dev upgrade package (#2622)

* 🔨 fix: typescript-sdk zh-CN link error * 🔨fix: portal list PageLimit adapts theme colors & typescript sdk tutorial error * 🔨fix: shell error * Add null checks and input validation for safer data handling * upgrade rooch-sdk package dependencies * fix: rooch-sdk-kit error build * fix: rooch-portal-v2 build error
rooch-network · Sep 19, 2024 · 14a6856 · 14a6856
1 parent b2635e2
commit 14a6856
Show file tree

Hide file tree

Showing 12 changed files with 5,164 additions and 5,593 deletions.
diff --git a/.npmrc b/.npmrc
@@ -1,3 +1,4 @@
 legacy-peer-deps = false
 auto-install-peers=true
 strict-peer-dependencies=false
+loglevel=error
diff --git a/infra/rooch-portal-v2/next-env.d.ts b/infra/rooch-portal-v2/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
diff --git a/infra/rooch-portal-v2/src/components/table/utils.ts b/infra/rooch-portal-v2/src/components/table/utils.ts
@@ -13,6 +13,14 @@ function descendingComparator<T>(a: T, b: T, orderBy: keyof T) {
   if (b[orderBy] === null) {
     return -1;
   }
+
+  if (a[orderBy] === undefined) {
+    return 1;
+  }
+  if (b[orderBy] === undefined) {
+    return -1;
+  }
+
   if (b[orderBy] < a[orderBy]) {
     return -1;
   }

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/sdk/typescript/bitseed-sdk/package.json b/sdk/typescript/bitseed-sdk/package.json
@@ -7,7 +7,7 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "packageManager": "pnpm@8.6.6",
+  "packageManager": "pnpm@9.10.0",
   "scripts": {
     "playwright-deps": "pnpm playwright install --with-deps",
     "build": "build-package",
@@ -48,51 +48,51 @@
     "@mempool/mempool.js": "^2.3.0",
     "@radix-ui/colors": "^3.0.0",
     "@radix-ui/react-icons": "^1.3.0",
-    "@radix-ui/themes": "^2.0.0",
+    "@radix-ui/themes": "^3.1.3",
     "@roochnetwork/rooch-sdk": "workspace:*",
     "@roochnetwork/rooch-sdk-kit": "workspace:*",
     "@sadoprotocol/ordit-sdk": "./libs/sadoprotocol-ordit-sdk-v2.4.9.tgz",
-    "@tanstack/react-query": "^5.0.0",
+    "@tanstack/react-query": "^5.56.2",
     "@types/debug": "^4.1.12",
-    "@types/randomstring": "^1.1.11",
+    "@types/randomstring": "^1.3.0",
     "bip39": "^3.1.0",
-    "bitcoinjs-lib": "^6.1.5",
-    "buffer": "5.7.1",
+    "bitcoinjs-lib": "^6.1.6",
+    "buffer": "6.0.3",
     "cbor": "^9.0.2",
-    "commander": "^10.0.0",
-    "debug": "^4.3.6",
+    "commander": "^12.1.0",
+    "debug": "^4.3.7",
     "decimal.js": "^10.4.3",
     "js-sha3": "^0.9.3",
-    "randomstring": "^1.2.3",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "randomstring": "^1.3.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.9",
-    "@babel/preset-env": "^7.23.9",
-    "@playwright/experimental-ct-react": "^1.41.2",
-    "@playwright/test": "^1.41.2",
+    "@babel/core": "^7.25.2",
+    "@babel/preset-env": "^7.25.4",
+    "@playwright/experimental-ct-react": "^1.47.0",
+    "@playwright/test": "^1.47.0",
     "@roochnetwork/build-scripts": "workspace:*",
     "@roochnetwork/test-suite": "workspace:*",
-    "@types/jest": "^29.5.12",
-    "@types/node": "^20.11.19",
-    "@types/react": "^18.2.15",
-    "@types/react-dom": "^18.2.7",
-    "@typescript-eslint/eslint-plugin": "^6.1.0",
-    "@typescript-eslint/parser": "^6.1.0",
+    "@types/jest": "^29.5.13",
+    "@types/node": "^22.5.4",
+    "@types/react": "^18.3.5",
+    "@types/react-dom": "^18.3.0",
+    "@typescript-eslint/eslint-plugin": "^8.5.0",
+    "@typescript-eslint/parser": "^8.5.0",
     "@vitejs/plugin-react": "^4.3.1",
-    "@vitejs/plugin-react-swc": "^3.3.2",
+    "@vitejs/plugin-react-swc": "^3.7.0",
     "babel-jest": "^29.7.0",
     "jest": "^29.7.0",
     "node-fetch": "^3.3.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "testcontainers": "^10.11.0",
-    "ts-jest": "^29.1.2",
-    "typescript": "5.1.6",
-    "vite": "5.0.2",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "testcontainers": "^10.13.1",
+    "ts-jest": "^29.2.5",
+    "typescript": "5.6.2",
+    "vite": "5.4.4",
     "vite-plugin-node-polyfills": "^0.22.0",
     "vite-plugin-wasm": "^3.3.0",
-    "vitest": "^1.6.0"
+    "vitest": "^2.1.0"
   }
 }
diff --git a/sdk/typescript/rooch-sdk-kit/package.json b/sdk/typescript/rooch-sdk-kit/package.json
@@ -7,7 +7,7 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "packageManager": "pnpm@9.4.0",
+  "packageManager": "pnpm@9.10.0",
   "scripts": {
     "build": "build-rooch-sdk-kit",
     "build:clean": "rimraf dist",
@@ -55,33 +55,31 @@
   ],
   "devDependencies": {
     "@roochnetwork/build-scripts": "workspace:*",
-    "@size-limit/preset-small-lib": "^8.2.6",
-    "@tanstack/react-query": "^5.0.0",
-    "@testing-library/dom": "^9.3.1",
-    "@testing-library/jest-dom": "^5.17.0",
-    "@testing-library/react": "^14.0.0",
-    "@testing-library/user-event": "^14.4.3",
-    "@types/react": "^18.2.15",
-    "@types/testing-library__jest-dom": "^5.14.9",
-    "@vanilla-extract/esbuild-plugin": "^2.3.0",
-    "@vanilla-extract/vite-plugin": "^3.9.0",
-    "jsdom": "^23.0.0",
-    "react": "^18.2.0",
-    "happy-dom": "^14.12.0",
-    "react-dom": "^18.2.0",
-    "size-limit": "^8.2.6",
-    "typescript": "^5.3.3",
-    "vite": "^4.4.4",
-    "vitest": "^1.6.0",
-    "sats-connect": "2.7.0"
+    "@size-limit/preset-small-lib": "^11.1.5",
+    "@tanstack/react-query": "^5.56.2",
+    "@testing-library/dom": "^10.4.0",
+    "@testing-library/jest-dom": "^6.5.0",
+    "@testing-library/react": "^16.0.1",
+    "@testing-library/user-event": "^14.5.2",
+    "@types/react": "^18.3.5",
+    "@vanilla-extract/esbuild-plugin": "^2.3.10",
+    "@vanilla-extract/vite-plugin": "^4.0.15",
+    "happy-dom": "^15.7.4",
+    "jsdom": "^25.0.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "size-limit": "^11.1.5",
+    "typescript": "^5.6.2",
+    "vite": "^5.4.4",
+    "vitest": "^2.1.0"
   },
   "dependencies": {
-    "clsx": "^2.0.0",
-    "zustand": "^4.4.1",
-    "@vanilla-extract/css": "^1.13.0",
-    "@vanilla-extract/dynamic": "^2.0.3",
-    "@vanilla-extract/recipes": "^0.5.0",
-    "@roochnetwork/rooch-sdk": "workspace:*"
+    "@roochnetwork/rooch-sdk": "workspace:*",
+    "@vanilla-extract/css": "^1.15.5",
+    "@vanilla-extract/dynamic": "^2.1.2",
+    "@vanilla-extract/recipes": "^0.5.5",
+    "clsx": "^2.1.1",
+    "zustand": "^4.5.5"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.0.0",
@@ -91,4 +89,4 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   }
-}
+}
diff --git a/sdk/typescript/rooch-sdk-kit/src/wellet/xverse.ts b/sdk/typescript/rooch-sdk-kit/src/wellet/xverse.ts
@@ -1,7 +1,6 @@
 // Copyright (c) RoochNetwork
 // SPDX-License-Identifier: Apache-2.0
 
