Merge pull request #115 from planetarium/fix-nonce

fix: fetch next nonce correctly
planetarium · Jul 26, 2024 · f98ac54 · f98ac54
2 parents 628d5fa + 50cda3d
commit f98ac54
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/background/src/wallet/wallet.ts b/background/src/wallet/wallet.ts
@@ -88,7 +88,6 @@ export default class Wallet {
 			"createSequentialWallet",
 			"createPrivateKeyWallet",
 			"sendNCG",
-			"nextNonce",
 			"getPrivateKey",
 			"sign",
 			"signTx",

diff --git a/popup/src/api/background.ts b/popup/src/api/background.ts
@@ -126,9 +126,6 @@ export default {
 		) => {
 			return await callWallet("sendNCG", [sender, receiver, amount, nonce]);
 		},
-		nextNonce: async (address: string) => {
-			return await callWallet<number>("nextNonce", [address]);
-		},
 		getPrivateKey: async (address: string, passphrase: string) => {
 			return await callWallet<string>("getPrivateKey", [address, passphrase]);
 		},

diff --git a/popup/src/views/Send.vue b/popup/src/views/Send.vue
@@ -181,7 +181,7 @@ export default defineComponent({
 				throw new Error("'account' state seems not loaded yet.");
 			}
 			if (await (this.$refs["sendForm"] as VForm).validate()) {
-				this.nonce = await bg.wallet.nextNonce(this.account.address);
+				this.nonce = await bg.graphql("getNextTxNonce", this.account.address);
 				this.confirmDialog = true;
 			}
 		},