Merge main into release

src/transform.ts

@@ -131,28 +131,7 @@ function extractTransactionFromBlockTransaction(
   closeAmount?: number
   logs?: Uint8Array[]
 } {
-  const txn = { ...blockTransaction.txn }
-
-  // https://github.com/algorand/js-algorand-sdk/blob/develop/examples/block_fetcher/index.ts
-  // Remove nulls (mainly where an appl txn contains a null app arg)
-  removeNulls(txn)
-
-  // Add genesisId (gen) as the transaction was processed with it, and is required to generate the correct txID.
-  if ('hgi' in blockTransaction && blockTransaction.hgi === true) {
-    txn.gen = genesisId
-  }
-
-  // Add genesisHash (gh) as the transaction was processed with it, and is required to generate the correct txID.
-  // gh is mandatory on MainNet and TestNet (see https://forum.algorand.org/t/calculating-transaction-id/3119/7), so set gh unless hgh is explicitly false.
-  if (!('hgh' in blockTransaction) || blockTransaction.hgh !== false) {
-    txn.gh = genesisHash
-  }
-
-  if (txn.type === TransactionType.axfer && !txn.arcv) {
-    // from_obj_for_encoding expects arcv to be set, which may not be defined when performing an opt out.
-    txn.arcv = Buffer.from(ALGORAND_ZERO_ADDRESS_BYTES)
-  }
-
+  const txn = extractAndNormaliseTransaction(blockTransaction, genesisHash, genesisId)
   const t = Transaction.from_obj_for_encoding(txn)
   return {
     transaction: t,
@@ -196,7 +175,11 @@ function concatArrays(...arrs: ArrayLike<number>[]) {
   return c
 }
 
-function getTxIdFromBlockTransaction(blockTransaction: BlockTransaction, genesisHash: Buffer, genesisId: string): string {
+function extractAndNormaliseTransaction(
+  blockTransaction: BlockTransaction | BlockInnerTransaction,
+  genesisHash: Buffer,
+  genesisId: string,
+) {
   const txn = { ...blockTransaction.txn }
 
   // https://github.com/algorand/js-algorand-sdk/blob/develop/examples/block_fetcher/index.ts
@@ -214,6 +197,22 @@ function getTxIdFromBlockTransaction(blockTransaction: BlockTransaction, genesis
     txn.gh = genesisHash
   }
 
+  if (txn.type === TransactionType.axfer && !txn.arcv) {
+    // from_obj_for_encoding expects arcv to be set, which may not be defined when performing an opt out.
+    txn.arcv = Buffer.from(ALGORAND_ZERO_ADDRESS_BYTES)
+  }
+
+  if (txn.type === TransactionType.pay && !txn.rcv) {
+    // from_obj_for_encoding expects rcv to be set, which may not be defined when closing an account.
+    txn.rcv = Buffer.from(ALGORAND_ZERO_ADDRESS_BYTES)
+  }
+
+  return txn
+}
+
+function getTxIdFromBlockTransaction(blockTransaction: BlockTransaction, genesisHash: Buffer, genesisId: string): string {
+  const txn = extractAndNormaliseTransaction(blockTransaction, genesisHash, genesisId)
+
   // Translated from algosdk.Transaction.txID()
   const ALGORAND_TRANSACTION_LENGTH = 52
   const encodedMessage = msgpack.encode(txn, { sortKeys: true, ignoreUndefined: true })

tests/scenarios/transform-complex-txn.spec.ts

@@ -640,6 +640,14 @@ describe('Complex transaction with many nested inner transactions', () => {
     expect(algosdk.encodeAddress(blockTransactions[5].transaction.to.publicKey)).toBe(ALGORAND_ZERO_ADDRESS)
   })
 
+  it('Transforms pay without a rcv address', async () => {
+    const blocks = await getBlocksBulk({ startRound: 39723800, maxRound: 39723800 }, algod) // Contains a pay close account inner transaction without a rcv address
+    const blockTransactions = blocks.flatMap((b) => getBlockTransactions(b.block))
+
+    expect(blockTransactions.length).toBe(486)
+    expect(algosdk.encodeAddress(blockTransactions[371].transaction.to.publicKey)).toBe(ALGORAND_ZERO_ADDRESS)
+  })
+
   it('Produces the correct txID for a non hgi transaction', async () => {
     const blocks = await getBlocksBulk({ startRound: 39430981, maxRound: 39430981 }, algod)
     const blockTransactions = blocks.flatMap((b) => getBlockTransactions(b.block))