Merge branch 'main' into pre-audit

Bananapus · Apr 6, 2024 · 648aee8 · 648aee8
2 parents 5222537 + b7de18b
commit 648aee8
Show file tree

Hide file tree

Showing 24 changed files with 3,628 additions and 970 deletions.
diff --git a/deployments/compiler-inputs/950f56a064d8d2e7ba7c87a45921f9f4.json b/deployments/compiler-inputs/950f56a064d8d2e7ba7c87a45921f9f4.json
diff --git a/deployments/nana-721-hook/optimism_sepolia/JB721TiersHook.json b/deployments/nana-721-hook/optimism_sepolia/JB721TiersHook.json
diff --git a/deployments/nana-721-hook/optimism_sepolia/JB721TiersHookDeployer.json b/deployments/nana-721-hook/optimism_sepolia/JB721TiersHookDeployer.json
diff --git a/deployments/nana-721-hook/optimism_sepolia/JB721TiersHookProjectDeployer.json b/deployments/nana-721-hook/optimism_sepolia/JB721TiersHookProjectDeployer.json
diff --git a/deployments/nana-721-hook/optimism_sepolia/JBAddressRegistry.json b/deployments/nana-721-hook/optimism_sepolia/JBAddressRegistry.json
diff --git a/...m_sepolia/execution/1d47156af934c17b13e7d378c105f1db4620968a053a041896c54802ce7e751a.json b/...m_sepolia/execution/1d47156af934c17b13e7d378c105f1db4620968a053a041896c54802ce7e751a.json
diff --git a/deployments/nana-721-hook/polygon_mumbai/JB721TiersHook.json b/deployments/nana-721-hook/polygon_mumbai/JB721TiersHook.json
diff --git a/deployments/nana-721-hook/polygon_mumbai/JB721TiersHookDeployer.json b/deployments/nana-721-hook/polygon_mumbai/JB721TiersHookDeployer.json
diff --git a/deployments/nana-721-hook/polygon_mumbai/JB721TiersHookProjectDeployer.json b/deployments/nana-721-hook/polygon_mumbai/JB721TiersHookProjectDeployer.json
diff --git a/deployments/nana-721-hook/polygon_mumbai/JBAddressRegistry.json b/deployments/nana-721-hook/polygon_mumbai/JBAddressRegistry.json
diff --git a/...on_mumbai/execution/1d47156af934c17b13e7d378c105f1db4620968a053a041896c54802ce7e751a.json b/...on_mumbai/execution/1d47156af934c17b13e7d378c105f1db4620968a053a041896c54802ce7e751a.json
diff --git a/deployments/nana-721-hook/sepolia/JB721TiersHook.json b/deployments/nana-721-hook/sepolia/JB721TiersHook.json
diff --git a/deployments/nana-721-hook/sepolia/JB721TiersHookDeployer.json b/deployments/nana-721-hook/sepolia/JB721TiersHookDeployer.json
diff --git a/deployments/nana-721-hook/sepolia/JB721TiersHookProjectDeployer.json b/deployments/nana-721-hook/sepolia/JB721TiersHookProjectDeployer.json
diff --git a/deployments/nana-721-hook/sepolia/JBAddressRegistry.json b/deployments/nana-721-hook/sepolia/JBAddressRegistry.json
diff --git a/...k/sepolia/execution/1d47156af934c17b13e7d378c105f1db4620968a053a041896c54802ce7e751a.json b/...k/sepolia/execution/1d47156af934c17b13e7d378c105f1db4620968a053a041896c54802ce7e751a.json
diff --git a/lib/sphinx b/lib/sphinx
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,11 +18,11 @@
   },
   "dependencies": {
     "@bananapus/address-registry": "^0.0.4",
-    "@bananapus/core": "^0.0.8",
-    "@bananapus/ownable": "^0.0.4",
+    "@bananapus/core": "^0.0.9",
+    "@bananapus/ownable": "^0.0.5",
     "@bananapus/permission-ids": "^0.0.5",
-    "@openzeppelin/contracts": "^5.0.1",
+    "@openzeppelin/contracts": "^5.0.2",
     "@prb/math": "^4.0.2",
-    "@sphinx-labs/plugins": "^0.30.4"
+    "@sphinx-labs/plugins": "^0.30.12"
   }
 }
diff --git a/src/JB721TiersHook.sol b/src/JB721TiersHook.sol
@@ -207,7 +207,7 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
         IJBPermissions permissions,
         address trustedForwarder
     )
