Skip to content

Commit 3882d5e

Browse files
0xTimepunk0xTimepunk
committed
fix: tenderly scripts
1 parent 7ffdd1c commit 3882d5e

File tree

4 files changed

+87
-96
lines changed

4 files changed

+87
-96
lines changed

‎script/forge-scripts/Abstract.Deploy.Single.s.sol

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ struct SetupVars {
8484
address superPositions;
8585
address superRBAC;
8686
address lifiValidator;
87-
address socketValidator;
8887
address socketOneInchValidator;
8988
address deBridgeValidator;
9089
address deBridgeForwarderValidator;
@@ -178,7 +177,7 @@ abstract contract AbstractDeploySingle is BatchScript {
178177
/// 4 is one inch implementation
179178
/// 5 is debridge implementation
180179
/// 6 is debridge crosschain forwarder
181-
uint8[] public bridgeIds = [101, 2, 3, 4, 5, 6];
180+
uint8[] public bridgeIds = [101, 3, 4, 5, 6];
182181

183182
mapping(uint64 chainId => address[] bridgeAddresses) public BRIDGE_ADDRESSES;
184183

@@ -610,13 +609,10 @@ abstract contract AbstractDeploySingle is BatchScript {
610609
}
611610

612611
bridgeValidators[0] = vars.lifiValidator;
613-
bridgeValidators[1] = vars.socketValidator;
614-
615-
bridgeValidators[2] = vars.socketOneInchValidator;
616-
617-
bridgeValidators[3] = vars.oneInchValidator;
618-
bridgeValidators[4] = vars.deBridgeValidator;
619-
bridgeValidators[5] = vars.deBridgeForwarderValidator;
612+
bridgeValidators[1] = vars.socketOneInchValidator;
613+
bridgeValidators[2] = vars.oneInchValidator;
614+
bridgeValidators[3] = vars.deBridgeValidator;
615+
bridgeValidators[4] = vars.deBridgeForwarderValidator;
620616

621617
/// @dev 7 - Deploy SuperformFactory
622618
vars.factory = address(new SuperformFactory{ salt: salt }(vars.superRegistry));
@@ -1560,7 +1556,6 @@ abstract contract AbstractDeploySingle is BatchScript {
15601556
mapping(uint64 chainId => address[] bridgeAddresses) storage bridgeAddresses = BRIDGE_ADDRESSES;
15611557
bridgeAddresses[ETH] = [
15621558
0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE,
1563-
0xc30141B657f4216252dc59Af2e7CdB9D8792e1B0,
15641559
0x2ddf16BA6d0180e5357d5e170eF1917a01b41fc0,
15651560
0x111111125421cA6dc452d289314280a0f8842A65,
15661561
0xeF4fB24aD0916217251F553c0596F8Edc630EB66,
@@ -1569,39 +1564,34 @@ abstract contract AbstractDeploySingle is BatchScript {
15691564

15701565
bridgeAddresses[BSC] = [
15711566
0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE,
1572-
0xc30141B657f4216252dc59Af2e7CdB9D8792e1B0,
15731567
0xd286595d2e3D879596FAB51f83A702D10a6db27b,
15741568
0x111111125421cA6dc452d289314280a0f8842A65,
15751569
0xeF4fB24aD0916217251F553c0596F8Edc630EB66,
15761570
0x663DC15D3C1aC63ff12E45Ab68FeA3F0a883C251
15771571
];
15781572
bridgeAddresses[AVAX] = [
15791573
0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE,
1580-
0x2b42AFFD4b7C14d9B7C2579229495c052672Ccd3,
15811574
0xbDf50eAe568ECef74796ed6022a0d453e8432410,
15821575
0x111111125421cA6dc452d289314280a0f8842A65,
15831576
0xeF4fB24aD0916217251F553c0596F8Edc630EB66,
15841577
0x663DC15D3C1aC63ff12E45Ab68FeA3F0a883C251
15851578
];
15861579
bridgeAddresses[POLY] = [
15871580
0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE,
1588-
0xc30141B657f4216252dc59Af2e7CdB9D8792e1B0,
15891581
0x2ddf16BA6d0180e5357d5e170eF1917a01b41fc0,
15901582
0x111111125421cA6dc452d289314280a0f8842A65,
15911583
0xeF4fB24aD0916217251F553c0596F8Edc630EB66,
15921584
0x663DC15D3C1aC63ff12E45Ab68FeA3F0a883C251
15931585
];
15941586
bridgeAddresses[ARBI] = [
15951587
0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE,
1596-
0xc30141B657f4216252dc59Af2e7CdB9D8792e1B0,
15971588
0xaa3d9fA3aB930aE635b001d00C612aa5b14d750e,
15981589
0x111111125421cA6dc452d289314280a0f8842A65,
15991590
0xeF4fB24aD0916217251F553c0596F8Edc630EB66,
16001591
0x663DC15D3C1aC63ff12E45Ab68FeA3F0a883C251
16011592
];
16021593
bridgeAddresses[OP] = [
16031594
0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE,
1604-
0xc30141B657f4216252dc59Af2e7CdB9D8792e1B0,
16051595
0xbDf50eAe568ECef74796ed6022a0d453e8432410,
16061596
0x111111125421cA6dc452d289314280a0f8842A65,
16071597
0xeF4fB24aD0916217251F553c0596F8Edc630EB66,
@@ -1610,14 +1600,12 @@ abstract contract AbstractDeploySingle is BatchScript {
16101600
bridgeAddresses[BASE] = [
16111601
0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE,
16121602
address(0),
1613-
address(0),
16141603
0x111111125421cA6dc452d289314280a0f8842A65,
16151604
0xeF4fB24aD0916217251F553c0596F8Edc630EB66,
16161605
0x663DC15D3C1aC63ff12E45Ab68FeA3F0a883C251
16171606
];
16181607
bridgeAddresses[FANTOM] = [
16191608
0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE,
1620-
0xc30141B657f4216252dc59Af2e7CdB9D8792e1B0,
16211609
0x565810cbfa3Cf1390963E5aFa2fB953795686339,
16221610
0x111111125421cA6dc452d289314280a0f8842A65,
16231611
0xeF4fB24aD0916217251F553c0596F8Edc630EB66,
@@ -1627,12 +1615,11 @@ abstract contract AbstractDeploySingle is BatchScript {
16271615
0xDE1E598b81620773454588B85D6b5D4eEC32573e,
16281616
address(0),
16291617
address(0),
1630-
address(0),
16311618
0xeF4fB24aD0916217251F553c0596F8Edc630EB66,
16321619
0x663DC15D3C1aC63ff12E45Ab68FeA3F0a883C251
16331620
];
16341621
bridgeAddresses[BLAST] =
1635-
[0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE, address(0), address(0), address(0), address(0), address(0)];
1622+
[0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE, address(0), address(0), address(0), address(0)];
16361623

16371624
/// price feeds on all chains
16381625
mapping(uint64 => mapping(uint64 => address)) storage priceFeeds = PRICE_FEEDS;

‎script/output/1/Ethereum-latest.json

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,30 @@
11
{
2-
"BroadcastRegistry": "0x0000000000000000000000000000000000000000",
3-
"CoreStateRegistry": "0x0000000000000000000000000000000000000000",
4-
"DeBridgeForwarderValidator": "0xb6f98854Ceb1b65EA4b1D3467ecaD564e0ba4E71",
5-
"DeBridgeValidator": "0x147878930DeffF47fC5Cf4773e9759E3fb741A73",
6-
"DstSwapper": "0x0000000000000000000000000000000000000000",
7-
"ERC4626Form": "0x0000000000000000000000000000000000000000",
8-
"EmergencyQueue": "0x0000000000000000000000000000000000000000",
9-
"HyperlaneImplementation": "0x0000000000000000000000000000000000000000",
10-
"LayerzeroImplementation": "0x0000000000000000000000000000000000000000",
11-
"LiFiValidator": "0x0000000000000000000000000000000000000000",
12-
"PayMaster": "0x0000000000000000000000000000000000000000",
13-
"PayloadHelper": "0x0000000000000000000000000000000000000000",
14-
"PaymentHelper": "0x0000000000000000000000000000000000000000",
15-
"SocketOneInchValidator": "0x0000000000000000000000000000000000000000",
2+
"AxelarImplementation": "0x679Cf01eaF7b48aF3Eb13D8D5dd8E8005675B75D",
3+
"BroadcastRegistry": "0xCEc20ddF2f26a7f2e213B65bBDc3Dba5a94905dB",
4+
"CoreStateRegistry": "0xda4Bc7aD4bfe737f1bAB14E96F345db40A71Ec3D",
5+
"DeBridgeForwarderValidator": "0x33A77A6ac571034579690C2B14dF11E3e803A3AC",
6+
"DeBridgeValidator": "0x4d6bd7F58B111368F7cAa900E25a3Fc345c145e4",
7+
"DstSwapper": "0x0f0f6e8F7Df71f40F76a6085e68cbADfC3693b3c",
8+
"ERC4626Form": "0xBC696200257Aa524DC33daC962609b1cc5829e7f",
9+
"ERC5115Form": "0xE7c419E8697863945498799445EedFb353D3aB7A",
10+
"ERC5115To4626WrapperFactory": "0xC3d2303C2D7BD590786b2a161d16756459814A4F",
11+
"EmergencyQueue": "0x97757B4Fbe27844491cda3B766B2Af2C5FC3CdE5",
12+
"HyperlaneImplementation": "0xA32C38a1F734D40d4293688f2B401A99eE34211c",
13+
"LayerzeroImplementation": "0x05D2543d0b6b50e59f6eB548660289502f6095BE",
14+
"LiFiValidator": "0xF279499555c1F70A1e4412b652c376C881Ad0B89",
15+
"OneInchValidator": "0xf4F2b2d0036C5d9be3ddf86fa188B60C73170280",
16+
"PayMaster": "0xcBB80F21cE80877EA652BceF97821D7883A219e9",
17+
"PayloadHelper": "0x89e7F61E97fd5E30B58640ea48FE9109F5434aA2",
18+
"PaymentHelper": "0xEdA1ca7339547589Df09544303dB13328A4c2517",
19+
"RewardsDistributor": "0xBee4aa07Dee132B76d195Bb00eeB7F7B360d2afd",
20+
"SocketOneInchValidator": "0xB0F404e09F4D9660970bE7780Bb453ba4E161F96",
1621
"SocketValidator": "0x0000000000000000000000000000000000000000",
17-
"SuperPositions": "0x0000000000000000000000000000000000000000",
18-
"SuperRBAC": "0x0000000000000000000000000000000000000000",
19-
"SuperRegistry": "0x0000000000000000000000000000000000000000",
20-
"SuperformFactory": "0x0000000000000000000000000000000000000000",
21-
"SuperformRouter": "0x0000000000000000000000000000000000000000",
22-
"VaultClaimer": "0x0000000000000000000000000000000000000000",
23-
"WormholeARImplementation": "0x0000000000000000000000000000000000000000",
24-
"WormholeSRImplementation": "0x0000000000000000000000000000000000000000",
25-
"RewardsDistributor": "0xce23bD7205bF2B543F6B4eeC00Add0C111FEFc3B"
22+
"SuperPositions": "0x24Bc1C19781a1Bbf5A37b0E1A5F79aac75AF6467",
23+
"SuperRBAC": "0xAEb63A3199d2CB3B2812BBD1dc6Ef62f12182E5d",
24+
"SuperRegistry": "0xD678fDdf21eA7b6722115cb9edBDDC8CF2BFb7d7",
25+
"SuperformFactory": "0xC8E70Ef21FaB64B321E8Aea0Ed1fda4eC481Ea24",
26+
"SuperformRouter": "0x229C2Cd1C67c1b7ab2D6A07718DC622b6EC3d408",
27+
"VaultClaimer": "0x36B20e607eDC57da1bcd0475831150E475F58d70",
28+
"WormholeARImplementation": "0x7E76F8602194811eA4E1d36d570b5c3c2C6dd3c2",
29+
"WormholeSRImplementation": "0x802e93000D4F89A5B3c1D30b0D426bB7bCe3084C"
2630
}

‎script/output/10/Optimism-latest.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
{
2-
"AxelarImplementation": "0x0000000000000000000000000000000000000000",
3-
"BroadcastRegistry": "0x0000000000000000000000000000000000000000",
4-
"CoreStateRegistry": "0x0000000000000000000000000000000000000000",
5-
"DeBridgeForwarderValidator": "0x0000000000000000000000000000000000000000",
6-
"DeBridgeValidator": "0x0000000000000000000000000000000000000000",
7-
"DstSwapper": "0x0000000000000000000000000000000000000000",
8-
"ERC4626Form": "0x0000000000000000000000000000000000000000",
9-
"ERC5115Form": "0x0000000000000000000000000000000000000000",
10-
"ERC5115To4626WrapperFactory": "0x14Bc2728DaE89FE7c828833a186DdC5E9AE439C3",
11-
"EmergencyQueue": "0x0000000000000000000000000000000000000000",
12-
"HyperlaneImplementation": "0x0000000000000000000000000000000000000000",
13-
"LayerzeroImplementation": "0x0000000000000000000000000000000000000000",
14-
"LiFiValidator": "0x0000000000000000000000000000000000000000",
15-
"OneInchValidator": "0x0000000000000000000000000000000000000000",
16-
"PayMaster": "0x0000000000000000000000000000000000000000",
17-
"PayloadHelper": "0x0000000000000000000000000000000000000000",
18-
"PaymentHelper": "0x0000000000000000000000000000000000000000",
19-
"RewardsDistributor": "0x0000000000000000000000000000000000000000",
20-
"SocketOneInchValidator": "0x0000000000000000000000000000000000000000",
2+
"AxelarImplementation": "0x679Cf01eaF7b48aF3Eb13D8D5dd8E8005675B75D",
3+
"BroadcastRegistry": "0xCEc20ddF2f26a7f2e213B65bBDc3Dba5a94905dB",
4+
"CoreStateRegistry": "0xda4Bc7aD4bfe737f1bAB14E96F345db40A71Ec3D",
5+
"DeBridgeForwarderValidator": "0x33A77A6ac571034579690C2B14dF11E3e803A3AC",
6+
"DeBridgeValidator": "0x4d6bd7F58B111368F7cAa900E25a3Fc345c145e4",
7+
"DstSwapper": "0x0f0f6e8F7Df71f40F76a6085e68cbADfC3693b3c",
8+
"ERC4626Form": "0xBC696200257Aa524DC33daC962609b1cc5829e7f",
9+
"ERC5115Form": "0xE7c419E8697863945498799445EedFb353D3aB7A",
10+
"ERC5115To4626WrapperFactory": "0xC3d2303C2D7BD590786b2a161d16756459814A4F",
11+
"EmergencyQueue": "0x97757B4Fbe27844491cda3B766B2Af2C5FC3CdE5",
12+
"HyperlaneImplementation": "0xA32C38a1F734D40d4293688f2B401A99eE34211c",
13+
"LayerzeroImplementation": "0x05D2543d0b6b50e59f6eB548660289502f6095BE",
14+
"LiFiValidator": "0xF279499555c1F70A1e4412b652c376C881Ad0B89",
15+
"OneInchValidator": "0xf4F2b2d0036C5d9be3ddf86fa188B60C73170280",
16+
"PayMaster": "0xcBB80F21cE80877EA652BceF97821D7883A219e9",
17+
"PayloadHelper": "0x89e7F61E97fd5E30B58640ea48FE9109F5434aA2",
18+
"PaymentHelper": "0xEdA1ca7339547589Df09544303dB13328A4c2517",
19+
"RewardsDistributor": "0xBee4aa07Dee132B76d195Bb00eeB7F7B360d2afd",
20+
"SocketOneInchValidator": "0xB0F404e09F4D9660970bE7780Bb453ba4E161F96",
2121
"SocketValidator": "0x0000000000000000000000000000000000000000",
22-
"SuperPositions": "0x0000000000000000000000000000000000000000",
23-
"SuperRBAC": "0x0000000000000000000000000000000000000000",
24-
"SuperRegistry": "0x0000000000000000000000000000000000000000",
25-
"SuperformFactory": "0x0000000000000000000000000000000000000000",
26-
"SuperformRouter": "0x0000000000000000000000000000000000000000",
27-
"VaultClaimer": "0x0000000000000000000000000000000000000000",
28-
"WormholeARImplementation": "0x0000000000000000000000000000000000000000",
29-
"WormholeSRImplementation": "0x0000000000000000000000000000000000000000"
22+
"SuperPositions": "0x24Bc1C19781a1Bbf5A37b0E1A5F79aac75AF6467",
23+
"SuperRBAC": "0xAEb63A3199d2CB3B2812BBD1dc6Ef62f12182E5d",
24+
"SuperRegistry": "0xD678fDdf21eA7b6722115cb9edBDDC8CF2BFb7d7",
25+
"SuperformFactory": "0xC8E70Ef21FaB64B321E8Aea0Ed1fda4eC481Ea24",
26+
"SuperformRouter": "0x229C2Cd1C67c1b7ab2D6A07718DC622b6EC3d408",
27+
"VaultClaimer": "0x36B20e607eDC57da1bcd0475831150E475F58d70",
28+
"WormholeARImplementation": "0x7E76F8602194811eA4E1d36d570b5c3c2C6dd3c2",
29+
"WormholeSRImplementation": "0x802e93000D4F89A5B3c1D30b0D426bB7bCe3084C"
3030
}

‎script/output/42161/Arbitrum-latest.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
{
2-
"AxelarImplementation": "0x0000000000000000000000000000000000000000",
3-
"BroadcastRegistry": "0x0000000000000000000000000000000000000000",
4-
"CoreStateRegistry": "0x0000000000000000000000000000000000000000",
5-
"DeBridgeForwarderValidator": "0x0000000000000000000000000000000000000000",
6-
"DeBridgeValidator": "0x0000000000000000000000000000000000000000",
7-
"DstSwapper": "0x0000000000000000000000000000000000000000",
8-
"ERC4626Form": "0x0000000000000000000000000000000000000000",
9-
"ERC5115Form": "0x0000000000000000000000000000000000000000",
10-
"ERC5115To4626WrapperFactory": "0x14Bc2728DaE89FE7c828833a186DdC5E9AE439C3",
11-
"EmergencyQueue": "0x0000000000000000000000000000000000000000",
12-
"HyperlaneImplementation": "0x0000000000000000000000000000000000000000",
13-
"LayerzeroImplementation": "0x0000000000000000000000000000000000000000",
14-
"LiFiValidator": "0x0000000000000000000000000000000000000000",
15-
"OneInchValidator": "0x0000000000000000000000000000000000000000",
16-
"PayMaster": "0x0000000000000000000000000000000000000000",
17-
"PayloadHelper": "0x0000000000000000000000000000000000000000",
18-
"PaymentHelper": "0x0000000000000000000000000000000000000000",
19-
"RewardsDistributor": "0x0000000000000000000000000000000000000000",
20-
"SocketOneInchValidator": "0x0000000000000000000000000000000000000000",
2+
"AxelarImplementation": "0x679Cf01eaF7b48aF3Eb13D8D5dd8E8005675B75D",
3+
"BroadcastRegistry": "0xCEc20ddF2f26a7f2e213B65bBDc3Dba5a94905dB",
4+
"CoreStateRegistry": "0xda4Bc7aD4bfe737f1bAB14E96F345db40A71Ec3D",
5+
"DeBridgeForwarderValidator": "0x33A77A6ac571034579690C2B14dF11E3e803A3AC",
6+
"DeBridgeValidator": "0x4d6bd7F58B111368F7cAa900E25a3Fc345c145e4",
7+
"DstSwapper": "0x0f0f6e8F7Df71f40F76a6085e68cbADfC3693b3c",
8+
"ERC4626Form": "0xBC696200257Aa524DC33daC962609b1cc5829e7f",
9+
"ERC5115Form": "0xE7c419E8697863945498799445EedFb353D3aB7A",
10+
"ERC5115To4626WrapperFactory": "0xC3d2303C2D7BD590786b2a161d16756459814A4F",
11+
"EmergencyQueue": "0x97757B4Fbe27844491cda3B766B2Af2C5FC3CdE5",
12+
"HyperlaneImplementation": "0xA32C38a1F734D40d4293688f2B401A99eE34211c",
13+
"LayerzeroImplementation": "0x05D2543d0b6b50e59f6eB548660289502f6095BE",
14+
"LiFiValidator": "0xF279499555c1F70A1e4412b652c376C881Ad0B89",
15+
"OneInchValidator": "0xf4F2b2d0036C5d9be3ddf86fa188B60C73170280",
16+
"PayMaster": "0xcBB80F21cE80877EA652BceF97821D7883A219e9",
17+
"PayloadHelper": "0x89e7F61E97fd5E30B58640ea48FE9109F5434aA2",
18+
"PaymentHelper": "0xEdA1ca7339547589Df09544303dB13328A4c2517",
19+
"RewardsDistributor": "0xBee4aa07Dee132B76d195Bb00eeB7F7B360d2afd",
20+
"SocketOneInchValidator": "0xB0F404e09F4D9660970bE7780Bb453ba4E161F96",
2121
"SocketValidator": "0x0000000000000000000000000000000000000000",
22-
"SuperPositions": "0x0000000000000000000000000000000000000000",
23-
"SuperRBAC": "0x0000000000000000000000000000000000000000",
24-
"SuperRegistry": "0x0000000000000000000000000000000000000000",
25-
"SuperformFactory": "0x0000000000000000000000000000000000000000",
26-
"SuperformRouter": "0x0000000000000000000000000000000000000000",
27-
"VaultClaimer": "0x0000000000000000000000000000000000000000",
28-
"WormholeARImplementation": "0x0000000000000000000000000000000000000000",
29-
"WormholeSRImplementation": "0x0000000000000000000000000000000000000000"
22+
"SuperPositions": "0x24Bc1C19781a1Bbf5A37b0E1A5F79aac75AF6467",
23+
"SuperRBAC": "0xAEb63A3199d2CB3B2812BBD1dc6Ef62f12182E5d",
24+
"SuperRegistry": "0xD678fDdf21eA7b6722115cb9edBDDC8CF2BFb7d7",
25+
"SuperformFactory": "0xC8E70Ef21FaB64B321E8Aea0Ed1fda4eC481Ea24",
26+
"SuperformRouter": "0x229C2Cd1C67c1b7ab2D6A07718DC622b6EC3d408",
27+
"VaultClaimer": "0x36B20e607eDC57da1bcd0475831150E475F58d70",
28+
"WormholeARImplementation": "0x7E76F8602194811eA4E1d36d570b5c3c2C6dd3c2",
29+
"WormholeSRImplementation": "0x802e93000D4F89A5B3c1D30b0D426bB7bCe3084C"
3030
}

0 commit comments

Comments
 (0)