Skip to content

Commit 2f69954

Browse files
authored
Merge pull request #181 from api3dao/csur-2024-08-08
Csur 2024 08 08
2 parents 427a051 + a1a4044 commit 2f69954

19 files changed

+8660
-0
lines changed

.changeset/gorgeous-apples-hear.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@api3/contracts': minor
3+
---
4+
5+
Add dAPI and Market support to conflux and conflux-testnet

data/chain-support.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
"bsquared-testnet",
2323
"blast-sepolia-testnet",
2424
"camp-sepolia-testnet",
25+
"conflux",
26+
"conflux-testnet",
2527
"core",
2628
"core-testnet",
2729
"ethereum",
@@ -107,6 +109,8 @@
107109
"bsquared",
108110
"bsquared-testnet",
109111
"camp-sepolia-testnet",
112+
"conflux",
113+
"conflux-testnet",
110114
"core",
111115
"core-testnet",
112116
"ethereum",

data/manager-multisig.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
"bsquared": "0x14A9E40FcAdA95A273ce3c8d4ccF7EA3280BDd26",
2121
"bsquared-testnet": "0x14A9E40FcAdA95A273ce3c8d4ccF7EA3280BDd26",
2222
"camp-sepolia-testnet": "0x14A9E40FcAdA95A273ce3c8d4ccF7EA3280BDd26",
23+
"conflux": "0x026A473DAB17ef658Ca09d726c70b4570A76188b",
24+
"conflux-testnet": "0x026A473DAB17ef658Ca09d726c70b4570A76188b",
2325
"core": "0x14A9E40FcAdA95A273ce3c8d4ccF7EA3280BDd26",
2426
"core-testnet": "0x14A9E40FcAdA95A273ce3c8d4ccF7EA3280BDd26",
2527
"ethereum": "0x33E6C2f5Fa6aA18254927F55b0C5b5B975Ec1358",

deployments/addresses.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"30": "0x81bc85f329cDB28936FbB239f734AE495121F9A6",
66
"42": "0x81bc85f329cDB28936FbB239f734AE495121F9A6",
77
"56": "0x81bc85f329cDB28936FbB239f734AE495121F9A6",
8+
"71": "0x81bc85f329cDB28936FbB239f734AE495121F9A6",
89
"97": "0x81bc85f329cDB28936FbB239f734AE495121F9A6",
910
"100": "0x81bc85f329cDB28936FbB239f734AE495121F9A6",
1011
"111": "0x81bc85f329cDB28936FbB239f734AE495121F9A6",
@@ -19,6 +20,7 @@
1920
"255": "0x81bc85f329cDB28936FbB239f734AE495121F9A6",
2021
"324": "0x1e0cd5CDB3a7bc2Db750aBc12FeeD05CA94e90ab",
2122
"919": "0x81bc85f329cDB28936FbB239f734AE495121F9A6",
23+
"1030": "0x81bc85f329cDB28936FbB239f734AE495121F9A6",
2224
"1088": "0x2D6D050Fc44d4db1c8577f4cF87905811fA126b2",
2325
"1101": "0x81bc85f329cDB28936FbB239f734AE495121F9A6",
2426
"1115": "0x81bc85f329cDB28936FbB239f734AE495121F9A6",
@@ -92,6 +94,7 @@
9294
"30": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
9395
"42": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
9496
"56": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
97+
"71": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
9598
"97": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
9699
"100": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
97100
"111": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
@@ -105,6 +108,7 @@
105108
"252": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
106109
"255": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
107110
"919": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
111+
"1030": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
108112
"1088": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
109113
"1101": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
110114
"1115": "0xcD7Df573B0F0bb4F2f8dFFF6650cDe8C77431730",
@@ -177,6 +181,7 @@
177181
"30": "0x709944a48cAf83535e43471680fDA4905FB3920a",
178182
"42": "0x709944a48cAf83535e43471680fDA4905FB3920a",
179183
"56": "0x709944a48cAf83535e43471680fDA4905FB3920a",
184+
"71": "0x709944a48cAf83535e43471680fDA4905FB3920a",
180185
"97": "0x709944a48cAf83535e43471680fDA4905FB3920a",
181186
"100": "0x709944a48cAf83535e43471680fDA4905FB3920a",
182187
"111": "0x709944a48cAf83535e43471680fDA4905FB3920a",
@@ -190,6 +195,7 @@
190195
"252": "0x709944a48cAf83535e43471680fDA4905FB3920a",
191196
"255": "0x709944a48cAf83535e43471680fDA4905FB3920a",
192197
"919": "0x709944a48cAf83535e43471680fDA4905FB3920a",
198+
"1030": "0x709944a48cAf83535e43471680fDA4905FB3920a",
193199
"1088": "0x0ADa28a62F6F304aEF27e73E4a65cBD34C6026c3",
194200
"1101": "0x709944a48cAf83535e43471680fDA4905FB3920a",
195201
"1115": "0x709944a48cAf83535e43471680fDA4905FB3920a",
@@ -262,6 +268,7 @@
262268
"30": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
263269
"42": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
264270
"56": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
271+
"71": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
265272
"97": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
266273
"100": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
267274
"111": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
@@ -275,6 +282,7 @@
275282
"252": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
276283
"255": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
277284
"919": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
285+
"1030": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
278286
"1088": "0x55a07E3066e893A2303B95BfD6637b1543647002",
279287
"1101": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
280288
"1115": "0x9EB9798Dc1b602067DFe5A57c3bfc914B965acFD",
@@ -346,6 +354,7 @@
346354
"10": "0x9F5223d4a93a771D178992078DB1AbE421Dd4218",
347355
"42": "0x9F5223d4a93a771D178992078DB1AbE421Dd4218",
348356
"56": "0x9F5223d4a93a771D178992078DB1AbE421Dd4218",
357+
"71": "0x9F5223d4a93a771D178992078DB1AbE421Dd4218",
349358
"97": "0x9F5223d4a93a771D178992078DB1AbE421Dd4218",
350359
"100": "0x9F5223d4a93a771D178992078DB1AbE421Dd4218",
351360
"111": "0x9F5223d4a93a771D178992078DB1AbE421Dd4218",
@@ -359,6 +368,7 @@
359368
"252": "0x9F5223d4a93a771D178992078DB1AbE421Dd4218",
360369
"255": "0x9F5223d4a93a771D178992078DB1AbE421Dd4218",
361370
"919": "0x9F5223d4a93a771D178992078DB1AbE421Dd4218",
371+
"1030": "0x9F5223d4a93a771D178992078DB1AbE421Dd4218",
362372
"1088": "0xFfD653c4a90E2e133566c1136A6f75731d01D8E7",
363373
"1101": "0x9F5223d4a93a771D178992078DB1AbE421Dd4218",
364374
"1115": "0x9F5223d4a93a771D178992078DB1AbE421Dd4218",
@@ -439,6 +449,7 @@
439449
"250": "0xb45fe2838F47DCCEe00F635785EAF0c723F742E5",
440450
"252": "0xb45fe2838F47DCCEe00F635785EAF0c723F742E5",
441451
"255": "0xb45fe2838F47DCCEe00F635785EAF0c723F742E5",
452+
"1030": "0xb45fe2838F47DCCEe00F635785EAF0c723F742E5",
442453
"1088": "0xb45fe2838F47DCCEe00F635785EAF0c723F742E5",
443454
"1101": "0xb45fe2838F47DCCEe00F635785EAF0c723F742E5",
444455
"1116": "0xb45fe2838F47DCCEe00F635785EAF0c723F742E5",

