@1sat/wallet-toolbox 0.0.22 → 0.0.23

package/dist/api/constants.d.ts

@@ -15,6 +15,7 @@ export declare const ORDLOCK_PREFIX = "2097dfd76851bf465e8f715593b217714858bbe95
 export declare const ORDLOCK_SUFFIX = "615179547a75537a537a537a0079537a75527a527a7575615579008763567901c161517957795779210ac407f0e4bd44bfc207355a778b046225a7068fc59ee7eda43ad905aadbffc800206c266b30e6a1319c66dc401e5bd6b432ba49688eecd118297041da8074ce081059795679615679aa0079610079517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e01007e81517a75615779567956795679567961537956795479577995939521414136d08c5ed2bf3ba048afe6dcaebafeffffffffffffffffffffffffffffff00517951796151795179970079009f63007952799367007968517a75517a75517a7561527a75517a517951795296a0630079527994527a75517a6853798277527982775379012080517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e01205279947f7754537993527993013051797e527e54797e58797e527e53797e52797e57797e0079517a75517a75517a75517a75517a75517a75517a75517a75517a75517a75517a75517a75517a756100795779ac517a75517a75517a75517a75517a75517a75517a75517a75517a7561517a75517a756169587951797e58797eaa577961007982775179517958947f7551790128947f77517a75517a75618777777777777777777767557951876351795779a9876957795779ac777777777777777767006868";
 export declare const LOCK_PREFIX = "20d37f4de0d1c735b4d51a5572df0f3d9104d1d9e99db8694fdd1b1a92e1f0dce1757601687f76a9";
 export declare const LOCK_SUFFIX = "88ac7e7601207f75a9011488";
+export declare const ONESAT_PROTOCOL: [0 | 1 | 2, string];
 export declare const MESSAGE_SIGNING_PROTOCOL: [0 | 1 | 2, string];
 export declare const MAX_INSCRIPTION_BYTES = 100000;
 export declare const MIN_UNLOCK_SATS = 1500;

package/dist/api/constants.js

@@ -21,7 +21,8 @@ export const ORDLOCK_SUFFIX = "615179547a75537a537a537a0079537a75527a527a7575615
 // Lock template constants
 export const LOCK_PREFIX = "20d37f4de0d1c735b4d51a5572df0f3d9104d1d9e99db8694fdd1b1a92e1f0dce1757601687f76a9";
 export const LOCK_SUFFIX = "88ac7e7601207f75a9011488";
-// Message signing protocol
+// Protocol IDs
+export const ONESAT_PROTOCOL = [1, "1sat"];
 export const MESSAGE_SIGNING_PROTOCOL = [1, "message signing"];
 // Constants
 export const MAX_INSCRIPTION_BYTES = 100_000;

package/dist/api/inscriptions/index.js

@@ -5,11 +5,7 @@
  */
 import { P2PKH, PublicKey, Script, Utils } from "@bsv/sdk";
 import { Inscription } from "@bopen-io/templates";
-import { MAX_INSCRIPTION_BYTES, ORDINALS_BASKET } from "../constants";
-// ============================================================================
-// Constants
-// ============================================================================
-const ORDINAL_PROTOCOL = [1, "ordinal"];
+import { MAX_INSCRIPTION_BYTES, ORDINALS_BASKET, ONESAT_PROTOCOL } from "../constants";
 // ============================================================================
 // Internal helpers
 // ============================================================================
