@bananapus/suckers-v6 0.0.33 → 0.0.34

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 (10) hide show
  1. package/package.json +1 -1
  2. package/script/Deploy.s.sol +9 -8
  3. package/src/JBArbitrumSucker.sol +2 -1
  4. package/src/JBBaseSucker.sol +2 -1
  5. package/src/JBCCIPSucker.sol +2 -1
  6. package/src/JBCeloSucker.sol +2 -1
  7. package/src/JBOptimismSucker.sol +2 -1
  8. package/src/JBSucker.sol +2 -2
  9. package/src/JBSuckerRegistry.sol +1 -1
  10. package/src/JBSwapCCIPSucker.sol +2 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bananapus/suckers-v6",
3
- "version": "0.0.33",
3
+ "version": "0.0.34",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",
package/script/Deploy.s.sol CHANGED
@@ -4,6 +4,7 @@ pragma solidity 0.8.28;
4
4
  import {IInbox} from "@arbitrum/nitro-contracts/src/bridge/IInbox.sol";
5
5
  import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
6
6
  import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
7
+ import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
7
8
  import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
8
9
  import {CoreDeployment, CoreDeploymentLib} from "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
9
10
  import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
@@ -224,7 +225,7 @@ contract DeployScript is Script, Sphinx {
224
225
  deployer: _opDeployer,
225
226
  directory: core.directory,
226
227
  permissions: core.permissions,
227
- prices: address(core.prices),
228
+ prices: core.prices,
228
229
  tokens: core.tokens,
229
230
  feeProjectId: 1,
230
231
  registry: REGISTRY,
@@ -276,7 +277,7 @@ contract DeployScript is Script, Sphinx {
276
277
  deployer: _opDeployer,
277
278
  directory: core.directory,
278
279
  permissions: core.permissions,
279
- prices: address(core.prices),
280
+ prices: core.prices,
280
281
  tokens: core.tokens,
281
282
  feeProjectId: 1,
282
283
  registry: REGISTRY,
@@ -359,7 +360,7 @@ contract DeployScript is Script, Sphinx {
359
360
  deployer: _baseDeployer,
360
361
  directory: core.directory,
361
362
  permissions: core.permissions,
362
- prices: address(core.prices),
363
+ prices: core.prices,
363
364
  tokens: core.tokens,
364
365
  feeProjectId: 1,
365
366
  registry: REGISTRY,
@@ -411,7 +412,7 @@ contract DeployScript is Script, Sphinx {
411
412
  deployer: _baseDeployer,
412
413
  directory: core.directory,
413
414
  permissions: core.permissions,
414
- prices: address(core.prices),
415
+ prices: core.prices,
415
416
  tokens: core.tokens,
416
417
  feeProjectId: 1,
417
418
  registry: REGISTRY,
@@ -490,7 +491,7 @@ contract DeployScript is Script, Sphinx {
490
491
  deployer: _arbDeployer,
491
492
  directory: core.directory,
492
493
  permissions: core.permissions,
493
- prices: address(core.prices),
494
+ prices: core.prices,
494
495
  tokens: core.tokens,
495
496
  feeProjectId: 1,
496
497
  registry: REGISTRY,
@@ -545,7 +546,7 @@ contract DeployScript is Script, Sphinx {
545
546
  deployer: _arbDeployer,
546
547
  directory: core.directory,
547
548
  permissions: core.permissions,
548
- prices: address(core.prices),
549
+ prices: core.prices,
549
550
  tokens: core.tokens,
550
551
  feeProjectId: 1,
551
552
  registry: REGISTRY,
@@ -721,7 +722,7 @@ contract DeployScript is Script, Sphinx {
721
722
  salt: salt,
722
723
  directory: core.directory,
723
724
  permissions: core.permissions,
724
- prices: address(core.prices),
725
+ prices: core.prices,
725
726
  tokens: core.tokens,
726
727
  configurator: safeAddress(),
727
728
  trustedForwarder: TRUSTED_FORWARDER,
@@ -738,7 +739,7 @@ contract DeployScript is Script, Sphinx {
738
739
  bytes32 salt,
739
740
  IJBDirectory directory,
740
741
  IJBPermissions permissions,
741
- address prices,
742
+ IJBPrices prices,
742
743
  IJBTokens tokens,
743
744
  address configurator,
744
745
  address trustedForwarder,
package/src/JBArbitrumSucker.sol CHANGED
@@ -8,6 +8,7 @@ import {AddressAliasHelper} from "@arbitrum/nitro-contracts/src/libraries/Addres
8
8
  import {ArbSys} from "@arbitrum/nitro-contracts/src/precompiles/ArbSys.sol";
9
9
  import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
10
10
  import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
11
+ import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
11
12
  import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
12
13
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
13
14
  import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
@@ -61,7 +62,7 @@ contract JBArbitrumSucker is JBSucker, IJBArbitrumSucker {
61
62
  JBArbitrumSuckerDeployer deployer,
62
63
  IJBDirectory directory,
63
64
  IJBPermissions permissions,
64
- address prices,
65
+ IJBPrices prices,
65
66
  IJBTokens tokens,
66
67
  uint256 feeProjectId,
67
68
  IJBSuckerRegistry registry,
package/src/JBBaseSucker.sol CHANGED
@@ -3,6 +3,7 @@ pragma solidity 0.8.28;
3
3
 
4
4
  import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
5
5
  import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
6
+ import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
6
7
  import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
7
8
 
8
9
  import {JBOptimismSucker} from "./JBOptimismSucker.sol";
@@ -24,7 +25,7 @@ contract JBBaseSucker is JBOptimismSucker {
24
25
  JBOptimismSuckerDeployer deployer,
25
26
  IJBDirectory directory,
26
27
  IJBPermissions permissions,
27
- address prices,
28
+ IJBPrices prices,
28
29
  IJBTokens tokens,
29
30
  uint256 feeProjectId,
30
31
  IJBSuckerRegistry registry,
package/src/JBCCIPSucker.sol CHANGED
@@ -4,6 +4,7 @@ pragma solidity 0.8.28;
4
4
  // External packages (alphabetized)
5
5
  import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
6
6
  import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
7
+ import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
7
8
  import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
8
9
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
9
10
  import {IAny2EVMMessageReceiver} from "@chainlink/contracts-ccip/contracts/interfaces/IAny2EVMMessageReceiver.sol";
@@ -86,7 +87,7 @@ contract JBCCIPSucker is JBSucker, IAny2EVMMessageReceiver {
86
87
  JBCCIPSuckerDeployer deployer,
87
88
  IJBDirectory directory,
88
89
  IJBPermissions permissions,
89
- address prices,
90
+ IJBPrices prices,
90
91
  IJBTokens tokens,
91
92
  uint256 feeProjectId,
92
93
  IJBSuckerRegistry registry,
package/src/JBCeloSucker.sol CHANGED
@@ -3,6 +3,7 @@ pragma solidity 0.8.28;
3
3
 
4
4
  import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
5
5
  import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
6
+ import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
6
7
  import {IJBTerminal} from "@bananapus/core-v6/src/interfaces/IJBTerminal.sol";
7
8
  import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
8
9
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
@@ -43,7 +44,7 @@ contract JBCeloSucker is JBOptimismSucker {
43
44
  JBCeloSuckerDeployer deployer,
44
45
  IJBDirectory directory,
45
46
  IJBPermissions permissions,
46
- address prices,
47
+ IJBPrices prices,
47
48
  IJBTokens tokens,
48
49
  uint256 feeProjectId,
49
50
  IJBSuckerRegistry registry,
package/src/JBOptimismSucker.sol CHANGED
@@ -3,6 +3,7 @@ pragma solidity 0.8.28;
3
3
 
4
4
  import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
5
5
  import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
6
+ import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
6
7
  import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
7
8
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
8
9
  import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
@@ -44,7 +45,7 @@ contract JBOptimismSucker is JBSucker, IJBOptimismSucker {
44
45
  JBOptimismSuckerDeployer deployer,
45
46
  IJBDirectory directory,
46
47
  IJBPermissions permissions,
47
- address prices,
48
+ IJBPrices prices,
48
49
  IJBTokens tokens,
49
50
  uint256 feeProjectId,
50
51
  IJBSuckerRegistry registry,
package/src/JBSucker.sol CHANGED
@@ -225,7 +225,7 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
225
225
  constructor(
226
226
  IJBDirectory directory,
227
227
  IJBPermissions permissions,
228
- address prices,
228
+ IJBPrices prices,
229
229
  IJBTokens tokens,
230
230
  uint256 feeProjectId,
231
231
  IJBSuckerRegistry registry,
@@ -236,7 +236,7 @@ abstract contract JBSucker is ERC2771Context, JBPermissioned, Initializable, ERC
236
236
  {
237
237
  DIRECTORY = directory;
238
238
  FEE_PROJECT_ID = feeProjectId;
239
- PRICES = IJBPrices(prices);
239
+ PRICES = prices;
240
240
  PROJECTS = directory.PROJECTS();
241
241
  REGISTRY = registry;
242
242
  TOKENS = tokens;
package/src/JBSuckerRegistry.sol CHANGED
@@ -58,7 +58,7 @@ contract JBSuckerRegistry is ERC2771Context, Ownable, JBPermissioned, IJBSuckerR
58
58
  // --------------- public immutable stored properties ---------------- //
59
59
  //*********************************************************************//
60
60
 
61
- /// @notice The juicebox directory.
61
+ /// @notice The Juicebox directory used to look up project terminals and controllers.
62
62
  IJBDirectory public immutable override DIRECTORY;
63
63
 
64
64
  /// @notice A contract which mints ERC-721s that represent project ownership and transfers.
package/src/JBSwapCCIPSucker.sol CHANGED
@@ -4,6 +4,7 @@ pragma solidity 0.8.28;
4
4
  // Core JB imports.
5
5
  import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
6
6
  import {IJBPermissions} from "@bananapus/core-v6/src/interfaces/IJBPermissions.sol";
7
+ import {IJBPrices} from "@bananapus/core-v6/src/interfaces/IJBPrices.sol";
7
8
  import {IJBTokens} from "@bananapus/core-v6/src/interfaces/IJBTokens.sol";
8
9
  // CCIP imports.
9
10
  import {Client} from "@chainlink/contracts-ccip/contracts/libraries/Client.sol";
@@ -209,7 +210,7 @@ contract JBSwapCCIPSucker is JBCCIPSucker, IUnlockCallback, IUniswapV3SwapCallba
209
210
  JBSwapCCIPSuckerDeployer deployer,
210
211
  IJBDirectory directory,
211
212
  IJBPermissions permissions,
212
- address prices,
213
+ IJBPrices prices,
213
214
  IJBTokens tokens,
214
215
  uint256 feeProjectId,
215
216
  IJBSuckerRegistry registry,