chore: fix sudt backend cors & support mysql8 (#567)

ckb-js · Nov 30, 2023 · 3997f2a · 3997f2a
1 parent ef557cb
commit 3997f2a
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/samples/sudt/package.json b/packages/samples/sudt/package.json
@@ -17,6 +17,7 @@
     "http-errors": "2.0.0",
     "koa": "2.14.1",
     "koa-body": "6.0.1",
+    "mysql": "npm:[email protected]",
     "mysql2": "3.6.1",
     "typeorm": "0.3.17"
   },

diff --git a/packages/samples/sudt/src/actors/sudt.model.ts b/packages/samples/sudt/src/actors/sudt.model.ts
@@ -91,7 +91,7 @@ export class SudtModel extends JSONStore<Record<string, never>> {
       return true
     })
     if (currentTotalCapacity.lt(needCapacity)) {
-      inputs = inputs.concat(omnilock.loadCapacity(needCapacity.sub(currentTotalCapacity)))
+      inputs = inputs.concat(omnilock.loadCapacity(needCapacity.sub(currentTotalCapacity)).inputs)
     }
     if (currentTotalSudt.lt(amount)) throw new InternalServerError('not enough sudt balance')
 

diff --git a/packages/samples/sudt/src/bootstrap.ts b/packages/samples/sudt/src/bootstrap.ts
@@ -1,5 +1,6 @@
 import Koa from 'koa'
 import { koaBody } from 'koa-body'
+import cors from '@koa/cors'
 import { getGenesisScriptsConfig, initialKuai } from '@ckb-js/kuai-core'
 import { KoaRouterAdapter, CoR } from '@ckb-js/kuai-io'
 import SudtController from './controllers/sudt.controller'
@@ -34,6 +35,10 @@ const initiateDataSource = async () => {
   return dataSource
 }
 
+process.on('uncaughtException', (error) => {
+  console.log(error)
+})
+
 export const bootstrap = async () => {
   const kuaiCtx = await initialKuai()
   const kuaiEnv = kuaiCtx.getRuntimeEnvironment()
@@ -80,6 +85,7 @@ export const bootstrap = async () => {
 
   const koaRouterAdapter = new KoaRouterAdapter(cor)
 
+  app.use(cors())
   app.use(koaRouterAdapter.routes())
 
   // while (true) {

diff --git a/packages/samples/sudt/src/controllers/account.controller.ts b/packages/samples/sudt/src/controllers/account.controller.ts
@@ -20,6 +20,18 @@ export class AccountController extends BaseController {
     super()
   }
 
+  async getOrCreateAccount(address: string) {
+    const repo = this._dataSource.getRepository(Account)
+    const account = await repo.findOneBy({ address })
+    if (account) {
+      return account
+    }
+
+    appRegistry.findOrBind<OmnilockModel>(new ActorReference('omnilock', `/${getLock(address).args}/`))
+
+    return repo.save(repo.create({ address }))
+  }
+
   @Post('/mint/:typeId')
   async mint(@Body() { from, to, amount }: MintRequest, @Param('typeId') typeId: string) {
     if (!from || from.length === 0 || !to || !amount) {
@@ -45,12 +57,7 @@ export class AccountController extends BaseController {
     if (!address) {
       throw new Request('invalid address')
     }
-
-    const repo = this._dataSource.getRepository(Account)
-    const account = await repo.findBy({ address })
-    if (!account) {
-      repo.save(repo.create({ address }))
-    }
+    await this.getOrCreateAccount(address)
 
     const omniLockModel = appRegistry.findOrBind<OmnilockModel>(
       new ActorReference('omnilock', `/${getLock(address).args}/`),
@@ -82,10 +89,7 @@ export class AccountController extends BaseController {
   @Get('/:address/assets')
   async accountAssets(@Param('address') address: string) {
     const tokens = await this._dataSource.getRepository(Token).find()
-    const account = await this._dataSource.getRepository(Account).findOneBy({ address })
-    if (!account) {
-      throw SudtResponse.err(404, 'account not found')
-    }
+    const account = await this.getOrCreateAccount(address)
 
     const assets = await this._dataSource.getRepository(Asset).findBy({ accountId: account.id })
     const assetsMap = assets.reduce((acc, cur) => {