enable sqlite wal

.gitignore

@@ -123,6 +123,8 @@ dist
 *.sqlite-journal
 *.wasm
 *.db
+*.sqlite-shm
+*.sqlite-wal
 
 .DS_store
 
@@ -135,4 +137,4 @@ lib
 docs-src
 
 # vitepress cache
-.vitepress/cache
+.vitepress/cache

packages/db/src/base-sql.ts

@@ -3,21 +3,6 @@ import { DataSource } from 'typeorm'
 import { HexString } from '@polkadot/util/types'
 
 import { BlockEntity, KeyValuePair } from './db/entities'
-import { retry } from './retry'
-
-function Retryable<T>(
-  _target: any,
-  _propertyKey: string,
-  descriptor: TypedPropertyDescriptor<(...args: any[]) => Promise<T>>,
-) {
-  const originalMethod = descriptor.value
-
-  descriptor.value = async function (...args: any[]): Promise<T> {
-    return retry(() => originalMethod!.apply(this, args))
-  }
-
-  return descriptor
-}
 
 export abstract class BaseSqlDatabase implements Database {
   abstract datasource: Promise<DataSource>
@@ -27,7 +12,6 @@ export abstract class BaseSqlDatabase implements Database {
     await db.destroy()
   }
 
-  @Retryable
   async saveBlock(block: BlockEntry) {
     const db = await this.datasource
 
@@ -49,37 +33,31 @@ export abstract class BaseSqlDatabase implements Database {
     })
   }
 
-  @Retryable
   async queryBlock(hash: HexString): Promise<BlockEntry | null> {
     const db = await this.datasource
     return db.getRepository(BlockEntity).findOne({ where: { hash } })
   }
 
-  @Retryable
   async queryBlockByNumber(number: number): Promise<BlockEntry | null> {
     const db = await this.datasource
     return db.getRepository(BlockEntity).findOne({ where: { number }, order: { number: 'desc' } })
   }
 
-  @Retryable
   async queryHighestBlock(): Promise<BlockEntry | null> {
     const db = await this.datasource
     return db.getRepository(BlockEntity).findOne({ where: {}, order: { number: 'desc' } })
   }
 
-  @Retryable
   async deleteBlock(hash: HexString) {
     const db = await this.datasource
     await db.getRepository(BlockEntity).delete({ hash })
   }
 
-  @Retryable
   async blocksCount(): Promise<number> {
     const db = await this.datasource
     return db.getRepository(BlockEntity).count()
   }
 
-  @Retryable
   async saveStorage(blockHash: HexString, key: HexString, value: HexString | null) {
     const db = await this.datasource
     await db.getRepository(KeyValuePair).upsert(
@@ -92,7 +70,6 @@ export abstract class BaseSqlDatabase implements Database {
     )
   }
 
-  @Retryable
   async queryStorage(blockHash: HexString, key: HexString): Promise<KeyValueEntry | null> {
     const db = await this.datasource
     return db.getRepository(KeyValuePair).findOne({ where: { blockHash, key } })

packages/db/src/db/index.ts

@@ -1,7 +1,6 @@
 import { DataSource } from 'typeorm'
 
 import * as entities from './entities'
-import { retry } from '../retry'
 
 export const openDb = async (dbPath: string): Promise<DataSource> => {
   const source = new DataSource({
@@ -10,9 +9,12 @@ export const openDb = async (dbPath: string): Promise<DataSource> => {
     entities: Object.values(entities),
     synchronize: true,
     logging: false,
+    enableWAL: true, // improve performance and concurrency
+    busyErrorRetry: 1000, // typeorm retry timeout
+    busyTimeout: 5000, // retry for 5 seconds, sqlite PRAGMA busy_timeout
   })
 
-  await retry(() => source.initialize(), 3, 1000)
+  await source.initialize()
 
   return source
 }

packages/e2e/scripts/sidecar-chopsticks.sh

@@ -3,8 +3,8 @@
 set -x
 
 # run chopsticks node
-yarn dev:acala --port 8011 & ACALA_PID=$!
-yarn dev:karura --port 8012 & KARURA_PID=$!
+yarn script:start -c acala --port 8011 & ACALA_PID=$!
+yarn script:start -c karura --port 8012 & KARURA_PID=$!
 
 printf "Waiting for chains to be ready"
 attempts=30 # 5 minutes

tsconfig.base.json

@@ -15,8 +15,6 @@
 		"resolveJsonModule": true,
 		"baseUrl": ".",
 		"composite": true,
-		"emitDecoratorMetadata": true,
-		"experimentalDecorators": true,
 		"paths": {
 			"@acala-network/chopsticks": ["packages/chopsticks/src"],
 			"@acala-network/chopsticks/*": ["packages/chopsticks/src/*"],