Merge pull request #61 from EnsoBuild/script-updates

fix: scripts

Author: PeterMPhillips

scripts/buildTransaction.ts

@@ -59,7 +59,7 @@ async function main() {
 
     const campaign = await getCampaign(provider, chainId, marketHash);
     const { owner, verified, receiptToken, depositRecipe } = campaign;
-    if (!verified) throw 'Error: Market is not verified';
+    if (!verified) console.log('Market is not verified'); //throw 'Error: Market is not verified';
     const preVerificationHash = buildVerificationHash(receiptToken, depositRecipe);
 
     const shortcutHashMap = await buildShortcutsHashMap(chainId, provider);
@@ -111,7 +111,7 @@ async function main() {
     console.log('Weiroll Wallet Token Balances: ', tokenBalances, '\n');
 
     const roles = getSimulationRolesByChainId(chainId);
-    if (useMockWalletAmounts) {
+    if (!verified || useMockWalletAmounts) {
       await simulateShortcutOnQuoter(
         provider,
         shortcut,

scripts/crossChainSimulation.ts

@@ -78,7 +78,7 @@ const marketHashes: Record<string, Record<string, string>> = {
   },
   d2: {
     'usdc-kodiakplus': '0x027987432679079fbbc990691d14dabe7f7780f51df6a1a53e7bd875b1f9581a',
-    //'usdc-beraland': '0x0964848864e96952ee2454ce58fc93b867f9b2d9a6b44216eec8b08726813d1b',
+    'usdc-beraland': '0x0964848864e96952ee2454ce58fc93b867f9b2d9a6b44216eec8b08726813d1b',
     'usdc-hyperbera': '0xb7b78119806fcb9bbc499131da16b52ce52cf4a1ceabfc59e4f2f6e6ef7046c0',
   },
   goldilocks: {
@@ -94,16 +94,16 @@ const marketHashes: Record<string, Record<string, string>> = {
     'honey-usdc': '0x72bec627884d7bdf538f174bedd551e9eccf3995adc880f40972e2bab87df3b9',
     'mim-honey': '0x9a117f13c7d5d2b4b18e444f72e6e77c010a1fd90cf21135be75669d66ad9428',
     'pumpbtc-fbtc': '0xab27dc8061f66791bb94a536546b08ba15e06344dabad2cc6267cf44f0070574',
-    //'pumpbtc-ylbtclst': '0x2fa37184f43783f5d6b23548c4a7a21bb86cd2f314bba9d5bb7d2415d61d11c8',
-    //'pumpbtc-ylpumpbtc': '0xaa636d73f39ea0de0e04ed9270eac5d943707e7f8fb9c3480c0d80eb015ccfc8',
+    'pumpbtc-ylbtclst': '0x2fa37184f43783f5d6b23548c4a7a21bb86cd2f314bba9d5bb7d2415d61d11c8',
+    'pumpbtc-ylpumpbtc': '0xaa636d73f39ea0de0e04ed9270eac5d943707e7f8fb9c3480c0d80eb015ccfc8',
     'rseth-beraeth': '0x25f7a422282a1f26d9d96b5d1c43fa5c6f8c355b0ed7a4755ac8d04a504817f5',
     //'rseth-ylrseth': '0x460ec133419318efe4e05b4c3b6db421503fd6fcefbb20a43f50e3fc50f2ee39',
     'rusd-honey': '0xcdb30c06ea11f3f5408bce5eefdb392dfe0008ef81af3a486bcfed891f9cc112',
     'solvbtc-fbtc': '0xc5165360e2e8b195cb55e21cf259ce6a5ee996b055057d8705851d9b01fc8620',
     'solvbtc-solvbtcbnn': '0x378d4d32d89450978d01cfdf1ff1907d4419aa186c48abb94e612b76d75f3fae',
     'susda-usda': '0xd70673b98af7096f575717d70fbf2fa935dd719926b55c0e011480678cdac563',
     'susde-honey': '0xad9ee12ea8b3dccf85934c2918bd4ad38ccf7bc8b43d5fcb6f298858aa4c9ca4',
-    //'unibtc-ylbtclst': '0x21c6a0baa6f41b060937be5a4f1be096b63f426c50f763b4dabd1af46803fa2f',
+    'unibtc-ylbtclst': '0x21c6a0baa6f41b060937be5a4f1be096b63f426c50f763b4dabd1af46803fa2f',
     'usde-honey': '0x5f7935e257b94aee6caf9bbe917d4cfad75e8bc3b231806769ca0935af8371e8',
     'usde-usda': '0xab689b5eac7541b8cc774f0ca3705a91b21660e8221fc7bd8e93c391fb5d690d',
     'usdt-honey': '0xf8f745f188ddb10c16724faee95583521191c3c69e15490fa53c1136b73c17d7',

scripts/lpDeposits.ts

@@ -1,16 +1,24 @@
-import { AddressArg } from '@ensofinance/shortcuts-builder/types';
+import { BigNumber } from '@ethersproject/bignumber';
 import { StaticJsonRpcProvider } from '@ethersproject/providers';
 
-import { getChainId, getRpcUrlByChainId, getUniswapLiquidity } from '../src/helpers';
+import {
+  getChainId,
+  getDepositLockerAmount,
+  getMarketInputToken,
+  getRpcUrlByChainId,
+  getUniswapLiquidity,
+} from '../src/helpers';
+
+const minBps = 9970;
+const bps = 10000;
 
 async function main() {
   try {
     const args: string[] = process.argv.slice(2);
 
-    if (args.length < 3) throw 'Error: Please pass chain, lp token, and amount';
+    if (args.length < 2) throw 'Error: Please pass chain and market hash';
     const chain = args[0];
-    const lpToken = args[1];
-    const liquidity = args[2];
+    const marketHash = args[1];
 
     const chainId = getChainId(chain);
     if (!chainId) throw 'Error: Unknown chain';
@@ -20,8 +28,23 @@ async function main() {
       url: rpcUrl,
     });
 
-    const response = await getUniswapLiquidity(provider, lpToken as AddressArg, liquidity);
-    console.log(response);
+    const lockedAmount = await getDepositLockerAmount(provider, marketHash);
+    // Check if underlying is uniswap
+    const token = await getMarketInputToken(provider, marketHash);
+
+    console.log('Market Hash: ', marketHash);
+    console.log('Locked amount: ', lockedAmount.toString());
+    console.log('LP Token: ', token);
+    const { amount0, amount1 } = await getUniswapLiquidity(provider, token, lockedAmount);
+    const minAmount0 = BigNumber.from(amount0).mul(minBps).div(bps).toString();
+    const minAmount1 = BigNumber.from(amount1).mul(minBps).div(bps).toString();
+
+    console.log({
+      amount0,
+      amount1,
+      minAmount0,
+      minAmount1,
+    });
   } catch (e) {
     console.error(e);
   }