From ba402ba835dd0192e404465d484bfe88edeb061a Mon Sep 17 00:00:00 2001 From: "Jason Ridgway-Taylor (~misfur-mondut)" <57174310+glottologist@users.noreply.github.com> Date: Tue, 21 Nov 2023 13:01:29 +0800 Subject: [PATCH] UPdated UI to point at new testing contract (#418) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 * 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 * 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 * Corrected Network type and mainnet token hash * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * Added interim connecting captions for wallet loading * Fixed issue with button showing connecting * Fixed NaN issue in Holdings tab --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * Clear active account on disconnect * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * Fixed issue with button showing connecting * Fixed NaN issue in Holdings tab * Fixed issue with token balances updating --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * Clear active account on disconnect * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * 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 * 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 * 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 * Corrected Network type and mainnet token hash * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * Fixed issue with button showing connecting * Fixed NaN issue in Holdings tab --------- Co-authored-by: Cyril B * 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 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 * 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 * 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 * 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 * Corrected Network type and mainnet token hash * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * Added interim connecting captions for wallet loading * Fixed issue with button showing connecting * Fixed NaN issue in Holdings tab --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * Clear active account on disconnect * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * Fixed issue with button showing connecting * Fixed NaN issue in Holdings tab * Fixed issue with token balances updating --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * Clear active account on disconnect * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * 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 * 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 * 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 * Corrected Network type and mainnet token hash * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * Fixed issue with button showing connecting * Fixed NaN issue in Holdings tab --------- Co-authored-by: Cyril B * 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 Co-authored-by: Jason Ridgway-Taylor (~misfur-mondut) <57174310+glottologist@users.noreply.github.com> * pipelines: fix ci of bot notif * Corrected mainnet variables --------- Co-authored-by: Cyril B * Removed rate notifications from ghostnet nbot * 325 bot jit liquidity (#337) * Added skeleton for liquidity cli * Added initial start of jit implementation * Added buy side jit provisioning rules to bot * Added initial always on provision * Corrected path in message for always-on * Tidy up * Tidy up * Add interaction with batcher contract on ghostnet (#336) * gitignore for javascript compiled files * Add a dependency to Taquito * Add interaction with Batcher contract: deposit and redeem. Also, wallets. * Working versions for both liquidity bots * Packaged build to single file and add release action * Added working sub dir to build and manual trigger for testing * Added example config files into build file and expanded ghostnet example * Corrected release pathing * Corrected release pathing * Compress and hash release artefacts * corrected compression * Added zip compression to release artefacts * Added zip compression to release artefacts * Removed pre-release clause * Removed bundled compilation * Package node modules with liq bots * Updated packaging to prune modules * Always on only submits once per batch * Tidied bot status message * Tidied bot status message * Correctly parse status * Update batcher-bot/liquidity/src/utils.ts Co-authored-by: Ulrik Strid * PRC: Throw if no private key in environment * Added usage README content for liq bot * PRC: Use if in structure rather than getting all keys * PRC: Change lets to consts where applicable in provisioning * PRC: Change lets to consts where applicable in provisioning * PRC: Declare events prior to subscription --------- Co-authored-by: aguillon Co-authored-by: Ulrik Strid * pipelines: use more recent versions of action blocks before deprecation * Disabled swap button if the batch is closed. Additionally added a wait for socket connection (#339) * Disabled redeem button if there are no cleared holdings (#341) * Fix merge issues and tidy up * Added batch number in info panel (#342) * Added current and last to batch prefix * Changed to use a reduced swap structure (name only) to reduce duplication in storage (#350) * 344 reduce duplication in contract storage (#351) * Changed to use a reduced swap structure (name only) to reduce duplication in storage * Changed pair type to string * string * Fixed merge issues * 346 only open batches on first trade (#371) * Batch will not progress via tick on finalized * Added new contact hash for ghostnet * Moved burn from deposit. Allowed redemption to calculate how much of the fees should be burned or refunded based on if the amount was in clearing (#372) * 327-move-fees style suggestion (#373) * Moved burn from deposit. Allowed redemption to calculate how much of the fees should be burned or refunded based on if the amount was in clearing * Small style suggestion --------- Co-authored-by: Jason Ridgway-Taylor Co-authored-by: Jason Ridgway-Taylor (~misfur-mondut) <57174310+glottologist@users.noreply.github.com> * 345 remove batches from bigmap imp2 (#377) * Added refunds of tokens and fess on cancelation * Added check that batch is open in order to cancel * Added batch_holdings object, utils and adjusted storage * Remove holdings and remove batch is completely cleared * Corrected can_batch_be_removed * Added alternative implementation of batch holdings * 380 add documentation (#381) * Release to Ghostnet (#349) * 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 * 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 * 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 * Corrected Network type and mainnet token hash * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * Added interim connecting captions for wallet loading * Fixed issue with button showing connecting * Fixed NaN issue in Holdings tab --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * Clear active account on disconnect * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * Fixed issue with button showing connecting * Fixed NaN issue in Holdings tab * Fixed issue with token balances updating --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * Clear active account on disconnect * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * 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 * 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 * 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 * Corrected Network type and mainnet token hash * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * Fixed issue with button showing connecting * Fixed NaN issue in Holdings tab --------- Co-authored-by: Cyril B * 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 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 * Corrected mainnet variables * Removed rate notifications from ghostnet nbot * 325 bot jit liquidity (#337) * Added skeleton for liquidity cli * Added initial start of jit implementation * Added buy side jit provisioning rules to bot * Added initial always on provision * Corrected path in message for always-on * Tidy up * Tidy up * Add interaction with batcher contract on ghostnet (#336) * gitignore for javascript compiled files * Add a dependency to Taquito * Add interaction with Batcher contract: deposit and redeem. Also, wallets. * Working versions for both liquidity bots * Packaged build to single file and add release action * Added working sub dir to build and manual trigger for testing * Added example config files into build file and expanded ghostnet example * Corrected release pathing * Corrected release pathing * Compress and hash release artefacts * corrected compression * Added zip compression to release artefacts * Added zip compression to release artefacts * Removed pre-release clause * Removed bundled compilation * Package node modules with liq bots * Updated packaging to prune modules * Always on only submits once per batch * Tidied bot status message * Tidied bot status message * Correctly parse status * Update batcher-bot/liquidity/src/utils.ts Co-authored-by: Ulrik Strid * PRC: Throw if no private key in environment * Added usage README content for liq bot * PRC: Use if in structure rather than getting all keys * PRC: Change lets to consts where applicable in provisioning * PRC: Change lets to consts where applicable in provisioning * PRC: Declare events prior to subscription --------- Co-authored-by: aguillon Co-authored-by: Ulrik Strid * pipelines: use more recent versions of action blocks before deprecation * Disabled swap button if the batch is closed. Additionally added a wait for socket connection (#339) * Disabled redeem button if there are no cleared holdings (#341) * Fix merge issues and tidy up * Added batch number in info panel (#342) * Added current and last to batch prefix --------- Co-authored-by: Cyril B Co-authored-by: aguillon Co-authored-by: Ulrik Strid * pipelines: add trigger when pr is merged on ghost branch * Changed token hashes in ghostnet contract to match faucet * Switched ghostnet UI to new contract hash * Re-adjusted token hashes on Ghostnet * Re-pointed UI to new contract on ghostnet * Added skeleton docs --------- Co-authored-by: Cyril B Co-authored-by: aguillon Co-authored-by: Ulrik Strid * 380 add documentation (#382) * Release to Ghostnet (#349) * 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 * 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 * 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 * Corrected Network type and mainnet token hash * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * Added interim connecting captions for wallet loading * Fixed issue with button showing connecting * Fixed NaN issue in Holdings tab --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * Clear active account on disconnect * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * Fixed issue with button showing connecting * Fixed NaN issue in Holdings tab * Fixed issue with token balances updating --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * Clear active account on disconnect * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * 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 * 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 * 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 * Corrected Network type and mainnet token hash * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * Fixed issue with button showing connecting * Fixed NaN issue in Holdings tab --------- Co-authored-by: Cyril B * 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 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 * Corrected mainnet variables * Removed rate notifications from ghostnet nbot * 325 bot jit liquidity (#337) * Added skeleton for liquidity cli * Added initial start of jit implementation * Added buy side jit provisioning rules to bot * Added initial always on provision * Corrected path in message for always-on * Tidy up * Tidy up * Add interaction with batcher contract on ghostnet (#336) * gitignore for javascript compiled files * Add a dependency to Taquito * Add interaction with Batcher contract: deposit and redeem. Also, wallets. * Working versions for both liquidity bots * Packaged build to single file and add release action * Added working sub dir to build and manual trigger for testing * Added example config files into build file and expanded ghostnet example * Corrected release pathing * Corrected release pathing * Compress and hash release artefacts * corrected compression * Added zip compression to release artefacts * Added zip compression to release artefacts * Removed pre-release clause * Removed bundled compilation * Package node modules with liq bots * Updated packaging to prune modules * Always on only submits once per batch * Tidied bot status message * Tidied bot status message * Correctly parse status * Update batcher-bot/liquidity/src/utils.ts Co-authored-by: Ulrik Strid * PRC: Throw if no private key in environment * Added usage README content for liq bot * PRC: Use if in structure rather than getting all keys * PRC: Change lets to consts where applicable in provisioning * PRC: Change lets to consts where applicable in provisioning * PRC: Declare events prior to subscription --------- Co-authored-by: aguillon Co-authored-by: Ulrik Strid * pipelines: use more recent versions of action blocks before deprecation * Disabled swap button if the batch is closed. Additionally added a wait for socket connection (#339) * Disabled redeem button if there are no cleared holdings (#341) * Fix merge issues and tidy up * Added batch number in info panel (#342) * Added current and last to batch prefix --------- Co-authored-by: Cyril B Co-authored-by: aguillon Co-authored-by: Ulrik Strid * pipelines: add trigger when pr is merged on ghost branch * Changed token hashes in ghostnet contract to match faucet * Switched ghostnet UI to new contract hash * Re-adjusted token hashes on Ghostnet * Re-pointed UI to new contract on ghostnet * Added skeleton docs --------- Co-authored-by: Cyril B Co-authored-by: aguillon Co-authored-by: Ulrik Strid * Cancellations (#375) * Added refunds of tokens and fess on cancelation * Added check that batch is open in order to cancel * Built contract * Added UI changes for cancellations * Added refund of tokens back in, along with burning fee * Revive tests (#384) * Restructured tests. Oracle mock plus origination of test token contracts * Added tests for change_fee * Added tests for change_fee * Added test context type to reduce test code duplication * Adjusted clause to assure burn and fee recipient aren't the same. Additionally added a test * Removed references to burn and burn address as it will not always be a burn address * Added tests for enabling and disabling swap pairs * Added tests for adding, updating and removing metadata * Added tests for token pair limit * Uncommented failing oracle source change test for PR review * Added workflow for testing using github action * rolled action version * rolled action version * Added explicit path variable for workspace * Added explicit path variable for workspace * Added path listing to debug action * Added path listing to debug action * Set directory in workflow file * Adeed explicit working directory * Fixed issue with 0.70 of ligo compiler * Working Oracle test * Attempt to make gh action work * use release of ligo-version * Manage ligo version manually in ligo gh action * Covered add and remove swap pairs * Manage ligo version manually in ligo gh action * Added deposit tests * Amended typos in tests * Switched Expect.fail_with_value for Breath.Expect.fail_with_value * Added cancellation tests * Removed manual ubots construction --------- Co-authored-by: Laurent Canis * w * [1 * Added market maker doc * Added market maker doc * Added Add Liquidity enpoint * Added test for adding liquidity * Add liquidity to market maker and test * Added add/remove liquidity and claim rewards tests. Added view for getting vault holdings summary * Started splitting market maker off into own contract * Seperated out tests * Split out mm contract from Batcher and pulled out common code into shared files * Amended tests to work with new split contracts * Populated ghostnet storage for marketmaker * Added get market holdings mechanism * Added user holdings display and buttons for MM * Added contract calls * Added Batcher modifications to handle fee payouts and makring a batch as having been given liquidity by the market maker * Added placeholders for market vault operations against batcher * Added rebalancing up to amount exchange * Added redemption of holdings * Added operator and deposit ops to utils * Added approve, deposit and revoke operations to the market maker * Added liquidity injection for market maker * Added additional tokens * Set up new pairs in ghostnet storage * Added new tokens and pairs into market maker * Added new ghostnet batcher contract to mm storage * Added new ghostnet mm address to batcher ghostnet storage * Added new ghhostnet addresses to the config * Fix issue cmm (#407) * Release to Mainnet (#348) * 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 * 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 * 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 * Corrected Network type and mainnet token hash * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * Added interim connecting captions for wallet loading * Fixed issue with button showing connecting * Fixed NaN issue in Holdings tab --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * Clear active account on disconnect * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * Fixed issue with button showing connecting * Fixed NaN issue in Holdings tab * Fixed issue with token balances updating --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * Clear active account on disconnect * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * 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 * 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 * 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 * Corrected Network type and mainnet token hash * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * Fixed issue with button showing connecting * Fixed NaN issue in Holdings tab --------- Co-authored-by: Cyril B * 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 Co-authored-by: Jason Ridgway-Taylor (~misfur-mondut) <57174310+glottologist@users.noreply.github.com> * pipelines: fix ci of bot notif * Corrected mainnet variables * Corrections to Batcher notifications bot (#334) * 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 * 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 * 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 * Corrected Network type and mainnet token hash * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * Added interim connecting captions for wallet loading * Fixed issue with button showing connecting * Fixed NaN issue in Holdings tab --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * Clear active account on disconnect * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * Fixed issue with button showing connecting * Fixed NaN issue in Holdings tab * Fixed issue with token balances updating --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * Clear active account on disconnect * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * 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 * 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 * 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 * Corrected Network type and mainnet token hash * Clear active account on disconnect --------- Co-authored-by: Cyril B * 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 * 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 * 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 * 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 * Clear active account on disconnect --------- Co-authored-by: Cyril B * Added interim connecting captions for wallet loading --------- Co-authored-by: Cyril B * Fixed issue with button showing connecting * Fixed NaN issue in Holdings tab --------- Co-authored-by: Cyril B * 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 … * Added redeem by batch * Fix CMM UI (#408) * :recycle: review market maker UI * :bento: add usdtz icon --------- Co-authored-by: Quentin Burg Co-authored-by: Jason Ridgway-Taylor (~misfur-mondut) <57174310+glottologist@users.noreply.github.com> * Fixed merge issues, rebuilt to deploy * Added measure for mm contract * Skeleton token manager * Added vault contract and moved michelson output to own folder * Test types * Adjusted Batcher to support calling the token manager * Removed unused code in Batcher * Added fee map insteand of single market maker address * Added liquidity injection to Vault * Added reward distribution in vaults * Amended clean mechanism in makefule * Added liquidity injection request into market maker * Fixed getting native tokens view call from vaults * Fixed bug in upsert methods * Added a build step to build all contracts * Fixed issue on makefile and tzbtc vault storage * Added new vault endpoint call into Batcher for adding rewards to the vault * Added vault balance requests after add or remove liquidity and liquidity injection * Removed balance assertion from deposit for testing * Removed foreign token assertions for testing * Fixed silly token standard parsing error * Fixed silly token standard parsing error * Fixed silly token standard parsing error * Compile all for ghostnet * Moved assert balances into its own entry * Added clause to test batch for liquidity * Removed todo clause * Added debug view to vault to test token balance endpoints * Adjusted callback types * Adjusted vault process response * Adjusted vault process response * Adjusted getBalance endpoint call opt * Adjusted type of getBlanace response for callback * :wrench: rewrite config due to new contracts architecture * :recycle: redirect tokens management to token manager contract * :recycle: refactor components && fetch token vault informations * Updated ghostnet contracts in config * Updated contract error codes * Changed UI to support new contract structure * Adjusted tick script to tick more pairs and also tick the market maker * Amended tick operation to pull rates for all pairs * Adjusted tick script to call new unified tick endpoint and re-pointed to new contract on ghostnet * Repointed UI to new ghostnet contract * new batcher contract hash for docker file * Added get_vaults view to marketmaker and removed no_batch error on UI * Repointed to new marketmaker * Use - instead of / for swap pairs i.e. tzBTC-USDT instead of tzBTC/USDT * Use - instead of / for swap pairs i.e. tzBTC-USDT instead of tzBTC/USDT in UI * Repointed to new marketmaker * corrected tick script calls * corrected tick script calls * corrected tick script calls * corrected tick script calls * corrected tick script calls * Changed ghostnet oracles * Added tokens list to exchange state and fixed Volume display * Fixed holdings display * Fixed holdings display * Fixed linting and type issues * Fixed linting and type issues * Added swaps to state and fixed token selection * Fixed UI docker build issues * Use the swap tokens to get pair name * Repointed to new ghostnet batcher contract * Added view to get single swap * Added view to get single swap * Added view to get single swap * Added view to get pair name * Changed token pair keys for BTCtz * Changed token pair keys for BTCtz * Updated ghostnet contracts --------- Co-authored-by: Cyril B Co-authored-by: aguillon Co-authored-by: Ulrik Strid Co-authored-by: Laurent Canis Co-authored-by: Quentin Burg Co-authored-by: Quentin Co-authored-by: Quentin Burg --- Dockerfile.tick.beta.ghostnet | 2 +- .../src/components/batcher/Exchange.tsx | 2 + batcher-ui/src/config/contracts.js | 4 +- batcher/batcher.mligo | 11 +- batcher/errors.mligo | 1 + batcher/michelson/batcher-ghostnet.tz | 1070 +++++++++-------- batcher/michelson/marketmaker-ghostnet.tz | 2 +- .../tokenmanager-storage-ghostnet.tz | 10 +- .../tokenmanager_storage_ghostnet.mligo | 6 +- 9 files changed, 590 insertions(+), 518 deletions(-) diff --git a/Dockerfile.tick.beta.ghostnet b/Dockerfile.tick.beta.ghostnet index 26e2a8a6..4c7d28d6 100644 --- a/Dockerfile.tick.beta.ghostnet +++ b/Dockerfile.tick.beta.ghostnet @@ -12,5 +12,5 @@ WORKDIR /etc/run COPY ./tick.sh /etc/run/ -CMD [ "/etc/run/tick.sh", "-b", "KT1Lh5Wkf2dtgNR23DnrdGcG4igfXUc9HQFW", "-m", "KT1VpMZjKtPa2oEdD2tQJiV7Mj3r4xY4QKFQ", "-f", "150" ] +CMD [ "/etc/run/tick.sh", "-b", "KT1JG7r23BFcc2GFdSnKBvijmagVzUncn9ry", "-m", "KT1VpMZjKtPa2oEdD2tQJiV7Mj3r4xY4QKFQ", "-f", "180" ] diff --git a/batcher-ui/src/components/batcher/Exchange.tsx b/batcher-ui/src/components/batcher/Exchange.tsx index cf119b66..ad686bb3 100644 --- a/batcher-ui/src/components/batcher/Exchange.tsx +++ b/batcher-ui/src/components/batcher/Exchange.tsx @@ -155,6 +155,8 @@ const Exchange = () => { tolerance, }; + console.info("SWAP PARAMS", swap_params); + if (selectedToken.standard === 'FA1.2 token') { if (!swap.from.token.address) { dispatch( diff --git a/batcher-ui/src/config/contracts.js b/batcher-ui/src/config/contracts.js index da54f708..21701f3f 100644 --- a/batcher-ui/src/config/contracts.js +++ b/batcher-ui/src/config/contracts.js @@ -15,9 +15,9 @@ const CONTRACTS_NAMES = [ ]; const ghostnet = { - batcher: 'KT1Lh5Wkf2dtgNR23DnrdGcG4igfXUc9HQFW', + batcher: 'KT1JG7r23BFcc2GFdSnKBvijmagVzUncn9ry', market_maker: 'KT1VpMZjKtPa2oEdD2tQJiV7Mj3r4xY4QKFQ', - token_manager: 'KT1AwSv5yaew3ZEEPn7HkDMvnbCrLniTBWCM', + token_manager: 'KT1WN3F9SkGHGigYsUBtYtBJu358UgiJSEKF', tzBTC_vault: 'KT1QChZQRof4pYheGE5MbUBv3oBsdJiy1Ue3', USDT_vault: 'KT1J2mW59LADXgD6AvywT46KF1Hyep7pKYcL', USDtz_vault: 'KT1KftikTS3nffDMuUobjBHt6LHqe5Zb8xMw', diff --git a/batcher/batcher.mligo b/batcher/batcher.mligo index f263094a..533ca4fa 100644 --- a/batcher/batcher.mligo +++ b/batcher/batcher.mligo @@ -869,6 +869,7 @@ let get_valid_swap_reduced (pair_name: string) (storage : storage) : valid_swap_reduced = let valid_swaps = TokenManagerUtils.get_valid_swaps storage.tokenmanager in + if (Map.size valid_swaps) = 0n then failwith unable_to_get_swaps_from_token_manager else match Map.find_opt pair_name valid_swaps with | Some vswp -> vswp | None -> failwith swap_does_not_exist @@ -957,6 +958,7 @@ let cancel let token_one, token_two = pair in let pair_name = find_lexicographical_pair_name token_one token_two in let valid_swaps = TokenManagerUtils.get_valid_swaps storage.tokenmanager in + if (Map.size valid_swaps) = 0n then failwith unable_to_get_swaps_from_token_manager else match Map.find_opt pair_name valid_swaps with | None -> failwith swap_does_not_exist | Some vswpr -> let valid_tokens = TokenManagerUtils.get_valid_tokens storage.tokenmanager in @@ -1004,7 +1006,7 @@ let enforce_correct_side let deposit (external_order: external_swap_order) (storage : storage) : result = let pair = pair_of_external_swap external_order in let current_time = Tezos.get_now () in - let pair_name = get_rate_name_from_pair pair in + let pair_name = find_lexicographical_pair_name external_order.swap.to.name external_order.swap.from.token.name in let valid_swap = get_valid_swap_reduced pair_name storage in if valid_swap.is_disabled_for_deposits then failwith swap_is_disabled_for_deposits else let () = enforce_correct_side external_order valid_swap in @@ -1221,8 +1223,13 @@ let does_batch_need_liquidity if volumes.buy_total_volume > 0n && volumes.sell_total_volume > 0n then (None: batch option) else Some batch | _ -> (None: batch option) - + +[@view] +let get_valid_swap (pair,storage:string * storage): valid_swap_reduced = get_valid_swap_reduced pair storage + +[@view] +let get_pair_name ((to,from),_storage:(string * string) * storage): string = find_lexicographical_pair_name to from [@view] let get_batches_needing_liquidity ((),storage: unit * storage) : batch list= diff --git a/batcher/errors.mligo b/batcher/errors.mligo index a223dbb6..1bbb248c 100644 --- a/batcher/errors.mligo +++ b/batcher/errors.mligo @@ -72,3 +72,4 @@ [@inline] let unable_to_get_balance_of_entrypoint_from_fa2_token : nat = 171n [@inline] let unable_to_get_balance_response_fa12_entrypoint_from_vault : nat = 172n [@inline] let unable_to_get_get_balance_entrypoint_from_fa12_token : nat = 173n +[@inline] let valid_swaps_map_is_empty = 174n diff --git a/batcher/michelson/batcher-ghostnet.tz b/batcher/michelson/batcher-ghostnet.tz index 47d1d864..211e1300 100644 --- a/batcher/michelson/batcher-ghostnet.tz +++ b/batcher/michelson/batcher-ghostnet.tz @@ -288,518 +288,524 @@ (nat %oracle_precision) (bool %is_disabled_for_deposits))) ; IF_NONE { PUSH nat 165 ; FAILWITH } {} ; - DUP 3 ; - DUP 3 ; + PUSH nat 0 ; + DUP 2 ; + SIZE ; COMPARE ; - GT ; - IF { DIG 2 ; PUSH string "-" ; CONCAT ; DIG 2 ; CONCAT } - { SWAP ; PUSH string "-" ; CONCAT ; DIG 2 ; CONCAT } ; - GET ; - IF_NONE - { DROP 4 ; PUSH nat 117 ; FAILWITH } - { DUP 4 ; - CDR ; - CDR ; - CAR ; - UNIT ; - VIEW "get_valid_tokens" - (map string - (pair (nat %token_id) - (string %name) - (option %address address) - (nat %decimals) - (option %standard string))) ; - IF_NONE { PUSH nat 162 ; FAILWITH } {} ; - DUP 2 ; - CAR ; - DUP 2 ; - DUP 2 ; - CAR ; - GET ; - IF_NONE { PUSH nat 111 ; FAILWITH } {} ; - DUG 2 ; - CDR ; - GET ; - IF_NONE { PUSH nat 111 ; FAILWITH } {} ; - NOW ; - DUP 7 ; - CAR ; - CAR ; - CAR ; - CDR ; - DUP ; - CDR ; - DUP 2 ; - CAR ; - DUP 9 ; - UNPAIR ; - DUP ; - DUP 3 ; - COMPARE ; - GT ; - IF { PUSH string "-" ; CONCAT ; SWAP ; CONCAT } - { SWAP ; PUSH string "-" ; CONCAT ; SWAP ; CONCAT } ; - GET ; - IF_NONE { PUSH nat 0 } {} ; - GET ; - IF_NONE - { PUSH nat 0 ; - DUP 2 ; - CAR ; - ITER { CDR ; DUP 2 ; DUP 2 ; COMPARE ; GT ; IF { SWAP ; DROP } { DROP } } ; - PUSH nat 1 ; - ADD ; - NONE address ; - PUSH nat 0 ; - DIG 9 ; - PUSH nat 0 ; - PUSH nat 0 ; - PUSH nat 0 ; - PUSH nat 0 ; - PUSH nat 0 ; - PUSH nat 0 ; - PUSH nat 0 ; - PUSH nat 0 ; - PAIR 8 ; - DIG 6 ; - RIGHT - (or (pair (pair timestamp - (pair (pair nat nat nat) - (or (or unit unit) unit) - (pair nat nat nat nat) - (pair (pair string string) (pair int int) timestamp))) - (pair (pair string string) (pair int int) timestamp)) - (pair timestamp timestamp)) ; - DIG 5 ; - PAIR 6 ; - DUP 7 ; - DUP 3 ; - DUP 4 ; - CDR ; - DUP 4 ; - SOME ; - DUP 5 ; - CAR ; - UPDATE ; - UPDATE 2 ; - DIG 3 ; - CAR ; - DUP 4 ; - CAR ; - SOME ; - DUP 5 ; - GET 7 ; - UNPAIR ; - DUP ; - DUP 3 ; - COMPARE ; - GT ; - IF { PUSH string "-" ; CONCAT ; SWAP ; CONCAT } - { SWAP ; PUSH string "-" ; CONCAT ; SWAP ; CONCAT } ; - UPDATE ; - UPDATE 1 } - { DUP 9 ; - CAR ; - CAR ; - CDR ; - CAR ; - DUP 2 ; - GET 3 ; - IF_LEFT - { SWAP ; - DROP ; - IF_LEFT - { DROP 2 ; - PUSH nat 0 ; - DUP 2 ; - CAR ; - ITER { CDR ; DUP 2 ; DUP 2 ; COMPARE ; GT ; IF { SWAP ; DROP } { DROP } } ; - PUSH nat 1 ; - ADD ; - NONE address ; - PUSH nat 0 ; - DIG 9 ; - PUSH nat 0 ; - PUSH nat 0 ; - PUSH nat 0 ; - PUSH nat 0 ; - PUSH nat 0 ; - PUSH nat 0 ; - PUSH nat 0 ; - PUSH nat 0 ; - PAIR 8 ; - DIG 6 ; - RIGHT - (or (pair (pair timestamp - (pair (pair nat nat nat) - (or (or unit unit) unit) - (pair nat nat nat nat) - (pair (pair string string) (pair int int) timestamp))) - (pair (pair string string) (pair int int) timestamp)) - (pair timestamp timestamp)) ; - DIG 5 ; - PAIR 6 ; - DUP 7 ; - DUP 3 ; - DUP 4 ; - CDR ; - DUP 4 ; - SOME ; - DUP 5 ; - CAR ; - UPDATE ; - UPDATE 2 ; - DIG 3 ; - CAR ; - DUP 4 ; - CAR ; - SOME ; - DUP 5 ; - GET 7 ; - UNPAIR ; - DUP ; - DUP 3 ; - COMPARE ; - GT ; - IF { PUSH string "-" ; CONCAT ; SWAP ; CONCAT } - { SWAP ; PUSH string "-" ; CONCAT ; SWAP ; CONCAT } ; - UPDATE ; - UPDATE 1 } - { DIG 3 ; DIG 8 ; DROP 3 ; DUP 7 ; DIG 2 } } - { DIG 9 ; - DROP ; - DUP 2 ; - INT ; - ADD ; - DIG 4 ; - COMPARE ; - GE ; - IF { DUP 2 ; - GET 3 ; + EQ ; + IF { DROP 7 ; PUSH nat 165 ; FAILWITH } + { DUP 3 ; + DUP 3 ; + COMPARE ; + GT ; + IF { DIG 2 ; PUSH string "-" ; CONCAT ; DIG 2 ; CONCAT } + { SWAP ; PUSH string "-" ; CONCAT ; DIG 2 ; CONCAT } ; + GET ; + IF_NONE + { DROP 4 ; PUSH nat 117 ; FAILWITH } + { DUP 4 ; + CDR ; + CDR ; + CAR ; + UNIT ; + VIEW "get_valid_tokens" + (map string + (pair (nat %token_id) + (string %name) + (option %address address) + (nat %decimals) + (option %standard string))) ; + IF_NONE { PUSH nat 162 ; FAILWITH } {} ; + DUP 2 ; + CAR ; + DUP 2 ; + DUP 2 ; + CAR ; + GET ; + IF_NONE { PUSH nat 111 ; FAILWITH } {} ; + DUG 2 ; + CDR ; + GET ; + IF_NONE { PUSH nat 111 ; FAILWITH } {} ; + NOW ; + DUP 7 ; + CAR ; + CAR ; + CAR ; + CDR ; + DUP ; + CDR ; + DUP 2 ; + CAR ; + DUP 9 ; + UNPAIR ; + DUP ; + DUP 3 ; + COMPARE ; + GT ; + IF { PUSH string "-" ; CONCAT ; SWAP ; CONCAT } + { SWAP ; PUSH string "-" ; CONCAT ; SWAP ; CONCAT } ; + GET ; + IF_NONE { PUSH nat 0 } {} ; + GET ; + IF_NONE + { PUSH nat 0 ; + DUP 2 ; + CAR ; + ITER { CDR ; DUP 2 ; DUP 2 ; COMPARE ; GT ; IF { SWAP ; DROP } { DROP } } ; + PUSH nat 1 ; + ADD ; + NONE address ; + PUSH nat 0 ; + DIG 9 ; + PUSH nat 0 ; + PUSH nat 0 ; + PUSH nat 0 ; + PUSH nat 0 ; + PUSH nat 0 ; + PUSH nat 0 ; + PUSH nat 0 ; + PUSH nat 0 ; + PAIR 8 ; + DIG 6 ; + RIGHT + (or (pair (pair timestamp + (pair (pair nat nat nat) + (or (or unit unit) unit) + (pair nat nat nat nat) + (pair (pair string string) (pair int int) timestamp))) + (pair (pair string string) (pair int int) timestamp)) + (pair timestamp timestamp)) ; + DIG 5 ; + PAIR 6 ; + DUP 7 ; + DUP 3 ; + DUP 4 ; + CDR ; + DUP 4 ; + SOME ; + DUP 5 ; + CAR ; + UPDATE ; + UPDATE 2 ; + DIG 3 ; + CAR ; + DUP 4 ; + CAR ; + SOME ; + DUP 5 ; + GET 7 ; + UNPAIR ; + DUP ; + DUP 3 ; + COMPARE ; + GT ; + IF { PUSH string "-" ; CONCAT ; SWAP ; CONCAT } + { SWAP ; PUSH string "-" ; CONCAT ; SWAP ; CONCAT } ; + UPDATE ; + UPDATE 1 } + { DUP 9 ; + CAR ; + CAR ; + CDR ; + CAR ; + DUP 2 ; + GET 3 ; + IF_LEFT + { SWAP ; + DROP ; IF_LEFT - { SWAP ; - DIG 2 ; - DROP 2 ; - IF_LEFT - { DROP ; PUSH nat 105 ; FAILWITH } - { DROP ; PUSH nat 105 ; FAILWITH } } - { SWAP ; - INT ; + { DROP 2 ; + PUSH nat 0 ; DUP 2 ; + CAR ; + ITER { CDR ; DUP 2 ; DUP 2 ; COMPARE ; GT ; IF { SWAP ; DROP } { DROP } } ; + PUSH nat 1 ; ADD ; - PAIR ; + NONE address ; + PUSH nat 0 ; + DIG 9 ; + PUSH nat 0 ; + PUSH nat 0 ; + PUSH nat 0 ; + PUSH nat 0 ; + PUSH nat 0 ; + PUSH nat 0 ; + PUSH nat 0 ; + PUSH nat 0 ; + PAIR 8 ; + DIG 6 ; RIGHT - (pair (pair timestamp - (pair (pair nat nat nat) - (or (or unit unit) unit) - (pair nat nat nat nat) - (pair (pair string string) (pair int int) timestamp))) - (pair (pair string string) (pair int int) timestamp)) ; - LEFT timestamp ; - UPDATE 3 ; + (or (pair (pair timestamp + (pair (pair nat nat nat) + (or (or unit unit) unit) + (pair nat nat nat nat) + (pair (pair string string) (pair int int) timestamp))) + (pair (pair string string) (pair int int) timestamp)) + (pair timestamp timestamp)) ; + DIG 5 ; + PAIR 6 ; DUP 7 ; - PAIR } ; - UNPAIR ; - DUP 3 ; - DUP 4 ; + DUP 3 ; + DUP 4 ; + CDR ; + DUP 4 ; + SOME ; + DUP 5 ; + CAR ; + UPDATE ; + UPDATE 2 ; + DIG 3 ; + CAR ; + DUP 4 ; + CAR ; + SOME ; + DUP 5 ; + GET 7 ; + UNPAIR ; + DUP ; + DUP 3 ; + COMPARE ; + GT ; + IF { PUSH string "-" ; CONCAT ; SWAP ; CONCAT } + { SWAP ; PUSH string "-" ; CONCAT ; SWAP ; CONCAT } ; + UPDATE ; + UPDATE 1 } + { DIG 3 ; DIG 8 ; DROP 3 ; DUP 7 ; DIG 2 } } + { DIG 9 ; + DROP ; + DUP 2 ; + INT ; + ADD ; + DIG 4 ; + COMPARE ; + GE ; + IF { DUP 2 ; + GET 3 ; + IF_LEFT + { SWAP ; + DIG 2 ; + DROP 2 ; + IF_LEFT + { DROP ; PUSH nat 105 ; FAILWITH } + { DROP ; PUSH nat 105 ; FAILWITH } } + { SWAP ; + INT ; + DUP 2 ; + ADD ; + PAIR ; + RIGHT + (pair (pair timestamp + (pair (pair nat nat nat) + (or (or unit unit) unit) + (pair nat nat nat nat) + (pair (pair string string) (pair int int) timestamp))) + (pair (pair string string) (pair int int) timestamp)) ; + LEFT timestamp ; + UPDATE 3 ; + DUP 7 ; + PAIR } ; + UNPAIR ; + DUP 3 ; + DUP 4 ; + CDR ; + DUP 4 ; + SOME ; + DUP 5 ; + CAR ; + UPDATE ; + UPDATE 2 ; + DIG 3 ; + CAR ; + DUP 4 ; + CAR ; + SOME ; + DUP 5 ; + GET 7 ; + UNPAIR ; + DUP ; + DUP 3 ; + COMPARE ; + GT ; + IF { PUSH string "-" ; CONCAT ; SWAP ; CONCAT } + { SWAP ; PUSH string "-" ; CONCAT ; SWAP ; CONCAT } ; + UPDATE ; + UPDATE 1 } + { DROP ; DUP 7 ; DIG 2 } } } ; + DIG 2 ; + DUP ; + GET 3 ; + IF_LEFT + { IF_LEFT { DROP ; PUSH bool False } { DROP ; PUSH bool False } } + { DROP ; PUSH bool True } ; + NOT ; + IF { PUSH nat 140 ; FAILWITH } {} ; + DIG 7 ; + CDR ; + CDR ; + CDR ; + DUP 8 ; + GET ; + IF_NONE + { DROP 8 ; PUSH nat 139 ; FAILWITH } + { DUP 2 ; + CAR ; + DUP 2 ; + DUP 2 ; + GET ; + IF_NONE + { SWAP ; DIG 4 ; DROP 3 ; PUSH nat 139 ; FAILWITH } + { DUP 6 ; + DUP 7 ; CDR ; - DUP 4 ; - SOME ; - DUP 5 ; - CAR ; + DUP ; + CDR ; + DIG 8 ; + CDR ; + CDR ; + CDR ; + DIG 6 ; + DIG 6 ; + NONE (map (pair (or unit unit) (or (or unit unit) unit)) nat) ; + SWAP ; UPDATE ; - UPDATE 2 ; - DIG 3 ; - CAR ; - DUP 4 ; - CAR ; SOME ; - DUP 5 ; - GET 7 ; - UNPAIR ; - DUP ; - DUP 3 ; - COMPARE ; - GT ; - IF { PUSH string "-" ; CONCAT ; SWAP ; CONCAT } - { SWAP ; PUSH string "-" ; CONCAT ; SWAP ; CONCAT } ; + DUP 12 ; UPDATE ; - UPDATE 1 } - { DROP ; DUP 7 ; DIG 2 } } } ; - DIG 2 ; - DUP ; - GET 3 ; - IF_LEFT - { IF_LEFT { DROP ; PUSH bool False } { DROP ; PUSH bool False } } - { DROP ; PUSH bool True } ; - NOT ; - IF { PUSH nat 140 ; FAILWITH } {} ; - DIG 7 ; - CDR ; - CDR ; - CDR ; - DUP 8 ; - GET ; - IF_NONE - { DROP 8 ; PUSH nat 139 ; FAILWITH } - { DUP 2 ; - CAR ; - DUP 2 ; - DUP 2 ; - GET ; - IF_NONE - { SWAP ; DIG 4 ; DROP 3 ; PUSH nat 139 ; FAILWITH } - { DUP 6 ; - DUP 7 ; - CDR ; - DUP ; - CDR ; - DIG 8 ; - CDR ; - CDR ; - CDR ; - DIG 6 ; - DIG 6 ; - NONE (map (pair (or unit unit) (or (or unit unit) unit)) nat) ; - SWAP ; - UPDATE ; - SOME ; - DUP 12 ; - UPDATE ; - UPDATE 2 ; - UPDATE 2 ; - UPDATE 2 ; - SWAP ; - PAIR } ; - UNPAIR ; - DUP 3 ; - GET 5 ; - DUP 2 ; - ITER { UNPAIR ; - UNPAIR ; - IF_LEFT - { DROP ; - DUP 2 ; - DUP 4 ; - GET 7 ; - SUB ; - ABS ; - SWAP ; - IF_LEFT - { IF_LEFT - { DROP ; - DUP 3 ; - DIG 2 ; - DIG 3 ; - GET 3 ; - SUB ; - ABS ; - UPDATE 3 ; - SWAP ; - UPDATE 7 } - { DROP ; - DUP 3 ; - DIG 2 ; - DIG 3 ; - CAR ; - SUB ; - ABS ; - UPDATE 1 ; - SWAP ; - UPDATE 7 } } - { DROP ; - DUP 3 ; - DIG 2 ; - DIG 3 ; - GET 5 ; - SUB ; - ABS ; - UPDATE 5 ; - SWAP ; - UPDATE 7 } } - { DROP ; - DUP 2 ; - DUP 4 ; - GET 14 ; - SUB ; - ABS ; - SWAP ; - IF_LEFT - { IF_LEFT - { DROP ; - DUP 3 ; - DIG 2 ; - DIG 3 ; - GET 11 ; - SUB ; - ABS ; - UPDATE 11 ; - SWAP ; - UPDATE 14 } - { DROP ; - DUP 3 ; - DIG 2 ; - DIG 3 ; - GET 9 ; - SUB ; - ABS ; - UPDATE 9 ; - SWAP ; - UPDATE 14 } } - { DROP ; - DUP 3 ; - DIG 2 ; - DIG 3 ; - GET 13 ; - SUB ; - ABS ; - UPDATE 13 ; - SWAP ; - UPDATE 14 } } } ; - PUSH nat 1 ; - DUP 5 ; - GET 9 ; - SUB ; - ABS ; - DIG 4 ; - DIG 2 ; - UPDATE 5 ; - SWAP ; - UPDATE 9 ; - DUP 3 ; - DIG 3 ; - CAR ; - DUP ; - CAR ; - DUP ; - CAR ; - DUP 7 ; - DIG 7 ; - CDR ; - DUP 7 ; - SOME ; - DIG 7 ; - CAR ; - UPDATE ; - UPDATE 2 ; - UPDATE 2 ; - UPDATE 1 ; - UPDATE 1 ; - UPDATE 1 ; - DUP 5 ; - GET 8 ; - DUP 6 ; - GET 7 ; - DUP 7 ; - GET 5 ; - DIG 7 ; - GET 3 ; - DIG 6 ; - PUSH nat 1 ; - DIG 8 ; - PAIR ; - PAIR ; - PAIR 5 ; - PUSH mutez 0 ; - EMPTY_MAP string (pair (pair nat string (option address) nat (option string)) nat) ; - PAIR ; - DIG 3 ; - ITER { UNPAIR ; - DIG 2 ; - UNPAIR ; - DIG 3 ; - DIG 3 ; - CAR ; - IF_LEFT { DROP ; DUP 4 ; CAR ; CAR ; CAR } { DROP ; DUP 4 ; CAR ; CDR } ; - PAIR ; - PAIR ; - DUP 6 ; - SWAP ; - EXEC ; - DUP 4 ; - CAR ; - CAR ; - CDR ; - CDR ; - DIG 2 ; - ADD ; - SWAP ; - PAIR } ; - SWAP ; - DIG 4 ; - DROP 2 ; - UNPAIR ; - SELF_ADDRESS ; - NIL operation ; - DIG 2 ; - ITER { CDR ; - DUP ; - CAR ; - GET 5 ; - IF_NONE - { DROP ; PUSH nat 109 ; FAILWITH } - { DUP 2 ; - CAR ; - GET 8 ; - IF_NONE - { DROP 2 ; PUSH nat 108 ; FAILWITH } - { PUSH string "FA1.2 token" ; - DUP 2 ; - COMPARE ; - EQ ; - IF { DROP ; - CONTRACT %transfer (pair (address %from) (address %to) (nat %value)) ; - IF_NONE { PUSH nat 101 ; FAILWITH } {} ; - PUSH mutez 0 ; + UPDATE 2 ; + UPDATE 2 ; + UPDATE 2 ; + SWAP ; + PAIR } ; + UNPAIR ; + DUP 3 ; + GET 5 ; + DUP 2 ; + ITER { UNPAIR ; + UNPAIR ; + IF_LEFT + { DROP ; + DUP 2 ; + DUP 4 ; + GET 7 ; + SUB ; + ABS ; + SWAP ; + IF_LEFT + { IF_LEFT + { DROP ; + DUP 3 ; + DIG 2 ; + DIG 3 ; + GET 3 ; + SUB ; + ABS ; + UPDATE 3 ; + SWAP ; + UPDATE 7 } + { DROP ; + DUP 3 ; + DIG 2 ; + DIG 3 ; + CAR ; + SUB ; + ABS ; + UPDATE 1 ; + SWAP ; + UPDATE 7 } } + { DROP ; + DUP 3 ; DIG 2 ; - CDR ; - DUP 8 ; - DUP 6 ; - PAIR 3 ; - TRANSFER_TOKENS } - { PUSH string "FA2 token" ; + DIG 3 ; + GET 5 ; + SUB ; + ABS ; + UPDATE 5 ; + SWAP ; + UPDATE 7 } } + { DROP ; + DUP 2 ; + DUP 4 ; + GET 14 ; + SUB ; + ABS ; + SWAP ; + IF_LEFT + { IF_LEFT + { DROP ; + DUP 3 ; + DIG 2 ; + DIG 3 ; + GET 11 ; + SUB ; + ABS ; + UPDATE 11 ; + SWAP ; + UPDATE 14 } + { DROP ; + DUP 3 ; + DIG 2 ; + DIG 3 ; + GET 9 ; + SUB ; + ABS ; + UPDATE 9 ; + SWAP ; + UPDATE 14 } } + { DROP ; + DUP 3 ; + DIG 2 ; + DIG 3 ; + GET 13 ; + SUB ; + ABS ; + UPDATE 13 ; SWAP ; + UPDATE 14 } } } ; + PUSH nat 1 ; + DUP 5 ; + GET 9 ; + SUB ; + ABS ; + DIG 4 ; + DIG 2 ; + UPDATE 5 ; + SWAP ; + UPDATE 9 ; + DUP 3 ; + DIG 3 ; + CAR ; + DUP ; + CAR ; + DUP ; + CAR ; + DUP 7 ; + DIG 7 ; + CDR ; + DUP 7 ; + SOME ; + DIG 7 ; + CAR ; + UPDATE ; + UPDATE 2 ; + UPDATE 2 ; + UPDATE 1 ; + UPDATE 1 ; + UPDATE 1 ; + DUP 5 ; + GET 8 ; + DUP 6 ; + GET 7 ; + DUP 7 ; + GET 5 ; + DIG 7 ; + GET 3 ; + DIG 6 ; + PUSH nat 1 ; + DIG 8 ; + PAIR ; + PAIR ; + PAIR 5 ; + PUSH mutez 0 ; + EMPTY_MAP string (pair (pair nat string (option address) nat (option string)) nat) ; + PAIR ; + DIG 3 ; + ITER { UNPAIR ; + DIG 2 ; + UNPAIR ; + DIG 3 ; + DIG 3 ; + CAR ; + IF_LEFT { DROP ; DUP 4 ; CAR ; CAR ; CAR } { DROP ; DUP 4 ; CAR ; CDR } ; + PAIR ; + PAIR ; + DUP 6 ; + SWAP ; + EXEC ; + DUP 4 ; + CAR ; + CAR ; + CDR ; + CDR ; + DIG 2 ; + ADD ; + SWAP ; + PAIR } ; + SWAP ; + DIG 4 ; + DROP 2 ; + UNPAIR ; + SELF_ADDRESS ; + NIL operation ; + DIG 2 ; + ITER { CDR ; + DUP ; + CAR ; + GET 5 ; + IF_NONE + { DROP ; PUSH nat 109 ; FAILWITH } + { DUP 2 ; + CAR ; + GET 8 ; + IF_NONE + { DROP 2 ; PUSH nat 108 ; FAILWITH } + { PUSH string "FA1.2 token" ; + DUP 2 ; COMPARE ; EQ ; - IF { CONTRACT %transfer - (list (pair (address %from_) (list %tx (pair (address %to_) (nat %token_id) (nat %amount))))) ; + IF { DROP ; + CONTRACT %transfer (pair (address %from) (address %to) (nat %value)) ; IF_NONE { PUSH nat 101 ; FAILWITH } {} ; PUSH mutez 0 ; - NIL (pair address (list (pair address nat nat))) ; - NIL (pair address nat nat) ; - DUP 5 ; + DIG 2 ; CDR ; - DIG 5 ; - CAR ; - CAR ; - DUP 11 ; - PAIR 3 ; - CONS ; + DUP 8 ; DUP 6 ; - PAIR ; - CONS ; + PAIR 3 ; TRANSFER_TOKENS } - { DROP 2 ; PUSH nat 108 ; FAILWITH } } } } ; - CONS } ; - SWAP ; - DIG 4 ; - DROP 2 ; - PUSH mutez 0 ; - DUP 3 ; - COMPARE ; - GT ; - IF { DUP 3 ; - CAR ; - CDR ; - CAR ; - CAR ; - CONTRACT unit ; - IF_NONE - { SWAP ; DROP ; PUSH nat 102 ; FAILWITH } - { DIG 2 ; UNIT ; TRANSFER_TOKENS } ; - CONS } - { SWAP ; DROP } ; - PAIR } } } } + { PUSH string "FA2 token" ; + SWAP ; + COMPARE ; + EQ ; + IF { CONTRACT %transfer + (list (pair (address %from_) (list %tx (pair (address %to_) (nat %token_id) (nat %amount))))) ; + IF_NONE { PUSH nat 101 ; FAILWITH } {} ; + PUSH mutez 0 ; + NIL (pair address (list (pair address nat nat))) ; + NIL (pair address nat nat) ; + DUP 5 ; + CDR ; + DIG 5 ; + CAR ; + CAR ; + DUP 11 ; + PAIR 3 ; + CONS ; + DUP 6 ; + PAIR ; + CONS ; + TRANSFER_TOKENS } + { DROP 2 ; PUSH nat 108 ; FAILWITH } } } } ; + CONS } ; + SWAP ; + DIG 4 ; + DROP 2 ; + PUSH mutez 0 ; + DUP 3 ; + COMPARE ; + GT ; + IF { DUP 3 ; + CAR ; + CDR ; + CAR ; + CAR ; + CONTRACT unit ; + IF_NONE + { SWAP ; DROP ; PUSH nat 102 ; FAILWITH } + { DIG 2 ; UNIT ; TRANSFER_TOKENS } ; + CONS } + { SWAP ; DROP } ; + PAIR } } } } } { DIG 2 ; DROP ; IF_LEFT @@ -1072,7 +1078,16 @@ SWAP ; IF_LEFT { DROP } { DROP ; DUP ; CAR ; SWAP ; CDR ; PAIR } ; NOW ; + DUP 3 ; + CAR ; + CAR ; + CAR ; + GET 3 ; DUP 4 ; + CAR ; + CDR ; + GET 3 ; + DUP 6 ; CDR ; CDR ; CAR ; @@ -1085,16 +1100,20 @@ (nat %oracle_precision) (bool %is_disabled_for_deposits))) ; IF_NONE { PUSH nat 165 ; FAILWITH } {} ; - DUP 3 ; - UNPAIR ; - DUP ; - DUP 3 ; + PUSH nat 0 ; + DUP 2 ; + SIZE ; COMPARE ; - GT ; - IF { PUSH string "-" ; CONCAT ; SWAP ; CONCAT } - { SWAP ; PUSH string "-" ; CONCAT ; SWAP ; CONCAT } ; - GET ; - IF_NONE { PUSH nat 117 ; FAILWITH } {} ; + EQ ; + IF { DROP 3 ; PUSH nat 165 ; FAILWITH } + { DUP 3 ; + DUP 3 ; + COMPARE ; + GT ; + IF { DIG 2 ; PUSH string "-" ; CONCAT ; DIG 2 ; CONCAT } + { SWAP ; PUSH string "-" ; CONCAT ; DIG 2 ; CONCAT } ; + GET ; + IF_NONE { PUSH nat 117 ; FAILWITH } {} } ; DUP ; GET 8 ; IF { DROP 6 ; PUSH nat 125 ; FAILWITH } @@ -1385,9 +1404,13 @@ (nat %oracle_precision) (bool %is_disabled_for_deposits))) ; IF_NONE { PUSH nat 165 ; FAILWITH } {} ; + PUSH nat 0 ; DUP 2 ; - GET ; - IF_NONE { PUSH nat 117 ; FAILWITH } {} ; + SIZE ; + COMPARE ; + EQ ; + IF { DROP ; PUSH nat 165 ; FAILWITH } + { DUP 2 ; GET ; IF_NONE { PUSH nat 117 ; FAILWITH } {} } ; DUP ; GET 3 ; SWAP ; @@ -4753,6 +4776,45 @@ SWAP ; ITER { CDR ; PUSH nat 0 ; SWAP ; COMPARE ; GT ; OR } ; OR } } } ; + view "get_valid_swap" + string + (pair (pair %swap (string %from) (string %to)) + (address %oracle_address) + (string %oracle_asset_name) + (nat %oracle_precision) + (bool %is_disabled_for_deposits)) + { UNPAIR ; + SWAP ; + CDR ; + CDR ; + CAR ; + UNIT ; + VIEW "get_valid_swaps" + (map string + (pair (pair %swap (string %from) (string %to)) + (address %oracle_address) + (string %oracle_asset_name) + (nat %oracle_precision) + (bool %is_disabled_for_deposits))) ; + IF_NONE { PUSH nat 165 ; FAILWITH } {} ; + PUSH nat 0 ; + DUP 2 ; + SIZE ; + COMPARE ; + EQ ; + IF { DROP 2 ; PUSH nat 165 ; FAILWITH } + { SWAP ; GET ; IF_NONE { PUSH nat 117 ; FAILWITH } {} } } ; + view "get_pair_name" + (pair string string) + string + { CAR ; + UNPAIR ; + DUP 2 ; + DUP 2 ; + COMPARE ; + GT ; + IF { SWAP ; PUSH string "-" ; CONCAT ; SWAP ; CONCAT } + { PUSH string "-" ; CONCAT ; SWAP ; CONCAT } } ; view "get_batches_needing_liquidity" unit (list (pair (nat %batch_number) diff --git a/batcher/michelson/marketmaker-ghostnet.tz b/batcher/michelson/marketmaker-ghostnet.tz index 6b7f7217..bd116685 100644 --- a/batcher/michelson/marketmaker-ghostnet.tz +++ b/batcher/michelson/marketmaker-ghostnet.tz @@ -703,7 +703,7 @@ COMPARE ; GT ; IF { SWAP ; PUSH string "-" ; CONCAT ; SWAP ; CONCAT } - { PUSH string "-" ; CONCAT ; SWAP ; CONCAT } + { PUSH string "-" ; CONCAT ; SWAP ; CONCAT } ; DUP 7 ; DUP 2 ; GET ; diff --git a/batcher/michelson/tokenmanager-storage-ghostnet.tz b/batcher/michelson/tokenmanager-storage-ghostnet.tz index 3f1099f1..d5f6e329 100644 --- a/batcher/michelson/tokenmanager-storage-ghostnet.tz +++ b/batcher/michelson/tokenmanager-storage-ghostnet.tz @@ -1,15 +1,15 @@ (Pair (Pair "tz1ca4batAsNxMYab3mUK5H4QRjY8drV4ViL" 10) (Pair { "BTCtz-USDT" ; "BTCtz-USDtz" ; "tzBTC-EURL" ; "tzBTC-USDT" ; "tzBTC-USDtz" } { Elt "BTCtz-USDT" - (Pair (Pair "BTCtz" "USDT") "KT1DG2g5DPYWqyHKGpRL579YkYZwJxibwaAZ" "BTC-USDT" 6 False) ; + (Pair (Pair "BTCtz" "USDT") "KT1C5Y5dWWEP9Ucxsdmgb3PSPiYQ2Qcgo9xM" "BTC-USDT" 6 False) ; Elt "BTCtz-USDtz" - (Pair (Pair "BTCtz" "USDtz") "KT1DG2g5DPYWqyHKGpRL579YkYZwJxibwaAZ" "BTC-USDT" 6 False) ; + (Pair (Pair "BTCtz" "USDtz") "KT1C5Y5dWWEP9Ucxsdmgb3PSPiYQ2Qcgo9xM" "BTC-USDT" 6 False) ; Elt "tzBTC-EURL" - (Pair (Pair "tzBTC" "EURL") "KT1DG2g5DPYWqyHKGpRL579YkYZwJxibwaAZ" "BTC-EUR" 6 False) ; + (Pair (Pair "tzBTC" "EURL") "KT1C5Y5dWWEP9Ucxsdmgb3PSPiYQ2Qcgo9xM" "BTC-EUR" 6 False) ; Elt "tzBTC-USDT" - (Pair (Pair "tzBTC" "USDT") "KT1DG2g5DPYWqyHKGpRL579YkYZwJxibwaAZ" "BTC-USDT" 6 False) ; + (Pair (Pair "tzBTC" "USDT") "KT1C5Y5dWWEP9Ucxsdmgb3PSPiYQ2Qcgo9xM" "BTC-USDT" 6 False) ; Elt "tzBTC-USDtz" - (Pair (Pair "tzBTC" "USDtz") "KT1DG2g5DPYWqyHKGpRL579YkYZwJxibwaAZ" "BTC-USDT" 6 False) }) + (Pair (Pair "tzBTC" "USDtz") "KT1C5Y5dWWEP9Ucxsdmgb3PSPiYQ2Qcgo9xM" "BTC-USDT" 6 False) }) { "BTCtz" ; "EURL" ; "USDT" ; "USDtz" ; "tzBTC" } { Elt "BTCtz" (Pair 0 "BTCtz" (Some "KT1ErLEYVsxqHxLgLucXViq5DYrtSyDuSFTe") 8 (Some "FA2 token")) ; diff --git a/batcher/storage/tokenmanager_storage_ghostnet.mligo b/batcher/storage/tokenmanager_storage_ghostnet.mligo index 2af54255..ad4da717 100644 --- a/batcher/storage/tokenmanager_storage_ghostnet.mligo +++ b/batcher/storage/tokenmanager_storage_ghostnet.mligo @@ -41,7 +41,7 @@ let f(_:unit) : TokenManager.TokenManager.storage = { ]; }; valid_swaps = { - keys = Set.literal ["tzBTC-USDT";"BTCtz-USDtz";"tzBTC-USDtz";"BTCtz-USDT";"tzBTC-EURL"] ; + keys = Set.literal ["tzBTC-USDT";"USDtz-BTCtz";"tzBTC-USDtz";"USDT-BTCtz";"tzBTC-EURL"] ; values = Big_map.literal [ ("tzBTC-USDT", { swap = { @@ -54,7 +54,7 @@ let f(_:unit) : TokenManager.TokenManager.storage = { is_disabled_for_deposits = false } ); - ("BTCtz-USDtz", { + ("USDtz-BTCtz", { swap = { from = "BTCtz"; to = "USDtz"; @@ -76,7 +76,7 @@ let f(_:unit) : TokenManager.TokenManager.storage = { is_disabled_for_deposits = false } ); - ("BTCtz-USDT", { + ("USDT-BTCtz", { swap = { from = "BTCtz"; to = "USDT";