Skip to content

Colossus - accountNextIndex() instead of nonce caching #1352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shamil-gadelshin merged 1 commit into from
Sep 15, 2020
Merged

Colossus - accountNextIndex() instead of nonce caching #1352

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 1 addition & 29 deletions storage-node/packages/runtime-api/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ class RuntimeApi {

this.asyncLock = new AsyncLock()

// Keep track locally of account nonces.
this.nonces = {}

// The storage provider id to use
this.storageProviderId = parseInt(options.storageProviderId) // u64 instead ?

Expand Down Expand Up @@ -148,28 +145,6 @@ class RuntimeApi {
})
}

// Get cached nonce and use unless system nonce is greater, to avoid stale nonce if
// there was a long gap in time between calls to signAndSend during which an external app
// submitted a transaction.
async selectBestNonce(accountId) {
const cachedNonce = this.nonces[accountId]
// In future use this rpc method to take the pending tx pool into account when fetching the nonce
// const nonce = await this.api.rpc.system.accountNextIndex(accountId)
const { nonce } = await this.api.query.system.account(accountId)

const systemNonce = nonce

const bestNonce = cachedNonce && cachedNonce.gte(systemNonce) ? cachedNonce : systemNonce

this.nonces[accountId] = bestNonce

return bestNonce.toNumber()
}

incrementAndSaveNonce(accountId) {
this.nonces[accountId] = this.nonces[accountId].addn(1)
}

/*
* signAndSend() with nonce tracking, to enable concurrent sending of transacctions
* so that they can be included in the same block. Allows you to use the accountId instead
Expand Down Expand Up @@ -213,7 +188,7 @@ class RuntimeApi {

// synchronize access to nonce
await this.executeWithAccountLock(accountId, async () => {
const nonce = await this.selectBestNonce(accountId)
const nonce = await this.api.rpc.system.accountNextIndex(accountId)
const signed = tx.sign(fromKey, { nonce })
const txhash = signed.hash

Expand All @@ -237,9 +212,6 @@ class RuntimeApi {
} else {
debugTx(`Submitted: ${serialized}`)
}

// transaction submitted successfully, increment and save nonce.
this.incrementAndSaveNonce(accountId)
} catch (err) {
const errstr = err.toString()
debugTx(`Rejected: ${errstr} txhash: ${txhash} nonce: ${nonce}`)
Expand Down