Merge pull request #483 from nervosnetwork/bump-1.6.0-rc1

chore: bump v1.6.0-rc1
godwokenrises · Aug 9, 2022 · 94aaeac · 94aaeac
2 parents d4d6250 + cb06609
commit 94aaeac
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -30,6 +30,6 @@
     "eslint": "^8.5.0",
     "prettier": "^2.2.1"
   },
-  "version": "1.5.2-rc1",
+  "version": "1.6.0-rc1",
   "author": "hupeng <bitrocks.hu@gmail.com>"
 }
diff --git a/packages/api-server/package.json b/packages/api-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@godwoken-web3/api-server",
-  "version": "1.5.2-rc1",
+  "version": "1.6.0-rc1",
   "private": true,
   "scripts": {
     "start": "concurrently \"tsc -w\" \"nodemon ./bin/cluster\"",
@@ -32,7 +32,7 @@
   "dependencies": {
     "@ckb-lumos/base": "0.18.0-rc6",
     "@ckb-lumos/toolkit": "0.18.0-rc6",
-    "@godwoken-web3/godwoken": "1.5.2-rc1",
+    "@godwoken-web3/godwoken": "1.6.0-rc1",
     "@newrelic/native-metrics": "^7.0.1",
     "@sentry/node": "^6.11.0",
     "blake2b": "2.1.3",

diff --git a/packages/api-server/src/convert-tx.ts b/packages/api-server/src/convert-tx.ts
@@ -240,6 +240,7 @@ export async function parseRawTransactionData(
   );
 
   let cacheKeyAndValue: [string, string] | undefined;
+  // auto create account
   if (fromId == null) {
     const ethTxHash = calcEthTxHash(rlpEncoded);
     const { balance, requiredBalance } = await checkBalance(
@@ -249,6 +250,9 @@ export async function parseRawTransactionData(
       gasLimit,
       gasPrice
     );
+    logger.info(
+      `aca tx: action: send, address: ${fromEthAddress}, eth_tx_hash: ${ethTxHash}, balance: ${balance}, required_balance: ${requiredBalance}`
+    );
     if (balance < requiredBalance) {
       throw new Error(
         `insufficient balance of ${fromEthAddress}, require ${requiredBalance}, got ${balance}`

diff --git a/packages/api-server/src/methods/modules/eth.ts b/packages/api-server/src/methods/modules/eth.ts
@@ -798,6 +798,9 @@ export class Eth {
         tx,
         fromAddress
       );
+      logger.info(
+        `aca tx: action: getTransactionByHash, eth_tx_hash: ${ethTxHash}, is_tx_exist: ${isAcaTxExist}`
+      );
       if (isAcaTxExist) {
         const apiTransaction: EthTransaction =
           polyjuiceRawTransactionToApiTransaction(
@@ -1484,6 +1487,9 @@ async function buildEthCallTx(
 
   let serializedRegistryAddress: HexString | undefined;
   if (fromId == null && fromAddress != null) {
+    logger.info(
+      `aca tx: action: call/estimateGas, from_address: ${fromAddress}`
+    );
     const registryAddress: EthRegistryAddress = new EthRegistryAddress(
       fromAddress
     );

diff --git a/packages/godwoken/package.json b/packages/godwoken/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@godwoken-web3/godwoken",
-  "version": "1.5.2-rc1",
+  "version": "1.6.0-rc1",
   "private": true,
   "main": "lib/index.js",
   "scripts": {