diff --git a/go.mod b/go.mod index 3bd0b72502..61d6cb40de 100644 --- a/go.mod +++ b/go.mod @@ -305,6 +305,6 @@ require ( replace github.com/ethereum/go-ethereum v1.13.15 => github.com/taikoxyz/taiko-geth v0.0.0-20240504072040-7e1b8b65a3f8 -replace github.com/ethereum-optimism/optimism v1.7.4 => github.com/taikoxyz/optimism v0.0.0-20240504104604-6c9729321b29 +replace github.com/ethereum-optimism/optimism v1.7.4 => github.com/taikoxyz/optimism v0.0.0-20240508063202-db34e8c760ea replace github.com/uber/jaeger-client-go => github.com/uber/jaeger-client-go v2.25.0+incompatible diff --git a/go.sum b/go.sum index 5a3627928a..591d7adf2e 100644 --- a/go.sum +++ b/go.sum @@ -1119,8 +1119,8 @@ github.com/swaggo/swag v1.16.3/go.mod h1:DImHIuOFXKpMFAQjcC7FG4m3Dg4+QuUgUzJmKjI github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= -github.com/taikoxyz/optimism v0.0.0-20240504104604-6c9729321b29 h1:JcOxHwY5zQfqsjx2Uh9WwWkcwy5jJX3XR2YQEx3IByY= -github.com/taikoxyz/optimism v0.0.0-20240504104604-6c9729321b29/go.mod h1:bkiRWtDE4T9nXmaK5NBKC/buX5GnyJ6VKozGFwiwKxs= +github.com/taikoxyz/optimism v0.0.0-20240508063202-db34e8c760ea h1:+oLT2sxS+KLgHZVW4toyKavAMbgjYkFOiL0YpciATnQ= +github.com/taikoxyz/optimism v0.0.0-20240508063202-db34e8c760ea/go.mod h1:bkiRWtDE4T9nXmaK5NBKC/buX5GnyJ6VKozGFwiwKxs= github.com/taikoxyz/taiko-geth v0.0.0-20240504072040-7e1b8b65a3f8 h1:z4juQ4Nyp2T836JTCNC8t3vrbr0K9v2pPUV/ir2dy9s= github.com/taikoxyz/taiko-geth v0.0.0-20240504072040-7e1b8b65a3f8/go.mod h1:nqByouVW0a0qx5KKgvYgoXba+pYEHznAAQp6LhZilgM= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= diff --git a/packages/protocol/contracts/L1/TaikoData.sol b/packages/protocol/contracts/L1/TaikoData.sol index a9b0adc6ed..2c816af177 100644 --- a/packages/protocol/contracts/L1/TaikoData.sol +++ b/packages/protocol/contracts/L1/TaikoData.sol @@ -163,7 +163,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/DeployOnL1.s.sol b/packages/protocol/script/DeployOnL1.s.sol index fe0577c4d5..751379e463 100644 --- a/packages/protocol/script/DeployOnL1.s.sol +++ b/packages/protocol/script/DeployOnL1.s.sol @@ -152,7 +152,7 @@ contract DeployOnL1 is DeployCapability { impl: address(new TaikoToken()), data: abi.encodeCall( TaikoToken.init, (owner, vm.envAddress("TAIKO_TOKEN_PREMINT_RECIPIENT")) - ), + ), registerTo: sharedAddressManager }); } @@ -263,7 +263,7 @@ contract DeployOnL1 is DeployCapability { vm.envBytes32("L2_GENESIS_HASH"), vm.envBool("PAUSE_TAIKO_L1") ) - ), + ), registerTo: rollupAddressManager }); @@ -330,7 +330,7 @@ contract DeployOnL1 is DeployCapability { impl: automateDcapV3AttestationImpl, data: abi.encodeCall( AutomataDcapV3Attestation.init, (owner, address(sigVerifyLib), address(pemCertChainLib)) - ), + ), registerTo: rollupAddressManager }); diff --git a/packages/protocol/test/L2/DelegateOwner.t.sol b/packages/protocol/test/L2/DelegateOwner.t.sol index 7ba7d570d0..96bf4bc9e3 100644 --- a/packages/protocol/test/L2/DelegateOwner.t.sol +++ b/packages/protocol/test/L2/DelegateOwner.t.sol @@ -46,7 +46,7 @@ contract TestDelegateOwner is TaikoTest { impl: address(new DelegateOwner()), data: abi.encodeCall( DelegateOwner.init, (remoteOwner, address(addressManager), remoteChainId) - ), + ), 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 4133197796..453d7d6647 100644 --- a/packages/protocol/test/automata-attestation/common/AttestationBase.t.sol +++ b/packages/protocol/test/automata-attestation/common/AttestationBase.t.sol @@ -61,7 +61,7 @@ contract AttestationBase is Test, DcapTestUtils, V3QuoteParseUtils { data: abi.encodeCall( AutomataDcapV3Attestation.init, (admin, address(sigVerifyLib), address(pemCertChainLib)) - ) + ) }) ); diff --git a/packages/protocol/test/bridge/Bridge.t.sol b/packages/protocol/test/bridge/Bridge.t.sol index 145efcb9d2..4a6cd593ee 100644 --- a/packages/protocol/test/bridge/Bridge.t.sol +++ b/packages/protocol/test/bridge/Bridge.t.sol @@ -93,7 +93,7 @@ contract BridgeTest is TaikoTest { impl: address(new DelegateOwner()), data: abi.encodeCall( DelegateOwner.init, (mockDAO, address(addressManager), l1ChainId) - ) + ) }) ) ); 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 e6e0749af6..1f0fb5908f 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)) - ) + ) }) );