mainnet-js 1.1.34 → 2.0.1

package/package.json

@@ -9,7 +9,7 @@
     "url": "https://github.com/mainnet-cash/mainnet-js/issues"
   },
   "name": "mainnet-js",
-  "version": "1.1.34",
+  "version": "2.0.1",
   "homepage": "https://mainnet.cash",
   "module": "dist/module/index.js",
   "browser": {
@@ -40,24 +40,19 @@
   "dependencies": {
     "@bitauth/libauth": "^2.0.0-alpha.8",
     "axios": "^0.21.1",
-    "bchaddrjs-slp": "^0.2.12",
-    "bignumber": "^1.1.0",
-    "bignumber.js": "^9.0.1",
     "bip39": "^3.0.3",
     "buffer": "^6.0.3",
-    "cashaddrjs": "^0.4.4",
     "electrum-cash": "^2.0.10",
     "events": "^3.2.0",
     "eventsource": "^1.0.7",
-    "qrcode-svg": "1.1.0",
-    "slp-parser": "^0.0.4"
+    "qrcode-svg": "1.1.0"
   },
   "devDependencies": {
-    "fake-indexeddb": "^3.1.2"
+    "fake-indexeddb": "^3.1.2",
+    "@types/pg": "8.6.0",
+    "@types/pg-format": "^1.0.1"
   },
   "optionalDependencies": {
-    "@types/pg": "8.6.0",
-    "@types/pg-format": "^1.0.1",
     "dexie": "3.2.2",
     "dotenv": "^10.0.0",
     "node-postgres": "^0.6.2",

package/src/db/SqlProvider.test.ts

@@ -103,21 +103,6 @@ test("Should handle basic sql injection", async () => {
   sh.close();
 });
 
-test("Should fail registering SLP webhook without tokenId", async () => {
-  let db = new SqlProvider(`regtest ${Math.random()}`);
-  await db.init();
-  await expect(
-    db.addWebhook({
-      cashaddr: "",
-      url: "https://example.com/fail",
-      type: WebhookType.slpTransactionIn,
-      recurrence: WebhookRecurrence.recurrent,
-    })
-  ).rejects.toThrow();
-
-  db.close();
-});
-
 test("Test wallet database name regression", async () => {
   const name = `test ${Math.random()}`;
 
@@ -279,14 +264,13 @@ test("Should not have ssl property when unconfigured", async () => {
 test("Store and retrieve faucet queue items", async () => {
   let db = new SqlProvider(`testnet ${Math.random()}`);
   await db.init();
-  await db.addFaucetQueueItem("0x00", "", "0x0a");
-  await db.addFaucetQueueItem("0x01", "", "0x0b");
+  await db.addFaucetQueueItem("0x00", "0x0a");
+  await db.addFaucetQueueItem("0x01", "0x0b");
 
   await db.beginTransaction();
   const items = await db.getFaucetQueue();
   expect(items.length).toBe(2);
   expect(items[0].address).toBe("0x00");
-  expect(items[0].token).toBe("");
   expect(items[0].value).toBe("0x0a");
   await db.deleteFaucetQueueItems(items);
   await db.commitTransaction();

package/src/db/SqlProvider.ts

@@ -3,7 +3,6 @@ import { sslConfigI, WalletI, FaucetQueueItemI } from "./interface.js";
 import { TxI } from "../interface.js";
 import { Webhook, WebhookRecurrence, WebhookType } from "../webhook/Webhook.js";
 import { RegisterWebhookParams } from "../webhook/interface.js";
-import { isCashAddress } from "../util/bchaddr.js";
 import { getSslConfig } from "./util.js";
 import parseDbUrl from "parse-database-url";
 import pg from "pg";
@@ -64,7 +63,6 @@ export default class SqlProvider implements StorageProvider {
           "status TEXT," +
           "tx_seen JSON," +
           "last_height INTEGER," +
-          "token_id TEXT," +
           "expires_at TIMESTAMPTZ" +
           ");",
         this.webhookTable
@@ -75,7 +73,6 @@ export default class SqlProvider implements StorageProvider {
         "CREATE TABLE IF NOT EXISTS %I (" +
           "id SERIAL PRIMARY KEY," +
           "address TEXT," +
-          "token TEXT," +
           "value TEXT" +
           ");",
         this.faucetQueueTable
@@ -144,19 +141,8 @@ export default class SqlProvider implements StorageProvider {
   }
 
   public async webhookFromDb(hook: Webhook) {
-    // map tokenId field from postgres
-    hook.tokenId = (hook as any).token_id;
-    delete (hook as any).token_id;
-
-    if (hook.type.indexOf("slp") === 0) {
-      const { WebhookSlp } = await import("../webhook/WebhookSlp.js");
-      return new WebhookSlp(hook);
-    } else if (isCashAddress(hook.cashaddr)) {
-      const { WebhookBch } = await import("../webhook/WebhookBch.js");
-      return new WebhookBch(hook);
-    }
-
-    throw new Error(`Unsupported or incorrect hook address ${hook.cashaddr}`);
+    const { WebhookBch } = await import("../webhook/WebhookBch.js");
+    return new WebhookBch(hook);
   }
 
   public async addWebhook(params: RegisterWebhookParams): Promise<Webhook> {
@@ -170,17 +156,12 @@ export default class SqlProvider implements StorageProvider {
     params.duration_sec = params.duration_sec || expireTimeout;
     params.duration_sec =
       params.duration_sec > expireTimeout ? expireTimeout : params.duration_sec;
-    params.tokenId = params.tokenId || "";
-
-    if (params.type.indexOf("slp") === 0 && !params.tokenId) {
-      throw new Error("'tokenId' parameter is required for SLP webhooks");
-    }
 
     const expires_at = new Date(
       new Date().getTime() + params.duration_sec * 1000
     );
     let text = this.formatter(
-      "INSERT into %I (cashaddr,type,recurrence,url,status,tx_seen,last_height,token_id,expires_at) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING *;",
+      "INSERT into %I (cashaddr,type,recurrence,url,status,tx_seen,last_height,expires_at) VALUES ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING *;",
       this.webhookTable
     );
 
@@ -192,7 +173,6 @@ export default class SqlProvider implements StorageProvider {
       "",
       "[]",
       0,
-      params.tokenId,
       expires_at.toISOString(),
     ]);
     const hook = await this.webhookFromDb(result.rows[0]);
@@ -266,14 +246,13 @@ export default class SqlProvider implements StorageProvider {
 
   public async addFaucetQueueItem(
     address: string,
-    tokenId: string,
     value: string
   ): Promise<boolean> {
     let text = this.formatter(
-      "INSERT into %I (address,token,value) VALUES ($1, $2, $3);",
+      "INSERT into %I (address,value) VALUES ($1, $2);",
       this.faucetQueueTable
     );
-    return await this.db.query(text, [address, tokenId, value]);
+    return await this.db.query(text, [address, value]);
   }
 
   public async getFaucetQueue(): Promise<Array<FaucetQueueItemI>> {

package/src/index.ts

@@ -1,6 +1,5 @@
 export * from "./db/index.js";
 export * from "./mine/index.js";
-export * from "./slp/index.js";
 export * from "./test/expect.js";
 export * from "./test/axios.js";
 export * from "./webhook/index.js";
@@ -50,9 +49,6 @@ export {
 } from "./message/interface.js";
 export { WalletRequestI, WalletResponseI } from "./wallet/interface.js";
 
-// TODO move this up to util (Mainnet) ?
-export * from "./util/bchaddr.js";
-
-export function cube(x: number) {
-  return x * x * x;
-}
+// export function cube(x: number) {
+//   return x * x * x;
+// }

package/src/transaction/Wif.ts

@@ -39,7 +39,6 @@ export async function buildP2pkhNonHdTransaction({
   sourceAddress,
   fee = 0,
   discardChange = false,
-  slpOutputs = [],
   feePaidBy = FeePaidByEnum.change,
   changeAddress = "",
 }: {
@@ -49,7 +48,6 @@ export async function buildP2pkhNonHdTransaction({
   sourceAddress: string;
   fee?: number;
   discardChange?: boolean;
-  slpOutputs?: Output[];
   feePaidBy?: FeePaidByEnum;
   changeAddress?: string;
 }) {
@@ -101,7 +99,7 @@ export async function buildP2pkhNonHdTransaction({
   const result = generateTransaction({
     inputs: preparedInputs,
     locktime: 0,
-    outputs: [...slpOutputs, ...lockedOutputs],
+    outputs: lockedOutputs,
     version: 2,
   });
 
@@ -429,7 +427,6 @@ export async function getFeeAmountSimple({
   utxos,
   sendRequests,
   relayFeePerByteInSatoshi,
-  slpOutputs,
   discardChange,
 }: {
   utxos: UtxoI[];
@@ -437,7 +434,6 @@ export async function getFeeAmountSimple({
   privateKey: Uint8Array;
   sourceAddress: string;
   relayFeePerByteInSatoshi: number;
-  slpOutputs: Output[];
   feePaidBy: FeePaidByEnum;
   discardChange?: boolean;
 }) {
@@ -479,15 +475,8 @@ export async function getFeeAmountSimple({
   const outputTotalSize =
     sendRequests.reduce((prev, curr) => prev + outputSize(curr), 0) +
     (discardChange ? 0 : outputSizeP2pkh);
-  const slpTotalSize = slpOutputs.reduce(
-    (prev, curr) => prev + curr.lockingBytecode.length,
-    0
-  );
 
-  return (
-    (inputTotalSize + outputTotalSize + slpTotalSize + 16) *
-    relayFeePerByteInSatoshi
-  );
+  return (inputTotalSize + outputTotalSize + 16) * relayFeePerByteInSatoshi;
 }
 
 // precise fee estimation
@@ -497,7 +486,6 @@ export async function getFeeAmount({
   privateKey,
   sourceAddress,
   relayFeePerByteInSatoshi,
-  slpOutputs,
   feePaidBy,
   discardChange,
 }: {
@@ -506,7 +494,6 @@ export async function getFeeAmount({
   privateKey: Uint8Array;
   sourceAddress: string;
   relayFeePerByteInSatoshi: number;
-  slpOutputs: Output[];
   feePaidBy: FeePaidByEnum;
   discardChange?: boolean;
 }) {
@@ -521,7 +508,6 @@ export async function getFeeAmount({
         sourceAddress,
         fee: 0, //DUST_UTXO_THRESHOLD
         discardChange: discardChange ?? false,
-        slpOutputs,
         feePaidBy,
         changeAddress: "",
       });
@@ -542,7 +528,6 @@ export async function buildEncodedTransaction({
   sourceAddress,
   fee = 0,
   discardChange = false,
-  slpOutputs = [],
   feePaidBy = FeePaidByEnum.change,
   changeAddress = "",
   buildUnsigned = false,
@@ -553,7 +538,6 @@ export async function buildEncodedTransaction({
   sourceAddress: string;
   fee?: number;
   discardChange?: boolean;
-  slpOutputs?: Output[];
   feePaidBy?: FeePaidByEnum;
   changeAddress?: string;
   buildUnsigned?: boolean;
@@ -565,7 +549,6 @@ export async function buildEncodedTransaction({
     sourceAddress,
     fee,
     discardChange,
-    slpOutputs,
     feePaidBy,
     changeAddress,
   });

package/src/util/deriveCashaddr.test.ts

@@ -3,6 +3,7 @@ import {
   deriveCashaddr,
   deriveTokenaddr,
   isTokenaddr,
+  isValidAddress,
   toCashaddr,
   toTokenaddr,
 } from "./deriveCashaddr";
@@ -41,3 +42,10 @@ test("Test address conversion", async () => {
   expect(isTokenaddr(wallet.cashaddr!)).toBe(false);
   expect(isTokenaddr(wallet.tokenaddr!)).toBe(true);
 });
+
+test("Test isValidAddress", async () => {
+  const wallet = await RegTestWallet.watchOnly(process.env.ADDRESS!);
+  expect(isValidAddress(wallet.cashaddr!)).toBe(true);
+  expect(isValidAddress(wallet.tokenaddr!)).toBe(true);
+  expect(isValidAddress("asdf")).toBe(false);
+});

package/src/util/deriveCashaddr.ts

@@ -13,6 +13,15 @@ import {
 
 import { hash160 } from "./hash160.js";
 
+export function isValidAddress(cashaddr: string): boolean {
+  const result = decodeCashAddress(cashaddr);
+  if (typeof result === "string") {
+    return false;
+  }
+
+  return true;
+}
+
 export function deriveCashaddr(
   privateKey: Uint8Array,
   networkPrefix: CashAddressNetworkPrefix

package/src/wallet/Base.ts

@@ -153,7 +153,7 @@ export class BaseWallet implements WalletI {
    * such kind of wallet does not have a private key and is unable to spend any funds
    * however it still allows to use many utility functions such as getting and watching balance, etc.
    *
-   * @param address   cashaddress, token aware cashaddress or slpaddress of a wallet
+   * @param address   cashaddress, token aware cashaddress of a wallet
    *
    * @returns instantiated wallet
    */

package/src/wallet/Bcmr.ts

@@ -402,7 +402,9 @@ export class BCMR {
    *
    * @param  {string} options.chaingraphUrl (required) URL of a chaingraph indexer instance to fetch info from
    * @param  {string} options.transactionHash (required) transaction hash from which to build the auth chain
-   * @param  {string?} options.network (default=mainnet) network to query the data from, specific to the queried instance, can be mainnet, chipnet, or anything else
+   * @param  {string?} options.network (default=undefined) network to query the data from, specific to the queried instance,
+   *  can be 'mainnet', 'chipnet', or anything else.
+   *  if left undefined all chaingraph transactions will be looked at, disregarding the chain
    *
    * @returns {AuthChain} returns the resolved authchain
    */
@@ -415,10 +417,6 @@ export class BCMR {
       throw new Error("Provide `chaingraphUrl` param.");
     }
 
-    if (options.network === undefined) {
-      options.network = "mainnet";
-    }
-
     const response = await axios.post(
       options.chaingraphUrl,
       {
@@ -429,10 +427,7 @@ export class BCMR {
   transaction(
     where: {
       hash:{_eq:"\\\\x${options.transactionHash}"},
-      _or: [
-        {node_validation_timeline:{node:{name:{_ilike:"%${options.network}%"}}}},
-        {block_inclusions:{block:{accepted_by:{node:{name:{_ilike:"%${options.network}%"}}}}}},
-      ]
+      ${options.network ? `node_validation_timeline:{node:{name:{_ilike:"%${options.network}%"}}}` : ""}
     }
   ) {
     hash

package/src/wallet/Util.ts

@@ -166,7 +166,7 @@ export class Util {
 
 //#region Specific wallet classes
 /**
- * Class to manage an slp enabled testnet wallet.
+ * Class to manage a testnet wallet.
  */
 export class TestNetUtil extends Util {
   static get walletType() {
@@ -175,7 +175,7 @@ export class TestNetUtil extends Util {
 }
 
 /**
- * Class to manage an slp enabled regtest wallet.
+ * Class to manage a regtest wallet.
  */
 export class RegTestUtil extends Util {
   static get walletType() {

package/src/wallet/Wif.test.ts

@@ -887,29 +887,6 @@ describe(`Wallet subscriptions`, () => {
     delay(3000);
     expect(response.balance!.sat!).toBe(0);
   });
-
-  test.skip("Should get testnet slp tokens and send them back", async () => {
-    let aliceWif = `${process.env.ALICE_TESTNET_WALLET_ID!}`;
-    let aliceWallet = await TestNetWallet.fromId(aliceWif);
-
-    const wallet = (await TestNetWallet.newRandom()) as TestNetWallet;
-
-    // send bob some bch gas to enable him to send slp
-    await aliceWallet
-      .slpAware()
-      .send([{ cashaddr: wallet.cashaddr!, value: 5000, unit: "sat" }]);
-
-    const txid = await wallet.getTestnetSlp("MNC");
-    expect(txid.length).toBe(64);
-    let balance = await wallet.slp.getBalance("MNC");
-    expect(balance[0].value.toNumber()).toBe(10);
-
-    const tokenId = balance[0].tokenId;
-    const response = await wallet.returnTestnetSlp(tokenId);
-    expect(response.balance).toBe(0);
-
-    await wallet.slpAware(false).sendMax(aliceWallet.cashaddr!);
-  });
 });
 
 describe(`Wallet extrema behavior regression testing`, () => {