Skip to content

Commit 317e182

Browse files
0xTimepunk0xTimepunk
committed
fix: payment helper same chain
1 parent 441f822 commit 317e182

File tree

3 files changed

+137
-8
lines changed

3 files changed

+137
-8
lines changed

‎script/utils/misc/run_script_mainnet_paymentHelperV2.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ wait
4646
FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.PaymentHelperV2.s.sol:MainnetDeployPaymentHelperV2 --sig "deployPaymentHelper(uint256,uint256)" 0 6 --rpc-url $BASE_RPC_URL --slow --account defaultKey --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy --broadcast
4747
4848
wait
49-
49+
comment
5050

5151
echo Configuring paymentHelper v2
5252
# at this point the policy should be unblocked in fireblocks for the new contract
@@ -100,6 +100,14 @@ fireblocks-json-rpc --http -- forge script script/forge-scripts/misc/Mainnet.Dep
100100

101101
wait
102102

103+
export FIREBLOCKS_RPC_URL=$FANTOM_RPC_URL
104+
105+
fireblocks-json-rpc --http -- forge script script/forge-scripts/misc/Mainnet.Deploy.PaymentHelperV2.s.sol:MainnetDeployPaymentHelperV2 --sig "configurePaymentHelper(uint256,uint256)" 0 7 \
106+
--rpc-url {} --sender 0xD911673eAF0D3e15fe662D58De15511c5509bAbB --broadcast --unlocked --slow
107+
108+
wait
109+
110+
<<comment
103111
104112
echo Configuring paymentHelper v2 with protocol admin:
105113
@@ -126,5 +134,5 @@ wait
126134
FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.PaymentHelperV2.s.sol:MainnetDeployPaymentHelperV2 --sig "configureSuperRegistry(uint256,uint256)" 0 5 --rpc-url $OPTIMISM_RPC_URL --broadcast --slow --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy
127135
128136
wait
129-
comment
137+
130138
FOUNDRY_PROFILE=production forge script script/forge-scripts/misc/Mainnet.Deploy.PaymentHelperV2.s.sol:MainnetDeployPaymentHelperV2 --sig "configureSuperRegistry(uint256,uint256)" 0 6 --rpc-url $BASE_RPC_URL --broadcast --slow --sender 0x48aB8AdF869Ba9902Ad483FB1Ca2eFDAb6eabe92 --legacy

‎script/utils/verify_contracts.sh

Lines changed: 126 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ networks=(
2121
8453
2222
250
2323
59144
24+
81457
2425
# add more networks here if needed
2526
)
2627

@@ -34,6 +35,7 @@ api_keys=(
3435
$BASESCAN_API_KEY
3536
$FTMSCAN_API_KEY
3637
$LINEASCAN_API_KEY
38+
$BLASTSCAN_API_KEY
3739
# add more API keys here if needed
3840
)
3941

