Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
cyberhorsey committed Jul 2, 2024
1 parent ed709d7 commit 999e5d4
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion packages/protocol/contracts/L1/TaikoData.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/script/DeployERC20Airdrop.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
)
})
);

Expand Down
8 changes: 4 additions & 4 deletions packages/protocol/script/DeployOnL1.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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
});
}
Expand Down Expand Up @@ -257,7 +257,7 @@ contract DeployOnL1 is DeployCapability {
vm.envBytes32("L2_GENESIS_HASH"),
vm.envBool("PAUSE_TAIKO_L1")
)
),
),
registerTo: rollupAddressManager
});

Expand Down Expand Up @@ -316,7 +316,7 @@ contract DeployOnL1 is DeployCapability {
impl: automateDcapV3AttestationImpl,
data: abi.encodeCall(
AutomataDcapV3Attestation.init, (owner, address(sigVerifyLib), address(pemCertChainLib))
),
),
registerTo: rollupAddressManager
});

Expand All @@ -330,7 +330,7 @@ contract DeployOnL1 is DeployCapability {
impl: address(new ProverSet()),
data: abi.encodeCall(
ProverSet.init, (owner, vm.envAddress("PROVER_SET_ADMIN"), rollupAddressManager)
)
)
});

address sequencerRegistryProxy = deployProxy({
Expand Down
6 changes: 4 additions & 2 deletions packages/protocol/script/SetSequencer.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ contract SetSequencer is Script {

proxy = SequencerRegistry(payable(proxyAddress));

address[] memory addresses = [addr];
bool[] memory enabledAddresses = [enabled];
address[] memory addresses = new address[](1);
addresses[0] = addr;
bool[] memory enabledAddresses = new bool[](1);
enabledAddresses[0] = enabled;
proxy.setSequencers(addresses, enabledAddresses);

vm.stopBroadcast();
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/script/tokenunlock/Deploy.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/test/L2/DelegateOwner.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ contract TestDelegateOwner is TaikoTest {
data: abi.encodeCall(
DelegateOwner.init,
(remoteOwner, address(addressManager), remoteChainId, address(0))
),
),
registerTo: address(addressManager)
})
);
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/test/L2/TaikoL2.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ contract TestTaikoL2 is TaikoTest {
impl: address(new TaikoL2EIP1559Configurable()),
data: abi.encodeCall(
TaikoL2.init, (address(0), addressManager, l1ChainId, gasExcess)
),
),
registerTo: addressManager
})
)
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/test/L2/TaikoL2NoFeeCheck.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ contract TestTaikoL2NoFeeCheck is TaikoTest {
impl: address(new SkipBasefeeCheckL2()),
data: abi.encodeCall(
TaikoL2.init, (address(0), addressManager, l1ChainId, gasExcess)
),
),
registerTo: addressManager
})
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ contract AttestationBase is Test, DcapTestUtils, V3QuoteParseUtils {
data: abi.encodeCall(
AutomataDcapV3Attestation.init,
(admin, address(sigVerifyLib), address(pemCertChainLib))
)
)
})
);

Expand Down
4 changes: 2 additions & 2 deletions packages/protocol/test/team/airdrop/ERC20Airdrop.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ contract TestERC20Airdrop is TaikoTest {
data: abi.encodeCall(
BridgedERC20.init,
(address(0), address(addressManager), randAddress(), 100, 18, "TKO", "Taiko Token")
)
)
})
);

Expand All @@ -129,7 +129,7 @@ contract TestERC20Airdrop is TaikoTest {
data: abi.encodeCall(
ERC20Airdrop.init,
(address(0), claimStart, claimEnd, merkleRoot, address(token), address(vault))
)
)
})
);

Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/test/tokenvault/BridgedERC20.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ contract TestBridgedERC20 is TaikoTest {
data: abi.encodeCall(
BridgedERC20.init,
(owner, address(manager), srcToken, srcChainId, srcDecimals, name, name)
),
),
registerTo: manager
})
);
Expand Down
6 changes: 3 additions & 3 deletions packages/protocol/test/tokenvault/ERC20Vault.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ contract TestERC20Vault is TaikoTest {
data: abi.encodeCall(
BridgedERC20.init,
(address(0), address(addressManager), randAddress(), 100, 18, "USDC", "USDC coin")
)
)
})
);

Expand All @@ -188,7 +188,7 @@ contract TestERC20Vault is TaikoTest {
data: abi.encodeCall(
BridgedERC20.init,
(address(0), address(addressManager), randAddress(), 100, 18, "USDT", "USDT coin")
)
)
})
);

Expand All @@ -207,7 +207,7 @@ contract TestERC20Vault is TaikoTest {
"stETH",
"Lido Staked ETH"
)
)
)
})
);
vm.stopPrank();
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/test/verifiers/RiscZeroVerifier.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ contract TestRiscZeroVerifier is TaikoL1TestBase {
data: abi.encodeCall(
RiscZeroVerifier.init,
(address(0), address(addressManager), address(riscZeroRemoteVerifier))
)
)
})
);

Expand Down

0 comments on commit 999e5d4

Please sign in to comment.