Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

isLiquidityAvailableForCudos module added #140

Merged
merged 1 commit into from
Nov 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/lib/httpCalls/oneInchAxiosHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export const OneInchSwap = async (
if (res?.data?.tx?.data) {
data = res?.data?.tx?.data;
}
console.log("data", res?.data);
} catch (error: any) {
console.log("1Inch error", error);
console.log("1Inch error", error?.response?.data);
Expand Down
34 changes: 31 additions & 3 deletions app/lib/middlewares/helpers/liquidityHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import { is } from "bluebird";

var { ethers } = require("ethers");
var tokenAbi = require("../../../../artifacts/contracts/token/Token.sol/Token.json");
const cudosBalance = require("../../../../scripts/cudosBalance");

export const isLiquidityAvailable = async (
export const isLiquidityAvailableForEVM = async (
foundryTokenAddress: string,
fundManagerAddress: string,
provider: any,
Expand All @@ -17,9 +18,36 @@ export const isLiquidityAvailable = async (
);
let balance = await contract.balanceOf(fundManagerAddress);
if (balance) {
console.log("result", Number(balance), Number(amount));
console.log("result", Number(balance), amount);
}
if (balance && Number(balance) >= Number(amount)) {
if (balance && Number(balance) >= amount) {
isValid = true;
}
return isValid;
};

export const isLiquidityAvailableForCudos = async (
foundryTokenAddress: string,
fundManagerAddress: string,
rpc: any,
privateKey: string,
amount: number
): Promise<boolean> => {
let isValid = false;
let balance: any = await cudosBalance(
foundryTokenAddress,
fundManagerAddress,
rpc,
privateKey
);
if (balance && balance.amount) {
console.log("result", balance);
balance.amount = (global as any).utils.convertFromExponentialToDecimal(
balance?.amount
);
console.log("result", balance?.amount, amount);
}
if (balance && balance.amount && balance.amount >= amount) {
isValid = true;
}
return isValid;
Expand Down
36 changes: 36 additions & 0 deletions scripts/cudosBalance.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
require("dotenv").config();

const wasmMultiswap = require("./multiSwapSdk/cosmwasm/multiswap");

function initContracts(fundManagerContract, rpc, privKey, gasPrice) {
const multiswap = new wasmMultiswap.MultiswapContract(
fundManagerContract,
rpc,
privKey,
gasPrice
);
return { multiswap };
}

async function cudosBalance(
foundryTokenAddress,
fundManagerAddress,
cudosRpc,
privateKey
) {
const { multiswap: targetMultiswap } = initContracts(
fundManagerAddress,
cudosRpc,
privateKey,
null
);
const balance = await targetMultiswap.tokenBalance(
foundryTokenAddress,
fundManagerAddress,
privateKey,
cudosRpc
);
return balance;
}

module.exports = cudosBalance;
26 changes: 22 additions & 4 deletions scripts/fiberNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ import {
} from "../app/lib/middlewares/helpers/assetTypeHelper";
import { getAmountOut } from "../app/lib/middlewares/helpers/dexContractHelper";
import { OneInchSwap } from "../app/lib/httpCalls/oneInchAxiosHelper";
import { isLiquidityAvailable } from "../app/lib/middlewares/helpers/liquidityHelper";
import {
isLiquidityAvailableForEVM,
isLiquidityAvailableForCudos,
} from "../app/lib/middlewares/helpers/liquidityHelper";
let InsufficientLiquidityError = "Insufficient liquidity";

module.exports = {
categoriseSwapAssets: async function (
Expand Down Expand Up @@ -297,7 +301,7 @@ module.exports = {
Math.floor(machineSourceBridgeAmountIntoTargetDecimal)
);

let isValidLiquidityAvailable = await isLiquidityAvailable(
let isValidLiquidityAvailable = await isLiquidityAvailableForEVM(
targetNetwork.foundryTokenAddress,
targetNetwork.fundManager,
targetNetwork.provider,
Expand All @@ -306,8 +310,22 @@ module.exports = {
)
);
if (!isValidLiquidityAvailable) {
console.log("Insufficient liquidity");
throw "Insufficient liquidity";
console.log(InsufficientLiquidityError);
throw InsufficientLiquidityError;
}
} else {
let isValidLiquidityAvailable = await isLiquidityAvailableForCudos(
targetNetwork.foundryTokenAddress,
targetNetwork.fundManager,
targetNetwork.rpcUrl,
(global as any).environment.DESTINATION_CHAIN_PRIV_KEY,
(global as any).utils.convertFromExponentialToDecimal(
machineSourceBridgeAmountIntoTargetDecimal
)
);
if (!isValidLiquidityAvailable) {
console.log(InsufficientLiquidityError);
throw InsufficientLiquidityError;
}
}

Expand Down
19 changes: 9 additions & 10 deletions scripts/multiSwapSdk/cosmwasm/multiswap.js
Original file line number Diff line number Diff line change
Expand Up @@ -355,16 +355,15 @@ class MultiswapContract {
console.log("Executed remove_liquidity", tx.transactionHash);
}

async tokenBalance(token, address) {
client = await SigningCosmWasmClient.connectWithSigner(
this.rpcEndpoint,
async tokenBalance(token, address, mnemonic, rpcEndpoint) {
let wallet = await DirectSecp256k1HdWallet.fromMnemonic(mnemonic, {
prefix: "cudos",
});
let client = await SigningCosmWasmClient.connectWithSigner(
rpcEndpoint,
wallet
);
const balance = await client.queryContractSmart(token, {
balance_of: {
address: address,
},
});
const balance = await client.getBalance(address, token);
return balance;
}

Expand Down Expand Up @@ -465,8 +464,8 @@ class MultiswapContract {
let client = await SigningCosmWasmClient.connectWithSigner(
this.rpcEndpoint
);
const txResp = await client.getTx(txId)
console.log("txResp", txResp)
const txResp = await client.getTx(txId);
console.log("txResp", txResp);
}
}

Expand Down