Merge develop 1.1.0 into main #529
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…x failing tests due to protocol config change in boson
…ary code and adding natspec
* Update ci.yaml * tidy
Bumps the dev-dependencies group with 1 update: [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint). Updates `typescript-eslint` from 8.13.0 to 8.14.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.14.0/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-dependencies ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#319) Bumps the npm_and_yarn group with 1 update: [@eslint/plugin-kit](https://github.com/eslint/rewrite). Updates `@eslint/plugin-kit` from 0.2.0 to 0.2.3 - [Release notes](https://github.com/eslint/rewrite/releases) - [Changelog](https://github.com/eslint/rewrite/blob/main/release-please-config.json) - [Commits](eslint/rewrite@core-v0.2.0...plugin-kit-v0.2.3) --- updated-dependencies: - dependency-name: "@eslint/plugin-kit" dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps the npm_and_yarn group with 1 update: [cross-spawn](https://github.com/moxystudio/node-cross-spawn). Updates `cross-spawn` from 7.0.3 to 7.0.5 - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](moxystudio/node-cross-spawn@v7.0.3...v7.0.5) --- updated-dependencies: - dependency-name: cross-spawn dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps the dev-dependencies group with 4 updates in the / directory: [@nomicfoundation/hardhat-verify](https://github.com/nomicfoundation/hardhat), [eslint](https://github.com/eslint/eslint), [hardhat](https://github.com/nomiclabs/hardhat) and [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint). Updates `@nomicfoundation/hardhat-verify` from 2.0.11 to 2.0.12 - [Release notes](https://github.com/nomicfoundation/hardhat/releases) - [Commits](https://github.com/nomicfoundation/hardhat/compare/@nomicfoundation/hardhat-verify@2.0.11...@nomicfoundation/hardhat-verify@2.0.12) Updates `eslint` from 9.14.0 to 9.15.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](eslint/eslint@v9.14.0...v9.15.0) Updates `hardhat` from 2.22.15 to 2.22.16 - [Release notes](https://github.com/nomiclabs/hardhat/releases) - [Commits](https://github.com/nomiclabs/hardhat/compare/hardhat@2.22.15...hardhat@2.22.16) Updates `typescript-eslint` from 8.14.0 to 8.15.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.15.0/packages/typescript-eslint) --- updated-dependencies: - dependency-name: "@nomicfoundation/hardhat-verify" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-dependencies - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-dependencies - dependency-name: hardhat dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-dependencies - dependency-name: typescript-eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-dependencies ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Klemen <64400885+zajck@users.noreply.github.com>
Co-authored-by: Klemen <64400885+zajck@users.noreply.github.com>
feat: backfilling faucet and offchain backfilling of data
* feat: upgrade script, fork simulation * chore: add instructions for upgrade and fork tests in README * chore: working version of generate and upgrade suite (only missing upgrade-clients) * fix: fork test and implement default replaceAll colliding selectors in fork tests * refactor: CreatorToken interface rename * revert: CreatorToken name back to original naming * chore: add generation of clients diff in generate-upgrade-config * refactor: finalize implementation of both scripts and refactor README * fix: fork dryRun initialization * refactor: add pause/unpause protocol and fix upgrade hook path * refactor: throw error if hook fails * refactor: address PR comments * Update scripts/upgrade/upgrade-clients.ts Co-authored-by: Klemen <64400885+zajck@users.noreply.github.com> * fix: deploymentComplete function overwrites newly deployed contracts if they exist * refactor: address PR comments * Update scripts/upgrade/upgrade-clients.ts Co-authored-by: Klemen <64400885+zajck@users.noreply.github.com> * chore: add missing config files * fix: re-add accidentally deleted tasks from hardhat config * Sepolia v1.1.0 upgrade * Amoy v1.1.0-rc.1 upgrade * Base Sepolia v1.1.0-rc.1 upgrade * fix: re-upgrade clients on Sepolia test * Optimism Sepolia v1.1.0-rc.1 upgrade * Arbitrum Sepolia v1.1.0-rc.1 upgrade * refactor: fixing minor script bugs and add some missing pieces for some chains * [FBA-01M, FBA-02M] Native bid claims and reentrancy guard (#455) * feat: add native claims for outbidding rather than direct native transfer * chore: add tests for native claims * chore: add reentrancy guard to bid function * fix: address PR comments * chore: add max tax amount to clearCheckoutRequest (#460) * EYT-01M: Inexistent Requirement of Successful Operation (#461) * feat: revert on no op tx when no entity has been removed * refactor: address PR comments * chore: remove all privileges of old admin role (#462) * feat: add new proposalId param in voteOnProposal (#463) * Fix failing unit tests * Fix failing coverage test * refactor: remove break in for loops (#479) * [CNO-01C] Redundant Import of Logic Implementation (#513) * Introduce IFermionFractionsERC20 interface * tidy * tidy * [ORE-05M] Potential Loss of Native Funds (#512) * Prevent native funds when seller deposit is 0 * Cover also native self-sale unwrap * Update test/protocol/offerFacet.ts Co-authored-by: 0xlucian <96285542+0xlucian@users.noreply.github.com> * Update test/protocol/offerFacet.ts Co-authored-by: 0xlucian <96285542+0xlucian@users.noreply.github.com> * Prevent native funds when erc20 offer and sellerDeposit covered from the available funds * Update test/protocol/offerFacet.ts Co-authored-by: 0xlucian <96285542+0xlucian@users.noreply.github.com> --------- Co-authored-by: 0xlucian <96285542+0xlucian@users.noreply.github.com> * Audit fixes batch 1.1.0 (#485) * chore: cvt-01m auction state end change condition * chore: cyd-02m fix custodian payoff precise return amount revert edge case * chore: ore-01m remove commented out code * chore: cyd-01m using _msgSender() in addItemToCustodianOffer external call * chore: cgi-01m impose paused region restriction on setProtocolFeeTable * chore: eip-01m remove revert in case of failed call to signer * chore: eip-02m use block.chainid instead of cached chainId * chore: fmr-02m manual static call and validation of returnData * chore: fwr-01s address 0 check * chore ctn-01s split interface from contract file * refactor: fix PR comments * chore: rgd-02c * chore: ore-03c redundant zero address check * chore: ore-02c remove redundant assignment * chore: eyt-03c * chore: cvt-02c * refactor: add test for checkTrustedForwarder response handling * refactor: small fixes * refactor: add a happy path for safeTrasferFrom if trustedForwarder return strange data * fix: failing test * chore: increase code coverage * set MAX_SKIPPED to 0 and tidy * Allow multiple price update proposals (#514) * feat: initial implementation * refactor: adjust tests * chore: ffe-01m adjust votes on burn as well * refactor: increase coverage and some small code fixes * refactor: address PR comments * refactor: small fixes * chore: add epoch to all FermionFractions events * Small refactor + tidy * Fix failing unit tests --------- Co-authored-by: zajck <klemen@impressieve.com> * Code Style Batch fixes 2 (#506) * chore: cyd-01c add unchecked when necessary * chore: cvt-01c incorect revert natspec * chore: eyt-02c add unchecked block safe arithmetic * chore: eyt-04c relocate modifiers to internal function * chore: flb-01c add safe arithmetich in unchecked block * chore: fft-01c change emptyslot type to unit256 * chore: ffp-01c add unchecked block to safe arithmetic op * chore: ffm-01c optimise migrateFractions function * chore: fsd-01c remove explicit contract invocation * chore: fmr-02c move safe arithmetics into unchecked block * fix: ffm-01c optimise migrateFractions function * refactor: address PR comments * FIxed unchecked brackets * Code style fixes batch 1 (#505) * Fix [ASS-01C] #480 * FIx [CPO-01C] #481 * FIx [CST-01C] #483 * Fix [CTX-01C] #484 * Fix [EYT-01C] #488 * Fix [FFP-02C] #494 * Fix [FMR-01C] #497 * Fix [MTN-01C] #499 * Fix [ORE-01C] #500 * Fix [FFP-02C] #494 * Fix [RGD-01C] #503 * Fix [ORE-02M] Insecure Unchecked Code Block #510 --------- Co-authored-by: Klemen <64400885+zajck@users.noreply.github.com> Co-authored-by: zajck <klemen@impressieve.com>
* feat: upgrade script, fork simulation * chore: working version of generate and upgrade suite (only missing upgrade-clients) * fix: fork test and implement default replaceAll colliding selectors in fork tests * refactor: CreatorToken interface rename * revert: CreatorToken name back to original naming * chore: add generation of clients diff in generate-upgrade-config * refactor: finalize implementation of both scripts and refactor README * chore: add missing config files * refactor: fixing minor script bugs and add some missing pieces for some chains * feat: add new proposalId param in voteOnProposal (#463) * Audit fixes batch 1.1.0 (#485) * chore: cvt-01m auction state end change condition * chore: cyd-02m fix custodian payoff precise return amount revert edge case * chore: ore-01m remove commented out code * chore: cyd-01m using _msgSender() in addItemToCustodianOffer external call * chore: cgi-01m impose paused region restriction on setProtocolFeeTable * chore: eip-01m remove revert in case of failed call to signer * chore: eip-02m use block.chainid instead of cached chainId * chore: fmr-02m manual static call and validation of returnData * chore: fwr-01s address 0 check * chore ctn-01s split interface from contract file * refactor: fix PR comments * chore: rgd-02c * chore: ore-03c redundant zero address check * chore: ore-02c remove redundant assignment * chore: eyt-03c * chore: cvt-02c * refactor: add test for checkTrustedForwarder response handling * refactor: small fixes * refactor: add a happy path for safeTrasferFrom if trustedForwarder return strange data * fix: failing test * chore: increase code coverage * fix: upgrade-facets script to allow/disable metatx sig hashes * refactor: cleanup and fix logic * fix: failing tests due to wrong rebase on some files * fix: do not allowlist restricted functions and do not allowlist already allowlisted functions * chore: address PR comments --------- Co-authored-by: Klemen <64400885+zajck@users.noreply.github.com>
* feat: upgrade script, fork simulation * chore: working version of generate and upgrade suite (only missing upgrade-clients) * fix: fork test and implement default replaceAll colliding selectors in fork tests * refactor: CreatorToken interface rename * revert: CreatorToken name back to original naming * chore: add generation of clients diff in generate-upgrade-config * refactor: finalize implementation of both scripts and refactor README * chore: add missing config files * refactor: fixing minor script bugs and add some missing pieces for some chains * feat: add new proposalId param in voteOnProposal (#463) * Audit fixes batch 1.1.0 (#485) * chore: cvt-01m auction state end change condition * chore: cyd-02m fix custodian payoff precise return amount revert edge case * chore: ore-01m remove commented out code * chore: cyd-01m using _msgSender() in addItemToCustodianOffer external call * chore: cgi-01m impose paused region restriction on setProtocolFeeTable * chore: eip-01m remove revert in case of failed call to signer * chore: eip-02m use block.chainid instead of cached chainId * chore: fmr-02m manual static call and validation of returnData * chore: fwr-01s address 0 check * chore ctn-01s split interface from contract file * refactor: fix PR comments * chore: rgd-02c * chore: ore-03c redundant zero address check * chore: ore-02c remove redundant assignment * chore: eyt-03c * chore: cvt-02c * refactor: add test for checkTrustedForwarder response handling * refactor: small fixes * refactor: add a happy path for safeTrasferFrom if trustedForwarder return strange data * fix: failing test * chore: increase code coverage * fix: upgrade-facets script to allow/disable metatx sig hashes * refactor: cleanup and fix logic * fix: failing tests due to wrong rebase on some files * fix: do not allowlist restricted functions and do not allowlist already allowlisted functions * chore: script implementation and README instructions
* Improve EIP-7702 support in EIP712 verification. * Add a comment
* chore: generate 1.1.0-rc.4 upgrade config * Sepolia v1.1.0-rc.4 upgrade * Amoy v1.1.0-rc.4 upgrade * Base Sepolia v1.1.0-rc.4 upgrade * Optimism Sepolia v1.1.0-rc.4 upgrade * Arbitrum Sepolia v1.1.0-rc.4 upgrade
* chore: generate upgrade config * chore: add pre and post upgrade hooks * Sepolia v1.1.0 staging upgrade * Base Sepolia v1.1.0 staging upgrade * Optimism Sepolia v1.1.0 staging upgrade * chore: add arb sepolia subgraph URL * Arbitrum Sepolia v1.1.0 staging upgrade * Amoy v1.1.0 staging upgrade * refactor: update subgraph config * Add arbitrum prod addresses * chore: add arbitrum prod subgraph * Polygon v1.1.0 upgrade * Ethereum v1.1.0 upgrade * chore: add fermion config * Base v1.1.0 upgrade * Arbitrum v1.1.0 upgrade * Add optimism v1 addresses * Optimism v1.1.0 upgrade * chore: upgrade package version * etherscan v2 api verification --------- Co-authored-by: zajck <klemen@impressieve.com>
* merge main into prepare-v1.1.0-for-main-merge * Remove FNFT metadata setters * update yarn.lock
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
There was a problem hiding this comment.
Slither found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.
0xlucian
approved these changes
Jun 5, 2025
albertfolch-redeemeum
approved these changes
Jun 5, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.