From 5934f27e722f01aba103202ea6d1ab6544a2f0be Mon Sep 17 00:00:00 2001 From: Patchy Bot Date: Wed, 11 Feb 2026 21:39:08 +0000 Subject: [PATCH 1/4] Remove encodePermissionContexts and decodePermissionContexts wrappers --- .../test/delegateAndRedeem.test.ts | 10 +- packages/smart-accounts-kit/src/delegation.ts | 28 +--- .../smart-accounts-kit/src/utils/index.ts | 4 +- .../test/delegation.test.ts | 126 +----------------- 4 files changed, 8 insertions(+), 160 deletions(-) diff --git a/packages/delegator-e2e/test/delegateAndRedeem.test.ts b/packages/delegator-e2e/test/delegateAndRedeem.test.ts index 3b1b776a..e8b3a94f 100644 --- a/packages/delegator-e2e/test/delegateAndRedeem.test.ts +++ b/packages/delegator-e2e/test/delegateAndRedeem.test.ts @@ -22,7 +22,7 @@ import { type PartialSignature, } from '@metamask/smart-accounts-kit'; import { - encodePermissionContexts, + encodeDelegations, encodeExecutionCalldatas, } from '@metamask/smart-accounts-kit/utils'; import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts'; @@ -123,7 +123,7 @@ test('maincase: Bob increments the counter with a delegation from Alice', async abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -232,7 +232,7 @@ test("Bob attempts to increment the counter with a delegation from Alice that do abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -335,7 +335,7 @@ test('Bob increments the counter with a delegation from a multisig account', asy abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -366,4 +366,4 @@ test('Bob increments the counter with a delegation from a multisig account', asy const countAfter = await counterContract.read.count(); expect(countAfter, 'Expected final count to have incremented').toEqual(1n); -}); +}); \ No newline at end of file diff --git a/packages/smart-accounts-kit/src/delegation.ts b/packages/smart-accounts-kit/src/delegation.ts index b8e86d45..ca5274cb 100644 --- a/packages/smart-accounts-kit/src/delegation.ts +++ b/packages/smart-accounts-kit/src/delegation.ts @@ -102,20 +102,6 @@ export const encodeDelegations = (delegations: Delegation[]): Hex => { return encodeDelegationsCore(delegationStructs); }; -/** - * Abi encodes permission contexts. - * - * @param delegations - The delegation chains to encode. - * @returns The encoded permission contexts. - */ -export const encodePermissionContexts = (delegations: Delegation[][]) => { - const encodedDelegations = delegations.map((delegationChain) => - encodeDelegations(delegationChain), - ); - - return encodedDelegations; -}; - /** * Decodes an array of delegations from its ABI-encoded representation. * @@ -127,18 +113,6 @@ export const decodeDelegations = (encoded: Hex): Delegation[] => { return decodeDelegationsCore(encoded).map(toDelegation); }; -/** - * Decodes an array of encoded permission contexts into an array of delegation chains. - * - * @param encoded - The hex-encoded permission context to decode. - * @returns An array of decoded delegations. - */ -export const decodePermissionContexts = (encoded: Hex[]): Delegation[][] => { - const delegationChains = encoded.map(decodeDelegations); - - return delegationChains; -}; - /** * TypedData to be used when signing a Delegation. Delegation value for `signature` and Caveat values for `args` are omitted as they cannot be known at signing time. */ @@ -363,4 +337,4 @@ export const signDelegation = async ({ privateKey, ...typedData, }); -}; +}; \ No newline at end of file diff --git a/packages/smart-accounts-kit/src/utils/index.ts b/packages/smart-accounts-kit/src/utils/index.ts index acb0c957..2139247f 100644 --- a/packages/smart-accounts-kit/src/utils/index.ts +++ b/packages/smart-accounts-kit/src/utils/index.ts @@ -3,8 +3,6 @@ export { decodeDelegations, toDelegationStruct, toDelegation, - encodePermissionContexts, - decodePermissionContexts, DELEGATION_ARRAY_ABI_TYPE, DELEGATION_ABI_TYPE_COMPONENTS, DELEGATION_TYPEHASH, @@ -41,4 +39,4 @@ export { export type { CoreCaveatBuilder, CaveatBuilderConfig } from '../caveatBuilder'; -export { createCaveatBuilder, CaveatBuilder } from '../caveatBuilder'; +export { createCaveatBuilder, CaveatBuilder } from '../caveatBuilder'; \ No newline at end of file diff --git a/packages/smart-accounts-kit/test/delegation.test.ts b/packages/smart-accounts-kit/test/delegation.test.ts index 55999de2..68f83b24 100644 --- a/packages/smart-accounts-kit/test/delegation.test.ts +++ b/packages/smart-accounts-kit/test/delegation.test.ts @@ -12,8 +12,6 @@ import { resolveAuthority, encodeDelegations, decodeDelegations, - encodePermissionContexts, - decodePermissionContexts, signDelegation, } from '../src/delegation'; import type { @@ -604,128 +602,6 @@ describe('decodeDelegations', () => { }); }); -describe('encodePermissionContexts', () => { - const mockDelegation1: Delegation = { - delegate: mockDelegate, - delegator: mockDelegator, - authority: ROOT_AUTHORITY, - caveats: [mockCaveat], - salt: '0x123' as Hex, - signature: mockSignature, - }; - - const mockDelegation2: Delegation = { - delegate: '0x2222222222222222222222222222222222222222', - delegator: '0x3333333333333333333333333333333333333333', - authority: ROOT_AUTHORITY, - caveats: [ - { - enforcer: '0x1111111111111111111111111111111111111111', - terms: '0x', - args: '0x00', - }, - ], - salt: '0x456' as Hex, - signature: mockSignature, - }; - - it('should encode a single permission context', () => { - const permissionContexts = [[mockDelegation1]]; - const encoded = encodePermissionContexts(permissionContexts); - const decoded = decodePermissionContexts(encoded); - - expect(decoded).to.have.length(1); - expect(decoded).to.deep.equal([[mockDelegation1]]); - }); - - it('should encode multiple permission contexts', () => { - const permissionContexts = [[mockDelegation1], [mockDelegation2]]; - const encoded = encodePermissionContexts(permissionContexts); - const decoded = decodePermissionContexts(encoded); - - expect(decoded).to.have.length(2); - expect(decoded).to.deep.equal([[mockDelegation1], [mockDelegation2]]); - }); - - it('should handle permission contexts with multiple delegations', () => { - const permissionContexts = [[mockDelegation1, mockDelegation2]]; - const encoded = encodePermissionContexts(permissionContexts); - const decoded = decodePermissionContexts(encoded); - - expect(decoded).to.have.length(1); - expect(decoded).to.deep.equal([[mockDelegation1, mockDelegation2]]); - }); - - it('should handle empty permission contexts', () => { - const permissionContexts: Delegation[][] = []; - const encoded = encodePermissionContexts(permissionContexts); - const decoded = decodePermissionContexts(encoded); - - expect(decoded).to.have.length(0); - }); -}); - -describe('decodePermissionContexts', () => { - const mockDelegation1: Delegation = { - delegate: mockDelegate, - delegator: mockDelegator, - authority: ROOT_AUTHORITY, - caveats: [mockCaveat], - salt: '0x123' as Hex, - signature: mockSignature, - }; - - const mockDelegation2: Delegation = { - delegate: '0x2222222222222222222222222222222222222222', - delegator: '0x3333333333333333333333333333333333333333', - authority: ROOT_AUTHORITY, - caveats: [ - { - enforcer: '0x1111111111111111111111111111111111111111', - terms: '0x', - args: '0x00', - }, - ], - salt: '0x456' as Hex, - signature: mockSignature, - }; - - it('should decode a single permission context', () => { - const permissionContexts = [[mockDelegation1]]; - const encoded = encodePermissionContexts(permissionContexts); - const decoded = decodePermissionContexts(encoded); - - expect(decoded).to.have.length(1); - expect(decoded).to.deep.equal([[mockDelegation1]]); - }); - - it('should decode multiple permission contexts', () => { - const permissionContexts = [[mockDelegation1], [mockDelegation2]]; - const encoded = encodePermissionContexts(permissionContexts); - const decoded = decodePermissionContexts(encoded); - - expect(decoded).to.have.length(2); - expect(decoded).to.deep.equal([[mockDelegation1], [mockDelegation2]]); - }); - - it('should handle permission contexts with multiple delegations', () => { - const permissionContexts = [[mockDelegation1, mockDelegation2]]; - const encoded = encodePermissionContexts(permissionContexts); - const decoded = decodePermissionContexts(encoded); - - expect(decoded).to.have.length(1); - expect(decoded).to.deep.equal([[mockDelegation1, mockDelegation2]]); - }); - - it('should handle empty permission contexts', () => { - const permissionContexts: Delegation[][] = []; - const encoded = encodePermissionContexts(permissionContexts); - const decoded = decodePermissionContexts(encoded); - - expect(decoded).to.have.length(0); - }); -}); - describe('signDelegation', () => { const mockPrivateKey: Hex = '0x1234567890123456789012345678901234567890123456789012345678901234'; @@ -795,4 +671,4 @@ describe('signDelegation', () => { // ECDSA signature should be 65 bytes (130 hex chars) + 0x prefix = 132 total chars expect(signature).to.have.length(132); }); -}); +}); \ No newline at end of file From 0b415bcdff9850d2e320cba19ded5be23980d36d Mon Sep 17 00:00:00 2001 From: Patchy Bot Date: Wed, 11 Feb 2026 21:40:43 +0000 Subject: [PATCH 2/4] Remove remaining references to encodePermissionContexts --- .../DelegationManager/methods/redeemDelegations.ts | 8 ++++---- packages/smart-accounts-kit/src/write.ts | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/smart-accounts-kit/src/DelegationFramework/DelegationManager/methods/redeemDelegations.ts b/packages/smart-accounts-kit/src/DelegationFramework/DelegationManager/methods/redeemDelegations.ts index bbc94e1a..116e1b28 100644 --- a/packages/smart-accounts-kit/src/DelegationFramework/DelegationManager/methods/redeemDelegations.ts +++ b/packages/smart-accounts-kit/src/DelegationFramework/DelegationManager/methods/redeemDelegations.ts @@ -3,7 +3,7 @@ import type { Address, Client } from 'viem'; import { encodeFunctionData } from 'viem'; import { simulateContract, writeContract } from 'viem/actions'; -import { encodePermissionContexts } from '../../../delegation'; +import { encodeDelegations } from '../../../delegation'; import { encodeExecutionCalldatas } from '../../../executions'; import type { ExecutionMode, ExecutionStruct } from '../../../executions'; import type { Delegation } from '../../../types'; @@ -37,7 +37,7 @@ export const simulate = async ({ abi: DelegationManager, functionName: 'redeemDelegations', args: [ - encodePermissionContexts(delegations), + delegations.map((delegationChain) => encodeDelegations(delegationChain)), modes, encodeExecutionCalldatas(executions), ], @@ -71,9 +71,9 @@ export const encode = ({ abi: DelegationManager, functionName: 'redeemDelegations', args: [ - encodePermissionContexts(delegations), + delegations.map((delegationChain) => encodeDelegations(delegationChain)), modes, encodeExecutionCalldatas(executions), ], }); -}; +}; \ No newline at end of file diff --git a/packages/smart-accounts-kit/src/write.ts b/packages/smart-accounts-kit/src/write.ts index 220ae897..9311e742 100644 --- a/packages/smart-accounts-kit/src/write.ts +++ b/packages/smart-accounts-kit/src/write.ts @@ -1,7 +1,7 @@ import { SimpleFactory, DelegationManager } from '@metamask/delegation-abis'; import type { Address, Chain, Hex, PublicClient, WalletClient } from 'viem'; -import { encodePermissionContexts } from './delegation'; +import { encodeDelegations } from './delegation'; import type { ExecutionStruct, ExecutionMode } from './executions'; import { encodeExecutionCalldatas } from './executions'; import type { Delegation, ContractMetaData, Redemption } from './types'; @@ -62,8 +62,9 @@ export const redeemDelegations = async ( executionModes.push(redemption.mode); }); - const encodedPermissionContexts = - encodePermissionContexts(permissionContexts); + const encodedPermissionContexts = permissionContexts.map((delegationChain) => + encodeDelegations(delegationChain), + ); const executionCalldatas = encodeExecutionCalldatas(executionsBatch); const { request } = await publicClient.simulateContract({ @@ -116,4 +117,4 @@ export async function deployContract( } return { address: receipt.contractAddress, hash, receipt }; -} +} \ No newline at end of file From 518729ce22c5950b05a7e577f60d618ab8ae5e3c Mon Sep 17 00:00:00 2001 From: Jeff Smale <6363749+jeffsmale90@users.noreply.github.com> Date: Thu, 12 Feb 2026 17:13:11 +1300 Subject: [PATCH 3/4] Fix linting errors --- .../DelegationManager/methods/redeemDelegations.ts | 2 +- packages/smart-accounts-kit/src/delegation.ts | 2 +- packages/smart-accounts-kit/src/utils/index.ts | 2 +- packages/smart-accounts-kit/src/write.ts | 2 +- packages/smart-accounts-kit/test/delegation.test.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/smart-accounts-kit/src/DelegationFramework/DelegationManager/methods/redeemDelegations.ts b/packages/smart-accounts-kit/src/DelegationFramework/DelegationManager/methods/redeemDelegations.ts index 116e1b28..ed878295 100644 --- a/packages/smart-accounts-kit/src/DelegationFramework/DelegationManager/methods/redeemDelegations.ts +++ b/packages/smart-accounts-kit/src/DelegationFramework/DelegationManager/methods/redeemDelegations.ts @@ -76,4 +76,4 @@ export const encode = ({ encodeExecutionCalldatas(executions), ], }); -}; \ No newline at end of file +}; diff --git a/packages/smart-accounts-kit/src/delegation.ts b/packages/smart-accounts-kit/src/delegation.ts index ca5274cb..843cd241 100644 --- a/packages/smart-accounts-kit/src/delegation.ts +++ b/packages/smart-accounts-kit/src/delegation.ts @@ -337,4 +337,4 @@ export const signDelegation = async ({ privateKey, ...typedData, }); -}; \ No newline at end of file +}; diff --git a/packages/smart-accounts-kit/src/utils/index.ts b/packages/smart-accounts-kit/src/utils/index.ts index 2139247f..7dbd6c14 100644 --- a/packages/smart-accounts-kit/src/utils/index.ts +++ b/packages/smart-accounts-kit/src/utils/index.ts @@ -39,4 +39,4 @@ export { export type { CoreCaveatBuilder, CaveatBuilderConfig } from '../caveatBuilder'; -export { createCaveatBuilder, CaveatBuilder } from '../caveatBuilder'; \ No newline at end of file +export { createCaveatBuilder, CaveatBuilder } from '../caveatBuilder'; diff --git a/packages/smart-accounts-kit/src/write.ts b/packages/smart-accounts-kit/src/write.ts index 9311e742..a094e526 100644 --- a/packages/smart-accounts-kit/src/write.ts +++ b/packages/smart-accounts-kit/src/write.ts @@ -117,4 +117,4 @@ export async function deployContract( } return { address: receipt.contractAddress, hash, receipt }; -} \ No newline at end of file +} diff --git a/packages/smart-accounts-kit/test/delegation.test.ts b/packages/smart-accounts-kit/test/delegation.test.ts index 68f83b24..afa5c095 100644 --- a/packages/smart-accounts-kit/test/delegation.test.ts +++ b/packages/smart-accounts-kit/test/delegation.test.ts @@ -671,4 +671,4 @@ describe('signDelegation', () => { // ECDSA signature should be 65 bytes (130 hex chars) + 0x prefix = 132 total chars expect(signature).to.have.length(132); }); -}); \ No newline at end of file +}); From e3e6d771091d082ed63c7ac5d9a00c039cfa6fdb Mon Sep 17 00:00:00 2001 From: Jeff Smale <6363749+jeffsmale90@users.noreply.github.com> Date: Thu, 12 Feb 2026 17:13:37 +1300 Subject: [PATCH 4/4] Fix e2e tests that relied on the removed functino --- .../infuraBundlerClient.test.ts | 4 +-- .../test/actions/infuraBundlerClient.test.ts | 4 +-- .../test/caveats/allowedCalldata.test.ts | 6 ++-- .../test/caveats/allowedMethods.test.ts | 10 +++--- .../test/caveats/allowedTargets.test.ts | 6 ++-- .../test/caveats/argsEqualityCheck.test.ts | 6 ++-- .../test/caveats/blockNumber.test.ts | 6 ++-- .../test/caveats/caveatUtils.test.ts | 32 +++++++++---------- .../test/caveats/deployed.test.ts | 6 ++-- .../test/caveats/erc20PeriodTransfer.test.ts | 26 +++++++-------- .../test/caveats/erc20Streaming.test.ts | 16 +++++----- .../test/caveats/erc20TransferAmount.test.ts | 16 +++++----- .../test/caveats/erc721Transfer.test.ts | 10 +++--- .../test/caveats/exactCalldata.test.ts | 6 ++-- .../test/caveats/exactCalldataBatch.test.ts | 6 ++-- .../test/caveats/exactExecution.test.ts | 6 ++-- .../test/caveats/exactExecutionBatch.test.ts | 6 ++-- .../delegator-e2e/test/caveats/id.test.ts | 6 ++-- .../caveats/idEnforcerContractRead.test.ts | 12 +++---- .../test/caveats/limitedCalls.test.ts | 8 ++--- .../test/caveats/multiTokenPeriod.test.ts | 6 ++-- .../test/caveats/nativeBalanceChange.test.ts | 8 ++--- .../test/caveats/nativeTokenPayment.test.ts | 3 +- .../caveats/nativeTokenPeriodTransfer.test.ts | 28 ++++++++-------- .../test/caveats/nativeTokenStreaming.test.ts | 24 +++++++------- .../caveats/nativeTokenTransferAmount.test.ts | 20 ++++++------ .../delegator-e2e/test/caveats/nonce.test.ts | 6 ++-- .../test/caveats/ownershipTransfer.test.ts | 10 +++--- .../test/caveats/redeemer.test.ts | 6 ++-- .../specificActionERC20TransferBatch.test.ts | 8 ++--- .../test/caveats/timestamp.test.ts | 6 ++-- .../test/caveats/valueLte.test.ts | 4 +-- .../test/delegationManagement.test.ts | 4 +-- 33 files changed, 165 insertions(+), 166 deletions(-) diff --git a/packages/delegator-e2e/external-integration-tests/infuraBundlerClient.test.ts b/packages/delegator-e2e/external-integration-tests/infuraBundlerClient.test.ts index 63fc77f3..3813a343 100644 --- a/packages/delegator-e2e/external-integration-tests/infuraBundlerClient.test.ts +++ b/packages/delegator-e2e/external-integration-tests/infuraBundlerClient.test.ts @@ -21,7 +21,7 @@ import { type UserOperationGasPriceResponse, } from '@metamask/smart-accounts-kit'; import { - encodePermissionContexts, + encodeDelegations, encodeExecutionCalldatas, } from '@metamask/smart-accounts-kit/utils'; import { INFURA_API_KEY, PIMLICO_API_KEY } from '../src/config.js'; @@ -344,7 +344,7 @@ test('complete delegation workflow with dynamic gas pricing', async () => { abi: delegateSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [[signedDelegation]].map(encodeDelegations), [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/actions/infuraBundlerClient.test.ts b/packages/delegator-e2e/test/actions/infuraBundlerClient.test.ts index b9cb91a5..80e7ff8d 100644 --- a/packages/delegator-e2e/test/actions/infuraBundlerClient.test.ts +++ b/packages/delegator-e2e/test/actions/infuraBundlerClient.test.ts @@ -12,7 +12,7 @@ import { type InfuraBundlerClient, } from '@metamask/smart-accounts-kit'; import { - encodePermissionContexts, + encodeDelegations, encodeExecutionCalldatas, } from '@metamask/smart-accounts-kit/utils'; import { publicClient, gasPrice, deploySmartAccount } from '../utils/helpers'; @@ -114,7 +114,7 @@ test('infuraBundlerClient should work for delegation redemption', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/allowedCalldata.test.ts b/packages/delegator-e2e/test/caveats/allowedCalldata.test.ts index 719eea69..b7315bb0 100644 --- a/packages/delegator-e2e/test/caveats/allowedCalldata.test.ts +++ b/packages/delegator-e2e/test/caveats/allowedCalldata.test.ts @@ -11,7 +11,7 @@ import { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { gasPrice, @@ -172,7 +172,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -244,7 +244,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/allowedMethods.test.ts b/packages/delegator-e2e/test/caveats/allowedMethods.test.ts index 626ed530..42ea4cb6 100644 --- a/packages/delegator-e2e/test/caveats/allowedMethods.test.ts +++ b/packages/delegator-e2e/test/caveats/allowedMethods.test.ts @@ -1,7 +1,7 @@ import { beforeEach, test, expect } from 'vitest'; import { encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { createExecution, @@ -173,7 +173,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -243,7 +243,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -322,7 +322,7 @@ const runScopeTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -394,7 +394,7 @@ const runScopeTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/allowedTargets.test.ts b/packages/delegator-e2e/test/caveats/allowedTargets.test.ts index 2934737f..fcff935f 100644 --- a/packages/delegator-e2e/test/caveats/allowedTargets.test.ts +++ b/packages/delegator-e2e/test/caveats/allowedTargets.test.ts @@ -11,7 +11,7 @@ import { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { transport, @@ -141,7 +141,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -211,7 +211,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/argsEqualityCheck.test.ts b/packages/delegator-e2e/test/caveats/argsEqualityCheck.test.ts index 955b2c72..9a90e76d 100644 --- a/packages/delegator-e2e/test/caveats/argsEqualityCheck.test.ts +++ b/packages/delegator-e2e/test/caveats/argsEqualityCheck.test.ts @@ -11,7 +11,7 @@ import { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { transport, @@ -167,7 +167,7 @@ const runTest_expectSuccess = async (args: Hex, actualArgs: Hex) => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -239,7 +239,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/blockNumber.test.ts b/packages/delegator-e2e/test/caveats/blockNumber.test.ts index 73221952..a1870ee8 100644 --- a/packages/delegator-e2e/test/caveats/blockNumber.test.ts +++ b/packages/delegator-e2e/test/caveats/blockNumber.test.ts @@ -11,7 +11,7 @@ import { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { transport, @@ -211,7 +211,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -287,7 +287,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/caveatUtils.test.ts b/packages/delegator-e2e/test/caveats/caveatUtils.test.ts index 64066407..578b1c72 100644 --- a/packages/delegator-e2e/test/caveats/caveatUtils.test.ts +++ b/packages/delegator-e2e/test/caveats/caveatUtils.test.ts @@ -1,7 +1,7 @@ import { beforeEach, test, expect, describe } from 'vitest'; import { encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, createCaveatBuilder, } from '@metamask/smart-accounts-kit/utils'; import { @@ -154,7 +154,7 @@ describe('ERC20PeriodTransferEnforcer', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -233,7 +233,7 @@ describe('ERC20PeriodTransferEnforcer', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -310,7 +310,7 @@ describe('ERC20PeriodTransferEnforcer', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -399,7 +399,7 @@ describe('ERC20StreamingEnforcer', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -489,7 +489,7 @@ describe('ERC20StreamingEnforcer', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -570,7 +570,7 @@ describe('ERC20StreamingEnforcer', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -675,7 +675,7 @@ describe('MultiTokenPeriodEnforcer', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -769,7 +769,7 @@ describe('MultiTokenPeriodEnforcer', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -857,7 +857,7 @@ describe('MultiTokenPeriodEnforcer', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -939,7 +939,7 @@ describe('NativeTokenPeriodTransferEnforcer', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -1021,7 +1021,7 @@ describe('NativeTokenPeriodTransferEnforcer', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -1092,7 +1092,7 @@ describe('NativeTokenPeriodTransferEnforcer', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -1175,7 +1175,7 @@ describe('NativeTokenStreamingEnforcer', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -1259,7 +1259,7 @@ describe('NativeTokenStreamingEnforcer', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -1334,7 +1334,7 @@ describe('NativeTokenStreamingEnforcer', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/deployed.test.ts b/packages/delegator-e2e/test/caveats/deployed.test.ts index 9088fda1..e2b62b96 100644 --- a/packages/delegator-e2e/test/caveats/deployed.test.ts +++ b/packages/delegator-e2e/test/caveats/deployed.test.ts @@ -11,7 +11,7 @@ import { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { transport, @@ -191,7 +191,7 @@ const runTest_expectSuccess = async (deployedAddress: Hex, salt: Hex) => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -278,7 +278,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/erc20PeriodTransfer.test.ts b/packages/delegator-e2e/test/caveats/erc20PeriodTransfer.test.ts index 51d4b1ec..57ecaf9f 100644 --- a/packages/delegator-e2e/test/caveats/erc20PeriodTransfer.test.ts +++ b/packages/delegator-e2e/test/caveats/erc20PeriodTransfer.test.ts @@ -1,7 +1,7 @@ import { beforeEach, test, expect } from 'vitest'; import { encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, createCaveatBuilder, } from '@metamask/smart-accounts-kit/utils'; import { @@ -142,7 +142,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -227,7 +227,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -382,7 +382,7 @@ test('Bob attempts to redeem with invalid terms length', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -455,7 +455,7 @@ test('Bob attempts to redeem with invalid execution length', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -526,7 +526,7 @@ test('Bob attempts to redeem with invalid contract', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -596,7 +596,7 @@ test('Bob attempts to redeem with invalid method', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -673,7 +673,7 @@ test('Bob attempts to redeem with zero start date', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -750,7 +750,7 @@ test('Bob attempts to redeem with zero period amount', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -828,7 +828,7 @@ test('Bob attempts to redeem with zero period duration', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -898,7 +898,7 @@ test('Bob attempts to redeem before start date', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -1008,7 +1008,7 @@ const runScopeTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -1103,7 +1103,7 @@ const runScopeTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/erc20Streaming.test.ts b/packages/delegator-e2e/test/caveats/erc20Streaming.test.ts index 97afe25f..2a64ea2c 100644 --- a/packages/delegator-e2e/test/caveats/erc20Streaming.test.ts +++ b/packages/delegator-e2e/test/caveats/erc20Streaming.test.ts @@ -15,7 +15,7 @@ import type { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { @@ -436,7 +436,7 @@ test('Bob attempts to redeem with invalid terms length', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -518,7 +518,7 @@ test('Bob attempts to redeem with maxAmount less than initialAmount', async () = abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -600,7 +600,7 @@ test('Bob attempts to redeem with zero start time', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -672,7 +672,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -765,7 +765,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -894,7 +894,7 @@ const runScopeTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -991,7 +991,7 @@ const runScopeTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/erc20TransferAmount.test.ts b/packages/delegator-e2e/test/caveats/erc20TransferAmount.test.ts index 53039a88..7c972c56 100644 --- a/packages/delegator-e2e/test/caveats/erc20TransferAmount.test.ts +++ b/packages/delegator-e2e/test/caveats/erc20TransferAmount.test.ts @@ -1,7 +1,7 @@ import { beforeEach, test, expect, describe } from 'vitest'; import { encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, createCaveatBuilder, getDelegationHashOffchain, } from '@metamask/smart-accounts-kit/utils'; @@ -139,7 +139,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -234,7 +234,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -395,7 +395,7 @@ describe('ERC20TransferAmountEnforcer Utilities E2E Tests', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution1]]), ], @@ -452,7 +452,7 @@ describe('ERC20TransferAmountEnforcer Utilities E2E Tests', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution2]]), ], @@ -580,7 +580,7 @@ describe('ERC20TransferAmountEnforcer Utilities E2E Tests', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -791,7 +791,7 @@ const runScopeTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -882,7 +882,7 @@ const runScopeTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/erc721Transfer.test.ts b/packages/delegator-e2e/test/caveats/erc721Transfer.test.ts index 646dce06..b1f1de4b 100644 --- a/packages/delegator-e2e/test/caveats/erc721Transfer.test.ts +++ b/packages/delegator-e2e/test/caveats/erc721Transfer.test.ts @@ -14,7 +14,7 @@ import type { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { @@ -136,7 +136,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -236,7 +236,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -378,7 +378,7 @@ const runScopeTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -476,7 +476,7 @@ const runScopeTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/exactCalldata.test.ts b/packages/delegator-e2e/test/caveats/exactCalldata.test.ts index 46703c48..1e29ba9d 100644 --- a/packages/delegator-e2e/test/caveats/exactCalldata.test.ts +++ b/packages/delegator-e2e/test/caveats/exactCalldata.test.ts @@ -10,7 +10,7 @@ import { } from '@metamask/smart-accounts-kit'; import { createCaveatBuilder, - encodePermissionContexts, + encodeDelegations, encodeExecutionCalldatas, } from '@metamask/smart-accounts-kit/utils'; import { @@ -102,7 +102,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -162,7 +162,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/exactCalldataBatch.test.ts b/packages/delegator-e2e/test/caveats/exactCalldataBatch.test.ts index b39d5184..ceb55496 100644 --- a/packages/delegator-e2e/test/caveats/exactCalldataBatch.test.ts +++ b/packages/delegator-e2e/test/caveats/exactCalldataBatch.test.ts @@ -11,7 +11,7 @@ import { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { @@ -100,7 +100,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.BatchDefault], encodeExecutionCalldatas([actualExecutions]), ], @@ -155,7 +155,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.BatchDefault], encodeExecutionCalldatas([actualExecutions]), ], diff --git a/packages/delegator-e2e/test/caveats/exactExecution.test.ts b/packages/delegator-e2e/test/caveats/exactExecution.test.ts index 8c565456..e6ff3b40 100644 --- a/packages/delegator-e2e/test/caveats/exactExecution.test.ts +++ b/packages/delegator-e2e/test/caveats/exactExecution.test.ts @@ -11,7 +11,7 @@ import { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { @@ -96,7 +96,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -151,7 +151,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[actualExecution]]), ], diff --git a/packages/delegator-e2e/test/caveats/exactExecutionBatch.test.ts b/packages/delegator-e2e/test/caveats/exactExecutionBatch.test.ts index 63f9572f..a844e269 100644 --- a/packages/delegator-e2e/test/caveats/exactExecutionBatch.test.ts +++ b/packages/delegator-e2e/test/caveats/exactExecutionBatch.test.ts @@ -11,7 +11,7 @@ import { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { transport, @@ -99,7 +99,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.BatchDefault], encodeExecutionCalldatas([executions]), ], @@ -154,7 +154,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.BatchDefault], encodeExecutionCalldatas([actualExecutions]), ], diff --git a/packages/delegator-e2e/test/caveats/id.test.ts b/packages/delegator-e2e/test/caveats/id.test.ts index e2b2abfc..90842461 100644 --- a/packages/delegator-e2e/test/caveats/id.test.ts +++ b/packages/delegator-e2e/test/caveats/id.test.ts @@ -11,7 +11,7 @@ import { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { @@ -141,7 +141,7 @@ const runTest_expectSuccess = async (idValue: number) => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -214,7 +214,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/idEnforcerContractRead.test.ts b/packages/delegator-e2e/test/caveats/idEnforcerContractRead.test.ts index c2d6bc6a..0798914e 100644 --- a/packages/delegator-e2e/test/caveats/idEnforcerContractRead.test.ts +++ b/packages/delegator-e2e/test/caveats/idEnforcerContractRead.test.ts @@ -11,7 +11,7 @@ import { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { IdEnforcer } from '@metamask/smart-accounts-kit/contracts'; @@ -183,7 +183,7 @@ describe('IdEnforcer Contract Read Methods', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -274,7 +274,7 @@ describe('IdEnforcer Contract Read Methods', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedAliceDelegation]]), + [[signedAliceDelegation]].map(encodeDelegations), [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -387,7 +387,7 @@ describe('IdEnforcer Contract Read Methods', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -480,7 +480,7 @@ describe('IdEnforcer Contract Read Methods', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation1]]), + [[signedDelegation1]].map(encodeDelegations), [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution1]]), ], @@ -547,7 +547,7 @@ describe('IdEnforcer Contract Read Methods', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation2]]), + [[signedDelegation2]].map(encodeDelegations), [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution2]]), ], diff --git a/packages/delegator-e2e/test/caveats/limitedCalls.test.ts b/packages/delegator-e2e/test/caveats/limitedCalls.test.ts index 9f63bcb7..33f5313b 100644 --- a/packages/delegator-e2e/test/caveats/limitedCalls.test.ts +++ b/packages/delegator-e2e/test/caveats/limitedCalls.test.ts @@ -11,7 +11,7 @@ import { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, getDelegationHashOffchain, } from '@metamask/smart-accounts-kit/utils'; import { LimitedCallsEnforcer } from '@metamask/smart-accounts-kit/contracts'; @@ -140,7 +140,7 @@ const runTest = async (limit: number, runs: number) => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -273,7 +273,7 @@ describe('LimitedCallsEnforcer Contract Read Methods', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -362,7 +362,7 @@ describe('LimitedCallsEnforcer Contract Read Methods', () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation1]]), + [[signedDelegation1]].map(encodeDelegations), [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/multiTokenPeriod.test.ts b/packages/delegator-e2e/test/caveats/multiTokenPeriod.test.ts index 32502316..240c3b6b 100644 --- a/packages/delegator-e2e/test/caveats/multiTokenPeriod.test.ts +++ b/packages/delegator-e2e/test/caveats/multiTokenPeriod.test.ts @@ -1,7 +1,7 @@ import { beforeEach, test, expect } from 'vitest'; import { encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, createCaveatBuilder, } from '@metamask/smart-accounts-kit/utils'; import { @@ -167,7 +167,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -260,7 +260,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/nativeBalanceChange.test.ts b/packages/delegator-e2e/test/caveats/nativeBalanceChange.test.ts index 8fb236a5..72f9509e 100644 --- a/packages/delegator-e2e/test/caveats/nativeBalanceChange.test.ts +++ b/packages/delegator-e2e/test/caveats/nativeBalanceChange.test.ts @@ -12,7 +12,7 @@ import { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { @@ -158,7 +158,7 @@ test('Bob attempts to redeem with invalid terms length', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -225,7 +225,7 @@ const testRun_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -315,7 +315,7 @@ const testRun_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/nativeTokenPayment.test.ts b/packages/delegator-e2e/test/caveats/nativeTokenPayment.test.ts index 7427ccc2..60f009a6 100644 --- a/packages/delegator-e2e/test/caveats/nativeTokenPayment.test.ts +++ b/packages/delegator-e2e/test/caveats/nativeTokenPayment.test.ts @@ -2,7 +2,6 @@ import { beforeEach, test, expect } from 'vitest'; import { encodeDelegations, encodeExecutionCalldatas, - encodePermissionContexts, getDelegationHashOffchain, createCaveatBuilder, } from '@metamask/smart-accounts-kit/utils'; @@ -374,7 +373,7 @@ const submitUserOpForTest = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/nativeTokenPeriodTransfer.test.ts b/packages/delegator-e2e/test/caveats/nativeTokenPeriodTransfer.test.ts index becbefb1..14742353 100644 --- a/packages/delegator-e2e/test/caveats/nativeTokenPeriodTransfer.test.ts +++ b/packages/delegator-e2e/test/caveats/nativeTokenPeriodTransfer.test.ts @@ -1,7 +1,7 @@ import { beforeEach, test, expect } from 'vitest'; import { encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, createCaveatBuilder, } from '@metamask/smart-accounts-kit/utils'; import { @@ -116,7 +116,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([ [{ target: recipient, value: transferAmount, callData: '0x' }], @@ -190,7 +190,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([ [{ target: recipient, value: transferAmount, callData: '0x' }], @@ -331,7 +331,7 @@ test('Bob attempts to redeem with invalid terms length', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([ [{ target: targetAddress, value: transferAmount, callData: '0x' }], @@ -400,7 +400,7 @@ test('Bob attempts to redeem with zero start date', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([ [{ target: targetAddress, value: transferAmount, callData: '0x' }], @@ -469,7 +469,7 @@ test('Bob attempts to redeem with zero period amount', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([ [{ target: targetAddress, value: transferAmount, callData: '0x' }], @@ -538,7 +538,7 @@ test('Bob attempts to redeem with zero period duration', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([ [{ target: targetAddress, value: transferAmount, callData: '0x' }], @@ -600,7 +600,7 @@ test('Bob attempts to redeem before start date', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([ [{ target: targetAddress, value: transferAmount, callData: '0x' }], @@ -691,7 +691,7 @@ const runScopeTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -763,7 +763,7 @@ const runScopeTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -826,7 +826,7 @@ test('Caveat with exactCalldata: Bob successfully redeems with exact calldata ma abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -918,7 +918,7 @@ test('Caveat with exactCalldata: Bob fails to redeem with wrong calldata', async abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -983,7 +983,7 @@ test('Caveat with allowedCalldata: Bob successfully redeems with allowed calldat abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -1074,7 +1074,7 @@ test('Caveat with allowedCalldata: Bob fails to redeem with disallowed calldata abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/nativeTokenStreaming.test.ts b/packages/delegator-e2e/test/caveats/nativeTokenStreaming.test.ts index 9fd65fc1..cb75d604 100644 --- a/packages/delegator-e2e/test/caveats/nativeTokenStreaming.test.ts +++ b/packages/delegator-e2e/test/caveats/nativeTokenStreaming.test.ts @@ -1,7 +1,7 @@ import { beforeEach, test, expect } from 'vitest'; import { encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, createCaveatBuilder, } from '@metamask/smart-accounts-kit/utils'; import { @@ -361,7 +361,7 @@ test('Bob attempts to redeem with invalid terms length', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -434,7 +434,7 @@ test('Bob attempts to redeem with invalid max amount', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -508,7 +508,7 @@ test('Bob attempts to redeem with zero start time', async () => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -574,7 +574,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -656,7 +656,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -765,7 +765,7 @@ const runScopeTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -843,7 +843,7 @@ const runScopeTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -920,7 +920,7 @@ test('Caveat with exactCalldata: Bob successfully redeems with exact calldata ma abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -1014,7 +1014,7 @@ test('Caveat with exactCalldata: Bob fails to redeem with wrong calldata', async abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -1081,7 +1081,7 @@ test('Caveat with allowedCalldata: Bob successfully redeems with allowed calldat abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -1174,7 +1174,7 @@ test('Caveat with allowedCalldata: Bob fails to redeem with disallowed calldata abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/nativeTokenTransferAmount.test.ts b/packages/delegator-e2e/test/caveats/nativeTokenTransferAmount.test.ts index 92622dd0..80ca4fd5 100644 --- a/packages/delegator-e2e/test/caveats/nativeTokenTransferAmount.test.ts +++ b/packages/delegator-e2e/test/caveats/nativeTokenTransferAmount.test.ts @@ -1,7 +1,7 @@ import { beforeEach, test, expect } from 'vitest'; import { encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, createCaveatBuilder, getDelegationHashOffchain, } from '@metamask/smart-accounts-kit/utils'; @@ -126,7 +126,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -198,7 +198,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -280,7 +280,7 @@ const runScopeTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -351,7 +351,7 @@ const runScopeTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -499,7 +499,7 @@ test('Utility: getSpentAmount should track spending correctly before and after t abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -602,7 +602,7 @@ test('Caveat with exactCalldata: Bob successfully redeems with exact calldata ma abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -688,7 +688,7 @@ test('Caveat with exactCalldata: Bob fails to redeem with wrong calldata', async abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -747,7 +747,7 @@ test('Caveat with allowedCalldata: Bob successfully redeems with allowed calldat abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -833,7 +833,7 @@ test('Caveat with allowedCalldata: Bob fails to redeem with disallowed calldata abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/nonce.test.ts b/packages/delegator-e2e/test/caveats/nonce.test.ts index 2ff17cae..9c8681e1 100644 --- a/packages/delegator-e2e/test/caveats/nonce.test.ts +++ b/packages/delegator-e2e/test/caveats/nonce.test.ts @@ -12,7 +12,7 @@ import { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { NonceEnforcer as NonceEnforcerUtils } from '@metamask/smart-accounts-kit/contracts'; import { @@ -148,7 +148,7 @@ const runTest_expectSuccess = async (newCount: bigint, nonce: bigint) => { abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -222,7 +222,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/ownershipTransfer.test.ts b/packages/delegator-e2e/test/caveats/ownershipTransfer.test.ts index ef36cf78..d5303068 100644 --- a/packages/delegator-e2e/test/caveats/ownershipTransfer.test.ts +++ b/packages/delegator-e2e/test/caveats/ownershipTransfer.test.ts @@ -14,7 +14,7 @@ import type { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { @@ -125,7 +125,7 @@ describe('Ownership Transfer Caveat', () => { }); const executionCallData = encodeExecutionCalldatas([[executions]]); - const permissionContexts = encodePermissionContexts([[signedDelegation]]); + const permissionContexts = [[signedDelegation]].map(encodeDelegations); const userOpCalldata = encodeFunctionData({ abi: bobSmartAccount.abi, @@ -200,7 +200,7 @@ describe('Ownership Transfer Caveat', () => { }); const executionCallData = encodeExecutionCalldatas([[executions]]); - const permissionContexts = encodePermissionContexts([[signedDelegation]]); + const permissionContexts = [[signedDelegation]].map(encodeDelegations); const userOpCalldata = encodeFunctionData({ abi: bobSmartAccount.abi, @@ -285,7 +285,7 @@ describe('Ownership Transfer Caveat', () => { }); const executionCallData = encodeExecutionCalldatas([[executions]]); - const permissionContexts = encodePermissionContexts([[signedDelegation]]); + const permissionContexts = [[signedDelegation]].map(encodeDelegations); const userOpCalldata = encodeFunctionData({ abi: bobSmartAccount.abi, @@ -354,7 +354,7 @@ describe('Ownership Transfer Caveat', () => { }); const executionCallData = encodeExecutionCalldatas([[executions]]); - const permissionContexts = encodePermissionContexts([[signedDelegation]]); + const permissionContexts = [[signedDelegation]].map(encodeDelegations); const userOpCalldata = encodeFunctionData({ abi: bobSmartAccount.abi, diff --git a/packages/delegator-e2e/test/caveats/redeemer.test.ts b/packages/delegator-e2e/test/caveats/redeemer.test.ts index a9b1ace9..e877ae93 100644 --- a/packages/delegator-e2e/test/caveats/redeemer.test.ts +++ b/packages/delegator-e2e/test/caveats/redeemer.test.ts @@ -11,7 +11,7 @@ import { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { @@ -124,7 +124,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -205,7 +205,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/specificActionERC20TransferBatch.test.ts b/packages/delegator-e2e/test/caveats/specificActionERC20TransferBatch.test.ts index 8f81c15c..d72c93f7 100644 --- a/packages/delegator-e2e/test/caveats/specificActionERC20TransferBatch.test.ts +++ b/packages/delegator-e2e/test/caveats/specificActionERC20TransferBatch.test.ts @@ -1,7 +1,7 @@ import { beforeEach, test, expect, describe } from 'vitest'; import { encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, createCaveatBuilder, getDelegationHashOffchain, } from '@metamask/smart-accounts-kit/utils'; @@ -136,7 +136,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.BatchDefault], encodeExecutionCalldatas([executions]), ], @@ -209,7 +209,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.BatchDefault], encodeExecutionCalldatas([executions]), ], @@ -755,7 +755,7 @@ describe('SpecificActionERC20TransferBatchEnforcer Contract Read Methods', () => abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.BatchDefault], encodeExecutionCalldatas([executions]), ], diff --git a/packages/delegator-e2e/test/caveats/timestamp.test.ts b/packages/delegator-e2e/test/caveats/timestamp.test.ts index 08cee64b..bfb349f8 100644 --- a/packages/delegator-e2e/test/caveats/timestamp.test.ts +++ b/packages/delegator-e2e/test/caveats/timestamp.test.ts @@ -11,7 +11,7 @@ import { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { @@ -188,7 +188,7 @@ const runTest_expectSuccess = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], @@ -273,7 +273,7 @@ const runTest_expectFailure = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/caveats/valueLte.test.ts b/packages/delegator-e2e/test/caveats/valueLte.test.ts index 93474b6c..8fb4b130 100644 --- a/packages/delegator-e2e/test/caveats/valueLte.test.ts +++ b/packages/delegator-e2e/test/caveats/valueLte.test.ts @@ -11,7 +11,7 @@ import { import { createCaveatBuilder, encodeExecutionCalldatas, - encodePermissionContexts, + encodeDelegations, } from '@metamask/smart-accounts-kit/utils'; import { @@ -146,7 +146,7 @@ const submitUserOperationForTest = async ( abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ], diff --git a/packages/delegator-e2e/test/delegationManagement.test.ts b/packages/delegator-e2e/test/delegationManagement.test.ts index a6fa1424..b041b048 100644 --- a/packages/delegator-e2e/test/delegationManagement.test.ts +++ b/packages/delegator-e2e/test/delegationManagement.test.ts @@ -8,7 +8,7 @@ import { type MetaMaskSmartAccount, } from '@metamask/smart-accounts-kit'; import { - encodePermissionContexts, + encodeDelegations, encodeExecutionCalldatas, getDelegationHashOffchain, } from '@metamask/smart-accounts-kit/utils'; @@ -111,7 +111,7 @@ test('delegation management lifecycle: create, disable, enable, and check status abi: bobSmartAccount.abi, functionName: 'redeemDelegations', args: [ - encodePermissionContexts([[signedDelegation]]), + [encodeDelegations([signedDelegation])], [ExecutionMode.SingleDefault], encodeExecutionCalldatas([[execution]]), ],