Skip to content
Open
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
10 changes: 5 additions & 5 deletions packages/delegator-e2e/test/delegateAndRedeem.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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]]),
],
Expand Down Expand Up @@ -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]]),
],
Expand Down Expand Up @@ -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]]),
],
Expand Down Expand Up @@ -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);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -37,7 +37,7 @@ export const simulate = async ({
abi: DelegationManager,
functionName: 'redeemDelegations',
args: [
encodePermissionContexts(delegations),
delegations.map((delegationChain) => encodeDelegations(delegationChain)),
modes,
encodeExecutionCalldatas(executions),
],
Expand Down Expand Up @@ -71,7 +71,7 @@ export const encode = ({
abi: DelegationManager,
functionName: 'redeemDelegations',
args: [
encodePermissionContexts(delegations),
delegations.map((delegationChain) => encodeDelegations(delegationChain)),
modes,
encodeExecutionCalldatas(executions),
],
Expand Down
2 changes: 0 additions & 2 deletions packages/smart-accounts-kit/src/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ export {
decodeDelegation,
toDelegationStruct,
toDelegation,
encodePermissionContexts,
decodePermissionContexts,
DELEGATION_ARRAY_ABI_TYPE,
DELEGATION_ABI_TYPE,
DELEGATION_ABI_TYPE_COMPONENTS,
Expand Down
7 changes: 4 additions & 3 deletions packages/smart-accounts-kit/src/write.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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({
Expand Down
Loading