Code

fix: Add ERC6909 support#447

Code

Merged

zhongeric merged 113 commits intomainUniswap/v4-core:mainfrom wip-6909Uniswap/v4-core:wip-6909Copy head branch name to clipboardDec 16, 2023

+715-88

Commits

Commits on Dec 14, 2023

• forge install: erc-6909

  jtriley2p

  committed
  f9820ed

  Copy full SHA for f9820ed

• migrate 1155 to 6909

  jtriley2p

  committed
  b22dc74

  Copy full SHA for b22dc74

• rm old 6909

  jtriley2p

  committed
  ce37af4

  Copy full SHA for ce37af4

• forge install: erc-6909

  jtriley2p

  committed
  00f4341

  Copy full SHA for 00f4341

• add event arg

  jtriley2p

  committed
  3673856

  Copy full SHA for 3673856

• rm old 6909

  jtriley2p

  committed
  d771042

  Copy full SHA for d771042

• forge install: erc-6909

  jtriley2p

  committed
  a6ee17c

  Copy full SHA for a6ee17c

• update test event

  jtriley2p

  committed
  5309c7f

  Copy full SHA for 5309c7f

• Add gas snaps

  zhongeric

  committed
  33fdf58

  Copy full SHA for 33fdf58

• squash: support arbitrary calldata on test routers (#361)

  

  saucepoint

  authored and

  zhongeric

  committed
  56d2d08

  Copy full SHA for 56d2d08

• Chore: update licenses (#364)

  Show description for b67e3f3
  

  erin-koen

  authored and

  zhongeric

  committed
  b67e3f3

  Copy full SHA for b67e3f3

• Migrate SwapMath tests to foundry (#363)

  Show description for 7d3c6ec
  

  3 peopleauthored and

  zhongeric

  committed
  7d3c6ec

  Copy full SHA for 7d3c6ec

• add base hook for tests (#377)

  

  snreynolds

  authored and

  zhongeric

  committed
  ba04e0f

  Copy full SHA for ba04e0f

• change natspec to ILockCallback.lockAcquired (#376)

  

  wildmolasses

  authored and

  zhongeric

  committed
  3464902

  Copy full SHA for 3464902

• feat: update to solidity 0.8.22 (#378)

  Show description for d6f0bb3
  

  marktoda

  authored and

  zhongeric

  committed
  d6f0bb3

  Copy full SHA for d6f0bb3

• Cache dynamic fee in slot0 (#360)

  

  snreynolds

  authored and

  zhongeric

  committed
  9875e9f

  Copy full SHA for 9875e9f

• Bug: Require different currencies (#380)

  Show description for 81e2f1f
  

  hensha256

  authored and

  zhongeric

  committed
  81e2f1f

  Copy full SHA for 81e2f1f

• Replace MockERC20 with solmate's MockERC20 (#374)

  Show description for fad1737
  

  saucepoint

  authored and

  zhongeric

  committed
  fad1737

  Copy full SHA for fad1737

• Fixing compiler warnings (#386)

  

  hensha256

  authored and

  zhongeric

  committed
  ebaa5d1

  Copy full SHA for ebaa5d1

• fix: add gas snaps for swaps with 1155 as input/output (#383)

  Show description for 9a34f3e
  zhongeric

  committed
  9a34f3e

  Copy full SHA for 9a34f3e

• Delete Hardhat (#372)

  Show description for 0fadf92
  

  3 peopleauthored and

  zhongeric

  committed
  0fadf92

  Copy full SHA for 0fadf92

• feat: use standard forge directory structure (#389)

  Show description for fbd55b9
  

  marktoda

  authored and

  zhongeric

  committed
  fbd55b9

  Copy full SHA for fbd55b9

• Improve forge tests (#391)

  Show description for a6c8e05
  

  hensha256

  authored and

  zhongeric

  committed
  a6c8e05

  Copy full SHA for a6c8e05

• Fix Issue #397: Incorrect Documentation (#399)

  

  sipox11

  authored and

  zhongeric

  committed
  33aaf5f

  Copy full SHA for 33aaf5f

• feat: move whitepapers to docs dir to cleanup root (#393)

  Show description for be80868
  

  marktoda

  authored and

  zhongeric

  committed
  be80868

  Copy full SHA for be80868

• add snapshots to CI with tolerance (#401)

  

  snreynolds

  authored and

  zhongeric

  committed
  2743802

  Copy full SHA for 2743802

• Implement Claims accounting as minimal balance (#379)

  Show description for 4e2996d
  zhongeric

  committed
  4e2996d

  Copy full SHA for 4e2996d

• fix: whitepaper link (#400)

  Show description for 68c52a4
  

  marktoda

  authored and

  zhongeric

  committed
  68c52a4

  Copy full SHA for 68c52a4

• Add solc binaries and transient storage lock library (#395)

  

  snreynolds

  authored and

  zhongeric

  committed
  f5afe92

  Copy full SHA for f5afe92

• Updated solc setup and instructions (#406)

  Show description for 80a71bf
  

  hensha256

  authored and

  zhongeric

  committed
  80a71bf

  Copy full SHA for 80a71bf

• feat: move JS scripts to subdir and add helper (#405)

  Show description for 7a09f10
  

  marktoda

  authored and

  zhongeric

  committed
  7a09f10

  Copy full SHA for 7a09f10

• Set tick spacing range as constants (#369)

  Show description for 46e08e8
  

  hyunchel

  authored and

  zhongeric

  committed
  46e08e8

  Copy full SHA for 46e08e8

• Part 1: Improve forge tests (#407)

  Show description for 4271165
  

  hensha256

  authored and

  zhongeric

  committed
  4271165

  Copy full SHA for 4271165

• remove forge snapshot --check (#417)

  

  snreynolds

  authored and

  zhongeric

  committed
  fb68e18

  Copy full SHA for fb68e18

• feat: update justfile with custom solc (#418)

  Show description for 874115d
  

  marktoda

  authored and

  zhongeric

  committed
  874115d

  Copy full SHA for 874115d

• Fix typos (#365)

  Show description for 1831ace
  

  xiaolou86

  authored and

  zhongeric

  committed
  1831ace

  Copy full SHA for 1831ace

• Update just prep and build (#421)

  Show description for 6b2727d
  

  hensha256

  authored and

  zhongeric

  committed
  6b2727d

  Copy full SHA for 6b2727d

• fix tests

  zhongeric

  committed
  4b8e4e2

  Copy full SHA for 4b8e4e2

• remove totalsupply

  zhongeric

  committed
  2ce5840

  Copy full SHA for 2ce5840

• remove lib

  zhongeric

  committed
  748937c

  Copy full SHA for 748937c

• remove solmate

  zhongeric

  committed
  c42aba8

  Copy full SHA for c42aba8

• forge install: solmate

  Show description for 1babbb6
  zhongeric

  committed
  1babbb6

  Copy full SHA for 1babbb6

• Add comment

  zhongeric

  committed
  30d6d7c

  Copy full SHA for 30d6d7c

• Add solmate 6909 and remove claims

  zhongeric

  committed
  fcb4762

  Copy full SHA for fcb4762

• feat: add variadic args to justfile (#423)

  Show description for e2fef70
  

  marktoda

  authored and

  zhongeric

  committed
  e2fef70

  Copy full SHA for e2fef70

• move up settle and remove solmate

  zhongeric

  committed
  85dfe2f

  Copy full SHA for 85dfe2f

• forge install: solmate

  zhongeric

  committed
  b7f97a0

  Copy full SHA for b7f97a0

• copy erc6909 locally and use _mint and _burn

  zhongeric

  committed
  be0d822

  Copy full SHA for be0d822

• forge fmt

  zhongeric

  committed
  932376b

  Copy full SHA for 932376b

• remove lib

  zhongeric

  committed
  482a146

  Copy full SHA for 482a146

• forge install: solmate

  Show description for 42445f2
  zhongeric

  committed
  42445f2

  Copy full SHA for 42445f2

• rmeove solmate

  zhongeric

  committed
  1959c6a

  Copy full SHA for 1959c6a

• forge install: solmate

  Show description for 8291f76
  zhongeric

  committed
  8291f76

  Copy full SHA for 8291f76

• fix gas snaps

  zhongeric

  committed
  9bef4c7

  Copy full SHA for 9bef4c7

• remove unchecked without totalSupply

  zhongeric

  committed
  ae7c0db

  Copy full SHA for ae7c0db

• Lock on initialize (#424)

  Show description for 95a41e9
  

  hensha256

  authored and

  zhongeric

  committed
  95a41e9

  Copy full SHA for 95a41e9

• NoOp implementation with flag (#324)

  Show description for 477f1eb
  

  3 peopleauthored and

  zhongeric

  committed
  477f1eb

  Copy full SHA for 477f1eb

• update testss

  zhongeric

  committed
  2929b3c

  Copy full SHA for 2929b3c

• rm solmate

  zhongeric

  committed
  88e7d57

  Copy full SHA for 88e7d57

• forge install: solmate

  Show description for d3060e1
  zhongeric

  committed
  d3060e1

  Copy full SHA for d3060e1

• Use solmate 6909

  zhongeric

  committed
  12e504f

  Copy full SHA for 12e504f

• fmt

  zhongeric

  committed
  df5f006

  Copy full SHA for df5f006

• cache msg sender

  zhongeric

  committed
  3cf69de

  Copy full SHA for 3cf69de

• Explain different solc options (#429)

  Show description for 0d327b8
  

  hensha256

  authored and

  zhongeric

  committed
  0d327b8

  Copy full SHA for 0d327b8

• Access lock (#404)

  

  snreynolds

  authored and

  zhongeric

  committed
  a319c1e

  Copy full SHA for a319c1e

• Fix broken tests that were using old claims balance format

  zhongeric

  committed
  56a1cd3

  Copy full SHA for 56a1cd3

• Add V46909 and reorder params

  zhongeric

  committed
  5df80bc

  Copy full SHA for 5df80bc

• Add V46909 and Mock contract for test

  zhongeric

  committed
  37b0bd7

  Copy full SHA for 37b0bd7

• Add revert tests

  zhongeric

  committed
  3ecbe30

  Copy full SHA for 3ecbe30

• burnFrom internal

  zhongeric

  committed
  72b52a3

  Copy full SHA for 72b52a3

• remove old gas snaps and add native tests

  zhongeric

  committed
  d2d9e07

  Copy full SHA for d2d9e07

• feat: add lock target (#300)

  Show description for 22d4964
  

  marktoda

  authored and

  zhongeric

  committed
  22d4964

  Copy full SHA for 22d4964

• fix tests and snaps

  zhongeric

  committed
  521f381

  Copy full SHA for 521f381

• forge fmt

  zhongeric

  committed
  b4764ed

  Copy full SHA for b4764ed

• expectEmit() all

  zhongeric

  committed
  fdd52d2

  Copy full SHA for fdd52d2

• expect emit all

  zhongeric

  committed
  9c70e2e

  Copy full SHA for 9c70e2e

• Prevent ProtocolFeeController from bricking pool initialization on revert (#362)

  Show description for 312467e
  

  zhongeric

  and

  snreynolds

  committed
  312467e

  Copy full SHA for 312467e

• feedback

  zhongeric

  committed
  2081ddc

  Copy full SHA for 2081ddc

• Add IERC69009, does not compile

  zhongeric

  committed
  9e7735e

  Copy full SHA for 9e7735e

• Revert "Add IERC69009, does not compile"

  Show description for babc9b0
  zhongeric

  committed
  babc9b0

  Copy full SHA for babc9b0

• added delta overflow checks (#433)

  

  aadams

  authored and

  zhongeric

  committed
  349b334

  Copy full SHA for 349b334

• add pool getters (#438)

  Show description for cf6f514
  

  snreynolds

  authored and

  zhongeric

  committed
  cf6f514

  Copy full SHA for cf6f514

• A few cleanup tasks (#437)

  Show description for e7db92e
  

  2 peopleauthored and

  zhongeric

  committed
  e7db92e

  Copy full SHA for e7db92e

• Remove hook fees and protocol fee on withdrawal (#432)

  Show description for 8aec8c3
  

  hensha256

  authored and

  zhongeric

  committed
  8aec8c3

  Copy full SHA for 8aec8c3

• refactor: hooks callsites (#439)

  Show description for a669d68
  

  marktoda

  authored and

  zhongeric

  committed
  a669d68

  Copy full SHA for a669d68

• merge conflicts

  zhongeric

  committed
  caa1166

  Copy full SHA for caa1166

• fix fialing test

  zhongeric

  committed
  c90b990

  Copy full SHA for c90b990

• Copy solmate 6909 locally to get interface inheritance

  zhongeric

  committed
  2a719d5

  Copy full SHA for 2a719d5

• natspec

  zhongeric

  committed
  c84c919

  Copy full SHA for c84c919

• expose getters in pool interface

  

  snreynolds

  authored and

  zhongeric

  committed
  5338b3c

  Copy full SHA for 5338b3c

• Use id for mint/burn instead of currency

  zhongeric

  committed
  7ffbe50

  Copy full SHA for 7ffbe50

• forge fmt

  zhongeric

  committed
  664209e

  Copy full SHA for 664209e

• Add burnFrom no approval test

  zhongeric

  committed
  a4d55c9

  Copy full SHA for a4d55c9

• feedback

  zhongeric

  committed
  4ec5353

  Copy full SHA for 4ec5353

• feedback

  zhongeric

  committed
  43c6725

  Copy full SHA for 43c6725

• forge install: ERC-6909

  Show description for 182d500
  zhongeric

  committed
  182d500

  Copy full SHA for 182d500

• remove lib

  zhongeric

  committed
  4f1dfd3

  Copy full SHA for 4f1dfd3

• Add commit SHA

  zhongeric

  committed
  f4fa8f9

  Copy full SHA for f4fa8f9

• Merge branch 'main' into wip-6909

  zhongeric

  committed
  b467fe0

  Copy full SHA for b467fe0

• merge conflicts galore

  zhongeric

  committed
  c8c12c8

  Copy full SHA for c8c12c8

• forge install: solmate

  Show description for a41cf51
  zhongeric

  committed
  a41cf51

  Copy full SHA for a41cf51

• fix conflict

  zhongeric

  committed
  3c18ea7

  Copy full SHA for 3c18ea7

• fix libs

  zhongeric

  committed
  a5e42f8

  Copy full SHA for a5e42f8

• del

  zhongeric

  committed
  cf067dc

  Copy full SHA for cf067dc

• forge install: openzeppelin-contracts

  Show description for db16ded
  zhongeric

  committed
  db16ded

  Copy full SHA for db16ded

• fix tests from conflcits and gas

  zhongeric

  committed
  0dc051f

  Copy full SHA for 0dc051f

• forge fmt

  zhongeric

  committed
  ee57069

  Copy full SHA for ee57069

• removed unused file

  zhongeric

  committed
  555e234

  Copy full SHA for 555e234

Commits on Dec 15, 2023

• fix: faling fuzz tests (#441)

  Show description for 29bcdd5
  

  zhongeric

  and

  aadams

  committed
  29bcdd5

  Copy full SHA for 29bcdd5

• fix gas snap

  zhongeric

  committed
  63ded70

  Copy full SHA for 63ded70

• Merge branch 'main' into wip-6909

  zhongeric

  committed
  8bb3fa8

  Copy full SHA for 8bb3fa8

• forge test

  zhongeric

  committed
  b81b9b3

  Copy full SHA for b81b9b3

• feedback

  zhongeric

  committed
  a0beb23

  Copy full SHA for a0beb23