Skip to content

Commit f2ad98a

Browse files
jeffsmale90jeffsmale90
authored
fix: rename permit2ApproveZero to permit2Approve (#237)
* fix: rename permit2ApproveZero to permit2Approve * Changelog updates
1 parent b874928 commit f2ad98a

12 files changed

Lines changed: 35 additions & 27 deletions

File tree

‎packages/7715-permission-types/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
### Fixed
11+
12+
- Rename `permit2ApproveZero` to `permit2Approve` in `TokenApprovalRevocationPermission` ERC-7715 permission data ([#237](https://github.com/MetaMask/smart-accounts-kit/pull/237))
13+
1014
## [0.7.0]
1115

1216
### Added

‎packages/7715-permission-types/src/types.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ export type TokenApprovalRevocationPermission = BasePermission & {
191191
erc20Approve: boolean;
192192
erc721Approve: boolean;
193193
erc721SetApprovalForAll: boolean;
194-
permit2ApproveZero: boolean;
194+
permit2Approve: boolean;
195195
permit2Lockdown: boolean;
196196
permit2InvalidateNonces: boolean;
197197
};

‎packages/delegation-core/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
### Fixed
11+
12+
- Rename `permit2ApproveZero` to `permit2Approve` in `approvalRevocationEnforcer` terms builders and decoders ([#237](https://github.com/MetaMask/smart-accounts-kit/pull/237))
13+
1014
## [2.2.0]
1115

1216
### Added

‎packages/delegation-core/src/caveats/approvalRevocationEnforcer.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export type ApprovalRevocationTerms = {
6666
/** Allow revoking operator access via `setApprovalForAll(operator, false)` (ERC-721 / ERC-1155). */
6767
erc721SetApprovalForAll: boolean;
6868
/** Allow revoking Permit2 approvals via `approve(token, spender, 0, 0)`. */
69-
permit2ApproveZero: boolean;
69+
permit2Approve: boolean;
7070
/** Allow revoking Permit2 lockdown via `lockdown((address,address)[])`. */
7171
permit2Lockdown: boolean;
7272
/** Allow revoking Permit2 invalidateNonces via `invalidateNonces(token, spender, newNonce)`. */
@@ -91,7 +91,7 @@ function termsToMask(terms: ApprovalRevocationTerms): number {
9191
if (terms.erc721SetApprovalForAll) {
9292
mask |= BIT_SET_APPROVAL_FOR_ALL_REVOKE;
9393
}
94-
if (terms.permit2ApproveZero) {
94+
if (terms.permit2Approve) {
9595
mask |= BIT_PERMIT2_APPROVE_ZERO;
9696
}
9797
if (terms.permit2Lockdown) {
@@ -128,7 +128,7 @@ function maskToTerms(mask: number): ApprovalRevocationTerms {
128128
erc20Approve: (mask & BIT_ERC20_APPROVE_ZERO) !== 0,
129129
erc721Approve: (mask & BIT_ERC721_PER_TOKEN_CLEAR) !== 0,
130130
erc721SetApprovalForAll: (mask & BIT_SET_APPROVAL_FOR_ALL_REVOKE) !== 0,
131-
permit2ApproveZero: (mask & BIT_PERMIT2_APPROVE_ZERO) !== 0,
131+
permit2Approve: (mask & BIT_PERMIT2_APPROVE_ZERO) !== 0,
132132
permit2Lockdown: (mask & BIT_PERMIT2_LOCKDOWN) !== 0,
133133
permit2InvalidateNonces: (mask & BIT_PERMIT2_INVALIDATE_NONCES) !== 0,
134134
};

‎packages/delegation-core/test/caveats/approvalRevocationEnforcer.test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const ALL_FALSE = {
1111
erc20Approve: false,
1212
erc721Approve: false,
1313
erc721SetApprovalForAll: false,
14-
permit2ApproveZero: false,
14+
permit2Approve: false,
1515
permit2Lockdown: false,
1616
permit2InvalidateNonces: false,
1717
} satisfies ApprovalRevocationTerms;
@@ -25,7 +25,7 @@ const ALL_VALID_TERM_SETS: ApprovalRevocationTerms[] = Array.from(
2525
erc20Approve: (mask & 0x01) !== 0,
2626
erc721Approve: (mask & 0x02) !== 0,
2727
erc721SetApprovalForAll: (mask & 0x04) !== 0,
28-
permit2ApproveZero: (mask & 0x08) !== 0,
28+
permit2Approve: (mask & 0x08) !== 0,
2929
permit2Lockdown: (mask & 0x10) !== 0,
3030
permit2InvalidateNonces: (mask & 0x20) !== 0,
3131
};
@@ -70,7 +70,7 @@ describe('ApprovalRevocationEnforcer', () => {
7070
expect(
7171
createApprovalRevocationTerms({
7272
...ALL_FALSE,
73-
permit2ApproveZero: true,
73+
permit2Approve: true,
7474
}),
7575
).toBe('0x08');
7676
});
@@ -99,7 +99,7 @@ describe('ApprovalRevocationEnforcer', () => {
9999
erc20Approve: true,
100100
erc721Approve: true,
101101
erc721SetApprovalForAll: true,
102-
permit2ApproveZero: true,
102+
permit2Approve: true,
103103
permit2Lockdown: true,
104104
permit2InvalidateNonces: true,
105105
}),
@@ -119,7 +119,7 @@ describe('ApprovalRevocationEnforcer', () => {
119119
erc20Approve: true,
120120
erc721Approve: true,
121121
erc721SetApprovalForAll: false,
122-
permit2ApproveZero: true,
122+
permit2Approve: true,
123123
permit2Lockdown: false,
124124
permit2InvalidateNonces: true,
125125
},
@@ -138,7 +138,7 @@ describe('ApprovalRevocationEnforcer', () => {
138138
erc20Approve: true,
139139
erc721Approve: false,
140140
erc721SetApprovalForAll: true,
141-
permit2ApproveZero: false,
141+
permit2Approve: false,
142142
permit2Lockdown: true,
143143
permit2InvalidateNonces: true,
144144
};
@@ -160,7 +160,7 @@ describe('ApprovalRevocationEnforcer', () => {
160160
erc20Approve: false,
161161
erc721Approve: false,
162162
erc721SetApprovalForAll: true,
163-
permit2ApproveZero: true,
163+
permit2Approve: true,
164164
permit2Lockdown: false,
165165
permit2InvalidateNonces: true,
166166
},
@@ -170,7 +170,7 @@ describe('ApprovalRevocationEnforcer', () => {
170170
erc20Approve: false,
171171
erc721Approve: false,
172172
erc721SetApprovalForAll: true,
173-
permit2ApproveZero: true,
173+
permit2Approve: true,
174174
permit2Lockdown: false,
175175
permit2InvalidateNonces: true,
176176
});

‎packages/delegation-core/test/caveats/decoders.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ describe('Terms Decoders', () => {
196196
erc20Approve: true,
197197
erc721Approve: false,
198198
erc721SetApprovalForAll: true,
199-
permit2ApproveZero: false,
199+
permit2Approve: false,
200200
permit2Lockdown: false,
201201
permit2InvalidateNonces: false,
202202
};

‎packages/delegator-e2e/test/caveats/approvalRevocation.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ test('maincase: Bob revokes an existing ERC20 approval', async () => {
8787
erc20Approve: true,
8888
erc721Approve: false,
8989
erc721SetApprovalForAll: false,
90-
permit2ApproveZero: false,
90+
permit2Approve: false,
9191
permit2Lockdown: false,
9292
permit2InvalidateNonces: false,
9393
})

‎packages/smart-accounts-kit/CHANGELOG.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Added
1111

12-
- ERC-7715 `token-approval-revocation` permission type ([#226](https://github.com/MetaMask/smart-accounts-kit/pull/226))
13-
- `CaveatBuilder` for `ApprovalRevocationEnforcer`, deployment address added to `SmartAccountsEnvironment` ([#226](https://github.com/metamask/smart-accounts-kit/pull/226))
12+
- ERC-7715 `token-approval-revocation` permission type ([#226](https://github.com/MetaMask/smart-accounts-kit/pull/226), [#237](https://github.com/MetaMask/smart-accounts-kit/pull/237))
13+
- `CaveatBuilder` for `ApprovalRevocationEnforcer`, deployment address added to `SmartAccountsEnvironment` ([#226](https://github.com/metamask/smart-accounts-kit/pull/226), [#237](https://github.com/MetaMask/smart-accounts-kit/pull/237))
1414

1515
### Changed
1616

‎packages/smart-accounts-kit/src/actions/erc7715Mapping.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ function tokenApprovalRevocationPermissionToRpc(
428428
erc20Approve,
429429
erc721Approve,
430430
erc721SetApprovalForAll,
431-
permit2ApproveZero,
431+
permit2Approve,
432432
permit2Lockdown,
433433
permit2InvalidateNonces,
434434
justification,
@@ -440,7 +440,7 @@ function tokenApprovalRevocationPermissionToRpc(
440440
erc20Approve,
441441
erc721Approve,
442442
erc721SetApprovalForAll,
443-
permit2ApproveZero,
443+
permit2Approve,
444444
permit2Lockdown,
445445
permit2InvalidateNonces,
446446
...(justification ? { justification } : {}),

‎packages/smart-accounts-kit/test/actions/erc7715Mapping.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ describe('erc7715Mapping', () => {
199199
erc20Approve: true,
200200
erc721Approve: false,
201201
erc721SetApprovalForAll: true,
202-
permit2ApproveZero: false,
202+
permit2Approve: false,
203203
permit2Lockdown: true,
204204
permit2InvalidateNonces: false,
205205
justification: 'Revoke token approvals',
@@ -215,7 +215,7 @@ describe('erc7715Mapping', () => {
215215
erc20Approve: true,
216216
erc721Approve: false,
217217
erc721SetApprovalForAll: true,
218-
permit2ApproveZero: false,
218+
permit2Approve: false,
219219
permit2Lockdown: true,
220220
permit2InvalidateNonces: false,
221221
justification: 'Revoke token approvals',
@@ -813,7 +813,7 @@ describe('erc7715Mapping', () => {
813813
erc20Approve: true,
814814
erc721Approve: false,
815815
erc721SetApprovalForAll: true,
816-
permit2ApproveZero: false,
816+
permit2Approve: false,
817817
permit2Lockdown: true,
818818
permit2InvalidateNonces: false,
819819
justification: 'Revoke token approvals',
@@ -833,7 +833,7 @@ describe('erc7715Mapping', () => {
833833
erc20Approve: true,
834834
erc721Approve: false,
835835
erc721SetApprovalForAll: true,
836-
permit2ApproveZero: false,
836+
permit2Approve: false,
837837
permit2Lockdown: true,
838838
permit2InvalidateNonces: false,
839839
justification: 'Revoke token approvals',

0 commit comments

Comments
 (0)