From b94ec45c7f8d3b02ae2c04f4251d5e6fe8d1c82a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20D=C3=ADaz?= Date: Fri, 31 May 2024 14:13:21 +0200 Subject: [PATCH 1/6] chore(libs): remove min collateral condition --- contracts/libs/WitnetV2.sol | 2 -- 1 file changed, 2 deletions(-) diff --git a/contracts/libs/WitnetV2.sol b/contracts/libs/WitnetV2.sol index 6d8cd7d1..f895eaa6 100644 --- a/contracts/libs/WitnetV2.sol +++ b/contracts/libs/WitnetV2.sol @@ -72,8 +72,6 @@ library WitnetV2 { return ( sla.witnessingFeeNanoWit > 0 && sla.committeeSize > 0 && sla.committeeSize <= 127 - // v1.7.x requires witnessing collateral to be greater or equal to 20 WIT: - && sla.witnessingFeeNanoWit * 100 >= 20 * 10 ** 9 ); } From acbaf496fc25dfe455b374abb4b8d3700e81e85c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20D=C3=ADaz?= Date: Fri, 31 May 2024 14:17:16 +0200 Subject: [PATCH 2/6] chore: prepare celo chains for upgrade --- migrations/addresses.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/migrations/addresses.json b/migrations/addresses.json index fc59f224..878e9c3b 100644 --- a/migrations/addresses.json +++ b/migrations/addresses.json @@ -103,7 +103,7 @@ "WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B", "WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c", "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", - "WitnetOracleTrustableDefault": "0x73280fa1238DAE165b9c37B7E877668C31b239f6", + "WitnetOracleTrustableDefault": "", "WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837", "WitnetPriceFeedsDefault": "0x8280929b7F6adcE1CfA15b63cbEC1A7FD8cAEf11", "WitnetRequestBytecodesDefault": "0x51376b77d9944bb9c5685b9d9289dd08D399B5e1", @@ -112,12 +112,12 @@ "celo:mainnet": { "WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B", "WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c", - "WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837", "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", + "WitnetOracleTrustableDefault": "", + "WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837", + "WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0", "WitnetRequestBytecodesDefault": "0x967C4A627e68770db28803d033eEBCeE615C37EB", - "WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04", - "WitnetOracleTrustableDefault": "0x105EeFc7ad7A057C3BF2D516a0bFbB84E80d66eF", - "WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0" + "WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04" }, "conflux:core:mainnet": { "WitnetDeployer": "0x8785dBa05D3B90c55c009D0C47f12A2d976C5e47", From baa2f11f9d3f836608db949d7717a474578c8288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20D=C3=ADaz?= Date: Fri, 7 Jun 2024 12:01:22 +0200 Subject: [PATCH 3/6] chore: prepare some testnets for upgrade --- migrations/addresses.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/migrations/addresses.json b/migrations/addresses.json index 878e9c3b..91911773 100644 --- a/migrations/addresses.json +++ b/migrations/addresses.json @@ -258,7 +258,7 @@ "WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B", "WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c", "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", - "WitnetOracleTrustableDefault": "0x90A31c3f10391bd0f69a436473C96AAEe4DF0A5e", + "WitnetOracleTrustableDefault": "", "WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837", "WitnetPriceFeedsDefault": "0x8280929b7F6adcE1CfA15b63cbEC1A7FD8cAEf11", "WitnetRequestBytecodesDefault": "0x51376b77d9944bb9c5685b9d9289dd08D399B5e1", @@ -278,7 +278,7 @@ "WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B", "WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c", "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", - "WitnetOracleTrustableDefault": "0x574235e0e798c36fF6f8c81EEdDe0134Eda59050", + "WitnetOracleTrustableDefault": "", "WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837", "WitnetPriceFeedsDefault": "0x8280929b7F6adcE1CfA15b63cbEC1A7FD8cAEf11", "WitnetRequestBytecodesDefault": "0x51376b77d9944bb9c5685b9d9289dd08D399B5e1", @@ -298,7 +298,7 @@ "WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B", "WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c", "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", - "WitnetOracleTrustableDefault": "0xfA4817078d74D93F88738CB04883f518bC06bD81", + "WitnetOracleTrustableDefault": "", "WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837", "WitnetPriceFeedsDefault": "0x8280929b7F6adcE1CfA15b63cbEC1A7FD8cAEf11", "WitnetRequestBytecodesDefault": "0x51376b77d9944bb9c5685b9d9289dd08D399B5e1", @@ -383,7 +383,7 @@ "WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B", "WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c", "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", - "WitnetOracleTrustableDefault": "0xcE68F9D657C5B8931a1Baceb77Dc0e71499F7855", + "WitnetOracleTrustableDefault": "", "WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837", "WitnetPriceFeedsDefault": "0x8280929b7F6adcE1CfA15b63cbEC1A7FD8cAEf11", "WitnetRequestBytecodesDefault": "0x51376b77d9944bb9c5685b9d9289dd08D399B5e1", From 4424a21101f8b7c1219b7ab4105e442debceaa44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20D=C3=ADaz?= Date: Fri, 7 Jun 2024 12:16:35 +0200 Subject: [PATCH 4/6] chore: upgrade affected testnets --- migrations/addresses.json | 26 +++++++++++++++++++++----- migrations/constructorArgs.json | 15 +++++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/migrations/addresses.json b/migrations/addresses.json index 91911773..4a49892f 100644 --- a/migrations/addresses.json +++ b/migrations/addresses.json @@ -258,7 +258,7 @@ "WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B", "WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c", "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", - "WitnetOracleTrustableDefault": "", + "WitnetOracleTrustableDefault": "0x64c74993A83C55Dc81eB1ec9502867d3b4d1d924", "WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837", "WitnetPriceFeedsDefault": "0x8280929b7F6adcE1CfA15b63cbEC1A7FD8cAEf11", "WitnetRequestBytecodesDefault": "0x51376b77d9944bb9c5685b9d9289dd08D399B5e1", @@ -278,7 +278,7 @@ "WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B", "WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c", "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", - "WitnetOracleTrustableDefault": "", + "WitnetOracleTrustableDefault": "0x64c74993A83C55Dc81eB1ec9502867d3b4d1d924", "WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837", "WitnetPriceFeedsDefault": "0x8280929b7F6adcE1CfA15b63cbEC1A7FD8cAEf11", "WitnetRequestBytecodesDefault": "0x51376b77d9944bb9c5685b9d9289dd08D399B5e1", @@ -298,7 +298,7 @@ "WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B", "WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c", "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", - "WitnetOracleTrustableDefault": "", + "WitnetOracleTrustableDefault": "0x64c74993A83C55Dc81eB1ec9502867d3b4d1d924", "WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837", "WitnetPriceFeedsDefault": "0x8280929b7F6adcE1CfA15b63cbEC1A7FD8cAEf11", "WitnetRequestBytecodesDefault": "0x51376b77d9944bb9c5685b9d9289dd08D399B5e1", @@ -383,7 +383,7 @@ "WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B", "WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c", "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", - "WitnetOracleTrustableDefault": "", + "WitnetOracleTrustableDefault": "0x64c74993A83C55Dc81eB1ec9502867d3b4d1d924", "WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837", "WitnetPriceFeedsDefault": "0x8280929b7F6adcE1CfA15b63cbEC1A7FD8cAEf11", "WitnetRequestBytecodesDefault": "0x51376b77d9944bb9c5685b9d9289dd08D399B5e1", @@ -471,7 +471,23 @@ "WitnetOracleTrustableDefault": "0x412647Ff1519706C01706c5816E5cC355dd0A06D", "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", diff --git a/migrations/constructorArgs.json b/migrations/constructorArgs.json index b25a0077..2ac295d7 100644 --- a/migrations/constructorArgs.json +++ b/migrations/constructorArgs.json @@ -43,6 +43,9 @@ "WitnetOracleTrustableOvm2": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20", "WitnetPriceFeedsDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da007770000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000" }, + "celo:alfajores": { + "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31352d64383461343832000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20" + }, "celo:mainnet": { "WitnetRequestBytecodesDefault": "0000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", "WitnetRequestFactoryDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da00777000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", @@ -95,18 +98,27 @@ "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20", "WitnetPriceFeedsDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da007770000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000" }, + "kava:testnet": { + "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31352d64626234666331000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20" + }, "kcc:mainnet": { "WitnetRequestBytecodesDefault": "0000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", "WitnetRequestFactoryDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da00777000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20", "WitnetPriceFeedsDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da007770000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000" }, + "kcc:testnet": { + "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31352d64626234666331000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20" + }, "klaytn:mainnet": { "WitnetRequestBytecodesDefault": "0000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", "WitnetRequestFactoryDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da00777000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20", "WitnetPriceFeedsDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da007770000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000" }, + "klaytn:testnet": { + "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31352d64626234666331000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20" + }, "mantle:mainnet": { "WitnetRequestBytecodesDefault": "0000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", "WitnetRequestFactoryDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da00777000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", @@ -127,6 +139,9 @@ "WitnetRandomnessV2": "00000000000000000000000051e12a16d52de519f7b13bfeda42fb61214d32a0000000000000000000000000e169bf81ecf738d02fd8d3824dfe02153b334ef7", "WitnetRequestFactoryCfxCore": "00000000000000000000000051e12a16d52de519f7b13bfeda42fb61214d32a000000000000000000000000087e25ad751306b21f9345494f163122e057b7b530000000000000000000000000000000000000000000000000000000000000001322e302e31342d34386336646436000000000000000000000000000000000000" }, + "moonbeam:moonbase": { + "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31352d64626234666331000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20" + }, "moonbeam:mainnet": { "WitnetRequestBytecodesDefault": "0000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", "WitnetRequestFactoryDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da00777000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", From 389fb6e101cbaef0fd839565c7ea7d3178d6089c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20D=C3=ADaz?= Date: Fri, 7 Jun 2024 13:22:26 +0200 Subject: [PATCH 5/6] chore: prepare next mainnets upgrade --- migrations/addresses.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/migrations/addresses.json b/migrations/addresses.json index 4a49892f..3de52675 100644 --- a/migrations/addresses.json +++ b/migrations/addresses.json @@ -251,7 +251,7 @@ "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", "WitnetRequestBytecodesDefault": "0x967C4A627e68770db28803d033eEBCeE615C37EB", "WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04", - "WitnetOracleTrustableDefault": "0x105EeFc7ad7A057C3BF2D516a0bFbB84E80d66eF", + "WitnetOracleTrustableDefault": "", "WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0" }, "kava:testnet": { @@ -271,7 +271,7 @@ "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", "WitnetRequestBytecodesDefault": "0x967C4A627e68770db28803d033eEBCeE615C37EB", "WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04", - "WitnetOracleTrustableDefault": "0x105EeFc7ad7A057C3BF2D516a0bFbB84E80d66eF", + "WitnetOracleTrustableDefault": "", "WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0" }, "kcc:testnet": { @@ -291,7 +291,7 @@ "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", "WitnetRequestBytecodesDefault": "0x967C4A627e68770db28803d033eEBCeE615C37EB", "WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04", - "WitnetOracleTrustableDefault": "0x105EeFc7ad7A057C3BF2D516a0bFbB84E80d66eF", + "WitnetOracleTrustableDefault": "", "WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0" }, "klaytn:testnet": { @@ -376,7 +376,7 @@ "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", "WitnetRequestBytecodesDefault": "0x967C4A627e68770db28803d033eEBCeE615C37EB", "WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04", - "WitnetOracleTrustableDefault": "0x412647Ff1519706C01706c5816E5cC355dd0A06D", + "WitnetOracleTrustableDefault": "", "WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0" }, "moonbeam:moonbase": { @@ -468,7 +468,7 @@ "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", "WitnetRequestBytecodesNoSha256": "0x0C39d07778Fc2FF94efe889b107Deaa074041719", "WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04", - "WitnetOracleTrustableDefault": "0x412647Ff1519706C01706c5816E5cC355dd0A06D", + "WitnetOracleTrustableDefault": "", "WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0" }, "reef:mainnet": { From 171221bd9348d2208fa415ecc4b041ade055c29f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20D=C3=ADaz?= Date: Fri, 7 Jun 2024 13:49:49 +0200 Subject: [PATCH 6/6] chore: upgrade required mainnets --- migrations/addresses.json | 12 ++++++------ migrations/constructorArgs.json | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/migrations/addresses.json b/migrations/addresses.json index 3de52675..3e9ba231 100644 --- a/migrations/addresses.json +++ b/migrations/addresses.json @@ -113,7 +113,7 @@ "WitnetErrorsLib": "0xa57B9dd8420631248c3DFB535f4FC9f7E2f02B4B", "WitnetEncodingLib": "0x268631E002eE8c23F4C124AfBb6fE5DBbaa6d58c", "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", - "WitnetOracleTrustableDefault": "", + "WitnetOracleTrustableDefault": "0x2c2C1Cf21c113F1c2D2df35a1E88aa96fc0AE749", "WitnetPriceFeedsLib": "0x579b4aD5E67E5B491a33A033A02A70769D7AF837", "WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0", "WitnetRequestBytecodesDefault": "0x967C4A627e68770db28803d033eEBCeE615C37EB", @@ -251,7 +251,7 @@ "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", "WitnetRequestBytecodesDefault": "0x967C4A627e68770db28803d033eEBCeE615C37EB", "WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04", - "WitnetOracleTrustableDefault": "", + "WitnetOracleTrustableDefault": "0x2c2C1Cf21c113F1c2D2df35a1E88aa96fc0AE749", "WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0" }, "kava:testnet": { @@ -271,7 +271,7 @@ "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", "WitnetRequestBytecodesDefault": "0x967C4A627e68770db28803d033eEBCeE615C37EB", "WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04", - "WitnetOracleTrustableDefault": "", + "WitnetOracleTrustableDefault": "0x2c2C1Cf21c113F1c2D2df35a1E88aa96fc0AE749", "WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0" }, "kcc:testnet": { @@ -291,7 +291,7 @@ "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", "WitnetRequestBytecodesDefault": "0x967C4A627e68770db28803d033eEBCeE615C37EB", "WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04", - "WitnetOracleTrustableDefault": "", + "WitnetOracleTrustableDefault": "0x2c2C1Cf21c113F1c2D2df35a1E88aa96fc0AE749", "WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0" }, "klaytn:testnet": { @@ -376,7 +376,7 @@ "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", "WitnetRequestBytecodesDefault": "0x967C4A627e68770db28803d033eEBCeE615C37EB", "WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04", - "WitnetOracleTrustableDefault": "", + "WitnetOracleTrustableDefault": "0x2c2C1Cf21c113F1c2D2df35a1E88aa96fc0AE749", "WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0" }, "moonbeam:moonbase": { @@ -468,7 +468,7 @@ "WitnetOracleDataLib": "0x561A6c8F9C9D6e7EbAEcd4963A8f27Ae13568676", "WitnetRequestBytecodesNoSha256": "0x0C39d07778Fc2FF94efe889b107Deaa074041719", "WitnetRequestFactoryDefault": "0xE2CA421F5c28a04eb0B22f12512627acA9cF9E04", - "WitnetOracleTrustableDefault": "", + "WitnetOracleTrustableDefault": "0x2c2C1Cf21c113F1c2D2df35a1E88aa96fc0AE749", "WitnetPriceFeedsDefault": "0xd26f5c402D274C1b7c443E2215221D70C0b8DeB0" }, "reef:mainnet": { diff --git a/migrations/constructorArgs.json b/migrations/constructorArgs.json index 2ac295d7..124a6c8c 100644 --- a/migrations/constructorArgs.json +++ b/migrations/constructorArgs.json @@ -49,7 +49,7 @@ "celo:mainnet": { "WitnetRequestBytecodesDefault": "0000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", "WitnetRequestFactoryDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da00777000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", - "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20", + "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31352d39666334346562000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20", "WitnetPriceFeedsDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da007770000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000" }, "conflux:core:mainnet": { @@ -95,7 +95,7 @@ "kava:mainnet": { "WitnetRequestBytecodesDefault": "0000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", "WitnetRequestFactoryDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da00777000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", - "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20", + "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31352d39666334346562000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20", "WitnetPriceFeedsDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da007770000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000" }, "kava:testnet": { @@ -104,7 +104,7 @@ "kcc:mainnet": { "WitnetRequestBytecodesDefault": "0000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", "WitnetRequestFactoryDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da00777000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", - "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20", + "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31352d39666334346562000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20", "WitnetPriceFeedsDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da007770000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000" }, "kcc:testnet": { @@ -113,7 +113,7 @@ "klaytn:mainnet": { "WitnetRequestBytecodesDefault": "0000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", "WitnetRequestFactoryDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da00777000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", - "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20", + "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31352d39666334346562000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20", "WitnetPriceFeedsDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da007770000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000" }, "klaytn:testnet": { @@ -145,7 +145,7 @@ "moonbeam:mainnet": { "WitnetRequestBytecodesDefault": "0000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", "WitnetRequestFactoryDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da00777000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", - "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20", + "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31352d39666334346562000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20", "WitnetPriceFeedsDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da007770000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000" }, "moonbeam:moonriver": { @@ -169,7 +169,7 @@ "polygon:zkevm:mainnet": { "WitnetRequestBytecodesNoSha256": "0000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", "WitnetRequestFactoryDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da00777000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000", - "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20", + "WitnetOracleTrustableDefault": "000000000000000000000000000db36997af1f02209a6f995883b9b699900000000000000000000000000000000b61fe075f545fd37767f403916582759000000000000000000000000000000000000000000000000000000000000000000001322e302e31352d39666334346562000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3aa000000000000000000000000000000000000000000000000000000000000fef90000000000000000000000000000000000000000000000000000000000010faa0000000000000000000000000000000000000000000000000000000000004e20", "WitnetPriceFeedsDefault": "00000000000000000000000077703ae126b971c9946d562f41dd47071da007770000000000000000000000000000000000000000000000000000000000000001322e302e31342d64313036336562000000000000000000000000000000000000" }, "reef:mainnet": {},