chore: update

Author: walker27

packages/neuron-wallet/package.json

@@ -42,6 +42,7 @@
     ]
   },
   "dependencies": {
+    "@ckb-ccc/ccc": "^1.1.22",
     "@ckb-lumos/base": "0.23.0",
     "@ckb-lumos/ckb-indexer": "0.23.0",
     "@ckb-lumos/helpers": "0.23.0",

packages/neuron-wallet/src/controllers/perun.ts

@@ -138,7 +138,7 @@ export default class PerunController {
   }
 
   async openChannel(params: Controller.Params.OpenChannelParams): Promise<Controller.Response> {
-    logger.info('PerunController: openChannel----------', params)
+    logger.info('PerunController: openChannel----------')
     const alloc = Allocation.create({
       assets: [new Uint8Array(1)],
       balances: Balances.create({

packages/neuron-wallet/src/services/perun/fetchCell.ts

@@ -0,0 +1,31 @@
+import { ccc } from "@ckb-ccc/core";
+
+
+const networkMap = {
+  // https://testnet.ckb.dev,https://testnet.ckbapp.dev
+  testnet: "https://testnet.ckb.dev",
+  // https://mainnet.ckb.dev,https://mainnet.ckbapp.dev
+  mainnet: "https://mainnet.ckb.dev",
+} as const
+
+const testnetService = new ccc.ClientPublicTestnet({ url: networkMap.testnet })
+
+export async function fetchTargetCell(txhash: string, outputIndex: number) {
+  const txResponse = await testnetService.getTransaction(txhash);
+  const tx = txResponse?.transaction;
+  if (!tx) {
+    return null;
+  }
+  const cellInfo = tx.getOutput(outputIndex);
+  const cell = {
+    capacity: '0x' + cellInfo?.cellOutput.capacity.toString(16),
+    lock: cellInfo?.cellOutput.lock,
+    lockHash: cellInfo?.cellOutput.lock.hash(),
+    // todo
+    multiSignBlake160: null,
+    type: cellInfo?.cellOutput.type,
+    typeHash: cellInfo?.cellOutput.type?.hash(),
+    data: cellInfo?.outputData,
+  }
+  return cell;
+}

packages/neuron-wallet/src/services/perun/service-runner.ts

@@ -14,12 +14,13 @@ import Input from '../../models/chain/input'
 import CellsService from '../../services/cells'
 import OutPoint from '../../models/chain/out-point'
 import RpcService from '../../services/rpc-service'
-import { TransactionsService } from '../tx'
+// import { TransactionsService } from '../tx'
 import NetworksService from '../networks'
-import { LightRPC } from 'src/utils/ckb-rpc'
-import { NetworkType } from '../../models/network'
+// import { LightRPC } from 'src/utils/ckb-rpc'
+// import { NetworkType } from '../../models/network'
 import generateConfigFiles, { ConfigFileOptions } from './configFiles'
 import SettingsService from '../settings'
+import { fetchTargetCell } from './fetchCell'
 
 const { app } = env
 
@@ -318,29 +319,30 @@ export class PerunServiceRunner {
         let liveCell = undefined
         while (retries < 25) {
           const fetchedCell = await CellsService.getLiveCell(OutPoint.fromObject(input.previousOutput))
-          const outputs = await CellsService.getOutputsByTransactionHash(input.previousOutput.txHash)
-          logger.info('fetched outputs:', outputs)
-          const tx = await TransactionsService.get(input.previousOutput.txHash)
-          logger.info('fetched tx:', tx)
+          // const outputs = await CellsService.getOutputsByTransactionHash(input.previousOutput.txHash)
+          // logger.info('fetched outputs:', outputs)
+          // const tx = await TransactionsService.get(input.previousOutput.txHash)
+          // logger.info('fetched tx:', tx)
           if (fetchedCell) {
             liveCell = fetchedCell
             break
           }
           logger.info('USING RPC-SERVICE')
-          const rpcTip = await rpcService.getTipHeader()
-          logger.info('TIP:', rpcTip)
+          // const rpcTip = await rpcService.getTipHeader()
+          // logger.info('TIP:', rpcTip)
           // const rpcTx = await rpcService.getTransaction(input.previousOutput.txHash)
-          const rpcTx = network.type === NetworkType.Light
-            // light rpc did't include the tx of peer A user
-            ? await (await (rpcService.rpc as LightRPC).fetchTransaction(input.previousOutput.txHash)).txWithStatus
-            : await rpcService.getTransaction(input.previousOutput.txHash)
-          logger.info('RPC-TX:', rpcTx)
-
-          if (rpcTx?.transaction) {
-            logger.info("rpc output's index:", input.previousOutput.index)
-            logger.info('rpc outputs', rpcTx.transaction.outputs)
-            liveCell = rpcTx.transaction.outputs[Number(input.previousOutput.index)]
-            logger.info("live cell found in rpc-tx's outputs:", liveCell)
+          // const rpcTx = network.type === NetworkType.Light
+          //   // light rpc did't include the tx of peer A user
+          //   ? await (await (rpcService.rpc as LightRPC).fetchTransaction(input.previousOutput.txHash)).txWithStatus
+          //   : await rpcService.getTransaction(input.previousOutput.txHash)
+          // const targetCell = rpcTx?.transaction?.outputs[Number(input.previousOutput.index)]
+          // logger.info('RPC-TX:', rpcTx)
+          // todo testnet only for now
+          const targetCell = await fetchTargetCell(input.previousOutput.txHash, input.previousOutput.index);
+          // console.log("iCell", targetCell);
+
+          if (targetCell) {
+            liveCell = targetCell; // rpcTx.transaction.outputs[Number(input.previousOutput.index)]
             break
           }
           logger.info(`Failed to fetch live cell, retrying in ${delay}ms`)
@@ -351,6 +353,7 @@ export class PerunServiceRunner {
         if (!liveCell) {
           return reject(new Error('Failed to fetch live cell'))
         }
+        console.log("liveCell data check", liveCell)
 
         const resolvedInput = Input.fromObject({
           previousOutput: OutPoint.fromObject(typedInput.previousOutput),