@bsv/wallet-toolbox 1.6.2 → 1.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "description": "BRC100 conforming wallet, wallet storage and wallet signer components",
   "main": "./out/src/index.js",
   "types": "./out/src/index.d.ts",

package/src/services/chaintracker/chaintracks/Ingest/BulkIngestorCDN.ts

@@ -6,7 +6,6 @@ import { BulkHeaderFileInfo } from '../util/BulkHeaderFile'
 import { BulkHeaderFilesInfo } from '../util/BulkHeaderFile'
 import { HeightRange, HeightRanges } from '../util/HeightRange'
 import { ChaintracksFetchApi } from '../Api/ChaintracksFetchApi'
-import { logger } from '../../../../../test/utils/TestUtilsWalletStorage'
 import { WalletError, WERR_INVALID_PARAMETER } from '../../../../sdk'
 import { validateBulkFileData } from '../util/blockHeaderUtilities'
 import { selectBulkHeaderFiles } from '../util/BulkFileDataManager'
@@ -168,7 +167,7 @@ export class BulkIngestorCDN extends BulkIngestorBase {
     for (const u of r.updated) {
       log += `  updated: ${u.fileName}, fileId=${u.fileId}\n`
     }
-    logger(log)
+    console.log(log)
 
     return priorLiveHeaders
   }

package/src/services/chaintracker/chaintracks/index.all.ts

@@ -5,3 +5,7 @@ export * from './Storage/ChaintracksStorageKnex'
 export * from './Storage/ChaintracksStorageMemory'
 
 export * from './createDefaultKnexChaintracksOptions'
+
+export * from './ChaintracksService'
+export * from './Ingest/BulkIngestorWhatsOnChainWs'
+export * from './Ingest/LiveIngestorWhatsOnChainWs'

package/src/services/chaintracker/chaintracks/index.client.ts

@@ -10,7 +10,6 @@ export * from './Api/LiveIngestorApi'
 export * from './Api/BlockHeaderApi'
 
 export * from './Chaintracks'
-export * from './ChaintracksService'
 export * from './ChaintracksServiceClient'
 
 export * from './Ingest/BulkIngestorBase'
@@ -19,9 +18,7 @@ export * from './Ingest/LiveIngestorBase'
 export * from './Ingest/BulkIngestorCDN'
 export * from './Ingest/BulkIngestorCDNBabbage'
 export * from './Ingest/BulkIngestorWhatsOnChainCdn'
-export * from './Ingest/BulkIngestorWhatsOnChainWs'
 export * from './Ingest/LiveIngestorWhatsOnChainPoll'
-export * from './Ingest/LiveIngestorWhatsOnChainWs'
 export * from './Ingest/WhatsOnChainServices'
 
 export * from './Storage/BulkStorageBase'

package/src/services/chaintracker/chaintracks/util/BulkFileDataManager.ts

@@ -16,7 +16,6 @@ import {
 } from './blockHeaderUtilities'
 import { ChaintracksStorageBulkFileApi } from '../Api/ChaintracksStorageApi'
 import { ChaintracksFetch } from './ChaintracksFetch'
-import { logger } from '../../../../../test/utils/TestUtilsWalletStorage'
 import { ChaintracksFsApi } from '../Api/ChaintracksFsApi'
 import { SingleWriterMultiReaderLock } from './SingleWriterMultiReaderLock'
 
@@ -110,7 +109,7 @@ export class BulkFileDataManager {
     log += `  url: ${url}\n`
     log += `  bulk range before: ${rangeBefore}\n`
     log += `  bulk range after:  ${rangeAfter}\n`
-    logger(log)
+    console.log(log)
   }
 
   async setStorage(storage: ChaintracksStorageBulkFileApi): Promise<void> {
@@ -188,7 +187,7 @@ export class BulkFileDataManager {
         }
       }
     }
-    logger(`BulkFileDataManager.merge:\n${this.toLogString(r)}\n`)
+    console.log(`BulkFileDataManager.merge:\n${this.toLogString(r)}\n`)
     return r
   }
 

package/src/storage/__test/getBeefForTransaction.test.ts

@@ -44,12 +44,9 @@ import {
   PurgeParams,
   PurgeResults,
   StorageGetBeefOptions,
-  TrxToken,
+  TrxToken
 } from '../../sdk/WalletStorage.interfaces'
