added use of accountNonceApi (#5915)

polkadot-js · Jun 24, 2024 · 058a3ac · 058a3ac
1 parent 5a4d11c
commit 058a3ac
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/packages/api-derive/src/tx/signingInfo.ts b/packages/api-derive/src/tx/signingInfo.ts
@@ -29,9 +29,13 @@ function latestNonce (api: DeriveApi, address: string): Observable<Index> {
 }
 
 function nextNonce (api: DeriveApi, address: string): Observable<Index> {
-  return api.rpc.system?.accountNextIndex
-    ? api.rpc.system.accountNextIndex(address)
-    : latestNonce(api, address);
+  if (api.call.accountNonceApi) {
+    return api.call.accountNonceApi.accountNonce(address);
+  } else {
+    return api.rpc.system?.accountNextIndex
+      ? api.rpc.system.accountNextIndex(address)
+      : latestNonce(api, address);
+  }
 }
 
 function signingHeader (api: DeriveApi): Observable<Header> {