ox 0.12.2 → 0.12.4

package/tempo/TxEnvelopeTempo.test.ts

@@ -7,6 +7,7 @@ import * as TxEnvelopeTempo from './TxEnvelopeTempo.js'
 
 const privateKey =
   '0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80'
+const address = Address.fromPublicKey(Secp256k1.getPublicKey({ privateKey }))
 
 describe('assert', () => {
   test('empty calls list', () => {
@@ -340,6 +341,7 @@ describe('deserialize', () => {
       })
       expect(TxEnvelopeTempo.deserialize(serialized)).toEqual({
         ...transaction,
+        from: address,
         signature: { signature, type: 'secp256k1' },
       })
     })
@@ -354,6 +356,7 @@ describe('deserialize', () => {
       })
       expect(TxEnvelopeTempo.deserialize(serialized)).toEqual({
         ...transaction,
+        from: address,
         signature: { signature, type: 'secp256k1' },
       })
     })
@@ -377,6 +380,7 @@ describe('deserialize', () => {
       delete signature.yParity
       expect(TxEnvelopeTempo.deserialize(serialized)).toEqual({
         ...transaction,
+        from: Address.fromPublicKey(publicKey),
         signature: { prehash: true, publicKey, signature, type: 'p256' },
       })
     })
@@ -417,6 +421,7 @@ describe('deserialize', () => {
     ]).slice(2)}` as const
     const deserialized = TxEnvelopeTempo.deserialize(serialized)
     expect(deserialized.feePayerSignature).toBe(null)
+    expect(deserialized.from).toBe('0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266')
   })
 
   test('feePayerSignature with signature tuple', () => {
@@ -1174,6 +1179,7 @@ describe('serialize', () => {
       delete signature.yParity
       expect(TxEnvelopeTempo.deserialize(serialized)).toEqual({
         ...transaction,
+        from: Address.fromPublicKey(publicKey),
         nonceKey: 0n,
         signature: { prehash: true, publicKey, signature, type: 'p256' },
       })

package/tempo/TxEnvelopeTempo.ts

@@ -351,9 +351,11 @@ export function deserialize(serialized: Serialized): Compute<TxEnvelopeTempo> {
     if (
       feePayerSignatureOrSender === '0x00' ||
       Address.validate(feePayerSignatureOrSender)
-    )
+    ) {
       transaction.feePayerSignature = null
-    else
+      if (Address.validate(feePayerSignatureOrSender))
+        transaction.from = feePayerSignatureOrSender
+    } else
       transaction.feePayerSignature = Signature.fromTuple(
         feePayerSignatureOrSender as never,
       )
@@ -373,6 +375,24 @@ export function deserialize(serialized: Serialized): Compute<TxEnvelopeTempo> {
       signature: signatureEnvelope,
     }
 
+  // Recover sender address from the signature if not already set.
+  if (!transaction.from && signatureEnvelope) {
+    try {
+      if (signatureEnvelope.type === 'keychain')
+        transaction.from = signatureEnvelope.userAddress
+      else if (
+        signatureEnvelope.type === 'p256' ||
+        signatureEnvelope.type === 'webAuthn'
+      )
+        transaction.from = Address.fromPublicKey(signatureEnvelope.publicKey)
+      else if (signatureEnvelope.type === 'secp256k1')
+        transaction.from = Secp256k1.recoverAddress({
+          payload: getSignPayload(from(transaction)),
+          signature: signatureEnvelope.signature,
+        })
+    } catch {}
+  }
+
   assert(transaction)
 
   return transaction

package/version.ts

@@ -1,2 +1,2 @@
 /** @internal */
-export const version = '0.12.2'
+export const version = '0.12.4'