@arkade-os/sdk 0.3.11 → 0.3.12

package/README.md

@@ -164,9 +164,8 @@ const boardingUtxos = await wallet.getBoardingUtxos()
 ```typescript
 // Send bitcoin via Ark
 const txid = await wallet.sendBitcoin({
-  address: 'tb1qw508d6qejxtdg4y5r3zarvary0c5xw7kxpjzsx',
-  amount: 50000,  // in satoshis
-  feeRate: 1      // optional, in sats/vbyte
+  address: 'ark1qq4...', // ark address
+  amount: 50000,         // in satoshis
 })
 ```
 

package/dist/cjs/utils/transactionHistory.js

@@ -16,7 +16,7 @@ const txKey = {
  * @param {Set<string>} commitmentsToIgnore - A set of commitment IDs that should be excluded from processing.
  * @return {ExtendedArkTransaction[]} A sorted array of extended Ark transactions, representing the transaction history.
  */
-function buildTransactionHistory(vtxos, allBoardingTxs, commitmentsToIgnore) {
+async function buildTransactionHistory(vtxos, allBoardingTxs, commitmentsToIgnore, getTxCreatedAt) {
     const fromOldestVtxo = [...vtxos].sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime());
     const sent = [];
     let received = [];
@@ -59,21 +59,23 @@ function buildTransactionHistory(vtxos, allBoardingTxs, commitmentsToIgnore) {
             if (vtxo.arkTxId &&
                 !sent.some((s) => s.key.arkTxid === vtxo.arkTxId)) {
                 const changes = fromOldestVtxo.filter((_) => _.txid === vtxo.arkTxId);
+                // We want to find all the other VTXOs spent by the same transaction to
+                // calculate the full amount of the change.
+                const allSpent = fromOldestVtxo.filter((v) => v.arkTxId === vtxo.arkTxId);
+                const spentAmount = allSpent.reduce((acc, v) => acc + v.value, 0);
                 let txAmount = 0;
                 let txTime = 0;
                 if (changes.length > 0) {
                     const changeAmount = changes.reduce((acc, v) => acc + v.value, 0);
-                    // We want to find all the other VTXOs spent by the same transaction to
-                    // calculate the full amount of the change.
-                    const allSpent = fromOldestVtxo.filter((v) => v.arkTxId === vtxo.arkTxId);
-                    const spentAmount = allSpent.reduce((acc, v) => acc + v.value, 0);
                     txAmount = spentAmount - changeAmount;
                     txTime = changes[0].createdAt.getTime();
                 }
                 else {
-                    txAmount = vtxo.value;
+                    txAmount = spentAmount;
                     // TODO: fetch the vtxo with /v1/indexer/vtxos?outpoints=<vtxo.arkTxid:0> to know when the tx was made
-                    txTime = vtxo.createdAt.getTime() + 1;
+                    txTime = getTxCreatedAt
+                        ? await getTxCreatedAt(vtxo.arkTxId)
+                        : vtxo.createdAt.getTime() + 1;
                 }
                 sent.push({
                     key: { ...txKey, arkTxid: vtxo.arkTxId },

package/dist/cjs/wallet/wallet.js

@@ -268,7 +268,10 @@ class ReadonlyWallet {
             scripts: [base_1.hex.encode(this.offchainTapscript.pkScript)],
         });
         const { boardingTxs, commitmentsToIgnore } = await this.getBoardingTxs();
-        return (0, transactionHistory_1.buildTransactionHistory)(response.vtxos, boardingTxs, commitmentsToIgnore);
+        const getTxCreatedAt = (txid) => this.indexerProvider
+            .getVtxos({ outpoints: [{ txid, vout: 0 }] })
+            .then((res) => res.vtxos[0]?.createdAt.getTime() || 0);
+        return (0, transactionHistory_1.buildTransactionHistory)(response.vtxos, boardingTxs, commitmentsToIgnore, getTxCreatedAt);
     }
     async getBoardingTxs() {
         const utxos = [];

package/dist/esm/utils/transactionHistory.js

@@ -13,7 +13,7 @@ const txKey = {
  * @param {Set<string>} commitmentsToIgnore - A set of commitment IDs that should be excluded from processing.
  * @return {ExtendedArkTransaction[]} A sorted array of extended Ark transactions, representing the transaction history.
  */
-export function buildTransactionHistory(vtxos, allBoardingTxs, commitmentsToIgnore) {
+export async function buildTransactionHistory(vtxos, allBoardingTxs, commitmentsToIgnore, getTxCreatedAt) {
     const fromOldestVtxo = [...vtxos].sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime());
     const sent = [];
     let received = [];
@@ -56,21 +56,23 @@ export function buildTransactionHistory(vtxos, allBoardingTxs, commitmentsToIgno
             if (vtxo.arkTxId &&
                 !sent.some((s) => s.key.arkTxid === vtxo.arkTxId)) {
                 const changes = fromOldestVtxo.filter((_) => _.txid === vtxo.arkTxId);
+                // We want to find all the other VTXOs spent by the same transaction to
+                // calculate the full amount of the change.
+                const allSpent = fromOldestVtxo.filter((v) => v.arkTxId === vtxo.arkTxId);
+                const spentAmount = allSpent.reduce((acc, v) => acc + v.value, 0);
                 let txAmount = 0;
                 let txTime = 0;
                 if (changes.length > 0) {
                     const changeAmount = changes.reduce((acc, v) => acc + v.value, 0);
-                    // We want to find all the other VTXOs spent by the same transaction to
-                    // calculate the full amount of the change.
-                    const allSpent = fromOldestVtxo.filter((v) => v.arkTxId === vtxo.arkTxId);
-                    const spentAmount = allSpent.reduce((acc, v) => acc + v.value, 0);
                     txAmount = spentAmount - changeAmount;
                     txTime = changes[0].createdAt.getTime();
                 }
                 else {
-                    txAmount = vtxo.value;
+                    txAmount = spentAmount;
                     // TODO: fetch the vtxo with /v1/indexer/vtxos?outpoints=<vtxo.arkTxid:0> to know when the tx was made
-                    txTime = vtxo.createdAt.getTime() + 1;
+                    txTime = getTxCreatedAt
+                        ? await getTxCreatedAt(vtxo.arkTxId)
+                        : vtxo.createdAt.getTime() + 1;
                 }
                 sent.push({
                     key: { ...txKey, arkTxid: vtxo.arkTxId },

package/dist/esm/wallet/wallet.js

@@ -230,7 +230,10 @@ export class ReadonlyWallet {
             scripts: [hex.encode(this.offchainTapscript.pkScript)],
         });
         const { boardingTxs, commitmentsToIgnore } = await this.getBoardingTxs();
-        return buildTransactionHistory(response.vtxos, boardingTxs, commitmentsToIgnore);
+        const getTxCreatedAt = (txid) => this.indexerProvider
+            .getVtxos({ outpoints: [{ txid, vout: 0 }] })
+            .then((res) => res.vtxos[0]?.createdAt.getTime() || 0);
+        return buildTransactionHistory(response.vtxos, boardingTxs, commitmentsToIgnore, getTxCreatedAt);
     }
     async getBoardingTxs() {
         const utxos = [];

package/dist/types/utils/transactionHistory.d.ts

@@ -11,5 +11,5 @@ type ExtendedArkTransaction = ArkTransaction & {
  * @param {Set<string>} commitmentsToIgnore - A set of commitment IDs that should be excluded from processing.
  * @return {ExtendedArkTransaction[]} A sorted array of extended Ark transactions, representing the transaction history.
  */
-export declare function buildTransactionHistory(vtxos: VirtualCoin[], allBoardingTxs: ArkTransaction[], commitmentsToIgnore: Set<string>): ExtendedArkTransaction[];
+export declare function buildTransactionHistory(vtxos: VirtualCoin[], allBoardingTxs: ArkTransaction[], commitmentsToIgnore: Set<string>, getTxCreatedAt?: (txid: string) => Promise<number>): Promise<ExtendedArkTransaction[]>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/sdk",
-  "version": "0.3.11",
+  "version": "0.3.12",
   "description": "Bitcoin wallet SDK with Taproot and Ark integration",
   "type": "module",
   "main": "./dist/cjs/index.js",