@bithomp/xrpl-api 3.1.17 → 3.2.0

package/lib/v1/utils.js

@@ -8,18 +8,26 @@ const client_1 = require("../client");
 function toRippledAmount(amount) {
     if (typeof amount === "string")
         return amount;
-    if (amount.currency === (0, client_1.getNativeCurrency)()) {
-        return (0, common_1.xrpToDrops)(amount.value);
+    if ("currency" in amount) {
+        if (amount.currency === (0, client_1.getNativeCurrency)()) {
+            return (0, common_1.xrpToDrops)(amount.value);
+        }
+        else if (amount.currency === "drops") {
+            return amount.value;
+        }
+        const issuer = amount.counterparty || amount.issuer;
+        return {
+            currency: amount.currency,
+            issuer,
+            value: amount.value,
+        };
     }
-    if (amount.currency === "drops") {
-        return amount.value;
+    if ("mpt_issuance_id" in amount) {
+        return {
+            value: amount.value,
+            mpt_issuance_id: amount.mpt_issuance_id,
+        };
     }
-    const issuer = amount.counterparty || amount.issuer;
-    return {
-        currency: amount.currency,
-        issuer,
-        value: amount.value,
-    };
 }
 function getClassicAccountAndTag(Account, expectedTag) {
     if ((0, ripple_address_codec_1.isValidXAddress)(Account)) {

package/lib/validator.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -34,7 +44,6 @@ exports.verify2 = verify2;
 const assert = __importStar(require("assert"));
 const ripple_address_codec_1 = require("ripple-address-codec");
 const Crypto = __importStar(require("crypto"));
-const Base58 = __importStar(require("./base58"));
 const elliptic_1 = __importDefault(require("elliptic"));
 const secp256k1 = new elliptic_1.default.ec("secp256k1");
 const ed25519 = new elliptic_1.default.eddsa("ed25519");
@@ -56,14 +65,7 @@ function classicAddressFromValidatorPK(pk) {
     const pubkeyOuterHash = Crypto.createHash("ripemd160");
     pubkeyOuterHash.update(pubkeyInnerHash.digest());
     const accountID = pubkeyOuterHash.digest();
-    const addressTypePrefix = Buffer.from([0x00]);
-    const payload = Buffer.concat([addressTypePrefix, accountID]);
-    const chksumHash1 = Crypto.createHash("sha256").update(payload).digest();
-    const chksumHash2 = Crypto.createHash("sha256").update(chksumHash1).digest();
-    const checksum = chksumHash2.slice(0, 4);
-    const dataToEncode = Buffer.concat([payload, checksum]);
-    const address = Base58.encode(dataToEncode);
-    return address;
+    return (0, ripple_address_codec_1.encodeAccountID)(accountID);
 }
 function generateSecrets() {
     const keypair = Crypto.generateKeyPairSync("ed25519", {

package/lib/wallet.d.ts

@@ -6,6 +6,12 @@ interface GenerateAddressInterface {
     address: string;
     seed: string;
 }
+export interface VerifySignatureInterface {
+    signedBy?: string;
+    signatureValid?: boolean;
+    signatureMultiSign?: boolean;
+    error?: string;
+}
 export declare function isValidSecret(secret: string): boolean;
 export interface WalletFromSeedInterface {
     masterAddress?: string;
@@ -21,6 +27,7 @@ export declare function signTransaction(wallet: Wallet, transaction: Transaction
     tx_blob: string;
     hash: string;
 };
-export declare function verifyTransaction(wallet: Wallet, signedTransaction: Transaction | string): boolean;
+export declare function verifyTransaction(signedTransaction: Transaction | string, definitions?: XrplDefinitionsBase): boolean;
+export declare function verifySignature(signedTransaction: Transaction | string, explicitMultiSigner?: string | null, definitions?: XrplDefinitionsBase): VerifySignatureInterface;
 declare function hashSignedTx(tx: Transaction | string, definitions?: XrplDefinitionsBase, validateTx?: boolean): string;
 export { XrplDefinitionsBase, XrplDefinitions, DEFAULT_DEFINITIONS, hashSignedTx };

package/lib/wallet.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -34,6 +44,7 @@ exports.isValidClassicAddress = isValidClassicAddress;
 exports.checksumClassicAddress = checksumClassicAddress;
 exports.signTransaction = signTransaction;
 exports.verifyTransaction = verifyTransaction;
+exports.verifySignature = verifySignature;
 exports.hashSignedTx = hashSignedTx;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const omitBy_1 = __importDefault(require("lodash/omitBy"));
@@ -147,11 +158,83 @@ function signTransaction(wallet, transaction, multisign, definitions, validateTx
         hash: hashSignedTx(serialized, definitions),
     };
 }
-function verifyTransaction(wallet, signedTransaction) {
-    const tx = typeof signedTransaction === "string" ? (0, ripple_binary_codec_1.decode)(signedTransaction) : signedTransaction;
-    const messageHex = (0, ripple_binary_codec_1.encodeForSigning)(tx);
+function verifyTransaction(signedTransaction, definitions) {
+    const tx = typeof signedTransaction === "string" ? (0, ripple_binary_codec_1.decode)(signedTransaction, definitions) : signedTransaction;
+    const messageHex = (0, ripple_binary_codec_1.encodeForSigning)(tx, definitions);
     const signature = tx.TxnSignature;
-    return (0, ripple_keypairs_1.verify)(messageHex, signature, wallet.publicKey);
+    const publicKey = tx.SigningPubKey;
+    return (0, ripple_keypairs_1.verify)(messageHex, signature, publicKey);
+}
+function verifySignature(signedTransaction, explicitMultiSigner, definitions) {
+    let tx;
+    let signedBy = "";
+    let signatureValid = false;
+    try {
+        if (typeof signedTransaction === "string") {
+            tx = (0, ripple_binary_codec_1.decode)(signedTransaction, definitions);
+        }
+        else if (signedTransaction !== null && typeof signedTransaction === "object") {
+            tx = signedTransaction;
+        }
+    }
+    catch (err) {
+        return { signatureValid: false, error: err.message };
+    }
+    if (!tx) {
+        return { signatureValid: false, error: "The transaction could not be decoded." };
+    }
+    if (!tx.TxnSignature && !tx.Signers) {
+        return { signatureValid: false, error: "The transaction must be signed to verify the signature." };
+    }
+    const signatureMultiSign = typeof tx.Signers !== "undefined" &&
+        Array.isArray(tx.Signers) &&
+        tx.Signers.length > 0 &&
+        typeof tx.SigningPubKey === "string" &&
+        tx.SigningPubKey === "";
+    try {
+        if (signatureMultiSign && explicitMultiSigner && explicitMultiSigner.match(/^r/)) {
+            signedBy = explicitMultiSigner;
+        }
+        else if (signatureMultiSign && explicitMultiSigner) {
+            signedBy = (0, ripple_keypairs_1.deriveAddress)(explicitMultiSigner);
+        }
+        else {
+            let signer = tx.SigningPubKey;
+            if (signatureMultiSign && tx.Signers && tx.Signers.length > 0) {
+                const firstSigner = Object.values(tx.Signers)[0];
+                signer = firstSigner.Signer.SigningPubKey;
+            }
+            signedBy = (0, ripple_keypairs_1.deriveAddress)(signer);
+        }
+    }
+    catch (err) {
+        return { signatureValid: false, error: err.message };
+    }
+    try {
+        if (signatureMultiSign && tx.Signers) {
+            const matchingSigners = Object.values(tx.Signers).filter((signer) => {
+                return (0, ripple_keypairs_1.deriveAddress)(signer.Signer.SigningPubKey) === signedBy;
+            });
+            if (matchingSigners.length > 0) {
+                const multiSigner = matchingSigners[0];
+                signatureValid = (0, ripple_keypairs_1.verify)((0, ripple_binary_codec_1.encodeForMultisigning)(tx, signedBy, definitions), multiSigner.Signer.TxnSignature, multiSigner.Signer.SigningPubKey);
+            }
+            else {
+                return { signatureValid: false, error: "Explicit MultiSigner not in Signers" };
+            }
+        }
+        else {
+            signatureValid = (0, ripple_keypairs_1.verify)((0, ripple_binary_codec_1.encodeForSigning)(tx, definitions), tx.TxnSignature, tx.SigningPubKey);
+        }
+    }
+    catch (err) {
+        return { signedBy, signatureValid: false, error: err.message };
+    }
+    return {
+        signedBy,
+        signatureValid,
+        signatureMultiSign,
+    };
 }
 function computeSignature(tx, privateKey, signAs, definitions) {
     if (signAs) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bithomp/xrpl-api",
-  "version": "3.1.17",
+  "version": "3.2.0",
   "description": "A Bithomp JavaScript/TypeScript library for interacting with the XRP Ledger",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -41,7 +41,7 @@
     "test": "node ./node_modules/mocha/bin/mocha",
     "build": "tsc",
     "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
-    "lint": "eslint -c .eslintrc.json --ext .ts src/",
+    "lint": "eslint",
     "prepare": "npm run build",
     "prepublishOnly": "npm test && npm run lint",
     "preversion": "npm run lint",
@@ -52,36 +52,39 @@
     "lib/**/*"
   ],
   "dependencies": {
-    "axios": "^1.7.7",
+    "axios": "^1.7.9",
     "base-x": "^5.0.0",
     "bignumber.js": "^9.1.2",
-    "elliptic": "^6.6.0",
+    "elliptic": "^6.6.1",
     "lodash": "^4.17.21",
     "ripple-address-codec": "^5.0.0",
     "ripple-binary-codec": "^2.1.0",
     "xrpl": "^4.0.0"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.19",
-    "@types/chai-as-promised": "^7.1.8",
+    "@eslint/eslintrc": "^3.2.0",
+    "@eslint/js": "^9.17.0",
+    "@types/chai": "^5.0.1",
+    "@types/chai-as-promised": "^8.0.1",
     "@types/lodash": "^4.17.13",
-    "@types/mocha": "^10.0.9",
+    "@types/mocha": "^10.0.10",
     "@types/nconf": "^0.10.7",
-    "@types/node": "^20.14.15",
-    "@typescript-eslint/eslint-plugin": "^8.13.0",
-    "@typescript-eslint/parser": "^8.13.0",
+    "@types/node": "^22.10.2",
+    "@typescript-eslint/eslint-plugin": "^8.18.1",
+    "@typescript-eslint/parser": "^8.18.1",
     "chai": "^4.5.0",
     "chai-as-promised": "^7.1.2",
-    "eslint": "^8.57.0",
+    "eslint": "^9.17.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-chai-friendly": "^1.0.1",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-n": "^17.12.0",
-    "eslint-plugin-promise": "^7.1.0",
-    "mocha": "^10.8.2",
+    "eslint-plugin-n": "^17.15.1",
+    "eslint-plugin-promise": "^7.2.1",
+    "globals": "^15.14.0",
+    "mocha": "^11.0.1",
     "nconf": "^0.12.1",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.5"
+    "typescript": "^5.7.2"
   }
 }