diff --git a/packages/xrpl/snippets/src/multisigning.ts b/packages/xrpl/snippets/src/multisigning.ts index 8f9bbd0903..983afdefcf 100644 --- a/packages/xrpl/snippets/src/multisigning.ts +++ b/packages/xrpl/snippets/src/multisigning.ts @@ -4,6 +4,7 @@ import { AccountSet, convertStringToHex, SignerListSet, + Wallet, } from '../../src' const client = new Client('wss://s.altnet.rippletest.net:51233') @@ -15,12 +16,8 @@ async function multisigning(): Promise { * In practice, users generally will not have all keys in one spot, * hence, users need to implement a way to get signatures. */ - const { wallet: wallet1 } = await client.fundWallet(null, { - usageContext: 'code snippets', - }) - const { wallet: wallet2 } = await client.fundWallet(null, { - usageContext: 'code snippets', - }) + const wallet1 = Wallet.generate() + const wallet2 = Wallet.generate() const { wallet: walletMaster } = await client.fundWallet(null, { usageContext: 'code snippets', }) diff --git a/packages/xrpl/src/Wallet/signer.ts b/packages/xrpl/src/Wallet/signer.ts index 366ee3dd9c..6980c423bd 100644 --- a/packages/xrpl/src/Wallet/signer.ts +++ b/packages/xrpl/src/Wallet/signer.ts @@ -32,9 +32,13 @@ function multisign(transactions: Array): string { throw new ValidationError('There were 0 transactions to multisign') } - transactions.forEach((txOrBlob) => { - const tx: Transaction = getDecodedTransaction(txOrBlob) + const decodedTransactions: Transaction[] = transactions.map( + (txOrBlob: string | Transaction) => { + return getDecodedTransaction(txOrBlob) + }, + ) + decodedTransactions.forEach((tx) => { /* * This will throw a more clear error for JS users if any of the supplied transactions has incorrect formatting */ @@ -53,12 +57,6 @@ function multisign(transactions: Array): string { } }) - const decodedTransactions: Transaction[] = transactions.map( - (txOrBlob: string | Transaction) => { - return getDecodedTransaction(txOrBlob) - }, - ) - validateTransactionEquivalence(decodedTransactions) return encode(getTransactionWithAllSigners(decodedTransactions)) @@ -154,10 +152,11 @@ function compareSigners(left: Signer, right: Signer): number { ) } +const NUM_BITS_IN_HEX = 16 + function addressToBigNumber(address: string): BigNumber { const hex = Buffer.from(decodeAccountID(address)).toString('hex') - const numberOfBitsInHex = 16 - return new BigNumber(hex, numberOfBitsInHex) + return new BigNumber(hex, NUM_BITS_IN_HEX) } function getDecodedTransaction(txOrBlob: Transaction | string): Transaction {