US-2050 Updated rifwallet to include an extra pendingTxsCount. Update…

…d rif-relay-sdk to use pendingTxsCount to increase the nonce of the smartwallet. (#123)
rsksmart · Dec 15, 2023 · 48d4f9b · 48d4f9b
1 parent 39fedc5
commit 48d4f9b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rsksmart/rif-wallet-core",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "RIF Wallet Core",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/core/src/RIFWallet.ts b/packages/core/src/RIFWallet.ts
@@ -96,7 +96,9 @@ export class RIFWallet extends Signer implements TypedDataSigner {
           ...transactionRequest,
           gasPrice: overriddenOptions.gasPrice,
           gasLimit: overriddenOptions.gasLimit,
-        }, overriddenOptions.tokenPayment)
+        }, overriddenOptions.tokenPayment,
+        overriddenOptions.pendingTxsCount
+        )
       }
 
       // direct execute transaction paying gas with EOA wallet:

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -16,6 +16,7 @@ export type OverriddableTransactionOptions = {
   gasLimit: BigNumberish,
   gasPrice: BigNumberish,
   tokenPayment?: RelayPayment
+  pendingTxsCount?: number
 }
 
 export type SendTransactionRequest = IncomingRequest<

diff --git a/packages/rif-relay-sdk/package.json b/packages/rif-relay-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rsksmart/rif-relay-light-sdk",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/rif-relay-sdk/src/RifRelaySDK/RifRelaySDK.ts b/packages/rif-relay-sdk/src/RifRelaySDK/RifRelaySDK.ts
@@ -107,7 +107,8 @@ export class RIFRelaySDK {
 
   private createRelayRequest = async (
     tx: TransactionRequest,
-    payment: RelayPayment
+    payment: RelayPayment,
+    pendingTxsCount = 0
   ): Promise<RelayRequest> => {
     const gasPrice = this.checkTransactionGasPrice(tx.gasPrice)
     const nonce = await this.smartWallet.nonce()
@@ -127,6 +128,7 @@ export class RIFRelaySDK {
         ? estimated.sub(INTERNAL_TRANSACTION_ESTIMATE_CORRECTION)
         : estimated
     const internalCallCost = Math.round(correction.toNumber() * 1.01)
+    const updatedNonceWithPendingTxs = nonce.add(pendingTxsCount)
 
     const relayRequest: RelayRequest = {
       request: {
@@ -136,7 +138,7 @@ export class RIFRelaySDK {
         data: tx.data?.toString() || '0x',
         value: tx.value?.toString() || '0',
         gas: internalCallCost.toString(),
-        nonce: nonce.toString(),
+        nonce: updatedNonceWithPendingTxs.toString(),
         tokenContract: tokenContract.toLowerCase(),
         tokenAmount: tokenAmount.toString(),
         tokenGas: tokenGas.toString(),
@@ -180,13 +182,14 @@ export class RIFRelaySDK {
 
   sendRelayTransaction = async (
     tx: TransactionRequest,
-    payment: RelayPayment
+    payment: RelayPayment,
+    pendingTxsCount = 0
   ): Promise<TransactionResponse> => {
     if (Object.is(this.serverConfig, null)) {
       await this.getServerConfig()
     }
 
-    const request = await this.createRelayRequest(tx, payment)
+    const request = await this.createRelayRequest(tx, payment, pendingTxsCount)
     const signature = await this.signRelayRequest(request, false)
 
     return this.sendRequestToRelay(request, signature).then((hash: string) =>
@@ -291,7 +294,8 @@ export class RIFRelaySDK {
 
   estimateTransactionCost = async (
     tx: TransactionRequest,
-    tokenContract: Address
+    tokenContract: Address,
+    pendingTxsCount = 0
   ): Promise<BigNumber> => {
     if (Object.is(this.serverConfig, null)) {
       await this.getServerConfig()
@@ -304,7 +308,7 @@ export class RIFRelaySDK {
 
     let request
     try {
-      const relayRequest = await this.createRelayRequest(tx, payment)
+      const relayRequest = await this.createRelayRequest(tx, payment, pendingTxsCount)
       const signature = await this.signRelayRequest(relayRequest, false)
       request = await this.prepareDataForServer(relayRequest, signature)
     } catch (err) {