Merge branch 'feat/taikoon-alt-networks' of ssh://github.com/taikoxyz…

…/taiko-mono into feat/taikoon-alt-networks
taikoxyz · May 14, 2024 · 980f919 · 980f919
2 parents 9464ce3 + 377cd85
commit 980f919
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/packages/protocol/script/DeployOnL1.s.sol b/packages/protocol/script/DeployOnL1.s.sol
@@ -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
             });
         }
@@ -266,7 +266,7 @@ contract DeployOnL1 is DeployCapability {
                     vm.envBytes32("L2_GENESIS_HASH"),
                     vm.envBool("PAUSE_TAIKO_L1")
                 )
-                ),
+            ),
             registerTo: rollupAddressManager
         });
 
@@ -333,7 +333,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/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/supplementary-contracts/contract_layout.md b/packages/supplementary-contracts/contract_layout.md
@@ -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 |
+
-Original file line number
+Diff line change
@@ Expand Up @@
                     data: abi.encodeCall(
                         AutomataDcapV3Attestation.init,
                         (admin, address(sigVerifyLib), address(pemCertChainLib))
-                        )
+                    )
                 })
             );
@@ Expand Down @@