diff --git a/batcher-ui/src/commands/events.ts b/batcher-ui/src/commands/events.ts index ecf70951..e8f62d37 100644 --- a/batcher-ui/src/commands/events.ts +++ b/batcher-ui/src/commands/events.ts @@ -71,8 +71,8 @@ export const newEventCmd = (event: BigMapEvent, toks: Map) => { //! oracle price has changed const data = eventData.content.value as RatesCurrentBigmap; console.info('Oracle change', data); - const buyToken = tokens.get(data.swap.from.token.name); - const sellToken = tokens.get(data.swap.to.name); + const buyToken = tokens.get(data.swap.from); + const sellToken = tokens.get(data.swap.to); const buyTokenDecimals: number = buyToken?.decimals || 0; const sellTokenDecimals: number = sellToken?.decimals || 0; dispatch( diff --git a/batcher-ui/src/components/batcher/BatcherInfo.tsx b/batcher-ui/src/components/batcher/BatcherInfo.tsx index caaad5d5..f57645c8 100644 --- a/batcher-ui/src/components/batcher/BatcherInfo.tsx +++ b/batcher-ui/src/components/batcher/BatcherInfo.tsx @@ -6,14 +6,14 @@ import { batcherStatusSelector, currentPairSelector, oraclePriceSelector, - oraclePairSelector, + //oraclePairSelector, remainingTimeSelector, } from '@/reducers'; import { BatcherStatus } from '@/types'; const BatcherInfo = () => { const tokenPair = useSelector(currentPairSelector); - const oraclePair = useSelector(oraclePairSelector); + //const oraclePair = useSelector(oraclePairSelector); const batchNumber = useSelector(batchNumberSelector); const status = useSelector(batcherStatusSelector); diff --git a/batcher-ui/src/components/batcher/SelectPair.tsx b/batcher-ui/src/components/batcher/SelectPair.tsx index 3d9313d5..f73b12db 100644 --- a/batcher-ui/src/components/batcher/SelectPair.tsx +++ b/batcher-ui/src/components/batcher/SelectPair.tsx @@ -46,25 +46,18 @@ const SelectPair = ({ isFrom }: SelectPairProps) => { }; useEffect(() => { - console.info('SWAPPAIRS', swaps); - console.info('SWAPPAIRS displayTokens', displayTokens); - console.info('SWAPPAIRS displayTokens s', Array.from(displayTokens)); + const mappedSwaps = ensureMapTypeOnSwaps(swaps); const mappedDisplayTokens = ensureMapTypeOnDisplayTokens(displayTokens); const swapPairs = Array.from(mappedSwaps).map(([k, v]) => { - console.info('SWAPPAIRS k', k); - console.info('SWAPPAIRS v', v); const to = mappedDisplayTokens.get(v.swap.to); const from = mappedDisplayTokens.get(v.swap.from); - console.info('SWAPPAIRS to', to); - console.info('SWAPPAIRS from', from); + let ds: DisplaySwap = { pair: k, to: to || emptyDisplayToken(), from: from || emptyDisplayToken(), }; - console.info('SWAPPAIRS ds', ds); - return ds; }); @@ -73,6 +66,7 @@ const SelectPair = ({ isFrom }: SelectPairProps) => { }, [dispatch, swaps, displayTokens]); + const displayValue = useCallback(() => { if (isReverse && isFrom) return swap.to?.name; if (isReverse && !isFrom) return swap.from?.name; diff --git a/batcher-ui/src/types/contracts/batcher.ts b/batcher-ui/src/types/contracts/batcher.ts index 6fd37bfc..fc899a25 100644 --- a/batcher-ui/src/types/contracts/batcher.ts +++ b/batcher-ui/src/types/contracts/batcher.ts @@ -19,11 +19,8 @@ export type TokenNames = 'tzBTC' | 'EURL' | 'USDT'; export type SwapNames = 'tzBTC-USDT' | 'tzBTC-EURL'; type Swap = { - from: { - token: ContractToken; - amount: string; - }; - to: ContractToken; + from: string; + to: string; }; export type ContractToken = { @@ -124,17 +121,6 @@ export type VaultHoldings = Map; export type BatcherStorage = { metadata: number; //! ID of metadata bigmap - valid_tokens: Record; - valid_swaps: Record< - SwapNames, - { - swap: Swap; - is_disabled_for_deposits: boolean; - oracle_address: string; - oracle_precision: string; - oracle_asset_name: string; - } - >; rates_current: number; //! ID of rates_current bigmap fee_in_mutez: number; batch_set: { @@ -145,7 +131,6 @@ export type BatcherStorage = { fee_recipient: string; //! Address last_order_number: string; //! number in string user_batch_ordertypes: number; //! ID of order book bigmap - limit_on_tokens_or_pairs: string; //! 10 per default deposit_time_window_in_seconds: string; //! 600 at this time scale_factor_for_oracle_staleness: string; //! "1" }; diff --git a/batcher-ui/src/utils/token-manager.ts b/batcher-ui/src/utils/token-manager.ts index b22c5a53..d855bf8d 100644 --- a/batcher-ui/src/utils/token-manager.ts +++ b/batcher-ui/src/utils/token-manager.ts @@ -105,20 +105,14 @@ export const getPairsInformation = async ( return { currentSwap: swapStoredCurrently, pair }; } else { const storage = await getTokenManagerStorage(); - console.info('DEBUG getPairsInfo - pair ', pair); - console.info('DEBUG getPairsInfo -storage ', storage); - //const validSwaps = storage['valid_swaps']; //TODO - Only swaps pairs allowed by the contract should be displayed. A token might not be swappable with every other token const validTokens = storage['valid_tokens']; const pairs = pair.split('-'); - console.info('DEBUG getPairsInfo - pairs ', pairs); + if (!pairs) { console.trace(); } const left = (await getTokenFromBigmap(validTokens.values, pairs[0])).value; - const right = (await getTokenFromBigmap(validTokens.values, pairs[1])) - .value; - console.info('DEBUG getPairsInfo - left ', left); - console.info('DEBUG getPairsInfo - right ', right); + const right = (await getTokenFromBigmap(validTokens.values, pairs[1])).value; return { currentSwap: { diff --git a/batcher-ui/src/utils/utils.ts b/batcher-ui/src/utils/utils.ts index 4e348c6e..065cae7f 100644 --- a/batcher-ui/src/utils/utils.ts +++ b/batcher-ui/src/utils/utils.ts @@ -216,11 +216,9 @@ export const getBalances = async (userAddress: string): Promise => { const tokenManagerStorage = await getTokenManagerStorage(); const validTokens = tokenManagerStorage['valid_tokens']; const rawBalances = await getTokensBalancesByAccount(userAddress); - console.info('DEBUG: storage', tokenManagerStorage); let bals = new Array(); for await (const token_name of validTokens.keys) { const token = await getBigMapByIdAndKey(validTokens.values, token_name); - console.info('DEBUG: token', token); const balance = rawBalances.find( (b: TokenBalance) => b.token?.contract?.address === token.address )?.balance; @@ -431,7 +429,8 @@ export const ensureMapTypeOnDisplayTokens = ( let dsp: Map = new Map(); Object.values(displayTokens).forEach(v => { console.info('v', v); - const dt = (v as unknown) as DisplayToken; + const dt = v as unknown as DisplayToken; + console.info('dt', dt); dsp.set(dt.name, dt); }); @@ -461,7 +460,10 @@ export const computeOraclePrice = ( ) => { const numerator = parseInt(rate.p); const denominator = parseInt(rate.q); - console.info("#### Oracle Rate ######", rate); + console.info('#### Oracle Rate ######', rate); + console.info('#### Buy Decimals ######', buyDecimals); + console.info('#### Sell Decimals ######', sellDecimals); + const scaledPow = sellDecimals - buyDecimals; return scaleAmountUp(numerator / denominator, scaledPow); };