-import {
-  ValidListActionsArgs,
-  ValidListOutputsArgs
-} from '../../sdk/validationHelpers'
+import { ValidListActionsArgs, ValidListOutputsArgs } from '../../sdk/validationHelpers'
 
 describe('getBeefForTransaction tests', () => {
   jest.setTimeout(99999999)

package/test/storage/idb/update.test.ts

@@ -501,7 +501,7 @@ describe('idb update tests', () => {
   })
 
   test('7a updateTransactionStatus', async () => {
-    const { activeStorage: storage } = await _tu.createLegacyWalletSQLiteCopy('updateTransactionStatus7a')
+    const { activeStorage: storage } = await _tu.createLegacyWalletSQLiteCopy('idb_updateTransactionStatus7a')
 
     let tx = verifyOne(
       await storage.findTransactions({

package/mobile/out/src/Setup.d.ts

@@ -1,267 +0,0 @@
-import { Knex } from 'knex';
-import { KeyPairAddress, SetupWallet, SetupWalletClient } from './SetupWallet';
-import { BEEF, CreateActionOptions, CreateActionOutput, CreateActionResult, KeyDeriverApi, LockingScript, PrivateKey, ScriptTemplateUnlock, WalletInterface } from '@bsv/sdk';
-import { Chain } from './sdk/types';
-import { WalletStorageManager } from './storage/WalletStorageManager';
-import { Services } from './services/Services';
-import { Monitor } from './monitor/Monitor';
-import { Wallet } from './Wallet';
-import { StorageKnex } from './storage/StorageKnex';
-import { WalletStorageProvider } from './sdk/WalletStorage.interfaces';
-/**
- * The 'Setup` class provides static setup functions to construct BRC-100 compatible
- * wallets in a variety of configurations.
- *
- * It serves as a starting point for experimentation and customization.
- */
-export declare abstract class Setup {
-    /**
-     * @param chain
-     * @returns true if .env is not valid for chain
-     */
-    static noEnv(chain: Chain): boolean;
-    /**
-     * Creates content for .env file with some private keys, identity keys, sample API keys, and sample MySQL connection string.
-     *
-     * Two new, random private keys are generated each time, with their associated public identity keys.
-     *
-     * Loading secrets from a .env file is intended only for experimentation and getting started.
-     * Private keys should never be included directly in your source code.
-     *
-     * @publicbody
-     */
-    static makeEnv(): string;
-    /**
-     * Reads a .env file of the format created by `makeEnv`.
-     *
-     * Returns values for designated `chain`.
-     *
-     * Access private keys through the `devKeys` object: `devKeys[identityKey]`
-     *
-     * @param chain Which chain to use: 'test' or 'main'
-     * @returns {SetupEnv} with configuration environment secrets used by `Setup` functions.
-     *
-     * @publicbody
-     */
-    static getEnv(chain: Chain): SetupEnv;
-    /**
-     * Create a `Wallet`. Storage can optionally be provided or configured later.
-     *
-     * The following components are configured: KeyDeriver, WalletStorageManager, WalletService, WalletStorage.
-     * Optionally, PrivilegedKeyManager is also configured.
-     *
-     * @publicbody
-     */
-    static createWallet(args: SetupWalletArgs): Promise<SetupWallet>;
-    /**
-     * Setup a new `Wallet` without requiring a .env file.
-     *
-     * @param args.chain - 'main' or 'test'
-     * @param args.rootKeyHex  - Root private key for wallet's key deriver.
-     * @param args.storageUrl - Optional. `StorageClient` and `chain` compatible endpoint URL.
-     * @param args.privilegedKeyGetter - Optional. Method that will return the privileged `PrivateKey`, on demand.
-     */
-    static createWalletClientNoEnv(args: {
-        chain: Chain;
-        rootKeyHex: string;
-        storageUrl?: string;
-        privilegedKeyGetter?: () => Promise<PrivateKey>;
-    }): Promise<Wallet>;
-    /**
-     * @publicbody
-     */
-    static createWalletClient(args: SetupWalletClientArgs): Promise<SetupWalletClient>;
-    /**
-     * @publicbody
-     */
-    static getKeyPair(priv?: string | PrivateKey): KeyPairAddress;
-    /**
-     * @publicbody
-     */
-    static getLockP2PKH(address: string): LockingScript;
-    /**
-     * @publicbody
-     */
-    static getUnlockP2PKH(priv: PrivateKey, satoshis: number): ScriptTemplateUnlock;
-    /**
-     * @publicbody
-     */
-    static createP2PKHOutputs(outputs: {
-        address: string;
-        satoshis: number;
-        outputDescription?: string;
-        basket?: string;
-        tags?: string[];
-    }[]): CreateActionOutput[];
-    /**
-     * @publicbody
-     */
-    static createP2PKHOutputsAction(wallet: WalletInterface, outputs: {
-        address: string;
-        satoshis: number;
-        outputDescription?: string;
-        basket?: string;
-        tags?: string[];
-    }[], options?: CreateActionOptions): Promise<{
-        cr: CreateActionResult;
-        outpoints: string[] | undefined;
-    }>;
-    /**
-     * @publicbody
-     */
-    static fundWalletFromP2PKHOutpoints(wallet: WalletInterface, outpoints: string[], p2pkhKey: KeyPairAddress, inputBEEF?: BEEF): Promise<void>;
-    /**
-     * Adds `Knex` based storage to a `Wallet` configured by `Setup.createWalletOnly`
-     *
-     * @param args.knex `Knex` object configured for either MySQL or SQLite database access.
-     * Schema will be created and migrated as needed.
-     * For MySQL, a schema corresponding to databaseName must exist with full access permissions.
-     * @param args.databaseName Name for this storage. For MySQL, the schema name within the MySQL instance.
-     * @param args.chain Which chain this wallet is on: 'main' or 'test'. Defaults to 'test'.
-     * @param args.rootKeyHex
-     *
-     * @publicbody
-     */
-    static createWalletKnex(args: SetupWalletKnexArgs): Promise<SetupWalletKnex>;
-    /**
-     * @returns {StorageKnex} - `Knex` based storage provider for a wallet. May be used for either active storage or backup storage.
-     */
-    static createStorageKnex(args: SetupWalletKnexArgs): Promise<StorageKnex>;
-    /**
-     * @publicbody
-     */
-    static createSQLiteKnex(filename: string): Knex;
-    /**
-     * @publicbody
-     */
-    static createMySQLKnex(connection: string, database?: string): Knex;
-    /**
-     * @publicbody
-     */
-    static createWalletMySQL(args: SetupWalletMySQLArgs): Promise<SetupWalletKnex>;
-    /**
-     * @publicbody
-     */
-    static createWalletSQLite(args: SetupWalletSQLiteArgs): Promise<SetupWalletKnex>;
-}
-/**
- * Arguments used by `createWallet` to construct a `SetupWallet`.
- *
- * Extension `SetupWalletClientArgs` used by `createWalletClient` to construct a `SetupWalletClient`.
- *
- * Extension `SetupWalletKnexArgs` used by `createWalletKnex` to construct a `SetupWalletKnex`.
- *
- * Extension `SetupWalletMySQLArgs` used by `createWalletMySQL` to construct a `SetupWalletKnex`.
- *
- * Extension `SetupWalletSQLiteArgs` used by `createWalletSQLite` to construct a `SetupWalletKnex`.
- */
-export interface SetupWalletArgs {
-    /**
-     * Configuration "secrets" typically obtained by `Setup.makeEnv` and `Setup.getEnv` functions.
-     */
-    env: SetupEnv;
-    /**
-     * Optional. The non-privileged private key used to initialize the `KeyDeriver` and determine the `identityKey`.
-     * Defaults to `env.devKeys[env.identityKey]
-     */
-    rootKeyHex?: string;
-    /**
-     * Optional. The privileged private key getter used to initialize the `PrivilegedKeyManager`.
-     * Defaults to undefined.
-     */
-    privilegedKeyGetter?: () => Promise<PrivateKey>;
-    /**
-     * Optional. Active wallet storage. Can be added later.
-     */
-    active?: WalletStorageProvider;
-    /**
-     * Optional. One or more storage providers managed as backup destinations. Can be added later.
-     */
-    backups?: WalletStorageProvider[];
-}
-/**
- *
- */
-export interface SetupWalletKnexArgs extends SetupWalletArgs {
-    knex: Knex<any, any[]>;
-    databaseName: string;
-}
-/**
- *
- */
-export interface SetupWalletMySQLArgs extends SetupWalletArgs {
-    databaseName: string;
-}
-/**
- *
- */
-export interface SetupWalletSQLiteArgs extends SetupWalletArgs {
-    filePath: string;
-    databaseName: string;
-}
-/**
- *
- */
-export interface SetupWalletKnex extends SetupWallet {
-    activeStorage: StorageKnex;
-    userId: number;
-    rootKey: PrivateKey;
-    identityKey: string;
-    keyDeriver: KeyDeriverApi;
-    chain: Chain;
-    storage: WalletStorageManager;
-    services: Services;
-    monitor: Monitor;
-    wallet: Wallet;
-}
-/**
- * `SetupEnv` provides a starting point for managing secrets that
- * must not appear in source code.
- *
- * The `makeEnv` and `getEnv` functions of the `Setup` and `SetupClient` classes
- * provide an easy way to create and import these secrets and related properties.
- */
-export interface SetupEnv {
-    /**
-     * The chan being accessed: 'main' for mainnet, 'test' for 'testnet'.
-     */
-    chain: Chain;
-    /**
-     * The user's primary identity key (public key).
-     */
-    identityKey: string;
-    /**
-     * A secondary identity key (public key), used to test exchanges with other users.
-     */
-    identityKey2: string;
-    /**
-     * Filepath to sqlite file to be used for identityKey wallet.
-     */
-    filePath: string | undefined;
-    /**
-     * A vaild TAAL API key for use by `Services`
-     */
-    taalApiKey: string;
-    /**
-     * A map of public keys (identity keys, hex strings) to private keys (hex strings).
-     */
-    devKeys: Record<string, string>;
-    /**
-     * A MySQL connection string including user and password properties.
-     * Must be valid to make use of MySQL `Setup` class support.
-     */
-    mySQLConnection: string;
-}
-/**
- * Extension `SetupWalletClientArgs` of `SetupWalletArgs` is used by `createWalletClient`
- * to construct a `SetupWalletClient`.
- */
-export interface SetupWalletClientArgs extends SetupWalletArgs {
-    /**
-     * The endpoint URL of a service hosting the `StorageServer` JSON-RPC service to
-     * which a `StorageClient` instance should connect to function as
-     * the active storage provider of the newly created wallet.
-     */
-    endpointUrl?: string;
-}
-//# sourceMappingURL=Setup.d.ts.map

package/mobile/out/src/Setup.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Setup.d.ts","sourceRoot":"","sources":["../../../src/Setup.ts"],"names":[],"mappings":"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"}