Skip to content

Commit a023804

Browse files
cinnabarhorsecinnabarhorse
authored
Merge branch 'SocketDotTech:main' into feat/nft
2 parents 46d379e + f4c1412 commit a023804

File tree

14 files changed

+582
-58
lines changed

14 files changed

+582
-58
lines changed

‎contracts/hooks/plugins/ExecutionHelper.sol‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ contract ExecutionHelper is RescueBase {
1616
bytes32 public messageId;
1717
uint256 public bridgeAmount;
1818

19+
event ExecutionFailed(bytes reason);
20+
1921
constructor(address owner_) AccessControl(owner_) {
2022
_grantRole(RESCUE_ROLE, owner_);
2123
}
@@ -46,13 +48,24 @@ contract ExecutionHelper is RescueBase {
4648
messageId = messageId_;
4749
bridgeAmount = bridgeAmount_;
4850

49-
(success, ) = target_.excessivelySafeCall(
51+
bytes memory returnData;
52+
(success, returnData) = target_.excessivelySafeCall(
5053
gasleft(),
5154
MAX_COPY_BYTES,
5255
payload_
5356
);
5457

58+
if (!success) emit ExecutionFailed(_getRevertMsg(returnData));
59+
5560
messageId = bytes32(0);
5661
bridgeAmount = 0;
5762
}
63+
64+
function _getRevertMsg(
65+
bytes memory _returnData
66+
) internal pure returns (bytes memory) {
67+
// If the _res length is less than 68, then the transaction failed silently (without a revert message)
68+
if (_returnData.length < 68) return bytes("");
69+
return _returnData;
70+
}
5871
}

‎deployments/superbridge/prod_addresses.json‎

Lines changed: 29 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,80 +1177,53 @@
11771177
},
11781178
"reya": {
11791179
"1": {
1180-
"SUSDE": {
1180+
"SDEUSD": {
11811181
"isAppChain": false,
1182-
"NonMintableToken": "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497",
1183-
"Vault": "0x5F3B301B4967623fDb3AE52Bb8FF4dB01C460Cd3",
1184-
"ExecutionHelper": "0xc0dd07e53C48807d3E30996D82e75e2D194b67ec",
1185-
"LimitExecutionHook": "0x95e76A77B5e67fa306A4F982cbD0761d219b35b7",
1182+
"NonMintableToken": "0x5c5b196abe0d54485975d1ec29617d42d9198326",
1183+
"Vault": "0x0A5A19376064fED2A0A9f3120B2426c957BC289D",
1184+
"ExecutionHelper": "0xD18CEaAa37E1C41Dcbb57509d15EEF22A0faa381",
1185+
"LimitExecutionHook": "0xc38eC96c98db945A0B985413acD563B4d19399c9",
11861186
"connectors": {
11871187
"1324967486": {
1188-
"FAST": "0xe38Dccb8Bd138c326E3Df926ADD9dE71a442837F"
1188+
"FAST": "0xFAB1efe6cA9435faEf9e29f40E575e27A74373A9"
11891189
}
11901190
}
1191-
}
1192-
},
1193-
"10": {
1194-
"SUSDE": {
1195-
"isAppChain": false,
1196-
"NonMintableToken": "0x211Cc4DD073734dA055fbF44a2b4667d5E5fE5d2",
1197-
"Vault": "0xe9f2Ed94dEe821bd23716ED90672d6e3dc9e0415",
1198-
"ExecutionHelper": "0xD7BBE2f6D1B52A27D2dAC28298DE3974a3d13047",
1199-
"LimitExecutionHook": "0x063cE19E9D682F38bE70644a5FDDAE3a2EC380b6",
1200-
"connectors": {
1201-
"1324967486": {
1202-
"FAST": "0x716206c6Ac501315f8b204e1E564b9e0cbC210d4"
1203-
}
1204-
}
1205-
}
1206-
},
1207-
"8453": {
1208-
"SUSDE": {
1191+
},
1192+
"DEUSD": {
12091193
"isAppChain": false,
1210-
"NonMintableToken": "0x211Cc4DD073734dA055fbF44a2b4667d5E5fE5d2",
1211-
"Vault": "0x3FC5c9C4860b51D92e3d84B3e450D1b8e81Df592",
1212-
"ExecutionHelper": "0x46bCC550354c07Fd2f70611D15453C12DC4f09f2",
1213-
"LimitExecutionHook": "0x4954DBC82bAc36D63f8ea795ae67da6a3539Ad7c",
1194+
"NonMintableToken": "0x15700b564ca08d9439c58ca5053166e8317aa138",
1195+
"Vault": "0x0b4447344fAAA340bcD2B0FdBD8f0CEcd161bC9E",
1196+
"ExecutionHelper": "0x6E2BABf4F6332548f635aD8AE1b044549744a31A",
1197+
"LimitExecutionHook": "0x7813664285c811F3B4BC245B5577739290a9Bc12",
12141198
"connectors": {
12151199
"1324967486": {
1216-
"FAST": "0x491817B73935Ae5E15EeD1031f0769eE0EB780b0"
1200+
"FAST": "0xE88F6b194BD3b43013710A785DDFF41454A19537"
12171201
}
12181202
}
12191203
}
12201204
},
1221-
"42161": {
1222-
"SUSDE": {
1223-
"isAppChain": false,
1224-
"NonMintableToken": "0x211Cc4DD073734dA055fbF44a2b4667d5E5fE5d2",
1225-
"Vault": "0xed902143F4129BE7Be73Bc355e77B67D47Df7bc3",
1226-
"ExecutionHelper": "0x81B9553321a5B583bcD3D292595C348f2892C2c6",
1227-
"LimitExecutionHook": "0xD34308fB7138716b9A9519E13fb1e0196bfb9D3f",
1205+
"1324967486": {
1206+
"SDEUSD": {
1207+
"isAppChain": true,
1208+
"MintableToken": "0x4D3fEB76ab1C7eF40388Cd7a2066edacE1a2237D",
1209+
"Controller": "0xCDb4A30CEBbf9d8C14e4e96fDe6EA7E40c6f3f5B",
1210+
"ExecutionHelper": "0x70c46c24f9f923F44278C3B5451986C175c39F73",
1211+
"LimitExecutionHook": "0xDbd87a7546b3528741E4d548F2e62dF2962a7c5F",
12281212
"connectors": {
1229-
"1324967486": {
1230-
"FAST": "0xf9715b5518396378596cBc70Bea7f8Cf4c10D9b2"
1213+
"1": {
1214+
"FAST": "0x2dc464B4f5Fd55ea19f0bdF71A8dc3584eeb64d7"
12311215
}
12321216
}
1233-
}
1234-
},
1235-
"1324967486": {
1236-
"SUSDE": {
1217+
},
1218+
"DEUSD": {
12371219
"isAppChain": true,
1238-
"MintableToken": "0x2339D41f410EA761F346a14c184385d15f7266c4",
1239-
"Controller": "0x3379f120917fb67728d6Db6065d9fDBBd1507A7B",
1240-
"ExecutionHelper": "0x9e51CDbD0dC54E314B6b17C69ED34a98B8259A16",
1241-
"LimitExecutionHook": "0xbf47f1b6aeC8C1Ec47CeBa21f3B868567738C8b2",
1220+
"MintableToken": "0x809B99df4DDd6fA90F2CF305E2cDC310C6AD3C2c",
1221+
"Controller": "0x322A8EA44716586b6BB31456055e61B28da4f1C1",
1222+
"ExecutionHelper": "0xEB7F89394B325a021259939DA5Ba5EE83984b7F5",
1223+
"LimitExecutionHook": "0x13058f01BB8E2A93a600875aBE8647b30BE72765",
12421224
"connectors": {
12431225
"1": {
1244-
"FAST": "0x888f5426Bf4E387770A225d0097f0716aF98e7b5"
1245-
},
1246-
"10": {
1247-
"FAST": "0x79C06E5BD8e7a4dc151D7591eba71C2a5D49e2B6"
1248-
},
1249-
"8453": {
1250-
"FAST": "0xE71b58F3324d06786cA70b3c9695df23EEaaF630"
1251-
},
1252-
"42161": {
1253-
"FAST": "0x4f471ff392733b722992F012e40728e36c5e9848"
1226+
"FAST": "0x65ce0D9c5bbF43ee7A6011B3D077DD2FeA6b2726"
12541227
}
12551228
}
12561229
}

‎deployments/superbridge/prod_polynomial_addresses.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,18 @@
3535
"FAST": "0xEd0952283fdA768aA9d69eB7e895d49afcC3c0fe"
3636
}
3737
}
38+
},
39+
"USDZEROPP": {
40+
"isAppChain": false,
41+
"NonMintableToken": "0x35D8949372D46B7a3D5A56006AE77B215fc69bC0",
42+
"Vault": "0xDf9Fa2b420689384E8DD55a706262DC0ED37020F",
43+
"ExecutionHelper": "0xEc017A04a6FA6D309A48238266dCe0c1fafB06B6",
44+
"LimitExecutionHook": "0x76a6EA327E73E1548F9C4d6453A497a679E99aCE",
45+
"connectors": {
46+
"8008": {
47+
"FAST": "0x80f5143AF6BF51B38C038BaFF71465Be9b48cAEe"
48+
}
49+
}
3850
}
3951
},
4052
"10": {
@@ -96,6 +108,18 @@
96108
"FAST": "0xce70303Df18E2E10A5059da96f41Cfd95Bf9D5cE"
97109
}
98110
}
111+
},
112+
"USDZEROPP": {
113+
"isAppChain": true,
114+
"MintableToken": "0x6224dC817dC4D5c53fcF3eb08A4f84C456F9f38f",
115+
"Controller": "0xadf7D3A2c6D3396164396069e0607dea54a93aEe",
116+
"ExecutionHelper": "0x8E055Ff010DDB0387C3d819Abb8aeFAa9fee6061",
117+
"LimitExecutionHook": "0x1FC707CCBD82D5CCe6a426f5C4eCaA2c7ab37d6f",
118+
"connectors": {
119+
"1": {
120+
"FAST": "0x5ab9aCb348b61ec02dD2b43eBF5eD1a56713E19F"
121+
}
122+
}
99123
}
100124
},
101125
"8453": {

‎deployments/superbridge/prod_polynomial_verification.json‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,38 @@
11
{
22
"1": [
3+
[
4+
"0x80f5143AF6BF51B38C038BaFF71465Be9b48cAEe",
5+
"ConnectorPlug",
6+
"contracts/ConnectorPlug.sol",
7+
[
8+
"0xDf9Fa2b420689384E8DD55a706262DC0ED37020F",
9+
"0x943AC2775928318653e91d350574436A1b9b16f9",
10+
8008
11+
]
12+
],
13+
[
14+
"0x76a6EA327E73E1548F9C4d6453A497a679E99aCE",
15+
"LimitExecutionHook",
16+
"contracts/hooks/LimitExecutionHook.sol",
17+
[
18+
"0xAeBF1Bc19Ed4Fdf509c456ab6c28D25C9Ca3B332",
19+
"0xDf9Fa2b420689384E8DD55a706262DC0ED37020F",
20+
"0xEc017A04a6FA6D309A48238266dCe0c1fafB06B6",
21+
false
22+
]
23+
],
24+
[
25+
"0xEc017A04a6FA6D309A48238266dCe0c1fafB06B6",
26+
"ExecutionHelper",
27+
"contracts/hooks/plugins/ExecutionHelper.sol",
28+
["0xAeBF1Bc19Ed4Fdf509c456ab6c28D25C9Ca3B332"]
29+
],
30+
[
31+
"0xDf9Fa2b420689384E8DD55a706262DC0ED37020F",
32+
"Vault",
33+
"contracts/bridge/Vault.sol",
34+
["0x35D8949372D46B7a3D5A56006AE77B215fc69bC0"]
35+
],
336
[
437
"0xEd0952283fdA768aA9d69eB7e895d49afcC3c0fe",
538
"ConnectorPlug",
@@ -154,6 +187,39 @@
154187
]
155188
],
156189
"8008": [
190+
[
191+
"0x5ab9aCb348b61ec02dD2b43eBF5eD1a56713E19F",
192+
"ConnectorPlug",
193+
"contracts/ConnectorPlug.sol",
194+
[
195+
"0xadf7D3A2c6D3396164396069e0607dea54a93aEe",
196+
"0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE",
197+
1
198+
]
199+
],
200+
[
201+
"0x1FC707CCBD82D5CCe6a426f5C4eCaA2c7ab37d6f",
202+
"LimitExecutionHook",
203+
"contracts/hooks/LimitExecutionHook.sol",
204+
[
205+
"0xAeBF1Bc19Ed4Fdf509c456ab6c28D25C9Ca3B332",
206+
"0xadf7D3A2c6D3396164396069e0607dea54a93aEe",
207+
"0x8E055Ff010DDB0387C3d819Abb8aeFAa9fee6061",
208+
true
209+
]
210+
],
211+
[
212+
"0x8E055Ff010DDB0387C3d819Abb8aeFAa9fee6061",
213+
"ExecutionHelper",
214+
"contracts/hooks/plugins/ExecutionHelper.sol",
215+
["0xAeBF1Bc19Ed4Fdf509c456ab6c28D25C9Ca3B332"]
216+
],
217+
[
218+
"0xadf7D3A2c6D3396164396069e0607dea54a93aEe",
219+
"Controller",
220+
"contracts/bridge/Controller.sol",
221+
["0x6224dC817dC4D5c53fcF3eb08A4f84C456F9f38f"]
222+
],
157223
[
158224
"0xce70303Df18E2E10A5059da96f41Cfd95Bf9D5cE",
159225
"ConnectorPlug",

‎deployments/superbridge/prod_reya_addresses.json‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,30 @@
107107
"FAST": "0xe38Dccb8Bd138c326E3Df926ADD9dE71a442837F"
108108
}
109109
}
110+
},
111+
"SDEUSD": {
112+
"isAppChain": false,
113+
"NonMintableToken": "0x5c5b196abe0d54485975d1ec29617d42d9198326",
114+
"Vault": "0x0A5A19376064fED2A0A9f3120B2426c957BC289D",
115+
"ExecutionHelper": "0xD18CEaAa37E1C41Dcbb57509d15EEF22A0faa381",
116+
"LimitExecutionHook": "0xc38eC96c98db945A0B985413acD563B4d19399c9",
117+
"connectors": {
118+
"1324967486": {
119+
"FAST": "0xFAB1efe6cA9435faEf9e29f40E575e27A74373A9"
120+
}
121+
}
122+
},
123+
"DEUSD": {
124+
"isAppChain": false,
125+
"NonMintableToken": "0x15700b564ca08d9439c58ca5053166e8317aa138",
126+
"Vault": "0x0b4447344fAAA340bcD2B0FdBD8f0CEcd161bC9E",
127+
"ExecutionHelper": "0x6E2BABf4F6332548f635aD8AE1b044549744a31A",
128+
"LimitExecutionHook": "0x7813664285c811F3B4BC245B5577739290a9Bc12",
129+
"connectors": {
130+
"1324967486": {
131+
"FAST": "0xE88F6b194BD3b43013710A785DDFF41454A19537"
132+
}
133+
}
110134
}
111135
},
112136
"10": {
@@ -594,6 +618,30 @@
594618
"FAST": "0x4f471ff392733b722992F012e40728e36c5e9848"
595619
}
596620
}
621+
},
622+
"SDEUSD": {
623+
"isAppChain": true,
624+
"MintableToken": "0x4D3fEB76ab1C7eF40388Cd7a2066edacE1a2237D",
625+
"Controller": "0xCDb4A30CEBbf9d8C14e4e96fDe6EA7E40c6f3f5B",
626+
"ExecutionHelper": "0x70c46c24f9f923F44278C3B5451986C175c39F73",
627+
"LimitExecutionHook": "0xDbd87a7546b3528741E4d548F2e62dF2962a7c5F",
628+
"connectors": {
629+
"1": {
630+
"FAST": "0x2dc464B4f5Fd55ea19f0bdF71A8dc3584eeb64d7"
631+
}
632+
}
633+
},
634+
"DEUSD": {
635+
"isAppChain": true,
636+
"MintableToken": "0x809B99df4DDd6fA90F2CF305E2cDC310C6AD3C2c",
637+
"Controller": "0x322A8EA44716586b6BB31456055e61B28da4f1C1",
638+
"ExecutionHelper": "0xEB7F89394B325a021259939DA5Ba5EE83984b7F5",
639+
"LimitExecutionHook": "0x13058f01BB8E2A93a600875aBE8647b30BE72765",
640+
"connectors": {
641+
"1": {
642+
"FAST": "0x65ce0D9c5bbF43ee7A6011B3D077DD2FeA6b2726"
643+
}
644+
}
597645
}
598646
}
599647
}

0 commit comments

Comments
 (0)