deployments/block-numbers.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"30": 5136166,
66
"42": 2407610,
77
"56": 26520952,
8+
"71": 183045340,
89
"97": 28030871,
910
"100": 26975349,
1011
"111": 8598361,
@@ -19,6 +20,7 @@
1920
"255": 10426562,
2021
"324": 314826,
2122
"919": 12408182,
23+
"1030": 102037200,
2224
"1088": 5092415,
2325
"1101": 314,
2426
"1115": 20076407,
@@ -91,6 +93,7 @@
9193
"10": 113178117,
9294
"30": 5878534,
9395
"56": 34145921,
96+
"71": 183045430,
9497
"97": 35747910,
9598
"100": 31307049,
9699
"111": 8598369,
@@ -102,6 +105,7 @@
102105
"250": 72156335,
103106
"252": 2936904,
104107
"919": 12408189,
108+
"1030": 102037240,
105109
"1088": 16786522,
106110
"1101": 8431018,
107111
"1115": 20076409,
@@ -167,6 +171,7 @@
167171
"30": 5878540,
168172
"42": 2407613,
169173
"56": 34145925,
174+
"71": 183045480,
170175
"97": 35747913,
171176
"100": 31307055,
172177
"111": 8598373,
@@ -180,6 +185,7 @@
180185
"252": 2936907,
181186
"255": 10426571,
182187
"919": 12408194,
188+
"1030": 102037255,
183189
"1088": 16786526,
184190
"1101": 8431019,
185191
"1115": 20076412,
@@ -252,6 +258,7 @@
252258
"30": 5878561,
253259
"42": 2407615,
254260
"56": 34145927,
261+
"71": 183045510,
255262
"97": 35747915,
256263
"100": 31307058,
257264
"111": 8598377,
@@ -265,6 +272,7 @@
265272
"252": 2936910,
266273
"255": 10426577,
267274
"919": 12408198,
275+
"1030": 102037275,
268276
"1088": 16786528,
269277
"1101": 8431020,
270278
"1115": 20076414,
@@ -336,6 +344,7 @@
336344
"10": 118199356,
337345
"42": 2407633,
338346
"56": 37486463,
347+
"71": 183172095,
339348
"97": 38837562,
340349
"100": 33227913,
341350
"111": 8598397,
@@ -349,6 +358,7 @@
349358
"252": 2936927,
350359
"255": 10426589,
351360
"919": 12408327,
361+
"1030": 102037365,
352362
"1088": 16786536,
353363
"1101": 11245712,
354364
"1115": 20076424,
@@ -429,6 +439,7 @@
429439
"250": 83703470,
430440
"252": 6256542,
431441
"255": 12721742,
442+
"1030": 101000985,
432443
"1088": 17458438,
433444
"1101": 13679800,
434445
"1116": 15340963,

deployments/conflux-testnet/.chainId

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
71

0 commit comments

Comments
 (0)