Skip to content

Commit 357bf6f

Browse files
ItsNickBarryItsNickBarry
committed
fix DiamondWritable visibility layers and move custom errors to internal interface
1 parent 41e9ba7 commit 357bf6f

15 files changed

+538
-358
lines changed

‎abi/DiamondWritable.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
[
22
{
33
"inputs": [],
4-
"name": "DiamondBaseStorage__InvalidInitializationParameters",
4+
"name": "DiamondWritable__InvalidInitializationParameters",
55
"type": "error"
66
},
77
{
88
"inputs": [],
9-
"name": "DiamondBaseStorage__RemoveTargetNotZeroAddress",
9+
"name": "DiamondWritable__RemoveTargetNotZeroAddress",
1010
"type": "error"
1111
},
1212
{
1313
"inputs": [],
14-
"name": "DiamondBaseStorage__ReplaceTargetIsIdentical",
14+
"name": "DiamondWritable__ReplaceTargetIsIdentical",
1515
"type": "error"
1616
},
1717
{
1818
"inputs": [],
19-
"name": "DiamondBaseStorage__SelectorAlreadyAdded",
19+
"name": "DiamondWritable__SelectorAlreadyAdded",
2020
"type": "error"
2121
},
2222
{
2323
"inputs": [],
24-
"name": "DiamondBaseStorage__SelectorIsImmutable",
24+
"name": "DiamondWritable__SelectorIsImmutable",
2525
"type": "error"
2626
},
2727
{
2828
"inputs": [],
29-
"name": "DiamondBaseStorage__SelectorNotFound",
29+
"name": "DiamondWritable__SelectorNotFound",
3030
"type": "error"
3131
},
3232
{
3333
"inputs": [],
34-
"name": "DiamondBaseStorage__SelectorNotSpecified",
34+
"name": "DiamondWritable__SelectorNotSpecified",
3535
"type": "error"
3636
},
3737
{
3838
"inputs": [],
39-
"name": "DiamondBaseStorage__TargetHasNoCode",
39+
"name": "DiamondWritable__TargetHasNoCode",
4040
"type": "error"
4141
},
4242
{
@@ -60,7 +60,7 @@
6060
"type": "address"
6161
},
6262
{
63-
"internalType": "enum IDiamondWritable.FacetCutAction",
63+
"internalType": "enum IDiamondWritableInternal.FacetCutAction",
6464
"name": "action",
6565
"type": "uint8"
6666
},
@@ -71,7 +71,7 @@
7171
}
7272
],
7373
"indexed": false,
74-
"internalType": "struct IDiamondWritable.FacetCut[]",
74+
"internalType": "struct IDiamondWritableInternal.FacetCut[]",
7575
"name": "facetCuts",
7676
"type": "tuple[]"
7777
},
@@ -120,7 +120,7 @@
120120
"type": "address"
121121
},
122122
{
123-
"internalType": "enum IDiamondWritable.FacetCutAction",
123+
"internalType": "enum IDiamondWritableInternal.FacetCutAction",
124124
"name": "action",
125125
"type": "uint8"
126126
},
@@ -130,7 +130,7 @@
130130
"type": "bytes4[]"
131131
}
132132
],
133-
"internalType": "struct IDiamondWritable.FacetCut[]",
133+
"internalType": "struct IDiamondWritableInternal.FacetCut[]",
134134
"name": "facetCuts",
135135
"type": "tuple[]"
136136
},

‎abi/DiamondBaseStorage.json‎ renamed to ‎abi/DiamondWritableInternal.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
[
22
{
33
"inputs": [],
4-
"name": "DiamondBaseStorage__InvalidInitializationParameters",
4+
"name": "DiamondWritable__InvalidInitializationParameters",
55
"type": "error"
66
},
77
{
88
"inputs": [],
9-
"name": "DiamondBaseStorage__RemoveTargetNotZeroAddress",
9+
"name": "DiamondWritable__RemoveTargetNotZeroAddress",
1010
"type": "error"
1111
},
1212
{
1313
"inputs": [],
14-
"name": "DiamondBaseStorage__ReplaceTargetIsIdentical",
14+
"name": "DiamondWritable__ReplaceTargetIsIdentical",
1515
"type": "error"
1616
},
1717
{
1818
"inputs": [],
19-
"name": "DiamondBaseStorage__SelectorAlreadyAdded",
19+
"name": "DiamondWritable__SelectorAlreadyAdded",
2020
"type": "error"
2121
},
2222
{
2323
"inputs": [],
24-
"name": "DiamondBaseStorage__SelectorIsImmutable",
24+
"name": "DiamondWritable__SelectorIsImmutable",
2525
"type": "error"
2626
},
2727
{
2828
"inputs": [],
29-
"name": "DiamondBaseStorage__SelectorNotFound",
29+
"name": "DiamondWritable__SelectorNotFound",
3030
"type": "error"
3131
},
3232
{
3333
"inputs": [],
34-
"name": "DiamondBaseStorage__SelectorNotSpecified",
34+
"name": "DiamondWritable__SelectorNotSpecified",
3535
"type": "error"
3636
},
3737
{
3838
"inputs": [],
39-
"name": "DiamondBaseStorage__TargetHasNoCode",
39+
"name": "DiamondWritable__TargetHasNoCode",
4040
"type": "error"
4141
},
4242
{
@@ -50,7 +50,7 @@
5050
"type": "address"
5151
},
5252
{
53-
"internalType": "enum IDiamondWritable.FacetCutAction",
53+
"internalType": "enum IDiamondWritableInternal.FacetCutAction",
5454
"name": "action",
5555
"type": "uint8"
5656
},
@@ -61,7 +61,7 @@
6161
}
6262
],
6363
"indexed": false,
64-
"internalType": "struct IDiamondWritable.FacetCut[]",
64+
"internalType": "struct IDiamondWritableInternal.FacetCut[]",
6565
"name": "facetCuts",
6666
"type": "tuple[]"
6767
},

