Skip to content

Commit

Permalink
Constrain UI swapping to valid swaps (#421)
Browse files Browse the repository at this point in the history 
* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

* Clear active account on disconnect

* Added interim connecting captions for wallet loading

* Fixed issue with button showing connecting

* Fixed NaN issue in Holdings tab

* Fixed issue with token balances updating

* Check for null user address on token update to reduce errors to the console

* Filtered out 204 responses from tzkt for volumes

* Updated About page

* Updated About page

* Added nix flake for project

* Added skeleton ts project

* Added initial skeleton for tg bot

* Added html formatting to rates messages

* Added raw operation socker sub

* Added deposit op to bot

* Corrected tick filter

* Corrected deposit format for TG bot

* Corrected deposit amount for TG bot

* Corrected deposit amount for TG bot

* Scaled amount for TG bot

* Added sedning of raw big map

* Corrected pair naming

* Corrected scaling from rates message

* Use all socket messages

* PArse non formated big maps to json

* Filtered user_batch_ordertypes from big_map updates

* Expanded log message

* Added additional logging for bot

* Changed filters on socket messages

* Changed filters on socket messages

* Changed filters on socket messages

* Changed filters on socket messages

* Filter for transaction that are contract calls

* Filter for transaction that are contract calls

* Log ops received from socket

* Corrected filter

* Added skeleton for batch updates

* Added batch update formatter showing volumes

* Assisting compiler

* Corrected json path in batch change

* Corrected html encoding for batch change

* Tidy up on logging

* Corrected object path for cleared message

* Added rate name into batch status message

* Corrected closing message detail

* Added filter on messages

* remove node_modules folder from repo by rewriting history (squash things from commit 706dd9 to 5c5816)

List of squashed commits:
Amended token update urls to include token addresses (#323)
Filtered out 0 vol status updates and added docker bot image builds
Corrected entrypoint commands for bot images
Added node_modules in sub dirs to gitignore
Merge branch 'main' of github.com:marigold-dev/batcher
Added mainnet and ghostnet docker files for telegram bot

* telegram bot for mainnet version (#333)

* pipelines: rework docker build process

* Ghostnet - Release (#307)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Release to Ghostnet (#310)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Release - Ghostnet (#312)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Mainnet - Release (#308)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Release - Ghostnet (#315)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Mainnet - Release (#308)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Mainnet (#311)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

* Release - Mainnet (#313)

* pipelines: rework docker build process

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Ghostnet - Release (#307)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Ghostnet (#310)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Added interim connecting captions for wallet loading

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Release - Ghostnet (#316)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Mainnet - Release (#308)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Mainnet (#311)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

* Release - Mainnet (#313)

* pipelines: rework docker build process

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Ghostnet - Release (#307)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Ghostnet (#310)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Added interim connecting captions for wallet loading

* Fixed issue with button showing connecting

* Fixed NaN issue in Holdings tab

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Release - Ghostnet (#318)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Mainnet - Release (#308)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Mainnet (#311)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

* Release - Mainnet (#313)

* pipelines: rework docker build process

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Ghostnet - Release (#307)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Ghostnet (#310)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Added interim connecting captions for wallet loading

* Release - Mainnet (#314)

* pipelines: rework docker build process

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Ghostnet - Release (#307)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Ghostnet (#310)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

* Added interim connecting captions for wallet loading

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Fixed issue with button showing connecting

* Fixed NaN issue in Holdings tab

* Fixed issue with token balances updating

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* pipelines: patch deprecated set-output commands and actions [skip ci]

* telegram bot for ghostnet version (#332)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Mainnet - Release (#308)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Mainnet (#311)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

* Release - Mainnet (#313)

* pipelines: rework docker build process

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Ghostnet - Release (#307)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Ghostnet (#310)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Added interim connecting captions for wallet loading

* Release - Mainnet (#314)

* pipelines: rework docker build process

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Ghostnet - Release (#307)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Ghostnet (#310)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

* Added interim connecting captions for wallet loading

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Fixed issue with button showing connecting

* Fixed NaN issue in Holdings tab

* Release - Mainnet (#317)

* pipelines: rework docker build process

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Ghostnet - Release (#307)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Ghostnet (#310)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

* Release - Ghostnet (#312)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Mainnet - Release (#308)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Added interim connecting captions for wallet loading

* Release - Ghostnet (#315)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Mainnet - Release (#308)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Mainnet (#311)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

* Release - Mainnet (#313)

* pipelines: rework docker build process

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Ghostnet - Release (#307)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Ghostnet (#310)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Added interim connecting captions for wallet loading

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Fixed issue with button showing connecting

* Fixed NaN issue in Holdings tab

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Fixed issue with token balances updating

* Check for null user address on token update to reduce errors to the console

* Filtered out 204 responses from tzkt for volumes

* Updated About page

* Updated About page

* Added nix flake for project

* Added skeleton ts project

* Added initial skeleton for tg bot

* Added html formatting to rates messages

* Added raw operation socker sub

* Added deposit op to bot

* Corrected tick filter

* Corrected deposit format for TG bot

* Corrected deposit amount for TG bot

* Corrected deposit amount for TG bot

* Scaled amount for TG bot

* Added sedning of raw big map

* Corrected pair naming

* Corrected scaling from rates message

* Use all socket messages

* PArse non formated big maps to json

* Filtered user_batch_ordertypes from big_map updates

* Expanded log message

* Added additional logging for bot

* Changed filters on socket messages

* Changed filters on socket messages

* Changed filters on socket messages

* Changed filters on socket messages

* Filter for transaction that are contract calls

* Filter for transaction that are contract calls

* Log ops received from socket

* Corrected filter

* Added skeleton for batch updates

* Added batch update formatter showing volumes

* Assisting compiler

* Corrected json path in batch change

* Corrected html encoding for batch change

* Tidy up on logging

* Corrected object path for cleared message

* Added rate name into batch status message

* Corrected closing message detail

* Added filter on messages

* remove node_modules folder from repo by rewriting history (squash things from commit 706dd9 to 5c5816)

List of squashed commits:
Amended token update urls to include token addresses (#323)
Filtered out 0 vol status updates and added docker bot image builds
Corrected entrypoint commands for bot images
Added node_modules in sub dirs to gitignore
Merge branch 'main' of github.com:marigold-dev/batcher
Added mainnet and ghostnet docker files for telegram bot

---------

Co-authored-by: Jason Ridgway-Taylor <jason@glottologist.co.uk>
Co-authored-by: Jason Ridgway-Taylor (~misfur-mondut) <57174310+glottologist@users.noreply.github.com>

* pipelines: fix ci of bot notif

---------

Co-authored-by: Jason Ridgway-Taylor (~misfur-mondut) <57174310+glottologist@users.noreply.github.com>
Co-authored-by: Jason Ridgway-Taylor <jason@glottologist.co.uk>

* Corrected mainnet variables

* Corrections for batcher notifications bot (mainnet)  (#335)

* pipelines: rework docker build process

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Ghostnet - Release (#307)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Ghostnet (#310)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

* Release - Ghostnet (#312)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Mainnet - Release (#308)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Added interim connecting captions for wallet loading

* Release - Ghostnet (#315)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Mainnet - Release (#308)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Mainnet (#311)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

* Release - Mainnet (#313)

* pipelines: rework docker build process

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Ghostnet - Release (#307)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Ghostnet (#310)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Added interim connecting captions for wallet loading

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Fixed issue with button showing connecting

* Fixed NaN issue in Holdings tab

* Release - Ghostnet (#316)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Mainnet - Release (#308)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Mainnet (#311)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

* Release - Mainnet (#313)

* pipelines: rework docker build process

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Ghostnet - Release (#307)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Ghostnet (#310)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Added interim connecting captions for wallet loading

* Fixed issue with button showing connecting

* Fixed NaN issue in Holdings tab

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Fixed issue with token balances updating

* Release - Ghostnet (#318)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Mainnet - Release (#308)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Mainnet (#311)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

* Release - Mainnet (#313)

* pipelines: rework docker build process

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Ghostnet - Release (#307)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Ghostnet (#310)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Added interim connecting captions for wallet loading

* Release - Mainnet (#314)

* pipelines: rework docker build process

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Ghostnet - Release (#307)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Ghostnet (#310)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

* Added interim connecting captions for wallet loading

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Fixed issue with button showing connecting

* Fixed NaN issue in Holdings tab

* Fixed issue with token balances updating

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Check for null user address on token update to reduce errors to the console

* Filtered out 204 responses from tzkt for volumes

* Updated About page

* Updated About page

* Added nix flake for project

* Added skeleton ts project

* Added initial skeleton for tg bot

* Added html formatting to rates messages

* Added raw operation socker sub

* Added deposit op to bot

* Corrected tick filter

* Corrected deposit format for TG bot

* Corrected deposit amount for TG bot

* Corrected deposit amount for TG bot

* Scaled amount for TG bot

* Added sedning of raw big map

* Corrected pair naming

* Corrected scaling from rates message

* Use all socket messages

* PArse non formated big maps to json

* Filtered user_batch_ordertypes from big_map updates

* Expanded log message

* Added additional logging for bot

* Changed filters on socket messages

* Changed filters on socket messages

* Changed filters on socket messages

* Changed filters on socket messages

* Filter for transaction that are contract calls

* Filter for transaction that are contract calls

* Log ops received from socket

* Corrected filter

* Added skeleton for batch updates

* Added batch update formatter showing volumes

* Assisting compiler

* Corrected json path in batch change

* Corrected html encoding for batch change

* Tidy up on logging

* Corrected object path for cleared message

* Added rate name into batch status message

* Corrected closing message detail

* Added filter on messages

* pipelines: patch deprecated set-output commands and actions [skip ci]

* remove node_modules folder from repo by rewriting history (squash things from commit 706dd9 to 5c5816)

List of squashed commits:
Amended token update urls to include token addresses (#323)
Filtered out 0 vol status updates and added docker bot image builds
Corrected entrypoint commands for bot images
Added node_modules in sub dirs to gitignore
Merge branch 'main' of github.com:marigold-dev/batcher
Added mainnet and ghostnet docker files for telegram bot

* telegram bot for ghostnet version (#332)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Mainnet - Release (#308)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Mainnet (#311)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

* Release - Mainnet (#313)

* pipelines: rework docker build process

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Ghostnet - Release (#307)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Ghostnet (#310)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Added interim connecting captions for wallet loading

* Release - Mainnet (#314)

* pipelines: rework docker build process

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Ghostnet - Release (#307)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Ghostnet (#310)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

* Added interim connecting captions for wallet loading

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Fixed issue with button showing connecting

* Fixed NaN issue in Holdings tab

* Release - Mainnet (#317)

* pipelines: rework docker build process

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Ghostnet - Release (#307)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Ghostnet (#310)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

* Release - Ghostnet (#312)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Mainnet - Release (#308)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Added interim connecting captions for wallet loading

* Release - Ghostnet (#315)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Mainnet - Release (#308)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Mainnet (#311)

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

* Release - Mainnet (#313)

* pipelines: rework docker build process

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Ghostnet - Release (#307)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Corrected Network type and mainnet token hash

* Release to Ghostnet (#310)

* Added mainnet admin and oracle address

* Correct mainnet build

* Pointed to mainnet contract

* Corrected UI error code parsing

* pipelines: rework docker build process

* pipelines: rework docker build process

* Corrected pair name on mainnet and admin address on both nets

* Added new mainnet contract hash

* pipelines: commit to trigger cicd

* pipelines: commit to trigger cicd (#306)

* Added michelson files to repo for both mainnet and ghostnet

* Added metadata file

* Fixed issue with wallet disconnecting

* Correctly assigned wallet after reload

* Corrected open and closed holdings

* Corrected Network type and mainnet token hash

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Added interim connecting captions for wallet loading

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Fixed issue with button showing connecting

* Fixed NaN issue in Holdings tab

---------

Co-authored-by: Cyril B <cyril.bourdet.pro@gmail.com>

* Fixed issue with token balances updating

* Check for null user address on token update to reduce errors to the console

* Filtered out 204 responses from tzkt for volumes

* Updated About page

* Updated About page

* Added nix flake for project

* Added skeleton ts project

* Added initial skeleton for tg bot

* Added html formatting to rates messages

* Added raw operation socker sub

* Added deposit op to bot

* Corrected tick filter

* Corrected deposit format for TG bot

* Corrected deposit amount for TG bot

* Corrected deposit amount for TG bot

* Scaled amount for TG bot

* Added sedning of raw big map

* Corrected pair naming

* Corrected scaling from rates message

* Use all socket messages

* PArse non formated big maps to json

* Filtered user_batch_ordertypes from big_map updates

* Expanded log message

* Added additional logging for bot

* Changed filters on socket messages

* Changed filters on socket messages

* Changed filters on socket messages

* Changed filters on socket messages

* Filter for transaction that are contract calls

* Filter for transaction that are contract calls

* Log ops received from socket

* Corrected filter

* Added skeleton for batch updates

* Added batch update formatter showing volumes

* Assisting compiler

* Corrected json path in batch change

* Corrected html encoding for batch change

* Tidy up on logging

* Corrected object path for cleared message

* Added rate name into batch status mess…
  • Loading branch information
@glottologist @cyrilevos
@aguillon @ulrikstrid @Laucans @quentin-burg
8 people committed Nov 26, 2023
1 parent ca19585 commit c76897d
Show file tree
Hide file tree
Showing 12 changed files with 343 additions and 203 deletions.
18 changes: 17 additions & 1 deletion batcher-ui/src/actions/exchange.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
PriceStrategy,
Token,
ValidSwap,
DisplayToken,
} from '@/types';

export const updatePriceStrategy = (priceStrategy: PriceStrategy) =>
Expand Down Expand Up @@ -136,6 +137,19 @@ export const getSwaps = () =>
type: 'GET_SWAPS',
}) as const;

export const updateDisplayTokens = (
display_tokens: Map<string, DisplayToken>
) =>
({
type: 'UPDATE_DISPLAY_TOKENS',
payload: { display_tokens },
}) as const;

export const getDisplayTokens = () =>
({
type: 'GET_DISPLAY_TOKENS',
}) as const;

export type ExchangeActions =
| ReturnType<typeof updatePriceStrategy>
| ReturnType<typeof reverseSwap>
Expand All @@ -157,4 +171,6 @@ export type ExchangeActions =
| ReturnType<typeof getTokens>
| ReturnType<typeof updateTokens>
| ReturnType<typeof getSwaps>
| ReturnType<typeof updateSwaps>;
| ReturnType<typeof updateSwaps>
| ReturnType<typeof getDisplayTokens>
| ReturnType<typeof updateDisplayTokens>;
14 changes: 10 additions & 4 deletions batcher-ui/src/commands/events.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,15 @@ export const newEventCmd = (event: BigMapEvent, toks: Map<string, Token>) => {
//! oracle price has changed
const data = eventData.content.value as RatesCurrentBigmap;
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(data.swap.to.decimals),
sellDecimals: parseInt(data.swap.from.token.decimals),
buyDecimals: buyTokenDecimals,
sellDecimals: sellTokenDecimals,
})
)
);
Expand All @@ -87,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,
})
)
);
Expand Down
43 changes: 36 additions & 7 deletions batcher-ui/src/commands/exchange.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import {
getTimeDifferenceInMs,
getTokens,
getSwaps,
ensureMapTypeOnTokens,
} from '@/utils/utils';
import { getPairsInformation } from '@/utils/token-manager';
import { getPairsInformation, getTokensMetadata } from '@/utils/token-manager';
import {
updateBatchNumber,
updateBatcherStatus,
Expand All @@ -21,19 +22,22 @@ import {
newError,
updateTokens,
updateSwaps,
updateDisplayTokens,
} from '@/actions';
import {
BatcherStatus,
CurrentSwap,
SwapNames,
Token,
ValidSwap,
ExchangeState,
DisplayToken,
} from '@/types';

const fetchPairInfosCmd = (pair: string) =>
const fetchPairInfosCmd = (state: ExchangeState, pair: string) =>
Cmd.run(
() => {
return getPairsInformation(pair);
return getPairsInformation(pair, state.currentSwap);
},
{
successActionCreator: updatePairsInfos,
Expand Down Expand Up @@ -85,15 +89,23 @@ const setupBatcherCmd = (startTime: string | null, status: BatcherStatus) => {
return Cmd.none;
};

const fetchOraclePriceCmd = (tokenPair: string, { swap }: CurrentSwap) => {
const fetchOraclePriceCmd = (
tokenPair: string,
tokens: Map<string, Token>,
{ swap }: CurrentSwap
) => {
return Cmd.run(
async () => {
console.info('TokenPair', tokenPair);
const rates = await getCurrentRates(tokenPair);
console.info('Rates', rates);
return computeOraclePrice(rates[0].rate, {
buyDecimals: swap.to.decimals,
sellDecimals: swap.from.token.decimals,
const rate = rates[0];
const tokensMapped = ensureMapTypeOnTokens(tokens);
const to = tokensMapped.get(rate.swap.to);
const from = tokensMapped.get(rate.swap.from);
return computeOraclePrice(rate.rate, {
buyDecimals: to?.decimals || 0,
sellDecimals: from?.decimals || 0,
});
},
{
Expand Down Expand Up @@ -151,6 +163,22 @@ const fetchSwapsCmd = () => {
);
};

const fetchDisplayTokensCmd = () => {
return Cmd.run(
async () => {
const tokensMetadata = await getTokensMetadata();

const mapped: Map<string, DisplayToken> =
tokensMetadata as unknown as Map<string, DisplayToken>;
console.info('Mapped tokens', mapped);
return mapped;
},
{
successActionCreator: updateDisplayTokens,
failActionCreator: (e: string) => newError(e),
}
);
};

export {
fetchPairInfosCmd,
Expand All @@ -161,4 +189,5 @@ export {
fetchVolumesCmd,
fetchTokensCmd,
fetchSwapsCmd,
fetchDisplayTokensCmd,
};
2 changes: 2 additions & 0 deletions batcher-ui/src/components/batcher/BatcherInfo.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ import {
batcherStatusSelector,
currentPairSelector,
oraclePriceSelector,
oraclePairSelector,
remainingTimeSelector,
} from '@/reducers';
import { BatcherStatus } from '@/types';

const BatcherInfo = () => {
const tokenPair = useSelector(currentPairSelector);
const oraclePair = useSelector(oraclePairSelector);
const batchNumber = useSelector(batchNumberSelector);

const status = useSelector(batcherStatusSelector);
Expand Down
89 changes: 42 additions & 47 deletions batcher-ui/src/components/batcher/Exchange.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ const Exchange = () => {
return;
}

const tokenName = isReverse ? swap.to.name : swap.from.token.name;
const tokenName = isReverse ? swap.to.name : swap.from.name;

const selectedToken = isReverse ? swap.to : swap.from.token;
const selectedToken = isReverse ? swap.to : swap.from;

const batcherContract = await tezos.wallet.at(batcherContractHash);

Expand All @@ -92,11 +92,11 @@ const Exchange = () => {
selectedToken.address,
compose(tzip12, tzip16)
);
const tokenId = isReverse ? swap.to.tokenId : swap.from.token.tokenId;
const tokenId = isReverse ? swap.to.tokenId : swap.from.tokenId;

const scaled_amount = isReverse
? scaleAmountUp(amount, swap.to.decimals)
: scaleAmountUp(amount, swap.from.token.decimals);
: scaleAmountUp(amount, swap.from.decimals);

const tolerance = toTolerance(isReverse, priceStategy);

Expand Down Expand Up @@ -133,16 +133,13 @@ const Exchange = () => {
amount: scaleAmountUp(amount, currentSwap.swap.to.decimals),
},
to: {
...currentSwap.swap.from.token,
...currentSwap.swap.from,
},
}
: {
from: {
token: { ...currentSwap.swap.from.token },
amount: scaleAmountUp(
amount,
currentSwap.swap.from.token.decimals
),
token: { ...currentSwap.swap.from },
amount: scaleAmountUp(amount, currentSwap.swap.from.decimals),
},
to: {
...currentSwap.swap.to,
Expand All @@ -155,19 +152,20 @@ const Exchange = () => {
tolerance,
};

console.info("SWAP PARAMS", swap_params);
console.info('SWAP PARAMS', swap_params);


if (selectedToken.standard === 'FA1.2 token') {
if (!swap.from.token.address) {
if (!swap.from.address) {
dispatch(
newError(
`Can\t retrieve token contract address for ${swap.from.token.name}`
`Can\t retrieve token contract address for ${swap.from.name}`
)
);
return;
}
const tokenfa12Contract = await tezos?.wallet.at(
swap.from.token.address,
swap.from.address,
compose(tzip12, tzip16)
);

Expand Down Expand Up @@ -232,13 +230,13 @@ const Exchange = () => {
dispatch(
newError(
`Deposit failed for token ${
isReverse ? swap.to.name : swap.from.token.name
isReverse ? swap.to.name : swap.from.name
}`
)
);
throw new Error(
`Failed to deposit ${
isReverse ? swap.to.name : swap.from.token.name
isReverse ? swap.to.name : swap.from.name
} token.`
);
} else {
Expand Down Expand Up @@ -268,29 +266,31 @@ const Exchange = () => {
onSubmit={event => {
event.preventDefault();
depositToken();
}}>
}}
>
<Form.Field name="amount">
<SelectPair isFrom />
<div className="flex items-baseline justify-between">
<Form.Label className="text-xl font-medium text-white">
{`From ${
isReverse
? currentSwap.swap.to.name
: currentSwap.swap.from.token.name
? currentSwap.swap.to?.name
: currentSwap.swap.from?.name
}`}
<p className="text-sm mb-2">
{`Balance : ${
isReverse
? userBalances[currentSwap.swap.to.name.toUpperCase()] ||
0
? userBalances[
currentSwap.swap.to?.name?.toUpperCase()
] || 0
: userBalances[
currentSwap.swap.from.token.name.toUpperCase()
currentSwap.swap.from?.name?.toUpperCase()
] || 0
}`}
</p>
</Form.Label>
</div>
<div className="flex">
<SelectPair isFrom />
<Form.Control asChild>
<input
className="box-border w-full bg-white shadow-black inline-flex h-[35px] items-center justify-center rounded-[4px] px-[10px] text-[15px] leading-none text-black outline-none [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
Expand All @@ -307,12 +307,14 @@ const Exchange = () => {
</div>
<Form.Message
className="text-[13px] text-primary opacity-[0.8]"
match={'valueMissing'}>
match={'valueMissing'}
>
Please input your amount
</Form.Message>
<Form.Message
className="text-[13px] text-primary opacity-[0.8]"
match={'badInput'}>
match={'badInput'}
>
Invalid input.
</Form.Message>
<Form.Message
Expand All @@ -321,12 +323,13 @@ const Exchange = () => {
return (
(isReverse &&
Number.parseFloat(value) >
userBalances[swap.to.name.toUpperCase()]) ||
userBalances[swap.to?.name?.toUpperCase()]) ||
(!isReverse &&
Number.parseFloat(value) >
userBalances[swap.from.token.name.toUpperCase()])
userBalances[swap.from?.name?.toUpperCase()])
);
}}>
}}
>
Greater than the balance.
</Form.Message>
</Form.Field>
Expand All @@ -339,7 +342,8 @@ const Exchange = () => {
setAnimate(true);
dispatch(reverseSwap());
}}
onAnimationEnd={() => setAnimate(false)}>
onAnimationEnd={() => setAnimate(false)}
>
<FontAwesomeIcon
size="2xl"
icon={faArrowRightArrowLeft}
Expand All @@ -352,39 +356,30 @@ const Exchange = () => {
<Form.Label className="text-xl font-medium leading-[35px] text-white">
{`To ${
isReverse
? currentSwap.swap.from.token.name
: currentSwap.swap.to.name
? currentSwap.swap.from?.name
: currentSwap.swap.to?.name
}`}
<p className="text-sm mb-2">
{`Balance : ${
isReverse
? userBalances[
currentSwap.swap.from.token.name.toUpperCase()
currentSwap.swap.from?.name?.toUpperCase()
] || 0
: userBalances[
currentSwap.swap.to?.name?.toUpperCase()
] || 0
: userBalances[currentSwap.swap.to.name.toUpperCase()] ||
0
}`}
</p>
</Form.Label>
</div>
<div className="flex">
<SelectPair isFrom={false} />
<Form.Control asChild>
<input
className="box-border w-full cursor-not-allowed bg-white shadow-black inline-flex h-[35px] items-center justify-center rounded-[4px] px-[10px] text-[15px] leading-none text-black outline-none [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
type="number"
min={0}
disabled
required
/>
</Form.Control>
</div>
<div className="flex"></div>
</Form.Field>

<Form.Submit asChild>
<button
disabled={!userAddress || batcherStatus === BatcherStatus.CLOSED}
className="text-white h-10 disabled:cursor-not-allowed cursor-pointer disabled:bg-lightgray items-center justify-center rounded bg-primary px-4 mt-8 text-xl self-center">
className="text-white h-10 disabled:cursor-not-allowed cursor-pointer disabled:bg-lightgray items-center justify-center rounded bg-primary px-4 mt-8 text-xl self-center"
>
Swap
</button>
</Form.Submit>
Expand Down
Loading

0 comments on commit c76897d

Please sign in to comment.