Move rpc call into nextNonce

It isn't necessary to slow down use of workflowUtils by calling this method
EdgeApp · Nov 5, 2024 · 7ad18ee · 7ad18ee
1 parent 32f1c43
commit 7ad18ee
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/src/plugins/stake-plugins/generic/policyAdapters/EthereumKilnAdaptor.ts b/src/plugins/stake-plugins/generic/policyAdapters/EthereumKilnAdaptor.ts
@@ -63,8 +63,13 @@ export const makeEthereumKilnAdapter = (policyConfig: StakePolicyConfig<Ethereum
     const walletSigner = new EdgeWalletSigner(wallet, provider)
     const walletAddress = await walletSigner.getAddress()
 
-    let txCount: number = await walletSigner.getTransactionCount('pending')
-    const nextNonce = (): number => txCount++
+    let txCount: number | undefined
+    const nextNonce = async (): Promise<number> => {
+      if (txCount == null) {
+        txCount = await walletSigner.getTransactionCount('pending')
+      }
+      return txCount++
+    }
 
     const feeData = await provider.getFeeData()
     const maxFeePerGas = feeData.maxFeePerGas !== null ? feeData.maxFeePerGas : undefined
@@ -108,7 +113,7 @@ export const makeEthereumKilnAdapter = (policyConfig: StakePolicyConfig<Ethereum
         gasLimit: '500000',
         maxFeePerGas,
         maxPriorityFeePerGas,
-        nonce: nextNonce()
+        nonce: await nextNonce()
       })
 
       return await prepareChangeQuote(walletSigner, tx, allocations)
@@ -121,7 +126,7 @@ export const makeEthereumKilnAdapter = (policyConfig: StakePolicyConfig<Ethereum
         gasLimit: '250000', // Typically uses 190000-225000 gas
         maxFeePerGas,
         maxPriorityFeePerGas,
-        nonce: nextNonce(),
+        nonce: await nextNonce(),
         value: requestNativeAmount
       })
 
@@ -144,7 +149,7 @@ export const makeEthereumKilnAdapter = (policyConfig: StakePolicyConfig<Ethereum
         gasLimit: '500000',
         maxFeePerGas,
         maxPriorityFeePerGas,
-        nonce: nextNonce()
+        nonce: await nextNonce()
       })
 
       const allocations: QuoteAllocation[] = [

diff --git a/src/plugins/stake-plugins/generic/policyAdapters/GlifInfinityPoolAdapter.ts b/src/plugins/stake-plugins/generic/policyAdapters/GlifInfinityPoolAdapter.ts
@@ -78,8 +78,13 @@ export const makeGlifInfinityPoolAdapter = (policyConfig: StakePolicyConfig<Glif
     const walletSigner = new EdgeWalletSigner(wallet, provider)
     const walletAddress = await walletSigner.getAddress()
 
-    let txCount: number = await walletSigner.getTransactionCount('pending')
-    const nextNonce = (): number => txCount++
+    let txCount: number | undefined
+    const nextNonce = async (): Promise<number> => {
+      if (txCount == null) {
+        txCount = await walletSigner.getTransactionCount('pending')
+      }
+      return txCount++
+    }
 
     const feeData = await provider.getFeeData()
     const maxFeePerGas = feeData.maxFeePerGas !== null ? feeData.maxFeePerGas : undefined
@@ -109,7 +114,7 @@ export const makeGlifInfinityPoolAdapter = (policyConfig: StakePolicyConfig<Glif
           value: requestNativeAmount,
           maxFeePerGas,
           maxPriorityFeePerGas,
-          nonce: nextNonce(),
+          nonce: await nextNonce(),
           customData: {
             metadata: {
               name: metadataName,
@@ -152,7 +157,7 @@ export const makeGlifInfinityPoolAdapter = (policyConfig: StakePolicyConfig<Glif
           await poolTokenContract.connect(walletSigner).populateTransaction.approve(simpleRampContract.address, expectedLiquidityAmount, {
             maxFeePerGas,
             maxPriorityFeePerGas,
-            nonce: nextNonce(),
+            nonce: await nextNonce(),
             customData: {
               metadata: {
                 name: metadataName,
@@ -170,7 +175,7 @@ export const makeGlifInfinityPoolAdapter = (policyConfig: StakePolicyConfig<Glif
           gasLimit: 250000000,
           maxFeePerGas,
           maxPriorityFeePerGas,
-          nonce: nextNonce(),
+          nonce: await nextNonce(),
           customData: {
             metadata: {
               name: metadataName,