‎abi/IDiamondWritable.json‎

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,44 @@
11
[
2+
{
3+
"inputs": [],
4+
"name": "DiamondWritable__InvalidInitializationParameters",
5+
"type": "error"
6+
},
7+
{
8+
"inputs": [],
9+
"name": "DiamondWritable__RemoveTargetNotZeroAddress",
10+
"type": "error"
11+
},
12+
{
13+
"inputs": [],
14+
"name": "DiamondWritable__ReplaceTargetIsIdentical",
15+
"type": "error"
16+
},
17+
{
18+
"inputs": [],
19+
"name": "DiamondWritable__SelectorAlreadyAdded",
20+
"type": "error"
21+
},
22+
{
23+
"inputs": [],
24+
"name": "DiamondWritable__SelectorIsImmutable",
25+
"type": "error"
26+
},
27+
{
28+
"inputs": [],
29+
"name": "DiamondWritable__SelectorNotFound",
30+
"type": "error"
31+
},
32+
{
33+
"inputs": [],
34+
"name": "DiamondWritable__SelectorNotSpecified",
35+
"type": "error"
36+
},
37+
{
38+
"inputs": [],
39+
"name": "DiamondWritable__TargetHasNoCode",
40+
"type": "error"
41+
},
242
{
343
"anonymous": false,
444
"inputs": [
@@ -10,7 +50,7 @@
1050
"type": "address"
1151
},
1252
{
13-
"internalType": "enum IDiamondWritable.FacetCutAction",
53+
"internalType": "enum IDiamondWritableInternal.FacetCutAction",
1454
"name": "action",
1555
"type": "uint8"
1656
},
@@ -21,7 +61,7 @@
2161
}
2262
],
2363
"indexed": false,
24-
"internalType": "struct IDiamondWritable.FacetCut[]",
64+
"internalType": "struct IDiamondWritableInternal.FacetCut[]",
2565
"name": "facetCuts",
2666
"type": "tuple[]"
2767
},
@@ -51,7 +91,7 @@
5191
"type": "address"
5292
},
5393
{
54-
"internalType": "enum IDiamondWritable.FacetCutAction",
94+
"internalType": "enum IDiamondWritableInternal.FacetCutAction",
5595
"name": "action",
5696
"type": "uint8"
5797
},
@@ -61,7 +101,7 @@
61101
"type": "bytes4[]"
62102
}
63103
],
64-
"internalType": "struct IDiamondWritable.FacetCut[]",
104+
"internalType": "struct IDiamondWritableInternal.FacetCut[]",
65105
"name": "facetCuts",
66106
"type": "tuple[]"
67107
},

‎abi/IDiamondWritableInternal.json‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
[
2+
{
3+
"inputs": [],
4+
"name": "DiamondWritable__InvalidInitializationParameters",
5+
"type": "error"
6+
},
7+
{
8+
"inputs": [],
9+
"name": "DiamondWritable__RemoveTargetNotZeroAddress",
10+
"type": "error"
11+
},
12+
{
13+
"inputs": [],
14+
"name": "DiamondWritable__ReplaceTargetIsIdentical",
15+
"type": "error"
16+
},
17+
{
18+
"inputs": [],
19+
"name": "DiamondWritable__SelectorAlreadyAdded",
20+
"type": "error"
21+
},
22+
{
23+
"inputs": [],
24+
"name": "DiamondWritable__SelectorIsImmutable",
25+
"type": "error"
26+
},
27+
{
28+
"inputs": [],
29+
"name": "DiamondWritable__SelectorNotFound",
30+
"type": "error"
31+
},
32+
{
33+
"inputs": [],
34+
"name": "DiamondWritable__SelectorNotSpecified",
35+
"type": "error"
36+
},
37+
{
38+
"inputs": [],
39+
"name": "DiamondWritable__TargetHasNoCode",
40+
"type": "error"
41+
},
42+
{
43+
"anonymous": false,
44+
"inputs": [
45+
{
46+
"components": [
47+
{
48+
"internalType": "address",
49+
"name": "target",
50+
"type": "address"
51+
},
52+
{
53+
"internalType": "enum IDiamondWritableInternal.FacetCutAction",
54+
"name": "action",
55+
"type": "uint8"
56+
},
57+
{
58+
"internalType": "bytes4[]",
59+
"name": "selectors",
60+
"type": "bytes4[]"
61+
}
62+
],
63+
"indexed": false,
64+
"internalType": "struct IDiamondWritableInternal.FacetCut[]",
65+
"name": "facetCuts",
66+
"type": "tuple[]"
67+
},
68+
{
69+
"indexed": false,
70+
"internalType": "address",
71+
"name": "target",
72+
"type": "address"
73+
},
74+
{
75+
"indexed": false,
76+
"internalType": "bytes",
77+
"name": "data",
78+
"type": "bytes"
79+
}
80+
],
81+
"name": "DiamondCut",
82+
"type": "event"
83+
}
84+
]

0 commit comments

Comments
 (0)