Merge pull request #225 from SocketDotTech/fix/tx-overrides

add global overrides for tx

Author: arthcp

hardhat.config.ts

@@ -17,7 +17,7 @@ import { resolve } from "path";
 import fs from "fs";
 
 import "./tasks/accounts";
-import { gasPrice, getJsonRpcUrl } from "./scripts/constants/networks";
+import { getJsonRpcUrl } from "./scripts/constants/networks";
 import { ChainKey, chainKeyToSlug } from "./src";
 
 const dotenvConfigPath: string = process.env.DOTENV_CONFIG_PATH || "./.env";
@@ -33,7 +33,6 @@ function getChainConfig(chain: keyof typeof chainKeyToSlug): NetworkUserConfig {
   return {
     accounts: [`0x${privateKey}`],
     chainId: chainKeyToSlug[chain],
-    gasPrice: gasPrice[chain] ? gasPrice[chain] : "auto",
     url: getJsonRpcUrl(chain),
   };
 }

scripts/constants/networks.ts

@@ -6,23 +6,6 @@ import { ChainKey, networkToChainSlug } from "../../src";
 const dotenvConfigPath: string = process.env.DOTENV_CONFIG_PATH || "./.env";
 dotenvConfig({ path: resolve(__dirname, dotenvConfigPath) });
 
