wip: update

Author: walker27

packages/neuron-ui/src/components/PaymentChannel/api.ts

@@ -19,18 +19,6 @@ export type ChannelState = {
 //   // state?: wire.State;
 //   myPayloadIndex: 0 | 1;
 // }
-export async function startupChannelServiceRunner(publicKey: string) {
-  const actionRes = await perunServiceAction({
-    type: 'startup',
-    payload: {
-      network: "testnet",
-      publicKey,
-    },
-  })
-  if (!isSuccessResponse(actionRes)) {
-    return []
-  }
-}
 export async function getChannels(publicKey: string, address: string) {
   const actionRes = await perunServiceAction({
     type: 'get',

packages/neuron-ui/src/components/PaymentChannel/components/ChannelCard/index.tsx

@@ -99,6 +99,7 @@ export default function ChannelCard(props: ChannelCardProps) {
       </div>
       {dialogType === DialogType.send && (
         <PerunSendPayment
+          maxAmount={channelState.state.allocation?.balances?.balances[0].balance[channelState.actorIdx] ?? "0"}
           onConfirm={async (swapAmount) => {
             updateChannel(channelState.id, 0, BigInt(swapAmount! * 1e8))
             // close

packages/neuron-ui/src/components/PaymentChannel/components/Console/index.tsx

@@ -56,8 +56,8 @@ export default function PerunConsole(props: PerunConsoleProps) {
   } = useGlobalState()
   const [t] = useTranslation()
   const [dialogType, setDialogType] = useState<DialogType | undefined>(undefined)
-  const channelInfoMap = useChannelInfoMap()
-  
+  const channelInfoMap = useChannelInfoMap(myAddress)
+
   // const [pendingChannels, setPendingChannels] = useState<ChannelInfo[]>([])
   // const [channelMap, setChannelMap] = useState<Record<string, ChannelInfo>>({})
   const { data: channelStates = [], run: syncChannels } = useRequest(async () => {
@@ -73,7 +73,7 @@ export default function PerunConsole(props: PerunConsoleProps) {
 
 
   useEffect(() => {
-    restoreChannels()
+    syncChannels()
   }, [])
 
   // const assets = ['CKB']
@@ -222,7 +222,7 @@ export default function PerunConsole(props: PerunConsoleProps) {
           channelInfoMap={channelInfoMap}
           onOpenChannel={(request) => {
             // todo convert request.initBals to payload
-            const payload: PerunAPI.OpenChannelParams['balances'] = [{ type: null, balances: ["1", "2"]}]
+            const payload: PerunAPI.OpenChannelParams['balances'] = [{ type: null, balances: ["1", "2"] }]
             const channelInfo: ChannelInfo = {
               channelId: UNMATCH_CHANNEL_ID,
               me: {
@@ -237,7 +237,7 @@ export default function PerunConsole(props: PerunConsoleProps) {
           }}
           onUpdateChannel={(request) => {
             const channelId = request.state?.id as string
-            if(channelId && !channelInfoMap.has(channelId) && channelInfoMap.has(UNMATCH_CHANNEL_ID)) {
+            if (channelId && !channelInfoMap.has(channelId) && channelInfoMap.has(UNMATCH_CHANNEL_ID)) {
               const temChannelInfo = channelInfoMap.get(UNMATCH_CHANNEL_ID)
               const channelInfo = {
                 ...temChannelInfo,

packages/neuron-ui/src/components/PaymentChannel/hooks.ts

@@ -1,27 +1,58 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
+import { perunServiceAction } from "services/remote";
+import { isSuccessResponse } from "utils";
 
 
 export const UNMATCH_CHANNEL_ID = 'UNMATCH_CHANNEL_ID';
 
-export type ChannelInfo = {
-  channelId: string;
-  me: PerunAPI.PeerUser;
-  peer: PerunAPI.PeerUser;
-  payload: PerunAPI.OpenChannelParams['balances'],
-  myPayloadIndex: 0 | 1;
-}
+export type ChannelInfo = Perun.ChannelInfo
 
-export function useChannelInfoMap() {
+export function useChannelInfoMap(address: string) {
   const [map, setMap] = useState<Record<string, ChannelInfo>>({})
   /** will update the channel info */
-  const add = (channelId: string, info: ChannelInfo) => setMap(map => ({ ...map, [channelId]: info }))
+  const add = (channelId: string, info: ChannelInfo) => {
+    if (channelId !== UNMATCH_CHANNEL_ID) {
+      perunServiceAction({
+        type: "add-channel-info",
+        payload: info,
+      })
+    }
+    setMap(map => ({ ...map, [channelId]: info }))
+  }
   const has = (channelId: string) => !!map[channelId];
-  const iDelete = (channelId: string) => setMap(map => {
-    const { [channelId]: _, ...rest } = map
-    return rest
-  })
+  const iDelete = (channelId: string) => {
+    setMap(map => {
+      const { [channelId]: _, ...rest } = map
+      return rest
+    })
+    perunServiceAction({
+      type: "remove-channel-info",
+      payload: {
+        channelId,
+      },
+    })
+  }
   const get = (channelId: string) => map[channelId] as ChannelInfo | undefined
 
+  useEffect(() => {
+    perunServiceAction({
+      type: "get-channel-infos",
+      payload: {
+        address,
+      },
+    }).then(res => {
+      if (!isSuccessResponse(res)) {
+        return
+      }
+      const list: ChannelInfo[] = res.result;
+      const map = list.reduce((acc, cur) => {
+        acc[cur.channelId] = cur
+        return acc
+      }, {} as Record<string, ChannelInfo>)
+      setMap(map)
+    })
+  }, [])
+
   return {
     add,
     has,

packages/neuron-ui/src/components/PaymentChannel/index.tsx

@@ -1,54 +1,18 @@
-import React, { useState, useEffect, useCallback } from 'react'
+import React, { useState, useEffect } from 'react'
 
 import { useState as useGlobalState } from 'states'
-import { bytes } from '@ckb-lumos/codec'
-import { blockchain } from '@ckb-lumos/base'
-import Dialog from 'widgets/Dialog'
-import Table, { TableProps } from 'widgets/Table'
 import PageContainer from 'components/PageContainer'
 import {
   PerunIcon,
-  AddSimple,
-  DetailIcon,
-  CkbIcon,
-  InfoCircleOutlined,
-  DepositTimeSort,
-  PerunSend,
-  PerunClose,
-  LineDownArrow,
 } from 'widgets/Icons/icon'
-import TableNoData from 'widgets/Icons/TableNoData.png'
-import { type CKBComponents } from '@ckb-lumos/lumos/rpc'
-import {
-  SerializeOffChainParticipant,
-  SerializeSEC1EncodedPubKey,
-} from 'utils/perun-wallet-wrapper/ckb/serialization'
-import { channelIdToString, channelIdFromString } from 'utils/perun-wallet-wrapper/translator'
-import * as wire from 'utils/perun-wallet-wrapper/wire'
 
-import { ControllerResponse } from 'services/remote/remoteApiWrapper'
 import {
-  OfflineSignStatus,
-  OfflineSignType,
-  getCurrentWalletAccountExtendedPubKey,
   perunServiceAction,
-  respondPerunRequest,
-  signRawMessage,
-  signTransactionOnly,
   showErrorMessage,
 } from 'services/remote'
 import {
-  addressToScript,
-  scriptToAddress,
-  bytesToHex,
-  ErrorCode,
-  errorFormatter,
-  isSuccessResponse,
-  clsx,
-  getParticipantByAddressAndPubkey,
   isMainnet,
 } from 'utils'
-import { PasswordDialog } from 'components/SignAndVerify'
 
 import styles from './perun.module.scss'
 
@@ -57,6 +21,7 @@ import Button from 'widgets/Button'
 import PerunConsole from './components/Console'
 import AddressSelector from './components/AddressSelector'
 import { useRequest } from 'ahooks'
+import { restoreChannels } from './api'
 
 
 
@@ -84,6 +49,7 @@ const PaymentChannel = () => {
   useEffect(() => {
     if(!enable && runnerState.running) {
       setEnable(true)
+      restoreChannels();
     }
     if (enable && !runnerState.running) {
       setEnable(false)

packages/neuron-ui/src/components/PerunCreationRequestList/index.tsx

@@ -81,7 +81,6 @@ export const PerunCreationRequestList = (props: PerunRequestListProps) => {
         return (
           <>
             <h3 className='my-0'>Open Channel Request from {address.slice(0, 10)}...{address.slice(-10)}</h3>
-            <p>{`Channel ID: ${request.proposalId}`}</p>
             <div className='flex flex-row gap-4 mt-2'>
               <div>
                 <div className='text-secondary'>My Token Locked</div>

packages/neuron-ui/src/components/PerunSendPayment/index.tsx

@@ -7,17 +7,26 @@ import { openExternal, MultisigConfig } from 'services/remote'
 import { localNumberFormatter, shannonToCKBFormatter } from 'utils'
 import Dialog from 'widgets/Dialog'
 import styles from './perunSendPayment.module.scss'
+import Big from 'big.js'
 
 
 const NERVOS_DAO_RFC_URL =
   'https://www.github.com/nervosnetwork/rfcs/blob/master/rfcs/0023-dao-deposit-withdraw/0023-dao-deposit-withdraw.md'
 
-const PerunSendPayment = ({ onClose, onConfirm }: { onClose: () => void, onConfirm: (swapAmount: number) => void }) => {
+type PerunSendPaymentProps = {
+  onClose: () => void
+  onConfirm: (amount: number) => void
+  // bigint string
+  maxAmount: string
+}
+const PerunSendPayment = (props: PerunSendPaymentProps) => {
+  const { onClose, onConfirm, maxAmount } = props
   const [t, { language }] = useTranslation()
   const [errorMessage, setErrorMessage] = useState('')
   const [updateAmount, setUpdateAmount] = useState<number>(0)
 
   const handleUpdateAmountChange = (am: string) => {
+    setErrorMessage('')
     const amountNum = parseFloat(am)
     if (Number.isNaN(amountNum)) {
       return
@@ -40,6 +49,12 @@ const PerunSendPayment = ({ onClose, onConfirm }: { onClose: () => void, onConfi
       show
       title={t('perun.send-payment')} onCancel={onClose} className={styles.container}
       onConfirm={() => {
+
+        const maxAmountVal = new Big(maxAmount).div(10 ** 8)
+        if (updateAmount > maxAmountVal.toNumber()) {
+          setErrorMessage(t('perun.message.max-amount', { amount: `${maxAmountVal} CKB` }))
+          return
+        }
         onConfirm(updateAmount);
       }}
     >

packages/neuron-ui/src/locales/en.json

@@ -882,7 +882,10 @@
       "rejection-reason": "Rejection reason",
       "ok": "Okay",
       "enter-amount": "Please enter the amount you want to swap",
-      "state": "State"
+      "state": "State",
+      "message": {
+        "max-amount": "Amount cannot exceed {{amount}}"
+      }
     },
     "lock-info-dialog": {
       "address-info": "Address Information",

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

@@ -20,6 +20,8 @@ import { parseState } from '../services/perun/tools/tool'
 import * as wire from "../utils/perun-wallet-wrapper/wire"
 // import PerunChannelServiceRunner from '../services/perun/channel-service-runner'
 import { PerunMessageReceiver } from '../services/perun/message-receiver'
+import { getConnection } from '../database/chain/connection'
+import PerunChannelInfoEntity from '../database/chain/entities/perun-channel-info'
 
 const defaultAddressEncoder: AddressEncoder = (add: Uint8Array | string) => {
   if (typeof add === 'string') {
@@ -120,11 +122,60 @@ export default class PerunController {
         return this.getChannels(params.payload)
       case 'restore':
         return this.restoreChannels(params.payload)
+      case 'get-channel-infos':
+        return this.getChannelInfos(params.payload)
+      case 'remove-channel-info':
+        return this.removeChannelInfo(params.payload)
+      case 'add-channel-info':
+        return this.addChannelInfo(params.payload)
       default:
         return Promise.reject(new Error('Invalid perun service action type'))
     }
   }
 
+  async getChannelInfos(params: (Perun.ServiceActionParams & { type: "get-channel-infos" })['payload']) {
+    const res = await getConnection().getRepository(PerunChannelInfoEntity).find({
+      where: {
+        meAddress: params.address,
+      }
+    })
+    return {
+      status: ResponseCode.Success,
+      result: res.map(item => item.toModel()),
+    }
+  }
+
+  async removeChannelInfo(params: (Perun.ServiceActionParams & { type: "remove-channel-info" })['payload']) {
+    await getConnection().getRepository(PerunChannelInfoEntity).delete({
+      channelId: params.channelId,
+    })
+    return {
+      status: ResponseCode.Success,
+      result: true,
+    }
+  }
+
+  async addChannelInfo(params: (Perun.ServiceActionParams & { type: "add-channel-info" })['payload']) {
+    const channelInfo = params;
+    // if exist remove it 
+    const db = getConnection().getRepository(PerunChannelInfoEntity)
+    const flag = await db.exist({
+      where: {
+        channelId: channelInfo.channelId,
+      }
+    })
+    if (flag) {
+      await db.delete({
+        channelId: channelInfo.channelId,
+      })
+    }
+    await db.insert(PerunChannelInfoEntity.fromObject(channelInfo))
+    return {
+      status: ResponseCode.Success,
+      result: true,
+    }
+  }
+
   // async getRunnerContext(): Promise<Controller.Response> {
   //   return {
   //     status: ResponseCode.Success,
@@ -160,11 +211,6 @@ export default class PerunController {
       message: message,
     }
     PerunRunnerStateSubject.next(this.runnerStatus)
-    // if (!this.context) {
-    //   throw new Error('PerunController: Perun Not Started')
-    // }
-    // this.runnerStatus = { running: false }
-    // logger.info('PerunController: stop-----PerunService-----')
     // todo
     // stop channel-service-runner
     // stop wallet-backend