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.

Sign up for GitHub

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

Jump to bottom

Staging: Develop -> Master #218

Merged
merged 95 commits into from
Jul 11, 2024
Merged

Staging: Develop -> Master #218

merged 95 commits into from
Jul 11, 2024

Commits on Jun 14, 2024

  1. Add official Uniswap V2 and V3 addresses

    @0xJem
    0xJem committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    af2a5bb View commit details
    Browse the repository at this point in the history

  2. Cross-port salt and test script improvements from #155.

    @0xJem
    0xJem committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    da3d2e5 View commit details
    Browse the repository at this point in the history

  3. Update test salts and addresses

    @0xJem
    0xJem committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    82d3753 View commit details
    Browse the repository at this point in the history

  4. Test scripts for Uniswap DTLs

    @0xJem
    0xJem committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    2832008 View commit details
    Browse the repository at this point in the history

  5. Update script paths and arguments

    @0xJem
    0xJem committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    f4dbabb View commit details
    Browse the repository at this point in the history

  6. Improve deployTokens script

    @0xJem
    0xJem committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    3e67699 View commit details
    Browse the repository at this point in the history

  7. Document broadcast flag

    @0xJem
    0xJem committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    94f2053 View commit details
    Browse the repository at this point in the history

  8. Make scripts executable

    @0xJem
    0xJem committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    4a3d9b7 View commit details
    Browse the repository at this point in the history

  9. Document broadcast flag

    @0xJem
    0xJem committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    baf04c2 View commit details
    Browse the repository at this point in the history

  10. Add to script specifying the Uniswap V3 pool fee

    @0xJem
    0xJem committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    25e61af View commit details
    Browse the repository at this point in the history

  11. Zero out GUniFactory addresses

    @0xJem
    0xJem committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    7dcd4f0 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2024

  1. Merge pull request #207 from Axis-Fi/dtl-testing 

    Improvements from DTL testing
    @0xJem
    0xJem authored Jun 15, 2024
    Configuration menu
    Copy the full SHA
    c318459 View commit details
    Browse the repository at this point in the history

  2. Add back removed salt key

    @0xJem
    0xJem committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    44f167f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #208 from Axis-Fi/salt-fixes 

    Salt Fixes
    @0xJem
    0xJem authored Jun 15, 2024
    Configuration menu
    Copy the full SHA
    16d7c1c View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. wip: LIV svg image

    @Oighty
    Oighty committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    0d45713 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. wip: more svg variants and updates

    @Oighty
    Oighty committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    6c2e768 View commit details
    Browse the repository at this point in the history

  2. wip: more liv image updates (including animation)

    @Oighty
    Oighty committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    9c4e56f View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. feat: compiles and integrated into LIV

    @Oighty
    Oighty committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    b861628 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Add check for length of callback data 

    # Conflicts:
