Use deploychain.sol

base-org · Nov 7, 2024 · fece3af · fece3af
1 parent d1584b2
commit fece3af
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/script/DeploySystem.s.sol b/script/DeploySystem.s.sol
@@ -229,12 +229,6 @@ contract DeploySystem is Deploy {
 
         bytes32 batcherHash = bytes32(uint256(uint160(cfg.batchSenderAddress())));
 
-        address customGasTokenAddress = Constants.ETHER;
-        if (cfg.useCustomGasToken()) {
-            customGasTokenAddress = cfg.customGasTokenAddress();
-            console.log("configured to use custom gas token %s", customGasTokenAddress);
-        }
-
         _upgradeAndCallViaSafe({
             _proxy: payable(systemConfigProxy),
             _implementation: systemConfig,
@@ -256,7 +250,7 @@ contract DeploySystem is Deploy {
                         disputeGameFactory: mustGetAddress("DisputeGameFactoryProxy"),
                         optimismPortal: mustGetAddress("OptimismPortalProxy"),
                         optimismMintableERC20Factory: mustGetAddress("OptimismMintableERC20FactoryProxy"),
-                        gasPayingToken: customGasTokenAddress
+                        gasPayingToken: Constants.ETHER
                     })
                 )
             )

diff --git a/src/DeployChain.sol b/src/DeployChain.sol
@@ -100,6 +100,7 @@ contract DeployChain {
         uint32 basefeeScalar,
         uint32 blobbasefeeScalar,
         uint64 gasLimit,
+        address gasToken,
         address batcherAddress,
         address unsafeBlockSigner,
         address proposer
@@ -126,6 +127,7 @@ contract DeployChain {
             basefeeScalar,
             blobbasefeeScalar,
             gasLimit,
+            gasToken,
             batcherAddress,
             unsafeBlockSigner,
             batchInbox,
@@ -213,6 +215,7 @@ contract DeployChain {
         uint32 basefeeScalar,
         uint32 blobbasefeeScalar,
         uint64 gasLimit,
+        address gasToken,
         address batcherAddress,
         address unsafeBlockSigner,
         address batchInbox,
@@ -240,7 +243,7 @@ contract DeployChain {
                 disputeGameFactory: address(0),
                 optimismPortal: addresses.optimismPortal,
                 optimismMintableERC20Factory: addresses.optimismMintableERC20Factory,
-                gasPayingToken: address(0)
+                gasPayingToken: gasToken
             })
         });
 

diff --git a/testnet/docker-compose.yml b/testnet/docker-compose.yml
@@ -68,4 +68,4 @@ services:
       dockerfile: testnet/Dockerfile
     command: [ "bash", "./entrypoint-enclave.sh" ]
     env_file:
-      - .env
+      - .env