Merge pull request #34 from nervina-labs/ref/remove-witness-index

refactor: Remove witnessIndex and witnessLastIndex
nervina-labs · Jul 3, 2024 · edddf6e · edddf6e
2 parents a5a3788 + e72b6d4
commit edddf6e
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 400 deletions.
diff --git a/.changeset/lovely-cobras-lie.md b/.changeset/lovely-cobras-lie.md
@@ -0,0 +1,5 @@
+---
+'@joyid/common': minor
+---
+
+refactor: Remove witnessIndex and witnessLastIndex from SignCkbRawTxRequest
diff --git a/.changeset/perfect-socks-sleep.md b/.changeset/perfect-socks-sleep.md
@@ -0,0 +1,5 @@
+---
+'@joyid/ckb': major
+---
+
+refactor: Remove witnessIndex and witnessLastIndex from signRawTx
diff --git a/examples/ckb-demo/package.json b/examples/ckb-demo/package.json
@@ -23,7 +23,6 @@
     "@joyid/ckb": "workspace:*",
     "@nervina-labs/ckb-dex": "0.1.6",
     "axios": "^1.6.0",
-    "ckb-omiga": "^0.0.12",
     "cross-fetch": "^3.1.5",
     "framer-motion": "^7.6.1",
     "i18next": "^22.0.1",

diff --git a/examples/ckb-demo/src/pages/Home/index.tsx b/examples/ckb-demo/src/pages/Home/index.tsx
@@ -98,14 +98,6 @@ export const Home = () => {
         }}>
         Transfer CoTA NFT
       </Button>
-      <Button
-        colorScheme="teal"
-        w="240px"
-        onClick={() => {
-          navi(RoutePath.SignCkbRawTx)
-        }}>
-        Sign CKB Raw Tx
-      </Button>
       <Button
         colorScheme="teal"
         w="240px"

diff --git a/examples/ckb-demo/src/pages/SignCkbRawTx/index.tsx b/examples/ckb-demo/src/pages/SignCkbRawTx/index.tsx
diff --git a/examples/ckb-demo/src/route/path.ts b/examples/ckb-demo/src/route/path.ts
@@ -4,5 +4,4 @@ export enum RoutePath {
   SignMessage = '/sign-message',
   CKBTransfer = '/ckb-transfer',
   CotaNFTTransfer = '/cota-nft-transfer',
-  SignCkbRawTx = '/sign-ckb-raw-tx',
 }
diff --git a/examples/ckb-demo/src/route/router.tsx b/examples/ckb-demo/src/route/router.tsx
@@ -6,7 +6,6 @@ import { SignMessage } from '../pages/SignMessage'
 import { SignTransaction } from '../pages/SignTransaction'
 import { RoutePath } from './path'
 import { SignCotaNFT } from '../pages/SignCotaNFT'
-import { SignCkbRawTx } from '../pages/SignCkbRawTx'
 
 export const routers: RouteObject[] = [
   {
@@ -34,10 +33,6 @@ export const routers: RouteObject[] = [
         path: RoutePath.CotaNFTTransfer,
         element: <SignCotaNFT />,
       },
-      {
-        path: RoutePath.SignCkbRawTx,
-        element: <SignCkbRawTx />,
-      },
     ],
   },
 ]
diff --git a/packages/ckb/src/index.ts b/packages/ckb/src/index.ts
@@ -21,7 +21,7 @@ import {
   append0x,
   remove0x,
 } from '@joyid/common'
-import ckbUtils from '@nervosnetwork/ckb-sdk-utils'
+import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils'
 import { Aggregator } from './aggregator'
 
 export * from './verify'
@@ -62,16 +62,10 @@ export const initConfig = (config?: CkbDappConfig): CkbDappConfig => {
 
 export const getConfig = (): CkbDappConfig => internalDappConfig
 
-// The witnessIndexes represents the positions of the JoyID cells in inputs, the default value is empty array
-// deprecated: The witnessIndex represents the position of the first JoyID cell in inputs, and the default value is 0
-// deprecated: The witnessLastIndex represents the position of the last JoyID cell in inputs, and the default value is inputs.length - 1
-// deprecated: The witnessLastIndex must not be smaller than witnessIndex.
-// deprecated: For example: witnessIndex = 1, witnessLastIndex = 3, this means the inputs[1..3] are JoyID cell, and the other inputs are another lock scripts.
+// The witnessIndexes represents the positions of the JoyID cells in inputs, the default value is an empty array
 export type SignConfig = CkbDappConfig &
   Pick<PopupConfigOptions, 'timeoutInSeconds' | 'popup'> & {
     witnessIndexes?: number[]
-    witnessIndex?: number
-    witnessLastIndex?: number
   }
 
 export const connect = async (
@@ -195,9 +189,9 @@ export const signRawTransaction = async (
     ...config,
   }
 
-  const { witnessIndexes, witnessIndex, witnessLastIndex } = config
+  const { witnessIndexes } = config
 
-  if (witnessIndexes) {
+  if (Array.isArray(witnessIndexes)) {
     if (witnessIndexes.length === 0) {
       throw new Error('The witnessIndexes must be not empty')
     }
@@ -208,19 +202,6 @@ export const signRawTransaction = async (
     }
   }
 
-  if (witnessIndex && witnessLastIndex) {
-    if (witnessLastIndex < witnessIndex) {
-      throw new Error(
-        'The witnessLastIndex must not be smaller than the witnessIndex'
-      )
-    }
-    if (witnessLastIndex >= tx.inputs.length) {
-      throw new Error(
-        'The witnessLastIndex must be smaller than the length of inputs'
-      )
-    }
-  }
-
   if (!config.popup) {
     config.popup = openPopup('')