@bithomp/xrpl-api 3.0.0 → 3.0.1

package/lib/ledger/transaction.js

@@ -196,7 +196,7 @@ async function submitPaymentTransactionV1(data, definitions, validateTx) {
     }
     transaction.Sequence = submitParams.sequence;
     transaction.LastLedgerSequence = submitParams.lastLedgerSequence;
-    const wallet = (0, wallet_1.walletFromSeed)(data.secret);
+    const wallet = (0, wallet_1.walletFromSeed)(data.secret, { seedAddress: transaction.Account });
     const signedTransaction = (0, wallet_1.signTransaction)(wallet, transaction, false, definitions, validateTx).tx_blob;
     return await submit(signedTransaction, { connection, definitions });
 }

package/lib/parse/utils.d.ts

@@ -10,6 +10,7 @@ declare function normalizeNodes(metadata: TransactionMetadata): any[];
 declare function hexToString(hex: string | undefined): string | undefined;
 declare function stringToHex(value: string | undefined): string | undefined;
 declare function bytesToHex(value: Uint8Array | ArrayBufferLike): string;
+declare function hexToBytes(value: string): Uint8Array;
 declare function parseUint32(buf: Buffer, cur: number): string;
 declare function parseUint64(buf: Buffer, cur: number): string;
-export { parseQuality, parseTimestamp, adjustQualityForXRP, isPartialPayment, removeGenericCounterparty, normalizeNodes, hexToString, stringToHex, bytesToHex, parseUint32, parseUint64, };
+export { parseQuality, parseTimestamp, adjustQualityForXRP, isPartialPayment, removeGenericCounterparty, normalizeNodes, hexToString, stringToHex, bytesToHex, hexToBytes, parseUint32, parseUint64, };

package/lib/parse/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseUint64 = exports.parseUint32 = exports.bytesToHex = exports.stringToHex = exports.hexToString = exports.normalizeNodes = exports.removeGenericCounterparty = exports.isPartialPayment = exports.adjustQualityForXRP = exports.parseTimestamp = exports.parseQuality = void 0;
+exports.parseUint64 = exports.parseUint32 = exports.hexToBytes = exports.bytesToHex = exports.stringToHex = exports.hexToString = exports.normalizeNodes = exports.removeGenericCounterparty = exports.isPartialPayment = exports.adjustQualityForXRP = exports.parseTimestamp = exports.parseQuality = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const xrpl_1 = require("xrpl");
@@ -69,6 +69,19 @@ function bytesToHex(value) {
     return Buffer.from(value).toString("hex").toUpperCase();
 }
 exports.bytesToHex = bytesToHex;
+function hexToBytes(value) {
+    if (value.length % 2 !== 0) {
+        throw new Error("Invalid hex string length");
+    }
+    if (!/^[0-9a-fA-F]*$/.test(value)) {
+        throw new Error("Invalid hex string");
+    }
+    if (value.length === 0) {
+        return new Uint8Array(0);
+    }
+    return Uint8Array.from(Buffer.from(value, "hex"));
+}
+exports.hexToBytes = hexToBytes;
 function parseUint32(buf, cur) {
     return ((BigInt(buf[cur]) << 24n) + (BigInt(buf[cur + 1]) << 16n) + (BigInt(buf[cur + 2]) << 8n) + BigInt(buf[cur + 3]) + "");
 }

package/lib/wallet.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Wallet, Transaction } from "xrpl";
+import { Wallet, Transaction, ECDSA } from "xrpl";
 import { XrplDefinitionsBase, XrplDefinitions, DEFAULT_DEFINITIONS } from "ripple-binary-codec";
 interface GenerateAddressInterface {
     publicKey: string;
@@ -8,7 +8,13 @@ interface GenerateAddressInterface {
     seed: string;
 }
 export declare function isValidSecret(secret: string): boolean;
-export declare function walletFromSeed(seed: string): Wallet;
+export interface WalletFromSeedInterface {
+    masterAddress?: string;
+    algorithm?: ECDSA;
+    seedAddress?: string;
+    ignoreSeedPayload?: boolean;
+}
+export declare function walletFromSeed(seed: string, options?: WalletFromSeedInterface): Wallet;
 export declare function generateAddress(): GenerateAddressInterface;
 export declare function isValidClassicAddress(address: string): boolean;
 export declare function checksumClassicAddress(buffer: Buffer): Buffer;

package/lib/wallet.js

@@ -53,11 +53,28 @@ function isValidSecret(secret) {
     return false;
 }
 exports.isValidSecret = isValidSecret;
-function walletFromSeed(seed) {
-    const decodedSeed = (0, ripple_address_codec_1.decodeSeed)(seed);
-    const wallet = xrpl_1.Wallet.fromSeed(seed, {
-        algorithm: decodedSeed.type === "ed25519" ? xrpl_1.ECDSA.ed25519 : xrpl_1.ECDSA.secp256k1,
-    });
+function walletFromSeed(seed, options) {
+    options = { ignoreSeedPayload: false, ...options };
+    let algorithm = options.algorithm;
+    if (!options.ignoreSeedPayload && !options.algorithm) {
+        const decodedSeed = (0, ripple_address_codec_1.decodeSeed)(seed);
+        if (decodedSeed.type === "secp256k1") {
+            if (options.seedAddress) {
+                const { publicKey } = (0, ripple_keypairs_1.deriveKeypair)(seed, { algorithm: xrpl_1.ECDSA.secp256k1 });
+                const classicAddress = (0, ripple_keypairs_1.deriveAddress)(publicKey);
+                if (classicAddress === options.seedAddress) {
+                    algorithm = xrpl_1.ECDSA.secp256k1;
+                }
+                else {
+                    algorithm = xrpl_1.ECDSA.ed25519;
+                }
+            }
+            else {
+                algorithm = xrpl_1.ECDSA.secp256k1;
+            }
+        }
+    }
+    const wallet = xrpl_1.Wallet.fromSeed(seed, { algorithm, masterAddress: options.masterAddress });
     return wallet;
 }
 exports.walletFromSeed = walletFromSeed;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bithomp/xrpl-api",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "A Bithomp JavaScript/TypeScript library for interacting with the XRP Ledger",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",