feat: Revert style quoter #73

ConjunctiveNormalForm · 2023-11-15T22:32:50Z

Which issue does this pull request resolve?

Quoter contract for off-chain use

Description of changes

Full implementation of revert-style quoter, and migrated over all test cases for V3's QuoterV2

contracts/libraries/SwapIntention.sol

marktoda

awesome work!!! Some first pass comments, apologies for the volume hopefully its helpful!

contracts/interfaces/IQuoter.sol

contracts/lens/Quoter.sol

foundry.toml

test/Quoter.t.sol

contracts/libraries/SwapIntention.sol

.solhint.json

contracts/lens/Quoter.sol

test/Quoter.t.sol

This commit updates v4 core to latest and fixes integration issues

snreynolds

changes look good, left 1 last comment but its syntax so up to you

contracts/lens/Quoter.sol

snreynolds

solid. i think this is the most well written periphery contract atm 👏 👏 👏 👏

* Update to v4-core latest (Uniswap#64) * first pass on using new router function singatures * updated v4-core * updated .getSlot0, as it returns less data now * snapshots * add base contracts and interfaces (Uniswap#75) * Update v4 core (Uniswap#74) * feat: update v4-core This commit updates v4 core to latest and fixes integration issues * fix: tests * fix: update tests * fix: test router was borked * fix: alice comments * update to latest core * use prev values * change twamm to use pool getters * changes after merging main * use --via-ir in cli * fix formatting * fix FullRange/TWAMM hook --------- Co-authored-by: Sara Reynolds <[email protected]> * feat: Revert style quoter (Uniswap#73) * add PoolTicksCounter library * quoter exact input single * quoter test * return deltas instead * safe casting to correct types * QuoteExactInput skeleton * multiple entries * break handleRevert by type * quoteExactInput and unit tests * more QuoteExactInput tests * remove lgos * remove commented out struct * via-ir in ci * remove unused imports/functions * store iteration params locally instead of editing function input * pull out sqrtPriceLimit to its own function * PathKey to its own library * rename initializedTicksCrossed to initializedTicksLoaded * remove manual abi encoding in yul :p * fix linter warnings for Quoter * natspec for IQuoter * feat: update v4-core This commit updates v4 core to latest and fixes integration issues * fix: tests * style fixes * inheritdoc * ExactInSingleBatch * fix: update tests * fix: test router was borked * exact out * fix: alice comments * fix ExactOutput * add ExactOput unit tests * add quoteExactOutputBatch * remove solhint config * remove newline * add QuoteExactOutput in interface * refactor lockAcquired * move magic numbers to constants + doc * add more natspec * natspec * named imports * self-call branching * remove old code * remove console2 import * refactor PathKeyLib * amountOutCached * inherit ILockCallback * add base contracts and interfaces (Uniswap#75) * remove unused errors * test lockAcquired reverts * remove ...Batch interface * REASON -> RESPONSE when valid * complete natspec * remove SwapInfo imports * rename to SwapParameters * move quoter structs into IQuoter interface * update to latest core * use prev values * change twamm to use pool getters * changes after merging main * use --via-ir in cli * fix formatting * fix FullRange/TWAMM hook * update ticks counter * update Quoter test * typo * typo * simplify handleRevertSingle * merge QuoteInput/OutputSingle structs * combine IQuoter structs * using ... ordering * update snapshots * move amountOutCached into inner call * using PathKeyLib for PathKey * fix amountOutCached * remove console2 import * resurface revert reason * clean up validateRevert * update natsppec * remove unused --------- Co-authored-by: Mark Toda <[email protected]> Co-authored-by: Tina <[email protected]> Co-authored-by: Sara Reynolds <[email protected]> * (Quoter) Avoid IR (Uniswap#93) * avoid stack too deep * pack local variables into structs; remove need for IR * reorg struct * snapshots * forge fmt * restore settings * remove IR * ensure tokens are ordered properly by using salts * gas snapshot * remove console logs * chore: update v4-core:latest (Uniswap#89) * update v4-core * update to new liquidity hooks * forge fmt; reuse v4-core justfile * snapshots * rename getHooksCalls --> getHookPermissions * enforce permanent liquidity with beforeRemoveLiquidity * snapshot * update v4-core (again) * snapshots with new v4-core * v4-core:latest * pin 0.8.24 * merge in remote; regenerate snapshots * remove justfile * repin cancun * pin token addresses using vm.etch * snapshots * forge fmt * remove via-ir and custom solc from CI * test nit * Update v4-core submodule to use https (Uniswap#97) Co-authored-by: saucepoint <[email protected]> * chore: add semgrep (Uniswap#94) --------- Co-authored-by: saucepoint <[email protected]> Co-authored-by: Tina <[email protected]> Co-authored-by: marktoda <[email protected]> Co-authored-by: Sara Reynolds <[email protected]> Co-authored-by: Zach Yang <[email protected]> Co-authored-by: 0x57 <[email protected]> Co-authored-by: mr-uniswap <[email protected]>

* feat: Revert style quoter (#73) * add PoolTicksCounter library * quoter exact input single * quoter test * return deltas instead * safe casting to correct types * QuoteExactInput skeleton * multiple entries * break handleRevert by type * quoteExactInput and unit tests * more QuoteExactInput tests * remove lgos * remove commented out struct * via-ir in ci * remove unused imports/functions * store iteration params locally instead of editing function input * pull out sqrtPriceLimit to its own function * PathKey to its own library * rename initializedTicksCrossed to initializedTicksLoaded * remove manual abi encoding in yul :p * fix linter warnings for Quoter * natspec for IQuoter * feat: update v4-core This commit updates v4 core to latest and fixes integration issues * fix: tests * style fixes * inheritdoc * ExactInSingleBatch * fix: update tests * fix: test router was borked * exact out * fix: alice comments * fix ExactOutput * add ExactOput unit tests * add quoteExactOutputBatch * remove solhint config * remove newline * add QuoteExactOutput in interface * refactor lockAcquired * move magic numbers to constants + doc * add more natspec * natspec * named imports * self-call branching * remove old code * remove console2 import * refactor PathKeyLib * amountOutCached * inherit ILockCallback * add base contracts and interfaces (#75) * remove unused errors * test lockAcquired reverts * remove ...Batch interface * REASON -> RESPONSE when valid * complete natspec * remove SwapInfo imports * rename to SwapParameters * move quoter structs into IQuoter interface * update to latest core * use prev values * change twamm to use pool getters * changes after merging main * use --via-ir in cli * fix formatting * fix FullRange/TWAMM hook * update ticks counter * update Quoter test * typo * typo * simplify handleRevertSingle * merge QuoteInput/OutputSingle structs * combine IQuoter structs * using ... ordering * update snapshots * move amountOutCached into inner call * using PathKeyLib for PathKey * fix amountOutCached * remove console2 import * resurface revert reason * clean up validateRevert * update natsppec * remove unused --------- Co-authored-by: Mark Toda <[email protected]> Co-authored-by: Tina <[email protected]> Co-authored-by: Sara Reynolds <[email protected]> * (Quoter) Avoid IR (#93) * avoid stack too deep * pack local variables into structs; remove need for IR * reorg struct * snapshots * forge fmt * restore settings * remove IR * ensure tokens are ordered properly by using salts * gas snapshot * remove console logs * chore: update v4-core:latest (#89) * update v4-core * update to new liquidity hooks * forge fmt; reuse v4-core justfile * snapshots * rename getHooksCalls --> getHookPermissions * enforce permanent liquidity with beforeRemoveLiquidity * snapshot * update v4-core (again) * snapshots with new v4-core * v4-core:latest * pin 0.8.24 * merge in remote; regenerate snapshots * remove justfile * repin cancun * pin token addresses using vm.etch * snapshots * forge fmt * remove via-ir and custom solc from CI * test nit * Update v4-core submodule to use https (#97) Co-authored-by: saucepoint <[email protected]> * chore: add semgrep (#94) * [Chore] Update v4-core:latest (#100) * Update v4-core * Update various examples, BaseHook, Quoter and tests * Remove nested locking for LimitOrder * Fix Quoter * update v4-core * fix: remove getLocker as its a bool now * update v4-core: flipped signs, push dynamic fees * fix: flip delta signs * flip delta signs * flip delta signs * flip delta signs * fix getSlot0 calls * snapshots * remove deadcode * remove unused param * update core * update for modifyLiquidity; misc doc updates * correct min int256 * allow for manual fee updates --------- Co-authored-by: saucepoint <[email protected]> * changes with core update * fix casing * switch versions back * Updated lib/v4-core submodule to main branch * switch to 0.8.19 --------- Co-authored-by: Zach Yang <[email protected]> Co-authored-by: Mark Toda <[email protected]> Co-authored-by: Tina <[email protected]> Co-authored-by: Sara Reynolds <[email protected]> Co-authored-by: saucepoint <[email protected]> Co-authored-by: 0x57 <[email protected]> Co-authored-by: mr-uniswap <[email protected]> Co-authored-by: 0x57 <[email protected]> Co-authored-by: saucepoint <[email protected]> Co-authored-by: Alice Henshaw <[email protected]>

* add PoolTicksCounter library * quoter exact input single * quoter test * return deltas instead * safe casting to correct types * QuoteExactInput skeleton * multiple entries * break handleRevert by type * quoteExactInput and unit tests * more QuoteExactInput tests * remove lgos * remove commented out struct * via-ir in ci * remove unused imports/functions * store iteration params locally instead of editing function input * pull out sqrtPriceLimit to its own function * PathKey to its own library * rename initializedTicksCrossed to initializedTicksLoaded * remove manual abi encoding in yul :p * fix linter warnings for Quoter * natspec for IQuoter * feat: update v4-core This commit updates v4 core to latest and fixes integration issues * fix: tests * style fixes * inheritdoc * ExactInSingleBatch * fix: update tests * fix: test router was borked * exact out * fix: alice comments * fix ExactOutput * add ExactOput unit tests * add quoteExactOutputBatch * remove solhint config * remove newline * add QuoteExactOutput in interface * refactor lockAcquired * move magic numbers to constants + doc * add more natspec * natspec * named imports * self-call branching * remove old code * remove console2 import * refactor PathKeyLib * amountOutCached * inherit ILockCallback * add base contracts and interfaces (#75) * remove unused errors * test lockAcquired reverts * remove ...Batch interface * REASON -> RESPONSE when valid * complete natspec * remove SwapInfo imports * rename to SwapParameters * move quoter structs into IQuoter interface * update to latest core * use prev values * change twamm to use pool getters * changes after merging main * use --via-ir in cli * fix formatting * fix FullRange/TWAMM hook * update ticks counter * update Quoter test * typo * typo * simplify handleRevertSingle * merge QuoteInput/OutputSingle structs * combine IQuoter structs * using ... ordering * update snapshots * start routing * start routing contract * naive swapExactIn impl * lint + bytecode snapshot * change concept of hops to token hops * UniswapV4Routing --> Routing * use PathKey * exactInputSingle * save DRY progress * no sqrtPriceLimit for multipool hops * exactOut implemented w awkward loops/int conversions single hops passing on exactOut * gas savings from not doing double negative number * gas savings from unchecked math * add swapExactOuputSingle * break out structs into interface * PR comments * pass hook data along * gas and coherency optimization * merge Quoter * remove SwapIntention * IV4Router structs * remove SwapIntention * remove logs * natspec * rebase onto latest core * simplify function naming * Routing diana (#104) * feat: Revert style quoter (#73) * add PoolTicksCounter library * quoter exact input single * quoter test * return deltas instead * safe casting to correct types * QuoteExactInput skeleton * multiple entries * break handleRevert by type * quoteExactInput and unit tests * more QuoteExactInput tests * remove lgos * remove commented out struct * via-ir in ci * remove unused imports/functions * store iteration params locally instead of editing function input * pull out sqrtPriceLimit to its own function * PathKey to its own library * rename initializedTicksCrossed to initializedTicksLoaded * remove manual abi encoding in yul :p * fix linter warnings for Quoter * natspec for IQuoter * feat: update v4-core This commit updates v4 core to latest and fixes integration issues * fix: tests * style fixes * inheritdoc * ExactInSingleBatch * fix: update tests * fix: test router was borked * exact out * fix: alice comments * fix ExactOutput * add ExactOput unit tests * add quoteExactOutputBatch * remove solhint config * remove newline * add QuoteExactOutput in interface * refactor lockAcquired * move magic numbers to constants + doc * add more natspec * natspec * named imports * self-call branching * remove old code * remove console2 import * refactor PathKeyLib * amountOutCached * inherit ILockCallback * add base contracts and interfaces (#75) * remove unused errors * test lockAcquired reverts * remove ...Batch interface * REASON -> RESPONSE when valid * complete natspec * remove SwapInfo imports * rename to SwapParameters * move quoter structs into IQuoter interface * update to latest core * use prev values * change twamm to use pool getters * changes after merging main * use --via-ir in cli * fix formatting * fix FullRange/TWAMM hook * update ticks counter * update Quoter test * typo * typo * simplify handleRevertSingle * merge QuoteInput/OutputSingle structs * combine IQuoter structs * using ... ordering * update snapshots * move amountOutCached into inner call * using PathKeyLib for PathKey * fix amountOutCached * remove console2 import * resurface revert reason * clean up validateRevert * update natsppec * remove unused --------- Co-authored-by: Mark Toda <[email protected]> Co-authored-by: Tina <[email protected]> Co-authored-by: Sara Reynolds <[email protected]> * (Quoter) Avoid IR (#93) * avoid stack too deep * pack local variables into structs; remove need for IR * reorg struct * snapshots * forge fmt * restore settings * remove IR * ensure tokens are ordered properly by using salts * gas snapshot * remove console logs * chore: update v4-core:latest (#89) * update v4-core * update to new liquidity hooks * forge fmt; reuse v4-core justfile * snapshots * rename getHooksCalls --> getHookPermissions * enforce permanent liquidity with beforeRemoveLiquidity * snapshot * update v4-core (again) * snapshots with new v4-core * v4-core:latest * pin 0.8.24 * merge in remote; regenerate snapshots * remove justfile * repin cancun * pin token addresses using vm.etch * snapshots * forge fmt * remove via-ir and custom solc from CI * test nit * Update v4-core submodule to use https (#97) Co-authored-by: saucepoint <[email protected]> * chore: add semgrep (#94) * [Chore] Update v4-core:latest (#100) * Update v4-core * Update various examples, BaseHook, Quoter and tests * Remove nested locking for LimitOrder * Fix Quoter * update v4-core * fix: remove getLocker as its a bool now * update v4-core: flipped signs, push dynamic fees * fix: flip delta signs * flip delta signs * flip delta signs * flip delta signs * fix getSlot0 calls * snapshots * remove deadcode * remove unused param * update core * update for modifyLiquidity; misc doc updates * correct min int256 * allow for manual fee updates --------- Co-authored-by: saucepoint <[email protected]> * changes with core update * fix casing * switch versions back * Updated lib/v4-core submodule to main branch * switch to 0.8.19 --------- Co-authored-by: Zach Yang <[email protected]> Co-authored-by: Mark Toda <[email protected]> Co-authored-by: Tina <[email protected]> Co-authored-by: Sara Reynolds <[email protected]> Co-authored-by: saucepoint <[email protected]> Co-authored-by: 0x57 <[email protected]> Co-authored-by: mr-uniswap <[email protected]> Co-authored-by: 0x57 <[email protected]> Co-authored-by: saucepoint <[email protected]> Co-authored-by: Alice Henshaw <[email protected]> * update imports --------- Co-authored-by: Mark Toda <[email protected]> Co-authored-by: Tina <[email protected]> Co-authored-by: Sara Reynolds <[email protected]> Co-authored-by: Emily Williams <[email protected]> Co-authored-by: Alice Henshaw <[email protected]> Co-authored-by: diana <[email protected]> Co-authored-by: saucepoint <[email protected]> Co-authored-by: 0x57 <[email protected]> Co-authored-by: mr-uniswap <[email protected]> Co-authored-by: 0x57 <[email protected]> Co-authored-by: saucepoint <[email protected]>

* start routing * start routing contract * naive swapExactIn impl * lint + bytecode snapshot * change concept of hops to token hops * UniswapV4Routing --> Routing * use PathKey * exactInputSingle * save DRY progress * no sqrtPriceLimit for multipool hops * exactOut implemented w awkward loops/int conversions single hops passing on exactOut * gas savings from not doing double negative number * gas savings from unchecked math * add swapExactOuputSingle * break out structs into interface * PR comments * pass hook data along * gas and coherency optimization * updated lib/v4-core submodule to main branch * feat: abstract router (#86) * add PoolTicksCounter library * quoter exact input single * quoter test * return deltas instead * safe casting to correct types * QuoteExactInput skeleton * multiple entries * break handleRevert by type * quoteExactInput and unit tests * more QuoteExactInput tests * remove lgos * remove commented out struct * via-ir in ci * remove unused imports/functions * store iteration params locally instead of editing function input * pull out sqrtPriceLimit to its own function * PathKey to its own library * rename initializedTicksCrossed to initializedTicksLoaded * remove manual abi encoding in yul :p * fix linter warnings for Quoter * natspec for IQuoter * feat: update v4-core This commit updates v4 core to latest and fixes integration issues * fix: tests * style fixes * inheritdoc * ExactInSingleBatch * fix: update tests * fix: test router was borked * exact out * fix: alice comments * fix ExactOutput * add ExactOput unit tests * add quoteExactOutputBatch * remove solhint config * remove newline * add QuoteExactOutput in interface * refactor lockAcquired * move magic numbers to constants + doc * add more natspec * natspec * named imports * self-call branching * remove old code * remove console2 import * refactor PathKeyLib * amountOutCached * inherit ILockCallback * add base contracts and interfaces (#75) * remove unused errors * test lockAcquired reverts * remove ...Batch interface * REASON -> RESPONSE when valid * complete natspec * remove SwapInfo imports * rename to SwapParameters * move quoter structs into IQuoter interface * update to latest core * use prev values * change twamm to use pool getters * changes after merging main * use --via-ir in cli * fix formatting * fix FullRange/TWAMM hook * update ticks counter * update Quoter test * typo * typo * simplify handleRevertSingle * merge QuoteInput/OutputSingle structs * combine IQuoter structs * using ... ordering * update snapshots * start routing * start routing contract * naive swapExactIn impl * lint + bytecode snapshot * change concept of hops to token hops * UniswapV4Routing --> Routing * use PathKey * exactInputSingle * save DRY progress * no sqrtPriceLimit for multipool hops * exactOut implemented w awkward loops/int conversions single hops passing on exactOut * gas savings from not doing double negative number * gas savings from unchecked math * add swapExactOuputSingle * break out structs into interface * PR comments * pass hook data along * gas and coherency optimization * merge Quoter * remove SwapIntention * IV4Router structs * remove SwapIntention * remove logs * natspec * rebase onto latest core * simplify function naming * Routing diana (#104) * feat: Revert style quoter (#73) * add PoolTicksCounter library * quoter exact input single * quoter test * return deltas instead * safe casting to correct types * QuoteExactInput skeleton * multiple entries * break handleRevert by type * quoteExactInput and unit tests * more QuoteExactInput tests * remove lgos * remove commented out struct * via-ir in ci * remove unused imports/functions * store iteration params locally instead of editing function input * pull out sqrtPriceLimit to its own function * PathKey to its own library * rename initializedTicksCrossed to initializedTicksLoaded * remove manual abi encoding in yul :p * fix linter warnings for Quoter * natspec for IQuoter * feat: update v4-core This commit updates v4 core to latest and fixes integration issues * fix: tests * style fixes * inheritdoc * ExactInSingleBatch * fix: update tests * fix: test router was borked * exact out * fix: alice comments * fix ExactOutput * add ExactOput unit tests * add quoteExactOutputBatch * remove solhint config * remove newline * add QuoteExactOutput in interface * refactor lockAcquired * move magic numbers to constants + doc * add more natspec * natspec * named imports * self-call branching * remove old code * remove console2 import * refactor PathKeyLib * amountOutCached * inherit ILockCallback * add base contracts and interfaces (#75) * remove unused errors * test lockAcquired reverts * remove ...Batch interface * REASON -> RESPONSE when valid * complete natspec * remove SwapInfo imports * rename to SwapParameters * move quoter structs into IQuoter interface * update to latest core * use prev values * change twamm to use pool getters * changes after merging main * use --via-ir in cli * fix formatting * fix FullRange/TWAMM hook * update ticks counter * update Quoter test * typo * typo * simplify handleRevertSingle * merge QuoteInput/OutputSingle structs * combine IQuoter structs * using ... ordering * update snapshots * move amountOutCached into inner call * using PathKeyLib for PathKey * fix amountOutCached * remove console2 import * resurface revert reason * clean up validateRevert * update natsppec * remove unused --------- Co-authored-by: Mark Toda <[email protected]> Co-authored-by: Tina <[email protected]> Co-authored-by: Sara Reynolds <[email protected]> * (Quoter) Avoid IR (#93) * avoid stack too deep * pack local variables into structs; remove need for IR * reorg struct * snapshots * forge fmt * restore settings * remove IR * ensure tokens are ordered properly by using salts * gas snapshot * remove console logs * chore: update v4-core:latest (#89) * update v4-core * update to new liquidity hooks * forge fmt; reuse v4-core justfile * snapshots * rename getHooksCalls --> getHookPermissions * enforce permanent liquidity with beforeRemoveLiquidity * snapshot * update v4-core (again) * snapshots with new v4-core * v4-core:latest * pin 0.8.24 * merge in remote; regenerate snapshots * remove justfile * repin cancun * pin token addresses using vm.etch * snapshots * forge fmt * remove via-ir and custom solc from CI * test nit * Update v4-core submodule to use https (#97) Co-authored-by: saucepoint <[email protected]> * chore: add semgrep (#94) * [Chore] Update v4-core:latest (#100) * Update v4-core * Update various examples, BaseHook, Quoter and tests * Remove nested locking for LimitOrder * Fix Quoter * update v4-core * fix: remove getLocker as its a bool now * update v4-core: flipped signs, push dynamic fees * fix: flip delta signs * flip delta signs * flip delta signs * flip delta signs * fix getSlot0 calls * snapshots * remove deadcode * remove unused param * update core * update for modifyLiquidity; misc doc updates * correct min int256 * allow for manual fee updates --------- Co-authored-by: saucepoint <[email protected]> * changes with core update * fix casing * switch versions back * Updated lib/v4-core submodule to main branch * switch to 0.8.19 --------- Co-authored-by: Zach Yang <[email protected]> Co-authored-by: Mark Toda <[email protected]> Co-authored-by: Tina <[email protected]> Co-authored-by: Sara Reynolds <[email protected]> Co-authored-by: saucepoint <[email protected]> Co-authored-by: 0x57 <[email protected]> Co-authored-by: mr-uniswap <[email protected]> Co-authored-by: 0x57 <[email protected]> Co-authored-by: saucepoint <[email protected]> Co-authored-by: Alice Henshaw <[email protected]> * update imports --------- Co-authored-by: Mark Toda <[email protected]> Co-authored-by: Tina <[email protected]> Co-authored-by: Sara Reynolds <[email protected]> Co-authored-by: Emily Williams <[email protected]> Co-authored-by: Alice Henshaw <[email protected]> Co-authored-by: diana <[email protected]> Co-authored-by: saucepoint <[email protected]> Co-authored-by: 0x57 <[email protected]> Co-authored-by: mr-uniswap <[email protected]> Co-authored-by: 0x57 <[email protected]> Co-authored-by: saucepoint <[email protected]> * allow payer and recipient to be different * try to fix ci * improve casting * reverting 3 commits to make branch * remove unused recipient param * remove payment logic from swap logic * factor out payment functions * gas opt removing struct * gas opt: decode in assembly * merge error * use base actions router in v4router * use isolate * merge conflicts * removing submodules * renaming to stop clashes in UR * PR comments and gas optimisations * add _getLocker * Amount field on settle and take * rename snaps * correcy casting order * Add deltaresolver to router * take_all command, remove from delta resolver * Routing test helper * Separate gas tests and regular tests * remove duplicate snapshot name * another gas test * PR comments * remove unused function * PR cmments * handle hook edgecase --------- Co-authored-by: Diana Kocsis <[email protected]> Co-authored-by: Alice Henshaw <[email protected]> Co-authored-by: Zach Yang <[email protected]> Co-authored-by: Mark Toda <[email protected]> Co-authored-by: Tina <[email protected]> Co-authored-by: Sara Reynolds <[email protected]> Co-authored-by: diana <[email protected]> Co-authored-by: saucepoint <[email protected]> Co-authored-by: 0x57 <[email protected]> Co-authored-by: mr-uniswap <[email protected]> Co-authored-by: 0x57 <[email protected]> Co-authored-by: saucepoint <[email protected]> Co-authored-by: Alice <[email protected]>

ConjunctiveNormalForm added 12 commits November 5, 2023 22:18

add PoolTicksCounter library

6313eb5

quoter exact input single

664c4ff

quoter test

d67f597

return deltas instead

ee84418

safe casting to correct types

d68e464

QuoteExactInput skeleton

bc381b0

multiple entries

3bd47d9

break handleRevert by type

f75b87a

quoteExactInput and unit tests

a69c782

more QuoteExactInput tests

4f9519f

remove lgos

7823167

remove commented out struct

e2d0c22

ConjunctiveNormalForm commented Nov 15, 2023

View reviewed changes

contracts/libraries/SwapIntention.sol Outdated Show resolved Hide resolved

via-ir in ci

6ba70f4

marktoda reviewed Nov 15, 2023

View reviewed changes

ConjunctiveNormalForm added 8 commits November 16, 2023 10:47

remove unused imports/functions

b093a78

store iteration params locally instead of editing function input

69c2c5b

pull out sqrtPriceLimit to its own function

20af595

PathKey to its own library

e3f6c7e

rename initializedTicksCrossed to initializedTicksLoaded

a8a0ed1

remove manual abi encoding in yul :p

bd22b11

fix linter warnings for Quoter

1e0277b

natspec for IQuoter

ca62ec2

marktoda reviewed Nov 16, 2023

View reviewed changes

contracts/libraries/SwapIntention.sol Outdated Show resolved Hide resolved

zhongeric reviewed Nov 16, 2023

View reviewed changes

.solhint.json Outdated Show resolved Hide resolved

contracts/lens/Quoter.sol Outdated Show resolved Hide resolved

test/Quoter.t.sol Outdated Show resolved Hide resolved

test/Quoter.t.sol Outdated Show resolved Hide resolved

marktoda and others added 5 commits November 16, 2023 16:07

feat: update v4-core

d526f75

This commit updates v4 core to latest and fixes integration issues

fix: tests

3e3ab5d

style fixes

c5b8c22

inheritdoc

1d8f14f

ExactInSingleBatch

55db578

using ... ordering

ad3a966

Base automatically changed from update-v4-core to main December 19, 2023 15:11

ConjunctiveNormalForm force-pushed the revert-quoter branch 2 times, most recently from e943501 to ad3a966 Compare December 19, 2023 16:34

ConjunctiveNormalForm added 2 commits December 19, 2023 11:35

Merge branch 'main' into revert-quoter

b098593

update snapshots

6a7882a

snreynolds self-requested a review December 19, 2023 18:24

snreynolds previously approved these changes Dec 19, 2023

View reviewed changes

marktoda previously approved these changes Dec 19, 2023

View reviewed changes

contracts/lens/Quoter.sol Show resolved Hide resolved

contracts/lens/Quoter.sol Outdated Show resolved Hide resolved

move amountOutCached into inner call

6a2b71f

ConjunctiveNormalForm dismissed stale reviews from marktoda and snreynolds via 6a2b71f December 19, 2023 21:43

using PathKeyLib for PathKey

88cbff3

zhongeric reviewed Dec 19, 2023

View reviewed changes

contracts/lens/Quoter.sol Outdated Show resolved Hide resolved

contracts/lens/Quoter.sol Show resolved Hide resolved

ConjunctiveNormalForm added 3 commits December 19, 2023 18:58

fix amountOutCached

c43f0f1

remove console2 import

f00e616

resurface revert reason

753d11a

snreynolds reviewed Dec 20, 2023

View reviewed changes

contracts/lens/Quoter.sol Outdated Show resolved Hide resolved

zhongeric reviewed Dec 20, 2023

View reviewed changes

contracts/lens/Quoter.sol Outdated Show resolved Hide resolved

ConjunctiveNormalForm added 3 commits December 20, 2023 17:43

clean up validateRevert

386a957

update natsppec

91c018e

remove unused

a657d5c

snreynolds self-requested a review December 20, 2023 22:49

snreynolds approved these changes Dec 20, 2023

View reviewed changes

ConjunctiveNormalForm merged commit 63d64fc into main Dec 20, 2023
2 checks passed

ConjunctiveNormalForm deleted the revert-quoter branch December 20, 2023 23:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Revert style quoter #73

feat: Revert style quoter #73

ConjunctiveNormalForm commented Nov 15, 2023 •

edited

Loading

marktoda left a comment

snreynolds left a comment

snreynolds left a comment

feat: Revert style quoter #73

feat: Revert style quoter #73

Conversation

ConjunctiveNormalForm commented Nov 15, 2023 • edited Loading

Which issue does this pull request resolve?

Description of changes

marktoda left a comment

Choose a reason for hiding this comment

snreynolds left a comment

Choose a reason for hiding this comment

snreynolds left a comment

Choose a reason for hiding this comment

ConjunctiveNormalForm commented Nov 15, 2023 •

edited

Loading