chore(contract-manager)-deploy-monad-testnet-again

Author: aditya520

contract_manager/scripts/common.ts

@@ -109,7 +109,7 @@ export const COMMON_DEPLOY_OPTIONS = {
   "std-output-dir": {
     type: "string",
     demandOption: true,
-    desc: "Path to the Foundry output directory (contains Contract.sol/Contract.json structure)",
+    desc: "Path to the Foundry output directory (typically 'out/' directory, contains Contract.sol/Contract.json structure)",
   },
   "private-key": {
     type: "string",
@@ -413,6 +413,20 @@ export async function topupAccountsIfNecessary(
         deploymentConfig.privateKey,
       );
       web3.eth.accounts.wallet.add(signer);
+
+      // Get the current nonce to avoid conflicts with pending transactions
+      const nonce = await web3.eth.getTransactionCount(
+        signer.address,
+        "pending",
+      );
+      console.log(`Using nonce: ${nonce}`);
+
+      // Get gas price and apply multiplier
+      const baseGasPrice = await chain.getGasPrice();
+      const gasPrice = Math.trunc(
+        Number(baseGasPrice) * deploymentConfig.gasPriceMultiplier,
+      );
+
       const estimatedGas = await web3.eth.estimateGas({
         from: signer.address,
         to: accountAddress,
@@ -423,7 +437,12 @@ export async function topupAccountsIfNecessary(
         from: signer.address,
         to: accountAddress,
         gas: estimatedGas * deploymentConfig.gasMultiplier,
+        gasPrice: gasPrice.toString(),
+        nonce: nonce,
         value: web3.utils.toWei(`${minBalance}`, "ether"),
+        // // Uncomment this if your tx are getting stuck in the mempool. Or if you get this error:
+        // // "An existing transaction had higher priority"
+        // maxPriorityFeePerGas: gasPrice.toString(),
       });
 
       console.log(

contract_manager/src/store/chains/EvmChains.json

@@ -1157,7 +1157,7 @@
   {
     "id": "monad_testnet",
     "mainnet": false,
-    "rpcUrl": "https://monad-testnet.drpc.org",
+    "rpcUrl": "https://rpc-testnet.monadinfra.com",
     "networkId": 10143,
     "type": "EvmChain"
   },

contract_manager/src/store/contracts/EvmEntropyContracts.json

@@ -149,11 +149,6 @@
     "address": "0xEbe57e8045F2F230872523bbff7374986E45C486",
     "type": "EvmEntropyContract"
   },
-  {
-    "chain": "monad_testnet",
-    "address": "0x36825bf3Fbdf5a29E2d5148bfe7Dcf7B5639e320",
-    "type": "EvmEntropyContract"
-  },
   {
     "chain": "berachain_mainnet",
     "address": "0x36825bf3Fbdf5a29E2d5148bfe7Dcf7B5639e320",
@@ -203,5 +198,10 @@
     "chain": "sonic_evm_testnet",
     "address": "0x8D254a21b3C86D32F7179855531CE99164721933",
     "type": "EvmEntropyContract"
+  },
+  {
+    "chain": "monad_testnet",
+    "address": "0x825c0390f379C631f3Cf11A82a37D20BddF93c07",
+    "type": "EvmEntropyContract"
   }
-]
+]

contract_manager/src/store/contracts/EvmExecutorContracts.json

@@ -79,11 +79,6 @@
     "address": "0x8D254a21b3C86D32F7179855531CE99164721933",
     "type": "EvmExecutorContract"
   },
-  {
-    "chain": "monad_testnet",
-    "address": "0x5744Cbf430D99456a0A8771208b674F27f8EF0Fb",
-    "type": "EvmExecutorContract"
-  },
   {
     "chain": "story_testnet",
     "address": "0x87047526937246727E4869C5f76A347160e08672",
@@ -238,5 +233,10 @@
     "chain": "sonic_evm_testnet",
     "address": "0x36825bf3Fbdf5a29E2d5148bfe7Dcf7B5639e320",
     "type": "EvmExecutorContract"
+  },
+  {
+    "chain": "monad_testnet",
+    "address": "0x4374e5a8b9C22271E9EB878A2AA31DE97DF15DAF",
+    "type": "EvmExecutorContract"
   }
-]
+]

contract_manager/src/store/contracts/EvmPriceFeedContracts.json

@@ -759,11 +759,6 @@
     "address": "0x2880aB155794e7179c9eE2e38200202908C17B43",
     "type": "EvmPriceFeedContract"
   },
-  {
-    "chain": "monad_testnet",
-    "address": "0x2880aB155794e7179c9eE2e38200202908C17B43",
-    "type": "EvmPriceFeedContract"
-  },
   {
     "chain": "berachain_mainnet",
     "address": "0x2880aB155794e7179c9eE2e38200202908C17B43",
@@ -918,5 +913,10 @@
     "chain": "celo_sepolia_testnet",
     "address": "0x2880aB155794e7179c9eE2e38200202908C17B43",
     "type": "EvmPriceFeedContract"
+  },
+  {
+    "chain": "monad_testnet",
+    "address": "0x2880aB155794e7179c9eE2e38200202908C17B43",
+    "type": "EvmPriceFeedContract"
   }
-]
+]

contract_manager/src/store/contracts/EvmWormholeContracts.json

@@ -749,11 +749,6 @@
     "address": "0xb27e5ca259702f209a29225d0eDdC131039C9933",
     "type": "EvmWormholeContract"
   },
-  {
-    "chain": "monad_testnet",
-    "address": "0xb27e5ca259702f209a29225d0eDdC131039C9933",
-    "type": "EvmWormholeContract"
-  },
   {
     "chain": "berachain_mainnet",
     "address": "0xb27e5ca259702f209a29225d0eDdC131039C9933",
@@ -928,5 +923,10 @@
     "chain": "celo_sepolia_testnet",
     "address": "0xb27e5ca259702f209a29225d0eDdC131039C9933",
     "type": "EvmWormholeContract"
+  },
+  {
+    "chain": "monad_testnet",
+    "address": "0xb27e5ca259702f209a29225d0eDdC131039C9933",
+    "type": "EvmWormholeContract"
   }
-]
+]