-// import Wallet from 'sats-connect'
 import { BitcoinAddress, Bytes, ThirdPartyAddress, str, bytes } from '@roochnetwork/rooch-sdk'
 import { BitcoinWallet } from '../wellet/index.js'
 

diff --git a/sdk/typescript/rooch-sdk/package.json b/sdk/typescript/rooch-sdk/package.json
@@ -7,7 +7,7 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "packageManager": "pnpm@8.6.6",
+  "packageManager": "pnpm@9.10.0",
   "scripts": {
     "clean": "rimraf tsconfig.tsbuildinfo rimraf dist",
     "codegen:version": "node genversion.mjs",
@@ -39,40 +39,47 @@
   "bugs": {
     "url": "https://github.com/rooch-network/rooch/issues"
   },
-  "files": ["dist", "src"],
+  "files": [
+    "dist",
+    "src"
+  ],
   "type": "module",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
   "types": "./dist/cjs/index.d.ts",
-  "keywords": ["Rooch", "Rooch Network", "Move"],
+  "keywords": [
+    "Rooch",
+    "Rooch Network",
+    "Move"
+  ],
   "devDependencies": {
+    "@iarna/toml": "^2.2.5",
     "@roochnetwork/build-scripts": "workspace:*",
     "@roochnetwork/test-suite": "workspace:*",
-    "@iarna/toml": "^2.2.5",
-    "@types/node": "^20.14.10",
-    "@types/tmp": "^0.2.1",
-    "ts-retry-promise": "^0.7.0",
-    "typescript": "^5.3.3",
-    "vite": "^4.4.4",
-    "vitest": "^1.6.0",
-    "wait-on": "^7.0.1",
-    "tmp": "^0.2.1",
     "@types/bs58check": "2.1.2",
-    "testcontainers": "10.11.0"
+    "@types/node": "^20.14.10",
+    "@types/tmp": "^0.2.6",
+    "testcontainers": "10.13.1",
+    "tmp": "^0.2.3",
+    "ts-retry-promise": "^0.8.1",
+    "typescript": "^5.4.4",
+    "vite": "^5.4.4",
+    "vitest": "^2.0.5",
+    "wait-on": "^8.0.1"
   },
   "dependencies": {
-    "@noble/hashes": "~1.4.0",
-    "@noble/curves": "~1.4.0",
+    "@mysten/bcs": "1.0.4",
+    "@noble/curves": "~1.6.0",
+    "@noble/hashes": "~1.5.0",
     "@scure/base": "~1.1.6",
-    "@scure/bip32": "^1.3.1",
-    "@scure/bip39": "^1.2.1",
+    "@scure/bip32": "^1.5.0",
+    "@scure/bip39": "^1.4.0",
     "@suchipi/femver": "^1.0.0",
-    "tweetnacl": "^1.0.3",
     "bech32": "^2.0.0",
-    "@mysten/bcs": "1.0.2",
-    "valibot": "^0.25.0",
-    "bs58check": "2.1.2",
-    "buffer": "6.0.3"
+    "bs58check": "4.0.0",
+    "buffer": "6.0.3",
+    "tweetnacl": "^1.0.3",
+    "valibot": "^0.41.0"
   },
   "publishConfig": {
     "access": "public",

diff --git a/sdk/typescript/rooch-sdk/src/address/bitcoin.ts b/sdk/typescript/rooch-sdk/src/address/bitcoin.ts
@@ -44,11 +44,11 @@ export class BitcoinNetwork {
 
   static fromBech32Prefix(prefix: string) {
     switch (prefix) {
-      case 'bc' || 'BC':
+      case 'bc':
         return new BitcoinNetwork(BitcoinNetowkType.Bitcoin)
-      case 'tb' || 'TB':
+      case 'tb':
         return new BitcoinNetwork(BitcoinNetowkType.Testnet)
-      case 'bcrt' || 'bcrt':
+      case 'bcrt':
         return new BitcoinNetwork(BitcoinNetowkType.Regtest)
       default:
         return undefined
@@ -101,7 +101,8 @@ export class BitcoinAddress extends ThirdPartyAddress implements Address {
           const hrp = new BitcoinNetwork(network).bech32HRP()
           const words = bech32.toWords(Buffer.from(this.bytes.slice(2)))
           words.unshift(version)
-          this.rawAddress = version === 0 ? bech32.encode(hrp, words) : bech32m.encode(hrp, words)
+          this.rawAddress =
+            version === 0 ? bech32.encode(hrp, words, false) : bech32m.encode(hrp, words, false)
       }
     } else {
       let info = this.decode()
@@ -141,7 +142,7 @@ export class BitcoinAddress extends ThirdPartyAddress implements Address {
   }
 
   decode() {
-    let input = this.rawAddress
+    let input = this.rawAddress as `${string}1${string}`
     if (input.length < 14 || input.length > 74) throw new Error('Invalid address length')
 
     const bech32_network = (() => {

diff --git a/sdk/typescript/rooch-sdk/src/address/rooch.ts b/sdk/typescript/rooch-sdk/src/address/rooch.ts
@@ -17,7 +17,7 @@ export class RoochAddress implements Address {
       if (isHex(address)) {
         this.address = fromHEX(address)
       } else {
-        this.address = bech32m.fromWords(bech32m.decode(address).words)
+        this.address = bech32m.fromWords(bech32m.decode(address as `${string}1${string}`).words)
       }
     } else {
       this.address = address
@@ -37,6 +37,6 @@ export class RoochAddress implements Address {
   }
 
   toBech32Address(): string {
-    return bech32m.encode(ROOCH_BECH32_PREFIX, bech32m.toWords(this.address))
+    return bech32m.encode(ROOCH_BECH32_PREFIX, bech32m.toWords(this.address), false)
   }
 }
diff --git a/sdk/typescript/rooch-sdk/src/address/util.ts b/sdk/typescript/rooch-sdk/src/address/util.ts
@@ -39,7 +39,7 @@ export function convertToRoochAddressBytes(input: address): Bytes {
     }
 
     if (input.startsWith(ROOCH_BECH32_PREFIX)) {
-      const decode = bech32m.decode(input)
+      const decode = bech32m.decode(input as `${string}1${string}`)
       const bytes = bech32m.fromWords(decode.words)
 
       if (decode.prefix === ROOCH_BECH32_PREFIX && bytes.length === ROOCH_ADDRESS_LENGTH) {
@@ -71,7 +71,7 @@ export function isValidRoochAddress(input: address): input is string {
     }
 
     if (input.startsWith(ROOCH_BECH32_PREFIX)) {
-      const decode = bech32m.decode(input)
+      const decode = bech32m.decode(input as `${string}1${string}`)
       const bytes = bech32m.fromWords(decode.words)
 
       return decode.prefix === ROOCH_BECH32_PREFIX && bytes.length === ROOCH_ADDRESS_LENGTH

diff --git a/sdk/typescript/rooch-sdk/src/keypairs/secp256k1/publickey.ts b/sdk/typescript/rooch-sdk/src/keypairs/secp256k1/publickey.ts
@@ -87,6 +87,7 @@ export class Secp256k1PublicKey extends PublicKey<BitcoinAddress> {
       bech32m.encode(
         new BitcoinNetwork(network).bech32HRP(),
         [version].concat(bech32m.toWords(tweakedPubkey)),
+        false,
       ),
     )
   }
-Original file line number
+Diff line change
@@ Expand Up @@
           bech32m.encode(
             new BitcoinNetwork(network).bech32HRP(),
             [version].concat(bech32m.toWords(tweakedPubkey)),
+            false,
           ),
         )
       }
@@ Expand Down @@