From 6a0f39443f8006508300eb970ce267765fb04786 Mon Sep 17 00:00:00 2001 From: Jeffery Walsh Date: Tue, 2 Jul 2024 19:18:31 -0700 Subject: [PATCH 1/4] rm unused stuff --- packages/protocol/genesis/test_config.js | 8 +- packages/protocol/script/DeployOnL1.s.sol | 180 +++++++++++----------- packages/protocol/tsconfig.json | 12 ++ 3 files changed, 109 insertions(+), 91 deletions(-) create mode 100644 packages/protocol/tsconfig.json diff --git a/packages/protocol/genesis/test_config.js b/packages/protocol/genesis/test_config.js index 4363719364..5279017400 100644 --- a/packages/protocol/genesis/test_config.js +++ b/packages/protocol/genesis/test_config.js @@ -2,9 +2,9 @@ const ADDRESS_LENGTH = 40; module.exports = { - contractOwner: "0x70997970C51812dc3A010C7d01b50e0d17dc79C8", - l1ChainId: 1, - chainId: 167, + contractOwner: "0x91c34396e640e3bB4eE80f2e523c23dDa2b3f78F", + l1ChainId: 7014190335, + chainId: 167010, seedAccounts: [ { "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266": 1024, @@ -76,7 +76,7 @@ module.exports = { "0x9eAF5590f2c84912A08de97FA28d0529361Deb9E": 1024, }, { - "0x1003ff39d25F2Ab16dBCc18EcE05a9B6154f65F4": 1024, + "0x91c34396e640e3bB4eE80f2e523c23dDa2b3f78F": 1024, }, ], get contractAddresses() { diff --git a/packages/protocol/script/DeployOnL1.s.sol b/packages/protocol/script/DeployOnL1.s.sol index 5d9458567c..7e06a6a45b 100644 --- a/packages/protocol/script/DeployOnL1.s.sol +++ b/packages/protocol/script/DeployOnL1.s.sol @@ -146,7 +146,7 @@ contract DeployOnL1 is DeployCapability { impl: address(new TaikoToken()), data: abi.encodeCall( TaikoToken.init, (owner, vm.envAddress("TAIKO_TOKEN_PREMINT_RECIPIENT")) - ), + ), registerTo: sharedAddressManager }); } @@ -159,69 +159,74 @@ contract DeployOnL1 is DeployCapability { registerTo: sharedAddressManager }); - address brdige = deployProxy({ - name: "bridge", - impl: address(new Bridge()), - data: abi.encodeCall(Bridge.init, (address(0), sharedAddressManager)), - registerTo: sharedAddressManager - }); - - if (vm.envBool("PAUSE_BRIDGE")) { - Bridge(payable(brdige)).pause(); - } - - Bridge(payable(brdige)).transferOwnership(owner); - - console2.log("------------------------------------------"); - console2.log( - "Warning - you need to register *all* counterparty bridges to enable multi-hop bridging:" - ); - console2.log( - "sharedAddressManager.setAddress(remoteChainId, \"bridge\", address(remoteBridge))" - ); - console2.log("- sharedAddressManager : ", sharedAddressManager); + // address brdige = deployProxy({ + // name: "bridge", + // impl: address(new Bridge()), + // data: abi.encodeCall(Bridge.init, (address(0), sharedAddressManager)), + // registerTo: sharedAddressManager + // }); + + // if (vm.envBool("PAUSE_BRIDGE")) { + // Bridge(payable(brdige)).pause(); + // } + + // Bridge(payable(brdige)).transferOwnership(owner); + + // console2.log("------------------------------------------"); + // console2.log( + // "Warning - you need to register *all* counterparty bridges to enable multi-hop + // bridging:" + // ); + // console2.log( + // "sharedAddressManager.setAddress(remoteChainId, \"bridge\", address(remoteBridge))" + // ); + // console2.log("- sharedAddressManager : ", sharedAddressManager); // Deploy Vaults - deployProxy({ - name: "erc20_vault", - impl: address(new ERC20Vault()), - data: abi.encodeCall(ERC20Vault.init, (owner, sharedAddressManager)), - registerTo: sharedAddressManager - }); - - deployProxy({ - name: "erc721_vault", - impl: address(new ERC721Vault()), - data: abi.encodeCall(ERC721Vault.init, (owner, sharedAddressManager)), - registerTo: sharedAddressManager - }); - - deployProxy({ - name: "erc1155_vault", - impl: address(new ERC1155Vault()), - data: abi.encodeCall(ERC1155Vault.init, (owner, sharedAddressManager)), - registerTo: sharedAddressManager - }); - - console2.log("------------------------------------------"); - console2.log( - "Warning - you need to register *all* counterparty vaults to enable multi-hop bridging:" - ); - console2.log( - "sharedAddressManager.setAddress(remoteChainId, \"erc20_vault\", address(remoteERC20Vault))" - ); - console2.log( - "sharedAddressManager.setAddress(remoteChainId, \"erc721_vault\", address(remoteERC721Vault))" - ); - console2.log( - "sharedAddressManager.setAddress(remoteChainId, \"erc1155_vault\", address(remoteERC1155Vault))" - ); - console2.log("- sharedAddressManager : ", sharedAddressManager); - - // Deploy Bridged token implementations - register(sharedAddressManager, "bridged_erc20", address(new BridgedERC20())); - register(sharedAddressManager, "bridged_erc721", address(new BridgedERC721())); - register(sharedAddressManager, "bridged_erc1155", address(new BridgedERC1155())); + // deployProxy({ + // name: "erc20_vault", + // impl: address(new ERC20Vault()), + // data: abi.encodeCall(ERC20Vault.init, (owner, sharedAddressManager)), + // registerTo: sharedAddressManager + // }); + + // deployProxy({ + // name: "erc721_vault", + // impl: address(new ERC721Vault()), + // data: abi.encodeCall(ERC721Vault.init, (owner, sharedAddressManager)), + // registerTo: sharedAddressManager + // }); + + // deployProxy({ + // name: "erc1155_vault", + // impl: address(new ERC1155Vault()), + // data: abi.encodeCall(ERC1155Vault.init, (owner, sharedAddressManager)), + // registerTo: sharedAddressManager + // }); + + // console2.log("------------------------------------------"); + // console2.log( + // "Warning - you need to register *all* counterparty vaults to enable multi-hop + // bridging:" + // ); + // console2.log( + // "sharedAddressManager.setAddress(remoteChainId, \"erc20_vault\", + // address(remoteERC20Vault))" + // ); + // console2.log( + // "sharedAddressManager.setAddress(remoteChainId, \"erc721_vault\", + // address(remoteERC721Vault))" + // ); + // console2.log( + // "sharedAddressManager.setAddress(remoteChainId, \"erc1155_vault\", + // address(remoteERC1155Vault))" + // ); + // console2.log("- sharedAddressManager : ", sharedAddressManager); + + // // Deploy Bridged token implementations + // register(sharedAddressManager, "bridged_erc20", address(new BridgedERC20())); + // register(sharedAddressManager, "bridged_erc721", address(new BridgedERC721())); + // register(sharedAddressManager, "bridged_erc1155", address(new BridgedERC1155())); } function deployRollupContracts( @@ -257,7 +262,7 @@ contract DeployOnL1 is DeployCapability { vm.envBytes32("L2_GENESIS_HASH"), vm.envBool("PAUSE_TAIKO_L1") ) - ), + ), registerTo: rollupAddressManager }); @@ -306,32 +311,33 @@ contract DeployOnL1 is DeployCapability { // No need to proxy these, because they are 3rd party. If we want to modify, we simply // change the registerAddress("automata_dcap_attestation", address(attestation)); - P256Verifier p256Verifier = new P256Verifier(); - SigVerifyLib sigVerifyLib = new SigVerifyLib(address(p256Verifier)); - PEMCertChainLib pemCertChainLib = new PEMCertChainLib(); - address automateDcapV3AttestationImpl = address(new AutomataDcapV3Attestation()); - - address automataProxy = deployProxy({ - name: "automata_dcap_attestation", - impl: automateDcapV3AttestationImpl, - data: abi.encodeCall( - AutomataDcapV3Attestation.init, (owner, address(sigVerifyLib), address(pemCertChainLib)) - ), - registerTo: rollupAddressManager - }); + // P256Verifier p256Verifier = new P256Verifier(); + // SigVerifyLib sigVerifyLib = new SigVerifyLib(address(p256Verifier)); + // PEMCertChainLib pemCertChainLib = new PEMCertChainLib(); + // address automateDcapV3AttestationImpl = address(new AutomataDcapV3Attestation()); + + // address automataProxy = deployProxy({ + // name: "automata_dcap_attestation", + // impl: automateDcapV3AttestationImpl, + // data: abi.encodeCall( + // AutomataDcapV3Attestation.init, (owner, address(sigVerifyLib), + // address(pemCertChainLib)) + // ), + // registerTo: rollupAddressManager + // }); // Log addresses for the user to register sgx instance - console2.log("SigVerifyLib", address(sigVerifyLib)); - console2.log("PemCertChainLib", address(pemCertChainLib)); - console2.log("AutomataDcapVaAttestation", automataProxy); - - deployProxy({ - name: "prover_set", - impl: address(new ProverSet()), - data: abi.encodeCall( - ProverSet.init, (owner, vm.envAddress("PROVER_SET_ADMIN"), rollupAddressManager) - ) - }); + // console2.log("SigVerifyLib", address(sigVerifyLib)); + // console2.log("PemCertChainLib", address(pemCertChainLib)); + // console2.log("AutomataDcapVaAttestation", automataProxy); + + // deployProxy({ + // name: "prover_set", + // impl: address(new ProverSet()), + // data: abi.encodeCall( + // ProverSet.init, (owner, vm.envAddress("PROVER_SET_ADMIN"), rollupAddressManager) + // ) + // }); address sequencerRegistryProxy = deployProxy({ name: "sequencer_registry", diff --git a/packages/protocol/tsconfig.json b/packages/protocol/tsconfig.json new file mode 100644 index 0000000000..ab68f56d56 --- /dev/null +++ b/packages/protocol/tsconfig.json @@ -0,0 +1,12 @@ +{ + "compilerOptions": { + "target": "es6", + "module": "commonjs", + "lib": ["es6"], + "types": ["node"], + "moduleResolution": "node", + "esModuleInterop": true + }, + "include": ["utils/**/*.ts"], + "exclude": ["node_modules"] +} From f4e602a8e946e511373aaed61e0274fbbbd40104 Mon Sep 17 00:00:00 2001 From: cyberhorsey Date: Wed, 3 Jul 2024 02:23:59 +0000 Subject: [PATCH 2/4] forge fmt & update contract layout table --- packages/protocol/script/DeployOnL1.s.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/protocol/script/DeployOnL1.s.sol b/packages/protocol/script/DeployOnL1.s.sol index 7e06a6a45b..0044f581f1 100644 --- a/packages/protocol/script/DeployOnL1.s.sol +++ b/packages/protocol/script/DeployOnL1.s.sol @@ -146,7 +146,7 @@ contract DeployOnL1 is DeployCapability { impl: address(new TaikoToken()), data: abi.encodeCall( TaikoToken.init, (owner, vm.envAddress("TAIKO_TOKEN_PREMINT_RECIPIENT")) - ), + ), registerTo: sharedAddressManager }); } @@ -262,7 +262,7 @@ contract DeployOnL1 is DeployCapability { vm.envBytes32("L2_GENESIS_HASH"), vm.envBool("PAUSE_TAIKO_L1") ) - ), + ), registerTo: rollupAddressManager }); From 63ba19399115eb2d7fb6d24b30a72f3f746e80a9 Mon Sep 17 00:00:00 2001 From: Jeffery Walsh Date: Tue, 2 Jul 2024 19:34:22 -0700 Subject: [PATCH 3/4] rm bridge copy --- packages/protocol/contracts/L1/TaikoData.sol | 2 +- packages/protocol/script/DeployERC20Airdrop.s.sol | 2 +- packages/protocol/script/DeployOnL1.s.sol | 2 +- packages/protocol/script/tokenunlock/Deploy.s.sol | 2 +- packages/protocol/test/L2/DelegateOwner.t.sol | 2 +- packages/protocol/test/L2/TaikoL2.t.sol | 2 +- packages/protocol/test/L2/TaikoL2NoFeeCheck.t.sol | 2 +- .../test/automata-attestation/common/AttestationBase.t.sol | 2 +- packages/protocol/test/team/airdrop/ERC20Airdrop.t.sol | 4 ++-- packages/protocol/test/tokenvault/BridgedERC20.t.sol | 2 +- packages/protocol/test/tokenvault/ERC20Vault.t.sol | 6 +++--- packages/protocol/test/verifiers/RiscZeroVerifier.t.sol | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/protocol/contracts/L1/TaikoData.sol b/packages/protocol/contracts/L1/TaikoData.sol index fed50fcb6a..924571cdb7 100644 --- a/packages/protocol/contracts/L1/TaikoData.sol +++ b/packages/protocol/contracts/L1/TaikoData.sol @@ -174,7 +174,7 @@ library TaikoData { mapping( uint64 blockId_mod_blockRingBufferSize => mapping(uint32 transitionId => TransitionState ts) - ) transitions; + ) transitions; // Ring buffer for Ether deposits bytes32 __reserve1; SlotA slotA; // slot 5 diff --git a/packages/protocol/script/DeployERC20Airdrop.s.sol b/packages/protocol/script/DeployERC20Airdrop.s.sol index 70d0f7f3d4..cd640a0239 100644 --- a/packages/protocol/script/DeployERC20Airdrop.s.sol +++ b/packages/protocol/script/DeployERC20Airdrop.s.sol @@ -37,7 +37,7 @@ contract DeployERC20Airdrop is DeployCapability { impl: address(new ERC20Airdrop()), data: abi.encodeCall( ERC20Airdrop.init, (address(0), 0, 0, bytes32(0), bridgedTko, vaultAddress) - ) + ) }) ); diff --git a/packages/protocol/script/DeployOnL1.s.sol b/packages/protocol/script/DeployOnL1.s.sol index 7e06a6a45b..f5608d24d2 100644 --- a/packages/protocol/script/DeployOnL1.s.sol +++ b/packages/protocol/script/DeployOnL1.s.sol @@ -249,7 +249,7 @@ contract DeployOnL1 is DeployCapability { // Register shared contracts in the new rollup copyRegister(rollupAddressManager, _sharedAddressManager, "taiko_token"); copyRegister(rollupAddressManager, _sharedAddressManager, "signal_service"); - copyRegister(rollupAddressManager, _sharedAddressManager, "bridge"); + // copyRegister(rollupAddressManager, _sharedAddressManager, "bridge"); deployProxy({ name: "taiko", diff --git a/packages/protocol/script/tokenunlock/Deploy.s.sol b/packages/protocol/script/tokenunlock/Deploy.s.sol index 4041f7dfd6..ae94dfe953 100644 --- a/packages/protocol/script/tokenunlock/Deploy.s.sol +++ b/packages/protocol/script/tokenunlock/Deploy.s.sol @@ -35,7 +35,7 @@ contract DeployTokenUnlock is DeployCapability { impl: TOKEN_UNLOCK_IMPL, data: abi.encodeCall( TokenUnlock.init, (OWNER, ROLLUP_ADDRESS_MANAGER, recipients[i], TGE) - ) + ) }); vm.stopBroadcast(); console2.log("grantee:", recipients[i]); diff --git a/packages/protocol/test/L2/DelegateOwner.t.sol b/packages/protocol/test/L2/DelegateOwner.t.sol index ef690e99d4..9fe40f7d35 100644 --- a/packages/protocol/test/L2/DelegateOwner.t.sol +++ b/packages/protocol/test/L2/DelegateOwner.t.sol @@ -47,7 +47,7 @@ contract TestDelegateOwner is TaikoTest { data: abi.encodeCall( DelegateOwner.init, (remoteOwner, address(addressManager), remoteChainId, address(0)) - ), + ), registerTo: address(addressManager) }) ); diff --git a/packages/protocol/test/L2/TaikoL2.t.sol b/packages/protocol/test/L2/TaikoL2.t.sol index 3665c3cf43..eadb14a6f3 100644 --- a/packages/protocol/test/L2/TaikoL2.t.sol +++ b/packages/protocol/test/L2/TaikoL2.t.sol @@ -49,7 +49,7 @@ contract TestTaikoL2 is TaikoTest { impl: address(new TaikoL2EIP1559Configurable()), data: abi.encodeCall( TaikoL2.init, (address(0), addressManager, l1ChainId, gasExcess) - ), + ), registerTo: addressManager }) ) diff --git a/packages/protocol/test/L2/TaikoL2NoFeeCheck.t.sol b/packages/protocol/test/L2/TaikoL2NoFeeCheck.t.sol index 6a10e25d6c..8b21fbaf56 100644 --- a/packages/protocol/test/L2/TaikoL2NoFeeCheck.t.sol +++ b/packages/protocol/test/L2/TaikoL2NoFeeCheck.t.sol @@ -49,7 +49,7 @@ contract TestTaikoL2NoFeeCheck is TaikoTest { impl: address(new SkipBasefeeCheckL2()), data: abi.encodeCall( TaikoL2.init, (address(0), addressManager, l1ChainId, gasExcess) - ), + ), registerTo: addressManager }) ) diff --git a/packages/protocol/test/automata-attestation/common/AttestationBase.t.sol b/packages/protocol/test/automata-attestation/common/AttestationBase.t.sol index 92a228b21c..8b11b31314 100644 --- a/packages/protocol/test/automata-attestation/common/AttestationBase.t.sol +++ b/packages/protocol/test/automata-attestation/common/AttestationBase.t.sol @@ -67,7 +67,7 @@ contract AttestationBase is Test, DcapTestUtils, V3QuoteParseUtils { data: abi.encodeCall( AutomataDcapV3Attestation.init, (admin, address(sigVerifyLib), address(pemCertChainLib)) - ) + ) }) ); diff --git a/packages/protocol/test/team/airdrop/ERC20Airdrop.t.sol b/packages/protocol/test/team/airdrop/ERC20Airdrop.t.sol index ac33e31935..1222a7cf9e 100644 --- a/packages/protocol/test/team/airdrop/ERC20Airdrop.t.sol +++ b/packages/protocol/test/team/airdrop/ERC20Airdrop.t.sol @@ -102,7 +102,7 @@ contract TestERC20Airdrop is TaikoTest { data: abi.encodeCall( BridgedERC20.init, (address(0), address(addressManager), randAddress(), 100, 18, "TKO", "Taiko Token") - ) + ) }) ); @@ -129,7 +129,7 @@ contract TestERC20Airdrop is TaikoTest { data: abi.encodeCall( ERC20Airdrop.init, (address(0), claimStart, claimEnd, merkleRoot, address(token), address(vault)) - ) + ) }) ); diff --git a/packages/protocol/test/tokenvault/BridgedERC20.t.sol b/packages/protocol/test/tokenvault/BridgedERC20.t.sol index 80470c7064..6c92727d8c 100644 --- a/packages/protocol/test/tokenvault/BridgedERC20.t.sol +++ b/packages/protocol/test/tokenvault/BridgedERC20.t.sol @@ -131,7 +131,7 @@ contract TestBridgedERC20 is TaikoTest { data: abi.encodeCall( BridgedERC20.init, (owner, address(manager), srcToken, srcChainId, srcDecimals, name, name) - ), + ), registerTo: manager }) ); diff --git a/packages/protocol/test/tokenvault/ERC20Vault.t.sol b/packages/protocol/test/tokenvault/ERC20Vault.t.sol index 98f1c9ddc1..b8c63ef2aa 100644 --- a/packages/protocol/test/tokenvault/ERC20Vault.t.sol +++ b/packages/protocol/test/tokenvault/ERC20Vault.t.sol @@ -177,7 +177,7 @@ contract TestERC20Vault is TaikoTest { data: abi.encodeCall( BridgedERC20.init, (address(0), address(addressManager), randAddress(), 100, 18, "USDC", "USDC coin") - ) + ) }) ); @@ -188,7 +188,7 @@ contract TestERC20Vault is TaikoTest { data: abi.encodeCall( BridgedERC20.init, (address(0), address(addressManager), randAddress(), 100, 18, "USDT", "USDT coin") - ) + ) }) ); @@ -207,7 +207,7 @@ contract TestERC20Vault is TaikoTest { "stETH", "Lido Staked ETH" ) - ) + ) }) ); vm.stopPrank(); diff --git a/packages/protocol/test/verifiers/RiscZeroVerifier.t.sol b/packages/protocol/test/verifiers/RiscZeroVerifier.t.sol index 75eb16dd2d..77c719d8a2 100644 --- a/packages/protocol/test/verifiers/RiscZeroVerifier.t.sol +++ b/packages/protocol/test/verifiers/RiscZeroVerifier.t.sol @@ -48,7 +48,7 @@ contract TestRiscZeroVerifier is TaikoL1TestBase { data: abi.encodeCall( RiscZeroVerifier.init, (address(0), address(addressManager), address(riscZeroRemoteVerifier)) - ) + ) }) ); From 967f7ee09bb39524dbe5540edf3979e5fa7dae46 Mon Sep 17 00:00:00 2001 From: cyberhorsey Date: Wed, 3 Jul 2024 02:38:37 +0000 Subject: [PATCH 4/4] forge fmt & update contract layout table --- packages/protocol/contracts/L1/TaikoData.sol | 2 +- packages/protocol/script/DeployERC20Airdrop.s.sol | 2 +- packages/protocol/script/tokenunlock/Deploy.s.sol | 2 +- packages/protocol/test/L2/DelegateOwner.t.sol | 2 +- packages/protocol/test/L2/TaikoL2.t.sol | 2 +- packages/protocol/test/L2/TaikoL2NoFeeCheck.t.sol | 2 +- .../test/automata-attestation/common/AttestationBase.t.sol | 2 +- packages/protocol/test/team/airdrop/ERC20Airdrop.t.sol | 4 ++-- packages/protocol/test/tokenvault/BridgedERC20.t.sol | 2 +- packages/protocol/test/tokenvault/ERC20Vault.t.sol | 6 +++--- packages/protocol/test/verifiers/RiscZeroVerifier.t.sol | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/protocol/contracts/L1/TaikoData.sol b/packages/protocol/contracts/L1/TaikoData.sol index 924571cdb7..fed50fcb6a 100644 --- a/packages/protocol/contracts/L1/TaikoData.sol +++ b/packages/protocol/contracts/L1/TaikoData.sol @@ -174,7 +174,7 @@ library TaikoData { mapping( uint64 blockId_mod_blockRingBufferSize => mapping(uint32 transitionId => TransitionState ts) - ) transitions; + ) transitions; // Ring buffer for Ether deposits bytes32 __reserve1; SlotA slotA; // slot 5 diff --git a/packages/protocol/script/DeployERC20Airdrop.s.sol b/packages/protocol/script/DeployERC20Airdrop.s.sol index cd640a0239..70d0f7f3d4 100644 --- a/packages/protocol/script/DeployERC20Airdrop.s.sol +++ b/packages/protocol/script/DeployERC20Airdrop.s.sol @@ -37,7 +37,7 @@ contract DeployERC20Airdrop is DeployCapability { impl: address(new ERC20Airdrop()), data: abi.encodeCall( ERC20Airdrop.init, (address(0), 0, 0, bytes32(0), bridgedTko, vaultAddress) - ) + ) }) ); diff --git a/packages/protocol/script/tokenunlock/Deploy.s.sol b/packages/protocol/script/tokenunlock/Deploy.s.sol index ae94dfe953..4041f7dfd6 100644 --- a/packages/protocol/script/tokenunlock/Deploy.s.sol +++ b/packages/protocol/script/tokenunlock/Deploy.s.sol @@ -35,7 +35,7 @@ contract DeployTokenUnlock is DeployCapability { impl: TOKEN_UNLOCK_IMPL, data: abi.encodeCall( TokenUnlock.init, (OWNER, ROLLUP_ADDRESS_MANAGER, recipients[i], TGE) - ) + ) }); vm.stopBroadcast(); console2.log("grantee:", recipients[i]); diff --git a/packages/protocol/test/L2/DelegateOwner.t.sol b/packages/protocol/test/L2/DelegateOwner.t.sol index 9fe40f7d35..ef690e99d4 100644 --- a/packages/protocol/test/L2/DelegateOwner.t.sol +++ b/packages/protocol/test/L2/DelegateOwner.t.sol @@ -47,7 +47,7 @@ contract TestDelegateOwner is TaikoTest { data: abi.encodeCall( DelegateOwner.init, (remoteOwner, address(addressManager), remoteChainId, address(0)) - ), + ), registerTo: address(addressManager) }) ); diff --git a/packages/protocol/test/L2/TaikoL2.t.sol b/packages/protocol/test/L2/TaikoL2.t.sol index eadb14a6f3..3665c3cf43 100644 --- a/packages/protocol/test/L2/TaikoL2.t.sol +++ b/packages/protocol/test/L2/TaikoL2.t.sol @@ -49,7 +49,7 @@ contract TestTaikoL2 is TaikoTest { impl: address(new TaikoL2EIP1559Configurable()), data: abi.encodeCall( TaikoL2.init, (address(0), addressManager, l1ChainId, gasExcess) - ), + ), registerTo: addressManager }) ) diff --git a/packages/protocol/test/L2/TaikoL2NoFeeCheck.t.sol b/packages/protocol/test/L2/TaikoL2NoFeeCheck.t.sol index 8b21fbaf56..6a10e25d6c 100644 --- a/packages/protocol/test/L2/TaikoL2NoFeeCheck.t.sol +++ b/packages/protocol/test/L2/TaikoL2NoFeeCheck.t.sol @@ -49,7 +49,7 @@ contract TestTaikoL2NoFeeCheck is TaikoTest { impl: address(new SkipBasefeeCheckL2()), data: abi.encodeCall( TaikoL2.init, (address(0), addressManager, l1ChainId, gasExcess) - ), + ), registerTo: addressManager }) ) diff --git a/packages/protocol/test/automata-attestation/common/AttestationBase.t.sol b/packages/protocol/test/automata-attestation/common/AttestationBase.t.sol index 8b11b31314..92a228b21c 100644 --- a/packages/protocol/test/automata-attestation/common/AttestationBase.t.sol +++ b/packages/protocol/test/automata-attestation/common/AttestationBase.t.sol @@ -67,7 +67,7 @@ contract AttestationBase is Test, DcapTestUtils, V3QuoteParseUtils { data: abi.encodeCall( AutomataDcapV3Attestation.init, (admin, address(sigVerifyLib), address(pemCertChainLib)) - ) + ) }) ); diff --git a/packages/protocol/test/team/airdrop/ERC20Airdrop.t.sol b/packages/protocol/test/team/airdrop/ERC20Airdrop.t.sol index 1222a7cf9e..ac33e31935 100644 --- a/packages/protocol/test/team/airdrop/ERC20Airdrop.t.sol +++ b/packages/protocol/test/team/airdrop/ERC20Airdrop.t.sol @@ -102,7 +102,7 @@ contract TestERC20Airdrop is TaikoTest { data: abi.encodeCall( BridgedERC20.init, (address(0), address(addressManager), randAddress(), 100, 18, "TKO", "Taiko Token") - ) + ) }) ); @@ -129,7 +129,7 @@ contract TestERC20Airdrop is TaikoTest { data: abi.encodeCall( ERC20Airdrop.init, (address(0), claimStart, claimEnd, merkleRoot, address(token), address(vault)) - ) + ) }) ); diff --git a/packages/protocol/test/tokenvault/BridgedERC20.t.sol b/packages/protocol/test/tokenvault/BridgedERC20.t.sol index 6c92727d8c..80470c7064 100644 --- a/packages/protocol/test/tokenvault/BridgedERC20.t.sol +++ b/packages/protocol/test/tokenvault/BridgedERC20.t.sol @@ -131,7 +131,7 @@ contract TestBridgedERC20 is TaikoTest { data: abi.encodeCall( BridgedERC20.init, (owner, address(manager), srcToken, srcChainId, srcDecimals, name, name) - ), + ), registerTo: manager }) ); diff --git a/packages/protocol/test/tokenvault/ERC20Vault.t.sol b/packages/protocol/test/tokenvault/ERC20Vault.t.sol index b8c63ef2aa..98f1c9ddc1 100644 --- a/packages/protocol/test/tokenvault/ERC20Vault.t.sol +++ b/packages/protocol/test/tokenvault/ERC20Vault.t.sol @@ -177,7 +177,7 @@ contract TestERC20Vault is TaikoTest { data: abi.encodeCall( BridgedERC20.init, (address(0), address(addressManager), randAddress(), 100, 18, "USDC", "USDC coin") - ) + ) }) ); @@ -188,7 +188,7 @@ contract TestERC20Vault is TaikoTest { data: abi.encodeCall( BridgedERC20.init, (address(0), address(addressManager), randAddress(), 100, 18, "USDT", "USDT coin") - ) + ) }) ); @@ -207,7 +207,7 @@ contract TestERC20Vault is TaikoTest { "stETH", "Lido Staked ETH" ) - ) + ) }) ); vm.stopPrank(); diff --git a/packages/protocol/test/verifiers/RiscZeroVerifier.t.sol b/packages/protocol/test/verifiers/RiscZeroVerifier.t.sol index 77c719d8a2..75eb16dd2d 100644 --- a/packages/protocol/test/verifiers/RiscZeroVerifier.t.sol +++ b/packages/protocol/test/verifiers/RiscZeroVerifier.t.sol @@ -48,7 +48,7 @@ contract TestRiscZeroVerifier is TaikoL1TestBase { data: abi.encodeCall( RiscZeroVerifier.init, (address(0), address(addressManager), address(riscZeroRemoteVerifier)) - ) + ) }) );