@zoralabs/comments-contracts 0.0.1 → 0.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (110) hide show
  1. package/.turbo/turbo-build.log +49 -31
  2. package/README.md +10 -39
  3. package/abis/AddDelegateCommenterRole.json +9 -0
  4. package/abis/CallerAndCommenter.json +62 -0
  5. package/abis/CallerAndCommenterImpl.json +1218 -0
  6. package/abis/CallerAndCommenterMintAndCommentTest.json +771 -0
  7. package/abis/CallerAndCommenterSwapAndCommentTest.json +844 -0
  8. package/abis/CallerAndCommenterTestBase.json +577 -0
  9. package/abis/CommentsImpl.json +189 -59
  10. package/abis/CommentsImplConstants.json +106 -0
  11. package/abis/CommentsPermitTest.json +26 -6
  12. package/abis/CommentsTest.json +58 -10
  13. package/abis/Comments_mintAndCommentTest.json +11 -4
  14. package/abis/Comments_smartWallet.json +711 -0
  15. package/abis/DeployCallerAndCommenterImpl.json +9 -0
  16. package/abis/DeployImpl.json +0 -13
  17. package/abis/DeployNonDeterministic.json +0 -13
  18. package/abis/DeployScript.json +0 -13
  19. package/abis/EIP712Upgradeable.json +74 -0
  20. package/abis/EIP712UpgradeableWithChainId.json +49 -0
  21. package/abis/ERC20.json +310 -0
  22. package/abis/GenerateDeterministicParams.json +0 -13
  23. package/abis/ICallerAndCommenter.json +797 -0
  24. package/abis/IComments.json +629 -9
  25. package/abis/IERC20.json +39 -42
  26. package/abis/IERC20Metadata.json +224 -0
  27. package/abis/{CommentsDeployerBase.json → IMultiOwnable.json} +8 -2
  28. package/abis/IProtocolRewards.json +19 -0
  29. package/abis/ISecondarySwap.json +45 -0
  30. package/abis/IZoraCreator1155.json +51 -0
  31. package/abis/IZoraTimedSaleStrategy.json +91 -0
  32. package/abis/Mock1155.json +75 -1
  33. package/abis/Mock1155NoCreatorRewardRecipient.json +605 -0
  34. package/abis/Mock1155NoOwner.json +566 -0
  35. package/abis/{MockMinter.json → MockDelegateCommenter.json} +12 -2
  36. package/abis/MockERC20z.json +315 -0
  37. package/abis/MockMultiOwnable.json +212 -0
  38. package/abis/MockSecondarySwap.json +95 -0
  39. package/abis/MockZoraTimedSale.json +139 -0
  40. package/abis/Ownable2StepUpgradeable.json +138 -0
  41. package/abis/UnorderedNoncesUpgradeable.json +4 -4
  42. package/addresses/1.json +9 -0
  43. package/addresses/10.json +9 -0
  44. package/addresses/11155111.json +9 -0
  45. package/addresses/11155420.json +9 -0
  46. package/addresses/42161.json +9 -0
  47. package/addresses/7777777.json +9 -0
  48. package/addresses/81457.json +9 -0
  49. package/addresses/8453.json +9 -0
  50. package/addresses/84532.json +9 -0
  51. package/addresses/999999999.json +7 -2
  52. package/deterministicConfig/callerAndCommenter.json +8 -0
  53. package/deterministicConfig/comments.json +2 -2
  54. package/dist/index.cjs +724 -35
  55. package/dist/index.cjs.map +1 -1
  56. package/dist/index.js +723 -35
  57. package/dist/index.js.map +1 -1
  58. package/dist/types.d.ts +1 -1
  59. package/dist/types.d.ts.map +1 -1
  60. package/dist/wagmiGenerated.d.ts +1102 -57
  61. package/dist/wagmiGenerated.d.ts.map +1 -1
  62. package/package/types.ts +4 -1
  63. package/package/wagmiGenerated.ts +728 -32
  64. package/package.json +12 -11
  65. package/script/AddDelegateCommenterRole.s.sol +24 -0
  66. package/script/CommentsDeployerBase.sol +102 -19
  67. package/script/Deploy.s.sol +2 -44
  68. package/script/DeployCallerAndCommenterImpl.s.sol +29 -0
  69. package/script/DeployImpl.s.sol +1 -0
  70. package/script/DeployNonDeterministic.s.sol +22 -13
  71. package/script/GenerateDeterministicParams.s.sol +32 -4
  72. package/scripts/generateCommentsTestData.ts +170 -79
  73. package/src/CommentsImpl.sol +267 -134
  74. package/src/CommentsImplConstants.sol +44 -0
  75. package/src/interfaces/ICallerAndCommenter.sol +215 -0
  76. package/src/interfaces/IComments.sol +189 -42
  77. package/src/interfaces/IMultiOwnable.sol +10 -0
  78. package/src/interfaces/ISecondarySwap.sol +40 -0
  79. package/src/interfaces/IZoraCreator1155.sol +6 -1
  80. package/src/interfaces/IZoraCreator1155TypesV1.sol +46 -0
  81. package/src/interfaces/IZoraTimedSaleStrategy.sol +25 -0
  82. package/src/proxy/CallerAndCommenter.sol +43 -0
  83. package/src/utils/CallerAndCommenterImpl.sol +376 -0
  84. package/src/utils/EIP712UpgradeableWithChainId.sol +12 -23
  85. package/src/version/ContractVersionBase.sol +1 -1
  86. package/test/CallerAndCommenterTestBase.sol +77 -0
  87. package/test/CallerAndCommenter_mintAndComment.t copy.sol +214 -0
  88. package/test/CallerAndCommenter_swapAndComment.t.sol +523 -0
  89. package/test/Comments.t.sol +166 -29
  90. package/test/CommentsTestBase.sol +12 -20
  91. package/test/Comments_delegateComment.t.sol +129 -0
  92. package/test/Comments_permit.t.sol +131 -44
  93. package/test/Comments_smartWallet.t.sol +152 -0
  94. package/test/mocks/Mock1155.sol +12 -1
  95. package/test/mocks/Mock1155NoCreatorRewardRecipient.sol +65 -0
  96. package/test/mocks/Mock1155NoOwner.sol +53 -0
  97. package/test/mocks/MockDelegateCommenter.sol +36 -0
  98. package/test/mocks/MockIZoraCreator1155.sol +16 -0
  99. package/test/mocks/MockSecondarySwap.sol +30 -0
  100. package/test/mocks/MockZoraTimedSale.sol +38 -0
  101. package/wagmi.config.ts +3 -1
  102. package/abis/ProxyDeployerScript.json +0 -15
  103. package/scripts/backfillComments.ts +0 -176
  104. package/scripts/queries.ts +0 -73
  105. package/scripts/queryAndSaveComments.ts +0 -48
  106. package/scripts/queryQuantityOfComments.ts +0 -53
  107. package/scripts/writeComments.ts +0 -198
  108. package/src/deployments/CommentsDeployment.sol +0 -14
  109. package/test/Comments_mintAndComment.t.sol +0 -101
  110. package/test/mocks/MockMinter.sol +0 -29
