+
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-wallet/.env b/packages/neuron-wallet/.env
index 3c4d9296b8..7d71ecbddd 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='0x6dd077b407d019a0bce0cbad8c34e69a524ae4b2599b9feda2c7491f3559d32c'
-CKB_NODE_DATA_SIZE=54
+CKB_NODE_ASSUME_VALID_TARGET='0xca44ae8f7bc12ba8eab3224cbe3156c913e2284693e36dc1d01e4d30f362f3c2'
+CKB_NODE_ASSUME_VALID_TARGET_BLOCK_NUMBER=13705152
+CKB_NODE_DATA_SIZE=58
diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
index a5fd0c7891..dcd3c40b61 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.116.2",
+ "version": "0.117.0",
"private": true,
"author": {
"name": "Nervos Core Dev",
@@ -42,27 +42,23 @@
]
},
"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/rpc": "0.23.0",
+ "@ckb-lumos/lumos": "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",
+ "@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",
+ "elliptic": "6.5.5",
"hw-app-ckb": "0.1.2",
"i18next": "21.10.0",
"leveldown": "6.1.1",
@@ -72,14 +68,13 @@
"sha3": "2.1.4",
"sqlite3": "5.1.6",
"subleveldown": "4.1.4",
- "tslib": "2.6.2",
+ "tslib": "2.6.3",
"typeorm": "0.3.17",
- "undici": "5.28.4",
"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",
@@ -97,7 +92,7 @@
"electron-builder": "24.9.1",
"electron-devtools-installer": "3.2.0",
"jest-when": "3.6.0",
- "neuron-ui": "0.116.2",
+ "neuron-ui": "0.117.0",
"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 cf690f014b..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
@@ -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 b3401f6626..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[]
@@ -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 f87dddf99b..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,20 +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 retainedSyncScripts = syncScripts.filter(v => existSyncArgses.has(v.script.args))
- const existSyncscripts: Record = {}
+ const existSyncScripts: Record = {}
retainedSyncScripts.forEach(v => {
- existSyncscripts[scriptToHash(v.script)] = 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(),
@@ -198,56 +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)] ||
- +existSyncscripts[scriptToHash(v.script)].blockNumber < +(walletStartBlockMap[v.walletId] ?? 0)
+ .filter(v => {
+ return (
+ !currentWalletId ||
+ v.walletId === currentWalletId ||
+ walletMinBlockNumber[v.walletId] >
+ walletMinBlockNumber[currentWalletId] - THRESHOLD_BLOCK_NUMBER_IN_DIFF_WALLET
)
- .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 => ({
+ })
+ 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 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)
@@ -256,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
@@ -284,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))
) {
@@ -330,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 027bc14967..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,10 +17,9 @@ 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'
@@ -28,7 +27,6 @@ export default class Queue {
#lockHashes: string[]
#url: string // ckb node
#nodeType: NetworkType
- #indexerUrl: string
#addresses: AddressInterface[]
#rpcService: RpcService
#indexerConnector: Synchronizer | undefined
@@ -38,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(
@@ -67,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) {
@@ -122,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
@@ -138,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') {
@@ -149,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) {
@@ -236,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)
@@ -272,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 b8d1a789a2..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,19 +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) => {
@@ -108,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)
@@ -126,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) {
@@ -155,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) {
@@ -166,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 200aaeded3..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,6 +95,7 @@ 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) {
@@ -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 1a2532559b..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,16 +50,16 @@ const getTransactionStatus = async (hash: string) => {
}
const trackingStatus = async () => {
- const pendingTransactions = await FailedTransaction.pendings()
+ const pendingOrFailedTransactions = await FailedTransaction.pendingOrFaileds()
await FailedTransaction.processAmendFailedTxs()
- if (!pendingTransactions.length) {
+ 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 {
@@ -65,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 df092470bf..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'
@@ -49,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,
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index 0647f9db2a..f7f75d5b9e 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -24,7 +24,7 @@ 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'
@@ -59,12 +59,15 @@ 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 { OutPoint } from '@ckb-lumos/base'
+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'
// Handle channel messages from renderer process and user actions.
@@ -104,7 +107,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
}
@@ -317,6 +332,7 @@ export default class ApiController {
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,
@@ -799,9 +815,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)
@@ -815,10 +834,6 @@ 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('generate-destroy-asset-account-tx', async (_, params: { walletID: string; id: number }) => {
return this.#assetAccountController.destroyAssetAccount(params)
})
@@ -913,6 +928,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()
diff --git a/packages/neuron-wallet/src/controllers/asset-account.ts b/packages/neuron-wallet/src/controllers/asset-account.ts
index 1469996125..1fefd3e22e 100644
--- a/packages/neuron-wallet/src/controllers/asset-account.ts
+++ b/packages/neuron-wallet/src/controllers/asset-account.ts
@@ -3,7 +3,7 @@ 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'
@@ -22,6 +22,7 @@ export interface GenerateCreateAssetAccountTxParams {
decimal: string
feeRate: string
fee: string
+ udtType?: UDTType
}
export interface SendCreateAssetAccountTxParams {
@@ -137,16 +138,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')
diff --git a/packages/neuron-wallet/src/controllers/cell-management.ts b/packages/neuron-wallet/src/controllers/cell-management.ts
index 4e0ee8ce20..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 as OutPointSDK, 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'
@@ -69,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 cell owner')
+ 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 2dccf9e798..37e30447ad 100644
--- a/packages/neuron-wallet/src/controllers/dao.ts
+++ b/packages/neuron-wallet/src/controllers/dao.ts
@@ -1,4 +1,4 @@
-import { type OutPoint as OutPointSDK } from '@ckb-lumos/base'
+import { type OutPoint as OutPointSDK } from '@ckb-lumos/lumos'
import { ServiceHasNoResponse, IsRequired } from '../exceptions'
import { ResponseCode } from '../utils/const'
import CellsService from '../services/cells'
diff --git a/packages/neuron-wallet/src/controllers/export-debug.ts b/packages/neuron-wallet/src/controllers/export-debug.ts
index c393984bd3..0504fe8ce7 100644
--- a/packages/neuron-wallet/src/controllers/export-debug.ts
+++ b/packages/neuron-wallet/src/controllers/export-debug.ts
@@ -14,6 +14,7 @@ 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'
@@ -158,7 +159,12 @@ export default class ExportDebugController {
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}`)
}
diff --git a/packages/neuron-wallet/src/controllers/hardware.ts b/packages/neuron-wallet/src/controllers/hardware.ts
index e8e9aa0cfa..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 '@ckb-lumos/hd'
+import { hd } from '@ckb-lumos/lumos'
export default class HardwareController {
public async connectDevice(deviceInfo: DeviceInfo): Promise> {
@@ -50,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..c643890635 100644
--- a/packages/neuron-wallet/src/controllers/sudt.ts
+++ b/packages/neuron-wallet/src/controllers/sudt.ts
@@ -1,4 +1,3 @@
-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'
@@ -35,13 +34,4 @@ export default class SUDTController {
result: { tokenID: params.tokenID, symbol: symbol, tokenName: name, decimal: decimal },
}
}
-
- 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)
- return {
- status: ResponseCode.Success,
- result: scriptToHash(script.toSDK()),
- }
- }
}
diff --git a/packages/neuron-wallet/src/controllers/sync-api.ts b/packages/neuron-wallet/src/controllers/sync-api.ts
index 5207cc6ec4..d3571d2770 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) {
@@ -135,6 +139,16 @@ export default class SyncApiController {
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 &&
+ bestKnownBlockNumber < setAssumeValidTargetBlockNumber
const newSyncState: SyncState = {
nodeUrl: network.remote,
@@ -147,7 +161,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/wallets.ts b/packages/neuron-wallet/src/controllers/wallets.ts
index db66030bfa..a47f3c2015 100644
--- a/packages/neuron-wallet/src/controllers/wallets.ts
+++ b/packages/neuron-wallet/src/controllers/wallets.ts
@@ -4,9 +4,8 @@ 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 { bytes } from '@ckb-lumos/codec'
-import { Keychain, Keystore, ExtendedPrivateKey, AccountExtendedPublicKey } from '@ckb-lumos/hd'
-import { generateMnemonic, validateMnemonic, mnemonicToSeedSync } from '@ckb-lumos/hd/lib/mnemonic'
+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()
@@ -166,6 +171,21 @@ 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(bytes.bytify(masterPrivateKey.privateKey)),
@@ -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,
}
@@ -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()
@@ -601,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)
}
diff --git a/packages/neuron-wallet/src/database/address/meta.ts b/packages/neuron-wallet/src/database/address/meta.ts
index 36de7a34f3..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 '@ckb-lumos/hd'
+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/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 e5fa061106..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 '@ckb-lumos/hd'
+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 698be44a0f..3e62b73e5b 100644
--- a/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts
+++ b/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts
@@ -29,6 +29,9 @@ export default class MultisigConfig {
@Column()
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/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/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 e49a21cad4..b8699466d2 100644
--- a/packages/neuron-wallet/src/database/chain/ormconfig.ts
+++ b/packages/neuron-wallet/src/database/chain/ormconfig.ts
@@ -68,6 +68,8 @@ 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'
@@ -184,6 +186,8 @@ const getConnectionOptions = (genesisBlockHash: string, connectionName: Connecti
RenameSyncProgress1702781527414,
RemoveAddressInIndexerCache1704357651876,
AmendTransaction1709008125088,
+ AddStartBlockNumber1716539079505,
+ AddUdtType1720089814860,
],
subscribers: [
AddressSubscribe,
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/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/en.ts b/packages/neuron-wallet/src/locales/en.ts
index 5c87164364..fec1bc382c 100644
--- a/packages/neuron-wallet/src/locales/en.ts
+++ b/packages/neuron-wallet/src/locales/en.ts
@@ -122,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',
@@ -140,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: {
diff --git a/packages/neuron-wallet/src/locales/es.ts b/packages/neuron-wallet/src/locales/es.ts
index 60134165fd..9d70452efd 100644
--- a/packages/neuron-wallet/src/locales/es.ts
+++ b/packages/neuron-wallet/src/locales/es.ts
@@ -121,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',
@@ -141,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: {
diff --git a/packages/neuron-wallet/src/locales/fr.ts b/packages/neuron-wallet/src/locales/fr.ts
index 12c9cf30a9..58e11e3d3a 100644
--- a/packages/neuron-wallet/src/locales/fr.ts
+++ b/packages/neuron-wallet/src/locales/fr.ts
@@ -124,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',
@@ -142,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: {
diff --git a/packages/neuron-wallet/src/locales/zh-tw.ts b/packages/neuron-wallet/src/locales/zh-tw.ts
index a3c0d5c876..cc75c175f4 100644
--- a/packages/neuron-wallet/src/locales/zh-tw.ts
+++ b/packages/neuron-wallet/src/locales/zh-tw.ts
@@ -129,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: {
diff --git a/packages/neuron-wallet/src/locales/zh.ts b/packages/neuron-wallet/src/locales/zh.ts
index 77812478eb..5200e52497 100644
--- a/packages/neuron-wallet/src/locales/zh.ts
+++ b/packages/neuron-wallet/src/locales/zh.ts
@@ -130,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: {
diff --git a/packages/neuron-wallet/src/models/address.ts b/packages/neuron-wallet/src/models/address.ts
index f8827a1c78..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 '@ckb-lumos/hd'
+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 285abb9cf6..1cd76177ba 100644
--- a/packages/neuron-wallet/src/models/asset-account-info.ts
+++ b/packages/neuron-wallet/src/models/asset-account-info.ts
@@ -1,4 +1,5 @@
-import { bytes, molecule } from '@ckb-lumos/codec'
+import { bytes, struct, createFixedBytesCodec } from '@ckb-lumos/lumos/codec'
+import { predefined } from '@ckb-lumos/config-manager'
import CellDep, { DepType } from './chain/cell-dep'
import Script, { ScriptHashType } from './chain/script'
import OutPoint from './chain/out-point'
@@ -6,9 +7,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'
+const createFixedHexBytesCodec = (byteLength: number) =>
+ createFixedBytesCodec({ byteLength, pack: bytes.bytify, unpack: bytes.hexify })
+
export interface ScriptCellInfo {
cellDep: CellDep
codeHash: string
@@ -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 ? predefined.LINA.SCRIPTS : predefined.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,
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..4efc95dd60 100644
--- a/packages/neuron-wallet/src/models/chain/live-cell.ts
+++ b/packages/neuron-wallet/src/models/chain/live-cell.ts
@@ -1,6 +1,6 @@
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,
@@ -8,6 +8,8 @@ const LUMOS_HASH_TYPE_MAP: Record = {
data: ScriptHashType.Data,
}
+export type CellWithOutPoint = Cell & { outPoint: IOutPoint }
+
export default class LiveCell {
public txHash: string
public outputIndex: string
@@ -54,7 +56,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..40034ea46f 100644
--- a/packages/neuron-wallet/src/models/chain/script.ts
+++ b/packages/neuron-wallet/src/models/chain/script.ts
@@ -1,5 +1,5 @@
-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 {
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 62899b088b..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,7 +1,9 @@
-import { TransactionWithStatus as APITransactionWithStatus } from '@ckb-lumos/base/lib/api'
+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
diff --git a/packages/neuron-wallet/src/models/chain/transaction.ts b/packages/neuron-wallet/src/models/chain/transaction.ts
index 1f4a0d1223..1dcf73993c 100644
--- a/packages/neuron-wallet/src/models/chain/transaction.ts
+++ b/packages/neuron-wallet/src/models/chain/transaction.ts
@@ -2,18 +2,19 @@ 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'
export enum TransactionStatus {
Pending = 'pending',
Success = 'success',
Failed = 'failed',
+ Rejected = 'rejected',
}
export interface SudtTokenInfo {
@@ -41,6 +42,7 @@ export interface NFTInfo {
export enum AssetAccountType {
CKB = 'CKB',
SUDT = 'sUDT',
+ XUDT = 'xUDT',
}
export default class Transaction {
@@ -82,6 +84,8 @@ export default class Transaction {
public signatures: Signatures = {}
public assetAccountType?: AssetAccountType
+ public daoCapacity?: string
+
constructor(
version: string,
cellDeps: CellDep[] = [],
@@ -106,7 +110,8 @@ export default class Transaction {
sudtInfo?: SudtInfo,
nftType?: NFTInfo,
signatures: Signatures = {},
- assetAccountType?: AssetAccountType
+ assetAccountType?: AssetAccountType,
+ daoCapacity?: string
) {
this.cellDeps = cellDeps
this.headerDeps = headerDeps
@@ -120,7 +125,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
@@ -133,6 +138,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,
@@ -171,6 +177,7 @@ export default class Transaction {
nftInfo,
signatures = {},
assetAccountType,
+ daoCapacity,
}: {
version: string
cellDeps?: CellDep[]
@@ -196,6 +203,7 @@ export default class Transaction {
nftInfo?: NFTInfo
signatures?: Signatures
assetAccountType?: AssetAccountType
+ daoCapacity?: string
}): Transaction {
return new Transaction(
version,
@@ -226,7 +234,8 @@ export default class Transaction {
sudtInfo,
nftInfo,
signatures,
- assetAccountType
+ assetAccountType,
+ daoCapacity
)
}
@@ -271,7 +280,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/hd-public-key-info.ts b/packages/neuron-wallet/src/models/keys/hd-public-key-info.ts
index 86075d9589..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 { AddressType, AccountExtendedPublicKey } from '@ckb-lumos/hd'
+import { hd } from '@ckb-lumos/lumos'
import { scriptToAddress } from '../../utils/scriptAndAddress'
import SystemScriptInfo from '../../models/system-script-info'
import NetworksService from '../../services/networks'
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 AccountExtendedPublicKey.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/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 75f1a52fd6..bb5b27a86d 100644
--- a/packages/neuron-wallet/src/models/subjects/command.ts
+++ b/packages/neuron-wallet/src/models/subjects/command.ts
@@ -13,6 +13,7 @@ const CommandSubject = new Subject<{
| '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/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 6f7f75b98c..8f16b045a1 100644
--- a/packages/neuron-wallet/src/services/addresses.ts
+++ b/packages/neuron-wallet/src/services/addresses.ts
@@ -1,4 +1,4 @@
-import { AddressType, AccountExtendedPublicKey } from '@ckb-lumos/hd'
+import { hd } from '@ckb-lumos/lumos'
import { publicKeyToAddress, DefaultAddressNumber } from '../utils/scriptAndAddress'
import { Address as AddressInterface } from '../models/address'
import AddressCreatedSubject from '../models/subjects/address-created-subject'
@@ -19,9 +19,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 +58,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,7 +90,7 @@ 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
@@ -101,8 +101,8 @@ export default class AddressService {
changeAddressCount
)
if (!receivingCount && !changeCount) return undefined
- const maxReceivingAddressIndex = await this.maxAddressIndex(walletId, AddressType.Receiving)
- const maxChangeAddressIndex = await this.maxAddressIndex(walletId, AddressType.Change)
+ 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
@@ -159,7 +159,7 @@ export default class AddressService {
changeAddressCount,
}: {
walletId: string
- extendedKey: AccountExtendedPublicKey
+ extendedKey: hd.AccountExtendedPublicKey
isImporting?: boolean
receivingAddressCount?: number
changeAddressCount?: number
@@ -187,7 +187,7 @@ export default class AddressService {
}: {
walletId: string
publicKey: string
- addressType: AddressType
+ addressType: hd.AddressType
addressIndex: number
}): Promise {
const isMainnet = NetworksService.getInstance().isMainnet()
@@ -223,7 +223,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,
@@ -238,7 +238,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,
}
@@ -247,7 +247,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,
}
@@ -277,7 +277,7 @@ export default class AddressService {
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()
@@ -296,8 +296,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]
}
@@ -349,7 +349,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()
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 991338a744..563fe68ae4 100644
--- a/packages/neuron-wallet/src/services/asset-account-service.ts
+++ b/packages/neuron-wallet/src/services/asset-account-service.ts
@@ -15,11 +15,11 @@ 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') {
+ private static async getACPCells(publicKeyHash: string, tokenId: string = 'CKBytes', udtType?: UDTType) {
const assetAccountInfo = new AssetAccountInfo()
const anyoneCanPayLockHash = assetAccountInfo.generateAnyoneCanPayScript(publicKeyHash).computeHash()
const outputs = await getConnection()
@@ -27,7 +27,10 @@ export default class AssetAccountService {
.findBy({
status: In([OutputStatus.Live, OutputStatus.Sent]),
lockHash: anyoneCanPayLockHash,
- typeHash: tokenId !== 'CKBytes' ? assetAccountInfo.generateSudtScript(tokenId).computeHash() : IsNull(),
+ typeHash:
+ tokenId !== 'CKBytes'
+ ? assetAccountInfo.generateUdtScript(tokenId, udtType ?? UDTType.SUDT)!.computeHash()
+ : IsNull(),
})
return outputs
@@ -49,10 +52,13 @@ export default class AssetAccountService {
return availableBalance >= 0 ? availableBalance.toString() : BigInt(0)
}
- private static async calculateUDTAccountBalance(publicKeyHash: string, tokenId: string) {
+ private static async calculateUDTAccountBalance(publicKeyHash: string, tokenId: string, udtType?: UDTType) {
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')
@@ -71,7 +77,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(),
@@ -126,7 +136,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
}
@@ -135,7 +145,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()
}
@@ -171,23 +181,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
}> {
@@ -203,31 +228,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 {
@@ -236,12 +272,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()
@@ -322,6 +358,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,
@@ -331,12 +379,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.
@@ -344,7 +389,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 {
@@ -352,10 +401,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()
}
}
@@ -486,7 +539,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 03e8cc0a1f..04012b9d39 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, Not, type ObjectLiteral } from 'typeorm'
-import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
+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
@@ -296,6 +298,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 +307,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 +368,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 +396,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 +409,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 +473,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 {
@@ -1113,8 +1126,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 +1160,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(),
@@ -1365,6 +1392,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:
@@ -1391,7 +1420,7 @@ export default class CellsService {
typeHashType: SystemScriptInfo.DAO_HASH_TYPE,
})
.getMany()
- if (!inputEntities.length) throw new Error(`No unlock transaction use ${unlockHash} as input`)
+ 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)
diff --git a/packages/neuron-wallet/src/services/ckb-runner.ts b/packages/neuron-wallet/src/services/ckb-runner.ts
index 003800312d..0df5f1a3c7 100644
--- a/packages/neuron-wallet/src/services/ckb-runner.ts
+++ b/packages/neuron-wallet/src/services/ckb-runner.ts
@@ -91,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 = () => {
@@ -115,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']
@@ -140,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
}
@@ -162,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 67bde2b3d6..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 '@ckb-lumos/hd'
+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 fc0b1f9641..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 '@ckb-lumos/hd'
+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,
diff --git a/packages/neuron-wallet/src/services/hardware/ledger.ts b/packages/neuron-wallet/src/services/hardware/ledger.ts
index d22bb8713c..34bfcbb38a 100644
--- a/packages/neuron-wallet/src/services/hardware/ledger.ts
+++ b/packages/neuron-wallet/src/services/hardware/ledger.ts
@@ -7,10 +7,11 @@ 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 { AddressType, AccountExtendedPublicKey } from '@ckb-lumos/hd'
+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) => {
@@ -78,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 === AccountExtendedPublicKey.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
@@ -92,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 === AccountExtendedPublicKey.pathForReceiving(0) ? this.defaultPath : path,
+ path === hd.AccountExtendedPublicKey.pathForReceiving(0) ? this.defaultPath : path,
message,
false
)
@@ -108,7 +127,7 @@ export default class Ledger extends Hardware {
const networkService = NetworksService.getInstance()
const isTestnet = !networkService.isMainnet()
const result = await this.ledgerCKB!.getWalletPublicKey(
- path === AccountExtendedPublicKey.pathForReceiving(0) ? this.defaultPath : path,
+ path === hd.AccountExtendedPublicKey.pathForReceiving(0) ? this.defaultPath : path,
isTestnet
)
return result
@@ -143,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 220bb5fa35..5d86057476 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
@@ -156,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),
}
@@ -228,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)
@@ -260,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..3f6aab645e 100644
--- a/packages/neuron-wallet/src/services/rpc-service.ts
+++ b/packages/neuron-wallet/src/services/rpc-service.ts
@@ -6,6 +6,7 @@ import TransactionWithStatus from '../models/chain/transaction-with-status'
import logger from '../utils/logger'
import { 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
}
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/sign-message.ts b/packages/neuron-wallet/src/services/sign-message.ts
index aeaf32dca7..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 Blake2b from '../models/blake2b'
-import { key, Keychain } 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/codec'
+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()
}
@@ -40,7 +50,7 @@ export default class SignMessage {
private static signByPrivateKey(privateKey: string, message: string): string {
const digest = SignMessage.signatureHash(message)
- const signature = key.signRecoverable(digest, privateKey)
+ const signature = hd.key.signRecoverable(digest, privateKey)
return signature
}
@@ -91,7 +101,7 @@ export default class SignMessage {
private static getPrivateKey(wallet: Wallet, path: string, password: string): string {
const masterPrivateKey = wallet.loadKeystore().extendedPrivateKey(password)
- const masterKeychain = new Keychain(
+ const masterKeychain = new hd.Keychain(
Buffer.from(bytes.bytify(masterPrivateKey.privateKey)),
Buffer.from(bytes.bytify(masterPrivateKey.chainCode))
)
diff --git a/packages/neuron-wallet/src/services/sudt-token-info.ts b/packages/neuron-wallet/src/services/sudt-token-info.ts
index 7195f2cdb2..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 54839896f2..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))
@@ -86,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)
@@ -144,4 +161,17 @@ export default class SyncProgressService {
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 a0681e4673..09dfd25c10 100644
--- a/packages/neuron-wallet/src/services/transaction-sender.ts
+++ b/packages/neuron-wallet/src/services/transaction-sender.ts
@@ -18,7 +18,7 @@ import Multisig from '../models/multisig'
import Blake2b from '../models/blake2b'
import logger from '../utils/logger'
import { signWitnesses } from '../utils/signWitnesses'
-import { 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'
@@ -41,10 +41,10 @@ import { SignStatus } from '../models/offline-sign'
import NetworksService from './networks'
import { generateRPC } from '../utils/ckb-rpc'
import CellsService from './cells'
-import { key, Keychain } 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
@@ -395,7 +395,7 @@ export default class TransactionSender {
return tx
}
- public static async signSingleMultiSignScript(
+ public static signSingleMultiSignScript(
privateKeyOrPath: string,
witnesses: (string | WitnessArgs)[],
txHash: string,
@@ -417,13 +417,13 @@ export default class TransactionSender {
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 = bytes.bytify(wit).byteLength
- blake2b.update(bytes.hexify(number.Uint64LE.pack(`0x${byteLength.toString(16)}`)))
+ blake2b.update(bytes.hexify(Uint64LE.pack(`0x${byteLength.toString(16)}`)))
blake2b.update(wit)
})
@@ -432,7 +432,7 @@ export default class TransactionSender {
if (!wallet.isHardware()) {
// `privateKeyOrPath` variable here is a private key because wallet is not a hardware one. Otherwise, it will be a private key path.
const privateKey = privateKeyOrPath
- emptyWitness.lock = key.signRecoverable(message, privateKey)
+ emptyWitness.lock = hd.key.signRecoverable(message, privateKey)
}
return [emptyWitness, ...restWitnesses]
@@ -930,7 +930,7 @@ 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(
+ const masterKeychain = new hd.Keychain(
Buffer.from(bytes.bytify(masterPrivateKey.privateKey)),
Buffer.from(bytes.bytify(masterPrivateKey.chainCode))
)
diff --git a/packages/neuron-wallet/src/services/tx/failed-transaction.ts b/packages/neuron-wallet/src/services/tx/failed-transaction.ts
index 996c53d336..96c8f754cf 100644
--- a/packages/neuron-wallet/src/services/tx/failed-transaction.ts
+++ b/packages/neuron-wallet/src/services/tx/failed-transaction.ts
@@ -9,16 +9,41 @@ 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 pendingTransactions
+ 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 () => {
@@ -56,28 +81,7 @@ export class FailedTransaction {
}
})
- await getConnection().manager.transaction(async transactionalEntityManager => {
- await transactionalEntityManager
- .createQueryBuilder()
- .delete()
- .from(TransactionEntity)
- .where({ hash: In(removeTxs) })
- .execute()
-
- await transactionalEntityManager
- .createQueryBuilder()
- .delete()
- .from(OutputEntity)
- .where({ outPointTxHash: In(removeTxs) })
- .execute()
-
- await transactionalEntityManager
- .createQueryBuilder()
- .delete()
- .from(InputEntity)
- .where({ outPointTxHash: In(removeTxs) })
- .execute()
- })
+ 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 3164d353cc..ab8079ce94 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))
@@ -625,7 +625,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({
@@ -651,37 +651,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,
@@ -713,13 +727,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 === ''
@@ -729,6 +751,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)
@@ -741,14 +764,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],
@@ -782,7 +809,7 @@ export class TransactionGenerator {
throw new SudtAcpHaveDataError()
}
if (!isCKBAccount) {
- cellDeps.push(assetAccountInfo.sudtCellDep)
+ cellDeps.push(assetAccountInfo.sudtCellDep, assetAccountInfo.xudtCellDep)
}
const output = Output.fromObject({
@@ -921,7 +948,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)
@@ -940,10 +966,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],
@@ -987,7 +1017,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
}
@@ -1075,22 +1105,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: [],
@@ -1173,7 +1204,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
}
@@ -1204,11 +1235,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
@@ -1229,7 +1262,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],
@@ -1241,6 +1274,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]
@@ -1264,16 +1298,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)
}
@@ -1306,7 +1340,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
}
@@ -1378,12 +1412,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],
@@ -1410,7 +1445,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
}
@@ -1456,7 +1491,6 @@ export class TransactionGenerator {
]
const secpCellDep = await SystemScriptInfo.getInstance().getSecpCellDep()
- const sudtCellDep = assetAccountInfo.sudtCellDep
let outputs: Output[] = []
let acpInputCell: Input | null = null
const acpCodeHashes = new Set([sudtCell.lock.codeHash])
@@ -1511,7 +1545,12 @@ export class TransactionGenerator {
const tx = Transaction.fromObject({
version: '0',
headerDeps: [],
- cellDeps: [secpCellDep, sudtCellDep, ...acpCellDeps.filter((v): v is CellDep => !!v)],
+ cellDeps: [
+ secpCellDep,
+ assetAccountInfo.sudtCellDep,
+ assetAccountInfo.xudtCellDep,
+ ...acpCellDeps.filter((v): v is CellDep => !!v),
+ ],
inputs: sudtMigrateAcpInputs,
outputs: outputs,
outputsData: outputs.map(v => v.data || '0x'),
@@ -1521,7 +1560,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
}
@@ -1577,18 +1616,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-service.ts b/packages/neuron-wallet/src/services/tx/transaction-service.ts
index eb5cf93dd3..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'
@@ -22,6 +16,7 @@ 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
@@ -93,6 +88,145 @@ export class TransactionsService {
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 = ''
@@ -256,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
@@ -266,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)
@@ -284,7 +425,7 @@ export class TransactionsService {
walletId: params.walletID,
}
)
- .getRawMany()
+ .getRawMany<{ capacity: string; transactionHash: string; daoData: string }>()
const assetAccountInputs = await connection
.getRepository(InputEntity)
@@ -352,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 }[] = (
@@ -373,13 +506,17 @@ export class TransactionsService {
).filter(o => inputPreviousTxHashes.includes(o.txHash))
const sums = new Map()
- const daoFlag = new Map()
+ const daoInfo = new Map()
outputs.map(o => {
const s = sums.get(o.transactionHash) || BigInt(0)
sums.set(o.transactionHash, s + BigInt(o.capacity))
if (o.daoData) {
- daoFlag.set(o.transactionHash, true)
+ if (daoInfo.has(o.transactionHash)) {
+ daoInfo.get(o.transactionHash)!.outputs.push(o)
+ } else {
+ daoInfo.set(o.transactionHash, { inputs: [], outputs: [o] })
+ }
}
})
@@ -391,107 +528,61 @@ export class TransactionsService {
return dc.txHash === i.outPointTxHash && dc.index === i.outPointIndex
})
if (result) {
- daoFlag.set(i.transactionHash, true)
+ if (daoInfo.has(i.transactionHash)) {
+ daoInfo.get(i.transactionHash)!.inputs.push(i)
+ } else {
+ daoInfo.set(i.transactionHash, { inputs: [i], outputs: [] })
+ }
}
})
+ const {
+ acpCKBCells: acpCKBInputs,
+ acpSudtCells: acpSudtInputs,
+ acpXudtCells: acpXudtInputs,
+ } = TransactionsService.groupAssetCells(assetAccountInputs)
+ const {
+ acpCKBCells: acpCKBOutputs,
+ acpSudtCells: acpSudtOutputs,
+ acpXudtCells: acpXudtOutputs,
+ } = TransactionsService.groupAssetCells(assetAccountOutputs)
const txs = await Promise.all(
transactions.map(async tx => {
const value = sums.get(tx.hash!) || BigInt(0)
-
- let typeArgs: string | undefined | null
- let txType: string = value > BigInt(0) ? 'receive' : 'send'
- let assetAccountType: AssetAccountType | undefined
-
- const sudtInput = anyoneCanPayInputs.find(
- i => i.transactionHash === tx.hash && assetAccountInfo.isSudtScript(i.typeScript()!)
- )
- const sudtOutput = anyoneCanPayOutputs.find(
- o => o.outPointTxHash === tx.hash && assetAccountInfo.isSudtScript(o.typeScript()!)
- )
- if (sudtInput) {
- typeArgs = sudtInput.typeArgs
- if (!sudtOutput) {
- txType = 'destroy'
- assetAccountType = AssetAccountType.SUDT
- }
- } else {
- if (sudtOutput) {
- typeArgs = sudtOutput.typeArgs
- txType = 'create'
- assetAccountType = AssetAccountType.SUDT
- }
- }
-
- const ckbAssetInput = ckbAssetInputs.find(i => i.transactionHash === tx.hash)
- const ckbAssetOutput = ckbAssetOutputs.find(o => o.outPointTxHash === tx.hash)
- if (ckbAssetInput && !ckbAssetOutput) {
- txType = 'destroy'
- assetAccountType = AssetAccountType.CKB
- } else if (!ckbAssetInput && ckbAssetOutput) {
- txType = 'create'
- assetAccountType = AssetAccountType.CKB
- }
-
- let sudtInfo: SudtInfo | undefined
-
- if (typeArgs) {
- // const typeArgs = sudtInput.typeArgs
- const inputAmount = anyoneCanPayInputs
- .filter(
- i =>
- i.transactionHash === tx.hash &&
- assetAccountInfo.isSudtScript(i.typeScript()!) &&
- i.typeArgs === typeArgs
- )
- .map(i => BufferUtils.parseAmountFromSUDTData(i.data))
- .reduce((result, c) => result + c, BigInt(0))
- const outputAmount = anyoneCanPayOutputs
- .filter(
- o =>
- o.outPointTxHash === tx.hash &&
- assetAccountInfo.isSudtScript(o.typeScript()!) &&
- o.typeArgs === typeArgs
- )
- .map(o => BufferUtils.parseAmountFromSUDTData(o.data))
- .reduce((result, c) => result + c, BigInt(0))
-
- const amount = outputAmount - inputAmount
- const tokenInfo = await SudtTokenInfoService.getSudtTokenInfo(typeArgs)
-
- if (tokenInfo) {
- sudtInfo = {
- sUDT: tokenInfo,
- amount: amount.toString(),
- }
- }
- }
-
- const sendNFTCell = nftInputs.find(i => i.typeCodeHash === nftCodehash && i.transactionHash === tx.hash)
- const receiveNFTCell = nftOutputs.find(o => o.typeCodeHash === nftCodehash && o.outPointTxHash === tx.hash)
-
- let nftInfo: NFTInfo | undefined
- if (sendNFTCell) {
- nftInfo = { type: NFTType.Send, data: sendNFTCell.typeArgs! }
- } else if (receiveNFTCell) {
- nftInfo = { type: NFTType.Receive, data: receiveNFTCell.typeArgs! }
- }
+ const typeScriptInfo =
+ (await TransactionsService.getSudtInfo({
+ txHash: tx.hash,
+ acpUdtInputs: acpSudtInputs,
+ acpUdtOutputs: acpSudtOutputs,
+ udtType: UDTType.SUDT,
+ })) ||
+ (await TransactionsService.getSudtInfo({
+ txHash: tx.hash,
+ acpUdtInputs: acpXudtInputs,
+ acpUdtOutputs: acpXudtOutputs,
+ udtType: UDTType.XUDT,
+ })) ||
+ (await TransactionsService.getAssetCKBInfo({
+ txHash: tx.hash,
+ acpCKBInputs,
+ acpCKBOutputs,
+ }))
return Transaction.fromObject({
timestamp: tx.timestamp,
value: value.toString(),
hash: tx.hash,
version: tx.version,
- type: txType,
- assetAccountType: assetAccountType,
- nervosDao: daoFlag.get(tx.hash!),
status: tx.status,
description: tx.description,
createdAt: tx.createdAt,
updatedAt: tx.updatedAt,
blockNumber: tx.blockNumber,
- sudtInfo: sudtInfo,
- nftInfo: nftInfo,
+ ...typeScriptInfo,
+ type: typeScriptInfo?.txType ?? (value > BigInt(0) ? 'receive' : 'send'),
+ nftInfo: TransactionsService.getNtfInfo({ txHash: tx.hash, nftInputs, nftOutputs }),
+ nervosDao: !!daoInfo.get(tx.hash),
+ daoCapacity: TransactionsService.getDAOCapacity(value, daoInfo.get(tx.hash)),
})
})
)
@@ -613,7 +704,7 @@ export class TransactionsService {
hd_public_key_info.publicKeyInBlake160 FROM hd_public_key_info
WHERE
walletId = :walletId
- )
+ )
${lock ? 'AND lockCodeHash = :lockCodeHash AND lockHashType = :lockHashType' : ''}
UNION
SELECT
@@ -626,7 +717,7 @@ export class TransactionsService {
SELECT
hd_public_key_info.publicKeyInBlake160 FROM hd_public_key_info
WHERE
- walletId = :walletId
+ walletId = :walletId
)
${lock ? 'AND lockCodeHash = :lockCodeHash AND lockHashType = :lockHashType' : ''}
) AS cell
diff --git a/packages/neuron-wallet/src/services/wallets.ts b/packages/neuron-wallet/src/services/wallets.ts
index 025bedd07f..77ac8df4a5 100644
--- a/packages/neuron-wallet/src/services/wallets.ts
+++ b/packages/neuron-wallet/src/services/wallets.ts
@@ -1,7 +1,7 @@
import { v4 as uuid } from 'uuid'
import { WalletNotFound, IsRequired, UsedName, WalletFunctionNotSupported, DuplicateImportWallet } from '../exceptions'
import Store from '../models/store'
-import { Keystore, AccountExtendedPublicKey } from '@ckb-lumos/hd'
+import { hd } from '@ckb-lumos/lumos'
import WalletDeletedSubject from '../models/subjects/wallet-deleted-subject'
import { WalletListSubject, CurrentWalletSubject } from '../models/subjects/wallets'
import { DefaultAddressNumber } from '../utils/scriptAndAddress'
@@ -29,7 +29,7 @@ export interface WalletProperties {
extendedKey: string // Serialized account extended public key
isHDWallet?: boolean
device?: DeviceInfo
- keystore?: Keystore
+ keystore?: hd.Keystore
startBlockNumber?: string
}
@@ -76,11 +76,11 @@ export abstract class Wallet {
throw new Error('not implemented')
}
- public loadKeystore = (): Keystore => {
+ public loadKeystore = (): hd.Keystore => {
throw new WalletFunctionNotSupported(this.loadKeystore.name)
}
- public saveKeystore = (_keystore: Keystore): void => {
+ public saveKeystore = (_keystore: hd.Keystore): void => {
throw new WalletFunctionNotSupported(this.saveKeystore.name)
}
@@ -92,7 +92,7 @@ export abstract class Wallet {
throw new WalletFunctionNotSupported(this.getDeviceInfo.name)
}
- public accountExtendedPublicKey = (): AccountExtendedPublicKey => {
+ public accountExtendedPublicKey = (): hd.AccountExtendedPublicKey => {
throw new WalletFunctionNotSupported(this.accountExtendedPublicKey.name)
}
@@ -149,8 +149,8 @@ export class FileKeystoreWallet extends Wallet {
this.isHD = true
}
- accountExtendedPublicKey = (): AccountExtendedPublicKey => {
- return AccountExtendedPublicKey.parse(this.extendedKey)
+ accountExtendedPublicKey = (): hd.AccountExtendedPublicKey => {
+ return hd.AccountExtendedPublicKey.parse(this.extendedKey)
}
public toJSON = () => {
@@ -166,14 +166,14 @@ export class FileKeystoreWallet extends Wallet {
public loadKeystore = () => {
const data = fileService.readFileSync(MODULE_NAME, this.keystoreFileName())
- return Keystore.fromJson(data)
+ return hd.Keystore.fromJson(data)
}
static fromJSON = (json: WalletProperties) => {
return new FileKeystoreWallet(json)
}
- public saveKeystore = (keystore: Keystore): void => {
+ public saveKeystore = (keystore: hd.Keystore): void => {
fileService.writeFileSync(MODULE_NAME, this.keystoreFileName(), JSON.stringify({ ...keystore, id: this.id }))
}
@@ -235,8 +235,8 @@ export class HardwareWallet extends Wallet {
this.isHD = false
}
- accountExtendedPublicKey = (): AccountExtendedPublicKey => {
- return AccountExtendedPublicKey.parse(this.extendedKey)
+ accountExtendedPublicKey = (): hd.AccountExtendedPublicKey => {
+ return hd.AccountExtendedPublicKey.parse(this.extendedKey)
}
static fromJSON = (json: WalletProperties) => {
@@ -249,7 +249,7 @@ export class HardwareWallet extends Wallet {
public checkAndGenerateAddresses = async (): Promise => {
const { addressType, addressIndex } = this.getDeviceInfo()
- const { publicKey } = AccountExtendedPublicKey.parse(this.extendedKey)
+ const { publicKey } = hd.AccountExtendedPublicKey.parse(this.extendedKey)
const address = await AddressService.generateAndSaveForPublicKeyQueue.asyncPush({
walletId: this.id,
publicKey,
@@ -405,9 +405,20 @@ export default class WalletService {
wallet.saveKeystore(props.keystore!)
}
- if (this.getAll().find(item => item.extendedKey === props.extendedKey)) {
+ const existWalletsProperties = this.getAll().filter(item => item.extendedKey === props.extendedKey)
+ if (existWalletsProperties.length) {
+ const existWallets = existWalletsProperties.map(v => this.get(v.id))
+ const duplicateWatchedWalletIds = existWallets
+ .filter(v => v.isHDWallet() && v.loadKeystore().isEmpty())
+ .map(v => v.id)
this.importedWallet = wallet
- throw new DuplicateImportWallet(JSON.stringify({ extendedKey: props.extendedKey, id }))
+ throw new DuplicateImportWallet(
+ JSON.stringify({
+ duplicateWalletIds: existWallets.map(v => v.id),
+ duplicateWatchedWalletIds,
+ id,
+ })
+ )
}
this.listStore.writeSync(this.walletsKey, [...this.getAll(), wallet.toJSON()])
diff --git a/packages/neuron-wallet/src/types/controller.d.ts b/packages/neuron-wallet/src/types/controller.d.ts
index a59ea9fa0a..09ec01d15d 100644
--- a/packages/neuron-wallet/src/types/controller.d.ts
+++ b/packages/neuron-wallet/src/types/controller.d.ts
@@ -65,7 +65,7 @@ declare namespace Controller {
interface SignParams {
walletID: string
- address: string
+ address?: string
password: string
message: string
}
diff --git a/packages/neuron-wallet/src/types/rpc.d.ts b/packages/neuron-wallet/src/types/rpc.d.ts
index 10a7333fa2..fc922e398b 100644
--- a/packages/neuron-wallet/src/types/rpc.d.ts
+++ b/packages/neuron-wallet/src/types/rpc.d.ts
@@ -100,6 +100,8 @@ declare namespace RPC {
}
time_added_to_pool: Uint64 | null
cycles: Uint64 | null
+ fee: Uint64
+ min_replace_fee: Uint64
}
export interface TransactionPoint {
block_number: BlockNumber
diff --git a/packages/neuron-wallet/src/utils/ckb-rpc.ts b/packages/neuron-wallet/src/utils/ckb-rpc.ts
index fc33fbefe7..3f67d6e8be 100644
--- a/packages/neuron-wallet/src/utils/ckb-rpc.ts
+++ b/packages/neuron-wallet/src/utils/ckb-rpc.ts
@@ -1,9 +1,7 @@
-import type { ParamsFormatter } from '@ckb-lumos/rpc'
-import type { Block } from '@ckb-lumos/base'
-import type { Script } from '@ckb-lumos/base'
-import { HexString } from '@ckb-lumos/base'
+import type { HexString, Block, Script } from '@ckb-lumos/lumos'
import { CKBRPC } from '@ckb-lumos/rpc'
import { Method as SdkRpcMethod } from '@ckb-lumos/rpc/lib/method'
+import { type CKBComponents, type ParamsFormatter } from '@ckb-lumos/lumos/rpc'
import * as resultFormatter from '@ckb-lumos/rpc/lib/resultFormatter'
import { formatter as paramsFormatter } from '@ckb-lumos/rpc/lib/paramsFormatter'
import { Base } from '@ckb-lumos/rpc/lib/Base'
@@ -12,16 +10,14 @@ import {
PayloadInBatchException,
IdNotMatchedInBatchException,
} from '@ckb-lumos/rpc/lib/exceptions'
-import { request } from 'undici'
import CommonUtils from './common'
import { NetworkType } from '../models/network'
import type { RPCConfig } from '@ckb-lumos/rpc/lib/types/common'
-import type { CKBComponents } from '@ckb-lumos/rpc/lib/types/api'
export interface LightScriptFilter {
script: Script
blockNumber: CKBComponents.BlockNumber
- scriptType: CKBRPC.ScriptType
+ scriptType: CKBComponents.ScriptType
}
export type LightScriptSyncStatus = LightScriptFilter
@@ -67,7 +63,7 @@ const lightRPCProperties: Record[0]
paramsFormatters: [
(searchKey: {
script: CKBComponents.Script
- scriptType: CKBRPC.ScriptType
+ scriptType: CKBComponents.ScriptType
blockRange: [HexString, HexString]
}) => ({
script: {
@@ -111,7 +107,7 @@ const lightRPCProperties: Record[0]
paramsFormatters: [paramsFormatter.toHash],
resultFormatters: (result: {
status: 'fetched' | 'fetching' | 'added' | 'not_found'
- data?: RPC.TransactionWithStatus
+ data?: Parameters[0]
}) => {
return {
status: result.status,
@@ -149,7 +145,11 @@ export class LightRPC extends Base {
// TODO: the type is not the same as full node here
// @ts-ignore
getTransactions: (
- searchKey: { script: CKBComponents.Script; scriptType: CKBRPC.ScriptType; blockRange: [HexString, HexString] },
+ searchKey: {
+ script: CKBComponents.Script
+ scriptType: CKBComponents.ScriptType
+ blockRange: [HexString, HexString]
+ },
order: 'asc' | 'desc',
limit: HexString,
afterCursor: HexString
@@ -334,12 +334,12 @@ export class LightRPC extends Base {
return []
}
- const res = await request(node.url, {
+ const res = await fetch(node.url, {
method: 'POST',
body: JSON.stringify(payload),
headers: { 'content-type': 'application/json' },
})
- const batchRes = await res.body.json()
+ const batchRes = await res.json()
if (!Array.isArray(batchRes)) {
return []
diff --git a/packages/neuron-wallet/src/utils/const.ts b/packages/neuron-wallet/src/utils/const.ts
index d294db6b7f..9059715d05 100644
--- a/packages/neuron-wallet/src/utils/const.ts
+++ b/packages/neuron-wallet/src/utils/const.ts
@@ -24,6 +24,11 @@ export enum ResponseCode {
Success,
}
+export enum UDTType {
+ SUDT = 'sUDT',
+ XUDT = 'xUDT',
+}
+
export default {
ResponseCode,
}
diff --git a/packages/neuron-wallet/src/utils/deep-camelize-keys.ts b/packages/neuron-wallet/src/utils/deep-camelize-keys.ts
new file mode 100644
index 0000000000..94343db948
--- /dev/null
+++ b/packages/neuron-wallet/src/utils/deep-camelize-keys.ts
@@ -0,0 +1,20 @@
+export const snakeToCamel = (str: string): string => {
+ if (!str) return ''
+ return str.replace(/([-_][a-z])/gi, c => c.toUpperCase().replace(/[-_]/g, ''))
+}
+
+export const deepCamelizeKeys = (item: unknown): unknown => {
+ if (Array.isArray(item)) {
+ return item.map((el: unknown) => deepCamelizeKeys(el))
+ } else if (typeof item === 'function' || item !== Object(item)) {
+ return item
+ }
+ return Object.fromEntries(
+ Object.entries(item as Record).map(([key, value]: [string, unknown]) => [
+ key.replace(/([-_][a-z])/gi, c => c.toUpperCase().replace(/[-_]/g, '')),
+ deepCamelizeKeys(value),
+ ])
+ )
+}
+
+export default { deepCamelizeKeys, snakeToCamel }
diff --git a/packages/neuron-wallet/src/utils/multisig.ts b/packages/neuron-wallet/src/utils/multisig.ts
index 4ef4e7c058..d692479f75 100644
--- a/packages/neuron-wallet/src/utils/multisig.ts
+++ b/packages/neuron-wallet/src/utils/multisig.ts
@@ -1,7 +1,12 @@
-import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
+import { computeScriptHash as scriptToHash } from '@ckb-lumos/lumos/utils'
import Multisig from '../models/multisig'
import MultisigConfigModel from '../models/multisig-config'
import { Signatures, SignStatus } from '../models/offline-sign'
+import { OfflineSignJSON } from 'src/models/offline-sign'
+import Transaction from '../models/chain/transaction'
+import SystemScriptInfo from '../models/system-script-info'
+import Input from '../models/chain/input'
+import { deepCamelizeKeys } from './deep-camelize-keys'
export const getMultisigStatus = (multisigConfig: MultisigConfigModel, signatures: Signatures) => {
const multisigLockHash = scriptToHash(
@@ -27,6 +32,26 @@ export const getMultisigStatus = (multisigConfig: MultisigConfigModel, signature
return SignStatus.Signed
}
+export const parseMultisigTxJsonFromCkbCli = (tx: OfflineSignJSON): Transaction => {
+ const { multisig_configs, transaction } = tx
+ const txObj = Transaction.fromObject(deepCamelizeKeys(transaction) as any)
+ if (multisig_configs && Object.keys(multisig_configs).length) {
+ const args = Object.keys(multisig_configs)[0]
+ const lock = SystemScriptInfo.generateMultiSignScript(args)
+
+ txObj.inputs.forEach((input: Input) => {
+ if (!input?.lock) {
+ input.lock = lock
+ }
+ })
+ }
+ if (!txObj?.signatures && tx?.signatures) {
+ txObj.signatures = tx.signatures
+ }
+ return txObj
+}
+
export default {
getMultisigStatus,
+ parseMultisigTxJsonFromCkbCli,
}
diff --git a/packages/neuron-wallet/src/utils/rpc-request.ts b/packages/neuron-wallet/src/utils/rpc-request.ts
index 56bbd7babc..dc0631caaf 100644
--- a/packages/neuron-wallet/src/utils/rpc-request.ts
+++ b/packages/neuron-wallet/src/utils/rpc-request.ts
@@ -1,5 +1,3 @@
-import { request } from 'undici'
-
export const rpcRequest = async (
url: string,
options: {
@@ -7,7 +5,7 @@ export const rpcRequest = async (
params?: any
}
): Promise => {
- const res = await request(url, {
+ const res = await fetch(url, {
method: 'POST',
body: JSON.stringify({
id: 0,
@@ -19,10 +17,10 @@ export const rpcRequest = async (
'content-type': 'application/json',
},
})
- if (res.statusCode !== 200) {
- throw new Error(`indexer request failed with HTTP code ${res.statusCode}`)
+ if (res.status !== 200) {
+ throw new Error(`indexer request failed with HTTP code ${res.status}`)
}
- const body = await res.body.json()
+ const body = await res.json()
if (body !== null && typeof body === 'object' && 'result' in body) {
return body?.result as T
}
@@ -36,7 +34,7 @@ export const rpcBatchRequest = async (
params?: any
}[]
): Promise => {
- const res = await request(url, {
+ const res = await fetch(url, {
headers: {
'content-type': 'application/json',
},
@@ -50,10 +48,10 @@ export const rpcBatchRequest = async (
}))
),
})
- if (res.statusCode !== 200) {
- throw new Error(`indexer request failed with HTTP code ${res.statusCode}`)
+ if (res.status !== 200) {
+ throw new Error(`indexer request failed with HTTP code ${res.status}`)
}
- const responseBody = await res.body.json()
+ const responseBody = await res.json()
if (Array.isArray(responseBody) && responseBody.every(i => 'id' in i)) {
return responseBody.sort((a, b) => a.id - b.id)
}
diff --git a/packages/neuron-wallet/src/utils/scriptAndAddress.ts b/packages/neuron-wallet/src/utils/scriptAndAddress.ts
index a20fb27596..cbceca958c 100644
--- a/packages/neuron-wallet/src/utils/scriptAndAddress.ts
+++ b/packages/neuron-wallet/src/utils/scriptAndAddress.ts
@@ -1,7 +1,6 @@
-import { key } from '@ckb-lumos/hd'
-import { type Script } from '@ckb-lumos/base'
-import { predefined } from '@ckb-lumos/config-manager'
-import { encodeToAddress, parseAddress } from '@ckb-lumos/helpers'
+import { type Script, hd } from '@ckb-lumos/lumos'
+import { predefined } from '@ckb-lumos/lumos/config'
+import { encodeToAddress, parseAddress } from '@ckb-lumos/lumos/helpers'
import { systemScripts } from './systemScripts'
export enum DefaultAddressNumber {
@@ -16,7 +15,7 @@ export const publicKeyToAddress = (publicKey: string, isMainnet = false) => {
{
codeHash: systemScripts.SECP256K1_BLAKE160.CODE_HASH,
hashType: systemScripts.SECP256K1_BLAKE160.HASH_TYPE,
- args: key.publicKeyToBlake160(prefixWith0x(publicKey)),
+ args: hd.key.publicKeyToBlake160(prefixWith0x(publicKey)),
},
isMainnet
)
diff --git a/packages/neuron-wallet/src/utils/serialization.ts b/packages/neuron-wallet/src/utils/serialization.ts
index f1559467b3..07cb03c032 100644
--- a/packages/neuron-wallet/src/utils/serialization.ts
+++ b/packages/neuron-wallet/src/utils/serialization.ts
@@ -1,5 +1,5 @@
-import { CellDep, OutPoint, Input, Output, RawTransaction, Transaction, blockchain, WitnessArgs } from '@ckb-lumos/base'
-import { bytes } from '@ckb-lumos/codec'
+import { CellDep, OutPoint, Input, Output, RawTransaction, Transaction, WitnessArgs } from '@ckb-lumos/lumos'
+import { bytes, blockchain } from '@ckb-lumos/lumos/codec'
/**
* @param outPoint always required when serialize
diff --git a/packages/neuron-wallet/src/utils/shannonToCKB.ts b/packages/neuron-wallet/src/utils/shannonToCKB.ts
index 8d9ba94c69..dce470115c 100644
--- a/packages/neuron-wallet/src/utils/shannonToCKB.ts
+++ b/packages/neuron-wallet/src/utils/shannonToCKB.ts
@@ -1,4 +1,6 @@
-import { formatUnit, ckbDecimals } from '@ckb-lumos/bi'
+import { formatUnit } from '@ckb-lumos/lumos/utils'
+
+const ckbDecimals = 8
const shannonToCKB = (shannon: bigint) => {
return new Intl.NumberFormat('en-US', {
diff --git a/packages/neuron-wallet/src/utils/signWitnesses.ts b/packages/neuron-wallet/src/utils/signWitnesses.ts
index 0efade4466..47b97826ed 100644
--- a/packages/neuron-wallet/src/utils/signWitnesses.ts
+++ b/packages/neuron-wallet/src/utils/signWitnesses.ts
@@ -1,7 +1,7 @@
-import { bytes, number } from '@ckb-lumos/codec'
+import { bytes, Uint64LE } from '@ckb-lumos/lumos/codec'
import { serializeWitnessArgs } from './serialization'
-import { CKBHasher } from '@ckb-lumos/base/lib/utils'
-import { key } from '@ckb-lumos/hd'
+import { CKBHasher } from '@ckb-lumos/lumos/utils'
+import { hd } from '@ckb-lumos/lumos'
type StructuredWitness = CKBComponents.WitnessArgs | CKBComponents.Witness
@@ -31,16 +31,16 @@ export const signWitnesses = ({
const hasher = new CKBHasher()
hasher.update(transactionHash)
- hasher.update(number.Uint64LE.pack(serializedEmptyWitnessSize))
+ hasher.update(Uint64LE.pack(serializedEmptyWitnessSize))
hasher.update(serializedEmptyWitnessBytes)
witnesses.slice(1).forEach(witness => {
const witnessBytes = bytes.bytify(typeof witness === 'string' ? witness : serializeWitnessArgs(witness))
- hasher.update(number.Uint64LE.pack(witnessBytes.byteLength))
+ hasher.update(Uint64LE.pack(witnessBytes.byteLength))
hasher.update(witnessBytes)
})
const message = hasher.digestHex()
- emptyWitness.lock = key.signRecoverable(message, privateKey)
+ emptyWitness.lock = hd.key.signRecoverable(message, privateKey)
return [serializeWitnessArgs(emptyWitness), ...witnesses.slice(1)]
}
diff --git a/packages/neuron-wallet/src/utils/sudt-value-to-amount.ts b/packages/neuron-wallet/src/utils/sudt-value-to-amount.ts
index 37c1ed2c03..1f4b8b8429 100644
--- a/packages/neuron-wallet/src/utils/sudt-value-to-amount.ts
+++ b/packages/neuron-wallet/src/utils/sudt-value-to-amount.ts
@@ -1,4 +1,4 @@
-import { formatUnit } from '@ckb-lumos/bi'
+import { formatUnit } from '@ckb-lumos/lumos/utils'
const sudtValueToAmount = (value: string | null = '0', decimal: string | null = '') => {
return value === null || value === '0'
diff --git a/packages/neuron-wallet/src/utils/systemScripts.ts b/packages/neuron-wallet/src/utils/systemScripts.ts
index d238c8d2a7..d11165fe21 100644
--- a/packages/neuron-wallet/src/utils/systemScripts.ts
+++ b/packages/neuron-wallet/src/utils/systemScripts.ts
@@ -1,4 +1,4 @@
-import { predefined } from '@ckb-lumos/config-manager'
+import { predefined } from '@ckb-lumos/lumos/config'
const systemScriptsMainnet = predefined.LINA.SCRIPTS
const systemScriptsTestnet = predefined.AGGRON4.SCRIPTS
diff --git a/packages/neuron-wallet/src/utils/toml.ts b/packages/neuron-wallet/src/utils/toml.ts
index b0e724513f..97a57eef78 100644
--- a/packages/neuron-wallet/src/utils/toml.ts
+++ b/packages/neuron-wallet/src/utils/toml.ts
@@ -1,7 +1,11 @@
import fs from 'fs'
import path from 'path'
-export function updateToml(filePath: string, updateValue: Record, newFilePath?: string) {
+export function updateToml(
+ filePath: string,
+ updateValue: Record>,
+ newFilePath?: string
+) {
const values = fs.readFileSync(filePath).toString().split('\n')
let field: string | undefined = undefined
const newValues = values.map(v => {
@@ -14,9 +18,15 @@ export function updateToml(filePath: string, updateValue: Record
return v
}
if (field && updateValue[field]) {
- const newLine = updateValue[field]
- field = undefined
- return newLine
+ const equalIndex = v.indexOf('=')
+ if (equalIndex !== -1) {
+ const stringBeforeEqual = v.slice(0, equalIndex)
+ const key = stringBeforeEqual.trim()
+ if (updateValue[field][key]) {
+ const newLine = `${stringBeforeEqual}= ${updateValue[field][key]}`
+ return newLine
+ }
+ }
}
return v
})
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/full-synchronizer.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/full-synchronizer.test.ts
index b4f2cd19fd..bceea87ad7 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/full-synchronizer.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/full-synchronizer.test.ts
@@ -1,11 +1,13 @@
import { scriptToAddress } from '../../src/utils/scriptAndAddress'
import { when } from 'jest-when'
-import { AddressType } from '@ckb-lumos/hd'
+import { hd } from '@ckb-lumos/lumos'
import { Address, AddressVersion } from '../../src/models/address'
import SystemScriptInfo from '../../src/models/system-script-info'
import FullSynchronizer from '../../src/block-sync-renderer/sync/full-synchronizer'
import { flushPromises } from '../test-utils'
+const { AddressType } = hd
+
const stubbedTipFn = jest.fn()
const stubbedGetTransactionFn = jest.fn()
const stubbedGetHeaderFn = jest.fn()
@@ -87,14 +89,12 @@ describe('unit tests for IndexerConnector', () => {
})
describe('#constructor', () => {
- const STUB_URI = 'stub_uri'
-
describe('when init with indexer folder path', () => {
beforeEach(() => {
- new stubbedFullSynchronizer([], nodeUrl, STUB_URI)
+ new stubbedFullSynchronizer([], nodeUrl)
})
it('inits lumos indexer with a node url and indexer folder path', () => {
- expect(stubbedIndexerConstructor).toHaveBeenCalledWith(nodeUrl, STUB_URI)
+ expect(stubbedIndexerConstructor).toHaveBeenCalledWith(nodeUrl)
})
})
describe('when init without indexer folder path', () => {
@@ -102,7 +102,7 @@ describe('unit tests for IndexerConnector', () => {
new stubbedFullSynchronizer([], nodeUrl)
})
it('inits mercury indexer with a node url and a default port', () => {
- expect(stubbedIndexerConstructor).toHaveBeenCalledWith(nodeUrl, STUB_URI)
+ expect(stubbedIndexerConstructor).toHaveBeenCalledWith(nodeUrl)
})
})
})
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/index/createBlockSyncTask.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/index/createBlockSyncTask.test.ts
index 61da50c476..6f04520d7e 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/index/createBlockSyncTask.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/index/createBlockSyncTask.test.ts
@@ -75,9 +75,9 @@ describe(`Create block sync task`, () => {
message: {
addressMetas: STUB_ADDRESS_METAS,
genesisHash: STUB_NETWORK.genesisHash,
- indexerUrl: STUB_NETWORK.remote,
nodeType: NetworkType.Normal,
url: STUB_NETWORK.remote,
+ syncMultisig: false,
},
})
})
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/indexer-cache-service.intg.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/indexer-cache-service.intg.test.ts
index 2ba8f41a08..4d6022b2d3 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/indexer-cache-service.intg.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/indexer-cache-service.intg.test.ts
@@ -1,11 +1,13 @@
import { when } from 'jest-when'
import AddressMeta from '../../src/database/address/meta'
-import { AddressType } from '@ckb-lumos/hd'
+import { hd } from '@ckb-lumos/lumos'
import { AddressVersion } from '../../src/models/address'
import IndexerTxHashCache from '../../src/database/chain/entities/indexer-tx-hash-cache'
import RpcService from '../../src/services/rpc-service'
import { closeConnection, getConnection, initConnection } from '../setupAndTeardown'
+const { AddressType } = hd
+
const stubbedGetTransactionFn = jest.fn()
const stubbedGetHeaderFn = jest.fn()
const stubbedCollectFn = jest.fn(() => {
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts
index ccd7ee549e..7221546503 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts
@@ -1,4 +1,4 @@
-import type { Script } from '@ckb-lumos/base'
+import type { Script } from '@ckb-lumos/lumos'
import LightSynchronizer from '../../src/block-sync-renderer/sync/light-synchronizer'
import AddressMeta from '../../src/database/address/meta'
@@ -24,6 +24,7 @@ const schedulerWaitMock = jest.fn()
const getMultisigConfigForLightMock = jest.fn()
const walletGetCurrentMock = jest.fn()
const walletGetAllMock = jest.fn()
+const updateBlockStartNumberMock = jest.fn()
function mockReset() {
getSyncStatusMock.mockReset()
@@ -46,6 +47,8 @@ function mockReset() {
removeByHashesAndAddressType.mockReset()
walletGetCurrentMock.mockReset()
walletGetAllMock.mockReset()
+
+ updateBlockStartNumberMock.mockReset()
}
jest.mock('../../src/services/sync-progress', () => {
@@ -123,12 +126,15 @@ describe('test light synchronizer', () => {
await connect.initSyncProgress()
expect(getScriptsMock).toBeCalledTimes(0)
})
- it('append multisig script', async () => {
+ it('sync multisig config', async () => {
getScriptsMock.mockResolvedValue([])
const connect = new LightSynchronizer([], '')
getOtherTypeSyncBlockNumberMock.mockResolvedValueOnce({})
+ getMultisigConfigForLightMock.mockResolvedValueOnce([
+ { walletId: 'walletId', script, addressType: 1, scriptType: 'lock' },
+ ])
//@ts-ignore
- await connect.initSyncProgress([{ walletId: 'walletId', script, addressType: 1, scriptType: 'lock' }])
+ await connect.initMultisigSyncProgress()
expect(getScriptsMock).toBeCalledTimes(1)
expect(setScriptsMock).toHaveBeenNthCalledWith(
1,
@@ -138,6 +144,7 @@ describe('test light synchronizer', () => {
})
it('when syncing script in the local DB', async () => {
getScriptsMock.mockResolvedValue([{ script, blockNumber: '0xaa' }])
+ walletGetAllMock.mockReturnValue([{ id: 'walletId' }])
getExistingSyncArgsesMock.mockResolvedValue(new Set([script.args]))
const addressMeta = AddressMeta.fromObject({
walletId: 'walletId',
@@ -187,6 +194,7 @@ describe('test light synchronizer', () => {
})
it('when syncing script not in the local DB', async () => {
getScriptsMock.mockResolvedValue([{ script, blockNumber: '0xaa' }])
+ walletGetAllMock.mockReturnValue([{ id: 'walletId' }])
getExistingSyncArgsesMock.mockResolvedValue(new Set())
const addressMeta = AddressMeta.fromObject({
walletId: 'walletId',
@@ -256,6 +264,7 @@ describe('test light synchronizer', () => {
addressType: 0,
blake160: script.args,
})
+ walletGetAllMock.mockReturnValue([{ id: 'walletId' }])
getWalletMinLocalSavedBlockNumberMock.mockResolvedValue({ walletId: 170 })
const connect = new LightSynchronizer([addressMeta], '')
//@ts-ignore
@@ -367,6 +376,152 @@ describe('test light synchronizer', () => {
)
expect(setScriptsMock).toHaveBeenLastCalledWith([], 'delete')
})
+ it('when other wallet min synced block number near the current wallet', async () => {
+ walletGetCurrentMock.mockReturnValue({ id: 'walletId1' })
+ walletGetAllMock.mockReturnValue([
+ { id: 'walletId1', startBlockNumber: '0xaa' },
+ { id: 'walletId2', startBlockNumber: '0xab' },
+ ])
+ const addressMeta1 = AddressMeta.fromObject({
+ walletId: 'walletId1',
+ address,
+ path: '',
+ addressIndex: 10,
+ addressType: 0,
+ blake160: script.args,
+ })
+ const script2: Script = {
+ args: '0x403f0d4e833b2a8d372772a63facaa310dfeef93',
+ codeHash: '0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8',
+ hashType: 'type',
+ }
+ const getScriptsResult = [{ script: script2, blockNumber: '0xaa', scriptType: 'lock' }]
+ getScriptsMock.mockResolvedValue(getScriptsResult)
+ getExistingSyncArgsesMock.mockResolvedValue(new Set([script2.args]))
+ const addressMeta2 = AddressMeta.fromObject({
+ walletId: 'walletId2',
+ address,
+ path: '',
+ addressIndex: 10,
+ addressType: 0,
+ blake160: script2.args,
+ })
+ const connect = new LightSynchronizer([addressMeta1, addressMeta2], '')
+ //@ts-ignore
+ await connect.initSyncProgress()
+ expect(setScriptsMock).toHaveBeenNthCalledWith(
+ 1,
+ [
+ ...[
+ addressMeta1.generateDefaultLockScript().toSDK(),
+ addressMeta1.generateACPLockScript().toSDK(),
+ addressMeta1.generateLegacyACPLockScript().toSDK(),
+ ].map(script => ({
+ script,
+ scriptType: 'lock',
+ walletId: addressMeta1.walletId,
+ blockNumber: '0xaa',
+ })),
+ ...[
+ addressMeta2.generateDefaultLockScript().toSDK(),
+ addressMeta2.generateACPLockScript().toSDK(),
+ addressMeta2.generateLegacyACPLockScript().toSDK(),
+ ].map(script => ({
+ script,
+ scriptType: 'lock',
+ walletId: addressMeta2.walletId,
+ blockNumber: '0xab',
+ })),
+ ],
+ 'partial'
+ )
+ expect(setScriptsMock).toHaveBeenLastCalledWith([], 'delete')
+ expect(initSyncProgressMock).toBeCalledWith([
+ ...[
+ addressMeta1.generateDefaultLockScript().toSDK(),
+ addressMeta1.generateACPLockScript().toSDK(),
+ addressMeta1.generateLegacyACPLockScript().toSDK(),
+ ].map(script => ({
+ script,
+ scriptType: 'lock',
+ walletId: addressMeta1.walletId,
+ blockNumber: '0xaa',
+ })),
+ ...[
+ addressMeta2.generateDefaultLockScript().toSDK(),
+ addressMeta2.generateACPLockScript().toSDK(),
+ addressMeta2.generateLegacyACPLockScript().toSDK(),
+ ].map(script => ({
+ script,
+ scriptType: 'lock',
+ walletId: addressMeta2.walletId,
+ blockNumber: '0xab',
+ })),
+ ])
+ expect(updateSyncProgressFlagMock).toBeCalledWith(['walletId1', 'walletId2'])
+ })
+ it('when other wallet min synced block number bigger than the current wallet', async () => {
+ walletGetCurrentMock.mockReturnValue({ id: 'walletId1' })
+ walletGetAllMock.mockReturnValue([
+ { id: 'walletId1', startBlockNumber: '0xaaaa0' },
+ { id: 'walletId2', startBlockNumber: '0xab' },
+ ])
+ const addressMeta1 = AddressMeta.fromObject({
+ walletId: 'walletId1',
+ address,
+ path: '',
+ addressIndex: 10,
+ addressType: 0,
+ blake160: script.args,
+ })
+ const script2: Script = {
+ args: '0x403f0d4e833b2a8d372772a63facaa310dfeef93',
+ codeHash: '0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8',
+ hashType: 'type',
+ }
+ const getScriptsResult = [{ script: script2, blockNumber: '0xab', scriptType: 'lock' }]
+ getScriptsMock.mockResolvedValue(getScriptsResult)
+ getExistingSyncArgsesMock.mockResolvedValue(new Set([script2.args]))
+ const addressMeta2 = AddressMeta.fromObject({
+ walletId: 'walletId2',
+ address,
+ path: '',
+ addressIndex: 10,
+ addressType: 0,
+ blake160: script2.args,
+ })
+ const connect = new LightSynchronizer([addressMeta1, addressMeta2], '')
+ //@ts-ignore
+ await connect.initSyncProgress()
+ expect(setScriptsMock).toHaveBeenNthCalledWith(
+ 1,
+ [
+ addressMeta1.generateDefaultLockScript().toSDK(),
+ addressMeta1.generateACPLockScript().toSDK(),
+ addressMeta1.generateLegacyACPLockScript().toSDK(),
+ ].map(script => ({
+ script,
+ scriptType: 'lock',
+ walletId: addressMeta1.walletId,
+ blockNumber: '0xaaaa0',
+ })),
+ 'partial'
+ )
+ expect(setScriptsMock).toHaveBeenLastCalledWith(getScriptsResult, 'delete')
+ expect(initSyncProgressMock).toBeCalledWith(
+ [
+ addressMeta1.generateDefaultLockScript().toSDK(),
+ addressMeta1.generateACPLockScript().toSDK(),
+ addressMeta1.generateLegacyACPLockScript().toSDK(),
+ ].map(script => ({
+ script,
+ scriptType: 'lock',
+ walletId: addressMeta1.walletId,
+ blockNumber: '0xaaaa0',
+ }))
+ )
+ expect(updateSyncProgressFlagMock).toBeCalledWith(['walletId1', 'walletId2'])
+ })
})
describe('test initSync', () => {
@@ -428,16 +583,10 @@ describe('test light synchronizer', () => {
})
describe('#notifyCurrentBlockNumberProcessed', () => {
- const synchronizer = new LightSynchronizer([], '')
- const updateBlockStartNumberMock = jest.fn()
- beforeAll(() => {
+ it('last process block number finish', async () => {
+ const synchronizer = new LightSynchronizer([], '')
// @ts-ignore private property
synchronizer.updateBlockStartNumber = updateBlockStartNumberMock
- })
- beforeEach(() => {
- updateBlockStartNumberMock.mockReset()
- })
- it('last process block number finish', async () => {
// @ts-ignore private property
synchronizer.processingBlockNumber = '0xaa'
getCurrentWalletMinSyncedBlockNumberMock.mockResolvedValueOnce(100)
@@ -447,6 +596,9 @@ describe('test light synchronizer', () => {
expect(updateBlockStartNumberMock).toBeCalledWith(100)
})
it('not last process block number finish', async () => {
+ const synchronizer = new LightSynchronizer([], '')
+ // @ts-ignore private property
+ synchronizer.updateBlockStartNumber = updateBlockStartNumberMock
// @ts-ignore private property
synchronizer.processingBlockNumber = undefined
await synchronizer.notifyCurrentBlockNumberProcessed('0xaa')
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/queue.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/queue.test.ts
index 52051e88e8..d25151e60c 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/queue.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/queue.test.ts
@@ -2,7 +2,7 @@ import '../../src/types/ckbComponents.d.ts'
import { Subject } from 'rxjs'
import { Tip } from '@ckb-lumos/base'
import { scriptToAddress } from '../../src/utils/scriptAndAddress'
-import { AddressType } from '@ckb-lumos/hd'
+import { hd } from '@ckb-lumos/lumos'
import SystemScriptInfo from '../../src/models/system-script-info'
import { Address, AddressVersion } from '../../src/models/address'
import Queue from '../../src/block-sync-renderer/sync/queue'
@@ -105,7 +105,7 @@ describe('queue', () => {
blake160: `0x${'0'.repeat(40)}`,
walletId: fakeWalletId,
path: '',
- addressType: AddressType.Receiving,
+ addressType: hd.AddressType.Receiving,
addressIndex: 0,
txCount: 0,
liveBalance: '',
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/synchronizer.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/synchronizer.test.ts
index c3c1e7e325..dad25e6599 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/synchronizer.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/synchronizer.test.ts
@@ -1,8 +1,9 @@
import { scriptToAddress } from '../../src/utils/scriptAndAddress'
-import { AddressType } from '@ckb-lumos/hd'
+import { type Cell, hd } from '@ckb-lumos/lumos'
+import { QueryOptions } from '@ckb-lumos/base'
import { Address, AddressVersion } from '../../src/models/address'
import SystemScriptInfo from '../../src/models/system-script-info'
-import { Synchronizer, type LumosCell, type LumosCellQuery } from '../../src/block-sync-renderer/sync/synchronizer'
+import { Synchronizer } from '../../src/block-sync-renderer/sync/synchronizer'
import AddressMeta from '../../src/database/address/meta'
import IndexerTxHashCache from '../../src/database/chain/entities/indexer-tx-hash-cache'
import { ScriptHashType } from '../../src/models/chain/script'
@@ -39,7 +40,7 @@ const addressObj1: Address = {
blake160: '0x',
walletId: walletId1,
path: '',
- addressType: AddressType.Receiving,
+ addressType: hd.AddressType.Receiving,
addressIndex: 0,
txCount: 0,
liveBalance: '',
@@ -53,7 +54,7 @@ const addressObj2: Address = {
blake160: '0x',
walletId: walletId2,
path: '',
- addressType: AddressType.Receiving,
+ addressType: hd.AddressType.Receiving,
addressIndex: 0,
txCount: 0,
liveBalance: '',
@@ -110,22 +111,18 @@ describe('unit tests for IndexerConnector', () => {
})
describe('#constructor', () => {
- const STUB_URI = 'stub_uri'
-
it('inits lumos indexer with a node url and indexer folder path', () => {
new TestSynchronizer({
addresses: [],
nodeUrl,
- indexerUrl: STUB_URI,
})
- expect(stubbedIndexerConstructor).toHaveBeenCalledWith(nodeUrl, STUB_URI)
+ expect(stubbedIndexerConstructor).toHaveBeenCalledWith(nodeUrl)
})
it('init with addresses', () => {
const synchronizer = new TestSynchronizer({
addresses: [addressObj1, addressObj2],
nodeUrl,
- indexerUrl: STUB_URI,
})
expect(synchronizer.getAddressesByWalletId().get(walletId1)?.[0]).toStrictEqual(
AddressMeta.fromObject(addressObj1)
@@ -140,13 +137,12 @@ describe('unit tests for IndexerConnector', () => {
const synchronizer = new TestSynchronizer({
addresses: [addressObj1, addressObj2],
nodeUrl,
- indexerUrl: '',
})
it('no cached tx', async () => {
stubbedNextUnprocessedTxsGroupedByBlockNumberFn.mockResolvedValue([])
// @ts-ignore private method
const result = await synchronizer.getTxHashesWithNextUnprocessedBlockNumber()
- expect(result).toStrictEqual([undefined, []])
+ expect(result).toStrictEqual([undefined, [], []])
})
it('get cached tx and sort by block number', async () => {
stubbedNextUnprocessedTxsGroupedByBlockNumberFn.mockImplementation(walletId =>
@@ -170,7 +166,7 @@ describe('unit tests for IndexerConnector', () => {
)
// @ts-ignore private method
const result = await synchronizer.getTxHashesWithNextUnprocessedBlockNumber()
- expect(result).toStrictEqual(['2', ['hash2']])
+ expect(result).toStrictEqual(['2', ['hash2'], [walletId2]])
})
})
@@ -178,7 +174,6 @@ describe('unit tests for IndexerConnector', () => {
const synchronizer = new TestSynchronizer({
addresses: [addressObj1, addressObj2],
nodeUrl,
- indexerUrl: '',
})
synchronizer.blockTipsSubject.subscribe(stubbedBlockTipsSubscribe)
@@ -220,10 +215,11 @@ describe('unit tests for IndexerConnector', () => {
})
describe('#getLiveCellsByScript', () => {
- let fakeCell1: LumosCell, fakeCell2: LumosCell
- let cells: LumosCell[]
+ let fakeCell1: Cell, fakeCell2: Cell
+ let cells: Cell[]
fakeCell1 = {
+ data: '0x',
blockHash: '0x',
outPoint: {
txHash: '0x',
@@ -244,6 +240,7 @@ describe('unit tests for IndexerConnector', () => {
},
}
fakeCell2 = {
+ data: '0x',
blockHash: '0x',
outPoint: {
txHash: '0x',
@@ -257,7 +254,7 @@ describe('unit tests for IndexerConnector', () => {
args: '0x2',
},
type: {
- hashType: 'lock',
+ hashType: 'data',
codeHash: '0xcode',
args: '0x2',
},
@@ -268,11 +265,10 @@ describe('unit tests for IndexerConnector', () => {
const synchronizer = new TestSynchronizer({
addresses: [addressObj1, addressObj2],
nodeUrl,
- indexerUrl: '',
})
describe('when success', () => {
- const query: LumosCellQuery = {
+ const query = {
lock: {
hashType: ScriptHashType.Data,
codeHash: '0xcode',
@@ -283,7 +279,6 @@ describe('unit tests for IndexerConnector', () => {
codeHash: '0xcode',
args: '0x',
},
- data: null,
}
beforeEach(async () => {
@@ -298,14 +293,14 @@ describe('unit tests for IndexerConnector', () => {
it('transform the query parameter', () => {
expect(stubbedCellCollectorConstructor.mock.calls[0][1]).toEqual({
lock: {
- hashType: query.lock!.hashType,
- codeHash: query.lock!.codeHash,
- args: query.lock!.args,
+ hashType: query.lock.hashType,
+ codeHash: query.lock.codeHash,
+ args: query.lock.args,
},
type: {
- hashType: query.type!.hashType,
- codeHash: query.type!.codeHash,
- args: query.type!.args,
+ hashType: query.type.hashType,
+ codeHash: query.type.codeHash,
+ args: query.type.args,
},
data: 'any',
})
@@ -316,7 +311,7 @@ describe('unit tests for IndexerConnector', () => {
})
})
describe('when handling concurrent requests', () => {
- const query1: LumosCellQuery = {
+ const query1: QueryOptions = {
lock: {
hashType: ScriptHashType.Data,
codeHash: '0xcode',
@@ -327,9 +322,8 @@ describe('unit tests for IndexerConnector', () => {
codeHash: '0xcode',
args: '0x1',
},
- data: null,
}
- const query2: LumosCellQuery = {
+ const query2: QueryOptions = {
lock: {
hashType: ScriptHashType.Type,
codeHash: '0xcode',
@@ -340,7 +334,6 @@ describe('unit tests for IndexerConnector', () => {
codeHash: '0xcode',
args: '0x2',
},
- data: null,
}
const results: unknown[] = []
@@ -401,7 +394,7 @@ describe('unit tests for IndexerConnector', () => {
it('throws error', async () => {
let err
try {
- await synchronizer.getLiveCellsByScript({ lock: null, type: null, data: null })
+ await synchronizer.getLiveCellsByScript({})
} catch (error) {
err = error
}
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/task.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/task.test.ts
index 413e782d13..706f11482f 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/task.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/task.test.ts
@@ -6,7 +6,6 @@ const STUB_START_MESSAGE = {
genesisHash: 'stub_genesis_hash',
url: 'stub_url',
addressMetas: 'stub_address_metas',
- indexerUrl: 'stub_indexer_url',
nodeType: 2,
},
}
@@ -71,8 +70,8 @@ describe(`Block Sync Task`, () => {
expect(stubbedSyncQueue).toHaveBeenCalledWith(
STUB_START_MESSAGE.message.url,
STUB_START_MESSAGE.message.addressMetas,
- STUB_START_MESSAGE.message.indexerUrl,
- STUB_START_MESSAGE.message.nodeType
+ STUB_START_MESSAGE.message.nodeType,
+ undefined
)
expect(stubbedSyncQueueStart).toHaveBeenCalled()
})
diff --git a/packages/neuron-wallet/tests/controllers/anyone-can-pay.test.ts b/packages/neuron-wallet/tests/controllers/anyone-can-pay.test.ts
index dd906cea2d..119d08800a 100644
--- a/packages/neuron-wallet/tests/controllers/anyone-can-pay.test.ts
+++ b/packages/neuron-wallet/tests/controllers/anyone-can-pay.test.ts
@@ -1,7 +1,7 @@
import AnyoneCanPayController from '../../src/controllers/anyone-can-pay'
import Transaction from '../../src/models/chain/transaction'
import { ServiceHasNoResponse } from '../../src/exceptions'
-import { ResponseCode } from '../../src/utils/const'
+import { ResponseCode, UDTType } from '../../src/utils/const'
import AssetAccountInfo from '../../src/models/asset-account-info'
import { addressToScript } from '../../src/utils/scriptAndAddress'
@@ -133,8 +133,8 @@ describe('anyone-can-pay-controller', () => {
it('correct address', async () => {
const address =
'ckt1qq6pngwqn6e9vlm92th84rk0l4jp2h8lurchjmnwv8kq3rt5psf4vqvyxgyfu4z8yq4t790um8jef7lpm40h2csv4cv7m'
- await anyoneCanPayController.getHoldSudtCellCapacity(address, 'tokenID')
- expect(getHoldSUDTCellCapacityMock).toHaveBeenCalledWith(addressToScript(address), 'tokenID')
+ await anyoneCanPayController.getHoldSudtCellCapacity(address, 'tokenID', UDTType.SUDT)
+ expect(getHoldSUDTCellCapacityMock).toHaveBeenCalledWith(addressToScript(address), 'tokenID', UDTType.SUDT)
})
it('error address', async () => {
const address = 'ct1qq6pngwqn6e9vlm92th84rk0l4jp2h8lurchjmnwv8kq3rt5psf4vqvyxgyfu4z8yq4t790um8jef7lpm40h2csv4cv7m'
diff --git a/packages/neuron-wallet/tests/controllers/cell-management.test.ts b/packages/neuron-wallet/tests/controllers/cell-management.test.ts
index eb5a357e29..aaab619266 100644
--- a/packages/neuron-wallet/tests/controllers/cell-management.test.ts
+++ b/packages/neuron-wallet/tests/controllers/cell-management.test.ts
@@ -1,4 +1,4 @@
-import type { OutPoint as OutPointSDK } from '@ckb-lumos/base'
+import type { OutPoint as OutPointSDK } from '@ckb-lumos/lumos'
import CellManagement from '../../src/controllers/cell-management'
import CellLocalInfo from '../../src/database/chain/entities/cell-local-info'
import { AddressNotFound, CurrentWalletNotSet } from '../../src/exceptions'
@@ -57,8 +57,7 @@ jest.mock('../../src/services/addresses', () => ({
}))
jest.mock('../../src/services/sign-message', () => ({
- sign: (walletID: string, address: string, password: string, message: string) =>
- signMock(walletID, address, password, message),
+ sign: (params: { walletID: string; address?: string; password: string; message: string }) => signMock(params),
}))
jest.mock('../../src/services/cell-local-info', () => ({
@@ -155,7 +154,12 @@ describe('CellManage', () => {
getAddressesByWalletIdMock.mockResolvedValueOnce([{ address }])
const outPoints = [new OutPoint(`0x${'00'.repeat(32)}`, '0')]
await CellManagement.updateLiveCellsLockStatus(outPoints, true, [lockScript], 'password')
- expect(signMock).toBeCalledWith('walletId1', address, 'password', 'verify cell owner')
+ expect(signMock).toBeCalledWith({
+ walletID: 'walletId1',
+ password: 'password',
+ message: 'verify cell owner',
+ address,
+ })
expect(updateLiveCellLockStatusMock).toBeCalledWith(outPoints, true)
})
})
diff --git a/packages/neuron-wallet/tests/controllers/export-debug.test.ts b/packages/neuron-wallet/tests/controllers/export-debug.test.ts
index 9e9f4b797e..f346649c3d 100644
--- a/packages/neuron-wallet/tests/controllers/export-debug.test.ts
+++ b/packages/neuron-wallet/tests/controllers/export-debug.test.ts
@@ -100,6 +100,19 @@ jest.mock('../../src/services/wallets', () => {
}
})
+const encryptionMock = {
+ isEnabled: false,
+ encrypt: jest.fn(v => v),
+}
+
+jest.mock('../../src/services/log-encryption.ts', () => {
+ return {
+ getInstance() {
+ return encryptionMock
+ },
+ }
+})
+
import { dialog } from 'electron'
import logger from '../../src/utils/logger'
import ExportDebugController from '../../src/controllers/export-debug'
@@ -148,7 +161,7 @@ describe('Test ExportDebugController', () => {
})
it('should call required methods', () => {
- expect.assertions(9)
+ expect.assertions(10)
expect(showSaveDialogMock).toHaveBeenCalled()
expect(addBundledCKBLogMock).toHaveBeenCalled()
@@ -159,6 +172,7 @@ describe('Test ExportDebugController', () => {
expect(showMessageBoxMock).toHaveBeenCalled()
expect(showErrorBoxMock).not.toHaveBeenCalled()
expect(logger.error).not.toHaveBeenCalled()
+ expect(encryptionMock.encrypt).not.toHaveBeenCalled()
const csv = ['index,addressType,addressIndex,publicKeyInBlake160\n', '0,0,0,hash1\n', '1,1,1,hash2\n'].join('')
expect(archiveAppendMock).toHaveBeenCalledWith(csv, expect.objectContaining({ name: 'hd_public_key_info.csv' }))
@@ -200,4 +214,17 @@ describe('Test ExportDebugController', () => {
expect(showErrorBoxMock).toHaveBeenCalled()
})
})
+
+ describe('when encryption is enabled', () => {
+ beforeEach(() => {
+ encryptionMock.isEnabled = true
+ showSaveDialogMock.mockResolvedValue({ canceled: false, filePath: 'mock_path' })
+ return exportDebugController.export()
+ })
+
+ it('encrypt should be called', () => {
+ expect.assertions(1)
+ expect(encryptionMock.encrypt).toHaveBeenCalled()
+ })
+ })
})
diff --git a/packages/neuron-wallet/tests/controllers/sync-api.test.ts b/packages/neuron-wallet/tests/controllers/sync-api.test.ts
index 6c35b57135..1288f92a1a 100644
--- a/packages/neuron-wallet/tests/controllers/sync-api.test.ts
+++ b/packages/neuron-wallet/tests/controllers/sync-api.test.ts
@@ -44,15 +44,14 @@ jest.doMock('models/subjects/networks', () => {
},
}
})
-jest.doMock('services/ckb-runner', () => ({
- getLookingValidTargetStatus: jest.fn(),
-}))
-jest.mock('undici', () => ({
- request: () => jest.fn()(),
-}))
jest.mock('services/multisig', () => ({
syncMultisigOutput: () => jest.fn(),
}))
+jest.mock('env', () => ({
+ app: {
+ isPackaged: true,
+ },
+}))
describe('SyncApiController', () => {
const emitter = new Emitter()
@@ -131,7 +130,7 @@ describe('SyncApiController', () => {
bestKnownBlockNumber: bestKnownBlockNumber.toString(16),
bestKnownBlockTimestamp: `0x${bestKnownBlockTimestamp.toString(16)}`,
})
- getCurrentNetworkMock.mockReturnValue({ remote: fakeNodeUrl })
+ getCurrentNetworkMock.mockReturnValue({ remote: fakeNodeUrl, type: 0 })
stubbedGetTipHeader.mockResolvedValue({ timestamp: '180000' })
})
describe('on cache-tip-block-updated', () => {
@@ -148,9 +147,15 @@ describe('SyncApiController', () => {
timestamp: '187000',
}
beforeEach(async () => {
+ process.env.CKB_NODE_ASSUME_VALID_TARGET = '0x'
+ process.env.CKB_NODE_ASSUME_VALID_TARGET_BLOCK_NUMBER = '100000'
await sendFakeCacheBlockTipEvent(fakeState1)
await sendFakeCacheBlockTipEvent(fakeState2)
})
+ afterAll(() => {
+ delete process.env['CKB_NODE_ASSUME_VALID_TARGET']
+ delete process.env['CKB_NODE_ASSUME_VALID_TARGET_BLOCK_NUMBER']
+ })
it('broadcast event of synced', () => {
expect(stubbedSyncStateSubjectNext).toHaveBeenCalledWith({
nodeUrl: fakeNodeUrl,
@@ -163,6 +168,8 @@ describe('SyncApiController', () => {
cacheRate: undefined,
estimate: undefined,
status: 3,
+ isLookingValidTarget: true,
+ validTarget: '0x',
})
})
it('#getSyncStatus returns synced', async () => {
@@ -203,6 +210,7 @@ describe('SyncApiController', () => {
cacheRate: undefined,
estimate: undefined,
status: 2,
+ isLookingValidTarget: false,
})
})
it('#getSyncStatus returns syncing', async () => {
@@ -240,6 +248,7 @@ describe('SyncApiController', () => {
cacheRate: undefined,
estimate: undefined,
status: 1,
+ isLookingValidTarget: false,
})
})
it('#getSyncStatus returns sync pending', async () => {
@@ -271,6 +280,7 @@ describe('SyncApiController', () => {
cacheRate: undefined,
estimate: undefined,
status: 2,
+ isLookingValidTarget: false,
})
})
it('stores next block number', () => {
@@ -304,6 +314,7 @@ describe('SyncApiController', () => {
cacheRate: undefined,
estimate: Math.round((bestKnownBlockNumber - parseInt(fakeState2.indexerTipNumber)) / indexRate),
status: 2,
+ isLookingValidTarget: false,
}
beforeEach(async () => {
await sendFakeCacheBlockTipEvent(fakeState1)
@@ -399,6 +410,7 @@ describe('SyncApiController', () => {
cacheRate: undefined,
estimate: undefined,
status: 2,
+ isLookingValidTarget: false,
})
})
it('stores next block number', () => {
@@ -446,6 +458,7 @@ describe('SyncApiController', () => {
indexerTipNumber: parseInt(fakeState3.indexerTipNumber),
estimate: Math.round((bestKnownBlockNumber - parseInt(fakeState3.indexerTipNumber)) / indexRate),
status: 2,
+ isLookingValidTarget: false,
})
})
it('stores next block number', () => {
@@ -472,6 +485,7 @@ describe('SyncApiController', () => {
indexerTipNumber: parseInt(fakeState3.indexerTipNumber),
estimate: undefined,
status: 2,
+ isLookingValidTarget: false,
})
})
it('#getSyncStatus returns syncing', async () => {
@@ -516,6 +530,7 @@ describe('SyncApiController', () => {
cacheRate: undefined,
estimate: undefined,
status: 2,
+ isLookingValidTarget: false,
})
})
it('#getSyncStatus returns syncing', async () => {
diff --git a/packages/neuron-wallet/tests/database/address/meta.test.ts b/packages/neuron-wallet/tests/database/address/meta.test.ts
index cdc9f5605e..af9b7f4b62 100644
--- a/packages/neuron-wallet/tests/database/address/meta.test.ts
+++ b/packages/neuron-wallet/tests/database/address/meta.test.ts
@@ -1,5 +1,5 @@
import { Address, AddressVersion } from '../../../src/models/address'
-import { AddressType } from '@ckb-lumos/hd'
+import { hd } from '@ckb-lumos/lumos'
import AddressMeta from '../../../src/database/address/meta'
import Multisig from '../../../src/models/multisig'
import AssetAccountInfo from '../../../src/models/asset-account-info'
@@ -9,7 +9,7 @@ describe('Address Dao tests', () => {
walletId: '1',
address: 'ckt1qyqrdsefa43s6m882pcj53m4gdnj4k440axqswmu83',
path: "m/44'/309'/0'/0/0",
- addressType: AddressType.Receiving,
+ addressType: hd.AddressType.Receiving,
addressIndex: 0,
txCount: 0,
liveBalance: '0',
diff --git a/packages/neuron-wallet/tests/mock/hardware.ts b/packages/neuron-wallet/tests/mock/hardware.ts
index bc8c04f3b3..0ba564fcf0 100644
--- a/packages/neuron-wallet/tests/mock/hardware.ts
+++ b/packages/neuron-wallet/tests/mock/hardware.ts
@@ -1,5 +1,5 @@
import { DeviceInfo } from '../../src/services/hardware/common'
-import { AddressType } from '@ckb-lumos/hd'
+import { hd } from '@ckb-lumos/lumos'
import type { Subscriber } from 'rxjs'
enum Manufacturer {
@@ -12,7 +12,7 @@ export const ledgerNanoS: DeviceInfo = {
product: 'Nano S',
isBluetooth: false,
manufacturer: Manufacturer.Ledger,
- addressType: AddressType.Receiving,
+ addressType: hd.AddressType.Receiving,
addressIndex: 0,
}
@@ -22,7 +22,7 @@ export const LedgerNanoX: DeviceInfo = {
product: 'Nano X',
isBluetooth: true,
manufacturer: Manufacturer.Ledger,
- addressType: AddressType.Receiving,
+ addressType: hd.AddressType.Receiving,
addressIndex: 0,
}
diff --git a/packages/neuron-wallet/tests/models/asset-account-info.test.ts b/packages/neuron-wallet/tests/models/asset-account-info.test.ts
index cb7d34a570..7a21201fef 100644
--- a/packages/neuron-wallet/tests/models/asset-account-info.test.ts
+++ b/packages/neuron-wallet/tests/models/asset-account-info.test.ts
@@ -1,27 +1,27 @@
+import { predefined } from '@ckb-lumos/config-manager'
import AssetAccountInfo from '../../src/models/asset-account-info'
import CellDep, { DepType } from '../../src/models/chain/cell-dep'
import OutPoint from '../../src/models/chain/out-point'
-import { ScriptHashType } from '../../src/models/chain/script'
-import { AddressType } from '@ckb-lumos/hd'
+import { hd } from '@ckb-lumos/lumos'
import AddressMeta from '../../src/database/address/meta'
+const { AddressType } = hd
+
describe('AssetAccountInfo', () => {
+ const { SUDT, ANYONE_CAN_PAY } = predefined.AGGRON4.SCRIPTS
const testnetSudtInfo = {
- cellDep: new CellDep(
- new OutPoint('0xc1b2ae129fad7465aaa9acc9785f842ba3e6e8b8051d899defa89f5508a77958', '0'),
- DepType.Code
- ),
- codeHash: '0x48dbf59b4c7ee1547238021b4869bceedf4eea6b43772e5d66ef8865b6ae7212',
- hashType: ScriptHashType.Data,
+ cellDep: new CellDep(new OutPoint(SUDT.TX_HASH, SUDT.INDEX), SUDT.DEP_TYPE as DepType),
+ codeHash: SUDT.CODE_HASH,
+ hashType: SUDT.HASH_TYPE,
}
const testnetAnyoneCanPayInfo = {
cellDep: new CellDep(
- new OutPoint('0x4f32b3e39bd1b6350d326fdfafdfe05e5221865c3098ae323096f0bfc69e0a8c', '0'),
- DepType.DepGroup
+ new OutPoint(ANYONE_CAN_PAY.TX_HASH, ANYONE_CAN_PAY.INDEX),
+ ANYONE_CAN_PAY.DEP_TYPE as DepType
),
- codeHash: process.env.TESTNET_ACP_SCRIPT_CODEHASH,
- hashType: process.env.TESTNET_ACP_SCRIPT_HASHTYPE,
+ codeHash: ANYONE_CAN_PAY.CODE_HASH,
+ hashType: ANYONE_CAN_PAY.HASH_TYPE,
}
describe('testnet', () => {
diff --git a/packages/neuron-wallet/tests/models/chain/live-cell.test.ts b/packages/neuron-wallet/tests/models/chain/live-cell.test.ts
index 84a9b97830..1bc5cba2fd 100644
--- a/packages/neuron-wallet/tests/models/chain/live-cell.test.ts
+++ b/packages/neuron-wallet/tests/models/chain/live-cell.test.ts
@@ -1,6 +1,5 @@
import Script, { ScriptHashType } from '../../../src/models/chain/script'
-import { LumosCell } from '../../../src/block-sync-renderer/sync/synchronizer'
-import LiveCell from '../../../src/models/chain/live-cell'
+import LiveCell, { CellWithOutPoint } from '../../../src/models/chain/live-cell'
describe('LiveCell Test', () => {
const INITIAL_DATA = {
@@ -88,7 +87,7 @@ describe('LiveCell Test', () => {
})
describe('get cells from lumos cell', () => {
- const LUMOS_CELL: LumosCell = {
+ const LUMOS_CELL: CellWithOutPoint = {
blockHash: '0x0000000000000000000000000000000000000000000000000000000000000000',
outPoint: {
txHash: INITIAL_DATA.txHash,
diff --git a/packages/neuron-wallet/tests/models/keys/hd-public-key-info.test.ts b/packages/neuron-wallet/tests/models/keys/hd-public-key-info.test.ts
index a9aee99971..59e59ba484 100644
--- a/packages/neuron-wallet/tests/models/keys/hd-public-key-info.test.ts
+++ b/packages/neuron-wallet/tests/models/keys/hd-public-key-info.test.ts
@@ -1,5 +1,5 @@
import { scriptToAddress } from '../../../src/utils/scriptAndAddress'
-import { AddressType } from '@ckb-lumos/hd'
+import { hd } from '@ckb-lumos/lumos'
import KeyInfos from '../../setupAndTeardown/public-key-info.fixture'
import { systemScripts } from '../../../src/utils/systemScripts'
import { NetworkType } from '../../../src/models/network'
@@ -76,7 +76,7 @@ describe('HdPublicKeyInfoModel', () => {
describe('with change address type', () => {
beforeEach(() => {
keyInfoModel = HdPublicKeyInfoModel.fromObject({
- addressType: AddressType.Change,
+ addressType: hd.AddressType.Change,
addressIndex: 1,
})
})
@@ -87,7 +87,7 @@ describe('HdPublicKeyInfoModel', () => {
describe('with receive address type', () => {
beforeEach(() => {
keyInfoModel = HdPublicKeyInfoModel.fromObject({
- addressType: AddressType.Receiving,
+ addressType: hd.AddressType.Receiving,
addressIndex: 1,
})
})
diff --git a/packages/neuron-wallet/tests/models/multi-sign.test.ts b/packages/neuron-wallet/tests/models/multi-sign.test.ts
index bf9416a94b..97fe34b0e6 100644
--- a/packages/neuron-wallet/tests/models/multi-sign.test.ts
+++ b/packages/neuron-wallet/tests/models/multi-sign.test.ts
@@ -15,13 +15,13 @@ describe('MultiSign Test', () => {
const serialized = '0x0000010136c329ed630d6ce750712a477543672adab57f4c'
it('since', () => {
- const since = new Multisig().since(minutes, headerEpoch)
+ const since = Multisig.since(minutes, headerEpoch)
expect(since).toEqual(expectedSince)
})
it('since, minutes < 0', () => {
expect(() => {
- new Multisig().since(-1, headerEpoch)
+ Multisig.since(-1, headerEpoch)
}).toThrowError()
})
@@ -47,7 +47,7 @@ describe('MultiSign Test', () => {
})
it('args', () => {
- const args = new Multisig().args(bob.blake160, minutes, headerEpoch)
+ const args = Multisig.args(bob.blake160, minutes, headerEpoch)
expect(args).toEqual(expectedArgs)
})
})
diff --git a/packages/neuron-wallet/tests/models/transaction-size.test.ts b/packages/neuron-wallet/tests/models/transaction-size.test.ts
index 26371673b8..884fe631ee 100644
--- a/packages/neuron-wallet/tests/models/transaction-size.test.ts
+++ b/packages/neuron-wallet/tests/models/transaction-size.test.ts
@@ -1,5 +1,6 @@
import TransactionSize from '../../src/models/transaction-size'
-import { bytes as byteUtils } from '@ckb-lumos/codec'
+import { bytes as byteUtils } from '@ckb-lumos/lumos/codec'
+import { type CKBComponents } from '@ckb-lumos/lumos/rpc'
import Script, { ScriptHashType } from '../../src/models/chain/script'
import WitnessArgs from '../../src/models/chain/witness-args'
import Transaction from '../../src/models/chain/transaction'
@@ -115,7 +116,6 @@ describe('TransactionSize', () => {
args: '0x59a27ef3ba84f061517d13f42cf44ed020610061',
hashType: 'type',
},
- type: null,
},
],
outputsData: ['0x1234', '0x'],
diff --git a/packages/neuron-wallet/tests/services/address.test.ts b/packages/neuron-wallet/tests/services/address.test.ts
index c2b09c39e7..3083b5a588 100644
--- a/packages/neuron-wallet/tests/services/address.test.ts
+++ b/packages/neuron-wallet/tests/services/address.test.ts
@@ -1,7 +1,7 @@
import SystemScriptInfo from '../../src/models/system-script-info'
import { OutputStatus } from '../../src/models/chain/output'
import OutputEntity from '../../src/database/chain/entities/output'
-import { AddressType, AccountExtendedPublicKey } from '@ckb-lumos/hd'
+import { hd } from '@ckb-lumos/lumos'
import { Address } from '../../src/models/address'
import Transaction from '../../src/database/chain/entities/transaction'
import { TransactionStatus } from '../../src/models/chain/transaction'
@@ -10,6 +10,8 @@ import HdPublicKeyInfo from '../../src/database/chain/entities/hd-public-key-inf
import { closeConnection, getConnection, initConnection } from '../setupAndTeardown'
import { NetworkType } from '../../src/models/network'
+const { AddressType, AccountExtendedPublicKey } = hd
+
const walletId = '1'
const extendedKey = new AccountExtendedPublicKey(
'0x03e5b310636a0f6e7dcdfffa98f28d7ed70df858bb47acf13db830bfde3510b3f3',
diff --git a/packages/neuron-wallet/tests/services/anyone-can-pay.test.ts b/packages/neuron-wallet/tests/services/anyone-can-pay.test.ts
index 4f259b2a8e..bb6955fb0f 100644
--- a/packages/neuron-wallet/tests/services/anyone-can-pay.test.ts
+++ b/packages/neuron-wallet/tests/services/anyone-can-pay.test.ts
@@ -5,7 +5,7 @@ import { initConnection, closeConnection, getConnection } from '../setupAndTeard
import { AcpSendSameAccountError, TargetLockError, TargetOutputNotFoundError } from '../../src/exceptions'
import AssetAccountInfo from '../../src/models/asset-account-info'
import SystemScriptInfo from '../../src/models/system-script-info'
-import { MIN_SUDT_CAPACITY } from '../../src/utils/const'
+import { MIN_SUDT_CAPACITY, UDTType } from '../../src/utils/const'
const addressParseMock = jest.fn()
jest.mock('../../src/models/address-parser', () => ({
@@ -78,7 +78,9 @@ describe('anyone-can-pay-service', () => {
'tokenName',
'8',
'0',
- '0x62260b4dd406bee8a021185edaa60b7a77f7e99a'
+ '0x62260b4dd406bee8a021185edaa60b7a77f7e99a',
+ undefined,
+ UDTType.SUDT
)
)
const ckbAssetAccount = AssetAccountEntity.fromModel(
@@ -202,9 +204,9 @@ describe('anyone-can-pay-service', () => {
assetAccountEntity.id
)
expect(fromObjectMock).toHaveBeenCalledWith({
- capacity: BigInt(MIN_SUDT_CAPACITY).toString(),
lock: targetLockScript,
type: new AssetAccountInfo().generateSudtScript(assetAccount.tokenID),
+ data: '0x00000000000000000000000000000000',
})
expect(generateAnyoneCanPayToSudtTxMock).toHaveBeenCalledWith(
'walletId',
@@ -292,12 +294,13 @@ describe('anyone-can-pay-service', () => {
//@ts-ignore
await AnyoneCanPayService.getSUDTTargetOutput(
SystemScriptInfo.generateSecpScript(assetAccount.blake160),
- 'tokenID'
+ 'tokenID',
+ UDTType.SUDT
)
expect(fromObjectMock).toHaveBeenCalledWith({
- capacity: BigInt(MIN_SUDT_CAPACITY).toString(),
lock: SystemScriptInfo.generateSecpScript(assetAccount.blake160),
type: new AssetAccountInfo().generateSudtScript('tokenID'),
+ data: '0x00000000000000000000000000000000',
})
})
it('send to anyone pay address not exist', async () => {
@@ -305,12 +308,13 @@ describe('anyone-can-pay-service', () => {
//@ts-ignore
await AnyoneCanPayService.getSUDTTargetOutput(
new AssetAccountInfo().generateAnyoneCanPayScript(assetAccount.blake160),
- 'tokenID'
+ 'tokenID',
+ UDTType.SUDT
)
expect(fromObjectMock).toHaveBeenCalledWith({
- capacity: BigInt(MIN_SUDT_CAPACITY).toString(),
lock: new AssetAccountInfo().generateAnyoneCanPayScript(assetAccount.blake160),
type: new AssetAccountInfo().generateSudtScript('tokenID'),
+ data: '0x00000000000000000000000000000000',
})
})
it('send to anyone pay address exist', async () => {
@@ -345,11 +349,15 @@ describe('anyone-can-pay-service', () => {
getOneByLockScriptAndTypeScriptMock.mockResolvedValue(undefined)
const args = `0x${'0'.repeat(40)}`
//@ts-ignore
- await AnyoneCanPayService.getSUDTTargetOutput(new AssetAccountInfo().generateChequeScript(args, args), 'tokenID')
+ await AnyoneCanPayService.getSUDTTargetOutput(
+ new AssetAccountInfo().generateChequeScript(args, args),
+ 'tokenID',
+ UDTType.SUDT
+ )
expect(fromObjectMock).toHaveBeenCalledWith({
- capacity: BigInt(162 * 10 ** 8).toString(),
lock: new AssetAccountInfo().generateChequeScript(args, args),
type: new AssetAccountInfo().generateSudtScript('tokenID'),
+ data: '0x00000000000000000000000000000000',
})
})
})
@@ -358,7 +366,8 @@ describe('anyone-can-pay-service', () => {
it('is secp256 address', async () => {
const res = await AnyoneCanPayService.getHoldSUDTCellCapacity(
SystemScriptInfo.generateSecpScript(assetAccount.blake160),
- '0x00'
+ '0x00',
+ UDTType.SUDT
)
expect(res).toBe(undefined)
})
@@ -373,7 +382,8 @@ describe('anyone-can-pay-service', () => {
getOneByLockScriptAndTypeScriptMock.mockResolvedValue({})
const res = await AnyoneCanPayService.getHoldSUDTCellCapacity(
new AssetAccountInfo().generateAnyoneCanPayScript(assetAccount.blake160),
- '0x00'
+ '0x00',
+ UDTType.SUDT
)
expect(res).toBe(undefined)
})
@@ -381,7 +391,8 @@ describe('anyone-can-pay-service', () => {
getOneByLockScriptAndTypeScriptMock.mockResolvedValue(undefined)
const res = await AnyoneCanPayService.getHoldSUDTCellCapacity(
new AssetAccountInfo().generateAnyoneCanPayScript(assetAccount.blake160),
- '0x00'
+ `0x${'00'.repeat(32)}`,
+ UDTType.SUDT
)
expect(res).toBe(BigInt(MIN_SUDT_CAPACITY).toString())
})
@@ -389,7 +400,8 @@ describe('anyone-can-pay-service', () => {
getOneByLockScriptAndTypeScriptMock.mockResolvedValue(undefined)
const res = await AnyoneCanPayService.getHoldSUDTCellCapacity(
new AssetAccountInfo().generateChequeScript(assetAccount.blake160, assetAccount.blake160),
- '0x00'
+ `0x${'00'.repeat(32)}`,
+ UDTType.SUDT
)
expect(res).toBe(BigInt(162 * 10 ** 8).toString())
})
diff --git a/packages/neuron-wallet/tests/services/asset-account-service.test.ts b/packages/neuron-wallet/tests/services/asset-account-service.test.ts
index 0e980b8a08..b4fea15789 100644
--- a/packages/neuron-wallet/tests/services/asset-account-service.test.ts
+++ b/packages/neuron-wallet/tests/services/asset-account-service.test.ts
@@ -11,13 +11,14 @@ import { TransactionStatus } from '../../src/models/chain/transaction'
import { closeConnection, createAccounts, getConnection, initConnection } from '../setupAndTeardown'
import accounts from '../setupAndTeardown/accounts.fixture'
import HdPublicKeyInfo from '../../src/database/chain/entities/hd-public-key-info'
-import { AddressType } from '@ckb-lumos/hd'
+import { hd } from '@ckb-lumos/lumos'
import OutPoint from '../../src/models/chain/out-point'
import { when } from 'jest-when'
import SystemScriptInfo from '../../src/models/system-script-info'
import Script from '../../src/models/chain/script'
import Input from '../../src/models/chain/input'
import { keyInfos } from '../setupAndTeardown/public-key-info.fixture'
+import { UDTType } from '../../src/utils/const'
const stubbedWalletServiceGet = jest.fn()
const stubbedGenerateClaimChequeTx = jest.fn()
@@ -59,7 +60,8 @@ const generateOutput = (
tokenAmount = '100',
customData: string | undefined = undefined,
status: OutputStatus = OutputStatus.Live,
- lock?: Script
+ lock?: Script,
+ udtType?: UDTType
) => {
const outputEntity = new OutputEntity()
outputEntity.outPointTxHash = randomHex()
@@ -76,7 +78,7 @@ const generateOutput = (
outputEntity.data = customData || '0x'
outputEntity.hasData = customData ? true : false
if (tokenID !== 'CKBytes') {
- const type = assetAccountInfo.generateSudtScript(tokenID)
+ const type = assetAccountInfo.generateUdtScript(tokenID, udtType ?? UDTType.SUDT)!
outputEntity.typeCodeHash = type.codeHash
outputEntity.typeArgs = type.args
outputEntity.typeHashType = type.hashType
@@ -146,7 +148,7 @@ describe('AssetAccountService', () => {
const keyInfo = HdPublicKeyInfo.fromObject({
walletId,
- addressType: AddressType.Receiving,
+ addressType: hd.AddressType.Receiving,
addressIndex: 0,
publicKeyInBlake160: blake160,
})
@@ -251,6 +253,7 @@ describe('AssetAccountService', () => {
describe('#getAll', () => {
const tokenID = '0x' + '0'.repeat(64)
+ const xUdtTokenID = '0x' + '1'.repeat(64)
describe('with both sUDT and CKB accounts', () => {
describe('with live cells', () => {
@@ -264,6 +267,17 @@ describe('AssetAccountService', () => {
balance: '0',
accountName: 'sUDT',
blake160,
+ udtType: UDTType.SUDT,
+ }),
+ AssetAccount.fromObject({
+ tokenID: xUdtTokenID,
+ symbol: 'xUDT',
+ tokenName: 'xUDT',
+ decimal: '0',
+ balance: '0',
+ accountName: 'xUDT',
+ blake160,
+ udtType: UDTType.XUDT,
}),
AssetAccount.fromObject({
tokenID: 'CKBytes',
@@ -280,6 +294,7 @@ describe('AssetAccountService', () => {
generateOutput(undefined, undefined, undefined, toShannon(1000)),
generateOutput(tokenID),
generateOutput(tokenID),
+ generateOutput(xUdtTokenID),
]
await createAccounts(assetAccounts, outputs)
})
@@ -302,6 +317,17 @@ describe('AssetAccountService', () => {
balance: '0',
accountName: 'sUDT',
blake160,
+ udtType: UDTType.SUDT,
+ }),
+ AssetAccount.fromObject({
+ tokenID: xUdtTokenID,
+ symbol: 'xUDT',
+ tokenName: 'xUDT',
+ decimal: '0',
+ balance: '0',
+ accountName: 'xUDT',
+ blake160,
+ udtType: UDTType.XUDT,
}),
AssetAccount.fromObject({
tokenID: 'CKBytes',
@@ -318,13 +344,35 @@ describe('AssetAccountService', () => {
generateOutput(undefined, undefined, undefined, toShannon(1000), undefined, undefined, OutputStatus.Sent),
generateOutput(tokenID),
generateOutput(tokenID, undefined, undefined, undefined, undefined, undefined, OutputStatus.Sent),
+ generateOutput(
+ xUdtTokenID,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ UDTType.XUDT
+ ),
+ generateOutput(
+ xUdtTokenID,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ OutputStatus.Sent,
+ undefined,
+ UDTType.XUDT
+ ),
]
await createAccounts(assetAccounts, outputs)
})
it('includes balance calculations for both sUDT and CKB accounts', async () => {
const result = await AssetAccountService.getAll(walletId)
- expect(result.length).toEqual(2)
+ expect(result.length).toEqual(3)
expect(result.find((a: any) => a.tokenID === tokenID)?.balance).toEqual('200')
expect(result.find((a: any) => a.tokenID === 'CKBytes')?.balance).toEqual(toShannon(2000 - 61).toString())
})
@@ -507,6 +555,7 @@ describe('AssetAccountService', () => {
balance: '0',
accountName: 'sUDT',
blake160,
+ udtType: UDTType.SUDT,
}),
AssetAccount.fromObject({
tokenID: 'CKBytes',
@@ -962,7 +1011,9 @@ describe('AssetAccountService', () => {
'',
'',
'0',
- '0x0000000000000000000000000000000000000000'
+ '0x0000000000000000000000000000000000000000',
+ undefined,
+ UDTType.SUDT
)
const tx = {}
beforeEach(async () => {
diff --git a/packages/neuron-wallet/tests/services/cell-local-info.test.ts b/packages/neuron-wallet/tests/services/cell-local-info.test.ts
index 066f906415..9d27d3eac5 100644
--- a/packages/neuron-wallet/tests/services/cell-local-info.test.ts
+++ b/packages/neuron-wallet/tests/services/cell-local-info.test.ts
@@ -1,4 +1,4 @@
-import type { OutPoint } from '@ckb-lumos/base'
+import type { OutPoint } from '@ckb-lumos/lumos'
import CellLocalInfoService from '../../src/services/cell-local-info'
import { closeConnection, getConnection, initConnection } from '../setupAndTeardown'
import CellLocalInfo from '../../src/database/chain/entities/cell-local-info'
diff --git a/packages/neuron-wallet/tests/services/cells.test.ts b/packages/neuron-wallet/tests/services/cells.test.ts
index 8d3dcd17d1..a50acacc32 100644
--- a/packages/neuron-wallet/tests/services/cells.test.ts
+++ b/packages/neuron-wallet/tests/services/cells.test.ts
@@ -1,6 +1,6 @@
-import type { OutPoint as OutPointSDK } from '@ckb-lumos/base'
+import type { OutPoint as OutPointSDK } from '@ckb-lumos/lumos'
import { scriptToAddress } from '../../src/utils/scriptAndAddress'
-import { bytes } from '@ckb-lumos/codec'
+import { bytes } from '@ckb-lumos/lumos/codec'
import OutputEntity from '../../src/database/chain/entities/output'
import InputEntity from '../../src/database/chain/entities/input'
import { OutputStatus } from '../../src/models/chain/output'
@@ -1270,6 +1270,10 @@ describe('CellsService', () => {
generateCell('666', OutputStatus.Live, true, typeScript, { lockScript: bobDefaultLock }),
// sudt asset
generateCell('777', OutputStatus.Live, true, sudtType, { lockScript: bobDefaultLock }),
+ // xudt asset
+ generateCell('888', OutputStatus.Live, true, assetAccountInfo.generateXudtScript('0x'), {
+ lockScript: bobDefaultLock,
+ }),
]
await getConnection().manager.save(cells)
})
@@ -1280,10 +1284,10 @@ describe('CellsService', () => {
result = await CellsService.getCustomizedAssetCells([publicKeyHash], 1, 10)
})
it('returns all items', () => {
- expect(result.totalCount).toEqual(7)
- expect(result.items.length).toEqual(7)
+ expect(result.totalCount).toEqual(8)
+ expect(result.items.length).toEqual(8)
const totalCapacity = result.items.reduce((total: number, cell: any) => total + parseInt(cell.capacity), 0)
- expect(totalCapacity).toEqual(100 * 3 + 10000 * 2 + 666 + 777)
+ expect(totalCapacity).toEqual(100 * 3 + 10000 * 2 + 666 + 777 + 888)
})
it('attaches setCustomizedAssetInfo to single multisign cells', async () => {
const singleMultiSignCells = result.items.filter(
@@ -1312,23 +1316,32 @@ describe('CellsService', () => {
const cells = result.items.filter((item: any) => item.capacity === '777')
expect(cells.length).toEqual(1)
expect(cells[0].customizedAssetInfo).toEqual({
- lock: CustomizedLock.SUDT,
+ lock: '',
type: CustomizedType.SUDT,
data: '',
})
})
+ it('attaches setCustomizedAssetInfo to xudt cells', () => {
+ const cells = result.items.filter((item: any) => item.capacity === '888')
+ expect(cells.length).toEqual(1)
+ expect(cells[0].customizedAssetInfo).toEqual({
+ lock: '',
+ type: CustomizedType.XUDT,
+ data: '',
+ })
+ })
})
describe('within pagination scope', () => {
it('returns first page result', async () => {
const page = 1
const result = await CellsService.getCustomizedAssetCells([publicKeyHash], page, pageSize)
- expect(result.totalCount).toEqual(7)
+ expect(result.totalCount).toEqual(8)
expect(result.items.length).toEqual(pageSize)
})
it('returns the remaining cells for the last page', async () => {
const page = 2
const result = await CellsService.getCustomizedAssetCells([publicKeyHash], page, pageSize)
- expect(result.totalCount).toEqual(7)
+ expect(result.totalCount).toEqual(8)
expect(result.items.length).toEqual(2)
})
})
@@ -1336,7 +1349,7 @@ describe('CellsService', () => {
it('returns empty result', async () => {
const page = 8
const result = await CellsService.getCustomizedAssetCells([publicKeyHash], page, pageSize)
- expect(result.totalCount).toEqual(7)
+ expect(result.totalCount).toEqual(8)
expect(result.items.length).toEqual(0)
})
})
@@ -1676,7 +1689,7 @@ describe('CellsService', () => {
'61',
OutputStatus.Sent,
false,
- SystemScriptInfo.generateMultiSignScript(new Multisig().args(bob.blake160, +10, '0x7080291000049'))
+ SystemScriptInfo.generateMultiSignScript(Multisig.args(bob.blake160, +10, '0x7080291000049'))
)
await expect(CellsService.getLiveOrSentCellByWalletId(bob.walletId)).resolves.toHaveLength(1)
})
@@ -1718,7 +1731,7 @@ describe('CellsService', () => {
it('MULTI_LOCK_TIME', () => {
const output = Output.fromObject({
capacity: '1000',
- lock: SystemScriptInfo.generateMultiSignScript(new Multisig().args(bob.blake160, +10, '0x7080291000049')),
+ lock: SystemScriptInfo.generateMultiSignScript(Multisig.args(bob.blake160, +10, '0x7080291000049')),
})
expect(CellsService.getCellLockType(output)).toBe(LockScriptCategory.MULTI_LOCK_TIME)
})
@@ -1884,7 +1897,7 @@ describe('CellsService', () => {
it('no input', async () => {
const input = await saveTxAndInput()
await expect(CellsService.getDaoWithdrawAndDeposit(input.transactionHash)).rejects.toThrow(
- new Error(`No unlock transaction use ${input.transactionHash} as input`)
+ new Error(`This is not an unlock dao transaction ${input.transactionHash}`)
)
})
it('can not find output', async () => {
diff --git a/packages/neuron-wallet/tests/services/ckb-runner.test.ts b/packages/neuron-wallet/tests/services/ckb-runner.test.ts
index 451d9b2462..7e904a4637 100644
--- a/packages/neuron-wallet/tests/services/ckb-runner.test.ts
+++ b/packages/neuron-wallet/tests/services/ckb-runner.test.ts
@@ -1,6 +1,5 @@
import { EventEmitter } from 'typeorm/platform/PlatformTools'
import path from 'path'
-import { scheduler } from 'timers/promises'
const stubbedChildProcess = jest.fn()
const stubbedSpawn = jest.fn()
@@ -92,13 +91,7 @@ jest.doMock('../../src/utils/toml', () => ({
jest.doMock('../../src/utils/get-usable-port', () => ({
getUsablePort: getUsablePortMock,
}))
-const {
- startCkbNode,
- stopCkbNode,
- getLookingValidTargetStatus,
- migrateCkbData,
- getNodeUrl,
-} = require('../../src/services/ckb-runner')
+const { startCkbNode, stopCkbNode, migrateCkbData, getNodeUrl } = require('../../src/services/ckb-runner')
describe('ckb runner', () => {
let stubbedCkb: any = new EventEmitter()
@@ -199,54 +192,6 @@ describe('ckb runner', () => {
})
})
- describe('with assume valid target', () => {
- beforeEach(async () => {
- stubbedProcess.platform = platform
- app.isPackaged = true
- stubbedProcess.env = { CKB_NODE_ASSUME_VALID_TARGET: '0x' + '0'.repeat(64) }
- stubbedExistsSync.mockReturnValue(true)
- await startCkbNode()
- })
- afterEach(async () => {
- app.isPackaged = false
- stubbedProcess.env = {}
- const promise = stopCkbNode()
- stubbedCkb.emit('close')
- await promise
- })
- it('runs ckb binary', () => {
- expect(stubbedSpawn).toHaveBeenCalledWith(
- expect.stringContaining(path.join('bin', 'ckb')),
- ['run', '-C', ckbDataPath, '--indexer', '--assume-valid-target', '0x' + '0'.repeat(64)],
- { stdio: ['ignore', 'pipe', 'pipe'] }
- )
- })
- it('is Looking valid target', () => {
- stubbedCkb.stdout.emit(
- 'data',
- `can't find assume valid target temporarily, hash: Byte32(0x${'0'.repeat(64)})`
- )
- expect(getLookingValidTargetStatus()).toBeTruthy()
- })
- it('is Looking valid target', async () => {
- stubbedCkb.stdout.emit(
- 'data',
- `can't find assume valid target temporarily, hash: Byte32(0x${'0'.repeat(64)})`
- )
- await scheduler.wait(11000)
- stubbedCkb.stdout.emit('data', `had find valid target`)
- expect(getLookingValidTargetStatus()).toBeFalsy()
- }, 15000)
- it('ckb has closed', async () => {
- stubbedCkb.stdout.emit(
- 'data',
- `can't find assume valid target temporarily, hash: Byte32(0x${'0'.repeat(64)})`
- )
- stubbedCkb.emit('close')
- expect(getLookingValidTargetStatus()).toBeFalsy()
- })
- })
-
it('port is not usable', async () => {
stubbedExistsSync.mockReturnValue(true)
getUsablePortMock.mockReset()
@@ -255,8 +200,12 @@ describe('ckb runner', () => {
expect(getNodeUrl()).toBe('http://127.0.0.1:8114')
expect(getUsablePortMock).toHaveBeenLastCalledWith(8115)
expect(updateTomlMock).toBeCalledWith(path.join('/chains/mainnet', 'ckb.toml'), {
- rpc: `listen_address = "127.0.0.1:8114"`,
- network: `listen_addresses = ["/ip4/0.0.0.0/tcp/8115"]`,
+ rpc: {
+ listen_address: `"127.0.0.1:8114"`,
+ },
+ network: {
+ listen_addresses: `["/ip4/0.0.0.0/tcp/8115"]`,
+ },
})
const promise = stopCkbNode()
stubbedCkb.emit('close')
@@ -270,8 +219,12 @@ describe('ckb runner', () => {
expect(getNodeUrl()).toBe('http://127.0.0.1:8115')
expect(getUsablePortMock).toHaveBeenLastCalledWith(8116)
expect(updateTomlMock).toBeCalledWith(path.join('/chains/mainnet', 'ckb.toml'), {
- rpc: `listen_address = "127.0.0.1:8115"`,
- network: `listen_addresses = ["/ip4/0.0.0.0/tcp/8116"]`,
+ rpc: {
+ listen_address: `"127.0.0.1:8115"`,
+ },
+ network: {
+ listen_addresses: `["/ip4/0.0.0.0/tcp/8116"]`,
+ },
})
let promise = stopCkbNode()
stubbedCkb.emit('close')
diff --git a/packages/neuron-wallet/tests/services/light-runner.test.ts b/packages/neuron-wallet/tests/services/light-runner.test.ts
index a88ed7a1ec..1a2a2fe7ed 100644
--- a/packages/neuron-wallet/tests/services/light-runner.test.ts
+++ b/packages/neuron-wallet/tests/services/light-runner.test.ts
@@ -337,32 +337,46 @@ describe('test light runner', () => {
describe('test update config', () => {
it('port is used', async () => {
- getUsablePortMock.mockResolvedValueOnce(9001)
+ getUsablePortMock.mockResolvedValueOnce(9001).mockResolvedValueOnce(8119)
lightDataPathMock.mockReturnValue('lightDataPath')
resolveMock.mockImplementation((...v: string[]) => v.join(''))
joinMock.mockImplementation((...v: string[]) => v.join(''))
await CKBLightRunner.getInstance().updateConfig()
expect(CKBLightRunner.getInstance().port).toEqual(9001)
expect(updateTomlMock).toHaveBeenCalledWith('lightDataPath./ckb_light.toml', {
- store: `path = "lightDataPath./store"`,
- network: `path = "lightDataPath./network"`,
- rpc: `listen_address = "127.0.0.1:9001"`,
+ store: {
+ path: `"lightDataPath./store"`,
+ },
+ network: {
+ listen_addresses: '["/ip4/0.0.0.0/tcp/8119"]',
+ path: `"lightDataPath./network"`,
+ },
+ rpc: {
+ listen_address: `"127.0.0.1:9001"`,
+ },
})
//reset port
getUsablePortMock.mockResolvedValueOnce(9000)
await CKBLightRunner.getInstance().updateConfig()
})
it('port is not used', async () => {
- getUsablePortMock.mockResolvedValueOnce(9000)
+ getUsablePortMock.mockResolvedValueOnce(9000).mockResolvedValueOnce(8118)
lightDataPathMock.mockReturnValue('lightDataPath')
resolveMock.mockImplementation((...v: string[]) => v.join(''))
joinMock.mockImplementation((...v: string[]) => v.join(''))
await CKBLightRunner.getInstance().updateConfig()
expect(CKBLightRunner.getInstance().port).toEqual(9000)
expect(updateTomlMock).toHaveBeenCalledWith('lightDataPath./ckb_light.toml', {
- store: `path = "lightDataPath./store"`,
- network: `path = "lightDataPath./network"`,
- rpc: `listen_address = "127.0.0.1:9000"`,
+ store: {
+ path: `"lightDataPath./store"`,
+ },
+ network: {
+ listen_addresses: '["/ip4/0.0.0.0/tcp/8118"]',
+ path: `"lightDataPath./network"`,
+ },
+ rpc: {
+ listen_address: `"127.0.0.1:9000"`,
+ },
})
})
})
diff --git a/packages/neuron-wallet/tests/services/log-encryption.test.ts b/packages/neuron-wallet/tests/services/log-encryption.test.ts
new file mode 100644
index 0000000000..a389233ff2
--- /dev/null
+++ b/packages/neuron-wallet/tests/services/log-encryption.test.ts
@@ -0,0 +1,19 @@
+import LogEncryption, { LogDecryption } from '../../src/services/log-encryption'
+import { generateKeyPairSync } from 'node:crypto'
+
+describe('Test LogEncryption', () => {
+ it('encrypted message should be able to decrypt', () => {
+ const { publicKey: adminPublicKey, privateKey: adminPrivateKey } = generateKeyPairSync('rsa', {
+ modulusLength: 2048,
+ })
+
+ const encryption = new LogEncryption(adminPublicKey.export({ format: 'pem', type: 'pkcs1' }).toString())
+ const decryption = new LogDecryption(adminPrivateKey.export({ format: 'pem', type: 'pkcs1' }).toString())
+
+ const message = 'hello'
+ const encryptedMessage = encryption.encrypt(message)
+ const decryptedMessage = decryption.decrypt(encryptedMessage)
+
+ expect(decryptedMessage).toBe(message)
+ })
+})
diff --git a/packages/neuron-wallet/tests/services/multisig.test.ts b/packages/neuron-wallet/tests/services/multisig.test.ts
index 4f0e72fe7e..155cfab9f0 100644
--- a/packages/neuron-wallet/tests/services/multisig.test.ts
+++ b/packages/neuron-wallet/tests/services/multisig.test.ts
@@ -1,3 +1,12 @@
+jest.doMock('../../src/models/subjects/multisig-config-db-changed-subject', () => ({
+ getSubject() {
+ return {
+ next: jest.fn(),
+ subscribe: jest.fn(),
+ }
+ },
+}))
+
import MultisigConfig from '../../src/database/chain/entities/multisig-config'
import MultisigConfigModel from '../../src/models/multisig-config'
import MultisigService from '../../src/services/multisig'
@@ -6,9 +15,10 @@ import { OutputStatus } from '../../src/models/chain/output'
import { keyInfos } from '../setupAndTeardown/public-key-info.fixture'
import Multisig from '../../src/models/multisig'
import SystemScriptInfo from '../../src/models/system-script-info'
-import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
+import { computeScriptHash as scriptToHash } from '@ckb-lumos/lumos/utils'
import { closeConnection, getConnection, initConnection } from '../setupAndTeardown'
import { NetworkType } from '../../src/models/network'
+import { scheduler } from 'timers/promises'
const [alice, bob, charlie] = keyInfos
@@ -30,6 +40,7 @@ jest.mock('../../src/services/networks', () => ({
getCurrent: () => ({
type: NetworkType.Normal,
}),
+ isMainnet: jest.fn(),
}),
}))
@@ -45,6 +56,7 @@ describe('multisig service', () => {
)
const defaultMultisigConfig = MultisigConfig.fromModel(multisigConfigModel)
defaultMultisigConfig.lastestBlockNumber = '0x0'
+ defaultMultisigConfig.startBlockNumber = 0
const lock = {
args: Multisig.hash(
multisigConfigModel.blake160s,
@@ -82,13 +94,14 @@ describe('multisig service', () => {
multisigConfigModel.id = res?.id
await getConnection().manager.save(multisigOutput)
rpcBatchRequestMock.mockResolvedValue([])
- })
+ }, 20_000)
afterEach(async () => {
const connection = getConnection()
- await connection.synchronize(true)
+ await connection.getRepository(MultisigConfig).clear()
+ await connection.getRepository(MultisigOutput).clear()
rpcBatchRequestMock.mockReset()
multisigOutputChangedSubjectNextMock.mockReset()
- })
+ }, 20_000)
describe('save multisig config', () => {
it('has exist', async () => {
@@ -97,6 +110,7 @@ describe('multisig service', () => {
it('save success', async () => {
const anotherConfig = MultisigConfig.fromModel(multisigConfigModel)
anotherConfig.lastestBlockNumber = '0x0'
+ anotherConfig.startBlockNumber = 0
anotherConfig.r = 2
const res = await multisigService.saveMultisigConfig(anotherConfig)
const count = await getConnection()
@@ -133,6 +147,26 @@ describe('multisig service', () => {
.getOne()
expect(config?.alias).toBe('newalisa')
})
+ it('only update startBlockNumber and original data should not be change', async () => {
+ await multisigService.updateMultisigConfig({
+ id: multisigConfigModel.id!,
+ startBlockNumber: 256,
+ })
+ await scheduler.wait(2_000)
+ const config = await getConnection()
+ .getRepository(MultisigConfig)
+ .createQueryBuilder()
+ .where({
+ id: multisigConfigModel.id,
+ })
+ .getOne()
+ expect(config?.alias).toBe('alias')
+ expect(config?.startBlockNumber).toBe(256)
+ expect(config?.walletId).toBe(multisigConfigModel.walletId)
+ expect(config?.blake160s).toStrictEqual(multisigConfigModel.blake160s)
+ expect(config?.r).toBe(multisigConfigModel.r)
+ expect(config?.m).toBe(multisigConfigModel.m)
+ })
})
describe('test get config', () => {
diff --git a/packages/neuron-wallet/tests/services/networks.test.ts b/packages/neuron-wallet/tests/services/networks.test.ts
index af3ad18a67..98b2b910ca 100644
--- a/packages/neuron-wallet/tests/services/networks.test.ts
+++ b/packages/neuron-wallet/tests/services/networks.test.ts
@@ -158,21 +158,27 @@ describe(`Unit tests of networks service`, () => {
describe(`validation on parameters`, () => {
describe(`validation on parameters`, () => {
it(`service.create requires name, and remote`, async () => {
- expect(service.create(undefined as any, undefined as any)).rejects.toThrowError(t(ERROR_MESSAGE.MISSING_ARG))
- expect(service.create('network name', undefined as any)).rejects.toThrowError(t(ERROR_MESSAGE.MISSING_ARG))
+ await expect(service.create(undefined as any, undefined as any)).rejects.toThrowError(
+ t(ERROR_MESSAGE.MISSING_ARG)
+ )
+ await expect(service.create('network name', undefined as any)).rejects.toThrowError(
+ t(ERROR_MESSAGE.MISSING_ARG)
+ )
})
- it(`service.update requires id, options`, () => {
- expect(service.update(undefined as any, undefined as any)).rejects.toThrowError(t(ERROR_MESSAGE.MISSING_ARG))
- expect(service.update('', undefined as any)).rejects.toThrowError(t(ERROR_MESSAGE.MISSING_ARG))
+ it(`service.update requires id, options`, async () => {
+ await expect(service.update(undefined as any, undefined as any)).rejects.toThrowError(
+ t(ERROR_MESSAGE.MISSING_ARG)
+ )
+ await expect(service.update('', undefined as any)).rejects.toThrowError(t(ERROR_MESSAGE.MISSING_ARG))
})
- it(`service.delete requires id `, () => {
- expect(service.delete(undefined as any)).rejects.toThrowError(t(ERROR_MESSAGE.MISSING_ARG))
+ it(`service.delete requires id `, async () => {
+ await expect(service.delete(undefined as any)).rejects.toThrowError(t(ERROR_MESSAGE.MISSING_ARG))
})
- it(`service.activate requires id `, () => {
- expect(service.activate(undefined as any)).rejects.toThrowError(t(ERROR_MESSAGE.MISSING_ARG))
+ it(`service.activate requires id `, async () => {
+ await expect(service.activate(undefined as any)).rejects.toThrowError(t(ERROR_MESSAGE.MISSING_ARG))
})
})
})
@@ -182,18 +188,18 @@ describe(`Unit tests of networks service`, () => {
await service.create('Default', 'http://127.0.0.1:8114')
})
- it(`create network with existing name of Default`, () => {
- expect(service.create('Default', 'http://127.0.0.1:8114')).rejects.toThrowError(t(ERROR_MESSAGE.NAME_USED))
+ it(`create network with existing name of Default`, async () => {
+ await expect(service.create('Default', 'http://127.0.0.1:8114')).rejects.toThrowError(t(ERROR_MESSAGE.NAME_USED))
})
- it(`update network which is not existing`, () => {
+ it(`update network which is not existing`, async () => {
const id = `not-existing-id`
- expect(service.update(id, {})).rejects.toThrowError(t(ERROR_MESSAGE.NETWORK_ID_NOT_FOUND, { id }))
+ await expect(service.update(id, {})).rejects.toThrowError(t(ERROR_MESSAGE.NETWORK_ID_NOT_FOUND, { id }))
})
- it(`activate network which is not existing`, () => {
+ it(`activate network which is not existing`, async () => {
const id = `not-existing-id`
- expect(service.activate(id)).rejects.toThrowError(t(ERROR_MESSAGE.NETWORK_ID_NOT_FOUND, { id }))
+ await expect(service.activate(id)).rejects.toThrowError(t(ERROR_MESSAGE.NETWORK_ID_NOT_FOUND, { id }))
})
})
@@ -223,6 +229,7 @@ describe(`Unit tests of networks service`, () => {
service.readSync = readSyncMock
service.writeSync = writeSyncMock
service.updateAll = updateAllMock
+ service.activate = jest.fn()
})
afterEach(() => {
readSyncMock.mockReset()
diff --git a/packages/neuron-wallet/tests/services/node.test.ts b/packages/neuron-wallet/tests/services/node.test.ts
index bff33582fb..549c1e95dd 100644
--- a/packages/neuron-wallet/tests/services/node.test.ts
+++ b/packages/neuron-wallet/tests/services/node.test.ts
@@ -473,6 +473,7 @@ describe('NodeService', () => {
nodeService.getNeuronCompatibilityCKB = () => ({
'0.110': {
full: ['0.110', '0.109'],
+ light: ['0.3', '0.2'],
},
})
stubbedNetworsServiceGet.mockReturnValueOnce({ remote: BUNDLED_CKB_URL, readonly: true })
@@ -489,6 +490,12 @@ describe('NodeService', () => {
it('is compatible', () => {
expect(nodeService.isCkbCompatibility('0.110.0', '0.109.0 (30e1255 2023-01-30)')).toBeTruthy()
})
+ it('is not compatible', () => {
+ expect(nodeService.isCkbCompatibility('0.110.0', '0.1', 'light')).toBeFalsy()
+ })
+ it('is compatible', () => {
+ expect(nodeService.isCkbCompatibility('0.110.0', '0.3', 'light')).toBeTruthy()
+ })
})
describe('test should update', () => {
beforeEach(() => {
diff --git a/packages/neuron-wallet/tests/services/sign-message.test.ts b/packages/neuron-wallet/tests/services/sign-message.test.ts
index 50bc48c7e9..d093abab06 100644
--- a/packages/neuron-wallet/tests/services/sign-message.test.ts
+++ b/packages/neuron-wallet/tests/services/sign-message.test.ts
@@ -78,14 +78,24 @@ describe(`SignMessage`, () => {
it('not match wallet address', async () => {
getAddressesByWalletIdMock.mockReturnValueOnce([])
await expect(
- SignMessage.sign('walletId', signInfo.address, extendedKeyInfo.password, signInfo.message)
+ SignMessage.sign({
+ walletID: 'walletId',
+ password: extendedKeyInfo.password,
+ message: signInfo.message,
+ address: signInfo.address,
+ })
).rejects.toThrow(new AddressNotFound())
})
it('with generate', async () => {
getAddressesByWalletIdMock.mockReturnValueOnce([{ address: signInfo.address }])
getPrivateKeyMock.mockReturnValueOnce(signInfo.privateKey)
- const res = await SignMessage.sign('walletId', signInfo.address, extendedKeyInfo.password, signInfo.message)
+ const res = await SignMessage.sign({
+ walletID: 'walletId',
+ password: extendedKeyInfo.password,
+ message: signInfo.message,
+ address: signInfo.address,
+ })
expect(res).toEqual(signInfo.signature)
})
@@ -94,7 +104,12 @@ describe(`SignMessage`, () => {
walletMock.mockReturnValueOnce({ isHardware: () => true })
const signMessage = jest.fn()
hardWalletMock.mockReturnValueOnce({ signMessage })
- await SignMessage.sign('walletId', signInfo.address, extendedKeyInfo.password, signInfo.message)
+ await SignMessage.sign({
+ walletID: 'walletId',
+ password: extendedKeyInfo.password,
+ message: signInfo.message,
+ address: signInfo.address,
+ })
expect(signMessage).toHaveBeenCalled()
})
})
diff --git a/packages/neuron-wallet/tests/services/sudt-token-info.test.ts b/packages/neuron-wallet/tests/services/sudt-token-info.test.ts
index f89fd33088..9ce636567d 100644
--- a/packages/neuron-wallet/tests/services/sudt-token-info.test.ts
+++ b/packages/neuron-wallet/tests/services/sudt-token-info.test.ts
@@ -4,6 +4,7 @@ import { closeConnection, getConnection, initConnection } from '../setupAndTeard
import HdPublicKeyInfo from '../../src/database/chain/entities/hd-public-key-info'
import AssetAccountEntity from '../../src/database/chain/entities/asset-account'
import accounts from '../setupAndTeardown/accounts.fixture'
+import { UDTType } from '../../src/utils/const'
const defaultTokenId = '0x' + '0'.repeat(64)
@@ -162,19 +163,19 @@ describe('sudt token info service', () => {
})
it('no token info', async () => {
- await expect(SudtTokenInfoService.getSudtTokenInfo('0x')).resolves.toBeNull()
+ await expect(SudtTokenInfoService.getSudtTokenInfo('0x', UDTType.SUDT)).resolves.toBeNull()
})
it('token info not match', async () => {
const entity = AssetAccountEntity.fromModel(assetAccount)
await getConnection().manager.save([entity.sudtTokenInfo, entity])
- await expect(SudtTokenInfoService.getSudtTokenInfo(`0x${'00'.repeat(20)}`)).resolves.toBeNull()
+ await expect(SudtTokenInfoService.getSudtTokenInfo(`0x${'00'.repeat(20)}`, UDTType.SUDT)).resolves.toBeNull()
})
it('match token info', async () => {
const entity = AssetAccountEntity.fromModel(assetAccount)
await getConnection().manager.save([entity.sudtTokenInfo, entity])
- const result = await SudtTokenInfoService.getSudtTokenInfo(assetAccount.tokenID)
+ const result = await SudtTokenInfoService.getSudtTokenInfo(assetAccount.tokenID, UDTType.SUDT)
expect(result).toBeDefined()
expect(result?.assetAccounts).toHaveLength(1)
})
diff --git a/packages/neuron-wallet/tests/services/tx-wallet.test.ts b/packages/neuron-wallet/tests/services/tx-wallet.test.ts
index 66cde86d55..17992d97d0 100644
--- a/packages/neuron-wallet/tests/services/tx-wallet.test.ts
+++ b/packages/neuron-wallet/tests/services/tx-wallet.test.ts
@@ -1,7 +1,6 @@
import WalletService from '../../src/services/wallets'
-import { bytes } from '@ckb-lumos/codec'
-import { Keychain, Keystore, ExtendedPrivateKey, AccountExtendedPublicKey } from '@ckb-lumos/hd'
-import { mnemonicToSeedSync } from '@ckb-lumos/hd/lib/mnemonic'
+import { bytes } from '@ckb-lumos/lumos/codec'
+import { hd } from '@ckb-lumos/lumos'
import TransactionSender from '../../src/services/transaction-sender'
import { signWitnesses } from '../../src/utils/signWitnesses'
@@ -41,18 +40,18 @@ describe('get keys with paths', () => {
})
it('get keys', () => {
- const seed = mnemonicToSeedSync(mnemonic)
- const masterKeychain = Keychain.fromSeed(seed)
- const extendedKey = new ExtendedPrivateKey(
+ const seed = hd.mnemonic.mnemonicToSeedSync(mnemonic)
+ const masterKeychain = hd.Keychain.fromSeed(seed)
+ const extendedKey = new hd.ExtendedPrivateKey(
bytes.hexify(masterKeychain.privateKey),
bytes.hexify(masterKeychain.chainCode)
)
const privateKey = bytes.hexify(masterKeychain.derivePath(receivingPath).privateKey)
expect(privateKey).toEqual(receivingPrivateKey)
- const keystore = Keystore.create(extendedKey, password)
+ const keystore = hd.Keystore.create(extendedKey, password)
- const accountKeychain = masterKeychain.derivePath(AccountExtendedPublicKey.ckbAccountPath)
- const accountExtendedPublicKey = new AccountExtendedPublicKey(
+ const accountKeychain = masterKeychain.derivePath(hd.AccountExtendedPublicKey.ckbAccountPath)
+ const accountExtendedPublicKey = new hd.AccountExtendedPublicKey(
bytes.hexify(accountKeychain.publicKey),
bytes.hexify(accountKeychain.chainCode)
)
diff --git a/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts
index 3644000e9d..057a0c6018 100644
--- a/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts
+++ b/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts
@@ -1,5 +1,6 @@
import { when } from 'jest-when'
-import { bytes } from '@ckb-lumos/codec'
+import { bytes } from '@ckb-lumos/lumos/codec'
+import { since } from '@ckb-lumos/lumos'
import OutputEntity from '../../../src/database/chain/entities/output'
import InputEntity from '../../../src/database/chain/entities/input'
import TransactionEntity from '../../../src/database/chain/entities/transaction'
@@ -27,7 +28,7 @@ import {
SudtAcpHaveDataError,
TargetOutputNotFoundError,
} from '../../../src/exceptions'
-import LiveCell from '../../../src/models/chain/live-cell'
+import LiveCell, { CellWithOutPoint } from '../../../src/models/chain/live-cell'
import { keyInfos } from '../../setupAndTeardown/public-key-info.fixture'
const randomHex = (length: number = 64): string => {
@@ -85,8 +86,8 @@ import HdPublicKeyInfo from '../../../src/database/chain/entities/hd-public-key-
import AssetAccount from '../../../src/models/asset-account'
import MultisigConfigModel from '../../../src/models/multisig-config'
import MultisigOutput from '../../../src/database/chain/entities/multisig-output'
-import { LumosCell } from '../../../src/block-sync-renderer/sync/synchronizer'
import { closeConnection, getConnection, initConnection } from '../../setupAndTeardown'
+import { UDTType } from '../../../src/utils/const'
describe('TransactionGenerator', () => {
beforeAll(async () => {
@@ -470,13 +471,11 @@ describe('TransactionGenerator', () => {
const multiSignOutput = tx.outputs.find(o => o.lock.codeHash === SystemScriptInfo.MULTI_SIGN_CODE_HASH)
expect(multiSignOutput).toBeDefined()
- const multiSign = new Multisig()
- const epoch = multiSign.parseSince(multiSignOutput!.lock.args)
- // @ts-ignore: Private method
- const parsedEpoch = multiSign.parseEpoch(epoch)
- expect(parsedEpoch.number).toEqual(BigInt(5))
- expect(parsedEpoch.length).toEqual(BigInt(240))
- expect(parsedEpoch.index).toEqual(BigInt(43))
+ const epoch = Multisig.parseSince(multiSignOutput!.lock.args)
+ const parsedEpoch = since.parseEpoch(epoch)
+ expect(parsedEpoch.number).toEqual(5)
+ expect(parsedEpoch.length).toEqual(240)
+ expect(parsedEpoch.index).toEqual(43)
})
})
})
@@ -733,13 +732,11 @@ describe('TransactionGenerator', () => {
expect(tx.outputs[0].lock.codeHash).toEqual(SystemScriptInfo.MULTI_SIGN_CODE_HASH)
- const multiSign = new Multisig()
- const epoch = multiSign.parseSince(tx.outputs[0].lock.args)
- // @ts-ignore: Private method
- const parsedEpoch = multiSign.parseEpoch(epoch)
- expect(parsedEpoch.number).toEqual(BigInt(5))
- expect(parsedEpoch.length).toEqual(BigInt(240))
- expect(parsedEpoch.index).toEqual(BigInt(43))
+ const epoch = Multisig.parseSince(tx.outputs[0].lock.args)
+ const parsedEpoch = since.parseEpoch(epoch)
+ expect(parsedEpoch.number).toEqual(5)
+ expect(parsedEpoch.length).toEqual(240)
+ expect(parsedEpoch.index).toEqual(43)
})
})
@@ -1045,7 +1042,7 @@ describe('TransactionGenerator', () => {
describe('generateWithdrawMultiSignTx', () => {
const prevOutput = Output.fromObject({
capacity: toShannon('1000'),
- lock: SystemScriptInfo.generateMultiSignScript(new Multisig().args(bob.lockScript.args, 100, '0x7080018000001')),
+ lock: SystemScriptInfo.generateMultiSignScript(Multisig.args(bob.lockScript.args, 100, '0x7080018000001')),
})
const outPoint = OutPoint.fromObject({
txHash: '0x' + '0'.repeat(64),
@@ -1100,8 +1097,8 @@ describe('TransactionGenerator', () => {
tokenID: string | undefined = undefined,
lockScript: Script = bobAnyoneCanPayLockScript,
customData: string = '0x'
- ): LumosCell => {
- const liveCell: LumosCell = {
+ ): CellWithOutPoint => {
+ const liveCell: CellWithOutPoint = {
blockHash: randomHex(),
outPoint: {
txHash: randomHex(),
@@ -1112,18 +1109,17 @@ describe('TransactionGenerator', () => {
lock: {
codeHash: lockScript.codeHash,
args: lockScript.args,
- hashType: lockScript.hashType.toString(),
+ hashType: lockScript.hashType,
},
},
data: '0x',
}
if (tokenID) {
const typeScript = assetAccountInfo.generateSudtScript(tokenID)
- // @ts-ignore
liveCell.cellOutput.type = {
codeHash: typeScript.codeHash,
args: typeScript.args,
- hashType: typeScript.hashType.toString(),
+ hashType: typeScript.hashType,
}
}
liveCell.data = amount ? BufferUtils.writeBigUInt128LE(BigInt(amount)) : '0x'
@@ -2099,14 +2095,14 @@ describe('TransactionGenerator', () => {
describe('generateCreateAnyoneCanPayTx', () => {
const feeRate = '1000'
it('create ckb', async () => {
- const tx = await TransactionGenerator.generateCreateAnyoneCanPayTx(
- 'CKBytes',
- walletId1,
- alice.lockScript.args,
- bob.lockScript.args,
+ const tx = await TransactionGenerator.generateCreateAnyoneCanPayTx({
+ tokenID: 'CKBytes',
+ walletId: walletId1,
+ blake160: alice.lockScript.args,
+ changeBlake160: bob.lockScript.args,
feeRate,
- '0'
- )
+ fee: '0',
+ })
// check fee
const inputCapacities = tx.inputs.map(i => BigInt(i.capacity ?? 0)).reduce((result, c) => result + c, BigInt(0))
@@ -2134,14 +2130,15 @@ describe('TransactionGenerator', () => {
it('create sudt', async () => {
const tokenID = '0x' + '0'.repeat(64)
- const tx = await TransactionGenerator.generateCreateAnyoneCanPayTx(
+ const tx = await TransactionGenerator.generateCreateAnyoneCanPayTx({
tokenID,
- walletId1,
- alice.lockScript.args,
- bob.lockScript.args,
+ walletId: walletId1,
+ blake160: alice.lockScript.args,
+ changeBlake160: bob.lockScript.args,
feeRate,
- '0'
- )
+ fee: '0',
+ udtType: UDTType.SUDT,
+ })
// check fee
const inputCapacities = tx.inputs.map(i => BigInt(i.capacity ?? 0)).reduce((result, c) => result + c, BigInt(0))
@@ -2198,7 +2195,7 @@ describe('TransactionGenerator', () => {
type: senderAcpLiveCell.type(),
data: BufferUtils.writeBigUInt128LE(BigInt(110)),
})
- assetAccount = new AssetAccount(tokenID, '', '', '', '', '', alice.lockScript.args)
+ assetAccount = new AssetAccount(tokenID, '', '', '', '', '', alice.lockScript.args, undefined, UDTType.SUDT)
})
describe('with numeric send amount', () => {
beforeEach(async () => {
@@ -2566,11 +2563,11 @@ describe('TransactionGenerator', () => {
})
const bobLockHash = scriptToAddress(bobAnyoneCanPayLockScript)
const res = (await TransactionGenerator.generateSudtMigrateAcpTx(sudtCell, bobLockHash)) as Transaction
- expect(res.outputs).toHaveLength(3)
+ expect(res.outputs).toHaveLength(2)
expect(res.outputs[1].data).toEqual(BufferUtils.writeBigUInt128LE(BigInt(200)))
- expect(res.outputs[2].capacity).toEqual((BigInt(secpCell.capacity) - BigInt(res.fee ?? 0)).toString())
- expect(res.inputs).toHaveLength(3)
- expect(res.inputs[2].lockHash).toBe(bobAnyoneCanPayLockScript.computeHash())
+ expect(res.outputs[0].capacity).toEqual((BigInt(sudtCell.capacity) - BigInt(res.fee ?? 0)).toString())
+ expect(res.inputs).toHaveLength(2)
+ expect(res.inputs[1].lockHash).toBe(bobAnyoneCanPayLockScript.computeHash())
})
})
@@ -2638,13 +2635,13 @@ describe('TransactionGenerator', () => {
const cells: OutputEntity[] = [generateCell(toShannon('100'), OutputStatus.Live, false, null)]
await getConnection().manager.save(cells)
- const tx = await TransactionGenerator.generateCreateAnyoneCanPayTxUseAllBalance(
- 'CKBytes',
- walletId1,
- alice.lockScript.args,
+ const tx = await TransactionGenerator.generateCreateAnyoneCanPayTxUseAllBalance({
+ tokenID: 'CKBytes',
+ walletId: walletId1,
+ blake160: alice.lockScript.args,
feeRate,
- '0'
- )
+ fee: '0',
+ })
// check fee
const inputCapacities = tx.inputs.map(i => BigInt(i.capacity ?? 0)).reduce((result, c) => result + c, BigInt(0))
@@ -2672,13 +2669,14 @@ describe('TransactionGenerator', () => {
await getConnection().manager.save(cells)
const tokenID = '0x' + '0'.repeat(64)
- const tx = await TransactionGenerator.generateCreateAnyoneCanPayTxUseAllBalance(
+ const tx = await TransactionGenerator.generateCreateAnyoneCanPayTxUseAllBalance({
tokenID,
- walletId1,
- alice.lockScript.args,
+ walletId: walletId1,
+ blake160: alice.lockScript.args,
feeRate,
- '0'
- )
+ fee: '0',
+ udtType: UDTType.SUDT,
+ })
// check fee
const inputCapacities = tx.inputs.map(i => BigInt(i.capacity ?? 0)).reduce((result, c) => result + c, BigInt(0))
@@ -2694,6 +2692,35 @@ describe('TransactionGenerator', () => {
expect(assetAccountInfo.isAnyoneCanPayScript(output.lock)).toBe(true)
expect(output.data).toEqual('0x' + '0'.repeat(32))
})
+
+ it('create xudt', async () => {
+ const cells: OutputEntity[] = [generateCell(toShannon('143'), OutputStatus.Live, false, null)]
+ await getConnection().manager.save(cells)
+
+ const tokenID = '0x' + '0'.repeat(64)
+ const tx = await TransactionGenerator.generateCreateAnyoneCanPayTxUseAllBalance({
+ tokenID,
+ walletId: walletId1,
+ blake160: alice.lockScript.args,
+ feeRate,
+ fee: '0',
+ udtType: UDTType.XUDT,
+ })
+
+ // check fee
+ const inputCapacities = tx.inputs.map(i => BigInt(i.capacity ?? 0)).reduce((result, c) => result + c, BigInt(0))
+ const outputCapacities = tx.outputs.map(o => BigInt(o.capacity)).reduce((result, c) => result + c, BigInt(0))
+ expect(tx.fee).toEqual((inputCapacities - outputCapacities).toString())
+
+ // check output
+ expect(tx.outputs.length).toEqual(1)
+
+ const output = tx.outputs[0]
+ expect(output.capacity).toEqual((BigInt(143 * 10 ** 8) - BigInt(tx.fee ?? 0)).toString())
+ expect(assetAccountInfo.isXudtScript(output.type!)).toBe(true)
+ expect(assetAccountInfo.isAnyoneCanPayScript(output.lock)).toBe(true)
+ expect(output.data).toEqual('0x' + '0'.repeat(32))
+ })
})
describe('#generateMigrateLegacyACPTx', () => {
diff --git a/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts
index 919d8f3bdd..eaf1894650 100644
--- a/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts
+++ b/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts
@@ -1,4 +1,5 @@
-import { bytes } from '@ckb-lumos/codec'
+import { CKBComponents } from '@ckb-lumos/lumos/rpc'
+import { bytes } from '@ckb-lumos/lumos/codec'
import 'dotenv/config'
const stubbedRPCServiceConstructor = jest.fn()
@@ -145,7 +146,7 @@ jest.doMock('services/hardware', () => ({
}),
}))
-jest.doMock('@ckb-lumos/rpc', () => {
+jest.doMock('@ckb-lumos/lumos/rpc', () => {
return {
CKBRPC: class CKBRPC {
url: string
@@ -158,7 +159,7 @@ jest.doMock('@ckb-lumos/rpc', () => {
}
})
-jest.doMock('@ckb-lumos/common-scripts', () => {
+jest.doMock('@ckb-lumos/lumos/common-scripts', () => {
return {
dao: {
calculateMaximumWithdraw: stubbedCalculateDaoMaximumWithdraw,
@@ -187,7 +188,7 @@ import OutPoint from '../../../src/models/chain/out-point'
import Input from '../../../src/models/chain/input'
import Script, { ScriptHashType } from '../../../src/models/chain/script'
import Output from '../../../src/models/chain/output'
-import { AddressType, Keystore } from '@ckb-lumos/hd'
+import { hd } from '@ckb-lumos/lumos'
import WitnessArgs from '../../../src/models/chain/witness-args'
import CellWithStatus from '../../../src/models/chain/cell-with-status'
import SystemScriptInfo from '../../../src/models/system-script-info'
@@ -256,7 +257,7 @@ describe('TransactionSender Test', () => {
name: 'wallet-test1',
id: '11',
extendedKey: 'a',
- keystore: new Keystore(
+ keystore: new hd.Keystore(
{
cipher: 'wallet1',
cipherparams: { iv: 'wallet1' },
@@ -325,7 +326,7 @@ describe('TransactionSender Test', () => {
walletId: fakeWallet.id,
address: '',
path: `m/44'/309'/0'/0/0`,
- addressType: AddressType.Receiving,
+ addressType: hd.AddressType.Receiving,
addressIndex: 1,
txCount: 0,
liveBalance: '0',
diff --git a/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts
index 6b5f9165a8..05850caa09 100644
--- a/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts
+++ b/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts
@@ -32,7 +32,7 @@ jest.mock('../../../src/services/rpc-service', () => {
})
const ckbRpcExecMock = jest.fn()
-jest.mock('@ckb-lumos/rpc', () => {
+jest.mock('@ckb-lumos/lumos/rpc', () => {
return {
CKBRPC: class CKBRPC {
url: string
diff --git a/packages/neuron-wallet/tests/services/wallets.test.ts b/packages/neuron-wallet/tests/services/wallets.test.ts
index 5940e0c57a..bcaaf419e8 100644
--- a/packages/neuron-wallet/tests/services/wallets.test.ts
+++ b/packages/neuron-wallet/tests/services/wallets.test.ts
@@ -1,6 +1,6 @@
import { when } from 'jest-when'
import { WalletFunctionNotSupported, DuplicateImportWallet } from '../../src/exceptions/wallet'
-import { AddressType, Keystore, AccountExtendedPublicKey } from '@ckb-lumos/hd'
+import { hd } from '@ckb-lumos/lumos'
import { Manufacturer } from '../../src/services/hardware/common'
import { prefixWith0x } from '../../src/utils/scriptAndAddress'
@@ -76,7 +76,7 @@ describe('wallet service', () => {
name: 'wallet-test1',
id: '',
extendedKey: `${fakePublicKey}${fakeChainCode}`,
- keystore: new Keystore(
+ keystore: new hd.Keystore(
{
cipher: 'wallet1',
cipherparams: { iv: 'wallet1' },
@@ -99,7 +99,7 @@ describe('wallet service', () => {
name: 'wallet-test2',
id: '',
extendedKey: 'b'.repeat(66) + '2'.repeat(64),
- keystore: new Keystore(
+ keystore: new hd.Keystore(
{
cipher: 'wallet2',
cipherparams: { iv: 'wallet2' },
@@ -122,7 +122,7 @@ describe('wallet service', () => {
name: 'wallet-test3',
id: '',
extendedKey: 'c'.repeat(66) + '3'.repeat(64),
- keystore: new Keystore(
+ keystore: new hd.Keystore(
{
cipher: 'wallet3',
cipherparams: { iv: 'wallet1' },
@@ -152,7 +152,7 @@ describe('wallet service', () => {
descriptor: '',
vendorId: '10086',
addressIndex: 0,
- addressType: AddressType.Receiving,
+ addressType: hd.AddressType.Receiving,
},
}
@@ -160,7 +160,7 @@ describe('wallet service', () => {
name: 'wallet-test5',
id: '',
extendedKey: 'b'.repeat(66) + '2'.repeat(64),
- keystore: new Keystore(
+ keystore: new hd.Keystore(
{
cipher: 'wallet5',
cipherparams: { iv: 'wallet1' },
@@ -294,7 +294,7 @@ describe('wallet service', () => {
await wallet.checkAndGenerateAddresses()
})
it('calls AddressService.generateAndSaveForExtendedKey', async () => {
- const { publicKey } = AccountExtendedPublicKey.parse(wallet4.extendedKey)
+ const { publicKey } = hd.AccountExtendedPublicKey.parse(wallet4.extendedKey)
expect(stubbedGenerateAndSaveForPublicKeyQueueAsyncPush).toHaveBeenCalledWith({
walletId: createdWallet.id,
publicKey,
@@ -525,9 +525,9 @@ describe('wallet service', () => {
try {
walletService.create(wallet5)
} catch (error) {
- const { extendedKey, id } = JSON.parse(error.message)
+ const { duplicateWalletIds, id } = JSON.parse(error.message)
await walletService.replace(createdWallet2.id, id)
- expect(extendedKey).toBe(prefixWith0x('b'.repeat(66) + '2'.repeat(64)))
+ expect(duplicateWalletIds).toStrictEqual([createdWallet2.id])
expect(() => walletService.get(createdWallet2.id)).toThrowError()
expect(walletService.get(id).name).toBe(wallet5.name)
}
diff --git a/packages/neuron-wallet/tests/setupAndTeardown/accounts.fixture.ts b/packages/neuron-wallet/tests/setupAndTeardown/accounts.fixture.ts
index 21d4c06b97..86d25a65fc 100644
--- a/packages/neuron-wallet/tests/setupAndTeardown/accounts.fixture.ts
+++ b/packages/neuron-wallet/tests/setupAndTeardown/accounts.fixture.ts
@@ -1,4 +1,5 @@
import AssetAccount from '../../src/models/asset-account'
+import { UDTType } from '../../src/utils/const'
import { DEPLOY_KEY } from './keys'
const ASSET_ACCOUNT = {
@@ -9,6 +10,7 @@ const ASSET_ACCOUNT = {
balance: '0',
accountName: 'SUDT Account',
blake160: DEPLOY_KEY.blake160,
+ udtType: UDTType.SUDT,
}
const CKB_ASSET_ACCOUNT = {
diff --git a/packages/neuron-wallet/tests/setupAndTeardown/public-key-info.fixture.ts b/packages/neuron-wallet/tests/setupAndTeardown/public-key-info.fixture.ts
index d11da66bfb..821b67e66d 100644
--- a/packages/neuron-wallet/tests/setupAndTeardown/public-key-info.fixture.ts
+++ b/packages/neuron-wallet/tests/setupAndTeardown/public-key-info.fixture.ts
@@ -1,7 +1,9 @@
import { scriptToAddress } from '../../src/utils/scriptAndAddress'
-import { AddressType } from '@ckb-lumos/hd'
+import { hd } from '@ckb-lumos/lumos'
import SystemScriptInfo from '../../src/models/system-script-info'
+const AddressType = hd.AddressType
+
const walletId1 = 'w1'
const walletId2 = 'w2'
const walletId3 = 'w3'
diff --git a/packages/neuron-wallet/tests/utils/deep-camelize-keys/fixtures.json b/packages/neuron-wallet/tests/utils/deep-camelize-keys/fixtures.json
new file mode 100644
index 0000000000..1919e853f7
--- /dev/null
+++ b/packages/neuron-wallet/tests/utils/deep-camelize-keys/fixtures.json
@@ -0,0 +1,101 @@
+{
+ "value": {
+ "version": "0x0",
+ "cell_deps": [
+ {
+ "out_point": {
+ "tx_hash": "0xf8de3bb47d055cdf460d93a2a6e1b05f7432f9777c8c474abf4eec1d4aee5d37",
+ "index": "0x1"
+ },
+ "dep_type": "dep_group"
+ }
+ ],
+ "header_deps": [],
+ "inputs": [
+ {
+ "since": "0x0",
+ "previous_output": {
+ "tx_hash": "0x00bc60fd23dd556a9bd139791e4cb95d678550054953793b79c864abcc733eae",
+ "index": "0x1"
+ }
+ },
+ {
+ "previous_output": {
+ "txHash": "0x8b37ded770fe457e1d3969e93722873308aef1e6810757d248f437de4d009d8f",
+ "index": "0x1"
+ },
+ "since": "0x0"
+ }
+ ],
+ "outputs": [
+ {
+ "capacity": "6600000000",
+ "lock": {
+ "args": "0x2d8765d2d0e007aa227e61d9bc1ebd7343360a58",
+ "code_hash": "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8",
+ "hash_type": "type"
+ },
+ "type": null
+ },
+ {
+ "capacity": "10399999375",
+ "lock": {
+ "args": "0x5b34cc4f76644ec6da564c1ace41711ee0f1e071",
+ "code_hash": "0x5c5069eb0857efc65e1bca0c07df34c31663b3622fd3876c876320fc9634e2a8",
+ "hash_type": "type"
+ },
+ "type": null
+ }
+ ],
+ "outputs_data": ["0x", "0x"],
+ "witnesses": []
+ },
+ "expected": {
+ "version": "0x0",
+ "inputs": [
+ {
+ "since": "0x0",
+ "previousOutput": {
+ "index": "0x1",
+ "txHash": "0x00bc60fd23dd556a9bd139791e4cb95d678550054953793b79c864abcc733eae"
+ }
+ },
+ {
+ "since": "0x0",
+ "previousOutput": {
+ "txHash": "0x8b37ded770fe457e1d3969e93722873308aef1e6810757d248f437de4d009d8f",
+ "index": "0x1"
+ }
+ }
+ ],
+ "outputs": [
+ {
+ "capacity": "6600000000",
+ "lock": {
+ "args": "0x2d8765d2d0e007aa227e61d9bc1ebd7343360a58",
+ "codeHash": "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8",
+ "hashType": "type"
+ },
+ "type": null
+ },
+ {
+ "capacity": "10399999375",
+ "lock": {
+ "args": "0x5b34cc4f76644ec6da564c1ace41711ee0f1e071",
+ "codeHash": "0x5c5069eb0857efc65e1bca0c07df34c31663b3622fd3876c876320fc9634e2a8",
+ "hashType": "type"
+ },
+ "type": null
+ }
+ ],
+ "witnesses": [],
+ "cellDeps": [
+ {
+ "outPoint": { "index": "0x1", "txHash": "0xf8de3bb47d055cdf460d93a2a6e1b05f7432f9777c8c474abf4eec1d4aee5d37" },
+ "depType": "dep_group"
+ }
+ ],
+ "headerDeps": [],
+ "outputsData": ["0x", "0x"]
+ }
+}
diff --git a/packages/neuron-wallet/tests/utils/deep-camelize-keys/index.test.ts b/packages/neuron-wallet/tests/utils/deep-camelize-keys/index.test.ts
new file mode 100644
index 0000000000..2545c058e7
--- /dev/null
+++ b/packages/neuron-wallet/tests/utils/deep-camelize-keys/index.test.ts
@@ -0,0 +1,9 @@
+import { deepCamelizeKeys } from '../../../src/utils/deep-camelize-keys'
+import fixtures from './fixtures.json'
+
+describe('test json to hump', () => {
+ it('json to hump', () => {
+ const result = deepCamelizeKeys(fixtures.value)
+ expect(fixtures.expected).toEqual(result)
+ })
+})
diff --git a/packages/neuron-wallet/tests/utils/rpc-request.test.ts b/packages/neuron-wallet/tests/utils/rpc-request.test.ts
index f93ad617b9..fc1f0d207c 100644
--- a/packages/neuron-wallet/tests/utils/rpc-request.test.ts
+++ b/packages/neuron-wallet/tests/utils/rpc-request.test.ts
@@ -1,10 +1,5 @@
import { rpcBatchRequest, rpcRequest } from '../../src/utils/rpc-request'
-const requestMock = jest.fn()
-jest.mock('undici', () => ({
- request: () => requestMock(),
-}))
-
describe('rpc-batch-request', () => {
const options = [
{
@@ -17,15 +12,19 @@ describe('rpc-batch-request', () => {
},
]
it('fetch error', async () => {
- requestMock.mockResolvedValueOnce({ statusCode: 500 })
+ global.fetch = jest.fn(() =>
+ Promise.resolve({
+ status: 500,
+ })
+ ) as jest.Mock
await expect(rpcBatchRequest('url', options)).rejects.toThrow(
new Error(`indexer request failed with HTTP code 500`)
)
})
it('result is order by id', async () => {
- requestMock.mockResolvedValueOnce({
- statusCode: 200,
- body: {
+ global.fetch = jest.fn(() =>
+ Promise.resolve({
+ status: 200,
json() {
return Promise.resolve([
{
@@ -38,8 +37,9 @@ describe('rpc-batch-request', () => {
},
])
},
- },
- })
+ })
+ ) as jest.Mock
+
const res = await rpcBatchRequest('url', options)
expect(res).toEqual([
{
@@ -60,21 +60,25 @@ describe('rpc-request', () => {
params: 1,
}
it('fetch error', async () => {
- requestMock.mockResolvedValueOnce({ statusCode: 500 })
+ global.fetch = jest.fn(() =>
+ Promise.resolve({
+ status: 500,
+ })
+ ) as jest.Mock
await expect(rpcRequest('url', option)).rejects.toThrow(new Error(`indexer request failed with HTTP code 500`))
})
it('fetch success', async () => {
- requestMock.mockResolvedValueOnce({
- statusCode: 200,
- body: {
+ global.fetch = jest.fn(() =>
+ Promise.resolve({
+ status: 200,
json() {
return Promise.resolve({
id: 2,
result: 2,
})
},
- },
- })
+ })
+ ) as jest.Mock
const res = await rpcRequest('url', option)
expect(res).toEqual(2)
})
diff --git a/packages/neuron-wallet/tests/utils/toml/test.toml b/packages/neuron-wallet/tests/utils/toml/test.toml
index 7a693b7094..e5c6426928 100644
--- a/packages/neuron-wallet/tests/utils/toml/test.toml
+++ b/packages/neuron-wallet/tests/utils/toml/test.toml
@@ -17,6 +17,7 @@ log_to_stdout = true
[network]
network = 127
+listen_addresses = ["/ip4/0.0.0.0/tcp/8115"]
### Specify the public and routable network addresses
# public_addresses = []
diff --git a/packages/neuron-wallet/tests/utils/toml/toml.test.ts b/packages/neuron-wallet/tests/utils/toml/toml.test.ts
index 37ea295d0c..1184bcb430 100644
--- a/packages/neuron-wallet/tests/utils/toml/toml.test.ts
+++ b/packages/neuron-wallet/tests/utils/toml/toml.test.ts
@@ -27,41 +27,50 @@ describe('test toml', () => {
resetMock()
})
describe('test update toml', () => {
- it('update skip comment', () => {
+ it('update skip non exist key', () => {
const tomlPath = path.resolve(__dirname, './test.toml')
updateToml(tomlPath, {
- network: 'network = 127',
+ network: {
+ network1: '127',
+ },
})
- expect(writeFileSyncMock).toBeCalledWith(
- tomlPath,
- fs.readFileSync(tomlPath).toString().replace('listen_addresses = ["/ip4/0.0.0.0/tcp/8115"]', 'network = 127')
- )
+ expect(writeFileSyncMock).toBeCalledWith(tomlPath, fs.readFileSync(tomlPath).toString())
})
it('update multi values with new file and dir exist', () => {
const tomlPath = path.resolve(__dirname, './test.toml')
existsSyncMock.mockReturnValue(true)
- updateToml(tomlPath, { network: 'network = 127', rpc: 'rpc = 8116' }, path.resolve(__dirname, './new.toml'))
+ updateToml(
+ tomlPath,
+ { network: { network: '126', listen_addresses: 'test' }, rpc: { listen_address: 'listen_address' } },
+ path.resolve(__dirname, './new.toml')
+ )
expect(writeFileSyncMock).toBeCalledWith(
path.resolve(__dirname, './new.toml'),
fs
.readFileSync(tomlPath)
.toString()
- .replace('listen_addresses = ["/ip4/0.0.0.0/tcp/8115"]', 'network = 127')
- .replace('listen_address = "127.0.0.1:8114"', 'rpc = 8116')
+ .replace('network = 127', 'network = 126')
+ .replace('listen_addresses = ["/ip4/0.0.0.0/tcp/8115"]', 'listen_addresses = test')
+ .replace('listen_address = "127.0.0.1:8114"', 'listen_address = listen_address')
)
})
it('update multi values with new file and dir not exist', () => {
const tomlPath = path.resolve(__dirname, './test.toml')
existsSyncMock.mockReturnValue(false)
- updateToml(tomlPath, { network: 'network = 127', rpc: 'rpc = 8116' }, path.resolve(__dirname, './new.toml'))
+ updateToml(
+ tomlPath,
+ { network: { network: '126', listen_addresses: 'test' }, rpc: { listen_address: 'listen_address' } },
+ path.resolve(__dirname, './new.toml')
+ )
expect(mkdirSyncMock).toBeCalledWith(__dirname, { recursive: true })
expect(writeFileSyncMock).toBeCalledWith(
path.resolve(__dirname, './new.toml'),
fs
.readFileSync(tomlPath)
.toString()
- .replace('listen_addresses = ["/ip4/0.0.0.0/tcp/8115"]', 'network = 127')
- .replace('listen_address = "127.0.0.1:8114"', 'rpc = 8116')
+ .replace('network = 127', 'network = 126')
+ .replace('listen_addresses = ["/ip4/0.0.0.0/tcp/8115"]', 'listen_addresses = test')
+ .replace('listen_address = "127.0.0.1:8114"', 'listen_address = listen_address')
)
})
})
diff --git a/scripts/admin/decrypt-log/README.md b/scripts/admin/decrypt-log/README.md
new file mode 100644
index 0000000000..71e46c6a4f
--- /dev/null
+++ b/scripts/admin/decrypt-log/README.md
@@ -0,0 +1,58 @@
+## Log Encryption & Decryption
+
+## Encryption
+
+An environment variable `LOG_ENCRYPTION_PUBLIC_KEY` must be set to enable log encryption when releasing Neuron. If the variable is not set, a placeholder message will be left in the log file.
+
+To generate a keypair
+
+```sh
+# for ADMIN_PRIVATE_KEY
+openssl genrsa -out key.pem 2048
+
+# for LOG_ENCRYPTION_PUBLIC_KEY
+openssl rsa -in key.pem -outform PEM -pubout -out public.pem
+```
+
+## Decryption
+
+An encrypted log is following the pattern
+
+```
+[key:] [iv:]
+```
+
+And here is a real world example
+
+```
+[2024-07-31T11:15:06.811Z] [info] [key:sWFKSuG+GzC52QlqDUcLhCvWFevSR8JjcvlIwCmB6U750UbO59zQZlQFyIUCBMH2Vamdr/ScZaF00wObzyi2BERMkKCQ9XY1ELcQSvCaAjUy4251B4MIyrnYPu4Bf+bca5U/906ko37G6dZMDNCcm2J5pm3+0TvqwXFA+BDXsAeZ7YWXpNha+WTMbQJiGj+ltbjIlodXhtqGWBhkLHgeZtfpM/OQDclOUfSP4SDva1LUvjdkQjnmUB+5dLumEAQpm7u7mroXl5eMTpVhyVtULm+QkQ4aA/D9Q/Y1dGUxl8jU2zcgL1h8Uhrb9FMpCaLyu13gGZr42HlFVU4j/VzD/g==] [iv:/jDhuN6b/qEetyHnU2WPDw==] 0+B+gimzrZgbxfxBTtznyA==
+```
+
+To decrypt the message
+
+```sh
+export LOG_MESSAGE=""
+export ADMIN_PRIVATE_KEY=""
+bun run.ts
+```
+
+### Advanced
+
+If the admin key is protected, please decrypt the log key by the following script
+
+```sh
+openssl pkeyutl -pkeyopt rsa_padding_mode:oaep -passin "${MY_KEY_PASSWORD}" -decrypt -inkey private.key -in "${LOCAL_KEY}" -out "aes.key"
+```
+
+```js
+const aesKey = "";
+const iv = Buffer.from("", "base64");
+const decipher = createDecipheriv("aes-256-cbc", aesKey, iv);
+
+console.log(
+ Buffer.concat([
+ decipher.update("", "base64"),
+ decipher.final(),
+ ]).toString("utf-8")
+);
+```
diff --git a/scripts/admin/decrypt-log/run.ts b/scripts/admin/decrypt-log/run.ts
new file mode 100644
index 0000000000..ccf266bcc6
--- /dev/null
+++ b/scripts/admin/decrypt-log/run.ts
@@ -0,0 +1,70 @@
+import { createDecipheriv, privateDecrypt } from "node:crypto";
+
+export const DEFAULT_ALGORITHM = "aes-256-cbc";
+
+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 ADMIN_PRIVATE_KEY = process.env
+ .ADMIN_PRIVATE_KEY!.split(/\r?\n/)
+ .map((line) => line.trim())
+ .join("\n");
+const LOG_MESSAGE = process.env.LOG_MESSAGE!;
+
+const decryption = new LogDecryption(ADMIN_PRIVATE_KEY);
+console.log(decryption.decrypt(LOG_MESSAGE));
diff --git a/scripts/update-wallet-env.js b/scripts/update-wallet-env.js
index f0a9dee2c0..dcc6e940fd 100644
--- a/scripts/update-wallet-env.js
+++ b/scripts/update-wallet-env.js
@@ -24,12 +24,13 @@ async function rpcRequest(method, params = []) {
const ESTIMATE_BLOCK_COUNT_PER_DAY = 8_000
const envFilePath = path.resolve(__dirname, '../packages/neuron-wallet/.env')
const validTargetReg = /(CKB_NODE_ASSUME_VALID_TARGET=)[\S]*/
+const blockNumberReg = /(CKB_NODE_ASSUME_VALID_TARGET_BLOCK_NUMBER=)[\S]*/
const ckbNodeDataSizeReg = /(CKB_NODE_DATA_SIZE=)[\S]*/
async function getValidTarget() {
const tipBlockNumber = (await rpcRequest('get_tip_block_number')).result
const validTargetBlockNumber = `0x${(BigInt(tipBlockNumber) - BigInt(ESTIMATE_BLOCK_COUNT_PER_DAY)).toString(16)}`
- return (await rpcRequest('get_block_hash', [validTargetBlockNumber])).result
+ return [validTargetBlockNumber, (await rpcRequest('get_block_hash', [validTargetBlockNumber])).result]
}
async function getCKBNodeSize() {
@@ -41,12 +42,13 @@ async function getCKBNodeSize() {
;(async function () {
try {
console.info('start updating env file')
- const blockHash = await getValidTarget()
+ const [blockNumber, blockHash] = await getValidTarget()
const ckbNodeDataSize = await getCKBNodeSize()
const originEnvContent = fs.readFileSync(envFilePath).toString('utf-8')
fs.writeFileSync(
envFilePath,
originEnvContent.replace(validTargetReg, `CKB_NODE_ASSUME_VALID_TARGET='${blockHash}'`)
+ .replace(blockNumberReg, `CKB_NODE_ASSUME_VALID_TARGET_BLOCK_NUMBER=${+blockNumber}`)
.replace(ckbNodeDataSizeReg, `CKB_NODE_DATA_SIZE=${ckbNodeDataSize}`)
)
console.info('write success')
diff --git a/yarn.lock b/yarn.lock
index a7b79754a7..a925a6d045 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2030,10 +2030,10 @@
dependencies:
regenerator-runtime "^0.14.0"
-"@babel/runtime@^7.23.9":
- version "7.24.4"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.4.tgz#de795accd698007a66ba44add6cc86542aff1edd"
- integrity sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==
+"@babel/runtime@^7.24.8":
+ version "7.24.8"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.8.tgz#5d958c3827b13cc6d05e038c07fb2e5e3420d82e"
+ integrity sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA==
dependencies:
regenerator-runtime "^0.14.0"
@@ -2117,129 +2117,158 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
-"@ckb-lumos/base@0.21.1", "@ckb-lumos/base@^0.21.0-next.0":
- version "0.21.1"
- resolved "https://registry.yarnpkg.com/@ckb-lumos/base/-/base-0.21.1.tgz#1faf7909b5a68a124256d937cfb0fa03bb6b5457"
- integrity sha512-7O+jBl7pqMsRbYTMNnbpamgaQzvaLZq+ftMtnKZ3A+Zbs6hZcGbz/6nfbRZnyJitPXQHRPT5KAQz6g+TiYqJGg==
+"@ckb-lumos/base@0.23.0", "@ckb-lumos/base@^0.21.0-next.0":
+ version "0.23.0"
+ resolved "https://registry.yarnpkg.com/@ckb-lumos/base/-/base-0.23.0.tgz#507e2860dd49547268e9088e10aa2051507d4343"
+ integrity sha512-8aLFsUyWIK0rT7GQlYFuXyiG5lQ2bLRK2GvUsxv5G7I3nJ1UyxjwvVOdtlsR/cwhzOam3ujwqASqBIayBL6GLA==
dependencies:
- "@ckb-lumos/bi" "0.21.1"
- "@ckb-lumos/codec" "0.21.1"
- "@ckb-lumos/toolkit" "0.21.1"
+ "@ckb-lumos/bi" "0.23.0"
+ "@ckb-lumos/codec" "0.23.0"
+ "@ckb-lumos/toolkit" "0.23.0"
"@types/blake2b" "^2.1.0"
"@types/lodash.isequal" "^4.5.5"
blake2b "^2.1.3"
js-xxhash "^1.0.4"
lodash.isequal "^4.5.0"
-"@ckb-lumos/bi@0.21.1", "@ckb-lumos/bi@^0.21.0-next.0":
- version "0.21.1"
- resolved "https://registry.yarnpkg.com/@ckb-lumos/bi/-/bi-0.21.1.tgz#dfaa0968a9ffd990c1c4fcfc0711f20f09eb0485"
- integrity sha512-6q8uesvu3DAM7GReei9H5seino4tnakTeg8uXtZBPDC6rboMohLCPQvEwhl1iHmsybXvBYVQt4Te1BPPZtuaRw==
+"@ckb-lumos/bi@0.23.0", "@ckb-lumos/bi@^0.21.0-next.0":
+ version "0.23.0"
+ resolved "https://registry.yarnpkg.com/@ckb-lumos/bi/-/bi-0.23.0.tgz#8439d712b823234b858bffff2636ffc21d98199f"
+ integrity sha512-KAy+lyVpL+Al4XD+c9tHrA9DSpHkMusyXtTS81aNZi5MyL6F9jrVmFcqLorhfyfl8Fsv2sEjMe5Neo2Y+w/RJQ==
dependencies:
jsbi "^4.1.0"
-"@ckb-lumos/ckb-indexer@0.21.1":
- version "0.21.1"
- resolved "https://registry.yarnpkg.com/@ckb-lumos/ckb-indexer/-/ckb-indexer-0.21.1.tgz#a0e0ac3261c98181dc8c72e9e726030bb210779d"
- integrity sha512-592pMVP3lwTXF7TmlOcayvGYKOhkYpjbLHUDo7By4yWbm7ZpdexaN5hn0X1sjJgMuee5prxGr9/fY684VTpJQw==
- dependencies:
- "@ckb-lumos/base" "0.21.1"
- "@ckb-lumos/bi" "0.21.1"
- "@ckb-lumos/codec" "0.21.1"
- "@ckb-lumos/rpc" "0.21.1"
- "@ckb-lumos/toolkit" "0.21.1"
+"@ckb-lumos/ckb-indexer@0.23.0":
+ version "0.23.0"
+ resolved "https://registry.yarnpkg.com/@ckb-lumos/ckb-indexer/-/ckb-indexer-0.23.0.tgz#67cbf4539904ea511517fda1e23c5ec4515b574d"
+ integrity sha512-yLODLJzvtz4M6W6OJR4iRbBTUGrKReV2dhVePPjbH/HRkRY6f6J6cEM9+qM2I3QABmaCXeAM3hWvnWU9hjalQQ==
+ dependencies:
+ "@ckb-lumos/base" "0.23.0"
+ "@ckb-lumos/bi" "0.23.0"
+ "@ckb-lumos/codec" "0.23.0"
+ "@ckb-lumos/rpc" "0.23.0"
+ "@ckb-lumos/toolkit" "0.23.0"
cross-fetch "^3.1.5"
events "^3.3.0"
-"@ckb-lumos/codec@0.21.1", "@ckb-lumos/codec@^0.21.0-next.0":
- version "0.21.1"
- resolved "https://registry.yarnpkg.com/@ckb-lumos/codec/-/codec-0.21.1.tgz#160f21efa0cded6ea461eb6476f9af6010b682e0"
- integrity sha512-z6IUUxVZrx663iC7VM9CmaQZL8jsdM3ybgz0UCS24JgBXTNec+Uz0/Zrl7yeH6fBpVls44C2wObcHKigKaNVAA==
- dependencies:
- "@ckb-lumos/bi" "0.21.1"
-
-"@ckb-lumos/common-scripts@0.21.1", "@ckb-lumos/common-scripts@^0.21.0-next.0":
- version "0.21.1"
- resolved "https://registry.yarnpkg.com/@ckb-lumos/common-scripts/-/common-scripts-0.21.1.tgz#64776b5ce55d8c66898a3ab592c7f77fe13d865e"
- integrity sha512-EfZQ9wdxPmEsxVVwtBjhpZVKbYCm1FJkMt59ABsIO1Ub7yi0qap7AQl0MMbuLwWIGKwS2w0U3wx/oJPm7z1RXg==
- dependencies:
- "@ckb-lumos/base" "0.21.1"
- "@ckb-lumos/bi" "0.21.1"
- "@ckb-lumos/codec" "0.21.1"
- "@ckb-lumos/config-manager" "0.21.1"
- "@ckb-lumos/helpers" "0.21.1"
- "@ckb-lumos/rpc" "0.21.1"
- "@ckb-lumos/toolkit" "0.21.1"
+"@ckb-lumos/codec@0.23.0", "@ckb-lumos/codec@^0.21.0-next.0":
+ version "0.23.0"
+ resolved "https://registry.yarnpkg.com/@ckb-lumos/codec/-/codec-0.23.0.tgz#abc8c2da95931859d3347608af4b461d27c5daff"
+ integrity sha512-FwYooXnsFDjlHHnlFnCTB1UbBzV72I0VjkRpeauFk5nQ4+/75xl28ywK3J14M+0aHTnYU9msXUTRDAGqC0CaNQ==
+ dependencies:
+ "@ckb-lumos/bi" "0.23.0"
+
+"@ckb-lumos/common-scripts@0.23.0", "@ckb-lumos/common-scripts@^0.21.0-next.0":
+ version "0.23.0"
+ resolved "https://registry.yarnpkg.com/@ckb-lumos/common-scripts/-/common-scripts-0.23.0.tgz#ccb04214ca7186829036ddcbb0dc1b5326127a90"
+ integrity sha512-Dwic0Al94afdGNu+TGAMmZiU5OVF/zvXbzhCvNmkFS25t8BxPdFjGEc0MlWBI4ZSEoGRrC0O+BOxjzfl5VxSYg==
+ dependencies:
+ "@ckb-lumos/base" "0.23.0"
+ "@ckb-lumos/bi" "0.23.0"
+ "@ckb-lumos/codec" "0.23.0"
+ "@ckb-lumos/config-manager" "0.23.0"
+ "@ckb-lumos/helpers" "0.23.0"
+ "@ckb-lumos/rpc" "0.23.0"
+ "@ckb-lumos/toolkit" "0.23.0"
+ bech32 "^2.0.0"
+ bs58 "^5.0.0"
immutable "^4.3.0"
-"@ckb-lumos/config-manager@0.21.1", "@ckb-lumos/config-manager@^0.21.0-next.0":
- version "0.21.1"
- resolved "https://registry.yarnpkg.com/@ckb-lumos/config-manager/-/config-manager-0.21.1.tgz#857050ebf2ca38096d8fae26b6a8927164798ca3"
- integrity sha512-BmrNqYyaksdCKHWagyC8+R8GUxhIO+sOM5S925jlkpjju2sUbH0Id2/zmdb7I9KxdKnbx3WsR+hqy7/bYqw1lA==
+"@ckb-lumos/config-manager@0.23.0", "@ckb-lumos/config-manager@^0.21.0-next.0":
+ version "0.23.0"
+ resolved "https://registry.yarnpkg.com/@ckb-lumos/config-manager/-/config-manager-0.23.0.tgz#93a607f7857c9a24fae86735e29f1ca40ee34fb5"
+ integrity sha512-MvNyzGIJTmIpEf5WJB3TkE4icZyZ2HZhFIfJB2SXDRAC84E02jxENPelCnqRbM1rlFHnxjh/5a/oCi5LcXefag==
dependencies:
- "@ckb-lumos/base" "0.21.1"
- "@ckb-lumos/bi" "0.21.1"
- "@ckb-lumos/codec" "0.21.1"
+ "@ckb-lumos/base" "0.23.0"
+ "@ckb-lumos/bi" "0.23.0"
+ "@ckb-lumos/codec" "0.23.0"
+ "@ckb-lumos/rpc" "0.23.0"
"@types/deep-freeze-strict" "^1.1.0"
deep-freeze-strict "^1.1.1"
-"@ckb-lumos/hd@0.21.1":
- version "0.21.1"
- resolved "https://registry.yarnpkg.com/@ckb-lumos/hd/-/hd-0.21.1.tgz#406026ac2b570f72b4407149cb941d09bb8a0ab6"
- integrity sha512-BnfpJf/sx/dJzL5BrOxPeKbKgv2x74KWd0xwjw1/gBQ2IMhu0S1mLwFsOT3Zu2nuhpQYvZGvr0cd3vD/SoMDow==
+"@ckb-lumos/hd@0.23.0":
+ version "0.23.0"
+ resolved "https://registry.yarnpkg.com/@ckb-lumos/hd/-/hd-0.23.0.tgz#97ddf6e291bdb44b7b8d61bcf437c3a1b17d0182"
+ integrity sha512-z7EsR/GeX54hq4ukqwW3nrqLCsYrTWIFAjZLR1Ao8xycqQp0IBjCWZLLjRrZY6krbUQpVOoiKo3NBLpPW36LXg==
dependencies:
- "@ckb-lumos/base" "0.21.1"
- "@ckb-lumos/bi" "0.21.1"
+ "@ckb-lumos/base" "0.23.0"
+ "@ckb-lumos/bi" "0.23.0"
bn.js "^5.1.3"
elliptic "^6.5.4"
scrypt-js "^3.0.1"
sha3 "^2.1.3"
uuid "^8.3.0"
-"@ckb-lumos/helpers@0.21.1":
- version "0.21.1"
- resolved "https://registry.yarnpkg.com/@ckb-lumos/helpers/-/helpers-0.21.1.tgz#fffd455071f51556b2cd2539a255b3759893da08"
- integrity sha512-jFN6DtWzwVNEY4kmnzczRaQqtyRJQwzAEuHRUQ0LqTiIGM+SlfgjH/l/InAG4cIhDOurMudnUJ4ex68wmbkhVw==
- dependencies:
- "@ckb-lumos/base" "0.21.1"
- "@ckb-lumos/bi" "0.21.1"
- "@ckb-lumos/codec" "0.21.1"
- "@ckb-lumos/config-manager" "0.21.1"
- "@ckb-lumos/toolkit" "0.21.1"
+"@ckb-lumos/helpers@0.23.0":
+ version "0.23.0"
+ resolved "https://registry.yarnpkg.com/@ckb-lumos/helpers/-/helpers-0.23.0.tgz#095a6d4752d756287cfbee0360c614d27a5f71f3"
+ integrity sha512-yfD28vSn1BBk8BA+/ivL7pF3rMsx4OPQ+UUJjsQiR1zGdkNR3zhJOecgICeddJGYDTBBDVgwHcuyoekLxQzmGg==
+ dependencies:
+ "@ckb-lumos/base" "0.23.0"
+ "@ckb-lumos/bi" "0.23.0"
+ "@ckb-lumos/codec" "0.23.0"
+ "@ckb-lumos/config-manager" "0.23.0"
+ "@ckb-lumos/toolkit" "0.23.0"
bech32 "^2.0.0"
immutable "^4.3.0"
-"@ckb-lumos/lumos@^0.21.0-next.0":
- version "0.21.1"
- resolved "https://registry.yarnpkg.com/@ckb-lumos/lumos/-/lumos-0.21.1.tgz#ff5a9a10859b305530026668bd14cdc12e5e7532"
- integrity sha512-a5n8xaIUvmaPsw2fBki8Jamy6/6uQnLWDZM9SQX29cZ1YVoAk/slnBmEbCIGXmxDhcuAlLkTeJaiLDKEGrZ6pg==
- dependencies:
- "@ckb-lumos/base" "0.21.1"
- "@ckb-lumos/bi" "0.21.1"
- "@ckb-lumos/ckb-indexer" "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/toolkit" "0.21.1"
-
-"@ckb-lumos/rpc@0.21.1", "@ckb-lumos/rpc@^0.21.0-next.0":
- version "0.21.1"
- resolved "https://registry.yarnpkg.com/@ckb-lumos/rpc/-/rpc-0.21.1.tgz#f6a6b3ed6d76adfb84c148e4b4acadb7fbaa7d7a"
- integrity sha512-gZWXYCyQ98s84Pb+buOiYL3HOIxQPLHQdCyo96GFerNw9lB1XsbaGWzfHPYpZvOQqYtnJ1GUfTkQkADrQ7hmew==
- dependencies:
- "@ckb-lumos/base" "0.21.1"
- "@ckb-lumos/bi" "0.21.1"
+"@ckb-lumos/light-client@0.23.0":
+ version "0.23.0"
+ resolved "https://registry.yarnpkg.com/@ckb-lumos/light-client/-/light-client-0.23.0.tgz#093f28d4183971f1212241271e7b23bad9909689"
+ integrity sha512-O+dbfubDjl0iODiQ8Q+RVJLfuXYNCN6c0am8xEv4vvazLwfw1y/vn6fG/pFu9Mc1GahZ58y9o6fkUgs8ujH3Mg==
+ dependencies:
+ "@ckb-lumos/base" "0.23.0"
+ "@ckb-lumos/ckb-indexer" "0.23.0"
+ "@ckb-lumos/rpc" "0.23.0"
+ cross-fetch "^3.1.5"
+ events "^3.3.0"
+
+"@ckb-lumos/lumos@0.23.0", "@ckb-lumos/lumos@^0.21.0-next.0":
+ version "0.23.0"
+ resolved "https://registry.yarnpkg.com/@ckb-lumos/lumos/-/lumos-0.23.0.tgz#638b4780a990f42059f86c3e4e33cbd7e6557782"
+ integrity sha512-ocsmzgTgevVwyQeQkUZrg4PLJCfX48D5MEBNYTMoGh5b1g0f1iEBHcAgw4WBGOKgMJQmGRmWB5P6tPDZ3OZBwQ==
+ dependencies:
+ "@ckb-lumos/base" "0.23.0"
+ "@ckb-lumos/bi" "0.23.0"
+ "@ckb-lumos/ckb-indexer" "0.23.0"
+ "@ckb-lumos/codec" "0.23.0"
+ "@ckb-lumos/common-scripts" "0.23.0"
+ "@ckb-lumos/config-manager" "0.23.0"
+ "@ckb-lumos/hd" "0.23.0"
+ "@ckb-lumos/helpers" "0.23.0"
+ "@ckb-lumos/light-client" "0.23.0"
+ "@ckb-lumos/rpc" "0.23.0"
+ "@ckb-lumos/toolkit" "0.23.0"
+ "@ckb-lumos/transaction-manager" "0.23.0"
+
+"@ckb-lumos/rpc@0.23.0", "@ckb-lumos/rpc@^0.21.0-next.0":
+ version "0.23.0"
+ resolved "https://registry.yarnpkg.com/@ckb-lumos/rpc/-/rpc-0.23.0.tgz#e17bd281e62e17957db80459e6be25d0c64bbb59"
+ integrity sha512-NEY1Wb2cNMYdHwcZYtd8XZ3CP6WGPd25hcsudoDAFlAt9vjHsPlNiwSS7tcZCZfg1XiJy3taViVgG8pFemgpbA==
+ dependencies:
+ "@ckb-lumos/base" "0.23.0"
+ "@ckb-lumos/bi" "0.23.0"
abort-controller "^3.0.0"
cross-fetch "^3.1.5"
-"@ckb-lumos/toolkit@0.21.1":
- version "0.21.1"
- resolved "https://registry.yarnpkg.com/@ckb-lumos/toolkit/-/toolkit-0.21.1.tgz#bcf4bf05615375087e3dd02fb087b797a8c67f37"
- integrity sha512-awrFos7uQXEVGbqKSv/8Fc8B8XAfxdYoyYak4zFyAAmxxA0NiTTvk9V8TsOA7zVXpxct4Jal22+qUe+4Jg8T/g==
+"@ckb-lumos/toolkit@0.23.0":
+ version "0.23.0"
+ resolved "https://registry.yarnpkg.com/@ckb-lumos/toolkit/-/toolkit-0.23.0.tgz#4f5d25ea4292bd77dfc191506984ffc2c38078f7"
+ integrity sha512-7LTsUFfoNCBWJLgh+V/QFnemjGw+y4mmLeQvubwYuJqIPIhIpwKUuKRzkvVG8snA8xVQSfjSSQOs5m3mKp66Kg==
dependencies:
- "@ckb-lumos/bi" "0.21.1"
+ "@ckb-lumos/bi" "0.23.0"
+
+"@ckb-lumos/transaction-manager@0.23.0":
+ version "0.23.0"
+ resolved "https://registry.yarnpkg.com/@ckb-lumos/transaction-manager/-/transaction-manager-0.23.0.tgz#2e90d7f0fe5613fd594a7f0b7a2a48c3336b98dd"
+ integrity sha512-sfwt2g8JlYxr5jRx5r/UZNffTpkwn3sh4dD2THzKmX0S1CsSgww2D1ZD7yruWwSu05ZLKlDPFVKyJ50tNc3LuQ==
+ dependencies:
+ "@ckb-lumos/base" "0.23.0"
+ "@ckb-lumos/ckb-indexer" "0.23.0"
+ "@ckb-lumos/codec" "0.23.0"
+ "@ckb-lumos/rpc" "0.23.0"
+ "@ckb-lumos/toolkit" "0.23.0"
+ immutable "^4.3.0"
"@cnakazawa/watch@^1.0.3":
version "1.0.4"
@@ -2254,6 +2283,13 @@
resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
+"@cspotcode/source-map-support@^0.8.0":
+ version "0.8.1"
+ resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+ integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
+ dependencies:
+ "@jridgewell/trace-mapping" "0.3.9"
+
"@csstools/normalize.css@*":
version "12.0.0"
resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-12.0.0.tgz#a9583a75c3f150667771f30b60d9f059473e62c4"
@@ -2411,10 +2447,10 @@
fs-extra "^9.0.1"
promise-retry "^2.0.1"
-"@electron/notarize@2.2.0":
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.2.0.tgz#40455f9d8ca8098a74567aa4613b709089d82657"
- integrity sha512-Sf7RG47rafeGuUm+kLEbTXMN8XZeYXN70dMBstrcgiykxCq3SLl1uqxFWndxSI1LfMqv4Eq9PTDHLPwiya31Kg==
+"@electron/notarize@2.3.2":
+ version "2.3.2"
+ resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.3.2.tgz#20a52a961747be8542a35003380988a0d3fe15e6"
+ integrity sha512-zfayxCe19euNwRycCty1C7lF7snk9YwfRpB5M8GLr1a4ICH63znxaPNAubrMvj0yDvVozqfgsdYpXVUnpWBDpg==
dependencies:
debug "^4.1.1"
fs-extra "^9.0.1"
@@ -2622,11 +2658,6 @@
resolved "https://registry.yarnpkg.com/@fal-works/esbuild-plugin-global-externals/-/esbuild-plugin-global-externals-2.1.2.tgz#c05ed35ad82df8e6ac616c68b92c2282bd083ba4"
integrity sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ==
-"@fastify/busboy@^2.0.0":
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.0.0.tgz#f22824caff3ae506b18207bad4126dbc6ccdb6b8"
- integrity sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==
-
"@floating-ui/core@^1.4.2":
version "1.5.2"
resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.5.2.tgz#53a0f7a98c550e63134d504f26804f6b83dbc071"
@@ -2814,6 +2845,11 @@
wrap-ansi "^8.1.0"
wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
+"@isaacs/string-locale-compare@^1.1.0":
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
+ integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==
+
"@istanbuljs/load-nyc-config@^1.0.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
@@ -3152,6 +3188,11 @@
resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+"@jridgewell/resolve-uri@^3.0.3":
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+ integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
+
"@jridgewell/set-array@^1.0.1":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
@@ -3175,6 +3216,14 @@
resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+"@jridgewell/trace-mapping@0.3.9":
+ version "0.3.9"
+ resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
+ integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
+ dependencies:
+ "@jridgewell/resolve-uri" "^3.0.3"
+ "@jridgewell/sourcemap-codec" "^1.4.10"
+
"@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
version "0.3.18"
resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
@@ -3277,71 +3326,76 @@
resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
-"@lerna/create@8.0.1":
- version "8.0.1"
- resolved "https://registry.yarnpkg.com/@lerna/create/-/create-8.0.1.tgz#cc0ab19163c67269552292d95f23568468fa9921"
- integrity sha512-PDYNUF8Nv5j7DbGvVbizEuYuQbNFZ0+wVOtRPvBQOkC2dMNryi3dJjktEd1QeDX6Wa/JkJWvZ5SMHyr+7H3Rtg==
+"@lerna/create@8.1.5":
+ version "8.1.5"
+ resolved "https://registry.yarnpkg.com/@lerna/create/-/create-8.1.5.tgz#596cb9e4d36586c785d21abbf08a6a7eb9191865"
+ integrity sha512-Ku8yTGgeumayvMr8sml72EPb6WaoJhRjMTkMZrKSJtcLNDBlDpKwyUxDxNTBNBRUYWUuJCnj7eUH7pDNuc9odQ==
dependencies:
- "@npmcli/run-script" "7.0.2"
- "@nx/devkit" ">=17.1.2 < 18"
+ "@npmcli/arborist" "7.5.3"
+ "@npmcli/package-json" "5.2.0"
+ "@npmcli/run-script" "8.1.0"
+ "@nx/devkit" ">=17.1.2 < 20"
"@octokit/plugin-enterprise-rest" "6.0.1"
"@octokit/rest" "19.0.11"
+ aproba "2.0.0"
byte-size "8.1.1"
chalk "4.1.0"
clone-deep "4.0.1"
- cmd-shim "6.0.1"
+ cmd-shim "6.0.3"
+ color-support "1.1.3"
columnify "1.6.0"
+ console-control-strings "^1.1.0"
conventional-changelog-core "5.0.1"
conventional-recommended-bump "7.0.1"
cosmiconfig "^8.2.0"
- dedent "0.7.0"
+ dedent "1.5.3"
execa "5.0.0"
- fs-extra "^11.1.1"
+ fs-extra "^11.2.0"
get-stream "6.0.0"
- git-url-parse "13.1.0"
- glob-parent "5.1.2"
+ git-url-parse "14.0.0"
+ glob-parent "6.0.2"
globby "11.1.0"
graceful-fs "4.2.11"
has-unicode "2.0.1"
ini "^1.3.8"
- init-package-json "5.0.0"
+ init-package-json "6.0.3"
inquirer "^8.2.4"
is-ci "3.0.1"
is-stream "2.0.0"
js-yaml "4.1.0"
- libnpmpublish "7.3.0"
+ libnpmpublish "9.0.9"
load-json-file "6.2.0"
lodash "^4.17.21"
make-dir "4.0.0"
minimatch "3.0.5"
multimatch "5.0.0"
node-fetch "2.6.7"
- npm-package-arg "8.1.1"
- npm-packlist "5.1.1"
- npm-registry-fetch "^14.0.5"
- npmlog "^6.0.2"
- nx ">=17.1.2 < 18"
+ npm-package-arg "11.0.2"
+ npm-packlist "8.0.2"
+ npm-registry-fetch "^17.1.0"
+ nx ">=17.1.2 < 20"
p-map "4.0.0"
p-map-series "2.1.0"
p-queue "6.6.2"
p-reduce "^2.1.0"
- pacote "^17.0.5"
+ pacote "^18.0.6"
pify "5.0.0"
read-cmd-shim "4.0.0"
- read-package-json "6.0.4"
resolve-from "5.0.0"
rimraf "^4.4.1"
semver "^7.3.4"
+ set-blocking "^2.0.0"
signal-exit "3.0.7"
slash "^3.0.0"
- ssri "^9.0.1"
+ ssri "^10.0.6"
strong-log-transformer "2.1.0"
- tar "6.1.11"
+ tar "6.2.1"
temp-dir "1.0.0"
upath "2.0.1"
- uuid "^9.0.0"
+ uuid "^10.0.0"
validate-npm-package-license "^3.0.4"
- validate-npm-package-name "5.0.0"
+ validate-npm-package-name "5.0.1"
+ wide-align "1.1.5"
write-file-atomic "5.0.1"
write-pkg "4.0.0"
yargs "17.7.2"
@@ -3401,10 +3455,10 @@
pump "^3.0.0"
tar-fs "^2.1.1"
-"@nervosnetwork/ckb-types@0.109.0":
- version "0.109.0"
- resolved "https://registry.yarnpkg.com/@nervosnetwork/ckb-types/-/ckb-types-0.109.0.tgz#efcd1d96f1d3e21b20bb0c9d38e80b83e90ef827"
- integrity sha512-ZB3zpotHP8KDTex9Jxv7vi3sxVEqWijQjDmNA9laIEk01aoKVMyBZ09ByKuU46/88qgjmDsu3Ob7HqGaoFVtKQ==
+"@nervosnetwork/ckb-types@0.109.1":
+ version "0.109.1"
+ resolved "https://registry.yarnpkg.com/@nervosnetwork/ckb-types/-/ckb-types-0.109.1.tgz#1e8b0abe0ae0227306d6a3f65cb670bcd4cf276f"
+ integrity sha512-mD5mOCGa1JertKZekHSUVYwFPW27VJ0/MdwblWvEEK7pNIU6az+dLiIxgvl4TxR+j+7/GqmXNH1U59CM92y/wg==
"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
version "5.1.1-v1"
@@ -3445,6 +3499,47 @@
lru-cache "^10.0.1"
socks-proxy-agent "^8.0.1"
+"@npmcli/arborist@7.5.3":
+ version "7.5.3"
+ resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-7.5.3.tgz#88c51b124a1ec48d358897778af6ab5b0e05694d"
+ integrity sha512-7gbMdDNSYUzi0j2mpb6FoXRg3BxXWplMQZH1MZlvNjSdWFObaUz2Ssvo0Nlh2xmWks1OPo+gpsE6qxpT/5M7lQ==
+ dependencies:
+ "@isaacs/string-locale-compare" "^1.1.0"
+ "@npmcli/fs" "^3.1.1"
+ "@npmcli/installed-package-contents" "^2.1.0"
+ "@npmcli/map-workspaces" "^3.0.2"
+ "@npmcli/metavuln-calculator" "^7.1.1"
+ "@npmcli/name-from-folder" "^2.0.0"
+ "@npmcli/node-gyp" "^3.0.0"
+ "@npmcli/package-json" "^5.1.0"
+ "@npmcli/query" "^3.1.0"
+ "@npmcli/redact" "^2.0.0"
+ "@npmcli/run-script" "^8.1.0"
+ bin-links "^4.0.4"
+ cacache "^18.0.3"
+ common-ancestor-path "^1.0.1"
+ hosted-git-info "^7.0.2"
+ json-parse-even-better-errors "^3.0.2"
+ json-stringify-nice "^1.1.4"
+ lru-cache "^10.2.2"
+ minimatch "^9.0.4"
+ nopt "^7.2.1"
+ npm-install-checks "^6.2.0"
+ npm-package-arg "^11.0.2"
+ npm-pick-manifest "^9.0.1"
+ npm-registry-fetch "^17.0.1"
+ pacote "^18.0.6"
+ parse-conflict-json "^3.0.0"
+ proc-log "^4.2.0"
+ proggy "^2.0.0"
+ promise-all-reject-late "^1.0.0"
+ promise-call-limit "^3.0.1"
+ read-package-json-fast "^3.0.2"
+ semver "^7.3.7"
+ ssri "^10.0.6"
+ treeverse "^3.0.0"
+ walk-up-path "^3.0.1"
+
"@npmcli/fs@^1.0.0":
version "1.1.1"
resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
@@ -3460,6 +3555,13 @@
dependencies:
semver "^7.3.5"
+"@npmcli/fs@^3.1.1":
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.1.tgz#59cdaa5adca95d135fc00f2bb53f5771575ce726"
+ integrity sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==
+ dependencies:
+ semver "^7.3.5"
+
"@npmcli/git@^5.0.0":
version "5.0.3"
resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-5.0.3.tgz#ad3ede0994bcf716ddb63d361f3ea16cb72d878c"
@@ -3482,6 +3584,35 @@
npm-bundled "^3.0.0"
npm-normalize-package-bin "^3.0.0"
+"@npmcli/installed-package-contents@^2.1.0":
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz#63048e5f6e40947a3a88dcbcb4fd9b76fdd37c17"
+ integrity sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==
+ dependencies:
+ npm-bundled "^3.0.0"
+ npm-normalize-package-bin "^3.0.0"
+
+"@npmcli/map-workspaces@^3.0.2":
+ version "3.0.6"
+ resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-3.0.6.tgz#27dc06c20c35ef01e45a08909cab9cb3da08cea6"
+ integrity sha512-tkYs0OYnzQm6iIRdfy+LcLBjcKuQCeE5YLb8KnrIlutJfheNaPvPpgoFEyEFgbjzl5PLZ3IA/BWAwRU0eHuQDA==
+ dependencies:
+ "@npmcli/name-from-folder" "^2.0.0"
+ glob "^10.2.2"
+ minimatch "^9.0.0"
+ read-package-json-fast "^3.0.0"
+
+"@npmcli/metavuln-calculator@^7.1.1":
+ version "7.1.1"
+ resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-7.1.1.tgz#4d3b6c3192f72bc8ad59476de0da939c33877fcf"
+ integrity sha512-Nkxf96V0lAx3HCpVda7Vw4P23RILgdi/5K1fmj2tZkWIYLpXAN8k2UVVOsW16TsS5F8Ws2I7Cm+PU1/rsVF47g==
+ dependencies:
+ cacache "^18.0.0"
+ json-parse-even-better-errors "^3.0.0"
+ pacote "^18.0.0"
+ proc-log "^4.1.0"
+ semver "^7.3.5"
+
"@npmcli/move-file@^1.0.1":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
@@ -3490,11 +3621,29 @@
mkdirp "^1.0.4"
rimraf "^3.0.2"
+"@npmcli/name-from-folder@^2.0.0":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@npmcli/name-from-folder/-/name-from-folder-2.0.0.tgz#c44d3a7c6d5c184bb6036f4d5995eee298945815"
+ integrity sha512-pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg==
+
"@npmcli/node-gyp@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz#101b2d0490ef1aa20ed460e4c0813f0db560545a"
integrity sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==
+"@npmcli/package-json@5.2.0", "@npmcli/package-json@^5.0.0", "@npmcli/package-json@^5.1.0":
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-5.2.0.tgz#a1429d3111c10044c7efbfb0fce9f2c501f4cfad"
+ integrity sha512-qe/kiqqkW0AGtvBjL8TJKZk/eBBSpnJkUWvHdQ9jM2lKHXRYYJuyNpJPlJw3c8QjC2ow6NZYiLExhUaeJelbxQ==
+ dependencies:
+ "@npmcli/git" "^5.0.0"
+ glob "^10.2.2"
+ hosted-git-info "^7.0.0"
+ json-parse-even-better-errors "^3.0.0"
+ normalize-package-data "^6.0.0"
+ proc-log "^4.0.0"
+ semver "^7.5.3"
+
"@npmcli/promise-spawn@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-7.0.0.tgz#fd1c64ed4ff2341e503e1f390c62640a6540df09"
@@ -3502,94 +3651,109 @@
dependencies:
which "^4.0.0"
-"@npmcli/run-script@7.0.2", "@npmcli/run-script@^7.0.0":
- version "7.0.2"
- resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-7.0.2.tgz#497e7f058799497889df65900c711312252276d3"
- integrity sha512-Omu0rpA8WXvcGeY6DDzyRoY1i5DkCBkzyJ+m2u7PD6quzb0TvSqdIPOkTn8ZBOj7LbbcbMfZ3c5skwSu6m8y2w==
+"@npmcli/query@^3.1.0":
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/@npmcli/query/-/query-3.1.0.tgz#bc202c59e122a06cf8acab91c795edda2cdad42c"
+ integrity sha512-C/iR0tk7KSKGldibYIB9x8GtO/0Bd0I2mhOaDb8ucQL/bQVTmGoeREaFj64Z5+iCBRf3dQfed0CjJL7I8iTkiQ==
+ dependencies:
+ postcss-selector-parser "^6.0.10"
+
+"@npmcli/redact@^2.0.0":
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/@npmcli/redact/-/redact-2.0.1.tgz#95432fd566e63b35c04494621767a4312c316762"
+ integrity sha512-YgsR5jCQZhVmTJvjduTOIHph0L73pK8xwMVaDY0PatySqVM9AZj93jpoXYSJqfHFxFkN9dmqTw6OiqExsS3LPw==
+
+"@npmcli/run-script@8.1.0", "@npmcli/run-script@^8.0.0", "@npmcli/run-script@^8.1.0":
+ version "8.1.0"
+ resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-8.1.0.tgz#a563e5e29b1ca4e648a6b1bbbfe7220b4bfe39fc"
+ integrity sha512-y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg==
dependencies:
"@npmcli/node-gyp" "^3.0.0"
+ "@npmcli/package-json" "^5.0.0"
"@npmcli/promise-spawn" "^7.0.0"
node-gyp "^10.0.0"
- read-package-json-fast "^3.0.0"
+ proc-log "^4.0.0"
which "^4.0.0"
-"@nrwl/devkit@17.2.6":
- version "17.2.6"
- resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-17.2.6.tgz#ab283bc16fde0b3c4a73ce59c1364b89d9b73468"
- integrity sha512-uZVqc2qhi+WdSqLV9aIcE+5ck+IUSQ47Cc5bslWrssQjBncqGavHYDuU4ZLuKK5HxCuZqlQjvo7TsF7LeOjNiA==
+"@nrwl/devkit@19.3.1":
+ version "19.3.1"
+ resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-19.3.1.tgz#7e7a59434547cdb4f074359c576cf920b50fe7b0"
+ integrity sha512-SUS4P+yOwqGIZYlGMiHyU8Lav6ofal77cNTHuI5g/tHjewA6oSoi7xlrsJpzT6F5dtsoTtrilStfOIp50HkOLw==
dependencies:
- "@nx/devkit" "17.2.6"
+ "@nx/devkit" "19.3.1"
-"@nrwl/tao@17.2.6":
- version "17.2.6"
- resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-17.2.6.tgz#eab09ad1c5751e4310bb8c21796e25df1e8310b1"
- integrity sha512-cgtUKTRSxDZ94S9IpC27/qYZJ1YttJDET+veKrtRYvwnHFgkq1peyeTTtnM25yJon7PRdm2lYrlIVdPm0vXupw==
+"@nrwl/tao@19.3.1":
+ version "19.3.1"
+ resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-19.3.1.tgz#df5e799d4324fbbf76291c4d178861d1ae8e0cd3"
+ integrity sha512-K3VqTNwJ5/4vAaExIVmESWnQgO95MiJEgo+OzkmfkFvYTCOH2006OwvgCJFTQdjyONJ8Ao/lUPrHSDfsoevSeA==
dependencies:
- nx "17.2.6"
+ nx "19.3.1"
tslib "^2.3.0"
-"@nx/devkit@17.2.6", "@nx/devkit@>=17.1.2 < 18":
- version "17.2.6"
- resolved "https://registry.yarnpkg.com/@nx/devkit/-/devkit-17.2.6.tgz#e65d8386ca7467d49de2193bc963a78561134623"
- integrity sha512-a9GPw0KiLhvv2RBLPlWgaVDZRvgww4ANBwv7LuGvk8FNgxF5vkQMM5WyKpvxKJhmh1EZ+T9JsGWAFrK7skW9Bw==
+"@nx/devkit@19.3.1", "@nx/devkit@>=17.1.2 < 20":
+ version "19.3.1"
+ resolved "https://registry.yarnpkg.com/@nx/devkit/-/devkit-19.3.1.tgz#f398fc9061ac9cb3537f6cb77c92e214ad677fa6"
+ integrity sha512-sMMPGy6xivhipajvyfR96RMDJiKdmhIRgRxAVW298nKSKwrkRrxW48EtxYqUtI8MZkUPQigNVvqN8fyZ/gE7CA==
dependencies:
- "@nrwl/devkit" "17.2.6"
+ "@nrwl/devkit" "19.3.1"
ejs "^3.1.7"
enquirer "~2.3.6"
ignore "^5.0.4"
- semver "7.5.3"
+ minimatch "9.0.3"
+ semver "^7.5.3"
tmp "~0.2.1"
tslib "^2.3.0"
+ yargs-parser "21.1.1"
-"@nx/nx-darwin-arm64@17.2.6":
- version "17.2.6"
- resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-17.2.6.tgz#8f5a4cc579158388ec98e0bf26996d9c0457da00"
- integrity sha512-ezU5u7hkEwI2xzsFSjyr53uNURBvga40LQlpEnS/CbqRifHHhTKisCy+r2+kRhiOwTeR+I+/2D3zPyIyN3aEHQ==
-
-"@nx/nx-darwin-x64@17.2.6":
- version "17.2.6"
- resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-17.2.6.tgz#4ca7b4fb5ab03b786d8bcdfb9e5780abd1f31faf"
- integrity sha512-wUIwbM/7LMxlFkEOlbxR/s2qaRuD69yXc70f2rtxsskwJ4GOF5kfc1jk2YaDs9qswI+FgQVgbeZu8pgF+slY7Q==
-
-"@nx/nx-freebsd-x64@17.2.6":
- version "17.2.6"
- resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-17.2.6.tgz#59e0189d14f9b021644b123c16315ba1e09a808b"
- integrity sha512-uBKEGqG4txVCpBirRzt1QwuOLzfA0s9dlUP7n5t4qJuaf9OXuVcDXay8g84WT1jx4PPtipyv/wyIFu3r7v8kZw==
-
-"@nx/nx-linux-arm-gnueabihf@17.2.6":
- version "17.2.6"
- resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-17.2.6.tgz#e1bebfb4bf8e24b7d4f2072bde077de988317461"
- integrity sha512-dSDVz2BktaPHMkrJojFCx+V+QFLDF0KzoHorESzZmHZTfumr0xtJ1COWCU+gYmLptc+8OgwCzCPWXHhcDgji/A==
-
-"@nx/nx-linux-arm64-gnu@17.2.6":
- version "17.2.6"
- resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-17.2.6.tgz#b830f581ab5afc2ae30ec2f8bd27a750c1a66753"
- integrity sha512-AD99Kk47Yxn3IJ89aCT1oVpNX1XNECAYay97yhqf2tiBsDv9hC43PppOdjI0dNP5VRBTrr6EsWdhvE0uNJ3RJw==
-
-"@nx/nx-linux-arm64-musl@17.2.6":
- version "17.2.6"
- resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-17.2.6.tgz#c3865d4386097190f3c7fd1840999e3cc6fbb8cf"
- integrity sha512-MOX/EJyzseEnzbFxY7V6es/xta6WQ0cDDrl6i6qjCRnoRTFFVMsL0Fb4dtVbv7fd75O41P+OBGpG70MYx2SOxw==
-
-"@nx/nx-linux-x64-gnu@17.2.6":
- version "17.2.6"
- resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-17.2.6.tgz#3520364998256a628a861ad1427754504fc585a6"
- integrity sha512-16xTSszGPY25INDUr4pzLXWcO3va1764iVFiHRTuJr5siDymY7zSj+DPKFmewzqF2358Y5m8AtMotY0FqKciYg==
-
-"@nx/nx-linux-x64-musl@17.2.6":
- version "17.2.6"
- resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-17.2.6.tgz#f3c89d7d5c5336735bf31eb2ae0dd2e5ab6a9f25"
- integrity sha512-F/nIq8bcZd2cNuBiQbyJwur7CpeRBCt0qKDF38HQ2l3HhQv+jwk4T6115LMQqwZb9e6kt6BAFsY+6O7I6t3pCw==
-
-"@nx/nx-win32-arm64-msvc@17.2.6":
- version "17.2.6"
- resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-17.2.6.tgz#1e432cdbf55ba816d04fec776227e7d459dc4cc4"
- integrity sha512-1lAKKKiH7eduzqcPDB03iPz38yNXn3Y4Q/3jULjaRc3EFAplfBsYVwJ9kGjXPZSrpt/AY7w5ATY55/r5B3gQnA==
-
-"@nx/nx-win32-x64-msvc@17.2.6":
- version "17.2.6"
- resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-17.2.6.tgz#07fde42a0fe1f8f103aa7afd1db83cb76a72951f"
- integrity sha512-LrJySMWrO5oWMrP4VOWM1hr3c4rtxHGCcRy19VwqvaAPDrnsg0qfPjv4q1C9YyIU8sj+T3oJs1yZdnNntlN8ew==
+"@nx/nx-darwin-arm64@19.3.1":
+ version "19.3.1"
+ resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-19.3.1.tgz#9301858d0c956e568aae8d6ede37c1ca34d28f36"
+ integrity sha512-B8kpnfBBJJE4YfSvpNPNdKLi63cyd41dZJRePkBrW/7Va/wUiHuKoyAEQZEI2WmH9ZM3RNmw7dp5vESr05Sw5g==
+
+"@nx/nx-darwin-x64@19.3.1":
+ version "19.3.1"
+ resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-19.3.1.tgz#b23e6d85a8f127c61ee7e8bd051ba8edf0b623de"
+ integrity sha512-XKY76oi7hLQAKZzGlEsqPxNWx7BOS8E801CA9k+hKNVqNJdD6Vz/1hkhzKo/TwBrPkyhdvrq+BqBMLS7ZDefKw==
+
+"@nx/nx-freebsd-x64@19.3.1":
+ version "19.3.1"
+ resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-19.3.1.tgz#047232cf283990674b2f8b51192fb0829b632a06"
+ integrity sha512-ZXDmzosPEq1DKC9r7UxPxF9I2GE11TmmYePcwN2xE1/you9+NUd14+SVW/jh/uH1j1n/41w0g35oNA6X0U+fGw==
+
+"@nx/nx-linux-arm-gnueabihf@19.3.1":
+ version "19.3.1"
+ resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-19.3.1.tgz#da9056b13b9b6d016fcbfd9e7766e3098ef2db17"
+ integrity sha512-2Ls+08J14BmkHpkQ6DhHGdW97IcY3vvqmuwogTBrt5ATmJIim3o/O4Kp4Sq+uuotf0kae0NP986BuoFw/WW/xg==
+
+"@nx/nx-linux-arm64-gnu@19.3.1":
+ version "19.3.1"
+ resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-19.3.1.tgz#0b659694d81070c830303e43254cc9c382569e17"
+ integrity sha512-+UbThXaqKmctAavcwdYxmtZIjrojGLK4PJKdivR0awjPEJ9qXnxA0bOQk/GdbD8nse66LR2NnPeNDxxqfsh8tw==
+
+"@nx/nx-linux-arm64-musl@19.3.1":
+ version "19.3.1"
+ resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-19.3.1.tgz#3d796cd718b2694d5bbfaeba40415055d1d2dcef"
+ integrity sha512-JMuBbg2Zqdz4N7i+hiJGr2QdsDarDZ8vyzzeoevFq3b8nhZfqKh/lno7+Y0WkXNpH7aT05GHaUA1r1NXf/5BeQ==
+
+"@nx/nx-linux-x64-gnu@19.3.1":
+ version "19.3.1"
+ resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-19.3.1.tgz#27c362cdcc807cbda305f18ef47ad66183d842d3"
+ integrity sha512-cVmDMtolaqK7PziWxvjus1nCyj2wMNM+N0/4+rBEjG4v47gTtBxlZJoxK02jApdV+XELehsTjd0Z/xVfO4Rl1Q==
+
+"@nx/nx-linux-x64-musl@19.3.1":
+ version "19.3.1"
+ resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-19.3.1.tgz#776f600a27097c0d378f0763dd847fbadf7c82c6"
+ integrity sha512-UGujK/TLMz9TNJ6+6HLhoOV7pdlgPVosSyeNZcoXCHOg/Mg9NGM7Hgk9jDodtcAY+TP6QMDJIMVGuXBsCE7NLQ==
+
+"@nx/nx-win32-arm64-msvc@19.3.1":
+ version "19.3.1"
+ resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-19.3.1.tgz#64f4c3f9037abe555d640e25af8e1cb0a23db620"
+ integrity sha512-q+2aaRXarh/+HOOW/JXRwEnEEwPdGipsfzXBPDuDDJ7aOYKuyG7g1DlSERKdzI/aEBP+joneZbcbZHaDcEv2xw==
+
+"@nx/nx-win32-x64-msvc@19.3.1":
+ version "19.3.1"
+ resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-19.3.1.tgz#0ed9837c627f1276ee83245f8b5917784394f575"
+ integrity sha512-TG4DP1lodTnIwY/CiSsc9Pk7o9/JZXgd1pP/xdHNTkrZYjE//z6TbSm+facBLuryuMhp6s/WlJaAlW241qva0Q==
"@octokit/auth-token@^3.0.0":
version "3.0.4"
@@ -4096,48 +4260,51 @@
resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
-"@sigstore/bundle@^2.1.0":
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/@sigstore/bundle/-/bundle-2.1.0.tgz#c6140ca97b68815edf7c4fb7bdbf58d656525c39"
- integrity sha512-89uOo6yh/oxaU8AeOUnVrTdVMcGk9Q1hJa7Hkvalc6G3Z3CupWk4Xe9djSgJm9fMkH69s0P0cVHUoKSOemLdng==
+"@sigstore/bundle@^2.3.2":
+ version "2.3.2"
+ resolved "https://registry.yarnpkg.com/@sigstore/bundle/-/bundle-2.3.2.tgz#ad4dbb95d665405fd4a7a02c8a073dbd01e4e95e"
+ integrity sha512-wueKWDk70QixNLB363yHc2D2ItTgYiMTdPwK8D9dKQMR3ZQ0c35IxP5xnwQ8cNLoCgCRcHf14kE+CLIvNX1zmA==
dependencies:
- "@sigstore/protobuf-specs" "^0.2.1"
+ "@sigstore/protobuf-specs" "^0.3.2"
-"@sigstore/protobuf-specs@^0.1.0":
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz#957cb64ea2f5ce527cc9cf02a096baeb0d2b99b4"
- integrity sha512-a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ==
+"@sigstore/core@^1.0.0", "@sigstore/core@^1.1.0":
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/@sigstore/core/-/core-1.1.0.tgz#5583d8f7ffe599fa0a89f2bf289301a5af262380"
+ integrity sha512-JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg==
-"@sigstore/protobuf-specs@^0.2.1":
- version "0.2.1"
- resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz#be9ef4f3c38052c43bd399d3f792c97ff9e2277b"
- integrity sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==
+"@sigstore/protobuf-specs@^0.3.2":
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.3.2.tgz#5becf88e494a920f548d0163e2978f81b44b7d6f"
+ integrity sha512-c6B0ehIWxMI8wiS/bj6rHMPqeFvngFV7cDU/MY+B16P9Z3Mp9k8L93eYZ7BYzSickzuqAQqAq0V956b3Ju6mLw==
-"@sigstore/sign@^2.1.0":
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/@sigstore/sign/-/sign-2.2.0.tgz#4918207d8356877ab42d85d360d5729e9b3ec65a"
- integrity sha512-AAbmnEHDQv6CSfrWA5wXslGtzLPtAtHZleKOgxdQYvx/s76Fk6T6ZVt7w2IGV9j1UrFeBocTTQxaXG2oRrDhYA==
- dependencies:
- "@sigstore/bundle" "^2.1.0"
- "@sigstore/protobuf-specs" "^0.2.1"
- make-fetch-happen "^13.0.0"
+"@sigstore/sign@^2.3.2":
+ version "2.3.2"
+ resolved "https://registry.yarnpkg.com/@sigstore/sign/-/sign-2.3.2.tgz#d3d01e56d03af96fd5c3a9b9897516b1233fc1c4"
+ integrity sha512-5Vz5dPVuunIIvC5vBb0APwo7qKA4G9yM48kPWJT+OEERs40md5GoUR1yedwpekWZ4m0Hhw44m6zU+ObsON+iDA==
+ dependencies:
+ "@sigstore/bundle" "^2.3.2"
+ "@sigstore/core" "^1.0.0"
+ "@sigstore/protobuf-specs" "^0.3.2"
+ make-fetch-happen "^13.0.1"
+ proc-log "^4.2.0"
+ promise-retry "^2.0.1"
-"@sigstore/tuf@^1.0.0":
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-1.0.0.tgz#13b69323e7bf8de458cd6c952c57acd1169772a5"
- integrity sha512-bLzi9GeZgMCvjJeLUIfs8LJYCxrPRA8IXQkzUtaFKKVPTz0mucRyqFcV2U20yg9K+kYAD0YSitzGfRZCFLjdHQ==
+"@sigstore/tuf@^2.3.4":
+ version "2.3.4"
+ resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-2.3.4.tgz#da1d2a20144f3b87c0172920cbc8dcc7851ca27c"
+ integrity sha512-44vtsveTPUpqhm9NCrbU8CWLe3Vck2HO1PNLw7RIajbB7xhtn5RBPm1VNSCMwqGYHhDsBJG8gDF0q4lgydsJvw==
dependencies:
- "@sigstore/protobuf-specs" "^0.1.0"
- make-fetch-happen "^11.0.1"
- tuf-js "^1.1.3"
+ "@sigstore/protobuf-specs" "^0.3.2"
+ tuf-js "^2.2.1"
-"@sigstore/tuf@^2.1.0":
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-2.2.0.tgz#ef636239687e41af3f2ce10667ab88f5ca6165b3"
- integrity sha512-KKATZ5orWfqd9ZG6MN8PtCIx4eevWSuGRKQvofnWXRpyMyUEpmrzg5M5BrCpjM+NfZ0RbNGOh5tCz/P2uoRqOA==
+"@sigstore/verify@^1.2.1":
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/@sigstore/verify/-/verify-1.2.1.tgz#c7e60241b432890dcb8bd8322427f6062ef819e1"
+ integrity sha512-8iKx79/F73DKbGfRf7+t4dqrc0bRr0thdPrxAtCKWRm/F0tG71i6O1rvlnScncJLLBZHn3h8M3c1BSUAb9yu8g==
dependencies:
- "@sigstore/protobuf-specs" "^0.2.1"
- tuf-js "^2.1.0"
+ "@sigstore/bundle" "^2.3.2"
+ "@sigstore/core" "^1.1.0"
+ "@sigstore/protobuf-specs" "^0.3.2"
"@sinclair/typebox@^0.24.1":
version "0.24.51"
@@ -4173,10 +4340,10 @@
dependencies:
"@sinonjs/commons" "^1.7.0"
-"@spore-sdk/core@0.1.0-beta.14":
- version "0.1.0-beta.14"
- resolved "https://registry.yarnpkg.com/@spore-sdk/core/-/core-0.1.0-beta.14.tgz#1b7823e27180f7031fd12f641bbabcf52f78b3e3"
- integrity sha512-pwD20Ft134aTUzJ3xZDEGtSNqJfuO5CoUGKqIbd/o+oQp1a7UpwdNKiqYxUKUBWEBF/JyBPPD2qvoBID/PycRw==
+"@spore-sdk/core@0.1.0":
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/@spore-sdk/core/-/core-0.1.0.tgz#70489351a9ed7534ffccccd736f8cf89481a4fa1"
+ integrity sha512-+qrct1IKUFgrAzhp9yFeV/xbxQJJnl9BYNRwf4yZA+ItQPJkADvewAGOdHrlCT6y66mYRb+NNvsE6bCAU6A99g==
dependencies:
"@ckb-lumos/base" "^0.21.0-next.0"
"@ckb-lumos/bi" "^0.21.0-next.0"
@@ -5115,31 +5282,38 @@
resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
-"@tufjs/canonical-json@1.0.0":
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz#eade9fd1f537993bc1f0949f3aea276ecc4fab31"
- integrity sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==
+"@tsconfig/node10@^1.0.7":
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.11.tgz#6ee46400685f130e278128c7b38b7e031ff5b2f2"
+ integrity sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==
+
+"@tsconfig/node12@^1.0.7":
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
+ integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
+
+"@tsconfig/node14@^1.0.0":
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
+ integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
+
+"@tsconfig/node16@^1.0.2":
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
+ integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
"@tufjs/canonical-json@2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz#a52f61a3d7374833fca945b2549bc30a2dd40d0a"
integrity sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==
-"@tufjs/models@1.0.4":
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-1.0.4.tgz#5a689630f6b9dbda338d4b208019336562f176ef"
- integrity sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==
- dependencies:
- "@tufjs/canonical-json" "1.0.0"
- minimatch "^9.0.0"
-
-"@tufjs/models@2.0.0":
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-2.0.0.tgz#c7ab241cf11dd29deb213d6817dabb8c99ce0863"
- integrity sha512-c8nj8BaOExmZKO2DXhDfegyhSGcG9E/mPN3U13L+/PsoWm1uaGiHHjxqSHQiasDBQwDA3aHuw9+9spYAP1qvvg==
+"@tufjs/models@2.0.1":
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-2.0.1.tgz#e429714e753b6c2469af3212e7f320a6973c2812"
+ integrity sha512-92F7/SFyufn4DXsha9+QfKnN03JGqtMFMXgSHbZOo8JG59WkTni7UzAouNQDf7AuP9OAMxVOPQcqG3sB7w+kkg==
dependencies:
"@tufjs/canonical-json" "2.0.0"
- minimatch "^9.0.3"
+ minimatch "^9.0.4"
"@types/abstract-leveldown@*":
version "7.2.1"
@@ -5805,7 +5979,7 @@
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.3.tgz#cef09e3ec9af1d63d2a6cc5b383a737e24e6dcf5"
integrity sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==
-"@types/semver@^7.3.12", "@types/semver@^7.3.4", "@types/semver@^7.3.6":
+"@types/semver@^7.3.12", "@types/semver@^7.3.4":
version "7.5.0"
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"
integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==
@@ -6382,10 +6556,10 @@
js-yaml "^3.10.0"
tslib "^2.4.0"
-"@zkochan/js-yaml@0.0.6":
- version "0.0.6"
- resolved "https://registry.yarnpkg.com/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz#975f0b306e705e28b8068a07737fa46d3fc04826"
- integrity sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==
+"@zkochan/js-yaml@0.0.7":
+ version "0.0.7"
+ resolved "https://registry.yarnpkg.com/@zkochan/js-yaml/-/js-yaml-0.0.7.tgz#4b0cb785220d7c28ce0ec4d0804deb5d821eae89"
+ integrity sha512-nrUSn7hzt7J6JWgWGz78ZYI8wj+gdIJdk0Ynjpp8l+trkn58Uqsf6RYrYkEK+3X18EX+TNdtJI0WxAtc+L84SQ==
dependencies:
argparse "^2.0.1"
@@ -6489,11 +6663,23 @@ acorn-walk@^7.1.1, acorn-walk@^7.2.0:
resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
+acorn-walk@^8.1.1:
+ version "8.3.3"
+ resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.3.tgz#9caeac29eefaa0c41e3d4c65137de4d6f34df43e"
+ integrity sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==
+ dependencies:
+ acorn "^8.11.0"
+
acorn@^7.1.1, acorn@^7.4.1:
version "7.4.1"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
+acorn@^8.11.0, acorn@^8.4.1:
+ version "8.12.1"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
+ integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
+
acorn@^8.11.2, acorn@^8.9.0:
version "8.11.2"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
@@ -6541,7 +6727,7 @@ agent-base@^7.0.2, agent-base@^7.1.0:
dependencies:
debug "^4.3.4"
-agentkeepalive@^4.1.3, agentkeepalive@^4.2.1:
+agentkeepalive@^4.1.3:
version "4.3.0"
resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.3.0.tgz#bb999ff07412653c1803b3ced35e50729830a255"
integrity sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==
@@ -6740,7 +6926,7 @@ app-root-path@^3.1.0:
resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-3.1.0.tgz#5971a2fc12ba170369a7a1ef018c71e6e47c2e86"
integrity sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==
-"aproba@^1.0.3 || ^2.0.0":
+aproba@2.0.0, "aproba@^1.0.3 || ^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
@@ -6757,10 +6943,10 @@ archiver-utils@^4.0.1:
normalize-path "^3.0.0"
readable-stream "^3.6.0"
-archiver@6.0.1:
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/archiver/-/archiver-6.0.1.tgz#d56968d4c09df309435adb5a1bbfc370dae48133"
- integrity sha512-CXGy4poOLBKptiZH//VlWdFuUC1RESbdZjGjILwBuZ73P7WkAUN0htfSfBq/7k6FRFlpu7bg4JOkj1vU9G6jcQ==
+archiver@6.0.2:
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/archiver/-/archiver-6.0.2.tgz#f45e7598dfe48e834ac8c7a0c37033f826f5a639"
+ integrity sha512-UQ/2nW7NMl1G+1UnrLypQw1VdT9XZg/ECcKPq7l+STzStrSivFIXIp34D8M5zeNGW5NoOupdYCHv6VySCPNNlw==
dependencies:
archiver-utils "^4.0.1"
async "^3.2.4"
@@ -6786,6 +6972,11 @@ are-we-there-yet@^3.0.0:
delegates "^1.0.0"
readable-stream "^3.6.0"
+arg@^4.1.0:
+ version "4.1.3"
+ resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+ integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
+
arg@^5.0.2:
version "5.0.2"
resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
@@ -7134,12 +7325,12 @@ axios@^0.27.2:
follow-redirects "^1.14.9"
form-data "^4.0.0"
-axios@^1.5.1:
- version "1.6.2"
- resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.2.tgz#de67d42c755b571d3e698df1b6504cde9b0ee9f2"
- integrity sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==
+axios@^1.6.0:
+ version "1.7.2"
+ resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621"
+ integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==
dependencies:
- follow-redirects "^1.15.0"
+ follow-redirects "^1.15.6"
form-data "^4.0.0"
proxy-from-env "^1.1.0"
@@ -7386,6 +7577,11 @@ balanced-match@^1.0.0:
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+base-x@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/base-x/-/base-x-4.0.0.tgz#d0e3b7753450c73f8ad2389b5c018a4af7b2224a"
+ integrity sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==
+
base64-js@^1.3.1, base64-js@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -7451,6 +7647,16 @@ big.js@^5.2.2:
resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+bin-links@^4.0.4:
+ version "4.0.4"
+ resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-4.0.4.tgz#c3565832b8e287c85f109a02a17027d152a58a63"
+ integrity sha512-cMtq4W5ZsEwcutJrVId+a/tjt8GSbS+h0oNkdl6+6rBuEv8Ot33Bevj5KPm40t309zuhVic8NjpuL42QCiJWWA==
+ dependencies:
+ cmd-shim "^6.0.0"
+ npm-normalize-package-bin "^3.0.0"
+ read-cmd-shim "^4.0.0"
+ write-file-atomic "^5.0.0"
+
binary-extensions@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
@@ -7605,6 +7811,13 @@ braces@^3.0.2, braces@~3.0.2:
dependencies:
fill-range "^7.0.1"
+braces@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+ integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
+ dependencies:
+ fill-range "^7.1.1"
+
brorand@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -7654,6 +7867,13 @@ bs-logger@0.x:
dependencies:
fast-json-stable-stringify "2.x"
+bs58@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/bs58/-/bs58-5.0.0.tgz#865575b4d13c09ea2a84622df6c8cbeb54ffc279"
+ integrity sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==
+ dependencies:
+ base-x "^4.0.0"
+
bser@2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
@@ -7692,14 +7912,6 @@ buffer@^5.1.0, buffer@^5.5.0, buffer@^5.6.0:
base64-js "^1.3.1"
ieee754 "^1.1.13"
-builder-util-runtime@8.9.2:
- version "8.9.2"
- resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz#a9669ae5b5dcabfe411ded26678e7ae997246c28"
- integrity sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==
- dependencies:
- debug "^4.3.2"
- sax "^1.2.4"
-
builder-util-runtime@9.2.3:
version "9.2.3"
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz#0a82c7aca8eadef46d67b353c638f052c206b83c"
@@ -7708,6 +7920,14 @@ builder-util-runtime@9.2.3:
debug "^4.3.4"
sax "^1.2.4"
+builder-util-runtime@9.2.5:
+ version "9.2.5"
+ resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.5.tgz#0afdffa0adb5c84c14926c7dd2cf3c6e96e9be83"
+ integrity sha512-HjIDfhvqx/8B3TDN4GbABQcgpewTU4LMRTQPkVpKYV3lsuxEJoIfvg09GyWTNmfVNSUAYf+fbTN//JX4TH20pg==
+ dependencies:
+ debug "^4.3.4"
+ sax "^1.2.4"
+
builder-util@24.8.1:
version "24.8.1"
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.8.1.tgz#594d45b0c86d1d17f5c7bebbb77405080b2571c2"
@@ -7735,11 +7955,6 @@ builtin-modules@^3.1.0:
resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
-builtins@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
- integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==
-
builtins@^5.0.0:
version "5.0.1"
resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
@@ -7786,17 +8001,17 @@ cacache@^15.2.0:
tar "^6.0.2"
unique-filename "^1.1.1"
-cacache@^17.0.0:
- version "17.1.3"
- resolved "https://registry.yarnpkg.com/cacache/-/cacache-17.1.3.tgz#c6ac23bec56516a7c0c52020fd48b4909d7c7044"
- integrity sha512-jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg==
+cacache@^18.0.0:
+ version "18.0.1"
+ resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.1.tgz#b026d56ad569e4f73cc07c813b3c66707d0fb142"
+ integrity sha512-g4Uf2CFZPaxtJKre6qr4zqLDOOPU7bNVhWjlNhvzc51xaTOx2noMOLhfFkTAqwtrAZAKQUuDfyjitzilpA8WsQ==
dependencies:
"@npmcli/fs" "^3.1.0"
fs-minipass "^3.0.0"
glob "^10.2.2"
- lru-cache "^7.7.1"
- minipass "^5.0.0"
- minipass-collect "^1.0.2"
+ lru-cache "^10.0.1"
+ minipass "^7.0.3"
+ minipass-collect "^2.0.1"
minipass-flush "^1.0.5"
minipass-pipeline "^1.2.4"
p-map "^4.0.0"
@@ -7804,10 +8019,10 @@ cacache@^17.0.0:
tar "^6.1.11"
unique-filename "^3.0.0"
-cacache@^18.0.0:
- version "18.0.1"
- resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.1.tgz#b026d56ad569e4f73cc07c813b3c66707d0fb142"
- integrity sha512-g4Uf2CFZPaxtJKre6qr4zqLDOOPU7bNVhWjlNhvzc51xaTOx2noMOLhfFkTAqwtrAZAKQUuDfyjitzilpA8WsQ==
+cacache@^18.0.3:
+ version "18.0.3"
+ resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.3.tgz#864e2c18414e1e141ae8763f31e46c2cb96d1b21"
+ integrity sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg==
dependencies:
"@npmcli/fs" "^3.1.0"
fs-minipass "^3.0.0"
@@ -7970,11 +8185,6 @@ chalk@4.1.0:
ansi-styles "^4.1.0"
supports-color "^7.1.0"
-chalk@5.3.0:
- version "5.3.0"
- resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
- integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==
-
chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -7992,6 +8202,11 @@ chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
ansi-styles "^4.1.0"
supports-color "^7.1.0"
+chalk@~5.3.0:
+ version "5.3.0"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
+ integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==
+
char-regex@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
@@ -8077,11 +8292,16 @@ ci-info@^2.0.0:
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
-ci-info@^3.2.0, ci-info@^3.6.1:
+ci-info@^3.2.0:
version "3.8.0"
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
+ci-info@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.0.0.tgz#65466f8b280fc019b9f50a5388115d17a63a44f2"
+ integrity sha512-TdHqgGf9odd8SXNuxtUBVx8Nv+qZOejE6qyqiy5NtbYYQOeFa6zmHkxlPzmaLxWWHsU6nJmB7AETdVPi+2NBUg==
+
cjs-module-lexer@^1.0.0:
version "1.2.3"
resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
@@ -8219,10 +8439,10 @@ clone@^1.0.2:
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
-cmd-shim@6.0.1:
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-6.0.1.tgz#a65878080548e1dca760b3aea1e21ed05194da9d"
- integrity sha512-S9iI9y0nKR4hwEQsVWpyxld/6kRfGepGfzff83FcaiEBpmvlbA2nnGe7Cylgrx2f/p1P5S5wpRm9oL8z1PbS3Q==
+cmd-shim@6.0.3, cmd-shim@^6.0.0:
+ version "6.0.3"
+ resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-6.0.3.tgz#c491e9656594ba17ac83c4bd931590a9d6e26033"
+ integrity sha512-FMabTRlc5t5zjdenF6mS0MBeFZm0XqHqeOkcskKFb/LYCcRQ5fVgLOHVc4Lq9CqABd9zhjwPjMBCJvMCziSVtA==
co@^4.6.0:
version "4.6.0"
@@ -8275,7 +8495,7 @@ color-name@~1.1.4:
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-color-support@^1.1.2, color-support@^1.1.3:
+color-support@1.1.3, color-support@^1.1.2, color-support@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
@@ -8305,11 +8525,6 @@ combined-stream@^1.0.8:
dependencies:
delayed-stream "~1.0.0"
-commander@11.1.0:
- version "11.1.0"
- resolved "https://registry.yarnpkg.com/commander/-/commander-11.1.0.tgz#62fdce76006a68e5c1ab3314dc92e800eb83d906"
- integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==
-
commander@^2.19.0, commander@^2.20.0:
version "2.20.3"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -8340,6 +8555,16 @@ commander@^8.3.0:
resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
+commander@~12.1.0:
+ version "12.1.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-12.1.0.tgz#01423b36f501259fdaac4d0e4d60c96c991585d3"
+ integrity sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==
+
+common-ancestor-path@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz#4f7d2d1394d91b7abdf51871c62f71eadb0182a7"
+ integrity sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==
+
common-path-prefix@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0"
@@ -8672,6 +8897,11 @@ crc@^3.8.0:
dependencies:
buffer "^5.1.0"
+create-require@^1.1.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+ integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
+
cross-env@7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
@@ -8950,7 +9180,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
dependencies:
ms "2.0.0"
-debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
version "4.3.4"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -8964,6 +9194,13 @@ debug@^3.2.7:
dependencies:
ms "^2.1.1"
+debug@~4.3.4:
+ version "4.3.5"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
+ integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==
+ dependencies:
+ ms "2.1.2"
+
decamelize-keys@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
@@ -8994,7 +9231,12 @@ decompress-response@^6.0.0:
dependencies:
mimic-response "^3.1.0"
-dedent@0.7.0, dedent@^0.7.0:
+dedent@1.5.3:
+ version "1.5.3"
+ resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.3.tgz#99aee19eb9bae55a67327717b6e848d0bf777e5a"
+ integrity sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==
+
+dedent@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
@@ -9100,6 +9342,15 @@ define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
has-property-descriptors "^1.0.0"
object-keys "^1.1.1"
+define-properties@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
+ integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
+ dependencies:
+ define-data-property "^1.0.1"
+ has-property-descriptors "^1.0.0"
+ object-keys "^1.1.1"
+
define-property@^0.2.5:
version "0.2.5"
resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -9263,6 +9514,11 @@ diff-sequences@^29.6.3:
resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
+diff@^4.0.1:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+ integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
dir-compare@^3.0.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz#2c749f973b5c4b5d087f11edaae730db31788416"
@@ -9582,19 +9838,19 @@ electron-to-chromium@^1.4.601:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.612.tgz#350c6fd4201d677307519b931949fa64dae6a5cc"
integrity sha512-dM8BMtXtlH237ecSMnYdYuCkib2QHq0kpWfUnavjdYsyr/6OsAwg5ZGUfnQ9KD1Ga4QgB2sqXlB2NT8zy2GnVg==
-electron-updater@4.6.5:
- version "4.6.5"
- resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.6.5.tgz#e9a75458bbfd6bb41a58a829839e150ad2eb2d3d"
- integrity sha512-kdTly8O9mSZfm9fslc1mnCY+mYOeaYRy7ERa2Fed240u01BKll3aiupzkd07qKw69KvhBSzuHroIW3mF0D8DWA==
+electron-updater@6.3.0:
+ version "6.3.0"
+ resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.3.0.tgz#13a5c3c3f0b2b114fe33181e24a8270096734b3e"
+ integrity sha512-3Xlezhk+dKaSQrOnkQNqCGiuGSSUPO9BV9TQZ4Iig6AyTJ4FzJONE5gFFc382sY53Sh9dwJfzKsA3DxRHt2btw==
dependencies:
- "@types/semver" "^7.3.6"
- builder-util-runtime "8.9.2"
- fs-extra "^10.0.0"
+ builder-util-runtime "9.2.5"
+ fs-extra "^10.1.0"
js-yaml "^4.1.0"
lazy-val "^1.0.5"
lodash.escaperegexp "^4.1.2"
lodash.isequal "^4.5.0"
- semver "^7.3.5"
+ semver "^7.3.8"
+ tiny-typed-emitter "^2.1.0"
electron-window-state@5.0.3:
version "5.0.3"
@@ -9613,7 +9869,20 @@ electron@30.0.0:
"@types/node" "^20.9.0"
extract-zip "^2.0.1"
-elliptic@6.5.4, elliptic@^6.5.4:
+elliptic@6.5.5:
+ version "6.5.5"
+ resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.5.tgz#c715e09f78b6923977610d4c2346d6ce22e6dded"
+ integrity sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==
+ dependencies:
+ bn.js "^4.11.9"
+ brorand "^1.1.0"
+ hash.js "^1.0.0"
+ hmac-drbg "^1.0.1"
+ inherits "^2.0.4"
+ minimalistic-assert "^1.0.1"
+ minimalistic-crypto-utils "^1.0.1"
+
+elliptic@^6.5.4:
version "6.5.4"
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
@@ -9724,45 +9993,45 @@ env-paths@^2.2.0:
resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
-envinfo@7.8.1:
- version "7.8.1"
- resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
- integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
+envinfo@7.13.0:
+ version "7.13.0"
+ resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.13.0.tgz#81fbb81e5da35d74e814941aeab7c325a606fb31"
+ integrity sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==
envinfo@^7.7.3:
version "7.10.0"
resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.10.0.tgz#55146e3909cc5fe63c22da63fb15b05aeac35b13"
integrity sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==
-enzyme-adapter-react-16@1.15.7:
- version "1.15.7"
- resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.7.tgz#a737e6d8e2c147e9da5acf957755be7634f76201"
- integrity sha512-LtjKgvlTc/H7adyQcj+aq0P0H07LDL480WQl1gU512IUyaDo/sbOaNDdZsJXYW2XaoPqrLLE9KbZS+X2z6BASw==
+enzyme-adapter-react-16@1.15.8:
+ version "1.15.8"
+ resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.8.tgz#1aecb5daadaae33d32c5b8b78566d7cf45dc49d8"
+ integrity sha512-uYGC31eGZBp5nGsr4nKhZKvxGQjyHGjS06BJsUlWgE29/hvnpgCsT1BJvnnyny7N3GIIVyxZ4O9GChr6hy2WQA==
dependencies:
- enzyme-adapter-utils "^1.14.1"
- enzyme-shallow-equal "^1.0.5"
- has "^1.0.3"
- object.assign "^4.1.4"
- object.values "^1.1.5"
+ enzyme-adapter-utils "^1.14.2"
+ enzyme-shallow-equal "^1.0.7"
+ hasown "^2.0.0"
+ object.assign "^4.1.5"
+ object.values "^1.1.7"
prop-types "^15.8.1"
react-is "^16.13.1"
react-test-renderer "^16.0.0-0"
- semver "^5.7.0"
+ semver "^5.7.2"
-enzyme-adapter-utils@^1.14.1:
- version "1.14.1"
- resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.1.tgz#f30db15dafc22e0ccd44f5acc8d93be29218cdcf"
- integrity sha512-JZgMPF1QOI7IzBj24EZoDpaeG/p8Os7WeBZWTJydpsH7JRStc7jYbHE4CmNQaLqazaGFyLM8ALWA3IIZvxW3PQ==
+enzyme-adapter-utils@^1.14.2:
+ version "1.14.2"
+ resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.2.tgz#1d012e6261accbe7d406db098bb4d8dfdce8c003"
+ integrity sha512-1ZC++RlsYRaiOWE5NRaF5OgsMt7F5rn/VuaJIgc7eW/fmgg8eS1/Ut7EugSPPi7VMdWMLcymRnMF+mJUJ4B8KA==
dependencies:
airbnb-prop-types "^2.16.0"
- function.prototype.name "^1.1.5"
- has "^1.0.3"
- object.assign "^4.1.4"
- object.fromentries "^2.0.5"
+ function.prototype.name "^1.1.6"
+ hasown "^2.0.0"
+ object.assign "^4.1.5"
+ object.fromentries "^2.0.7"
prop-types "^15.8.1"
- semver "^5.7.1"
+ semver "^6.3.1"
-enzyme-shallow-equal@^1.0.0, enzyme-shallow-equal@^1.0.1, enzyme-shallow-equal@^1.0.5:
+enzyme-shallow-equal@^1.0.0, enzyme-shallow-equal@^1.0.1:
version "1.0.5"
resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.5.tgz#5528a897a6ad2bdc417c7221a7db682cd01711ba"
integrity sha512-i6cwm7hN630JXenxxJFBKzgLC3hMTafFQXflvzHgPmDhOBhxUWDe8AeRv1qp2/uWJ2Y8z5yLWMzmAfkTOiOCZg==
@@ -9770,6 +10039,14 @@ enzyme-shallow-equal@^1.0.0, enzyme-shallow-equal@^1.0.1, enzyme-shallow-equal@^
has "^1.0.3"
object-is "^1.1.5"
+enzyme-shallow-equal@^1.0.7:
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.7.tgz#4e3aa678022387a68e6c47aff200587851885b5e"
+ integrity sha512-/um0GFqUXnpM9SvKtje+9Tjoz3f1fpBC3eXRFrNs8kpYn69JljciYP7KZTqM/YQbUY9KUjvKB4jo/q+L6WGGvg==
+ dependencies:
+ hasown "^2.0.0"
+ object-is "^1.1.5"
+
enzyme@3.11.0:
version "3.11.0"
resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.11.0.tgz#71d680c580fe9349f6f5ac6c775bc3e6b7a79c28"
@@ -10493,21 +10770,6 @@ execa@5.0.0:
signal-exit "^3.0.3"
strip-final-newline "^2.0.0"
-execa@8.0.1:
- version "8.0.1"
- resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c"
- integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==
- dependencies:
- cross-spawn "^7.0.3"
- get-stream "^8.0.1"
- human-signals "^5.0.0"
- is-stream "^3.0.0"
- merge-stream "^2.0.0"
- npm-run-path "^5.1.0"
- onetime "^6.0.0"
- signal-exit "^4.1.0"
- strip-final-newline "^3.0.0"
-
execa@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
@@ -10536,6 +10798,21 @@ execa@^5.0.0, execa@^5.1.1:
signal-exit "^3.0.3"
strip-final-newline "^2.0.0"
+execa@~8.0.1:
+ version "8.0.1"
+ resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c"
+ integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==
+ dependencies:
+ cross-spawn "^7.0.3"
+ get-stream "^8.0.1"
+ human-signals "^5.0.0"
+ is-stream "^3.0.0"
+ merge-stream "^2.0.0"
+ npm-run-path "^5.1.0"
+ onetime "^6.0.0"
+ signal-exit "^4.1.0"
+ strip-final-newline "^3.0.0"
+
exit@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -10829,6 +11106,13 @@ fill-range@^7.0.1:
dependencies:
to-regex-range "^5.0.1"
+fill-range@^7.1.1:
+ version "7.1.1"
+ resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+ integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
+ dependencies:
+ to-regex-range "^5.0.1"
+
finalhandler@1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
@@ -10913,7 +11197,7 @@ flow-parser@0.*:
resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.210.1.tgz#6e04775dc2ebd5bde6a37de38532836678a5ac3e"
integrity sha512-M0SdOwD0wZHhk6K/AOaPReBnw2vB7p9KUFUFZHJRsU3ZMl/+WVrMpmb8AfEM6GXZ5mEssCx9vHugxxJg1ieoew==
-follow-redirects@^1.0.0, follow-redirects@^1.14.9, follow-redirects@^1.15.0:
+follow-redirects@^1.0.0, follow-redirects@^1.14.9, follow-redirects@^1.15.6:
version "1.15.6"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
@@ -11015,12 +11299,19 @@ fresh@0.5.2:
resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
+front-matter@^4.0.2:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/front-matter/-/front-matter-4.0.2.tgz#b14e54dc745cfd7293484f3210d15ea4edd7f4d5"
+ integrity sha512-I8ZuJ/qG92NWX8i5x1Y8qyj3vizhXS31OxjKDu3LKP+7/qBgfIKValiZIEwoVoJKUHlhWtYrktkxV1XsX+pPlg==
+ dependencies:
+ js-yaml "^3.13.1"
+
fs-constants@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-fs-extra@11.1.1, fs-extra@^11.1.1:
+fs-extra@11.1.1:
version "11.1.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d"
integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==
@@ -11038,10 +11329,10 @@ fs-extra@^10.0.0, fs-extra@^10.1.0:
jsonfile "^6.0.1"
universalify "^2.0.0"
-fs-extra@^11.1.0:
- version "11.1.0"
- resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.0.tgz#5784b102104433bb0e090f48bfc4a30742c357ed"
- integrity sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==
+fs-extra@^11.1.0, fs-extra@^11.2.0:
+ version "11.2.0"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
+ integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
dependencies:
graceful-fs "^4.2.0"
jsonfile "^6.0.1"
@@ -11317,10 +11608,10 @@ git-up@^7.0.0:
is-ssh "^1.4.0"
parse-url "^8.1.0"
-git-url-parse@13.1.0:
- version "13.1.0"
- resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-13.1.0.tgz#07e136b5baa08d59fabdf0e33170de425adf07b4"
- integrity sha512-5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA==
+git-url-parse@14.0.0:
+ version "14.0.0"
+ resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-14.0.0.tgz#18ce834726d5fbca0c25a4555101aa277017418f"
+ integrity sha512-NnLweV+2A4nCvn4U/m2AoYu0pPKlsmhK9cknG7IMwsjFY1S2jxM+mAhsDxyxfCIGfGaD+dozsyX4b6vkYc83yQ==
dependencies:
git-up "^7.0.0"
@@ -11341,37 +11632,25 @@ github-slugger@^1.0.0:
resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.5.0.tgz#17891bbc73232051474d68bd867a34625c955f7d"
integrity sha512-wIh+gKBI9Nshz2o46B0B3f5k/W+WI9ZAv6y5Dn5WJ5SK1t0TnDimB4WE5rmTD05ZAIn8HALCZVmCsvj0w0v0lw==
-glob-parent@5.1.2, glob-parent@^5.1.2, glob-parent@~5.1.2:
- version "5.1.2"
- resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
- integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
- dependencies:
- is-glob "^4.0.1"
-
-glob-parent@^6.0.2:
+glob-parent@6.0.2, glob-parent@^6.0.2:
version "6.0.2"
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
dependencies:
is-glob "^4.0.3"
+glob-parent@^5.1.2, glob-parent@~5.1.2:
+ version "5.1.2"
+ resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+ integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+ dependencies:
+ is-glob "^4.0.1"
+
glob-to-regexp@^0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
-glob@7.1.4:
- version "7.1.4"
- resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
- integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
- dependencies:
- fs.realpath "^1.0.0"
- inflight "^1.0.4"
- inherits "2"
- minimatch "^3.0.4"
- once "^1.3.0"
- path-is-absolute "^1.0.0"
-
glob@7.1.6:
version "7.1.6"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
@@ -11418,7 +11697,7 @@ glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
once "^1.3.0"
path-is-absolute "^1.0.0"
-glob@^8.0.0, glob@^8.0.1, glob@^8.1.0:
+glob@^8.0.0, glob@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
@@ -11726,13 +12005,6 @@ hosted-git-info@^2.1.4:
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-hosted-git-info@^3.0.6:
- version "3.0.8"
- resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d"
- integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==
- dependencies:
- lru-cache "^6.0.0"
-
hosted-git-info@^4.0.0, hosted-git-info@^4.0.1, hosted-git-info@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
@@ -11740,13 +12012,6 @@ hosted-git-info@^4.0.0, hosted-git-info@^4.0.1, hosted-git-info@^4.1.0:
dependencies:
lru-cache "^6.0.0"
-hosted-git-info@^6.0.0:
- version "6.1.1"
- resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-6.1.1.tgz#629442c7889a69c05de604d52996b74fe6f26d58"
- integrity sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==
- dependencies:
- lru-cache "^7.5.1"
-
hosted-git-info@^7.0.0:
version "7.0.1"
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-7.0.1.tgz#9985fcb2700467fecf7f33a4d4874e30680b5322"
@@ -11754,6 +12019,13 @@ hosted-git-info@^7.0.0:
dependencies:
lru-cache "^10.0.1"
+hosted-git-info@^7.0.2:
+ version "7.0.2"
+ resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-7.0.2.tgz#9b751acac097757667f30114607ef7b661ff4f17"
+ integrity sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==
+ dependencies:
+ lru-cache "^10.0.1"
+
hpack.js@^2.1.6:
version "2.1.6"
resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
@@ -12054,13 +12326,6 @@ ieee754@^1.1.13, ieee754@^1.2.1:
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-ignore-walk@^5.0.1:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-5.0.1.tgz#5f199e23e1288f518d90358d461387788a154776"
- integrity sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==
- dependencies:
- minimatch "^5.0.1"
-
ignore-walk@^6.0.4:
version "6.0.4"
resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-6.0.4.tgz#89950be94b4f522225eb63a13c56badb639190e9"
@@ -12157,15 +12422,15 @@ ini@^1.3.2, ini@^1.3.5, ini@^1.3.8, ini@~1.3.0:
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-init-package-json@5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-5.0.0.tgz#030cf0ea9c84cfc1b0dc2e898b45d171393e4b40"
- integrity sha512-kBhlSheBfYmq3e0L1ii+VKe3zBTLL5lDCDWR+f9dLmEGSB3MqLlMlsolubSsyI88Bg6EA+BIMlomAnQ1SwgQBw==
+init-package-json@6.0.3:
+ version "6.0.3"
+ resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-6.0.3.tgz#2552fba75b6eed2495dc97f44183e2e5a5bcf8b0"
+ integrity sha512-Zfeb5ol+H+eqJWHTaGca9BovufyGeIfr4zaaBorPmJBMrJ+KBnN+kQx2ZtXdsotUTgldHmHQV44xvUWOUA7E2w==
dependencies:
- npm-package-arg "^10.0.0"
+ "@npmcli/package-json" "^5.0.0"
+ npm-package-arg "^11.0.0"
promzard "^1.0.0"
- read "^2.0.0"
- read-package-json "^6.0.0"
+ read "^3.0.1"
semver "^7.3.5"
validate-npm-package-license "^3.0.4"
validate-npm-package-name "^5.0.0"
@@ -13582,6 +13847,11 @@ json-parse-even-better-errors@^3.0.0:
resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz#2cb2ee33069a78870a0c7e3da560026b89669cf7"
integrity sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==
+json-parse-even-better-errors@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz#b43d35e89c0f3be6b5fbbe9dc6c82467b30c28da"
+ integrity sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==
+
json-schema-traverse@^0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -13602,6 +13872,11 @@ json-stable-stringify-without-jsonify@^1.0.1:
resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
+json-stringify-nice@^1.1.4:
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz#2c937962b80181d3f317dd39aa323e14f5a60a67"
+ integrity sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==
+
json-stringify-safe@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -13673,6 +13948,16 @@ jszip@^3.1.0:
readable-stream "~2.3.6"
setimmediate "^1.0.5"
+just-diff-apply@^5.2.0:
+ version "5.5.0"
+ resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-5.5.0.tgz#771c2ca9fa69f3d2b54e7c3f5c1dfcbcc47f9f0f"
+ integrity sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw==
+
+just-diff@^6.0.0:
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-6.0.2.tgz#03b65908543ac0521caf6d8eb85035f7d27ea285"
+ integrity sha512-S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA==
+
keyv@^4.0.0:
version "4.5.2"
resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56"
@@ -13755,81 +14040,86 @@ lazystream@^1.0.0:
dependencies:
readable-stream "^2.0.5"
-lerna@8.0.1:
- version "8.0.1"
- resolved "https://registry.yarnpkg.com/lerna/-/lerna-8.0.1.tgz#cc705467c5507c38c76ae293fe976e5d438aa876"
- integrity sha512-ZxFMmOqwkP4e+q6BrMzxkAhixi6n0GVD2jAAnAfDkIFnwumB4/7X5/If6fqTlXXshtB2dQtN5OAtzafqVq8cwA==
+lerna@8.1.5:
+ version "8.1.5"
+ resolved "https://registry.yarnpkg.com/lerna/-/lerna-8.1.5.tgz#fa3ea882a1e248b7a18eb5ee8a9329c20ec955e5"
+ integrity sha512-/eigpa/JTfKl9RP9QHK9Tifeog+dymYICqBoZlR4fjp94ol2Q6adYQHy8dWRkv0VPrHh/Xuy5VlmPaGvIoGeDw==
dependencies:
- "@lerna/create" "8.0.1"
- "@npmcli/run-script" "7.0.2"
- "@nx/devkit" ">=17.1.2 < 18"
+ "@lerna/create" "8.1.5"
+ "@npmcli/arborist" "7.5.3"
+ "@npmcli/package-json" "5.2.0"
+ "@npmcli/run-script" "8.1.0"
+ "@nx/devkit" ">=17.1.2 < 20"
"@octokit/plugin-enterprise-rest" "6.0.1"
"@octokit/rest" "19.0.11"
+ aproba "2.0.0"
byte-size "8.1.1"
chalk "4.1.0"
clone-deep "4.0.1"
- cmd-shim "6.0.1"
+ cmd-shim "6.0.3"
+ color-support "1.1.3"
columnify "1.6.0"
+ console-control-strings "^1.1.0"
conventional-changelog-angular "7.0.0"
conventional-changelog-core "5.0.1"
conventional-recommended-bump "7.0.1"
cosmiconfig "^8.2.0"
- dedent "0.7.0"
- envinfo "7.8.1"
+ dedent "1.5.3"
+ envinfo "7.13.0"
execa "5.0.0"
- fs-extra "^11.1.1"
+ fs-extra "^11.2.0"
get-port "5.1.1"
get-stream "6.0.0"
- git-url-parse "13.1.0"
- glob-parent "5.1.2"
+ git-url-parse "14.0.0"
+ glob-parent "6.0.2"
globby "11.1.0"
graceful-fs "4.2.11"
has-unicode "2.0.1"
import-local "3.1.0"
ini "^1.3.8"
- init-package-json "5.0.0"
+ init-package-json "6.0.3"
inquirer "^8.2.4"
is-ci "3.0.1"
is-stream "2.0.0"
jest-diff ">=29.4.3 < 30"
js-yaml "4.1.0"
- libnpmaccess "7.0.2"
- libnpmpublish "7.3.0"
+ libnpmaccess "8.0.6"
+ libnpmpublish "9.0.9"
load-json-file "6.2.0"
lodash "^4.17.21"
make-dir "4.0.0"
minimatch "3.0.5"
multimatch "5.0.0"
node-fetch "2.6.7"
- npm-package-arg "8.1.1"
- npm-packlist "5.1.1"
- npm-registry-fetch "^14.0.5"
- npmlog "^6.0.2"
- nx ">=17.1.2 < 18"
+ npm-package-arg "11.0.2"
+ npm-packlist "8.0.2"
+ npm-registry-fetch "^17.1.0"
+ nx ">=17.1.2 < 20"
p-map "4.0.0"
p-map-series "2.1.0"
p-pipe "3.1.0"
p-queue "6.6.2"
p-reduce "2.1.0"
p-waterfall "2.1.1"
- pacote "^17.0.5"
+ pacote "^18.0.6"
pify "5.0.0"
read-cmd-shim "4.0.0"
- read-package-json "6.0.4"
resolve-from "5.0.0"
rimraf "^4.4.1"
semver "^7.3.8"
+ set-blocking "^2.0.0"
signal-exit "3.0.7"
slash "3.0.0"
- ssri "^9.0.1"
+ ssri "^10.0.6"
strong-log-transformer "2.1.0"
- tar "6.1.11"
+ tar "6.2.1"
temp-dir "1.0.0"
typescript ">=3 < 6"
upath "2.0.1"
- uuid "^9.0.0"
+ uuid "^10.0.0"
validate-npm-package-license "3.0.4"
- validate-npm-package-name "5.0.0"
+ validate-npm-package-name "5.0.1"
+ wide-align "1.1.5"
write-file-atomic "5.0.1"
write-pkg "4.0.0"
yargs "17.7.2"
@@ -13930,27 +14220,27 @@ levn@~0.3.0:
prelude-ls "~1.1.2"
type-check "~0.3.2"
-libnpmaccess@7.0.2:
- version "7.0.2"
- resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-7.0.2.tgz#7f056c8c933dd9c8ba771fa6493556b53c5aac52"
- integrity sha512-vHBVMw1JFMTgEk15zRsJuSAg7QtGGHpUSEfnbcRL1/gTBag9iEfJbyjpDmdJmwMhvpoLoNBtdAUCdGnaP32hhw==
+libnpmaccess@8.0.6:
+ version "8.0.6"
+ resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-8.0.6.tgz#73be4c236258babc0a0bca6d3b6a93a6adf937cf"
+ integrity sha512-uM8DHDEfYG6G5gVivVl+yQd4pH3uRclHC59lzIbSvy7b5FEwR+mU49Zq1jEyRtRFv7+M99mUW9S0wL/4laT4lw==
dependencies:
- npm-package-arg "^10.1.0"
- npm-registry-fetch "^14.0.3"
+ npm-package-arg "^11.0.2"
+ npm-registry-fetch "^17.0.1"
-libnpmpublish@7.3.0:
- version "7.3.0"
- resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-7.3.0.tgz#2ceb2b36866d75a6cd7b4aa748808169f4d17e37"
- integrity sha512-fHUxw5VJhZCNSls0KLNEG0mCD2PN1i14gH5elGOgiVnU3VgTcRahagYP2LKI1m0tFCJ+XrAm0zVYyF5RCbXzcg==
+libnpmpublish@9.0.9:
+ version "9.0.9"
+ resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-9.0.9.tgz#e737378c09f09738377d2a276734be35cffb85e2"
+ integrity sha512-26zzwoBNAvX9AWOPiqqF6FG4HrSCPsHFkQm7nT+xU1ggAujL/eae81RnCv4CJ2In9q9fh10B88sYSzKCUh/Ghg==
dependencies:
- ci-info "^3.6.1"
- normalize-package-data "^5.0.0"
- npm-package-arg "^10.1.0"
- npm-registry-fetch "^14.0.3"
- proc-log "^3.0.0"
+ ci-info "^4.0.0"
+ normalize-package-data "^6.0.1"
+ npm-package-arg "^11.0.2"
+ npm-registry-fetch "^17.0.1"
+ proc-log "^4.2.0"
semver "^7.3.7"
- sigstore "^1.4.0"
- ssri "^10.0.1"
+ sigstore "^2.2.0"
+ ssri "^10.0.6"
lie@~3.3.0:
version "3.3.0"
@@ -13959,16 +14249,16 @@ lie@~3.3.0:
dependencies:
immediate "~3.0.5"
-lilconfig@3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.0.0.tgz#f8067feb033b5b74dab4602a5f5029420be749bc"
- integrity sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==
-
lilconfig@^2.0.3, lilconfig@^2.0.5, lilconfig@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==
+lilconfig@~3.1.1:
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.2.tgz#e4a7c3cb549e3a606c8dcc32e5ae1005e62c05cb"
+ integrity sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==
+
lines-and-columns@^1.1.6:
version "1.2.4"
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
@@ -13979,32 +14269,32 @@ lines-and-columns@~2.0.3:
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.3.tgz#b2f0badedb556b747020ab8ea7f0373e22efac1b"
integrity sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==
-lint-staged@15.2.0:
- version "15.2.0"
- resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-15.2.0.tgz#3111534ca58096a3c8f70b044b6e7fe21b36f859"
- integrity sha512-TFZzUEV00f+2YLaVPWBWGAMq7So6yQx+GG8YRMDeOEIf95Zn5RyiLMsEiX4KTNl9vq/w+NqRJkLA1kPIo15ufQ==
- dependencies:
- chalk "5.3.0"
- commander "11.1.0"
- debug "4.3.4"
- execa "8.0.1"
- lilconfig "3.0.0"
- listr2 "8.0.0"
- micromatch "4.0.5"
- pidtree "0.6.0"
- string-argv "0.3.2"
- yaml "2.3.4"
-
-listr2@8.0.0:
- version "8.0.0"
- resolved "https://registry.yarnpkg.com/listr2/-/listr2-8.0.0.tgz#aa7c230995f8ce378585f7c96c0c6d1cefa4700d"
- integrity sha512-u8cusxAcyqAiQ2RhYvV7kRKNLgUvtObIbhOX2NCXqvp1UU32xIg5CT22ykS2TPKJXZWJwtK3IKLiqAGlGNE+Zg==
+lint-staged@15.2.7:
+ version "15.2.7"
+ resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-15.2.7.tgz#97867e29ed632820c0fb90be06cd9ed384025649"
+ integrity sha512-+FdVbbCZ+yoh7E/RosSdqKJyUM2OEjTciH0TFNkawKgvFp1zbGlEC39RADg+xKBG1R4mhoH2j85myBQZ5wR+lw==
+ dependencies:
+ chalk "~5.3.0"
+ commander "~12.1.0"
+ debug "~4.3.4"
+ execa "~8.0.1"
+ lilconfig "~3.1.1"
+ listr2 "~8.2.1"
+ micromatch "~4.0.7"
+ pidtree "~0.6.0"
+ string-argv "~0.3.2"
+ yaml "~2.4.2"
+
+listr2@~8.2.1:
+ version "8.2.1"
+ resolved "https://registry.yarnpkg.com/listr2/-/listr2-8.2.1.tgz#06a1a6efe85f23c5324180d7c1ddbd96b5eefd6d"
+ integrity sha512-irTfvpib/rNiD637xeevjO2l3Z5loZmuaRi0L0YE5LfijwVY96oyVn0DFD3o/teAok7nfobMG1THvvcHh/BP6g==
dependencies:
cli-truncate "^4.0.0"
colorette "^2.0.20"
eventemitter3 "^5.0.1"
log-update "^6.0.0"
- rfdc "^1.3.0"
+ rfdc "^1.3.1"
wrap-ansi "^9.0.0"
load-json-file@6.2.0:
@@ -14131,7 +14421,7 @@ lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-log-symbols@^4.1.0:
+log-symbols@^4.0.0, log-symbols@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
@@ -14174,6 +14464,11 @@ lru-cache@^10.0.1:
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.1.0.tgz#2098d41c2dc56500e6c88584aa656c84de7d0484"
integrity sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==
+lru-cache@^10.2.2:
+ version "10.2.2"
+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.2.tgz#48206bc114c1252940c41b25b41af5b545aca878"
+ integrity sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==
+
lru-cache@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -14188,11 +14483,6 @@ lru-cache@^6.0.0:
dependencies:
yallist "^4.0.0"
-lru-cache@^7.5.1, lru-cache@^7.7.1:
- version "7.18.3"
- resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
- integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
-
lru-cache@^9.1.1:
version "9.1.2"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.1.2.tgz#255fdbc14b75589d6d0e73644ca167a8db506835"
@@ -14244,36 +14534,32 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
dependencies:
semver "^6.0.0"
-make-error@1.x:
+make-error@1.x, make-error@^1.1.1:
version "1.3.6"
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1, make-fetch-happen@^11.1.0:
- version "11.1.1"
- resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f"
- integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==
+make-fetch-happen@^13.0.0:
+ version "13.0.0"
+ resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz#705d6f6cbd7faecb8eac2432f551e49475bfedf0"
+ integrity sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==
dependencies:
- agentkeepalive "^4.2.1"
- cacache "^17.0.0"
+ "@npmcli/agent" "^2.0.0"
+ cacache "^18.0.0"
http-cache-semantics "^4.1.1"
- http-proxy-agent "^5.0.0"
- https-proxy-agent "^5.0.0"
is-lambda "^1.0.1"
- lru-cache "^7.7.1"
- minipass "^5.0.0"
+ minipass "^7.0.2"
minipass-fetch "^3.0.0"
minipass-flush "^1.0.5"
minipass-pipeline "^1.2.4"
negotiator "^0.6.3"
promise-retry "^2.0.1"
- socks-proxy-agent "^7.0.0"
ssri "^10.0.0"
-make-fetch-happen@^13.0.0:
- version "13.0.0"
- resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz#705d6f6cbd7faecb8eac2432f551e49475bfedf0"
- integrity sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==
+make-fetch-happen@^13.0.1:
+ version "13.0.1"
+ resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz#273ba2f78f45e1f3a6dca91cede87d9fa4821e36"
+ integrity sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==
dependencies:
"@npmcli/agent" "^2.0.0"
cacache "^18.0.0"
@@ -14284,6 +14570,7 @@ make-fetch-happen@^13.0.0:
minipass-flush "^1.0.5"
minipass-pipeline "^1.2.4"
negotiator "^0.6.3"
+ proc-log "^4.2.0"
promise-retry "^2.0.1"
ssri "^10.0.0"
@@ -14433,14 +14720,6 @@ methods@~1.1.2:
resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
-micromatch@4.0.5, micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
- version "4.0.5"
- resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
- integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
- dependencies:
- braces "^3.0.2"
- picomatch "^2.3.1"
-
micromatch@^3.1.4:
version "3.1.10"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -14460,6 +14739,22 @@ micromatch@^3.1.4:
snapdragon "^0.8.1"
to-regex "^3.0.2"
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
+ version "4.0.5"
+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+ integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+ dependencies:
+ braces "^3.0.2"
+ picomatch "^2.3.1"
+
+micromatch@~4.0.7:
+ version "4.0.7"
+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5"
+ integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==
+ dependencies:
+ braces "^3.0.3"
+ picomatch "^2.3.1"
+
mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
version "1.52.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
@@ -14531,7 +14826,7 @@ minimatch@3.0.5:
dependencies:
brace-expansion "^1.1.7"
-minimatch@9.0.3, minimatch@^9.0.3:
+minimatch@9.0.3:
version "9.0.3"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
@@ -14566,6 +14861,13 @@ minimatch@^9.0.0, minimatch@^9.0.1:
dependencies:
brace-expansion "^2.0.1"
+minimatch@^9.0.4:
+ version "9.0.4"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
+ integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
+ dependencies:
+ brace-expansion "^2.0.1"
+
minimist-options@4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
@@ -14623,14 +14925,6 @@ minipass-flush@^1.0.5:
dependencies:
minipass "^3.0.0"
-minipass-json-stream@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7"
- integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==
- dependencies:
- jsonparse "^1.3.1"
- minipass "^3.0.0"
-
minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
@@ -14764,7 +15058,7 @@ mute-stream@0.0.8:
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-mute-stream@~1.0.0:
+mute-stream@^1.0.0, mute-stream@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e"
integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==
@@ -15009,6 +15303,13 @@ nopt@^7.0.0:
dependencies:
abbrev "^2.0.0"
+nopt@^7.2.1:
+ version "7.2.1"
+ resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7"
+ integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==
+ dependencies:
+ abbrev "^2.0.0"
+
normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -15029,20 +15330,20 @@ normalize-package-data@^3.0.0, normalize-package-data@^3.0.3:
semver "^7.3.4"
validate-npm-package-license "^3.0.1"
-normalize-package-data@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-5.0.0.tgz#abcb8d7e724c40d88462b84982f7cbf6859b4588"
- integrity sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==
+normalize-package-data@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-6.0.0.tgz#68a96b3c11edd462af7189c837b6b1064a484196"
+ integrity sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==
dependencies:
- hosted-git-info "^6.0.0"
+ hosted-git-info "^7.0.0"
is-core-module "^2.8.1"
semver "^7.3.5"
validate-npm-package-license "^3.0.4"
-normalize-package-data@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-6.0.0.tgz#68a96b3c11edd462af7189c837b6b1064a484196"
- integrity sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==
+normalize-package-data@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-6.0.1.tgz#fa69e9452210f0fabf4d79ee08d0c2870c51ed88"
+ integrity sha512-6rvCfeRW+OEZagAB4lMLSNuTNYZWLVtKccK79VSTf//yTY5VOCgcpH80O+bZK8Neps7pUnd5G+QlMg1yV/2iZQ==
dependencies:
hosted-git-info "^7.0.0"
is-core-module "^2.8.1"
@@ -15071,13 +15372,6 @@ normalize-url@^6.0.1:
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
-npm-bundled@^1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
- integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
- dependencies:
- npm-normalize-package-bin "^1.0.1"
-
npm-bundled@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-3.0.0.tgz#7e8e2f8bb26b794265028491be60321a25a39db7"
@@ -15092,32 +15386,25 @@ npm-install-checks@^6.0.0:
dependencies:
semver "^7.1.1"
-npm-normalize-package-bin@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
- integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
+npm-install-checks@^6.2.0:
+ version "6.3.0"
+ resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-6.3.0.tgz#046552d8920e801fa9f919cad569545d60e826fe"
+ integrity sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==
+ dependencies:
+ semver "^7.1.1"
npm-normalize-package-bin@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz#25447e32a9a7de1f51362c61a559233b89947832"
integrity sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==
-npm-package-arg@8.1.1:
- version "8.1.1"
- resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.1.tgz#00ebf16ac395c63318e67ce66780a06db6df1b04"
- integrity sha512-CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg==
- dependencies:
- hosted-git-info "^3.0.6"
- semver "^7.0.0"
- validate-npm-package-name "^3.0.0"
-
-npm-package-arg@^10.0.0, npm-package-arg@^10.1.0:
- version "10.1.0"
- resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-10.1.0.tgz#827d1260a683806685d17193073cc152d3c7e9b1"
- integrity sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==
+npm-package-arg@11.0.2, npm-package-arg@^11.0.2:
+ version "11.0.2"
+ resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-11.0.2.tgz#1ef8006c4a9e9204ddde403035f7ff7d718251ca"
+ integrity sha512-IGN0IAwmhDJwy13Wc8k+4PEbTPhpJnMtfR53ZbOyjkvmEcLS4nCwp6mvMWjS5sUjeiW3mpx6cHmuhKEu9XmcQw==
dependencies:
- hosted-git-info "^6.0.0"
- proc-log "^3.0.0"
+ hosted-git-info "^7.0.0"
+ proc-log "^4.0.0"
semver "^7.3.5"
validate-npm-package-name "^5.0.0"
@@ -15131,15 +15418,12 @@ npm-package-arg@^11.0.0:
semver "^7.3.5"
validate-npm-package-name "^5.0.0"
-npm-packlist@5.1.1:
- version "5.1.1"
- resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.1.1.tgz#79bcaf22a26b6c30aa4dd66b976d69cc286800e0"
- integrity sha512-UfpSvQ5YKwctmodvPPkK6Fwk603aoVsf8AEbmVKAEECrfvL8SSe1A2YIwrJ6xmTHAITKPwwZsWo7WwEbNk0kxw==
+npm-packlist@8.0.2:
+ version "8.0.2"
+ resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-8.0.2.tgz#5b8d1d906d96d21c85ebbeed2cf54147477c8478"
+ integrity sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA==
dependencies:
- glob "^8.0.1"
- ignore-walk "^5.0.1"
- npm-bundled "^1.1.2"
- npm-normalize-package-bin "^1.0.1"
+ ignore-walk "^6.0.4"
npm-packlist@^8.0.0:
version "8.0.1"
@@ -15158,31 +15442,29 @@ npm-pick-manifest@^9.0.0:
npm-package-arg "^11.0.0"
semver "^7.3.5"
-npm-registry-fetch@^14.0.3, npm-registry-fetch@^14.0.5:
- version "14.0.5"
- resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz#fe7169957ba4986a4853a650278ee02e568d115d"
- integrity sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==
+npm-pick-manifest@^9.0.1:
+ version "9.0.1"
+ resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-9.0.1.tgz#c90658bd726fe5bca9d2869f3e99359b8fcda046"
+ integrity sha512-Udm1f0l2nXb3wxDpKjfohwgdFUSV50UVwzEIpDXVsbDMXVIEF81a/i0UhuQbhrPMMmdiq3+YMFLFIRVLs3hxQw==
dependencies:
- make-fetch-happen "^11.0.0"
- minipass "^5.0.0"
- minipass-fetch "^3.0.0"
- minipass-json-stream "^1.0.1"
- minizlib "^2.1.2"
- npm-package-arg "^10.0.0"
- proc-log "^3.0.0"
+ npm-install-checks "^6.0.0"
+ npm-normalize-package-bin "^3.0.0"
+ npm-package-arg "^11.0.0"
+ semver "^7.3.5"
-npm-registry-fetch@^16.0.0:
- version "16.1.0"
- resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-16.1.0.tgz#10227b7b36c97bc1cf2902a24e4f710cfe62803c"
- integrity sha512-PQCELXKt8Azvxnt5Y85GseQDJJlglTFM9L9U9gkv2y4e9s0k3GVDdOx3YoB6gm2Do0hlkzC39iCGXby+Wve1Bw==
+npm-registry-fetch@^17.0.0, npm-registry-fetch@^17.0.1, npm-registry-fetch@^17.1.0:
+ version "17.1.0"
+ resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-17.1.0.tgz#fb69e8e762d456f08bda2f5f169f7638fb92beb1"
+ integrity sha512-5+bKQRH0J1xG1uZ1zMNvxW0VEyoNWgJpY9UDuluPFLKDfJ9u2JmmjmTJV1srBGQOROfdBMiVvnH2Zvpbm+xkVA==
dependencies:
+ "@npmcli/redact" "^2.0.0"
+ jsonparse "^1.3.1"
make-fetch-happen "^13.0.0"
minipass "^7.0.2"
minipass-fetch "^3.0.0"
- minipass-json-stream "^1.0.1"
minizlib "^2.1.2"
npm-package-arg "^11.0.0"
- proc-log "^3.0.0"
+ proc-log "^4.0.0"
npm-run-path@^2.0.0:
version "2.0.2"
@@ -15215,7 +15497,7 @@ npmlog@^5.0.1:
gauge "^3.0.0"
set-blocking "^2.0.0"
-npmlog@^6.0.0, npmlog@^6.0.2:
+npmlog@^6.0.0:
version "6.0.2"
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
@@ -15244,16 +15526,16 @@ nwsapi@^2.2.0:
resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.5.tgz#a52744c61b3889dd44b0a158687add39b8d935e2"
integrity sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ==
-nx@17.2.6, "nx@>=17.1.2 < 18":
- version "17.2.6"
- resolved "https://registry.yarnpkg.com/nx/-/nx-17.2.6.tgz#717297e0757237aa010f2e07aa8fdf68e77ea104"
- integrity sha512-lBHp0e0AMBwYwpT44a8b0j29szspmYUhY1okqNctz/3ifuonNFG9WGfbzRO4YKOrVkfNsuaomHVAE6gtqo55ng==
+nx@19.3.1, "nx@>=17.1.2 < 20":
+ version "19.3.1"
+ resolved "https://registry.yarnpkg.com/nx/-/nx-19.3.1.tgz#d0e0367b01828ce9f55cd2b58f75b5e21443a670"
+ integrity sha512-dDkhnXMpnDN5/ZJxJXz7wPlKA3pQwQmwNQ3YmTrCwucNbpwNRdwXiDgbLpjlGCtaeE9yZh2E/dAH1HNbgViJ6g==
dependencies:
- "@nrwl/tao" "17.2.6"
+ "@nrwl/tao" "19.3.1"
"@yarnpkg/lockfile" "^1.1.0"
"@yarnpkg/parsers" "3.0.0-rc.46"
- "@zkochan/js-yaml" "0.0.6"
- axios "^1.5.1"
+ "@zkochan/js-yaml" "0.0.7"
+ axios "^1.6.0"
chalk "^4.1.0"
cli-cursor "3.1.0"
cli-spinners "2.6.1"
@@ -15263,18 +15545,18 @@ nx@17.2.6, "nx@>=17.1.2 < 18":
enquirer "~2.3.6"
figures "3.2.0"
flat "^5.0.2"
+ front-matter "^4.0.2"
fs-extra "^11.1.0"
- glob "7.1.4"
ignore "^5.0.4"
jest-diff "^29.4.1"
- js-yaml "4.1.0"
jsonc-parser "3.2.0"
lines-and-columns "~2.0.3"
- minimatch "3.0.5"
+ minimatch "9.0.3"
node-machine-id "1.1.12"
npm-run-path "^4.0.1"
open "^8.4.0"
- semver "7.5.3"
+ ora "5.3.0"
+ semver "^7.5.3"
string-width "^4.2.3"
strong-log-transformer "^2.1.0"
tar-stream "~2.2.0"
@@ -15284,16 +15566,16 @@ nx@17.2.6, "nx@>=17.1.2 < 18":
yargs "^17.6.2"
yargs-parser "21.1.1"
optionalDependencies:
- "@nx/nx-darwin-arm64" "17.2.6"
- "@nx/nx-darwin-x64" "17.2.6"
- "@nx/nx-freebsd-x64" "17.2.6"
- "@nx/nx-linux-arm-gnueabihf" "17.2.6"
- "@nx/nx-linux-arm64-gnu" "17.2.6"
- "@nx/nx-linux-arm64-musl" "17.2.6"
- "@nx/nx-linux-x64-gnu" "17.2.6"
- "@nx/nx-linux-x64-musl" "17.2.6"
- "@nx/nx-win32-arm64-msvc" "17.2.6"
- "@nx/nx-win32-x64-msvc" "17.2.6"
+ "@nx/nx-darwin-arm64" "19.3.1"
+ "@nx/nx-darwin-x64" "19.3.1"
+ "@nx/nx-freebsd-x64" "19.3.1"
+ "@nx/nx-linux-arm-gnueabihf" "19.3.1"
+ "@nx/nx-linux-arm64-gnu" "19.3.1"
+ "@nx/nx-linux-arm64-musl" "19.3.1"
+ "@nx/nx-linux-x64-gnu" "19.3.1"
+ "@nx/nx-linux-x64-musl" "19.3.1"
+ "@nx/nx-win32-arm64-msvc" "19.3.1"
+ "@nx/nx-win32-x64-msvc" "19.3.1"
object-assign@^4.0.1, object-assign@^4.1.1:
version "4.1.1"
@@ -15354,6 +15636,16 @@ object.assign@^4.1.0, object.assign@^4.1.2, object.assign@^4.1.3, object.assign@
has-symbols "^1.0.3"
object-keys "^1.1.1"
+object.assign@^4.1.5:
+ version "4.1.5"
+ resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0"
+ integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==
+ dependencies:
+ call-bind "^1.0.5"
+ define-properties "^1.2.1"
+ has-symbols "^1.0.3"
+ object-keys "^1.1.1"
+
object.entries@^1.1.1, object.entries@^1.1.2, object.entries@^1.1.5, object.entries@^1.1.6:
version "1.1.6"
resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.6.tgz#9737d0e5b8291edd340a3e3264bb8a3b00d5fa23"
@@ -15363,7 +15655,7 @@ object.entries@^1.1.1, object.entries@^1.1.2, object.entries@^1.1.5, object.entr
define-properties "^1.1.4"
es-abstract "^1.20.4"
-object.fromentries@^2.0.0, object.fromentries@^2.0.5, object.fromentries@^2.0.6:
+object.fromentries@^2.0.0, object.fromentries@^2.0.6:
version "2.0.6"
resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.6.tgz#cdb04da08c539cffa912dcd368b886e0904bfa73"
integrity sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==
@@ -15417,7 +15709,7 @@ object.pick@^1.3.0:
dependencies:
isobject "^3.0.1"
-object.values@^1.1.0, object.values@^1.1.1, object.values@^1.1.5, object.values@^1.1.6:
+object.values@^1.1.0, object.values@^1.1.1, object.values@^1.1.6:
version "1.1.6"
resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
@@ -15544,6 +15836,20 @@ optionator@^0.9.3:
prelude-ls "^1.2.1"
type-check "^0.4.0"
+ora@5.3.0:
+ version "5.3.0"
+ resolved "https://registry.yarnpkg.com/ora/-/ora-5.3.0.tgz#fb832899d3a1372fe71c8b2c534bbfe74961bb6f"
+ integrity sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==
+ dependencies:
+ bl "^4.0.3"
+ chalk "^4.1.0"
+ cli-cursor "^3.1.0"
+ cli-spinners "^2.5.0"
+ is-interactive "^1.0.0"
+ log-symbols "^4.0.0"
+ strip-ansi "^6.0.0"
+ wcwidth "^1.0.1"
+
ora@^5.4.1:
version "5.4.1"
resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
@@ -15685,27 +15991,26 @@ p-waterfall@2.1.1:
dependencies:
p-reduce "^2.0.0"
-pacote@^17.0.5:
- version "17.0.5"
- resolved "https://registry.yarnpkg.com/pacote/-/pacote-17.0.5.tgz#e9854edee7a073635cdd36b0c07cd4f2ab1757b6"
- integrity sha512-TAE0m20zSDMnchPja9vtQjri19X3pZIyRpm2TJVeI+yU42leJBBDTRYhOcWFsPhaMxf+3iwQkFiKz16G9AEeeA==
+pacote@^18.0.0, pacote@^18.0.6:
+ version "18.0.6"
+ resolved "https://registry.yarnpkg.com/pacote/-/pacote-18.0.6.tgz#ac28495e24f4cf802ef911d792335e378e86fac7"
+ integrity sha512-+eK3G27SMwsB8kLIuj4h1FUhHtwiEUo21Tw8wNjmvdlpOEr613edv+8FUsTj/4F/VN5ywGE19X18N7CC2EJk6A==
dependencies:
"@npmcli/git" "^5.0.0"
"@npmcli/installed-package-contents" "^2.0.1"
+ "@npmcli/package-json" "^5.1.0"
"@npmcli/promise-spawn" "^7.0.0"
- "@npmcli/run-script" "^7.0.0"
+ "@npmcli/run-script" "^8.0.0"
cacache "^18.0.0"
fs-minipass "^3.0.0"
minipass "^7.0.2"
npm-package-arg "^11.0.0"
npm-packlist "^8.0.0"
npm-pick-manifest "^9.0.0"
- npm-registry-fetch "^16.0.0"
- proc-log "^3.0.0"
+ npm-registry-fetch "^17.0.0"
+ proc-log "^4.0.0"
promise-retry "^2.0.1"
- read-package-json "^7.0.0"
- read-package-json-fast "^3.0.0"
- sigstore "^2.0.0"
+ sigstore "^2.2.0"
ssri "^10.0.0"
tar "^6.1.11"
@@ -15734,6 +16039,15 @@ parent-module@^1.0.0:
dependencies:
callsites "^3.0.0"
+parse-conflict-json@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-3.0.1.tgz#67dc55312781e62aa2ddb91452c7606d1969960c"
+ integrity sha512-01TvEktc68vwbJOtWZluyWeVGWjP+bZwXtPDMQVbBKzbJ/vZBif0L69KH1+cHv1SZ6e0FKLvjyHe8mqsIqYOmw==
+ dependencies:
+ json-parse-even-better-errors "^3.0.0"
+ just-diff "^6.0.0"
+ just-diff-apply "^5.2.0"
+
parse-json@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -15936,7 +16250,7 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatc
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-pidtree@0.6.0:
+pidtree@~0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c"
integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==
@@ -16682,6 +16996,11 @@ proc-log@^3.0.0:
resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-3.0.0.tgz#fb05ef83ccd64fd7b20bbe9c8c1070fc08338dd8"
integrity sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==
+proc-log@^4.0.0, proc-log@^4.1.0, proc-log@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-4.2.0.tgz#b6f461e4026e75fdfe228b265e9f7a00779d7034"
+ integrity sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==
+
process-nextick-args@~2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -16692,11 +17011,26 @@ process@^0.11.10:
resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
+proggy@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/proggy/-/proggy-2.0.0.tgz#154bb0e41d3125b518ef6c79782455c2c47d94e1"
+ integrity sha512-69agxLtnI8xBs9gUGqEnK26UfiexpHy+KUpBQWabiytQjnn5wFY8rklAi7GRfABIuPNnQ/ik48+LGLkYYJcy4A==
+
progress@^2.0.1, progress@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+promise-all-reject-late@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz#f8ebf13483e5ca91ad809ccc2fcf25f26f8643c2"
+ integrity sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==
+
+promise-call-limit@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/promise-call-limit/-/promise-call-limit-3.0.1.tgz#3570f7a3f2aaaf8e703623a552cd74749688cf19"
+ integrity sha512-utl+0x8gIDasV5X+PI5qWEPqH6fJS0pFtQ/4gZ95xfEFb/89dmh+/b895TbFDBLiafBvxD/PGTKfvxl4kH/pQg==
+
promise-inflight@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
@@ -17038,11 +17372,11 @@ react-error-overlay@^6.0.11:
integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==
react-i18next@13.5.0, react-i18next@>=11.16.4:
- version "14.1.0"
- resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-14.1.0.tgz#44da74fbffd416f5d0c5307ef31735cf10cc91d9"
- integrity sha512-3KwX6LHpbvGQ+sBEntjV4sYW3Zovjjl3fpoHbUwSgFHf0uRBcbeCBLR5al6ikncI5+W0EFb71QXZmfop+J6NrQ==
+ version "15.0.0"
+ resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-15.0.0.tgz#4980f8edf85b9df6573d6b12d95aca5b8f0cc8b0"
+ integrity sha512-2O3IgF4zivg57Q6p6i+ChDgJ371IDcEWbuWC6gvoh5NbkDMs0Q+O7RPr4v61+Se32E0V+LmtwePAeqWZW0bi6g==
dependencies:
- "@babel/runtime" "^7.23.9"
+ "@babel/runtime" "^7.24.8"
html-parse-stringify "^3.0.1"
react-inspector@6.0.2:
@@ -17234,7 +17568,7 @@ read-cache@^1.0.0:
dependencies:
pify "^2.3.0"
-read-cmd-shim@4.0.0:
+read-cmd-shim@4.0.0, read-cmd-shim@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz#640a08b473a49043e394ae0c7a34dd822c73b9bb"
integrity sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==
@@ -17251,7 +17585,7 @@ read-config-file@6.3.2:
json5 "^2.2.0"
lazy-val "^1.0.4"
-read-package-json-fast@^3.0.0:
+read-package-json-fast@^3.0.0, read-package-json-fast@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz#394908a9725dc7a5f14e70c8e7556dff1d2b1049"
integrity sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==
@@ -17259,26 +17593,6 @@ read-package-json-fast@^3.0.0:
json-parse-even-better-errors "^3.0.0"
npm-normalize-package-bin "^3.0.0"
-read-package-json@6.0.4, read-package-json@^6.0.0:
- version "6.0.4"
- resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-6.0.4.tgz#90318824ec456c287437ea79595f4c2854708836"
- integrity sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==
- dependencies:
- glob "^10.2.2"
- json-parse-even-better-errors "^3.0.0"
- normalize-package-data "^5.0.0"
- npm-normalize-package-bin "^3.0.0"
-
-read-package-json@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-7.0.0.tgz#d605c9dcf6bc5856da24204aa4e9518ee9714be0"
- integrity sha512-uL4Z10OKV4p6vbdvIXB+OzhInYtIozl/VxUBPgNkBuUi2DeRonnuspmaVAMcrkmfjKGNmRndyQAbE7/AmzGwFg==
- dependencies:
- glob "^10.2.2"
- json-parse-even-better-errors "^3.0.0"
- normalize-package-data "^6.0.0"
- npm-normalize-package-bin "^3.0.0"
-
read-pkg-up@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
@@ -17322,6 +17636,13 @@ read@^2.0.0:
dependencies:
mute-stream "~1.0.0"
+read@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/read/-/read-3.0.1.tgz#926808f0f7c83fa95f1ef33c0e2c09dbb28fd192"
+ integrity sha512-SLBrDU/Srs/9EoWhU5GdbAoxG1GzpQHo/6qiGItaoLJ1thmYpcNIM1qISEUvyHBzfGlWIyd6p2DNi1oV1VmAuw==
+ dependencies:
+ mute-stream "^1.0.0"
+
readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.5, readable-stream@^2.2.2, readable-stream@~2.3.6:
version "2.3.8"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
@@ -17675,10 +17996,10 @@ reusify@^1.0.4:
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
-rfdc@^1.3.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
- integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
+rfdc@^1.3.1:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz#778f76c4fb731d93414e8f925fbecf64cce7f6ca"
+ integrity sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==
rgbcolor@^1.0.1:
version "1.0.1"
@@ -17970,18 +18291,11 @@ semver-compare@^1.0.0:
resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
-"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
+"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0, semver@^5.7.2:
version "5.7.2"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
-semver@7.5.3:
- version "7.5.3"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"
- integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
- dependencies:
- lru-cache "^6.0.0"
-
semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
version "6.3.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
@@ -18181,25 +18495,17 @@ signal-exit@^4.1.0:
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
-sigstore@^1.4.0:
- version "1.6.0"
- resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-1.6.0.tgz#887a4007c6ee83f3ef3fd844be1a0840e849c301"
- integrity sha512-QODKff/qW/TXOZI6V/Clqu74xnInAS6it05mufj4/fSewexLtfEntgLZZcBtUK44CDQyUE5TUXYy1ARYzlfG9g==
- dependencies:
- "@sigstore/protobuf-specs" "^0.1.0"
- "@sigstore/tuf" "^1.0.0"
- make-fetch-happen "^11.0.1"
- tuf-js "^1.1.3"
-
-sigstore@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-2.1.0.tgz#c577b596642b3f360dc4135d476466e6edeb2364"
- integrity sha512-kPIj+ZLkyI3QaM0qX8V/nSsweYND3W448pwkDgS6CQ74MfhEkIR8ToK5Iyx46KJYRjseVcD3Rp9zAmUAj6ZjPw==
+sigstore@^2.2.0:
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-2.3.1.tgz#0755dd2cc4820f2e922506da54d3d628e13bfa39"
+ integrity sha512-8G+/XDU8wNsJOQS5ysDVO0Etg9/2uA5gR9l4ZwijjlwxBcrU6RPfwi2+jJmbP+Ap1Hlp/nVAaEO4Fj22/SL2gQ==
dependencies:
- "@sigstore/bundle" "^2.1.0"
- "@sigstore/protobuf-specs" "^0.2.1"
- "@sigstore/sign" "^2.1.0"
- "@sigstore/tuf" "^2.1.0"
+ "@sigstore/bundle" "^2.3.2"
+ "@sigstore/core" "^1.0.0"
+ "@sigstore/protobuf-specs" "^0.3.2"
+ "@sigstore/sign" "^2.3.2"
+ "@sigstore/tuf" "^2.3.4"
+ "@sigstore/verify" "^1.2.1"
simple-concat@^1.0.0:
version "1.0.1"
@@ -18315,15 +18621,6 @@ socks-proxy-agent@^6.0.0:
debug "^4.3.3"
socks "^2.6.2"
-socks-proxy-agent@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
- integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
- dependencies:
- agent-base "^6.0.2"
- debug "^4.3.3"
- socks "^2.6.2"
-
socks-proxy-agent@^8.0.1:
version "8.0.2"
resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz#5acbd7be7baf18c46a3f293a840109a430a640ad"
@@ -18519,13 +18816,20 @@ sqlite3@5.1.6:
optionalDependencies:
node-gyp "8.x"
-ssri@^10.0.0, ssri@^10.0.1:
+ssri@^10.0.0:
version "10.0.4"
resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.4.tgz#5a20af378be586df139ddb2dfb3bf992cf0daba6"
integrity sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ==
dependencies:
minipass "^5.0.0"
+ssri@^10.0.6:
+ version "10.0.6"
+ resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.6.tgz#a8aade2de60ba2bce8688e3fa349bad05c7dc1e5"
+ integrity sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==
+ dependencies:
+ minipass "^7.0.3"
+
ssri@^8.0.0, ssri@^8.0.1:
version "8.0.1"
resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
@@ -18533,13 +18837,6 @@ ssri@^8.0.0, ssri@^8.0.1:
dependencies:
minipass "^3.1.1"
-ssri@^9.0.1:
- version "9.0.1"
- resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
- integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
- dependencies:
- minipass "^3.1.1"
-
stable@^0.1.8:
version "0.1.8"
resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
@@ -18625,7 +18922,7 @@ streamx@^2.15.0:
fast-fifo "^1.1.0"
queue-tick "^1.0.1"
-string-argv@0.3.2:
+string-argv@~0.3.2:
version "0.3.2"
resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==
@@ -19062,14 +19359,14 @@ tar-stream@^3.0.0:
fast-fifo "^1.2.0"
streamx "^2.15.0"
-tar@6.1.11:
- version "6.1.11"
- resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
- integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
+tar@6.2.1:
+ version "6.2.1"
+ resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
+ integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
dependencies:
chownr "^2.0.0"
fs-minipass "^2.0.0"
- minipass "^3.0.0"
+ minipass "^5.0.0"
minizlib "^2.1.1"
mkdirp "^1.0.3"
yallist "^4.0.0"
@@ -19241,6 +19538,11 @@ tiny-invariant@^1.3.1:
resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642"
integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
+tiny-typed-emitter@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz#b3b027fdd389ff81a152c8e847ee2f5be9fad7b5"
+ integrity sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==
+
tmp-promise@^3.0.2:
version "3.0.3"
resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7"
@@ -19348,6 +19650,11 @@ tree-kill@^1.2.2:
resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
+treeverse@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-3.0.0.tgz#dd82de9eb602115c6ebd77a574aae67003cb48c8"
+ integrity sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ==
+
trim-newlines@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
@@ -19380,10 +19687,10 @@ ts-interface-checker@^0.1.9:
resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699"
integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==
-ts-jest@29.1.1:
- version "29.1.1"
- resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.1.tgz#f58fe62c63caf7bfcc5cc6472082f79180f0815b"
- integrity sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==
+ts-jest@29.2.0:
+ version "29.2.0"
+ resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.2.0.tgz#e1a0e624d8dbed4303debf0d8e063b4403d15c40"
+ integrity sha512-eFmkE9MG0+oT6nqSOcUwL+2UUmK2IvhhUV8hFDsCHnc++v2WCCbQQZh5vvjsa8sgOY/g9T0325hmkEmi6rninA==
dependencies:
bs-logger "0.x"
fast-json-stable-stringify "2.x"
@@ -19394,6 +19701,25 @@ ts-jest@29.1.1:
semver "^7.5.3"
yargs-parser "^21.0.1"
+ts-node@^10.9.2:
+ version "10.9.2"
+ resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
+ integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
+ dependencies:
+ "@cspotcode/source-map-support" "^0.8.0"
+ "@tsconfig/node10" "^1.0.7"
+ "@tsconfig/node12" "^1.0.7"
+ "@tsconfig/node14" "^1.0.0"
+ "@tsconfig/node16" "^1.0.2"
+ acorn "^8.4.1"
+ acorn-walk "^8.1.1"
+ arg "^4.1.0"
+ create-require "^1.1.0"
+ diff "^4.0.1"
+ make-error "^1.1.1"
+ v8-compile-cache-lib "^3.0.1"
+ yn "3.1.1"
+
ts-pnp@^1.1.6:
version "1.2.0"
resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
@@ -19428,10 +19754,10 @@ tsconfig-paths@^4.1.2:
minimist "^1.2.6"
strip-bom "^3.0.0"
-tslib@2.6.2:
- version "2.6.2"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
- integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
+tslib@2.6.3, tslib@^2.5.0:
+ version "2.6.3"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
+ integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
tslib@^1.10.0, tslib@^1.13.0, tslib@^1.8.1, tslib@^1.9.0:
version "1.14.1"
@@ -19450,23 +19776,14 @@ tsutils@^3.21.0:
dependencies:
tslib "^1.8.1"
-tuf-js@^1.1.3:
- version "1.1.6"
- resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.6.tgz#ad3e7a20237b83b51c2a8f9d1ddf093279a10fc2"
- integrity sha512-CXwFVIsXGbVY4vFiWF7TJKWmlKJAT8TWkH4RmiohJRcDJInix++F0dznDmoVbtJNzZ8yLprKUG4YrDIhv3nBMg==
- dependencies:
- "@tufjs/models" "1.0.4"
- debug "^4.3.4"
- make-fetch-happen "^11.1.0"
-
-tuf-js@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-2.1.0.tgz#87aa36d5a166e7522f1e2050eb502a3a9b0bde72"
- integrity sha512-eD7YPPjVlMzdggrOeE8zwoegUaG/rt6Bt3jwoQPunRiNVzgcCE009UDFJKJjG+Gk9wFu6W/Vi+P5d/5QpdD9jA==
+tuf-js@^2.2.1:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-2.2.1.tgz#fdd8794b644af1a75c7aaa2b197ddffeb2911b56"
+ integrity sha512-GwIJau9XaA8nLVbUXsN3IlFi7WmQ48gBUrl3FTkkL/XLu/POhBzfmX9hd33FNMX1qAsfl6ozO1iMmW9NC8YniA==
dependencies:
- "@tufjs/models" "2.0.0"
+ "@tufjs/models" "2.0.1"
debug "^4.3.4"
- make-fetch-happen "^13.0.0"
+ make-fetch-happen "^13.0.1"
tunnel-agent@^0.6.0:
version "0.6.0"
@@ -19659,13 +19976,6 @@ undici-types@~5.26.4:
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-undici@5.28.4:
- version "5.28.4"
- resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.4.tgz#6b280408edb6a1a604a9b20340f45b422e373068"
- integrity sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==
- dependencies:
- "@fastify/busboy" "^2.0.0"
-
unicode-canonical-property-names-ecmascript@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
@@ -19954,11 +20264,21 @@ uuid@8.3.2, uuid@^8.3.0, uuid@^8.3.2:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+uuid@^10.0.0:
+ version "10.0.0"
+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-10.0.0.tgz#5a95aa454e6e002725c79055fd42aaba30ca6294"
+ integrity sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==
+
uuid@^9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
+v8-compile-cache-lib@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
+ integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
+
v8-to-istanbul@^8.1.0:
version "8.1.1"
resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz#77b752fd3975e31bbcef938f85e9bd1c7a8d60ed"
@@ -19976,20 +20296,18 @@ validate-npm-package-license@3.0.4, validate-npm-package-license@^3.0.1, validat
spdx-correct "^3.0.0"
spdx-expression-parse "^3.0.0"
-validate-npm-package-name@5.0.0, validate-npm-package-name@^5.0.0:
+validate-npm-package-name@5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz#a316573e9b49f3ccd90dbb6eb52b3f06c6d604e8"
+ integrity sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==
+
+validate-npm-package-name@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz#f16afd48318e6f90a1ec101377fa0384cfc8c713"
integrity sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==
dependencies:
builtins "^5.0.0"
-validate-npm-package-name@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
- integrity sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==
- dependencies:
- builtins "^1.0.3"
-
vary@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
@@ -20034,6 +20352,11 @@ wait-on@7.0.1:
minimist "^1.2.7"
rxjs "^7.8.0"
+walk-up-path@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-3.0.1.tgz#c8d78d5375b4966c717eb17ada73dbd41490e886"
+ integrity sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==
+
walker@^1.0.7, walker@^1.0.8, walker@~1.0.5:
version "1.0.8"
resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
@@ -20376,7 +20699,7 @@ which@^4.0.0:
dependencies:
isexe "^3.1.1"
-wide-align@^1.1.2, wide-align@^1.1.5:
+wide-align@1.1.5, wide-align@^1.1.2, wide-align@^1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
@@ -20603,7 +20926,7 @@ wrappy@1:
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-write-file-atomic@5.0.1:
+write-file-atomic@5.0.1, write-file-atomic@^5.0.0:
version "5.0.1"
resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.1.tgz#68df4717c55c6fa4281a7860b4c2ba0a6d2b11e7"
integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==
@@ -20660,21 +20983,21 @@ write-pkg@4.0.0:
write-json-file "^3.2.0"
ws@^6.1.0:
- version "6.2.2"
- resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
- integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
+ version "6.2.3"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.3.tgz#ccc96e4add5fd6fedbc491903075c85c5a11d9ee"
+ integrity sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==
dependencies:
async-limiter "~1.0.0"
ws@^7.4.6:
- version "7.5.9"
- resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
- integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
+ version "7.5.10"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
+ integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
ws@^8.13.0, ws@^8.2.3:
- version "8.13.0"
- resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
- integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
+ version "8.17.1"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
+ integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
xml-name-validator@^3.0.0:
version "3.0.0"
@@ -20716,11 +21039,6 @@ yallist@^4.0.0:
resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-yaml@2.3.4:
- version "2.3.4"
- resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.4.tgz#53fc1d514be80aabf386dc6001eb29bf3b7523b2"
- integrity sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==
-
yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2:
version "1.10.2"
resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
@@ -20731,6 +21049,11 @@ yaml@^2.1.1:
resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b"
integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==
+yaml@~2.4.2:
+ version "2.4.5"
+ resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.5.tgz#60630b206dd6d84df97003d33fc1ddf6296cca5e"
+ integrity sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==
+
yargs-parser@21.1.1, yargs-parser@^21.0.1, yargs-parser@^21.1.1:
version "21.1.1"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
@@ -20775,6 +21098,11 @@ yauzl@^2.10.0:
buffer-crc32 "~0.2.3"
fd-slicer "~1.1.0"
+yn@3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+ integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+
yocto-queue@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"