Skip to content

test #227

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.

Sign up for GitHub

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

Open
kigastu wants to merge 3 commits into
base: main
Choose a base branch
from
Open

test #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3cc019f
test
kigastu Dec 14, 2023
153e922
test
kigastu Dec 14, 2023
df0f259
fix: ver
kigastu Dec 14, 2023
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@orionprotocol/sdk",
"version": "0.20.33",
"version": "0.20.33-test1",
"description": "Orion Protocol SDK",
"main": "./lib/index.cjs",
"module": "./lib/index.js",
Expand Down
179 changes: 138 additions & 41 deletions src/Unit/Exchange/generateSwapCalldata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,49 @@
import type { LibValidator } from "@orionprotocol/contracts/lib/ethers-v6/Exchange.js";
import { ethers, ZeroAddress } from "ethers";
import type { AddressLike, JsonRpcProvider, BigNumberish, BytesLike } from "ethers";
import type {
AddressLike,
JsonRpcProvider,
BigNumberish,
BytesLike,
} from "ethers";
import cloneDeep from "lodash.clonedeep";
import { safeGet, SafeArray } from "../../utils/safeGetters.js";
import { simpleFetch } from "simple-typed-fetch";
import type Unit from "../index.js";
import { generateUni2Calls, generateUni2Call } from "./callGenerators/uniswapV2.js";
import {
generateUni2Calls,
generateUni2Call,
} from "./callGenerators/uniswapV2.js";
import {
generateUni3Calls,
generateOrion3Calls,
generateUni3Call,
generateOrion3Call,
} from "./callGenerators/uniswapV3.js";
import { exchangeToNativeDecimals, generateCalls, pathCallWithBalance } from "./callGenerators/utils.js";
import {
exchangeToNativeDecimals,
generateCalls,
pathCallWithBalance,
} from "./callGenerators/utils.js";
import { generateTransferCall } from "./callGenerators/erc20.js";
import { generateCurveStableSwapCall } from "./callGenerators/curve.js";
import type { SingleSwap } from "../../types.js";
import { addressLikeToString } from "../../utils/addressLikeToString.js";
import { generateUnwrapAndTransferCall, generateWrapAndTransferCall } from "./callGenerators/weth.js";
import { getExchangeAllowance, getTotalBalance } from "../../utils/getBalance.js";
import {
generateUnwrapAndTransferCall,
generateWrapAndTransferCall,
} from "./callGenerators/weth.js";
import {
getExchangeAllowance,
getTotalBalance,
} from "../../utils/getBalance.js";

export type Factory = "UniswapV2" | "UniswapV3" | "Curve" | "OrionV2" | "OrionV3";
export type Factory =
| "UniswapV2"
| "UniswapV3"
| "Curve"
| "OrionV2"
| "OrionV3";

