Skip to content

Commit

Permalink
worldchain addresses (#430)
Browse files Browse the repository at this point in the history
* Dev into main (#429)

* 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 <34962750+hensha256@users.noreply.github.com>
Co-authored-by: Alice Henshaw <henshawalice@gmail.com>

* 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 <daniel@gretzke.de>

* 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

* 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

* 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

* Make msgSender public (#365)

* make maximum input transient (#366)

* update v4 periphery to main and update deployRouter (#367)

* update v4 periphery to main and update deployRouter

* point to updated v4 posm

* v4 planner (#368)

* v4 planner

* some renaming

* separate uniswap tests (#369)

* separate uniswap tests

* Move permit2 tests

* final decode in calldata (#363)

* batch permit decode in calldata

* array of structs

* PR comment

* 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

* 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

* 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

* Update periphery in UR (#371)

* update to audit commit (#372)

* V4 Native Tests (#373)

* ETH input v4 tests

* eth output v4 tests

* PR comments

* Add v4 to receive (#376)

* add v4 to receive function

* linting

* PR comments

* fix and snapshots

* Take portion tests (#377)

* take portion test

* take portion test native

* correct comment

* take portion on input test

* remove console logs oops

* Oz L-09 (#382)

* OZ L-09

* Remove .vscode/settings.json from the repository

* update periphery to main (#380)

* update periphery to main

* update periphery after it updated main

* update again

* update again

* 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

* OZ N-06 (#383)

* OZ N-16 (#388)

* ABDK CVF-107 (#385)

* spearbit 94 (#389)

* ABDK CVF106 (#387)

* ABDK CVF106

* fix comment

* oz-L13: missing natspec (#390)

* Spearbit 59 (#391)

* Spearbit 60 & 61 (#392)

* OZ N-11 (#393)

* update periphery (#394)

* update periphery

* remove position config

* lint

* Audit reports (#395)

* Periphery update - calldata decoder (#396)

* Periphery update - calldata decoder

* rename function and snapshots

* actually use the function

* feat: update to 1.6.1-beta.1 (#398)

* 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 <603073+Jonney@users.noreply.github.com>

* chore: fix yarn publish (#401)

* chore: fix yarn publish

* Update deploy.yml

* Update deploy.yml

* chore(infra): deploy with npm (#403)

* Update deploy.yml

* Update deploy.yml

* Update package.json

* compile contracts in workflow

* 2.0.0-beta.1 (#407)

* Release workflow needs forge install (#408)

* init submodules in release workflow (#409)

* gitmodules should use https (#410)

* Update v4 initialize (#415)

* update periphery

* update initialize ABI

* temporary position descriptor constructor arg

* lint

* updated snap

* 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 <henshawalice@gmail.com>

* 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 <34962750+hensha256@users.noreply.github.com>

* Update script/deployParameters/DeployUnichainSepolia.s.sol

Co-authored-by: Alice <34962750+hensha256@users.noreply.github.com>

---------

Co-authored-by: Jonney <603073+Jonney@users.noreply.github.com>
Co-authored-by: Alice <34962750+hensha256@users.noreply.github.com>

* Latest v4 periphery (#420)

* Latest v4 periphery

* why didnt the linter catch this

* v3 refactor and pull latest periphery (#418)

* v3 refactor and pull latest periphery

* switch to if else

* allow permit2 to silently fail to avoid dos (#417)

* allow permit2 to silently fail to avoid dos

* fix tests

* 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 <daniel@gretzke.de>

* move file (#425)

* Merge updates into dev (#428)

* Update .gitmodules (#337)

There is no need to use an account for GitHub.

* chore(infra): set up deploy (#397)

* chore: yarn publish (#402)

* chore: yarn publish

* Update deploy.yml

* Update deploy.yml

* Update deploy.yml

* Update deploy.yml

* chore: add provenance (#404)

* compile contracts in workflow (#405)

* feat: deploy worldchain (#411)

* fix: update UR address on worldchain (#412)

previous accidentally set it to the unsupported protocol

* Create CODEOWNERS (#419)

---------

Co-authored-by: Jonney <603073+Jonney@users.noreply.github.com>
Co-authored-by: mr-uniswap <144828035+mr-uniswap@users.noreply.github.com>
Co-authored-by: Emily Williams <emag3m@gmail.com>
Co-authored-by: marktoda <toda.mark@gmail.com>
Co-authored-by: dianakocsis <diana.kocsis@uniswap.org>

---------

Co-authored-by: Daniel Gretzke <daniel@gretzke.de>
Co-authored-by: diana <diana.kocsis@uniswap.org>
Co-authored-by: saucepoint <98790946+saucepoint@users.noreply.github.com>
Co-authored-by: marktoda <toda.mark@gmail.com>
Co-authored-by: mr-uniswap <144828035+mr-uniswap@users.noreply.github.com>
Co-authored-by: Jonney <603073+Jonney@users.noreply.github.com>
Co-authored-by: Emily Williams <emag3m@gmail.com>

* worldcoin addresses

* Resolved submodule conflict for v4-periphery

---------

Co-authored-by: Alice <34962750+hensha256@users.noreply.github.com>
Co-authored-by: Daniel Gretzke <daniel@gretzke.de>
Co-authored-by: saucepoint <98790946+saucepoint@users.noreply.github.com>
Co-authored-by: marktoda <toda.mark@gmail.com>
Co-authored-by: mr-uniswap <144828035+mr-uniswap@users.noreply.github.com>
Co-authored-by: Jonney <603073+Jonney@users.noreply.github.com>
Co-authored-by: Emily Williams <emag3m@gmail.com>
  • Loading branch information
8 people authored Jan 22, 2025
1 parent e092073 commit 3fc2b48
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions script/deployParameters/DeployWorldchain.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import {RouterParameters} from 'contracts/types/RouterParameters.sol';
contract DeployWorldchain is DeployUniversalRouter {
function setUp() public override {
params = RouterParameters({
permit2: 0x0000000000000000000000000000000000000000,
weth9: 0x0000000000000000000000000000000000000000,
v2Factory: 0x0000000000000000000000000000000000000000,
v3Factory: 0x0000000000000000000000000000000000000000,
permit2: 0x000000000022D473030F116dDEE9F6B43aC78BA3,
weth9: 0x4200000000000000000000000000000000000006,
v2Factory: 0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f,
v3Factory: 0x7a5028BDa40e7B173C278C5342087826455ea25a,
pairInitCodeHash: 0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f,
poolInitCodeHash: 0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f,
v4PoolManager: 0x0000000000000000000000000000000000000000,
v3NFTPositionManager: 0x0000000000000000000000000000000000000000,
v4PositionManager: 0x0000000000000000000000000000000000000000
poolInitCodeHash: 0xe34f199b19b2b4f47f68442619d555527d244f78a3297ea89325f843f87b8b54,
v4PoolManager: address(0),
v3NFTPositionManager: 0xec12a9F9a09f50550686363766Cc153D03c27b5e,
v4PositionManager: address(0)
});
}
}

0 comments on commit 3fc2b48

Please sign in to comment.