nonce increment before signing (WIP)

CHANGELOG.md

@@ -1,3 +1,6 @@
+### [0.6.0](https://github.com/useElven/core/releases/tag/v0.6.0) (2023-06-04)
+- improvements for nonce incrementation to let triggering multiple transactions at the same time. The logic is slightly different, but it shouldn't break anything
+
 ### [0.5.0](https://github.com/useElven/core/releases/tag/v0.5.0) (2023-05-28)
 - Breaking: switch to using sdk-native-auth-client instead passing string-based login tokens. There is no fallback or other option, so it is a breaking change. Native Auth is recommended. The old way of doing that will be deprecated. Please freeze the previous version if you are not ready to switch yet
 - update dependencies

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@useelven/core",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Core hooks for MultiversX React DApps",
   "license": "MIT",
   "author": "Julian Ćwirko <julian.io>",

src/hooks/common-helpers/sendTxOperations.ts

@@ -25,24 +25,24 @@ export interface TransactionCallbackParams {
 }
 
 export const postSendTxOperations = async (
-  tx: Transaction,
+  signedTx: Transaction,
   setTransaction: Dispatch<SetStateAction<Transaction | null>>,
   setTxResult: Dispatch<SetStateAction<ITransactionOnNetwork | null>>,
   apiNetworkProvider: NetworkState['apiNetworkProvider'],
   cb?: (params: TransactionCallbackParams) => void
 ) => {
+  setTransaction(signedTx);
   if (apiNetworkProvider) {
     const transactionWatcher = new TransactionWatcher(apiNetworkProvider);
-    const txResult = await transactionWatcher.awaitCompleted(tx);
-    setTransaction(tx);
+    const txResult = await transactionWatcher.awaitCompleted(signedTx);
+    setTransaction(signedTx);
     setTxResult(txResult);
-    cb?.({ transaction: tx, pending: false, txResult });
-    const sender = tx.getSender();
+    cb?.({ transaction: signedTx, pending: false, txResult });
+    const sender = signedTx.getSender();
     const senderAccount = new Account(sender);
     const userAccountOnNetwork = await apiNetworkProvider.getAccount(sender);
     senderAccount.update(userAccountOnNetwork);
     setAccountState('address', senderAccount.address.bech32());
-    setAccountState('nonce', senderAccount.getNonceThenIncrement());
     setAccountState('balance', senderAccount.balance.toString());
   }
 };
@@ -66,8 +66,6 @@ export const sendTxOperations = async (
       await dappProvider.signTransaction(tx, {
         callbackUrl: webWalletRedirectUrl || currentUrl,
       });
-      // web wallet provider doesn't return signed transaction
-      signedTx = tx;
     }
     if (dappProvider instanceof ExtensionProvider) {
       signedTx = await dappProvider.signTransaction(tx);
@@ -80,7 +78,6 @@ export const sendTxOperations = async (
     }
     if (loginInfoSnap.loginMethod !== LoginMethodsEnum.wallet) {
       await apiNetworkProvider.sendTransaction(signedTx);
-      setTransaction(signedTx);
       await postSendTxOperations(
         signedTx,
         setTransaction,

src/hooks/common-helpers/useWebWalletTxSend.tsx

@@ -12,6 +12,7 @@ import {
 import { errorParse } from '../../utils/errorParse';
 import { ApiNetworkProvider } from '@multiversx/sdk-network-providers/out';
 import { useAccount } from '../useAccount';
+import { setAccountState } from '../../store/auth';
 import { useNetwork } from '../useNetwork';
 
 interface UseWebWalletTxSendProps {
@@ -56,7 +57,7 @@ export const useWebWalletTxSend = ({
         setPending(true);
         cb?.({ pending: true });
         const transaction = Transaction.fromPlainObject(transactionObj);
-        transaction.setNonce(currentNonce);
+
         try {
           await networkStateSnap.apiNetworkProvider.sendTransaction(
             transaction
@@ -76,6 +77,7 @@ export const useWebWalletTxSend = ({
         } finally {
           setPending(false);
           cb?.({ pending: false });
+          setAccountState('nonce', currentNonce + 1);
         }
       }
     };

src/hooks/useExtensionLogin.tsx

@@ -87,7 +87,6 @@ export const useExtensionLogin = (params?: Login) => {
           userAccountInstance.update(userAccountOnNetwork);
 
           setAccountState('address', userAccountInstance.address.bech32());
-
           setAccountState('nonce', userAccountInstance.nonce.valueOf());
           setAccountState('balance', userAccountInstance.balance.toString());
         } catch (e) {

src/hooks/useTransaction.tsx

@@ -7,13 +7,15 @@ import {
   IGasLimit,
   ITransactionValue,
   ITransactionOnNetwork,
+  Account,
 } from '@multiversx/sdk-core';
 import { useWebWalletTxSend } from './common-helpers/useWebWalletTxSend';
 import {
   TransactionCallbackParams,
   sendTxOperations,
 } from './common-helpers/sendTxOperations';
 import { DappProvider } from '../types/network';
+import { setAccountState } from '../store/auth';
 import { ApiNetworkProvider } from '@multiversx/sdk-network-providers/out';
 import { useConfig } from './useConfig';
 import { useLoginInfo } from './useLoginInfo';
@@ -71,17 +73,21 @@ export function useTransaction(
       setPending(true);
       cb?.({ pending: true });
 
+      const sender = new Address(accountSnap.address);
+
       const tx = new Transaction({
         nonce: currentNonce,
         receiver: new Address(address),
         gasLimit,
         chainID: configStateSnap.shortId || 'D',
         data,
         value: value || 0,
-        sender: new Address(accountSnap.address),
+        sender,
       });
 
-      tx.setNonce(currentNonce);
+      const senderAccount = new Account(sender);
+      senderAccount.incrementNonce();
+      setAccountState('nonce', currentNonce + 1);
 
       sendTxOperations(
         networkStateSnap.dappProvider as DappProvider,