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

Feat/zilswap v2 #77

Open
wants to merge 150 commits into
base: master
Choose a base branch
from
Open

Feat/zilswap v2 #77

wants to merge 150 commits into from

Conversation

kaijun123
Copy link

Completed Pool and Router Contract, except MintFee

RavenXce and others added 30 commits August 16, 2022 15:13
@RavenXce
v2 initial
c06ddca
@RavenXce
Add router scaffold
434128a
@RavenXce
Implement mint and burn
7133f65
@RavenXce
WIP swap
4bd4f11
@kaijun123
added VerifyBalanceAndUpdateEMA
d399fbd
@kaijun123
edited VerifyBalanceAndUpdateEMA
c45ffa9
@kaijun123
Added back get_val util function
6effa8a
@kaijun123
reimplemented get_final_fee
bd922ed
@kaijun123
Fixed bug with VerifyBalanceAndUpdateEMA
fae0ecc
@kaijun123
Added Skim transition
82fbf73
@kaijun123
Added Sync transition
fb9757d
@kaijun123
Added zrc2 transfer callback
c6c5003
@kaijun123
Refactored Sync transition
7aa51f1
@kaijun123
Minor formatting edits
9072e6a
@kaijun123
Minor formatting edits
b9eed92
@kaijun123
Added preliminary router test
8b9cc93
@kaijun123
Added VerifyPoolAddress for AddLiquidity
a6b3f88
@kaijun123
Added AddLiquidity to router
5eddb46
@kaijun123
Added RemoveLiquidity on Router
aea1308
@kaijun123
Half-implemented mul_in_precision on pool
c2d8ef8
@kaijun123
Added v_reserve_ratio_bounds for AddLiquidity in Router
ffad369
@kaijun123
Working AddLiquidity with test script
585d2c6
@kaijun123
Working RemoveLiquidity and test
eec8ff8
@kaijun123
Added SwapExactTokensForTokens for one pool
8b64e1a
@kaijun123
Added SwapTokensForExactTokens
df4d26b
@kaijun123
Added AddLiquidityZIL
50eaca6
@kaijun123
WIP Pool
fe8021a
@stevenkhong
Implement unsafePowInPrecision in ZilSwapPool
19dcca7
@kaijun123
Fixed unsafePowInPrecision in Pool
6886313
@kaijun123
Implemented unsafePowInPrecision into RecordVolume on Pool
b013323
kaijun123 and others added 30 commits December 22, 2022 14:26
@kaijun123
Removed comments from pool and router contracts
f69a087
@kaijun123
Removed SwapExactZILForTokensQuad from router
fd3bd10
@kaijun123
Refactored pool test to include new calculations
a9e5b4d
@kaijun123
Added params test
8626263
@kaijun123
Refactored getVReserveBound in pool test for non-amp pool
e71ee40
@kaijun123
Added fuzz test. Edited AddLiquidityZIL in router contract
da979b7
@kaijun123
Refactored all existing tests
d8b2f83
@kaijun123
Added mintFee test
627e1f5
@kaijun123
Added MintFee calculation to router. Refactored state setting
2495c68
@kaijun123
Added AddLiquidityZIL and RemoveLiquidityZIL to pool test
566ccf9
@kaijun123
Edited fuzz test to prevent same pools when swapping
a28eae7
@kaijun123
Added same pool check and invalid path check on router
baec64d
@yan-soon
add liquidity param to poolMint and poolBurn events
32a0211
@yan-soon
add scripts to deploy router and pool
0106175
@yan-soon
uncomment poolContractCheck
088e8ec
@yan-soon
fix bug for unsafe_pow_in_precision fxn
04ff2d2
@yan-soon
add fix to unsafe_pow_precision to pool contract
6c1ad8c
@yan-soon
update comments for max loop for unsafe pow
a38f444
@yan-soon
update test cases for repeated swaps and fix bug in unsafe_pow in poo…
55a30fe 
…l contract
@kaijun123
Removed unused tests
b7693c6
@yan-soon
replace max loop 128 with 256
f4b3f4e
@yan-soon
Merge branch 'feat/zilswap-v2' of github.com:Switcheo/zilswap into fe…
dd3ec91 
…at/zilswap-v2
@yan-soon
update zilswapv2 contracts wrt to changes to codehash
dd4e951
@yan-soon
add token order check in pool contract and update singleSwap tests
089c411
@yan-soon
update double and triple swap tests
8fe73b3
@yan-soon
Revert "update double and triple swap tests"
97caf68 
This reverts commit 8fe73b3.
@yan-soon
Revert "add token order check in pool contract and update singleSwap …
f8b8422 
…tests"

This reverts commit 089c411.
@yan-soon
Revert "update zilswapv2 contracts wrt to changes to codehash"
48334bf 
This reverts commit dd4e951.
@yan-soon
add checkCodeHash script and remove typo from router
99947ea
@yan-soon
add updateContractHash method to router contract
21f650a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kaijun123 @RavenXce @stevenkhong @yan-soon