Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/polite-sponsors-pay.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"viem": patch
---

`viem/tempo`: Preserved sponsor-returned `feeToken` values from `eth_fillTransaction` responses with `feePayerSignature`.
34 changes: 34 additions & 0 deletions src/actions/wallet/prepareTransactionRequest.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,40 @@
`)
})

test('behavior: sponsor fill feeToken overrides prefilled feeToken', async () => {
const requestFeeToken = '0x20c0000000000000000000000000000000000001'
const sponsorFeeToken = '0x20c0000000000000000000000000000000000000'
const fillTransactionSpy = vi
.spyOn(fillTransaction, 'fillTransaction')
.mockResolvedValueOnce({
transaction: {
feePayerSignature: {
r: '0x1',
s: '0x2',
yParity: 0,
},
feeToken: sponsorFeeToken,
gas: 21000n,
},
} as never)

try {
const request = await prepareTransactionRequest(client, {
account: privateKeyToAccount(sourceAccount.privateKey),
feePayer: true,
feeToken: requestFeeToken,
parameters: ['gas'],
to: targetAccount.address,
value: parseEther('1'),
} as never)

expect(request.feePayerSignature).toBeDefined()

Check failure on line 858 in src/actions/wallet/prepareTransactionRequest.test.ts

View workflow job for this annotation

GitHub Actions / Verify / Types (5.9.3)

Property 'feePayerSignature' does not exist on type '{ type?: "legacy" | undefined; gasPrice?: bigint | undefined; maxFeePerBlobGas?: undefined; maxFeePerGas?: undefined; maxPriorityFeePerGas?: undefined; to?: `0x${string}` | null | undefined; ... 14 more ...; _capabilities?: { ...; } | undefined; } | ... 4 more ... | { ...; }'.
expect(request.feeToken).toBe(sponsorFeeToken)

Check failure on line 859 in src/actions/wallet/prepareTransactionRequest.test.ts

View workflow job for this annotation

GitHub Actions / Verify / Types (5.9.3)

Property 'feeToken' does not exist on type '{ type?: "legacy" | undefined; gasPrice?: bigint | undefined; maxFeePerBlobGas?: undefined; maxFeePerGas?: undefined; maxPriorityFeePerGas?: undefined; to?: `0x${string}` | null | undefined; ... 14 more ...; _capabilities?: { ...; } | undefined; } | ... 4 more ... | { ...; }'.
} finally {
fillTransactionSpy.mockRestore()
}
})

test('behavior: chain default priority fee', async () => {
await setup()

Expand Down
16 changes: 10 additions & 6 deletions src/actions/wallet/prepareTransactionRequest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,15 @@ export async function prepareTransactionRequest<
type,
...rest
} = result.transaction
const feeToken = 'feeToken' in rest ? rest.feeToken : undefined
const hasFilledFeePayerSignature =
'feePayerSignature' in rest &&
rest.feePayerSignature !== null &&
typeof rest.feePayerSignature !== 'undefined'
const shouldUseFilledFeeToken =
typeof feeToken !== 'undefined' &&
feeToken !== null &&
(!('feeToken' in request) || hasFilledFeePayerSignature)
supportsFillTransaction.set(client.uid, true)
return {
...request,
Expand Down Expand Up @@ -461,12 +470,7 @@ export async function prepareTransactionRequest<
rest.feePayerSignature !== null
? { feePayerSignature: rest.feePayerSignature }
: {}),
...('feeToken' in rest &&
typeof rest.feeToken !== 'undefined' &&
rest.feeToken !== null &&
!('feeToken' in request)
? { feeToken: rest.feeToken }
: {}),
...(shouldUseFilledFeeToken ? { feeToken } : {}),
...(result.capabilities
? { _capabilities: result.capabilities }
: {}),
Expand Down
Loading