xrpl 5.0.0 → 5.1.0-batch.1

package/dist/npm/Wallet/batchSigner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batchSigner.d.ts","sourceRoot":"","sources":["../../../src/Wallet/batchSigner.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAyB,MAAM,WAAW,CAAA;AAMxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAgDrC,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,KAAK,EAClB,IAAI,GAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;CAAO,GACjE,IAAI,CA4CN;AAYD,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,GAClC,MAAM,CAmCR"}
+{"version":3,"file":"batchSigner.d.ts","sourceRoot":"","sources":["../../../src/Wallet/batchSigner.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAyB,MAAM,WAAW,CAAA;AAMxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAgErC,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,KAAK,EAClB,IAAI,GAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;CAAO,GACjE,IAAI,CA0DN;AAYD,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,GAClC,MAAM,CAmCR"}

package/dist/npm/Wallet/batchSigner.js

@@ -37,6 +37,14 @@ function constructBatchSignerObject(batchAccount, wallet, signature, multisignAd
     }
     return batchSigner;
 }
+function getBatchSeqValue(transaction) {
+    var _a, _b;
+    const sequence = (_a = transaction.Sequence) !== null && _a !== void 0 ? _a : 0;
+    if (sequence !== 0) {
+        return sequence;
+    }
+    return (_b = transaction.TicketSequence) !== null && _b !== void 0 ? _b : 0;
+}
 function signMultiBatch(wallet, transaction, opts = {}) {
     var _a;
     const batchAccount = (_a = opts.batchAccount) !== null && _a !== void 0 ? _a : wallet.classicAddress;
@@ -51,14 +59,19 @@ function signMultiBatch(wallet, transaction, opts = {}) {
         throw new errors_1.ValidationError('Must be a Batch transaction.');
     }
     (0, models_1.validate)(transaction);
-    const involvedAccounts = new Set(transaction.RawTransactions.map((raw) => raw.RawTransaction.Account));
+    const involvedAccounts = new Set();
+    transaction.RawTransactions.forEach((raw) => {
+        involvedAccounts.add(raw.RawTransaction.Account);
+        const counterparty = raw.RawTransaction
+            .Counterparty;
+        if (typeof counterparty === 'string') {
+            involvedAccounts.add(counterparty);
+        }
+    });
     if (!involvedAccounts.has(batchAccount)) {
         throw new errors_1.ValidationError('Must be signing for an address submitting a transaction in the Batch.');
     }
-    const fieldsToSign = {
-        flags: transaction.Flags,
-        txIDs: transaction.RawTransactions.map((rawTx) => (0, hashes_1.hashSignedTx)(rawTx.RawTransaction)),
-    };
+    const fieldsToSign = Object.assign({ account: transaction.Account, sequence: getBatchSeqValue(transaction), flags: transaction.Flags, txIDs: transaction.RawTransactions.map((rawTx) => (0, hashes_1.hashSignedTx)(rawTx.RawTransaction)), batchAccount }, (multisignAddress ? { signerAccount: multisignAddress } : {}));
     const signature = (0, ripple_keypairs_1.sign)((0, ripple_binary_codec_1.encodeForSigningBatch)(fieldsToSign), wallet.privateKey);
     transaction.BatchSigners = [
         constructBatchSignerObject(batchAccount, wallet, signature, multisignAddress),
@@ -89,23 +102,37 @@ function combineBatchSigners(transactions) {
     return (0, ripple_binary_codec_1.encode)(getTransactionWithAllBatchSigners(batchTransactions));
 }
 exports.combineBatchSigners = combineBatchSigners;
-function validateBatchTransactionEquivalence(transactions) {
-    const exampleTransaction = JSON.stringify({
-        flags: transactions[0].Flags,
-        transactionIDs: transactions[0].RawTransactions.map((rawTx) => (0, hashes_1.hashSignedTx)(rawTx.RawTransaction)),
-    });
-    if (transactions.slice(1).some((tx) => JSON.stringify({
+function getBatchEquivalenceKey(tx) {
+    return JSON.stringify({
+        account: tx.Account,
+        sequence: getBatchSeqValue(tx),
         flags: tx.Flags,
         transactionIDs: tx.RawTransactions.map((rawTx) => (0, hashes_1.hashSignedTx)(rawTx.RawTransaction)),
-    }) !== exampleTransaction)) {
-        throw new errors_1.ValidationError('Flags and transaction hashes are not the same for all provided transactions.');
+    });
+}
+function validateBatchTransactionEquivalence(transactions) {
+    const exampleTransaction = getBatchEquivalenceKey(transactions[0]);
+    if (transactions
+        .slice(1)
+        .some((tx) => getBatchEquivalenceKey(tx) !== exampleTransaction)) {
+        throw new errors_1.ValidationError('Account, sequence, flags, and transaction hashes must be the same for all provided transactions.');
     }
 }
 function getTransactionWithAllBatchSigners(transactions) {
+    const outerAccount = transactions[0].Account;
     const sortedSigners = transactions
         .flatMap((tx) => { var _a; return (_a = tx.BatchSigners) !== null && _a !== void 0 ? _a : []; })
-        .filter((signer) => signer.BatchSigner.Account !== transactions[0].Account)
+        .filter((signer) => signer.BatchSigner.Account !== outerAccount)
         .sort((signer1, signer2) => (0, utils_1.compareSigners)(signer1.BatchSigner, signer2.BatchSigner));
-    return Object.assign(Object.assign({}, transactions[0]), { BatchSigners: sortedSigners });
+    const dedupedSigners = [];
+    let lastAccount = '';
+    for (const signer of sortedSigners) {
+        const account = signer.BatchSigner.Account;
+        if (account !== lastAccount) {
+            dedupedSigners.push(signer);
+            lastAccount = account;
+        }
+    }
+    return Object.assign(Object.assign({}, transactions[0]), { BatchSigners: dedupedSigners });
 }
 //# sourceMappingURL=batchSigner.js.map

package/dist/npm/Wallet/batchSigner.js.map

@@ -1 +1 @@
-{"version":3,"file":"batchSigner.js","sourceRoot":"","sources":["../../../src/Wallet/batchSigner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"batchSigner.js","sourceRoot":"","sources":["../../../src/Wallet/batchSigner.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xrpl",
-  "version": "5.0.0",
+  "version": "5.1.0-batch.1",
   "license": "ISC",
   "description": "A TypeScript/JavaScript API for interacting with the XRP Ledger in Node.js and the browser",
   "files": [
@@ -30,7 +30,7 @@
     "eventemitter3": "^5.0.1",
     "fast-json-stable-stringify": "^2.1.0",
     "ripple-address-codec": "^5.0.1",
-    "ripple-binary-codec": "^2.8.0",
+    "ripple-binary-codec": "^2.9.0-batch.1",
     "ripple-keypairs": "^3.0.0"
   },
   "devDependencies": {

package/src/Wallet/batchSigner.ts

@@ -45,6 +45,21 @@ function constructBatchSignerObject(
   return batchSigner
 }
 
+/**
+ * Resolve the sequence value bound into a Batch signature: the `Sequence` when
+ * non-zero, otherwise the `TicketSequence` value (or 0).
+ *
+ * @param transaction - The Batch transaction being signed.
+ * @returns The sequence value to bind into the signature.
+ */
+function getBatchSeqValue(transaction: Batch): number {
+  const sequence = transaction.Sequence ?? 0
+  if (sequence !== 0) {
+    return sequence
+  }
+  return transaction.TicketSequence ?? 0
+}
+
 /**
  * Sign a multi-account Batch transaction.
  *
@@ -56,6 +71,7 @@ function constructBatchSignerObject(
  *                       The actual address is only needed in the case of regular key usage.
  * @throws ValidationError if the transaction is malformed.
  */
+// eslint-disable-next-line max-lines-per-function -- cohesive signing routine
 export function signMultiBatch(
   wallet: Wallet,
   transaction: Batch,
@@ -79,19 +95,33 @@ export function signMultiBatch(
   // eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- validate does not accept Transaction type
   validate(transaction as unknown as Record<string, unknown>)
 
-  const involvedAccounts = new Set(
-    transaction.RawTransactions.map((raw) => raw.RawTransaction.Account),
-  )
+  // An account must sign the Batch if it submits an inner transaction or is the
+  // `Counterparty` of one.
+  const involvedAccounts = new Set<string>()
+  transaction.RawTransactions.forEach((raw) => {
+    involvedAccounts.add(raw.RawTransaction.Account)
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- Counterparty only exists on some inner tx types
+    const counterparty = (raw.RawTransaction as Record<string, unknown>)
+      .Counterparty
+    if (typeof counterparty === 'string') {
+      involvedAccounts.add(counterparty)
+    }
+  })
   if (!involvedAccounts.has(batchAccount)) {
     throw new ValidationError(
       'Must be signing for an address submitting a transaction in the Batch.',
     )
   }
   const fieldsToSign = {
+    account: transaction.Account,
+    sequence: getBatchSeqValue(transaction),
     flags: transaction.Flags,
     txIDs: transaction.RawTransactions.map((rawTx) =>
       hashSignedTx(rawTx.RawTransaction),
     ),
+    batchAccount,
+    // Multi-signed batch signers also bind the inner signer account.
+    ...(multisignAddress ? { signerAccount: multisignAddress } : {}),
   }
   const signature = sign(encodeForSigningBatch(fieldsToSign), wallet.privateKey)
 
@@ -155,6 +185,26 @@ export function combineBatchSigners(
   return encode(getTransactionWithAllBatchSigners(batchTransactions))
 }
 
+/**
+ * Builds a comparison key over every field bound into a Batch signature
+ * (XLS-56 V1_1): the outer account, sequence value, flags, and inner
+ * transaction IDs. Fragments that disagree on any of these were signed over
+ * different payloads and cannot be combined.
+ *
+ * @param tx - The Batch transaction to derive the key from.
+ * @returns A stable string key for equivalence comparison.
+ */
+function getBatchEquivalenceKey(tx: Batch): string {
+  return JSON.stringify({
+    account: tx.Account,
+    sequence: getBatchSeqValue(tx),
+    flags: tx.Flags,
+    transactionIDs: tx.RawTransactions.map((rawTx) =>
+      hashSignedTx(rawTx.RawTransaction),
+    ),
+  })
+}
+
 /**
  * The transactions should all be equal except for the 'Signers' field.
  *
@@ -162,37 +212,41 @@ export function combineBatchSigners(
  * @throws ValidationError if the transactions are not equal in any field other than 'Signers'.
  */
 function validateBatchTransactionEquivalence(transactions: Batch[]): void {
-  const exampleTransaction = JSON.stringify({
-    flags: transactions[0].Flags,
-    transactionIDs: transactions[0].RawTransactions.map((rawTx) =>
-      hashSignedTx(rawTx.RawTransaction),
-    ),
-  })
+  const exampleTransaction = getBatchEquivalenceKey(transactions[0])
   if (
-    transactions.slice(1).some(
-      (tx) =>
-        JSON.stringify({
-          flags: tx.Flags,
-          transactionIDs: tx.RawTransactions.map((rawTx) =>
-            hashSignedTx(rawTx.RawTransaction),
-          ),
-        }) !== exampleTransaction,
-    )
+    transactions
+      .slice(1)
+      .some((tx) => getBatchEquivalenceKey(tx) !== exampleTransaction)
   ) {
     throw new ValidationError(
-      'Flags and transaction hashes are not the same for all provided transactions.',
+      'Account, sequence, flags, and transaction hashes must be the same for all provided transactions.',
     )
   }
 }
 
 function getTransactionWithAllBatchSigners(transactions: Batch[]): Batch {
+  const outerAccount = transactions[0].Account
+
   // Signers must be sorted in the combined transaction - See compareSigners' documentation for more details
   const sortedSigners: BatchSigner[] = transactions
     .flatMap((tx) => tx.BatchSigners ?? [])
-    .filter((signer) => signer.BatchSigner.Account !== transactions[0].Account)
+    // A batch signer cannot be the outer account (rippled: temBAD_SIGNER).
+    .filter((signer) => signer.BatchSigner.Account !== outerAccount)
     .sort((signer1, signer2) =>
       compareSigners(signer1.BatchSigner, signer2.BatchSigner),
     )
 
-  return { ...transactions[0], BatchSigners: sortedSigners }
+  // BatchSigners must be strictly ascending and unique by account, so
+  // de-duplicate when combining fragments that share a signer.
+  const dedupedSigners: BatchSigner[] = []
+  let lastAccount = ''
+  for (const signer of sortedSigners) {
+    const account = signer.BatchSigner.Account
+    if (account !== lastAccount) {
+      dedupedSigners.push(signer)
+      lastAccount = account
+    }
+  }
+
+  return { ...transactions[0], BatchSigners: dedupedSigners }
 }