@proton/wrap-constants 0.2.185 → 0.2.188

package/package.json

@@ -5,7 +5,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.2.185",
+  "version": "0.2.188",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -25,20 +25,17 @@
   },
   "devDependencies": {
     "@bloks/numbers": "^27.0.0",
-    "@bloks/utils": "^25.0.0",
-    "@proton/js": "^26.0.1",
-    "@size-limit/preset-small-lib": "^4.9.1",
+    "@size-limit/preset-small-lib": "^11.2.0",
     "@types/lodash.clonedeep": "^4.5.6",
-    "@typescript-eslint/parser": "^4.28.2",
-    "size-limit": "^4.9.1",
-    "tsup": "^6.7.0"
+    "@typescript-eslint/eslint-plugin": "^8.36.0",
+    "@typescript-eslint/parser": "^8.36.0",
+    "eslint": "^9.30.1",
+    "size-limit": "^11.2.0",
+    "tsup": "^8.5.0"
   },
   "dependencies": {
+    "bignumber.js": "^9.3.1",
     "lodash.clonedeep": "^4.5.0",
     "zod": "^3.19.1"
-  },
-  "resolutions": {
-    "typescript": "4.5"
-  },
-  "gitHead": "88555c5fb8a463f5e0d8af0e6976025739398ba3"
-}
+  }
+}

package/src/coins.ts

