Merge pull request #43 from sotatek-dev/develop

Develop

docker-compose.dev.yaml

@@ -93,6 +93,17 @@ services:
     networks:
       - myNetwork
     user: node
+  validate-mina-signature-1:
+    image: mina-bridge:1.0.0
+    command: >
+      sh -c "npm run console validate-mina-bridge-unlock"
+    tty: true
+    restart: always
+    depends_on:
+      - postgres
+    networks:
+      - myNetwork
+    user: node
   postgres:
     container_name: mina-bridge-${NODE_ENV}-postgres
     image: postgres:15.3-alpine3.18

nest-cli.json

@@ -3,6 +3,8 @@
   "collection": "@nestjs/schematics",
   "sourceRoot": "src",
   "compilerOptions": {
-    "deleteOutDir": true
+    "deleteOutDir": true,
+    "assets": ["src/modules/crawler/minaSc/*.js"],
+    "watchAssets": true
   }
 }

package.json

@@ -51,11 +51,11 @@
     "ioredis": "^5.3.2",
     "joi": "^17.11.0",
     "log4js": "^6.9.1",
-    "mina-fungible-token": "0.1.0",
+    "mina-fungible-token": "1.0.0",
     "mina-signer": "^2.1.1",
     "nestjs-console": "^9.0.0",
     "nestjs-typeorm-custom-repository": "^1.1.1",
-    "o1js": "0.18.0",
+    "o1js": "1.6.0",
     "passport": "^0.7.0",
     "passport-jwt": "^4.0.1",
     "pg": "^8.11.3",

src/database/repositories/multi-signature.repository.ts

@@ -11,4 +11,21 @@ import { MultiSignature } from '@modules/crawler/entities/multi-signature.entity
 @EntityRepository(MultiSignature)
 export class MultiSignatureRepository extends BaseRepository<MultiSignature> {
   protected alias: ETableName = ETableName.MULTI_SIGNATURE;
+  public async upsertErrorAndRetryMultiSignature(validator: string, txId: number, errorCode: unknown) {
+    const validatorSignature = await this.findOne({
+      where: { txId, validator },
+    });
+    if (!validatorSignature) {
+      await this.save(
+        new MultiSignature({
+          txId,
+          validator,
+          retry: 1,
+          errorCode,
+        }),
+      );
+    } else {
+      await this.update({ txId, validator }, { retry: ++validatorSignature.retry, errorCode });
+    }
+  }
 }

src/modules/crawler/crawler.console.ts

@@ -49,7 +49,7 @@ export class CrawlerConsole {
     command: 'validate-eth-bridge-unlock',
     description: 'validate ETH Bridge unlock',
   })
-  async handleValidateMinaLockTx() {
+  async handleValidateEthLockTx() {
     try {
       while (true) {
         this.senderEVMBridge.unlockEVMTransaction();
@@ -60,6 +60,21 @@ export class CrawlerConsole {
     }
   }
 
+  @Command({
+    command: 'validate-mina-bridge-unlock',
+    description: 'validate MINA Bridge unlock',
+  })
+  async handleValidateMinaLockTx() {
+    try {
+      while (true) {
+        this.senderMinaBridge.handleValidateUnlockTxMina();
+        await sleep(15);
+      }
+    } catch (error) {
+      this.logger.error(error);
+    }
+  }
+
   @Command({
     command: 'sender-eth-bridge-unlock',
     description: 'sender ETH Bridge unlock',
@@ -74,6 +89,7 @@ export class CrawlerConsole {
       this.logger.error(error);
     }
   }
+
 
   @Command({
     command: 'crawl-mina-bridge-contract',

src/modules/crawler/crawler.minabridge.ts

@@ -15,7 +15,7 @@ import { CrawlContract, EventLog } from '@modules/crawler/entities';
 
 import { LoggerService } from '@shared/modules/logger/logger.service';
 
-import { Bridge } from './minaSc/minaBridgeSC';
+import { Bridge } from './minaSc/Bridge.js';
 
 @Injectable()
 export class SCBridgeMinaCrawler {