@bsv/wallet-toolbox 1.1.21 → 1.1.23

package/package.json

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

package/src/SetupClient.ts

@@ -76,10 +76,10 @@ MY_MAIN_IDENTITY = '${mainIdentityKey1}'
 MY_MAIN_IDENTITY2 = '${mainIdentityKey2}'
 MAIN_TAAL_API_KEY='mainnet_9596de07e92300c6287e4393594ae39c'
 TEST_TAAL_API_KEY='testnet_0e6cf72133b43ea2d7861da2a38684e3'
-MYSQL_CONNECTION='{"port":3306,"host":"127.0.0.1","user":"root","password":"<your_password>","database":"<your_database>", "timezone": "Z"}'
+MYSQL_CONNECTION='{"port":3306,"host":"127.0.0.1","user":"root","password":"your_password","database":"your_database", "timezone": "Z"}'
 DEV_KEYS = '{
     "${testIdentityKey1}": "${testPrivKey1.toString()}",
-    "${testIdentityKey2}": "${testPrivKey2.toString()}"
+    "${testIdentityKey2}": "${testPrivKey2.toString()}",
     "${mainIdentityKey1}": "${mainPrivKey1.toString()}",
     "${mainIdentityKey2}": "${mainPrivKey2.toString()}"
 }'
@@ -162,7 +162,7 @@ DEV_KEYS = '{
     if (storage.stores.length > 0) await storage.makeAvailable()
     const serviceOptions = Services.createDefaultOptions(chain)
     serviceOptions.taalApiKey = args.env.taalApiKey
-    const services = new Services(chain)
+    const services = new Services(serviceOptions)
     const monopts = Monitor.createDefaultWalletMonitorOptions(
       chain,
       storage,
@@ -170,11 +170,9 @@ DEV_KEYS = '{
     )
     const monitor = new Monitor(monopts)
     monitor.addDefaultTasks()
-    let privilegedKeyManager: sdk.PrivilegedKeyManager | undefined = undefined
-    if (args.privKeyHex) {
-      const privKey = PrivateKey.fromString(args.privKeyHex)
-      privilegedKeyManager = new sdk.PrivilegedKeyManager(async () => privKey)
-    }
+    const privilegedKeyManager = args.privilegedKeyGetter
+      ? new sdk.PrivilegedKeyManager(args.privilegedKeyGetter)
+      : undefined
     const wallet = new Wallet({
       chain,
       keyDeriver,
@@ -196,6 +194,44 @@ DEV_KEYS = '{
     return r
   }
 
+  /**
+   * 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 async createWalletClientNoEnv(args: {
+    chain: sdk.Chain
+    rootKeyHex: string
+    storageUrl?: string
+    privilegedKeyGetter?: () => Promise<PrivateKey>
+  }): Promise<Wallet> {
+    const chain = args.chain
+    const endpointUrl =
+      args.storageUrl ||
+      `https://${args.chain !== 'main' ? 'staging-' : ''}storage.babbage.systems`
+    const rootKey = PrivateKey.fromHex(args.rootKeyHex)
+    const keyDeriver = new KeyDeriver(rootKey)
+    const storage = new WalletStorageManager(keyDeriver.identityKey)
+    const services = new Services(chain)
+    const privilegedKeyManager = args.privilegedKeyGetter
+      ? new sdk.PrivilegedKeyManager(args.privilegedKeyGetter)
+      : undefined
+    const wallet = new Wallet({
+      chain,
+      keyDeriver,
+      storage,
+      services,
+      privilegedKeyManager
+    })
+    const client = new StorageClient(wallet, endpointUrl)
+    await storage.addWalletStorageProvider(client)
+    await storage.makeAvailable()
+    return wallet
+  }
+
   /**
    * @publicbody
    */
@@ -406,10 +442,10 @@ export interface SetupWalletArgs {
    */
   rootKeyHex?: string
   /**
-   * Optional. The privileged private key used to initialize the `PrivilegedKeyManager`.
+   * Optional. The privileged private key getter used to initialize the `PrivilegedKeyManager`.
    * Defaults to undefined.
    */
-  privKeyHex?: string
+  privilegedKeyGetter?: () => Promise<PrivateKey>
   /**
    * Optional. Active wallet storage. Can be added later.
    */

package/test/examples/pushdrop.test.ts

@@ -107,8 +107,7 @@ async function outputPushDrop(
       randomizeOutputs: false,
       // This example prefers to immediately wait for the new transaction to be broadcast to the network.
       // Typically, most production applications benefit from performance gains when broadcasts are handled in the background.
-      //acceptDelayedBroadcast: false
-      noSend: true
+      acceptDelayedBroadcast: false
     },
     labels: [label],
     description: label
@@ -133,8 +132,6 @@ ${beef.toHex()}
 ${beef.toLogString()}
 `)
 
-  await setup.wallet.abortAction({ reference: car.txid! })
-  
   // Return the bits and pieces of the new output created.
   return {
     beef,