@@ -384,7 +384,7 @@ export const initializeCoins = (
                 hasWithdrawMemo: false,
               },
               {
-                wallet: "METAL",
+                wallet: "METAL-ERC20",
                 symbol: "METAL",
                 chain: Chains.EthereumMainnet,
                 network: Networks.ERC20,

package/src/constants.ts

@@ -20,7 +20,6 @@ export const initializeConstants = (chain: string) => {
     VEST_CONTRACT: "vest",
     DEX_CONTRACT: "dex",
     FEE_FACTOR,
-    GOOGLE_MAPS_KEY: "AIzaSyDb2_CrK032kSIqBXbkdwmaLKWELl0SxVs",
     SWAP_URL:
       chain === "proton"
         ? "https://otc.protonswap.com"
@@ -83,16 +82,16 @@ export const initializeConstants = (chain: string) => {
     PROTON_ENDPOINTS:
       chain === "proton"
         ? [
-          "https://rpc.api.mainnet.metalx.com",
-          "https://proton.greymass.com",
-          "https://proton.eoscafeblock.com",
-          "https://proton.cryptolions.io",
-          "https://proton.eosusa.news",
-        ]
+            "https://rpc.api.mainnet.metalx.com",
+            "https://proton.greymass.com",
+            "https://proton.eoscafeblock.com",
+            "https://proton.cryptolions.io",
+            "https://proton.eosusa.news",
+          ]
         : [
-          "https://rpc.api.testnet.metalx.com",
-          "https://testnet.protonchain.com",
-        ],
+            "https://rpc.api.testnet.metalx.com",
+            "https://testnet.protonchain.com",
+          ],
 
     CHAIN_ID:
       chain === "proton"

package/src/math.ts

@@ -1,5 +1,5 @@
-import { BigNumber as BN } from 'bignumber.js'
-import { FEE_FACTOR } from './constants'
+import BN from "bignumber.js";
+import { FEE_FACTOR } from "./constants";
 
 /**
  * XPR<>XUSDT (XPR -> XUSDT)
@@ -10,17 +10,23 @@ import { FEE_FACTOR } from './constants'
  *
  *  result = term - (term * fee)
  */
-export const compute_transfer = (pool1: BN.Instance, pool2: BN.Instance, swap: BN.Instance, exchange_fee: number, precision: number): BN => {
-  const term1 = pool2
-  const term2over = pool1.times(pool2)
-  const term2under = pool1.plus(swap)
-  const term2 = term2over.div(term2under).integerValue(BN.ROUND_DOWN)
-  const term = term1.minus(term2)
-  const fee = new BN(exchange_fee).div(FEE_FACTOR)
-  const result = term.minus(term.times(fee))
- 
-  return result.integerValue(BN.ROUND_DOWN).shiftedBy(-precision)
-}
+export const compute_transfer = (
+  pool1: BN.Instance,
+  pool2: BN.Instance,
+  swap: BN.Instance,
+  exchange_fee: number,
+  precision: number
+): BN => {
+  const term1 = pool2;
+  const term2over = pool1.times(pool2);
+  const term2under = pool1.plus(swap);
+  const term2 = term2over.div(term2under).integerValue(BN.ROUND_DOWN);
+  const term = term1.minus(term2);
+  const fee = new BN(exchange_fee).div(FEE_FACTOR);
+  const result = term.minus(term.times(fee));
+
+  return result.integerValue(BN.ROUND_DOWN).shiftedBy(-precision);
+};
 
 export const compute_transfer_curve = (
   reserve_in: number,
@@ -31,39 +37,51 @@ export const compute_transfer_curve = (
   amplifier: number
 ): BN => {
   if (amplifier === 0) {
-      return compute_transfer(new BN(reserve_in), new BN(reserve_out), new BN(amount_in), exchange_fee, precision)
+    return compute_transfer(
+      new BN(reserve_in),
+      new BN(reserve_out),
+      new BN(amount_in),
+      exchange_fee,
+      precision
+    );
   }
 
-  const MAX_ITERATIONS = 10
+  const MAX_ITERATIONS = 10;
 
-  const sum = reserve_in + reserve_out
+  const sum = reserve_in + reserve_out;
   let D = sum;
-  let D_prev = 0
+  let D_prev = 0;
 
   const F = (v: number) => {
-      return (v >= 0 ? 1 : -1) * Math.floor(Math.abs(v));
-  }
+    return (v >= 0 ? 1 : -1) * Math.floor(Math.abs(v));
+  };
 
-  let i = MAX_ITERATIONS
+  let i = MAX_ITERATIONS;
   while (D != D_prev && i--) {
-      const prod1 = F((F((D * D) / (reserve_in * 2)) * D) / (reserve_out * 2));
-      D_prev = D
-      D = F((2 * D * ((amplifier * sum) + prod1)) / ((2 * amplifier - 1) * D + 3 * prod1));
+    const prod1 = F((F((D * D) / (reserve_in * 2)) * D) / (reserve_out * 2));
+    D_prev = D;
+    D = F(
+      (2 * D * (amplifier * sum + prod1)) /
+        ((2 * amplifier - 1) * D + 3 * prod1)
+    );
   }
 
-  const b = ((reserve_in + amount_in) + F(D / (amplifier * 2))) - D;
+  const b = reserve_in + amount_in + F(D / (amplifier * 2)) - D;
 
-  const c = F(F((D * D) / ((reserve_in + amount_in) * 2)) * D / (amplifier * 4));
+  const c = F(
+    (F((D * D) / ((reserve_in + amount_in) * 2)) * D) / (amplifier * 4)
+  );
 
-  let x = D, x_prev = 0;
+  let x = D,
+    x_prev = 0;
   i = MAX_ITERATIONS;
-  while ( x != x_prev && i--) {
+  while (x != x_prev && i--) {
     x_prev = F(x);
-    x = +new BN(x * x + c).div(2 * x + b).toFixed(0, BN.ROUND_DOWN)
+    x = +new BN(x * x + c).div(2 * x + b).toFixed(0, BN.ROUND_DOWN);
   }
 
   if (reserve_out <= x) {
-      throw new Error("curve: insufficient reserve out")
+    throw new Error("curve: insufficient reserve out");
   }
 
   // Amount out + Fee + 1
@@ -71,42 +89,59 @@ export const compute_transfer_curve = (
 
   // Fee + 1
   // +1 covers small precision issues
-  const fee = amount_out_with_fee.times(exchange_fee).div(FEE_FACTOR).plus(1).toFixed(0, BN.ROUND_DOWN);
-  
-  // Amount out
-  const amount_out = amount_out_with_fee.minus(fee)
+  const fee = amount_out_with_fee
+    .times(exchange_fee)
+    .div(FEE_FACTOR)
+    .plus(1)
+    .toFixed(0, BN.ROUND_DOWN);
 
-  return amount_out.integerValue(BN.ROUND_DOWN).shiftedBy(-precision)
-}
-
-export const compute_liquidity = (amount_lt: BN.Instance, pool: BN.Instance, lt_supply: BN.Instance, precision: number): number => {
-  const over = amount_lt.times(pool)
-  const under = lt_supply
-  const result = over.div(under).integerValue(BN.ROUND_DOWN)
-
-  return +(result.shiftedBy(-precision).toFixed(precision, BN.ROUND_DOWN))
-}
-
-export const isInputInvalid = (data: string, value: string | number, pool: { xtokenPrecision: number }): boolean => {
-  value = String(value)
-  
-  const isBackspace = data === null
-  const isNumber = !/[0-9]|\./.test(data)
-  const isDoubleDot = data === '.' && value.indexOf('.') !== value.length - 1
-  const isPrecisionTooHigh = value && value.indexOf('.') !== -1 && value.split('.')[1].length > pool.xtokenPrecision
-  const isInvalid = !isBackspace && Boolean(isNumber || isDoubleDot || isPrecisionTooHigh)
-
-  return isInvalid
-}
+  // Amount out
+  const amount_out = amount_out_with_fee.minus(fee);
+
+  return amount_out.integerValue(BN.ROUND_DOWN).shiftedBy(-precision);
+};
+
+export const compute_liquidity = (
+  amount_lt: BN.Instance,
+  pool: BN.Instance,
+  lt_supply: BN.Instance,
+  precision: number
+): number => {
+  const over = amount_lt.times(pool);
+  const under = lt_supply;
+  const result = over.div(under).integerValue(BN.ROUND_DOWN);
+
+  return +result.shiftedBy(-precision).toFixed(precision, BN.ROUND_DOWN);
+};
+
+export const isInputInvalid = (
+  data: string,
+  value: string | number,
+  pool: { xtokenPrecision: number }
+): boolean => {
+  value = String(value);
+
+  const isBackspace = data === null;
+  const isNumber = !/[0-9]|\./.test(data);
+  const isDoubleDot = data === "." && value.indexOf(".") !== value.length - 1;
+  const isPrecisionTooHigh =
+    value &&
+    value.indexOf(".") !== -1 &&
+    value.split(".")[1].length > pool.xtokenPrecision;
+  const isInvalid =
+    !isBackspace && Boolean(isNumber || isDoubleDot || isPrecisionTooHigh);
+
+  return isInvalid;
+};
 
 export const applyDiscountToFee = (fee: number, staked: number): number => {
   if (staked >= 10000000) {
-    return fee * 0
+    return fee * 0;
   } else if (staked >= 1000000) {
-    return fee * 0.33
+    return fee * 0.33;
   } else if (staked >= 100000) {
-    return fee * 0.66
+    return fee * 0.66;
   } else {
-    return fee
+    return fee;
   }
-}
+};

package/src/parsers/auth.ts

@@ -1,22 +1,36 @@
-import * as z from 'zod';
-import { baseActionParser, singleActionTransactionParser } from './actions'
-import { authorizationParser } from './base'
-import { WRAP_CONTRACT, WRAP_AUTH_ACTION } from '../constants'
+import * as z from "zod";
+import { baseActionParser, singleActionTransactionParser } from "./actions";
+import { authorizationParser } from "./base";
+import { WRAP_CONTRACT, WRAP_AUTH_ACTION } from "../constants";
 
-export const createAbstractAuthParser = (contract: string, action: string, data: z.ZodRawShape) => {
-    return z.object({
-        signer     : authorizationParser,
-        signatures : z.array(z.string()).length(1),
-        transaction: singleActionTransactionParser(contract, action, data)
-    })
-}
+export const createAbstractAuthParser = (
+  contract: string,
+  action: string,
+  data: z.ZodRawShape
+) => {
+  return z.object({
+    signer: authorizationParser,
+    signatures: z.array(z.string()).length(1),
+    transaction: singleActionTransactionParser(contract, action, data),
+  });
+};
 
 const generateAuthData = {
-    time: z.string(),
-    protonAccount: z.string()
-}
-const generateAuthActionsBaseParser = baseActionParser(WRAP_CONTRACT, WRAP_AUTH_ACTION, generateAuthData)
-export type GenerateAuthBaseAction = z.infer<typeof generateAuthActionsBaseParser>
+  time: z.string(),
+  protonAccount: z.string(),
+};
+const generateAuthActionsBaseParser = baseActionParser(
+  WRAP_CONTRACT,
+  WRAP_AUTH_ACTION,
+  generateAuthData
+);
+export type GenerateAuthBaseAction = z.infer<
+  typeof generateAuthActionsBaseParser
+>;
 
