Skip to content

feat: include feeAmount in batch transaction value for ETH_FEE_PROXY_CONTRACT payments #1674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aimensahnoun merged 1 commit into from
Dec 18, 2025
+105 −5
Merged

feat: include feeAmount in batch transaction value for ETH_FEE_PROXY_CONTRACT payments #1674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions packages/payment-processor/src/payment/batch-conversion-proxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,11 +310,13 @@ const getBatchTxValue = (enrichedRequests: EnrichedRequest[]) => {
curr.paymentNetworkId !== ExtensionTypes.PAYMENT_NETWORK_ID.ETH_FEE_PROXY_CONTRACT
)
return prev;
return prev.add(
curr.paymentNetworkId === ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_ETH_PROXY
? curr.paymentSettings.maxToSpend
: getAmountToPay(curr.request),
);

if (curr.paymentNetworkId === ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_ETH_PROXY) {
return prev.add(curr.paymentSettings.maxToSpend);
}

const { feeAmount } = getRequestPaymentValues(curr.request);
return prev.add(getAmountToPay(curr.request)).add(BigNumber.from(feeAmount || '0'));
}, BigNumber.from(0));
};

Expand Down
98 changes: 98 additions & 0 deletions packages/payment-processor/test/payment/batch-proxy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,5 +935,103 @@ describe('batch-proxy', () => {
).toBe(batchConversionPaymentsArtifact.getAddress('private', '0.1.0'));
});
});

describe('getBatchTxValue (ETH_FEE_PROXY_CONTRACT)', () => {
it('includes feeAmount for a single ETH_FEE_PROXY_CONTRACT payment', () => {
const requestWithFee = {
...ETHValidRequest,
expectedAmount: '1000000000000000000', // 1 ETH
extensions: {
[ExtensionTypes.PAYMENT_NETWORK_ID.ETH_FEE_PROXY_CONTRACT]: {
...ETHValidRequest.extensions[
ExtensionTypes.PAYMENT_NETWORK_ID.ETH_FEE_PROXY_CONTRACT
],
values: {
...ETHValidRequest.extensions[
ExtensionTypes.PAYMENT_NETWORK_ID.ETH_FEE_PROXY_CONTRACT
].values,
feeAmount: '2000000000000000', // 0.002 ETH
},
},
},
};

const enrichedRequests: EnrichedRequest[] = [
{
paymentNetworkId: ExtensionTypes.PAYMENT_NETWORK_ID.ETH_FEE_PROXY_CONTRACT,
request: requestWithFee,
paymentSettings: { maxToSpend: '0' },
},
];

const tx = prepareBatchConversionPaymentTransaction(enrichedRequests, options);

const expectedValue = BigNumber.from(requestWithFee.expectedAmount).add('2000000000000000');
expect(tx.value.toString()).toBe(expectedValue.toString());
});

it('includes feeAmount in a batch of 2 ETH_FEE_PROXY_CONTRACT payments (bug case)', () => {
const payment1 = {
...ETHValidRequest,
expectedAmount: '10000000000000000000', // 10 ETH
extensions: {
[ExtensionTypes.PAYMENT_NETWORK_ID.ETH_FEE_PROXY_CONTRACT]: {
...ETHValidRequest.extensions[
ExtensionTypes.PAYMENT_NETWORK_ID.ETH_FEE_PROXY_CONTRACT
],
values: {
...ETHValidRequest.extensions[
ExtensionTypes.PAYMENT_NETWORK_ID.ETH_FEE_PROXY_CONTRACT
].values,
feeAmount: '2000000000000000', // 0.002 ETH
},
},
},
};

const payment2 = {
...ETHValidRequest,
expectedAmount: '5000000000000000', // 0.005 ETH
extensions: {
[ExtensionTypes.PAYMENT_NETWORK_ID.ETH_FEE_PROXY_CONTRACT]: {
...ETHValidRequest.extensions[
ExtensionTypes.PAYMENT_NETWORK_ID.ETH_FEE_PROXY_CONTRACT
],
values: {
...ETHValidRequest.extensions[
ExtensionTypes.PAYMENT_NETWORK_ID.ETH_FEE_PROXY_CONTRACT
].values,
feeAmount: '0',
},
},
},
};

const enrichedRequests: EnrichedRequest[] = [
{
paymentNetworkId: ExtensionTypes.PAYMENT_NETWORK_ID.ETH_FEE_PROXY_CONTRACT,
request: payment1,
paymentSettings: { maxToSpend: '0' },
},
{
paymentNetworkId: ExtensionTypes.PAYMENT_NETWORK_ID.ETH_FEE_PROXY_CONTRACT,
request: payment2,
paymentSettings: { maxToSpend: '0' },
},
];

const tx = prepareBatchConversionPaymentTransaction(enrichedRequests, options);

const expectedValue = BigNumber.from(payment1.expectedAmount)
.add('2000000000000000')
.add(payment2.expectedAmount);
expect(tx.value.toString()).toBe(expectedValue.toString());

const valueWithoutFee = BigNumber.from(payment1.expectedAmount).add(
payment2.expectedAmount,
);
expect(tx.value.toString()).not.toBe(valueWithoutFee.toString());
});
});
});
});