update smoldot and fix empty next key (#438)

* update smoldot and fix empty next key

* fix trie empty next key

* lint

* update test

packages/chopsticks/src/utils/signFake.ts

@@ -11,8 +11,7 @@ export const signFakeWithApi = async (
   options: SignFakeOptions = {},
 ) => {
   const nonce = options.nonce ?? (await api.query.system.account(addr)).nonce
-
-  return signFake(tx, addr, {
+  signFake(tx, addr, {
     nonce,
     genesisHash: api.genesisHash,
     runtimeVersion: api.runtimeVersion,
@@ -28,6 +27,4 @@ export const signFake = (tx: GenericExtrinsic, addr: string, options: SignatureO
   tx.signFake(addr, options)
 
   tx.signature.set(mockSignature)
-
-  return tx
 }

packages/core/src/blockchain/storage-layer.ts

@@ -4,7 +4,7 @@ import _ from 'lodash'
 import { Api } from '../api'
 import { KeyValuePair } from '../db/entities'
 import { defaultLogger } from '../logger'
-import KeyCache from '../utils/key-cache'
+import KeyCache, { PREFIX_LENGTH } from '../utils/key-cache'
 
 const logger = defaultLogger.child({ name: 'layer' })
 
@@ -71,7 +71,7 @@ export class RemoteStorageLayer implements StorageLayerProvider {
     if (pageSize > BATCH_SIZE) throw new Error(`pageSize must be less or equal to ${BATCH_SIZE}`)
     logger.trace({ at: this.#at, prefix, pageSize, startKey }, 'RemoteStorageLayer getKeysPaged')
     // can't handle keyCache without prefix
-    if (prefix.length < 66) {
+    if (prefix.length < PREFIX_LENGTH || startKey.length < PREFIX_LENGTH) {
       return this.#api.getKeysPaged(prefix, pageSize, startKey, this.#at)
     }
 

packages/core/src/executor.ts

@@ -13,6 +13,7 @@ import {
   run_task,
 } from '@acala-network/chopsticks-executor'
 import { defaultLogger, truncate } from './logger'
+import { stripChildPrefix } from './utils'
 import _ from 'lodash'
 import type { JsCallback } from '@acala-network/chopsticks-executor'
 
@@ -98,7 +99,7 @@ export const taskHandler = (block: Block): JsCallback => {
         pageSize: 1,
         startKey: key,
       })
-      return nextKey
+      return nextKey && stripChildPrefix(nextKey as HexString)
     },
     offchainGetStorage: async function (key: HexString) {
       if (!block.chain.offchainWorker) throw new Error('offchain worker not found')

packages/e2e/src/crowdloan.redeem.test.ts

@@ -0,0 +1,50 @@
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { testingPairs } from '@acala-network/chopsticks-testing'
+
+import networks from './networks'
+
+describe('Polkadot Crowdloan Refund', async () => {
+  const { alice } = testingPairs()
+  const { api, dev, teardown } = await networks.polkadot({ blockNumber: 17700000, timeout: 400_000 })
+
+  beforeAll(async () => {
+    // make sure crowdloan is ended
+    await dev.newBlock({ unsafeBlockHeight: 17855999, count: 3 })
+
+    // give alice some DOTs for transaction fee
+    await dev.setStorage({
+      System: {
+        Account: [[[alice.address], { providers: 1, data: { free: 1000 * 1e10 } }]],
+      },
+    })
+  }, 200_000)
+
+  it(
+    "should refund Acala's contributers",
+    async () => {
+      // trigger refund
+      await expect(api.tx.crowdloan.refund(3336).signAndSend(alice)).resolves.toBeTruthy()
+      await dev.newBlock()
+
+      // some address get refund
+      expect((await api.query.system.events()).toHuman()).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            event: expect.objectContaining({
+              method: 'Transfer',
+              section: 'balances',
+              data: expect.objectContaining({
+                from: '13UVJyLnbVp77Z2t6qZV4fNpRjDHppL6c87bHcZKG48tKJad',
+                to: '111DbHPUxncZcffEfy1BrtFZNDUzK7hHchLpmJYFEFG4hy1',
+                amount: '1,000,000,000,000',
+              }),
+            }),
+          }),
+        ]),
+      )
+    },
+    { timeout: 400_000 },
+  )
+
+  afterAll(async () => await teardown())
+})

packages/testing/src/index.ts

@@ -49,7 +49,7 @@ export const createConfig = ({
     endpoint,
     port,
     block: blockNumber || blockHash,
-    mockSignatureHost: true,
+    'mock-signature-host': true,
     'build-block-mode': BuildBlockMode.Manual,
     'max-memory-block-count': maxMemoryBlockCount ?? 100,
     db,

vitest.config.ts → vitest.config.mts

@@ -3,10 +3,10 @@ import swc from 'unplugin-swc'
 import tsconfigPaths from 'vite-tsconfig-paths'
 
 export default defineConfig({
-  test: {
-    hookTimeout: 30000,
-    testTimeout: 120000,
-    include: ['packages/**/*.test.ts'],
-  },
-  plugins: [swc.vite(), tsconfigPaths()],
+	test: {
+		hookTimeout: 30000,
+		testTimeout: 120000,
+		include: ['packages/**/*.test.ts'],
+	},
+	plugins: [swc.vite(), tsconfigPaths()],
 })