Skip to content

Commit

Permalink
Merge branch 'ui-lib' of ssh://github.com/taikoxyz/taiko-mono into ui…
Browse files Browse the repository at this point in the history 
…-lib
  • Loading branch information
@bearni95
bearni95 committed May 14, 2024
2 parents 9949571 + 2c4c8b9 commit 6e4dfd4
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion packages/protocol/contracts/L1/TaikoData.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/script/DeployERC20Airdrop.s.sol
View file
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
6 changes: 3 additions & 3 deletions packages/protocol/script/DeployOnL1.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,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 @@ -266,7 +266,7 @@ contract DeployOnL1 is DeployCapability {
vm.envBytes32("L2_GENESIS_HASH"),
vm.envBool("PAUSE_TAIKO_L1")
)
),
),
registerTo: rollupAddressManager
});

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

Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/test/L2/DelegateOwner.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ contract TestDelegateOwner is TaikoTest {
impl: address(new DelegateOwner()),
data: abi.encodeCall(
DelegateOwner.init, (remoteOwner, address(addressManager), remoteChainId)
),
),
registerTo: address(addressManager)
})
);
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/test/L2/TaikoL2.t.sol
View file
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
View file
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
2 changes: 1 addition & 1 deletion packages/protocol/test/automata-attestation/common/AttestationBase.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ contract AttestationBase is Test, DcapTestUtils, V3QuoteParseUtils {
data: abi.encodeCall(
AutomataDcapV3Attestation.init,
(admin, address(sigVerifyLib), address(pemCertChainLib))
)
)
})
);

Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/test/bridge/Bridge.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ contract BridgeTest is TaikoTest {
impl: address(new DelegateOwner()),
data: abi.encodeCall(
DelegateOwner.init, (mockDAO, address(addressManager), l1ChainId)
)
)
})
)
);
Expand Down
4 changes: 2 additions & 2 deletions packages/protocol/test/team/airdrop/ERC20Airdrop.t.sol
View file
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
View file
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
View file
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
View file
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
20 changes: 10 additions & 10 deletions packages/supplementary-contracts/contract_layout.md
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
## TokenUnlocking

| Name | Type | Slot | Offset | Bytes | Contract |
| --------------- | ----------- | ---- | ------ | ----- | ---------------------------------------------------------- |
| \_initialized | uint8 | 0 | 0 | 1 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| \_initializing | bool | 0 | 1 | 1 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| \_\_gap | uint256[50] | 1 | 0 | 1600 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| \_owner | address | 51 | 0 | 20 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| \_\_gap | uint256[49] | 52 | 0 | 1568 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| \_status | uint256 | 101 | 0 | 32 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| \_\_gap | uint256[49] | 102 | 0 | 1568 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
|-----------------|-------------|------|--------|-------|------------------------------------------------------------|
| _initialized | uint8 | 0 | 0 | 1 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| _initializing | bool | 0 | 1 | 1 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| __gap | uint256[50] | 1 | 0 | 1600 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| _owner | address | 51 | 0 | 20 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| __gap | uint256[49] | 52 | 0 | 1568 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| _status | uint256 | 101 | 0 | 32 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| __gap | uint256[49] | 102 | 0 | 1568 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| amountVested | uint256 | 151 | 0 | 32 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| amountWithdrawn | uint256 | 152 | 0 | 32 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| recipient | address | 153 | 0 | 20 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| taikoToken | address | 154 | 0 | 20 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| tgeTimestamp | uint64 | 154 | 20 | 8 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| \_\_gap | uint256[46] | 155 | 0 | 1472 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |
| __gap | uint256[46] | 155 | 0 | 1472 | contracts/tokenUnlocking/TokenUnlocking.sol:TokenUnlocking |

0 comments on commit 6e4dfd4

Please sign in to comment.