mainnet-js 1.1.3 → 1.1.5

package/src/wallet/Cashtokens.test.ts

@@ -837,10 +837,11 @@ describe(`Test cashtokens`, () => {
       aliceWallet.cashaddr!
     );
 
+    let tokenId;
     {
       const aliceUtxos = await aliceWallet.getAddressUtxos();
 
-      const { unsignedTransaction, sourceOutputs } =
+      const { unsignedTransaction, sourceOutputs, tokenIds } =
         await aliceWatchWallet.tokenGenesis(
           {
             capability: "minting",
@@ -867,13 +868,20 @@ describe(`Test cashtokens`, () => {
       ).toBe(true);
       expect(sourceOutputs!.length).toBe(decoded.inputs.length);
       expect(binToHex(decoded.outputs[0].token?.nft?.commitment!)).toBe("00");
-    }
 
-    const genesisResponse = await aliceWallet.tokenGenesis({
-      capability: "minting",
-      commitment: "00",
-    });
-    const tokenId = genesisResponse.tokenIds![0];
+      const signed = await aliceWallet.signUnsignedTransaction(
+        unsignedTransaction!,
+        sourceOutputs!
+      );
+      await aliceWallet.submitTransaction(signed);
+
+      tokenId = tokenIds![0];
+
+      expect(await aliceWallet.getNftTokenBalance(tokenId)).toBe(1);
+      const tokenUtxos = await aliceWallet.getTokenUtxos(tokenId);
+      expect(tokenUtxos.length).toBe(1);
+      expect(tokenUtxos[0].token?.capability).toBe(NFTCapability.minting);
+    }
 
     {
       const aliceUtxos = await aliceWallet.getAddressUtxos();
@@ -908,12 +916,26 @@ describe(`Test cashtokens`, () => {
       expect(binToHex(sourceOutputs![0].token?.nft?.commitment!)).toBe("00");
       expect(binToHex(decoded.outputs[0].token?.nft?.commitment!)).toBe("00");
       expect(binToHex(decoded.outputs[1].token?.nft?.commitment!)).toBe("0a");
-    }
 
-    await aliceWallet.tokenMint(tokenId, {
-      capability: "none",
-      commitment: "0a",
-    });
+      const signed = await aliceWallet.signUnsignedTransaction(
+        unsignedTransaction!,
+        sourceOutputs!
+      );
+      await aliceWallet.submitTransaction(signed);
+
+      expect(await aliceWallet.getNftTokenBalance(tokenId)).toBe(2);
+      const tokenUtxos = await aliceWallet.getTokenUtxos(tokenId);
+      expect(tokenUtxos.length).toBe(2);
+      expect(
+        tokenUtxos.filter(
+          (val) => val.token?.capability === NFTCapability.minting
+        ).length
+      ).toBe(1);
+      expect(
+        tokenUtxos.filter((val) => val.token?.capability === NFTCapability.none)
+          .length
+      ).toBe(1);
+    }
 
     {
       const aliceUtxos = await aliceWallet.getAddressUtxos();
@@ -949,38 +971,27 @@ describe(`Test cashtokens`, () => {
       expect(sourceOutputs!.length).toBe(decoded.inputs.length);
       expect(binToHex(sourceOutputs![0].token?.nft?.commitment!)).toBe("0a");
       expect(binToHex(decoded.outputs[0].token?.nft?.commitment!)).toBe("0a");
-    }
-  });
-
-  test("Kek", async () => {
-    const aliceWatchWallet = await TestNetWallet.watchOnly("bchtest:zzm0t7f76ye50xh2hr0lmt2a0wage2sutcqnl25ahq");
-
-    // const utxos = (await aliceWatchWallet.getTokenUtxos()).filter(val => val.token?.tokenId.startsWith("4cca"));
-    // console.log(utxos);
-    // return;
-
-
-      const { unsignedTransaction, sourceOutputs } = await aliceWatchWallet.tokenGenesis({
-        cashaddr: aliceWatchWallet.cashaddr!,
-        capability: NFTCapability.minting,
-        commitment: "",
-        value: 1000
-      }, OpReturnData.from(""), { buildUnsigned: true });
-      const encodedTransaction = hexToBin(unsignedTransaction!);
-      expect(encodedTransaction.length).toBeGreaterThan(0);
-
-      // const decoded = decodeTransaction(encodedTransaction);
-      // if (typeof decoded === "string") {
-      //   throw decoded;
-      // }
-
-      // expect(binsAreEqual(decoded.inputs[0].unlockingBytecode, Uint8Array.from([]))).toBe(true);
-      // expect(sourceOutputs!.length).toBe(decoded.inputs.length);
-      // expect(binToHex(decoded.outputs[0].token?.nft?.commitment!)).toBe("00");
 
+      const signed = await aliceWallet.signUnsignedTransaction(
+        unsignedTransaction!,
+        sourceOutputs!
+      );
+      await aliceWallet.submitTransaction(signed);
+      expect(await aliceWallet.getNftTokenBalance(tokenId)).toBe(2);
+      const tokenUtxos = await aliceWallet.getTokenUtxos(tokenId);
+      expect(tokenUtxos.length).toBe(2);
+      expect(
+        tokenUtxos.filter(
+          (val) => val.token?.capability === NFTCapability.minting
+        ).length
+      ).toBe(1);
+      expect(
+        tokenUtxos.filter((val) => val.token?.capability === NFTCapability.none)
+          .length
+      ).toBe(1);
+    }
   });
 
-
   test("Test enforcing token addresses", async () => {
     const bob = await RegTestWallet.newRandom();
 

package/src/wallet/Wif.ts

@@ -39,6 +39,7 @@ import {
   SendRequestArray,
   SendRequestType,
   SendResponse,
+  SourceOutput,
   TokenBurnRequest,
   TokenGenesisRequest,
   TokenMintRequest,
@@ -50,6 +51,7 @@ import {
   buildEncodedTransaction,
   getSuitableUtxos,
   getFeeAmount,
+  signUnsignedTransaction,
 } from "../transaction/Wif.js";
 
 import { asSendRequestObject } from "../util/asSendRequestObject.js";
@@ -1132,13 +1134,6 @@ export class Wallet extends BaseWallet {
       utxos = utxos.filter((val) => !val.token);
     }
 
-    // let tokenOp: "send" | "genesis" | "mint" | "burn" | undefined = undefined;
-    // if (options?.ensureUtxos?.every(val => !val.token) && sendRequests.some(val => (val as TokenSendRequest).tokenId)) {
-    //   tokenOp = "genesis";
-    // } else if (options?.ensureUtxos?.length === 1 && options?.ensureUtxos?.[0].token?.capability === NFTCapability.minting && ) {
-
-    // }
-
     const addTokenChangeOutputs = (
       inputs: UtxoI[],
       outputs: SendRequestType[]
@@ -1245,6 +1240,7 @@ export class Wallet extends BaseWallet {
         slpOutputs: [],
         feePaidBy,
         changeAddress,
+        buildUnsigned: options?.buildUnsigned === true,
       }
     );
 
@@ -1260,6 +1256,21 @@ export class Wallet extends BaseWallet {
     return { encodedTransaction, tokenIds, sourceOutputs };
   }
 
+  public async signUnsignedTransaction(
+    transaction: Uint8Array | string,
+    sourceOutputs: SourceOutput[]
+  ): Promise<Uint8Array> {
+    if (!this.privateKey) {
+      throw Error("Can not sign a transaction with watch-only wallet.");
+    }
+
+    return signUnsignedTransaction(
+      transaction,
+      sourceOutputs,
+      this.privateKey!
+    );
+  }
+
   // Submit a raw transaction
   public async submitTransaction(
     transaction: Uint8Array,
@@ -1492,13 +1503,13 @@ export class Wallet extends BaseWallet {
       value: genesisRequest.value || 1000,
       capability: genesisRequest.capability,
       commitment: genesisRequest.commitment,
-      tokenId: utxos[0].txid,
+      tokenId: genesisInputs[0].txid,
     });
 
     return this.send([genesisSendRequest, ...(sendRequests as any)], {
       ...options,
       utxoIds: utxos,
-      ensureUtxos: [utxos[0]],
+      ensureUtxos: [genesisInputs[0]],
       checkTokenQuantities: false,
       queryBalance: false,
       tokenOperation: "genesis",