mainnet-js 1.1.7 → 1.1.9

package/src/wallet/Bcmr.ts

@@ -10,10 +10,9 @@ import {
 } from "@bitauth/libauth";
 import axios from "axios";
 import { Network, TxI } from "../interface.js";
-import { getGlobalProvider } from "../network/default.js";
 import ElectrumNetworkProvider from "../network/ElectrumNetworkProvider.js";
 import { ElectrumRawTransaction } from "../network/interface.js";
-import { IdentitySnapshot, Registry } from "./bcmr-v1.schema.js";
+import { IdentitySnapshot, Registry } from "./bcmr-v2.schema.js";
 import { initProvider } from "../network/Connection.js";
 
 export interface AuthChainElement {
@@ -324,9 +323,11 @@ export class BCMR {
       if (
         registry.extensions &&
         registry.extensions["authchain"] &&
-        (registry.extensions["authchain"] as string[]).length
+        Object.keys(registry.extensions["authchain"]).length
       ) {
-        const chainTxArray = registry.extensions!["authchain"] as string[];
+        const chainTxArray = Object.values(
+          registry.extensions!["authchain"]
+        ) as string[];
 
         chainBase = chainTxArray
           .map((tx) => {
@@ -435,28 +436,16 @@ export class BCMR {
    */
   public static getTokenInfo(tokenId: string): IdentitySnapshot | undefined {
     for (const registry of this.metadataRegistries.slice().reverse()) {
-      // registry identity is an authbase string pointer
-      if (typeof registry.registryIdentity === "string") {
-        // enforce spec, ensure identities have this authbase
-        if (registry.identities?.[registry.registryIdentity]) {
-          // find the latest identity in history and add it to the list
-          const latestIdentityInHistory = registry.identities![tokenId]?.[0];
-          if (latestIdentityInHistory) {
-            return latestIdentityInHistory;
-          }
-        }
-      } else {
-        // if the token identity is the registry identity and categories match, return it
-        if (registry.registryIdentity.token?.category === tokenId) {
-          return registry.registryIdentity;
-        }
-
-        // find the latest identity in history and add it to the list
-        const latestIdentityInHistory = registry.identities![tokenId]?.[0];
-        if (latestIdentityInHistory) {
-          return latestIdentityInHistory;
-        }
+      const history = registry.identities?.[tokenId];
+      if (!history) {
+        continue;
       }
+      const latestIdentityIndex = Object.keys(history)[0];
+      if (latestIdentityIndex === undefined) {
+        continue;
+      }
+
+      return history[latestIdentityIndex];
     }
 
     return undefined;

package/src/wallet/Cashtokens.test.ts

@@ -993,23 +993,76 @@ describe(`Test cashtokens`, () => {
   });
 
   test("Test enforcing token addresses", async () => {
+    const alice = await RegTestWallet.fromId(process.env.ALICE_ID!);
     const bob = await RegTestWallet.newRandom();
+    const genesisResponse = await alice.tokenGenesis({
+      amount: 100,
+    });
+    const tokenId = genesisResponse.tokenIds![0];
 
     const previousValue = Config.EnforceCashTokenReceiptAddresses;
 
     const wrap = (addr) => {
-      return new Promise(() => {
-        return new TokenSendRequest({ cashaddr: addr, tokenId: "" });
+      return new Promise((resolve) => {
+        resolve(new TokenSendRequest({ cashaddr: addr, tokenId: "" }));
       });
     };
 
     Config.EnforceCashTokenReceiptAddresses = false;
-    expect(wrap(bob.cashaddr)).resolves.not.toThrow();
-    expect(wrap(bob.tokenaddr)).resolves.not.toThrow();
+    await expect(wrap(alice.cashaddr)).resolves.not.toThrow();
+    await expect(wrap(alice.tokenaddr)).resolves.not.toThrow();
+
+    await alice.send(
+      new TokenSendRequest({
+        cashaddr: bob.cashaddr!,
+        tokenId: tokenId,
+        amount: 1,
+      })
+    );
+    await expect(
+      alice.send(
+        new TokenSendRequest({
+          cashaddr: bob.cashaddr!,
+          tokenId: tokenId,
+          amount: 1,
+        })
+      )
+    ).resolves.not.toThrow();
+
+    await expect(
+      alice.send(
+        new TokenSendRequest({
+          cashaddr: bob.tokenaddr!,
+          tokenId: tokenId,
+          amount: 1,
+        })
+      )
+    ).resolves.not.toThrow();
 
     Config.EnforceCashTokenReceiptAddresses = true;
-    expect(wrap(bob.cashaddr)).rejects.toThrow();
-    expect(wrap(bob.tokenaddr)).resolves.not.toThrow();
+    await expect(wrap(alice.cashaddr)).rejects.toThrow();
+    await expect(wrap(alice.tokenaddr)).resolves.not.toThrow();
+
+    await expect(
+      (async () =>
+        await alice.send(
+          new TokenSendRequest({
+            cashaddr: bob.cashaddr!,
+            tokenId: tokenId,
+            amount: 1,
+          })
+        ))()
+    ).rejects.toThrow();
+
+    await expect(
+      alice.send(
+        new TokenSendRequest({
+          cashaddr: bob.tokenaddr!,
+          tokenId: tokenId,
+          amount: 1,
+        })
+      )
+    ).resolves.not.toThrow();
 
     Config.EnforceCashTokenReceiptAddresses = previousValue;
   });

package/src/wallet/Wif.ts

@@ -61,7 +61,11 @@ import {
   BalanceResponse,
 } from "../util/balanceObjectFromSatoshi.js";
 import { checkWifNetwork } from "../util/checkWifNetwork.js";
-import { deriveCashaddr, deriveTokenaddr } from "../util/deriveCashaddr.js";
+import {
+  deriveCashaddr,
+  deriveTokenaddr,
+  toTokenaddr,
+} from "../util/deriveCashaddr.js";
 import {
   derivePrefix,
   derivePublicKeyHash,
@@ -107,7 +111,7 @@ import { DERIVATION_PATHS, DUST_UTXO_THRESHOLD } from "../constant.js";
 
 import { TransactionHistoryI } from "../history/interface.js";
 import { getAddressHistory } from "../history/electrumTransformer.js";
-import { IdentitySnapshot, Registry } from "./bcmr-v1.schema.js";
+import { IdentitySnapshot, Registry } from "./bcmr-v2.schema.js";
 import { BCMR } from "./Bcmr.js";
 import { qrAddress } from "../qr/Qr.js";
 import { ImageI } from "../qr/interface.js";
@@ -1172,7 +1176,7 @@ export class Wallet extends BaseWallet {
         if (change > 0) {
           outputs.push(
             new TokenSendRequest({
-              cashaddr: changeAddress || this.tokenaddr!,
+              cashaddr: toTokenaddr(changeAddress) || this.tokenaddr!,
               amount: change,
               tokenId: tokenId,
               commitment: tokenOutputs[0].commitment,