-export const gasPrice: {
-  [chainKEY in ChainKey]?: number | "auto" | undefined;
-} = {
-  [ChainKey.ARBITRUM]: "auto",
-  [ChainKey.ARBITRUM_GOERLI]: "auto",
-  [ChainKey.OPTIMISM]: "auto",
-  [ChainKey.OPTIMISM_GOERLI]: "auto",
-  [ChainKey.AVALANCHE]: "auto",
-  [ChainKey.BSC]: "auto",
-  [ChainKey.BSC_TESTNET]: "auto",
-  [ChainKey.MAINNET]: "auto",
-  [ChainKey.GOERLI]: "auto",
-  [ChainKey.POLYGON_MAINNET]: "auto",
-  [ChainKey.POLYGON_MUMBAI]: "auto",
-  [ChainKey.HARDHAT]: "auto",
-};
-
 export const chainSlugKeys: string[] = Object.values(networkToChainSlug);
 
 export function getJsonRpcUrl(chain: ChainKey): string {

scripts/deploy/checkRoles.ts

@@ -31,6 +31,7 @@ import {
   transmitterAddresses,
   watcherAddresses,
 } from "./config";
+import { overrides } from "./config";
 
 let roleStatus: any = {};
 
@@ -154,6 +155,7 @@ const executeRoleTransactions = async (
     let tx = await wallet.sendTransaction({
       to: contractAddress,
       data,
+      ...overrides[chainId],
     });
     console.log(
       `chain: ${chainId}`,

scripts/deploy/config.ts

@@ -37,6 +37,11 @@ export const filterChains: number[] = chains;
 export const capacitorType = 1;
 export const maxPacketLength = 1;
 
+export const gasLimit = 30_000_000;
+export const type = 0;
+export const gasMultiplier = 1;
+export const gasPrice = "auto";
+
 export const transmitterAddresses = {
   [DeploymentMode.DEV]: "0x138e9840861C983DC0BB9b3e941FB7C0e9Ade320",
   [DeploymentMode.SURGE]: "0x22883bEF8302d50Ac76c6F6e048965Cd4413EBb7",
@@ -54,3 +59,66 @@ export const executorAddresses = {
   [DeploymentMode.SURGE]: "0x3051Aa7F267bF425A4e8bF766750D60391F014B4",
   [DeploymentMode.PROD]: "0x557E729E55d49E767c11982d026a63aBFD930Ac9",
 };
+
+export const overrides = {
+  [ChainSlug.ARBITRUM]: {
+    type,
+    gasPrice,
+    gasLimit,
+    gasMultiplier,
+  },
+  [ChainSlug.ARBITRUM_GOERLI]: {
+    type,
+    gasPrice,
+    gasLimit,
+    gasMultiplier,
+  },
+  [ChainSlug.OPTIMISM]: {
+    type,
+    gasPrice,
+    gasLimit,
+    gasMultiplier,
+  },
+  [ChainSlug.OPTIMISM_GOERLI]: {
+    type,
+    gasPrice,
+    gasLimit,
+    gasMultiplier,
+  },
+  [ChainSlug.BSC]: {
+    type,
+    gasPrice,
+    gasLimit,
+    gasMultiplier,
+  },
+  [ChainSlug.BSC_TESTNET]: {
+    type,
+    gasPrice,
+    gasLimit,
+    gasMultiplier,
+  },
+  [ChainSlug.MAINNET]: {
+    type,
+    gasPrice,
+    gasLimit,
+    gasMultiplier,
+  },
+  [ChainSlug.GOERLI]: {
+    type,
+    gasPrice,
+    gasLimit,
+    gasMultiplier,
+  },
+  [ChainSlug.POLYGON_MAINNET]: {
+    type,
+    gasPrice,
+    gasLimit,
+    gasMultiplier,
+  },
+  [ChainSlug.POLYGON_MUMBAI]: {
+    type,
+    gasPrice,
+    gasLimit,
+    gasMultiplier,
+  },
+};

scripts/deploy/configure.ts

@@ -21,6 +21,7 @@ import {
 } from "../../src";
 import registerSwitchBoard from "./scripts/registerSwitchboard";
 import { capacitorType, chains, maxPacketLength, mode } from "./config";
+import { overrides } from "./config";
 
 export const main = async () => {
   try {
@@ -185,7 +186,9 @@ const setRemoteSwitchboards = async (addresses) => {
 
           const tx = await sbContract
             .connect(socketSigner)
-            [functionName](dstSwitchboardAddress);
+            [functionName](dstSwitchboardAddress, {
+              ...overrides[await socketSigner.getChainId()],
+            });
           console.log(tx.hash);
           await tx.wait();
         }

scripts/deploy/connect.ts

@@ -17,6 +17,7 @@ import {
 import { mode } from "./config";
 import { Contract, Wallet } from "ethers";
 import { getSwitchboardAddress } from "../../src";
+import { overrides } from "./config";
 
 const chains = [...TestnetIds, ...MainnetIds];
 
@@ -88,7 +89,8 @@ export const main = async () => {
         const tx = await counter.setSocketConfig(
           sibling,
           siblingCounter,
-          switchboard
+          switchboard,
+          { ...overrides[await socketSigner.getChainId()] }
         );
 
         console.log(

scripts/deploy/scripts/registerSwitchboard.ts

@@ -3,6 +3,7 @@ import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 
 import { createObj, getInstance } from "../utils";
 import { ChainSlug, ChainSocketAddresses } from "../../../src";
+import { overrides } from "../config";
 
 export default async function registerSwitchBoard(
   switchBoardAddress: string,
@@ -29,7 +30,8 @@ export default async function registerSwitchBoard(
           switchBoardAddress,
           maxPacketLength,
           remoteChainSlug,
-          capacitorType
+          capacitorType,
+          { ...overrides[await signer.getChainId()] }
         );
       console.log(
         `Registering Switchboard ${switchBoardAddress}: ${registerTx.hash}`

scripts/deploy/utils/utils.ts

@@ -12,6 +12,7 @@ import {
   DeploymentMode,
 } from "../../../src";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
+import { overrides } from "../config";
 
 export const deploymentsPath = path.join(__dirname, `/../../../deployments/`);
 
@@ -84,8 +85,9 @@ export async function deployContractWithArgs(
     const Contract: ContractFactory = await ethers.getContractFactory(
       contractName
     );
-
-    const contract: Contract = await Contract.connect(signer).deploy(...args);
+    const contract: Contract = await Contract.connect(signer).deploy(...args, {
+      ...overrides[await signer.getChainId()],
+    });
     await contract.deployed();
     return contract;
   } catch (error) {