Merge pull request #512 from connext/gas-limit-arbitrum

Gas limit
connext · Nov 10, 2021 · dc8a10d · dc8a10d
2 parents 612e77a + d1fa95f
commit dc8a10d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/packages/sdk/src/sdk.ts b/packages/sdk/src/sdk.ts
@@ -34,7 +34,7 @@ import {
   CancelParams,
   GetTransferQuote,
 } from "./types";
-import { signFulfillTransactionPayload, encodeAuctionBid, ethereumRequest } from "./utils";
+import { signFulfillTransactionPayload, encodeAuctionBid, ethereumRequest, getGasLimit } from "./utils";
 import { SubgraphEvent, SubgraphEvents } from "./subgraph/subgraph";
 import { NxtpSdkBase } from "./sdkBase";
 
@@ -351,8 +351,9 @@ export class NxtpSdk {
     }
 
     const approveTxReq = await this.sdkBase.approveForPrepare(transferParams, infiniteApprove);
+    const gasLimit = getGasLimit(receivingChainId);
     if (approveTxReq) {
-      const approveTx = await connectedSigner.sendTransaction(approveTxReq);
+      const approveTx = await connectedSigner.sendTransaction({ ...approveTxReq, gasLimit });
       this.evts.SenderTokenApprovalSubmitted.post({
         assetId: sendingAssetId,
         chainId: sendingChainId,
@@ -387,7 +388,7 @@ export class NxtpSdk {
     // Prepare sender side tx
     const prepareReq = await this.sdkBase.prepareTransfer(transferParams);
     this.logger.warn("Generated prepareReq", requestContext, methodContext, { prepareReq });
-    const prepareResponse = await connectedSigner.sendTransaction(prepareReq);
+    const prepareResponse = await connectedSigner.sendTransaction({ ...prepareReq, gasLimit });
     this.evts.SenderTransactionPrepareSubmitted.post({
       prepareParams: {
         txData: {

diff --git a/packages/sdk/src/utils.ts b/packages/sdk/src/utils.ts
@@ -15,6 +15,18 @@ import {
   isChainSupportedByGelato as _isChainSupportedByGelato,
 } from "@connext/nxtp-utils";
 
+/**
+ * Get gas limit if it's hardcoded for some chains
+ * @param chainId
+ * @returns Gas Limit
+ */
+export const getGasLimit = (chainId: number): number | undefined => {
+  if (chainId === 42161) {
+    return 10_000_000;
+  }
+  return undefined;
+};
+
 /**
  * Utility to convert the number of hours into seconds
  *

diff --git a/packages/sdk/test/unit/sdk.spec.ts b/packages/sdk/test/unit/sdk.spec.ts
@@ -380,7 +380,7 @@ describe("NxtpSdk", () => {
         bidSignature,
         gasFeeInReceivingToken,
       });
-      expect(signer.sendTransaction).to.be.calledOnceWithExactly(PrepareReq);
+      expect(signer.sendTransaction).to.be.calledOnceWithExactly({ ...PrepareReq, gasLimit: undefined });
       expect(res.prepareResponse).to.be.deep.eq(TxResponse);
     });
 
@@ -393,8 +393,8 @@ describe("NxtpSdk", () => {
         gasFeeInReceivingToken,
       });
 
-      expect(signer.sendTransaction).to.be.calledWithExactly(ApproveReq);
-      expect(signer.sendTransaction).to.be.calledWithExactly(PrepareReq);
+      expect(signer.sendTransaction).to.be.calledWithExactly({ ...ApproveReq, gasLimit: undefined });
+      expect(signer.sendTransaction).to.be.calledWithExactly({ ...PrepareReq, gasLimit: undefined });
       expect(res.prepareResponse).to.be.deep.eq(TxResponse);
     });
   });