WIP

Signed-off-by: James Zuccon <zuccon@gmail.com>

packages/wallet/package.json

@@ -10,7 +10,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsc --build --clean",
+    "build": "tsc --build --clean && tsc --build",
     "prepublishOnly": "npm run build"
   },
   "author": "",

packages/wallet/src/wallet/blockchain.ts

@@ -88,11 +88,8 @@ export class Blockchain {
     transaction: Uint8Array | Transaction | string,
     opts: { waitUntilSeen: boolean } = { waitUntilSeen: true }
   ) {
-    if (typeof transaction === 'string') {
-      transaction = Transaction.fromHex(transaction);
-    }
-    if (transaction instanceof Uint8Array) {
-      transaction = Transaction.fromBytes(transaction);
+    if (!(transaction instanceof Transaction)) {
+      transaction = Transaction.fromAny(transaction);
     }
 
     this.pendingTransactions.addTransaction(transaction);
@@ -107,16 +104,27 @@ export class Blockchain {
     transaction: Uint8Array | Transaction | string,
     opts: { waitUntilSeen: boolean } = { waitUntilSeen: true }
   ) {
-    if (typeof transaction === 'string') {
-      transaction = Transaction.fromHex(transaction);
-    }
-    if (transaction instanceof Uint8Array) {
-      transaction = Transaction.fromBytes(transaction);
+    if (!(transaction instanceof Transaction)) {
+      transaction = Transaction.fromAny(transaction);
     }
 
     this.pendingTransactions.addTransaction(transaction);
 
-    // TODO: Broadcast the transaction.
+    // Broadcast any pending transaction.
+    // TODO: Use while loop instead.
+    for (let tx of this.pendingTransactions.getBroadcastOrder()) {
+      try {
+        console.log('broadcasting', tx);
+
+        this.pendingTransactions.removeTransaction(tx.toHashHex());
+      } catch (error) {
+        this.pendingTransactions.removeDependentTransactions(tx.toHashHex());
+
+        throw new Error(
+          `Broadcast failed for ${transaction.getHashHex()}. Removing dependent transactions.`
+        );
+      }
+    }
 
     // TODO: Wait for transaction to be seen on network.
     console.log(opts);

packages/wallet/src/wallet/index.ts

@@ -3,3 +3,6 @@ export * from './blockchain-types.js';
 export * from './storage.js';
 export * from './wallet-hd.js';
 export * from './wallet-p2pkh.js';
+export * from './wallet-p2sh20.js';
+export * from './wallet-p2sh32.js';
+export * from './wallet-set.js';

packages/wallet/src/wallet/storage.ts

@@ -6,6 +6,14 @@
  * We don't want to extend this - we want to compose it.
  * Reason being that we want to support multiple storage adapters.
  * And we should allow the possibility of having non-critical storage adapters fail (e.g. remote vs local).
+ *
+ * Additionally, consider how we'll store data for WalletSets.
+ * There will be child wallets. These will have their own data.
+ * And each child may then have its own wallet. And on and on.
+ * So, it's a tree hierarchy.
+ * We can probably emit a "storageUpdated" event that is registered by each parent wallet.
+ * The parent then "wraps" its own state into this and propagates it up to its parent.
+ * Then, when it reaches root, the storage adapter stashes all of the propagated data into actual storage.
  */
 export class Storage {
   constructor() {

packages/wallet/src/wallet/wallet-hd.ts

@@ -1,5 +1,5 @@
 // Import the Stamp class to derive the private keys
-import { HDPrivateNode } from '@xo/primitives';
+import { HDPrivateNode, Transaction } from '@xo/primitives';
 import { EventEmitter } from '../utils/index.js';
 import { Blockchain } from './blockchain.js';
 import {
@@ -232,6 +232,14 @@ export class WalletHD<
 
     return encodedTransaction;
   }
+
+  getTransactions() {
+    // NOTE: We use a set so that we don't end up with duplicate transactions.
+    return this.wallets.reduce((txs, wallet) => {
+      wallet.transactions.forEach((tx) => txs.add(tx));
+      return txs; // Make sure to return the accumulator
+    }, new Set<Transaction>());
+  }
 }
 
 //-----------------------------------------------------------------------------

packages/wallet/src/wallet/wallet-p2sh20.ts

@@ -0,0 +1,11 @@
+/**
+ * Placeholder.
+ *
+ * @remarks
+ * TODO Use AddressData
+ */
+export class WalletP2SH20 {
+  constructor() {
+    console.log('TODO');
+  }
+}

packages/wallet/src/wallet/wallet-p2sh32.ts

@@ -0,0 +1,11 @@
+/**
+ * Placeholder.
+ *
+ * @remarks
+ * TODO Use AddressData
+ */
+export class WalletP2SH32 {
+  constructor() {
+    console.log('TODO');
+  }
+}

packages/wallet/src/wallet/wallet-set.ts

@@ -0,0 +1,13 @@
+/**
+ * Placeholder.
+ *
+ * @remarks
+ * One difficult thing here is going to be storage of the subwallets.
+ * We're going to have child wallets and we need to propagate their storage to the root WalletSet.
+ * See remarks on Storage - it's semi-related and I'm still playing with approaches.
+ */
+export class WalletSet {
+  constructor() {
+    console.log('TODO');
+  }
+}