@@ -79,6 +81,40 @@ file_names=(
7981
"src/crosschain-data/adapters/axelar/AxelarImplementation.sol"
8082
"src/RewardsDistributor.sol"
8183
"src/forms/ERC5115Form.sol"
84+
"src/forms/wrappers/ERC5115To4626WrapperFactory.sol"
85+
"src/crosschain-data/adapters/layerzero/LayerzeroImplementation.sol"
86+
# Add more file names here if needed
87+
)
88+
89+
file_name_blast=(
90+
"src/crosschain-data/extensions/CoreStateRegistry.sol"
91+
"src/crosschain-liquidity/DstSwapper.sol"
92+
"script/forge-scripts/misc/blast/forms/BlastERC4626Form.sol"
93+
"src/EmergencyQueue.sol"
94+
"src/crosschain-data/adapters/hyperlane/HyperlaneImplementation.sol"
95+
"src/crosschain-data/adapters/layerzero-v2/LayerzeroV2Implementation.sol"
96+
"src/crosschain-liquidity/lifi/LiFiValidator.sol"
97+
"src/payments/PayMaster.sol"
98+
"src/crosschain-data/utils/PayloadHelper.sol"
99+
"src/payments/PaymentHelper.sol"
100+
"src/crosschain-liquidity/socket/SocketValidator.sol"
101+
"src/SuperformFactory.sol"
102+
"src/SuperformRouter.sol"
103+
"src/crosschain-data/adapters/wormhole/automatic-relayer/WormholeARImplementation.sol"
104+
"src/SuperPositions.sol"
105+
"src/settings/SuperRegistry.sol"
106+
"src/settings/SuperRBAC.sol"
107+
"src/VaultClaimer.sol"
108+
"src/crosschain-data/BroadcastRegistry.sol"
109+
"src/crosschain-data/adapters/wormhole/specialized-relayer/WormholeSRImplementation.sol"
110+
"src/crosschain-liquidity/socket/SocketOneInchValidator.sol"
111+
"src/crosschain-liquidity/1inch/OneInchValidator.sol"
112+
"src/crosschain-liquidity/debridge/DeBridgeForwarderValidator.sol"
113+
"src/crosschain-liquidity/debridge/DeBridgeValidator.sol"
114+
"src/crosschain-data/adapters/axelar/AxelarImplementation.sol"
115+
"src/RewardsDistributor.sol"
116+
"script/forge-scripts/misc/blast/forms/BlastERC5115Form.sol"
117+
"src/forms/wrappers/ERC5115To4626WrapperFactory.sol"
82118
"src/crosschain-data/adapters/layerzero/LayerzeroImplementation.sol"
83119
# Add more file names here if needed
84120
)
@@ -111,6 +147,7 @@ contract_names=(
111147
"AxelarImplementation"
112148
"RewardsDistributor"
113149
"ERC5115Form"
150+
"ERC5115To4626WrapperFactory"
114151
"LayerzeroImplementation"
115152
# Add more contract names here if needed
116153
)
@@ -124,7 +161,7 @@ contract_addresses=(
124161
0x2a14460FEE6f73b408c6acF627190614daC97Df0
125162
0x7fa95363c82b2baceb73627988dc12eeb17e4c2b
126163
0xF1b9e0E57D134B7dFede001ccE5e879D8C2b8C1B
127-
0x92f98d698d2c8E0f29D1bb4d75C3A03e05e811bc
164+
0xAD2b7eD1315330633bc265A0109D3B12D4caed3c
128165
0x69c531E5bdf2458FFb4f5E0dB3DE41745151b2Bd
129166
0x7483486862BDa9BA68Be4923E7E9945c2771Ec28
130167
0xD85ec15A9F814D6173bF1a89273bFB3964aAdaEC
@@ -143,6 +180,7 @@ contract_addresses=(
143180
0xD8d5B00C1c99174897488E3dCa157B6849731E6A
144181
0xce23bD7205bF2B543F6B4eeC00Add0C111FEFc3B
145182
0x35E3057FF29ebC5b8dEF18EC66FEde16f1B237F5
183+
0x664E1e7b8393DF4aC4EFAbEf9d56B2100098FCE2
146184
0xc100592b40eeb4CBC7524092A00400917421ab64
147185
# Add more addresses here if needed
148186
)
@@ -156,7 +194,7 @@ contract_addresses_fantom=(
156194
0xbc558947dd89C72E4e9C3563Cfb637f8bd46CD5c
157195
0xbB7d1453487043Aa8db8512eC22498a8F2fB652B
158196
0xeE8695cDa4697987e1Fcd191F3c69FFF5Ef02eD0
159-
0xEBDf673A9A0c40149641E50244415C67DD2B5CE8
197+
0xf3960a8759A8757E1ED44dC24d5D2dF1394633F5
160198
0xb69929AC813125EdFaCFad366643c3787C0d1500
161199
0xfDf661e1e7e8F617b383516688A8aFC9c6176A04
162200
0xbc85043544CC2b3Fd095d54b6431822979BBB62A
@@ -176,6 +214,73 @@ contract_addresses_fantom=(
176214
0xd6cea5c8853c3fb4bbd77ef5e924c4e647c03a94
177215
0x168EFbe9bc32f1b4FCCbd7B0704331CBacB53e86
178216
0xAcceD01769200d6Fe399b88789FC8a044e094112
217+
0x5757dD91fcFd860aC9b7b036FF1fD3f869827e46
218+
# Add more addresses here if needed
219+
)
220+
221+
contract_addresses_linea=(
222+
0x3721B0E122768CedDfB3Dec810E64c361177f826
223+
0x2691638Fa19357773C186BA34924E194B4Ab6cDa
224+
0x58F8Cef0D825B1a609FaD0576d5F2b7399ab1335
225+
0xE22DCd9264086DF7B26d97A9A9d35e8dFac819dd
226+
0xe6f739F355f9e9e3788752e6cfBB2A6B7b18a13c
227+
0xB07e2B06839ECF55A1E47A52E4A14ba6D6D76fA4
228+
0x717de40D4e360C678aC5e195B99605bc4aAC697E
229+
0x3639492Dc83019EA36899108B4A1A47cC3b3ecAa
230+
0x92f98d698d2c8E0f29D1bb4d75C3A03e05e811bc
231+
0x69c531E5bdf2458FFb4f5E0dB3DE41745151b2Bd
232+
0x7483486862BDa9BA68Be4923E7E9945c2771Ec28
233+
0xD85ec15A9F814D6173bF1a89273bFB3964aAdaEC
234+
0xa195608C2306A26f727d5199D5A382a4508308DA
235+
0xEa3b1027fe6dB0F01aCc73627B47fD4a5a079427
236+
0x01dF6fb6a28a89d6bFa53b2b3F20644AbF417678
237+
0x17A332dC7B40aE701485023b219E9D6f493a2514
238+
0x480bec236e3d3AE33789908BF024850B2Fe71258
239+
0xC4A234A40aC13b02096Dd4aae1b8221541Dc5d5A
240+
0x856ddF6348fFF6B774566cD63f2e8db3796a0965
241+
0x2827eFf89affacf9E80D671bca6DeCf7dbdcCaCa
242+
0x9B1dE8d1Fbf77Ca949f944F718D93fdC48f218C8
243+
0xB2B58dEfa7Dc7e26D21F58847BaEA5A6375eAf8D
244+
0xDEa392D62cA1Edb74FB9210Aed714ad8F12b3E60
245+
0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d
246+
0xbf938adDB48594089B20677931f028261D25D6A2
247+
0xce23bD7205bF2B543F6B4eeC00Add0C111FEFc3B
248+
0x35E3057FF29ebC5b8dEF18EC66FEde16f1B237F5
249+
0x664E1e7b8393DF4aC4EFAbEf9d56B2100098FCE2
250+
0xc100592b40eeb4CBC7524092A00400917421ab64
251+
# Add more addresses here if needed
252+
)
253+
254+
contract_addresses_blast=(
255+
0x3721B0E122768CedDfB3Dec810E64c361177f826
256+
0x2691638Fa19357773C186BA34924E194B4Ab6cDa
257+
0x9dbb4Ca0Ba024cd5efF6401F1d177b9de6A3Fd3E
258+
0xE22DCd9264086DF7B26d97A9A9d35e8dFac819dd
259+
0xe6f739F355f9e9e3788752e6cfBB2A6B7b18a13c
260+
0xB07e2B06839ECF55A1E47A52E4A14ba6D6D76fA4
261+
0x717de40D4e360C678aC5e195B99605bc4aAC697E
262+
0x3639492Dc83019EA36899108B4A1A47cC3b3ecAa
263+
0x92f98d698d2c8E0f29D1bb4d75C3A03e05e811bc
264+
0x69c531E5bdf2458FFb4f5E0dB3DE41745151b2Bd
265+
0x7483486862BDa9BA68Be4923E7E9945c2771Ec28
266+
0xD85ec15A9F814D6173bF1a89273bFB3964aAdaEC
267+
0xa195608C2306A26f727d5199D5A382a4508308DA
268+
0xbe296d633E91BD3E72f52732d80F7b28F18cDB54
269+
0x01dF6fb6a28a89d6bFa53b2b3F20644AbF417678
270+
0x17A332dC7B40aE701485023b219E9D6f493a2514
271+
0x480bec236e3d3AE33789908BF024850B2Fe71258
272+
0xC4A234A40aC13b02096Dd4aae1b8221541Dc5d5A
273+
0x856ddF6348fFF6B774566cD63f2e8db3796a0965
274+
0x2827eFf89affacf9E80D671bca6DeCf7dbdcCaCa
275+
0x9B1dE8d1Fbf77Ca949f944F718D93fdC48f218C8
276+
0xB2B58dEfa7Dc7e26D21F58847BaEA5A6375eAf8D
277+
0xDEa392D62cA1Edb74FB9210Aed714ad8F12b3E60
278+
0x04A9e7318544DA4dd8c3d76E9c72d2087e285a8d
279+
0xbf938adDB48594089B20677931f028261D25D6A2
280+
0xce23bD7205bF2B543F6B4eeC00Add0C111FEFc3B
281+
0x5266958cb4b8E6A1534c6Ac19f4220909cf3F7FA
282+
0x664E1e7b8393DF4aC4EFAbEf9d56B2100098FCE2
283+
0xc100592b40eeb4CBC7524092A00400917421ab64
179284
# Add more addresses here if needed
180285
)
181286

@@ -249,9 +354,12 @@ for i in "${!networks[@]}"; do
249354
# loop through file_names and contract_names
250355
for j in "${!file_names[@]}"; do
251356
file_name="${file_names[$j]}"
357+
file_name_blast="${file_name_blast[$j]}"
252358
contract_name="${contract_names[$j]}"
253359
contract_address="${contract_addresses[$j]}"
254360
contract_address_fantom="${contract_addresses_fantom[$j]}"
361+
contract_address_linea="${contract_addresses_linea[$j]}"
362+
contract_address_blast="${contract_addresses_blast[$j]}"
255363
constructor_arg="${constructor_args[$j]}"
256364
constructor_arg_ftm="${constructor_args_ftm[$j]}"
257365
# verify the contract
@@ -272,6 +380,22 @@ for i in "${!networks[@]}"; do
272380
--constructor-args "$constructor_arg_ftm" \
273381
"$file_name:$contract_name" \
274382
--etherscan-api-key "$api_key"
383+
elif [[ $network == 59144 ]]; then
384+
forge verify-contract $contract_address_linea \
385+
--chain-id $network \
386+
--num-of-optimizations 200 \
387+
--watch --compiler-version v0.8.23+commit.f704f362 \
388+
--constructor-args "$constructor_arg" \
389+
"$file_name:$contract_name" \
390+
--etherscan-api-key "$api_key"
391+
elif [[ $network == 81457 ]]; then
392+
forge verify-contract $contract_address_blast \
393+
--chain-id $network \
394+
--num-of-optimizations 200 \
395+
--watch --compiler-version v0.8.23+commit.f704f362 \
396+
--constructor-args "$constructor_arg" \
397+
"$file_name_blast:$contract_name" \
398+
--etherscan-api-key "$api_key"
275399
else
276400
forge verify-contract $contract_address \
277401
--chain-id $network \

‎test/mainnet/SmokeTest.t.sol

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -500,10 +500,7 @@ contract SmokeTest is MainnetBaseSetup {
500500

501501
for (uint256 j; j < TARGET_DEPLOYMENT_CHAINS.length; ++j) {
502502
if (chainId != TARGET_DEPLOYMENT_CHAINS[j]) {
503-
assertEq(
504-
axelar.authorizedImpl(ambIds_[j]),
505-
getContract(TARGET_DEPLOYMENT_CHAINS[j], "AxelarImplementation")
506-
);
503+
assertEq(axelar.authorizedImpl(ambIds_[j]), address(0xDEAD));
507504
assertEq(axelar.ambChainId(TARGET_DEPLOYMENT_CHAINS[j]), ambIds_[j]);
508505
assertEq(axelar.superChainId(ambIds_[j]), TARGET_DEPLOYMENT_CHAINS[j]);
509506
}

0 commit comments

Comments
 (0)