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.

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

Constrained UI swapping to valid swaps #420

Closed
Changes from 1 commit
Commits
Show all changes
167 commits
Select commit Hold shift + click to select a range
8495a5d
344 reduce duplication in contract storage (#351)
glottologist Jun 9, 2023
d895076
Fixed merge issues
glottologist Jun 9, 2023
a71b585
346 only open batches on first trade (#371)
glottologist Jun 20, 2023
80eea91
Moved burn from deposit. Allowed redemption to calculate how much of…
glottologist Jun 20, 2023
d6ccd0a
327-move-fees style suggestion (#373)
aguillon Jun 20, 2023
0a660bb
Release new contract to Ghostnet due to faucet changes (#374)
glottologist Jun 26, 2023
9cba481
345 remove batches from bigmap imp2 (#377)
glottologist Jul 11, 2023
60cf52f
380 add documentation (#381)
glottologist Jul 13, 2023
fa6bd9a
380 add documentation (#382)
glottologist Jul 13, 2023
d1f67d4
Cancellations (#375)
glottologist Jul 17, 2023
0d53644
add google analytics tracking (#385)
cyrilevos Jul 25, 2023
4f62ac1
edit pipelines [skip ci]
cyrilevos Jul 25, 2023
f6cc409
Revive tests (#384)
glottologist Aug 8, 2023
fa5ab1d
w
glottologist Aug 9, 2023
612c9b8
[1
glottologist Aug 9, 2023
e24bb8b
Added market maker doc
glottologist Aug 10, 2023
e737e4b
Added market maker doc
glottologist Aug 10, 2023
31d2879
Added Add Liquidity enpoint
glottologist Aug 14, 2023
ea94b98
Added test for adding liquidity
glottologist Aug 14, 2023
ee3d7cf
Add liquidity to market maker and test
glottologist Aug 22, 2023
8e2097b
Added add/remove liquidity and claim rewards tests. Added view for g…
glottologist Aug 30, 2023
9f2ad10
Current mainnet contract (#393)
glottologist Aug 31, 2023
ed3aa21
Current mainnet contract (#395)
quentin-burg Sep 1, 2023
75f3372
edit pipeline to create a docker image for beta version. [skip ci]
cyrilevos Sep 4, 2023
0bf9f33
Upgrade Batcher UI (#388)
quentin-burg Sep 4, 2023
fa693fc
:wrench: update github workflow with staging branch instead of featur…
Sep 5, 2023
78c6d1a
:bug: fix volumes update when received an event from bigmap
Sep 5, 2023
5fe3184
Improve requests (#398)
quentin-burg Sep 6, 2023
22a34ee
:recycle: remove tzkt SDK
Sep 6, 2023
c993ef5
:bug: get fees amount from storage before deposit tokens
Sep 6, 2023
e9a60b5
:recycle: improve check status from http request
Sep 6, 2023
bf17a14
:mag: write open graph metadata
Sep 7, 2023
1cc383e
:sparkles: add token icon in swap selector
Sep 7, 2023
8f0d7ec
:bento: add tzbtc icon in local
Sep 7, 2023
43ebce3
Started splitting market maker off into own contract
glottologist Sep 7, 2023
7528a6a
Seperated out tests
glottologist Sep 7, 2023
5a60310
Merged makefile
glottologist Sep 7, 2023
e4901b7
:construction: test og metadata
Sep 7, 2023
b00afdb
:sparkles add tooltip on price strategy
Sep 7, 2023
7d5f7c3
Split out mm contract from Batcher and pulled out common code into sh…
glottologist Sep 7, 2023
3480734
Amended tests to work with new split contracts
glottologist Sep 8, 2023
a9515a6
:sparkles: select tokens both side
Sep 8, 2023
9577d3b
:sparkles: add toasts for error and info
Sep 8, 2023
d71e47d
:green_heart: try to fix CI failure
Sep 8, 2023
d855fd1
:wrench: choose the right network depending on network targeted
Sep 11, 2023
3b94cce
:construction: try to fix CI
Sep 11, 2023
5b48165
:bug: fix issues with holdings and improve other things
Sep 11, 2023
bba18f5
:recycle: upgrade taquito
Sep 11, 2023
9746649
favicon is missing
Sep 12, 2023
4a8ceda
Populated ghostnet storage for marketmaker
glottologist Sep 12, 2023
71d5b8f
Added get market holdings mechanism
glottologist Sep 12, 2023
4686b2a
Added user holdings display and buttons for MM
glottologist Sep 13, 2023
bf30e3c
Added contract calls
glottologist Sep 14, 2023
85a1330
Added Batcher modifications to handle fee payouts and makring a batch…
glottologist Sep 18, 2023
ec93d7b
Added placeholders for market vault operations against batcher
glottologist Sep 18, 2023
620fe4c
Added rebalancing up to amount exchange
glottologist Sep 21, 2023
f73d70c
Added redemption of holdings
glottologist Sep 21, 2023
248f03d
Added operator and deposit ops to utils
glottologist Sep 22, 2023
655474f
Added approve, deposit and revoke operations to the market maker
glottologist Sep 25, 2023
e7a5f3e
Added liquidity injection for market maker
glottologist Sep 26, 2023
5d7c487
Added additional tokens
glottologist Oct 5, 2023
a9666bd
Set up new pairs in ghostnet storage
glottologist Oct 5, 2023
fe06661
Added new tokens and pairs into market maker
glottologist Oct 5, 2023
e16af2b
Added new ghostnet batcher contract to mm storage
glottologist Oct 5, 2023
d48eb01
Added new ghostnet mm address to batcher ghostnet storage
glottologist Oct 5, 2023
5696905
Added new ghhostnet addresses to the config
glottologist Oct 5, 2023
d6c815f
Fix issue cmm (#407)
quentin-burg Oct 5, 2023
c77cc8a
Added redeem by batch
glottologist Oct 5, 2023
83f7a11
Fix CMM UI (#408)
quentin-burg Oct 5, 2023
9c8c05f
Merge branch 'release-ghostnet-beta' into 389-community-market-maker-1
glottologist Oct 5, 2023
abb052c
389 community market maker 1 (#409)
glottologist Oct 6, 2023
ef68ee8
Fixed merge issues, rebuilt to deploy
glottologist Oct 6, 2023
2c6cd69
Added measure for mm contract
glottologist Oct 6, 2023
2284c2b
Skeleton token manager
glottologist Oct 10, 2023
ecb47a7
Added vault contract and moved michelson output to own folder
glottologist Oct 13, 2023
b1959ca
Test types
glottologist Oct 17, 2023
895f627
Adjusted Batcher to support calling the token manager
glottologist Oct 17, 2023
c04dd01
Removed unused code in Batcher
glottologist Oct 17, 2023
2f6ea0c
Added fee map insteand of single market maker address
glottologist Oct 17, 2023
44255d2
:recycle: fix swap pair management to ensure swap is valid
Oct 6, 2023
97dc418
Added liquidity injection to Vault
glottologist Oct 17, 2023
33d87c2
Added reward distribution in vaults
glottologist Oct 23, 2023
5467257
Amended clean mechanism in makefule
glottologist Oct 23, 2023
213dc1b
Added liquidity injection request into market maker
glottologist Oct 24, 2023
a763aed
Fixed getting native tokens view call from vaults
glottologist Oct 24, 2023
bdedb9c
Fixed bug in upsert methods
glottologist Oct 24, 2023
4a4c782
Added a build step to build all contracts
glottologist Oct 24, 2023
08834cc
Fixed issue on makefile and tzbtc vault storage
glottologist Oct 24, 2023
55ace34
Added new vault endpoint call into Batcher for adding rewards to the …
glottologist Oct 24, 2023
06a7181
Added vault balance requests after add or remove liquidity and liquid…
glottologist Oct 25, 2023
f571a33
Removed balance assertion from deposit for testing
glottologist Oct 25, 2023
01be131
Removed foreign token assertions for testing
glottologist Oct 26, 2023
a60de19
Fixed silly token standard parsing error
glottologist Oct 26, 2023
9bd5d79
Fixed silly token standard parsing error
glottologist Oct 26, 2023
a2aa960
Fixed silly token standard parsing error
glottologist Oct 26, 2023
49de0db
Compile all for ghostnet
glottologist Oct 26, 2023
e917111
Moved assert balances into its own entry
glottologist Oct 28, 2023
6b4c980
Added clause to test batch for liquidity
glottologist Oct 28, 2023
a4103f6
Removed todo clause
glottologist Oct 28, 2023
a9c1535
Added debug view to vault to test token balance endpoints
glottologist Oct 30, 2023
fa03d3d
Adjusted callback types
glottologist Oct 30, 2023
ff06943
Adjusted vault process response
glottologist Oct 30, 2023
f1a85c8
Adjusted vault process response
glottologist Oct 30, 2023
690531f
Adjusted getBalance endpoint call opt
glottologist Oct 30, 2023
5600f79
Adjusted type of getBlanace response for callback
glottologist Oct 30, 2023
6f43ef4
:wrench: rewrite config due to new contracts architecture
Oct 17, 2023
af5b877
:recycle: redirect tokens management to token manager contract
Oct 17, 2023
1980265
:recycle: refactor components && fetch token vault informations
Oct 18, 2023
2f2042f
Updated ghostnet contracts in config
glottologist Oct 31, 2023
385eaed
Updated contract error codes
glottologist Oct 31, 2023
821cd20
Changed UI to support new contract structure
glottologist Nov 6, 2023
0b672f3
Added UI changes manually
glottologist Nov 7, 2023
2b73699
Updated batcher contracts to newest version
glottologist Nov 7, 2023
28fc3a5
Merge branch 'release-ghostnet-beta' into 410-further-split-out-batch…
glottologist Nov 7, 2023
67231db
Merge new UI for separate contracts (#413)
glottologist Nov 7, 2023
348e04e
Please the linter
glottologist Nov 7, 2023
f644300
cicd: edit dockerfile
cyrilevos Nov 7, 2023
7e60c32
Adjusted tick script to tick more pairs and also tick the market maker
glottologist Nov 8, 2023
3bdbdd2
Merge branch '410-further-split-out-batcher-and-mm-contracts-to-avoid…
glottologist Nov 8, 2023
e69d2fd
Amended tick operation to pull rates for all pairs
glottologist Nov 10, 2023
886cfc1
Adjusted tick script to call new unified tick endpoint and re-pointed…
glottologist Nov 10, 2023
63f315d
Repointed UI to new ghostnet contract
glottologist Nov 10, 2023
33ec6e0
Merge branch 'release-ghostnet-beta' into 410-further-split-out-batch…
glottologist Nov 10, 2023
a250476
Repoint to new Batcher beta Ghonest contract (#414)
glottologist Nov 10, 2023
590bae7
new batcher contract hash for docker file
glottologist Nov 13, 2023
a1e350a
Merge branch '410-further-split-out-batcher-and-mm-contracts-to-avoid…
glottologist Nov 13, 2023
ac2dcb9
Added get_vaults view to marketmaker and removed no_batch error on UI
glottologist Nov 13, 2023
19a6437
Repointed to new marketmaker
glottologist Nov 13, 2023
c4f5bca
Use - instead of / for swap pairs i.e. tzBTC-USDT instead of tzBTC/USDT
glottologist Nov 13, 2023
f08ca8f
Use - instead of / for swap pairs i.e. tzBTC-USDT instead of tzBTC/US…
glottologist Nov 13, 2023
115a8e3
Repointed to new marketmaker
glottologist Nov 13, 2023
8210e42
corrected tick script calls
glottologist Nov 13, 2023
267b999
corrected tick script calls
glottologist Nov 13, 2023
dcd751a
corrected tick script calls
glottologist Nov 13, 2023
d1a0c5d
corrected tick script calls
glottologist Nov 13, 2023
8484fec
corrected tick script calls
glottologist Nov 13, 2023
2c100b0
Changed ghostnet oracles
glottologist Nov 13, 2023
4d7826f
Added tokens list to exchange state and fixed Volume display
glottologist Nov 14, 2023
0e7397b
Fixed holdings display
glottologist Nov 14, 2023
8f78c0d
Fixed holdings display
glottologist Nov 14, 2023
46edd4b
Fixed linting and type issues
glottologist Nov 14, 2023
5bda817
Fixed linting and type issues
glottologist Nov 14, 2023
76a7f58
Merge branch 'release-ghostnet-beta' into 410-further-split-out-batch…
glottologist Nov 14, 2023
00ae6a2
410 further split out batcher and mm contracts to avoid size constrai…
glottologist Nov 14, 2023
0f1b5f6
Added swaps to state and fixed token selection
glottologist Nov 16, 2023
0421cc6
Merge branch '410-further-split-out-batcher-and-mm-contracts-to-avoid…
glottologist Nov 16, 2023
a4d69bd
Merge branch 'release-ghostnet-beta' into 410-further-split-out-batch…
glottologist Nov 16, 2023
a8e2ddd
Fixed Token Selection (#416)
glottologist Nov 16, 2023
45f9edb
Fixed merge issues
glottologist Nov 16, 2023
2ffcf6c
Fixed UI docker build issues
glottologist Nov 16, 2023
ce17e16
Merge branch 'release-ghostnet-beta' into 410-further-split-out-batch…
glottologist Nov 16, 2023
c2d7695
Fix UI Docker build issues (#417)
glottologist Nov 16, 2023
48e7adc
Use the swap tokens to get pair name
glottologist Nov 20, 2023
fe60680
Merge branch '410-further-split-out-batcher-and-mm-contracts-to-avoid…
glottologist Nov 20, 2023
dab0731
Repointed to new ghostnet batcher contract
glottologist Nov 20, 2023
9965f1c
Added view to get single swap
glottologist Nov 20, 2023
4f25ac7
Added view to get single swap
glottologist Nov 20, 2023
a580b81
Added view to get single swap
glottologist Nov 20, 2023
d6adea3
Added view to get pair name
glottologist Nov 20, 2023
16f4829
Changed token pair keys for BTCtz
glottologist Nov 21, 2023
0bda1a0
Changed token pair keys for BTCtz
glottologist Nov 21, 2023
c134b75
Updated ghostnet contracts
glottologist Nov 21, 2023
7ba7312
Merge branch 'release-ghostnet-beta' into 410-further-split-out-batch…
glottologist Nov 21, 2023
803c042
Cajoled the token swaps pair name to match that in Ligo
glottologist Nov 23, 2023
79d6d7b
Merge branch '410-further-split-out-batcher-and-mm-contracts-to-avoid…
glottologist Nov 23, 2023
c9378fb
Constrained UI for swapping and fixed oracle price
glottologist Nov 26, 2023
44f13f8
fixed typing on oracle calc
glottologist Nov 26, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixed typing on oracle calc
glottologist committed Nov 26, 2023
commit 44f13f8f9708229a0acb1d6a8d82dcfa043d181f
12 changes: 8 additions & 4 deletions batcher-ui/src/commands/events.ts
Original file line number Diff line number Diff line change
@@ -73,11 +73,13 @@ export const newEventCmd = (event: BigMapEvent, toks: Map<string, Token>) => {
console.info('Oracle change', data);
const buyToken = tokens.get(data.swap.from.token.name);
const sellToken = tokens.get(data.swap.to.name);
const buyTokenDecimals: number = buyToken?.decimals || 0;
const sellTokenDecimals: number = sellToken?.decimals || 0;
dispatch(
updateOraclePrice(
computeOraclePrice(data.rate, {
buyDecimals: parseInt(buyToken?.decimals) || 0,
sellDecimals: parseInt(sellToken?.decimals) || 0,
buyDecimals: buyTokenDecimals,
sellDecimals: sellTokenDecimals,
})
)
);
@@ -89,12 +91,14 @@ export const newEventCmd = (event: BigMapEvent, toks: Map<string, Token>) => {
const status = mapStatus(data);
const buyToken = tokens.get(data.pair.string_0);
const sellToken = tokens.get(data.pair.string_1);
const buyTokenDecimals: number = buyToken?.decimals || 0;
const sellTokenDecimals: number = sellToken?.decimals || 0;
dispatch(updateBatcherStatus(status));
dispatch(
updateVolumes(
toVolumes(data.volumes, {
buyDecimals: buyToken?.decimals || 0,
sellDecimals: sellToken?.decimals || 0,
buyDecimals: buyTokenDecimals,
sellDecimals: sellTokenDecimals,
})
)
);
4 changes: 2 additions & 2 deletions batcher-ui/src/commands/exchange.ts
Original file line number Diff line number Diff line change
@@ -104,8 +104,8 @@ const fetchOraclePriceCmd = (
const to = tokensMapped.get(rate.swap.to);
const from = tokensMapped.get(rate.swap.from);
return computeOraclePrice(rate.rate, {
buyDecimals: to.decimals,
sellDecimals: from.decimals,
buyDecimals: to?.decimals || 0,
sellDecimals: from?.decimals || 0,
});
},
{