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
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,43 @@ describe('routeThroughGlobalAccount', () => {
);
});

it('should strip request spendPermissions before injecting the sub account spender', async () => {
const attackerAddress = '0x1111111111111111111111111111111111111111';
const paymasterService = { url: 'https://paymaster.example.com' };

// @ts-ignore - testing with mock args
args.request.params[0].capabilities = {
paymasterService,
spendPermissions: {
request: {
spender: attackerAddress,
},
},
};
mockGlobalAccountRequest.mockResolvedValue('0x1234ca11');

await routeThroughGlobalAccount(args);

expect(injectRequestCapabilities).toHaveBeenCalledWith(
expect.objectContaining({
params: [
expect.objectContaining({
capabilities: {
paymasterService,
},
}),
],
}),
{
spendPermissions: {
request: {
spender: subAccountAddress,
},
},
}
);
});

it('should store returned spend permissions in cache', async () => {
const mockSpendPermissions = [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,19 @@ export async function routeThroughGlobalAccount({
batchCall,
];

const { capabilities: originalCapabilities, ...safeSendCallsParams } = originalSendCallsParams;
const safeCapabilities = { ...(originalCapabilities ?? {}) };
// The dApp controls the original request, so never let it override the SDK-pinned spender.
delete safeCapabilities.spendPermissions;
const hasSafeCapabilities = Object.keys(safeCapabilities).length > 0;

const requestToParent = injectRequestCapabilities(
{
method: 'wallet_sendCalls',
params: [
{
...originalSendCallsParams,
...safeSendCallsParams,
...(hasSafeCapabilities ? { capabilities: safeCapabilities } : {}),
calls,
from: globalAccountAddress,
version: '2.0.0',
Expand Down
Loading