package/abis/IERC20.json CHANGED
@@ -33,7 +33,7 @@
33
33
  "internalType": "address"
34
34
  },
35
35
  {
36
- "name": "amount",
36
+ "name": "value",
37
37
  "type": "uint256",
38
38
  "internalType": "uint256"
39
39
  }
@@ -66,45 +66,6 @@
66
66
  ],
67
67
  "stateMutability": "view"
68
68
  },
69
- {
70
- "type": "function",
71
- "name": "decimals",
72
- "inputs": [],
73
- "outputs": [
74
- {
75
- "name": "",
76
- "type": "uint8",
77
- "internalType": "uint8"
78
- }
79
- ],
80
- "stateMutability": "view"
81
- },
82
- {
83
- "type": "function",
84
- "name": "name",
85
- "inputs": [],
86
- "outputs": [
87
- {
88
- "name": "",
89
- "type": "string",
90
- "internalType": "string"
91
- }
92
- ],
93
- "stateMutability": "view"
94
- },
95
- {
96
- "type": "function",
97
- "name": "symbol",
98
- "inputs": [],
99
- "outputs": [
100
- {
101
- "name": "",
102
- "type": "string",
103
- "internalType": "string"
104
- }
105
- ],
106
- "stateMutability": "view"
107
- },
108
69
  {
109
70
  "type": "function",
110
71
  "name": "totalSupply",
@@ -128,7 +89,7 @@
128
89
  "internalType": "address"
129
90
  },
