Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/bypass v20 #416

Merged
merged 17 commits into from
Apr 26, 2024
Merged

Feat/bypass v20 #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4510c03
refactor: Witnet, WitnetV2 libs
guidiaz Mar 18, 2024
27361c0
chore: import interfaces to bypass WRB to
guidiaz Mar 18, 2024
e9bb5fc
feat: migration script for bypassing WRBs
guidiaz Mar 18, 2024
bdd472c
feat: first approach to WitnetRequestBoardBypassV20
guidiaz Mar 18, 2024
0bdb17e
chore: polish WitnetRequestBoardBypassV20
guidiaz Mar 19, 2024
7d870b4
fix(wrb): checkResult* on 0.7 -> 2.0 bypass
guidiaz Mar 19, 2024
3ef14a4
chore: deploy wsb v0.7 on optimism:sepolia
guidiaz Mar 19, 2024
94457d5
chore: bypass wrb on optimism:sepolia to v2.0
guidiaz Mar 19, 2024
2869863
feat: WitnetPriceFeesBypassV20
guidiaz Mar 20, 2024
a606826
fix: redeploy wrb wpf wpr on optimism:sepolia
guidiaz Mar 20, 2024
e2eb449
test: bypass wpf v0.7 on optimism:sepolia
guidiaz Mar 20, 2024
151ce5e
chore: bump package version to 0.7.18
guidiaz Mar 20, 2024
5c0b949
chore: fmt!
guidiaz Mar 20, 2024
a1cbaeb
chore: temporarily remove legacy tests (yet to be refactored)
guidiaz Mar 20, 2024
7fb61d2
chore: prepare v07 chains for bypass
guidiaz Apr 4, 2024
563f986
chore: bypass ethereum:sepolia
guidiaz Apr 11, 2024
d79cf2a
chore: bypass optimism:mainnet
guidiaz Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contracts/UsingWitnet.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ abstract contract UsingWitnet {
/// @param _slaParams The SLA params upon which this data request will be solved by Witnet.
/// @return _id The unique identifier of the just posted data request.
/// @return _reward Current reward amount escrowed by the WRB until a result gets reported.
function _witnetPostRequest(bytes32 _radHash, WitnetV2.RadonSLA memory _slaParams)
function _witnetPostRequest(bytes32 _radHash, Witnet.RadonSLA memory _slaParams)
virtual internal
returns (uint256 _id, uint256 _reward)
{
Expand Down
4 changes: 2 additions & 2 deletions contracts/WitnetFeeds.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ abstract contract WitnetFeeds
IWitnetFeedsAdmin,
IWitnetFeedsEvents
{
WitnetV2.RadonDataTypes immutable public override dataType;
Witnet.RadonDataTypes immutable public override dataType;
WitnetBytecodes immutable public override registry;
WitnetRequestBoard immutable public override witnet;

bytes32 immutable internal __prefix;

constructor(
WitnetRequestBoard _wrb,
WitnetV2.RadonDataTypes _dataType,
Witnet.RadonDataTypes _dataType,
string memory _prefix
)
{
Expand Down
2 changes: 1 addition & 1 deletion contracts/WitnetPriceFeeds.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ abstract contract WitnetPriceFeeds
constructor(WitnetRequestBoard _wrb)
WitnetFeeds(
_wrb,
WitnetV2.RadonDataTypes.Integer,
Witnet.RadonDataTypes.Integer,
"Price-"
)
{}
Expand Down
2 changes: 1 addition & 1 deletion contracts/data/WitnetBoardData.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ abstract contract WitnetBoardData {

/// Gets current status of given query.
function _statusOf(uint256 _queryId)
internal view
virtual internal view
returns (Witnet.QueryStatus)
{
Witnet.Query storage _query = __storage().queries[_queryId];
Expand Down
16 changes: 11 additions & 5 deletions contracts/data/WitnetBytecodesData.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,25 @@ abstract contract WitnetBytecodesData {
string[][] args;
bytes32 aggregator;
bytes32 radHash;
WitnetV2.RadonDataTypes resultDataType;
Witnet.RadonDataTypes resultDataType;
uint16 resultMaxSize;
bytes32[] retrievals;
bytes32 tally;
}

struct DataProvider {
string authority;
uint256 totalEndpoints;
mapping (uint256 => bytes32) endpoints;
}

struct Database {
mapping (uint256 => WitnetV2.DataProvider) providers;
mapping (uint256 => DataProvider) providers;
mapping (bytes32 => uint256) providersIndex;

mapping (bytes32 => WitnetV2.RadonReducer) reducers;
mapping (bytes32 => WitnetV2.RadonRetrieval) retrievals;
mapping (bytes32 => WitnetV2.RadonSLA) slas;
mapping (bytes32 => Witnet.RadonReducer) reducers;
mapping (bytes32 => Witnet.RadonRetrieval) retrievals;
mapping (bytes32 => Witnet.RadonSLA) slas;

mapping (bytes32 => RadonRequest) requests;
mapping (bytes32 => bytes32) rads;
Expand Down
2 changes: 1 addition & 1 deletion contracts/data/WitnetRequestFactoryData.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ contract WitnetRequestFactoryData {
/// @notice Array of retrievals hashes passed upon construction.
bytes32[] retrievals;
/// @notice Result data type.
WitnetV2.RadonDataTypes resultDataType;
Witnet.RadonDataTypes resultDataType;
/// @notice Result max size or rank (if variable type).
uint16 resultDataMaxSize;
}
Expand Down
Loading
Loading