mainnet-js 2.7.23 → 2.7.25

package/src/wallet/Wif.ts

@@ -1,5 +1,10 @@
 //#region Imports
-import { encodeHdPublicKey, HdKeyNetwork, secp256k1 } from "@bitauth/libauth";
+import {
+  encodeHdPublicKey,
+  HdKeyNetwork,
+  hexToBin,
+  secp256k1,
+} from "@bitauth/libauth";
 
 import {
   binToHex,
@@ -54,20 +59,20 @@ import { BaseWallet } from "./Base.js";
  * Class to manage a bitcoin cash wallet.
  */
 export class Wallet extends BaseWallet {
-  declare provider: ElectrumNetworkProvider;
-  declare cashaddr: string;
-  declare tokenaddr: string;
-  derivationPath: string = Config.DefaultParentDerivationPath + "/0/0";
-  parentDerivationPath: string = Config.DefaultParentDerivationPath;
-  mnemonic!: string;
-  parentXPubKey!: string;
-  privateKey!: Uint8Array;
-  publicKeyCompressed!: Uint8Array;
-  privateKeyWif!: string;
-  publicKey!: Uint8Array;
-  declare publicKeyHash: Uint8Array;
+  declare readonly provider: ElectrumNetworkProvider;
+  declare readonly cashaddr: string;
+  declare readonly tokenaddr: string;
+  readonly derivationPath: string = Config.DefaultParentDerivationPath + "/0/0";
+  readonly parentDerivationPath: string = Config.DefaultParentDerivationPath;
+  readonly mnemonic!: string;
+  readonly parentXPubKey!: string;
+  readonly privateKey!: Uint8Array;
+  readonly publicKeyCompressed!: Uint8Array;
+  readonly privateKeyWif!: string;
+  readonly publicKey!: Uint8Array;
+  declare readonly publicKeyHash: Uint8Array;
   declare name: string;
-  static signedMessage: SignedMessageI = new SignedMessage();
+  static readonly signedMessage: SignedMessageI = new SignedMessage();
 
   //#region Accessors
   // Get mnemonic and derivation path for wallet
@@ -141,6 +146,7 @@ export class Wallet extends BaseWallet {
   ) {
     super(network);
     this.name = name;
+    // @ts-ignore
     this.walletType = walletType;
   }
 
@@ -159,6 +165,20 @@ export class Wallet extends BaseWallet {
     return new this().fromId(walletId) as InstanceType<T>;
   }
 
+  /**
+   * fromPrivateKey - create a wallet using the private key supplied in hex or Uint8Array
+   *
+   * @param wif   WIF encoded private key string
+   *
+   * @returns instantiated wallet
+   */
+  public static async fromPrivateKey<T extends typeof Wallet>(
+    this: T,
+    privateKey: string | Uint8Array
+  ): Promise<InstanceType<T>> {
+    return new this().fromPrivateKey(privateKey) as InstanceType<T>;
+  }
+
   /**
    * fromWIF - create a wallet using the private key supplied in `Wallet Import Format`
    *
@@ -229,6 +249,7 @@ export class Wallet extends BaseWallet {
 
   private async _generateWif() {
     if (!this.privateKey) {
+      // @ts-ignore
       this.privateKey = generatePrivateKey(
         () => generateRandomBytes(32) as Uint8Array
       );
@@ -237,12 +258,14 @@ export class Wallet extends BaseWallet {
   }
 
   private async _generateMnemonic() {
+    // @ts-ignore
     this.mnemonic = generateMnemonic(Config.getWordlist());
     if (this.mnemonic.length == 0)
       throw Error("refusing to create wallet from empty mnemonic");
     const seed = mnemonicToSeedSync(this.mnemonic);
     checkForEmptySeed(seed);
     const network = this.isTestnet ? "testnet" : "mainnet";
+    // @ts-ignore
     this.parentXPubKey = getXPubKey(seed, this.parentDerivationPath, network);
 
     const hdNode = deriveHdPrivateNodeFromSeed(seed, {
@@ -254,8 +277,10 @@ export class Wallet extends BaseWallet {
     if (typeof zerothChild === "string") {
       throw Error(zerothChild);
     }
+    // @ts-ignore
     this.privateKey = zerothChild.privateKey;
 
+    // @ts-ignore
     this.walletType = WalletTypeEnum.Seed;
     return await this.deriveInfo();
   }
@@ -270,10 +295,13 @@ export class Wallet extends BaseWallet {
 
     // "wif:regtest:cNfsPtqN2bMRS7vH5qd8tR8GMvgXyL5BjnGAKgZ8DYEiCrCCQcP6"
     switch (walletType) {
-      case "wif":
+      case WalletTypeEnum.PrivateKey:
+        return this.fromPrivateKey(arg1);
+
+      case WalletTypeEnum.Wif:
         return this.fromWIF(arg1);
 
-      case "watch":
+      case WalletTypeEnum.Watch:
         if (arg2) {
           // watch:testnet:bchtest:qq1234567
           return this.watchOnly(`${arg1}:${arg2}`);
@@ -281,7 +309,7 @@ export class Wallet extends BaseWallet {
         // watch:testnet:qq1234567
         return this.watchOnly(`${arg1}`);
 
-      case "named":
+      case WalletTypeEnum.Named:
         if (arg2) {
           // named:testnet:wallet_1:my_database
           return this.named(arg1, arg2);
@@ -290,7 +318,7 @@ export class Wallet extends BaseWallet {
           return this.named(arg1);
         }
 
-      case "seed":
+      case WalletTypeEnum.Seed:
         if (arg2) {
           // seed:testnet:table later ... stove kitten pluck:m/44'/0'/0'/0/0
           return this.fromSeed(arg1, arg2);
@@ -320,6 +348,7 @@ export class Wallet extends BaseWallet {
     mnemonic: string,
     derivationPath?: string
   ): Promise<this> {
+    // @ts-ignore
     this.mnemonic = mnemonic.trim().toLowerCase();
 
     if (this.mnemonic.length == 0)
@@ -331,11 +360,13 @@ export class Wallet extends BaseWallet {
       throwErrors: true,
     });
     if (derivationPath) {
+      // @ts-ignore
       this.derivationPath = derivationPath;
 
       // If the derivation path is for the first account child, set the parent derivation path
       const path = derivationPath.split("/");
       if (path.slice(-2).join("/") == "0/0") {
+        // @ts-ignore
         this.parentDerivationPath = path.slice(0, -2).join("/");
       }
     }
@@ -344,15 +375,18 @@ export class Wallet extends BaseWallet {
     if (typeof zerothChild === "string") {
       throw Error(zerothChild);
     }
+    // @ts-ignore
     this.privateKey = zerothChild.privateKey;
 
     const network = this.isTestnet ? "testnet" : "mainnet";
+    // @ts-ignore
     this.parentXPubKey = await getXPubKey(
       seed,
       this.parentDerivationPath,
       network
     );
 
+    // @ts-ignore
     this.walletType = WalletTypeEnum.Seed;
     await this.deriveInfo();
     return this;
@@ -406,6 +440,22 @@ export class Wallet extends BaseWallet {
     });
   }
 
+  // Initialize wallet from private key in hex or Uint8Array
+  protected async fromPrivateKey(
+    privateKey: string | Uint8Array
+  ): Promise<this> {
+    if (typeof privateKey === "string") {
+      privateKey = hexToBin(privateKey);
+    }
+
+    // @ts-ignore
+    this.privateKey = privateKey;
+    // @ts-ignore
+    this.walletType = WalletTypeEnum.PrivateKey;
+    await this.deriveInfo();
+    return this;
+  }
+
   // Initialize wallet from Wallet Import Format
   protected async fromWIF(secret: string): Promise<this> {
     checkWifNetwork(secret, this.network);
@@ -416,8 +466,11 @@ export class Wallet extends BaseWallet {
       throw Error(wifResult as string);
     }
     let resultData: PrivateKeyI = wifResult as PrivateKeyI;
+    // @ts-ignore
     this.privateKey = resultData.privateKey;
+    // @ts-ignore
     this.privateKeyWif = secret;
+    // @ts-ignore
     this.walletType = WalletTypeEnum.Wif;
     await this.deriveInfo();
     return this;
@@ -447,6 +500,8 @@ export class Wallet extends BaseWallet {
   public toString() {
     if (this.name) {
       return `named:${this.network}:${this.name}`;
+    } else if (this.walletType == WalletTypeEnum.PrivateKey) {
+      return `${this.walletType}:${this.network}:${binToHex(this.privateKey)}`;
     } else if (this.walletType == WalletTypeEnum.Seed) {
       return `${this.walletType}:${this.network}:${this.mnemonic}:${this.derivationPath}`;
     } else if (this.walletType === WalletTypeEnum.Wif) {
@@ -466,6 +521,8 @@ export class Wallet extends BaseWallet {
   public toDbString() {
     if (this.walletType == WalletTypeEnum.Seed) {
       return `${this.walletType}:${this.network}:${this.mnemonic}:${this.derivationPath}`;
+    } else if (this.walletType == WalletTypeEnum.PrivateKey) {
+      return `${this.walletType}:${this.network}:${binToHex(this.privateKey)}`;
     } else if (this.walletType === WalletTypeEnum.Wif) {
       return `${this.walletType}:${this.network}:${this.privateKeyWif}`;
     } else if (this.walletType == WalletTypeEnum.Watch) {
@@ -553,6 +610,7 @@ export class Wallet extends BaseWallet {
     if (typeof publicKey === "string") {
       throw new Error(publicKey);
     }
+    // @ts-ignore
     this.publicKey = publicKey;
     const publicKeyCompressed = secp256k1.derivePublicKeyCompressed(
       this.privateKey
@@ -560,14 +618,19 @@ export class Wallet extends BaseWallet {
     if (typeof publicKeyCompressed === "string") {
       throw new Error(publicKeyCompressed);
     }
+    // @ts-ignore
     this.publicKeyCompressed = publicKeyCompressed;
     const networkType =
       this.network === NetworkType.Regtest ? NetworkType.Testnet : this.network;
+    // @ts-ignore
     this.privateKeyWif = encodePrivateKeyWif(this.privateKey, networkType);
     checkWifNetwork(this.privateKeyWif, this.network);
 
+    // @ts-ignore
     this.cashaddr = deriveCashaddr(this.privateKey, this.networkPrefix);
+    // @ts-ignore
     this.tokenaddr = deriveTokenaddr(this.privateKey, this.networkPrefix);
+    // @ts-ignore
     this.publicKeyHash = derivePublicKeyHash(this.cashaddr);
     return this;
   }

package/src/wallet/enum.ts

@@ -1,4 +1,5 @@
 export enum WalletTypeEnum {
+  Named = "named",
   Wif = "wif",
   Seed = "seed",
   Hd = "hd",

package/dist/module/util/walletConnect.d.ts

@@ -1,22 +0,0 @@
-import { IConnector, WcSignTransactionRequest, WcSignTransactionResponse } from "@bch-wc2/interfaces";
-import { BaseWallet } from "../wallet/Base.js";
-import { SendRequestOptionsI } from "../wallet/interface.js";
-import { OpReturnData, SendRequest, SendRequestArray, SendRequestType, SendResponse, TokenBurnRequest, TokenGenesisRequest, TokenMintRequest, TokenSendRequest } from "../wallet/model.js";
-export interface WcTransactionOptions {
-    broadcast?: boolean;
-    userPrompt?: string;
-}
-export declare const generateWcSignTransactionRequest: (sendResponse: SendResponse, options?: WcTransactionOptions) => WcSignTransactionRequest;
-export type WcSendResponse = SendResponse & WcSignTransactionResponse;
-export declare class WcSigner {
-    wallet: BaseWallet;
-    connector: IConnector;
-    constructor(wallet: BaseWallet, connector: IConnector);
-    private handleTransaction;
-    send(requests: SendRequest | TokenSendRequest | OpReturnData | Array<SendRequest | TokenSendRequest | OpReturnData> | SendRequestArray[], options?: SendRequestOptionsI & WcTransactionOptions): Promise<WcSendResponse>;
-    sendMax(cashaddr: string, options?: SendRequestOptionsI & WcTransactionOptions): Promise<WcSendResponse>;
-    tokenGenesis(genesisRequest: TokenGenesisRequest, sendRequests?: SendRequestType | SendRequestType[], options?: SendRequestOptionsI & WcTransactionOptions): Promise<WcSendResponse>;
-    tokenMint(tokenId: string, mintRequests: TokenMintRequest | Array<TokenMintRequest>, deductTokenAmount?: boolean, options?: SendRequestOptionsI & WcTransactionOptions): Promise<WcSendResponse>;
-    tokenBurn(burnRequest: TokenBurnRequest, message?: string, options?: SendRequestOptionsI & WcTransactionOptions): Promise<WcSendResponse>;
-}
-//# sourceMappingURL=walletConnect.d.ts.map

package/dist/module/util/walletConnect.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"walletConnect.d.ts","sourceRoot":"","sources":["../../../src/util/walletConnect.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,wBAAwB,EACxB,yBAAyB,EAC1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EACL,YAAY,EACZ,WAAW,EACX,gBAAgB,EAChB,eAAe,EACf,YAAY,EACZ,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,oBAAoB;IACnC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,gCAAgC,iBAC7B,YAAY,YAChB,oBAAoB,KAC7B,wBAYF,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG,yBAAyB,CAAC;AAKtE,qBAAa,QAAQ;IACZ,MAAM,EAAG,UAAU,CAAC;IACpB,SAAS,EAAE,UAAU,CAAC;gBAEjB,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU;YASvC,iBAAiB;IA4BzB,IAAI,CACR,QAAQ,EACJ,WAAW,GACX,gBAAgB,GAChB,YAAY,GACZ,KAAK,CAAC,WAAW,GAAG,gBAAgB,GAAG,YAAY,CAAC,GACpD,gBAAgB,EAAE,EACtB,OAAO,CAAC,EAAE,mBAAmB,GAAG,oBAAoB,GACnD,OAAO,CAAC,cAAc,CAAC;IASb,OAAO,CAClB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,mBAAmB,GAAG,oBAAoB,GACnD,OAAO,CAAC,cAAc,CAAC;IASpB,YAAY,CAChB,cAAc,EAAE,mBAAmB,EACnC,YAAY,GAAE,eAAe,GAAG,eAAe,EAAO,EACtD,OAAO,CAAC,EAAE,mBAAmB,GAAG,oBAAoB,GACnD,OAAO,CAAC,cAAc,CAAC;IASb,SAAS,CACpB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC,EACxD,iBAAiB,GAAE,OAAe,EAClC,OAAO,CAAC,EAAE,mBAAmB,GAAG,oBAAoB,GACnD,OAAO,CAAC,cAAc,CAAC;IASb,SAAS,CACpB,WAAW,EAAE,gBAAgB,EAC7B,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,mBAAmB,GAAG,oBAAoB,GACnD,OAAO,CAAC,cAAc,CAAC;CAQ3B"}

package/dist/module/util/walletConnect.js

@@ -1,57 +0,0 @@
-export const generateWcSignTransactionRequest = (sendResponse, options) => {
-    if (!sendResponse.unsignedTransaction || !sendResponse.sourceOutputs) {
-        throw new Error("SendResponse does not contain an unsigned transaction or source outputs");
-    }
-    return {
-        ...options,
-        transaction: sendResponse.unsignedTransaction,
-        sourceOutputs: sendResponse.sourceOutputs,
-    };
-};
-// A wrapper class for signing transactions with WalletConnect
-// Interfaces are the same as the original wallet methods
-// Meant to be a drop-in replacement for the original wallet methods
-export class WcSigner {
-    constructor(wallet, connector) {
-        if (!wallet || !connector) {
-            throw new Error("Invalid wallet or connector");
-        }
-        this.wallet = wallet;
-        this.connector = connector;
-    }
-    async handleTransaction(walletMethod, walletArgs, options, errorMsg = "Failed to sign transaction, user may have rejected the request") {
-        const response = await walletMethod.apply(this.wallet, [
-            ...walletArgs,
-            { queryBalance: false, ...options, buildUnsigned: true },
-        ]);
-        const signRequest = generateWcSignTransactionRequest(response, {
-            // ask to broadcast the transaction by default
-            broadcast: true,
-            ...options,
-        });
-        const signResponse = await this.connector.signTransaction(signRequest);
-        if (!signResponse) {
-            throw new Error(errorMsg);
-        }
-        return {
-            ...response,
-            ...signResponse,
-        };
-    }
-    async send(requests, options) {
-        return this.handleTransaction(this.wallet.send, [requests], options, "Failed to sign send transaction, user may have rejected the request");
-    }
-    async sendMax(cashaddr, options) {
-        return this.handleTransaction(this.wallet.sendMax, [cashaddr], options, "Failed to sign send max transaction, user may have rejected the request");
-    }
-    async tokenGenesis(genesisRequest, sendRequests = [], options) {
-        return this.handleTransaction(this.wallet.tokenGenesis, [genesisRequest, sendRequests], options, "Failed to sign token genesis transaction, user may have rejected the request");
-    }
-    async tokenMint(tokenId, mintRequests, deductTokenAmount = false, options) {
-        return this.handleTransaction(this.wallet.tokenMint, [tokenId, mintRequests, deductTokenAmount], options, "Failed to sign token mint transaction, user may have rejected the request");
-    }
-    async tokenBurn(burnRequest, message, options) {
-        return this.handleTransaction(this.wallet.tokenBurn, [burnRequest, message], options, "Failed to sign token burn transaction, user may have rejected the request");
-    }
-}
-//# sourceMappingURL=walletConnect.js.map

package/dist/module/util/walletConnect.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"walletConnect.js","sourceRoot":"","sources":["../../../src/util/walletConnect.ts"],"names":[],"mappings":"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"}

package/src/util/walletConnect.test.ts

@@ -1,115 +0,0 @@
-import { binToHex } from "@bitauth/libauth";
-import { RegTestWallet } from "../wallet/Wif";
-import { generateWcSignTransactionRequest, WcSigner } from "./walletConnect";
-import { WcSignTransactionRequest } from "@bch-wc2/interfaces";
-import {
-  PrivKeyConnector,
-  signWcTransaction,
-} from "@bch-wc2/privkey-connector";
-import { NetworkProvider } from "../network";
-
-export const processWcSignTransactionRequest = async (
-  wcTransactionRequest: WcSignTransactionRequest,
-  signingInfo: {
-    privateKey: Uint8Array;
-    pubkeyCompressed?: Uint8Array;
-    walletLockingBytecodeHex?: string;
-  },
-  networkProvider?: NetworkProvider
-): Promise<string> => {
-  const signedTransaction = signWcTransaction(
-    wcTransactionRequest,
-    signingInfo
-  );
-  const hexSignedTransaction = binToHex(signedTransaction);
-
-  if (wcTransactionRequest.broadcast) {
-    if (!networkProvider) {
-      throw new Error(
-        "NetworkProvider is required for broadcasting transactions"
-      );
-    }
-
-    await networkProvider.sendRawTransaction(hexSignedTransaction);
-  }
-
-  return hexSignedTransaction;
-};
-
-describe("Wallet Connect Utility Functions", () => {
-  it("should generate a valid WcSignTransactionRequest object and sign it", async () => {
-    const wallet = await RegTestWallet.fromId(process.env.ALICE_ID!);
-
-    const bob = await RegTestWallet.newRandom();
-
-    const sendResponse = await wallet.send(
-      {
-        cashaddr: bob.cashaddr,
-        value: 5000,
-        unit: "satoshi",
-      },
-      {
-        buildUnsigned: true,
-        queryBalance: false,
-      }
-    );
-
-    const request = generateWcSignTransactionRequest(sendResponse, {
-      broadcast: true,
-      userPrompt: "Confirm transaction",
-    });
-
-    await expect(
-      processWcSignTransactionRequest(
-        request,
-        {
-          privateKey: wallet.privateKey,
-          pubkeyCompressed: wallet.publicKeyCompressed,
-        },
-        undefined
-      )
-    ).rejects.toThrow(
-      "NetworkProvider is required for broadcasting transactions"
-    );
-
-    await processWcSignTransactionRequest(
-      request,
-      {
-        privateKey: wallet.privateKey,
-        pubkeyCompressed: wallet.publicKeyCompressed,
-      },
-      wallet.provider
-    );
-
-    expect(await bob.getBalance("sat")).toBe(5000);
-  });
-
-  it("should sign a transaction with WcSigner", async () => {
-    const wallet = await RegTestWallet.fromId(process.env.ALICE_ID!);
-    const bob = await RegTestWallet.newRandom();
-
-    const connector = new PrivKeyConnector({
-      privateKey: wallet.privateKey,
-      pubkeyCompressed: wallet.publicKeyCompressed,
-      networkProvider: wallet.provider,
-    });
-
-    const wcSigner = new WcSigner(wallet, connector);
-
-    const sendResponse = await wcSigner.send(
-      {
-        cashaddr: bob.cashaddr,
-        value: 5000,
-        unit: "satoshi",
-      },
-      {
-        userPrompt: "Confirm transaction",
-        broadcast: true,
-      }
-    );
-
-    expect(sendResponse.signedTransaction).toBeDefined();
-
-    expect(await bob.getBalance("sat")).toBe(5000);
-  });
-});

package/src/util/walletConnect.ts

@@ -1,156 +0,0 @@
-import {
-  IConnector,
-  WcSignTransactionRequest,
-  WcSignTransactionResponse,
-} from "@bch-wc2/interfaces";
-import { BaseWallet } from "../wallet/Base.js";
-import { SendRequestOptionsI } from "../wallet/interface.js";
-import {
-  OpReturnData,
-  SendRequest,
-  SendRequestArray,
-  SendRequestType,
-  SendResponse,
-  TokenBurnRequest,
-  TokenGenesisRequest,
-  TokenMintRequest,
-  TokenSendRequest,
-} from "../wallet/model.js";
-
-export interface WcTransactionOptions {
-  broadcast?: boolean;
-  userPrompt?: string;
-}
-
-export const generateWcSignTransactionRequest = (
-  sendResponse: SendResponse,
-  options?: WcTransactionOptions
-): WcSignTransactionRequest => {
-  if (!sendResponse.unsignedTransaction || !sendResponse.sourceOutputs) {
-    throw new Error(
-      "SendResponse does not contain an unsigned transaction or source outputs"
-    );
-  }
-
-  return {
-    ...options,
-    transaction: sendResponse.unsignedTransaction,
-    sourceOutputs: sendResponse.sourceOutputs,
-  };
-};
-
-export type WcSendResponse = SendResponse & WcSignTransactionResponse;
-
-// A wrapper class for signing transactions with WalletConnect
-// Interfaces are the same as the original wallet methods
-// Meant to be a drop-in replacement for the original wallet methods
-export class WcSigner {
-  public wallet!: BaseWallet;
-  public connector: IConnector;
-
-  constructor(wallet: BaseWallet, connector: IConnector) {
-    if (!wallet || !connector) {
-      throw new Error("Invalid wallet or connector");
-    }
-
-    this.wallet = wallet;
-    this.connector = connector;
-  }
-
-  private async handleTransaction(
-    walletMethod: (...args: any[]) => Promise<SendResponse>,
-    walletArgs: any[],
-    options?: SendRequestOptionsI & WcTransactionOptions,
-    errorMsg: string = "Failed to sign transaction, user may have rejected the request"
-  ): Promise<WcSendResponse> {
-    const response = await walletMethod.apply(this.wallet, [
-      ...walletArgs,
-      { queryBalance: false, ...options, buildUnsigned: true },
-    ]);
-
-    const signRequest = generateWcSignTransactionRequest(response, {
-      // ask to broadcast the transaction by default
-      broadcast: true,
-      ...options,
-    });
-    const signResponse = await this.connector.signTransaction(signRequest);
-
-    if (!signResponse) {
-      throw new Error(errorMsg);
-    }
-
-    return {
-      ...response,
-      ...signResponse,
-    };
-  }
-
-  async send(
-    requests:
-      | SendRequest
-      | TokenSendRequest
-      | OpReturnData
-      | Array<SendRequest | TokenSendRequest | OpReturnData>
-      | SendRequestArray[],
-    options?: SendRequestOptionsI & WcTransactionOptions
-  ): Promise<WcSendResponse> {
-    return this.handleTransaction(
-      this.wallet.send,
-      [requests],
-      options,
-      "Failed to sign send transaction, user may have rejected the request"
-    );
-  }
-
-  public async sendMax(
-    cashaddr: string,
-    options?: SendRequestOptionsI & WcTransactionOptions
-  ): Promise<WcSendResponse> {
-    return this.handleTransaction(
-      this.wallet.sendMax,
-      [cashaddr],
-      options,
-      "Failed to sign send max transaction, user may have rejected the request"
-    );
-  }
-
-  async tokenGenesis(
-    genesisRequest: TokenGenesisRequest,
-    sendRequests: SendRequestType | SendRequestType[] = [],
-    options?: SendRequestOptionsI & WcTransactionOptions
-  ): Promise<WcSendResponse> {
-    return this.handleTransaction(
-      this.wallet.tokenGenesis,
-      [genesisRequest, sendRequests],
-      options,
-      "Failed to sign token genesis transaction, user may have rejected the request"
-    );
-  }
-
-  public async tokenMint(
-    tokenId: string,
-    mintRequests: TokenMintRequest | Array<TokenMintRequest>,
-    deductTokenAmount: boolean = false,
-    options?: SendRequestOptionsI & WcTransactionOptions
-  ): Promise<WcSendResponse> {
-    return this.handleTransaction(
-      this.wallet.tokenMint,
-      [tokenId, mintRequests, deductTokenAmount],
-      options,
-      "Failed to sign token mint transaction, user may have rejected the request"
-    );
-  }
-
-  public async tokenBurn(
-    burnRequest: TokenBurnRequest,
-    message?: string,
-    options?: SendRequestOptionsI & WcTransactionOptions
-  ): Promise<WcSendResponse> {
-    return this.handleTransaction(
-      this.wallet.tokenBurn,
-      [burnRequest, message],
-      options,
-      "Failed to sign token burn transaction, user may have rejected the request"
-    );
-  }
-}