#	script/salts/salts.json
    @0xJem
    0xJem committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    b579f25 View commit details
    Browse the repository at this point in the history

  2. Tests for TokenAllowlist onBid

    @0xJem
    0xJem committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    3ec1171 View commit details
    Browse the repository at this point in the history

  3. Add tests for TokenAllowlist with AtomicAuctionHouse

    @0xJem
    0xJem committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    e95b609 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Merge branch 'master' into master-merge

    @0xJem
    0xJem committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    02b2cf8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #212 from Axis-Fi/master-merge 

    Merge master -> develop
    @0xJem
    0xJem authored Jun 24, 2024
    Configuration menu
    Copy the full SHA
    45aa37e View commit details
    Browse the repository at this point in the history

  3. Validate configuration addresses

    @0xJem
    0xJem committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    ae6d73b View commit details
    Browse the repository at this point in the history

  4. Compile error

    @0xJem
    0xJem committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    c9c49d3 View commit details
    Browse the repository at this point in the history

  5. Add script for pool deployment

    @0xJem
    0xJem committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    c8b0435 View commit details
    Browse the repository at this point in the history

  6. Default RPC urls

    @0xJem
    0xJem committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    4989e57 View commit details
    Browse the repository at this point in the history

  7. README

    @0xJem
    0xJem committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    a19acce View commit details
    Browse the repository at this point in the history

  8. Deployment script uses tags instead of directory

    @0xJem
    0xJem committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    1b87606 View commit details
    Browse the repository at this point in the history

  9. Logs and notes

    @0xJem
    0xJem committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    6d789de View commit details
    Browse the repository at this point in the history

  10. Log deployment address. Update docs.

    @0xJem
    0xJem committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    e7b85c5 View commit details
    Browse the repository at this point in the history

  11. Verification works

    @0xJem
    0xJem committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    d649d62 View commit details
    Browse the repository at this point in the history

  12. Updated deployment on arbitrum sepolia

    @0xJem
    0xJem committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    e3519f2 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Merge pull request #211 from Axis-Fi/allowlist-updates 

    Allowlist updates
    @0xJem
    0xJem authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    4984ab9 View commit details
    Browse the repository at this point in the history

  2. Add example .env file for g-uni

    @0xJem
    0xJem committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    6e7644c View commit details
    Browse the repository at this point in the history

  3. Address conflicting dependency versions by adding Initializable into … 

    …the g-uni repo
    @0xJem
    0xJem committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    15e3720 View commit details
    Browse the repository at this point in the history

  4. Update salts

    @0xJem
    0xJem committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    e5baeb3 View commit details
    Browse the repository at this point in the history

  5. Add note on salts/address mismatch

    @0xJem
    0xJem committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    f5ee3dd View commit details
    Browse the repository at this point in the history

  6. Revert "Updated deployment on arbitrum sepolia" 

    This reverts commit e3519f2.
    @0xJem
    0xJem committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    daa6f82 View commit details
    Browse the repository at this point in the history

  7. Add G-UNI factory addresses from testnet deployments

    @0xJem
    0xJem committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    be152b6 View commit details
    Browse the repository at this point in the history

  8. chore: linting

    @0xJem
    0xJem committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    5703b4f View commit details
    Browse the repository at this point in the history

  9. Verification of deployed tokens

    @0xJem
    0xJem committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    e628349 View commit details
    Browse the repository at this point in the history

  10. feat: set referrer fee by auction with a max referrer fee configured … 

    …by auction type
    @Oighty
    Oighty committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    be656cf View commit details
    Browse the repository at this point in the history

  11. chore: linting and cleanup

    @Oighty
    Oighty committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    3fc2363 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. Update Uniswap V2 addresses for arbitrum sepolia

    @0xJem
    0xJem committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    a657c48 View commit details
    Browse the repository at this point in the history

  2. Add resume flag to deployTokens script

    @0xJem
    0xJem committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    127cc24 View commit details
    Browse the repository at this point in the history

  3. Update Uniswap V2 deployments on blast/base/mode sepolia testnets

    @0xJem
    0xJem committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    d65b906 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Remove redundant env addresses

    @0xJem
    0xJem committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    c1922fc View commit details
    Browse the repository at this point in the history

  2. Add addresses for dependencies on Base

    @0xJem
    0xJem committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    706689d View commit details
    Browse the repository at this point in the history

  3. Document sources for external addresses

    @0xJem
    0xJem committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    de4491f View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Re-deployment of UniswapV2DTL to Arbitrum Sepolia

    @0xJem
    0xJem committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    3e37522 View commit details
    Browse the repository at this point in the history

  2. Re-deployment of UniswapV2DTL to Base Sepolia

    @0xJem
    0xJem committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    99cbe36 View commit details
    Browse the repository at this point in the history

  3. Re-deployment of UniswapV2DTL to Blast Sepolia

    @0xJem
    0xJem committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    60024dc View commit details
    Browse the repository at this point in the history

  4. Re-deployment of UniswapV2DTL on Mode Sepolia

    @0xJem
    0xJem committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    6687984 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. feat: add totalSupply value to ERC6909 derivatives

    @Oighty
    Oighty committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    eaae37e View commit details
    Browse the repository at this point in the history

  2. feat: update Linear Vesting tokenURI and cleanup SVG card

    @Oighty
    Oighty committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    a5d9f3c View commit details
    Browse the repository at this point in the history

  3. test: update salts

    @Oighty
    Oighty committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    5530eea View commit details
    Browse the repository at this point in the history

  4. fix: only track ERC6909 supply on derivative contract

    @Oighty
    Oighty committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    f0df1c4 View commit details
    Browse the repository at this point in the history

  5. test: linear vesting supply checks

    @Oighty
    Oighty committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    6d0edfb View commit details
    Browse the repository at this point in the history

  6. fix: revert when referrer fee greater than max

    @Oighty
    Oighty committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    906c436 View commit details
    Browse the repository at this point in the history

  7. fix: change all percentages to basis points (hundredths of a percent)

    @Oighty
    Oighty committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    8b17274 View commit details
    Browse the repository at this point in the history

  8. test: update based on new percent decimals and referrer design

    @Oighty
    Oighty committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    c1c858e View commit details
    Browse the repository at this point in the history

  9. chore: linter

    @Oighty
    Oighty committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    4b3aa13 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. fix: token URI encoding now in Base64 and other minor updates

    @Oighty
    Oighty committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    47374c0 View commit details
    Browse the repository at this point in the history

  2. test: add tests to check live tokenURIs

    @Oighty
    Oighty committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    c0b0a67 View commit details
    Browse the repository at this point in the history

  3. test: update salts and fix assertion that was broken

    @Oighty
    Oighty committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    bf5bc6b View commit details
    Browse the repository at this point in the history

  4. chore: add mantle sepolia deployment

    @Oighty
    Oighty committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    a7f310b View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. test: update salts

    @Oighty
    Oighty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    0f9b209 View commit details
    Browse the repository at this point in the history

  2. chore: bump pnpm action version

    @Oighty
    Oighty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    e0e8539 View commit details
    Browse the repository at this point in the history

  3. chore: update CI action to use install script

    @Oighty
    Oighty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    d5e8d57 View commit details
    Browse the repository at this point in the history

  4. chore: update lock file with fresh install

    @Oighty
    Oighty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    fb1973e View commit details
    Browse the repository at this point in the history

  5. test: update salts

    @Oighty
    Oighty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    964f4bf View commit details
    Browse the repository at this point in the history

  6. chore: try install script without checkout action

    @Oighty
    Oighty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    e7b9188 View commit details
    Browse the repository at this point in the history

  7. chore: add checkout at beginning of CI

    @Oighty
    Oighty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    b5e0b53 View commit details
    Browse the repository at this point in the history

  8. test: revert constant changes and update salts

    @Oighty
    Oighty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    7e65af6 View commit details
    Browse the repository at this point in the history

  9. chore: update pnpm test to not include longrunning settlement tests

    @Oighty
    Oighty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    084617e View commit details
    Browse the repository at this point in the history

  10. Merge pull request #219 from Axis-Fi/ci-fix 

    CI Fix
    @Oighty
    Oighty authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    27ed43d View commit details
    Browse the repository at this point in the history

  11. Merge branch 'develop' into ref-fee-by-auction

    @Oighty
    Oighty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    c21865f View commit details
    Browse the repository at this point in the history

  12. test: update salts (again)

    @Oighty
    Oighty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    b91ecd3 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #216 from Axis-Fi/ref-fee-by-auction 

    feat: Set referrer fee by auction
    @Oighty
    Oighty authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    22d310d View commit details
    Browse the repository at this point in the history

  14. Merge branch 'develop' into liv-svg

    @Oighty
    Oighty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    d0bc514 View commit details
    Browse the repository at this point in the history

  15. test: update salts

    @Oighty
    Oighty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    f4e2388 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #210 from Axis-Fi/liv-svg 

    SVG representation for Linear Vesting
    @Oighty
    Oighty authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    5c6c617 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'develop' into deployment

    @Oighty
    Oighty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    5d7f750 View commit details
    Browse the repository at this point in the history

  18. test: update salts

    @Oighty
    Oighty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    5d6d89b View commit details
    Browse the repository at this point in the history

  19. Merge pull request #213 from Axis-Fi/deployment 

    G-Uni Deployment Scripts
    @Oighty
    Oighty authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    90dc724 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. deploy: testnet v0.5 contracts

    @Oighty
    Oighty committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    26c6315 View commit details
    Browse the repository at this point in the history

  2. Fix typo

    @0xJem
    0xJem committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    947dd4b View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Remove unused values for atomic deployments in env.json

    @0xJem
    0xJem committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    be60eab View commit details
    Browse the repository at this point in the history

  2. Amend scripts to have separate keys for constants and deployments

    @0xJem
    0xJem committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    2159201 View commit details
    Browse the repository at this point in the history

  3. Amend salt scripts to work without AtomicAuctionHouse deployment

    @0xJem
    0xJem committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    1aa1b0f View commit details
    Browse the repository at this point in the history

  4. Fix compiler error

    @0xJem
    0xJem committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    beebd54 View commit details
    Browse the repository at this point in the history

  5. chore: linting

    @0xJem
    0xJem committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    16985e4 View commit details
    Browse the repository at this point in the history

  6. script: add option to set max fees on auction module deployment

    @Oighty
    Oighty committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    497979b View commit details
    Browse the repository at this point in the history

  7. Merge pull request #220 from Axis-Fi/env-cleanup 

    Improvements to Deployment Addresses
    @Oighty
    Oighty authored Jul 11, 2024
    Configuration menu
    Copy the full SHA
    4171e11 View commit details
    Browse the repository at this point in the history