Daryl-L · Daryl-L · Dec 27, 2021 · Dec 16, 2021 · Dec 17, 2021 · Dec 17, 2021
diff --git a/docs/use-docker.md b/docs/use-docker.md
@@ -58,10 +58,11 @@ Check <https://hub.docker.com/r/nervos/perkins-tent>.
 
 ```bash
 cd offchain-modules
+# install node modules
+yarn testnet-docker:install
 # generate all configs
 yarn testnet-docker:generate
-# install and build force bridge inside docker
-docker run --rm -v ${offchainModulePath}:/app -v force-bridge-node-modules:/app/node_modules node:14.18.1-bullseye bash -c 'cd /app && yarn build'
+
 cd workdir/testnet-docker
 docker-compose up -d
 ```

diff --git a/eth-contracts/hardhat.config.js b/eth-contracts/hardhat.config.js
@@ -36,6 +36,10 @@ module.exports = {
 
   networks: {
     hardhat: {},
+    bsc_testnet: {
+      network_id: 97,
+      url: `https://data-seed-prebsc-1-s1.binance.org:8545`,
+    },
     geth: {
       url: `http://127.0.0.1:8545`,
       // address [`0x17c4b5CE0605F63732bfd175feCe7aC6b4620FD2`, `0x46beaC96B726a51C5703f99eC787ce12793Dae11`]

diff --git a/offchain-modules/CHANGELOG.md b/offchain-modules/CHANGELOG.md
@@ -0,0 +1,21 @@
+## v0.0.17 (2021-12-24)
+
+### Features
+
+- [bsc compatability support](https://github.com/nervosnetwork/force-bridge/pull/269)
+
+## v0.0.16 (2021-12-20)
+
+### Bug fixes
+
+- [Fix version api of verifiers](https://github.com/nervosnetwork/force-bridge/pull/260)
+- [Better hint of CKB insufficient error message](https://github.com/nervosnetwork/force-bridge/pull/262)
+
+## v0.0.15 (2021-12-03)
+
+### Features
+
+- [CKB2021 address](https://github.com/nervosnetwork/rfcs/pull/239) format compatibility.
+- Readonly mode for watchers. We can seperate the read and write nodes for watchers, thus scale the read nodes to
+  handle more requests.
+- Cross chain assets monitor and audit.
diff --git a/offchain-modules/lerna.json b/offchain-modules/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.0.15",
+  "version": "0.0.17",
   "workspaces": [
     "packages/*"
   ],

diff --git a/offchain-modules/package.json b/offchain-modules/package.json
@@ -59,7 +59,7 @@
     "startDevDockers": "docker-compose -f ../workdir/dev-docker/docker-compose.yml up -d --scale ui=0",
     "startDevDockersWithUi": "docker-compose -f ../workdir/dev-docker/docker-compose.yml up -d",
     "destroyDevDockers": "docker-compose -f ../workdir/dev-docker/docker-compose.yml down",
-    "testnet-docker:generate": "DOTENV_PATH=../workdir/testnet-docker/.env ts-node packages/scripts/src/testnetDocker.ts",
+    "testnet-docker:generate": "docker run --rm -e FORCE_BRIDGE_PROJECT_DIR=$(dirname \"$(pwd)\") -v $(dirname \"$(pwd)\"):/app -v force-bridge-node-modules:/app/offchain-modules/node_modules node:14.18.1-bullseye bash -c 'cd /app/offchain-modules && DOTENV_PATH=../workdir/testnet-docker/.env npx ts-node packages/scripts/src/testnetDocker.ts'",
     "testnet-docker:install": "docker run --rm -v $(pwd):/app -v force-bridge-node-modules:/app/node_modules node:14.18.1-bullseye bash -c 'cd /app && yarn build'"
   },
   "author": "",

diff --git a/offchain-modules/packages/app-cli/package.json b/offchain-modules/packages/app-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@force-bridge/cli",
   "main": "dist",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "bin": {
     "forcecli": "./dist/index.js"
   },
@@ -17,12 +17,12 @@
     "@ckb-lumos/common-scripts": "^0.18.0-rc2",
     "@ckb-lumos/hd": "^0.18.0-rc2",
     "@ckb-lumos/helpers": "^0.18.0-rc2",
-    "@force-bridge/app-monitor": "^0.0.15",
-    "@force-bridge/app-multisign-server": "^0.0.15",
-    "@force-bridge/app-relayer": "^0.0.15",
-    "@force-bridge/app-rpc-server": "^0.0.15",
-    "@force-bridge/keystore": "^0.0.15",
-    "@force-bridge/x": "^0.0.15",
+    "@force-bridge/app-monitor": "^0.0.17",
+    "@force-bridge/app-multisign-server": "^0.0.17",
+    "@force-bridge/app-relayer": "^0.0.17",
+    "@force-bridge/app-rpc-server": "^0.0.17",
+    "@force-bridge/keystore": "^0.0.17",
+    "@force-bridge/x": "^0.0.17",
     "@lay2/pw-core": "^0.3.22",
     "@nervosnetwork/ckb-sdk-core": "^0.101.0",
     "commander": "^8.1.0",

diff --git a/offchain-modules/packages/app-cli/src/index.ts b/offchain-modules/packages/app-cli/src/index.ts
@@ -12,7 +12,7 @@ import { sigCmd } from './sigServer';
 
 export const program = commander.program;
 
-const version = '0.0.15';
+const version = '0.0.17';
 
 async function main() {
   program

diff --git a/offchain-modules/packages/app-monitor/package.json b/offchain-modules/packages/app-monitor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@force-bridge/app-monitor",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "main": "dist",
   "scripts": {
     "build": "yarn run clean && yarn run compile",
@@ -13,8 +13,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@force-bridge/x": "^0.0.15",
-    "@force-bridge/xchain-eth": "^0.0.15",
+    "@force-bridge/x": "^0.0.17",
+    "@force-bridge/xchain-eth": "^0.0.17",
     "fetch-with-proxy": "^3.0.1"
   }
 }
diff --git a/offchain-modules/packages/app-multisign-server/package.json b/offchain-modules/packages/app-multisign-server/package.json
@@ -9,10 +9,10 @@
     "test": "yarn run build"
   },
   "dependencies": {
-    "@force-bridge/x": "^0.0.15"
+    "@force-bridge/x": "^0.0.17"
   },
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.0.15"
+  "version": "0.0.17"
 }
diff --git a/offchain-modules/packages/app-multisign-server/src/sigServer.ts b/offchain-modules/packages/app-multisign-server/src/sigServer.ts
@@ -20,7 +20,7 @@ import { signEthTx } from './ethSigner';
 import { getPendingTx, getPendingTxResult } from './pendingTx';
 import { serverStatus, serverStatusResult } from './status';
 
-const version = '0.0.15';
+const version = '0.0.17';
 const apiPath = '/force-bridge/sign-server/api/v1';
 
 const ethPendingTxKey = 'ethPendingTx';
@@ -156,7 +156,7 @@ export async function startSigServer(configPath: string): Promise<void> {
 
   const server = new JSONRPCServer();
   server.addMethod('version', () => {
-    return { version };
+    return SigResponse.fromData(version);
   });
   server.addMethod('signCkbTx', async (params: collectSignaturesParams) => {
     try {

diff --git a/offchain-modules/packages/app-relayer/package.json b/offchain-modules/packages/app-relayer/package.json
@@ -9,10 +9,10 @@
     "test": "yarn run build"
   },
   "dependencies": {
-    "@force-bridge/x": "^0.0.15"
+    "@force-bridge/x": "^0.0.17"
   },
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.0.15"
+  "version": "0.0.17"
 }
diff --git a/offchain-modules/packages/app-rpc-server/package.json b/offchain-modules/packages/app-rpc-server/package.json
@@ -9,10 +9,10 @@
     "test": "yarn run build"
   },
   "dependencies": {
-    "@force-bridge/x": "^0.0.15"
+    "@force-bridge/x": "^0.0.17"
   },
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.0.15"
+  "version": "0.0.17"
 }
diff --git a/offchain-modules/packages/app-rpc-server/src/client.ts b/offchain-modules/packages/app-rpc-server/src/client.ts
@@ -76,8 +76,7 @@ export class ForceBridgeAPIV1Client implements ForceBridgeAPIV1 {
         }
         break;
       default:
-        //TODO add other chains
-        Promise.reject(new Error('not yet'));
+        throw new Error('only support Ethereum for now');
     }
     return result;
   }

diff --git a/offchain-modules/packages/app-rpc-server/src/server.ts b/offchain-modules/packages/app-rpc-server/src/server.ts
@@ -9,7 +9,7 @@ import { JSONRPCServer } from 'json-rpc-2.0';
 import { ForceBridgeAPIV1Handler } from './handler';
 import { GetBalancePayload, GetBridgeTransactionSummariesPayload, XChainNetWork } from './types/apiv1';
 
-const version = '0.0.15';
+const version = '0.0.17';
 const forceBridgePath = '/force-bridge/api/v1';
 
 export async function startRpcServer(configPath: string): Promise<void> {
@@ -46,7 +46,7 @@ export async function startRpcServer(configPath: string): Promise<void> {
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   server.addMethod('version', () => {
-    return { version };
+    return version;
   });
   server.addMethod('generateBridgeOutNervosTransaction', forceBridgeRpc.generateBridgeOutNervosTransaction);
   server.addMethod('generateBridgeInNervosTransaction', forceBridgeRpc.generateBridgeInNervosTransaction);

diff --git a/offchain-modules/packages/app-rpc-server/src/types/apiv1.ts b/offchain-modules/packages/app-rpc-server/src/types/apiv1.ts
@@ -136,7 +136,6 @@ export interface GetBridgeConfigResponse {
 // TODO: change to the higher order generic when it impl
 // https://github.com/microsoft/TypeScript/issues/1213
 export interface ForceBridgeAPIV1 {
-  /*
   // prettier-ignore
   generateBridgeInNervosTransaction: <T extends NetworkTypes>(payload: GenerateBridgeInTransactionPayload) => Promise<GenerateTransactionResponse<T>>
   // prettier-ignore

diff --git a/offchain-modules/packages/ckb-indexer-client/package.json b/offchain-modules/packages/ckb-indexer-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@force-bridge/ckb-indexer-client",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "main": "dist",
   "scripts": {
     "build": "yarn run clean && yarn run compile",

diff --git a/offchain-modules/packages/internal/package.json b/offchain-modules/packages/internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@force-bridge/internal",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "main": "dist",
   "scripts": {
     "build": "yarn run clean && yarn run compile",
@@ -13,6 +13,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@force-bridge/keystore": "^0.0.15"
+    "@force-bridge/keystore": "^0.0.17"
   }
 }
diff --git a/offchain-modules/packages/keystore/package.json b/offchain-modules/packages/keystore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@force-bridge/keystore",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "main": "dist",
   "scripts": {
     "build": "yarn run clean && yarn run compile",

diff --git a/offchain-modules/packages/reconc/package.json b/offchain-modules/packages/reconc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@force-bridge/reconc",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "main": "dist",
   "scripts": {
     "build": "yarn run clean && yarn run compile",

diff --git a/offchain-modules/packages/scripts/package.json b/offchain-modules/packages/scripts/package.json
@@ -10,20 +10,20 @@
     "test": "yarn run build"
   },
   "dependencies": {
-    "@force-bridge/app-monitor": "^0.0.15",
-    "@force-bridge/ckb-indexer-client": "^0.0.15",
-    "@force-bridge/internal": "^0.0.15",
-    "@force-bridge/keystore": "^0.0.15",
-    "@force-bridge/reconc": "^0.0.15",
-    "@force-bridge/x": "^0.0.15",
-    "@force-bridge/xchain-eth": "^0.0.15",
+    "@force-bridge/app-monitor": "^0.0.17",
+    "@force-bridge/ckb-indexer-client": "^0.0.17",
+    "@force-bridge/internal": "^0.0.17",
+    "@force-bridge/keystore": "^0.0.17",
+    "@force-bridge/reconc": "^0.0.17",
+    "@force-bridge/x": "^0.0.17",
+    "@force-bridge/xchain-eth": "^0.0.17",
     "cheerio": "^1.0.0-rc.10",
     "dotenv": "^10.0.0",
     "mustache": "^4.2.0",
     "node-fetch": "^1.7.3",
     "shelljs": "^0.8.4"
   },
-  "version": "0.0.15",
+  "version": "0.0.17",
   "devDependencies": {
     "@types/shelljs": "^0.8.9"
   }

diff --git a/offchain-modules/packages/scripts/src/testnetDocker.ts b/offchain-modules/packages/scripts/src/testnetDocker.ts
@@ -10,6 +10,8 @@ import * as lodash from 'lodash';
 import * as Mustache from 'mustache';
 import { execShellCmd, PATH_PROJECT_ROOT, pathFromProjectRoot } from './utils';
 import { deployDev } from './utils/deploy';
+import { nonNullable } from '@force-bridge/x';
+
 dotenv.config({ path: process.env.DOTENV_PATH || '.env' });
 
 export interface VerifierConfig {
@@ -140,7 +142,7 @@ const dockerComposeTemplate = `
 version: "3.3"
 services:
   script:
-    image: node:14
+    image: node:14.18.1-bullseye
     restart: on-failure
     volumes:
       - ./script:/data
@@ -163,7 +165,7 @@ services:
     ports:
       - 3050:3306
   watcher:
-    image: node:14
+    image: node:14.18.1-bullseye
     restart: on-failure
     environment:
       FORCE_BRIDGE_KEYSTORE_PASSWORD: {{FORCE_BRIDGE_KEYSTORE_PASSWORD}}
@@ -188,7 +190,7 @@ services:
     ports:
       - 3059:3306
   collector:
-    image: node:14
+    image: node:14.18.1-bullseye
     restart: on-failure
     environment:
       FORCE_BRIDGE_KEYSTORE_PASSWORD: {{FORCE_BRIDGE_KEYSTORE_PASSWORD}}
@@ -214,7 +216,7 @@ services:
     ports:
       - {{db_port}}:3306
   {{name}}:
-    image: node:14
+    image: node:14.18.1-bullseye
     restart: on-failure
     environment:
       FORCE_BRIDGE_KEYSTORE_PASSWORD: {{FORCE_BRIDGE_KEYSTORE_PASSWORD}}
@@ -233,7 +235,7 @@ services:
       - {{name}}_db
 {{/verifiers}}
   monitor:
-    image: node:14
+    image: node:14.18.1-bullseye
     restart: on-failure
     environment:
       MONITOR_DURATION_CONFIG_PATH: /data/monitor.json
@@ -254,6 +256,8 @@ volumes:
 async function main() {
   initLog({ level: 'debug', identity: 'testnet-docker' });
   // used for deploy and run service
+  // passed through: docker run -e FORCE_BRIDGE_PROJECT_DIR=$(dirname "$(pwd)")
+  nonNullable(process.env.FORCE_BRIDGE_PROJECT_DIR);
   const CKB_RPC_URL = getFromEnv('CKB_RPC_URL');
   const ETH_RPC_URL = getFromEnv('ETH_RPC_URL');
   const CKB_INDEXER_URL = getFromEnv('CKB_INDEXER_URL');
@@ -293,7 +297,7 @@ async function main() {
     },
     eth: {
       rpcUrl: ETH_RPC_URL,
-      confirmNumber: 12,
+      confirmNumber: 12, // 1 if Bsc
       startBlockHeight: 1,
       batchUnlock: {
         batchNumber: 100,
@@ -305,7 +309,7 @@ async function main() {
       ckbIndexerUrl: CKB_INDEXER_URL,
       startBlockHeight: 1,
       confirmNumber: 15,
-      sudtSize: 150,
+      sudtSize: 400,
     },
   };
 
@@ -354,7 +358,7 @@ async function main() {
   await execShellCmd(`mkdir -p ${path.join(configPath, 'script')}`);
   const dockerComposeFile = Mustache.render(dockerComposeTemplate, {
     FORCE_BRIDGE_KEYSTORE_PASSWORD,
-    projectDir: PATH_PROJECT_ROOT,
+    projectDir: process.env.FORCE_BRIDGE_PROJECT_DIR,
     verifiers,
   });
   fs.writeFileSync(path.join(configPath, 'docker-compose.yml'), dockerComposeFile);

diff --git a/offchain-modules/packages/x/package.json b/offchain-modules/packages/x/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@force-bridge/x",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "main": "./dist/index.js",
   "license": "MIT",
   "scripts": {
@@ -21,10 +21,10 @@
     "@ckb-lumos/helpers": "^0.18.0-rc2",
     "@ckb-lumos/rpc": "^0.18.0-rc2",
     "@ckb-lumos/transaction-manager": "^0.18.0-rc2",
-    "@force-bridge/ckb-indexer-client": "^0.0.15",
-    "@force-bridge/internal": "^0.0.15",
-    "@force-bridge/keystore": "^0.0.15",
-    "@force-bridge/reconc": "^0.0.15",
+    "@force-bridge/ckb-indexer-client": "^0.0.17",
+    "@force-bridge/internal": "^0.0.17",
+    "@force-bridge/keystore": "^0.0.17",
+    "@force-bridge/reconc": "^0.0.17",
     "@lay2/pw-core": "^0.3.22",
     "@nervosnetwork/ckb-sdk-core": "^0.101.0",
     "@nervosnetwork/ckb-sdk-utils": "^0.101.0",