@bannynet/core-v6 0.0.34 → 0.0.36
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.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bannynet/core-v6",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.36",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -32,17 +32,18 @@
|
|
|
32
32
|
"artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'banny-core-v6'"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@bananapus/721-hook-v6": "^0.0.
|
|
36
|
-
"@bananapus/buyback-hook-v6": "^0.0.
|
|
37
|
-
"@bananapus/core-v6": "^0.0.
|
|
38
|
-
"@bananapus/router-terminal-v6": "^0.0.
|
|
39
|
-
"@bananapus/suckers-v6": "^0.0.
|
|
35
|
+
"@bananapus/721-hook-v6": "^0.0.54",
|
|
36
|
+
"@bananapus/buyback-hook-v6": "^0.0.49",
|
|
37
|
+
"@bananapus/core-v6": "^0.0.57",
|
|
38
|
+
"@bananapus/router-terminal-v6": "^0.0.46",
|
|
39
|
+
"@bananapus/suckers-v6": "^0.0.49",
|
|
40
|
+
"@croptop/core-v6": "^0.0.52",
|
|
40
41
|
"@openzeppelin/contracts": "5.6.1",
|
|
41
|
-
"@rev-net/core-v6": "^0.0.
|
|
42
|
+
"@rev-net/core-v6": "^0.0.61",
|
|
42
43
|
"keccak": "3.0.4"
|
|
43
44
|
},
|
|
44
45
|
"devDependencies": {
|
|
45
|
-
"@bananapus/address-registry-v6": "^0.0.
|
|
46
|
+
"@bananapus/address-registry-v6": "^0.0.26",
|
|
46
47
|
"@sphinx-labs/plugins": "0.33.3"
|
|
47
48
|
}
|
|
48
49
|
}
|
package/script/Add.Denver.s.sol
CHANGED
|
@@ -64,7 +64,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
64
64
|
votingUnits: 0,
|
|
65
65
|
reserveFrequency: 0,
|
|
66
66
|
reserveBeneficiary: address(0),
|
|
67
|
-
|
|
67
|
+
encodedIpfsUri: bytes32(0x233dd4173ef4ed0f60822a469277bb328b5ae056d8980301f7bd7ad9df780099),
|
|
68
68
|
category: 1,
|
|
69
69
|
discountPercent: 0,
|
|
70
70
|
flags: JB721TierConfigFlags({
|
package/script/Deploy.s.sol
CHANGED
|
@@ -4,10 +4,6 @@ pragma solidity 0.8.28;
|
|
|
4
4
|
import {Hook721Deployment, Hook721DeploymentLib} from "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
|
|
5
5
|
import {CoreDeployment, CoreDeploymentLib} from "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
|
|
6
6
|
import {SuckerDeployment, SuckerDeploymentLib} from "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
|
|
7
|
-
import {
|
|
8
|
-
RouterTerminalDeployment,
|
|
9
|
-
RouterTerminalDeploymentLib
|
|
10
|
-
} from "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
|
|
11
7
|
import {
|
|
12
8
|
RevnetCoreDeployment,
|
|
13
9
|
RevnetCoreDeploymentLib
|
|
@@ -22,7 +18,6 @@ import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
|
|
|
22
18
|
import {JBCurrencyIds} from "@bananapus/core-v6/src/libraries/JBCurrencyIds.sol";
|
|
23
19
|
import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
|
|
24
20
|
import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
|
|
25
|
-
import {JBTerminalConfig} from "@bananapus/core-v6/src/structs/JBTerminalConfig.sol";
|
|
26
21
|
import {JBTokenMapping} from "@bananapus/suckers-v6/src/structs/JBTokenMapping.sol";
|
|
27
22
|
import {REVAutoIssuance} from "@rev-net/core-v6/src/structs/REVAutoIssuance.sol";
|
|
28
23
|
import {REVConfig} from "@rev-net/core-v6/src/structs/REVConfig.sol";
|
|
@@ -34,7 +29,6 @@ import {REV721TiersHookFlags} from "@rev-net/core-v6/src/structs/REV721TiersHook
|
|
|
34
29
|
import {REVStageConfig} from "@rev-net/core-v6/src/structs/REVStageConfig.sol";
|
|
35
30
|
import {REVSuckerDeploymentConfig} from "@rev-net/core-v6/src/structs/REVSuckerDeploymentConfig.sol";
|
|
36
31
|
import {JBSuckerDeployerConfig} from "@bananapus/suckers-v6/src/structs/JBSuckerDeployerConfig.sol";
|
|
37
|
-
import {IJBTerminal} from "@bananapus/core-v6/src/interfaces/IJBTerminal.sol";
|
|
38
32
|
|
|
39
33
|
import {Sphinx} from "@sphinx-labs/contracts/contracts/foundry/SphinxPlugin.sol";
|
|
40
34
|
import {Script} from "forge-std/Script.sol";
|
|
@@ -42,10 +36,10 @@ import {Script} from "forge-std/Script.sol";
|
|
|
42
36
|
import {Banny721TokenUriResolver} from "./../src/Banny721TokenUriResolver.sol";
|
|
43
37
|
|
|
44
38
|
struct BannyverseRevnetConfig {
|
|
39
|
+
JBAccountingContext[] accountingContextsToAccept;
|
|
45
40
|
REVConfig configuration;
|
|
46
|
-
JBTerminalConfig[] terminalConfigurations;
|
|
47
|
-
REVSuckerDeploymentConfig suckerDeploymentConfiguration;
|
|
48
41
|
REVDeploy721TiersHookConfig hookConfiguration;
|
|
42
|
+
REVSuckerDeploymentConfig suckerDeploymentConfiguration;
|
|
49
43
|
}
|
|
50
44
|
|
|
51
45
|
contract DeployScript is Script, Sphinx {
|
|
@@ -57,8 +51,6 @@ contract DeployScript is Script, Sphinx {
|
|
|
57
51
|
RevnetCoreDeployment revnet;
|
|
58
52
|
/// @notice tracks the deployment of the 721 hook contracts for the chain we are deploying to.
|
|
59
53
|
Hook721Deployment hook;
|
|
60
|
-
/// @notice tracks the deployment of the router terminal.
|
|
61
|
-
RouterTerminalDeployment routerTerminal;
|
|
62
54
|
|
|
63
55
|
BannyverseRevnetConfig bannyverseConfig;
|
|
64
56
|
|
|
@@ -113,14 +105,6 @@ contract DeployScript is Script, Sphinx {
|
|
|
113
105
|
suckers = SuckerDeploymentLib.getDeployment(
|
|
114
106
|
vm.envOr("NANA_SUCKERS_DEPLOYMENT_PATH", string("node_modules/@bananapus/suckers-v6/deployments/"))
|
|
115
107
|
);
|
|
116
|
-
// Get the deployment addresses for the 721 hook contracts for this chain.
|
|
117
|
-
routerTerminal = RouterTerminalDeploymentLib.getDeployment(
|
|
118
|
-
vm.envOr(
|
|
119
|
-
"NANA_ROUTER_TERMINAL_DEPLOYMENT_PATH",
|
|
120
|
-
string("node_modules/@bananapus/router-terminal-v6/deployments/")
|
|
121
|
-
)
|
|
122
|
-
);
|
|
123
|
-
|
|
124
108
|
trustedForwarder = core.controller.trustedForwarder();
|
|
125
109
|
|
|
126
110
|
bannyverseConfig = getBannyverseRevnetConfig();
|
|
@@ -130,22 +114,13 @@ contract DeployScript is Script, Sphinx {
|
|
|
130
114
|
}
|
|
131
115
|
|
|
132
116
|
function getBannyverseRevnetConfig() internal view returns (BannyverseRevnetConfig memory) {
|
|
133
|
-
// The terminals that the project will accept funds through.
|
|
134
|
-
JBTerminalConfig[] memory terminalConfigurations = new JBTerminalConfig[](2);
|
|
135
117
|
JBAccountingContext[] memory accountingContextsToAccept = new JBAccountingContext[](1);
|
|
136
118
|
|
|
137
|
-
// Accept the chain's native currency through the multi terminal.
|
|
119
|
+
// Accept the chain's native currency through the Revnet deployer's canonical multi terminal. The deployer
|
|
120
|
+
// registers its immutable router-terminal registry separately, so this config only needs accounting contexts.
|
|
138
121
|
accountingContextsToAccept[0] =
|
|
139
122
|
JBAccountingContext({token: JBConstants.NATIVE_TOKEN, decimals: DECIMALS, currency: NATIVE_CURRENCY});
|
|
140
123
|
|
|
141
|
-
terminalConfigurations[0] =
|
|
142
|
-
JBTerminalConfig({terminal: core.terminal, accountingContextsToAccept: accountingContextsToAccept});
|
|
143
|
-
|
|
144
|
-
terminalConfigurations[1] = JBTerminalConfig({
|
|
145
|
-
terminal: IJBTerminal(address(routerTerminal.registry)),
|
|
146
|
-
accountingContextsToAccept: new JBAccountingContext[](0)
|
|
147
|
-
});
|
|
148
|
-
|
|
149
124
|
JBSplit[] memory splits = new JBSplit[](1);
|
|
150
125
|
splits[0] = JBSplit({
|
|
151
126
|
percent: JBConstants.SPLITS_TOTAL_PERCENT,
|
|
@@ -228,7 +203,7 @@ contract DeployScript is Script, Sphinx {
|
|
|
228
203
|
votingUnits: 0,
|
|
229
204
|
reserveFrequency: 0,
|
|
230
205
|
reserveBeneficiary: address(0),
|
|
231
|
-
|
|
206
|
+
encodedIpfsUri: bytes32(0),
|
|
232
207
|
category: BANNY_BODY_CATEGORY,
|
|
233
208
|
discountPercent: 0,
|
|
234
209
|
flags: JB721TierConfigFlags({
|
|
@@ -249,7 +224,7 @@ contract DeployScript is Script, Sphinx {
|
|
|
249
224
|
votingUnits: 0,
|
|
250
225
|
reserveFrequency: 0,
|
|
251
226
|
reserveBeneficiary: address(0),
|
|
252
|
-
|
|
227
|
+
encodedIpfsUri: bytes32(0),
|
|
253
228
|
category: BANNY_BODY_CATEGORY,
|
|
254
229
|
discountPercent: 0,
|
|
255
230
|
flags: JB721TierConfigFlags({
|
|
@@ -270,7 +245,7 @@ contract DeployScript is Script, Sphinx {
|
|
|
270
245
|
votingUnits: 0,
|
|
271
246
|
reserveFrequency: 0,
|
|
272
247
|
reserveBeneficiary: address(0),
|
|
273
|
-
|
|
248
|
+
encodedIpfsUri: bytes32(0),
|
|
274
249
|
category: BANNY_BODY_CATEGORY,
|
|
275
250
|
discountPercent: 0,
|
|
276
251
|
flags: JB721TierConfigFlags({
|
|
@@ -291,7 +266,7 @@ contract DeployScript is Script, Sphinx {
|
|
|
291
266
|
votingUnits: 0,
|
|
292
267
|
reserveFrequency: 0,
|
|
293
268
|
reserveBeneficiary: address(0),
|
|
294
|
-
|
|
269
|
+
encodedIpfsUri: bytes32(0),
|
|
295
270
|
category: BANNY_BODY_CATEGORY,
|
|
296
271
|
discountPercent: 0,
|
|
297
272
|
flags: JB721TierConfigFlags({
|
|
@@ -348,9 +323,8 @@ contract DeployScript is Script, Sphinx {
|
|
|
348
323
|
REVSuckerDeploymentConfig({deployerConfigurations: suckerDeployerConfigurations, salt: SUCKER_SALT});
|
|
349
324
|
|
|
350
325
|
return BannyverseRevnetConfig({
|
|
326
|
+
accountingContextsToAccept: accountingContextsToAccept,
|
|
351
327
|
configuration: revnetConfiguration,
|
|
352
|
-
terminalConfigurations: terminalConfigurations,
|
|
353
|
-
suckerDeploymentConfiguration: suckerDeploymentConfiguration,
|
|
354
328
|
hookConfiguration: REVDeploy721TiersHookConfig({
|
|
355
329
|
baseline721HookConfiguration: REVBaseline721HookConfig({
|
|
356
330
|
name: "Banny Retail",
|
|
@@ -372,7 +346,8 @@ contract DeployScript is Script, Sphinx {
|
|
|
372
346
|
preventOperatorUpdatingMetadata: false,
|
|
373
347
|
preventOperatorMinting: false,
|
|
374
348
|
preventOperatorIncreasingDiscountPercent: false
|
|
375
|
-
})
|
|
349
|
+
}),
|
|
350
|
+
suckerDeploymentConfiguration: suckerDeploymentConfiguration
|
|
376
351
|
});
|
|
377
352
|
}
|
|
378
353
|
|
|
@@ -430,11 +405,11 @@ contract DeployScript is Script, Sphinx {
|
|
|
430
405
|
bannyverseConfig.hookConfiguration.baseline721HookConfiguration.tokenUriResolver = resolver;
|
|
431
406
|
|
|
432
407
|
// Deploy the $BANNY Revnet.
|
|
433
|
-
revnet.
|
|
408
|
+
revnet.basicDeployer
|
|
434
409
|
.deployFor({
|
|
435
410
|
revnetId: 0,
|
|
436
411
|
configuration: bannyverseConfig.configuration,
|
|
437
|
-
|
|
412
|
+
accountingContextsToAccept: bannyverseConfig.accountingContextsToAccept,
|
|
438
413
|
suckerDeploymentConfiguration: bannyverseConfig.suckerDeploymentConfiguration,
|
|
439
414
|
tiered721HookConfiguration: bannyverseConfig.hookConfiguration,
|
|
440
415
|
allowedPosts: new REVCroptopAllowedPost[](0)
|
package/script/Drop1.s.sol
CHANGED
|
@@ -65,7 +65,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
65
65
|
votingUnits: 0,
|
|
66
66
|
reserveFrequency: 0,
|
|
67
67
|
reserveBeneficiary: address(0),
|
|
68
|
-
|
|
68
|
+
encodedIpfsUri: bytes32(0x5665b0c125d1bccccb78cc0ffc429e66ce41ed3bccebba51209d04636cadbd2c),
|
|
69
69
|
category: 1,
|
|
70
70
|
discountPercent: 0,
|
|
71
71
|
flags: JB721TierConfigFlags({
|
|
@@ -89,7 +89,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
89
89
|
votingUnits: 0,
|
|
90
90
|
reserveFrequency: 0,
|
|
91
91
|
reserveBeneficiary: address(0),
|
|
92
|
-
|
|
92
|
+
encodedIpfsUri: bytes32(0x233dd4173ef4ed0f60822a469277bb328b5ae056d8980301f7bd7ad9df780099),
|
|
93
93
|
category: 1,
|
|
94
94
|
discountPercent: 0,
|
|
95
95
|
flags: JB721TierConfigFlags({
|
|
@@ -113,7 +113,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
113
113
|
votingUnits: 0,
|
|
114
114
|
reserveFrequency: 0,
|
|
115
115
|
reserveBeneficiary: address(0),
|
|
116
|
-
|
|
116
|
+
encodedIpfsUri: bytes32(0x6cb06872575a04a0c4527157eb4719be10b6474d08aa2ce2a4ac5bcb0da996ea),
|
|
117
117
|
category: 2,
|
|
118
118
|
discountPercent: 0,
|
|
119
119
|
flags: JB721TierConfigFlags({
|
|
@@ -137,7 +137,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
137
137
|
votingUnits: 0,
|
|
138
138
|
reserveFrequency: 0,
|
|
139
139
|
reserveBeneficiary: address(0),
|
|
140
|
-
|
|
140
|
+
encodedIpfsUri: bytes32(0x7206771942e806053d6ed8aa90040e53a07319e4fd1f938fc4a10879b7bd2da9),
|
|
141
141
|
category: 2,
|
|
142
142
|
discountPercent: 0,
|
|
143
143
|
flags: JB721TierConfigFlags({
|
|
@@ -161,7 +161,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
161
161
|
votingUnits: 0,
|
|
162
162
|
reserveFrequency: 12,
|
|
163
163
|
reserveBeneficiary: address(0),
|
|
164
|
-
|
|
164
|
+
encodedIpfsUri: bytes32(0xef6478be50575bade53e7ce4c9fb5b399643bcabed94f2111afb63e97fb9fd44),
|
|
165
165
|
category: 3,
|
|
166
166
|
discountPercent: 0,
|
|
167
167
|
flags: JB721TierConfigFlags({
|
|
@@ -185,7 +185,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
185
185
|
votingUnits: 0,
|
|
186
186
|
reserveFrequency: 0,
|
|
187
187
|
reserveBeneficiary: address(0),
|
|
188
|
-
|
|
188
|
+
encodedIpfsUri: bytes32(0xe26d20762024435aedd91058ac9bc9900d719e1f7a04cace501d83a4c1f40941),
|
|
189
189
|
category: 4,
|
|
190
190
|
discountPercent: 0,
|
|
191
191
|
flags: JB721TierConfigFlags({
|
|
@@ -209,7 +209,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
209
209
|
votingUnits: 0,
|
|
210
210
|
reserveFrequency: 25,
|
|
211
211
|
reserveBeneficiary: address(0),
|
|
212
|
-
|
|
212
|
+
encodedIpfsUri: bytes32(0x9f76cb495fd79397cba4fe3d377a5aa2fdd63df218f3b3022c6cc8e32478b494),
|
|
213
213
|
category: 6,
|
|
214
214
|
discountPercent: 0,
|
|
215
215
|
flags: JB721TierConfigFlags({
|
|
@@ -233,7 +233,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
233
233
|
votingUnits: 0,
|
|
234
234
|
reserveFrequency: 25,
|
|
235
235
|
reserveBeneficiary: reserveBeneficiary,
|
|
236
|
-
|
|
236
|
+
encodedIpfsUri: bytes32(0xf01423f9dae3de4adc7e372e6902a351e2c6193a385dde90f5baf37165914831),
|
|
237
237
|
category: 6,
|
|
238
238
|
discountPercent: 0,
|
|
239
239
|
flags: JB721TierConfigFlags({
|
|
@@ -257,7 +257,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
257
257
|
votingUnits: 0,
|
|
258
258
|
reserveFrequency: 0,
|
|
259
259
|
reserveBeneficiary: address(0),
|
|
260
|
-
|
|
260
|
+
encodedIpfsUri: bytes32(0x325c138f1f38e5b5f90a57a248a2f5afe6af738b2adfc825cf9f413bbcf50fa1),
|
|
261
261
|
category: 6,
|
|
262
262
|
discountPercent: 0,
|
|
263
263
|
flags: JB721TierConfigFlags({
|
|
@@ -281,7 +281,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
281
281
|
votingUnits: 0,
|
|
282
282
|
reserveFrequency: 50,
|
|
283
283
|
reserveBeneficiary: address(0),
|
|
284
|
-
|
|
284
|
+
encodedIpfsUri: bytes32(0x7dc7e556a7ac39c473da85165df3d094c6ed9258003fb7dc3d9a8582bcb0dc7f),
|
|
285
285
|
category: 6,
|
|
286
286
|
discountPercent: 0,
|
|
287
287
|
flags: JB721TierConfigFlags({
|
|
@@ -305,7 +305,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
305
305
|
votingUnits: 0,
|
|
306
306
|
reserveFrequency: 0,
|
|
307
307
|
reserveBeneficiary: address(0),
|
|
308
|
-
|
|
308
|
+
encodedIpfsUri: bytes32(0xb06dbd64696994798dee9e00d406a649191524a95e715532f1bdebc92f00aebd),
|
|
309
309
|
category: 6,
|
|
310
310
|
discountPercent: 0,
|
|
311
311
|
flags: JB721TierConfigFlags({
|
|
@@ -329,7 +329,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
329
329
|
votingUnits: 0,
|
|
330
330
|
reserveFrequency: 10,
|
|
331
331
|
reserveBeneficiary: address(0),
|
|
332
|
-
|
|
332
|
+
encodedIpfsUri: bytes32(0x52815d712399165b921df61795581a8c20ad9acf3502e777e20a782b7bc11d54),
|
|
333
333
|
category: 7,
|
|
334
334
|
discountPercent: 0,
|
|
335
335
|
flags: JB721TierConfigFlags({
|
|
@@ -353,7 +353,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
353
353
|
votingUnits: 0,
|
|
354
354
|
reserveFrequency: 0,
|
|
355
355
|
reserveBeneficiary: address(0),
|
|
356
|
-
|
|
356
|
+
encodedIpfsUri: bytes32(0x8a1b694033a47ad08b648d2608fa1b86dccdb0f431795c470605a819988f55ad),
|
|
357
357
|
category: 8,
|
|
358
358
|
discountPercent: 0,
|
|
359
359
|
flags: JB721TierConfigFlags({
|
|
@@ -377,7 +377,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
377
377
|
votingUnits: 0,
|
|
378
378
|
reserveFrequency: 0,
|
|
379
379
|
reserveBeneficiary: address(0),
|
|
380
|
-
|
|
380
|
+
encodedIpfsUri: bytes32(0x39cd82854f76c22afccaf4ad6f055d4e225c2e225f322154f1c3d327cbaccb5a),
|
|
381
381
|
category: 8,
|
|
382
382
|
discountPercent: 0,
|
|
383
383
|
flags: JB721TierConfigFlags({
|
|
@@ -401,7 +401,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
401
401
|
votingUnits: 0,
|
|
402
402
|
reserveFrequency: 10,
|
|
403
403
|
reserveBeneficiary: address(0),
|
|
404
|
-
|
|
404
|
+
encodedIpfsUri: bytes32(0x4e87f483ea20c1537f24c2a586acd14819ca2a6cba1bab68365361e45374f9f9),
|
|
405
405
|
category: 8,
|
|
406
406
|
discountPercent: 0,
|
|
407
407
|
flags: JB721TierConfigFlags({
|
|
@@ -425,7 +425,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
425
425
|
votingUnits: 0,
|
|
426
426
|
reserveFrequency: 0,
|
|
427
427
|
reserveBeneficiary: address(0),
|
|
428
|
-
|
|
428
|
+
encodedIpfsUri: bytes32(0x5fbc1c58d608acd436c18e11edc72d3ae436e1a4c15d127b28a9a24879013d3c),
|
|
429
429
|
category: 9,
|
|
430
430
|
discountPercent: 0,
|
|
431
431
|
flags: JB721TierConfigFlags({
|
|
@@ -449,7 +449,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
449
449
|
votingUnits: 0,
|
|
450
450
|
reserveFrequency: 6,
|
|
451
451
|
reserveBeneficiary: address(0),
|
|
452
|
-
|
|
452
|
+
encodedIpfsUri: bytes32(0x823466de69eaf605d3a62366e5e9dbd6649a71da146f791f94628d4749a2da55),
|
|
453
453
|
category: 9,
|
|
454
454
|
discountPercent: 0,
|
|
455
455
|
flags: JB721TierConfigFlags({
|
|
@@ -473,7 +473,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
473
473
|
votingUnits: 0,
|
|
474
474
|
reserveFrequency: 0,
|
|
475
475
|
reserveBeneficiary: address(0),
|
|
476
|
-
|
|
476
|
+
encodedIpfsUri: bytes32(0x017db86219678b824995b8556e7073d65af87212671312212365497708675c41),
|
|
477
477
|
category: 9,
|
|
478
478
|
discountPercent: 0,
|
|
479
479
|
flags: JB721TierConfigFlags({
|
|
@@ -497,7 +497,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
497
497
|
votingUnits: 0,
|
|
498
498
|
reserveFrequency: 50,
|
|
499
499
|
reserveBeneficiary: address(0),
|
|
500
|
-
|
|
500
|
+
encodedIpfsUri: bytes32(0xdf7d4084b087b22cc172e1df3a2b465b5386a950e9bcd53ed424014a0a86ee57),
|
|
501
501
|
category: 9,
|
|
502
502
|
discountPercent: 0,
|
|
503
503
|
flags: JB721TierConfigFlags({
|
|
@@ -521,7 +521,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
521
521
|
votingUnits: 0,
|
|
522
522
|
reserveFrequency: 15,
|
|
523
523
|
reserveBeneficiary: address(0),
|
|
524
|
-
|
|
524
|
+
encodedIpfsUri: bytes32(0x745b3b4f18aab6ad0d8465d34751ca8eb5b9c267dee6ec8bf63686b508afacf3),
|
|
525
525
|
category: 10,
|
|
526
526
|
discountPercent: 0,
|
|
527
527
|
flags: JB721TierConfigFlags({
|
|
@@ -545,7 +545,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
545
545
|
votingUnits: 0,
|
|
546
546
|
reserveFrequency: 0,
|
|
547
547
|
reserveBeneficiary: address(0),
|
|
548
|
-
|
|
548
|
+
encodedIpfsUri: bytes32(0x815c7dfb119da1e3802754f8ce364caf7a8069e331e35c3f20446800579d8df8),
|
|
549
549
|
category: 11,
|
|
550
550
|
discountPercent: 0,
|
|
551
551
|
flags: JB721TierConfigFlags({
|
|
@@ -569,7 +569,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
569
569
|
votingUnits: 0,
|
|
570
570
|
reserveFrequency: 0,
|
|
571
571
|
reserveBeneficiary: address(0),
|
|
572
|
-
|
|
572
|
+
encodedIpfsUri: bytes32(0xc77fe2f93a5a48ad7f59a3c6c40dd76317e47605fcb74b85a4c5bea160fdab6e),
|
|
573
573
|
category: 11,
|
|
574
574
|
discountPercent: 0,
|
|
575
575
|
flags: JB721TierConfigFlags({
|
|
@@ -593,7 +593,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
593
593
|
votingUnits: 0,
|
|
594
594
|
reserveFrequency: 10,
|
|
595
595
|
reserveBeneficiary: address(0),
|
|
596
|
-
|
|
596
|
+
encodedIpfsUri: bytes32(0x2b62afa12feb307f005902e6bec09f15f8f5d7ba09d937f1162e5d2f00c21e12),
|
|
597
597
|
category: 11,
|
|
598
598
|
discountPercent: 0,
|
|
599
599
|
flags: JB721TierConfigFlags({
|
|
@@ -617,7 +617,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
617
617
|
votingUnits: 0,
|
|
618
618
|
reserveFrequency: 0,
|
|
619
619
|
reserveBeneficiary: address(0),
|
|
620
|
-
|
|
620
|
+
encodedIpfsUri: bytes32(0x4d4b149bded92db977ac35a77bcfff72270eaee404db8751b27ec18030511d3b),
|
|
621
621
|
category: 11,
|
|
622
622
|
discountPercent: 0,
|
|
623
623
|
flags: JB721TierConfigFlags({
|
|
@@ -641,7 +641,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
641
641
|
votingUnits: 0,
|
|
642
642
|
reserveFrequency: 0,
|
|
643
643
|
reserveBeneficiary: address(0),
|
|
644
|
-
|
|
644
|
+
encodedIpfsUri: bytes32(0x5ec40dc2aad2a009266337a198d4b9098cd968d08c06cdc328efd4789f974aa4),
|
|
645
645
|
category: 11,
|
|
646
646
|
discountPercent: 0,
|
|
647
647
|
flags: JB721TierConfigFlags({
|
|
@@ -665,7 +665,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
665
665
|
votingUnits: 0,
|
|
666
666
|
reserveFrequency: 25,
|
|
667
667
|
reserveBeneficiary: address(0),
|
|
668
|
-
|
|
668
|
+
encodedIpfsUri: bytes32(0xb8658c65907f280bfbd228ec384f0dfdfe55401505dc0f303d7d3d6a68a6414b),
|
|
669
669
|
category: 11,
|
|
670
670
|
discountPercent: 0,
|
|
671
671
|
flags: JB721TierConfigFlags({
|
|
@@ -689,7 +689,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
689
689
|
votingUnits: 0,
|
|
690
690
|
reserveFrequency: 0,
|
|
691
691
|
reserveBeneficiary: address(0),
|
|
692
|
-
|
|
692
|
+
encodedIpfsUri: bytes32(0x04e22ea49d80f346b7a5a9013169470824f71faa7d9e0155a71f4afc3fa63f89),
|
|
693
693
|
category: 11,
|
|
694
694
|
discountPercent: 0,
|
|
695
695
|
flags: JB721TierConfigFlags({
|
|
@@ -713,7 +713,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
713
713
|
votingUnits: 0,
|
|
714
714
|
reserveFrequency: 50,
|
|
715
715
|
reserveBeneficiary: address(0),
|
|
716
|
-
|
|
716
|
+
encodedIpfsUri: bytes32(0xf7c17eff468f5dd227b991d773b7a36b93cd997751547f9908a4bf33e31ba701),
|
|
717
717
|
category: 11,
|
|
718
718
|
discountPercent: 0,
|
|
719
719
|
flags: JB721TierConfigFlags({
|
|
@@ -737,7 +737,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
737
737
|
votingUnits: 0,
|
|
738
738
|
reserveFrequency: 50,
|
|
739
739
|
reserveBeneficiary: address(0),
|
|
740
|
-
|
|
740
|
+
encodedIpfsUri: bytes32(0x9a29e975b191f800744d74b11c580fdd74b2db73c95426af36e28cf00d66da97),
|
|
741
741
|
category: 12,
|
|
742
742
|
discountPercent: 0,
|
|
743
743
|
flags: JB721TierConfigFlags({
|
|
@@ -761,7 +761,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
761
761
|
votingUnits: 0,
|
|
762
762
|
reserveFrequency: 0,
|
|
763
763
|
reserveBeneficiary: address(0),
|
|
764
|
-
|
|
764
|
+
encodedIpfsUri: bytes32(0x52a03dc3e983121f275cadc2d86626e0fca8a9901f3dc7d0bbee826e5d3d409d),
|
|
765
765
|
category: 12,
|
|
766
766
|
discountPercent: 0,
|
|
767
767
|
flags: JB721TierConfigFlags({
|
|
@@ -785,7 +785,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
785
785
|
votingUnits: 0,
|
|
786
786
|
reserveFrequency: 25,
|
|
787
787
|
reserveBeneficiary: address(0),
|
|
788
|
-
|
|
788
|
+
encodedIpfsUri: bytes32(0xc583623dc7a3e61bfc04813f8c975eba8a22aeafe3d741edff1e2c97ac520737),
|
|
789
789
|
category: 12,
|
|
790
790
|
discountPercent: 0,
|
|
791
791
|
flags: JB721TierConfigFlags({
|
|
@@ -809,7 +809,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
809
809
|
votingUnits: 0,
|
|
810
810
|
reserveFrequency: 25,
|
|
811
811
|
reserveBeneficiary: address(0),
|
|
812
|
-
|
|
812
|
+
encodedIpfsUri: bytes32(0x58f8e217cfafd0a6feff40f4822790cdc19aba5dd4d4948f4c1bd5e313c90e8d),
|
|
813
813
|
category: 12,
|
|
814
814
|
discountPercent: 0,
|
|
815
815
|
flags: JB721TierConfigFlags({
|
|
@@ -833,7 +833,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
833
833
|
votingUnits: 0,
|
|
834
834
|
reserveFrequency: 10,
|
|
835
835
|
reserveBeneficiary: address(0),
|
|
836
|
-
|
|
836
|
+
encodedIpfsUri: bytes32(0x3e67840649fabab6d62f92bad701a6248b77f86ea8fcd66dc88dfbcba1134d85),
|
|
837
837
|
category: 12,
|
|
838
838
|
discountPercent: 0,
|
|
839
839
|
flags: JB721TierConfigFlags({
|
|
@@ -857,7 +857,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
857
857
|
votingUnits: 0,
|
|
858
858
|
reserveFrequency: 0,
|
|
859
859
|
reserveBeneficiary: address(0),
|
|
860
|
-
|
|
860
|
+
encodedIpfsUri: bytes32(0xd4724e692969066fc0b3587b8e18d1589205d1e1f133d7f9f8d63d14b6d1862f),
|
|
861
861
|
category: 12,
|
|
862
862
|
discountPercent: 0,
|
|
863
863
|
flags: JB721TierConfigFlags({
|
|
@@ -881,7 +881,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
881
881
|
votingUnits: 0,
|
|
882
882
|
reserveFrequency: 0,
|
|
883
883
|
reserveBeneficiary: address(0),
|
|
884
|
-
|
|
884
|
+
encodedIpfsUri: bytes32(0xde4c6e589f4e99cda7205236a99db750638236007b2dd03d79de1146102d7f81),
|
|
885
885
|
category: 12,
|
|
886
886
|
discountPercent: 0,
|
|
887
887
|
flags: JB721TierConfigFlags({
|
|
@@ -905,7 +905,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
905
905
|
votingUnits: 0,
|
|
906
906
|
reserveFrequency: 0,
|
|
907
907
|
reserveBeneficiary: address(0),
|
|
908
|
-
|
|
908
|
+
encodedIpfsUri: bytes32(0x766001db70e4a18e76dbbd9e4b0f9e47b5a9c4daa1a7c3727190a154daabfa1c),
|
|
909
909
|
category: 12,
|
|
910
910
|
discountPercent: 0,
|
|
911
911
|
flags: JB721TierConfigFlags({
|
|
@@ -929,7 +929,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
929
929
|
votingUnits: 0,
|
|
930
930
|
reserveFrequency: 0,
|
|
931
931
|
reserveBeneficiary: address(0),
|
|
932
|
-
|
|
932
|
+
encodedIpfsUri: bytes32(0xa4d2eb02df6eb99cbbdc3603a116b3b9dcd45f865a8c8396611ea5f879deee59),
|
|
933
933
|
category: 13,
|
|
934
934
|
discountPercent: 0,
|
|
935
935
|
flags: JB721TierConfigFlags({
|
|
@@ -953,7 +953,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
953
953
|
votingUnits: 0,
|
|
954
954
|
reserveFrequency: 100,
|
|
955
955
|
reserveBeneficiary: address(0),
|
|
956
|
-
|
|
956
|
+
encodedIpfsUri: bytes32(0x18abc38e7f1c5c014398f705131aac80196dcd0da2b5f02c103e1a549433e8b3),
|
|
957
957
|
category: 13,
|
|
958
958
|
discountPercent: 0,
|
|
959
959
|
flags: JB721TierConfigFlags({
|
|
@@ -977,7 +977,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
977
977
|
votingUnits: 0,
|
|
978
978
|
reserveFrequency: 100,
|
|
979
979
|
reserveBeneficiary: address(0),
|
|
980
|
-
|
|
980
|
+
encodedIpfsUri: bytes32(0xc498a98bea66a8b44297631f136a7326f7a28b882058829588979b186d06baff),
|
|
981
981
|
category: 13,
|
|
982
982
|
discountPercent: 0,
|
|
983
983
|
flags: JB721TierConfigFlags({
|
|
@@ -1001,7 +1001,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
1001
1001
|
votingUnits: 0,
|
|
1002
1002
|
reserveFrequency: 100,
|
|
1003
1003
|
reserveBeneficiary: address(0),
|
|
1004
|
-
|
|
1004
|
+
encodedIpfsUri: bytes32(0x3bd1186293e2d3e4def734a669c348976e1ba0cdc628a19cd5a3b38e0bee28f9),
|
|
1005
1005
|
category: 13,
|
|
1006
1006
|
discountPercent: 0,
|
|
1007
1007
|
flags: JB721TierConfigFlags({
|
|
@@ -1025,7 +1025,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
1025
1025
|
votingUnits: 0,
|
|
1026
1026
|
reserveFrequency: 10,
|
|
1027
1027
|
reserveBeneficiary: address(0),
|
|
1028
|
-
|
|
1028
|
+
encodedIpfsUri: bytes32(0x6b8bfbf33e574747b69039adfc6788101047a4593db7ea7ff4f6fa5a890e9ecf),
|
|
1029
1029
|
category: 13,
|
|
1030
1030
|
discountPercent: 0,
|
|
1031
1031
|
flags: JB721TierConfigFlags({
|
|
@@ -1049,7 +1049,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
1049
1049
|
votingUnits: 0,
|
|
1050
1050
|
reserveFrequency: 25,
|
|
1051
1051
|
reserveBeneficiary: address(0),
|
|
1052
|
-
|
|
1052
|
+
encodedIpfsUri: bytes32(0xf11d1cea4163e0dfa2be8d60b0cd82d075fb37d969e40439df4e91db53bf7f3e),
|
|
1053
1053
|
category: 13,
|
|
1054
1054
|
discountPercent: 0,
|
|
1055
1055
|
flags: JB721TierConfigFlags({
|
|
@@ -1073,7 +1073,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
1073
1073
|
votingUnits: 0,
|
|
1074
1074
|
reserveFrequency: 50,
|
|
1075
1075
|
reserveBeneficiary: address(0),
|
|
1076
|
-
|
|
1076
|
+
encodedIpfsUri: bytes32(0xedf8136f97347d1fee1fc14b1b9cbdb6d170a75c3860a92664c56060712567f3),
|
|
1077
1077
|
category: 13,
|
|
1078
1078
|
discountPercent: 0,
|
|
1079
1079
|
flags: JB721TierConfigFlags({
|
|
@@ -1097,7 +1097,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
1097
1097
|
votingUnits: 0,
|
|
1098
1098
|
reserveFrequency: 25,
|
|
1099
1099
|
reserveBeneficiary: address(0),
|
|
1100
|
-
|
|
1100
|
+
encodedIpfsUri: bytes32(0xbcc0c314f94ccb0f8f2717aff0b2096a28ace5b70465b5b4e106981fdbceb238),
|
|
1101
1101
|
category: 13,
|
|
1102
1102
|
discountPercent: 0,
|
|
1103
1103
|
flags: JB721TierConfigFlags({
|
|
@@ -1121,7 +1121,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
1121
1121
|
votingUnits: 0,
|
|
1122
1122
|
reserveFrequency: 30,
|
|
1123
1123
|
reserveBeneficiary: address(0),
|
|
1124
|
-
|
|
1124
|
+
encodedIpfsUri: bytes32(0x867d8d8b9da0b5d8a00024d548e5f6e33562d521dff8c245764b6206003d1970),
|
|
1125
1125
|
category: 13,
|
|
1126
1126
|
discountPercent: 0,
|
|
1127
1127
|
flags: JB721TierConfigFlags({
|
|
@@ -1145,7 +1145,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
1145
1145
|
votingUnits: 0,
|
|
1146
1146
|
reserveFrequency: 0,
|
|
1147
1147
|
reserveBeneficiary: address(0),
|
|
1148
|
-
|
|
1148
|
+
encodedIpfsUri: bytes32(0x876078bdfb8cdcc4359bb946274a9964e84877beac0ecd59fbf293c3bc2457c9),
|
|
1149
1149
|
category: 14,
|
|
1150
1150
|
discountPercent: 0,
|
|
1151
1151
|
flags: JB721TierConfigFlags({
|
|
@@ -1169,7 +1169,7 @@ contract Drop1Script is Script, Sphinx {
|
|
|
1169
1169
|
votingUnits: 0,
|
|
1170
1170
|
reserveFrequency: 15,
|
|
1171
1171
|
reserveBeneficiary: address(0),
|
|
1172
|
-
|
|
1172
|
+
encodedIpfsUri: bytes32(0x1d1484b4b37a882e59ab5a01c1a32528e703e15156b9bb9b5372b61fec84c0df),
|
|
1173
1173
|
category: 16,
|
|
1174
1174
|
discountPercent: 0,
|
|
1175
1175
|
flags: JB721TierConfigFlags({
|
|
@@ -807,7 +807,7 @@ function generateBatchScript(batchNumber, tierIds, transferDataFunctions, items)
|
|
|
807
807
|
JB721TiersHook hook = JB721TiersHook(hookAddress);
|
|
808
808
|
|
|
809
809
|
// Get project ID from hook
|
|
810
|
-
uint256 projectId = hook.
|
|
810
|
+
uint256 projectId = hook.projectId();
|
|
811
811
|
|
|
812
812
|
// Deploy the appropriate chain-specific migration contract with transfer data
|
|
813
813
|
`;
|
|
@@ -1716,7 +1716,7 @@ contract AirdropOutfitsScript is Script, Sphinx {
|
|
|
1716
1716
|
JB721TiersHook hook = JB721TiersHook(hookAddress);
|
|
1717
1717
|
|
|
1718
1718
|
// Get project ID from hook
|
|
1719
|
-
uint256 projectId = hook.
|
|
1719
|
+
uint256 projectId = hook.projectId();
|
|
1720
1720
|
|
|
1721
1721
|
// Deploy the appropriate chain-specific migration contract with transfer data
|
|
1722
1722
|
if (chainId == 1) {
|
|
@@ -1041,7 +1041,7 @@ contract Banny721TokenUriResolver is
|
|
|
1041
1041
|
return string.concat(
|
|
1042
1042
|
'<image href="',
|
|
1043
1043
|
JBIpfsDecoder.decode({
|
|
1044
|
-
baseUri: svgBaseUri, hexString: _storeOf(hook).
|
|
1044
|
+
baseUri: svgBaseUri, hexString: _storeOf(hook).encodedIpfsUriOf({hook: hook, tierId: upc})
|
|
1045
1045
|
}),
|
|
1046
1046
|
'" width="400" height="400"/>'
|
|
1047
1047
|
);
|