Skip to content

Commit 6b8f8f5

Browse files
typicalHumanericglau
typicalHuman
and
ericglau
authored
Fixed bug with incorrect names in generated comment for Multisig account. (#720)
Co-authored-by: Eric Lau <[email protected]>
1 parent bec86b5 commit 6b8f8f5

File tree

4 files changed

+55
-49
lines changed

4 files changed

+55
-49
lines changed

‎.changeset/huge-ties-find.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@openzeppelin/wizard': patch
3+
---
4+
5+
Fixed bug with incorrect names in generated comment for Multisig account.

‎packages/core/solidity/src/account.test.ts.md‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6241,8 +6241,8 @@ Generated by [AVA](https://avajs.dev).
62416241
return super._validateUserOp(userOp, userOpHash, signature);␊
62426242
}␊
62436243
␊
6244-
// IMPORTANT: Make sure SignerMultisig is most derived than AccountERC7579␊
6245-
// in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerMultisig)␊
6244+
// IMPORTANT: Make sure MultiSignerERC7913 is most derived than AccountERC7579␊
6245+
// in the inheritance chain (i.e. contract ... is AccountERC7579, ..., MultiSignerERC7913)␊
62466246
// to ensure the correct order of function resolution.␊
62476247
// AccountERC7579 returns false for _rawSignatureValidation␊
62486248
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -6307,8 +6307,8 @@ Generated by [AVA](https://avajs.dev).
63076307
return super.isValidSignature(hash, signature);␊
63086308
}␊
63096309
␊
6310-
// IMPORTANT: Make sure SignerMultisig is most derived than AccountERC7579␊
6311-
// in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerMultisig)␊
6310+
// IMPORTANT: Make sure MultiSignerERC7913 is most derived than AccountERC7579␊
6311+
// in the inheritance chain (i.e. contract ... is AccountERC7579, ..., MultiSignerERC7913)␊
63126312
// to ensure the correct order of function resolution.␊
63136313
// AccountERC7579 returns false for _rawSignatureValidation␊
63146314
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -6378,8 +6378,8 @@ Generated by [AVA](https://avajs.dev).
63786378
return super._validateUserOp(userOp, userOpHash, signature);␊
63796379
}␊
63806380
␊
6381-
// IMPORTANT: Make sure SignerMultisig is most derived than AccountERC7579␊
6382-
// in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerMultisig)␊
6381+
// IMPORTANT: Make sure MultiSignerERC7913 is most derived than AccountERC7579␊
6382+
// in the inheritance chain (i.e. contract ... is AccountERC7579, ..., MultiSignerERC7913)␊
63836383
// to ensure the correct order of function resolution.␊
63846384
// AccountERC7579 returns false for _rawSignatureValidation␊
63856385
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -6450,8 +6450,8 @@ Generated by [AVA](https://avajs.dev).
64506450
return super._validateUserOp(userOp, userOpHash, signature);␊
64516451
}␊
64526452
␊
6453-
// IMPORTANT: Make sure SignerMultisig is most derived than AccountERC7579␊
6454-
// in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerMultisig)␊
6453+
// IMPORTANT: Make sure MultiSignerERC7913 is most derived than AccountERC7579␊
6454+
// in the inheritance chain (i.e. contract ... is AccountERC7579, ..., MultiSignerERC7913)␊
64556455
// to ensure the correct order of function resolution.␊
64566456
// AccountERC7579 returns false for _rawSignatureValidation␊
64576457
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -6897,8 +6897,8 @@ Generated by [AVA](https://avajs.dev).
68976897
return super._validateUserOp(userOp, userOpHash, signature);␊
68986898
}␊
68996899
␊
6900-
// IMPORTANT: Make sure SignerMultisigUpgradeable is most derived than AccountERC7579Upgradeable␊
6901-
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerMultisigUpgradeable)␊
6900+
// IMPORTANT: Make sure MultiSignerERC7913Upgradeable is most derived than AccountERC7579Upgradeable␊
6901+
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913Upgradeable)␊
69026902
// to ensure the correct order of function resolution.␊
69036903
// AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
69046904
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -6980,8 +6980,8 @@ Generated by [AVA](https://avajs.dev).
69806980
return super.isValidSignature(hash, signature);␊
69816981
}␊
69826982
␊
6983-
// IMPORTANT: Make sure SignerMultisigUpgradeable is most derived than AccountERC7579Upgradeable␊
6984-
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerMultisigUpgradeable)␊
6983+
// IMPORTANT: Make sure MultiSignerERC7913Upgradeable is most derived than AccountERC7579Upgradeable␊
6984+
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913Upgradeable)␊
69856985
// to ensure the correct order of function resolution.␊
69866986
// AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
69876987
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -7067,8 +7067,8 @@ Generated by [AVA](https://avajs.dev).
70677067
return super._validateUserOp(userOp, userOpHash, signature);␊
70687068
}␊
70697069
␊
7070-
// IMPORTANT: Make sure SignerMultisigUpgradeable is most derived than AccountERC7579Upgradeable␊
7071-
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerMultisigUpgradeable)␊
7070+
// IMPORTANT: Make sure MultiSignerERC7913Upgradeable is most derived than AccountERC7579Upgradeable␊
7071+
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913Upgradeable)␊
70727072
// to ensure the correct order of function resolution.␊
70737073
// AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
70747074
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -7155,8 +7155,8 @@ Generated by [AVA](https://avajs.dev).
71557155
return super._validateUserOp(userOp, userOpHash, signature);␊
71567156
}␊
71577157
␊
7158-
// IMPORTANT: Make sure SignerMultisigUpgradeable is most derived than AccountERC7579Upgradeable␊
7159-
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerMultisigUpgradeable)␊
7158+
// IMPORTANT: Make sure MultiSignerERC7913Upgradeable is most derived than AccountERC7579Upgradeable␊
7159+
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913Upgradeable)␊
71607160
// to ensure the correct order of function resolution.␊
71617161
// AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
71627162
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -7546,8 +7546,8 @@ Generated by [AVA](https://avajs.dev).
75467546
return super._validateUserOp(userOp, userOpHash, signature);␊
75477547
}␊
75487548
␊
7549-
// IMPORTANT: Make sure SignerMultisigUpgradeable is most derived than AccountERC7579Upgradeable␊
7550-
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerMultisigUpgradeable)␊
7549+
// IMPORTANT: Make sure MultiSignerERC7913Upgradeable is most derived than AccountERC7579Upgradeable␊
7550+
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913Upgradeable)␊
75517551
// to ensure the correct order of function resolution.␊
75527552
// AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
75537553
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -7622,8 +7622,8 @@ Generated by [AVA](https://avajs.dev).
76227622
return super.isValidSignature(hash, signature);␊
76237623
}␊
76247624
␊
7625-
// IMPORTANT: Make sure SignerMultisigUpgradeable is most derived than AccountERC7579Upgradeable␊
7626-
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerMultisigUpgradeable)␊
7625+
// IMPORTANT: Make sure MultiSignerERC7913Upgradeable is most derived than AccountERC7579Upgradeable␊
7626+
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913Upgradeable)␊
76277627
// to ensure the correct order of function resolution.␊
76287628
// AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
76297629
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -7702,8 +7702,8 @@ Generated by [AVA](https://avajs.dev).
77027702
return super._validateUserOp(userOp, userOpHash, signature);␊
77037703
}␊
77047704
␊
7705-
// IMPORTANT: Make sure SignerMultisigUpgradeable is most derived than AccountERC7579Upgradeable␊
7706-
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerMultisigUpgradeable)␊
7705+
// IMPORTANT: Make sure MultiSignerERC7913Upgradeable is most derived than AccountERC7579Upgradeable␊
7706+
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913Upgradeable)␊
77077707
// to ensure the correct order of function resolution.␊
77087708
// AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
77097709
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -7783,8 +7783,8 @@ Generated by [AVA](https://avajs.dev).
77837783
return super._validateUserOp(userOp, userOpHash, signature);␊
77847784
}␊
77857785
␊
7786-
// IMPORTANT: Make sure SignerMultisigUpgradeable is most derived than AccountERC7579Upgradeable␊
7787-
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerMultisigUpgradeable)␊
7786+
// IMPORTANT: Make sure MultiSignerERC7913Upgradeable is most derived than AccountERC7579Upgradeable␊
7787+
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913Upgradeable)␊
77887788
// to ensure the correct order of function resolution.␊
77897789
// AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
77907790
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -8163,8 +8163,8 @@ Generated by [AVA](https://avajs.dev).
81638163
return super._validateUserOp(userOp, userOpHash, signature);␊
81648164
}␊
81658165
␊
8166-
// IMPORTANT: Make sure SignerMultisigWeighted is most derived than AccountERC7579␊
8167-
// in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerMultisigWeighted)␊
8166+
// IMPORTANT: Make sure MultiSignerERC7913Weighted is most derived than AccountERC7579␊
8167+
// in the inheritance chain (i.e. contract ... is AccountERC7579, ..., MultiSignerERC7913Weighted)␊
81688168
// to ensure the correct order of function resolution.␊
81698169
// AccountERC7579 returns false for _rawSignatureValidation␊
81708170
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -8237,8 +8237,8 @@ Generated by [AVA](https://avajs.dev).
82378237
return super.isValidSignature(hash, signature);␊
82388238
}␊
82398239
␊
8240-
// IMPORTANT: Make sure SignerMultisigWeighted is most derived than AccountERC7579␊
8241-
// in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerMultisigWeighted)␊
8240+
// IMPORTANT: Make sure MultiSignerERC7913Weighted is most derived than AccountERC7579␊
8241+
// in the inheritance chain (i.e. contract ... is AccountERC7579, ..., MultiSignerERC7913Weighted)␊
82428242
// to ensure the correct order of function resolution.␊
82438243
// AccountERC7579 returns false for _rawSignatureValidation␊
82448244
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -8316,8 +8316,8 @@ Generated by [AVA](https://avajs.dev).
83168316
return super._validateUserOp(userOp, userOpHash, signature);␊
83178317
}␊
83188318
␊
8319-
// IMPORTANT: Make sure SignerMultisigWeighted is most derived than AccountERC7579␊
8320-
// in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerMultisigWeighted)␊
8319+
// IMPORTANT: Make sure MultiSignerERC7913Weighted is most derived than AccountERC7579␊
8320+
// in the inheritance chain (i.e. contract ... is AccountERC7579, ..., MultiSignerERC7913Weighted)␊
83218321
// to ensure the correct order of function resolution.␊
83228322
// AccountERC7579 returns false for _rawSignatureValidation␊
83238323
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -8396,8 +8396,8 @@ Generated by [AVA](https://avajs.dev).
83968396
return super._validateUserOp(userOp, userOpHash, signature);␊
83978397
}␊
83988398
␊
8399-
// IMPORTANT: Make sure SignerMultisigWeighted is most derived than AccountERC7579␊
8400-
// in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerMultisigWeighted)␊
8399+
// IMPORTANT: Make sure MultiSignerERC7913Weighted is most derived than AccountERC7579␊
8400+
// in the inheritance chain (i.e. contract ... is AccountERC7579, ..., MultiSignerERC7913Weighted)␊
84018401
// to ensure the correct order of function resolution.␊
84028402
// AccountERC7579 returns false for _rawSignatureValidation␊
84038403
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -8906,8 +8906,8 @@ Generated by [AVA](https://avajs.dev).
89068906
return super._validateUserOp(userOp, userOpHash, signature);␊
89078907
}␊
89088908
␊
8909-
// IMPORTANT: Make sure SignerMultisigWeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
8910-
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerMultisigWeightedUpgradeable)␊
8909+
// IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
8910+
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913WeightedUpgradeable)␊
89118911
// to ensure the correct order of function resolution.␊
89128912
// AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
89138913
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -8997,8 +8997,8 @@ Generated by [AVA](https://avajs.dev).
89978997
return super.isValidSignature(hash, signature);␊
89988998
}␊
89998999
␊
9000-
// IMPORTANT: Make sure SignerMultisigWeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
9001-
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerMultisigWeightedUpgradeable)␊
9000+
// IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
9001+
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913WeightedUpgradeable)␊
90029002
// to ensure the correct order of function resolution.␊
90039003
// AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
90049004
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -9092,8 +9092,8 @@ Generated by [AVA](https://avajs.dev).
90929092
return super._validateUserOp(userOp, userOpHash, signature);␊
90939093
}␊
90949094
␊
9095-
// IMPORTANT: Make sure SignerMultisigWeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
9096-
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerMultisigWeightedUpgradeable)␊
9095+
// IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
9096+
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913WeightedUpgradeable)␊
90979097
// to ensure the correct order of function resolution.␊
90989098
// AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
90999099
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -9188,8 +9188,8 @@ Generated by [AVA](https://avajs.dev).
91889188
return super._validateUserOp(userOp, userOpHash, signature);␊
91899189
}␊
91909190
␊
9191-
// IMPORTANT: Make sure SignerMultisigWeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
9192-
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerMultisigWeightedUpgradeable)␊
9191+
// IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
9192+
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913WeightedUpgradeable)␊
91939193
// to ensure the correct order of function resolution.␊
91949194
// AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
91959195
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -9642,8 +9642,8 @@ Generated by [AVA](https://avajs.dev).
96429642
return super._validateUserOp(userOp, userOpHash, signature);␊
96439643
}␊
96449644
␊
9645-
// IMPORTANT: Make sure SignerMultisigWeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
9646-
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerMultisigWeightedUpgradeable)␊
9645+
// IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
9646+
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913WeightedUpgradeable)␊
96479647
// to ensure the correct order of function resolution.␊
96489648
// AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
96499649
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -9726,8 +9726,8 @@ Generated by [AVA](https://avajs.dev).
97269726
return super.isValidSignature(hash, signature);␊
97279727
}␊
97289728
␊
9729-
// IMPORTANT: Make sure SignerMultisigWeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
9730-
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerMultisigWeightedUpgradeable)␊
9729+
// IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
9730+
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913WeightedUpgradeable)␊
97319731
// to ensure the correct order of function resolution.␊
97329732
// AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
97339733
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -9814,8 +9814,8 @@ Generated by [AVA](https://avajs.dev).
98149814
return super._validateUserOp(userOp, userOpHash, signature);␊
98159815
}␊
98169816
␊
9817-
// IMPORTANT: Make sure SignerMultisigWeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
9818-
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerMultisigWeightedUpgradeable)␊
9817+
// IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
9818+
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913WeightedUpgradeable)␊
98199819
// to ensure the correct order of function resolution.␊
98209820
// AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
98219821
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
@@ -9903,8 +9903,8 @@ Generated by [AVA](https://avajs.dev).
99039903
return super._validateUserOp(userOp, userOpHash, signature);␊
99049904
}␊
99059905
␊
9906-
// IMPORTANT: Make sure SignerMultisigWeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
9907-
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerMultisigWeightedUpgradeable)␊
9906+
// IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
9907+
// in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913WeightedUpgradeable)␊
99089908
// to ensure the correct order of function resolution.␊
99099909
// AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
99109910
function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊

‎packages/core/solidity/src/account.test.ts.snap‎

8 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)