130
91
  {
131
- "name": "amount",
92
+ "name": "value",
132
93
  "type": "uint256",
133
94
  "internalType": "uint256"
134
95
  }
@@ -157,7 +118,7 @@
157
118
  "internalType": "address"
158
119
  },
159
120
  {
160
- "name": "amount",
121
+ "name": "value",
161
122
  "type": "uint256",
162
123
  "internalType": "uint256"
163
124
  }
@@ -221,4 +182,40 @@
221
182
  ],
222
183
  "anonymous": false
223
184
  }
185
+ ]pe": "address"
186
+ },
187
+ {
188
+ "name": "value",
189
+ "type": "uint256",
190
+ "indexed": false,
191
+ "internalType": "uint256"
192
+ }
193
+ ],
194
+ "anonymous": false
195
+ },
196
+ {
197
+ "type": "event",
198
+ "name": "Transfer",
199
+ "inputs": [
200
+ {
201
+ "name": "from",
202
+ "type": "address",
203
+ "indexed": true,
204
+ "internalType": "address"
205
+ },
206
+ {
207
+ "name": "to",
208
+ "type": "address",
209
+ "indexed": true,
210
+ "internalType": "address"
211
+ },
212
+ {
213
+ "name": "value",
214
+ "type": "uint256",
215
+ "indexed": false,
216
+ "internalType": "uint256"
217
+ }
218
+ ],
219
+ "anonymous": false
220
+ }
224
221
  ]