-        JBOwnable(directory.PROJECTS(), permissions)
+        JBOwnable(directory.PROJECTS(), permissions, msg.sender, uint88(0))
         JB721Hook(directory)
         ERC2771Context(trustedForwarder)
     {
@@ -404,7 +404,11 @@ contract JB721TiersHook is JBOwnable, ERC2771Context, JB721Hook, IJB721TiersHook
         override
     {
         // Enforce permissions.
-        _requirePermissionFrom({account: owner(), projectId: projectId, permissionId: JBPermissionIds.SET_721_METADATA});
+        _requirePermissionFrom({
+            account: owner(),
+            projectId: projectId,
+            permissionId: JBPermissionIds.SET_721_METADATA
+        });
 
         if (bytes(baseUri).length != 0) {
             // Store the new base URI.

diff --git a/src/abstract/JB721Hook.sol b/src/abstract/JB721Hook.sol
@@ -8,7 +8,7 @@ import {IJBRulesetDataHook} from "@bananapus/core/src/interfaces/IJBRulesetDataH
 import {IJBDirectory} from "@bananapus/core/src/interfaces/IJBDirectory.sol";
 import {IJBPayHook} from "@bananapus/core/src/interfaces/IJBPayHook.sol";
 import {IJBRedeemHook} from "@bananapus/core/src/interfaces/IJBRedeemHook.sol";
-import {IJBTerminal} from "@bananapus/core/src/interfaces/terminal/IJBTerminal.sol";
+import {IJBTerminal} from "@bananapus/core/src/interfaces/IJBTerminal.sol";
 import {JBConstants} from "@bananapus/core/src/libraries/JBConstants.sol";
 import {JBBeforePayRecordedContext} from "@bananapus/core/src/structs/JBBeforePayRecordedContext.sol";
 import {JBAfterPayRecordedContext} from "@bananapus/core/src/structs/JBAfterPayRecordedContext.sol";

diff --git a/test/E2E/Pay_Mint_Redeem_E2E.t.sol b/test/E2E/Pay_Mint_Redeem_E2E.t.sol
@@ -58,6 +58,7 @@ contract Test_TiersHook_E2E is TestBaseWorkflow {
         super.setUp();
         hook = new JB721TiersHook(jbDirectory, jbPermissions, trustedForwarder);
         addressRegistry = new JBAddressRegistry();
+        store = new JB721TiersHookStore();
         JB721TiersHookDeployer hookDeployer = new JB721TiersHookDeployer(hook, store, addressRegistry, trustedForwarder);
         deployer =
             new JB721TiersHookProjectDeployer(IJBDirectory(jbDirectory), IJBPermissions(jbPermissions), hookDeployer);

diff --git a/test/utils/TestBaseWorkflow.sol b/test/utils/TestBaseWorkflow.sol
@@ -27,7 +27,7 @@ import "@bananapus/core/src/structs/JBBeforePayRecordedContext.sol";
 import "@bananapus/core/src/structs/JBBeforeRedeemRecordedContext.sol";
 import "@bananapus/core/src/structs/JBSplit.sol";
 
-import "@bananapus/core/src/interfaces/terminal/IJBTerminal.sol";
+import "@bananapus/core/src/interfaces/IJBTerminal.sol";
 import "@bananapus/core/src/interfaces/IJBToken.sol";
 
 import "@bananapus/permission-ids/src/JBPermissionIds.sol";
@@ -80,7 +80,7 @@ contract TestBaseWorkflow is Test {
         jbPermissions = new JBPermissions();
         vm.label(address(jbPermissions), "JBPermissions");
 
-        jbProjects = new JBProjects(projectOwner);
+        jbProjects = new JBProjects(projectOwner, address(0));
         vm.label(address(jbProjects), "JBProjects");
 
         jbPrices = new JBPrices(jbPermissions, jbProjects, projectOwner);
@@ -98,7 +98,7 @@ contract TestBaseWorkflow is Test {
         jbFeelessAddresses = new JBFeelessAddresses(address(69));
         vm.label(address(jbFeelessAddresses), "JBFeelessAddresses");
 
-        jbTokens = new JBTokens(jbDirectory);
+        jbTokens = new JBTokens(jbDirectory, new JBERC20());
         vm.label(address(jbTokens), "JBTokens");
 
         jbSplits = new JBSplits(jbDirectory);

diff --git a/test/utils/UnitTestSetup.sol b/test/utils/UnitTestSetup.sol
@@ -16,7 +16,7 @@ import "@bananapus/core/src/structs/JBAfterPayRecordedContext.sol";
 import "@bananapus/core/src/structs/JBAfterRedeemRecordedContext.sol";
 import "@bananapus/core/src/structs/JBRedeemHookSpecification.sol";
 import "@bananapus/core/src/structs/JBFundAccessLimitGroup.sol";
-import "@bananapus/core/src/interfaces/terminal/IJBTerminal.sol";
+import "@bananapus/core/src/interfaces/IJBTerminal.sol";
 import "@bananapus/core/src/interfaces/IJBRulesetApprovalHook.sol";
 
 import "../../src/structs/JBLaunchProjectConfig.sol";