@streamflow/common 7.0.0-alpha.1 → 7.0.0-alpha.10

package/dist/cjs/types.js

@@ -1,19 +1,4 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContractError = exports.IChain = exports.ICluster = void 0;
 // Utility types
@@ -36,23 +21,20 @@ var IChain;
 /**
  * Error wrapper for calls made to the contract on chain
  */
-var ContractError = /** @class */ (function (_super) {
-    __extends(ContractError, _super);
+class ContractError extends Error {
     /**
      * Constructs the Error Wrapper
      * @param error Original error raised probably by the chain SDK
      * @param code extracted code from the error if managed to parse it
      */
-    function ContractError(error, code, description) {
-        var _this = _super.call(this, error.message) || this;
-        _this.contractErrorCode = code !== null && code !== void 0 ? code : null;
-        _this.description = description !== null && description !== void 0 ? description : null;
+    constructor(error, code, description) {
+        super(error.message); // Call the base class constructor with the error message
+        this.contractErrorCode = code ?? null;
+        this.description = description ?? null;
         // Copy properties from the original error
-        Object.setPrototypeOf(_this, ContractError.prototype);
-        _this.name = "ContractError"; // Set the name property
-        _this.stack = error.stack;
-        return _this;
+        Object.setPrototypeOf(this, ContractError.prototype);
+        this.name = "ContractError"; // Set the name property
+        this.stack = error.stack;
     }
-    return ContractError;
-}(Error));
+}
 exports.ContractError = ContractError;

package/dist/cjs/utils.js

@@ -1,100 +1,50 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sleep = exports.handleContractError = exports.getNumberFromBN = exports.getBN = void 0;
-var bn_js_1 = __importDefault(require("bn.js"));
-var types_js_1 = require("./types.js");
+exports.sleep = exports.handleContractError = exports.getScaledBigNumber = exports.getNumberFromBigNumber = void 0;
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const types_js_1 = require("./types.js");
 /**
- * Used for conversion of token amounts to their Big Number representation.
- * Get Big Number representation in the smallest units from the same value in the highest units.
- * @param {number} value - Number of tokens you want to convert to its BN representation.
+ * Used for token amounts conversion from their Big Number representation to number.
+ * Get value in the highest units from BigNumber representation of the same value in the smallest units.
+ * @param {BigNumber} value - Big Number representation of value in the smallest units.
  * @param {number} decimals - Number of decimals the token has.
  */
-var getBN = function (value, decimals) {
-    var decimalPart = value - Math.trunc(value);
-    var integerPart = new bn_js_1.default(Math.trunc(value));
-    var decimalE = new bn_js_1.default(decimalPart * 1e9);
-    var sum = integerPart.mul(new bn_js_1.default(1e9)).add(decimalE);
-    var resultE = sum.mul(new bn_js_1.default(10).pow(new bn_js_1.default(decimals)));
-    return resultE.div(new bn_js_1.default(1e9));
+const getNumberFromBigNumber = (bigNum, decimals) => {
+    return bigNum.div((0, bignumber_js_1.default)(10).pow(decimals)).toNumber();
 };
-exports.getBN = getBN;
+exports.getNumberFromBigNumber = getNumberFromBigNumber;
 /**
- * Used for token amounts conversion from their Big Number representation to number.
- * Get value in the highest units from BN representation of the same value in the smallest units.
- * @param {BN} value - Big Number representation of value in the smallest units.
+ * Used for conversion of token amounts to their Big Number representation.
+ * Get Big Number representation in the smallest units from the same value in the highest units.
+ * @param {number} value - Number of tokens you want to convert to its BigNumber representation.
  * @param {number} decimals - Number of decimals the token has.
  */
-var getNumberFromBN = function (value, decimals) {
-    return value.gt(new bn_js_1.default(Math.pow(2, 53) - 1)) ? value.div(new bn_js_1.default(Math.pow(10, decimals))).toNumber() : value.toNumber() / Math.pow(10, decimals);
+const getScaledBigNumber = (value, decimals) => {
+    return new bignumber_js_1.default(value).times(new bignumber_js_1.default(10).pow(decimals));
 };
-exports.getNumberFromBN = getNumberFromBN;
+exports.getScaledBigNumber = getScaledBigNumber;
 /**
  * Used to make on chain calls to the contract and wrap raised errors if any
  * @param func function that interacts with the contract
  * @param callback callback that may be used to extract error code
  * @returns {T}
  */
-function handleContractError(func, callback) {
-    return __awaiter(this, void 0, void 0, function () {
-        var err_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    _a.trys.push([0, 2, , 3]);
-                    return [4 /*yield*/, func()];
-                case 1: return [2 /*return*/, _a.sent()];
-                case 2:
-                    err_1 = _a.sent();
-                    if (err_1 instanceof Error) {
-                        if (callback) {
-                            throw new types_js_1.ContractError(err_1, callback(err_1));
-                        }
-                        throw new types_js_1.ContractError(err_1);
-                    }
-                    throw err_1;
-                case 3: return [2 /*return*/];
+async function handleContractError(func, callback) {
+    try {
+        return await func();
+    }
+    catch (err) {
+        if (err instanceof Error) {
+            if (callback) {
+                throw new types_js_1.ContractError(err, callback(err));
             }
-        });
-    });
+            throw new types_js_1.ContractError(err);
+        }
+        throw err;
+    }
 }
 exports.handleContractError = handleContractError;
 /**
@@ -102,6 +52,6 @@ exports.handleContractError = handleContractError;
  * @param ms millisecond to sleep for
  */
 function sleep(ms) {
-    return new Promise(function (resolve) { return setTimeout(resolve, ms); });
+    return new Promise((resolve) => setTimeout(resolve, ms));
 }
 exports.sleep = sleep;

package/dist/esm/solana/instructions.d.ts

@@ -1,3 +1,3 @@
 import { Connection, PublicKey, TransactionInstruction } from "@solana/web3.js";
-import BN from "bn.js";
-export declare const prepareWrappedAccount: (connection: Connection, senderAddress: PublicKey, amount: BN) => Promise<TransactionInstruction[]>;
+import BigNumber from "bignumber.js";
+export declare const prepareWrappedAccount: (connection: Connection, senderAddress: PublicKey, amount: BigNumber) => Promise<TransactionInstruction[]>;

package/dist/esm/solana/types.d.ts

@@ -30,6 +30,10 @@ export interface ThrottleParams {
     sendRate?: number;
     sendThrottler?: PQueue;
 }
+export interface IProgramAccount<T> {
+    publicKey: PublicKey;
+    account: T;
+}
 export declare class TransactionFailedError extends Error {
     constructor(m: string);
 }

package/dist/esm/solana/utils.js

@@ -17,7 +17,7 @@ export const buildSendThrottler = (sendRate) => {
  * @return {Promise<Account[]>} - Array of resulting accounts.
  */
 export async function getProgramAccounts(connection, wallet, offset, programId) {
-    return connection?.getProgramAccounts(programId, {
+    const programAccounts = await connection?.getProgramAccounts(programId, {
         filters: [
             {
                 memcmp: {
@@ -27,6 +27,7 @@ export async function getProgramAccounts(connection, wallet, offset, programId)
             },
         ],
     });
+    return [...programAccounts];
 }
 /**
  * Utility function to check if the transaction initiator is a Wallet object
@@ -243,11 +244,11 @@ export async function simulateTransaction(connection, tx) {
  * @returns Transaction Status
  */
 export async function confirmAndEnsureTransaction(connection, signature, ignoreError) {
-    const response = await connection.getSignatureStatus(signature);
-    if (!response) {
+    const response = await connection.getSignatureStatuses([signature]);
+    if (!response || response.value.length === 0 || response.value[0] === null) {
         return null;
     }
-    const { value } = response;
+    const value = response.value[0];
     if (!value) {
         return null;
     }

package/dist/esm/utils.d.ts

@@ -1,18 +1,18 @@
-import BN from "bn.js";
+import BigNumber from "bignumber.js";
 /**
- * Used for conversion of token amounts to their Big Number representation.
- * Get Big Number representation in the smallest units from the same value in the highest units.
- * @param {number} value - Number of tokens you want to convert to its BN representation.
+ * Used for token amounts conversion from their Big Number representation to number.
+ * Get value in the highest units from BigNumber representation of the same value in the smallest units.
+ * @param {BigNumber} value - Big Number representation of value in the smallest units.
  * @param {number} decimals - Number of decimals the token has.
  */
-export declare const getBN: (value: number, decimals: number) => BN;
+export declare const getNumberFromBigNumber: (bigNum: BigNumber, decimals: number) => number;
 /**
- * Used for token amounts conversion from their Big Number representation to number.
- * Get value in the highest units from BN representation of the same value in the smallest units.
- * @param {BN} value - Big Number representation of value in the smallest units.
+ * Used for conversion of token amounts to their Big Number representation.
+ * Get Big Number representation in the smallest units from the same value in the highest units.
+ * @param {number} value - Number of tokens you want to convert to its BigNumber representation.
  * @param {number} decimals - Number of decimals the token has.
  */
-export declare const getNumberFromBN: (value: BN, decimals: number) => number;
+export declare const getScaledBigNumber: (value: number | string | BigNumber, decimals: number) => BigNumber;
 /**
  * Used to make on chain calls to the contract and wrap raised errors if any
  * @param func function that interacts with the contract

package/dist/esm/utils.js

@@ -1,26 +1,23 @@
-import BN from "bn.js";
+import BigNumber from "bignumber.js";
 import { ContractError } from "./types.js";
 /**
- * Used for conversion of token amounts to their Big Number representation.
- * Get Big Number representation in the smallest units from the same value in the highest units.
- * @param {number} value - Number of tokens you want to convert to its BN representation.
+ * Used for token amounts conversion from their Big Number representation to number.
+ * Get value in the highest units from BigNumber representation of the same value in the smallest units.
+ * @param {BigNumber} value - Big Number representation of value in the smallest units.
  * @param {number} decimals - Number of decimals the token has.
  */
-export const getBN = (value, decimals) => {
-    const decimalPart = value - Math.trunc(value);
-    const integerPart = new BN(Math.trunc(value));
-    const decimalE = new BN(decimalPart * 1e9);
-    const sum = integerPart.mul(new BN(1e9)).add(decimalE);
-    const resultE = sum.mul(new BN(10).pow(new BN(decimals)));
-    return resultE.div(new BN(1e9));
+export const getNumberFromBigNumber = (bigNum, decimals) => {
+    return bigNum.div(BigNumber(10).pow(decimals)).toNumber();
 };
 /**
- * Used for token amounts conversion from their Big Number representation to number.
- * Get value in the highest units from BN representation of the same value in the smallest units.
- * @param {BN} value - Big Number representation of value in the smallest units.
+ * Used for conversion of token amounts to their Big Number representation.
+ * Get Big Number representation in the smallest units from the same value in the highest units.
+ * @param {number} value - Number of tokens you want to convert to its BigNumber representation.
  * @param {number} decimals - Number of decimals the token has.
  */
-export const getNumberFromBN = (value, decimals) => value.gt(new BN(2 ** 53 - 1)) ? value.div(new BN(10 ** decimals)).toNumber() : value.toNumber() / 10 ** decimals;
+export const getScaledBigNumber = (value, decimals) => {
+    return new BigNumber(value).times(new BigNumber(10).pow(decimals));
+};
 /**
  * Used to make on chain calls to the contract and wrap raised errors if any
  * @param func function that interacts with the contract

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamflow/common",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0-alpha.10",
   "description": "Common utilities and types used by streamflow packages.",
   "homepage": "https://github.com/streamflow-finance/js-sdk/",
   "main": "./dist/esm/index.js",
@@ -27,21 +27,20 @@
     "lint-config": "eslint --print-config",
     "prepublishOnly": "npm run lint && npm run build"
   },
-  "gitHead": "8b2be143ac1bfeaca3bcecc11eb5fa1e81f2ffb7",
+  "gitHead": "263638b9fd29395dcb64c33dfc2197df47f526af",
   "devDependencies": {
-    "@streamflow/eslint-config": "7.0.0-alpha.1",
-    "@types/bn.js": "5.1.1",
+    "@streamflow/eslint-config": "7.0.0-alpha.10",
     "date-fns": "2.28.0",
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "@coral-xyz/borsh": "^0.29.0",
+    "@coral-xyz/borsh": "0.30.1",
     "@solana/buffer-layout": "4.0.1 ",
     "@solana/spl-token": "0.3.6",
     "@solana/wallet-adapter-base": "0.9.19",
-    "@solana/web3.js": "1.70.1",
-    "aptos": "1.4.0",
-    "bn.js": "5.2.1",
+    "@solana/web3.js": "1.90.2",
+    "aptos": "1.21.0",
+    "bignumber.js": "^9.1.2",
     "borsh": "^2.0.0",
     "bs58": "5.0.0",
     "p-queue": "^8.0.1"