Skip to content

Commit 55c35a0

Browse files
committed
cleanup
Signed-off-by: Ihor Farion <ihor@umaproject.org>
1 parent 53f74ae commit 55c35a0

File tree

10 files changed

+46
-152
lines changed

10 files changed

+46
-152
lines changed

broadcast/113DeploySponsoredCCTPSrcPeriphery.sol/42161/run-latest.json

Lines changed: 25 additions & 25 deletions
Large diffs are not rendered by default.

broadcast/deployed-addresses.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -770,9 +770,9 @@
770770
"transaction_hash": "0x3a645809d7a2d2a0176afc87f8e565419f94547c9b1521b537b6f233c3bb412c"
771771
},
772772
"SponsoredCCTPSrcPeriphery": {
773-
"address": "0xaa4958efa0cf6ddd87e354a90785f1d7291a82c7",
774-
"block_number": 411061877,
775-
"transaction_hash": "0x7ec8dc5fcf19334a4b6ef26fe67bdfaf36c934d3748f3e694ac8a7c3d6f4e533"
773+
"address": "0xce1ffe01ebb4f8521c12e74363a396ee3d337e1b",
774+
"block_number": 406495696,
775+
"transaction_hash": "0x6c4f6d7537530911757ecc317e0b5a39b5caf7089ab5549cb4299c830a9d854c"
776776
},
777777
"SponsoredOFTSrcPeriphery": {
778778
"address": "0x2ac5ee3796e027da274fbde84c82173a65868940",

broadcast/deployed-addresses.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ This file contains the latest deployed smart contract addresses from the broadca
245245
| SpokePool | [0xe35e9842fceaCA96570B734083f4a58e8F7C5f2A](https://arbiscan.io/address/0xe35e9842fceaCA96570B734083f4a58e8F7C5f2A) |
246246
| SpokePoolPeriphery | [0x89415a82d909a7238d69094C3Dd1dCC1aCbDa85C](https://arbiscan.io/address/0x89415a82d909a7238d69094C3Dd1dCC1aCbDa85C) |
247247
| SpokePoolVerifier | [0x3Fb9cED51E968594C87963a371Ed90c39519f65A](https://arbiscan.io/address/0x3Fb9cED51E968594C87963a371Ed90c39519f65A) |
248-
| SponsoredCCTPSrcPeriphery | [0xAA4958EFa0Cf6DdD87e354a90785f1D7291a82c7](https://arbiscan.io/address/0xAA4958EFa0Cf6DdD87e354a90785f1D7291a82c7) |
248+
| SponsoredCCTPSrcPeriphery | [0xce1FFE01eBB4f8521C12e74363A396ee3d337E1B](https://arbiscan.io/address/0xce1FFE01eBB4f8521C12e74363A396ee3d337E1B) |
249249
| SponsoredOFTSrcPeriphery | [0x2ac5Ee3796E027dA274fbDe84c82173a65868940](https://arbiscan.io/address/0x2ac5Ee3796E027dA274fbDe84c82173a65868940) |
250250
| UniswapV3_SwapAndBridge | [0xF633b72A4C2Fb73b77A379bf72864A825aD35b6D](https://arbiscan.io/address/0xF633b72A4C2Fb73b77A379bf72864A825aD35b6D) |
251251

script/mintburn/DeployPermissionedMulticallHandler.s.sol renamed to script/DeployPermissionedMulticallHandler.s.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ pragma solidity ^0.8.0;
44
import { Script } from "forge-std/Script.sol";
55
import { console } from "forge-std/console.sol";
66

7-
import { PermissionedMulticallHandler } from "../../contracts/handlers/PermissionedMulticallHandler.sol";
7+
import { PermissionedMulticallHandler } from "../contracts/handlers/PermissionedMulticallHandler.sol";
88

9-
// Deploy: forge script script/mintburn/DeployPermissionedMulticallHandler.s.sol:DeployPermissionedMulticallHandler --rpc-url <network> -vvvv --broadcast
9+
// Deploy: forge script script/DeployPermissionedMulticallHandler.s.sol:DeployPermissionedMulticallHandler --rpc-url <network> -vvvv --broadcast --verify
1010
contract DeployPermissionedMulticallHandler is Script {
1111
function run() external {
1212
console.log("Deploying PermissionedMulticallHandler...");

script/mintburn/ApproveZkLighterMaxUSDCFromMulticallHandler.s.sol

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
1010
import { PermissionedMulticallHandler } from "../../contracts/handlers/PermissionedMulticallHandler.sol";
1111
import { MulticallHandler } from "../../contracts/handlers/MulticallHandler.sol";
1212

13-
/// @notice Approves zkLighter to spend USDC from the deployed MulticallHandler by having the handler call USDC.approve().
14-
/// @dev Requires msg.sender (broadcast signer) to be whitelisted on PermissionedMulticallHandler.
15-
1613
/**
14+
Approves zkLighter to spend USDC from the deployed PermissionedMulticallHandler by having the handler call USDC.approve().
15+
Requires msg.sender (broadcast signer) to be whitelisted on PermissionedMulticallHandler.
16+
17+
@notice This script makes sense only with PermissionedMulticallHandler, with the API controlling what functions can be called
18+
as a part of custom EVM execution. Otherwise, anyone can rescind the approval
19+
1720
Run:
1821
forge script script/mintburn/ApproveZkLighterMaxUSDCFromMulticallHandler.s.sol:ApproveZkLighterMaxUSDCFromMulticallHandler \
1922
--rpc-url <network> -vvvv --broadcast
@@ -28,7 +31,7 @@ contract ApproveZkLighterMaxUSDCFromMulticallHandler is Script, Config {
2831
address deployer = vm.addr(pk);
2932
console.log("Deployer:", deployer);
3033

31-
_loadConfig("./script/mintburn/cctp/configLighter.toml", false);
34+
_loadConfig("./script/mintburn/cctp/config.toml", false);
3235

3336
address usdc = config.get("usdc").toAddress();
3437
address zkLighter = config.get("zkLighter").toAddress();

script/mintburn/cctp/113DeploySponsoredCCTPSrcPeriphery.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ contract DeploySponsoredCCTPSrcPeriphery is DeploymentUtils {
1616
uint256 deployerPrivateKey = vm.deriveKey(deployerMnemonic, 0);
1717
address deployer = vm.addr(deployerPrivateKey);
1818

19-
_loadConfig("./script/mintburn/cctp/configLighter.toml", true);
19+
_loadConfig("./script/mintburn/cctp/config.toml", true);
2020

2121
address cctpTokenMessenger = config.get("cctpTokenMessenger").toAddress();
2222
uint32 sourceDomain = config.get("cctpDomainId").toUint32();

script/mintburn/cctp/114DeploySponsoredCCTPDstPeriphery.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ contract DeploySponsoredCCTPDstPeriphery is DeploymentUtils {
1717
uint256 deployerPrivateKey = vm.deriveKey(deployerMnemonic, 0);
1818
address deployer = vm.addr(deployerPrivateKey);
1919

20-
_loadConfig("./script/mintburn/cctp/configLighter.toml", true);
20+
_loadConfig("./script/mintburn/cctp/config.toml", true);
2121

2222
address cctpMessageTransmitter = config.get("cctpMessageTransmitter").toAddress();
2323

script/mintburn/cctp/config.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ endpoint_url = "${NODE_URL_1}"
55
sponsoredCCTPSrcPeriphery = "0x89004EA51Bac007FEc55976967135b2Aa6e838d4"
66
cctpTokenMessenger = "0x28b5a0e9C621a5BadaA536219b3a228C8168cf5d"
77
usdc = "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
8+
cctpMessageTransmitter = "0x81D40F21F12A8F0E3252Bccb954D722d4c464B64"
9+
baseToken = "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
10+
sponsoredCCTPDstPeriphery = "0x5616194d65638086a3191B1fEF436f503ff329eC"
11+
multicallHandler = "0x64a43393866DBA0044879979fAa7AD3d000622e9"
12+
zkLighter = "0x3B4D794a66304F130a4Db8F2551B0070dfCf5ca7"
813

914
[mainnet.uint]
1015
cctpDomainId = 0

script/mintburn/cctp/configLighter.toml

Lines changed: 0 additions & 114 deletions
This file was deleted.

script/mintburn/cctp/createLighterDeposit.s.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ contract CreateLighterDeposit is Script, Config {
4040
address deployer = vm.addr(deployerPrivateKey);
4141

4242
// Load config and create forks for all chains
43-
_loadConfigAndForks("./script/mintburn/cctp/configLighter.toml", false);
43+
_loadConfigAndForks("./script/mintburn/cctp/config.toml", false);
4444

4545
// Resolve environment from source and destination chains
4646
DepositEnv memory env = _resolveEnv();

0 commit comments

Comments
 (0)