@@ -0,0 +1,224 @@
1
+ [
2
+ {
3
+ "type": "function",
4
+ "name": "allowance",
5
+ "inputs": [
6
+ {
7
+ "name": "owner",
8
+ "type": "address",
9
+ "internalType": "address"
10
+ },
11
+ {
12
+ "name": "spender",
13
+ "type": "address",
14
+ "internalType": "address"
15
+ }
16
+ ],
17
+ "outputs": [
18
+ {
19
+ "name": "",
20
+ "type": "uint256",
21
+ "internalType": "uint256"
22
+ }
23
+ ],
24
+ "stateMutability": "view"
25
+ },
26
+ {
27
+ "type": "function",
28
+ "name": "approve",
29
+ "inputs": [
30
+ {
31
+ "name": "spender",
32
+ "type": "address",
33
+ "internalType": "address"
34
+ },
35
+ {
36
+ "name": "value",
37
+ "type": "uint256",
38
+ "internalType": "uint256"
39
+ }
40
+ ],
41
+ "outputs": [
42
+ {
43
+ "name": "",
44
+ "type": "bool",
45
+ "internalType": "bool"
46
+ }
47
+ ],
48
+ "stateMutability": "nonpayable"
49
+ },
50
+ {
51
+ "type": "function",
52
+ "name": "balanceOf",
53
+ "inputs": [
54
+ {
55
+ "name": "account",
56
+ "type": "address",
57
+ "internalType": "address"
58
+ }
59
+ ],
60
+ "outputs": [
61
+ {
62
+ "name": "",
63
+ "type": "uint256",
64
+ "internalType": "uint256"
65
+ }
66
+ ],
67
+ "stateMutability": "view"
68
+ },
69
+ {
70
+ "type": "function",
71
+ "name": "decimals",
72
+ "inputs": [],
73
+ "outputs": [
74
+ {
75
+ "name": "",
76
+ "type": "uint8",
77
+ "internalType": "uint8"
78
+ }
79
+ ],
80
+ "stateMutability": "view"
81
+ },
82
+ {
83
+ "type": "function",
84
+ "name": "name",
85
+ "inputs": [],
86
+ "outputs": [
87
+ {
88
+ "name": "",
89
+ "type": "string",
90
+ "internalType": "string"
91
+ }
92
+ ],
93
+ "stateMutability": "view"
94
+ },
95
+ {
96
+ "type": "function",
97
+ "name": "symbol",
98
+ "inputs": [],
99
+ "outputs": [
100
+ {
101
+ "name": "",
102
+ "type": "string",
103
+ "internalType": "string"
104
+ }
105
+ ],
106
+ "stateMutability": "view"
107
+ },
108
+ {
109
+ "type": "function",
110
+ "name": "totalSupply",
111
+ "inputs": [],
112
+ "outputs": [
113
+ {
114
+ "name": "",
115
+ "type": "uint256",
116
+ "internalType": "uint256"
117
+ }
118
+ ],
119
+ "stateMutability": "view"
120
+ },
121
+ {
122
+ "type": "function",
123
+ "name": "transfer",
124
+ "inputs": [
125
+ {
126
+ "name": "to",
127
+ "type": "address",
128
+ "internalType": "address"
129
+ },
130
+ {
131
+ "name": "value",
132
+ "type": "uint256",
133
+ "internalType": "uint256"
134
+ }
135
+ ],
136
+ "outputs": [
137
+ {
138
+ "name": "",
139
+ "type": "bool",
140
+ "internalType": "bool"
141
+ }
142
+ ],
143
+ "stateMutability": "nonpayable"
144
+ },
145
+ {
146
+ "type": "function",
147
+ "name": "transferFrom",
148
+ "inputs": [
149
+ {
150
+ "name": "from",
151
+ "type": "address",
152
+ "internalType": "address"
153
+ },
154
+ {
155
+ "name": "to",
156
+ "type": "address",
157
+ "internalType": "address"
158
+ },
159
+ {
160
+ "name": "value",
161
+ "type": "uint256",
162
+ "internalType": "uint256"
163
+ }
164
+ ],
165
+ "outputs": [
166
+ {
167
+ "name": "",
168
+ "type": "bool",
169
+ "internalType": "bool"
170
+ }
171
+ ],
172
+ "stateMutability": "nonpayable"
173
+ },
174
+ {
175
+ "type": "event",
176
+ "name": "Approval",
177
+ "inputs": [
178
+ {
179
+ "name": "owner",
180
+ "type": "address",
181
+ "indexed": true,
182
+ "internalType": "address"
183
+ },
184
+ {
185
+ "name": "spender",
186
+ "type": "address",
187
+ "indexed": true,
188
+ "internalType": "address"
189
+ },
190
+ {
191
+ "name": "value",
192
+ "type": "uint256",
193
+ "indexed": false,
194
+ "internalType": "uint256"
195
+ }
196
+ ],
197
+ "anonymous": false
198
+ },
199
+ {
200
+ "type": "event",
201
+ "name": "Transfer",
202
+ "inputs": [
203
+ {
204
+ "name": "from",
205
+ "type": "address",
206
+ "indexed": true,
207
+ "internalType": "address"
208
+ },
209
+ {
210
+ "name": "to",
211
+ "type": "address",
212
+ "indexed": true,
213
+ "internalType": "address"
214
+ },
215
+ {
216
+ "name": "value",
217
+ "type": "uint256",
218
+ "indexed": false,
219
+ "internalType": "uint256"
220
+ }
221
+ ],
222
+ "anonymous": false
223
+ }
224
+ ]
@@ -1,8 +1,14 @@
1
1
  [
2
2
  {
3
3
  "type": "function",
4
- "name": "IS_SCRIPT",
5
- "inputs": [],
4
+ "name": "isOwnerAddress",
5
+ "inputs": [
6
+ {
7
+ "name": "account",
8
+ "type": "address",
9
+ "internalType": "address"
10
+ }
11
+ ],
6
12
  "outputs": [
7
13
  {
8
14
  "name": "",
@@ -1,4 +1,23 @@
1
1
  [
2
+ {
3
+ "type": "function",
4
+ "name": "balanceOf",
5
+ "inputs": [
6
+ {
7
+ "name": "account",
8
+ "type": "address",
9
+ "internalType": "address"
10
+ }
11
+ ],
12
+ "outputs": [
13
+ {
14
+ "name": "",
15
+ "type": "uint256",
16
+ "internalType": "uint256"
17
+ }
18
+ ],
19
+ "stateMutability": "view"
20
+ },
2
21
  {
3
22
  "type": "function",
4
23
  "name": "deposit",
@@ -0,0 +1,45 @@
1
+ [
2
+ {
3
+ "type": "function",
4
+ "name": "buy1155",
5
+ "inputs": [
6
+ {
7
+ "name": "erc20zAddress",
8
+ "type": "address",
9
+ "internalType": "address"
10
+ },
11
+ {
12
+ "name": "num1155ToBuy",
13
+ "type": "uint256",
14
+ "internalType": "uint256"
15
+ },
16
+ {
17
+ "name": "recipient",
18
+ "type": "address",
19
+ "internalType": "address payable"
20
+ },
21
+ {
22
+ "name": "excessRefundRecipient",
23
+ "type": "address",
24
+ "internalType": "address payable"
25
+ },
26
+ {
27
+ "name": "maxEthToSpend",
28
+ "type": "uint256",
29
+ "internalType": "uint256"
30
+ },
31
+ {
32
+ "name": "sqrtPriceLimitX96",
33
+ "type": "uint160",
34
+ "internalType": "uint160"
35
+ }
36
+ ],
37
+ "outputs": [],
38
+ "stateMutability": "payable"
39
+ },
40
+ {
41
+ "type": "error",
42
+ "name": "SaleNotSet",
43
+ "inputs": []
44
+ }
45
+ ]
@@ -47,6 +47,44 @@
47
47
  ],
48
48
  "stateMutability": "view"
49
49
  },
50
+ {
51
+ "type": "function",
52
+ "name": "config",
53
+ "inputs": [],
54
+ "outputs": [
55
+ {
56
+ "name": "owner",
57
+ "type": "address",
58
+ "internalType": "address"
59
+ },
60
+ {
61
+ "name": "__gap1",
62
+ "type": "uint96",
63
+ "internalType": "uint96"
64
+ },
65
+ {
66
+ "name": "fundsRecipient",
67
+ "type": "address",
68
+ "internalType": "address payable"
69
+ },
70
+ {
71
+ "name": "__gap2",
72
+ "type": "uint96",
73
+ "internalType": "uint96"
74
+ },
75
+ {
76
+ "name": "transferHook",
77
+ "type": "address",
78
+ "internalType": "address"
79
+ },
80
+ {
81
+ "name": "__gap3",
82
+ "type": "uint96",
83
+ "internalType": "uint96"
84
+ }
85
+ ],
86
+ "stateMutability": "view"
87
+ },
50
88
  {
51
89
  "type": "function",
52
90
  "name": "getCreatorRewardRecipient",
@@ -119,6 +157,19 @@
119
157
  ],
120
158
  "stateMutability": "view"
121
159
  },
160
+ {
161
+ "type": "function",
162
+ "name": "owner",
163
+ "inputs": [],
164
+ "outputs": [
165
+ {
166
+ "name": "",
167
+ "type": "address",
168
+ "internalType": "address"
169
+ }
170
+ ],
171
+ "stateMutability": "view"
172
+ },
122
173
  {
123
174
  "type": "function",
124
175
  "name": "safeBatchTransferFrom",
@@ -0,0 +1,91 @@
1
+ [
2
+ {
3
+ "type": "function",
4
+ "name": "mint",
5
+ "inputs": [
6
+ {
7
+ "name": "mintTo",
8
+ "type": "address",
9
+ "internalType": "address"
10
+ },
11
+ {
12
+ "name": "quantity",
13
+ "type": "uint256",
14
+ "internalType": "uint256"
15
+ },
16
+ {
17
+ "name": "collection",
18
+ "type": "address",
19
+ "internalType": "address"
20
+ },
21
+ {
22
+ "name": "tokenId",
23
+ "type": "uint256",
24
+ "internalType": "uint256"
25
+ },
26
+ {
27
+ "name": "mintReferral",
28
+ "type": "address",
29
+ "internalType": "address"
30
+ },
31
+ {
32
+ "name": "comment",
33
+ "type": "string",
34
+ "internalType": "string"
35
+ }
36
+ ],
37
+ "outputs": [],
38
+ "stateMutability": "payable"
39
+ },
40
+ {
41
+ "type": "function",
42
+ "name": "sale",
43
+ "inputs": [
44
+ {
45
+ "name": "collection",
46
+ "type": "address",
47
+ "internalType": "address"
48
+ },
49
+ {
50
+ "name": "tokenId",
51
+ "type": "uint256",
52
+ "internalType": "uint256"
53
+ }
54
+ ],
55
+ "outputs": [
56
+ {
57
+ "name": "",
58
+ "type": "tuple",
59
+ "internalType": "struct IZoraTimedSaleStrategy.SaleStorage",
60
+ "components": [
61
+ {
62
+ "name": "erc20zAddress",
63
+ "type": "address",
64
+ "internalType": "address payable"
65
+ },
66
+ {
67
+ "name": "saleStart",
68
+ "type": "uint64",
69
+ "internalType": "uint64"
70
+ },
71
+ {
72
+ "name": "poolAddress",
73
+ "type": "address",
74
+ "internalType": "address"
75
+ },
76
+ {
77
+ "name": "saleEnd",
78
+ "type": "uint64",
79
+ "internalType": "uint64"
80
+ },
81
+ {
82
+ "name": "secondaryActivated",
83
+ "type": "bool",
84
+ "internalType": "bool"
85
+ }
86
+ ]
87
+ }
88
+ ],
89
+ "stateMutability": "view"
90
+ }
91
+ ]
@@ -84,6 +84,67 @@
84
84
  ],
85
85
  "stateMutability": "view"
86
86
  },
87
+ {
88
+ "type": "function",
89
+ "name": "burn",
90
+ "inputs": [
91
+ {
92
+ "name": "from",
93
+ "type": "address",
94
+ "internalType": "address"
95
+ },
96
+ {
97
+ "name": "id",
98
+ "type": "uint256",
99
+ "internalType": "uint256"
100
+ },
101
+ {
102
+ "name": "amount",
103
+ "type": "uint256",
104
+ "internalType": "uint256"
105
+ }
106
+ ],
107
+ "outputs": [],
108
+ "stateMutability": "nonpayable"
109
+ },
110
+ {
111
+ "type": "function",
112
+ "name": "config",
113
+ "inputs": [],
114
+ "outputs": [
115
+ {
116
+ "name": "owner",
117
+ "type": "address",
118
+ "internalType": "address"
119
+ },
120
+ {
121
+ "name": "__gap1",
122
+ "type": "uint96",
123
+ "internalType": "uint96"
124
+ },
125
+ {
126
+ "name": "fundsRecipient",
127
+ "type": "address",
128
+ "internalType": "address payable"
129
+ },
130
+ {
131
+ "name": "__gap2",
132
+ "type": "uint96",
133
+ "internalType": "uint96"
134
+ },
135
+ {
136
+ "name": "transferHook",
137
+ "type": "address",
138
+ "internalType": "address"
139
+ },
140
+ {
141
+ "name": "__gap3",
142
+ "type": "uint96",
143
+ "internalType": "uint96"
144
+ }
145
+ ],
146
+ "stateMutability": "view"
147
+ },
87
148
  {
88
149
  "type": "function",
89
150
  "name": "createToken",
@@ -200,7 +261,20 @@
200
261
  }
201
262
  ],
202
263
  "outputs": [],
203
- "stateMutability": "nonpayable"
264
+ "stateMutability": "payable"
265
+ },
266
+ {
267
+ "type": "function",
268
+ "name": "owner",
269
+ "inputs": [],
270
+ "outputs": [
271
+ {
272
+ "name": "",
273
+ "type": "address",
274
+ "internalType": "address"
275
+ }
276
+ ],
277
+ "stateMutability": "view"
204
278
  },
205
279
  {
206
280
  "type": "function",