Skip to content

Commit 78f0e2f

Browse files
authored
Merge pull request #2422 from AmbireTech/config/remove-7702-delegation-warn
Config / Remove override existing EIP-7702 delegation warning
2 parents 2db043a + bd0700c commit 78f0e2f

2 files changed

Lines changed: 0 additions & 31 deletions

File tree

src/consts/signAccountOp/errorHandling.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@ const WARNINGS: { [key: string]: Warning } = {
2727
id: 'feeTokenPriceUnavailable',
2828
title: 'Unable to estimate the transaction fee in USD.'
2929
},
30-
delegationDetected: {
31-
id: 'delegationDetected',
32-
title: 'Delegation detected',
33-
text: 'The transaction you are about to sign will override the existing EIP-7702 delegation on your account. Are you sure you want to proceed?',
34-
promptBefore: ['one-click-sign', 'sign'],
35-
type: 'info'
36-
},
3730
v1Acc: {
3831
id: 'v1Acc',
3932
title: 'You can only broadcast transactions for Ambire v1 accounts from an EOA'

src/controllers/signAccountOp/signAccountOp.ts

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,30 +1142,6 @@ export class SignAccountOpController extends EventEmitter implements ISignAccoun
11421142
if (significantBalanceDecreaseWarning) warnings.push(significantBalanceDecreaseWarning)
11431143
if (unknownTokenWarnings) warnings.push(unknownTokenWarnings)
11441144

1145-
// if 7702 EOA that is not ambire
1146-
// and another delegation is there, show the warning
1147-
const broadcastOption = this.selectedOption
1148-
? this.baseAccount.getBroadcastOption(this.selectedOption, {
1149-
op: this.accountOp,
1150-
isSponsored: this.isSponsored
1151-
})
1152-
: null
1153-
if (
1154-
'is7702' in this.baseAccount &&
1155-
this.baseAccount.is7702 &&
1156-
this.delegatedContract &&
1157-
this.delegatedContract !== ZeroAddress &&
1158-
this.delegatedContract?.toLowerCase() !== EIP_7702_AMBIRE_ACCOUNT.toLowerCase() &&
1159-
this.delegatedContract?.toLowerCase() !== EIP_7702_GRID_PLUS.toLowerCase() &&
1160-
this.delegatedContract?.toLowerCase() !== EIP_7702_KATANA.toLowerCase() &&
1161-
(!this.accountOp.meta || this.accountOp.meta.setDelegation === undefined) &&
1162-
(broadcastOption === BROADCAST_OPTIONS.byBundler ||
1163-
broadcastOption === BROADCAST_OPTIONS.delegation) &&
1164-
WARNINGS.delegationDetected
1165-
) {
1166-
warnings.push(WARNINGS.delegationDetected)
1167-
}
1168-
11691145
const accountState =
11701146
this.#accounts.accountStates[this.account.addr]?.[this.#network.chainId.toString()]
11711147
if (this.account.creation && !accountState?.isV2 && WARNINGS.v1Acc)

0 commit comments

Comments
 (0)