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.

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

Pooltogether/worldchain mainnet #449

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions contracts/core/defaults/WitnetOracleTrustableBase.sol
Original file line number Diff line number Diff line change
Expand Up @@ -649,8 +649,7 @@ abstract contract WitnetOracleTrustableBase
WitnetOracleDataLib.notInStatusRevertMessage(WitnetV2.QueryStatus.Posted)
);
} else if (
uint256(_batchResults[_i].queryResultTimestamp) > block.timestamp
|| _batchResults[_i].queryResultTimestamp == 0
_batchResults[_i].queryResultTimestamp == 0
|| _batchResults[_i].queryResultCborBytes.length == 0
) {
emit BatchReportError(
Expand Down
89 changes: 0 additions & 89 deletions contracts/mocks/MyDapp.sol

This file was deleted.

88 changes: 72 additions & 16 deletions migrations/addresses.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B",
"WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c",
"WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676",
"WitnetOracleTrustableDefault": "0x73280fa1238DAE165b9c37B7E877668C31b239f6",
"WitnetOracleTrustableDefault": "",
"WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837",
"WitnetPriceFeedsDefault": "0x8280929b7F6adcE1CfA15b63cbEC1A7FD8cAEf11",
"WitnetRequestBytecodesDefault": "0x51376b77d9944bb9c5685b9d9289dd08D399B5e1",
Expand All @@ -112,12 +112,12 @@
"celo:mainnet": {
"WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B",
"WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c",
"WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837",
"WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676",
"WitnetOracleTrustableDefault": "0x2c2C1Cf21c113F1c2D2df35a1E88aa96fc0AE749",
"WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837",
"WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0",
"WitnetRequestBytecodesDefault": "0x967C4A627e68770db28803d033eEBCeE615C37EB",
"WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04",
"WitnetOracleTrustableDefault": "0x105EeFc7ad7A057C3BF2D516a0bFbB84E80d66eF",
"WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0"
"WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04"
},
"conflux:core:mainnet": {
"WitnetDeployer": "0x8785dBa05D3B90c55c009D0C47f12A2d976C5e47",
Expand Down Expand Up @@ -223,6 +223,16 @@
"WitnetRequestBytecodesDefault": "0x51376b77d9944bb9c5685b9d9289dd08D399B5e1",
"WitnetRequestFactoryDefault": "0xB06a2fEc3Dc38b6f8Ce6337317Fcd4aAB00FE773"
},
"ethereum:mainnet": {
"WitnetErrorsLib": "0x3b7AD1402C243Ba59D45a0364B17A31e260A4301",
"WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c",
"WitnetPriceFeedsLib": "0x751F77190Ce6212899D5848334838D56CF7eEe91",
"WitnetOracleDataLib": "0xE89dc301AEe78917018039FEBE72f9FE5aB730D9",
"WitnetRequestBytecodesDefault": "0x4a2f2b2E137DD7D4a61389E07c935B14a562078d",
"WitnetRequestFactoryDefault": "0x1a5cc6DeE6c7d873639e3eF49678b581f459bBa1",
"WitnetOracleTrustableDefault": "0x7084a8C12100cDBB1995aa1B0393A83A0B868837",
"WitnetPriceFeedsDefault": "0xC815f56cC791E41a11DB3f0D2880AdB10316fca6"
},
"ethereum:sepolia": {
"WitnetProxy": "0x21ac85A6c320E6fC89774A98732eAE733032651C",
"WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B",
Expand All @@ -234,6 +244,16 @@
"WitnetRequestBytecodesDefault": "0x34e6465f23aE086e5701A6ca8547aF7c29e0283C",
"WitnetRequestFactoryDefault": "0x1869A7137dF26397999AA6DB90c7D6D029d13908"
},
"gnosis:mainnet": {
"WitnetErrorsLib": "0x3b7AD1402C243Ba59D45a0364B17A31e260A4301",
"WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c",
"WitnetPriceFeedsLib": "0x751F77190Ce6212899D5848334838D56CF7eEe91",
"WitnetOracleDataLib": "0xE89dc301AEe78917018039FEBE72f9FE5aB730D9",
"WitnetRequestBytecodesDefault": "0x7D94ad8e75CBb8d8a2237A4422cC3C809070d825",
"WitnetRequestFactoryDefault": "0x3129138bd571d9A76a7e52734ae8A95c28F61C6f",
"WitnetOracleTrustableDefault": "0x241A2C0A9ced7acCE24B55f5a8e1ce9707eFF090",
"WitnetPriceFeedsDefault": "0xB7bA6b3e5047386a8E7588Ce2188Fc24Ddc36163"
},
"gnosis:testnet": {
"WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B",
"WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c",
Expand All @@ -251,14 +271,14 @@
"WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676",
"WitnetRequestBytecodesDefault": "0x967C4A627e68770db28803d033eEBCeE615C37EB",
"WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04",
"WitnetOracleTrustableDefault": "0x105EeFc7ad7A057C3BF2D516a0bFbB84E80d66eF",
"WitnetOracleTrustableDefault": "0x2c2C1Cf21c113F1c2D2df35a1E88aa96fc0AE749",
"WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0"
},
"kava:testnet": {
"WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B",
"WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c",
"WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676",
"WitnetOracleTrustableDefault": "0x90A31c3f10391bd0f69a436473C96AAEe4DF0A5e",
"WitnetOracleTrustableDefault": "0x64c74993A83C55Dc81eB1ec9502867d3b4d1d924",
"WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837",
"WitnetPriceFeedsDefault": "0x8280929b7F6adcE1CfA15b63cbEC1A7FD8cAEf11",
"WitnetRequestBytecodesDefault": "0x51376b77d9944bb9c5685b9d9289dd08D399B5e1",
Expand All @@ -271,14 +291,14 @@
"WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676",
"WitnetRequestBytecodesDefault": "0x967C4A627e68770db28803d033eEBCeE615C37EB",
"WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04",
"WitnetOracleTrustableDefault": "0x105EeFc7ad7A057C3BF2D516a0bFbB84E80d66eF",
"WitnetOracleTrustableDefault": "0x2c2C1Cf21c113F1c2D2df35a1E88aa96fc0AE749",
"WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0"
},
"kcc:testnet": {
"WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B",
"WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c",
"WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676",
"WitnetOracleTrustableDefault": "0x574235e0e798c36fF6f8c81EEdDe0134Eda59050",
"WitnetOracleTrustableDefault": "0x64c74993A83C55Dc81eB1ec9502867d3b4d1d924",
"WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837",
"WitnetPriceFeedsDefault": "0x8280929b7F6adcE1CfA15b63cbEC1A7FD8cAEf11",
"WitnetRequestBytecodesDefault": "0x51376b77d9944bb9c5685b9d9289dd08D399B5e1",
Expand All @@ -291,14 +311,14 @@
"WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676",
"WitnetRequestBytecodesDefault": "0x967C4A627e68770db28803d033eEBCeE615C37EB",
"WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04",
"WitnetOracleTrustableDefault": "0x105EeFc7ad7A057C3BF2D516a0bFbB84E80d66eF",
"WitnetOracleTrustableDefault": "0x2c2C1Cf21c113F1c2D2df35a1E88aa96fc0AE749",
"WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0"
},
"klaytn:testnet": {
"WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B",
"WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c",
"WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676",
"WitnetOracleTrustableDefault": "0xfA4817078d74D93F88738CB04883f518bC06bD81",
"WitnetOracleTrustableDefault": "0x64c74993A83C55Dc81eB1ec9502867d3b4d1d924",
"WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837",
"WitnetPriceFeedsDefault": "0x8280929b7F6adcE1CfA15b63cbEC1A7FD8cAEf11",
"WitnetRequestBytecodesDefault": "0x51376b77d9944bb9c5685b9d9289dd08D399B5e1",
Expand Down Expand Up @@ -376,14 +396,14 @@
"WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676",
"WitnetRequestBytecodesDefault": "0x967C4A627e68770db28803d033eEBCeE615C37EB",
"WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04",
"WitnetOracleTrustableDefault": "0x412647Ff1519706C01706c5816E5cC355dd0A06D",
"WitnetOracleTrustableDefault": "0x2c2C1Cf21c113F1c2D2df35a1E88aa96fc0AE749",
"WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0"
},
"moonbeam:moonbase": {
"WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B",
"WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c",
"WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676",
"WitnetOracleTrustableDefault": "0xcE68F9D657C5B8931a1Baceb77Dc0e71499F7855",
"WitnetOracleTrustableDefault": "0x64c74993A83C55Dc81eB1ec9502867d3b4d1d924",
"WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837",
"WitnetPriceFeedsDefault": "0x8280929b7F6adcE1CfA15b63cbEC1A7FD8cAEf11",
"WitnetRequestBytecodesDefault": "0x51376b77d9944bb9c5685b9d9289dd08D399B5e1",
Expand Down Expand Up @@ -468,10 +488,26 @@
"WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676",
"WitnetRequestBytecodesNoSha256": "0x0C39d07778Fc2FF94efe889b107Deaa074041719",
"WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04",
"WitnetOracleTrustableDefault": "0x412647Ff1519706C01706c5816E5cC355dd0A06D",
"WitnetOracleTrustableDefault": "0xe373c42e9Dad4cbc6b94ef8b46943454bC717e61",
"WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0"
},
"reef:mainnet": {},
"reef:mainnet": {
"WitnetDeployer": "0x94d6e5321039343f5e656aa7591dfbdbe81ff78f",
"WitnetProxy": "0x57a52fbcb26a08425fbe813bb1f21380bff23d47",
"WitnetErrorsLib": "0xE2996CE29D5351E22a01E9dD73ADd8A0264E7318",
"WitnetEncodingLib": "0x416c6e7ff66868375cFF36bA87B8eCBB2CF2Fb08",
"WitnetPriceFeedsLib": "0xcaa6dE265EF1545788E9576660Bc6d5ae1Edb0F5",
"WitnetOracleDataLib": "0x6F65a0110a2D2Af299a73a4C169CC3d2C41Be505",
"WitnetRequestBytecodesDefault": "",
"WitnetRequestFactoryDefault": "0x71E2e26E5EfF3C05935A497282Fe018963b78F55",
"WitnetOracleTrustableReef": "0x7950250D3d2ae1636a7Ca2a8A6ba53e46D1cB573",
"WitnetPriceFeedsDefault": "0x8af56567C7F0Deaf8979244d83194816a6ED144F",
"WitnetRequestBytecodes": "0xC4b7a5aD8BAF8fea9DbeB18aB6F77cdf54CF297a",
"WitnetRequestFactory": "0xEBa788A5de67E4B11869558a2414247e8Aa62179",
"WitnetOracle": "0x604b98893335CEf7Dc40061731F40aC5C6239907",
"WitnetPriceFeeds": "0xA9991dCd62a863f0F0aabF95a6a252d132b5c8D4",
"WitnetRandomnessV2": "0x84CD0bde18f78101064A2c8b8BaE5e1fCe1BCc0d"
},
"reef:testnet": {},
"scroll:mainnet": {
"WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B",
Expand Down Expand Up @@ -500,7 +536,7 @@
"WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676",
"WitnetRequestBytecodesDefault": "0x51376b77d9944bb9c5685b9d9289dd08D399B5e1",
"WitnetRequestFactoryDefault": "0xB06a2fEc3Dc38b6f8Ce6337317Fcd4aAB00FE773",
"WitnetOracleTrustableOvm2": "0x9Bd67787019a6474ddE27f9c9A37260c87Da92B5",
"WitnetOracleTrustableOvm2": "0xaE08701A621449e12e3678587aBe9420E8805eBb",
"WitnetPriceFeedsDefault": "0x8280929b7F6adcE1CfA15b63cbEC1A7FD8cAEf11"
},
"ten:testnet": {
Expand Down Expand Up @@ -533,5 +569,25 @@
"WitnetRequestFactoryDefault": "0xB06a2fEc3Dc38b6f8Ce6337317Fcd4aAB00FE773",
"WitnetOracleTrustableDefault": "0x90A31c3f10391bd0f69a436473C96AAEe4DF0A5e",
"WitnetPriceFeedsDefault": "0x8280929b7F6adcE1CfA15b63cbEC1A7FD8cAEf11"
},
"worldchain:sepolia": {
"WitnetErrorsLib": "0x3b7AD1402C243Ba59D45a0364B17A31e260A4301",
"WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c",
"WitnetPriceFeedsLib": "0x751F77190Ce6212899D5848334838D56CF7eEe91",
"WitnetOracleDataLib": "0xE89dc301AEe78917018039FEBE72f9FE5aB730D9",
"WitnetRequestBytecodesDefault": "0x19B3092a3B40938590D423d3a7a897d8634111d7",
"WitnetRequestFactoryDefault": "0x21C8dB6Bc5014979EC23048f77C69D68AE832f41",
"WitnetOracleTrustableOvm2": "0x9dB290bF22266896096F0343DbB26008e7f1eF3F",
"WitnetPriceFeedsDefault": "0x63F52294041D48B299F0e91b807DF972A4DF9254"
},
"worldchain:mainnet": {
"WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B",
"WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c",
"WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837",
"WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676",
"WitnetRequestBytecodesDefault": "0x098954bC12E2D57Ac3b853f4decB7e53d72cD62F",
"WitnetRequestFactoryDefault": "0x358b88a0Ce9329Fb54fBc2f5466D2a68ead59516",
"WitnetOracleTrustableOvm2": "0x916EFC3A25ECfD68F50afBF0B24Da24a3e417FF5",
"WitnetPriceFeedsDefault": "0x8dca756605398703B351c176f4649387967D66c2"
}
}
Loading