export type GenerateSwapCalldataWithUnitParams = {
amount: BigNumberish;
Expand Down Expand Up @@ -61,16 +84,20 @@ export async function generateSwapCalldataWithUnit({
}
const wethAddress = safeGet(unit.contracts, "WETH");
const curveRegistryAddress = safeGet(unit.contracts, "curveRegistry");
const { assetToAddress, swapExecutorContractAddress, exchangeContractAddress } = await simpleFetch(
unit.blockchainService.getInfo
)();
const {
assetToAddress,
swapExecutorContractAddress,
exchangeContractAddress,
} = await simpleFetch(unit.blockchainService.getInfo)();

const arrayLikePathCopy = cloneDeep(arrayLikePath);
let path = SafeArray.from(arrayLikePathCopy);

path = SafeArray.from(arrayLikePathCopy).map((swapInfo) => {
swapInfo.assetIn = assetToAddress[swapInfo.assetIn] ?? swapInfo.assetIn.toLowerCase();
swapInfo.assetOut = assetToAddress[swapInfo.assetOut] ?? swapInfo.assetOut.toLowerCase();
swapInfo.assetIn =
assetToAddress[swapInfo.assetIn] ?? swapInfo.assetIn.toLowerCase();
swapInfo.assetOut =
assetToAddress[swapInfo.assetOut] ?? swapInfo.assetOut.toLowerCase();
return swapInfo;
});

Expand Down Expand Up @@ -105,8 +132,12 @@ export async function generateSwapCalldata({
value: bigint;
}> {
const wethAddress = await addressLikeToString(wethAddressLike);
const curveRegistryAddress = await addressLikeToString(curveRegistryAddressLike);
const swapExecutorContractAddress = await addressLikeToString(swapExecutorContractAddressLike);
const curveRegistryAddress = await addressLikeToString(
curveRegistryAddressLike
);
const swapExecutorContractAddress = await addressLikeToString(
swapExecutorContractAddressLike
);
let path = SafeArray.from(arrayLikePath);

const { assetIn: srcToken } = path.first();
Expand All @@ -121,11 +152,17 @@ export async function generateSwapCalldata({
minReturnAmount,
flags: 0,
};
const amountNativeDecimals = await exchangeToNativeDecimals(srcToken, amount, provider);
const amountNativeDecimals = await exchangeToNativeDecimals(
srcToken,
amount,
provider
);

path = SafeArray.from(arrayLikePath).map((singleSwap) => {
if (singleSwap.assetIn == ethers.ZeroAddress) singleSwap.assetIn = wethAddress;
if (singleSwap.assetOut == ethers.ZeroAddress) singleSwap.assetOut = wethAddress;
if (singleSwap.assetIn == ethers.ZeroAddress)
singleSwap.assetIn = wethAddress;
if (singleSwap.assetOut == ethers.ZeroAddress)
singleSwap.assetOut = wethAddress;
return singleSwap;
});

Expand All @@ -141,18 +178,18 @@ export async function generateSwapCalldata({
));
const calldata = generateCalls(calls);

const { useExchangeBalance, additionalTransferAmount } = await shouldUseExchangeBalance(
const { useExchangeBalance } = await shouldUseExchangeBalance(
srcToken,
initiatorAddress,
exchangeContractAddress,
amountNativeDecimals,
provider
);
if (useExchangeBalance) {
swapDescription.flags = 1n << 255n;
// swapDescription.flags = 1n << 255n;
}
const value = srcToken == ZeroAddress ? additionalTransferAmount : 0n;
return { swapDescription, calldata, value };
// const value = srcToken == ZeroAddress ? additionalTransferAmount : 0n;
return { swapDescription, calldata, value: 0n };
}

async function processSwaps(
Expand All @@ -165,7 +202,9 @@ async function processSwaps(
provider: JsonRpcProvider
) {
const { factory: firstSwapFactory } = path.first();
const isSingleFactorySwap = path.every((singleSwap) => singleSwap.factory === firstSwapFactory);
const isSingleFactorySwap = path.every(
(singleSwap) => singleSwap.factory === firstSwapFactory
);
let calls: BytesLike[];
if (isSingleFactorySwap) {
({ swapDescription, calls } = await processSingleFactorySwaps(
Expand Down Expand Up @@ -219,11 +258,21 @@ async function processSingleFactorySwaps(
break;
}
case "UniswapV3": {
calls = await generateUni3Calls(path, amount, swapExecutorContractAddress, provider);
calls = await generateUni3Calls(
path,
amount,
swapExecutorContractAddress,
provider
);
break;
}
case "OrionV3": {
calls = await generateOrion3Calls(path, amount, swapExecutorContractAddress, provider);
calls = await generateOrion3Calls(
path,
amount,
swapExecutorContractAddress,
provider
);
break;
}
case "Curve": {
Expand Down Expand Up @@ -259,27 +308,55 @@ async function processMultiFactorySwaps(
for (const swap of path) {
switch (swap.factory) {
case "OrionV2": {
let transferCall = await generateTransferCall(swap.assetIn, swap.pool, 0);
let transferCall = await generateTransferCall(
swap.assetIn,
swap.pool,
0
);
transferCall = pathCallWithBalance(transferCall, swap.assetIn);
const uni2Call = await generateUni2Call(swap.pool, swap.assetIn, swap.assetOut, swapExecutorContractAddress);
const uni2Call = await generateUni2Call(
swap.pool,
swap.assetIn,
swap.assetOut,
swapExecutorContractAddress
);
calls.push(transferCall, uni2Call);
break;
}
case "UniswapV2": {
let transferCall = await generateTransferCall(swap.assetIn, swap.pool, 0);
let transferCall = await generateTransferCall(
swap.assetIn,
swap.pool,
0
);
transferCall = pathCallWithBalance(transferCall, swap.assetIn);
const uni2Call = await generateUni2Call(swap.pool, swap.assetIn, swap.assetOut, swapExecutorContractAddress);
const uni2Call = await generateUni2Call(
swap.pool,
swap.assetIn,
swap.assetOut,
swapExecutorContractAddress
);
calls.push(transferCall, uni2Call);
break;
}
case "UniswapV3": {
let uni3Call = await generateUni3Call(swap, 0, swapExecutorContractAddress, provider);
let uni3Call = await generateUni3Call(
swap,
0,
swapExecutorContractAddress,
provider
);
uni3Call = pathCallWithBalance(uni3Call, swap.assetIn);
calls.push(uni3Call);
break;
}
case "OrionV3": {
let orion3Call = await generateOrion3Call(swap, 0, swapExecutorContractAddress, provider);
let orion3Call = await generateOrion3Call(
swap,
0,
swapExecutorContractAddress,
provider
);
orion3Call = pathCallWithBalance(orion3Call, swap.assetIn);
calls.push(orion3Call);
break;
Expand Down Expand Up @@ -313,16 +390,25 @@ async function wrapOrUnwrapIfNeeded(
wethAddress: string
) {
if (swapDescription.srcToken === ZeroAddress) {
const wrapCall = generateWrapAndTransferCall(swapDescription.srcReceiver, { value: amount });
const wrapCall = generateWrapAndTransferCall(swapDescription.srcReceiver, {
value: amount,
});
swapDescription.srcReceiver = swapExecutorContractAddress;
calls = ([wrapCall] as BytesLike[]).concat(calls);
}
if (swapDescription.dstToken === ZeroAddress) {
let unwrapCall = generateUnwrapAndTransferCall(swapDescription.dstReceiver, 0);
let unwrapCall = generateUnwrapAndTransferCall(
swapDescription.dstReceiver,
0
);
unwrapCall = pathCallWithBalance(unwrapCall, wethAddress);
calls.push(unwrapCall);
} else {
let transferCall = await generateTransferCall(swapDescription.dstToken, swapDescription.dstReceiver, 0);
let transferCall = await generateTransferCall(
swapDescription.dstToken,
swapDescription.dstReceiver,
0
);
transferCall = pathCallWithBalance(transferCall, swapDescription.dstToken);
calls.push(transferCall);
}
Expand All @@ -336,28 +422,39 @@ async function shouldUseExchangeBalance(
amount: bigint,
provider: JsonRpcProvider
) {
const { walletBalance, exchangeBalance } = await getTotalBalance(
const { exchangeBalance } = await getTotalBalance(
srcToken,
initiatorAddress,
exchangeContractAddress,
provider
);
const exchangeAllowance = await getExchangeAllowance(
srcToken,
initiatorAddress,
exchangeContractAddress,
provider
);
const exchangeAllowance = await getExchangeAllowance(srcToken, initiatorAddress, exchangeContractAddress, provider);

if (walletBalance + exchangeBalance < amount) {
throw new Error(
`Not enough balance to make swap, totalBalance - ${walletBalance + exchangeBalance} swapAmount - ${amount}`
);
}
// if (walletBalance + exchangeBalance < amount) {
// throw new Error(
// `Not enough balance to make swap, totalBalance - ${
// walletBalance + exchangeBalance
// } swapAmount - ${amount}`
// );
// }
let useExchangeBalance = true;
let additionalTransferAmount = 0n;

if (exchangeBalance == 0n) {
useExchangeBalance = false;
additionalTransferAmount = amount;
} else {
additionalTransferAmount = exchangeBalance >= amount ? 0n : amount - exchangeBalance;
if (srcToken !== ZeroAddress && additionalTransferAmount > exchangeAllowance) {
additionalTransferAmount =
exchangeBalance >= amount ? 0n : amount - exchangeBalance;
if (
srcToken !== ZeroAddress &&
additionalTransferAmount > exchangeAllowance
) {
throw new Error(
`Not enough allowance to make swap, allowance - ${exchangeAllowance} needed allowance - ${additionalTransferAmount}`
);
Expand Down