Merge branch 'develop' of https://github.com/nervosnetwork/neuron int…

…o develop
nervosnetwork · Dec 14, 2023 · a156dca · a156dca
2 parents a1fddf6 + f598a0f
commit a156dca
Show file tree

Hide file tree

Showing 9 changed files with 429 additions and 510 deletions.
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "lint-staged": "13.3.0",
     "ncp": "2.0.0",
     "prettier": "2.8.8",
-    "ts-jest": "27.1.5",
+    "ts-jest": "29.1.1",
     "typescript": "5.3.3",
     "wait-on": "7.0.1"
   },

diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
@@ -50,8 +50,8 @@
     "last 2 chrome versions"
   ],
   "dependencies": {
-    "@ckb-lumos/base": "0.21.0-next.2",
-    "@ckb-lumos/codec": "0.21.0-next.3",
+    "@ckb-lumos/base": "0.21.1",
+    "@ckb-lumos/codec": "0.21.1",
     "@nervosnetwork/ckb-sdk-core": "0.109.0",
     "@nervosnetwork/ckb-sdk-utils": "0.109.0",
     "canvg": "2.0.0",

diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
@@ -42,15 +42,15 @@
     ]
   },
   "dependencies": {
-    "@ckb-lumos/base": "0.21.0-next.2",
-    "@ckb-lumos/bi": "0.21.0-next.3",
-    "@ckb-lumos/ckb-indexer": "0.21.0-next.3",
-    "@ckb-lumos/codec": "0.21.0-next.3",
-    "@ckb-lumos/common-scripts": "0.21.0-next.3",
-    "@ckb-lumos/config-manager": "0.21.0-next.3",
-    "@ckb-lumos/hd": "0.21.0-next.3",
-    "@ckb-lumos/helpers": "0.21.0-next.2",
-    "@ckb-lumos/rpc": "0.21.0-next.2",
+    "@ckb-lumos/base": "0.21.1",
+    "@ckb-lumos/bi": "0.21.1",
+    "@ckb-lumos/ckb-indexer": "0.21.1",
+    "@ckb-lumos/codec": "0.21.1",
+    "@ckb-lumos/common-scripts": "0.21.1",
+    "@ckb-lumos/config-manager": "0.21.1",
+    "@ckb-lumos/hd": "0.21.1",
+    "@ckb-lumos/helpers": "0.21.1",
+    "@ckb-lumos/rpc": "0.21.1",
     "@iarna/toml": "2.2.5",
     "@ledgerhq/hw-transport-node-hid": "6.27.22",
     "@spore-sdk/core": "0.1.0-beta.9",

diff --git a/packages/neuron-wallet/src/services/sdk-core.ts b/packages/neuron-wallet/src/services/sdk-core.ts
@@ -1,32 +1,7 @@
 import { CKBRPC } from '@ckb-lumos/rpc'
-import https from 'https'
-import http from 'http'
-
-let httpsAgent: https.Agent
-let httpAgent: http.Agent
-
-const getHttpsAgent = () => {
-  if (!httpsAgent) {
-    httpsAgent = new https.Agent({ keepAlive: true })
-  }
-  return httpsAgent
-}
-
-const getHttpAgent = () => {
-  if (!httpAgent) {
-    httpAgent = new http.Agent({ keepAlive: true })
-  }
-  return httpAgent
-}
 
 export const generateCKB = (url: string): CKBRPC => {
-  const rpc = new CKBRPC(url)
-  if (url.startsWith('https')) {
-    rpc.setNode({ url, httpsAgent: getHttpsAgent() })
-  } else {
-    rpc.setNode({ url, httpAgent: getHttpAgent() })
-  }
-  return rpc
+  return new CKBRPC(url, { fetch: (request, init) => globalThis.fetch(request, { ...init, keepalive: true }) })
 }
 
 export default {

diff --git a/packages/neuron-wallet/src/services/transaction-sender.ts b/packages/neuron-wallet/src/services/transaction-sender.ts
@@ -855,7 +855,9 @@ export default class TransactionSender {
     const rpc = generateRPC(currentNetwork.remote, currentNetwork.type)
 
     let tx = await rpc.getTransaction(depositOutPoint.txHash)
-    if (tx.txStatus.status !== 'committed') throw new Error('Transaction is not committed yet')
+    if (tx.txStatus.status !== 'committed' || !tx.txStatus.blockHash) {
+      throw new Error('Transaction is not committed yet')
+    }
     const depositBlockHash = tx.txStatus.blockHash
 
     const cellOutput = tx.transaction.outputs[+depositOutPoint.index]