Merge pull request #152 from Bananapus/ci/0.0.15

ci: `v0.0.15`
Bananapus · Jun 3, 2024 · 036b7dd · 036b7dd
2 parents bc6005c + 372eac7
commit 036b7dd
Show file tree

Hide file tree

Showing 62 changed files with 74,992 additions and 8,104 deletions.
diff --git a/deployments/compiler-inputs/d72d671cb704a380777b1be08dd807eb.json b/deployments/compiler-inputs/d72d671cb704a380777b1be08dd807eb.json
diff --git a/deployments/nana-core/arbitrum_sepolia/JBController.json b/deployments/nana-core/arbitrum_sepolia/JBController.json
diff --git a/deployments/nana-core/arbitrum_sepolia/JBDirectory.json b/deployments/nana-core/arbitrum_sepolia/JBDirectory.json
diff --git a/deployments/nana-core/arbitrum_sepolia/JBERC20.json b/deployments/nana-core/arbitrum_sepolia/JBERC20.json
diff --git a/deployments/nana-core/arbitrum_sepolia/JBFeelessAddresses.json b/deployments/nana-core/arbitrum_sepolia/JBFeelessAddresses.json
diff --git a/deployments/nana-core/arbitrum_sepolia/JBFundAccessLimits.json b/deployments/nana-core/arbitrum_sepolia/JBFundAccessLimits.json
diff --git a/deployments/nana-core/arbitrum_sepolia/JBMultiTerminal.json b/deployments/nana-core/arbitrum_sepolia/JBMultiTerminal.json
diff --git a/deployments/nana-core/arbitrum_sepolia/JBPermissions.json b/deployments/nana-core/arbitrum_sepolia/JBPermissions.json
diff --git a/deployments/nana-core/arbitrum_sepolia/JBPrices.json b/deployments/nana-core/arbitrum_sepolia/JBPrices.json
diff --git a/deployments/nana-core/arbitrum_sepolia/JBProjects.json b/deployments/nana-core/arbitrum_sepolia/JBProjects.json
diff --git a/deployments/nana-core/arbitrum_sepolia/JBRulesets.json b/deployments/nana-core/arbitrum_sepolia/JBRulesets.json
diff --git a/deployments/nana-core/arbitrum_sepolia/JBSplits.json b/deployments/nana-core/arbitrum_sepolia/JBSplits.json
diff --git a/deployments/nana-core/arbitrum_sepolia/JBTerminalStore.json b/deployments/nana-core/arbitrum_sepolia/JBTerminalStore.json
diff --git a/deployments/nana-core/arbitrum_sepolia/JBTokens.json b/deployments/nana-core/arbitrum_sepolia/JBTokens.json
diff --git a/...m_sepolia/execution/11830f0fb7ad6b482466bf66cc24181095df70d9395bc2c496d5a5bd11e611a7.json b/...m_sepolia/execution/11830f0fb7ad6b482466bf66cc24181095df70d9395bc2c496d5a5bd11e611a7.json
diff --git a/deployments/nana-core/base_sepolia/JBController.json b/deployments/nana-core/base_sepolia/JBController.json
diff --git a/deployments/nana-core/base_sepolia/JBDirectory.json b/deployments/nana-core/base_sepolia/JBDirectory.json
diff --git a/deployments/nana-core/base_sepolia/JBERC20.json b/deployments/nana-core/base_sepolia/JBERC20.json
diff --git a/deployments/nana-core/base_sepolia/JBFeelessAddresses.json b/deployments/nana-core/base_sepolia/JBFeelessAddresses.json
diff --git a/deployments/nana-core/base_sepolia/JBFundAccessLimits.json b/deployments/nana-core/base_sepolia/JBFundAccessLimits.json
diff --git a/deployments/nana-core/base_sepolia/JBMultiTerminal.json b/deployments/nana-core/base_sepolia/JBMultiTerminal.json
diff --git a/deployments/nana-core/base_sepolia/JBPermissions.json b/deployments/nana-core/base_sepolia/JBPermissions.json
diff --git a/deployments/nana-core/base_sepolia/JBPrices.json b/deployments/nana-core/base_sepolia/JBPrices.json
diff --git a/deployments/nana-core/base_sepolia/JBProjects.json b/deployments/nana-core/base_sepolia/JBProjects.json
diff --git a/deployments/nana-core/base_sepolia/JBRulesets.json b/deployments/nana-core/base_sepolia/JBRulesets.json
diff --git a/deployments/nana-core/base_sepolia/JBSplits.json b/deployments/nana-core/base_sepolia/JBSplits.json
diff --git a/deployments/nana-core/base_sepolia/JBTerminalStore.json b/deployments/nana-core/base_sepolia/JBTerminalStore.json
diff --git a/deployments/nana-core/base_sepolia/JBTokens.json b/deployments/nana-core/base_sepolia/JBTokens.json
diff --git a/...e_sepolia/execution/11830f0fb7ad6b482466bf66cc24181095df70d9395bc2c496d5a5bd11e611a7.json b/...e_sepolia/execution/11830f0fb7ad6b482466bf66cc24181095df70d9395bc2c496d5a5bd11e611a7.json
diff --git a/deployments/nana-core/optimism_sepolia/JBController.json b/deployments/nana-core/optimism_sepolia/JBController.json
diff --git a/deployments/nana-core/optimism_sepolia/JBDirectory.json b/deployments/nana-core/optimism_sepolia/JBDirectory.json
diff --git a/deployments/nana-core/optimism_sepolia/JBERC20.json b/deployments/nana-core/optimism_sepolia/JBERC20.json
diff --git a/deployments/nana-core/optimism_sepolia/JBFeelessAddresses.json b/deployments/nana-core/optimism_sepolia/JBFeelessAddresses.json
diff --git a/deployments/nana-core/optimism_sepolia/JBFundAccessLimits.json b/deployments/nana-core/optimism_sepolia/JBFundAccessLimits.json
diff --git a/deployments/nana-core/optimism_sepolia/JBMultiTerminal.json b/deployments/nana-core/optimism_sepolia/JBMultiTerminal.json
diff --git a/deployments/nana-core/optimism_sepolia/JBPermissions.json b/deployments/nana-core/optimism_sepolia/JBPermissions.json
diff --git a/deployments/nana-core/optimism_sepolia/JBPrices.json b/deployments/nana-core/optimism_sepolia/JBPrices.json
diff --git a/deployments/nana-core/optimism_sepolia/JBProjects.json b/deployments/nana-core/optimism_sepolia/JBProjects.json
diff --git a/deployments/nana-core/optimism_sepolia/JBRulesets.json b/deployments/nana-core/optimism_sepolia/JBRulesets.json
diff --git a/deployments/nana-core/optimism_sepolia/JBSplits.json b/deployments/nana-core/optimism_sepolia/JBSplits.json
diff --git a/deployments/nana-core/optimism_sepolia/JBTerminalStore.json b/deployments/nana-core/optimism_sepolia/JBTerminalStore.json
diff --git a/deployments/nana-core/optimism_sepolia/JBTokens.json b/deployments/nana-core/optimism_sepolia/JBTokens.json
diff --git a/...m_sepolia/execution/11830f0fb7ad6b482466bf66cc24181095df70d9395bc2c496d5a5bd11e611a7.json b/...m_sepolia/execution/11830f0fb7ad6b482466bf66cc24181095df70d9395bc2c496d5a5bd11e611a7.json
diff --git a/deployments/nana-core/sepolia/JBController.json b/deployments/nana-core/sepolia/JBController.json
diff --git a/deployments/nana-core/sepolia/JBDirectory.json b/deployments/nana-core/sepolia/JBDirectory.json
diff --git a/deployments/nana-core/sepolia/JBERC20.json b/deployments/nana-core/sepolia/JBERC20.json
diff --git a/deployments/nana-core/sepolia/JBFeelessAddresses.json b/deployments/nana-core/sepolia/JBFeelessAddresses.json
diff --git a/deployments/nana-core/sepolia/JBFundAccessLimits.json b/deployments/nana-core/sepolia/JBFundAccessLimits.json
diff --git a/deployments/nana-core/sepolia/JBMultiTerminal.json b/deployments/nana-core/sepolia/JBMultiTerminal.json
diff --git a/deployments/nana-core/sepolia/JBPermissions.json b/deployments/nana-core/sepolia/JBPermissions.json
diff --git a/deployments/nana-core/sepolia/JBPrices.json b/deployments/nana-core/sepolia/JBPrices.json
diff --git a/deployments/nana-core/sepolia/JBProjects.json b/deployments/nana-core/sepolia/JBProjects.json
diff --git a/deployments/nana-core/sepolia/JBRulesets.json b/deployments/nana-core/sepolia/JBRulesets.json
diff --git a/deployments/nana-core/sepolia/JBSplits.json b/deployments/nana-core/sepolia/JBSplits.json
diff --git a/deployments/nana-core/sepolia/JBTerminalStore.json b/deployments/nana-core/sepolia/JBTerminalStore.json
diff --git a/deployments/nana-core/sepolia/JBTokens.json b/deployments/nana-core/sepolia/JBTokens.json
diff --git a/...e/sepolia/execution/11830f0fb7ad6b482466bf66cc24181095df70d9395bc2c496d5a5bd11e611a7.json b/...e/sepolia/execution/11830f0fb7ad6b482466bf66cc24181095df70d9395bc2c496d5a5bd11e611a7.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
@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/core",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
@@ -35,14 +35,11 @@ contract Deploy is Script, Sphinx {
 
     /// @notice The nonce that gets used across all chains to sync deployment addresses and allow for new deployments of
     /// the same bytecode.
-    uint256 private CORE_DEPLOYMENT_NONCE = 1;
+    uint256 private CORE_DEPLOYMENT_NONCE = 2;
 
     function configureSphinx() public override {
         // TODO: Update to contain JB Emergency Developers
-        sphinxConfig.owners = [0x26416423d530b1931A2a7a6b7D435Fac65eED27d];
-        sphinxConfig.orgId = "cltepuu9u0003j58rjtbd0hvu";
         sphinxConfig.projectName = "nana-core";
-        sphinxConfig.threshold = 1;
         sphinxConfig.mainnets = ["ethereum", "optimism", "base", "arbitrum"];
         sphinxConfig.testnets = ["ethereum_sepolia", "optimism_sepolia", "base_sepolia", "arbitrum_sepolia"];
     }

diff --git a/sphinx.lock b/sphinx.lock
@@ -0,0 +1,115 @@
+{
+  "warning": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
+  "format": "sphinx-lock-1.0.0",
+  "orgId": "cltepuu9u0003j58rjtbd0hvu",
+  "projects": {
+    "nana-core": {
+      "projectId": "cltexoiyd000210jy2dvlnw8u",
+      "projectName": "nana-core",
+      "defaultSafe": {
+        "safeName": "nana-core",
+        "owners": [
+          "0x26416423d530b1931A2a7a6b7D435Fac65eED27d"
+        ],
+        "threshold": "1",
+        "saltNonce": "0"
+      }
+    },
+    "nana-721-hook": {
+      "projectId": "cltnks5yq0002rh5dtacgqdrf",
+      "projectName": "nana-721-hook",
+      "defaultSafe": {
+        "safeName": "nana-721-hook",
+        "owners": [
+          "0x26416423d530b1931A2a7a6b7D435Fac65eED27d"
+        ],
+        "threshold": "1",
+        "saltNonce": "3"
+      }
+    },
+    "nana-suckers": {
+      "projectId": "cltnl62660002ftj9o6zp6jqc",
+      "projectName": "nana-suckers",
+      "defaultSafe": {
+        "safeName": "nana-suckers",
+        "owners": [
+          "0x26416423d530b1931A2a7a6b7D435Fac65eED27d"
+        ],
+        "threshold": "1",
+        "saltNonce": "2"
+      }
+    },
+    "croptop-core": {
+      "projectId": "cltoutm3y0002vt2jrl7mjy1v",
+      "projectName": "croptop-core",
+      "defaultSafe": {
+        "safeName": "croptop-core",
+        "owners": [
+          "0x26416423d530b1931A2a7a6b7D435Fac65eED27d"
+        ],
+        "threshold": "1",
+        "saltNonce": "4"
+      }
+    },
+    "revnet-core": {
+      "projectId": "cltow4v3o0002ijpouxrnjb9a",
+      "projectName": "revnet-core",
+      "defaultSafe": {
+        "safeName": "revnet-core",
+        "owners": [
+          "0x26416423d530b1931A2a7a6b7D435Fac65eED27d"
+        ],
+        "threshold": "1",
+        "saltNonce": "5"
+      }
+    },
+    "bannyverse-core": {
+      "projectId": "cltq3gw8e000213e7xb1tvmp3",
+      "projectName": "bannyverse-core",
+      "defaultSafe": {
+        "safeName": "bannyverse-core",
+        "owners": [
+          "0x26416423d530b1931A2a7a6b7D435Fac65eED27d"
+        ],
+        "threshold": "1",
+        "saltNonce": "6"
+      }
+    },
+    "nana-buyback-hook": {
+      "projectId": "cltrp2uit0002mzvv2yypiluf",
+      "projectName": "nana-buyback-hook",
+      "defaultSafe": {
+        "safeName": "nana-buyback-hook",
+        "owners": [
+          "0x26416423d530b1931A2a7a6b7D435Fac65eED27d"
+        ],
+        "threshold": "1",
+        "saltNonce": "7"
+      }
+    },
+    "nana-swap-terminal": {
+      "projectId": "cltvxqo0700025ahxz515nn5f",
+      "projectName": "nana-swap-terminal",
+      "defaultSafe": {
+        "safeName": "nana-swap-terminal",
+        "owners": [
+          "0x26416423d530b1931A2a7a6b7D435Fac65eED27d"
+        ],
+        "threshold": "1",
+        "saltNonce": "8"
+      }
+    },
+    "nana-fee-project": {
+      "projectId": "cltyoxabi00022yhhi361lau6",
+      "projectName": "nana-fee-project",
+      "defaultSafe": {
+        "safeName": "nana-fee-project",
+        "owners": [
+          "0x26416423d530b1931A2a7a6b7D435Fac65eED27d"
+        ],
+        "threshold": "1",
+        "saltNonce": "10"
+      }
+    }
+  }
+}
+4 −1		.circleci/config.yml
+9 −24		.github/workflows/docker-image.yml
+7 −1		README.md
+57 −0		docs/breaking/registration.md
+32 −30		docs/cli-existing-project.md
+10 −13		docs/cli-quickstart.md
+8 −107		ops/ci-builder/Dockerfile
+0 −8		ops/ci-builder/check-changed.sh
+1 −1		package.json
+45 −0		packages/contracts/CHANGELOG.md
+8 −9		packages/contracts/contracts/foundry/Sphinx.sol
+61 −7		packages/contracts/contracts/foundry/SphinxConstants.sol
+34 −3		packages/contracts/contracts/foundry/SphinxPluginTypes.sol
+93 −99		packages/contracts/contracts/foundry/SphinxUtils.sol
+2 −2		packages/contracts/package.json
+30 −0		packages/contracts/sphinx.lock
+147 −0		packages/contracts/src/addresses.ts
+334 −14		packages/contracts/src/networks.ts
+0 −22		packages/contracts/src/utils.ts
+1 −1		packages/contracts/src/version.ts
+1 −1		packages/contracts/test/ManagedService.t.sol
+9 −15		packages/contracts/test/ScriptConfiguration.t.sol
+7 −13		packages/contracts/test/Sphinx.t.sol
+8 −7		packages/contracts/test/SphinxTestUtils.sol
+5 −51		packages/contracts/test/SphinxUtils.t.sol
+0 −21		packages/contracts/test/issues/CHU572.s.sol
+1 −4		packages/contracts/test/issues/CHU663.s.sol
+0 −23		packages/contracts/test/issues/CHU663/CHU663.s.sol
+38 −0		packages/contracts/test/mocha/address.spec.ts
+0 −35		packages/contracts/test/mocha/utils.spec.ts
+62 −0		packages/core/CHANGELOG.md
+3 −3		packages/core/package.json
+8 −3		packages/core/src/actions/execute.ts
+3 −8		packages/core/src/actions/types.ts
+6 −7		packages/core/src/artifacts.ts
+8 −5		packages/core/src/config/types.ts
+2 −1		packages/core/src/languages/solidity/types.ts
+25 −0		packages/core/src/networks.ts
+18 −0		packages/core/src/types.ts
+52 −64		packages/core/src/utils.ts
+17 −7		packages/core/test/convert.spec.ts
+13 −0		packages/demo/CHANGELOG.md
+5 −5		packages/demo/package.json
+18 −0		packages/demo/sphinx.lock
+2 −2		packages/demo/test/Solc.spec.ts
+22 −16		packages/demo/test/init.spec.ts
+83 −0		packages/plugins/CHANGELOG.md
+1 −5		packages/plugins/contracts/test/script/Cases.s.sol
+0 −4		packages/plugins/contracts/test/script/Empty.s.sol
+1 −5		packages/plugins/contracts/test/script/Large.s.sol
+1 −5		packages/plugins/contracts/test/script/PartiallyEmpty.s.sol
+1 −5		packages/plugins/contracts/test/script/RevertDuringSimulation.s.sol
+3 −15		packages/plugins/contracts/test/script/Simple.s.sol
+1 −4		packages/plugins/contracts/test/script/issues/CHU676.s.sol
+4 −0		packages/plugins/foundry.toml
+6 −5		packages/plugins/package.json
+3 −7		packages/plugins/script/Sample.s.sol
+12 −0		packages/plugins/script/write-version.ts
+18 −0		packages/plugins/sphinx.lock
+10 −6		packages/plugins/src/cli/propose/index.ts
+30 −5		packages/plugins/src/cli/setup.ts
+1 −0		packages/plugins/src/cli/version.ts
+1 −4		packages/plugins/src/foundry/decode.ts
+35 −30		packages/plugins/src/foundry/utils/index.ts
+6 −8		packages/plugins/src/sample-project/index.ts
+4 −11		packages/plugins/src/sample-project/sample-contracts.ts
+2 −1		packages/plugins/src/sample-project/sample-foundry-config.ts
+5 −2		packages/plugins/test/mocha/artifacts.spec.ts
+2 −2		packages/plugins/test/mocha/cli/deploy.spec.ts
+7 −11		packages/plugins/test/mocha/cli/propose.spec.ts
+2 −133		packages/plugins/test/mocha/common.ts
+32 −1		packages/plugins/test/mocha/foundry/utils.spec.ts
+4 −2		packages/plugins/test/mocha/simulate.spec.ts