accountNextIndex with pending tx (AcalaNetwork#224)

* accountNextIndex with pending tx * rename var
interlay · Apr 3, 2023 · 73ee70d · 73ee70d
1 parent e191c1e
commit 73ee70d
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 12 deletions.
diff --git a/e2e/src/system.test.ts b/e2e/src/system.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 
-import { api, env, expectJson, setupApi } from './helper'
+import { api, dev, env, expectJson, setupApi, testingPairs } from './helper'
 
 setupApi(env.mandala)
 
@@ -15,8 +15,30 @@ describe('system rpc', () => {
       isSyncing: false,
       shouldHavePeers: false,
     })
-    expect((await api.rpc.system.accountNextIndex('5EYCAe5fiQJsoMt16QywpBQwyn5cgfkXFFJApwwKPXFoF2h7')).toNumber()).toBe(
-      0
-    )
+  })
+
+  it('get correct account next index', async () => {
+    const { alice } = testingPairs()
+
+    const nonce = async (address: string) => (await api.query.system.account(address)).nonce.toNumber()
+
+    const accountNextIndex = async (address: string) => (await api.rpc.system.accountNextIndex(address)).toNumber()
+
+    // send tx
+    await api.tx.balances.transfer(alice.address, 0).signAndSend(alice)
+
+    expect(await nonce(alice.address)).toBe(0)
+    expect(await accountNextIndex(alice.address)).toBe(1)
+
+    await dev.newBlock()
+
+    expect(await nonce(alice.address)).toBe(1)
+    expect(await accountNextIndex(alice.address)).toBe(1)
+
+    // send another tx
+    await api.tx.balances.transfer(alice.address, 0).signAndSend(alice)
+
+    expect(await nonce(alice.address)).toBe(1)
+    expect(await accountNextIndex(alice.address)).toBe(2)
   })
 })
diff --git a/packages/chopsticks/src/blockchain/index.ts b/packages/chopsticks/src/blockchain/index.ts
@@ -157,7 +157,7 @@ export class Blockchain {
     const registry = await this.head.registry
     const validity: TransactionValidity = registry.createType('TransactionValidity', res.result)
     if (validity.isOk) {
-      this.#txpool.submitExtrinsic(extrinsic)
+      await this.#txpool.submitExtrinsic(extrinsic)
       return blake2AsHex(extrinsic, 256)
     }
     throw validity.asErr

diff --git a/packages/chopsticks/src/blockchain/txpool.ts b/packages/chopsticks/src/blockchain/txpool.ts
@@ -4,6 +4,7 @@ import _ from 'lodash'
 
 import { Blockchain } from '.'
 import { Deferred, defer } from '../utils'
+import { GenericExtrinsic } from '@polkadot/types'
 import { InherentProvider } from './inherent'
 import { buildBlock } from './block-builder'
 
@@ -35,7 +36,7 @@ export interface BuildBlockParams {
 export class TxPool {
   readonly #chain: Blockchain
 
-  readonly #pool: HexString[] = []
+  readonly #pool: { extrinsic: HexString; signer: string }[] = []
   readonly #ump: Record<number, HexString[]> = {}
   readonly #dmp: DownwardMessage[] = []
   readonly #hrmp: Record<number, HorizontalMessage[]> = {}
@@ -55,15 +56,25 @@ export class TxPool {
   }
 
   get pendingExtrinsics(): HexString[] {
-    return this.#pool
+    return this.#pool.map(({ extrinsic }) => extrinsic)
   }
 
-  submitExtrinsic(extrinsic: HexString) {
-    this.#pool.push(extrinsic)
+  pendingExtrinsicsBy(address: string): HexString[] {
+    return this.#pool.filter(({ signer }) => signer === address).map(({ extrinsic }) => extrinsic)
+  }
+
+  async submitExtrinsic(extrinsic: HexString) {
+    this.#pool.push({ extrinsic, signer: await this.#getSigner(extrinsic) })
 
     this.#maybeBuildBlock()
   }
 
+  async #getSigner(extrinsic: HexString) {
+    const registry = await this.#chain.head.registry
+    const tx = registry.createType<GenericExtrinsic>('GenericExtrinsic', extrinsic)
+    return tx.signer.toString()
+  }
+
   submitUpwardMessages(id: number, ump: HexString[]) {
     if (!this.#ump[id]) {
       this.#ump[id] = []
@@ -114,7 +125,7 @@ export class TxPool {
   }
 
   async buildBlock(params?: Partial<BuildBlockParams>) {
-    const transactions = params?.transactions || this.#pool.splice(0)
+    const transactions = params?.transactions || this.#pool.splice(0).map(({ extrinsic }) => extrinsic)
     const upwardMessages = params?.upwardMessages || { ...this.#ump }
     const downwardMessages = params?.downwardMessages || this.#dmp.splice(0)
     const horizontalMessages = params?.horizontalMessages || { ...this.#hrmp }
@@ -177,7 +188,9 @@ export class TxPool {
         this.event.emit(APPLY_EXTRINSIC_ERROR, [extrinsic, error])
       }
     )
-    this.#pool.push(...pendingExtrinsics)
+    for (const extrinsic of pendingExtrinsics) {
+      this.#pool.push({ extrinsic, signer: await this.#getSigner(extrinsic) })
+    }
     await this.#chain.setHead(newBlock)
 
     this.#pendingBlocks.shift()

diff --git a/packages/chopsticks/src/rpc/substrate/system.ts b/packages/chopsticks/src/rpc/substrate/system.ts
@@ -41,7 +41,8 @@ const handlers: Handlers = {
     const registry = await head.registry
     const account = registry.createType('AccountId', address)
     const result = await head.call('AccountNonceApi_account_nonce', [account.toHex()])
-    return registry.createType<Index>('Index', hexToU8a(result.result)).toNumber()
+    const nonce = registry.createType<Index>('Index', hexToU8a(result.result)).toNumber()
+    return nonce + context.chain.txPool.pendingExtrinsicsBy(address).length
   },
 }