other improvements

matter-labs · Sep 12, 2024 · 1634e02 · 1634e02
1 parent 0aeb2cf
commit 1634e02
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/core/tests/upgrade-test/tests/upgrade.test.ts b/core/tests/upgrade-test/tests/upgrade.test.ts
@@ -89,25 +89,29 @@ describe('Upgrade test', function () {
         alice = tester.emptyWallet();
 
         if (fileConfig.loadFromFile) {
-            let walletConfig = loadConfig({ pathToHome, chain: fileConfig.chain, config: 'wallets.yaml' });
+            const chainWalletConfig = loadConfig({ pathToHome, chain: fileConfig.chain, config: 'wallets.yaml' });
 
-            adminGovWallet = new ethers.Wallet(walletConfig.governor.private_key, alice._providerL1());
+            adminGovWallet = new ethers.Wallet(chainWalletConfig.governor.private_key, alice._providerL1());
 
-            walletConfig = loadConfig({
+            const ecosystemWalletConfig = loadConfig({
                 pathToHome,
                 chain: fileConfig.chain,
                 configsFolder: '../../configs/',
                 config: 'wallets.yaml'
             });
 
-            ecosystemGovWallet = new ethers.Wallet(walletConfig.governor.private_key, alice._providerL1());
+            if (ecosystemWalletConfig.governor.private_key == chainWalletConfig.governor.private_key) {
+                ecosystemGovWallet = adminGovWallet;
+            } else {
+                ecosystemGovWallet = new ethers.Wallet(ecosystemWalletConfig.governor.private_key, alice._providerL1());
+            }
         } else {
             let govMnemonic = ethers.Mnemonic.fromPhrase(
                 require('../../../../etc/test_config/constant/eth.json').mnemonic
             );
             let govWalletHD = ethers.HDNodeWallet.fromMnemonic(govMnemonic, "m/44'/60'/0'/0/1");
             adminGovWallet = new ethers.Wallet(govWalletHD.privateKey, alice._providerL1());
-            ecosystemGovWallet = new ethers.Wallet(govWalletHD.privateKey, alice._providerL1());
+            ecosystemGovWallet = adminGovWallet;
         }
 
         logs = fs.createWriteStream('upgrade.log', { flags: 'a' });

diff --git a/docker-compose-cpu-runner.yml b/docker-compose-cpu-runner.yml
@@ -11,7 +11,7 @@ services:
         source: ./etc/reth/chaindata
         target: /chaindata
 
-    command: node --dev --datadir /rethdata --http --http.addr 0.0.0.0 --http.port 8545 --http.corsdomain "*" --dev.block-time 300ms --chain /chaindata/reth_config
+    command: node --dev --datadir /rethdata --http --http.addr 0.0.0.0 --http.port 8545 --http.corsdomain "*" --dev.block-time 600ms --chain /chaindata/reth_config
     ports:
       - 127.0.0.1:8545:8545
 

diff --git a/docker-compose-gpu-runner-cuda-12-0.yml b/docker-compose-gpu-runner-cuda-12-0.yml
@@ -11,7 +11,7 @@ services:
         source: ./etc/reth/chaindata
         target: /chaindata
 
-    command: node --dev --datadir /rethdata --http --http.addr 0.0.0.0 --http.port 8545 --http.corsdomain "*" --dev.block-time 300ms --chain /chaindata/reth_config
+    command: node --dev --datadir /rethdata --http --http.addr 0.0.0.0 --http.port 8545 --http.corsdomain "*" --dev.block-time 600ms --chain /chaindata/reth_config
     ports:
       - 127.0.0.1:8545:8545
 

diff --git a/docker-compose-gpu-runner.yml b/docker-compose-gpu-runner.yml
@@ -11,7 +11,7 @@ services:
         source: ./etc/reth/chaindata
         target: /chaindata
 
-    command: node --dev --datadir /rethdata --http --http.addr 0.0.0.0 --http.port 8545 --http.corsdomain "*" --dev.block-time 300ms --chain /chaindata/reth_config
+    command: node --dev --datadir /rethdata --http --http.addr 0.0.0.0 --http.port 8545 --http.corsdomain "*" --dev.block-time 600ms --chain /chaindata/reth_config
     ports:
       - 127.0.0.1:8545:8545
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
         source: ./etc/reth/chaindata
         target: /chaindata
 
-    command: node --dev --datadir /rethdata --http --http.addr 0.0.0.0 --http.port 8545 --http.corsdomain "*" --dev.block-time 300ms --chain /chaindata/reth_config
+    command: node --dev --datadir /rethdata --http --http.addr 0.0.0.0 --http.port 8545 --http.corsdomain "*" --dev.block-time 600ms --chain /chaindata/reth_config
 
 
   postgres: