Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #46

Merged
merged 1 commit into from
Jan 9, 2025
Merged

fix #46

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/sphinx
Submodule sphinx updated 90 files
+4 −5 .github/workflows/docker-image.yml
+19 −11 README.md
+0 −57 docs/breaking/registration.md
+31 −38 docs/cli-existing-project.md
+15 −19 docs/cli-quickstart.md
+1 −1 package.json
+0 −19 packages/contracts/CHANGELOG.md
+0 −1 packages/contracts/contract-artifacts/sphinx/PermissionlessRelay.sol/PermissionlessRelay.json
+0 −764,220 packages/contracts/contract-artifacts/sphinx/permissionless-relay-build-info.json
+0 −61 packages/contracts/contracts/core/PermissionlessRelay.sol
+11 −10 packages/contracts/contracts/foundry/Sphinx.sol
+4 −58 packages/contracts/contracts/foundry/SphinxConstants.sol
+3 −34 packages/contracts/contracts/foundry/SphinxPluginTypes.sol
+89 −83 packages/contracts/contracts/foundry/SphinxUtils.sol
+6 −1 packages/contracts/package.json
+3 −3 packages/contracts/scripts/write-constants.ts
+0 −30 packages/contracts/sphinx.lock
+14 −151 packages/contracts/src/addresses.ts
+15 −7 packages/contracts/src/contract-info.ts
+3 −4 packages/contracts/src/ifaces.ts
+2 −196 packages/contracts/src/networks.ts
+22 −0 packages/contracts/src/utils.ts
+1 −1 packages/contracts/src/version.ts
+1 −1 packages/contracts/test/ManagedService.t.sol
+15 −9 packages/contracts/test/ScriptConfiguration.t.sol
+13 −7 packages/contracts/test/Sphinx.t.sol
+4 −3 packages/contracts/test/SphinxInitCode.sol
+7 −8 packages/contracts/test/SphinxTestUtils.sol
+4 −5 packages/contracts/test/SphinxUtils.t.sol
+21 −0 packages/contracts/test/issues/CHU572.s.sol
+4 −1 packages/contracts/test/issues/CHU663.s.sol
+23 −0 packages/contracts/test/issues/CHU663/CHU663.s.sol
+0 −38 packages/contracts/test/mocha/address.spec.ts
+35 −0 packages/contracts/test/mocha/utils.spec.ts
+0 −44 packages/core/CHANGELOG.md
+7 −0 packages/core/config/local.ts
+14 −0 packages/core/config/standard.ts
+44 −67 packages/core/hardhat.config.ts
+2 −2 packages/core/package.json
+16 −12 packages/core/src/actions/execute.ts
+8 −3 packages/core/src/actions/types.ts
+4 −2 packages/core/src/artifacts.ts
+4 −7 packages/core/src/config/types.ts
+4 −0 packages/core/src/constants.ts
+1 −11 packages/core/src/etherscan.ts
+174 −2 packages/core/src/languages/solidity/predeploys.ts
+1 −2 packages/core/src/languages/solidity/types.ts
+0 −18 packages/core/src/types.ts
+95 −54 packages/core/src/utils.ts
+6 −16 packages/core/test/convert.spec.ts
+0 −22 packages/demo/CHANGELOG.md
+4 −4 packages/demo/package.json
+0 −18 packages/demo/sphinx.lock
+2 −2 packages/demo/test/Solc.spec.ts
+16 −22 packages/demo/test/init.spec.ts
+0 −53 packages/plugins/CHANGELOG.md
+5 −1 packages/plugins/contracts/test/script/Cases.s.sol
+4 −0 packages/plugins/contracts/test/script/Empty.s.sol
+5 −1 packages/plugins/contracts/test/script/Large.s.sol
+5 −1 packages/plugins/contracts/test/script/PartiallyEmpty.s.sol
+5 −1 packages/plugins/contracts/test/script/RevertDuringSimulation.s.sol
+15 −3 packages/plugins/contracts/test/script/Simple.s.sol
+4 −1 packages/plugins/contracts/test/script/issues/CHU676.s.sol
+0 −4 packages/plugins/foundry.toml
+6 −6 packages/plugins/package.json
+7 −3 packages/plugins/script/Sample.s.sol
+0 −12 packages/plugins/script/write-version.ts
+0 −18 packages/plugins/sphinx.lock
+4 −0 packages/plugins/src/cli/context.ts
+3 −0 packages/plugins/src/cli/deploy.ts
+20 −11 packages/plugins/src/cli/propose/index.ts
+5 −30 packages/plugins/src/cli/setup.ts
+8 −0 packages/plugins/src/cli/types.ts
+0 −1 packages/plugins/src/cli/version.ts
+4 −1 packages/plugins/src/foundry/decode.ts
+145 −37 packages/plugins/src/foundry/utils/index.ts
+48 −0 packages/plugins/src/hardhat.config.js
+71 −0 packages/plugins/src/hardhat/hardhatRunner.ts
+618 −0 packages/plugins/src/hardhat/simulate.ts
+1 −0 packages/plugins/src/index.ts
+8 −6 packages/plugins/src/sample-project/index.ts
+11 −4 packages/plugins/src/sample-project/sample-contracts.ts
+1 −2 packages/plugins/src/sample-project/sample-foundry-config.ts
+2 −5 packages/plugins/test/mocha/artifacts.spec.ts
+52 −2 packages/plugins/test/mocha/cli/deploy.spec.ts
+335 −12 packages/plugins/test/mocha/cli/propose.spec.ts
+135 −4 packages/plugins/test/mocha/common.ts
+151 −41 packages/plugins/test/mocha/foundry/utils.spec.ts
+11 −0 packages/plugins/test/mocha/mock.ts
+437 −0 packages/plugins/test/mocha/simulate.spec.ts
4 changes: 2 additions & 2 deletions src/JB721TiersHookStore.sol
Original file line number Diff line number Diff line change
Expand Up @@ -1132,7 +1132,7 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
}
}

/// @notice Pack three bools into a single uint8.
/// @notice Pack five bools into a single uint8.
/// @param allowOwnerMint Whether or not owner minting is allowed in new tiers.
/// @param transfersPausable Whether or not 721 transfers can be paused.
/// @param useVotingUnits Whether or not custom voting unit amounts are allowed in new tiers.
Expand All @@ -1159,7 +1159,7 @@ contract JB721TiersHookStore is IJB721TiersHookStore {
}
}

/// @notice Unpack three bools from a single uint8.
/// @notice Unpack five bools from a single uint8.
/// @param packed The packed bools.
/// @param allowOwnerMint Whether or not owner minting is allowed in new tiers.
/// @param transfersPausable Whether or not 721 transfers can be paused.
Expand Down
Loading