+
diff --git a/packages/neuron-ui/src/widgets/Tooltip/tooltip.module.scss b/packages/neuron-ui/src/widgets/Tooltip/tooltip.module.scss
index 6c4d88ffd1..111bd6d1d3 100644
--- a/packages/neuron-ui/src/widgets/Tooltip/tooltip.module.scss
+++ b/packages/neuron-ui/src/widgets/Tooltip/tooltip.module.scss
@@ -251,25 +251,25 @@ $placements: left, right, top, bottom, left-top, right-top, left-bottom, right-b
.tipWithNode {
position: relative;
- .tip {
+ > .tip {
@include tip;
}
&[data-type='always-dark'] {
- .tip {
+ > .tip {
background: #000000;
color: #ffffff;
}
}
&[data-trigger='click'] {
- &[data-tip-show='true'] .tip {
+ &[data-tip-show='true'] > .tip {
display: block;
}
}
@each $placement in $placements {
- @include tip-placement($placement, ' .tip');
+ @include tip-placement($placement, '> .tip');
}
&[data-trigger='hover'] {
@@ -286,14 +286,14 @@ $placements: left, right, top, bottom, left-top, right-top, left-bottom, right-b
&[data-has-trigger='true'] {
&[data-placement='bottom'] {
&:not([data-trigger-next-to-child='true']) {
- & .tip {
+ & > .tip {
top: calc(100% + 20px);
}
}
}
&[data-placement='top'] {
&[data-trigger-next-to-child='true'] {
- & .tip {
+ & > .tip {
margin-bottom: 2px;
}
}
diff --git a/packages/neuron-ui/tsconfig.json b/packages/neuron-ui/tsconfig.json
index e7acb114a4..7bfedb98e6 100644
--- a/packages/neuron-ui/tsconfig.json
+++ b/packages/neuron-ui/tsconfig.json
@@ -2,26 +2,21 @@
"extends": "../../tsconfig.json",
"compilerOptions": {
"baseUrl": "./src",
- "lib": [
- "dom",
- "dom.iterable",
- "esnext"
- ],
+ "lib": ["dom", "dom.iterable", "esnext"],
"strict": true,
"forceConsistentCasingInFileNames": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "preserve",
- "types": ["@types/jest"],
"typeRoots": [
"src/types",
"node_modules/@nervosnetwork/ckb-types",
- "node_modules/@types"
+ "node_modules/@types",
+ "node_modules/@testing-library",
+ "node_modules/vite"
],
"allowJs": true,
"allowSyntheticDefaultImports": true
},
- "include": [
- "src"
- ]
+ "include": ["src", "vitest-setup.js"]
}
diff --git a/packages/neuron-ui/vite.config.js b/packages/neuron-ui/vite.config.js
new file mode 100644
index 0000000000..87ab061d9a
--- /dev/null
+++ b/packages/neuron-ui/vite.config.js
@@ -0,0 +1,77 @@
+import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react'
+import { nodePolyfills } from 'vite-plugin-node-polyfills'
+import svgr from 'vite-plugin-svgr'
+import eslintPlugin from 'vite-plugin-eslint'
+import path from 'path'
+import postcss from 'postcss-preset-env'
+import commonjs from 'vite-plugin-commonjs'
+import { configDefaults } from 'vitest/config'
+
+export default defineConfig({
+ plugins: [
+ react(),
+ commonjs(),
+ nodePolyfills(),
+ postcss({
+ autoprefixer: false,
+ }),
+ svgr({
+ include: '**/*.svg?react',
+ }),
+ ...[process.env.DISABLE_ESLINT_PLUGIN === 'true' ? [] : [eslintPlugin()]],
+ ],
+ assetsInclude: ['**/*.svg'],
+ base: './',
+ resolve: {
+ alias: {
+ electron: path.resolve(__dirname, './src/electron-modules'),
+ components: path.resolve(__dirname, './src/components'),
+ containers: path.resolve(__dirname, './src/containers'),
+ exceptions: path.resolve(__dirname, './src/exceptions'),
+ locales: path.resolve(__dirname, './src/locales'),
+ services: path.resolve(__dirname, './src/services'),
+ states: path.resolve(__dirname, './src/states'),
+ stories: path.resolve(__dirname, './src/stories'),
+ styles: path.resolve(__dirname, './src/styles'),
+ tests: path.resolve(__dirname, './src/tests'),
+ types: path.resolve(__dirname, './src/types'),
+ utils: path.resolve(__dirname, './src/utils'),
+ theme: path.resolve(__dirname, './src/theme'),
+ router: path.resolve(__dirname, './src/router'),
+ widgets: path.resolve(__dirname, './src/widgets'),
+ },
+ },
+ server: {
+ port: 3000,
+ host: '0.0.0.0',
+ },
+ build: {
+ target: 'esnext',
+ manifest: false,
+ sourcemap: false,
+ outDir: 'build',
+ assetsDir: 'assets',
+ emptyOutDir: true,
+ rollupOptions: {
+ output: {
+ format: 'es',
+ entryFileNames: '[name].js',
+ assetFileNames: 'assets/[name]-[hash][extname]',
+ },
+ },
+ },
+ css: {
+ preprocessorOptions: {
+ less: {
+ javascriptEnabled: true,
+ },
+ },
+ },
+ test: {
+ globals: true,
+ environment: 'jsdom',
+ setupFiles: ['./vitest-setup.js'],
+ include: [...configDefaults.include, 'src/**/*.test.{ts,tsx}'],
+ },
+})
diff --git a/packages/neuron-ui/vitest-setup.js b/packages/neuron-ui/vitest-setup.js
new file mode 100644
index 0000000000..c44951a680
--- /dev/null
+++ b/packages/neuron-ui/vitest-setup.js
@@ -0,0 +1 @@
+import '@testing-library/jest-dom'
diff --git a/packages/neuron-wallet/.env b/packages/neuron-wallet/.env
index b86de40909..29e074fea1 100644
--- a/packages/neuron-wallet/.env
+++ b/packages/neuron-wallet/.env
@@ -117,5 +117,6 @@ DAO_CODE_HASH=0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e
MULTISIG_CODE_HASH=0x5c5069eb0857efc65e1bca0c07df34c31663b3622fd3876c876320fc9634e2a8
# CKB NODE OPTIONS
-CKB_NODE_ASSUME_VALID_TARGET='0xe88730476c6ef0508f4767b233c82a0f20c6365fb1572bf020cb1dce2a0e704b'
-CKB_NODE_DATA_SIZE=49
+CKB_NODE_ASSUME_VALID_TARGET='0x53dd03a0420b68e082d660cb2e86f167aa8f1bd95c637228285bf36f5caa9e1d'
+CKB_NODE_ASSUME_VALID_TARGET_BLOCK_NUMBER=15361857
+CKB_NODE_DATA_SIZE=120
diff --git a/packages/neuron-wallet/electron-builder.yml b/packages/neuron-wallet/electron-builder.yml
index 32ab135725..8beb1160e4 100644
--- a/packages/neuron-wallet/electron-builder.yml
+++ b/packages/neuron-wallet/electron-builder.yml
@@ -73,7 +73,7 @@ mac:
gatekeeperAssess: false
entitlements: assets/entitlements.plist
entitlementsInherit: assets/entitlements.plist
- electronLanguages: ["en", "zh", "zh_CN", "zh_TW"]
+ electronLanguages: ["en", "zh", "zh_CN", "zh_TW", "ar", "fr"]
target:
- target: default
arch:
diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
index 45828839f7..a1016a0229 100644
--- a/packages/neuron-wallet/package.json
+++ b/packages/neuron-wallet/package.json
@@ -3,7 +3,7 @@
"productName": "Neuron",
"description": "CKB Neuron Wallet",
"homepage": "https://www.nervos.org/",
- "version": "0.112.0",
+ "version": "0.121.1",
"private": true,
"author": {
"name": "Nervos Core Dev",
@@ -42,28 +42,24 @@
]
},
"dependencies": {
- "@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",
+ "@ckb-lumos/base": "0.23.0",
+ "@ckb-lumos/ckb-indexer": "0.23.0",
+ "@ckb-lumos/helpers": "0.23.0",
+ "@ckb-lumos/lumos": "0.23.0",
+ "@ckb-lumos/rpc": "0.23.0",
"@iarna/toml": "2.2.5",
"@ledgerhq/hw-transport-node-hid": "6.27.22",
- "@spore-sdk/core": "0.1.0-beta.14",
- "archiver": "6.0.1",
+ "@magickbase/hw-app-ckb": "0.2.0-alpha.0",
+ "@spore-sdk/core": "0.1.0",
+ "archiver": "6.0.2",
"async": "3.2.5",
"bn.js": "4.12.0",
"chalk": "3.0.0",
"dotenv": "8.6.0",
"electron-log": "4.4.8",
- "electron-updater": "4.6.5",
+ "electron-updater": "6.3.0",
"electron-window-state": "5.0.3",
- "elliptic": "6.5.4",
- "hw-app-ckb": "0.1.2",
+ "elliptic": "6.6.1",
"i18next": "21.10.0",
"leveldown": "6.1.1",
"levelup": "4.4.0",
@@ -72,14 +68,13 @@
"sha3": "2.1.4",
"sqlite3": "5.1.6",
"subleveldown": "4.1.4",
- "tslib": "2.6.2",
- "typeorm": "0.2.45",
- "undici": "5.28.2",
+ "tslib": "2.6.3",
+ "typeorm": "0.3.17",
"uuid": "8.3.2"
},
"devDependencies": {
- "@electron/notarize": "2.2.0",
- "@nervosnetwork/ckb-types": "0.109.0",
+ "@electron/notarize": "2.3.2",
+ "@nervosnetwork/ckb-types": "0.109.1",
"@types/archiver": "6.0.2",
"@types/async": "3.2.24",
"@types/electron-devtools-installer": "2.2.5",
@@ -93,12 +88,11 @@
"@types/sqlite3": "3.1.11",
"@types/uuid": "8.3.4",
"devtron": "1.4.0",
- "electron": "28.1.0",
- "electron-build-env": "0.2.0",
+ "electron": "30.0.0",
"electron-builder": "24.9.1",
"electron-devtools-installer": "3.2.0",
"jest-when": "3.6.0",
- "neuron-ui": "0.112.0",
+ "neuron-ui": "0.121.1",
"typescript": "5.3.3"
}
}
diff --git a/packages/neuron-wallet/src/block-sync-renderer/index.ts b/packages/neuron-wallet/src/block-sync-renderer/index.ts
index 95576c84a7..e62a772353 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/index.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/index.ts
@@ -9,22 +9,21 @@ import DataUpdateSubject from '../models/subjects/data-update'
import AddressCreatedSubject from '../models/subjects/address-created-subject'
import WalletDeletedSubject from '../models/subjects/wallet-deleted-subject'
import TxDbChangedSubject from '../models/subjects/tx-db-changed-subject'
-import { LumosCellQuery, LumosCell } from './sync/synchronizer'
+import { type QueryOptions } from '@ckb-lumos/base'
+import { type Cell } from '@ckb-lumos/lumos'
import { WorkerMessage, StartParams, QueryIndexerParams } from './task'
import logger from '../utils/logger'
import CommonUtils from '../utils/common'
import queueWrapper from '../utils/queue'
import env from '../env'
import MultisigConfigDbChangedSubject from '../models/subjects/multisig-config-db-changed-subject'
-import Multisig from '../services/multisig'
-import { SyncAddressType } from '../database/chain/entities/sync-progress'
-import { debounceTime } from 'rxjs/operators'
import { TransactionPersistor } from '../services/tx'
let network: Network | null
let child: ChildProcess | null = null
let requestId = 0
let requests = new Map
unknown>>()
+let isSyncMultisigWithLight = false
export const killBlockSyncTask = async () => {
const _child = child
@@ -64,7 +63,7 @@ export const resetSyncTask = async (startTask = true) => {
if (startTask) {
await WalletService.getInstance().maintainAddressesIfNecessary()
- await TransactionPersistor.checkTxLock()
+ await CommonUtils.retry(3, 5000, TransactionPersistor.checkTxLock)
await CommonUtils.sleep(3000)
await createBlockSyncTask()
}
@@ -88,7 +87,7 @@ export const switchToNetwork = async (newNetwork: Network, reconnected = false,
await resetSyncTaskQueue.asyncPush(shouldSync)
}
-export const queryIndexer = async (query: LumosCellQuery): Promise => {
+export const queryIndexer = async (query: QueryOptions): Promise => {
const _child = child
if (!_child) {
return []
@@ -102,7 +101,7 @@ export const queryIndexer = async (query: LumosCellQuery): Promise
return registerRequest(_child, msg).catch(err => {
logger.error(`Sync:\tfailed to register query indexer task`, err)
return []
- }) as Promise
+ }) as Promise
}
export const createBlockSyncTask = async () => {
@@ -177,8 +176,8 @@ export const createBlockSyncTask = async () => {
genesisHash: network.genesisHash,
url: network.remote,
addressMetas,
- indexerUrl: network.remote,
nodeType: network.type,
+ syncMultisig: isSyncMultisigWithLight,
}
const msg: Required> = { type: 'call', channel: 'start', id: requestId++, message }
return registerRequest(_child, msg).catch(err => {
@@ -200,17 +199,10 @@ export const registerRequest = (c: ChildProcess, msg: Required) =
AddressCreatedSubject.getSubject().subscribe(() => resetSyncTaskQueue.asyncPush(true))
WalletDeletedSubject.getSubject().subscribe(() => resetSyncTaskQueue.asyncPush(true))
-MultisigConfigDbChangedSubject.getSubject()
- .pipe(debounceTime(1000))
- .subscribe(async () => {
- if (!child) {
- return
- }
- const appendScripts = await Multisig.getMultisigConfigForLight()
- const msg: Required<
- WorkerMessage<{ walletId: string; script: CKBComponents.Script; addressType: SyncAddressType }[]>
- > = { type: 'call', channel: 'append_scripts', id: requestId++, message: appendScripts }
- return registerRequest(child, msg).catch(err => {
- logger.error(`Sync:\ffailed to append script to light client`, err)
- })
- })
+MultisigConfigDbChangedSubject.getSubject().subscribe(() => resetSyncTaskQueue.asyncPush(true))
+
+export async function changeMultisigSyncStatus(status: boolean) {
+ logger.info(`Sync:\t ${status ? 'start' : 'stop'} multisig sync`)
+ isSyncMultisigWithLight = status
+ await resetSyncTask(true)
+}
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/full-synchronizer.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/full-synchronizer.ts
index 972d37e5f0..7682cdbd6c 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/full-synchronizer.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/full-synchronizer.ts
@@ -1,4 +1,4 @@
-import { Tip } from '@ckb-lumos/base'
+import { type CKBComponents } from '@ckb-lumos/lumos/rpc'
import logger from '../../utils/logger'
import CommonUtils from '../../utils/common'
import RpcService from '../../services/rpc-service'
@@ -10,12 +10,12 @@ import IndexerCacheService from './indexer-cache-service'
export default class FullSynchronizer extends Synchronizer {
private rpcService: RpcService
- constructor(addresses: Address[], nodeUrl: string, indexerUrl: string, nodeType: NetworkType) {
- super({ addresses, nodeUrl, indexerUrl })
+ constructor(addresses: Address[], nodeUrl: string, nodeType: NetworkType) {
+ super({ addresses, nodeUrl })
this.rpcService = new RpcService(nodeUrl, nodeType)
}
- private async synchronize(indexerTipBlock: Tip) {
+ private async synchronize(indexerTipBlock: CKBComponents.Tip) {
if (!indexerTipBlock) {
return
}
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts
index 45f74efba8..99f29b49e4 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts
@@ -6,7 +6,7 @@ import RpcService from '../../services/rpc-service'
import TransactionWithStatus from '../../models/chain/transaction-with-status'
import SyncInfoEntity from '../../database/chain/entities/sync-info'
import { getConnection } from '../../database/chain/connection'
-import { TransactionCollector, CellCollector, Indexer as CkbIndexer } from '@ckb-lumos/ckb-indexer'
+import { TransactionCollector, Indexer as CkbIndexer, CellCollector } from '@ckb-lumos/ckb-indexer'
export default class IndexerCacheService {
private addressMetas: AddressMeta[]
@@ -149,7 +149,7 @@ export default class IndexerCacheService {
cacheBlockNumberEntity =
(await getConnection()
.getRepository(SyncInfoEntity)
- .findOne({ name: SyncInfoEntity.getLastCachedKey(blake160) })) ??
+ .findOneBy({ name: SyncInfoEntity.getLastCachedKey(blake160) })) ??
SyncInfoEntity.fromObject({
name: SyncInfoEntity.getLastCachedKey(blake160),
value: '0x0',
@@ -194,7 +194,7 @@ export default class IndexerCacheService {
const txsWithStatus: TransactionWithStatus[] = []
const fetchBlockDetailsQueue = queue(async (hash: string) => {
const txWithStatus = await this.rpcService.getTransaction(hash)
- if (!txWithStatus) {
+ if (!txWithStatus?.transaction) {
return
}
const blockHeader = await this.rpcService.getHeader(txWithStatus!.txStatus.blockHash!)
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts
index 1adccf187b..2f7829c674 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts
@@ -1,39 +1,36 @@
-import type { HexString, Script, TransactionWithStatus } from '@ckb-lumos/base'
+import type { HexString, Script } from '@ckb-lumos/lumos'
+import { type CKBComponents } from '@ckb-lumos/lumos/rpc'
import logger from '../../utils/logger'
import { Address } from '../../models/address'
import AddressMeta from '../../database/address/meta'
import { scheduler } from 'timers/promises'
import SyncProgressService from '../../services/sync-progress'
-import { Synchronizer, AppendScript } from './synchronizer'
-import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
+import { Synchronizer } from './synchronizer'
+import { computeScriptHash as scriptToHash } from '@ckb-lumos/lumos/utils'
import { FetchTransactionReturnType, LightRPC, LightScriptFilter } from '../../utils/ckb-rpc'
import Multisig from '../../services/multisig'
import SyncProgress, { SyncAddressType } from '../../database/chain/entities/sync-progress'
import WalletService from '../../services/wallets'
import AssetAccountInfo from '../../models/asset-account-info'
import { DepType } from '../../models/chain/cell-dep'
-import { molecule } from '@ckb-lumos/codec'
-import { blockchain } from '@ckb-lumos/base'
-import type { Base } from '@ckb-lumos/rpc/lib/Base'
-import { BI } from '@ckb-lumos/bi'
+import { vector, blockchain } from '@ckb-lumos/lumos/codec'
+import type { Base } from '@ckb-lumos/lumos/rpc'
+import { BI } from '@ckb-lumos/lumos'
import IndexerCacheService from './indexer-cache-service'
-import { ScriptType } from '@ckb-lumos/ckb-indexer/lib/type'
import { scriptToAddress } from '../../utils/scriptAndAddress'
import NetworksService from '../../services/networks'
import { getConnection } from '../../database/chain/connection'
-const unpackGroup = molecule.vector(blockchain.OutPoint)
+const unpackGroup = vector(blockchain.OutPoint)
+const THRESHOLD_BLOCK_NUMBER_IN_DIFF_WALLET = 100_000
export default class LightSynchronizer extends Synchronizer {
private lightRpc: LightRPC
private addressMetas: AddressMeta[]
+ private syncMultisig?: boolean
constructor(addresses: Address[], nodeUrl: string) {
- super({
- addresses,
- nodeUrl,
- indexerUrl: nodeUrl,
- })
+ super({ addresses, nodeUrl })
this.lightRpc = new LightRPC(nodeUrl)
this.addressMetas = addresses.map(address => AddressMeta.fromObject(address))
// fetch some dep cell
@@ -45,6 +42,7 @@ export default class LightSynchronizer extends Synchronizer {
const fetchCellDeps = [
assetAccountInfo.anyoneCanPayCellDep,
assetAccountInfo.sudtCellDep,
+ assetAccountInfo.xudtCellDep,
assetAccountInfo.getNftClassInfo().cellDep,
assetAccountInfo.getNftInfo().cellDep,
assetAccountInfo.getNftIssuerInfo().cellDep,
@@ -87,7 +85,9 @@ export default class LightSynchronizer extends Synchronizer {
private async synchronize() {
const syncScripts = await this.upsertTxHashes()
await this.updateSyncedBlockOfScripts(syncScripts)
- const minSyncBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber()
+ const minSyncBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber(
+ this.syncMultisig ? SyncAddressType.Multisig : undefined
+ )
const hasNextBlock = await this.notifyAndSyncNext(minSyncBlockNumber)
if (!hasNextBlock) {
await this.updateBlockStartNumber(minSyncBlockNumber)
@@ -101,7 +101,7 @@ export default class LightSynchronizer extends Synchronizer {
}: {
script: Script
blockRange: [HexString, HexString]
- scriptType: ScriptType
+ scriptType: CKBComponents.ScriptType
}) {
const res = []
let lastCursor: HexString | undefined = undefined
@@ -171,18 +171,32 @@ export default class LightSynchronizer extends Synchronizer {
await getConnection('light').manager.save(updatedSyncProgress, { chunk: 100 })
}
- private async initSyncProgress(appendScripts: AppendScript[] = []) {
- if (!this.addressMetas.length && !appendScripts.length) {
+ private static async getWalletsSyncedMinBlockNumber() {
+ const walletMinBlockNumber = await SyncProgressService.getWalletMinLocalSavedBlockNumber()
+ const wallets = await WalletService.getInstance().getAll()
+ return wallets.reduce>(
+ (pre, cur) => ({
+ ...pre,
+ [cur.id]: Math.max(parseInt(cur.startBlockNumber ?? '0x0'), walletMinBlockNumber?.[cur.id] ?? 0),
+ }),
+ {}
+ )
+ }
+
+ private async initSyncProgress() {
+ if (!this.addressMetas.length) {
return
}
+ const existSyncArgses = await SyncProgressService.getExistingSyncArgses()
const syncScripts = await this.lightRpc.getScripts()
- const existSyncscripts: Record = {}
- syncScripts.forEach(v => {
- existSyncscripts[scriptToHash(v.script)] = v
+ const retainedSyncScripts = syncScripts.filter(v => existSyncArgses.has(v.script.args))
+ const existSyncScripts: Record = {}
+ retainedSyncScripts.forEach(v => {
+ existSyncScripts[scriptToHash(v.script)] = v
})
+ const walletMinBlockNumber = await LightSynchronizer.getWalletsSyncedMinBlockNumber()
const currentWalletId = WalletService.getInstance().getCurrent()?.id
const allScripts = this.addressMetas
- .filter(v => (currentWalletId ? v.walletId === currentWalletId : true))
.map(addressMeta => {
const lockScripts = [
addressMeta.generateDefaultLockScript(),
@@ -196,52 +210,81 @@ export default class LightSynchronizer extends Synchronizer {
}))
})
.flat()
- const walletMinBlockNumber = await SyncProgressService.getWalletMinLocalSavedBlockNumber()
- const wallets = await WalletService.getInstance().getAll()
- const walletStartBlockMap = wallets.reduce>(
- (pre, cur) => ({ ...pre, [cur.id]: cur.startBlockNumber }),
- {}
- )
- const otherTypeSyncBlockNumber = await SyncProgressService.getOtherTypeSyncBlockNumber()
- const addScripts = [
- ...allScripts
- .filter(v => !existSyncscripts[scriptToHash(v.script)])
- .map(v => {
- const blockNumber = Math.max(
- parseInt(walletStartBlockMap[v.walletId] ?? '0x0'),
- walletMinBlockNumber?.[v.walletId] ?? 0
- )
- return {
- ...v,
- blockNumber: `0x${blockNumber.toString(16)}`,
- }
- }),
- ...appendScripts
- .filter(v => !existSyncscripts[scriptToHash(v.script)])
- .map(v => ({
+ .filter(v => {
+ return (
+ !currentWalletId ||
+ v.walletId === currentWalletId ||
+ walletMinBlockNumber[v.walletId] >
+ walletMinBlockNumber[currentWalletId] - THRESHOLD_BLOCK_NUMBER_IN_DIFF_WALLET
+ )
+ })
+ const addScripts = allScripts
+ .filter(v => {
+ const scriptHash = scriptToHash(v.script)
+ return (
+ !existSyncScripts[scriptHash] || +existSyncScripts[scriptHash].blockNumber < walletMinBlockNumber[v.walletId]
+ )
+ })
+ .map(v => {
+ return {
...v,
- blockNumber: `0x${(otherTypeSyncBlockNumber[scriptToHash(v.script)] ?? 0).toString(16)}`,
- })),
- ]
+ blockNumber: `0x${walletMinBlockNumber[v.walletId].toString(16)}`,
+ }
+ })
await this.lightRpc.setScripts(addScripts, 'partial')
- const allScriptHashes = new Set([
- ...allScripts.map(v => scriptToHash(v.script)),
- ...appendScripts.map(v => scriptToHash(v.script)),
- ])
- const deleteScript = syncScripts.filter(v => !allScriptHashes.has(scriptToHash(v.script)))
+ const allScriptHashes = new Set(allScripts.map(v => scriptToHash(v.script)))
+ const deleteScript = retainedSyncScripts.filter(v => !allScriptHashes.has(scriptToHash(v.script)))
await this.lightRpc.setScripts(deleteScript, 'delete')
const walletIds = [...new Set(this.addressMetas.map(v => v.walletId))]
- await SyncProgressService.initSyncProgress(addScripts)
await SyncProgressService.updateSyncProgressFlag(walletIds)
+ await SyncProgressService.initSyncProgress(addScripts)
+ }
+
+ private async initMultisigSyncProgress() {
+ const multisigScripts = await Multisig.getMultisigConfigForLight()
+ if (!multisigScripts.length) {
+ return
+ }
+ const existSyncArgses = await SyncProgressService.getExistingSyncArgses()
+ const syncScripts = await this.lightRpc.getScripts()
+ const retainedSyncScripts = syncScripts.filter(v => existSyncArgses.has(v.script.args))
+ const existSyncScripts: Record = {}
+ retainedSyncScripts.forEach(v => {
+ existSyncScripts[scriptToHash(v.script)] = v
+ })
+ const otherTypeSyncBlockNumber = await SyncProgressService.getOtherTypeSyncBlockNumber()
+ const addScripts = multisigScripts
+ .filter(v => {
+ const scriptHash = scriptToHash(v.script)
+ return (
+ !existSyncScripts[scriptToHash(v.script)] ||
+ +existSyncScripts[scriptHash].blockNumber < (v.startBlockNumber ?? 0)
+ )
+ })
+ .map(v => ({
+ ...v,
+ blockNumber: `0x${Math.max(
+ otherTypeSyncBlockNumber[scriptToHash(v.script)] ?? 0,
+ v.startBlockNumber ?? 0
+ ).toString(16)}`,
+ }))
+ await this.lightRpc.setScripts(addScripts, 'partial')
+ const allScriptHashes = new Set(multisigScripts.map(v => scriptToHash(v.script)))
+ const deleteScript = retainedSyncScripts.filter(v => !allScriptHashes.has(scriptToHash(v.script)))
+ await this.lightRpc.setScripts(deleteScript, 'delete')
+ await SyncProgressService.initSyncProgress(addScripts)
await SyncProgressService.removeByHashesAndAddressType(
SyncAddressType.Multisig,
- appendScripts.map(v => scriptToHash(v.script))
+ multisigScripts.map(v => scriptToHash(v.script))
)
}
- private async initSync() {
- const appendScripts = await Multisig.getMultisigConfigForLight()
- await this.initSyncProgress(appendScripts)
+ private async initSync(syncMultisig?: boolean) {
+ if (syncMultisig) {
+ await this.initMultisigSyncProgress()
+ } else {
+ await this.initSyncProgress()
+ }
while (this.pollingIndexer) {
await this.synchronize()
await scheduler.wait(5000)
@@ -250,7 +293,9 @@ export default class LightSynchronizer extends Synchronizer {
private async fetchPreviousOutputs(txHashes: string[]) {
const transactions = await this.lightRpc
- .createBatchRequest<'getTransaction', string[], TransactionWithStatus[]>(txHashes.map(v => ['getTransaction', v]))
+ .createBatchRequest<'getTransaction', string[], CKBComponents.TransactionWithStatus[]>(
+ txHashes.map(v => ['getTransaction', v])
+ )
.exec()
const previousTxHashes = new Set()
transactions
@@ -262,10 +307,15 @@ export default class LightSynchronizer extends Synchronizer {
previousTxHashes.add(previousTxHash)
}
})
+ if (!previousTxHashes.size) return
await this.lightRpc.createBatchRequest([...previousTxHashes].map(v => ['fetchTransaction' as keyof Base, v])).exec()
}
private async updateBlockStartNumber(blockNumber: number) {
+ if (this._needGenerateAddress || !this.pollingIndexer) {
+ logger.info('LightConnector:\twait for generating address')
+ return
+ }
const scripts = await this.lightRpc.getScripts()
await SyncProgressService.updateBlockNumber(
scripts.map(v => v.script.args),
@@ -273,37 +323,38 @@ export default class LightSynchronizer extends Synchronizer {
)
}
- public async connect() {
+ public async connect(syncMultisig?: boolean) {
try {
logger.info('LightConnector:\tconnect ...:')
this.pollingIndexer = true
- this.initSync()
+ this.syncMultisig = syncMultisig
+ this.initSync(syncMultisig)
} catch (error) {
logger.error(`Error connecting to Light: ${error.message}`)
throw error
}
}
- async appendScript(scripts: AppendScript[]) {
- this.initSyncProgress(scripts)
- }
-
private async checkTxExist(txHashes: string[]) {
const transactions = await this.lightRpc
- .createBatchRequest<'getTransaction', string[], TransactionWithStatus[]>(txHashes.map(v => ['getTransaction', v]))
+ .createBatchRequest<'getTransaction', string[], CKBComponents.TransactionWithStatus[]>(
+ txHashes.map(v => ['getTransaction', v])
+ )
.exec()
return transactions.every(v => !!v.transaction)
}
async processTxsInNextBlockNumber() {
- const [nextBlockNumber, txHashesInNextBlock] = await this.getTxHashesWithNextUnprocessedBlockNumber()
- const minSyncBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber()
+ const [nextBlockNumber, txHashesInNextBlock, walletIds] = await this.getTxHashesWithNextUnprocessedBlockNumber()
+ const minSyncBlockNumber = this.syncMultisig
+ ? await SyncProgressService.getCurrentWalletMinSyncedBlockNumber(SyncAddressType.Multisig)
+ : await SyncProgressService.getMinSyncedBlockNumberInWallets(walletIds)
if (
nextBlockNumber !== undefined &&
txHashesInNextBlock.length &&
// For light client, if tx hash has been called with fetch_transaction, the tx can not return by get_transactions
// So before derived address synced to bigger than next synced block number, do not sync the next block number
- minSyncBlockNumber >= parseInt(nextBlockNumber) &&
+ (minSyncBlockNumber === undefined || minSyncBlockNumber >= parseInt(nextBlockNumber)) &&
// check whether the tx is sync from light client, after split the light client and full DB file, this check will remove
(await this.checkTxExist(txHashesInNextBlock))
) {
@@ -319,7 +370,9 @@ export default class LightSynchronizer extends Synchronizer {
} else {
return
}
- const minCachedBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber()
+ const minCachedBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber(
+ this.syncMultisig ? SyncAddressType.Multisig : undefined
+ )
await this.updateBlockStartNumber(Math.min(parseInt(blockNumber), minCachedBlockNumber))
this.processNextBlockNumber()
}
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts
index a09055eb58..890cbac985 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts
@@ -17,17 +17,16 @@ import IndexerCacheService from './indexer-cache-service'
import logger from '../../utils/logger'
import CommonUtils from '../../utils/common'
import { ShouldInChildProcess } from '../../exceptions'
-import { AppendScript, BlockTips, Synchronizer } from './synchronizer'
+import { BlockTips, Synchronizer } from './synchronizer'
import LightSynchronizer from './light-synchronizer'
import { generateRPC } from '../../utils/ckb-rpc'
-import { BUNDLED_LIGHT_CKB_URL } from '../../utils/const'
import { NetworkType } from '../../models/network'
+import WalletService from '../../services/wallets'
export default class Queue {
#lockHashes: string[]
#url: string // ckb node
#nodeType: NetworkType
- #indexerUrl: string
#addresses: AddressInterface[]
#rpcService: RpcService
#indexerConnector: Synchronizer | undefined
@@ -37,15 +36,16 @@ export default class Queue {
#multiSignBlake160s: string[]
#anyoneCanPayLockHashes: string[]
#assetAccountInfo: AssetAccountInfo
+ #syncMultisig: boolean
- constructor(url: string, addresses: AddressInterface[], indexerUrl: string, nodeType: NetworkType) {
+ constructor(url: string, addresses: AddressInterface[], nodeType: NetworkType, syncMultisig: boolean) {
this.#url = url
- this.#indexerUrl = indexerUrl
this.#addresses = addresses
this.#rpcService = new RpcService(url, nodeType)
this.#nodeType = nodeType
this.#assetAccountInfo = new AssetAccountInfo()
this.#lockHashes = AddressParser.batchToLockHash(this.#addresses.map(meta => meta.address))
+ this.#syncMultisig = syncMultisig
const blake160s = this.#addresses.map(meta => meta.blake160)
this.#lockArgsSet = new Set(
@@ -66,12 +66,12 @@ export default class Queue {
start = async () => {
logger.info('Queue:\tstart')
try {
- if (this.#url === BUNDLED_LIGHT_CKB_URL) {
+ if (this.#nodeType === NetworkType.Light) {
this.#indexerConnector = new LightSynchronizer(this.#addresses, this.#url)
} else {
- this.#indexerConnector = new FullSynchronizer(this.#addresses, this.#url, this.#indexerUrl, this.#nodeType)
+ this.#indexerConnector = new FullSynchronizer(this.#addresses, this.#url, this.#nodeType)
}
- await this.#indexerConnector!.connect()
+ await this.#indexerConnector!.connect(this.#syncMultisig)
} catch (error) {
logger.error('Restarting child process due to error', error.message)
if (process.send) {
@@ -121,10 +121,6 @@ export default class Queue {
}
}
- async appendLightScript(scripts: AppendScript[]) {
- await this.#indexerConnector?.appendScript(scripts)
- }
-
private async fetchTxsWithStatus(txHashes: string[]) {
const rpc = generateRPC(this.#url, this.#nodeType)
const txsWithStatus = await rpc
@@ -137,8 +133,8 @@ export default class Queue {
for (let index = 0; index < txsWithStatus.length; index++) {
if (txsWithStatus[index]?.transaction) {
const tx = Transaction.fromSDK(txsWithStatus[index].transaction)
- tx.blockHash = txsWithStatus[index].txStatus.blockHash!
- blockHashes.push(tx.blockHash)
+ tx.blockHash = txsWithStatus[index].txStatus.blockHash
+ blockHashes.push(tx.blockHash!)
txs.push(tx)
} else {
if ((txsWithStatus[index].txStatus as any) === 'rejected') {
@@ -148,7 +144,7 @@ export default class Queue {
}
}
const headers = await rpc
- .createBatchRequest<'getHeader', string[], CKBComponents.BlockHeader[]>(blockHashes.map(v => ['getHeader', v]))
+ .createBatchRequest<'getHeader', string[], CKBComponents.BlockHeader[]>(blockHashes.map(v => ['getHeader', v!]))
.exec()
headers.forEach((blockHeader: CKBComponents.BlockHeader, idx: number) => {
if (blockHeader) {
@@ -235,7 +231,7 @@ export default class Queue {
}
await TransactionPersistor.saveFetchTx(tx, this.#lockArgsSet)
for (const info of anyoneCanPayInfos) {
- await AssetAccountService.checkAndSaveAssetAccountWhenSync(info.tokenID, info.blake160)
+ await AssetAccountService.checkAndSaveAssetAccountWhenSync(info.tokenID, info.blake160, info.udtType)
}
await this.#checkAndGenerateAddressesByTx(tx)
@@ -254,6 +250,9 @@ export default class Queue {
.map(addr => addr.walletId)
)
if (process.send) {
+ this.#indexerConnector!.needGenerateAddress = await WalletService.getInstance().checkNeedGenerateAddress([
+ ...walletIds,
+ ])
process.send({ channel: 'check-and-save-wallet-address', message: [...walletIds] })
} else {
throw new ShouldInChildProcess()
@@ -268,6 +267,7 @@ export default class Queue {
indexerTipNumber: tip.indexerTipNumber,
cacheTipNumber: tip.cacheTipNumber,
timestamp: Date.now(),
+ syncMultisig: this.#syncMultisig,
},
})
} else {
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/synchronizer.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/synchronizer.ts
index 7b1fd0b4e8..e3b58c0eb7 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/synchronizer.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/synchronizer.ts
@@ -1,10 +1,9 @@
import { Subject } from 'rxjs'
import { queue, QueueObject } from 'async'
+import { type QueryOptions } from '@ckb-lumos/base'
import { Indexer as CkbIndexer, CellCollector } from '@ckb-lumos/ckb-indexer'
-import { QueryOptions } from '@ckb-lumos/base'
import AddressMeta from '../../database/address/meta'
import { Address } from '../../models/address'
-import { SyncAddressType } from '../../database/chain/entities/sync-progress'
import IndexerCacheService from './indexer-cache-service'
import logger from '../../utils/logger'
import IndexerTxHashCache from '../../database/chain/entities/indexer-tx-hash-cache'
@@ -14,41 +13,6 @@ export interface BlockTips {
indexerTipNumber: number | undefined
}
-export interface LumosCellQuery {
- lock: CKBComponents.Script | null
- type: CKBComponents.Script | null
- data: string | null
-}
-
-export interface LumosCell {
- blockHash: string
- outPoint: {
- txHash: string
- index: string
- }
- cellOutput: {
- capacity: string
- lock: {
- codeHash: string
- args: string
- hashType: string
- }
- type?: {
- codeHash: string
- args: string
- hashType: string
- }
- }
- data?: string
-}
-
-export interface AppendScript {
- walletId: string
- script: CKBComponents.Script
- addressType: SyncAddressType
- scriptType: CKBRPC.ScriptType
-}
-
export abstract class Synchronizer {
public readonly blockTipsSubject: Subject = new Subject()
public readonly transactionsSubject = new Subject<{ txHashes: CKBComponents.Hash[]; params: string }>()
@@ -57,18 +21,16 @@ export abstract class Synchronizer {
protected processingBlockNumber?: string
protected addressesByWalletId: Map = new Map()
protected pollingIndexer: boolean = false
- private indexerQueryQueue: QueueObject | undefined
+ private indexerQueryQueue: QueueObject | undefined
+ protected _needGenerateAddress: boolean = false
- abstract connect(): Promise
+ abstract connect(syncMultisig?: boolean): Promise
abstract processTxsInNextBlockNumber(): Promise
protected abstract upsertTxHashes(): Promise
public abstract notifyCurrentBlockNumberProcessed(blockNumber: string): Promise
- async appendScript(_scripts: AppendScript[]) {
- // do nothing
- }
- constructor({ addresses, nodeUrl, indexerUrl }: { addresses: Address[]; nodeUrl: string; indexerUrl: string }) {
- this.indexer = new CkbIndexer(nodeUrl, indexerUrl)
+ constructor({ addresses, nodeUrl }: { addresses: Address[]; nodeUrl: string }) {
+ this.indexer = new CkbIndexer(nodeUrl)
this.addressesByWalletId = addresses
.map(address => AddressMeta.fromObject(address))
.reduce((addressesByWalletId, addressMeta) => {
@@ -96,6 +58,10 @@ export abstract class Synchronizer {
this.pollingIndexer = false
}
+ public set needGenerateAddress(v: boolean) {
+ this._needGenerateAddress = v
+ }
+
protected async processNextBlockNumber() {
// the processNextBlockNumberQueue is a queue to ensure that ONLY one
// block processing task runs at a time to avoid the data conflict while syncing
@@ -103,7 +69,7 @@ export abstract class Synchronizer {
await this.processNextBlockNumberQueue?.drain()
}
- protected async getTxHashesWithNextUnprocessedBlockNumber(): Promise<[string | undefined, string[]]> {
+ protected async getTxHashesWithNextUnprocessedBlockNumber(): Promise<[string | undefined, string[], string[]]> {
const txHashCachesByNextBlockNumberAndAddress = await Promise.all(
[...this.addressesByWalletId.keys()].map(async walletId =>
IndexerCacheService.nextUnprocessedTxsGroupedByBlockNumber(walletId)
@@ -121,12 +87,15 @@ export abstract class Synchronizer {
const nextUnprocessedBlockNumber = [...groupedTxHashCaches.keys()].sort((a, b) => parseInt(a) - parseInt(b)).shift()
if (!nextUnprocessedBlockNumber) {
- return [undefined, []]
+ return [undefined, [], []]
}
const txHashCachesInNextUnprocessedBlockNumber = groupedTxHashCaches.get(nextUnprocessedBlockNumber)
-
- return [nextUnprocessedBlockNumber, txHashCachesInNextUnprocessedBlockNumber!.map(({ txHash }) => txHash)]
+ return [
+ nextUnprocessedBlockNumber,
+ txHashCachesInNextUnprocessedBlockNumber!.map(({ txHash }) => txHash),
+ [...new Set(txHashCachesInNextUnprocessedBlockNumber!.map(({ walletId }) => walletId))],
+ ]
}
protected async notifyAndSyncNext(indexerTipNumber: number) {
@@ -150,7 +119,7 @@ export abstract class Synchronizer {
return false
}
- public async getLiveCellsByScript(query: LumosCellQuery) {
+ public async getLiveCellsByScript(query: QueryOptions) {
return new Promise((resolve, reject) => {
this.indexerQueryQueue!.push(query, (err: any, result: unknown) => {
if (err) {
@@ -161,7 +130,7 @@ export abstract class Synchronizer {
})
}
- private async collectLiveCellsByScript(query: LumosCellQuery) {
+ private async collectLiveCellsByScript(query: QueryOptions) {
const { lock, type, data } = query
if (!lock && !type) {
throw new Error('at least one parameter is required')
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/tx-address-finder.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/tx-address-finder.ts
index f8d1a9d295..8cb87fffd7 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/tx-address-finder.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/tx-address-finder.ts
@@ -6,10 +6,13 @@ import OutPoint from '../../models/chain/out-point'
import Transaction from '../../models/chain/transaction'
import SystemScriptInfo from '../../models/system-script-info'
import { getConnection } from '../../database/chain/connection'
+import { UDTType } from '../../utils/const'
+import AssetAccountInfo from '../../models/asset-account-info'
export interface AnyoneCanPayInfo {
tokenID: string
blake160: string
+ udtType?: UDTType
}
// Search for all addresses related to a transaction. These addresses include:
@@ -47,6 +50,7 @@ export default class TxAddressFinder {
let shouldSync = false
// const anyoneCanPayBlake160s: string[] = []
const anyoneCanPayInfos: AnyoneCanPayInfo[] = []
+ const assetAccountInfo = new AssetAccountInfo()
const outputs: Output[] = this.tx
.outputs!.map((output, index) => {
if (SystemScriptInfo.isMultiSignScript(output.lock)) {
@@ -62,6 +66,11 @@ export default class TxAddressFinder {
anyoneCanPayInfos.push({
blake160: output.lock.args,
tokenID: output.type?.args || 'CKBytes',
+ udtType: output.type
+ ? assetAccountInfo.isSudtScript(output.type)
+ ? UDTType.SUDT
+ : UDTType.XUDT
+ : undefined,
})
}
if (this.lockHashes.has(output.lockHash!)) {
@@ -86,11 +95,12 @@ export default class TxAddressFinder {
const anyoneCanPayInfos: AnyoneCanPayInfo[] = []
const inputs = this.tx.inputs!.filter(i => i.previousOutput !== null)
const isMainnet = NetworksService.getInstance().isMainnet()
+ const assetAccountInfo = new AssetAccountInfo()
let shouldSync = false
for (const input of inputs) {
const outPoint: OutPoint = input.previousOutput!
- const output = await getConnection().getRepository(OutputEntity).findOne({
+ const output = await getConnection().getRepository(OutputEntity).findOneBy({
outPointTxHash: outPoint.txHash,
outPointIndex: outPoint.index,
})
@@ -100,6 +110,11 @@ export default class TxAddressFinder {
anyoneCanPayInfos.push({
blake160: output.lockArgs,
tokenID: output.typeArgs || 'CKBytes',
+ udtType: output.typeScript()
+ ? assetAccountInfo.isSudtScript(output.typeScript()!)
+ ? UDTType.SUDT
+ : UDTType.XUDT
+ : undefined,
})
}
if (output && this.lockHashes.has(output.lockHash)) {
diff --git a/packages/neuron-wallet/src/block-sync-renderer/task.ts b/packages/neuron-wallet/src/block-sync-renderer/task.ts
index e10291360e..124a781fdd 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/task.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/task.ts
@@ -1,4 +1,4 @@
-import type { LumosCellQuery } from './sync/synchronizer'
+import { type QueryOptions } from '@ckb-lumos/base'
import initConnection from '../database/chain/ormconfig'
import { register as registerTxStatusListener } from './tx-status-listener'
import SyncQueue from './sync/queue'
@@ -21,7 +21,6 @@ export interface WorkerMessage {
| 'address-created'
| 'indexer-error'
| 'check-and-save-wallet-address'
- | 'append_scripts'
message: T
}
@@ -31,11 +30,11 @@ export interface StartParams {
genesisHash: string
url: SyncQueueParams[0]
addressMetas: SyncQueueParams[1]
- indexerUrl: SyncQueueParams[2]
- nodeType: SyncQueueParams[3]
+ nodeType: SyncQueueParams[2]
+ syncMultisig: SyncQueueParams[3]
}
-export type QueryIndexerParams = LumosCellQuery
+export type QueryIndexerParams = QueryOptions
export const listener = async ({ type, id, channel, message }: WorkerMessage) => {
if (type === 'kill') {
@@ -63,7 +62,7 @@ export const listener = async ({ type, id, channel, message }: WorkerMessage) =>
try {
await initConnection(message.genesisHash)
- syncQueue = new SyncQueue(message.url, message.addressMetas, message.indexerUrl, message.nodeType)
+ syncQueue = new SyncQueue(message.url, message.addressMetas, message.nodeType, message.syncMultisig)
syncQueue.start()
} catch (err) {
logger.error(`Block Sync Task:\t`, err)
@@ -93,12 +92,6 @@ export const listener = async ({ type, id, channel, message }: WorkerMessage) =>
}
break
}
- case 'append_scripts': {
- if (Array.isArray(message)) {
- await syncQueue?.appendLightScript(message)
- }
- break
- }
default: {
// ignore
}
diff --git a/packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts b/packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts
index 1fbba05c50..3d996b3cf7 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts
@@ -7,6 +7,7 @@ import TransactionWithStatus from '../models/chain/transaction-with-status'
import logger from '../utils/logger'
import { getConnection } from '../database/chain/connection'
import { interval } from 'rxjs'
+import TxStatus from '../models/chain/tx-status'
type TransactionDetail = {
hash: string
@@ -18,7 +19,8 @@ type TransactionDetail = {
const getTransactionStatus = async (hash: string) => {
const network = NetworksService.getInstance().getCurrent()
const rpcService = new RpcService(network.remote, network.type)
- const txWithStatus: TransactionWithStatus | undefined = await rpcService.getTransaction(hash)
+ const txWithStatus: TransactionWithStatus | undefined | { transaction: null; txStatus: TxStatus } =
+ await rpcService.getTransaction(hash)
if (!txWithStatus) {
return {
tx: txWithStatus,
@@ -33,6 +35,13 @@ const getTransactionStatus = async (hash: string) => {
blockHash: txWithStatus.txStatus.blockHash,
}
}
+ if (txWithStatus.txStatus.isRejected()) {
+ return {
+ tx: null,
+ status: TransactionStatus.Rejected,
+ blockHash: null,
+ }
+ }
return {
tx: txWithStatus.transaction,
status: TransactionStatus.Pending,
@@ -41,14 +50,16 @@ const getTransactionStatus = async (hash: string) => {
}
const trackingStatus = async () => {
- const pendingTransactions = await FailedTransaction.pendings()
- if (!pendingTransactions.length) {
+ const pendingOrFailedTransactions = await FailedTransaction.pendingOrFaileds()
+ await FailedTransaction.processAmendFailedTxs()
+
+ if (!pendingOrFailedTransactions.length) {
return
}
- const pendingHashes = pendingTransactions.map(tx => tx.hash)
+ const pendingOrFailedHashes = pendingOrFailedTransactions.map(tx => tx.hash)
const txs = await Promise.all(
- pendingHashes.map(async hash => {
+ pendingOrFailedHashes.map(async hash => {
try {
const txWithStatus = await getTransactionStatus(hash)
return {
@@ -63,17 +74,18 @@ const trackingStatus = async () => {
})
)
- const failedTxs = txs.filter(
- (tx): tx is TransactionDetail & { status: TransactionStatus.Failed } => tx?.status === TransactionStatus.Failed
- )
- const successTxs = txs.filter(
- (tx): tx is TransactionDetail & { status: TransactionStatus.Success } => tx?.status === TransactionStatus.Success
- )
+ const failedTxs = txs.filter((tx): tx is TransactionDetail => tx?.status === TransactionStatus.Failed)
+ const successTxs = txs.filter((tx): tx is TransactionDetail => tx?.status === TransactionStatus.Success)
+ const rejectedTxs = txs.filter((tx): tx is TransactionDetail => tx?.status === TransactionStatus.Rejected)
if (failedTxs.length) {
await FailedTransaction.updateFailedTxs(failedTxs.map(tx => tx.hash))
}
+ if (rejectedTxs.length) {
+ await FailedTransaction.deleteFailedTxs(rejectedTxs.map(tx => tx.hash))
+ }
+
if (successTxs.length > 0) {
const network = NetworksService.getInstance().getCurrent()
const rpcService = new RpcService(network.remote, network.type)
diff --git a/packages/neuron-wallet/src/controllers/anyone-can-pay.ts b/packages/neuron-wallet/src/controllers/anyone-can-pay.ts
index b74267ea19..9848f808ea 100644
--- a/packages/neuron-wallet/src/controllers/anyone-can-pay.ts
+++ b/packages/neuron-wallet/src/controllers/anyone-can-pay.ts
@@ -1,7 +1,7 @@
import AssetAccountInfo from '../models/asset-account-info'
import Transaction from '../models/chain/transaction'
import { ServiceHasNoResponse } from '../exceptions'
-import { ResponseCode } from '../utils/const'
+import { ResponseCode, UDTType } from '../utils/const'
import AnyoneCanPayService from '../services/anyone-can-pay'
import TransactionSender from '../services/transaction-sender'
import { set as setDescription } from '../services/tx/transaction-description'
@@ -22,6 +22,7 @@ export interface SendAnyoneCanPayTxParams {
tx: Transaction
password: string
skipLastInputs?: boolean
+ amendHash?: string
}
export default class AnyoneCanPayController {
@@ -48,10 +49,11 @@ export default class AnyoneCanPayController {
public async getHoldSudtCellCapacity(
receiveAddress: string,
- tokenID: string
+ tokenID: string,
+ udtType?: UDTType
): Promise> {
const lockScript = AddressParser.parse(receiveAddress)
- const extraCKB = await AnyoneCanPayService.getHoldSUDTCellCapacity(lockScript, tokenID)
+ const extraCKB = await AnyoneCanPayService.getHoldSUDTCellCapacity(lockScript, tokenID, udtType)
return {
status: ResponseCode.Success,
result: extraCKB,
@@ -65,7 +67,8 @@ export default class AnyoneCanPayController {
txModel,
params.password,
params?.skipLastInputs ?? true,
- skipSign
+ skipSign,
+ params?.amendHash
)
if (!txHash) {
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index 70c9526c7f..914ef68464 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -19,12 +19,13 @@ import fs from 'fs'
import env from '../env'
import { showWindow } from './app/show-window'
import CommonUtils from '../utils/common'
+import { CKB_NODE_DATA_SIZE_BUFFER_RATIO } from '../utils/const'
import { NetworkType, Network } from '../models/network'
import { ConnectionStatusSubject } from '../models/subjects/node'
import NetworksService from '../services/networks'
import WalletsService from '../services/wallets'
import SettingsService, { Locale } from '../services/settings'
-import { ResponseCode } from '../utils/const'
+import { ResponseCode, UDTType } from '../utils/const'
import { clean as cleanChain } from '../database/chain'
import WalletsController from '../controllers/wallets'
import TransactionsController from '../controllers/transactions'
@@ -33,7 +34,6 @@ import NetworksController from '../controllers/networks'
import UpdateController from '../controllers/update'
import MultisigController from '../controllers/multisig'
import Transaction from '../models/chain/transaction'
-import OutPoint from '../models/chain/out-point'
import SignMessageController from '../controllers/sign-message'
import CustomizedAssetsController from './customized-assets'
import SystemScriptInfo from '../models/system-script-info'
@@ -60,13 +60,17 @@ import startMonitor, { stopMonitor } from '../services/monitor'
import { migrateCkbData } from '../services/ckb-runner'
import NodeService from '../services/node'
import SyncProgressService from '../services/sync-progress'
-import { resetSyncTaskQueue } from '../block-sync-renderer'
+import { changeMultisigSyncStatus, resetSyncTaskQueue } from '../block-sync-renderer'
import DataUpdateSubject from '../models/subjects/data-update'
import CellManagement from './cell-management'
import { UpdateCellLocalInfo } from '../database/chain/entities/cell-local-info'
import { CKBLightRunner } from '../services/light-runner'
+import { type OutPoint } from '@ckb-lumos/lumos'
+import { updateApplicationMenu } from './app/menu'
+import { DuplicateImportWallet } from '../exceptions'
+import CommandSubject from '../models/subjects/command'
-export type Command = 'export-xpubkey' | 'import-xpubkey' | 'delete-wallet' | 'backup-wallet' | 'migrate-acp'
+export type Command = 'export-xpubkey' | 'import-xpubkey' | 'delete-wallet' | 'backup-wallet'
// Handle channel messages from renderer process and user actions.
export default class ApiController {
#walletsController = new WalletsController()
@@ -104,7 +108,19 @@ export default class ApiController {
DataUpdateSubject.next({ dataType: 'new-xpubkey-wallet', actionType: 'create' })
})
.catch(error => {
- dialog.showMessageBox({ type: 'error', buttons: [], message: error.message })
+ if (error instanceof DuplicateImportWallet) {
+ const window = BrowserWindow.getFocusedWindow()
+ if (window) {
+ CommandSubject.next({
+ winID: window.id,
+ type: 'import-exist-xpubkey',
+ payload: error.message,
+ dispatchToUI: true,
+ })
+ }
+ } else {
+ dialog.showMessageBox({ type: 'error', buttons: [], message: error.message })
+ }
})
break
}
@@ -114,10 +130,6 @@ export default class ApiController {
this.#walletsController.requestPassword(params, command)
break
}
- case 'migrate-acp': {
- this.#assetAccountController.showACPMigrationDialog(false)
- break
- }
default: {
logger.error(`API Controller:\treceive invalid command "${command}" with params "${params}"`)
}
@@ -306,6 +318,43 @@ export default class ApiController {
}
})
+ handle('unlock-window', async (_, password: string) => {
+ if (!SettingsService.getInstance().verifyLockWindowPassword(password)) {
+ return {
+ status: ResponseCode.Fail,
+ }
+ }
+ SettingsService.getInstance().updateLockWindowInfo({ locked: false })
+ return {
+ status: ResponseCode.Success,
+ result: SettingsService.getInstance().lockWindowInfo,
+ }
+ })
+
+ handle('update-lock-window-info', async (_, params: { locked?: boolean; password?: string }) => {
+ SettingsService.getInstance().updateLockWindowInfo(params)
+ updateApplicationMenu(BrowserWindow.getFocusedWindow())
+ return {
+ status: ResponseCode.Success,
+ result: SettingsService.getInstance().lockWindowInfo,
+ }
+ })
+
+ handle('get-lock-window-info', async () => {
+ return {
+ result: SettingsService.getInstance().lockWindowInfo,
+ status: ResponseCode.Success,
+ }
+ })
+
+ handle('verify-lock-window-password', async (_, password: string) => {
+ return {
+ status: SettingsService.getInstance().verifyLockWindowPassword(password)
+ ? ResponseCode.Success
+ : ResponseCode.Fail,
+ }
+ })
+
// Wallets
handle('get-all-wallets', async () => {
@@ -341,12 +390,12 @@ export default class ApiController {
startBlockNumber: string
}
) => {
- const res = this.#walletsController.update(params)
const network = NetworksService.getInstance().getCurrent()
if (network.type !== NetworkType.Light) {
throw new Error('Only Light client can set start block number')
}
const lastSetStartBlockNumber = WalletsService.getInstance().getCurrent()?.toJSON().startBlockNumber
+ const res = this.#walletsController.update(params)
if (lastSetStartBlockNumber && +params.startBlockNumber < +lastSetStartBlockNumber) {
await CKBLightRunner.getInstance().clearNodeCache()
} else {
@@ -392,6 +441,14 @@ export default class ApiController {
return this.#walletsController.getAllAddresses(id)
})
+ handle('get-private-key-by-address', async (_, { walletID, password, address }) => {
+ return this.#walletsController.getPrivateKeyByAddress({
+ walletID,
+ password,
+ address,
+ })
+ })
+
handle(
'update-address-description',
async (_, params: { walletID: string; address: string; description: string }) => {
@@ -416,6 +473,8 @@ export default class ApiController {
password: string
description?: string
multisigConfig?: MultisigConfigModel
+ amendHash?: string
+ skipLastInputs?: boolean
}
) => {
return this.#walletsController.sendTx({
@@ -434,7 +493,7 @@ export default class ApiController {
items: { address: string; capacity: string }[]
fee: string
feeRate: string
- consumeOutPoints?: CKBComponents.OutPoint[]
+ consumeOutPoints?: OutPoint[]
enableUseSentCell?: boolean
}
) => {
@@ -451,7 +510,7 @@ export default class ApiController {
items: { address: string; capacity: string }[]
fee: string
feeRate: string
- consumeOutPoints: CKBComponents.OutPoint[]
+ consumeOutPoints: OutPoint[]
enableUseSentCell?: boolean
}
) => {
@@ -514,6 +573,12 @@ export default class ApiController {
return this.#daoController.getDaoCells(params)
})
+ handle('get-multisig-dao-data', async (_, params: { multisigConfig: MultisigConfigModel }) => {
+ return this.#daoController.getMultisigDaoCells({
+ multisigConfig: MultisigConfigModel.fromObject(params.multisigConfig),
+ })
+ })
+
handle(
'generate-dao-deposit-tx',
async (_, params: { walletID: string; capacity: string; fee: string; feeRate: string }) => {
@@ -521,6 +586,18 @@ export default class ApiController {
}
)
+ handle(
+ 'generate-multisig-dao-deposit-tx',
+ async (_, params: { capacity: string; fee: string; feeRate: string; multisigConfig: MultisigConfigModel }) => {
+ return this.#daoController.generateMultisigDepositTx({
+ capacity: params.capacity,
+ fee: params.fee,
+ feeRate: params.feeRate,
+ multisigConfig: MultisigConfigModel.fromObject(params.multisigConfig),
+ })
+ }
+ )
+
handle(
'generate-dao-deposit-all-tx',
async (_, params: { walletID: string; isBalanceReserved: boolean; fee: string; feeRate: string }) => {
@@ -528,6 +605,21 @@ export default class ApiController {
}
)
+ handle(
+ 'generate-multisig-dao-deposit-all-tx',
+ async (
+ _,
+ params: { isBalanceReserved: boolean; fee: string; feeRate: string; multisigConfig: MultisigConfigModel }
+ ) => {
+ return this.#daoController.generateMultisigDepositAllTx({
+ isBalanceReserved: params.isBalanceReserved,
+ fee: params.fee,
+ feeRate: params.feeRate,
+ multisigConfig: MultisigConfigModel.fromObject(params.multisigConfig),
+ })
+ }
+ )
+
handle(
'start-withdraw-from-dao',
async (_, params: { walletID: string; outPoint: OutPoint; fee: string; feeRate: string }) => {
@@ -535,6 +627,18 @@ export default class ApiController {
}
)
+ handle(
+ 'start-withdraw-from-multisig-dao',
+ async (_, params: { outPoint: OutPoint; fee: string; feeRate: string; multisigConfig: MultisigConfigModel }) => {
+ return this.#daoController.startWithdrawFromMultisigDao({
+ outPoint: params.outPoint,
+ fee: params.fee,
+ feeRate: params.feeRate,
+ multisigConfig: MultisigConfigModel.fromObject(params.multisigConfig),
+ })
+ }
+ )
+
handle(
'withdraw-from-dao',
async (
@@ -551,6 +655,32 @@ export default class ApiController {
}
)
+ handle(
+ 'withdraw-from-multisig-dao',
+ async (
+ _,
+ params: {
+ depositOutPoint: OutPoint
+ withdrawingOutPoint: OutPoint
+ fee: string
+ feeRate: string
+ multisigConfig: MultisigConfigModel
+ }
+ ) => {
+ return this.#daoController.withdrawFromMultisigDao({
+ depositOutPoint: params.depositOutPoint,
+ withdrawingOutPoint: params.withdrawingOutPoint,
+ fee: params.fee,
+ feeRate: params.feeRate,
+ multisigConfig: MultisigConfigModel.fromObject(params.multisigConfig),
+ })
+ }
+ )
+
+ handle('calculate-unlock-dao-maximum-withdraw', async (_, unlockHash: string) => {
+ return this.#daoController.calculateUnlockDaoMaximumWithdraw(unlockHash)
+ })
+
// Customized Asset
handle('get-customized-asset-cells', async (_, params: Controller.Params.GetCustomizedAssetCellsParams) => {
return this.#customizedAssetsController.getCustomizedAssetCells(params)
@@ -638,7 +768,7 @@ export default class ApiController {
status: ResponseCode.Success,
result: {
isFirstSync: SettingsService.getInstance().isFirstSync && currentNetwork.type === NetworkType.Default,
- needSize: Math.ceil(+process.env.CKB_NODE_DATA_SIZE! * 1.2),
+ needSize: Math.ceil(+process.env.CKB_NODE_DATA_SIZE! * CKB_NODE_DATA_SIZE_BUFFER_RATIO),
ckbNodeDataPath: SettingsService.getInstance().getNodeDataPath(),
},
}
@@ -652,6 +782,13 @@ export default class ApiController {
}
})
+ handle('get-ckb-node-data-need-size', () => {
+ return {
+ status: ResponseCode.Success,
+ result: Math.ceil(+process.env.CKB_NODE_DATA_SIZE! * CKB_NODE_DATA_SIZE_BUFFER_RATIO),
+ }
+ })
+
handle('get-ckb-node-data-path', () => {
return {
status: ResponseCode.Success,
@@ -741,11 +878,6 @@ export default class ApiController {
return this.#assetAccountController.getAccount(params)
})
- handle('check-migrate-acp', async () => {
- const allowMultipleOpen = true
- return this.#assetAccountController.showACPMigrationDialog(allowMultipleOpen)
- })
-
handle('migrate-acp', async (_, params: MigrateACPParams) => {
return this.#assetAccountController.migrateAcp(params)
})
@@ -766,9 +898,12 @@ export default class ApiController {
return this.#anyoneCanPayController.generateTx(params)
})
- handle('get-hold-sudt-cell-capacity', async (_, params: { address: string; tokenID: string }) => {
- return this.#anyoneCanPayController.getHoldSudtCellCapacity(params.address, params.tokenID)
- })
+ handle(
+ 'get-hold-sudt-cell-capacity',
+ async (_, params: { address: string; tokenID: string; udtType?: UDTType }) => {
+ return this.#anyoneCanPayController.getHoldSudtCellCapacity(params.address, params.tokenID, params.udtType)
+ }
+ )
handle('send-to-anyone-can-pay', async (_, params: SendAnyoneCanPayTxParams) => {
return this.#anyoneCanPayController.sendTx(params)
@@ -782,9 +917,28 @@ export default class ApiController {
return this.#sudtController.getSUDTTokenInfo(params)
})
- handle('get-sudt-type-script-hash', async (_, params: { tokenID: string }) => {
- return this.#sudtController.getSUDTTypeScriptHash(params)
- })
+ handle(
+ 'get-sudt-token-info-and-balance',
+ async (_, params: { tokenID: string; holder: string; outpoint?: CKBComponents.OutPoint }) => {
+ return this.#sudtController.getUDTTokenInfoAndBalance(params)
+ }
+ )
+
+ handle(
+ 'generate-recycle-udt-cell-tx',
+ async (
+ _,
+ params: {
+ walletId: string
+ holder: string
+ tokenID: string
+ receiver: string
+ outpoint?: CKBComponents.OutPoint
+ }
+ ) => {
+ return this.#assetAccountController.generateRecycleUDTCellTx(params)
+ }
+ )
handle('generate-destroy-asset-account-tx', async (_, params: { walletID: string; id: number }) => {
return this.#assetAccountController.destroyAssetAccount(params)
@@ -803,10 +957,6 @@ export default class ApiController {
return this.#hardwareController.getCkbAppVersion()
})
- handle('get-device-firmware-version', async () => {
- return this.#hardwareController.getFirmwareVersion()
- })
-
handle('get-device-extended-public-key', async () => {
return this.#hardwareController.getExtendedPublicKey()
})
@@ -884,6 +1034,13 @@ export default class ApiController {
return this.#multisigController.loadMultisigTxJson(fullPayload)
})
+ handle('change-multisig-sync-status', (_, status: boolean) => {
+ changeMultisigSyncStatus(status)
+ return {
+ status: ResponseCode.Success,
+ }
+ })
+
//migrate
handle('start-migrate', async () => {
migrateCkbData()
@@ -920,9 +1077,9 @@ export default class ApiController {
async (
_,
params: {
- outPoints: CKBComponents.OutPoint[]
+ outPoints: OutPoint[]
locked: boolean
- password: string
+ password?: string
lockScripts: CKBComponents.Script[]
}
) => {
diff --git a/packages/neuron-wallet/src/controllers/app/menu.ts b/packages/neuron-wallet/src/controllers/app/menu.ts
index 24ae895113..1e1b728330 100644
--- a/packages/neuron-wallet/src/controllers/app/menu.ts
+++ b/packages/neuron-wallet/src/controllers/app/menu.ts
@@ -15,6 +15,7 @@ import NetworksService from '../../services/networks'
import { clearCkbNodeCache } from '../../services/ckb-runner'
import { CKBLightRunner } from '../../services/light-runner'
import { NetworkType } from '../../models/network'
+import SettingsService from '../../services/settings'
enum URL {
Settings = '/settings',
@@ -112,6 +113,13 @@ const requestPassword = (walletID: string, actionType: 'delete-wallet' | 'backup
}
}
+const lockWindow = () => {
+ const window = BrowserWindow.getFocusedWindow()
+ if (window) {
+ CommandSubject.next({ winID: window.id, type: 'lock-window', payload: null, dispatchToUI: true })
+ }
+}
+
const updateApplicationMenu = (mainWindow: BrowserWindow | null) => {
const isMac = process.platform === 'darwin'
const currentWindow = BrowserWindow.getFocusedWindow()
@@ -389,6 +397,13 @@ const updateApplicationMenu = (mainWindow: BrowserWindow | null) => {
label: t('application-menu.window.close'),
role: 'close',
},
+ {
+ label: t('application-menu.window.lock'),
+ accelerator: 'CmdOrCtrl+L',
+ click: () => {
+ lockWindow()
+ },
+ },
],
}
@@ -523,10 +538,15 @@ const updateApplicationMenu = (mainWindow: BrowserWindow | null) => {
],
}
- const applicationMenuTemplate = env.isDevMode
+ let applicationMenuTemplate = env.isDevMode
? [walletMenuItem, editMenuItem, developMenuItem, toolsMenuItem, windowMenuItem, helpMenuItem]
: [walletMenuItem, editMenuItem, toolsMenuItem, windowMenuItem, helpMenuItem]
+ if (SettingsService.getInstance().lockWindowInfo.locked) {
+ applicationMenuTemplate = env.isDevMode
+ ? [editMenuItem, developMenuItem, windowMenuItem, helpMenuItem]
+ : [editMenuItem, windowMenuItem, helpMenuItem]
+ }
if (isMac) {
applicationMenuTemplate.unshift(appMenuItem)
}
diff --git a/packages/neuron-wallet/src/controllers/app/subscribe.ts b/packages/neuron-wallet/src/controllers/app/subscribe.ts
index 84f5d8e436..a71a18661d 100644
--- a/packages/neuron-wallet/src/controllers/app/subscribe.ts
+++ b/packages/neuron-wallet/src/controllers/app/subscribe.ts
@@ -47,9 +47,6 @@ export const subscribe = (dispatcher: AppResponder) => {
estimation.estimate = cachedEstimation.estimate
}
dispatcher.sendMessage('sync-estimate-updated', estimation)
- // dispatcher.sendMessage('synced-block-number-updated', params)
-
- dispatcher.runCommand('migrate-acp', '')
})
CommandSubject.subscribe(params => {
diff --git a/packages/neuron-wallet/src/controllers/asset-account.ts b/packages/neuron-wallet/src/controllers/asset-account.ts
index 3c2300a0d7..eaf368c2a9 100644
--- a/packages/neuron-wallet/src/controllers/asset-account.ts
+++ b/packages/neuron-wallet/src/controllers/asset-account.ts
@@ -3,15 +3,12 @@ import AssetAccount from '../models/asset-account'
import Transaction from '../models/chain/transaction'
import AssetAccountService from '../services/asset-account-service'
import { ServiceHasNoResponse } from '../exceptions'
-import { ResponseCode } from '../utils/const'
+import { ResponseCode, UDTType } from '../utils/const'
import NetworksService from '../services/networks'
import AssetAccountInfo from '../models/asset-account-info'
import TransactionSender from '../services/transaction-sender'
-import { BrowserWindow, dialog } from 'electron'
+import { dialog } from 'electron'
import { t } from 'i18next'
-import WalletsService from '../services/wallets'
-import CommandSubject from '../models/subjects/command'
-import SyncApiController, { SyncStatus } from './sync-api'
import { TransactionGenerator } from '../services/tx'
import OutPoint from '../models/chain/out-point'
import SudtTokenInfoService from '../services/sudt-token-info'
@@ -25,6 +22,7 @@ export interface GenerateCreateAssetAccountTxParams {
decimal: string
feeRate: string
fee: string
+ udtType?: UDTType
}
export interface SendCreateAssetAccountTxParams {
@@ -68,8 +66,6 @@ export interface GenerateWithdrawChequeTxParams {
}
export default class AssetAccountController {
- private displayedACPMigrationDialogByWalletIds: Set = new Set()
-
public async getAll(params: {
walletID: string
}): Promise> {
@@ -114,6 +110,29 @@ export default class AssetAccountController {
}
}
+ public async generateRecycleUDTCellTx(params: {
+ walletId: string
+ holder: string
+ tokenID: string
+ receiver: string
+ outpoint?: CKBComponents.OutPoint
+ }) {
+ const tokens = await SudtTokenInfoService.findSudtTokenInfoByArgs([params.tokenID])
+ if (!tokens || !tokens.length) {
+ throw new ServiceHasNoResponse('UDT Cell')
+ }
+
+ const { udtType } = tokens[0]
+ const tx = await AssetAccountService.generateRecycleUDTCellTx({
+ ...params,
+ udtType,
+ })
+ return {
+ status: ResponseCode.Success,
+ result: tx,
+ }
+ }
+
public async getAccount(params: {
walletID: string
id: number
@@ -142,16 +161,7 @@ export default class AssetAccountController {
tx: Transaction
}>
> {
- const result = await AssetAccountService.generateCreateTx(
- params.walletID,
- params.tokenID,
- params.symbol,
- params.accountName,
- params.tokenName,
- params.decimal,
- params.feeRate,
- params.fee
- )
+ const result = await AssetAccountService.generateCreateTx(params)
if (!result) {
throw new ServiceHasNoResponse('AssetAccount')
@@ -221,82 +231,6 @@ export default class AssetAccountController {
}
}
- public async showACPMigrationDialog(
- allowMultipleOpen: boolean | undefined
- ): Promise> {
- const walletsService = WalletsService.getInstance()
- const currentWallet = walletsService.getCurrent()
- if (!currentWallet) {
- return {
- status: ResponseCode.Success,
- }
- }
- const walletId = currentWallet.id
-
- if (!allowMultipleOpen && this.displayedACPMigrationDialogByWalletIds.has(walletId)) {
- return {
- status: ResponseCode.Success,
- }
- }
-
- const syncStatus = await SyncApiController.getInstance().getSyncStatus()
-
- if (syncStatus !== SyncStatus.SyncCompleted || BrowserWindow.getAllWindows().length !== 1) {
- return {
- status: ResponseCode.Success,
- }
- }
-
- const window = BrowserWindow.getFocusedWindow()
- if (!window) {
- return {
- status: ResponseCode.Success,
- }
- }
-
- const tx = await TransactionGenerator.generateMigrateLegacyACPTx(walletId)
- if (!tx) {
- return {
- status: ResponseCode.Success,
- }
- }
-
- this.displayedACPMigrationDialogByWalletIds.add(walletId)
-
- const I18N_PATH = `messageBox.acp-migration`
- return dialog
- .showMessageBox({
- type: 'info',
- buttons: ['skip', 'migrate'].map(label => t(`${I18N_PATH}.buttons.${label}`)),
- defaultId: 1,
- title: t(`${I18N_PATH}.title`),
- message: t(`${I18N_PATH}.message`),
- detail: t(`${I18N_PATH}.detail`),
- cancelId: 0,
- noLink: true,
- })
- .then(({ response }) => {
- switch (response) {
- case 1: {
- CommandSubject.next({
- winID: window.id,
- type: 'migrate-acp',
- payload: walletId,
- dispatchToUI: true,
- })
- return true
- }
- case 0:
- default:
- return false
- }
- })
- .then(result => ({
- status: ResponseCode.Success,
- result,
- }))
- }
-
public async generateCreateChequeTx(params: GenerateCreateChequeTxParams): Promise> {
const tx = await AssetAccountService.generateCreateChequeTx(
params.walletID,
diff --git a/packages/neuron-wallet/src/controllers/cell-management.ts b/packages/neuron-wallet/src/controllers/cell-management.ts
index 4757e3a929..1ad6b37cb1 100644
--- a/packages/neuron-wallet/src/controllers/cell-management.ts
+++ b/packages/neuron-wallet/src/controllers/cell-management.ts
@@ -1,4 +1,4 @@
-import type { OutPoint, Script } from '@ckb-lumos/base'
+import type { OutPoint as OutPointSDK, Script } from '@ckb-lumos/lumos'
import CellLocalInfo, { UpdateCellLocalInfo } from '../database/chain/entities/cell-local-info'
import Output from '../models/chain/output'
import CellsService, { LockScriptCategory, TypeScriptCategory } from '../services/cells'
@@ -17,7 +17,9 @@ export default class CellManagement {
const liveCells = (await CellsService.getLiveOrSentCellByWalletId(currentWallet.id, { includeCheque: true })).map(
v => v.toModel()
)
- const outPoints = liveCells.filter((v): v is Output & { outPoint: OutPoint } => !!v.outPoint).map(v => v.outPoint)
+ const outPoints = liveCells
+ .filter((v): v is Output & { outPoint: OutPointSDK } => !!v.outPoint)
+ .map(v => v.outPoint)
const cellLocalInfoMap = await CellLocalInfoService.getCellLocalInfoMap(outPoints)
return liveCells
.map<
@@ -56,10 +58,10 @@ export default class CellManagement {
}
static async updateLiveCellsLockStatus(
- outPoints: OutPoint[],
+ outPoints: OutPointSDK[],
locked: boolean,
lockScripts: Script[],
- password: string
+ password: string = ''
) {
// check wallet password
const currentWallet = WalletService.getInstance().getCurrent()
@@ -67,7 +69,12 @@ export default class CellManagement {
const addresses = new Set((await AddressService.getAddressesByWalletId(currentWallet.id)).map(v => v.address))
const isMainnet = NetworksService.getInstance().isMainnet()
if (!lockScripts.every(v => addresses.has(scriptToAddress(v, isMainnet)))) throw new AddressNotFound()
- await SignMessage.sign(currentWallet.id, scriptToAddress(lockScripts[0], isMainnet), password, 'verify password')
+ await SignMessage.sign({
+ walletID: currentWallet.id,
+ password,
+ message: 'verify cell owner',
+ address: scriptToAddress(lockScripts[0], isMainnet),
+ })
return CellLocalInfoService.updateLiveCellLockStatus(outPoints, locked)
}
diff --git a/packages/neuron-wallet/src/controllers/dao.ts b/packages/neuron-wallet/src/controllers/dao.ts
index e460b0b13a..7f9e688a46 100644
--- a/packages/neuron-wallet/src/controllers/dao.ts
+++ b/packages/neuron-wallet/src/controllers/dao.ts
@@ -1,3 +1,4 @@
+import { type OutPoint as OutPointSDK } from '@ckb-lumos/lumos'
import { ServiceHasNoResponse, IsRequired } from '../exceptions'
import { ResponseCode } from '../utils/const'
import CellsService from '../services/cells'
@@ -5,6 +6,8 @@ import TransactionSender from '../services/transaction-sender'
import OutPoint from '../models/chain/out-point'
import Cell from '../models/chain/output'
import Transaction from '../models/chain/transaction'
+import MultisigConfigModel from '../models/multisig-config'
+import Multisig from '../models/multisig'
export default class DaoController {
public async getDaoCells(params: Controller.Params.GetDaoCellsParams): Promise> {
@@ -21,6 +24,28 @@ export default class DaoController {
}
}
+ public async getMultisigDaoCells(params: {
+ multisigConfig: MultisigConfigModel
+ }): Promise> {
+ const { multisigConfig } = params
+ const multiSignBlake160 = Multisig.hash(
+ multisigConfig.blake160s,
+ multisigConfig.r,
+ multisigConfig.m,
+ multisigConfig.n
+ )
+ const cells = await CellsService.getDaoCells('', multiSignBlake160)
+
+ if (!cells) {
+ throw new ServiceHasNoResponse('DaoCells')
+ }
+
+ return {
+ status: ResponseCode.Success,
+ result: cells,
+ }
+ }
+
public async generateDepositTx(params: {
walletID: string
capacity: string
@@ -43,6 +68,28 @@ export default class DaoController {
}
}
+ public async generateMultisigDepositTx(params: {
+ capacity: string
+ fee: string
+ feeRate: string
+ multisigConfig: MultisigConfigModel
+ }): Promise> {
+ if (!params) {
+ throw new IsRequired('Parameters')
+ }
+
+ const tx = await new TransactionSender().generateMultisigDepositTx(
+ params.capacity,
+ params.fee,
+ params.feeRate,
+ params.multisigConfig
+ )
+ return {
+ status: ResponseCode.Success,
+ result: tx,
+ }
+ }
+
public async generateDepositAllTx(params: {
walletID: string
isBalanceReserved: boolean
@@ -65,9 +112,31 @@ export default class DaoController {
}
}
+ public async generateMultisigDepositAllTx(params: {
+ isBalanceReserved: boolean
+ fee: string
+ feeRate: string
+ multisigConfig: MultisigConfigModel
+ }): Promise> {
+ if (!params) {
+ throw new IsRequired('Parameters')
+ }
+
+ const tx = await new TransactionSender().generateMultisigDepositAllTx(
+ params.isBalanceReserved,
+ params.fee,
+ params.feeRate,
+ params.multisigConfig
+ )
+ return {
+ status: ResponseCode.Success,
+ result: tx,
+ }
+ }
+
public async startWithdrawFromDao(params: {
walletID: string
- outPoint: OutPoint
+ outPoint: OutPointSDK
fee: string
feeRate: string
}): Promise> {
@@ -77,7 +146,7 @@ export default class DaoController {
const tx = await new TransactionSender().startWithdrawFromDao(
params.walletID,
- new OutPoint(params.outPoint.txHash, params.outPoint.index),
+ OutPoint.fromSDK(params.outPoint),
params.fee,
params.feeRate
)
@@ -87,10 +156,32 @@ export default class DaoController {
}
}
+ public async startWithdrawFromMultisigDao(params: {
+ outPoint: OutPointSDK
+ fee: string
+ feeRate: string
+ multisigConfig: MultisigConfigModel
+ }): Promise> {
+ if (!params) {
+ throw new IsRequired('Parameters')
+ }
+
+ const tx = await new TransactionSender().startWithdrawFromMultisigDao(
+ OutPoint.fromSDK(params.outPoint),
+ params.fee,
+ params.feeRate,
+ params.multisigConfig
+ )
+ return {
+ status: ResponseCode.Success,
+ result: tx,
+ }
+ }
+
public async withdrawFromDao(params: {
walletID: string
- depositOutPoint: OutPoint
- withdrawingOutPoint: OutPoint
+ depositOutPoint: OutPointSDK
+ withdrawingOutPoint: OutPointSDK
fee: string
feeRate: string
}): Promise> {
@@ -100,8 +191,8 @@ export default class DaoController {
const tx = await new TransactionSender().withdrawFromDao(
params.walletID,
- new OutPoint(params.depositOutPoint.txHash, params.depositOutPoint.index),
- new OutPoint(params.withdrawingOutPoint.txHash, params.withdrawingOutPoint.index),
+ OutPoint.fromSDK(params.depositOutPoint),
+ OutPoint.fromSDK(params.withdrawingOutPoint),
params.fee,
params.feeRate
)
@@ -110,4 +201,46 @@ export default class DaoController {
result: tx,
}
}
+
+ public async withdrawFromMultisigDao(params: {
+ depositOutPoint: OutPointSDK
+ withdrawingOutPoint: OutPointSDK
+ fee: string
+ feeRate: string
+ multisigConfig: MultisigConfigModel
+ }): Promise> {
+ if (!params) {
+ throw new IsRequired('Parameters')
+ }
+
+ const tx = await new TransactionSender().withdrawFromDao(
+ '',
+ OutPoint.fromSDK(params.depositOutPoint),
+ OutPoint.fromSDK(params.withdrawingOutPoint),
+ params.fee,
+ params.feeRate,
+ params.multisigConfig
+ )
+ return {
+ status: ResponseCode.Success,
+ result: tx,
+ }
+ }
+
+ public async calculateUnlockDaoMaximumWithdraw(unlockHash: string): Promise> {
+ const depositAndWithdrawInfo = await CellsService.getDaoWithdrawAndDeposit(unlockHash)
+ let total = BigInt(0)
+ for (let index = 0; index < depositAndWithdrawInfo.length; index++) {
+ total =
+ total +
+ (await new TransactionSender().calculateDaoMaximumWithdraw(
+ depositAndWithdrawInfo[index].depositOutPoint,
+ depositAndWithdrawInfo[index].withdrawBlockHash
+ ))
+ }
+ return {
+ status: ResponseCode.Success,
+ result: total.toString(),
+ }
+ }
}
diff --git a/packages/neuron-wallet/src/controllers/export-debug.ts b/packages/neuron-wallet/src/controllers/export-debug.ts
index 38c9af3d38..0504fe8ce7 100644
--- a/packages/neuron-wallet/src/controllers/export-debug.ts
+++ b/packages/neuron-wallet/src/controllers/export-debug.ts
@@ -13,6 +13,8 @@ import SettingsService from '../services/settings'
import { generateRPC } from '../utils/ckb-rpc'
import { CKBLightRunner } from '../services/light-runner'
import { LIGHT_CLIENT_MAINNET, LIGHT_CLIENT_TESTNET } from '../utils/const'
+import WalletsService from '../services/wallets'
+import LogEncryption from '../services/log-encryption'
export default class ExportDebugController {
#I18N_PATH = 'export-debug-info'
@@ -78,6 +80,7 @@ export default class ExportDebugController {
])
const { platform, arch } = process
const release = os.release()
+ const wallets = WalletsService.getInstance().getAll()
const status = {
neuron: {
version: neuronVersion,
@@ -95,30 +98,30 @@ export default class ExportDebugController {
release,
vcredist,
},
+ wallets: wallets.map((v, idx) => ({
+ idx,
+ startBlockNumber: v.startBlockNumber,
+ })),
}
this.archive.append(JSON.stringify(status), {
name: 'status.json',
})
}
- private addBundledCKBLog = () => {
- const name = 'bundled-ckb.log'
- const SIZE_TO_READ = 32_000
-
- return new Promise((resolve, reject) => {
- const logPath = path.resolve(SettingsService.getInstance().getNodeDataPath(), 'data', 'logs', 'run.log')
- if (!fs.existsSync(logPath)) {
+ private readLastSizeOfFile(filepath: string, size = 32_000) {
+ return new Promise((resolve, reject) => {
+ if (!fs.existsSync(filepath)) {
return reject(new Error('File not found'))
}
- const fileStats = fs.statSync(logPath)
- const position = fileStats.size - SIZE_TO_READ
+ const fileStats = fs.statSync(filepath)
+ const position = fileStats.size - size
- fs.open(logPath, 'r', (openErr, fd) => {
+ fs.open(filepath, 'r', (openErr, fd) => {
if (openErr) {
return reject(openErr)
}
- fs.read(fd, Buffer.alloc(SIZE_TO_READ), 0, SIZE_TO_READ, position, (readErr, _, buffer) => {
+ fs.read(fd, Buffer.alloc(size), 0, size, position, (readErr, _, buffer) => {
fs.close(fd, closeErr => {
const err = closeErr || readErr
if (err) {
@@ -129,24 +132,39 @@ export default class ExportDebugController {
})
})
})
- .then((log: string) => {
- this.archive.append(log, { name })
- })
- .catch(err => {
- this.archive.append(err.message, { name })
- })
+ }
+
+ private addBundledCKBLog = async () => {
+ const name = 'bundled-ckb.log'
+ try {
+ const logPath = path.resolve(SettingsService.getInstance().getNodeDataPath(), 'data', 'logs', 'run.log')
+ const log = await this.readLastSizeOfFile(logPath)
+ this.archive.append(log, { name })
+ } catch (error) {
+ this.archive.append(error.message, { name })
+ }
}
private async addHdPublicKeyInfoCsv() {
try {
const addressMetas = await AddressService.getAddressesByAllWallets()
- let csv = 'walletId,addressType,addressIndex,publicKeyInBlake160\n'
+ const wallets = WalletsService.getInstance().getAll()
+ const idToIdx = new Map()
+ wallets.forEach((v, idx) => idToIdx.set(v.id, idx))
+ let csv = 'index,addressType,addressIndex,publicKeyInBlake160\n'
for (const addressMeta of addressMetas) {
- const row = `${addressMeta.walletId},${addressMeta.addressType},${addressMeta.addressIndex},${addressMeta.blake160}\n`
+ const row = `${idToIdx.get(addressMeta.walletId) ?? addressMeta.walletId},${addressMeta.addressType},${
+ addressMeta.addressIndex
+ },${addressMeta.blake160}\n`
csv += row
}
const csvFileName = 'hd_public_key_info.csv'
- this.archive.append(csv, { name: csvFileName })
+ const encryption = LogEncryption.getInstance()
+ if (encryption.isEnabled) {
+ this.archive.append(encryption.encrypt(csv), { name: `encrypted_${csvFileName}` })
+ } else {
+ this.archive.append(csv, { name: csvFileName })
+ }
} catch (error) {
logger.error(`Export Debug:\t export public key info error: ${error}`)
}
@@ -162,14 +180,16 @@ export default class ExportDebugController {
})
}
- private addBundledCKBLightClientLog() {
+ private async addBundledCKBLightClientLog() {
const mainnetLogPath = CKBLightRunner.getInstance().getLogPath(LIGHT_CLIENT_MAINNET)
- const testnetLogPath = CKBLightRunner.getInstance().getLogPath(LIGHT_CLIENT_TESTNET)
if (fs.existsSync(mainnetLogPath)) {
- this.archive.file(mainnetLogPath, { name: 'bundled-ckb-lignt-client-mainnet.log' })
+ const mainnetLog = await this.readLastSizeOfFile(mainnetLogPath)
+ this.archive.append(mainnetLog, { name: 'bundled-ckb-lignt-client-mainnet.log' })
}
+ const testnetLogPath = CKBLightRunner.getInstance().getLogPath(LIGHT_CLIENT_TESTNET)
if (fs.existsSync(testnetLogPath)) {
- this.archive.file(testnetLogPath, { name: 'bundled-ckb-lignt-client-testnet.log' })
+ const testnetLog = await this.readLastSizeOfFile(testnetLogPath)
+ this.archive.append(testnetLog, { name: 'bundled-ckb-lignt-client-testnet.log' })
}
}
}
diff --git a/packages/neuron-wallet/src/controllers/hardware.ts b/packages/neuron-wallet/src/controllers/hardware.ts
index 41cd9f0d8a..563fe58c89 100644
--- a/packages/neuron-wallet/src/controllers/hardware.ts
+++ b/packages/neuron-wallet/src/controllers/hardware.ts
@@ -2,7 +2,7 @@ import { DeviceInfo, ExtendedPublicKey, PublicKey } from '../services/hardware/c
import { ResponseCode } from '../utils/const'
import HardwareWalletService from '../services/hardware'
import { connectDeviceFailed } from '../exceptions'
-import { AccountExtendedPublicKey } from '../models/keys/key'
+import { hd } from '@ckb-lumos/lumos'
export default class HardwareController {
public async connectDevice(deviceInfo: DeviceInfo): Promise> {
@@ -38,16 +38,6 @@ export default class HardwareController {
}
}
- public async getFirmwareVersion(): Promise> {
- const device = HardwareWalletService.getInstance().getCurrent()!
- const version = await device.getFirmwareVersion?.()
-
- return {
- status: ResponseCode.Success,
- result: version,
- }
- }
-
public async getExtendedPublicKey(): Promise> {
const device = HardwareWalletService.getInstance().getCurrent()!
const pubkey = await device.getExtendedPublicKey()
@@ -60,7 +50,7 @@ export default class HardwareController {
public async getPublicKey(): Promise> {
const device = HardwareWalletService.getInstance().getCurrent()!
- const defaultPath = AccountExtendedPublicKey.ckbAccountPath
+ const defaultPath = hd.AccountExtendedPublicKey.ckbAccountPath
const pubkey = await device.getPublicKey(defaultPath)
return {
diff --git a/packages/neuron-wallet/src/controllers/multisig.ts b/packages/neuron-wallet/src/controllers/multisig.ts
index ea41a69bb1..8dfa307756 100644
--- a/packages/neuron-wallet/src/controllers/multisig.ts
+++ b/packages/neuron-wallet/src/controllers/multisig.ts
@@ -2,9 +2,10 @@ import fs from 'fs'
import path from 'path'
import { dialog, BrowserWindow } from 'electron'
import { t } from 'i18next'
-import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
+import { computeScriptHash as scriptToHash } from '@ckb-lumos/lumos/utils'
import { scriptToAddress, addressToScript } from '../utils/scriptAndAddress'
import { ResponseCode } from '../utils/const'
+import { parseMultisigTxJsonFromCkbCli } from '../utils/multisig'
import MultisigConfig from '../database/chain/entities/multisig-config'
import MultisigConfigModel from '../models/multisig-config'
import MultisigService from '../services/multisig'
@@ -14,6 +15,10 @@ import Multisig from '../models/multisig'
import SystemScriptInfo from '../models/system-script-info'
import NetworksService from '../services/networks'
import ShowGlobalDialogSubject from '../models/subjects/show-global-dialog'
+import { NetworkType } from '../models/network'
+import MultisigConfigDbChangedSubject from '../models/subjects/multisig-config-db-changed-subject'
+import { LightRPC } from '../utils/ckb-rpc'
+import SyncProgressService from '../services/sync-progress'
interface MultisigConfigOutput {
multisig_configs: Record<
@@ -55,6 +60,23 @@ export default class MultisigController {
}
}
+ async resetMultisigSync(config: MultisigConfig, startBlockNumber: number) {
+ const network = NetworksService.getInstance().getCurrent()
+ const lightRpc = new LightRPC(network.remote)
+ const script = Multisig.getMultisigScript(config.blake160s, config.r, config.m, config.n)
+ await lightRpc.setScripts(
+ [
+ {
+ script,
+ blockNumber: `0x${startBlockNumber.toString(16)}`,
+ scriptType: 'lock' as CKBRPC.ScriptType,
+ },
+ ],
+ 'partial'
+ )
+ SyncProgressService.resetMultisigSync(scriptToHash(script), startBlockNumber)
+ }
+
async updateConfig(params: {
id: number
walletId?: string
@@ -63,8 +85,19 @@ export default class MultisigController {
n?: number
addresses?: string[]
alias?: string
+ startBlockNumber?: number
}) {
+ const config = await this.#multisigService.getMultisigConfigById(params.id)
const result = await this.#multisigService.updateMultisigConfig(params)
+ const network = NetworksService.getInstance().getCurrent()
+ if (params.startBlockNumber && network.type === NetworkType.Light) {
+ if (config?.startBlockNumber !== undefined && config.startBlockNumber > params.startBlockNumber) {
+ // if set small than last, reset by set_script
+ this.resetMultisigSync(config, params.startBlockNumber)
+ }
+ // if it's light client, restart queue task
+ MultisigConfigDbChangedSubject.getSubject().next('UpdateStartBlockNumber')
+ }
return {
status: ResponseCode.Success,
result,
@@ -214,7 +247,12 @@ export default class MultisigController {
}
const tx = result.json
const lockHash = scriptToHash(addressToScript(fullPayload))
- if (tx.transaction.inputs.every(v => v.lockHash !== lockHash)) {
+
+ if (tx.transaction) {
+ tx.transaction = parseMultisigTxJsonFromCkbCli(tx)
+ }
+
+ if (tx.transaction.inputs.every(v => v.lockHash && v.lockHash !== lockHash)) {
ShowGlobalDialogSubject.next({
type: 'failed',
title: t('common.error'),
@@ -226,7 +264,7 @@ export default class MultisigController {
}
return {
status: ResponseCode.Success,
- result: result?.json,
+ result: tx,
}
}
}
diff --git a/packages/neuron-wallet/src/controllers/sign-message.ts b/packages/neuron-wallet/src/controllers/sign-message.ts
index a81916b7f6..cd2d9d0233 100644
--- a/packages/neuron-wallet/src/controllers/sign-message.ts
+++ b/packages/neuron-wallet/src/controllers/sign-message.ts
@@ -4,12 +4,10 @@ import { ResponseCode } from '../utils/const'
export default class SignMessageController {
public async sign(params: Controller.Params.SignParams): Promise> {
- const signature: string = await SignMessage.sign(
- params.walletID,
- params.address.trim(),
- params.password,
- params.message
- )
+ const signature: string = await SignMessage.sign({
+ ...params,
+ address: params.address?.trim(),
+ })
if (!signature) {
throw new ServiceHasNoResponse('Sign')
}
diff --git a/packages/neuron-wallet/src/controllers/sudt.ts b/packages/neuron-wallet/src/controllers/sudt.ts
index 7b9813c497..5451135830 100644
--- a/packages/neuron-wallet/src/controllers/sudt.ts
+++ b/packages/neuron-wallet/src/controllers/sudt.ts
@@ -1,11 +1,11 @@
-import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
import LiveCellService from '../services/live-cell-service'
import AssetAccountInfo from '../models/asset-account-info'
import Script, { ScriptHashType } from '../models/chain/script'
import parseSUDTTokenInfo from '../utils/parse_sudt_token_info'
-import { ResponseCode } from '../utils/const'
+import { ResponseCode, UDTType } from '../utils/const'
import { SudtTokenInfo } from '../models/chain/transaction'
import SudtTokenInfoService from '../services/sudt-token-info'
+import AssetAccountService from '../services/asset-account-service'
export default class SUDTController {
public async getSUDTTokenInfo(params: { tokenID: string }): Promise> {
@@ -32,16 +32,34 @@ export default class SUDTController {
const { decimal, name, symbol } = parseSUDTTokenInfo(liveCell.data)
return {
status: ResponseCode.Success,
- result: { tokenID: params.tokenID, symbol: symbol, tokenName: name, decimal: decimal },
+ result: { tokenID: params.tokenID, symbol: symbol, tokenName: name, decimal: decimal, udtType: UDTType.SUDT },
}
}
- public getSUDTTypeScriptHash(params: { tokenID: string }): Controller.Response {
- const assetAccount = new AssetAccountInfo()
- const script = new Script(assetAccount.infos.sudt.codeHash, params.tokenID, assetAccount.infos.sudt.hashType)
+ // outpoint
+ public async getUDTTokenInfoAndBalance(params: {
+ tokenID: string
+ holder: string
+ outpoint?: CKBComponents.OutPoint
+ }): Promise> {
+ const { tokenID, holder, outpoint } = params
+ const info = await this.getSUDTTokenInfo({ tokenID })
+ if (!info.result) {
+ return {
+ status: ResponseCode.Fail,
+ }
+ }
+
+ const balance = await AssetAccountService.calculateUDTAccountBalance(holder, tokenID, info.result.udtType, outpoint)
+ const cells = await AssetAccountService.getACPCells(holder, tokenID, info.result.udtType, outpoint)
+
+ let capacity = cells.reduce((a, b) => {
+ return a + BigInt(b.capacity as string)
+ }, BigInt(0))
+
return {
status: ResponseCode.Success,
- result: scriptToHash(script.toSDK()),
+ result: { ...info.result, balance: balance.toString(), capacity: capacity.toString() },
}
}
}
diff --git a/packages/neuron-wallet/src/controllers/sync-api.ts b/packages/neuron-wallet/src/controllers/sync-api.ts
index 5207cc6ec4..c0d56afff6 100644
--- a/packages/neuron-wallet/src/controllers/sync-api.ts
+++ b/packages/neuron-wallet/src/controllers/sync-api.ts
@@ -1,15 +1,17 @@
import EventEmiter from 'events'
import { debounceTime } from 'rxjs/operators'
+import env from '../env'
import RpcService from '../services/rpc-service'
import SyncedBlockNumber from '../models/synced-block-number'
import SyncStateSubject from '../models/subjects/sync-state-subject'
import { CurrentNetworkIDSubject } from '../models/subjects/networks'
import MultisigService from '../services/multisig'
-import { getLookingValidTargetStatus } from '../services/ckb-runner'
import NetworksService from '../services/networks'
+import { NetworkType } from '../models/network'
const TEN_MINS = 600000
const MAX_TIP_BLOCK_DELAY = 180000
+const { app } = env
export enum SyncStatus {
SyncNotStart,
@@ -108,8 +110,10 @@ export default class SyncApiController {
const rpcService = new RpcService(network.remote, network.type)
try {
const syncState = await rpcService.getSyncState()
+ const bestKnownBlockNumber =
+ network.chain === 'ckb_dev' ? await rpcService.getTipBlockNumber() : syncState.bestKnownBlockNumber
return {
- bestKnownBlockNumber: parseInt(syncState.bestKnownBlockNumber, 16),
+ bestKnownBlockNumber: parseInt(bestKnownBlockNumber, 16),
bestKnownBlockTimestamp: +syncState.bestKnownBlockTimestamp,
}
} catch (error) {
@@ -129,12 +133,21 @@ export default class SyncApiController {
const currentTimestamp = Date.now()
const network = NetworksService.getInstance().getCurrent()
const tipHeader = await new RpcService(network.remote, network.type).getTipHeader()
+ const syncState = await new RpcService(network.remote, network.type).getSyncState()
const { bestKnownBlockNumber, bestKnownBlockTimestamp } = await this.#fetchBestKnownBlockInfo()
const foundBestKnownBlockNumber = this.#foundBestKnownBlockNumber(bestKnownBlockNumber)
const remainingBlocksToCache = bestKnownBlockNumber - cacheTipNumber
const remainingBlocksToIndex = bestKnownBlockNumber - indexerTipNumber
+ const setAssumeValidTargetBlockNumber =
+ app.isPackaged &&
+ process.env.CKB_NODE_ASSUME_VALID_TARGET &&
+ process.env.CKB_NODE_ASSUME_VALID_TARGET_BLOCK_NUMBER
+ ? +process.env.CKB_NODE_ASSUME_VALID_TARGET_BLOCK_NUMBER
+ : undefined
+ const isLookingValidTarget =
+ network.type === NetworkType.Default && !!setAssumeValidTargetBlockNumber && !syncState.assumeValidTargetReached
const newSyncState: SyncState = {
nodeUrl: network.remote,
@@ -147,7 +160,7 @@ export default class SyncApiController {
cacheRate: undefined,
estimate: undefined,
status: SyncStatus.Syncing,
- isLookingValidTarget: getLookingValidTargetStatus(),
+ isLookingValidTarget,
validTarget: process.env.CKB_NODE_ASSUME_VALID_TARGET,
}
diff --git a/packages/neuron-wallet/src/controllers/transactions.ts b/packages/neuron-wallet/src/controllers/transactions.ts
index 4cf2f38068..eb3a4fabfc 100644
--- a/packages/neuron-wallet/src/controllers/transactions.ts
+++ b/packages/neuron-wallet/src/controllers/transactions.ts
@@ -9,19 +9,18 @@ import { TransactionNotFound, CurrentWalletNotSet } from '../exceptions'
import Transaction from '../models/chain/transaction'
import { set as setDescription, get as getDescription } from '../services/tx/transaction-description'
-import AddressParser from '../models/address-parser'
import ShowGlobalDialogSubject from '../models/subjects/show-global-dialog'
export default class TransactionsController {
public async getAll(
params: Controller.Params.TransactionsByKeywords
): Promise & Controller.Params.TransactionsByKeywords>> {
- const { pageNo = 1, pageSize = 15, keywords = '', walletID = '' } = params
+ const { pageNo = 1, pageSize = 15, keywords = '', walletID = '', sort, direction } = params
const addresses = (await AddressesService.getAddressesByWalletId(walletID)).map(addr => addr.address)
const transactions = await TransactionsService.getAllByAddresses(
- { walletID, pageNo, pageSize, addresses },
+ { walletID, pageNo, pageSize, addresses, sort, direction },
keywords.trim()
).catch(() => ({
totalCount: 0,
@@ -61,17 +60,16 @@ export default class TransactionsController {
throw new CurrentWalletNotSet()
}
- const addresses: string[] = (await AddressesService.getAddressesByWalletId(wallet.id)).map(addr => addr.address)
- const lockHashes: string[] = AddressParser.batchToLockHash(addresses)
+ const lockArgs: string[] = (await AddressesService.getAddressesByWalletId(wallet.id)).map(addr => addr.blake160)
const outputCapacities: bigint = transaction
- .outputs!.filter(o => lockHashes.includes(o.lockHash!))
+ .outputs!.filter(o => lockArgs.includes(o.lock.args))
.map(o => BigInt(o.capacity))
.reduce((result, c) => result + c, BigInt(0))
const inputCapacities: bigint = transaction
.inputs!.filter(i => {
- if (i.lockHash) {
- return lockHashes.includes(i.lockHash)
+ if (i.lock?.args) {
+ return lockArgs.includes(i.lock?.args)
}
return false
})
diff --git a/packages/neuron-wallet/src/controllers/wallets.ts b/packages/neuron-wallet/src/controllers/wallets.ts
index 61b972a0b4..2307c6be40 100644
--- a/packages/neuron-wallet/src/controllers/wallets.ts
+++ b/packages/neuron-wallet/src/controllers/wallets.ts
@@ -1,12 +1,11 @@
import fs from 'fs'
import { t } from 'i18next'
+import { prefixWith0x } from '../utils/scriptAndAddress'
import { dialog, SaveDialogReturnValue, BrowserWindow, OpenDialogReturnValue } from 'electron'
import WalletsService, { Wallet, WalletProperties, FileKeystoreWallet } from '../services/wallets'
import NetworksService from '../services/networks'
-import Keystore from '../models/keys/keystore'
-import Keychain from '../models/keys/keychain'
-import { validateMnemonic, mnemonicToSeedSync } from '../models/keys/mnemonic'
-import { AccountExtendedPublicKey, ExtendedPrivateKey, generateMnemonic } from '../models/keys/key'
+import { bytes } from '@ckb-lumos/lumos/codec'
+import { hd } from '@ckb-lumos/lumos'
import CommandSubject from '../models/subjects/command'
import { ResponseCode } from '../utils/const'
import {
@@ -22,6 +21,9 @@ import {
UsedName,
MainnetAddressRequired,
TestnetAddressRequired,
+ UnsupportedCkbCliKeystore,
+ DuplicateImportWallet,
+ AddressRequired,
} from '../exceptions'
import AddressService from '../services/addresses'
import TransactionSender from '../services/transaction-sender'
@@ -34,6 +36,9 @@ import AddressParser from '../models/address-parser'
import MultisigConfigModel from '../models/multisig-config'
import { generateRPC } from '../utils/ckb-rpc'
+const { Keychain, Keystore, ExtendedPrivateKey, AccountExtendedPublicKey, mnemonic } = hd
+const { generateMnemonic, validateMnemonic, mnemonicToSeedSync } = mnemonic
+
export default class WalletsController {
public async getAll(): Promise[]>> {
const wallets = WalletsService.getInstance().getAll()
@@ -106,15 +111,15 @@ export default class WalletsController {
throw new InvalidMnemonic()
}
const extendedKey = new ExtendedPrivateKey(
- masterKeychain.privateKey.toString('hex'),
- masterKeychain.chainCode.toString('hex')
+ bytes.hexify(masterKeychain.privateKey),
+ bytes.hexify(masterKeychain.chainCode)
)
const keystore = Keystore.create(extendedKey, password)
const accountKeychain = masterKeychain.derivePath(AccountExtendedPublicKey.ckbAccountPath)
const accountExtendedPublicKey = new AccountExtendedPublicKey(
- accountKeychain.publicKey.toString('hex'),
- accountKeychain.chainCode.toString('hex')
+ bytes.hexify(accountKeychain.publicKey),
+ bytes.hexify(accountKeychain.chainCode)
)
const walletsService = WalletsService.getInstance()
@@ -166,15 +171,30 @@ export default class WalletsController {
throw new InvalidJSON()
}
const keystoreObject = Keystore.fromJson(keystore)
+
+ if (keystoreObject.isFromCkbCli()) {
+ throw new UnsupportedCkbCliKeystore()
+ }
+
+ try {
+ keystoreObject.extendedPrivateKey(password)
+ } catch (error) {
+ if (error.message === 'Incorrect password!') {
+ throw new IncorrectPassword()
+ } else {
+ throw error
+ }
+ }
+
const masterPrivateKey = keystoreObject.extendedPrivateKey(password)
const masterKeychain = new Keychain(
- Buffer.from(masterPrivateKey.privateKey, 'hex'),
- Buffer.from(masterPrivateKey.chainCode, 'hex')
+ Buffer.from(bytes.bytify(masterPrivateKey.privateKey)),
+ Buffer.from(bytes.bytify(masterPrivateKey.chainCode))
)
const accountKeychain = masterKeychain.derivePath(AccountExtendedPublicKey.ckbAccountPath)
const accountExtendedPublicKey = new AccountExtendedPublicKey(
- accountKeychain.publicKey.toString('hex'),
- accountKeychain.chainCode.toString('hex')
+ bytes.hexify(accountKeychain.publicKey),
+ bytes.hexify(accountKeychain.chainCode)
)
const walletsService = WalletsService.getInstance()
@@ -214,7 +234,7 @@ export default class WalletsController {
throw new WalletNotFound(id)
}
- const props: { name: string; keystore?: Keystore; device?: DeviceInfo; startBlockNumber?: string } = {
+ const props: { name: string; keystore?: hd.Keystore; device?: DeviceInfo; startBlockNumber?: string } = {
name: name || wallet.name,
startBlockNumber,
}
@@ -273,7 +293,7 @@ export default class WalletsController {
walletName,
}: ExtendedPublicKey & { walletName: string }): Promise> {
const device = HardwareWalletService.getInstance().getCurrent()!
- const accountExtendedPublicKey = new AccountExtendedPublicKey(publicKey, chainCode)
+ const accountExtendedPublicKey = new AccountExtendedPublicKey(prefixWith0x(publicKey), prefixWith0x(chainCode))
const walletsService = WalletsService.getInstance()
const wallet = walletsService.create({
device: device.deviceInfo,
@@ -320,7 +340,7 @@ export default class WalletsController {
result: wallet,
}
} catch (e) {
- if (e instanceof UsedName) {
+ if (e instanceof UsedName || e instanceof DuplicateImportWallet) {
throw e
}
throw new InvalidJSON()
@@ -416,6 +436,8 @@ export default class WalletsController {
password: string
description?: string
multisigConfig?: MultisigConfigModel
+ amendHash?: string
+ skipLastInputs?: boolean
},
skipSign = false
) {
@@ -437,8 +459,9 @@ export default class WalletsController {
params.walletID,
Transaction.fromObject(params.tx),
params.password,
- false,
- skipSign
+ params.skipLastInputs || false,
+ skipSign,
+ params.amendHash
)
}
const description = params.description || params.tx.description || ''
@@ -598,6 +621,10 @@ export default class WalletsController {
private checkAddresses = (addresses: string[]) => {
const isMainnet = NetworksService.getInstance().isMainnet()
addresses.forEach(address => {
+ if (!address) {
+ throw new AddressRequired()
+ }
+
if (isMainnet && !address.startsWith('ckb')) {
throw new MainnetAddressRequired(address)
}
@@ -672,4 +699,24 @@ export default class WalletsController {
}
})
}
+
+ public async getPrivateKeyByAddress({
+ walletID,
+ password,
+ address,
+ }: {
+ walletID: string
+ password: string
+ address?: string
+ }) {
+ const privateKey = await AddressService.getPrivateKeyByAddress({
+ walletID,
+ password,
+ address,
+ })
+ return {
+ status: ResponseCode.Success,
+ result: privateKey,
+ }
+ }
}
diff --git a/packages/neuron-wallet/src/database/address/meta.ts b/packages/neuron-wallet/src/database/address/meta.ts
index 3fd8f99abc..5ef8db354d 100644
--- a/packages/neuron-wallet/src/database/address/meta.ts
+++ b/packages/neuron-wallet/src/database/address/meta.ts
@@ -1,6 +1,6 @@
-import { bytes } from '@ckb-lumos/codec'
+import { bytes } from '@ckb-lumos/lumos/codec'
import { Address, AddressVersion } from '../../models/address'
-import { AddressType } from '../../models/keys/address'
+import { hd } from '@ckb-lumos/lumos'
import Script from '../../models/chain/script'
import SystemScriptInfo from '../../models/system-script-info'
import AssetAccountInfo from '../../models/asset-account-info'
@@ -11,7 +11,7 @@ export default class AddressMeta implements Address {
walletId: string
address: string
path: string
- addressType: AddressType
+ addressType: hd.AddressType
addressIndex: number
blake160: string
txCount?: number
@@ -28,7 +28,7 @@ export default class AddressMeta implements Address {
walletId: string,
address: string,
path: string,
- addressType: AddressType,
+ addressType: hd.AddressType,
addressIndex: number,
blake160: string,
version?: AddressVersion,
diff --git a/packages/neuron-wallet/src/database/chain/connection.ts b/packages/neuron-wallet/src/database/chain/connection.ts
index a65452b356..32344e7946 100644
--- a/packages/neuron-wallet/src/database/chain/connection.ts
+++ b/packages/neuron-wallet/src/database/chain/connection.ts
@@ -1,15 +1,13 @@
-import { getConnection as originGetConnection } from 'typeorm'
+import { ConnectionName, dataSource } from './ormconfig'
import { NetworkType } from '../../models/network'
import NetworksService from '../../services/networks'
-export type ConnectionName = 'light' | 'full'
-
export function getCurrentConnectionName(): ConnectionName {
return NetworksService.getInstance().getCurrent()?.type === NetworkType.Light ? 'light' : 'full'
}
export function getConnection(connectionName: ConnectionName = getCurrentConnectionName()) {
- const connection = originGetConnection(connectionName)
+ const connection = dataSource[connectionName]
if (!connection) {
throw new Error(`The connection ${connectionName} should be initialized before use`)
}
diff --git a/packages/neuron-wallet/src/database/chain/entities/amend-transaction.ts b/packages/neuron-wallet/src/database/chain/entities/amend-transaction.ts
new file mode 100644
index 0000000000..8bca7a08db
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/entities/amend-transaction.ts
@@ -0,0 +1,31 @@
+import { Column, PrimaryGeneratedColumn, Entity } from 'typeorm'
+
+@Entity()
+export default class AmendTransaction {
+ @PrimaryGeneratedColumn()
+ id!: number
+
+ @Column({
+ type: 'varchar',
+ })
+ hash!: string
+
+ @Column({
+ type: 'varchar',
+ })
+ amendHash!: string
+
+ static fromObject(params: { hash: string; amendHash: string }) {
+ const res = new AmendTransaction()
+ res.hash = params.hash
+ res.amendHash = params.amendHash
+ return res
+ }
+
+ public toModel() {
+ return {
+ hash: this.hash,
+ amendHash: this.amendHash,
+ }
+ }
+}
diff --git a/packages/neuron-wallet/src/database/chain/entities/asset-account.ts b/packages/neuron-wallet/src/database/chain/entities/asset-account.ts
index d59d67ecd4..009e30b8e3 100644
--- a/packages/neuron-wallet/src/database/chain/entities/asset-account.ts
+++ b/packages/neuron-wallet/src/database/chain/entities/asset-account.ts
@@ -1,9 +1,10 @@
import { Entity, Column, PrimaryGeneratedColumn, Index, ManyToOne, JoinColumn } from 'typeorm'
import AssetAccountModel from '../../../models/asset-account'
import SudtTokenInfo from './sudt-token-info'
+import { UDTType } from '../../../utils/const'
@Entity()
-@Index(['tokenID', 'blake160'], { unique: true })
+@Index(['tokenID', 'blake160', 'udtType'], { unique: true })
export default class AssetAccount {
@PrimaryGeneratedColumn()
id!: number
@@ -13,6 +14,12 @@ export default class AssetAccount {
})
tokenID!: string
+ @Column({
+ type: 'varchar',
+ nullable: true,
+ })
+ udtType?: UDTType
+
@Column({
type: 'varchar',
default: '',
@@ -40,12 +47,14 @@ export default class AssetAccount {
assetAccount.accountName = info.accountName
assetAccount.balance = info.balance
assetAccount.blake160 = info.blake160
+ assetAccount.udtType = info.udtType
const sudtTokenInfo = new SudtTokenInfo()
sudtTokenInfo.tokenID = info.tokenID
sudtTokenInfo.symbol = info.symbol
sudtTokenInfo.tokenName = info.tokenName
sudtTokenInfo.decimal = info.decimal
+ sudtTokenInfo.udtType = info.udtType
assetAccount.sudtTokenInfo = sudtTokenInfo
return assetAccount
@@ -60,7 +69,8 @@ export default class AssetAccount {
this.sudtTokenInfo.decimal,
this.balance,
this.blake160,
- this.id
+ this.id,
+ this.udtType
)
}
}
diff --git a/packages/neuron-wallet/src/database/chain/entities/cell-local-info.ts b/packages/neuron-wallet/src/database/chain/entities/cell-local-info.ts
index 714e012559..a86b1a1885 100644
--- a/packages/neuron-wallet/src/database/chain/entities/cell-local-info.ts
+++ b/packages/neuron-wallet/src/database/chain/entities/cell-local-info.ts
@@ -1,4 +1,4 @@
-import type { OutPoint } from '@ckb-lumos/base'
+import type { OutPoint } from '@ckb-lumos/lumos'
import { Entity, PrimaryColumn, Column } from 'typeorm'
@Entity()
diff --git a/packages/neuron-wallet/src/database/chain/entities/hd-public-key-info.ts b/packages/neuron-wallet/src/database/chain/entities/hd-public-key-info.ts
index e06e3d5632..076b5ddc0c 100644
--- a/packages/neuron-wallet/src/database/chain/entities/hd-public-key-info.ts
+++ b/packages/neuron-wallet/src/database/chain/entities/hd-public-key-info.ts
@@ -1,6 +1,6 @@
import { Entity, Column, PrimaryGeneratedColumn, Index, CreateDateColumn } from 'typeorm'
import HdPublicKeyInfoModel from '../../../models/keys/hd-public-key-info'
-import { AddressType } from '../../../models/keys/address'
+import { hd } from '@ckb-lumos/lumos'
@Entity()
export default class HdPublicKeyInfo {
@@ -14,7 +14,7 @@ export default class HdPublicKeyInfo {
walletId!: string
@Column()
- addressType!: AddressType
+ addressType!: hd.AddressType
@Column()
@Index()
diff --git a/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts b/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts
index 2c0b2d8f6a..3e62b73e5b 100644
--- a/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts
+++ b/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts
@@ -24,10 +24,13 @@ export default class MultisigConfig {
blake160s!: string[]
@Column()
- alias!: string
+ alias: string = ''
@Column()
- lastestBlockNumber!: string
+ lastestBlockNumber: string = ''
+
+ @Column()
+ startBlockNumber?: number
public static fromModel(model: MultisigConfigModel): MultisigConfig {
const multisigConfig = new MultisigConfig()
diff --git a/packages/neuron-wallet/src/database/chain/entities/multisig-output.ts b/packages/neuron-wallet/src/database/chain/entities/multisig-output.ts
index 628d93f827..61a7a302fb 100644
--- a/packages/neuron-wallet/src/database/chain/entities/multisig-output.ts
+++ b/packages/neuron-wallet/src/database/chain/entities/multisig-output.ts
@@ -1,7 +1,7 @@
import { Entity, BaseEntity, Column, PrimaryColumn } from 'typeorm'
import Script, { ScriptHashType } from '../../../models/chain/script'
import OutPoint from '../../../models/chain/out-point'
-import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
+import { computeScriptHash as scriptToHash } from '@ckb-lumos/lumos/utils'
import { OutputStatus } from '../../../models/chain/output'
@Entity()
diff --git a/packages/neuron-wallet/src/database/chain/entities/sudt-token-info.ts b/packages/neuron-wallet/src/database/chain/entities/sudt-token-info.ts
index ec0614395b..35c6512f3a 100644
--- a/packages/neuron-wallet/src/database/chain/entities/sudt-token-info.ts
+++ b/packages/neuron-wallet/src/database/chain/entities/sudt-token-info.ts
@@ -1,14 +1,21 @@
import { Entity, Column, Index, OneToMany, PrimaryColumn } from 'typeorm'
import AssetAccount from './asset-account'
+import { UDTType } from '../../../utils/const'
@Entity()
-@Index(['tokenID'], { unique: true })
+@Index(['tokenID', 'udtType'], { unique: true })
export default class SudtTokenInfo {
@PrimaryColumn({
type: 'varchar',
})
tokenID!: string
+ @Column({
+ type: 'varchar',
+ nullable: true,
+ })
+ udtType?: UDTType
+
@Column({
type: 'varchar',
})
@@ -33,6 +40,7 @@ export default class SudtTokenInfo {
tokenName: this.tokenName,
symbol: this.symbol,
decimal: this.decimal,
+ udtType: this.udtType,
}
}
}
diff --git a/packages/neuron-wallet/src/database/chain/entities/sync-progress.ts b/packages/neuron-wallet/src/database/chain/entities/sync-progress.ts
index 75229b5ec4..8400216781 100644
--- a/packages/neuron-wallet/src/database/chain/entities/sync-progress.ts
+++ b/packages/neuron-wallet/src/database/chain/entities/sync-progress.ts
@@ -1,5 +1,5 @@
-import { HexString } from '@ckb-lumos/base'
-import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
+import { HexString } from '@ckb-lumos/lumos'
+import { computeScriptHash as scriptToHash } from '@ckb-lumos/lumos/utils'
import { Entity, PrimaryColumn, Column } from 'typeorm'
export enum SyncAddressType {
diff --git a/packages/neuron-wallet/src/database/chain/index.ts b/packages/neuron-wallet/src/database/chain/index.ts
index fcb13996e9..95a2a7a298 100644
--- a/packages/neuron-wallet/src/database/chain/index.ts
+++ b/packages/neuron-wallet/src/database/chain/index.ts
@@ -8,6 +8,7 @@ import IndexerTxHashCache from './entities/indexer-tx-hash-cache'
import MultisigOutput from './entities/multisig-output'
import SyncProgress from './entities/sync-progress'
import TxLock from './entities/tx-lock'
+import AmendTransactionEntity from './entities/amend-transaction'
import { getConnection } from '../../database/chain/connection'
/*
@@ -15,7 +16,15 @@ import { getConnection } from '../../database/chain/connection'
*/
export const clean = async (clearAllLightClientData?: boolean) => {
await Promise.all([
- ...[InputEntity, OutputEntity, TransactionEntity, IndexerTxHashCache, MultisigOutput, TxLock].map(entity => {
+ ...[
+ InputEntity,
+ OutputEntity,
+ TransactionEntity,
+ IndexerTxHashCache,
+ MultisigOutput,
+ TxLock,
+ AmendTransactionEntity,
+ ].map(entity => {
return getConnection().getRepository(entity).clear()
}),
clearAllLightClientData
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1651820157100-RemoveAddressesMultisigConfig.ts b/packages/neuron-wallet/src/database/chain/migrations/1651820157100-RemoveAddressesMultisigConfig.ts
index 2d8469aff9..279acba979 100644
--- a/packages/neuron-wallet/src/database/chain/migrations/1651820157100-RemoveAddressesMultisigConfig.ts
+++ b/packages/neuron-wallet/src/database/chain/migrations/1651820157100-RemoveAddressesMultisigConfig.ts
@@ -8,7 +8,9 @@ export class RemoveAddressesMultisigConfig1651820157100 implements MigrationInte
public async up(queryRunner: QueryRunner): Promise {
await queryRunner.renameColumn('multisig_config', 'addresses', 'blake160s')
await queryRunner.dropColumn('multisig_config', 'fullpayload')
- const configList = await queryRunner.manager.find(MultisigConfig)
+ // after add a column for multisig_config here will throw exception if use `queryRunner.manager.find(MultisigConfig)`
+ // so it's better to use query to find the items
+ const configList: MultisigConfig[] = await queryRunner.manager.query('select * from multisig_config')
const updated = configList.map(v => {
v.blake160s = v.blake160s.map(v => addressToScript(v).args)
return v
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1652945662504-UpdateOutputChequeLockHash.ts b/packages/neuron-wallet/src/database/chain/migrations/1652945662504-UpdateOutputChequeLockHash.ts
index 01d8d3a719..6b23fd4d6c 100644
--- a/packages/neuron-wallet/src/database/chain/migrations/1652945662504-UpdateOutputChequeLockHash.ts
+++ b/packages/neuron-wallet/src/database/chain/migrations/1652945662504-UpdateOutputChequeLockHash.ts
@@ -1,5 +1,5 @@
import { In, MigrationInterface, QueryRunner } from "typeorm";
-import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
+import { computeScriptHash as scriptToHash } from '@ckb-lumos/lumos/utils'
import { ScriptHashType } from "../../../models/chain/script";
import Output from "../entities/output";
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1681360188494-AddTypeSyncProgress.ts b/packages/neuron-wallet/src/database/chain/migrations/1681360188494-AddTypeSyncProgress.ts
index e5dfeabc7e..9a268ee990 100644
--- a/packages/neuron-wallet/src/database/chain/migrations/1681360188494-AddTypeSyncProgress.ts
+++ b/packages/neuron-wallet/src/database/chain/migrations/1681360188494-AddTypeSyncProgress.ts
@@ -1,6 +1,6 @@
import { MigrationInterface, QueryRunner, TableColumn, TableIndex } from "typeorm"
import Multisig from "../../../models/multisig"
-import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
+import { computeScriptHash as scriptToHash } from '@ckb-lumos/lumos/utils'
import { SyncAddressType } from "../entities/sync-progress"
import MultisigConfig from "../entities/multisig-config"
@@ -15,10 +15,9 @@ export class AddTypeSyncProgress1681360188494 implements MigrationInterface {
default: SyncAddressType.Default,
}))
await queryRunner.createIndex("sync_progress", new TableIndex({ columnNames: ["addressType"] }))
- const multisigConfigs = await queryRunner.connection
- .getRepository(MultisigConfig)
- .createQueryBuilder()
- .getMany()
+ // after add a column for multisig_config here will throw exception if use `queryRunner.manager.find(MultisigConfig)`
+ // so it's better to use query to find the items
+ const multisigConfigs: MultisigConfig[] = await queryRunner.manager.query('select * from multisig_config')
const scriptHashes = multisigConfigs.map(v => scriptToHash(Multisig.getMultisigScript(v.blake160s, v.r, v.m, v.n)))
await queryRunner.query(`UPDATE sync_progress set addressType=1 where hash in (${scriptHashes.map(v => `'${v}'`).join(',')})`)
}
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1702781527414-RenameSyncProgress.ts b/packages/neuron-wallet/src/database/chain/migrations/1702781527414-RenameSyncProgress.ts
index 4a6c4b78d8..7ef43299d1 100644
--- a/packages/neuron-wallet/src/database/chain/migrations/1702781527414-RenameSyncProgress.ts
+++ b/packages/neuron-wallet/src/database/chain/migrations/1702781527414-RenameSyncProgress.ts
@@ -1,21 +1,18 @@
-import {MigrationInterface, QueryRunner, TableColumn} from "typeorm";
+import {MigrationInterface, QueryRunner} from "typeorm";
export class RenameSyncProgress1702781527414 implements MigrationInterface {
name = 'RenameSyncProgress1702781527414'
public async up(queryRunner: QueryRunner): Promise {
- await queryRunner.renameColumn('sync_progress', 'blockStartNumber', 'localSavedBlockNumber')
- await queryRunner.renameColumn('sync_progress', 'blockEndNumber', 'syncedBlockNumber')
- await queryRunner.addColumn('sync_progress', new TableColumn({
- name: 'lightStartBlockNumber',
- type: 'integer',
- default: 0
- }))
+ // the typeorm renameColumn will throw an exception about drop indexer when rename or add column
+ await queryRunner.query('ALTER TABLE "sync_progress" RENAME "blockStartNumber" to "localSavedBlockNumber"')
+ await queryRunner.query('ALTER TABLE "sync_progress" RENAME "blockEndNumber" to "syncedBlockNumber"')
+ await queryRunner.query(`ALTER TABLE "sync_progress" ADD COLUMN "lightStartBlockNumber" integer DEFAULT 0;`)
}
public async down(queryRunner: QueryRunner): Promise {
- await queryRunner.renameColumn('sync_progress', 'localSavedBlockNumber', 'blockStartNumber')
- await queryRunner.renameColumn('sync_progress', 'syncedBlockNumber', 'blockEndNumber')
- }
+ await queryRunner.query('ALTER TABLE "sync_progress" RENAME "localSavedBlockNumber" to "blockStartNumber"')
+ await queryRunner.query('ALTER TABLE "sync_progress" RENAME "syncedBlockNumber" to "blockEndNumber"')
+ }
}
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1709008125088-AmendTransaction.ts b/packages/neuron-wallet/src/database/chain/migrations/1709008125088-AmendTransaction.ts
new file mode 100644
index 0000000000..d6578a0dac
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/migrations/1709008125088-AmendTransaction.ts
@@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class AmendTransaction1709008125088 implements MigrationInterface {
+
+ public async up(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "amend_transaction" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "hash" varchar NOT NULL, "amendHash" varchar NOT NULL)`)
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP TABLE "amend_transaction"`)
+ }
+
+}
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1716539079505-AddStartBlockNumber.ts b/packages/neuron-wallet/src/database/chain/migrations/1716539079505-AddStartBlockNumber.ts
new file mode 100644
index 0000000000..c1bdb527c5
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/migrations/1716539079505-AddStartBlockNumber.ts
@@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class AddStartBlockNumber1716539079505 implements MigrationInterface {
+ name = 'AddStartBlockNumber1716539079505'
+
+ public async up(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "multisig_config" ADD COLUMN "startBlockNumber" integer;`)
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "multisig_config" DROP COLUMN "startBlockNumber";`)
+ }
+
+}
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1720089814860-AddUdtType.ts b/packages/neuron-wallet/src/database/chain/migrations/1720089814860-AddUdtType.ts
new file mode 100644
index 0000000000..b30e1bf7f3
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/migrations/1720089814860-AddUdtType.ts
@@ -0,0 +1,22 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class AddUdtType1720089814860 implements MigrationInterface {
+ name = 'AddUdtType1720089814860'
+
+ public async up(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "sudt_token_info" ADD COLUMN "udtType" varchar;`)
+ await queryRunner.query(`CREATE UNIQUE INDEX "IDX_37bb4f2a4a849bf0b1dadee2c7" ON "sudt_token_info" ("tokenID", "udtType") `);
+ await queryRunner.query(`UPDATE "sudt_token_info" set udtType="sUDT" where tokenID!="CKBytes"`)
+ await queryRunner.query(`ALTER TABLE "asset_account" ADD COLUMN "udtType" varchar;`)
+ await queryRunner.query(`CREATE UNIQUE INDEX "IDX_5139df6b311e63ecdd93cd17ed" ON "asset_account" ("tokenID", "blake160", "udtType") `);
+ await queryRunner.query(`UPDATE "asset_account" set udtType="sUDT" where tokenID!="CKBytes"`)
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "IDX_37bb4f2a4a849bf0b1dadee2c7"`);
+ await queryRunner.query(`ALTER TABLE "sudt_token_info" DROP COLUMN "udtType";`);
+ await queryRunner.query(`DROP INDEX "IDX_5139df6b311e63ecdd93cd17ed"`);
+ await queryRunner.query(`ALTER TABLE "asset_account" DROP COLUMN "udtType";`);
+ }
+
+}
diff --git a/packages/neuron-wallet/src/database/chain/ormconfig.ts b/packages/neuron-wallet/src/database/chain/ormconfig.ts
index a4c6c134d7..b8699466d2 100644
--- a/packages/neuron-wallet/src/database/chain/ormconfig.ts
+++ b/packages/neuron-wallet/src/database/chain/ormconfig.ts
@@ -1,4 +1,4 @@
-import { createConnection, getConnectionOptions, getConnection } from 'typeorm'
+import { AbstractLogger, DataSource, LogLevel, LogMessage } from 'typeorm'
import { SqliteConnectionOptions } from 'typeorm/driver/sqlite/SqliteConnectionOptions'
import path from 'path'
import fs from 'fs'
@@ -21,6 +21,7 @@ import MultisigOutput from './entities/multisig-output'
import SyncProgress from './entities/sync-progress'
import TxLock from './entities/tx-lock'
import CellLocalInfo from './entities/cell-local-info'
+import AmendTransaction from './entities/amend-transaction'
import { InitMigration1566959757554 } from './migrations/1566959757554-InitMigration'
import { AddTypeAndHasData1567144517514 } from './migrations/1567144517514-AddTypeAndHasData'
@@ -61,32 +62,68 @@ import { IndexerTxHashCacheRemoveField1701234043431 } from './migrations/1701234
import { CreateCellLocalInfo1701234043432 } from './migrations/1701234043432-CreateCellLocalInfo'
import { RenameSyncProgress1702781527414 } from './migrations/1702781527414-RenameSyncProgress'
import { RemoveAddressInIndexerCache1704357651876 } from './migrations/1704357651876-RemoveAddressInIndexerCache'
-import { ConnectionName } from './connection'
+import { AmendTransaction1709008125088 } from './migrations/1709008125088-AmendTransaction'
import AddressSubscribe from './subscriber/address-subscriber'
import MultisigConfigSubscribe from './subscriber/multisig-config-subscriber'
import TxDescriptionSubscribe from './subscriber/tx-description-subscriber'
import SudtTokenInfoSubscribe from './subscriber/sudt-token-info-subscriber'
import AssetAccountSubscribe from './subscriber/asset-account-subscriber'
+import { AddStartBlockNumber1716539079505 } from './migrations/1716539079505-AddStartBlockNumber'
+import { AddUdtType1720089814860 } from './migrations/1720089814860-AddUdtType'
export const CONNECTION_NOT_FOUND_NAME = 'ConnectionNotFoundError'
+export type ConnectionName = 'light' | 'full'
const dbPath = (name: string, connectionName: string): string => {
const filename = `${connectionName}-${name}.sqlite`
return path.join(env.fileBasePath, 'cells', filename)
}
-const connectOptions = async (
- genesisBlockHash: string,
- connectionName: ConnectionName
-): Promise => {
- const connectionOptions = await getConnectionOptions()
+class TypeormLogger extends AbstractLogger {
+ /**
+ * Write log to specific output.
+ */
+ protected writeLog(level: LogLevel, logMessage: LogMessage | LogMessage[]) {
+ const messages = this.prepareLogMessages(logMessage, {
+ highlightSql: false,
+ })
+
+ for (let message of messages) {
+ switch (message.type ?? level) {
+ case 'log':
+ case 'schema-build':
+ case 'migration':
+ case 'info':
+ case 'query':
+ case 'warn':
+ case 'query-slow':
+ if (message.prefix) {
+ console.info(message.prefix, message.message)
+ } else {
+ console.info(message.message)
+ }
+ break
+
+ case 'error':
+ case 'query-error':
+ if (message.prefix) {
+ console.error(message.prefix, message.message)
+ } else {
+ console.error(message.message)
+ }
+ break
+ }
+ }
+ }
+}
+
+const getConnectionOptions = (genesisBlockHash: string, connectionName: ConnectionName): SqliteConnectionOptions => {
const database = env.isTestMode ? ':memory:' : dbPath(genesisBlockHash, connectionName)
const logging: boolean | ('query' | 'schema' | 'error' | 'warn' | 'info' | 'log' | 'migration')[] = ['warn', 'error']
// (env.isDevMode) ? ['warn', 'error', 'log', 'info', 'schema', 'migration'] : ['warn', 'error']
return {
- ...connectionOptions,
name: connectionName,
type: 'sqlite',
database,
@@ -106,6 +143,7 @@ const connectOptions = async (
SyncProgress,
TxLock,
CellLocalInfo,
+ AmendTransaction,
],
migrations: [
InitMigration1566959757554,
@@ -147,6 +185,9 @@ const connectOptions = async (
CreateCellLocalInfo1701234043432,
RenameSyncProgress1702781527414,
RemoveAddressInIndexerCache1704357651876,
+ AmendTransaction1709008125088,
+ AddStartBlockNumber1716539079505,
+ AddUdtType1720089814860,
],
subscribers: [
AddressSubscribe,
@@ -155,35 +196,38 @@ const connectOptions = async (
SudtTokenInfoSubscribe,
TxDescriptionSubscribe,
],
- logger: 'simple-console',
+ logger: new TypeormLogger(),
logging,
+ migrationsRun: true,
maxQueryExecutionTime: 30,
}
}
+export const dataSource: Record = {
+ light: null,
+ full: null,
+}
+
const initConnectionWithType = async (genesisBlockHash: string, connectionName: ConnectionName) => {
// try to close connection, if not exist, will throw ConnectionNotFoundError when call getConnection()
try {
- await getConnection(connectionName).close()
+ await dataSource[connectionName]?.destroy()
} catch (err) {
+ dataSource[connectionName] = null
// do nothing
}
- const connectionOptions = await connectOptions(genesisBlockHash, connectionName)
+ const connectionOptions = getConnectionOptions(genesisBlockHash, connectionName)
+ dataSource[connectionName] = new DataSource(connectionOptions)
try {
- await createConnection(connectionOptions)
- await getConnection(connectionName).manager.query(`PRAGMA busy_timeout = 3000;`)
- await getConnection(connectionName).manager.query(`PRAGMA temp_store = MEMORY;`)
+ await dataSource[connectionName]?.initialize()
+ await dataSource[connectionName]?.manager.query(`PRAGMA busy_timeout = 3000;`)
+ await dataSource[connectionName]?.manager.query(`PRAGMA temp_store = MEMORY;`)
} catch (err) {
logger.error(err.message)
}
}
-export async function initConnection(genesisBlockHash: string) {
- await initConnectionWithType(genesisBlockHash, 'full')
- await initConnectionWithType(genesisBlockHash, 'light')
-}
-
export function migrateDBFile(genesisBlockHash: string) {
const originDBFile = dbPath(genesisBlockHash, 'cell')
const currentFullDBFile = dbPath(genesisBlockHash, 'full')
@@ -199,4 +243,7 @@ export function migrateDBFile(genesisBlockHash: string) {
}
}
-export default initConnection
+export default async function initConnection(genesisBlockHash: string) {
+ await initConnectionWithType(genesisBlockHash, 'full')
+ await initConnectionWithType(genesisBlockHash, 'light')
+}
diff --git a/packages/neuron-wallet/src/database/chain/subscriber/asset-account-subscriber.ts b/packages/neuron-wallet/src/database/chain/subscriber/asset-account-subscriber.ts
index 7e06e8db0d..a53e499f1e 100644
--- a/packages/neuron-wallet/src/database/chain/subscriber/asset-account-subscriber.ts
+++ b/packages/neuron-wallet/src/database/chain/subscriber/asset-account-subscriber.ts
@@ -15,9 +15,9 @@ export default class AssetAccountSubscribe extends UserSettingSubscriber): Promise {
const repo = this.getNeedSyncConnection(event.connection.name)?.getRepository(AssetAccount)
if (repo && event.entity) {
- const exist = await repo.findOne({ tokenID: event.entity.tokenID, blake160: event.entity.blake160 })
+ const exist = await repo.findOneBy({ tokenID: event.entity.tokenID, blake160: event.entity.blake160 })
if (exist) {
- await repo.upsert(AssetAccount.fromModel(event.entity.toModel()), this.unionKeys)
+ await repo.update(exist.id, AssetAccount.fromModel(event.entity.toModel()))
} else {
await repo.save(event.entity)
}
diff --git a/packages/neuron-wallet/src/database/chain/subscriber/sudt-token-info-subscriber.ts b/packages/neuron-wallet/src/database/chain/subscriber/sudt-token-info-subscriber.ts
index 5682bb5fa6..c24f777126 100644
--- a/packages/neuron-wallet/src/database/chain/subscriber/sudt-token-info-subscriber.ts
+++ b/packages/neuron-wallet/src/database/chain/subscriber/sudt-token-info-subscriber.ts
@@ -18,7 +18,9 @@ export default class SudtTokenInfoSubscribe extends UserSettingSubscriber = new (...args: unknown[]) => T
diff --git a/packages/neuron-wallet/src/exceptions/address.ts b/packages/neuron-wallet/src/exceptions/address.ts
index 5263214b63..080ce9d679 100644
--- a/packages/neuron-wallet/src/exceptions/address.ts
+++ b/packages/neuron-wallet/src/exceptions/address.ts
@@ -39,10 +39,18 @@ export class NoMatchAddressForSign extends Error {
}
}
+export class AddressRequired extends Error {
+ public code = 311
+ constructor() {
+ super(t('messages.address-required'))
+ }
+}
+
export default {
InvalidAddress,
MainnetAddressRequired,
TestnetAddressRequired,
AddressNotFound,
NoMatchAddressForSign,
+ AddressRequired,
}
diff --git a/packages/neuron-wallet/src/exceptions/multisig.ts b/packages/neuron-wallet/src/exceptions/multisig.ts
index 5eef3e0dfd..5afb135b1c 100644
--- a/packages/neuron-wallet/src/exceptions/multisig.ts
+++ b/packages/neuron-wallet/src/exceptions/multisig.ts
@@ -25,6 +25,7 @@ export class MultisigConfigAddressError extends Error {
}
export class MultisigConfigNeedError extends Error {
+ public code = 502
constructor() {
super(t('messages.multisig-config-need-error'))
}
diff --git a/packages/neuron-wallet/src/exceptions/wallet.ts b/packages/neuron-wallet/src/exceptions/wallet.ts
index 25962d77a3..82af7d255f 100644
--- a/packages/neuron-wallet/src/exceptions/wallet.ts
+++ b/packages/neuron-wallet/src/exceptions/wallet.ts
@@ -85,6 +85,13 @@ export class DuplicateImportWallet extends Error {
}
}
+export class UnsupportedCkbCliKeystore extends Error {
+ public code = 119
+ constructor() {
+ super(t('messages.unsupported-ckb-cli-keystore'))
+ }
+}
+
export default {
WalletNotFound,
CurrentWalletNotSet,
@@ -96,4 +103,5 @@ export default {
CapacityNotEnoughForChange,
InvalidKeystore,
DuplicateImportWallet,
+ UnsupportedCkbCliKeystore,
}
diff --git a/packages/neuron-wallet/src/locales/ar.ts b/packages/neuron-wallet/src/locales/ar.ts
new file mode 100644
index 0000000000..2f00419a5c
--- /dev/null
+++ b/packages/neuron-wallet/src/locales/ar.ts
@@ -0,0 +1,308 @@
+export default {
+ translation: {
+ keywords: {
+ wallet: 'محفظة',
+ password: 'كلمة المرور',
+ 'wallet-name': 'اسم المحفظة',
+ },
+ 'application-menu': {
+ neuron: {
+ about: 'حول {{app}}',
+ preferences: 'التفضيلات...',
+ 'check-updates': 'التحقق من التحديثات...',
+ quit: 'إنهاء {{app}}',
+ },
+ wallet: {
+ label: 'المحفظة',
+ select: 'اختر المحفظة',
+ 'create-new': 'إنشاء محفظة جديدة',
+ import: 'استيراد المحفظة',
+ backup: 'نسخ احتياطي للمحفظة الحالية',
+ 'export-xpubkey': 'تصدير المفتاح العام الموسع',
+ delete: 'حذف المحفظة الحالية',
+ 'change-password': 'تغيير كلمة المرور',
+ 'import-mnemonic': 'استيراد العبارة المساعدة',
+ 'import-keystore': 'الاستيراد من مخزن المفاتيح',
+ 'import-xpubkey': 'استيراد المفتاح العام الموسع',
+ 'import-hardware': 'استيراد محفظة الأجهزة',
+ },
+ edit: {
+ label: 'تعديل',
+ cut: 'قص',
+ copy: 'نسخ',
+ paste: 'لصق',
+ selectall: 'تحديد الكل',
+ },
+ tools: {
+ label: 'أدوات',
+ 'sign-and-verify': 'توقيع/التحقق من الرسالة',
+ 'multisig-address': 'عناوين التوقيع المتعدد',
+ 'offline-sign': 'توقيع غير متصل',
+ 'clear-sync-data': 'مسح جميع البيانات المتزامنة',
+ 'broadcast-transaction': 'بث المعاملة',
+ },
+ window: {
+ label: 'نافذة',
+ minimize: 'تصغير',
+ close: 'إغلاق النافذة',
+ lock: 'قفل النافذة',
+ },
+ help: {
+ label: 'مساعدة',
+ 'nervos-website': 'موقع Nervos',
+ 'source-code': 'شفرة المصدر',
+ 'report-issue': 'الإبلاغ عن مشكلة',
+ 'contact-us': 'اتصل بنا',
+ 'contact-us-message':
+ '> يرجى إرفاق معلومات التصحيح المصدرة من "القائمة" -> "مساعدة" -> "تصدير معلومات التصحيح".',
+ documentation: 'الوثائق',
+ settings: 'الإعدادات',
+ 'export-debug-info': 'تصدير معلومات التصحيح',
+ },
+ develop: {
+ develop: 'تطوير',
+ 'force-reload': 'إعادة التحميل بالقوة',
+ reload: 'إعادة التحميل',
+ 'toggle-dev-tools': 'تبديل أدوات المطور',
+ },
+ },
+ services: {
+ transactions: 'المعاملات',
+ wallets: 'المحافظ',
+ },
+ messages: {
+ 'failed-to-load-networks': 'فشل في تحميل الشبكات.',
+ 'Networks-will-be-reset': 'سيتم إعادة تعيين الشبكات.',
+ 'wallet-password-less-than-min-length': 'يجب أن تكون كلمة المرور من {{minPasswordLength}} أحرف على الأقل.',
+ 'wallet-password-more-than-max-length': 'يمكن أن تصل كلمة المرور إلى {{maxPasswordLength}} أحرف.',
+ 'wallet-password-letter-complexity':
+ 'يجب أن تحتوي كلمة المرور على مزيج من الأحرف الكبيرة والصغيرة والأرقام والرموز الخاصة.',
+ 'current-wallet-not-set': 'لم يتم تعيين المحفظة الحالية.',
+ 'incorrect-password': 'كلمة المرور غير صحيحة',
+ 'invalid-address': 'العنوان {{address}} غير صالح.',
+ 'codehash-not-loaded': 'لم يتم تحميل codehash.',
+ 'wallet-not-found': 'لم يتم العثور على المحفظة {{id}}.',
+ 'failed-to-create-mnemonic': 'فشل في إنشاء العبارة المساعدة.',
+ 'network-not-found': 'لم يتم العثور على شبكة بالمعرف {{id}}.',
+ 'invalid-name': 'الاسم {{field}} غير صالح.',
+ 'default-network-unremovable': 'لا يمكن إزالة الشبكة الافتراضية.',
+ 'lack-of-default-network': 'لا توجد شبكة افتراضية.',
+ 'current-network-not-set': 'لم يتم تعيين عقدة CKB الحالية.',
+ 'transaction-not-found': 'لم يتم العثور على المعاملة {{hash}}.',
+ 'is-required': '{{field}} مطلوب.',
+ 'invalid-format': '{{field}} بتنسيق غير صالح.',
+ 'used-name': 'الاسم {{field}} مستخدم، يرجى اختيار اسم آخر.',
+ 'missing-required-argument': 'المعامل المطلوب مفقود.',
+ 'save-keystore': 'حفظ مخزن المفاتيح.',
+ 'save-extended-public-key': 'حفظ المفتاح العام الموسع.',
+ 'import-extended-public-key': 'استيراد المفتاح العام الموسع.',
+ 'invalid-mnemonic': 'العبارة المساعدة غير صالحة، يرجى التحقق منها مرة أخرى.',
+ 'unsupported-cipher': 'الشيفرة غير مدعومة.',
+ 'capacity-not-enough': 'السعة غير كافية.',
+ 'capacity-not-enough-for-change': 'تحتاج إلى مزيد من السعة للفائض (أكثر من 61 CKBytes).',
+ 'capacity-not-enough-for-change-by-transfer':
+ "تحتاج إلى مزيد من السعة للفائض (أكثر من 61 CKBytes)، أو اضغط على زر 'الحد الأقصى' لإرسال كل رصيدك.",
+ 'live-capacity-not-enough': 'السعة المتاحة غير كافية، يرجى المحاولة مرة أخرى بعد تأكيد المعاملة الأخيرة.',
+ 'capacity-too-small': 'الحد الأدنى للسعة للتحويل هو {{bytes}} CKBytes.',
+ 'should-be-type-of': '{{field}} يجب أن يكون من نوع {{type}}.',
+ 'invalid-keystore': 'مخزن المفاتيح غير صالح، يرجى التحقق من سلامة الملف.',
+ 'invalid-json': 'ملف JSON غير صالح، يرجى التحقق من سلامة الملف.',
+ 'cell-is-not-yet-live': 'يرجى الانتظار حتى يتم تأكيد المعاملة الأخيرة على السلسلة.',
+ 'transaction-is-not-committed-yet':
+ 'لا يمكن العثور على الخلايا المطلوبة على السلسلة، يرجى التأكد من تأكيد المعاملات ذات الصلة.',
+ 'mainnet-address-required': '{{address}} ليس عنوان الشبكة الرئيسية.',
+ 'testnet-address-required': '{{address}} ليس عنوان شبكة الاختبار.',
+ 'address-not-found':
+ 'العنوان المعطى لا ينتمي إلى المحفظة الحالية. يرجى التحقق من محفظتك أو الانتظار حتى تكتمل المزامنة.',
+ 'target-output-not-found': 'لا توجد محفظة حساب مرتبطة بهذا العنوان.',
+ 'acp-same-account': 'يجب ألا يكون حساب الدفع وحساب الاستلام هو نفسه.',
+ 'device-sign-canceled':
+ 'لقد قمت بإلغاء طلب التوقيع. إذا لم يكن الأمر كذلك، يرجى التأكد من تمكين إعداد "السماح ببيانات العقد" في تطبيق Nervos على جهازك.',
+ 'connect-device-failed': 'لا يمكن الاتصال بالجهاز، يرجى التحقق من اتصالك.',
+ 'unsupported-manufacturer': 'الأجهزة من {{manufacturer}} غير مدعومة حاليًا.',
+ 'wallet-not-supported-function': 'هذه المحفظة لا تدعم الوظيفة {name}.',
+ 'unsupported-ckb-cli-keystore': 'Neuron لا يدعم استيراد ملف مخزن المفاتيح الخاص بـ ckb-cli.',
+ 'invalid-transaction-file': 'ملف المعاملة غير صالح.',
+ 'offline-sign-failed': 'فشل التوقيع، يرجى التحقق من استخدام المحفظة الصحيحة.',
+ 'multisig-script-prefix-error': 'إعداد التوقيع المتعدد خاطئ',
+ 'multisig-config-not-exist': 'إعداد التوقيع المتعدد غير موجود',
+ 'multisig-config-exist': 'إعداد التوقيع المتعدد موجود بالفعل',
+ 'multisig-config-address-error': 'عنوان إعداد التوقيع المتعدد غير صحيح',
+ 'multisig-config-need-error': 'يتطلب إنشاء معاملة توقيع متعدد إعداد التوقيع المتعدد',
+ 'transaction-no-input-parameter': 'معامل الإدخال مفقود للاستعلام عن الخلايا',
+ 'migrate-sudt-no-type': 'الخلايا المهاجرة لا تحتوي على نص النوع',
+ 'multisig-not-signed': 'التوقيعات الجزئية مفقودة للمعاملات ذات التوقيع المتعدد',
+ 'multisig-lock-hash-mismatch': 'عنوان التوقيع المتعدد الحالي لا يتطابق مع المعاملة التي سيتم الموافقة عليها',
+ 'sudt-acp-have-data': 'الحساب المدمر لـ sUDT لديه بيانات',
+ 'no-match-address-for-sign': 'لم يتم العثور على عنوان مطابق للتوقيع',
+ 'target-lock-error': 'يمكن لحساب أصول CKB التحويل فقط إلى عنوان secp256k1 أو acp',
+ 'no-exist-ckb-node-data': '{{path}} لا يحتوي على تكوين وتخزين عقدة CKB، اضغط على "تأكيد" للمزامنة من البداية',
+ 'light-client-sudt-acp-error': 'وضع العميل الخفيف لا يدعم إرسال الأصول إلى حسابات أصول الآخرين',
+ 'could-not-connect-service': 'تعذر الاتصال بالخدمة، يرجى المحاولة مرة أخرى لاحقًا.',
+ 'address-required': 'لا يمكن أن يكون العنوان فارغًا.',
+ },
+ messageBox: {
+ button: {
+ confirm: 'تأكيد',
+ discard: 'إلغاء',
+ },
+ 'clear-sync-data': {
+ title: 'مسح جميع البيانات المتزامنة',
+ message:
+ 'سيؤدي مسح جميع البيانات المتزامنة إلى حذف جميع البيانات المحلية وإعادة مزامنة البيانات على السلسلة، وقد تستغرق المزامنة الكاملة وقتًا طويلاً.',
+ },
+ 'send-capacity': {
+ title: 'إرسال معاملة',
+ },
+ 'remove-network': {
+ title: 'إزالة الشبكة',
+ message: 'سيتم إزالة شبكة {{name}} (العنوان: {{address}}).',
+ alert: 'هذه هي الشبكة الحالية، عند إزالتها، سيتم التحويل إلى الشبكة الافتراضية',
+ },
+ 'remove-wallet': {
+ title: 'حذف المحفظة',
+ password: 'كلمة المرور',
+ },
+ 'backup-keystore': {
+ title: 'نسخ احتياطي لمخزن المفاتيح',
+ password: 'كلمة المرور',
+ },
+ transaction: {
+ title: 'معاملة: {{hash}}',
+ },
+ 'sign-and-verify': {
+ title: 'توقيع/التحقق من الرسالة',
+ },
+ 'multisig-address': {
+ title: 'عناوين التوقيع المتعدد',
+ },
+ 'ckb-dependency': {
+ title: 'العميل المدمج لـ CKB',
+ message: 'يتطلب الاعتماد',
+ detail: `تعتمد عقد الشبكة في Neuron على مكونات بلغة C++، لذا يرجى تثبيت أحدث إصدار من Redistributable لـ Microsoft Visual C++ لنظام x64 لضمان تشغيل البرنامج بشكل صحيح.`,
+ buttons: {
+ 'install-and-exit': 'تثبيت وإنهاء',
+ },
+ },
+ 'acp-migration': {
+ title: 'ترقية حساب الأصول',
+ message: 'ترقية حساب الأصول',
+ detail:
+ 'في الآونة الأخيرة، حدد فريق الأمان لدينا ثغرة محتملة في نص حساب الأصول التجريبي. لقد نشرنا نص حساب الأصول الجديد مع إصلاح على الشبكة الرئيسية وسيستخدم جميع حسابات الأصول المستقبلية الإصدار الجديد. نقترح عليك ترقيتها لاستخدام النص الجديد.',
+ buttons: {
+ migrate: 'ترقية آمنة الآن',
+ skip: 'أنا أعلم بالمخاطر، سأرقى لاحقًا',
+ },
+ },
+ 'acp-migration-completed': {
+ title: 'تهانينا! لقد أكملت الترقية الآمنة.',
+ message: 'تهانينا! لقد أكملت الترقية الآمنة.',
+ buttons: {
+ ok: 'حسنًا',
+ },
+ },
+ 'hard-fork-migrate': {
+ message:
+ 'من أجل التوافق مع أحدث إصدار من CKB، سيقوم Neuron بمزامنة البيانات على السلسلة، وقد تستغرق المزامنة الكاملة وقتًا طويلاً.',
+ },
+ 'mail-us': {
+ message: 'يرجى مراسلتنا مع إرفاق معلومات التصحيح المصدرة من "القائمة" -> "مساعدة" -> "تصدير معلومات التصحيح".',
+ 'open-client': 'فتح عميل البريد',
+ 'fail-message':
+ 'تعذر تشغيل عميل البريد، يرجى نسخ عنوان البريد الإلكتروني، وإرفاق معلومات التصحيح المصدرة من "القائمة" -> "مساعدة" -> "تصدير معلومات التصحيح" وإرسالها لنا.',
+ 'copy-mail-addr': 'نسخ عنوان البريد الإلكتروني',
+ },
+ 'migrate-failed': {
+ title: 'فشلت الترقية',
+ message:
+ 'فشلت الترقية، اضغط على "حسنًا" لحذف البيانات القديمة والمزامنة من البداية، أو اضغط على "إلغاء" للترقية لاحقًا بإعادة تشغيل Neuron. سبب فشل الترقية: {{reason}}',
+ buttons: {
+ ok: 'حسنًا',
+ cancel: 'إلغاء',
+ },
+ },
+ 'unrecognized-lock-script': {
+ message: 'تم العثور على نص قفل غير معرّف في هذه المعاملة، يرجى التحقق.',
+ buttons: {
+ cancel: 'إلغاء',
+ ignore: 'تجاهل واستمرار',
+ },
+ },
+ },
+ prompt: {
+ password: {
+ label: 'أدخل كلمة المرور الخاصة بك',
+ submit: 'إرسال',
+ cancel: 'إلغاء',
+ },
+ },
+ updater: {
+ 'update-not-available': 'لا توجد تحديثات متاحة حاليًا.',
+ },
+ common: {
+ yes: 'نعم',
+ no: 'لا',
+ ok: 'حسنًا',
+ cancel: 'إلغاء',
+ error: 'خطأ',
+ },
+ 'export-debug-info': {
+ 'export-debug-info': 'تصدير معلومات التصحيح',
+ 'debug-info-exported': 'تم تصدير معلومات التصحيح إلى {{file}}',
+ },
+ about: {
+ 'app-version': 'إصدار {{name}}: {{version}}',
+ 'ckb-client-version': 'إصدار عميل CKB: {{version}}',
+ 'ckb-light-client-version': 'إصدار عميل CKB الخفيف: {{version}}',
+ },
+ settings: {
+ title: {
+ normal: 'الإعدادات',
+ mac: 'التفضيلات',
+ },
+ },
+ 'export-transactions': {
+ 'export-transactions': 'تصدير سجل المعاملات',
+ 'export-success': 'تم تصدير المعاملات بنجاح',
+ 'transactions-exported': 'تم تصدير {{total}} سجل معاملات إلى {{file}}',
+ column: {
+ time: 'الوقت',
+ 'block-number': 'رقم الكتلة',
+ 'tx-hash': 'تجزئة المعاملة',
+ 'tx-type': 'نوع المعاملة',
+ amount: 'مبلغ CKB',
+ 'udt-amount': 'مبلغ UDT',
+ description: 'الوصف',
+ },
+ 'tx-type': {
+ send: 'إرسال',
+ receive: 'استلام',
+ 'create-asset-account': 'إنشاء حساب أصول {{name}}',
+ 'destroy-asset-account': 'حذف حساب الأصول {{name}}',
+ },
+ },
+ 'offline-signature': {
+ 'export-transaction': 'تصدير المعاملة كـ JSON',
+ 'transaction-exported': 'تم تصدير المعاملة إلى {{filePath}}.',
+ 'load-transaction': 'تحميل ملف المعاملة',
+ },
+ 'multisig-config': {
+ 'import-config': 'استيراد إعداد التوقيع المتعدد',
+ 'export-config': 'تصدير إعداد التوقيع المتعدد',
+ 'config-exported': 'تم تصدير إعداد التوقيع المتعدد إلى {{filePath}}.',
+ 'import-duplicate': 'يرجى التحقق من وجود إعدادات مكررة',
+ 'import-result': 'عمليات الاستيراد الناجحة: {{success}}، الفاشلة: {{fail}}.{{failCheck}}',
+ 'confirm-delete': 'تأكيد حذف إعداد التوقيع المتعدد؟',
+ 'approve-tx': 'تأكيد معاملة التوقيع المتعدد',
+ 'delete-actions': {
+ ok: 'تأكيد',
+ cancel: 'إلغاء',
+ },
+ },
+ 'open-in-explorer': {
+ title: 'عرض في مستكشف CKB',
+ transaction: 'معاملة',
+ message: 'عرض {{type}} {{key}} في مستكشف CKB',
+ },
+ },
+}
diff --git a/packages/neuron-wallet/src/locales/en.ts b/packages/neuron-wallet/src/locales/en.ts
index c7a01ed7c7..82e3b7d27c 100644
--- a/packages/neuron-wallet/src/locales/en.ts
+++ b/packages/neuron-wallet/src/locales/en.ts
@@ -45,6 +45,7 @@ export default {
label: 'Window',
minimize: 'Minimize',
close: 'Close Window',
+ lock: 'Lock window',
},
help: {
label: 'Help',
@@ -121,6 +122,7 @@ export default {
'connect-device-failed': 'The device cannot be connected, please check your connection.',
'unsupported-manufacturer': 'Devices from {{manufacturer}} are not yet supported.',
'wallet-not-supported-function': 'This wallet does not support {name} function.',
+ 'unsupported-ckb-cli-keystore': "Neuron does not support importing ckb-cli's keystore file.",
'invalid-transaction-file': 'Invalid transaction file.',
'offline-sign-failed': 'Signing failed, please check if you are signing with the correct wallet.',
'multisig-script-prefix-error': 'The multisig config is error',
@@ -139,6 +141,7 @@ export default {
'{{path}} has no CKB Node config and storage, press confirm to synchronize from scratch',
'light-client-sudt-acp-error': "Light client mode doesn't support sending assets to other's asset account",
'could-not-connect-service': 'Could not connect to the service, please try again later.',
+ 'address-required': 'The address cannot be empty.',
},
messageBox: {
button: {
@@ -220,6 +223,13 @@ export default {
cancel: 'Cancel',
},
},
+ 'unrecognized-lock-script': {
+ message: 'An unrecognized lock script was found in this transaction, please check it.',
+ buttons: {
+ cancel: 'Cancel',
+ ignore: 'Ignore and continue',
+ },
+ },
},
prompt: {
password: {
diff --git a/packages/neuron-wallet/src/locales/es.ts b/packages/neuron-wallet/src/locales/es.ts
index 259a23ee13..6c6855becd 100644
--- a/packages/neuron-wallet/src/locales/es.ts
+++ b/packages/neuron-wallet/src/locales/es.ts
@@ -44,6 +44,7 @@ export default {
label: 'Ventana',
minimize: 'Minimizar',
close: 'Cerrar Ventana',
+ lock: 'Ventana bloqueada',
},
help: {
label: 'Ayuda',
@@ -120,6 +121,8 @@ export default {
'connect-device-failed': 'No se puede conectar el dispositivo, por favor, verifica tu conexión.',
'unsupported-manufacturer': 'Los dispositivos de {{manufacturer}} aún no son compatibles.',
'wallet-not-supported-function': 'Esta billetera no admite la función {name}.',
+ 'unsupported-ckb-cli-keystore':
+ 'Neuron no soporta la importación del archivo de almacenamiento de claves de ckb-cli.',
'invalid-transaction-file': 'Archivo de transacción no válido.',
'offline-sign-failed': 'Firma fallida, por favor, verifica si estás firmando con la billetera correcta.',
'multisig-script-prefix-error': 'Error en la configuración multifirma',
@@ -140,6 +143,7 @@ export default {
'light-client-sudt-acp-error':
'El modo cliente ligero no admite el envío de activos a la cuenta de activos de otra persona',
'could-not-connect-service': 'No se pudo conectar al servicio, por favor, inténtalo nuevamente más tarde.',
+ 'address-required': 'La dirección no puede estar vacía.',
},
messageBox: {
button: {
@@ -222,6 +226,13 @@ export default {
cancel: 'Cancelar',
},
},
+ 'unrecognized-lock-script': {
+ message: 'Se encontró un script de bloqueo no reconocido en esta transacción, por favor verifíquelo.',
+ buttons: {
+ cancel: 'Cancelar',
+ ignore: 'Ignorar y continuar',
+ },
+ },
},
prompt: {
password: {
diff --git a/packages/neuron-wallet/src/locales/fr.ts b/packages/neuron-wallet/src/locales/fr.ts
index 892de7cb34..c87442f556 100644
--- a/packages/neuron-wallet/src/locales/fr.ts
+++ b/packages/neuron-wallet/src/locales/fr.ts
@@ -44,6 +44,7 @@ export default {
label: 'Fenêtre',
minimize: 'Réduire',
close: 'Fermer la fenêtre',
+ lock: 'Fenêtre verrouillée',
},
help: {
label: 'Aide',
@@ -123,6 +124,8 @@ export default {
'connect-device-failed': "L'appareil ne peut pas être connecté, veuillez vérifier votre connexion.",
'unsupported-manufacturer': 'Les appareils de {{manufacturer}} ne sont pas encore pris en charge.',
'wallet-not-supported-function': 'Ce Wallet ne prend pas en charge la fonction {name}.',
+ 'unsupported-ckb-cli-keystore':
+ "Neuron ne prend pas en charge l'importation du fichier de stockage de clés de ckb-cli.",
'invalid-transaction-file': 'Fichier de transaction non valide.',
'offline-sign-failed': 'Échec de la signature, veuillez vérifier si vous signez avec le bon Wallet.',
'multisig-script-prefix-error': 'La configuration multisig est erronée',
@@ -141,6 +144,7 @@ export default {
"{{path}} n'a pas de configuration et de stockage de noeud CKB, appuyez sur Confirmer pour synchroniser à partir de zéro",
'light-client-sudt-acp-error':
"Le mode client léger ne prend pas en charge l'envoi d'actifs vers le compte d'actifs d'autrui",
+ 'address-required': "L'adresse ne peut pas être vide.",
},
messageBox: {
button: {
@@ -223,6 +227,13 @@ export default {
cancel: 'Annuler',
},
},
+ 'unrecognized-lock-script': {
+ message: 'Un script de verrouillage non reconnu a été trouvé dans cette transaction, veuillez vérifier.',
+ buttons: {
+ cancel: 'Annuler',
+ ignore: 'Ignorer et continuer',
+ },
+ },
},
prompt: {
password: {
diff --git a/packages/neuron-wallet/src/locales/i18n.ts b/packages/neuron-wallet/src/locales/i18n.ts
index 703b1f042c..10724f7b7f 100644
--- a/packages/neuron-wallet/src/locales/i18n.ts
+++ b/packages/neuron-wallet/src/locales/i18n.ts
@@ -3,15 +3,19 @@ import zh from './zh'
import en from './en'
import zhTW from './zh-tw'
import fr from './fr'
+import ar from './ar'
import es from './es'
i18n.init({
resources: {
en,
+ ar,
fr,
es,
zh,
'zh-TW': zhTW,
+ 'fr-CA': fr,
+ 'fr-BE': fr,
},
fallbackLng: {
'zh-CN': ['zh'],
diff --git a/packages/neuron-wallet/src/locales/zh-tw.ts b/packages/neuron-wallet/src/locales/zh-tw.ts
index 10f73600a9..7567c2f8d3 100644
--- a/packages/neuron-wallet/src/locales/zh-tw.ts
+++ b/packages/neuron-wallet/src/locales/zh-tw.ts
@@ -45,6 +45,7 @@ export default {
label: '視窗',
minimize: '最小化',
close: '關閉視窗',
+ lock: '鎖定窗口',
},
help: {
label: '幫助',
@@ -128,6 +129,7 @@ export default {
'no-exist-ckb-node-data': '{{path}} 目錄下沒有找到 CKB Node 配置和數據, 點擊確認重新同步',
'light-client-sudt-acp-error': '輕節點模式不支持發送資產給其他用戶的資產賬戶',
'could-not-connect-service': '無法連接到服務，請稍後再試。',
+ 'address-required': '地址不可為空',
},
messageBox: {
button: {
@@ -207,6 +209,13 @@ export default {
cancel: '取消',
},
},
+ 'unrecognized-lock-script': {
+ message: '在此交易中發現了一個未識別的lock script，請檢查。',
+ buttons: {
+ cancel: '取消',
+ ignore: '忽略並繼續',
+ },
+ },
},
prompt: {
password: {
diff --git a/packages/neuron-wallet/src/locales/zh.ts b/packages/neuron-wallet/src/locales/zh.ts
index 218c52483d..52b09f1210 100644
--- a/packages/neuron-wallet/src/locales/zh.ts
+++ b/packages/neuron-wallet/src/locales/zh.ts
@@ -45,6 +45,7 @@ export default {
label: '窗口',
minimize: '最小化',
close: '关闭窗口',
+ lock: '锁定窗口',
},
help: {
label: '帮助',
@@ -129,6 +130,7 @@ export default {
'no-exist-ckb-node-data': '{{path}} 目录下没有找到 CKB Node 配置和数据, 点击确认重新同步',
'light-client-sudt-acp-error': '轻节点模式不支持发送资产给其他用户的资产账户',
'could-not-connect-service': '无法连接到服务，请稍后再试。',
+ 'address-required': '地址不可为空',
},
messageBox: {
button: {
@@ -208,6 +210,13 @@ export default {
cancel: '取消',
},
},
+ 'unrecognized-lock-script': {
+ message: '在此交易中发现了一个未识别的lock script，请检查。',
+ buttons: {
+ cancel: '取消',
+ ignore: '忽略并继续',
+ },
+ },
},
prompt: {
password: {
diff --git a/packages/neuron-wallet/src/main.ts b/packages/neuron-wallet/src/main.ts
index a65b386bea..182eabd076 100644
--- a/packages/neuron-wallet/src/main.ts
+++ b/packages/neuron-wallet/src/main.ts
@@ -16,9 +16,11 @@ if (singleInstanceLock) {
appController.start()
})
- app.on('before-quit', async () => {
+ app.on('before-quit', async e => {
logger.info('App:\tNeuron will exit')
+ e.preventDefault()
await appController.end()
+ app.exit()
})
app.on('activate', appController.openWindow)
diff --git a/packages/neuron-wallet/src/models/address.ts b/packages/neuron-wallet/src/models/address.ts
index 7b3940cb95..14243b1e86 100644
--- a/packages/neuron-wallet/src/models/address.ts
+++ b/packages/neuron-wallet/src/models/address.ts
@@ -1,4 +1,4 @@
-import { AddressType } from '../models/keys/address'
+import { hd } from '@ckb-lumos/lumos'
export enum AddressVersion {
Testnet = 'testnet',
@@ -9,7 +9,7 @@ export interface Address {
walletId: string
address: string
path: string
- addressType: AddressType
+ addressType: hd.AddressType
addressIndex: number
blake160: string
txCount?: number
diff --git a/packages/neuron-wallet/src/models/asset-account-info.ts b/packages/neuron-wallet/src/models/asset-account-info.ts
index de4de46073..dee91b2426 100644
--- a/packages/neuron-wallet/src/models/asset-account-info.ts
+++ b/packages/neuron-wallet/src/models/asset-account-info.ts
@@ -1,4 +1,4 @@
-import { bytes, molecule } from '@ckb-lumos/codec'
+import { bytes, struct, createFixedBytesCodec } from '@ckb-lumos/lumos/codec'
import CellDep, { DepType } from './chain/cell-dep'
import Script, { ScriptHashType } from './chain/script'
import OutPoint from './chain/out-point'
@@ -6,8 +6,12 @@ import NetworksService from '../services/networks'
import Transaction from './chain/transaction'
import SystemScriptInfo from './system-script-info'
import { Address } from './address'
-import { createFixedHexBytesCodec } from '@ckb-lumos/codec/lib/blockchain'
+import { UDTType } from '../utils/const'
import { predefinedSporeConfigs, SporeConfig, SporeScript } from '@spore-sdk/core'
+import { AGGRON4, LINA } from '../utils/systemScripts'
+
+const createFixedHexBytesCodec = (byteLength: number) =>
+ createFixedBytesCodec({ byteLength, pack: bytes.bytify, unpack: bytes.hexify })
export interface ScriptCellInfo {
cellDep: CellDep
@@ -25,6 +29,7 @@ export default class AssetAccountInfo {
private nftIssuerInfo: ScriptCellInfo
private nftClassInfo: ScriptCellInfo
private nftInfo: ScriptCellInfo
+ private xudt: ScriptCellInfo
private sporeInfos: ScriptCellInfo[]
private sporeClusterInfos: ScriptCellInfo[]
@@ -37,19 +42,32 @@ export default class AssetAccountInfo {
sudt: this.sudt,
sudtInfo: this.sudtInfo,
anyoneCanPay: this.anyoneCanPayInfo,
+ xudt: this.xudt,
}
}
constructor(genesisBlockHash: string = NetworksService.getInstance().getCurrent().genesisHash) {
- if (genesisBlockHash === AssetAccountInfo.MAINNET_GENESIS_BLOCK_HASH) {
- this.sudt = {
- cellDep: new CellDep(
- new OutPoint(process.env.MAINNET_SUDT_DEP_TXHASH!, process.env.MAINNET_SUDT_DEP_INDEX!),
- process.env.MAINNET_SUDT_DEP_TYPE! as DepType
- ),
- codeHash: process.env.MAINNET_SUDT_SCRIPT_CODEHASH!,
- hashType: process.env.MAINNET_SUDT_SCRIPT_HASHTYPE! as ScriptHashType,
- }
+ const isMainnet = genesisBlockHash === AssetAccountInfo.MAINNET_GENESIS_BLOCK_HASH
+ const { XUDT, SUDT, ANYONE_CAN_PAY } = isMainnet ? LINA.SCRIPTS : AGGRON4.SCRIPTS
+ this.xudt = {
+ cellDep: new CellDep(new OutPoint(XUDT.TX_HASH, XUDT.INDEX), XUDT.DEP_TYPE as DepType),
+ codeHash: XUDT.CODE_HASH,
+ hashType: XUDT.HASH_TYPE as ScriptHashType,
+ }
+ this.sudt = {
+ cellDep: new CellDep(new OutPoint(SUDT.TX_HASH, SUDT.INDEX), SUDT.DEP_TYPE as DepType),
+ codeHash: SUDT.CODE_HASH,
+ hashType: SUDT.HASH_TYPE as ScriptHashType,
+ }
+ this.anyoneCanPayInfo = {
+ cellDep: new CellDep(
+ new OutPoint(ANYONE_CAN_PAY.TX_HASH, ANYONE_CAN_PAY.INDEX),
+ ANYONE_CAN_PAY.DEP_TYPE as DepType
+ ),
+ codeHash: ANYONE_CAN_PAY.CODE_HASH,
+ hashType: ANYONE_CAN_PAY.HASH_TYPE as ScriptHashType,
+ }
+ if (isMainnet) {
this.sudtInfo = {
cellDep: new CellDep(
new OutPoint(process.env.MAINNET_SUDT_INFO_DEP_TXHASH!, process.env.MAINNET_SUDT_INFO_DEP_INDEX!),
@@ -58,14 +76,6 @@ export default class AssetAccountInfo {
codeHash: process.env.MAINNET_SUDT_INFO_SCRIPT_CODEHASH!,
hashType: process.env.MAINNET_SUDT_INFO_SCRIPT_HASHTYPE! as ScriptHashType,
}
- this.anyoneCanPayInfo = {
- cellDep: new CellDep(
- new OutPoint(process.env.MAINNET_ACP_DEP_TXHASH!, process.env.MAINNET_ACP_DEP_INDEX!),
- process.env.MAINNET_ACP_DEP_TYPE! as DepType
- ),
- codeHash: process.env.MAINNET_ACP_SCRIPT_CODEHASH!,
- hashType: process.env.MAINNET_ACP_SCRIPT_HASHTYPE! as ScriptHashType,
- }
this.legacyAnyoneCanPayInfo = {
cellDep: new CellDep(
new OutPoint(process.env.LEGACY_MAINNET_ACP_DEP_TXHASH!, process.env.LEGACY_MAINNET_ACP_DEP_INDEX!),
@@ -114,19 +124,10 @@ export default class AssetAccountInfo {
codeHash: process.env.MAINNET_NFT_SCRIPT_CODEHASH!,
hashType: process.env.MAINNET_NFT_SCRIPT_HASH_TYPE! as ScriptHashType,
}
-
// TODO infos for mainnet
this.sporeInfos = []
this.sporeClusterInfos = []
} else {
- this.sudt = {
- cellDep: new CellDep(
- new OutPoint(process.env.TESTNET_SUDT_DEP_TXHASH!, process.env.TESTNET_SUDT_DEP_INDEX!),
- process.env.TESTNET_SUDT_DEP_TYPE! as DepType
- ),
- codeHash: process.env.TESTNET_SUDT_SCRIPT_CODEHASH!,
- hashType: process.env.TESTNET_SUDT_SCRIPT_HASHTYPE! as ScriptHashType,
- }
this.sudtInfo = {
cellDep: new CellDep(
new OutPoint(process.env.TESTNET_SUDT_INFO_DEP_TXHASH!, process.env.TESTNET_SUDT_INFO_DEP_INDEX!),
@@ -135,14 +136,6 @@ export default class AssetAccountInfo {
codeHash: process.env.TESTNET_SUDT_INFO_SCRIPT_CODEHASH!,
hashType: process.env.TESTNET_SUDT_INFO_SCRIPT_HASHTYPE! as ScriptHashType,
}
- this.anyoneCanPayInfo = {
- cellDep: new CellDep(
- new OutPoint(process.env.TESTNET_ACP_DEP_TXHASH!, process.env.TESTNET_ACP_DEP_INDEX!),
- process.env.TESTNET_ACP_DEP_TYPE! as DepType
- ),
- codeHash: process.env.TESTNET_ACP_SCRIPT_CODEHASH!,
- hashType: process.env.TESTNET_ACP_SCRIPT_HASHTYPE! as ScriptHashType,
- }
this.legacyAnyoneCanPayInfo = {
cellDep: new CellDep(
new OutPoint(process.env.LEGACY_TESTNET_ACP_DEP_TXHASH!, process.env.LEGACY_TESTNET_ACP_DEP_INDEX!),
@@ -211,6 +204,10 @@ export default class AssetAccountInfo {
return this.anyoneCanPayInfo.cellDep
}
+ public get xudtCellDep(): CellDep {
+ return this.xudt.cellDep
+ }
+
public get anyoneCanPayCodeHash(): string {
return this.anyoneCanPayInfo.codeHash
}
@@ -243,10 +240,6 @@ export default class AssetAccountInfo {
return this.sporeClusterInfos
}
- public getAcpCodeHash(): string {
- return this.anyoneCanPayInfo.codeHash
- }
-
public getSudtCodeHash(): string {
return this.sudt.codeHash
}
@@ -271,10 +264,29 @@ export default class AssetAccountInfo {
return new Script(info.codeHash, args, info.hashType)
}
+ public generateXudtScript(args: string): Script {
+ return new Script(this.xudt.codeHash, args, this.xudt.hashType)
+ }
+
+ public generateUdtScript(args: string, udtType?: UDTType): Script | undefined {
+ switch (udtType) {
+ case UDTType.SUDT:
+ return this.generateSudtScript(args)
+ case UDTType.XUDT:
+ return this.generateXudtScript(args)
+ default:
+ return undefined
+ }
+ }
+
public isSudtScript(script: Script): boolean {
return script.codeHash === this.sudt.codeHash && script.hashType === this.sudt.hashType
}
+ public isXudtScript(script: Script): boolean {
+ return script.codeHash === this.xudt.codeHash && script.hashType === this.xudt.hashType
+ }
+
public isAnyoneCanPayScript(script: Script): boolean {
const acpScripts = [this.anyoneCanPayInfo, this.pwAnyoneCanPayInfo]
const exist = acpScripts.find(acpScript => {
@@ -307,7 +319,7 @@ export default class AssetAccountInfo {
public static findSignPathForCheque(addressInfos: Address[], chequeLockArgs: string) {
const Bytes20 = createFixedHexBytesCodec(20)
- const ChequeLockArgsCodec = molecule.struct(
+ const ChequeLockArgsCodec = struct(
{
receiverLockHash: Bytes20,
senderLockHash: Bytes20,
@@ -359,6 +371,19 @@ export default class AssetAccountInfo {
extensions: [],
}
}
+
+ public getAcpCellDep(codeHash: string) {
+ switch (codeHash) {
+ case this.anyoneCanPayInfo.codeHash:
+ return this.anyoneCanPayCellDep
+ case this.legacyAnyoneCanPayInfo.codeHash:
+ return this.legacyAnyoneCanPayInfo.cellDep
+ case this.pwAnyoneCanPayInfo.codeHash:
+ return this.pwAnyoneCanPayInfo.cellDep
+ default:
+ break
+ }
+ }
}
function toSporeScript(info: ScriptCellInfo): SporeScript {
@@ -376,6 +401,7 @@ function toScriptInfo(sporeConfig: SporeScript): ScriptCellInfo {
if (sporeScriptHashType === 'type') return ScriptHashType.Type
if (sporeScriptHashType === 'data') return ScriptHashType.Data
if (sporeScriptHashType === 'data1') return ScriptHashType.Data1
+ if (sporeScriptHashType === 'data2') return ScriptHashType.Data2
throw new Error(`Invalid hash type: ${sporeScriptHashType}`)
})()
diff --git a/packages/neuron-wallet/src/models/asset-account.ts b/packages/neuron-wallet/src/models/asset-account.ts
index 38f295423b..06e3c09ea8 100644
--- a/packages/neuron-wallet/src/models/asset-account.ts
+++ b/packages/neuron-wallet/src/models/asset-account.ts
@@ -1,3 +1,5 @@
+import { UDTType } from '../utils/const'
+
export default class AssetAccount {
public id?: number
public tokenID: string
@@ -7,6 +9,7 @@ export default class AssetAccount {
public decimal: string
public balance: string
public blake160: string
+ public udtType?: UDTType
constructor(
tokenID: string,
@@ -16,7 +19,8 @@ export default class AssetAccount {
decimal: string,
balance: string,
blake160: string,
- id?: number
+ id?: number,
+ udtType?: UDTType
) {
this.tokenID = tokenID
this.symbol = symbol
@@ -26,6 +30,7 @@ export default class AssetAccount {
this.balance = balance
this.blake160 = blake160
this.id = id
+ this.udtType = udtType
}
public static fromObject(params: {
@@ -37,6 +42,7 @@ export default class AssetAccount {
balance: string
blake160: string
id?: number
+ udtType?: UDTType
}): AssetAccount {
return new AssetAccount(
params.tokenID,
@@ -46,7 +52,8 @@ export default class AssetAccount {
params.decimal,
params.balance,
params.blake160,
- params.id
+ params.id,
+ params.udtType
)
}
}
diff --git a/packages/neuron-wallet/src/models/blake2b.ts b/packages/neuron-wallet/src/models/blake2b.ts
index 7dc99b6c7e..1cb5548ab2 100644
--- a/packages/neuron-wallet/src/models/blake2b.ts
+++ b/packages/neuron-wallet/src/models/blake2b.ts
@@ -1,5 +1,7 @@
-import { CKBHasher } from '@ckb-lumos/base/lib/utils'
-import { bytes } from '@ckb-lumos/codec'
+import { CKBHasher } from '@ckb-lumos/lumos/utils'
+import { bytes } from '@ckb-lumos/lumos/codec'
+
+export const BLAKE160_HEX_LENGTH = 42
export default class Blake2b {
private blake2b: CKBHasher
diff --git a/packages/neuron-wallet/src/models/chain/cell-dep.ts b/packages/neuron-wallet/src/models/chain/cell-dep.ts
index c8830809ed..cb1979a065 100644
--- a/packages/neuron-wallet/src/models/chain/cell-dep.ts
+++ b/packages/neuron-wallet/src/models/chain/cell-dep.ts
@@ -1,4 +1,5 @@
import OutPoint from './out-point'
+import { snakeToCamel } from '../../utils/deep-camelize-keys'
export enum DepType {
Code = 'code',
@@ -14,8 +15,8 @@ export default class CellDep {
this.depType = depType
}
- public static fromObject({ outPoint, depType }: { outPoint: OutPoint; depType: DepType }): CellDep {
- return new CellDep(OutPoint.fromObject(outPoint), depType)
+ public static fromObject({ outPoint, depType }: { outPoint: OutPoint; depType: DepType | 'dep_group' }): CellDep {
+ return new CellDep(OutPoint.fromObject(outPoint), snakeToCamel(depType) as DepType)
}
public toSDK(): CKBComponents.CellDep {
diff --git a/packages/neuron-wallet/src/models/chain/input.ts b/packages/neuron-wallet/src/models/chain/input.ts
index 352989fab8..fcd587d2c1 100644
--- a/packages/neuron-wallet/src/models/chain/input.ts
+++ b/packages/neuron-wallet/src/models/chain/input.ts
@@ -1,6 +1,6 @@
import OutPoint from './out-point'
import Script from './script'
-import { BI } from '@ckb-lumos/bi'
+import { BI } from '@ckb-lumos/lumos'
import TypeChecker from '../../utils/type-checker'
import { OutputStatus } from './output'
diff --git a/packages/neuron-wallet/src/models/chain/live-cell.ts b/packages/neuron-wallet/src/models/chain/live-cell.ts
index c57fb25fed..4d85cedd47 100644
--- a/packages/neuron-wallet/src/models/chain/live-cell.ts
+++ b/packages/neuron-wallet/src/models/chain/live-cell.ts
@@ -1,13 +1,16 @@
import Script, { ScriptHashType } from './script'
import OutPoint from './out-point'
-import { LumosCell } from '../../block-sync-renderer/sync/synchronizer'
+import { type Cell, type OutPoint as IOutPoint } from '@ckb-lumos/lumos'
const LUMOS_HASH_TYPE_MAP: Record = {
type: ScriptHashType.Type,
data1: ScriptHashType.Data1,
data: ScriptHashType.Data,
+ data2: ScriptHashType.Data2,
}
+export type CellWithOutPoint = Cell & { outPoint: IOutPoint }
+
export default class LiveCell {
public txHash: string
public outputIndex: string
@@ -54,7 +57,7 @@ export default class LiveCell {
return undefined
}
- public static fromLumos(cell: LumosCell): LiveCell {
+ public static fromLumos(cell: CellWithOutPoint): LiveCell {
const type = cell.cellOutput.type
? new Script(
cell.cellOutput.type.codeHash,
diff --git a/packages/neuron-wallet/src/models/chain/out-point.ts b/packages/neuron-wallet/src/models/chain/out-point.ts
index 4b7f050791..19d30636c6 100644
--- a/packages/neuron-wallet/src/models/chain/out-point.ts
+++ b/packages/neuron-wallet/src/models/chain/out-point.ts
@@ -1,4 +1,4 @@
-import { BI } from '@ckb-lumos/bi'
+import { BI } from '@ckb-lumos/lumos'
import TypeChecker from '../../utils/type-checker'
export default class OutPoint {
diff --git a/packages/neuron-wallet/src/models/chain/output.ts b/packages/neuron-wallet/src/models/chain/output.ts
index 9a15c8d774..3d7804c28c 100644
--- a/packages/neuron-wallet/src/models/chain/output.ts
+++ b/packages/neuron-wallet/src/models/chain/output.ts
@@ -1,8 +1,9 @@
import Script from './script'
import OutPoint from './out-point'
-import { bytes as byteUtils } from '@ckb-lumos/codec'
-import { BI } from '@ckb-lumos/bi'
+import { bytes as byteUtils } from '@ckb-lumos/lumos/codec'
+import { BI, helpers } from '@ckb-lumos/lumos'
import TypeChecker from '../../utils/type-checker'
+import { MIN_CELL_CAPACITY } from '../../utils/const'
// sent: pending transaction's output
// pending: pending transaction's input
@@ -109,7 +110,7 @@ export default class Output {
depositTimestamp,
multiSignBlake160,
}: {
- capacity: string
+ capacity?: string
data?: string
lock: Script
type?: Script | null
@@ -126,7 +127,18 @@ export default class Output {
multiSignBlake160?: string | null
}): Output {
return new Output(
- capacity,
+ capacity ??
+ helpers
+ .minimalCellCapacity({
+ cellOutput: {
+ // use MIN_CELL_CAPACITY to place holder
+ capacity: MIN_CELL_CAPACITY.toString(),
+ lock: Script.fromObject(lock),
+ type: type ? Script.fromObject(type) : undefined,
+ },
+ data: data ?? '0x',
+ })
+ .toString(),
Script.fromObject(lock),
type ? Script.fromObject(type) : type,
data,
@@ -227,4 +239,15 @@ export default class Output {
output.type ? Script.fromSDK(output.type) : output.type
)
}
+
+ public minimalCellCapacity() {
+ return helpers.minimalCellCapacity({
+ cellOutput: {
+ capacity: this.capacity,
+ lock: this.lock,
+ type: this.type ?? undefined,
+ },
+ data: this.data,
+ })
+ }
}
diff --git a/packages/neuron-wallet/src/models/chain/script.ts b/packages/neuron-wallet/src/models/chain/script.ts
index a83305a59a..03dcc0880c 100644
--- a/packages/neuron-wallet/src/models/chain/script.ts
+++ b/packages/neuron-wallet/src/models/chain/script.ts
@@ -1,11 +1,12 @@
-import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
-import { bytes as byteUtils } from '@ckb-lumos/codec'
+import { computeScriptHash as scriptToHash } from '@ckb-lumos/lumos/utils'
+import { bytes as byteUtils } from '@ckb-lumos/lumos/codec'
import TypeChecker from '../../utils/type-checker'
export enum ScriptHashType {
Data = 'data',
Type = 'type',
Data1 = 'data1',
+ Data2 = 'data2',
}
export default class Script {
diff --git a/packages/neuron-wallet/src/models/chain/transaction-with-status.ts b/packages/neuron-wallet/src/models/chain/transaction-with-status.ts
index 11b14fb521..e0972774d3 100644
--- a/packages/neuron-wallet/src/models/chain/transaction-with-status.ts
+++ b/packages/neuron-wallet/src/models/chain/transaction-with-status.ts
@@ -1,19 +1,25 @@
+import { CKBComponents } from '@ckb-lumos/lumos/rpc'
import Transaction from './transaction'
import TxStatus from './tx-status'
+type APITransactionWithStatus = CKBComponents.TransactionWithStatus
+
export default class TransactionWithStatus {
public transaction: Transaction
public txStatus: TxStatus
+ public cycles: APITransactionWithStatus['cycles']
- constructor(transaction: Transaction, txStatus: TxStatus) {
+ constructor(transaction: Transaction, txStatus: TxStatus, cycles: APITransactionWithStatus['cycles']) {
this.transaction = transaction
this.txStatus = txStatus
+ this.cycles = cycles
}
- public static fromSDK(txWithStatus: CKBComponents.TransactionWithStatus): TransactionWithStatus {
+ public static fromSDK(txWithStatus: APITransactionWithStatus): TransactionWithStatus {
return new TransactionWithStatus(
Transaction.fromSDK(txWithStatus.transaction),
- TxStatus.fromSDK(txWithStatus.txStatus)
+ TxStatus.fromSDK(txWithStatus.txStatus),
+ txWithStatus.cycles
)
}
}
diff --git a/packages/neuron-wallet/src/models/chain/transaction.ts b/packages/neuron-wallet/src/models/chain/transaction.ts
index 2bd405c8bb..aa48661426 100644
--- a/packages/neuron-wallet/src/models/chain/transaction.ts
+++ b/packages/neuron-wallet/src/models/chain/transaction.ts
@@ -2,18 +2,20 @@ import CellDep from './cell-dep'
import Input from './input'
import Output from './output'
import WitnessArgs from './witness-args'
-import { BI } from '@ckb-lumos/bi'
+import { BI } from '@ckb-lumos/lumos'
import { serializeRawTransaction, serializeWitnessArgs } from '../../utils/serialization'
import BlockHeader from './block-header'
import TypeCheckerUtils from '../../utils/type-checker'
import OutPoint from './out-point'
import { Signatures } from '../../models/offline-sign'
-import { utils } from '@ckb-lumos/base'
+import { ckbHash } from '@ckb-lumos/lumos/utils'
+import { UDTType } from '../../utils/const'
export enum TransactionStatus {
Pending = 'pending',
Success = 'success',
Failed = 'failed',
+ Rejected = 'rejected',
}
export interface SudtTokenInfo {
@@ -21,6 +23,7 @@ export interface SudtTokenInfo {
tokenID: string
tokenName: string
decimal: string
+ udtType?: UDTType | undefined
}
export interface SudtInfo {
@@ -41,6 +44,7 @@ export interface NFTInfo {
export enum AssetAccountType {
CKB = 'CKB',
SUDT = 'sUDT',
+ XUDT = 'xUDT',
}
export default class Transaction {
@@ -61,6 +65,7 @@ export default class Transaction {
public value?: string
public fee?: string
public size?: number
+ public cycles?: string | null
public interest?: string
public type?: string
@@ -81,6 +86,8 @@ export default class Transaction {
public signatures: Signatures = {}
public assetAccountType?: AssetAccountType
+ public daoCapacity?: string
+
constructor(
version: string,
cellDeps: CellDep[] = [],
@@ -105,7 +112,8 @@ export default class Transaction {
sudtInfo?: SudtInfo,
nftType?: NFTInfo,
signatures: Signatures = {},
- assetAccountType?: AssetAccountType
+ assetAccountType?: AssetAccountType,
+ daoCapacity?: string
) {
this.cellDeps = cellDeps
this.headerDeps = headerDeps
@@ -119,7 +127,7 @@ export default class Transaction {
this.description = description
this.nervosDao = nervosDao
this.assetAccountType = assetAccountType
- this.version = BigInt(version).toString()
+ this.version = BigInt(version || '0x0').toString()
this.value = value ? BigInt(value).toString() : value
this.fee = fee ? BigInt(fee).toString() : fee
this.interest = interest ? BigInt(interest).toString() : interest
@@ -132,6 +140,7 @@ export default class Transaction {
this.sudtInfo = sudtInfo
this.nftInfo = nftType
this.signatures = signatures
+ this.daoCapacity = daoCapacity
TypeCheckerUtils.hashChecker(...this.headerDeps, this.blockHash)
TypeCheckerUtils.numberChecker(
this.version,
@@ -170,6 +179,7 @@ export default class Transaction {
nftInfo,
signatures = {},
assetAccountType,
+ daoCapacity,
}: {
version: string
cellDeps?: CellDep[]
@@ -195,6 +205,7 @@ export default class Transaction {
nftInfo?: NFTInfo
signatures?: Signatures
assetAccountType?: AssetAccountType
+ daoCapacity?: string
}): Transaction {
return new Transaction(
version,
@@ -225,7 +236,8 @@ export default class Transaction {
sudtInfo,
nftInfo,
signatures,
- assetAccountType
+ assetAccountType,
+ daoCapacity
)
}
@@ -270,7 +282,7 @@ export default class Transaction {
}
public computeHash(): string {
- return utils.ckbHash(serializeRawTransaction(this.toSDKRawTransaction()))
+ return ckbHash(serializeRawTransaction(this.toSDKRawTransaction()))
}
public toSDKRawTransaction(): CKBComponents.RawTransaction {
diff --git a/packages/neuron-wallet/src/models/chain/tx-status.ts b/packages/neuron-wallet/src/models/chain/tx-status.ts
index a2c54c553a..ba2292e8d1 100644
--- a/packages/neuron-wallet/src/models/chain/tx-status.ts
+++ b/packages/neuron-wallet/src/models/chain/tx-status.ts
@@ -4,6 +4,7 @@ export enum TxStatusType {
Pending = 'pending',
Proposed = 'proposed',
Committed = 'committed',
+ Rejected = 'rejected',
}
export default class TxStatus {
@@ -28,6 +29,10 @@ export default class TxStatus {
return this.status === TxStatusType.Committed
}
+ public isRejected(): boolean {
+ return this.status === TxStatusType.Rejected
+ }
+
public toSDK() {
return {
blockHash: this.blockHash,
diff --git a/packages/neuron-wallet/src/models/keys/address.ts b/packages/neuron-wallet/src/models/keys/address.ts
deleted file mode 100644
index 3e460284d9..0000000000
--- a/packages/neuron-wallet/src/models/keys/address.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { scriptToAddress } from '../../utils/scriptAndAddress'
-import { AccountExtendedPublicKey } from './key'
-import { systemScripts } from '../../utils/systemScripts'
-import hd from '@ckb-lumos/hd'
-
-export enum AddressType {
- Receiving = 0, // External chain
- Change = 1, // Internal chain
-}
-
-export const publicKeyToAddress = (publicKey: string, isMainnet = false) => {
- const pubkey = publicKey.startsWith('0x') ? publicKey : `0x${publicKey}`
- return scriptToAddress(
- {
- codeHash: systemScripts.SECP256K1_BLAKE160.CODE_HASH,
- hashType: systemScripts.SECP256K1_BLAKE160.HASH_TYPE,
- args: hd.key.publicKeyToBlake160(pubkey),
- },
- isMainnet
- )
-}
-
-export default class Address {
- publicKey?: string
- address: string
- path: string // BIP44 path
-
- constructor(address: string, path: string = Address.pathForReceiving(0)) {
- this.address = address
- this.path = path
- }
-
- public static fromPublicKey = (publicKey: string, path: string, isMainnet = false) => {
- const address = publicKeyToAddress(publicKey, isMainnet)
- const instance = new Address(address, path)
- instance.publicKey = publicKey
- return instance
- }
-
- public static pathFor = (type: AddressType, index: number) => {
- return `${AccountExtendedPublicKey.ckbAccountPath}/${type}/${index}`
- }
-
- public static pathForReceiving = (index: number) => {
- return Address.pathFor(AddressType.Receiving, index)
- }
-
- public static pathForChange = (index: number) => {
- return Address.pathFor(AddressType.Change, index)
- }
-}
diff --git a/packages/neuron-wallet/src/models/keys/hd-public-key-info.ts b/packages/neuron-wallet/src/models/keys/hd-public-key-info.ts
index d8f8a7f4e3..b8981a636f 100644
--- a/packages/neuron-wallet/src/models/keys/hd-public-key-info.ts
+++ b/packages/neuron-wallet/src/models/keys/hd-public-key-info.ts
@@ -1,11 +1,11 @@
+import { hd } from '@ckb-lumos/lumos'
import { scriptToAddress } from '../../utils/scriptAndAddress'
import SystemScriptInfo from '../../models/system-script-info'
import NetworksService from '../../services/networks'
-import Address, { AddressType } from './address'
export default class HdPublicKeyInfoModel {
public walletId: string
- public addressType: AddressType
+ public addressType: hd.AddressType
public addressIndex: number
public publicKeyInBlake160: string
public description?: string
@@ -22,12 +22,12 @@ export default class HdPublicKeyInfoModel {
}
public get path(): string {
- return Address.pathFor(this.addressType, this.addressIndex)
+ return hd.AccountExtendedPublicKey.pathFor(this.addressType, this.addressIndex)
}
constructor(
walletId: string,
- addressType: AddressType,
+ addressType: hd.AddressType,
addressIndex: number,
publicKeyInBlake160: string,
description?: string
@@ -41,7 +41,7 @@ export default class HdPublicKeyInfoModel {
public static fromObject(params: {
walletId: string
- addressType: AddressType
+ addressType: hd.AddressType
addressIndex: number
publicKeyInBlake160: string
description?: string
diff --git a/packages/neuron-wallet/src/models/keys/key.ts b/packages/neuron-wallet/src/models/keys/key.ts
deleted file mode 100644
index 5e5ae9c939..0000000000
--- a/packages/neuron-wallet/src/models/keys/key.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import crypto from 'crypto'
-
-import Address, { AddressType } from './address'
-import Keychain, { privateToPublic } from './keychain'
-import { entropyToMnemonic } from './mnemonic'
-
-export interface PathAndPrivateKey {
- path: string
- privateKey: string
-}
-
-const UNCOMPRESSED_KEY_LENGTH = 130
-
-export class ExtendedPublicKey {
- publicKey: string
- chainCode: string
-
- constructor(publicKey: string, chainCode: string) {
- this.publicKey = ExtendedPublicKey.compressPublicKey(publicKey)
- this.chainCode = chainCode
- }
-
- static compressPublicKey = (key: string) => {
- if (key.length !== UNCOMPRESSED_KEY_LENGTH) {
- return key
- }
-
- const publicKey = Buffer.from(key, 'hex')
- const compressedPublicKey = Buffer.alloc(33)
- // '03' for odd value, '02' for even value
- .fill(publicKey[64] & 1 ? '03' : '02', 0, 1, 'hex')
- .fill(publicKey.subarray(1, 33), 1, 33)
- return compressedPublicKey.toString('hex')
- }
-
- isUncompressedKey = (publicKey: string) => {
- return publicKey.startsWith('04')
- }
-
- serialize = () => {
- return this.publicKey + this.chainCode
- }
-
- static parse = (serialized: string) => {
- return new ExtendedPublicKey(serialized.slice(0, 66), serialized.slice(66))
- }
-}
-
-// Extended public key of the BIP44 path down to account level,
-// which is `m/44'/309'/0'`. This key will be persisted to wallet
-// and used to derive receiving/change addresses.
-export class AccountExtendedPublicKey extends ExtendedPublicKey {
- public static ckbAccountPath = `m/44'/309'/0'`
-
- static parse = (serialized: string) => {
- return new AccountExtendedPublicKey(serialized.slice(0, 66), serialized.slice(66))
- }
-
- address = (type: AddressType = AddressType.Receiving, index: number, isMainnet = false): Address => {
- return Address.fromPublicKey(this.addressPublicKey(type, index), Address.pathFor(type, index), isMainnet)
- }
-
- private addressPublicKey = (type = AddressType.Receiving, index: number) => {
- const keychain = Keychain.fromPublicKey(
- Buffer.from(this.publicKey, 'hex'),
- Buffer.from(this.chainCode, 'hex'),
- AccountExtendedPublicKey.ckbAccountPath
- )
- .deriveChild(type, false)
- .deriveChild(index, false)
-
- return keychain.publicKey.toString('hex')
- }
-}
-
-export class ExtendedPrivateKey {
- privateKey: string
- chainCode: string
-
- constructor(privateKey: string, chainCode: string) {
- this.privateKey = privateKey
- this.chainCode = chainCode
- }
-
- serialize = () => {
- return this.privateKey + this.chainCode
- }
-
- toExtendedPublicKey = (): ExtendedPublicKey => {
- const publicKey = privateToPublic(Buffer.from(this.privateKey, 'hex')).toString('hex')
- return new ExtendedPublicKey(publicKey, this.chainCode)
- }
-
- static parse = (serialized: string) => {
- return new ExtendedPrivateKey(serialized.slice(0, 64), serialized.slice(64))
- }
-}
-
-export enum DefaultAddressNumber {
- Receiving = 20,
- Change = 10,
-}
-
-export interface Addresses {
- receiving: Address[]
- change: Address[]
-}
-
-// Generate 12 words mnemonic code
-export const generateMnemonic = () => {
- const entropySize = 16
- const entropy = crypto.randomBytes(entropySize).toString('hex')
- return entropyToMnemonic(entropy)
-}
diff --git a/packages/neuron-wallet/src/models/keys/keychain.ts b/packages/neuron-wallet/src/models/keys/keychain.ts
deleted file mode 100644
index c7a0872e5f..0000000000
--- a/packages/neuron-wallet/src/models/keys/keychain.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import crypto from 'crypto'
-import { ec as EC } from 'elliptic'
-import BN from 'bn.js'
-
-const ec = new EC('secp256k1')
-
-export const privateToPublic = (privateKey: Buffer) => {
- if (privateKey.length !== 32) {
- throw new Error('Private key must be 32 bytes')
- }
-
- return Buffer.from(ec.keyFromPrivate(privateKey).getPublic(true, 'hex') as string, 'hex')
-}
-
-const EMPTY_BUFFER = Buffer.from('')
-
-// BIP32 Keychain. Not a full implementation.
-export default class Keychain {
- privateKey: Buffer = EMPTY_BUFFER
- publicKey: Buffer = EMPTY_BUFFER
- chainCode: Buffer = EMPTY_BUFFER
- index: number = 0
- depth: number = 0
- identifier: Buffer = EMPTY_BUFFER
- fingerprint: number = 0
- parentFingerprint: number = 0
-
- constructor(privateKey: Buffer, chainCode: Buffer) {
- this.privateKey = privateKey
- this.chainCode = chainCode
-
- if (!this.isNeutered()) {
- this.publicKey = privateToPublic(this.privateKey)
- }
- }
-
- calculateFingerprint = () => {
- this.identifier = this.hash160(this.publicKey)
- this.fingerprint = this.identifier.slice(0, 4).readUInt32BE(0)
- }
-
- public static fromSeed = (seed: Buffer): Keychain => {
- const i = crypto.createHmac('sha512', Buffer.from('Bitcoin seed', 'utf8')).update(seed).digest()
- const keychain = new Keychain(i.slice(0, 32), i.slice(32))
- keychain.calculateFingerprint()
- return keychain
- }
-
- // Create a child keychain with extended public key and path.
- // Children of this keychain should not have any hardened paths.
- public static fromPublicKey = (publicKey: Buffer, chainCode: Buffer, path: string): Keychain => {
- const keychain = new Keychain(EMPTY_BUFFER, chainCode)
- keychain.publicKey = publicKey
- keychain.calculateFingerprint()
-
- const pathComponents = path.split('/')
- keychain.depth = pathComponents.length - 1
- keychain.index = parseInt(pathComponents[pathComponents.length - 1], 10)
-
- return keychain
- }
-
- public deriveChild = (index: number, hardened: boolean): Keychain => {
- let data: Buffer
-
- const indexBuffer = Buffer.allocUnsafe(4)
-
- if (hardened) {
- const pk = Buffer.concat([Buffer.alloc(1, 0), this.privateKey])
- indexBuffer.writeUInt32BE(index + 0x80000000, 0)
- data = Buffer.concat([pk, indexBuffer])
- } else {
- indexBuffer.writeUInt32BE(index, 0)
- data = Buffer.concat([this.publicKey, indexBuffer])
- }
-
- const i = crypto.createHmac('sha512', this.chainCode).update(data).digest()
- const il = i.slice(0, 32)
- const ir = i.slice(32)
-
- let child: Keychain
- if (this.isNeutered()) {
- child = new Keychain(EMPTY_BUFFER, ir)
- child.publicKey = Keychain.publicKeyAdd(this.publicKey, il)
- child.calculateFingerprint()
- } else {
- const privateKey = Keychain.privateKeyAdd(this.privateKey, il)
- child = new Keychain(privateKey, ir)
- child.calculateFingerprint()
- }
-
- child.index = index
- child.depth = this.depth + 1
- child.parentFingerprint = this.fingerprint
-
- return child
- }
-
- public derivePath = (path: string): Keychain => {
- const master = ['m', `/`, '']
- if (master.includes(path)) {
- return this
- }
-
- // eslint-disable-next-line @typescript-eslint/no-this-alias
- let bip32: Keychain = this
-
- let entries = path.split('/')
- if (entries[0] === 'm') {
- entries = entries.slice(1)
- }
- entries.forEach(c => {
- const childIndex = parseInt(c, 10)
- const hardened = c.length > 1 && c[c.length - 1] === "'"
- bip32 = bip32.deriveChild(childIndex, hardened)
- })
-
- return bip32
- }
-
- isNeutered = (): boolean => {
- return this.privateKey === EMPTY_BUFFER
- }
-
- hash160 = (data: Buffer): Buffer => {
- const sha256 = crypto.createHash('sha256').update(data).digest()
- return crypto.createHash('ripemd160').update(sha256).digest()
- }
-
- private static privateKeyAdd = (privateKey: Buffer, factor: Buffer): Buffer => {
- const result = new BN(factor)
- result.iadd(new BN(privateKey))
- if (result.cmp(ec.curve.n) >= 0) {
- result.isub(ec.curve.n)
- }
-
- return result.toArrayLike(Buffer, 'be', 32)
- }
-
- private static publicKeyAdd = (publicKey: Buffer, factor: Buffer): Buffer => {
- const x = new BN(publicKey.slice(1)).toRed(ec.curve.red)
- let y = x.redSqr().redIMul(x).redIAdd(ec.curve.b).redSqrt()
- if ((publicKey[0] === 0x03) !== y.isOdd()) {
- y = y.redNeg()
- }
- const point = ec.curve.g.mul(new BN(factor)).add({ x, y })
- return Buffer.from(point.encode(true, true))
- }
-}
diff --git a/packages/neuron-wallet/src/models/keys/keystore.ts b/packages/neuron-wallet/src/models/keys/keystore.ts
deleted file mode 100644
index f69427433c..0000000000
--- a/packages/neuron-wallet/src/models/keys/keystore.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-import crypto from 'crypto'
-import { Keccak } from 'sha3'
-import { v4 as uuid } from 'uuid'
-
-import { UnsupportedCipher, IncorrectPassword, InvalidKeystore } from '../../exceptions'
-import { ExtendedPrivateKey } from './key'
-
-const CIPHER = 'aes-128-ctr'
-const CKB_CLI_ORIGIN = 'ckb-cli'
-
-interface CipherParams {
- iv: string
-}
-
-interface KdfParams {
- dklen: number
- n: number
- r: number
- p: number
- salt: string
-}
-
-interface Crypto {
- cipher: string
- cipherparams: CipherParams
- ciphertext: string
- kdf: string
- kdfparams: KdfParams
- mac: string
-}
-
-// Encrypt and save master extended private key.
-export default class Keystore {
- crypto: Crypto
- id: string
- version: number = 3
-
- constructor(theCrypto: Crypto, id: string) {
- this.crypto = theCrypto
- this.id = id
- }
-
- static fromJson = (json: string) => {
- try {
- const object = JSON.parse(json)
- if (object.origin === CKB_CLI_ORIGIN) {
- throw 'Keystore from CKB CLI is not supported'
- }
- if (!object.crypto || !object.id) {
- throw new InvalidKeystore()
- }
- return new Keystore(object.crypto, object.id)
- } catch {
- throw new InvalidKeystore()
- }
- }
-
- // Create an empty keystore object that contains empty private key
- static createEmpty = () => {
- const salt = crypto.randomBytes(32)
- const iv = crypto.randomBytes(16)
- const kdfparams: KdfParams = {
- dklen: 32,
- salt: salt.toString('hex'),
- n: 2 ** 18,
- r: 8,
- p: 1,
- }
- return new Keystore(
- {
- ciphertext: '',
- cipherparams: {
- iv: iv.toString('hex'),
- },
- cipher: CIPHER,
- kdf: 'scrypt',
- kdfparams,
- mac: '',
- },
- uuid()
- )
- }
-
- static create = (
- extendedPrivateKey: ExtendedPrivateKey,
- password: string,
- options: { salt?: Buffer; iv?: Buffer } = {}
- ) => {
- const salt = options.salt || crypto.randomBytes(32)
- const iv = options.iv || crypto.randomBytes(16)
- const kdfparams: KdfParams = {
- dklen: 32,
- salt: salt.toString('hex'),
- n: 2 ** 18,
- r: 8,
- p: 1,
- }
- const derivedKey = crypto.scryptSync(password, salt, kdfparams.dklen, Keystore.scryptOptions(kdfparams))
-
- const cipher = crypto.createCipheriv(CIPHER, derivedKey.slice(0, 16), iv)
- if (!cipher) {
- throw new UnsupportedCipher()
- }
- const ciphertext = Buffer.concat([
- cipher.update(Buffer.from(extendedPrivateKey.serialize(), 'hex')),
- cipher.final(),
- ])
-
- return new Keystore(
- {
- ciphertext: ciphertext.toString('hex'),
- cipherparams: {
- iv: iv.toString('hex'),
- },
- cipher: CIPHER,
- kdf: 'scrypt',
- kdfparams,
- mac: Keystore.mac(derivedKey, ciphertext),
- },
- uuid()
- )
- }
-
- // Imported from xpub with empty private key.
- isEmpty(): boolean {
- return this.crypto.ciphertext === '' && this.crypto.mac === ''
- }
-
- // Decrypt and return serialized extended private key.
- decrypt(password: string): string {
- const derivedKey = this.derivedKey(password)
- const ciphertext = Buffer.from(this.crypto.ciphertext, 'hex')
- if (Keystore.mac(derivedKey, ciphertext) !== this.crypto.mac) {
- throw new IncorrectPassword()
- }
- const decipher = crypto.createDecipheriv(
- this.crypto.cipher,
- derivedKey.slice(0, 16),
- Buffer.from(this.crypto.cipherparams.iv, 'hex')
- )
- return Buffer.concat([decipher.update(ciphertext), decipher.final()]).toString('hex')
- }
-
- extendedPrivateKey = (password: string): ExtendedPrivateKey => {
- return ExtendedPrivateKey.parse(this.decrypt(password))
- }
-
- checkPassword = (password: string) => {
- const derivedKey = this.derivedKey(password)
- const ciphertext = Buffer.from(this.crypto.ciphertext, 'hex')
- return Keystore.mac(derivedKey, ciphertext) === this.crypto.mac
- }
-
- derivedKey = (password: string) => {
- const { kdfparams } = this.crypto
- return crypto.scryptSync(
- password,
- Buffer.from(kdfparams.salt, 'hex'),
- kdfparams.dklen,
- Keystore.scryptOptions(kdfparams)
- )
- }
-
- static mac = (derivedKey: Buffer, ciphertext: Buffer) => {
- return new Keccak(256).update(Buffer.concat([derivedKey.slice(16, 32), ciphertext])).digest('hex')
- }
-
- static scryptOptions = (kdfparams: KdfParams) => {
- return {
- N: kdfparams.n,
- r: kdfparams.r,
- p: kdfparams.p,
- maxmem: 128 * (kdfparams.n + kdfparams.p + 2) * kdfparams.r,
- }
- }
-}
diff --git a/packages/neuron-wallet/src/models/keys/mnemonic/index.ts b/packages/neuron-wallet/src/models/keys/mnemonic/index.ts
deleted file mode 100644
index a84ed544c2..0000000000
--- a/packages/neuron-wallet/src/models/keys/mnemonic/index.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import crypto from 'crypto'
-import wordList from './word-list'
-
-const RADIX = 2048
-const PBKDF2_ROUNDS = 2048
-const KEY_LEN = 64
-const MIN_ENTROPY_SIZE = 16
-const MAX_ENTROPY_SIZE = 32
-const MIN_WORDS_SIZE = 12
-const MAX_WORDS_SIZE = 24
-
-const INVALID_MNEMONIC = `Invalid mnemonic`
-const INVALID_CHECKSUM = `Invalid checksum`
-const ENTROPY_NOT_DIVISIBLE = `Entropy should be divisible by 4`
-const ENTROPY_TOO_LONG = `Entropy should be shorter than ${MAX_ENTROPY_SIZE + 1}`
-const ENTROPY_TOO_SHORT = `Entropy should be longer than ${MIN_ENTROPY_SIZE - 1}`
-const WORDS_TOO_LONG = `Words should be shorter than ${MAX_WORDS_SIZE + 1}`
-const WORDS_TOO_SHORT = `Words should be longer than ${MIN_WORDS_SIZE - 1}`
-
-if (wordList.length !== RADIX) {
- throw new Error(`Word list should have ${RADIX} words, but ${wordList.length} received in fact`)
-}
-
-const bytesToBinary = (bytes: Buffer): string => {
- return bytes.reduce((binary, byte) => {
- return binary + byte.toString(2).padStart(8, '0')
- }, '')
-}
-
-const deriveChecksumBits = (entropyBuffer: Buffer): string => {
- const ENT = entropyBuffer.length * 8
- const CS = ENT / 32
- const hash = crypto.createHash('sha256').update(entropyBuffer).digest()
- return bytesToBinary(hash).slice(0, CS)
-}
-
-const salt = (password = '') => {
- return `mnemonic${password}`
-}
-
-export const mnemonicToSeedSync = (mnemonic: string = '', password: string = '') => {
- const mnemonicBuffer = Buffer.from(mnemonic.normalize('NFKD'), 'utf8')
- const saltBuffer = Buffer.from(salt(password.normalize('NFKD')), 'utf8')
- return crypto.pbkdf2Sync(mnemonicBuffer, saltBuffer, PBKDF2_ROUNDS, KEY_LEN, 'sha512')
-}
-
-export function mnemonicToSeed(mnemonic: string = '', password: string = ''): Promise {
- return new Promise((resolve, reject) => {
- try {
- const mnemonicBuffer = Buffer.from(mnemonic.normalize('NFKD'), 'utf8')
- const saltBuffer = Buffer.from(salt(password.normalize('NFKD')), 'utf8')
- crypto.pbkdf2(mnemonicBuffer, saltBuffer, PBKDF2_ROUNDS, KEY_LEN, 'sha512', (err, data) => {
- if (err) {
- reject(err)
- }
- resolve(data)
- })
- } catch (error) {
- reject(error)
- }
- })
-}
-
-export function mnemonicToEntropy(mnemonic: string = '') {
- const words = mnemonic.normalize('NFKD').split(' ')
- if (words.length < MIN_WORDS_SIZE) {
- throw new Error(WORDS_TOO_SHORT)
- }
- if (words.length > MAX_WORDS_SIZE) {
- throw new Error(WORDS_TOO_LONG)
- }
- if (words.length % 3 !== 0) {
- throw new Error(INVALID_MNEMONIC)
- }
- const bits = words
- .map(word => {
- const index = wordList!.indexOf(word)
- if (index === -1) {
- throw new Error(INVALID_MNEMONIC)
- }
- return index.toString(2).padStart(11, '0')
- })
- .join('')
-
- const dividerIndex = Math.floor(bits.length / 33) * 32
- const entropyBits = bits.slice(0, dividerIndex)
- const checksumBits = bits.slice(dividerIndex)
-
- const entropyBytes = entropyBits.match(/(.{1,8})/g)!.map(byte => parseInt(byte, 2))
- if (entropyBytes.length < MIN_ENTROPY_SIZE) {
- throw new Error(ENTROPY_TOO_SHORT)
- }
- if (entropyBytes.length > MAX_ENTROPY_SIZE) {
- throw new Error(ENTROPY_TOO_LONG)
- }
- if (entropyBytes.length % 4 !== 0) {
- throw new Error(ENTROPY_NOT_DIVISIBLE)
- }
-
- const entropy = Buffer.from(entropyBytes)
- const newChecksum = deriveChecksumBits(entropy)
- if (newChecksum !== checksumBits) {
- throw new Error(INVALID_CHECKSUM)
- }
-
- return entropy.toString('hex')
-}
-
-export function entropyToMnemonic(entropyStr: string) {
- const entropy = Buffer.from(entropyStr, 'hex')
-
- if (entropy.length < MIN_ENTROPY_SIZE) {
- throw new TypeError(ENTROPY_TOO_SHORT)
- }
- if (entropy.length > MAX_ENTROPY_SIZE) {
- throw new TypeError(ENTROPY_TOO_LONG)
- }
- if (entropy.length % 4 !== 0) {
- throw new TypeError(ENTROPY_NOT_DIVISIBLE)
- }
-
- const entropyBytes = bytesToBinary(entropy)
- const checksumBytes = deriveChecksumBits(entropy)
-
- const bytes = entropyBytes + checksumBytes
- const chunks = bytes.match(/(.{1,11})/g)!
- const words = chunks.map(binary => {
- const index = parseInt(binary, 2)
- return wordList[index]
- })
-
- return words.join(' ')
-}
-
-export function validateMnemonic(mnemonic: string) {
- try {
- mnemonicToEntropy(mnemonic)
- } catch (e) {
- return false
- }
- return true
-}
-
-export default {
- entropyToMnemonic,
- mnemonicToEntropy,
- mnemonicToSeed,
- mnemonicToSeedSync,
- validateMnemonic,
-}
diff --git a/packages/neuron-wallet/src/models/keys/mnemonic/word-list.ts b/packages/neuron-wallet/src/models/keys/mnemonic/word-list.ts
deleted file mode 100644
index f5d81d3377..0000000000
--- a/packages/neuron-wallet/src/models/keys/mnemonic/word-list.ts
+++ /dev/null
@@ -1,2050 +0,0 @@
-export default [
- 'abandon',
- 'ability',
- 'able',
- 'about',
- 'above',
- 'absent',
- 'absorb',
- 'abstract',
- 'absurd',
- 'abuse',
- 'access',
- 'accident',
- 'account',
- 'accuse',
- 'achieve',
- 'acid',
- 'acoustic',
- 'acquire',
- 'across',
- 'act',
- 'action',
- 'actor',
- 'actress',
- 'actual',
- 'adapt',
- 'add',
- 'addict',
- 'address',
- 'adjust',
- 'admit',
- 'adult',
- 'advance',
- 'advice',
- 'aerobic',
- 'affair',
- 'afford',
- 'afraid',
- 'again',
- 'age',
- 'agent',
- 'agree',
- 'ahead',
- 'aim',
- 'air',
- 'airport',
- 'aisle',
- 'alarm',
- 'album',
- 'alcohol',
- 'alert',
- 'alien',
- 'all',
- 'alley',
- 'allow',
- 'almost',
- 'alone',
- 'alpha',
- 'already',
- 'also',
- 'alter',
- 'always',
- 'amateur',
- 'amazing',
- 'among',
- 'amount',
- 'amused',
- 'analyst',
- 'anchor',
- 'ancient',
- 'anger',
- 'angle',
- 'angry',
- 'animal',
- 'ankle',
- 'announce',
- 'annual',
- 'another',
- 'answer',
- 'antenna',
- 'antique',
- 'anxiety',
- 'any',
- 'apart',
- 'apology',
- 'appear',
- 'apple',
- 'approve',
- 'april',
- 'arch',
- 'arctic',
- 'area',
- 'arena',
- 'argue',
- 'arm',
- 'armed',
- 'armor',
- 'army',
- 'around',
- 'arrange',
- 'arrest',
- 'arrive',
- 'arrow',
- 'art',
- 'artefact',
- 'artist',
- 'artwork',
- 'ask',
- 'aspect',
- 'assault',
- 'asset',
- 'assist',
- 'assume',
- 'asthma',
- 'athlete',
- 'atom',
- 'attack',
- 'attend',
- 'attitude',
- 'attract',
- 'auction',
- 'audit',
- 'august',
- 'aunt',
- 'author',
- 'auto',
- 'autumn',
- 'average',
- 'avocado',
- 'avoid',
- 'awake',
- 'aware',
- 'away',
- 'awesome',
- 'awful',
- 'awkward',
- 'axis',
- 'baby',
- 'bachelor',
- 'bacon',
- 'badge',
- 'bag',
- 'balance',
- 'balcony',
- 'ball',
- 'bamboo',
- 'banana',
- 'banner',
- 'bar',
- 'barely',
- 'bargain',
- 'barrel',
- 'base',
- 'basic',
- 'basket',
- 'battle',
- 'beach',
- 'bean',
- 'beauty',
- 'because',
- 'become',
- 'beef',
- 'before',
- 'begin',
- 'behave',
- 'behind',
- 'believe',
- 'below',
- 'belt',
- 'bench',
- 'benefit',
- 'best',
- 'betray',
- 'better',
- 'between',
- 'beyond',
- 'bicycle',
- 'bid',
- 'bike',
- 'bind',
- 'biology',
- 'bird',
- 'birth',
- 'bitter',
- 'black',
- 'blade',
- 'blame',
- 'blanket',
- 'blast',
- 'bleak',
- 'bless',
- 'blind',
- 'blood',
- 'blossom',
- 'blouse',
- 'blue',
- 'blur',
- 'blush',
- 'board',
- 'boat',
- 'body',
- 'boil',
- 'bomb',
- 'bone',
- 'bonus',
- 'book',
- 'boost',
- 'border',
- 'boring',
- 'borrow',
- 'boss',
- 'bottom',
- 'bounce',
- 'box',
- 'boy',
- 'bracket',
- 'brain',
- 'brand',
- 'brass',
- 'brave',
- 'bread',
- 'breeze',
- 'brick',
- 'bridge',
- 'brief',
- 'bright',
- 'bring',
- 'brisk',
- 'broccoli',
- 'broken',
- 'bronze',
- 'broom',
- 'brother',
- 'brown',
- 'brush',
- 'bubble',
- 'buddy',
- 'budget',
- 'buffalo',
- 'build',
- 'bulb',
- 'bulk',
- 'bullet',
- 'bundle',
- 'bunker',
- 'burden',
- 'burger',
- 'burst',
- 'bus',
- 'business',
- 'busy',
- 'butter',
- 'buyer',
- 'buzz',
- 'cabbage',
- 'cabin',
- 'cable',
- 'cactus',
- 'cage',
- 'cake',
- 'call',
- 'calm',
- 'camera',
- 'camp',
- 'can',
- 'canal',
- 'cancel',
- 'candy',
- 'cannon',
- 'canoe',
- 'canvas',
- 'canyon',
- 'capable',
- 'capital',
- 'captain',
- 'car',
- 'carbon',
- 'card',
- 'cargo',
- 'carpet',
- 'carry',
- 'cart',
- 'case',
- 'cash',
- 'casino',
- 'castle',
- 'casual',
- 'cat',
- 'catalog',
- 'catch',
- 'category',
- 'cattle',
- 'caught',
- 'cause',
- 'caution',
- 'cave',
- 'ceiling',
- 'celery',
- 'cement',
- 'census',
- 'century',
- 'cereal',
- 'certain',
- 'chair',
- 'chalk',
- 'champion',
- 'change',
- 'chaos',
- 'chapter',
- 'charge',
- 'chase',
- 'chat',
- 'cheap',
- 'check',
- 'cheese',
- 'chef',
- 'cherry',
- 'chest',
- 'chicken',
- 'chief',
- 'child',
- 'chimney',
- 'choice',
- 'choose',
- 'chronic',
- 'chuckle',
- 'chunk',
- 'churn',
- 'cigar',
- 'cinnamon',
- 'circle',
- 'citizen',
- 'city',
- 'civil',
- 'claim',
- 'clap',
- 'clarify',
- 'claw',
- 'clay',
- 'clean',
- 'clerk',
- 'clever',
- 'click',
- 'client',
- 'cliff',
- 'climb',
- 'clinic',
- 'clip',
- 'clock',
- 'clog',
- 'close',
- 'cloth',
- 'cloud',
- 'clown',
- 'club',
- 'clump',
- 'cluster',
- 'clutch',
- 'coach',
- 'coast',
- 'coconut',
- 'code',
- 'coffee',
- 'coil',
- 'coin',
- 'collect',
- 'color',
- 'column',
- 'combine',
- 'come',
- 'comfort',
- 'comic',
- 'common',
- 'company',
- 'concert',
- 'conduct',
- 'confirm',
- 'congress',
- 'connect',
- 'consider',
- 'control',
- 'convince',
- 'cook',
- 'cool',
- 'copper',
- 'copy',
- 'coral',
- 'core',
- 'corn',
- 'correct',
- 'cost',
- 'cotton',
- 'couch',
- 'country',
- 'couple',
- 'course',
- 'cousin',
- 'cover',
- 'coyote',
- 'crack',
- 'cradle',
- 'craft',
- 'cram',
- 'crane',
- 'crash',
- 'crater',
- 'crawl',
- 'crazy',
- 'cream',
- 'credit',
- 'creek',
- 'crew',
- 'cricket',
- 'crime',
- 'crisp',
- 'critic',
- 'crop',
- 'cross',
- 'crouch',
- 'crowd',
- 'crucial',
- 'cruel',
- 'cruise',
- 'crumble',
- 'crunch',
- 'crush',
- 'cry',
- 'crystal',
- 'cube',
- 'culture',
- 'cup',
- 'cupboard',
- 'curious',
- 'current',
- 'curtain',
- 'curve',
- 'cushion',
- 'custom',
- 'cute',
- 'cycle',
- 'dad',
- 'damage',
- 'damp',
- 'dance',
- 'danger',
- 'daring',
- 'dash',
- 'daughter',
- 'dawn',
- 'day',
- 'deal',
- 'debate',
- 'debris',
- 'decade',
- 'december',
- 'decide',
- 'decline',
- 'decorate',
- 'decrease',
- 'deer',
- 'defense',
- 'define',
- 'defy',
- 'degree',
- 'delay',
- 'deliver',
- 'demand',
- 'demise',
- 'denial',
- 'dentist',
- 'deny',
- 'depart',
- 'depend',
- 'deposit',
- 'depth',
- 'deputy',
- 'derive',
- 'describe',
- 'desert',
- 'design',
- 'desk',
- 'despair',
- 'destroy',
- 'detail',
- 'detect',
- 'develop',
- 'device',
- 'devote',
- 'diagram',
- 'dial',
- 'diamond',
- 'diary',
- 'dice',
- 'diesel',
- 'diet',
- 'differ',
- 'digital',
- 'dignity',
- 'dilemma',
- 'dinner',
- 'dinosaur',
- 'direct',
- 'dirt',
- 'disagree',
- 'discover',
- 'disease',
- 'dish',
- 'dismiss',
- 'disorder',
- 'display',
- 'distance',
- 'divert',
- 'divide',
- 'divorce',
- 'dizzy',
- 'doctor',
- 'document',
- 'dog',
- 'doll',
- 'dolphin',
- 'domain',
- 'donate',
- 'donkey',
- 'donor',
- 'door',
- 'dose',
- 'double',
- 'dove',
- 'draft',
- 'dragon',
- 'drama',
- 'drastic',
- 'draw',
- 'dream',
- 'dress',
- 'drift',
- 'drill',
- 'drink',
- 'drip',
- 'drive',
- 'drop',
- 'drum',
- 'dry',
- 'duck',
- 'dumb',
- 'dune',
- 'during',
- 'dust',
- 'dutch',
- 'duty',
- 'dwarf',
- 'dynamic',
- 'eager',
- 'eagle',
- 'early',
- 'earn',
- 'earth',
- 'easily',
- 'east',
- 'easy',
- 'echo',
- 'ecology',
- 'economy',
- 'edge',
- 'edit',
- 'educate',
- 'effort',
- 'egg',
- 'eight',
- 'either',
- 'elbow',
- 'elder',
- 'electric',
- 'elegant',
- 'element',
- 'elephant',
- 'elevator',
- 'elite',
- 'else',
- 'embark',
- 'embody',
- 'embrace',
- 'emerge',
- 'emotion',
- 'employ',
- 'empower',
- 'empty',
- 'enable',
- 'enact',
- 'end',
- 'endless',
- 'endorse',
- 'enemy',
- 'energy',
- 'enforce',
- 'engage',
- 'engine',
- 'enhance',
- 'enjoy',
- 'enlist',
- 'enough',
- 'enrich',
- 'enroll',
- 'ensure',
- 'enter',
- 'entire',
- 'entry',
- 'envelope',
- 'episode',
- 'equal',
- 'equip',
- 'era',
- 'erase',
- 'erode',
- 'erosion',
- 'error',
- 'erupt',
- 'escape',
- 'essay',
- 'essence',
- 'estate',
- 'eternal',
- 'ethics',
- 'evidence',
- 'evil',
- 'evoke',
- 'evolve',
- 'exact',
- 'example',
- 'excess',
- 'exchange',
- 'excite',
- 'exclude',
- 'excuse',
- 'execute',
- 'exercise',
- 'exhaust',
- 'exhibit',
- 'exile',
- 'exist',
- 'exit',
- 'exotic',
- 'expand',
- 'expect',
- 'expire',
- 'explain',
- 'expose',
- 'express',
- 'extend',
- 'extra',
- 'eye',
- 'eyebrow',
- 'fabric',
- 'face',
- 'faculty',
- 'fade',
- 'faint',
- 'faith',
- 'fall',
- 'false',
- 'fame',
- 'family',
- 'famous',
- 'fan',
- 'fancy',
- 'fantasy',
- 'farm',
- 'fashion',
- 'fat',
- 'fatal',
- 'father',
- 'fatigue',
- 'fault',
- 'favorite',
- 'feature',
- 'february',
- 'federal',
- 'fee',
- 'feed',
- 'feel',
- 'female',
- 'fence',
- 'festival',
- 'fetch',
- 'fever',
- 'few',
- 'fiber',
- 'fiction',
- 'field',
- 'figure',
- 'file',
- 'film',
- 'filter',
- 'final',
- 'find',
- 'fine',
- 'finger',
- 'finish',
- 'fire',
- 'firm',
- 'first',
- 'fiscal',
- 'fish',
- 'fit',
- 'fitness',
- 'fix',
- 'flag',
- 'flame',
- 'flash',
- 'flat',
- 'flavor',
- 'flee',
- 'flight',
- 'flip',
- 'float',
- 'flock',
- 'floor',
- 'flower',
- 'fluid',
- 'flush',
- 'fly',
- 'foam',
- 'focus',
- 'fog',
- 'foil',
- 'fold',
- 'follow',
- 'food',
- 'foot',
- 'force',
- 'forest',
- 'forget',
- 'fork',
- 'fortune',
- 'forum',
- 'forward',
- 'fossil',
- 'foster',
- 'found',
- 'fox',
- 'fragile',
- 'frame',
- 'frequent',
- 'fresh',
- 'friend',
- 'fringe',
- 'frog',
- 'front',
- 'frost',
- 'frown',
- 'frozen',
- 'fruit',
- 'fuel',
- 'fun',
- 'funny',
- 'furnace',
- 'fury',
- 'future',
- 'gadget',
- 'gain',
- 'galaxy',
- 'gallery',
- 'game',
- 'gap',
- 'garage',
- 'garbage',
- 'garden',
- 'garlic',
- 'garment',
- 'gas',
- 'gasp',
- 'gate',
- 'gather',
- 'gauge',
- 'gaze',
- 'general',
- 'genius',
- 'genre',
- 'gentle',
- 'genuine',
- 'gesture',
- 'ghost',
- 'giant',
- 'gift',
- 'giggle',
- 'ginger',
- 'giraffe',
- 'girl',
- 'give',
- 'glad',
- 'glance',
- 'glare',
- 'glass',
- 'glide',
- 'glimpse',
- 'globe',
- 'gloom',
- 'glory',
- 'glove',
- 'glow',
- 'glue',
- 'goat',
- 'goddess',
- 'gold',
- 'good',
- 'goose',
- 'gorilla',
- 'gospel',
- 'gossip',
- 'govern',
- 'gown',
- 'grab',
- 'grace',
- 'grain',
- 'grant',
- 'grape',
- 'grass',
- 'gravity',
- 'great',
- 'green',
- 'grid',
- 'grief',
- 'grit',
- 'grocery',
- 'group',
- 'grow',
- 'grunt',
- 'guard',
- 'guess',
- 'guide',
- 'guilt',
- 'guitar',
- 'gun',
- 'gym',
- 'habit',
- 'hair',
- 'half',
- 'hammer',
- 'hamster',
- 'hand',
- 'happy',
- 'harbor',
- 'hard',
- 'harsh',
- 'harvest',
- 'hat',
- 'have',
- 'hawk',
- 'hazard',
- 'head',
- 'health',
- 'heart',
- 'heavy',
- 'hedgehog',
- 'height',
- 'hello',
- 'helmet',
- 'help',
- 'hen',
- 'hero',
- 'hidden',
- 'high',
- 'hill',
- 'hint',
- 'hip',
- 'hire',
- 'history',
- 'hobby',
- 'hockey',
- 'hold',
- 'hole',
- 'holiday',
- 'hollow',
- 'home',
- 'honey',
- 'hood',
- 'hope',
- 'horn',
- 'horror',
- 'horse',
- 'hospital',
- 'host',
- 'hotel',
- 'hour',
- 'hover',
- 'hub',
- 'huge',
- 'human',
- 'humble',
- 'humor',
- 'hundred',
- 'hungry',
- 'hunt',
- 'hurdle',
- 'hurry',
- 'hurt',
- 'husband',
- 'hybrid',
- 'ice',
- 'icon',
- 'idea',
- 'identify',
- 'idle',
- 'ignore',
- 'ill',
- 'illegal',
- 'illness',
- 'image',
- 'imitate',
- 'immense',
- 'immune',
- 'impact',
- 'impose',
- 'improve',
- 'impulse',
- 'inch',
- 'include',
- 'income',
- 'increase',
- 'index',
- 'indicate',
- 'indoor',
- 'industry',
- 'infant',
- 'inflict',
- 'inform',
- 'inhale',
- 'inherit',
- 'initial',
- 'inject',
- 'injury',
- 'inmate',
- 'inner',
- 'innocent',
- 'input',
- 'inquiry',
- 'insane',
- 'insect',
- 'inside',
- 'inspire',
- 'install',
- 'intact',
- 'interest',
- 'into',
- 'invest',
- 'invite',
- 'involve',
- 'iron',
- 'island',
- 'isolate',
- 'issue',
- 'item',
- 'ivory',
- 'jacket',
- 'jaguar',
- 'jar',
- 'jazz',
- 'jealous',
- 'jeans',
- 'jelly',
- 'jewel',
- 'job',
- 'join',
- 'joke',
- 'journey',
- 'joy',
- 'judge',
- 'juice',
- 'jump',
- 'jungle',
- 'junior',
- 'junk',
- 'just',
- 'kangaroo',
- 'keen',
- 'keep',
- 'ketchup',
- 'key',
- 'kick',
- 'kid',
- 'kidney',
- 'kind',
- 'kingdom',
- 'kiss',
- 'kit',
- 'kitchen',
- 'kite',
- 'kitten',
- 'kiwi',
- 'knee',
- 'knife',
- 'knock',
- 'know',
- 'lab',
- 'label',
- 'labor',
- 'ladder',
- 'lady',
- 'lake',
- 'lamp',
- 'language',
- 'laptop',
- 'large',
- 'later',
- 'latin',
- 'laugh',
- 'laundry',
- 'lava',
- 'law',
- 'lawn',
- 'lawsuit',
- 'layer',
- 'lazy',
- 'leader',
- 'leaf',
- 'learn',
- 'leave',
- 'lecture',
- 'left',
- 'leg',
- 'legal',
- 'legend',
- 'leisure',
- 'lemon',
- 'lend',
- 'length',
- 'lens',
- 'leopard',
- 'lesson',
- 'letter',
- 'level',
- 'liar',
- 'liberty',
- 'library',
- 'license',
- 'life',
- 'lift',
- 'light',
- 'like',
- 'limb',
- 'limit',
- 'link',
- 'lion',
- 'liquid',
- 'list',
- 'little',
- 'live',
- 'lizard',
- 'load',
- 'loan',
- 'lobster',
- 'local',
- 'lock',
- 'logic',
- 'lonely',
- 'long',
- 'loop',
- 'lottery',
- 'loud',
- 'lounge',
- 'love',
- 'loyal',
- 'lucky',
- 'luggage',
- 'lumber',
- 'lunar',
- 'lunch',
- 'luxury',
- 'lyrics',
- 'machine',
- 'mad',
- 'magic',
- 'magnet',
- 'maid',
- 'mail',
- 'main',
- 'major',
- 'make',
- 'mammal',
- 'man',
- 'manage',
- 'mandate',
- 'mango',
- 'mansion',
- 'manual',
- 'maple',
- 'marble',
- 'march',
- 'margin',
- 'marine',
- 'market',
- 'marriage',
- 'mask',
- 'mass',
- 'master',
- 'match',
- 'material',
- 'math',
- 'matrix',
- 'matter',
- 'maximum',
- 'maze',
- 'meadow',
- 'mean',
- 'measure',
- 'meat',
- 'mechanic',
- 'medal',
- 'media',
- 'melody',
- 'melt',
- 'member',
- 'memory',
- 'mention',
- 'menu',
- 'mercy',
- 'merge',
- 'merit',
- 'merry',
- 'mesh',
- 'message',
- 'metal',
- 'method',
- 'middle',
- 'midnight',
- 'milk',
- 'million',
- 'mimic',
- 'mind',
- 'minimum',
- 'minor',
- 'minute',
- 'miracle',
- 'mirror',
- 'misery',
- 'miss',
- 'mistake',
- 'mix',
- 'mixed',
- 'mixture',
- 'mobile',
- 'model',
- 'modify',
- 'mom',
- 'moment',
- 'monitor',
- 'monkey',
- 'monster',
- 'month',
- 'moon',
- 'moral',
- 'more',
- 'morning',
- 'mosquito',
- 'mother',
- 'motion',
- 'motor',
- 'mountain',
- 'mouse',
- 'move',
- 'movie',
- 'much',
- 'muffin',
- 'mule',
- 'multiply',
- 'muscle',
- 'museum',
- 'mushroom',
- 'music',
- 'must',
- 'mutual',
- 'myself',
- 'mystery',
- 'myth',
- 'naive',
- 'name',
- 'napkin',
- 'narrow',
- 'nasty',
- 'nation',
- 'nature',
- 'near',
- 'neck',
- 'need',
- 'negative',
- 'neglect',
- 'neither',
- 'nephew',
- 'nerve',
- 'nest',
- 'net',
- 'network',
- 'neutral',
- 'never',
- 'news',
- 'next',
- 'nice',
- 'night',
- 'noble',
- 'noise',
- 'nominee',
- 'noodle',
- 'normal',
- 'north',
- 'nose',
- 'notable',
- 'note',
- 'nothing',
- 'notice',
- 'novel',
- 'now',
- 'nuclear',
- 'number',
- 'nurse',
- 'nut',
- 'oak',
- 'obey',
- 'object',
- 'oblige',
- 'obscure',
- 'observe',
- 'obtain',
- 'obvious',
- 'occur',
- 'ocean',
- 'october',
- 'odor',
- 'off',
- 'offer',
- 'office',
- 'often',
- 'oil',
- 'okay',
- 'old',
- 'olive',
- 'olympic',
- 'omit',
- 'once',
- 'one',
- 'onion',
- 'online',
- 'only',
- 'open',
- 'opera',
- 'opinion',
- 'oppose',
- 'option',
- 'orange',
- 'orbit',
- 'orchard',
- 'order',
- 'ordinary',
- 'organ',
- 'orient',
- 'original',
- 'orphan',
- 'ostrich',
- 'other',
- 'outdoor',
- 'outer',
- 'output',
- 'outside',
- 'oval',
- 'oven',
- 'over',
- 'own',
- 'owner',
- 'oxygen',
- 'oyster',
- 'ozone',
- 'pact',
- 'paddle',
- 'page',
- 'pair',
- 'palace',
- 'palm',
- 'panda',
- 'panel',
- 'panic',
- 'panther',
- 'paper',
- 'parade',
- 'parent',
- 'park',
- 'parrot',
- 'party',
- 'pass',
- 'patch',
- 'path',
- 'patient',
- 'patrol',
- 'pattern',
- 'pause',
- 'pave',
- 'payment',
- 'peace',
- 'peanut',
- 'pear',
- 'peasant',
- 'pelican',
- 'pen',
- 'penalty',
- 'pencil',
- 'people',
- 'pepper',
- 'perfect',
- 'permit',
- 'person',
- 'pet',
- 'phone',
- 'photo',
- 'phrase',
- 'physical',
- 'piano',
- 'picnic',
- 'picture',
- 'piece',
- 'pig',
- 'pigeon',
- 'pill',
- 'pilot',
- 'pink',
- 'pioneer',
- 'pipe',
- 'pistol',
- 'pitch',
- 'pizza',
- 'place',
- 'planet',
- 'plastic',
- 'plate',
- 'play',
- 'please',
- 'pledge',
- 'pluck',
- 'plug',
- 'plunge',
- 'poem',
- 'poet',
- 'point',
- 'polar',
- 'pole',
- 'police',
- 'pond',
- 'pony',
- 'pool',
- 'popular',
- 'portion',
- 'position',
- 'possible',
- 'post',
- 'potato',
- 'pottery',
- 'poverty',
- 'powder',
- 'power',
- 'practice',
- 'praise',
- 'predict',
- 'prefer',
- 'prepare',
- 'present',
- 'pretty',
- 'prevent',
- 'price',
- 'pride',
- 'primary',
- 'print',
- 'priority',
- 'prison',
- 'private',
- 'prize',
- 'problem',
- 'process',
- 'produce',
- 'profit',
- 'program',
- 'project',
- 'promote',
- 'proof',
- 'property',
- 'prosper',
- 'protect',
- 'proud',
- 'provide',
- 'public',
- 'pudding',
- 'pull',
- 'pulp',
- 'pulse',
- 'pumpkin',
- 'punch',
- 'pupil',
- 'puppy',
- 'purchase',
- 'purity',
- 'purpose',
- 'purse',
- 'push',
- 'put',
- 'puzzle',
- 'pyramid',
- 'quality',
- 'quantum',
- 'quarter',
- 'question',
- 'quick',
- 'quit',
- 'quiz',
- 'quote',
- 'rabbit',
- 'raccoon',
- 'race',
- 'rack',
- 'radar',
- 'radio',
- 'rail',
- 'rain',
- 'raise',
- 'rally',
- 'ramp',
- 'ranch',
- 'random',
- 'range',
- 'rapid',
- 'rare',
- 'rate',
- 'rather',
- 'raven',
- 'raw',
- 'razor',
- 'ready',
- 'real',
- 'reason',
- 'rebel',
- 'rebuild',
- 'recall',
- 'receive',
- 'recipe',
- 'record',
- 'recycle',
- 'reduce',
- 'reflect',
- 'reform',
- 'refuse',
- 'region',
- 'regret',
- 'regular',
- 'reject',
- 'relax',
- 'release',
- 'relief',
- 'rely',
- 'remain',
- 'remember',
- 'remind',
- 'remove',
- 'render',
- 'renew',
- 'rent',
- 'reopen',
- 'repair',
- 'repeat',
- 'replace',
- 'report',
- 'require',
- 'rescue',
- 'resemble',
- 'resist',
- 'resource',
- 'response',
- 'result',
- 'retire',
- 'retreat',
- 'return',
- 'reunion',
- 'reveal',
- 'review',
- 'reward',
- 'rhythm',
- 'rib',
- 'ribbon',
- 'rice',
- 'rich',
- 'ride',
- 'ridge',
- 'rifle',
- 'right',
- 'rigid',
- 'ring',
- 'riot',
- 'ripple',
- 'risk',
- 'ritual',
- 'rival',
- 'river',
- 'road',
- 'roast',
- 'robot',
- 'robust',
- 'rocket',
- 'romance',
- 'roof',
- 'rookie',
- 'room',
- 'rose',
- 'rotate',
- 'rough',
- 'round',
- 'route',
- 'royal',
- 'rubber',
- 'rude',
- 'rug',
- 'rule',
- 'run',
- 'runway',
- 'rural',
- 'sad',
- 'saddle',
- 'sadness',
- 'safe',
- 'sail',
- 'salad',
- 'salmon',
- 'salon',
- 'salt',
- 'salute',
- 'same',
- 'sample',
- 'sand',
- 'satisfy',
- 'satoshi',
- 'sauce',
- 'sausage',
- 'save',
- 'say',
- 'scale',
- 'scan',
- 'scare',
- 'scatter',
- 'scene',
- 'scheme',
- 'school',
- 'science',
- 'scissors',
- 'scorpion',
- 'scout',
- 'scrap',
- 'screen',
- 'script',
- 'scrub',
- 'sea',
- 'search',
- 'season',
- 'seat',
- 'second',
- 'secret',
- 'section',
- 'security',
- 'seed',
- 'seek',
- 'segment',
- 'select',
- 'sell',
- 'seminar',
- 'senior',
- 'sense',
- 'sentence',
- 'series',
- 'service',
- 'session',
- 'settle',
- 'setup',
- 'seven',
- 'shadow',
- 'shaft',
- 'shallow',
- 'share',
- 'shed',
- 'shell',
- 'sheriff',
- 'shield',
- 'shift',
- 'shine',
- 'ship',
- 'shiver',
- 'shock',
- 'shoe',
- 'shoot',
- 'shop',
- 'short',
- 'shoulder',
- 'shove',
- 'shrimp',
- 'shrug',
- 'shuffle',
- 'shy',
- 'sibling',
- 'sick',
- 'side',
- 'siege',
- 'sight',
- 'sign',
- 'silent',
- 'silk',
- 'silly',
- 'silver',
- 'similar',
- 'simple',
- 'since',
- 'sing',
- 'siren',
- 'sister',
- 'situate',
- 'six',
- 'size',
- 'skate',
- 'sketch',
- 'ski',
- 'skill',
- 'skin',
- 'skirt',
- 'skull',
- 'slab',
- 'slam',
- 'sleep',
- 'slender',
- 'slice',
- 'slide',
- 'slight',
- 'slim',
- 'slogan',
- 'slot',
- 'slow',
- 'slush',
- 'small',
- 'smart',
- 'smile',
- 'smoke',
- 'smooth',
- 'snack',
- 'snake',
- 'snap',
- 'sniff',
- 'snow',
- 'soap',
- 'soccer',
- 'social',
- 'sock',
- 'soda',
- 'soft',
- 'solar',
- 'soldier',
- 'solid',
- 'solution',
- 'solve',
- 'someone',
- 'song',
- 'soon',
- 'sorry',
- 'sort',
- 'soul',
- 'sound',
- 'soup',
- 'source',
- 'south',
- 'space',
- 'spare',
- 'spatial',
- 'spawn',
- 'speak',
- 'special',
- 'speed',
- 'spell',
- 'spend',
- 'sphere',
- 'spice',
- 'spider',
- 'spike',
- 'spin',
- 'spirit',
- 'split',
- 'spoil',
- 'sponsor',
- 'spoon',
- 'sport',
- 'spot',
- 'spray',
- 'spread',
- 'spring',
- 'spy',
- 'square',
- 'squeeze',
- 'squirrel',
- 'stable',
- 'stadium',
- 'staff',
- 'stage',
- 'stairs',
- 'stamp',
- 'stand',
- 'start',
- 'state',
- 'stay',
- 'steak',
- 'steel',
- 'stem',
- 'step',
- 'stereo',
- 'stick',
- 'still',
- 'sting',
- 'stock',
- 'stomach',
- 'stone',
- 'stool',
- 'story',
- 'stove',
- 'strategy',
- 'street',
- 'strike',
- 'strong',
- 'struggle',
- 'student',
- 'stuff',
- 'stumble',
- 'style',
- 'subject',
- 'submit',
- 'subway',
- 'success',
- 'such',
- 'sudden',
- 'suffer',
- 'sugar',
- 'suggest',
- 'suit',
- 'summer',
- 'sun',
- 'sunny',
- 'sunset',
- 'super',
- 'supply',
- 'supreme',
- 'sure',
- 'surface',
- 'surge',
- 'surprise',
- 'surround',
- 'survey',
- 'suspect',
- 'sustain',
- 'swallow',
- 'swamp',
- 'swap',
- 'swarm',
- 'swear',
- 'sweet',
- 'swift',
- 'swim',
- 'swing',
- 'switch',
- 'sword',
- 'symbol',
- 'symptom',
- 'syrup',
- 'system',
- 'table',
- 'tackle',
- 'tag',
- 'tail',
- 'talent',
- 'talk',
- 'tank',
- 'tape',
- 'target',
- 'task',
- 'taste',
- 'tattoo',
- 'taxi',
- 'teach',
- 'team',
- 'tell',
- 'ten',
- 'tenant',
- 'tennis',
- 'tent',
- 'term',
- 'test',
- 'text',
- 'thank',
- 'that',
- 'theme',
- 'then',
- 'theory',
- 'there',
- 'they',
- 'thing',
- 'this',
- 'thought',
- 'three',
- 'thrive',
- 'throw',
- 'thumb',
- 'thunder',
- 'ticket',
- 'tide',
- 'tiger',
- 'tilt',
- 'timber',
- 'time',
- 'tiny',
- 'tip',
- 'tired',
- 'tissue',
- 'title',
- 'toast',
- 'tobacco',
- 'today',
- 'toddler',
- 'toe',
- 'together',
- 'toilet',
- 'token',
- 'tomato',
- 'tomorrow',
- 'tone',
- 'tongue',
- 'tonight',
- 'tool',
- 'tooth',
- 'top',
- 'topic',
- 'topple',
- 'torch',
- 'tornado',
- 'tortoise',
- 'toss',
- 'total',
- 'tourist',
- 'toward',
- 'tower',
- 'town',
- 'toy',
- 'track',
- 'trade',
- 'traffic',
- 'tragic',
- 'train',
- 'transfer',
- 'trap',
- 'trash',
- 'travel',
- 'tray',
- 'treat',
- 'tree',
- 'trend',
- 'trial',
- 'tribe',
- 'trick',
- 'trigger',
- 'trim',
- 'trip',
- 'trophy',
- 'trouble',
- 'truck',
- 'true',
- 'truly',
- 'trumpet',
- 'trust',
- 'truth',
- 'try',
- 'tube',
- 'tuition',
- 'tumble',
- 'tuna',
- 'tunnel',
- 'turkey',
- 'turn',
- 'turtle',
- 'twelve',
- 'twenty',
- 'twice',
- 'twin',
- 'twist',
- 'two',
- 'type',
- 'typical',
- 'ugly',
- 'umbrella',
- 'unable',
- 'unaware',
- 'uncle',
- 'uncover',
- 'under',
- 'undo',
- 'unfair',
- 'unfold',
- 'unhappy',
- 'uniform',
- 'unique',
- 'unit',
- 'universe',
- 'unknown',
- 'unlock',
- 'until',
- 'unusual',
- 'unveil',
- 'update',
- 'upgrade',
- 'uphold',
- 'upon',
- 'upper',
- 'upset',
- 'urban',
- 'urge',
- 'usage',
- 'use',
- 'used',
- 'useful',
- 'useless',
- 'usual',
- 'utility',
- 'vacant',
- 'vacuum',
- 'vague',
- 'valid',
- 'valley',
- 'valve',
- 'van',
- 'vanish',
- 'vapor',
- 'various',
- 'vast',
- 'vault',
- 'vehicle',
- 'velvet',
- 'vendor',
- 'venture',
- 'venue',
- 'verb',
- 'verify',
- 'version',
- 'very',
- 'vessel',
- 'veteran',
- 'viable',
- 'vibrant',
- 'vicious',
- 'victory',
- 'video',
- 'view',
- 'village',
- 'vintage',
- 'violin',
- 'virtual',
- 'virus',
- 'visa',
- 'visit',
- 'visual',
- 'vital',
- 'vivid',
- 'vocal',
- 'voice',
- 'void',
- 'volcano',
- 'volume',
- 'vote',
- 'voyage',
- 'wage',
- 'wagon',
- 'wait',
- 'walk',
- 'wall',
- 'walnut',
- 'want',
- 'warfare',
- 'warm',
- 'warrior',
- 'wash',
- 'wasp',
- 'waste',
- 'water',
- 'wave',
- 'way',
- 'wealth',
- 'weapon',
- 'wear',
- 'weasel',
- 'weather',
- 'web',
- 'wedding',
- 'weekend',
- 'weird',
- 'welcome',
- 'west',
- 'wet',
- 'whale',
- 'what',
- 'wheat',
- 'wheel',
- 'when',
- 'where',
- 'whip',
- 'whisper',
- 'wide',
- 'width',
- 'wife',
- 'wild',
- 'will',
- 'win',
- 'window',
- 'wine',
- 'wing',
- 'wink',
- 'winner',
- 'winter',
- 'wire',
- 'wisdom',
- 'wise',
- 'wish',
- 'witness',
- 'wolf',
- 'woman',
- 'wonder',
- 'wood',
- 'wool',
- 'word',
- 'work',
- 'world',
- 'worry',
- 'worth',
- 'wrap',
- 'wreck',
- 'wrestle',
- 'wrist',
- 'write',
- 'wrong',
- 'yard',
- 'year',
- 'yellow',
- 'you',
- 'young',
- 'youth',
- 'zebra',
- 'zero',
- 'zone',
- 'zoo',
-]
diff --git a/packages/neuron-wallet/src/models/multisig-config.ts b/packages/neuron-wallet/src/models/multisig-config.ts
index 5c2258b7e5..a0a49f077d 100644
--- a/packages/neuron-wallet/src/models/multisig-config.ts
+++ b/packages/neuron-wallet/src/models/multisig-config.ts
@@ -1,4 +1,4 @@
-import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
+import { computeScriptHash as scriptToHash } from '@ckb-lumos/lumos/utils'
import Multisig from './multisig'
export default class MultisigConfigModel {
diff --git a/packages/neuron-wallet/src/models/multisig.ts b/packages/neuron-wallet/src/models/multisig.ts
index 39f2153d41..e2810df24d 100644
--- a/packages/neuron-wallet/src/models/multisig.ts
+++ b/packages/neuron-wallet/src/models/multisig.ts
@@ -1,6 +1,8 @@
import { MultisigPrefixError } from '../exceptions'
-import Blake2b from './blake2b'
import SystemScriptInfo from './system-script-info'
+import { since } from '@ckb-lumos/lumos'
+import { bytes, Uint64LE } from '@ckb-lumos/lumos/codec'
+import Blake2b, { BLAKE160_HEX_LENGTH } from './blake2b'
export interface MultisigPrefix {
S: string
@@ -11,7 +13,7 @@ export interface MultisigPrefix {
export default class Multisig {
// 1 epoch = 4h = 240min
- EPOCH_MINUTES = 240
+ static EPOCH_MINUTES = 240
static defaultS: string = '00'
@@ -24,32 +26,22 @@ export default class Multisig {
static hash(blake160s: string[], r: number = 0, m: number = 1, n: number = 1): string {
const serializeResult = Multisig.serialize(blake160s, r, m, n)
- return Blake2b.digest(serializeResult).slice(0, 42)
+ return Blake2b.digest(serializeResult).slice(0, BLAKE160_HEX_LENGTH)
}
- since(minutes: number, headerEpoch: string): string {
+ static since(minutes: number, headerEpoch: string): string {
if (minutes < 0) {
throw new Error("minutes to calculate since can't be less than 0")
}
- const currentEpochInfo = this.parseEpoch(BigInt(headerEpoch))
- const totalMinutes =
- minutes +
- parseInt(
- (
- (parseInt(currentEpochInfo.index.toString()) / parseInt(currentEpochInfo.length.toString())) *
- this.EPOCH_MINUTES
- ).toString()
- )
+ const currentEpoch = since.parseEpoch(headerEpoch)
+ const totalMinutes = minutes + Math.floor((currentEpoch.index / currentEpoch.length) * this.EPOCH_MINUTES)
const leftMinutes = totalMinutes % this.EPOCH_MINUTES
- const epochs: bigint =
- BigInt(parseInt((totalMinutes / this.EPOCH_MINUTES).toString(), 10)) + currentEpochInfo.number
- const result = this.epochSince(BigInt(this.EPOCH_MINUTES), BigInt(leftMinutes), epochs)
- const buf = Buffer.alloc(8)
- buf.writeBigUInt64LE(result)
- return `0x${buf.toString('hex')}`
+ const epochs = Math.floor(totalMinutes / this.EPOCH_MINUTES) + currentEpoch.number
+ const result = this.epochSince(BigInt(this.EPOCH_MINUTES), BigInt(leftMinutes), BigInt(epochs))
+ return bytes.hexify(Uint64LE.pack(result))
}
- args(blake160: string, minutes: number, headerEpoch: string): string {
+ static args(blake160: string, minutes: number, headerEpoch: string): string {
return Multisig.hash([blake160]) + this.since(minutes, headerEpoch).slice(2)
}
@@ -57,25 +49,14 @@ export default class Multisig {
return SystemScriptInfo.generateMultiSignScript(Multisig.hash(blake160s, r, m, n))
}
- parseSince(args: string): bigint {
- const str = args.slice(42)
- const buf = Buffer.from(str, 'hex')
- const sin: bigint = buf.readBigUInt64LE()
- return sin
+ static parseSince(args: string): bigint {
+ return Uint64LE.unpack(`0x${args.slice(BLAKE160_HEX_LENGTH)}`).toBigInt()
}
- private epochSince(length: bigint, index: bigint, number: bigint): bigint {
+ private static epochSince(length: bigint, index: bigint, number: bigint): bigint {
return (BigInt(0x20) << BigInt(56)) + (length << BigInt(40)) + (index << BigInt(24)) + number
}
- private parseEpoch(epoch: bigint) {
- return {
- length: (epoch >> BigInt(40)) & BigInt(0xffff),
- index: (epoch >> BigInt(24)) & BigInt(0xffff),
- number: epoch & BigInt(0xffffff),
- }
- }
-
private static getMultisigParamsHex(v: number) {
if (v < 0 || v > 255) {
throw new MultisigPrefixError()
diff --git a/packages/neuron-wallet/src/models/offline-sign.ts b/packages/neuron-wallet/src/models/offline-sign.ts
index 2fd73a0d93..934f5d3ad9 100644
--- a/packages/neuron-wallet/src/models/offline-sign.ts
+++ b/packages/neuron-wallet/src/models/offline-sign.ts
@@ -44,6 +44,7 @@ export interface OfflineSignJSON {
description?: string
asset_account?: AssetAccount
multisig_configs?: MultisigConfigs
+ signatures?: Signatures
}
export default class OfflineSign implements OfflineSignProps {
diff --git a/packages/neuron-wallet/src/models/subjects/command.ts b/packages/neuron-wallet/src/models/subjects/command.ts
index f840618928..bb5b27a86d 100644
--- a/packages/neuron-wallet/src/models/subjects/command.ts
+++ b/packages/neuron-wallet/src/models/subjects/command.ts
@@ -10,9 +10,10 @@ const CommandSubject = new Subject<{
| 'import-xpubkey'
| 'import-hardware'
| 'load-transaction-json'
- | 'migrate-acp'
| 'sign-verify'
| 'multisig-address'
+ | 'lock-window'
+ | 'import-exist-xpubkey'
payload: string | null
dispatchToUI: boolean
}>()
diff --git a/packages/neuron-wallet/src/models/subjects/multisig-config-db-changed-subject.ts b/packages/neuron-wallet/src/models/subjects/multisig-config-db-changed-subject.ts
index fc8358a5e8..cbdfd63c1f 100644
--- a/packages/neuron-wallet/src/models/subjects/multisig-config-db-changed-subject.ts
+++ b/packages/neuron-wallet/src/models/subjects/multisig-config-db-changed-subject.ts
@@ -2,7 +2,7 @@ import { ReplaySubject } from 'rxjs'
// subscribe this Subject to monitor any transaction table changes
export class MultisigConfigDbChangedSubject {
- private static subject = new ReplaySubject<'AfterInsert' | 'AfterRemove'>(100)
+ private static subject = new ReplaySubject<'AfterInsert' | 'AfterRemove' | 'UpdateStartBlockNumber'>(100)
public static getSubject() {
return MultisigConfigDbChangedSubject.subject
diff --git a/packages/neuron-wallet/src/models/synced-block-number.ts b/packages/neuron-wallet/src/models/synced-block-number.ts
index 35f98e9e0a..b76e9b92b0 100644
--- a/packages/neuron-wallet/src/models/synced-block-number.ts
+++ b/packages/neuron-wallet/src/models/synced-block-number.ts
@@ -28,7 +28,7 @@ export default class SyncedBlockNumber {
if (!this.#blockNumberEntity) {
let blockNumber = await getConnection()
.getRepository(SyncInfoEntity)
- .findOne({ name: SyncInfoEntity.CURRENT_BLOCK_NUMBER })
+ .findOneBy({ name: SyncInfoEntity.CURRENT_BLOCK_NUMBER })
if (!blockNumber) {
blockNumber = new SyncInfoEntity()
diff --git a/packages/neuron-wallet/src/models/transaction-size.ts b/packages/neuron-wallet/src/models/transaction-size.ts
index 072575950f..afbe471175 100644
--- a/packages/neuron-wallet/src/models/transaction-size.ts
+++ b/packages/neuron-wallet/src/models/transaction-size.ts
@@ -5,7 +5,7 @@ import Transaction from './chain/transaction'
import Multisig from './multisig'
import Script, { ScriptHashType } from './chain/script'
import BufferUtils from '../utils/buffer'
-import { bytes as byteUtils } from '@ckb-lumos/codec'
+import { bytes as byteUtils } from '@ckb-lumos/lumos/codec'
export default class TransactionSize {
// https://github.com/zhangsoledad/rfcs/blob/zhangsoledad/ckb2023-overview/rfcs/0008-serialization/0008-serialization.md#fixvec---fixed-vector
diff --git a/packages/neuron-wallet/src/services/addresses.ts b/packages/neuron-wallet/src/services/addresses.ts
index 91647a04e7..85b8cb4ffd 100644
--- a/packages/neuron-wallet/src/services/addresses.ts
+++ b/packages/neuron-wallet/src/services/addresses.ts
@@ -1,5 +1,8 @@
-import { AccountExtendedPublicKey, DefaultAddressNumber } from '../models/keys/key'
-import Address, { AddressType, publicKeyToAddress } from '../models/keys/address'
+import { hd } from '@ckb-lumos/lumos'
+import { bytes } from '@ckb-lumos/lumos/codec'
+import WalletService from './wallets'
+import { AddressNotFound } from '../exceptions'
+import { publicKeyToAddress, DefaultAddressNumber, addressToScript } from '../utils/scriptAndAddress'
import { Address as AddressInterface } from '../models/address'
import AddressCreatedSubject from '../models/subjects/address-created-subject'
import NetworksService from '../services/networks'
@@ -19,9 +22,9 @@ const MAX_ADDRESS_COUNT = 100
export interface AddressMetaInfo {
walletId: string
- addressType: AddressType
+ addressType: hd.AddressType
addressIndex: number
- accountExtendedPublicKey: AccountExtendedPublicKey
+ accountExtendedPublicKey: hd.AccountExtendedPublicKey
}
export default class AddressService {
@@ -58,7 +61,7 @@ export default class AddressService {
private static async generateAndSave(
walletId: string,
- extendedKey: AccountExtendedPublicKey,
+ extendedKey: hd.AccountExtendedPublicKey,
receivingStartIndex: number,
changeStartIndex: number,
receivingAddressCount: number = DefaultAddressNumber.Receiving,
@@ -90,25 +93,22 @@ export default class AddressService {
private static async recursiveGenerateAndSave(
walletId: string,
- extendedKey: AccountExtendedPublicKey,
+ extendedKey: hd.AccountExtendedPublicKey,
isImporting: boolean | undefined,
receivingAddressCount: number = DefaultAddressNumber.Receiving,
changeAddressCount: number = DefaultAddressNumber.Change
): Promise {
- const [unusedReceivingAddresses, unusedChangeAddresses] = await this.getGroupedUnusedAddressesByWalletId(walletId)
- const unusedReceivingCount = unusedReceivingAddresses.length
- const unusedChangeCount = unusedChangeAddresses.length
- if (unusedReceivingCount > this.minUnusedAddressCount && unusedChangeCount > this.minUnusedAddressCount) {
- return undefined
- }
- const maxReceivingAddressIndex = await this.maxAddressIndex(walletId, AddressType.Receiving)
- const maxChangeAddressIndex = await this.maxAddressIndex(walletId, AddressType.Change)
+ const [receivingCount, changeCount] = await this.getAddressCountsToFillGapLimit(
+ walletId,
+ receivingAddressCount,
+ changeAddressCount
+ )
+ if (!receivingCount && !changeCount) return undefined
+ const maxReceivingAddressIndex = await this.maxAddressIndex(walletId, hd.AddressType.Receiving)
+ const maxChangeAddressIndex = await this.maxAddressIndex(walletId, hd.AddressType.Change)
const nextReceivingIndex = maxReceivingAddressIndex === undefined ? 0 : maxReceivingAddressIndex + 1
const nextChangeIndex = maxChangeAddressIndex === undefined ? 0 : maxChangeAddressIndex + 1
- const receivingCount: number = unusedReceivingCount > this.minUnusedAddressCount ? 0 : receivingAddressCount
- const changeCount: number = unusedChangeCount > this.minUnusedAddressCount ? 0 : changeAddressCount
-
const currentGeneratedAddresses = await this.generateAndSave(
walletId,
extendedKey,
@@ -140,6 +140,20 @@ export default class AddressService {
return allGeneratedAddresses
}
+ public static async getAddressCountsToFillGapLimit(
+ walletId: string,
+ receivingAddressCount: number = DefaultAddressNumber.Receiving,
+ changeAddressCount: number = DefaultAddressNumber.Change
+ ) {
+ const [unusedReceivingAddresses, unusedChangeAddresses] = await this.getGroupedUnusedAddressesByWalletId(walletId)
+ const unusedReceivingCount = unusedReceivingAddresses.length
+ const unusedChangeCount = unusedChangeAddresses.length
+ return [
+ unusedReceivingCount > this.minUnusedAddressCount ? 0 : receivingAddressCount,
+ unusedChangeCount > this.minUnusedAddressCount ? 0 : changeAddressCount,
+ ]
+ }
+
public static async generateAndSaveForExtendedKey({
walletId,
extendedKey,
@@ -148,7 +162,7 @@ export default class AddressService {
changeAddressCount,
}: {
walletId: string
- extendedKey: AccountExtendedPublicKey
+ extendedKey: hd.AccountExtendedPublicKey
isImporting?: boolean
receivingAddressCount?: number
changeAddressCount?: number
@@ -176,7 +190,7 @@ export default class AddressService {
}: {
walletId: string
publicKey: string
- addressType: AddressType
+ addressType: hd.AddressType
addressIndex: number
}): Promise {
const isMainnet = NetworksService.getInstance().isMainnet()
@@ -212,7 +226,7 @@ export default class AddressService {
// Generate both receiving and change addresses.
public static generateAddresses = (
walletId: string,
- extendedKey: AccountExtendedPublicKey,
+ extendedKey: hd.AccountExtendedPublicKey,
receivingStartIndex: number,
changeStartIndex: number,
receivingAddressCount: number = DefaultAddressNumber.Receiving,
@@ -227,7 +241,7 @@ export default class AddressService {
const receiving = Array.from({ length: receivingAddressCount }).map((_, idx) => {
const addressMetaInfo: AddressMetaInfo = {
walletId,
- addressType: AddressType.Receiving,
+ addressType: hd.AddressType.Receiving,
addressIndex: idx + receivingStartIndex,
accountExtendedPublicKey: extendedKey,
}
@@ -236,7 +250,7 @@ export default class AddressService {
const change = Array.from({ length: changeAddressCount }).map((_, idx) => {
const addressMetaInfo: AddressMetaInfo = {
walletId,
- addressType: AddressType.Change,
+ addressType: hd.AddressType.Change,
addressIndex: idx + changeStartIndex,
accountExtendedPublicKey: extendedKey,
}
@@ -249,28 +263,24 @@ export default class AddressService {
}
private static toAddress = (addressMetaInfo: AddressMetaInfo): AddressInterface => {
- const path: string = Address.pathFor(addressMetaInfo.addressType, addressMetaInfo.addressIndex)
- const address: string = addressMetaInfo.accountExtendedPublicKey.address(
+ const info = addressMetaInfo.accountExtendedPublicKey.publicKeyInfo(
addressMetaInfo.addressType,
- addressMetaInfo.addressIndex,
- NetworksService.getInstance().isMainnet()
- ).address
-
- const blake160: string = AddressParser.toBlake160(address)
+ addressMetaInfo.addressIndex
+ )
- const addressInfo: AddressInterface = {
+ const address: AddressInterface = {
walletId: addressMetaInfo.walletId,
- address,
- path,
+ address: publicKeyToAddress(info.publicKey, NetworksService.getInstance().isMainnet()),
+ path: info.path,
addressType: addressMetaInfo.addressType,
addressIndex: addressMetaInfo.addressIndex,
- blake160,
+ blake160: info.blake160,
}
- return addressInfo
+ return address
}
- private static async maxAddressIndex(walletId: string, addressType: AddressType): Promise {
+ private static async maxAddressIndex(walletId: string, addressType: hd.AddressType): Promise {
const result = await getConnection()
.getRepository(HdPublicKeyInfo)
.createQueryBuilder()
@@ -289,8 +299,8 @@ export default class AddressService {
private static async getGroupedUnusedAddressesByWalletId(walletId: string) {
const allUnusedAddresses = await this.getUnusedAddressesByWalletId(walletId)
- const unusedReceivingAddresses = allUnusedAddresses.filter(addr => addr.addressType === AddressType.Receiving)
- const unusedChangeAddresses = allUnusedAddresses.filter(addr => addr.addressType === AddressType.Change)
+ const unusedReceivingAddresses = allUnusedAddresses.filter(addr => addr.addressType === hd.AddressType.Receiving)
+ const unusedChangeAddresses = allUnusedAddresses.filter(addr => addr.addressType === hd.AddressType.Change)
return [unusedReceivingAddresses, unusedChangeAddresses]
}
@@ -342,7 +352,7 @@ export default class AddressService {
const publicKeyInfo = await getConnection()
.getRepository(HdPublicKeyInfo)
.createQueryBuilder()
- .where({ walletId, addressType: AddressType.Receiving })
+ .where({ walletId, addressType: hd.AddressType.Receiving })
.orderBy('addressIndex', 'ASC')
.getOne()
@@ -438,4 +448,35 @@ export default class AddressService {
public static async deleteByWalletId(walletId: string): Promise {
await getConnection().createQueryBuilder().delete().from(HdPublicKeyInfo).where({ walletId }).execute()
}
+
+ public static async getPrivateKeyByAddress({
+ walletID,
+ password,
+ address,
+ }: {
+ walletID: string
+ password: string
+ address?: string
+ }): Promise {
+ const wallet = WalletService.getInstance().get(walletID)
+ const addresses = await AddressService.getAddressesByWalletId(walletID)
+ let addr = address ? addresses.find(addr => addr.address === address) : addresses[0]
+
+ if (!addr && address) {
+ const lock = addressToScript(address)
+ addr = addresses.find(a => a.blake160 === lock.args)
+ }
+
+ if (!addr) {
+ throw new AddressNotFound()
+ }
+
+ const masterPrivateKey = wallet.loadKeystore().extendedPrivateKey(password)
+ const masterKeychain = new hd.Keychain(
+ Buffer.from(bytes.bytify(masterPrivateKey.privateKey)),
+ Buffer.from(bytes.bytify(masterPrivateKey.chainCode))
+ )
+
+ return `0x${masterKeychain.derivePath(addr.path).privateKey.toString('hex')}`
+ }
}
diff --git a/packages/neuron-wallet/src/services/amend-transaction.ts b/packages/neuron-wallet/src/services/amend-transaction.ts
new file mode 100644
index 0000000000..b3eb96f545
--- /dev/null
+++ b/packages/neuron-wallet/src/services/amend-transaction.ts
@@ -0,0 +1,21 @@
+import { getConnection } from '../database/chain/connection'
+import AmendTransactionEntity from '../database/chain/entities/amend-transaction'
+
+export default class AmendTransactionService {
+ static async save(hash: string, amendHash: string) {
+ const exist = await getConnection().getRepository(AmendTransactionEntity).findOneBy({
+ hash,
+ amendHash,
+ })
+ if (exist) {
+ return
+ }
+
+ const amendTransactionEntity = AmendTransactionEntity.fromObject({
+ hash,
+ amendHash,
+ })
+
+ return await getConnection().manager.save(amendTransactionEntity)
+ }
+}
diff --git a/packages/neuron-wallet/src/services/anyone-can-pay.ts b/packages/neuron-wallet/src/services/anyone-can-pay.ts
index bfe9b8af33..054fbbc625 100644
--- a/packages/neuron-wallet/src/services/anyone-can-pay.ts
+++ b/packages/neuron-wallet/src/services/anyone-can-pay.ts
@@ -18,9 +18,11 @@ import LiveCellService from './live-cell-service'
import WalletService from './wallets'
import SystemScriptInfo from '../models/system-script-info'
import CellsService from './cells'
-import { MIN_SUDT_CAPACITY } from '../utils/const'
+import { MIN_SUDT_CAPACITY, UDTType } from '../utils/const'
import NetworksService from './networks'
import { NetworkType } from '../models/network'
+import BufferUtils from '../utils/buffer'
+import { helpers } from '@ckb-lumos/lumos'
export default class AnyoneCanPayService {
public static async generateAnyoneCanPayTx(
@@ -57,7 +59,7 @@ export default class AnyoneCanPayService {
const targetOutput = isCKB
? await AnyoneCanPayService.getCKBTargetOutput(targetLockScript)
- : await AnyoneCanPayService.getSUDTTargetOutput(targetLockScript, tokenID)
+ : await AnyoneCanPayService.getSUDTTargetOutput(targetLockScript, tokenID, assetAccount.udtType!)
const wallet = WalletService.getInstance().get(walletID)
const changeBlake160: string = (await wallet.getNextChangeAddress())!.blake160
@@ -112,18 +114,19 @@ export default class AnyoneCanPayService {
throw new TargetLockError()
}
- private static async getSUDTTargetOutput(lockScript: Script, tokenID: string) {
+ private static async getSUDTTargetOutput(lockScript: Script, tokenID: string, udtType: UDTType) {
if (SystemScriptInfo.isSecpScript(lockScript)) {
return Output.fromObject({
- capacity: BigInt(MIN_SUDT_CAPACITY).toString(),
lock: lockScript,
- type: new AssetAccountInfo().generateSudtScript(tokenID),
+ type: new AssetAccountInfo().generateUdtScript(tokenID, udtType),
+ // use amount 0 to place holder amount
+ data: BufferUtils.writeBigUInt128LE(BigInt(0)),
})
}
const liveCellService = LiveCellService.getInstance()
const targetOutputLiveCell: LiveCell | null = await liveCellService.getOneByLockScriptAndTypeScript(
lockScript,
- new AssetAccountInfo().generateSudtScript(tokenID)
+ new AssetAccountInfo().generateUdtScript(tokenID, udtType)!
)
if (targetOutputLiveCell && new AssetAccountInfo().isAnyoneCanPayScript(lockScript)) {
return Output.fromObject({
@@ -136,29 +139,38 @@ export default class AnyoneCanPayService {
}
return Output.fromObject({
- capacity: AnyoneCanPayService.getSUDTAddCapacity(lockScript.args),
lock: lockScript,
- type: new AssetAccountInfo().generateSudtScript(tokenID),
+ type: new AssetAccountInfo().generateUdtScript(tokenID, udtType),
+ // use amount 0 to place holder amount
+ data: BufferUtils.writeBigUInt128LE(BigInt(0)),
})
}
- private static getSUDTAddCapacity(args: string) {
- const addArgsLength = BigInt(args.slice(2).length / 2 - 20) * BigInt(10 ** 8)
- return (addArgsLength + BigInt(MIN_SUDT_CAPACITY)).toString()
- }
-
- public static async getHoldSUDTCellCapacity(lockScript: Script, tokenID: string) {
+ public static async getHoldSUDTCellCapacity(lockScript: Script, tokenID: string, udtType?: UDTType) {
if (SystemScriptInfo.isSecpScript(lockScript) || tokenID === 'CKBytes') {
return undefined
}
const liveCellService = LiveCellService.getInstance()
+ const typeScript = new AssetAccountInfo().generateUdtScript(tokenID, udtType)
+ if (!typeScript) {
+ return undefined
+ }
const targetOutputLiveCell: LiveCell | null = await liveCellService.getOneByLockScriptAndTypeScript(
lockScript,
- new AssetAccountInfo().generateSudtScript(tokenID)
+ typeScript
)
if (targetOutputLiveCell && new AssetAccountInfo().isAnyoneCanPayScript(lockScript)) {
return undefined
}
- return AnyoneCanPayService.getSUDTAddCapacity(lockScript.args)
+ return helpers
+ .minimalCellCapacity({
+ cellOutput: {
+ capacity: MIN_SUDT_CAPACITY.toString(),
+ lock: lockScript,
+ type: typeScript,
+ },
+ data: BufferUtils.writeBigUInt128LE(BigInt(0)),
+ })
+ .toString()
}
}
diff --git a/packages/neuron-wallet/src/services/asset-account-service.ts b/packages/neuron-wallet/src/services/asset-account-service.ts
index 7dc8f4689c..cc5cb5a15f 100644
--- a/packages/neuron-wallet/src/services/asset-account-service.ts
+++ b/packages/neuron-wallet/src/services/asset-account-service.ts
@@ -1,4 +1,4 @@
-import { In } from 'typeorm'
+import { In, IsNull } from 'typeorm'
import { getConnection } from '../database/chain/connection'
import BufferUtils from '../utils/buffer'
import OutputEntity from '../database/chain/entities/output'
@@ -15,26 +15,35 @@ import WalletService from './wallets'
import OutPoint from '../models/chain/out-point'
import SystemScriptInfo from '../models/system-script-info'
import Input from '../models/chain/input'
-import { MIN_CELL_CAPACITY } from '../utils/const'
+import { MIN_CELL_CAPACITY, UDTType } from '../utils/const'
import SudtTokenInfoService from './sudt-token-info'
export default class AssetAccountService {
- private static async getACPCells(publicKeyHash: string, tokenId: string = 'CKBytes') {
+ public static async getACPCells(
+ publicKeyHash: string,
+ tokenId: string = 'CKBytes',
+ udtType?: UDTType,
+ outpoint?: OutPoint
+ ) {
const assetAccountInfo = new AssetAccountInfo()
const anyoneCanPayLockHash = assetAccountInfo.generateAnyoneCanPayScript(publicKeyHash).computeHash()
- let typeHash = null
- if (tokenId !== 'CKBytes') {
- typeHash = assetAccountInfo.generateSudtScript(tokenId).computeHash()
- }
+
const outputs = await getConnection()
.getRepository(OutputEntity)
- .createQueryBuilder('output')
- .where({
+ .findBy({
status: In([OutputStatus.Live, OutputStatus.Sent]),
lockHash: anyoneCanPayLockHash,
- typeHash,
+ typeHash:
+ tokenId !== 'CKBytes'
+ ? assetAccountInfo.generateUdtScript(tokenId, udtType ?? UDTType.SUDT)!.computeHash()
+ : IsNull(),
+ ...(outpoint
+ ? {
+ outPointTxHash: outpoint.txHash,
+ outPointIndex: outpoint.index,
+ }
+ : {}),
})
- .getMany()
return outputs
}
@@ -55,10 +64,18 @@ export default class AssetAccountService {
return availableBalance >= 0 ? availableBalance.toString() : BigInt(0)
}
- private static async calculateUDTAccountBalance(publicKeyHash: string, tokenId: string) {
+ public static async calculateUDTAccountBalance(
+ publicKeyHash: string,
+ tokenId: string,
+ udtType?: UDTType,
+ outpoint?: OutPoint
+ ) {
const assetAccountInfo = new AssetAccountInfo()
const anyoneCanPayLockHash = assetAccountInfo.generateAnyoneCanPayScript(publicKeyHash).computeHash()
- const typeHash = assetAccountInfo.generateSudtScript(tokenId).computeHash()
+ const typeHash =
+ udtType === UDTType.SUDT
+ ? assetAccountInfo.generateSudtScript(tokenId).computeHash()
+ : assetAccountInfo.generateXudtScript(tokenId).computeHash()
const outputs = await getConnection()
.getRepository(OutputEntity)
.createQueryBuilder('output')
@@ -66,6 +83,12 @@ export default class AssetAccountService {
status: In([OutputStatus.Live, OutputStatus.Sent]),
lockHash: anyoneCanPayLockHash,
typeHash,
+ ...(outpoint
+ ? {
+ outPointTxHash: outpoint.txHash,
+ outPointIndex: outpoint.index,
+ }
+ : {}),
})
.getMany()
@@ -77,7 +100,11 @@ export default class AssetAccountService {
}
public static async destroyAssetAccount(walletID: string, assetAccount: AssetAccount) {
- const cells = await AssetAccountService.getACPCells(assetAccount?.blake160, assetAccount.tokenID)
+ const cells = await AssetAccountService.getACPCells(
+ assetAccount?.blake160,
+ assetAccount.tokenID,
+ assetAccount.udtType
+ )
const inputs = cells.map(cell => {
return Input.fromObject({
previousOutput: cell.outPoint(),
@@ -108,6 +135,45 @@ export default class AssetAccountService {
}
}
+ public static async generateRecycleUDTCellTx(params: {
+ walletId: string
+ holder: string
+ tokenID: string
+ receiver: string
+ udtType?: UDTType
+ outpoint?: CKBComponents.OutPoint
+ }) {
+ const { walletId, holder, tokenID, receiver, udtType, outpoint } = params
+ const cells = await AssetAccountService.getACPCells(holder, tokenID, udtType, outpoint)
+
+ if (!cells.length) {
+ throw new Error(`No cells found!`)
+ }
+
+ const inputs = cells.map(cell => {
+ return Input.fromObject({
+ previousOutput: cell.outPoint(),
+ capacity: cell.capacity,
+ lock: cell.lockScript(),
+ type: cell.typeScript(),
+ lockHash: cell.lockHash,
+ typeHash: cell.typeHash,
+ data: cell.data,
+ since: '0',
+ })
+ })
+
+ const tx = await TransactionGenerator.generateDestroyAssetAccountTx(
+ walletId,
+ inputs,
+ receiver,
+ tokenID === 'CKBytes',
+ true
+ )
+
+ return tx
+ }
+
public static async getAll(walletId: string): Promise {
const determineTokenID = (account: AssetAccountEntity) =>
account.tokenID.startsWith('0x') ? account.tokenID : 'CKBytes'
@@ -132,7 +198,7 @@ export default class AssetAccountService {
const model = aa.toModel()
const tokenID = determineTokenID(aa)
- const cells = await this.getACPCells(aa.blake160, tokenID)
+ const cells = await this.getACPCells(aa.blake160, tokenID, aa.udtType)
if (!cells.length) {
return
}
@@ -141,7 +207,7 @@ export default class AssetAccountService {
const bigIntAmount = await this.calculateAvailableCKBBalance(aa.blake160)
model.balance = bigIntAmount.toString()
} else {
- const bigIntAmount = await this.calculateUDTAccountBalance(aa.blake160, aa.tokenID)
+ const bigIntAmount = await this.calculateUDTAccountBalance(aa.blake160, aa.tokenID, aa.udtType)
model.balance = bigIntAmount.toString()
}
@@ -177,23 +243,38 @@ export default class AssetAccountService {
const bitIntAmount = await this.calculateAvailableCKBBalance(assetAccount.blake160)
assetAccount.balance = bitIntAmount.toString()
} else {
- const bigIntAmount = await this.calculateUDTAccountBalance(assetAccount.blake160, assetAccount.tokenID)
+ const bigIntAmount = await this.calculateUDTAccountBalance(
+ assetAccount.blake160,
+ assetAccount.tokenID,
+ assetAccount.udtType
+ )
assetAccount.balance = bigIntAmount.toString()
}
return assetAccount
}
- public static async generateCreateTx(
- walletID: string,
- tokenID: string,
- symbol: string,
- accountName: string,
- tokenName: string,
- decimal: string,
- feeRate: string,
+ public static async generateCreateTx({
+ walletID,
+ tokenID,
+ symbol,
+ accountName,
+ tokenName,
+ decimal,
+ feeRate,
+ fee,
+ udtType,
+ }: {
+ walletID: string
+ tokenID: string
+ symbol: string
+ accountName: string
+ tokenName: string
+ decimal: string
+ feeRate: string
fee: string
- ): Promise<{
+ udtType?: UDTType
+ }): Promise<{
assetAccount: AssetAccount
tx: Transaction
}> {
@@ -209,31 +290,42 @@ export default class AssetAccountService {
const addrObj = !wallet.isHDWallet() ? addresses[0] : addresses.find(a => !usedBlake160s.has(a.blake160))!
// 2. generate AssetAccount object
- const assetAccount = new AssetAccount(tokenID, symbol, accountName, tokenName, decimal, '0', addrObj.blake160)
+ const assetAccount = AssetAccount.fromObject({
+ tokenID,
+ symbol,
+ accountName,
+ tokenName,
+ decimal,
+ balance: '0',
+ blake160: addrObj.blake160,
+ udtType,
+ })
// 3. generate tx
const changeAddrObj = await wallet.getNextChangeAddress()
let tx: Transaction | undefined
try {
- tx = await TransactionGenerator.generateCreateAnyoneCanPayTx(
+ tx = await TransactionGenerator.generateCreateAnyoneCanPayTx({
tokenID,
- walletID,
- addrObj.blake160,
- changeAddrObj!.blake160,
+ walletId: walletID,
+ blake160: addrObj.blake160,
+ changeBlake160: changeAddrObj!.blake160,
feeRate,
- fee
- )
+ fee,
+ udtType,
+ })
} catch (err) {
if (!(err instanceof CapacityNotEnoughForChange)) {
throw err
}
- tx = await TransactionGenerator.generateCreateAnyoneCanPayTxUseAllBalance(
+ tx = await TransactionGenerator.generateCreateAnyoneCanPayTxUseAllBalance({
tokenID,
- walletID,
- addrObj.blake160,
+ walletId: walletID,
+ blake160: addrObj.blake160,
feeRate,
- fee
- )
+ fee,
+ udtType,
+ })
}
return {
@@ -242,12 +334,12 @@ export default class AssetAccountService {
}
}
- public static async checkAndSaveAssetAccountWhenSync(tokenID: string, blake160: string) {
+ public static async checkAndSaveAssetAccountWhenSync(tokenID: string, blake160: string, udtType?: UDTType) {
const isCKB = tokenID === 'CKBytes'
const decimal = isCKB ? '8' : ''
const symbol = isCKB ? 'CKB' : ''
const tokenName = isCKB ? 'CKBytes' : ''
- const assetAccount = new AssetAccount(tokenID, symbol, '', tokenName, decimal, '0', blake160)
+ const assetAccount = new AssetAccount(tokenID, symbol, '', tokenName, decimal, '0', blake160, undefined, udtType)
const assetAccountEntity = AssetAccountEntity.fromModel(assetAccount)
await SudtTokenInfoService.insertSudtTokenInfo(assetAccountEntity.sudtTokenInfo)
const existAccountAccount = await getConnection()
@@ -328,6 +420,18 @@ export default class AssetAccountService {
return assetAccounts.map(aa => aa.blake160)
}
+ private static async getExistAssetAccount(assetAccount: AssetAccount) {
+ return getConnection()
+ .getRepository(AssetAccountEntity)
+ .createQueryBuilder()
+ .where({
+ tokenID: assetAccount.tokenID,
+ blake160: assetAccount.blake160,
+ udtType: assetAccount.udtType ?? IsNull(),
+ })
+ .getOne()
+ }
+
public static async sendTx(
walletID: string,
assetAccount: AssetAccount,
@@ -337,12 +441,9 @@ export default class AssetAccountService {
): Promise {
// 1. check AssetAccount exists
const connection = getConnection()
- const exists = await connection.manager.query(
- `SELECT EXISTS (SELECT 1 FROM asset_account where tokenID = ? AND blake160 = ?) as exist`,
- [assetAccount.tokenID, assetAccount.blake160]
- )
+ const exists = await AssetAccountService.getExistAssetAccount(assetAccount)
- if (exists[0].exist === 1 && walletID) {
+ if (exists && walletID) {
// For hardware wallet in ckb asset account:
// 1. If a ckb account has been created, another one cannot be created;
// 2. If a ckb account has been destroyed, ckb account can be created.
@@ -350,7 +451,11 @@ export default class AssetAccountService {
if (wallet.isHardware()) {
const address = await wallet.getNextAddress()
if (address) {
- const acpCells = await AssetAccountService.getACPCells(address.blake160, assetAccount.tokenID)
+ const acpCells = await AssetAccountService.getACPCells(
+ address.blake160,
+ assetAccount.tokenID,
+ assetAccount.udtType
+ )
if (acpCells.length) {
throw new Error(`Asset account already exists!`)
} else {
@@ -358,10 +463,14 @@ export default class AssetAccountService {
.createQueryBuilder()
.delete()
.from(AssetAccountEntity)
- .where('tokenID = :tokenID AND blake160 = :blake160', {
- tokenID: assetAccount.tokenID,
- blake160: assetAccount.blake160,
- })
+ .where(
+ `tokenID = :tokenID AND blake160 = :blake160 ${assetAccount.udtType ? 'AND udtType = :udtType' : ''}`,
+ {
+ tokenID: assetAccount.tokenID,
+ blake160: assetAccount.blake160,
+ udtType: assetAccount.udtType,
+ }
+ )
.execute()
}
}
@@ -492,7 +601,12 @@ export default class AssetAccountService {
}
const tokenId = chequeLiveCell.type!.args
- const assetAccount = new AssetAccount(tokenId, '', '', '', '', '0', receiverAcpScript.args)
+ const udtType = assetAccountInfo.isSudtScript(chequeLiveCell.type!)
+ ? UDTType.SUDT
+ : assetAccountInfo.isXudtScript(chequeLiveCell.type!)
+ ? UDTType.XUDT
+ : undefined
+ const assetAccount = new AssetAccount(tokenId, '', '', '', '', '0', receiverAcpScript.args, undefined, udtType)
return { tx, assetAccount }
}
diff --git a/packages/neuron-wallet/src/services/cells.ts b/packages/neuron-wallet/src/services/cells.ts
index ad3b73c57c..235648ef46 100644
--- a/packages/neuron-wallet/src/services/cells.ts
+++ b/packages/neuron-wallet/src/services/cells.ts
@@ -1,5 +1,5 @@
-import { Brackets, In, IsNull, type ObjectLiteral } from 'typeorm'
-import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
+import { Brackets, In, IsNull, Not, type ObjectLiteral } from 'typeorm'
+import { computeScriptHash as scriptToHash } from '@ckb-lumos/lumos/utils'
import { getConnection } from '../database/chain/connection'
import { scriptToAddress, addressToScript } from '../utils/scriptAndAddress'
import {
@@ -31,7 +31,7 @@ import AssetAccountInfo from '../models/asset-account-info'
import NFT from '../models/nft'
import MultisigConfigModel from '../models/multisig-config'
import MultisigOutput from '../database/chain/entities/multisig-output'
-import { bytes } from '@ckb-lumos/codec'
+import { bytes } from '@ckb-lumos/lumos/codec'
import { generateRPC } from '../utils/ckb-rpc'
import { getClusterById, SporeData, unpackToRawClusterData } from '@spore-sdk/core'
import NetworksService from './networks'
@@ -39,6 +39,7 @@ import { LOCKTIME_ARGS_LENGTH, MIN_CELL_CAPACITY } from '../utils/const'
import HdPublicKeyInfo from '../database/chain/entities/hd-public-key-info'
import CellLocalInfoService from './cell-local-info'
import CellLocalInfo from '../database/chain/entities/cell-local-info'
+import { helpers } from '@ckb-lumos/lumos'
export interface PaginationResult {
totalCount: number
@@ -57,6 +58,7 @@ export enum CustomizedType {
NFTIssuer = 'NFTIssuer',
SUDT = 'SUDT',
+ XUDT = 'XUDT',
Spore = 'Spore',
SporeCluster = 'SporeCluster',
@@ -79,13 +81,13 @@ export enum TypeScriptCategory {
NFTClass = CustomizedType.NFTClass,
NFTIssuer = CustomizedType.NFTIssuer,
SUDT = CustomizedType.SUDT,
+ XUDT = CustomizedType.XUDT,
Spore = CustomizedType.Spore,
Unknown = CustomizedType.Unknown,
}
export default class CellsService {
private static ANYONE_CAN_PAY_CKB_CELL_MIN = BigInt(61 * 10 ** 8)
- private static ANYONE_CAN_PAY_SUDT_CELL_MIN = BigInt(142 * 10 ** 8)
public static async getBalancesByWalletId(walletId: string): Promise<{
liveBalances: Map
@@ -221,14 +223,13 @@ export default class CellsService {
return cells
}
- public static async getDaoCells(walletId: string): Promise {
+ public static async getDaoCells(walletId: string, lockArgs?: string): Promise {
const outputs: OutputEntity[] = await getConnection()
.getRepository(OutputEntity)
.createQueryBuilder('output')
.leftJoinAndSelect('output.transaction', 'tx')
.where(
- `
- output.daoData IS NOT NULL AND
+ `output.daoData IS NOT NULL AND
(
output.status = :liveStatus OR
output.status = :sentStatus OR
@@ -240,14 +241,17 @@ export default class CellsService {
) AND
output.depositTxHash is not null
)
- ) AND
- output.lockArgs in (
+ ) AND ${
+ lockArgs
+ ? `output.lockArgs = :lockArgs`
+ : `output.lockArgs in (
SELECT publicKeyInBlake160
FROM hd_public_key_info
- WHERE walletId = :walletId
- )`,
+ WHERE walletId = :walletId)`
+ }`,
{
walletId,
+ lockArgs,
liveStatus: OutputStatus.Live,
sentStatus: OutputStatus.Sent,
failedStatus: TransactionStatus.Failed,
@@ -296,6 +300,7 @@ export default class CellsService {
const nftClassCodehash = assetAccountInfo.getNftClassInfo().codeHash
const nftCodehash = assetAccountInfo.getNftInfo().codeHash
const sudtCodehash = assetAccountInfo.getSudtCodeHash()
+ const xudtCodeHash = assetAccountInfo.infos.xudt.codeHash
const sporeInfos = assetAccountInfo.getSporeInfos()
const secp256k1LockHashes = [...blake160Hashes].map(blake160 =>
@@ -304,7 +309,7 @@ export default class CellsService {
const skip = (pageNo - 1) * pageSize
- const allMultiSignOutputs = await getConnection()
+ const allCustomizedOutputs = await getConnection()
.getRepository(OutputEntity)
.createQueryBuilder('output')
.leftJoinAndSelect('output.transaction', 'tx')
@@ -365,7 +370,7 @@ export default class CellsService {
// to make the Spore NFT data available,
// we need to fetch it from RPC instead of database
const rpc = generateRPC(currentNetwork.remote, currentNetwork.type)
- const sporeOutputs = allMultiSignOutputs.filter(item =>
+ const sporeOutputs = allCustomizedOutputs.filter(item =>
sporeInfos.some(info => item.typeCodeHash && bytes.equal(info.codeHash, item.typeCodeHash))
)
@@ -393,7 +398,7 @@ export default class CellsService {
})
)
- const matchedOutputs = allMultiSignOutputs.filter(o => {
+ const matchedOutputs = allCustomizedOutputs.filter(o => {
if (o.multiSignBlake160) {
return multiSignHashes.has(o.multiSignBlake160)
}
@@ -406,7 +411,11 @@ export default class CellsService {
)
}
- if (o.hasData && o.typeCodeHash === sudtCodehash && o.lockCodeHash === assetAccountInfo.anyoneCanPayCodeHash) {
+ if (
+ o.hasData &&
+ (o.typeCodeHash === sudtCodehash || o.typeCodeHash === xudtCodeHash) &&
+ o.lockCodeHash === assetAccountInfo.anyoneCanPayCodeHash
+ ) {
return false
}
@@ -466,10 +475,16 @@ export default class CellsService {
})
} else if (o.typeCodeHash === sudtCodehash) {
cell.setCustomizedAssetInfo({
- lock: CustomizedLock.SUDT,
+ lock: '',
type: CustomizedType.SUDT,
data: '',
})
+ } else if (o.typeCodeHash === xudtCodeHash) {
+ cell.setCustomizedAssetInfo({
+ lock: '',
+ type: CustomizedType.XUDT,
+ data: '',
+ })
} else if (sporeInfos.some(info => o.typeCodeHash && bytes.equal(info.codeHash, o.typeCodeHash))) {
const data = (() => {
try {
@@ -506,7 +521,7 @@ export default class CellsService {
}
public static getLiveCell = async (outPoint: OutPoint): Promise => {
- const cellEntity: OutputEntity | undefined = await CellsService.getLiveCellEntity(outPoint)
+ const cellEntity = await CellsService.getLiveCellEntity(outPoint)
if (!cellEntity) {
return undefined
@@ -515,8 +530,8 @@ export default class CellsService {
return cellEntity.toModel()
}
- private static getLiveCellEntity = async (outPoint: OutPoint): Promise => {
- const cellEntity: OutputEntity | undefined = await getConnection().getRepository(OutputEntity).findOne({
+ private static getLiveCellEntity = async (outPoint: OutPoint): Promise => {
+ const cellEntity = await getConnection().getRepository(OutputEntity).findOneBy({
outPointTxHash: outPoint.txHash,
outPointIndex: outPoint.index,
status: 'live',
@@ -1113,8 +1128,14 @@ export default class CellsService {
} else {
totalSize += TransactionSize.secpLockWitness()
inputOriginCells.push(cell)
- // capacity - 142CKB, 142CKB remaining for change
- inputCapacities -= this.ANYONE_CAN_PAY_SUDT_CELL_MIN
+ inputCapacities -= helpers.minimalCellCapacity({
+ cellOutput: {
+ capacity: cell.capacity,
+ lock: cell.lock(),
+ type: cell.type(),
+ },
+ data: cell.data,
+ })
totalSize += TransactionSize.sudtAnyoneCanPayOutput() + TransactionSize.sudtData()
}
inputs.push(input)
@@ -1141,12 +1162,20 @@ export default class CellsService {
.map(i => BigInt(i.capacity!))
.reduce((result, c) => result + c, BigInt(0))
let capacity: bigint = BigInt(0)
- if (BigInt(cellCapacity) - this.ANYONE_CAN_PAY_SUDT_CELL_MIN >= extraPayCapacity) {
+ const curCellMinCapacity = helpers.minimalCellCapacity({
+ cellOutput: {
+ capacity: cell.capacity,
+ lock: cell.lock(),
+ type: cell.type(),
+ },
+ data: cell.data,
+ })
+ if (BigInt(cellCapacity) - curCellMinCapacity >= extraPayCapacity) {
capacity = BigInt(cellCapacity) - extraPayCapacity
extraPayCapacity = BigInt(0)
} else {
- capacity = this.ANYONE_CAN_PAY_SUDT_CELL_MIN
- extraPayCapacity = extraPayCapacity - (BigInt(cellCapacity) - this.ANYONE_CAN_PAY_SUDT_CELL_MIN)
+ capacity = curCellMinCapacity
+ extraPayCapacity = extraPayCapacity - (BigInt(cellCapacity) - curCellMinCapacity)
}
const output = Output.fromObject({
capacity: capacity.toString(),
@@ -1292,6 +1321,15 @@ export default class CellsService {
return {}
}
const lockHashes = multisigAddresses.map(v => scriptToHash(addressToScript(v)))
+
+ const outputs = await getConnection()
+ .getRepository(OutputEntity)
+ .createQueryBuilder('output')
+ .where('output.lockHash IN (:...lockHashes)', { lockHashes })
+ .andWhere('output.hasData = :hasData', { hasData: true })
+ .andWhere('output.typeHash IS NOT NULL')
+ .getMany()
+
const connection = await getConnection()
const [sql, parameters] = connection.driver.escapeQueryWithParameters(
`
@@ -1331,6 +1369,18 @@ export default class CellsService {
] = c.balance
})
+ outputs.forEach(item => {
+ const key = scriptToAddress(
+ {
+ args: item.lockArgs,
+ codeHash: SystemScriptInfo.MULTI_SIGN_CODE_HASH,
+ hashType: SystemScriptInfo.MULTI_SIGN_HASH_TYPE,
+ },
+ isMainnet
+ )
+ balances[key] = (BigInt(balances[key]) - BigInt(item.capacity)).toString()
+ })
+
return balances
}
@@ -1365,6 +1415,8 @@ export default class CellsService {
return TypeScriptCategory.NFTClass
case assetAccountInfo.getSudtCodeHash():
return TypeScriptCategory.SUDT
+ case assetAccountInfo.infos.xudt.codeHash:
+ return TypeScriptCategory.XUDT
case SystemScriptInfo.DAO_CODE_HASH:
return TypeScriptCategory.DAO
default:
@@ -1379,4 +1431,41 @@ export default class CellsService {
}
}
}
+
+ public static async getDaoWithdrawAndDeposit(unlockHash: string) {
+ const inputEntities = await getConnection()
+ .getRepository(InputEntity)
+ .createQueryBuilder('input')
+ .where({
+ transactionHash: unlockHash,
+ data: Not('0x'),
+ typeCodeHash: SystemScriptInfo.DAO_CODE_HASH,
+ typeHashType: SystemScriptInfo.DAO_HASH_TYPE,
+ })
+ .getMany()
+ if (!inputEntities.length) throw new Error(`This is not an unlock dao transaction ${unlockHash}`)
+ const inputPreviousTxHashes = inputEntities.map(v => v.outPointTxHash)
+ const outputEntities = await getConnection()
+ .getRepository(OutputEntity)
+ .createQueryBuilder('output')
+ .leftJoinAndSelect('output.transaction', 'tx')
+ .where({ outPointTxHash: In(inputPreviousTxHashes), depositTxHash: Not(IsNull()) })
+ .getMany()
+ if (!outputEntities.length) throw new Error(`${unlockHash} is not a DAO transaction`)
+ return inputEntities
+ .map(v => {
+ const withdrawOutput = outputEntities.find(
+ o => o.outPointTxHash === v.outPointTxHash && o.outPointIndex === v.outPointIndex
+ )
+ if (!withdrawOutput) return
+ return {
+ withdrawBlockHash: withdrawOutput.transaction.blockHash,
+ depositOutPoint: OutPoint.fromSDK({
+ txHash: withdrawOutput!.depositTxHash,
+ index: withdrawOutput!.depositIndex,
+ }),
+ }
+ })
+ .filter((v): v is { withdrawBlockHash: string; depositOutPoint: OutPoint } => !!v)
+ }
}
diff --git a/packages/neuron-wallet/src/services/ckb-runner.ts b/packages/neuron-wallet/src/services/ckb-runner.ts
index aeb1128d4c..0df5f1a3c7 100644
--- a/packages/neuron-wallet/src/services/ckb-runner.ts
+++ b/packages/neuron-wallet/src/services/ckb-runner.ts
@@ -26,6 +26,11 @@ const platform = (): string => {
}
}
+enum NeedMigrateMsg {
+ Wants = 'CKB wants to migrate the data into new format',
+ Recommends = 'CKB recommends migrating your data into a new format',
+}
+
const { app } = env
let ckb: ChildProcess | null = null
@@ -86,10 +91,6 @@ const initCkb = async () => {
})
}
-let isLookingValidTarget: boolean = false
-let lastLogTime: number
-export const getLookingValidTargetStatus = () => isLookingValidTarget
-
export const getNodeUrl = () => `${BUNDLED_URL_PREFIX}${rpcPort}`
const removeOldIndexerIfRunSuccess = () => {
@@ -110,8 +111,12 @@ export const startCkbNode = async () => {
listenPort = await getUsablePort(rpcPort >= listenPort ? rpcPort + 1 : listenPort)
updateToml(path.join(SettingsService.getInstance().getNodeDataPath(), 'ckb.toml'), {
- rpc: `listen_address = "127.0.0.1:${rpcPort}"`,
- network: `listen_addresses = ["/ip4/0.0.0.0/tcp/${listenPort}"]`,
+ rpc: {
+ listen_address: `"127.0.0.1:${rpcPort}"`,
+ },
+ network: {
+ listen_addresses: `["/ip4/0.0.0.0/tcp/${listenPort}"]`,
+ },
})
const options = ['run', '-C', SettingsService.getInstance().getNodeDataPath(), '--indexer']
const stdio: (StdioNull | StdioPipe)[] = ['ignore', 'pipe', 'pipe']
@@ -124,7 +129,7 @@ export const startCkbNode = async () => {
currentProcess.stderr?.on('data', data => {
const dataString: string = data.toString()
logger.error('CKB:\trun fail:', dataString)
- if (dataString.includes('CKB wants to migrate the data into new format')) {
+ if (dataString.includes(NeedMigrateMsg.Wants) || dataString.includes(NeedMigrateMsg.Recommends)) {
MigrateSubject.next({ type: 'need-migrate' })
}
})
@@ -135,21 +140,10 @@ export const startCkbNode = async () => {
logger.error('CKB:\trun fail:', dataString)
return
}
- if (
- dataString.includes(
- `can't find assume valid target temporarily, hash: Byte32(${process.env.CKB_NODE_ASSUME_VALID_TARGET})`
- )
- ) {
- isLookingValidTarget = true
- lastLogTime = Date.now()
- } else if (lastLogTime && Date.now() - lastLogTime > 10000) {
- isLookingValidTarget = false
- }
})
currentProcess.on('error', error => {
logger.error('CKB:\trun fail:', error)
- isLookingValidTarget = false
if (Object.is(ckb, currentProcess)) {
ckb = null
}
@@ -157,7 +151,6 @@ export const startCkbNode = async () => {
currentProcess.on('close', code => {
logger.info(`CKB:\tprocess closed with code ${code}`)
- isLookingValidTarget = false
if (Object.is(ckb, currentProcess)) {
ckb = null
}
diff --git a/packages/neuron-wallet/src/services/hardware/common.ts b/packages/neuron-wallet/src/services/hardware/common.ts
index 2cf52ae82c..be690f13f6 100644
--- a/packages/neuron-wallet/src/services/hardware/common.ts
+++ b/packages/neuron-wallet/src/services/hardware/common.ts
@@ -1,4 +1,6 @@
-import { AddressType } from '../../models/keys/address'
+import { hd } from '@ckb-lumos/lumos'
+
+type AddressType = hd.AddressType
export enum Manufacturer {
Ledger = 'Ledger',
diff --git a/packages/neuron-wallet/src/services/hardware/hardware.ts b/packages/neuron-wallet/src/services/hardware/hardware.ts
index 20af74e74c..8ec5592068 100644
--- a/packages/neuron-wallet/src/services/hardware/hardware.ts
+++ b/packages/neuron-wallet/src/services/hardware/hardware.ts
@@ -7,13 +7,13 @@ import Multisig from '../../models/multisig'
import WalletService from '../../services/wallets'
import DeviceSignIndexSubject from '../../models/subjects/device-sign-index-subject'
import type { DeviceInfo, ExtendedPublicKey, PublicKey } from './common'
-import { AccountExtendedPublicKey } from '../../models/keys/key'
+import { hd } from '@ckb-lumos/lumos'
import AssetAccountInfo from '../../models/asset-account-info'
export abstract class Hardware {
public deviceInfo: DeviceInfo
public isConnected: boolean
- protected defaultPath = AccountExtendedPublicKey.ckbAccountPath
+ protected defaultPath = hd.AccountExtendedPublicKey.ckbAccountPath
constructor(device: DeviceInfo) {
this.deviceInfo = device
@@ -90,7 +90,7 @@ export abstract class Hardware {
i => witnessesArgs[0].lockArgs.slice(0, 42) === Multisig.hash([i.blake160])
)!.blake160
const serializedMultiSign: string = Multisig.serialize([blake160])
- const witnesses = await TransactionSender.signSingleMultiSignScript(
+ const witnesses = TransactionSender.signSingleMultiSignScript(
path,
serializedWitnesses,
txHash,
@@ -140,7 +140,6 @@ export abstract class Hardware {
public abstract signMessage(path: string, messageHex: string): Promise
public abstract disconnect(): Promise
public abstract getAppVersion(): Promise
- public abstract getFirmwareVersion?(): Promise
public abstract signTransaction(
walletID: string,
tx: Transaction,
diff --git a/packages/neuron-wallet/src/services/hardware/ledger.ts b/packages/neuron-wallet/src/services/hardware/ledger.ts
index 1a41162df1..c7bbaaa58d 100644
--- a/packages/neuron-wallet/src/services/hardware/ledger.ts
+++ b/packages/neuron-wallet/src/services/hardware/ledger.ts
@@ -1,16 +1,31 @@
import { DeviceInfo, ExtendedPublicKey } from './common'
import { Hardware } from './hardware'
import HID from '@ledgerhq/hw-transport-node-hid'
-import LedgerCKB from 'hw-app-ckb'
+import LedgerCKB from '@magickbase/hw-app-ckb'
import type { DescriptorEvent, Subscription, Observer } from '@ledgerhq/hw-transport'
import type Transport from '@ledgerhq/hw-transport'
import { Observable, timer } from 'rxjs'
import { takeUntil, filter, scan } from 'rxjs/operators'
import Transaction from '../../models/chain/transaction'
-import Address, { AddressType } from '../../models/keys/address'
+import { hd } from '@ckb-lumos/lumos'
import logger from '../../utils/logger'
import NetworksService from '../../services/networks'
import { generateRPC } from '../../utils/ckb-rpc'
+import LogEncryption from '../log-encryption'
+
+const UNCOMPRESSED_KEY_LENGTH = 130
+const compressPublicKey = (key: string) => {
+ if (key.length !== UNCOMPRESSED_KEY_LENGTH) {
+ return key
+ }
+
+ const publicKey = Buffer.from(key, 'hex')
+ const compressedPublicKey = Buffer.alloc(33)
+ // '03' for odd value, '02' for even value
+ .fill(publicKey[64] & 1 ? '03' : '02', 0, 1, 'hex')
+ .fill(publicKey.subarray(1, 33), 1, 33)
+ return compressedPublicKey.toString('hex')
+}
export default class Ledger extends Hardware {
private ledgerCKB: LedgerCKB | null = null
@@ -41,8 +56,9 @@ export default class Ledger extends Hardware {
public async getExtendedPublicKey(): Promise {
const { public_key, chain_code } = await this.ledgerCKB!.getWalletExtendedPublicKey(this.defaultPath)
+ // The ledger wallet's public key is unzipped, so zip it to 33 bytes https://en.bitcoin.it/wiki/BIP_0032 serializes the coordinate pair P
return {
- publicKey: public_key,
+ publicKey: compressPublicKey(public_key),
chainCode: chain_code,
}
}
@@ -63,12 +79,30 @@ export default class Ledger extends Hardware {
context = txs.map(i => rpc.paramsFormatter.toRawTransaction(i.transaction))
}
- const signature = await this.ledgerCKB!.signTransaction(
- path === Address.pathForReceiving(0) ? this.defaultPath : path,
- rawTx,
- witnesses,
- context,
- this.defaultPath
+ const hdPath = path === hd.AccountExtendedPublicKey.pathForReceiving(0) ? this.defaultPath : path
+ const signature = await this.ledgerCKB!.signTransaction(hdPath, rawTx, witnesses, context, this.defaultPath).catch(
+ error => {
+ const errorMessage = error instanceof Error ? error.message : String(error)
+ const encryption = LogEncryption.getInstance()
+ logger.error(
+ encryption.encrypt(
+ JSON.stringify([
+ 'Ledger: failed to sign the transaction ',
+ errorMessage,
+ ' HD path:',
+ hdPath,
+ ' raw transaction:',
+ JSON.stringify(rawTx),
+ ' witnesses:',
+ JSON.stringify(witnesses),
+ ' context:',
+ JSON.stringify(context),
+ ])
+ )
+ )
+
+ return Promise.reject(error)
+ }
)
return signature
@@ -77,7 +111,7 @@ export default class Ledger extends Hardware {
async signMessage(path: string, messageHex: string) {
const message = this.removePrefix(messageHex)
const signed = await this.ledgerCKB!.signMessage(
- path === Address.pathForReceiving(0) ? this.defaultPath : path,
+ path === hd.AccountExtendedPublicKey.pathForReceiving(0) ? this.defaultPath : path,
message,
false
)
@@ -89,21 +123,11 @@ export default class Ledger extends Hardware {
return conf!.version
}
- async getFirmwareVersion(): Promise {
- const res: Buffer = await this.transport!.send(0xe0, 0x01, 0x00, 0x00)!
- const byteArray = [...res]
- const data = byteArray.slice(0, byteArray.length - 2)
- const versionLength = data[4]
- const version = Buffer.from(data.slice(5, 5 + versionLength)).toString()
-
- return version
- }
-
async getPublicKey(path: string) {
const networkService = NetworksService.getInstance()
const isTestnet = !networkService.isMainnet()
const result = await this.ledgerCKB!.getWalletPublicKey(
- path === Address.pathForReceiving(0) ? this.defaultPath : path,
+ path === hd.AccountExtendedPublicKey.pathForReceiving(0) ? this.defaultPath : path,
isTestnet
)
return result
@@ -138,7 +162,7 @@ export default class Ledger extends Hardware {
manufacturer: e.device.manufacturer,
product: e.device.product,
addressIndex: 0,
- addressType: AddressType.Receiving,
+ addressType: hd.AddressType.Receiving,
},
]
}, [])
diff --git a/packages/neuron-wallet/src/services/light-runner.ts b/packages/neuron-wallet/src/services/light-runner.ts
index 1c05fbf38e..da93dd39d2 100644
--- a/packages/neuron-wallet/src/services/light-runner.ts
+++ b/packages/neuron-wallet/src/services/light-runner.ts
@@ -81,6 +81,7 @@ export class CKBLightRunner extends NodeRunner {
protected binaryName: string = 'ckb-light-client'
protected logStream: Map = new Map()
protected _port: number = 9000
+ protected listenPort: number = 8118
static getInstance(): CKBLightRunner {
if (!CKBLightRunner.instance) {
@@ -117,13 +118,22 @@ export class CKBLightRunner extends NodeRunner {
async updateConfig() {
const usablePort = await getUsablePort(this._port)
+ const listenPort = await getUsablePort(usablePort >= this._port ? this.listenPort + 1 : this.listenPort)
this._port = usablePort
+ this.listenPort = listenPort
const storePath = path.join(SettingsService.getInstance().getNodeDataPath(), './store')
const networkPath = path.join(SettingsService.getInstance().getNodeDataPath(), './network')
updateToml(this.configFile, {
- store: `path = "${this.platform() === 'win' ? storePath.replace(/\\/g, '\\\\') : storePath}"`,
- network: `path = "${this.platform() === 'win' ? networkPath.replace(/\\/g, '\\\\') : networkPath}"`,
- rpc: `listen_address = "127.0.0.1:${usablePort}"`,
+ store: {
+ path: `"${this.platform() === 'win' ? storePath.replace(/\\/g, '\\\\') : storePath}"`,
+ },
+ network: {
+ path: `"${this.platform() === 'win' ? networkPath.replace(/\\/g, '\\\\') : networkPath}"`,
+ listen_addresses: `["/ip4/0.0.0.0/tcp/${listenPort}"]`,
+ },
+ rpc: {
+ listen_address: `"127.0.0.1:${usablePort}"`,
+ },
})
}
diff --git a/packages/neuron-wallet/src/services/live-cell-service.ts b/packages/neuron-wallet/src/services/live-cell-service.ts
index 4b7766d3db..3fe38814a6 100644
--- a/packages/neuron-wallet/src/services/live-cell-service.ts
+++ b/packages/neuron-wallet/src/services/live-cell-service.ts
@@ -1,7 +1,7 @@
import Script from '../models/chain/script'
-import LiveCell from '../models/chain/live-cell'
+import LiveCell, { CellWithOutPoint } from '../models/chain/live-cell'
import { queryIndexer } from '../block-sync-renderer/index'
-import { LumosCell, LumosCellQuery } from '../block-sync-renderer/sync/synchronizer'
+import { type QueryOptions } from '@ckb-lumos/base'
export default class LiveCellService {
private static instance: LiveCellService
@@ -20,14 +20,14 @@ export default class LiveCellService {
lock: Script | null,
type: Script | null,
data: string | null
- ): Promise {
+ ): Promise {
if (!lock && !type) {
throw new Error('at least one parameter is required')
}
- const query: LumosCellQuery = { lock, type, data }
- const liveCells: LumosCell[] = await queryIndexer(query)
- return liveCells
+ const query = { lock, type, data } as QueryOptions
+ const liveCells = await queryIndexer(query)
+ return liveCells as CellWithOutPoint[]
}
public async getOneByLockScriptAndTypeScript(lock: Script | null, type: Script | null) {
diff --git a/packages/neuron-wallet/src/services/log-encryption.ts b/packages/neuron-wallet/src/services/log-encryption.ts
new file mode 100644
index 0000000000..31c024d19c
--- /dev/null
+++ b/packages/neuron-wallet/src/services/log-encryption.ts
@@ -0,0 +1,131 @@
+import { randomBytes, createCipheriv, publicEncrypt, privateDecrypt, createDecipheriv } from 'node:crypto'
+import logger from '../utils/logger'
+
+export const DEFAULT_ALGORITHM = 'aes-256-cbc'
+
+export default class LogEncryption {
+ /**
+ * We use CBC mode here to prevent pattern-discerned
+ * > a one-bit change in a plaintext or initialization vector (IV) affects all following ciphertext blocks
+ * @private
+ */
+ private readonly algorithm = DEFAULT_ALGORITHM
+
+ /**
+ * A PEM-formatted RSA public key
+ * @private
+ */
+ private readonly adminPublicKey: string
+
+ public get isEnabled(): boolean {
+ return !!this.adminPublicKey
+ }
+
+ /**
+ *
+ * @param adminPublicKey a PEM-formatted RSA public key
+ */
+ constructor(adminPublicKey: string) {
+ this.adminPublicKey = adminPublicKey.replace(/\\n/g, '\n')
+ }
+
+ /**
+ * Encrypt a message
+ * @param message
+ */
+ encrypt(message: unknown): string {
+ if (message == null) return ''
+ if (!this.adminPublicKey) return 'The admin public key does not exist, skip encrypting message'
+
+ const localLogKey = randomBytes(32)
+ const iv = randomBytes(16)
+
+ const cipher = createCipheriv(this.algorithm, localLogKey, iv)
+ const serializedMessage = typeof message === 'string' ? message : JSON.stringify(message, JSONSerializer)
+
+ const encryptedLogKey = publicEncrypt(this.adminPublicKey, localLogKey).toString('base64')
+ const encryptedMsg = Buffer.concat([cipher.update(serializedMessage), cipher.final()]).toString('base64')
+
+ return `[key:${encryptedLogKey}] [iv:${iv.toString('base64')}] ${encryptedMsg}`
+ }
+
+ private static instance: LogEncryption
+
+ static getInstance(): LogEncryption {
+ if (!LogEncryption.instance) {
+ const adminPublicKey = process.env.LOG_ENCRYPTION_PUBLIC_KEY ?? ''
+ if (!adminPublicKey) {
+ logger.warn('LOG_ENCRYPTION_PUBLIC_KEY is required to create LogEncryption instance')
+ }
+
+ LogEncryption.instance = new LogEncryption(adminPublicKey)
+ }
+
+ return LogEncryption.instance
+ }
+}
+
+export class LogDecryption {
+ private readonly adminPrivateKey: string
+
+ constructor(adminPrivateKey: string) {
+ this.adminPrivateKey = adminPrivateKey
+ }
+
+ decrypt(encryptedMessage: string): string {
+ const { iv, key, content } = parseMessage(encryptedMessage)
+
+ const decipher = createDecipheriv(
+ DEFAULT_ALGORITHM,
+ privateDecrypt(this.adminPrivateKey, Buffer.from(key, 'base64')),
+ Buffer.from(iv, 'base64')
+ )
+
+ return Buffer.concat([decipher.update(content, 'base64'), decipher.final()]).toString('utf-8')
+ }
+}
+
+/**
+ * Parse a message into a JSON
+ *
+ * Input:
+ * ```
+ * [key1:value2] [key2:value2] remain content
+ * ```
+ * Output:
+ * ```json
+ * {
+ * "key1": "value1",
+ * "key2": "value2",
+ * "content": "remain content"
+ * }
+ * ```
+ * @param message
+ */
+function parseMessage(message: string) {
+ const result: Record = {}
+ const regex = /\[([^\]:]+):([^\]]+)]/g
+ let match
+ let lastIndex = 0
+
+ while ((match = regex.exec(message)) !== null) {
+ const [, key, value] = match
+ result[key.trim()] = value.trim()
+ lastIndex = regex.lastIndex
+ }
+
+ // Extract remaining content after the last bracket
+ const remainingContent = message.slice(lastIndex).trim()
+ if (remainingContent) {
+ result.content = remainingContent
+ }
+
+ return result
+}
+
+const JSONSerializer = (_key: string, value: any) => {
+ if (typeof value === 'bigint') {
+ return String(value) + 'n'
+ }
+ return value
+}
diff --git a/packages/neuron-wallet/src/services/multisig.ts b/packages/neuron-wallet/src/services/multisig.ts
index 5f97cd3b3a..a2baccd5ee 100644
--- a/packages/neuron-wallet/src/services/multisig.ts
+++ b/packages/neuron-wallet/src/services/multisig.ts
@@ -4,7 +4,7 @@ import MultisigConfig from '../database/chain/entities/multisig-config'
import MultisigOutput from '../database/chain/entities/multisig-output'
import { MultisigConfigNotExistError, MultisigConfigExistError } from '../exceptions/multisig'
import { rpcBatchRequest } from '../utils/rpc-request'
-import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
+import { computeScriptHash as scriptToHash } from '@ckb-lumos/lumos/utils'
import MultisigOutputChangedSubject from '../models/subjects/multisig-output-db-changed-subject'
import Transaction from '../models/chain/transaction'
import { OutputStatus } from '../models/chain/output'
@@ -41,6 +41,7 @@ export default class MultisigService {
n?: number
blake160s?: string[]
alias?: string
+ startBlockNumber?: number
}) {
const result = await getConnection()
.getRepository(MultisigConfig)
@@ -52,19 +53,15 @@ export default class MultisigService {
if (!result) {
throw new MultisigConfigNotExistError()
}
- await getConnection()
- .createQueryBuilder()
- .update(MultisigConfig)
- .set({
- alias: params.alias ?? result.alias,
- walletId: params.walletId ?? result.walletId,
- r: params.r ?? result.r,
- m: params.m ?? result.m,
- n: params.n ?? result.n,
- blake160s: params.blake160s ?? result.blake160s,
- })
- .where('id = :id', { id: params.id })
- .execute()
+ await getConnection().getRepository(MultisigConfig).update(params.id, {
+ alias: params.alias,
+ walletId: params.walletId,
+ r: params.r,
+ m: params.m,
+ n: params.n,
+ blake160s: params.blake160s,
+ startBlockNumber: params.startBlockNumber,
+ })
return { ...result, ...params }
}
@@ -77,6 +74,16 @@ export default class MultisigService {
return result
}
+ async getMultisigConfigById(id: number) {
+ return getConnection()
+ .getRepository(MultisigConfig)
+ .createQueryBuilder()
+ .where({
+ id,
+ })
+ .getOne()
+ }
+
async deleteConfig(id: number) {
const config = await getConnection()
.getRepository(MultisigConfig)
@@ -342,6 +349,7 @@ export default class MultisigService {
script: Multisig.getMultisigScript(v.blake160s, v.r, v.m, v.n),
addressType: SyncAddressType.Multisig,
scriptType: 'lock' as CKBRPC.ScriptType,
+ startBlockNumber: v.startBlockNumber,
}))
}
}
diff --git a/packages/neuron-wallet/src/services/networks.ts b/packages/neuron-wallet/src/services/networks.ts
index 8dfbb39fa0..c5e5957399 100644
--- a/packages/neuron-wallet/src/services/networks.ts
+++ b/packages/neuron-wallet/src/services/networks.ts
@@ -246,8 +246,10 @@ export default class NetworksService extends Store {
.getBlockchainInfo()
.then(info => info.chain)
.catch(() => '')
+ } else if (network.chain === 'ckb_dev') {
+ if (genesisHash === TESTNET_GENESIS_HASH) chain = LIGHT_CLIENT_TESTNET
+ if (genesisHash === MAINNET_GENESIS_HASH) chain = LIGHT_CLIENT_MAINNET
}
-
if (genesisHash !== network.genesisHash && chain !== '') {
network.genesisHash = genesisHash
network.chain = chain
diff --git a/packages/neuron-wallet/src/services/node.ts b/packages/neuron-wallet/src/services/node.ts
index d9731d2328..b194736a6e 100644
--- a/packages/neuron-wallet/src/services/node.ts
+++ b/packages/neuron-wallet/src/services/node.ts
@@ -1,6 +1,6 @@
import fs from 'fs'
import path from 'path'
-import { BI } from '@ckb-lumos/bi'
+import { BI } from '@ckb-lumos/lumos'
import { app as electronApp, dialog, shell, app } from 'electron'
import { t } from 'i18next'
import { interval, BehaviorSubject, merge, Subject } from 'rxjs'
@@ -28,6 +28,8 @@ export enum VerifyCkbVersionResult {
Incompatible,
}
+type CKBNodeType = 'full' | 'light'
+
class NodeService {
private static instance: NodeService
@@ -136,7 +138,8 @@ class NodeService {
await stopMonitor('ckb')
const isDefaultCKBNeedStart = await this.isDefaultCKBNeedRestart()
if (isDefaultCKBNeedStart) {
- if (SettingsService.getInstance().isFirstSync) {
+ const currentNetwork = NetworksService.getInstance().getCurrent()
+ if (SettingsService.getInstance().isFirstSync && currentNetwork.type === NetworkType.Default) {
logger.info("CKB:\tThis is the first sync, please wait for the user's confirmation")
return
}
@@ -145,7 +148,7 @@ class NodeService {
await (redistReady ? this.#startNodeSubject.next() : this.showGuideDialog())
await startMonitor()
} else {
- logger.info('CKB:\texternal RPC on default uri detected, skip starting bundled CKB node.')
+ logger.info('CKB:\tThe internal node is not selected so starting the bundled CKB node is skipped')
}
this.start()
}
@@ -155,11 +158,12 @@ class NodeService {
const network = NetworksService.getInstance().getCurrent()
if (!network.readonly) {
const localNodeInfo = await new RpcService(network.remote, network.type).localNodeInfo()
- const internalNodeVersion = this.getInternalNodeVersion()
+ const type: CKBNodeType = network.type === NetworkType.Light ? 'light' : 'full'
+ const internalNodeVersion = this.getInternalNodeVersion(type)
const neuronVersion = app.getVersion()
if (!internalNodeVersion || !localNodeInfo.version) return
return {
- ckbIsCompatible: this.isCkbCompatibility(neuronVersion, localNodeInfo.version),
+ ckbIsCompatible: this.isCkbCompatibility(neuronVersion, localNodeInfo.version, type),
withIndexer: await this.isStartWithIndexer(),
shouldUpdate: this.verifyCKbNodeShouldUpdate(internalNodeVersion, localNodeInfo.version),
}
@@ -227,9 +231,9 @@ class NodeService {
})
}
- private getInternalNodeVersion() {
+ private getInternalNodeVersion(type: CKBNodeType) {
const appPath = electronApp.isPackaged ? electronApp.getAppPath() : path.join(__dirname, '../../../..')
- const ckbVersionPath = path.join(appPath, '.ckb-version')
+ const ckbVersionPath = path.join(appPath, type === 'light' ? '.ckb-light-version' : '.ckb-version')
if (fs.existsSync(ckbVersionPath)) {
try {
return fs.readFileSync(ckbVersionPath, 'utf8')?.split('\n')?.[0]?.slice(1)
@@ -259,11 +263,11 @@ class NodeService {
}
}
- private isCkbCompatibility(neuronVersion: string, externalCKBVersion: string) {
+ private isCkbCompatibility(neuronVersion: string, externalCKBVersion: string, type: CKBNodeType = 'full') {
const compatibilities = this.getNeuronCompatibilityCKB()
const neuronCompatibleVersion = neuronVersion.split('.').slice(0, 2).join('.')
const externalCKBCompatibleVersion = externalCKBVersion.split('.').slice(0, 2).join('.')
- return compatibilities?.[neuronCompatibleVersion]?.full?.includes(externalCKBCompatibleVersion)
+ return compatibilities?.[neuronCompatibleVersion]?.[type]?.includes(externalCKBCompatibleVersion)
}
private verifyCKbNodeShouldUpdate(neuronCKBVersion: string, externalCKBVersion: string) {
diff --git a/packages/neuron-wallet/src/services/rpc-service.ts b/packages/neuron-wallet/src/services/rpc-service.ts
index 8b59adf858..f9f8c82ecb 100644
--- a/packages/neuron-wallet/src/services/rpc-service.ts
+++ b/packages/neuron-wallet/src/services/rpc-service.ts
@@ -4,8 +4,9 @@ import Block from '../models/chain/block'
import BlockHeader from '../models/chain/block-header'
import TransactionWithStatus from '../models/chain/transaction-with-status'
import logger from '../utils/logger'
-import { generateRPC } from '../utils/ckb-rpc'
+import { FullCKBRPC, generateRPC } from '../utils/ckb-rpc'
import { NetworkType } from '../models/network'
+import TxStatus, { TxStatusType } from '../models/chain/tx-status'
export default class RpcService {
private retryTime: number
@@ -29,20 +30,19 @@ export default class RpcService {
return BlockHeader.fromSDK(result)
}
- /**
- * TODO: rejected tx should be handled
- * {
- * transaction: null,
- * txStatus: { blockHash: null, status: 'rejected' }
- * }
- */
- public async getTransaction(hash: string): Promise {
+ public async getTransaction(
+ hash: string
+ ): Promise {
const result = await this.rpc.getTransaction(hash)
if (result?.transaction) {
return TransactionWithStatus.fromSDK(result)
}
- if ((result.txStatus as any) === 'rejected') {
+ if (result.txStatus.status === TxStatusType.Rejected) {
logger.warn(`Transaction[${hash}] was rejected`)
+ return {
+ transaction: null,
+ txStatus: TxStatus.fromSDK(result.txStatus),
+ }
}
return undefined
}
@@ -71,6 +71,9 @@ export default class RpcService {
public async getSyncState(): Promise {
const syncState = await this.retry(async () => {
+ if (this.rpc instanceof FullCKBRPC) {
+ return await this.rpc.getSyncState()
+ }
return await this.rpc.syncState()
})
return syncState
diff --git a/packages/neuron-wallet/src/services/sdk-core.ts b/packages/neuron-wallet/src/services/sdk-core.ts
index 36017e078c..738d7a109a 100644
--- a/packages/neuron-wallet/src/services/sdk-core.ts
+++ b/packages/neuron-wallet/src/services/sdk-core.ts
@@ -1,4 +1,4 @@
-import { CKBRPC } from '@ckb-lumos/rpc'
+import { CKBRPC } from '@ckb-lumos/lumos/rpc'
export const generateCKB = (url: string): CKBRPC => {
return new CKBRPC(url, { fetch: (request, init) => globalThis.fetch(request, { ...init, keepalive: true }) })
diff --git a/packages/neuron-wallet/src/services/settings.ts b/packages/neuron-wallet/src/services/settings.ts
index 55dd2a3e16..cd202dffb2 100644
--- a/packages/neuron-wallet/src/services/settings.ts
+++ b/packages/neuron-wallet/src/services/settings.ts
@@ -1,5 +1,6 @@
-import { BrowserWindow, nativeTheme } from 'electron'
+import { BrowserWindow, nativeTheme, safeStorage } from 'electron'
import fs from 'node:fs'
+import crypto from 'node:crypto'
import env from '../env'
import Store from '../models/store'
import { changeLanguage } from '../locales/i18n'
@@ -10,11 +11,12 @@ import { LIGHT_CLIENT_MAINNET, LIGHT_CLIENT_TESTNET } from '../utils/const'
const { app } = env
-export const locales = ['zh', 'zh-TW', 'en', 'en-US', 'fr', 'es'] as const
+export const locales = ['zh', 'zh-TW', 'en', 'en-US', 'ar', 'fr', 'fr-CA', 'fr-BE', 'es'] as const
export type Locale = (typeof locales)[number]
const settingKeys = {
ckbDataPath: 'ckbDataPath',
nodeDataPath: 'nodeDataPath',
+ lockWindow: 'lockWindow',
}
export default class SettingsService extends Store {
@@ -80,6 +82,39 @@ export default class SettingsService extends Store {
this.writeSync('themeSource', theme)
}
+ get lockWindowInfo(): { locked: boolean; encryptedPassword?: string } {
+ return this.readSync(settingKeys.lockWindow) ?? { locked: false }
+ }
+
+ private generateEncryptString(str: string) {
+ if (safeStorage.isEncryptionAvailable()) {
+ return safeStorage.encryptString(str).toString('hex')
+ }
+ const hash = crypto.createHash('sha256')
+ hash.update(str)
+ return hash.digest('hex')
+ }
+
+ updateLockWindowInfo(params: { locked?: boolean; password?: string }) {
+ const oldValue = SettingsService.getInstance().lockWindowInfo
+ const updatedValue = {
+ locked: params.locked ?? oldValue.locked,
+ encryptedPassword: oldValue.encryptedPassword,
+ }
+ if (params.password) {
+ updatedValue.encryptedPassword = this.generateEncryptString(params.password)
+ }
+ this.writeSync(settingKeys.lockWindow, updatedValue)
+ }
+
+ verifyLockWindowPassword(password: string) {
+ if (safeStorage.isEncryptionAvailable()) {
+ return safeStorage.decryptString(Buffer.from(this.lockWindowInfo.encryptedPassword!, 'hex')) === password
+ }
+ const encryptedPassword = this.generateEncryptString(password)
+ return SettingsService.getInstance().lockWindowInfo.encryptedPassword === encryptedPassword
+ }
+
constructor() {
super(
'',
@@ -88,6 +123,9 @@ export default class SettingsService extends Store {
locale: app.getLocale(),
ckbDataPath: path.resolve(app.getPath('userData'), 'chains/mainnet'),
isFirstSync: true,
+ [settingKeys.lockWindow]: {
+ locked: false,
+ },
})
)
if (!this.getNodeDataPath(LIGHT_CLIENT_MAINNET) || !this.getNodeDataPath('ckb')) {
@@ -100,7 +138,7 @@ export default class SettingsService extends Store {
private onLocaleChanged = (lng: Locale) => {
BrowserWindow.getAllWindows().forEach(bw => bw.webContents.send('set-locale', lng))
- updateApplicationMenu(null)
+ updateApplicationMenu(BrowserWindow.getFocusedWindow())
}
migrateDataPath() {
diff --git a/packages/neuron-wallet/src/services/sign-message.ts b/packages/neuron-wallet/src/services/sign-message.ts
index 96787d0ef2..31977328b7 100644
--- a/packages/neuron-wallet/src/services/sign-message.ts
+++ b/packages/neuron-wallet/src/services/sign-message.ts
@@ -1,22 +1,32 @@
import AddressService from './addresses'
import WalletService, { Wallet } from './wallets'
-import Keychain from '../models/keys/keychain'
import Blake2b from '../models/blake2b'
-import hd from '@ckb-lumos/hd'
+import { hd } from '@ckb-lumos/lumos'
import { ec as EC } from 'elliptic'
import { AddressNotFound } from '../exceptions'
import HardwareWalletService from './hardware'
import AddressParser from '../models/address-parser'
+import { bytes } from '@ckb-lumos/lumos/codec'
export default class SignMessage {
static GENERATE_COUNT = 100
private static ec = new EC('secp256k1')
private static magicString = 'Nervos Message:'
- public static async sign(walletID: string, address: string, password: string, message: string): Promise {
+ public static async sign({
+ walletID,
+ password,
+ message,
+ address,
+ }: {
+ walletID: string
+ password: string
+ message: string
+ address?: string
+ }): Promise {
const wallet = WalletService.getInstance().get(walletID)
const addresses = await AddressService.getAddressesByWalletId(walletID)
- let addr = addresses.find(addr => addr.address === address)
+ let addr = address ? addresses.find(addr => addr.address === address) : addresses[0]
if (!addr) {
throw new AddressNotFound()
}
@@ -91,9 +101,9 @@ export default class SignMessage {
private static getPrivateKey(wallet: Wallet, path: string, password: string): string {
const masterPrivateKey = wallet.loadKeystore().extendedPrivateKey(password)
- const masterKeychain = new Keychain(
- Buffer.from(masterPrivateKey.privateKey, 'hex'),
- Buffer.from(masterPrivateKey.chainCode, 'hex')
+ const masterKeychain = new hd.Keychain(
+ Buffer.from(bytes.bytify(masterPrivateKey.privateKey)),
+ Buffer.from(bytes.bytify(masterPrivateKey.chainCode))
)
return `0x${masterKeychain.derivePath(path).privateKey.toString('hex')}`
diff --git a/packages/neuron-wallet/src/services/sudt-token-info.ts b/packages/neuron-wallet/src/services/sudt-token-info.ts
index c24f06ad79..f69f26c760 100644
--- a/packages/neuron-wallet/src/services/sudt-token-info.ts
+++ b/packages/neuron-wallet/src/services/sudt-token-info.ts
@@ -1,6 +1,7 @@
import { In, Not } from 'typeorm'
import SudtTokenInfoEntity from '../database/chain/entities/sudt-token-info'
import { getConnection } from '../database/chain/connection'
+import { UDTType } from '../utils/const'
export default class SudtTokenInfoService {
static async findSudtTokenInfoByArgs(typeArgsList: string[]) {
@@ -41,13 +42,14 @@ export default class SudtTokenInfoService {
.execute()
}
- static getSudtTokenInfo(typeArgs: string): Promise {
+ static getSudtTokenInfo(typeArgs: string, udtType: UDTType): Promise {
return getConnection()
.getRepository(SudtTokenInfoEntity)
.createQueryBuilder('info')
.leftJoinAndSelect('info.assetAccounts', 'aa')
- .where(`info.tokenID = :typeArgs`, {
+ .where(`info.tokenID = :typeArgs AND info.udtType = :udtType`, {
typeArgs,
+ udtType,
})
.getOne()
}
diff --git a/packages/neuron-wallet/src/services/sync-progress.ts b/packages/neuron-wallet/src/services/sync-progress.ts
index 47362710a4..67de4b1d9c 100644
--- a/packages/neuron-wallet/src/services/sync-progress.ts
+++ b/packages/neuron-wallet/src/services/sync-progress.ts
@@ -1,5 +1,5 @@
import { In, LessThan, Not } from 'typeorm'
-import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
+import { computeScriptHash as scriptToHash } from '@ckb-lumos/lumos/utils'
import SyncProgress, { SyncAddressType } from '../database/chain/entities/sync-progress'
import WalletService from './wallets'
import { getConnection } from '../database/chain/connection'
@@ -19,6 +19,9 @@ export default class SyncProgressService {
.getRepository(SyncProgress)
.find({
select: ['hash'],
+ where: {
+ delete: false,
+ },
})
const existHashes = new Set(existProgresses.map(v => v.hash))
const newSyncProgreses = syncProgresses.filter(v => !existHashes.has(v.hash))
@@ -68,6 +71,11 @@ export default class SyncProgressService {
return res
}
+ static async getExistingSyncArgses() {
+ const syncProgresses = await getConnection().getRepository(SyncProgress).createQueryBuilder().getMany()
+ return new Set(syncProgresses.map(v => v.args))
+ }
+
static async getAllSyncStatusToMap() {
const result: Map = new Map()
const syncProgresses = await getConnection()
@@ -81,21 +89,35 @@ export default class SyncProgressService {
return result
}
- static async getCurrentWalletMinSyncedBlockNumber() {
+ static async getCurrentWalletMinSyncedBlockNumber(addressType: SyncAddressType = SyncAddressType.Default) {
const currentWallet = WalletService.getInstance().getCurrent()
const item = await getConnection()
.getRepository(SyncProgress)
.createQueryBuilder()
.where({
delete: false,
- addressType: SyncAddressType.Default,
- ...(currentWallet ? { walletId: currentWallet.id } : {}),
+ addressType,
+ ...(currentWallet && addressType === SyncAddressType.Default ? { walletId: currentWallet.id } : {}),
})
.orderBy('syncedBlockNumber', 'ASC')
.getOne()
return item?.syncedBlockNumber || 0
}
+ static async getMinSyncedBlockNumberInWallets(walletIds: string[]) {
+ const item = await getConnection()
+ .getRepository(SyncProgress)
+ .createQueryBuilder()
+ .where({
+ delete: false,
+ addressType: SyncAddressType.Default,
+ walletId: In(walletIds),
+ })
+ .orderBy('syncedBlockNumber', 'ASC')
+ .getOne()
+ return item?.syncedBlockNumber
+ }
+
static async getWalletMinLocalSavedBlockNumber() {
const items = await getConnection()
.getRepository(SyncProgress)
@@ -111,7 +133,7 @@ export default class SyncProgressService {
}
static async getOtherTypeSyncBlockNumber() {
- const items = await getConnection().getRepository(SyncProgress).find({
+ const items = await getConnection().getRepository(SyncProgress).findBy({
addressType: SyncAddressType.Multisig,
})
return items.reduce>((pre, cur) => ({ ...pre, [cur.hash]: cur.localSavedBlockNumber }), {})
@@ -132,4 +154,24 @@ export default class SyncProgressService {
.set({ localSavedBlockNumber: 0, syncedBlockNumber: 0 })
.execute()
}
+
+ static async deleteWalletSyncProgress(walletId: string) {
+ await getConnection().getRepository(SyncProgress).delete({
+ walletId,
+ addressType: SyncAddressType.Default,
+ })
+ }
+
+ static async resetMultisigSync(hash: string, startBlockNumber: number) {
+ await getConnection()
+ .createQueryBuilder()
+ .update(SyncProgress)
+ .set({
+ localSavedBlockNumber: startBlockNumber,
+ lightStartBlockNumber: startBlockNumber,
+ syncedBlockNumber: startBlockNumber,
+ })
+ .where({ hash })
+ .execute()
+ }
}
diff --git a/packages/neuron-wallet/src/services/transaction-sender.ts b/packages/neuron-wallet/src/services/transaction-sender.ts
index b8bc3f5962..5ac0ec0ca6 100644
--- a/packages/neuron-wallet/src/services/transaction-sender.ts
+++ b/packages/neuron-wallet/src/services/transaction-sender.ts
@@ -1,15 +1,15 @@
+import { t } from 'i18next'
+import { dialog } from 'electron'
import { serializeWitnessArgs } from '../utils/serialization'
import { scriptToAddress } from '../utils/scriptAndAddress'
import { TargetOutput, TransactionGenerator, TransactionPersistor } from './tx'
import AddressService from './addresses'
import WalletService, { Wallet } from '../services/wallets'
import RpcService from '../services/rpc-service'
-import { PathAndPrivateKey } from '../models/keys/key'
import { Address } from '../models/address'
import FeeMode from '../models/fee-mode'
import TransactionSize from '../models/transaction-size'
import TransactionFee from '../models/transaction-fee'
-import Keychain from '../models/keys/keychain'
import Input from '../models/chain/input'
import OutPoint from '../models/chain/out-point'
import Output from '../models/chain/output'
@@ -20,7 +20,7 @@ import Multisig from '../models/multisig'
import Blake2b from '../models/blake2b'
import logger from '../utils/logger'
import { signWitnesses } from '../utils/signWitnesses'
-import { bytes as byteUtils, bytes, number } from '@ckb-lumos/codec'
+import { bytes, Uint64LE } from '@ckb-lumos/lumos/codec'
import SystemScriptInfo from '../models/system-script-info'
import AddressParser from '../models/address-parser'
import HardwareWalletService from './hardware'
@@ -37,15 +37,16 @@ import AssetAccountInfo from '../models/asset-account-info'
import MultisigConfigModel from '../models/multisig-config'
import { Hardware } from './hardware/hardware'
import MultisigService from './multisig'
+import AmendTransactionService from './amend-transaction'
import { getMultisigStatus } from '../utils/multisig'
import { SignStatus } from '../models/offline-sign'
import NetworksService from './networks'
import { generateRPC } from '../utils/ckb-rpc'
import CellsService from './cells'
-import hd from '@ckb-lumos/hd'
+import { hd } from '@ckb-lumos/lumos'
import { getClusterByOutPoint } from '@spore-sdk/core'
import CellDep, { DepType } from '../models/chain/cell-dep'
-import { dao } from '@ckb-lumos/common-scripts'
+import { dao } from '@ckb-lumos/lumos/common-scripts'
interface SignInfo {
witnessArgs: WitnessArgs
@@ -54,6 +55,11 @@ interface SignInfo {
lockArgs: string
}
+interface PathAndPrivateKey {
+ path: string
+ privateKey: string
+}
+
export default class TransactionSender {
static MULTI_SIGN_ARGS_LENGTH = 58
@@ -68,13 +74,14 @@ export default class TransactionSender {
transaction: Transaction,
password: string = '',
skipLastInputs: boolean = true,
- skipSign = false
+ skipSign = false,
+ amendHash = ''
) {
const tx = skipSign
? Transaction.fromObject(transaction)
: await this.sign(walletID, transaction, password, skipLastInputs)
- return this.broadcastTx(walletID, tx)
+ return this.broadcastTx(walletID, tx, amendHash)
}
public async sendMultisigTx(
@@ -91,7 +98,7 @@ export default class TransactionSender {
return this.broadcastTx(walletID, tx)
}
- public async broadcastTx(walletID: string = '', tx: Transaction) {
+ public async broadcastTx(walletID: string = '', tx: Transaction, amendHash = '') {
const currentNetwork = NetworksService.getInstance().getCurrent()
const rpc = generateRPC(currentNetwork.remote, currentNetwork.type)
await rpc.sendTransaction(tx.toSDKRawTransaction(), 'passthrough')
@@ -99,6 +106,9 @@ export default class TransactionSender {
await TransactionPersistor.saveSentTx(tx, txHash)
await MultisigService.saveSentMultisigOutput(tx)
+ if (amendHash) {
+ await AmendTransactionService.save(txHash, amendHash)
+ }
if (walletID) {
const wallet = WalletService.getInstance().get(walletID)
@@ -190,7 +200,27 @@ export default class TransactionSender {
// A 65-byte empty signature used as placeholder
witnessesArgs[0].witnessArgs.setEmptyLock()
- const privateKey = findPrivateKey(witnessesArgs[0].lockArgs)
+ let privateKey = ''
+ try {
+ privateKey = findPrivateKey(witnessesArgs[0].lockArgs)
+ } catch (error) {
+ const BLOCK_UNRECOGNIZED = 0
+ const IGNORE_UNRECOGNIZED_AND_CONTINUE = 1
+ const res = await dialog.showMessageBox({
+ type: 'warning',
+ message: t('messageBox.unrecognized-lock-script.message'),
+ buttons: [
+ t('messageBox.unrecognized-lock-script.buttons.cancel'),
+ t('messageBox.unrecognized-lock-script.buttons.ignore'),
+ ],
+ defaultId: BLOCK_UNRECOGNIZED,
+ cancelId: IGNORE_UNRECOGNIZED_AND_CONTINUE,
+ })
+ if (res.response === IGNORE_UNRECOGNIZED_AND_CONTINUE) {
+ continue
+ }
+ throw error
+ }
const serializedWitnesses: (WitnessArgs | string)[] = witnessesArgs.map((value: SignInfo, index: number) => {
const args = value.witnessArgs
@@ -322,6 +352,21 @@ export default class TransactionSender {
for (const lockHash of lockHashes) {
const multisigConfig = multisigConfigMap[lockHash]
if (!multisigConfig) {
+ const BLOCK_UNRECOGNIZED = 0
+ const IGNORE_UNRECOGNIZED_AND_CONTINUE = 1
+ const res = await dialog.showMessageBox({
+ type: 'warning',
+ message: t('messageBox.unrecognized-lock-script.message'),
+ buttons: [
+ t('messageBox.unrecognized-lock-script.buttons.cancel'),
+ t('messageBox.unrecognized-lock-script.buttons.ignore'),
+ ],
+ defaultId: BLOCK_UNRECOGNIZED,
+ cancelId: IGNORE_UNRECOGNIZED_AND_CONTINUE,
+ })
+ if (res.response === IGNORE_UNRECOGNIZED_AND_CONTINUE) {
+ continue
+ }
throw new MultisigConfigNeedError()
}
const [privateKey, blake160] = findPrivateKeyAndBlake160(multisigConfig.blake160s, tx.signatures?.[lockHash])
@@ -387,7 +432,7 @@ export default class TransactionSender {
return tx
}
- public static async signSingleMultiSignScript(
+ public static signSingleMultiSignScript(
privateKeyOrPath: string,
witnesses: (string | WitnessArgs)[],
txHash: string,
@@ -406,16 +451,16 @@ export default class TransactionSender {
lock: `0x` + serializedMultiSign.slice(2) + '0'.repeat(130 * m),
})
const serializedEmptyWitness = serializeWitnessArgs(emptyWitness.toSDK())
- const serializedEmptyWitnessSize = byteUtils.bytify(serializedEmptyWitness).byteLength
+ const serializedEmptyWitnessSize = bytes.bytify(serializedEmptyWitness).byteLength
const blake2b = new Blake2b()
blake2b.update(txHash)
- blake2b.update(bytes.hexify(number.Uint64LE.pack(`0x${serializedEmptyWitnessSize.toString(16)}`)))
+ blake2b.update(bytes.hexify(Uint64LE.pack(`0x${serializedEmptyWitnessSize.toString(16)}`)))
blake2b.update(serializedEmptyWitness)
restWitnesses.forEach(w => {
const wit: string = typeof w === 'string' ? w : serializeWitnessArgs(w.toSDK())
- const byteLength = byteUtils.bytify(wit).byteLength
- blake2b.update(bytes.hexify(number.Uint64LE.pack(`0x${byteLength.toString(16)}`)))
+ const byteLength = bytes.bytify(wit).byteLength
+ blake2b.update(bytes.hexify(Uint64LE.pack(`0x${byteLength.toString(16)}`)))
blake2b.update(wit)
})
@@ -658,6 +703,38 @@ export default class TransactionSender {
return tx
}
+ public generateMultisigDepositTx = async (
+ capacity: string,
+ fee: string = '0',
+ feeRate: string = '0',
+ multisigConfig: MultisigConfigModel
+ ): Promise => {
+ const lockScript = Multisig.getMultisigScript(
+ multisigConfig.blake160s,
+ multisigConfig.r,
+ multisigConfig.m,
+ multisigConfig.n
+ )
+ const multisigAddresses = scriptToAddress(lockScript, NetworksService.getInstance().isMainnet())
+
+ const tx = await TransactionGenerator.generateDepositTx(
+ '',
+ capacity,
+ multisigAddresses,
+ multisigAddresses,
+ fee,
+ feeRate,
+ {
+ lockArgs: [lockScript.args],
+ codeHash: SystemScriptInfo.MULTI_SIGN_CODE_HASH,
+ hashType: SystemScriptInfo.MULTI_SIGN_HASH_TYPE,
+ },
+ multisigConfig
+ )
+
+ return tx
+ }
+
public startWithdrawFromDao = async (
walletID: string,
outPoint: OutPoint,
@@ -669,8 +746,8 @@ export default class TransactionSender {
const currentNetwork = NetworksService.getInstance().getCurrent()
const rpcService = new RpcService(currentNetwork.remote, currentNetwork.type)
- const depositeOutput = await CellsService.getLiveCell(outPoint)
- if (!depositeOutput) {
+ const depositOutput = await CellsService.getLiveCell(outPoint)
+ if (!depositOutput) {
throw new CellIsNotYetLive()
}
const prevTx = await rpcService.getTransaction(outPoint.txHash)
@@ -685,7 +762,7 @@ export default class TransactionSender {
const tx: Transaction = await TransactionGenerator.startWithdrawFromDao(
walletID,
outPoint,
- depositeOutput,
+ depositOutput,
depositBlockHeader!.number,
depositBlockHeader!.hash,
changeAddress!.address,
@@ -696,12 +773,60 @@ export default class TransactionSender {
return tx
}
+ public startWithdrawFromMultisigDao = async (
+ outPoint: OutPoint,
+ fee: string = '0',
+ feeRate: string = '0',
+ multisigConfig: MultisigConfigModel
+ ): Promise => {
+ const lockScript = Multisig.getMultisigScript(
+ multisigConfig.blake160s,
+ multisigConfig.r,
+ multisigConfig.m,
+ multisigConfig.n
+ )
+ const multisigAddresses = scriptToAddress(lockScript, NetworksService.getInstance().isMainnet())
+
+ const currentNetwork = NetworksService.getInstance().getCurrent()
+ const rpcService = new RpcService(currentNetwork.remote, currentNetwork.type)
+ const depositOutput = await CellsService.getLiveCell(outPoint)
+ if (!depositOutput) {
+ throw new CellIsNotYetLive()
+ }
+ const prevTx = await rpcService.getTransaction(outPoint.txHash)
+ if (!prevTx || !prevTx.txStatus.isCommitted()) {
+ throw new TransactionIsNotCommittedYet()
+ }
+
+ const depositBlockHeader = await rpcService.getHeader(prevTx.txStatus.blockHash!)
+
+ const tx: Transaction = await TransactionGenerator.startWithdrawFromDao(
+ '',
+ outPoint,
+ depositOutput,
+ depositBlockHeader!.number,
+ depositBlockHeader!.hash,
+ multisigAddresses,
+ fee,
+ feeRate,
+ {
+ lockArgs: [lockScript.args],
+ codeHash: SystemScriptInfo.MULTI_SIGN_CODE_HASH,
+ hashType: SystemScriptInfo.MULTI_SIGN_HASH_TYPE,
+ },
+ multisigConfig
+ )
+
+ return tx
+ }
+
public withdrawFromDao = async (
walletID: string,
depositOutPoint: OutPoint,
withdrawingOutPoint: OutPoint,
fee: string = '0',
- feeRate: string = '0'
+ feeRate: string = '0',
+ multisigConfig?: MultisigConfigModel
): Promise => {
const DAO_LOCK_PERIOD_EPOCHS = BigInt(180)
@@ -721,7 +846,9 @@ export default class TransactionSender {
throw new TransactionIsNotCommittedYet()
}
- const secpCellDep = await SystemScriptInfo.getInstance().getSecpCellDep()
+ const cellDep = multisigConfig
+ ? await SystemScriptInfo.getInstance().getMultiSignCellDep()
+ : await SystemScriptInfo.getInstance().getSecpCellDep()
const daoCellDep = await SystemScriptInfo.getInstance().getDaoCellDep()
const content = withdrawOutput.daoData
@@ -731,13 +858,13 @@ export default class TransactionSender {
if (!withdrawOutput.depositOutPoint) {
throw new Error('DAO has not finish step first withdraw')
}
- const depositeTx = await rpcService.getTransaction(withdrawOutput.depositOutPoint.txHash)
- if (!depositeTx?.txStatus.blockHash) {
- throw new Error(`Get deposite block hash failed with tx hash ${withdrawOutput.depositOutPoint.txHash}`)
+ const depositTx = await rpcService.getTransaction(withdrawOutput.depositOutPoint.txHash)
+ if (!depositTx?.txStatus.blockHash) {
+ throw new Error(`Get deposit block hash failed with tx hash ${withdrawOutput.depositOutPoint.txHash}`)
}
- const depositBlockHeader = await rpcService.getHeader(depositeTx.txStatus.blockHash)
+ const depositBlockHeader = await rpcService.getHeader(depositTx.txStatus.blockHash)
if (!depositBlockHeader) {
- throw new Error(`Get Header failed with blockHash ${depositeTx.txStatus.blockHash}`)
+ throw new Error(`Get Header failed with blockHash ${depositTx.txStatus.blockHash}`)
}
const depositEpoch = this.parseEpoch(BigInt(depositBlockHeader.epoch))
const depositCapacity: bigint = BigInt(withdrawOutput.capacity)
@@ -747,13 +874,13 @@ export default class TransactionSender {
const withdrawFraction = withdrawEpoch.index * depositEpoch.length
const depositFraction = depositEpoch.index * withdrawEpoch.length
- let depositedEpoches = withdrawEpoch.number - depositEpoch.number
+ let depositedEpochs = withdrawEpoch.number - depositEpoch.number
if (withdrawFraction > depositFraction) {
- depositedEpoches += BigInt(1)
+ depositedEpochs += BigInt(1)
}
- const lockEpoches =
- ((depositedEpoches + (DAO_LOCK_PERIOD_EPOCHS - BigInt(1))) / DAO_LOCK_PERIOD_EPOCHS) * DAO_LOCK_PERIOD_EPOCHS
- const minimalSinceEpochNumber = depositEpoch.number + lockEpoches
+ const lockEpochs =
+ ((depositedEpochs + (DAO_LOCK_PERIOD_EPOCHS - BigInt(1))) / DAO_LOCK_PERIOD_EPOCHS) * DAO_LOCK_PERIOD_EPOCHS
+ const minimalSinceEpochNumber = depositEpoch.number + lockEpochs
const minimalSinceEpochIndex = depositEpoch.index
const minimalSinceEpochLength = depositEpoch.length
@@ -761,16 +888,27 @@ export default class TransactionSender {
const outputCapacity: bigint = await this.calculateDaoMaximumWithdraw(depositOutPoint, withdrawBlockHeader.hash)
- const wallet = WalletService.getInstance().get(walletID)
- const address = await wallet.getNextAddress()
- const blake160 = AddressParser.toBlake160(address!.address)
-
- const output: Output = new Output(
- outputCapacity.toString(),
- new Script(SystemScriptInfo.SECP_CODE_HASH, blake160, SystemScriptInfo.SECP_HASH_TYPE),
- undefined,
- '0x'
- )
+ let output: Output
+ if (multisigConfig) {
+ const lockScript = Multisig.getMultisigScript(
+ multisigConfig.blake160s,
+ multisigConfig.r,
+ multisigConfig.m,
+ multisigConfig.n
+ )
+ const multisigAddresses = scriptToAddress(lockScript, NetworksService.getInstance().isMainnet())
+ output = new Output(outputCapacity.toString(), AddressParser.parse(multisigAddresses), undefined, '0x')
+ } else {
+ const wallet = WalletService.getInstance().get(walletID)
+ const address = await wallet.getNextAddress()
+ const blake160 = AddressParser.toBlake160(address!.address)
+ output = new Output(
+ outputCapacity.toString(),
+ new Script(SystemScriptInfo.SECP_CODE_HASH, blake160, SystemScriptInfo.SECP_HASH_TYPE),
+ undefined,
+ '0x'
+ )
+ }
const outputs: Output[] = [output]
@@ -784,7 +922,7 @@ export default class TransactionSender {
const withdrawWitnessArgs: WitnessArgs = new WitnessArgs(WitnessArgs.EMPTY_LOCK, '0x0000000000000000')
const tx: Transaction = Transaction.fromObject({
version: '0',
- cellDeps: [secpCellDep, daoCellDep],
+ cellDeps: [cellDep, daoCellDep],
headerDeps: [depositBlockHeader.hash, withdrawBlockHeader.hash],
inputs: [input],
outputs,
@@ -829,6 +967,38 @@ export default class TransactionSender {
return tx
}
+ public generateMultisigDepositAllTx = async (
+ isBalanceReserved = true,
+ fee: string = '0',
+ feeRate: string = '0',
+ multisigConfig: MultisigConfigModel
+ ): Promise => {
+ const lockScript = Multisig.getMultisigScript(
+ multisigConfig.blake160s,
+ multisigConfig.r,
+ multisigConfig.m,
+ multisigConfig.n
+ )
+ const multisigAddresses = scriptToAddress(lockScript, NetworksService.getInstance().isMainnet())
+
+ const tx = await TransactionGenerator.generateDepositAllTx(
+ '',
+ multisigAddresses,
+ multisigAddresses,
+ isBalanceReserved,
+ fee,
+ feeRate,
+ {
+ lockArgs: [lockScript.args],
+ codeHash: SystemScriptInfo.MULTI_SIGN_CODE_HASH,
+ hashType: SystemScriptInfo.MULTI_SIGN_HASH_TYPE,
+ },
+ multisigConfig
+ )
+
+ return tx
+ }
+
public async generateWithdrawMultiSignTx(
walletID: string,
outPoint: OutPoint,
@@ -922,15 +1092,15 @@ export default class TransactionSender {
// Derive all child private keys for specified BIP44 paths.
public getPrivateKeys = (wallet: Wallet, paths: string[], password: string): PathAndPrivateKey[] => {
const masterPrivateKey = wallet.loadKeystore().extendedPrivateKey(password)
- const masterKeychain = new Keychain(
- Buffer.from(masterPrivateKey.privateKey, 'hex'),
- Buffer.from(masterPrivateKey.chainCode, 'hex')
+ const masterKeychain = new hd.Keychain(
+ Buffer.from(bytes.bytify(masterPrivateKey.privateKey)),
+ Buffer.from(bytes.bytify(masterPrivateKey.chainCode))
)
const uniquePaths = paths.filter((value, idx, a) => a.indexOf(value) === idx)
return uniquePaths.map(path => ({
path,
- privateKey: `0x${masterKeychain.derivePath(path).privateKey.toString('hex')}`,
+ privateKey: bytes.hexify(masterKeychain.derivePath(path).privateKey),
}))
}
}
diff --git a/packages/neuron-wallet/src/services/tx/failed-transaction.ts b/packages/neuron-wallet/src/services/tx/failed-transaction.ts
index 6841cedca1..96c8f754cf 100644
--- a/packages/neuron-wallet/src/services/tx/failed-transaction.ts
+++ b/packages/neuron-wallet/src/services/tx/failed-transaction.ts
@@ -1,22 +1,87 @@
-import { In } from 'typeorm'
+import { In, Not } from 'typeorm'
import { getConnection } from '../../database/chain/connection'
import OutputEntity from '../../database/chain/entities/output'
+import InputEntity from '../../database/chain/entities/input'
import TransactionEntity from '../../database/chain/entities/transaction'
import { OutputStatus } from '../../models/chain/output'
import TransactionsService from './transaction-service'
import { TransactionStatus } from '../../models/chain/transaction'
+import AmendTransactionEntity from '../../database/chain/entities/amend-transaction'
export class FailedTransaction {
- public static pendings = async (): Promise => {
- const pendingTransactions = await getConnection()
+ public static pendingOrFaileds = async (): Promise => {
+ const transactions = await getConnection()
.getRepository(TransactionEntity)
.createQueryBuilder('tx')
.where({
- status: TransactionStatus.Pending,
+ status: In([TransactionStatus.Pending, TransactionStatus.Failed]),
+ })
+ .getMany()
+
+ return transactions
+ }
+
+ public static deleteFailedTxs = async (hashes: string[]) => {
+ await getConnection().manager.transaction(async transactionalEntityManager => {
+ await transactionalEntityManager
+ .createQueryBuilder()
+ .delete()
+ .from(TransactionEntity)
+ .where({ hash: In(hashes) })
+ .execute()
+
+ await transactionalEntityManager
+ .createQueryBuilder()
+ .delete()
+ .from(OutputEntity)
+ .where({ outPointTxHash: In(hashes) })
+ .execute()
+
+ await transactionalEntityManager
+ .createQueryBuilder()
+ .delete()
+ .from(InputEntity)
+ .where({ outPointTxHash: In(hashes) })
+ .execute()
+ })
+ }
+
+ public static processAmendFailedTxs = async () => {
+ const failedTransactions = await getConnection()
+ .getRepository(TransactionEntity)
+ .createQueryBuilder('tx')
+ .where({
+ status: TransactionStatus.Failed,
})
+ .select('tx.hash', 'hash')
+ .getRawMany()
+
+ if (!failedTransactions.length) return
+
+ const failedHashes = failedTransactions.map(item => item.hash)
+
+ const amendTxs = await getConnection()
+ .getRepository(AmendTransactionEntity)
+ .createQueryBuilder('amend')
+ .where([
+ { amendHash: In(failedHashes), hash: Not(In(failedHashes)) },
+ { hash: In(failedHashes), amendHash: Not(In(failedHashes)) },
+ ])
.getMany()
- return pendingTransactions
+ if (!amendTxs) return
+
+ const removeTxs: string[] = []
+ amendTxs.forEach(({ hash, amendHash }) => {
+ if (failedHashes.includes(hash)) {
+ removeTxs.push(hash)
+ }
+ if (failedHashes.includes(amendHash)) {
+ removeTxs.push(amendHash)
+ }
+ })
+
+ await FailedTransaction.deleteFailedTxs(removeTxs)
}
// update tx status to TransactionStatus.Failed
diff --git a/packages/neuron-wallet/src/services/tx/transaction-generator.ts b/packages/neuron-wallet/src/services/tx/transaction-generator.ts
index 53dccc2047..d223311622 100644
--- a/packages/neuron-wallet/src/services/tx/transaction-generator.ts
+++ b/packages/neuron-wallet/src/services/tx/transaction-generator.ts
@@ -1,4 +1,4 @@
-import { bytes } from '@ckb-lumos/codec'
+import { bytes } from '@ckb-lumos/lumos/codec'
import CellsService from '../../services/cells'
import {
CapacityTooSmall,
@@ -31,7 +31,7 @@ import AddressService from '../../services/addresses'
import { addressToScript } from '../../utils/scriptAndAddress'
import MultisigConfigModel from '../../models/multisig-config'
import WalletService from '../../services/wallets'
-import { MIN_CELL_CAPACITY, MIN_SUDT_CAPACITY } from '../../utils/const'
+import { MIN_CELL_CAPACITY, UDTType } from '../../utils/const'
import AssetAccountService from '../../services/asset-account-service'
import LiveCellService from '../../services/live-cell-service'
import NetworksService from '../networks'
@@ -72,7 +72,7 @@ export class TransactionGenerator {
if (!nftCell) return
const nftTx = await this.getRpcService().getTransaction(outPoint.txHash)
- const nftOriginalOutputData = nftTx?.transaction.outputsData[Number(outPoint.index)]
+ const nftOriginalOutputData = nftTx?.transaction?.outputsData[Number(outPoint.index)]
if (!nftOriginalOutputData) return
nftCell.data = nftOriginalOutputData
@@ -212,7 +212,7 @@ export class TransactionGenerator {
if (date) {
const blake160 = lockScript.args
const minutes: number = +((BigInt(date) - BigInt(tipHeaderTimestamp)) / BigInt(1000 * 60)).toString()
- const script = SystemScriptInfo.generateMultiSignScript(new Multisig().args(blake160, +minutes, tipHeaderEpoch))
+ const script = SystemScriptInfo.generateMultiSignScript(Multisig.args(blake160, +minutes, tipHeaderEpoch))
output.setLock(script)
output.setMultiSignBlake160(script.args.slice(0, 42))
}
@@ -333,7 +333,7 @@ export class TransactionGenerator {
const blake160 = lockScript.args
const minutes: number = +((BigInt(date) - BigInt(tipHeaderTimestamp)) / BigInt(1000 * 60)).toString()
const script: Script = SystemScriptInfo.generateMultiSignScript(
- new Multisig().args(blake160, minutes, tipHeaderEpoch)
+ Multisig.args(blake160, minutes, tipHeaderEpoch)
)
output.setLock(script)
output.setMultiSignBlake160(script.args.slice(0, 42))
@@ -378,6 +378,7 @@ export class TransactionGenerator {
tx.outputs[outputs.length - 1].setCapacity((totalCapacity - capacitiesExceptLast - finalFee).toString())
tx.fee = finalFee.toString()
tx.size = txSize
+ tx.hash = tx.computeHash()
// check
if (
@@ -407,26 +408,34 @@ export class TransactionGenerator {
receiveAddress: string,
changeAddress: string,
fee: string = '0',
- feeRate: string = '0'
+ feeRate: string = '0',
+ lockClass = {
+ lockArgs: [''],
+ codeHash: SystemScriptInfo.SECP_CODE_HASH,
+ hashType: ScriptHashType.Type,
+ },
+ multisigConfig?: MultisigConfigModel
): Promise => {
- const secpCellDep = await SystemScriptInfo.getInstance().getSecpCellDep()
+ let cellDep: CellDep
+ if (lockClass.codeHash === SystemScriptInfo.MULTI_SIGN_CODE_HASH) {
+ cellDep = await SystemScriptInfo.getInstance().getMultiSignCellDep()
+ } else {
+ cellDep = await SystemScriptInfo.getInstance().getSecpCellDep()
+ }
const daoCellDep = await SystemScriptInfo.getInstance().getDaoCellDep()
- const blake160: string = AddressParser.toBlake160(receiveAddress)
+
+ const lockScript = AddressParser.parse(receiveAddress)
const capacityInt: bigint = BigInt(capacity)
- const output: Output = new Output(
- capacity,
- SystemScriptInfo.generateSecpScript(blake160),
- SystemScriptInfo.generateDaoScript('0x')
- )
+ const output: Output = new Output(capacity, lockScript, SystemScriptInfo.generateDaoScript('0x'))
output.setDaoData('0x0000000000000000')
const outputs: Output[] = [output]
const tx = Transaction.fromObject({
version: '0',
- cellDeps: [secpCellDep, daoCellDep],
+ cellDeps: [cellDep, daoCellDep],
headerDeps: [],
inputs: [],
outputs,
@@ -443,18 +452,21 @@ export class TransactionGenerator {
feeRate,
baseSize,
TransactionGenerator.CHANGE_OUTPUT_SIZE,
- TransactionGenerator.CHANGE_OUTPUT_DATA_SIZE
+ TransactionGenerator.CHANGE_OUTPUT_DATA_SIZE,
+ undefined,
+ lockClass,
+ multisigConfig ? [multisigConfig] : []
)
const finalFeeInt = BigInt(finalFee)
tx.inputs = inputs
// change
if (hasChangeOutput) {
- const changeBlake160: string = AddressParser.toBlake160(changeAddress)
+ const lockScript = AddressParser.parse(changeAddress)
const changeCapacity = BigInt(capacities) - capacityInt - finalFeeInt
- const changeOutput = new Output(changeCapacity.toString(), SystemScriptInfo.generateSecpScript(changeBlake160))
+ const changeOutput = new Output(changeCapacity.toString(), lockScript)
tx.addOutput(changeOutput)
}
@@ -470,16 +482,32 @@ export class TransactionGenerator {
changeAddress: string,
isBalanceReserved = true,
fee: string = '0',
- feeRate: string = '0'
+ feeRate: string = '0',
+ lockClass = {
+ lockArgs: [''],
+ codeHash: SystemScriptInfo.SECP_CODE_HASH,
+ hashType: ScriptHashType.Type,
+ },
+ multisigConfig?: MultisigConfigModel
): Promise => {
- const secpCellDep = await SystemScriptInfo.getInstance().getSecpCellDep()
+ let cellDep: CellDep
+ if (lockClass.codeHash === SystemScriptInfo.MULTI_SIGN_CODE_HASH) {
+ cellDep = await SystemScriptInfo.getInstance().getMultiSignCellDep()
+ } else {
+ cellDep = await SystemScriptInfo.getInstance().getSecpCellDep()
+ }
const daoCellDep = await SystemScriptInfo.getInstance().getDaoCellDep()
const feeInt = BigInt(fee)
const feeRateInt = BigInt(feeRate)
const mode = new FeeMode(feeRateInt)
- const allInputs: Input[] = await CellsService.gatherAllInputs(walletId)
+ const allInputs: Input[] = await CellsService.gatherAllInputs(
+ walletId,
+ multisigConfig
+ ? Multisig.getMultisigScript(multisigConfig.blake160s, multisigConfig.r, multisigConfig.m, multisigConfig.n)
+ : undefined
+ )
if (allInputs.length === 0) {
throw new CapacityNotEnough()
}
@@ -489,24 +517,20 @@ export class TransactionGenerator {
const totalCapacity: bigint =
allInputs.map(input => BigInt(input.capacity || 0)).reduce((result, c) => result + c, BigInt(0)) - reservedBalance
- const receiveBlake160: string = AddressParser.toBlake160(receiveAddress)
- const output = new Output(
- totalCapacity.toString(),
- SystemScriptInfo.generateSecpScript(receiveBlake160),
- SystemScriptInfo.generateDaoScript('0x')
- )
+ const lockScript = AddressParser.parse(receiveAddress)
+ const output = new Output(totalCapacity.toString(), lockScript, SystemScriptInfo.generateDaoScript('0x'))
output.setDaoData('0x0000000000000000')
const outputs: Output[] = [output]
if (isBalanceReserved) {
- const changeBlake160 = AddressParser.toBlake160(changeAddress)
- outputs.push(new Output(reservedBalance.toString(), SystemScriptInfo.generateSecpScript(changeBlake160)))
+ const lockScript = AddressParser.parse(changeAddress)
+ outputs.push(new Output(reservedBalance.toString(), lockScript))
}
const tx = Transaction.fromObject({
version: '0',
- cellDeps: [secpCellDep, daoCellDep],
+ cellDeps: [cellDep, daoCellDep],
headerDeps: [],
inputs: allInputs,
outputs,
@@ -540,9 +564,20 @@ export class TransactionGenerator {
depositBlockHash: string,
changeAddress: string,
fee: string = '0',
- feeRate: string = '0'
+ feeRate: string = '0',
+ lockClass = {
+ lockArgs: [''],
+ codeHash: SystemScriptInfo.SECP_CODE_HASH,
+ hashType: ScriptHashType.Type,
+ },
+ multisigConfig?: MultisigConfigModel
): Promise => {
- const secpCellDep = await SystemScriptInfo.getInstance().getSecpCellDep()
+ let cellDep: CellDep
+ if (lockClass.codeHash === SystemScriptInfo.MULTI_SIGN_CODE_HASH) {
+ cellDep = await SystemScriptInfo.getInstance().getMultiSignCellDep()
+ } else {
+ cellDep = await SystemScriptInfo.getInstance().getSecpCellDep()
+ }
const daoCellDep = await SystemScriptInfo.getInstance().getDaoCellDep()
const output = prevOutput
@@ -555,7 +590,7 @@ export class TransactionGenerator {
const tx = Transaction.fromObject({
version: '0',
- cellDeps: [secpCellDep, daoCellDep],
+ cellDeps: [cellDep, daoCellDep],
headerDeps: [depositBlockHash],
inputs: [],
outputs,
@@ -580,7 +615,9 @@ export class TransactionGenerator {
baseSize,
TransactionGenerator.CHANGE_OUTPUT_SIZE,
TransactionGenerator.CHANGE_OUTPUT_DATA_SIZE,
- append
+ append,
+ lockClass,
+ multisigConfig ? [multisigConfig] : []
)
const finalFeeInt = BigInt(finalFee)
@@ -593,10 +630,10 @@ export class TransactionGenerator {
// change
if (hasChangeOutput) {
- const changeBlake160: string = AddressParser.toBlake160(changeAddress)
+ const lockScript = AddressParser.parse(changeAddress)
const changeCapacity = BigInt(capacities) - finalFeeInt
- const changeOutput = new Output(changeCapacity.toString(), SystemScriptInfo.generateSecpScript(changeBlake160))
+ const changeOutput = new Output(changeCapacity.toString(), lockScript)
tx.addOutput(changeOutput)
}
@@ -624,7 +661,7 @@ export class TransactionGenerator {
lock: lockScript,
})
- const since = new Multisig().parseSince(prevOutput.lock.args)
+ const since = Multisig.parseSince(prevOutput.lock.args)
const input = new Input(outPoint, since.toString(), prevOutput.capacity, prevOutput.lock)
const tx = Transaction.fromObject({
@@ -650,37 +687,51 @@ export class TransactionGenerator {
}
// sUDT
- public static async generateCreateAnyoneCanPayTx(
- tokenID: string,
- walletId: string,
- blake160: string,
- changeBlake160: string,
- feeRate: string,
+ public static async generateCreateAnyoneCanPayTx({
+ tokenID,
+ walletId,
+ blake160,
+ changeBlake160,
+ feeRate,
+ fee,
+ udtType,
+ }: {
+ tokenID: string
+ walletId: string
+ blake160: string
+ changeBlake160: string
+ feeRate: string
fee: string
- ): Promise {
+ udtType?: UDTType
+ }): Promise {
// if tokenID === '' or 'CKBytes', create ckb cell
const isCKB = tokenID === 'CKBytes' || tokenID === ''
+ if (!isCKB && !udtType) throw new Error('The udt token must has udt Type')
const secpCellDep = await SystemScriptInfo.getInstance().getSecpCellDep()
const assetAccountInfo = new AssetAccountInfo()
const sudtCellDep = assetAccountInfo.sudtCellDep
- const needCapacities = isCKB ? BigInt(61 * 10 ** 8) : BigInt(142 * 10 ** 8)
+ const xudtCellDep = assetAccountInfo.xudtCellDep
const output = Output.fromObject({
- capacity: needCapacities.toString(),
lock: assetAccountInfo.generateAnyoneCanPayScript(blake160),
- type: isCKB ? null : assetAccountInfo.generateSudtScript(tokenID),
+ type: isCKB
+ ? null
+ : udtType === UDTType.SUDT
+ ? assetAccountInfo.generateSudtScript(tokenID)
+ : assetAccountInfo.generateXudtScript(tokenID),
data: isCKB ? '0x' : BufferUtils.writeBigUInt128LE(BigInt(0)),
})
const tx = Transaction.fromObject({
version: '0',
headerDeps: [],
- cellDeps: [secpCellDep, sudtCellDep],
+ cellDeps: [secpCellDep, sudtCellDep, xudtCellDep],
inputs: [],
outputs: [output],
outputsData: [output.data],
witnesses: [],
})
const baseSize: number = TransactionSize.tx(tx)
+ const needCapacities = BigInt(output.capacity)
const { inputs, capacities, finalFee, hasChangeOutput } = await CellsService.gatherInputs(
needCapacities.toString(),
walletId,
@@ -712,13 +763,21 @@ export class TransactionGenerator {
return tx
}
- public static async generateCreateAnyoneCanPayTxUseAllBalance(
- tokenID: string,
- walletId: string,
- blake160: string,
- feeRate: string,
+ public static async generateCreateAnyoneCanPayTxUseAllBalance({
+ tokenID,
+ walletId,
+ blake160,
+ feeRate,
+ fee,
+ udtType,
+ }: {
+ tokenID: string
+ walletId: string
+ blake160: string
+ feeRate: string
fee: string
- ): Promise {
+ udtType?: UDTType
+ }): Promise {
// if tokenID === '' or 'CKBytes', create ckb cell
const isCKB = tokenID === 'CKBytes' || tokenID === ''
@@ -728,6 +787,7 @@ export class TransactionGenerator {
const secpCellDep = await SystemScriptInfo.getInstance().getSecpCellDep()
const assetAccountInfo = new AssetAccountInfo()
const sudtCellDep = assetAccountInfo.sudtCellDep
+ const xudtCellDep = assetAccountInfo.xudtCellDep
const allInputs: Input[] = await CellsService.gatherAllInputs(walletId)
@@ -740,14 +800,18 @@ export class TransactionGenerator {
const output = Output.fromObject({
capacity: totalCapacity.toString(),
lock: assetAccountInfo.generateAnyoneCanPayScript(blake160),
- type: isCKB ? null : assetAccountInfo.generateSudtScript(tokenID),
+ type: isCKB
+ ? null
+ : udtType === UDTType.SUDT
+ ? assetAccountInfo.generateSudtScript(tokenID)
+ : assetAccountInfo.generateXudtScript(tokenID),
data: isCKB ? '0x' : BufferUtils.writeBigUInt128LE(BigInt(0)),
})
const tx = Transaction.fromObject({
version: '0',
headerDeps: [],
- cellDeps: [secpCellDep, sudtCellDep],
+ cellDeps: [secpCellDep, sudtCellDep, xudtCellDep],
inputs: allInputs,
outputs: [output],
outputsData: [output.data],
@@ -771,17 +835,20 @@ export class TransactionGenerator {
walletId: string,
assetAccountInputs: Input[],
changeBlake160: string,
- isCKBAccount: boolean
+ isCKBAccount: boolean,
+ isForceDestroy?: boolean
) {
const secpCellDep = await SystemScriptInfo.getInstance().getSecpCellDep()
const assetAccountInfo = new AssetAccountInfo()
const cellDeps = [secpCellDep, assetAccountInfo.anyoneCanPayCellDep]
if (assetAccountInputs.some(v => v.type && v.data !== '0x' && BigInt(v.data || 0) !== BigInt(0))) {
- throw new SudtAcpHaveDataError()
+ if (!isForceDestroy) {
+ throw new SudtAcpHaveDataError()
+ }
}
if (!isCKBAccount) {
- cellDeps.push(assetAccountInfo.sudtCellDep)
+ cellDeps.push(assetAccountInfo.sudtCellDep, assetAccountInfo.xudtCellDep)
}
const output = Output.fromObject({
@@ -920,7 +987,6 @@ export class TransactionGenerator {
) {
const secpCellDep = await SystemScriptInfo.getInstance().getSecpCellDep()
const assetAccountInfo = new AssetAccountInfo()
- const sudtCellDep = assetAccountInfo.sudtCellDep
const anyoneCanPayDep = assetAccountInfo.anyoneCanPayCellDep
const targetAmount: bigint =
amount === 'all' ? BigInt(0) : BufferUtils.parseAmountFromSUDTData(targetOutput.data) + BigInt(amount)
@@ -939,10 +1005,14 @@ export class TransactionGenerator {
data: targetOutput.data,
})
: undefined
+ const udtCellDep =
+ targetOutput.type && assetAccountInfo.isSudtScript(targetOutput.type)
+ ? assetAccountInfo.sudtCellDep
+ : assetAccountInfo.xudtCellDep
const tx = Transaction.fromObject({
version: '0',
headerDeps: [],
- cellDeps: [secpCellDep, sudtCellDep, anyoneCanPayDep],
+ cellDeps: [secpCellDep, udtCellDep, anyoneCanPayDep],
inputs: targetInput ? [targetInput] : [],
outputs: [output],
outputsData: [output.data],
@@ -986,7 +1056,7 @@ export class TransactionGenerator {
// amount assertion
TransactionGenerator.checkTxCapacity(tx, 'generateAnyoneCanPayToSudtTx capacity not match!')
- TransactionGenerator.checkTxSudtAmount(tx, 'generateAnyoneCanPayToSudtTx sUDT amount not match!', assetAccountInfo)
+ TransactionGenerator.checkTxUdtAmount(tx, 'generateAnyoneCanPayToSudtTx sUDT amount not match!', assetAccountInfo)
return tx
}
@@ -1074,22 +1144,23 @@ export class TransactionGenerator {
const assetAccountInfo = new AssetAccountInfo()
const secpCellDep = await SystemScriptInfo.getInstance().getSecpCellDep()
- const sudtCellDep = assetAccountInfo.sudtCellDep
+ const udtCellDep =
+ assetAccount.udtType === UDTType.SUDT ? assetAccountInfo.sudtCellDep : assetAccountInfo.xudtCellDep
const anyoneCanPayDep = assetAccountInfo.anyoneCanPayCellDep
const senderAcpScript = assetAccountInfo.generateAnyoneCanPayScript(assetAccount.blake160)
const receiverLockScript = AddressParser.parse(receiverAddress)
const chequeCellTmp = Output.fromObject({
- capacity: BigInt(162 * 10 ** 8).toString(),
lock: assetAccountInfo.generateChequeScript(bytes.hexify(Buffer.alloc(20)), bytes.hexify(Buffer.alloc(20))),
- type: assetAccountInfo.generateSudtScript(assetAccount.tokenID),
+ type: assetAccountInfo.generateUdtScript(assetAccount.tokenID, assetAccount.udtType),
+ data: BufferUtils.writeBigUInt128LE(BigInt(0)),
})
const tx = Transaction.fromObject({
version: '0',
headerDeps: [],
- cellDeps: [secpCellDep, sudtCellDep, anyoneCanPayDep],
+ cellDeps: [secpCellDep, udtCellDep, anyoneCanPayDep],
inputs: [],
outputs: [],
outputsData: [],
@@ -1172,7 +1243,7 @@ export class TransactionGenerator {
tx.anyoneCanPaySendAmount = tx.sudtInfo.amount
TransactionGenerator.checkTxCapacity(tx, 'generateCreateChequeTx capacity not match!')
- TransactionGenerator.checkTxSudtAmount(tx, 'generateCreateChequeTx sUDT amount not match!', assetAccountInfo)
+ TransactionGenerator.checkTxUdtAmount(tx, 'generateCreateChequeTx sUDT amount not match!', assetAccountInfo)
return tx
}
@@ -1203,11 +1274,13 @@ export class TransactionGenerator {
}
const chequeSenderLock = senderInputsByLockHash[0].lockScript()
- const acpCellCapacity = BigInt(142 * 10 ** 8)
const assetAccountInfo = new AssetAccountInfo()
const secpCellDep = await SystemScriptInfo.getInstance().getSecpCellDep()
- const sudtCellDep = assetAccountInfo.sudtCellDep
+ const udtCellDep =
+ chequeCell.type && assetAccountInfo.isSudtScript(chequeCell.type)
+ ? assetAccountInfo.sudtCellDep
+ : assetAccountInfo.xudtCellDep
const anyoneCanPayDep = assetAccountInfo.anyoneCanPayCellDep
const chequeDep = assetAccountInfo.getChequeInfo().cellDep
@@ -1228,7 +1301,7 @@ export class TransactionGenerator {
const tx = Transaction.fromObject({
version: '0',
- cellDeps: [secpCellDep, sudtCellDep, anyoneCanPayDep, chequeDep],
+ cellDeps: [secpCellDep, udtCellDep, anyoneCanPayDep, chequeDep],
headerDeps: [],
inputs: [chequeInput],
outputs: [senderOutput],
@@ -1240,6 +1313,7 @@ export class TransactionGenerator {
const receiverAcpCells = await CellsService.getACPCells(receiverAcpScript, chequeCell.type!)
let requiredCapacity = BigInt(0)
+ let acpCellCapacity = BigInt(0)
if (receiverAcpCells.length) {
const originalReceiverAcpOutput = receiverAcpCells[0]
@@ -1263,16 +1337,16 @@ export class TransactionGenerator {
data: originalReceiverAcpOutput.data,
})
tx.inputs.push(receiverAcpInput)
+ acpCellCapacity = BigInt(newReceiverAcpOutput.capacity)
tx.outputs.push(newReceiverAcpOutput)
} else {
- requiredCapacity = acpCellCapacity
-
const receiverAcpOutput = Output.fromObject({
- capacity: acpCellCapacity.toString(),
lock: receiverAcpScript,
type: chequeCell.type,
data: chequeCell.data,
})
+ acpCellCapacity = BigInt(receiverAcpOutput.capacity)
+ requiredCapacity = BigInt(receiverAcpOutput.capacity)
tx.outputs.push(receiverAcpOutput)
}
@@ -1305,7 +1379,7 @@ export class TransactionGenerator {
}
TransactionGenerator.checkTxCapacity(tx, 'generateClaimChequeTx capacity not match!')
- TransactionGenerator.checkTxSudtAmount(tx, 'generateClaimChequeTx sUDT amount not match!', assetAccountInfo)
+ TransactionGenerator.checkTxUdtAmount(tx, 'generateClaimChequeTx sUDT amount not match!', assetAccountInfo)
return tx
}
@@ -1377,12 +1451,13 @@ export class TransactionGenerator {
const secpCellDep = await SystemScriptInfo.getInstance().getSecpCellDep()
const sudtCellDep = assetAccountInfo.sudtCellDep
+ const xudtCellDep = assetAccountInfo.xudtCellDep
const anyoneCanPayDep = assetAccountInfo.anyoneCanPayCellDep
const chequeDep = assetAccountInfo.getChequeInfo().cellDep
const tx = Transaction.fromObject({
version: '0',
- cellDeps: [secpCellDep, sudtCellDep, anyoneCanPayDep, chequeDep],
+ cellDeps: [secpCellDep, sudtCellDep, xudtCellDep, anyoneCanPayDep, chequeDep],
headerDeps: [],
inputs: [chequeSenderAcpInput, chequeInput],
outputs: [senderAcpOutput],
@@ -1409,7 +1484,7 @@ export class TransactionGenerator {
tx.outputsData.push('0x')
TransactionGenerator.checkTxCapacity(tx, 'generateWithdrawChequeTx capacity not match!')
- TransactionGenerator.checkTxSudtAmount(tx, 'generateWithdrawChequeTx sUDT amount not match!', assetAccountInfo)
+ TransactionGenerator.checkTxUdtAmount(tx, 'generateWithdrawChequeTx sUDT amount not match!', assetAccountInfo)
return tx
}
@@ -1455,10 +1530,9 @@ export class TransactionGenerator {
]
const secpCellDep = await SystemScriptInfo.getInstance().getSecpCellDep()
- const sudtCellDep = assetAccountInfo.sudtCellDep
- const anyoneCanPayDep = assetAccountInfo.anyoneCanPayCellDep
let outputs: Output[] = []
let acpInputCell: Input | null = null
+ const acpCodeHashes = new Set([sudtCell.lock.codeHash])
if (acpAddress) {
if (!inputSudtCell.type) {
throw new MigrateSudtCellNoTypeError()
@@ -1473,6 +1547,7 @@ export class TransactionGenerator {
const receiverAcpInputAmount = BufferUtils.readBigUInt128LE(receiverAcpCell.data)
const sudtCellAmount = BufferUtils.readBigUInt128LE(inputSudtCell.data)
const receiverAcpOutputAmount = receiverAcpInputAmount + sudtCellAmount
+ inputSudtCell.setLock(SystemScriptInfo.generateSecpScript(inputSudtCell.lock.args))
inputSudtCell.setData('0x')
inputSudtCell.setType(null)
outputs = [
@@ -1494,6 +1569,7 @@ export class TransactionGenerator {
since: '0',
})
sudtMigrateAcpInputs.push(acpInputCell)
+ acpCodeHashes.add(receiverAcpCell.lock().codeHash)
} else {
const addresses = await currentWallet.getNextReceivingAddresses()
const usedBlake160s = new Set(
@@ -1504,10 +1580,16 @@ export class TransactionGenerator {
outputs = [inputSudtCell]
}
+ const acpCellDeps = [...acpCodeHashes].map(v => assetAccountInfo.getAcpCellDep(v))
const tx = Transaction.fromObject({
version: '0',
headerDeps: [],
- cellDeps: [secpCellDep, sudtCellDep, anyoneCanPayDep],
+ cellDeps: [
+ secpCellDep,
+ assetAccountInfo.sudtCellDep,
+ assetAccountInfo.xudtCellDep,
+ ...acpCellDeps.filter((v): v is CellDep => !!v),
+ ],
inputs: sudtMigrateAcpInputs,
outputs: outputs,
outputsData: outputs.map(v => v.data || '0x'),
@@ -1517,7 +1599,7 @@ export class TransactionGenerator {
const txSize = TransactionSize.tx(tx) + TransactionSize.secpLockWitness() * tx.inputs.length
tx.fee = TransactionFee.fee(txSize, BigInt(feeRate)).toString()
const outputCapacity = BigInt(inputSudtCell.capacity) - BigInt(tx.fee)
- if (outputCapacity >= BigInt(MIN_SUDT_CAPACITY)) {
+ if (outputCapacity >= tx.outputs[0].minimalCellCapacity()) {
tx.outputs[0].capacity = outputCapacity.toString()
return tx
}
@@ -1573,18 +1655,29 @@ export class TransactionGenerator {
)
}
- private static checkTxSudtAmount(tx: Transaction, msg: string, assetAccountInfo: AssetAccountInfo) {
- const inputAmount = tx.inputs
+ private static checkTxUdtAmount(tx: Transaction, msg: string, assetAccountInfo: AssetAccountInfo) {
+ const sudtInputAmount = tx.inputs
.filter(i => i.type && assetAccountInfo.isSudtScript(i.type))
.map(i => BufferUtils.parseAmountFromSUDTData(i.data!))
.reduce((result, c) => result + c, BigInt(0))
- const outputAmount = tx.outputs
+ const sudtOutputAmount = tx.outputs
.filter(o => o.type && assetAccountInfo.isSudtScript(o.type))
.map(o => BufferUtils.parseAmountFromSUDTData(o.data!))
.reduce((result, c) => result + c, BigInt(0))
- assert.equal(inputAmount.toString(), outputAmount.toString(), `${msg}: ${JSON.stringify(tx)}`)
+ assert.equal(sudtInputAmount.toString(), sudtOutputAmount.toString(), `${msg}: ${JSON.stringify(tx)}`)
+
+ const xudtInputAmount = tx.inputs
+ .filter(i => i.type && assetAccountInfo.isXudtScript(i.type))
+ .map(i => BufferUtils.parseAmountFromSUDTData(i.data!))
+ .reduce((result, c) => result + c, BigInt(0))
+
+ const xudtOutputAmount = tx.outputs
+ .filter(o => o.type && assetAccountInfo.isXudtScript(o.type))
+ .map(o => BufferUtils.parseAmountFromSUDTData(o.data!))
+ .reduce((result, c) => result + c, BigInt(0))
+ assert.equal(xudtInputAmount.toString(), xudtOutputAmount.toString(), `${msg}: ${JSON.stringify(tx)}`)
}
}
diff --git a/packages/neuron-wallet/src/services/tx/transaction-persistor.ts b/packages/neuron-wallet/src/services/tx/transaction-persistor.ts
index 7298ded15f..3eeecd3a61 100644
--- a/packages/neuron-wallet/src/services/tx/transaction-persistor.ts
+++ b/packages/neuron-wallet/src/services/tx/transaction-persistor.ts
@@ -24,9 +24,7 @@ export class TransactionPersistor {
// 1. If the tx is not persisted before sending, output = sent, input = pending
// 2. If the tx is already persisted before sending, do nothing
private static saveWithSent = async (transaction: Transaction): Promise => {
- const txEntity: TransactionEntity | undefined = await getConnection()
- .getRepository(TransactionEntity)
- .findOne(transaction.hash)
+ const txEntity = await getConnection().getRepository(TransactionEntity).findOneBy({ hash: transaction.hash })
if (txEntity && txEntity.status === TransactionStatus.Failed) {
// delete and create a new one (OR just update all status)
@@ -51,9 +49,9 @@ export class TransactionPersistor {
lockArgsSetNeedsDetail?: Set
): Promise => {
const connection = getConnection()
- const txEntity: TransactionEntity | undefined = await connection
+ const txEntity: TransactionEntity | null = await connection
.getRepository(TransactionEntity)
- .findOne(transaction.hash)
+ .findOneBy({ hash: transaction.hash })
// update multiSignBlake160 / input.type / input.data / output.data
if (txEntity) {
@@ -151,7 +149,7 @@ export class TransactionPersistor {
const outPoint: OutPoint | null = input.previousOutput()
if (outPoint) {
- const outputEntity: OutputEntity | undefined = await connection.getRepository(OutputEntity).findOne({
+ const outputEntity = await connection.getRepository(OutputEntity).findOneBy({
outPointTxHash: outPoint.txHash,
outPointIndex: outPoint.index,
})
@@ -257,7 +255,7 @@ export class TransactionPersistor {
inputs.push(input)
if (outPoint) {
- const previousOutput: OutputEntity | undefined = await connection.getRepository(OutputEntity).findOne({
+ const previousOutput = await connection.getRepository(OutputEntity).findOneBy({
outPointTxHash: outPoint.txHash,
outPointIndex: outPoint.index,
})
@@ -271,7 +269,7 @@ export class TransactionPersistor {
}
const outputsData = transaction.outputsData!
- const useTxInputs = await connection.getRepository(InputEntity).find({ outPointTxHash: tx.hash })
+ const useTxInputs = await connection.getRepository(InputEntity).findBy({ outPointTxHash: tx.hash })
const useTxIndices = new Set(useTxInputs.map(v => v.outPointIndex))
const outputs: OutputEntity[] = transaction.outputs.map((o, index) => {
const output = new OutputEntity()
diff --git a/packages/neuron-wallet/src/services/tx/transaction-service.ts b/packages/neuron-wallet/src/services/tx/transaction-service.ts
index e58a36e84f..18dbb29bf5 100644
--- a/packages/neuron-wallet/src/services/tx/transaction-service.ts
+++ b/packages/neuron-wallet/src/services/tx/transaction-service.ts
@@ -1,14 +1,8 @@
-import { CKBRPC } from '@ckb-lumos/rpc'
+import { CKBRPC } from '@ckb-lumos/lumos/rpc'
import TransactionEntity from '../../database/chain/entities/transaction'
import OutputEntity from '../../database/chain/entities/output'
import { getConnection } from '../../database/chain/connection'
-import Transaction, {
- TransactionStatus,
- SudtInfo,
- NFTType,
- NFTInfo,
- AssetAccountType,
-} from '../../models/chain/transaction'
+import Transaction, { TransactionStatus, NFTType, AssetAccountType } from '../../models/chain/transaction'
import InputEntity from '../../database/chain/entities/input'
import AddressParser from '../../models/address-parser'
import AssetAccountInfo from '../../models/asset-account-info'
@@ -20,12 +14,17 @@ import NetworksService from '../networks'
import Script from '../../models/chain/script'
import Input from '../../models/chain/input'
import SudtTokenInfoService from '../sudt-token-info'
+import TransactionSize from '../../models/transaction-size'
+import Output from '../../models/chain/output'
+import { UDTType } from '../../utils/const'
export interface TransactionsByAddressesParam {
pageNo: number
pageSize: number
addresses: string[]
walletID: string
+ sort?: string
+ direction?: string
}
export interface PaginationResult {
@@ -42,6 +41,8 @@ export enum SearchType {
Unknown = 'unknown',
}
+const DESC = 'decrease'
+
export class TransactionsService {
public static filterSearchType(value: string) {
if (value === '') {
@@ -63,6 +64,169 @@ export class TransactionsService {
return SearchType.TokenInfo
}
+ public static ComparedTxType(a: Transaction, b: Transaction, direction: string) {
+ const aType = a.type ?? ''
+ const bType = b.type ?? ''
+ if (aType > bType) return direction === DESC ? 1 : -1
+ if (aType < bType) return direction === DESC ? -1 : 1
+ return 0
+ }
+
+ public static ComparedTxTimestamp(a: Transaction, b: Transaction, direction: string) {
+ const aTimestamp = a.timestamp ? +a.timestamp : 0
+ const bTimestamp = b.timestamp ? +b.timestamp : 0
+ if (aTimestamp > bTimestamp) return direction === DESC ? 1 : -1
+ if (aTimestamp < bTimestamp) return direction === DESC ? -1 : 1
+ return 0
+ }
+
+ public static ComparedTxBalance(a: Transaction, b: Transaction, direction: string) {
+ const aBalance = a.value ? BigInt(a.value) : BigInt(0)
+ const bBalance = b.value ? BigInt(b.value) : BigInt(0)
+ if (aBalance > bBalance) return direction === DESC ? 1 : -1
+ if (aBalance < bBalance) return direction === DESC ? -1 : 1
+ return 0
+ }
+
+ private static async getSudtInfo({
+ txHash,
+ acpUdtInputs,
+ acpUdtOutputs,
+ udtType,
+ }: {
+ txHash: string
+ acpUdtInputs: InputEntity[]
+ acpUdtOutputs: OutputEntity[]
+ udtType: UDTType
+ }) {
+ const udtInput = acpUdtInputs.find(i => i.transactionHash === txHash)
+ const udtOutput = acpUdtOutputs.find(o => o.outPointTxHash === txHash)
+ const typeArgs: string | undefined | null = udtInput?.typeArgs ?? udtOutput?.typeArgs
+ const assetAccountType: AssetAccountType | undefined =
+ udtInput || udtOutput ? (udtType === UDTType.SUDT ? AssetAccountType.SUDT : AssetAccountType.XUDT) : undefined
+ if (!typeArgs) return undefined
+ const inputAmount = acpUdtInputs
+ .filter(i => i.transactionHash === txHash && i.typeArgs === typeArgs)
+ .map(i => BufferUtils.parseAmountFromSUDTData(i.data))
+ .reduce((result, c) => result + c, BigInt(0))
+ const outputAmount = acpUdtOutputs
+ .filter(o => o.outPointTxHash === txHash && o.typeArgs === typeArgs)
+ .map(o => BufferUtils.parseAmountFromSUDTData(o.data))
+ .reduce((result, c) => result + c, BigInt(0))
+ const amount = outputAmount - inputAmount
+ let txType = amount > 0 ? 'receive' : 'send'
+ if (udtInput && !udtOutput) {
+ txType = 'destroy'
+ } else if (!udtInput && udtOutput) {
+ txType = 'create'
+ }
+
+ return {
+ sudtInfo: {
+ sUDT: (await SudtTokenInfoService.getSudtTokenInfo(typeArgs, udtType)) ?? undefined,
+ amount: amount.toString(),
+ },
+ txType,
+ assetAccountType,
+ }
+ }
+
+ private static async getAssetCKBInfo({
+ txHash,
+ acpCKBInputs,
+ acpCKBOutputs,
+ }: {
+ txHash: string
+ acpCKBInputs: InputEntity[]
+ acpCKBOutputs: OutputEntity[]
+ }) {
+ const ckbAssetInput = acpCKBInputs.find(i => i.transactionHash === txHash)
+ const ckbAssetOutput = acpCKBOutputs.find(o => o.outPointTxHash === txHash)
+ if (!ckbAssetInput && !ckbAssetOutput) return
+ if (ckbAssetInput && !ckbAssetOutput) {
+ return {
+ txType: 'destroy',
+ assetAccountType: AssetAccountType.CKB,
+ }
+ }
+ if (!ckbAssetInput && ckbAssetOutput) {
+ return {
+ txType: 'create',
+ assetAccountType: AssetAccountType.CKB,
+ }
+ }
+ }
+
+ private static getNtfInfo({
+ txHash,
+ nftInputs,
+ nftOutputs,
+ }: {
+ txHash: string
+ nftInputs: InputEntity[]
+ nftOutputs: OutputEntity[]
+ }) {
+ const sendNFTCell = nftInputs.find(i => i.transactionHash === txHash)
+ const receiveNFTCell = nftOutputs.find(o => o.outPointTxHash === txHash)
+
+ if (sendNFTCell) {
+ return { type: NFTType.Send, data: sendNFTCell.typeArgs! }
+ }
+ if (receiveNFTCell) {
+ return { type: NFTType.Receive, data: receiveNFTCell.typeArgs! }
+ }
+ }
+
+ private static getDAOCapacity(
+ ckbChange: bigint,
+ txDaoInfo?: {
+ inputs: {
+ capacity: string
+ transactionHash: string
+ outPointTxHash: string
+ outPointIndex: string
+ data: string
+ }[]
+ outputs: {
+ capacity: string
+ transactionHash: string
+ daoData: string
+ }[]
+ }
+ ) {
+ if (!txDaoInfo) return
+ if (txDaoInfo.inputs.length && !txDaoInfo.outputs.length) {
+ return txDaoInfo.inputs.reduce((pre, cur) => BigInt(cur.capacity) + pre, ckbChange).toString()
+ }
+ if (!txDaoInfo.inputs.length && txDaoInfo.outputs.length) {
+ return `-${txDaoInfo.outputs.reduce((pre, cur) => BigInt(cur.capacity) + pre, BigInt(0)).toString()}`
+ }
+ }
+
+ private static groupAssetCells(cells: T[]) {
+ const assetAccountInfo = new AssetAccountInfo()
+ const acpSudtCells: T[] = []
+ const acpCKBCells: T[] = []
+ const acpXudtCells: T[] = []
+ cells.forEach(v => {
+ const typeScript = v.typeScript()
+ if (typeScript) {
+ if (assetAccountInfo.isSudtScript(typeScript)) {
+ acpSudtCells.push(v)
+ } else if (assetAccountInfo.isXudtScript(typeScript)) {
+ acpXudtCells.push(v)
+ }
+ } else {
+ acpCKBCells.push(v)
+ }
+ })
+ return {
+ acpCKBCells,
+ acpSudtCells,
+ acpXudtCells,
+ }
+ }
+
public static async getAllByAddresses(
params: TransactionsByAddressesParam,
searchValue: string = ''
@@ -207,7 +371,10 @@ export class TransactionsService {
}
const skip = (params.pageNo - 1) * params.pageSize
- const txHashes = allTxHashes.slice(skip, skip + params.pageSize)
+ const needSort =
+ ['type', 'value', 'timestamp'].includes(params.sort ?? '') &&
+ ['increase', 'decrease'].includes(params.direction ?? '')
+ const txHashes = needSort ? allTxHashes : allTxHashes.slice(skip, skip + params.pageSize)
const transactions = await connection
.getRepository(TransactionEntity)
@@ -223,6 +390,7 @@ export class TransactionsService {
.addSelect('input.transactionHash', 'transactionHash')
.addSelect('input.outPointTxHash', 'outPointTxHash')
.addSelect('input.outPointIndex', 'outPointIndex')
+ .addSelect('input.data', 'data')
.where(
`
input.transactionHash IN (:...txHashes) AND
@@ -233,7 +401,13 @@ export class TransactionsService {
walletId: params.walletID,
}
)
- .getRawMany()
+ .getRawMany<{
+ capacity: string
+ transactionHash: string
+ outPointTxHash: string
+ outPointIndex: string
+ data: string
+ }>()
const outputs = await connection
.getRepository(OutputEntity)
@@ -251,7 +425,7 @@ export class TransactionsService {
walletId: params.walletID,
}
)
- .getRawMany()
+ .getRawMany<{ capacity: string; transactionHash: string; daoData: string }>()
const assetAccountInputs = await connection
.getRepository(InputEntity)
@@ -319,14 +493,6 @@ export class TransactionsService {
)
.getMany()
- const anyoneCanPayInputs = assetAccountInputs.filter(i => i.typeScript())
-
- const anyoneCanPayOutputs = assetAccountOutputs.filter(i => i.typeScript())
-
- const ckbAssetInputs = assetAccountInputs.filter(i => !i.typeScript())
-
- const ckbAssetOutputs = assetAccountOutputs.filter(i => !i.typeScript())
-
const inputPreviousTxHashes: string[] = inputs.map(i => i.outPointTxHash).filter(h => !!h) as string[]
const daoCellOutPoints: { txHash: string; index: string }[] = (
@@ -340,13 +506,17 @@ export class TransactionsService {
).filter(o => inputPreviousTxHashes.includes(o.txHash))
const sums = new Map()
- const daoFlag = new Map |