-export const generateAuthParser = createAbstractAuthParser(WRAP_CONTRACT, WRAP_AUTH_ACTION, generateAuthData)
-export type GenerateAuth = z.infer<typeof generateAuthParser>
+export const generateAuthParser = createAbstractAuthParser(
+  WRAP_CONTRACT,
+  WRAP_AUTH_ACTION,
+  generateAuthData
+);
+export type GenerateAuth = z.infer<typeof generateAuthParser>;

package/src/parsers/pool.ts

@@ -1,30 +1,29 @@
-import { Coin } from "../coins"
-import { ExtendedAsset } from '@bloks/numbers'
+import { ExtendedAsset } from "@bloks/numbers";
+import { Coin } from "../coins";
 import { INode } from "../graph";
 
-
 export interface RawPool {
-    lt_symbol: string;
-    creator: string;
-    memo: string;
-    pool1: {
-      quantity: string;
-      contract: string;
-    };
-    pool2: {
-      quantity: string;
-      contract: string;
-    };
-    hash: string;
-    fee: {
-      exchange_fee: number;
-      add_liquidity_fee: number;
-      remove_liquidity_fee: number;
-    };
-    active: boolean;
-    amplifier: number;
+  lt_symbol: string;
+  creator: string;
+  memo: string;
+  pool1: {
+    quantity: string;
+    contract: string;
+  };
+  pool2: {
+    quantity: string;
+    contract: string;
+  };
+  hash: string;
+  fee: {
+    exchange_fee: number;
+    add_liquidity_fee: number;
+    remove_liquidity_fee: number;
+  };
+  active: boolean;
+  amplifier: number;
 }
-export interface Pool extends Omit<RawPool, 'pool1'|'pool2'> {
+export interface Pool extends Omit<RawPool, "pool1" | "pool2"> {
   lt_symbol: string;
   creator: string;
   memo: string;
@@ -39,14 +38,16 @@ export interface Pool extends Omit<RawPool, 'pool1'|'pool2'> {
   liquidityUsd: number;
   liquidityApr: number;
 }
-  
-export type ExtendedToken = Coin & ExtendedAsset & { key: string; }
-export type ExtendedTokenWithRate = ExtendedToken & { rate: number; }
 
-export type PoolTable = {
-  pool1: ExtendedTokenWithRate;
-  pool2: ExtendedTokenWithRate;
-  path: INode<Pool>[];
-  shortestPath: INode<Pool>[];
-  getPathString: () => string;
-} | undefined
+export type ExtendedToken = Coin & ExtendedAsset & { key: string };
+export type ExtendedTokenWithRate = ExtendedToken & { rate: number };
+
+export type PoolTable =
+  | {
+      pool1: ExtendedTokenWithRate;
+      pool2: ExtendedTokenWithRate;
+      path: INode<Pool>[];
+      shortestPath: INode<Pool>[];
+      getPathString: () => string;
+    }
+  | undefined;