Skip to content

Merge dev#240

Merged
MirthFutures merged 9 commits intomainfrom
dev
Feb 25, 2026
Merged

Merge dev#240
MirthFutures merged 9 commits intomainfrom
dev

Conversation

@kexleyBeefy
Copy link
Contributor

No description provided.

MirthFutures and others added 9 commits January 2, 2026 13:39
* upgradeable l2 token

* Permit moved to main contract inherit oft

* reorder inits

* deploy script

* update to external

* Add upgradeable lockbox

* Lockbox deployment
* Add coverage caps

* Fix cap to agents instead of collaterals

* Add comments to delegation storage

* Fix collateral to external

* update coverage

* clean

---------

Co-authored-by: MirthFutures <MirthFutures@gmail.com>
* Bump actions/checkout from 5 to 6 (#226)

Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add Swapper

* Add UniswapV3 Oracle adapter

* Rmv minIndex

* Division-by-zero in UniswapV3Adapter.price

* Fix order of slippage

* Add FullMath to prevent overflows

* Division-by-zero in UniswapV3OracleLibrary

* Add dust refund

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump actions/checkout from 5 to 6 (#226)

Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Allow specifying the user address when estimating amount out

* Move user into parameter struct

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: kexley <87971154+kexleyBeefy@users.noreply.github.com>
* Add CCA token

* Add SoulboundERC721Merkle NFT

* Add explicit revert for invalid Merkle proofs

* Fix _baseURI naming overload

* Add ValidationHook

* Add ICCAToken custom natspec

* Add Predicate to ValidationHook

* Fix title natspec

* Match OZ double hash for leaves

* Add CCA & NFT tests

* Add ERC165 support on validation hook

* Swap timestamp for block number

* Add more CCA tests

* Add more validation hook tests

* New merkle tree

* Switch ERC721 for ERC1155 & inherit uniswap interface

* Add IERC1155 to interface

* Update merkle tree

* Fix storage type for array parameters

* Cheaper merkle verify

* Fix ERC721 comments to ERC1155

* Add CCAToken overrides to name and burn

* Add Stabledrop

* Simplify stabledrop funding

* Add Stabledrop tests

* Octane ICO I-1

* Octane ICO I-2

* Octane ICO I-3

* Octane ICO I-4

* Octane ICO I-5

* Add root view on ERC1155

* Add auction deploy script & bump lockfile
* Add Token

* Change supply name
@MirthFutures MirthFutures merged commit 0b67013 into main Feb 25, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants