Merge branch 'forced_inclusion_store_pacaya' of github.com:taikoxyz/t…

…aiko-mono into forced_inclusion_store_pacaya
taikoxyz · Jan 24, 2025 · d5c7083 · d5c7083
2 parents f1b81a0 + 70cc014
commit d5c7083
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/packages/protocol/contracts/layer1/preconf/impl/PreconfRouter.sol b/packages/protocol/contracts/layer1/preconf/impl/PreconfRouter.sol
@@ -42,9 +42,7 @@ contract PreconfRouter is EssentialContract, IPreconfRouter {
         } else {
             // Call the proposeBatchWithForcedInclusion function on the ForcedInclusionInbox
             (, meta_) = IForcedInclusionInbox(forcedInclusionInbox).proposeBatchWithForcedInclusion(
-                _forcedInclusionParams,
-                _batchParams,
-                _batchTxList
+                _forcedInclusionParams, _batchParams, _batchTxList
             );
         }
 

diff --git a/packages/protocol/script/layer1/based/DeployProtocolOnL1.s.sol b/packages/protocol/script/layer1/based/DeployProtocolOnL1.s.sol
@@ -411,7 +411,11 @@ contract DeployProtocolOnL1 is DeployCapability {
 
         store = deployProxy({
             name: "forced_inclusion_store",
-            impl: address(new ForcedInclusionStore(resolver, vm.envUint("INCLUSION_WINDOW"), vm.envUint("INCLUSION_FEE"))),
+            impl: address(
+                new ForcedInclusionStore(
+                    resolver, vm.envUint("INCLUSION_WINDOW"), vm.envUint("INCLUSION_FEE")
+                )
+            ),
             data: abi.encodeCall(ForcedInclusionStore.init, (owner)),
             registerTo: resolver
         });

diff --git a/packages/protocol/test/layer1/Layer1Test.sol b/packages/protocol/test/layer1/Layer1Test.sol
@@ -66,18 +66,12 @@ abstract contract Layer1Test is CommonTest {
         );
     }
 
-    function deployForcedInclusionInbox(
-    )
-        internal
-        returns (ForcedInclusionInbox)
-    {
+    function deployForcedInclusionInbox() internal returns (ForcedInclusionInbox) {
         return ForcedInclusionInbox(
             deploy({
                 name: "taiko_forced_inclusion_inbox",
                 impl: address(new ForcedInclusionInbox(address(resolver))),
-                data: abi.encodeCall(
-                    ForcedInclusionInbox.init, (address(0))
-                )
+                data: abi.encodeCall(ForcedInclusionInbox.init, (address(0)))
             })
         );
     }
@@ -94,9 +88,7 @@ abstract contract Layer1Test is CommonTest {
             deploy({
                 name: "forced_inclusion_store",
                 impl: address(new ForcedInclusionStore(address(resolver), inclusionDelay, fee)),
-                data: abi.encodeCall(
-                    ForcedInclusionStore.init, (owner)
-                )
+                data: abi.encodeCall(ForcedInclusionStore.init, (owner))
             })
         );
     }