@@ -58,7 +54,7 @@ export const inscribe = {
             }
             const keyID = Date.now().toString();
             const { publicKey } = await ctx.wallet.getPublicKey({
-                protocolID: ORDINAL_PROTOCOL,
+                protocolID: ONESAT_PROTOCOL,
                 keyID,
                 counterparty: "self",
                 forSelf: true,
@@ -75,7 +71,7 @@ export const inscribe = {
                         basket: ORDINALS_BASKET,
                         tags: [`type:${input.contentType}`],
                         customInstructions: JSON.stringify({
-                            protocolID: ORDINAL_PROTOCOL,
+                            protocolID: ONESAT_PROTOCOL,
                             keyID,
                         }),
                     },

package/dist/api/ordinals/index.js

@@ -6,18 +6,13 @@
  */
 import { BigNumber, Hash, LockingScript, OP, P2PKH, PublicKey, Script, Transaction, TransactionSignature, UnlockingScript, Utils, } from "@bsv/sdk";
 import { OrdLock } from "@bopen-io/templates";
-import { ORDINALS_BASKET, ORDLOCK_PREFIX, ORDLOCK_SUFFIX } from "../constants";
-// ============================================================================
-// Constants
-// ============================================================================
-const ORDINAL_PROTOCOL = [1, "ordinal"];
-const ORDINAL_LISTING_PROTOCOL = [1, "ordinal listing"];
+import { ORDINALS_BASKET, ORDLOCK_PREFIX, ORDLOCK_SUFFIX, ONESAT_PROTOCOL } from "../constants";
 // ============================================================================
 // Internal helpers
 // ============================================================================
 async function deriveCancelAddressInternal(ctx, outpoint) {
     const result = await ctx.wallet.getPublicKey({
-        protocolID: ORDINAL_LISTING_PROTOCOL,
+        protocolID: ONESAT_PROTOCOL,
         keyID: outpoint,
         forSelf: true,
     });
@@ -97,7 +92,7 @@ export async function buildTransferOrdinal(ctx, request) {
     let recipientAddress;
     if (counterparty) {
         const { publicKey } = await ctx.wallet.getPublicKey({
-            protocolID: ORDINAL_PROTOCOL,
+            protocolID: ONESAT_PROTOCOL,
             keyID: outpoint,
             counterparty,
             forSelf: false,
@@ -169,7 +164,7 @@ export async function buildListOrdinal(ctx, request) {
                 basket: ORDINALS_BASKET,
                 tags,
                 customInstructions: JSON.stringify({
-                    protocolID: ORDINAL_LISTING_PROTOCOL,
+                    protocolID: ONESAT_PROTOCOL,
                     keyID: outpoint,
                 }),
             },
@@ -248,7 +243,10 @@ export const transferOrdinal = {
             if ("error" in params) {
                 return params;
             }
-            const result = await ctx.wallet.createAction(params);
+            const result = await ctx.wallet.createAction({
+                ...params,
+                options: { randomizeOutputs: false },
+            });
             if (!result.txid) {
                 return { error: "no-txid-returned" };
             }
@@ -283,7 +281,10 @@ export const listOrdinal = {
             if ("error" in params) {
                 return params;
             }
-            const result = await ctx.wallet.createAction(params);
+            const result = await ctx.wallet.createAction({
+                ...params,
+                options: { randomizeOutputs: false },
+            });
             if (!result.txid) {
                 return { error: "no-txid-returned" };
             }
@@ -355,7 +356,7 @@ export const cancelListing = {
                         customInstructions: JSON.stringify({ protocolID, keyID }),
                     },
                 ],
-                options: { signAndProcess: false },
+                options: { signAndProcess: false, randomizeOutputs: false },
             });
             if ("error" in createResult && createResult.error) {
                 return { error: String(createResult.error) };
@@ -473,7 +474,7 @@ export const purchaseOrdinal = {
                 return { error: "not-an-ordlock-listing" };
             }
             const { publicKey } = await ctx.wallet.getPublicKey({
-                protocolID: ORDINAL_PROTOCOL,
+                protocolID: ONESAT_PROTOCOL,
                 keyID: outpoint,
                 counterparty: "self",
                 forSelf: true,
@@ -488,7 +489,7 @@ export const purchaseOrdinal = {
                 basket: ORDINALS_BASKET,
                 tags: [`type:${contentType}`, `origin:${origin}`],
                 customInstructions: JSON.stringify({
-                    protocolID: ORDINAL_PROTOCOL,
+                    protocolID: ONESAT_PROTOCOL,
                     keyID: outpoint,
                 }),
             });
@@ -523,7 +524,7 @@ export const purchaseOrdinal = {
                     },
                 ],
                 outputs,
-                options: { signAndProcess: false },
+                options: { signAndProcess: false, randomizeOutputs: false },
             });
             if ("error" in createResult && createResult.error) {
                 return { error: String(createResult.error) };

package/dist/api/sweep/index.js

@@ -3,7 +3,8 @@
  *
  * Functions for sweeping assets from external wallets into a BRC-100 wallet.
  */
-import { P2PKH, PrivateKey, Transaction, } from "@bsv/sdk";
+import { P2PKH, PrivateKey, PublicKey, Transaction, } from "@bsv/sdk";
+import { ONESAT_PROTOCOL } from "../constants";
 export * from "./types";
 /**
  * Prepare sweep inputs from IndexedOutput objects by fetching locking scripts.
@@ -288,9 +289,9 @@ export const sweepOrdinals = {
             // Build outputs - one per ordinal, each 1 sat to derived address
             const outputs = [];
             for (const input of inputs) {
-                // Derive a unique public key for this ordinal
+                // Derive a unique public key for this ordinal using the input outpoint as keyID
                 const pubKeyResult = await ctx.wallet.getPublicKey({
-                    protocolID: [1, "ordinal"],
+                    protocolID: ONESAT_PROTOCOL,
                     keyID: input.outpoint,
                     forSelf: true,
                 });
@@ -298,24 +299,35 @@ export const sweepOrdinals = {
                     return { error: `Failed to derive key for ${input.outpoint}` };
                 }
                 // Create P2PKH locking script from derived public key
-                const derivedAddress = pubKeyResult.publicKey;
+                const derivedAddress = PublicKey.fromString(pubKeyResult.publicKey).toAddress();
                 const lockingScript = new P2PKH().lock(derivedAddress);
+                // Build tags following ordinals API pattern
+                const tags = [];
+                if (input.contentType)
+                    tags.push(`type:${input.contentType}`);
+                if (input.origin)
+                    tags.push(`origin:${input.origin}`);
                 outputs.push({
                     lockingScript: lockingScript.toHex(),
                     satoshis: 1,
                     outputDescription: `Ordinal ${input.origin ?? input.outpoint}`,
                     basket: "1sat",
-                    tags: ["insc", "origin"],
+                    tags,
+                    customInstructions: JSON.stringify({
+                        protocolID: ONESAT_PROTOCOL,
+                        keyID: input.outpoint,
+                    }),
                 });
             }
             const beefData = firstBeef.toBinary();
             // Create action to get signable transaction
+            // CRITICAL: randomizeOutputs must be false to preserve ordinal satoshi positions
             const createResult = await ctx.wallet.createAction({
                 description: `Sweep ${inputs.length} ordinal${inputs.length !== 1 ? "s" : ""}`,
                 inputBEEF: beefData,
                 inputs: inputDescriptors,
                 outputs,
-                options: { signAndProcess: false },
+                options: { signAndProcess: false, randomizeOutputs: false },
             });
             if ("error" in createResult && createResult.error) {
                 return { error: String(createResult.error) };
@@ -325,7 +337,6 @@ export const sweepOrdinals = {
             }
             // Sign each input with our external key
             const tx = Transaction.fromBEEF(createResult.signableTransaction.tx);
-            console.log(`[sweepOrdinals] Transaction has ${tx.inputs.length} inputs, ${tx.outputs.length} outputs`);
             // Build a set of outpoints we control
             const ourOutpoints = new Set(inputs.map((input) => {
                 const [txid, vout] = input.outpoint.split("_");

package/dist/api/tokens/index.js

@@ -289,7 +289,7 @@ export const sendBsv21 = {
                     inputDescription: "Token input",
                 })),
                 outputs,
-                options: { signAndProcess: false },
+                options: { signAndProcess: false, randomizeOutputs: false },
             });
             if ("error" in createResult && createResult.error) {
                 return { error: String(createResult.error) };
@@ -421,7 +421,7 @@ export const purchaseBsv21 = {
                     },
                 ],
                 outputs,
-                options: { signAndProcess: false },
+                options: { signAndProcess: false, randomizeOutputs: false },
             });
             if ("error" in createResult && createResult.error) {
                 return { error: String(createResult.error) };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/wallet-toolbox",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "description": "BSV wallet library extending @bsv/wallet-toolbox with 1Sat Ordinals protocol support",
   "author": "1Sat Team",
   "license": "MIT",