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

Merge dev into main #426

Closed
wants to merge 55 commits into from
Closed

Merge dev into main #426

wants to merge 55 commits into from

Commits on Jun 14, 2024

  1. Prepare for v4 work (#346)

    * update hardhat
    
    * remove symlinks by using hardhat-foundry
    
    use hardhat-foundry package to use foundry remappings to compile. Symlinks are no longer necessary
    After upgrade HH412 error was thrown caused by the existing symlinks
    ref:
    https://hardhat.org/hardhat-runner/docs/errors#HH412
    NomicFoundation/hardhat#3623
    
    * update compiler version to ^0.8.24 supporting the cancun upgrades
    
    * fix ci
    
    * fix lock file
    
    * Update yarn.lock
    
    * regenerate gas snapshots
    
    * install foundry in ci
    
    * Use mainnet permit2 (#347)
    
    * solc upgrade to 0.8.26
    
    * use mainnet permit2 work started
    
    * fix uniswap tests
    
    * Remove block from resetFork
    
    * Refactor to fetch fee tiers
    
    * remove NFT protocols for V4 router (#348)
    
    * first pass
    
    * fix forge builds
    
    * fix reentrancy test
    
    * Add check to receive
    
    * remove .only rip
    
    * add todo for tests that need wrtiting
    
    * update readme and planner
    
    ---------
    
    Co-authored-by: Alice <[email protected]>
    Co-authored-by: Alice Henshaw <[email protected]>
    3 people authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    6cf84c8 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. V3 liquidity commands (#355)

    * import with dif version of OZ
    
    * fix remapping issue
    
    * duplicate exports and v3 version error
    
    * remove else statement and fix format
    
    * fix duplicate IERC165 in typechain
    
    * permit, decrease, collect, burn commands
    
    * all v3 commands separately
    
    * add structs
    
    * remove mint and increaseLiquidity on v3
    
    * test change
    
    * fix yarn.lock
    
    * pass foundry tests for now
    
    * nit - change name
    
    * spelling error
    
    * v3pm address not needed
    
    * some gas tests
    
    * check msg.sender
    
    * format
    
    * transient storage
    
    * unauthorized tests
    
    * transient storage
    
    * v3 multicall with tests
    
    * v3 call + transient storage
    
    * no decode
    
    * clean up tests
    
    * some changes
    
    * comment changes
    
    * suggestion fixes
    
    * regenerate yarn.lock file
    
    * revert yarn.lock
    
    * some changes
    
    * separate migration tests
    
    * bignumber to fix test
    
    * fix remappings for forge compile
    
    * remove command placeholder
    
    * remove transient storage
    
    * format
    
    * use v3 periphery 0.8 instead
    
    * fix gas snapshots
    
    * v3 position manager addresses
    
    * name change
    
    * remove v4 in this pr
    
    * remove unnecessary stuff
    
    * change test names
    
    * fix erc721 permit
    
    * more tests
    
    * name changes, comments, test
    
    ---------
    
    Co-authored-by: gretzke <[email protected]>
    dianakocsis and gretzke authored Jul 23, 2024
    Configuration menu
    Copy the full SHA
    d573cb7 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Reentrancy guard transient (#354)

    * Make reentrancy guard transient
    
    * locker tests
    
    * abstract the locker library away
    
    * Updated locker tests
    
    * move map, and fix CI
    
    * Update lint.yml
    
    * update comment
    hensha256 authored Jul 24, 2024
    Configuration menu
    Copy the full SHA
    8757822 View commit details
    Browse the repository at this point in the history
  2. V4 liquidity commands (#359)

    * v4 periphery git submodule
    
    * deploy v4
    
    * prettier
    
    * point v4 periphery to main
    
    * use solmate/src and deploy v4
    
    * format
    
    * update v4-periphery and future proof deployRouter
    
    * prettier
    dianakocsis authored Jul 24, 2024
    Configuration menu
    Copy the full SHA
    cc0e7c0 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. update v4-periphery, change remapping, and update deploy test (#361)

    * update v4-periphery, change remapping, and update deploy test
    
    * make immutables public
    
    * little fixes
    
    * last one
    
    * make only migrator immutables public
    dianakocsis authored Jul 29, 2024
    Configuration menu
    Copy the full SHA
    6c91122 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. Configuration menu
    Copy the full SHA
    43f1443 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. Configuration menu
    Copy the full SHA
    12132d5 View commit details
    Browse the repository at this point in the history
  2. update v4 periphery to main and update deployRouter (#367)

    * update v4 periphery to main and update deployRouter
    
    * point to updated v4 posm
    dianakocsis authored Aug 1, 2024
    Configuration menu
    Copy the full SHA
    49848f9 View commit details
    Browse the repository at this point in the history
  3. v4 planner (#368)

    * v4 planner
    
    * some renaming
    hensha256 authored Aug 1, 2024
    Configuration menu
    Copy the full SHA
    bc3d8dd View commit details
    Browse the repository at this point in the history
  4. separate uniswap tests (#369)

    * separate uniswap tests
    
    * Move permit2 tests
    hensha256 authored Aug 1, 2024
    Configuration menu
    Copy the full SHA
    297efe5 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. final decode in calldata (#363)

    * batch permit decode in calldata
    
    * array of structs
    
    * PR comment
    hensha256 authored Aug 2, 2024
    Configuration menu
    Copy the full SHA
    b143c03 View commit details
    Browse the repository at this point in the history
  2. V4 posm call (#364)

    * v4 mint so far
    
    * solmate remapping
    
    * v4 mint and increase tests
    
    * prettier
    
    * update v4 periphery to main
    
    * some gas tests
    
    * remove selector check in v4 posm call
    
    * organize some tests
    
    * more tests
    
    * prettier
    
    * more tests
    
    * update gas
    
    * remove unnecessary import
    
    * remove unnecessary encodings
    dianakocsis authored Aug 2, 2024
    Configuration menu
    Copy the full SHA
    15c26c2 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2024

  1. Add v4 routing (#360)

    * complete setup, everything working
    
    * v4 command plus planner
    
    * use main v4 branch
    
    * update periphery, handle changes
    
    * linting
    
    * V4 test setup
    
    * working pool setup
    
    * cleanup of imports
    
    * 2 working v4 swap tests
    
    * exact out swaps
    
    * 2 hop swap tests
    
    * update periphery
    hensha256 authored Aug 3, 2024
    Configuration menu
    Copy the full SHA
    1b67109 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2024

  1. Update posm with tests (#370)

    * update tests to correspond with posm
    
    * match deploy universal router with alices
    
    * update oz for ierc721permit problem
    
    * switch back to OZ 4.7.0
    
    * use OZ 5.0.2 to match v4
    
    * remove internal _msgSender()
    
    * pr comments
    
    * add license
    dianakocsis authored Aug 4, 2024
    Configuration menu
    Copy the full SHA
    b46ca05 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    972579a View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. Configuration menu
    Copy the full SHA
    4ce107d View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. V4 Native Tests (#373)

    * ETH input v4 tests
    
    * eth output v4 tests
    
    * PR comments
    hensha256 authored Aug 21, 2024
    Configuration menu
    Copy the full SHA
    00d4824 View commit details
    Browse the repository at this point in the history
  2. Add v4 to receive (#376)

    * add v4 to receive function
    
    * linting
    
    * PR comments
    
    * fix and snapshots
    hensha256 authored Aug 21, 2024
    Configuration menu
    Copy the full SHA
    5486943 View commit details
    Browse the repository at this point in the history
  3. Take portion tests (#377)

    * take portion test
    
    * take portion test native
    
    * correct comment
    
    * take portion on input test
    
    * remove console logs oops
    hensha256 authored Aug 21, 2024
    Configuration menu
    Copy the full SHA
    1180951 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Oz L-09 (#382)

    * OZ L-09
    
    * Remove .vscode/settings.json from the repository
    dianakocsis authored Aug 30, 2024
    Configuration menu
    Copy the full SHA
    a888522 View commit details
    Browse the repository at this point in the history
  2. update periphery to main (#380)

    * update periphery to main
    
    * update periphery after it updated main
    
    * update again
    
    * update again
    dianakocsis authored Aug 30, 2024
    Configuration menu
    Copy the full SHA
    cfacb1d View commit details
    Browse the repository at this point in the history
  3. add different tests for increasing and add tests for forwarding eth (#…

    …379)
    
    * add different tests for increasing and add tests for forwarding eth
    
    * fix gas snapshot
    
    * add more comments
    
    * fix gas snapshots
    
    * fix gas again
    
    * add comments on unpermit tests
    dianakocsis authored Aug 30, 2024
    Configuration menu
    Copy the full SHA
    d1e3741 View commit details
    Browse the repository at this point in the history
  4. OZ N-06 (#383)

    dianakocsis authored Aug 30, 2024
    Configuration menu
    Copy the full SHA
    05906be View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. OZ N-16 (#388)

    dianakocsis authored Sep 2, 2024
    Configuration menu
    Copy the full SHA
    a85d5c0 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. ABDK CVF-107 (#385)

    dianakocsis authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    473ba4f View commit details
    Browse the repository at this point in the history
  2. spearbit 94 (#389)

    dianakocsis authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    59a002d View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. ABDK CVF106 (#387)

    * ABDK CVF106
    
    * fix comment
    dianakocsis authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    a76242a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fe4c8a3 View commit details
    Browse the repository at this point in the history
  3. Spearbit 59 (#391)

    dianakocsis authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    f414f1b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    912b9b0 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. OZ N-11 (#393)

    dianakocsis authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    6322395 View commit details
    Browse the repository at this point in the history
  2. update periphery (#394)

    * update periphery
    
    * remove position config
    
    * lint
    hensha256 authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    2c728fd View commit details
    Browse the repository at this point in the history
  3. Audit reports (#395)

    hensha256 authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    2493262 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. Periphery update - calldata decoder (#396)

    * Periphery update - calldata decoder
    
    * rename function and snapshots
    
    * actually use the function
    hensha256 authored Sep 6, 2024
    Configuration menu
    Copy the full SHA
    a81e1ce View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Configuration menu
    Copy the full SHA
    398d7c4 View commit details
    Browse the repository at this point in the history
  2. Chore/push button deploy (#400)

    * Update .gitmodules (#337)
    
    There is no need to use an account for GitHub.
    
    * chore(infra): set up deploy
    
    ---------
    
    Co-authored-by: Jonney <[email protected]>
    mr-uniswap and Jonney authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    ef3dede View commit details
    Browse the repository at this point in the history
  3. chore: fix yarn publish (#401)

    * chore: fix yarn publish
    
    * Update deploy.yml
    
    * Update deploy.yml
    mr-uniswap authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    cbff29f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5b13e16 View commit details
    Browse the repository at this point in the history
  5. Update deploy.yml

    mr-uniswap authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    0590a2f View commit details
    Browse the repository at this point in the history
  6. Update deploy.yml

    mr-uniswap authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    20dc7dc View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Update package.json

    mr-uniswap authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    7f0cc5c View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. compile contracts in workflow

    ewilz committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    4552b93 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. 2.0.0-beta.1 (#407)

    ewilz authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    d569f63 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9451282 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    adb863a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5e9f4c9 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Update v4 initialize (#415)

    * update periphery
    
    * update initialize ABI
    
    * temporary position descriptor constructor arg
    
    * lint
    
    * updated snap
    saucepoint authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    1889511 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. restrict increase, decrease, and burn and v4 initialize pool call (#416)

    * restrict increase, decrease, and burn
    
    * prettier
    
    * initialize v4 pool call
    
    * prettier
    
    * refactor logic into function, plus optimise decode
    
    * merge latest periphery
    
    * move v3 logic outside of dispatcher
    
    * initialize pool tests
    
    * sbapshot
    
    * larger refactor
    
    * pull v4 periphery and revert payments
    
    * make checkV4InitializeCall like the others
    
    * Call initialize directly
    
    * undo v3 refactor
    
    * imports
    
    * remove unused typescript type
    
    * remove unnecessary extra immutable
    
    * Bump beta version
    
    * Improve coments
    
    * Add pool intiialization to some tests
    
    ---------
    
    Co-authored-by: Alice Henshaw <[email protected]>
    dianakocsis and hensha256 authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    5db48b1 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. deploy script for Base Sepolia (#381)

    * Update .gitmodules (#337)
    
    There is no need to use an account for GitHub.
    
    * deploy script for Base Sepolia
    
    * updating some deploys for sepolia L2s
    
    * include vanity/public RPCs for scripts
    
    * Update script/deployParameters/DeployOPSepolia.s.sol
    
    Co-authored-by: Alice <[email protected]>
    
    * Update script/deployParameters/DeployUnichainSepolia.s.sol
    
    Co-authored-by: Alice <[email protected]>
    
    ---------
    
    Co-authored-by: Jonney <[email protected]>
    Co-authored-by: Alice <[email protected]>
    3 people authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    419b9e6 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. Latest v4 periphery (#420)

    * Latest v4 periphery
    
    * why didnt the linter catch this
    hensha256 authored Nov 5, 2024
    Configuration menu
    Copy the full SHA
    c63d611 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2024

  1. v3 refactor and pull latest periphery (#418)

    * v3 refactor and pull latest periphery
    
    * switch to if else
    dianakocsis authored Nov 15, 2024
    Configuration menu
    Copy the full SHA
    1337089 View commit details
    Browse the repository at this point in the history
  2. allow permit2 to silently fail to avoid dos (#417)

    * allow permit2 to silently fail to avoid dos
    
    * fix tests
    dianakocsis authored Nov 15, 2024
    Configuration menu
    Copy the full SHA
    5aefc7e View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2024

  1. update periphery (#424)

    * update periphery not working
    
    * fix ur according to periphery update
    
    * prettier
    
    * fix issue during hardhat tests fixed in version 2.22.14
    
    * change optimizer size
    
    * change optimizer runs for manager only
    
    * update again
    
    * prettier
    
    * update periphery again
    
    * switch runs to 30000
    
    ---------
    
    Co-authored-by: gretzke <[email protected]>
    dianakocsis and gretzke authored Dec 3, 2024
    Configuration menu
    Copy the full SHA
    a029362 View commit details
    Browse the repository at this point in the history
  2. move file (#425)

    dianakocsis authored Dec 3, 2024
    Configuration menu
    Copy the full SHA
    8465e7d View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2024

  1. merge dev into main

    dianakocsis committed Dec 4, 2024
    Configuration menu
    Copy the full SHA
    2c32adc View commit details
    Browse the repository at this point in the history