瀏覽代碼

基本测试ok,放服务器测试

龚成明 2 年之前
父節點
當前提交
f088515d8b
共有 3 個文件被更改,包括 17 次插入6 次删除
  1. 3 3
      scripts/generate/index.js
  2. 8 2
      scripts/lib/lp-lib.js
  3. 6 1
      scripts/lib/token-lib.js

+ 3 - 3
scripts/generate/index.js

@@ -37,10 +37,10 @@ class LpGenerate {
           const token0 = await this.tokenLib.parseToken(lp, true)
           const token1 = await this.tokenLib.parseToken(lp, false)
           // 3.2.2.3 更新或新增lp
-          logger.info(await this.lpLib.saveLp(factory, lp))
+          await this.lpLib.saveLp(factory, lp)
           // 3.3.2.4 更新或新增token
-          logger.info(await this.tokenLib.saveToken(token0))
-          logger.info(await this.tokenLib.saveToken(token1))
+          await this.tokenLib.saveToken(token0)
+          await this.tokenLib.saveToken(token1)
 
           logger.debug(`${position + 1} / ${pairsLength}, ${lp.name}-${lp.hash}-${this.chain.networkName}`)
         } else {

+ 8 - 2
scripts/lib/lp-lib.js

@@ -28,13 +28,16 @@ module.exports = class LpLib {
   }
 
   async saveLp(factory, lp) {
+    let saveRst = undefined
     if (factory.version === 'univ2') {
-      return await this.v2LpModel.appendOrUpdate(lp)
+      saveRst = await this.v2LpModel.appendOrUpdate(lp)
     } else if (factory.version === 'univ3') {
-      return await this.v3LpModel.appendOrUpdate(lp)
+      saveRst = await this.v3LpModel.appendOrUpdate(lp)
     } else {
       throw Error(`Unknown factory version: ${factory.version}, hash is: ${factory.hash}.`)
     }
+
+    if (!saveRst.state) throw Error(saveRst.msg)
   }
 
   getEffectiveLp(factory, position, lp) {
@@ -59,6 +62,9 @@ module.exports = class LpLib {
     lp.decimals0 = parseInt(lp.decimals0)
     lp.decimals1 = parseInt(lp.decimals1)
 
+    // 链信息
+    lp.chainId = this.chain.id
+
     return lp
   }
 

+ 6 - 1
scripts/lib/token-lib.js

@@ -41,6 +41,9 @@ module.exports = class TokenLib {
     token.name = this.getEffectiveName(token.name)
     token.level = TokenLib.LEVEL.INIT
 
+    // 链信息
+    token.chainId = this.chain.id
+
     return token
   }
 
@@ -53,6 +56,8 @@ module.exports = class TokenLib {
   }
 
   async saveToken(token) {
-    return await this.tokenModel.appendOrUpdate(token)
+    const saveRst = await this.tokenModel.appendOrUpdate(token)
+
+    if (!saveRst.state) throw Error(saveRst.msg)
   }
 }