Skip to content

Commit

Permalink
Fixed Token Selection (#416)
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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Corrected Network type and mainnet token hash

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <[email protected]>

* Added interim connecting captions for wallet loading

---------

Co-authored-by: Cyril B <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <[email protected]>

* Added interim connecting captions for wallet loading

* Fixed issue with button showing connecting

* Fixed NaN issue in Holdings tab

---------

Co-authored-by: Cyril B <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Clear active account on disconnect

* Added interim connecting captions for wallet loading

---------

Co-authored-by: Cyril B <[email protected]>

* Fixed issue with button showing connecting

* Fixed NaN issue in Holdings tab

* Fixed issue with token balances updating

---------

Co-authored-by: Cyril B <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Clear active account on disconnect

* Added interim connecting captions for wallet loading

---------

Co-authored-by: Cyril B <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Corrected Network type and mainnet token hash

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <[email protected]>

* Added interim connecting captions for wallet loading

---------

Co-authored-by: Cyril B <[email protected]>

* Fixed issue with button showing connecting

* Fixed NaN issue in Holdings tab

---------

Co-authored-by: Cyril B <[email protected]>

* 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 <[email protected]>
Co-authored-by: Jason Ridgway-Taylor (~misfur-mondut) <[email protected]>

* pipelines: fix ci of bot notif

---------

Co-authored-by: Jason Ridgway-Taylor (~misfur-mondut) <[email protected]>
Co-authored-by: Jason Ridgway-Taylor <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Corrected Network type and mainnet token hash

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <[email protected]>

* Added interim connecting captions for wallet loading

---------

Co-authored-by: Cyril B <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <[email protected]>

* Added interim connecting captions for wallet loading

* Fixed issue with button showing connecting

* Fixed NaN issue in Holdings tab

---------

Co-authored-by: Cyril B <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Clear active account on disconnect

* Added interim connecting captions for wallet loading

---------

Co-authored-by: Cyril B <[email protected]>

* Fixed issue with button showing connecting

* Fixed NaN issue in Holdings tab

* Fixed issue with token balances updating

---------

Co-authored-by: Cyril B <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Clear active account on disconnect

* Added interim connecting captions for wallet loading

---------

Co-authored-by: Cyril B <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Corrected Network type and mainnet token hash

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Clear active account on disconnect

---------

Co-authored-by: Cyril B <[email protected]>

* Added interim connecting captions for wallet loading

---------

Co-authored-by: Cyril B <[email protected]>

* Fixed issue with button showing connecting

* Fixed NaN issue in Holdings tab

---------

Co-authored-by: Cyril B <[email protected]>

* 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

* Correc…
  • Loading branch information
8 people authored Nov 16, 2023
1 parent 00ae6a2 commit a8e2ddd
Show file tree
Hide file tree
Showing 9 changed files with 186 additions and 23 deletions.
23 changes: 21 additions & 2 deletions batcher-ui/src/actions/exchange.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
import { BatcherStatus, CurrentSwap, PriceStrategy, Token } from '@/types';
import {
BatcherStatus,
CurrentSwap,
PriceStrategy,
Token,
ValidSwap,
} from '@/types';

export const updatePriceStrategy = (priceStrategy: PriceStrategy) =>
({
Expand Down Expand Up @@ -119,6 +125,17 @@ export const getTokens = () =>
type: 'GET_TOKENS',
}) as const;

export const updateSwaps = (swaps: Map<string, ValidSwap>) =>
({
type: 'UPDATE_SWAPS',
payload: { swaps },
}) as const;

export const getSwaps = () =>
({
type: 'GET_SWAPS',
}) as const;

export type ExchangeActions =
| ReturnType<typeof updatePriceStrategy>
| ReturnType<typeof reverseSwap>
Expand All @@ -138,4 +155,6 @@ export type ExchangeActions =
| ReturnType<typeof getVolumes>
| ReturnType<typeof updateVolumes>
| ReturnType<typeof getTokens>
| ReturnType<typeof updateTokens>;
| ReturnType<typeof updateTokens>
| ReturnType<typeof getSwaps>
| ReturnType<typeof updateSwaps>;
36 changes: 34 additions & 2 deletions batcher-ui/src/commands/exchange.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
getVolumes,
getTimeDifferenceInMs,
getTokens,
getSwaps,
} from '@/utils/utils';
import { getPairsInformation } from '@/utils/token-manager';
import {
Expand All @@ -19,8 +20,15 @@ import {
updateRemainingTime,
newError,
updateTokens,
updateSwaps,
} from '@/actions';
import { BatcherStatus, CurrentSwap, SwapNames, Token } from '@/types';
import {
BatcherStatus,
CurrentSwap,
SwapNames,
Token,
ValidSwap,
} from '@/types';

const fetchPairInfosCmd = (pair: string) =>
Cmd.run(
Expand Down Expand Up @@ -111,7 +119,10 @@ const fetchTokensCmd = () => {
return Cmd.run(
async () => {
const tokens = await getTokens();
const mapped: Map<string, Token> = ((tokens as unknown) as Map<string, Token>);
const mapped: Map<string, Token> = tokens as unknown as Map<
string,
Token
>;
console.info('Mapped tokens', mapped);
return mapped;
},
Expand All @@ -121,6 +132,26 @@ const fetchTokensCmd = () => {
}
);
};

const fetchSwapsCmd = () => {
return Cmd.run(
async () => {
const swaps = await getSwaps();
const mapped: Map<string, ValidSwap> = swaps as unknown as Map<
string,
ValidSwap
>;
console.info('Mapped swaps', mapped);
return mapped;
},
{
successActionCreator: updateSwaps,
failActionCreator: (e: string) => newError(e),
}
);
};


export {
fetchPairInfosCmd,
fetchCurrentBatchNumberCmd,
Expand All @@ -129,4 +160,5 @@ export {
fetchOraclePriceCmd,
fetchVolumesCmd,
fetchTokensCmd,
fetchSwapsCmd,
};
63 changes: 52 additions & 11 deletions batcher-ui/src/components/batcher/SelectPair.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,16 @@ import {
faChevronUp,
} from '@fortawesome/free-solid-svg-icons';
import { useSelector } from 'react-redux';
import { currentSwapSelector } from '@/reducers';
import { currentSwapSelector, tokensSelector, swapsSelector } from '@/reducers';
import { useDispatch } from 'react-redux';
import { changePair } from '@/actions';
import { changePair, newError } from '@/actions';
import { ValidSwap } from '@/types';
import Image from 'next/image';
import { getTokensMetadata } from '@/utils/token-manager';
import {
getLexicographicalPairName,
getTokensMetadata,
} from '@/utils/token-manager';
import { ensureMapTypeOnSwaps } from '@/utils/utils';

interface SelectPairProps {
isFrom: boolean;
Expand All @@ -21,8 +26,10 @@ const SelectPair = ({ isFrom }: SelectPairProps) => {
const { swap, isReverse } = useSelector(currentSwapSelector);
const dispatch = useDispatch();

//const tokens = useSelector(tokensSelector);
const tokens = useSelector(tokensSelector);
const swaps = useSelector(swapsSelector);
const [availableTokens, setAvailableTokens] = useState<any[]>([]);
const [availableSwaps, setAvailableSwaps] = useState<string[]>([]);

const displayValue = useCallback(() => {
if (isReverse && isFrom) return swap.to.name;
Expand All @@ -38,20 +45,54 @@ const SelectPair = ({ isFrom }: SelectPairProps) => {
tokens: { name: string; address: string; icon: string | undefined }[]
) => {
setAvailableTokens(tokens);
console.info('swaps - before', swaps);
const swapsAsMap: Map<string, ValidSwap> = ensureMapTypeOnSwaps(swaps);
console.info('swaps - dispatch', swapsAsMap);
console.info('swaps keys - dispatch', swapsAsMap.keys());
const swps: string[] = Array.from(swapsAsMap.keys());
console.info('swps - dispatch', swps);
setAvailableSwaps(swps);
}
);
}, []);
}, [dispatch, tokens, swaps]);

const isValidPair = (pair: string) => availableSwaps.includes(pair);

const invalidSwap = (pairName: string) => {
dispatch(
newError(
pairName +
' is not a valid pair. Only ' +
availableSwaps.join() +
'are supported.'
)
);
};

const is_reversed = (pair: string, to: string, from: string) => {
const swap = ensureMapTypeOnSwaps(swaps).get(pair);
return to === swap?.swap.to && from === swap?.swap.from;
};

return (
<Select.Root
value={displayValue()}
onValueChange={value => {
//const pair = isFrom ? `${value}-${swap.to.name}` : `${swap.from.name}-${value}`;
//const availableSwap = availableSwaps[pair];
// const reversed = (!isFrom && value === ${swap.from.name}) || (isFrom && value === ${swap.to.name});
const pair = 'tzBTC-USDT';
const reversed = false;
dispatch(changePair(pair, reversed));
console.info('availableSwaps', availableSwaps);
console.info('swaps', swaps);
console.info('swap', swap);
console.info('value', value);
console.info('isFrom', isFrom);
const from = isFrom ? `${swap.to.name}` : `${value}`;
const to = isFrom ? `${value}` : `${swap.from.token.name}`;
const pairName = getLexicographicalPairName(to, from);
const is_valid = isValidPair(pairName);
if (is_valid) {
const reversed = is_reversed(pairName, to, from);
dispatch(changePair(pairName, reversed));
} else {
invalidSwap(pairName);
}
}}
>
<Select.Trigger className="flex items-center text-dark w-[200px] justify-center rounded px-2 mr-1 text-base gap-2 bg-white hover:bg-hovergray outline-none">
Expand Down
7 changes: 3 additions & 4 deletions batcher-ui/src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ import BatcherInfo from '@/components/batcher/BatcherInfo';
import PriceStrategy from '@/components/batcher/PriceStrategy';

import { useSelector, useDispatch } from 'react-redux';
import {
currentPairSelector,
userAddressSelector,
} from '@/reducers';
import { currentPairSelector, userAddressSelector } from '@/reducers';
import {
getTokens,
getSwaps,
fetchUserBalances,
batcherUnsetup,
getPairsInfos,
Expand Down Expand Up @@ -38,6 +36,7 @@ const Swap = () => {

useEffect(() => {
dispatch(getTokens());
dispatch(getSwaps());
}, [dispatch]);

return (
Expand Down
9 changes: 9 additions & 0 deletions batcher-ui/src/reducers/exchange.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
ExchangeState,
PriceStrategy,
Token,
ValidSwap,
} from '@/types';
import {
fetchBatcherStatusCmd,
Expand All @@ -21,6 +22,7 @@ import {
fetchOraclePriceCmd,
setupBatcherCmd,
fetchTokensCmd,
fetchSwapsCmd,
} from '@/commands/exchange';
import { getTimeDifference } from 'src/utils/utils';

Expand Down Expand Up @@ -61,6 +63,7 @@ const initialState: ExchangeState = {
batchNumber: 0,
oraclePrice: 0,
tokens: new Map<string, Token>(),
swaps: new Map<string, ValidSwap>(),
volumes: {
sell: Object.keys(PriceStrategy).reduce(
(acc, k) => ({ ...acc, [k]: 0 }),
Expand Down Expand Up @@ -205,6 +208,12 @@ const exchangeReducer = (
return { ...state, tokens: action.payload.tokens };
case 'GET_TOKENS':
return loop(state, fetchTokensCmd());
case 'UPDATE_SWAPS':
console.info('swaps', action.payload.swaps);
console.info('state', state);
return { ...state, swaps: action.payload.swaps };
case 'GET_SWAPS':
return loop(state, fetchSwapsCmd());
default:
return state;
}
Expand Down
1 change: 1 addition & 0 deletions batcher-ui/src/reducers/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const oraclePriceSelector = (state: AppState) =>
state.exchange.oraclePrice;

export const tokensSelector = (state: AppState) => state.exchange.tokens;
export const swapsSelector = (state: AppState) => state.exchange.swaps;

export const volumesSelector = (state: AppState) => state.exchange.volumes;

Expand Down
3 changes: 2 additions & 1 deletion batcher-ui/src/types/state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
PriceStrategy,
SwapNames,
} from '@/types/contracts/batcher';
import { ValidTokenAmount } from './contracts/token-manager';
import { ValidTokenAmount, ValidSwap } from './contracts/token-manager';

export type Token = {
address: string | undefined;
Expand Down Expand Up @@ -45,6 +45,7 @@ export type ExchangeState = {
oraclePrice: number;
volumes: VolumesState;
tokens: Map<string, Token>;
swaps: Map<string, ValidSwap>;
};

export type WalletState = {
Expand Down
27 changes: 26 additions & 1 deletion batcher-ui/src/utils/token-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ export const getLexicographicalPairName = (
to: string,
from: string
): string => {
if (to > from) {
const comp = to.localeCompare(from);
if (comp < 0)
return `${to}-${from}`;
} else {
return `${from}-${to}`;
Expand Down Expand Up @@ -197,3 +198,27 @@ export const getTokensFromStorage = async () => {
})
);
};

export const getSwapsFromStorage = async () => {
const storage = await getTokenManagerStorage();
const validSwaps = storage['valid_swaps'];
const names = validSwaps.keys;
return Promise.all(
names.map(async swap => {
const t = await getSwapFromBigmap(validSwaps.values, swap);

const swp = {
from: t.value.swap.from,
to: t.value.swap.to,
};

return {
swap: swp,
oracle_address: t.value.oracle_address,
oracle_asset_name: t.value.oracle_asset_name,
oracle_precision: t.value.oracle_precision,
is_disabled_for_deposits: t.value.is_disabled_for_deposits,
};
})
);
}
40 changes: 38 additions & 2 deletions batcher-ui/src/utils/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,14 @@ import {
RatesCurrentBigmap,
Token,
ValidToken,
ValidSwap,
ValidTokenAmount,
} from '@/types';
import {
getTokenManagerStorage,
getTokensFromStorage,
getSwapsFromStorage,
getLexicographicalPairName,
} from '@/utils/token-manager';
import { NetworkType } from '@airgap/beacon-sdk';
import { getByKey } from '@/utils/local-storage';
Expand All @@ -38,6 +41,22 @@ export const getTokens = async () => {
};
};

export const getSwaps = async () => {
const swaps = await getSwapsFromStorage();
console.info('getSwaps swaps', swaps);
const swapsMap = new Map(
swaps.map((value, index) => [
getLexicographicalPairName(value.swap.to, value.swap.from),
value,
])<<<<<<< 410-further-split-out-batcher-and-mm-contracts-to-avoid-size-constraint
);
console.info('getSwaps swapMap', swapsMap);

return {
swaps: swapsMap,
};
};

export const scaleAmountDown = (amount: number, decimals: number) => {
const scale = 10 ** -decimals;
return amount * scale;
Expand Down Expand Up @@ -383,6 +402,23 @@ export const ensureMapTypeOnTokens = (
}
};

export const ensureMapTypeOnSwaps = (
swaps: Map<string, ValidSwap>
): Map<string, ValidSwap> => {
const typeOfSwaps = typeof swaps;
console.info('swaps type', typeOfSwaps);
if (swaps instanceof Map) {
return swaps;
} else {
let swps: Map<string, ValidSwap> = new Map<string, ValidSwap>();
Object.values(swaps).forEach(v => {
console.info('v', v);
swps = v as Map<string, ValidSwap>;
});
return swps;
}
};

export const getTimeDifferenceInMs = (
status: BatcherStatus,
startTime: string | null
Expand Down Expand Up @@ -484,8 +520,8 @@ const findTokensForBatch = (batch: BatchBigmap, toks: Map<string, Token>) => {
const buyToken = tokens.get(pair.string_0);
const sellToken = tokens.get(pair.string_1);
const tkns = {
to: { name: buyToken?.name || "", decimals: buyToken?.decimals || 0 },
from: { name: sellToken?.name || "", decimals: sellToken?.decimals || 0 },
to: { name: buyToken?.name || '', decimals: buyToken?.decimals || 0 },
from: { name: sellToken?.name || '', decimals: sellToken?.decimals || 0 },
};
return tkns;
};
Expand Down

0 comments on commit a8e2ddd

Please sign in to comment.