Fixed token pair issue not matching the contract

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" ]
 

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(

batcher-ui/src/components/batcher/SelectPair.tsx

@@ -63,7 +63,9 @@ const SelectPair = ({ isFrom }: SelectPairProps) => {
       newError(
         pairName +
           ' is not a valid pair. Only ' +
-          availableSwaps.join() +
+          availableSwaps
+            .map(s => {s + '\n'})
+            .join() +
           'are supported.'
       )
     );

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',

batcher-ui/src/utils/token-manager.ts

@@ -29,11 +29,34 @@ const getSwapFromBigmap = (
     `${process.env.NEXT_PUBLIC_TZKT_API_URI}/v1/bigmaps/${bigMapId}/keys/${swapName}`
   ).then(checkStatus);
 
+
+// FIXME =- This is the only way I could ge tthe string comparisons to work the same way as they do in the contract ¯\_(ツ)_/¯
+const alignWithLigoLexicographicalSorting = (to: string, from: string) => {
+  const startsWithTzTo = to.startsWith('tz');
+  const startsWithTzFrom = from.startsWith('tz');
+  const endsWithTzFrom = from.endsWith('tz');
+
+  if (!startsWithTzTo && endsWithTzFrom) {
+    return from.localeCompare(to);
+  }
+  if (startsWithTzTo && endsWithTzFrom) {
+    return 1;
+  }
+  if (startsWithTzTo && !startsWithTzFrom) {
+    return -1;
+  }
+  if (!startsWithTzTo && startsWithTzFrom) {
+    return 1;
+  }
+
+  return to.localeCompare(from);
+};
+
 export const getLexicographicalPairName = (
   to: string,
   from: string
 ): string => {
-  const comp = to.localeCompare(from);
+  const comp = alignWithLigoLexicographicalSorting(to, from);
   if (comp < 0) {
     return `${to}-${from}`;
   } else {
@@ -179,7 +202,6 @@ export const getTokensMetadata = async () => {
   );
 };
 
-
 export const getTokensFromStorage = async () => {
   const storage = await getTokenManagerStorage();
   const validTokens = storage['valid_tokens'];
@@ -221,4 +243,4 @@ export const getSwapsFromStorage = async () => {
       };
     })
   );
-}
+};

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=

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

batcher/marketmaker.mligo

@@ -103,7 +103,7 @@ let execute_liquidity_request
   (vault_address:address)
   (valid_tokens:ValidTokens.t_map)
   (valid_swaps:ValidSwaps.t_map): operation = 
-  let pair_name = find_lexicographical_pair_name lt.name ot.name in 
+  let pair_name = getLexicographicalPairName lt.name ot.name in 
   match Map.find_opt pair_name valid_swaps with
   | None  -> failwith swap_does_not_exist
   | Some vs -> let (lastupdated_opt, _tes) = OracleUtils.get_oracle_price pair_name unable_to_get_price_from_oracle vs (Big_map.empty: TickErrors.t) in