Skip to content

chore: start removing duplicated @metamask/smart-accounts-kit logic from extension #41809

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
jeffsmale90 merged 9 commits into from
Apr 23, 2026
Merged

chore: start removing duplicated @metamask/smart-accounts-kit logic from extension #41809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5e7b75c
Remove caveat builder, move to caveat terms builders from @metamask/d…
jeffsmale90 Apr 16, 2026
2098751
Fix linting and tests
jeffsmale90 Apr 16, 2026
64be344
Use correct caveat enforcer contract address keys
jeffsmale90 Apr 16, 2026
9143ba8
Update LavaMoat policies
metamaskbot Apr 16, 2026
56f08be
Use enum to represent balance change type
jeffsmale90 Apr 16, 2026
df3ff43
Improvements to delegation creation
jeffsmale90 Apr 19, 2026
eec7459
Merge branch 'main' into chore/remove-caveat-builder
jeffsmale90 Apr 21, 2026
e096275
Update LavaMoat policies
metamaskbot Apr 21, 2026
35ec375
Merge branch 'main' into chore/remove-caveat-builder
jeffsmale90 Apr 22, 2026
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
14 changes: 14 additions & 0 deletions app/scripts/lib/transaction/containers/enforced-simulations.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,20 @@ describe('Enforced Simulations Utils', () => {
);
});

it('throws when no caveats can be generated', async () => {
const transactionMeta = cloneDeep(TRANSACTION_META_MOCK);
transactionMeta.simulationData = {
tokenBalanceChanges: [],
};

await expect(
enforceSimulations({
...options,
transactionMeta,
}),
).rejects.toThrow('No caveats generated for enforced simulations');
});

describe('applies slippage', () => {
it('if decrease', async () => {
simulationData.tokenBalanceChanges = [
Expand Down
98 changes: 67 additions & 31 deletions app/scripts/lib/transaction/containers/enforced-simulations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,17 @@ import {
} from '@metamask/transaction-controller';
import { Hex, createProjectLogger, hexToNumber } from '@metamask/utils';
import { BigNumber } from 'bignumber.js';
import {
createERC1155BalanceChangeTerms,
createERC20BalanceChangeTerms,
createERC721BalanceChangeTerms,
createNativeBalanceChangeTerms,
} from '@metamask/delegation-core';
import { TransactionControllerInitMessenger } from '../../../messenger-client-init/messengers/transaction-controller-messenger';
import { getEnforcedSimulationsSlippage } from '../../../../../shared/lib/transaction/enforced-simulations';
import {
createCaveatBuilder,
getDeleGatorEnvironment,
type Caveat,
type DeleGatorEnvironment,
} from '../../../../../shared/lib/delegation';
import {
Expand All @@ -18,6 +24,7 @@ import {
} from '../delegation';

const log = createProjectLogger('enforced-simulations');
const args: Hex = '0x';

const MOCK_DELEGATION_SIGNATURE =
'0x2261a7810ed3e9cde160895909e138e2f68adb2da86fcf98ea0840701df107721fb369ab9b52550ea98832c09f8185284aca4c94bd345e867a4f4461868dd7751b' as Hex;
Expand Down Expand Up @@ -90,7 +97,8 @@ function generateCaveats(
simulationData: SimulationData,
slippage: number,
) {
const caveatBuilder = createCaveatBuilder(environment);
const caveats: Caveat[] = [];

const { nativeBalanceChange, tokenBalanceChanges = [] } = simulationData;

if (nativeBalanceChange) {
Expand All @@ -105,12 +113,15 @@ function generateCaveats(
deltaWithSlippage: delta,
});

caveatBuilder.addCaveat(
'nativeBalanceChange',
enforceDecrease,
recipient,
delta,
);
caveats.push({
enforcer: environment.caveatEnforcers.NativeBalanceChangeEnforcer,
terms: createNativeBalanceChangeTerms({
recipient,
balance: delta,
changeType: getBalanceChangeType(enforceDecrease),
}),
args,
});
}

for (const tokenChange of tokenBalanceChanges) {
Expand Down Expand Up @@ -143,34 +154,44 @@ function generateCaveats(

switch (standard) {
case SimulationTokenStandard.erc20:
caveatBuilder.addCaveat(
'erc20BalanceChange',
enforceDecrease,
token,
recipient,
deltaWithSlippage,
);
caveats.push({
enforcer: environment.caveatEnforcers.ERC20BalanceChangeEnforcer,
terms: createERC20BalanceChangeTerms({
tokenAddress: token,
recipient,
balance: deltaWithSlippage,
changeType: getBalanceChangeType(enforceDecrease),
}),
args,
});

break;

case SimulationTokenStandard.erc721:
caveatBuilder.addCaveat(
'erc721BalanceChange',
enforceDecrease,
token,
recipient,
delta,
);
caveats.push({
enforcer: environment.caveatEnforcers.ERC721BalanceChangeEnforcer,
terms: createERC721BalanceChangeTerms({
tokenAddress: token,
recipient,
amount: delta,
changeType: getBalanceChangeType(enforceDecrease),
}),
args,
});
break;

case SimulationTokenStandard.erc1155:
caveatBuilder.addCaveat(
'erc1155BalanceChange',
enforceDecrease,
token,
recipient,
tokenId,
delta,
);
caveats.push({
enforcer: environment.caveatEnforcers.ERC1155BalanceChangeEnforcer,
terms: createERC1155BalanceChangeTerms({
tokenAddress: token,
recipient,
tokenId,
balance: delta,
changeType: getBalanceChangeType(enforceDecrease),
}),
args,
});
break;

default:
Expand All @@ -179,7 +200,22 @@ function generateCaveats(
}
}

return caveatBuilder.build();
if (caveats.length === 0) {
throw new Error('No caveats generated for enforced simulations');
}

return caveats;
Comment thread
cursor[bot] marked this conversation as resolved.
}

enum BalanceChangeType {
Comment thread
matthewwalsh0 marked this conversation as resolved.
DECREASE = 0,
INCREASE = 1,
}

function getBalanceChangeType(enforceDecrease: boolean): BalanceChangeType {
return enforceDecrease
? BalanceChangeType.DECREASE
: BalanceChangeType.INCREASE;
}

function applySlippage(
Expand Down
Loading
Loading