Mirror/orionprotocol-sdk
1
0
Fork 0
mirror of https://github.com/orionprotocol/sdk.git synced 2026-03-14 06:02:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renamed type SwapInfo to SingleSwap

Browse Source
This commit is contained in:
lomonoshka
2023-09-28 18:35:59 +04:00
parent f78266818f
commit 1134865abf
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@orionprotocol/sdk",
"version": "0.19.92-rc100",
"version": "0.19.92-rc101",
"description": "Orion Protocol SDK",
"main": "./lib/index.cjs",
"module": "./lib/index.js",

26
src/Unit/Exchange/generateSwapCalldata.ts
View File

@@ -12,7 +12,7 @@ import { generateCurveStableSwapCall } from './callGenerators/curve.js';
export type Factory = "UniswapV2" | "UniswapV3" | "Curve" | "OrionV2" | "OrionV3"
export type SwapInfo = {
export type SingleSwap = {
pool: string
assetIn: string
assetOut: string
@@ -23,7 +23,7 @@ export type GenerateSwapCalldataParams = {
amount: BigNumberish
minReturnAmount: BigNumberish
receiverAddress: string
path: ArrayLike<SwapInfo>
path: ArrayLike<SingleSwap>
unit: Unit
}
@@ -41,10 +41,10 @@ export default async function generateSwapCalldata({
const wethAddress = safeGet(unit.contracts, 'WETH')
const curveRegistryAddress = safeGet(unit.contracts, 'curveRegistry')
const { assetToAddress, swapExecutorContractAddress, exchangeContractAddress } = await simpleFetch(unit.blockchainService.getInfo)();
let path = SafeArray.from(arrayLikePath).map((swapInfo) => {
swapInfo.assetIn = safeGet(assetToAddress, swapInfo.assetIn);
swapInfo.assetOut = safeGet(assetToAddress, swapInfo.assetOut);
return swapInfo;
let path = SafeArray.from(arrayLikePath).map((singleSwap) => {
singleSwap.assetIn = safeGet(assetToAddress, singleSwap.assetIn);
singleSwap.assetOut = safeGet(assetToAddress, singleSwap.assetOut);
return singleSwap;
})
const { factory, assetIn: srcToken } = path.first()
@@ -61,12 +61,12 @@ export default async function generateSwapCalldata({
}
const amountNativeDecimals = await exchangeToNativeDecimals(srcToken, amount, unit.provider);
path = SafeArray.from(arrayLikePath).map((swapInfo) => {
if (swapInfo.assetIn == ethers.constants.AddressZero) swapInfo.assetIn = wethAddress
if (swapInfo.assetOut == ethers.constants.AddressZero) swapInfo.assetOut = wethAddress
return swapInfo;
path = SafeArray.from(arrayLikePath).map((singleSwap) => {
if (singleSwap.assetIn == ethers.constants.AddressZero) singleSwap.assetIn = wethAddress
if (singleSwap.assetOut == ethers.constants.AddressZero) singleSwap.assetOut = wethAddress
return singleSwap;
});
const isSingleFactorySwap = path.every(swapInfo => swapInfo.factory === factory)
const isSingleFactorySwap = path.every(singleSwap => singleSwap.factory === factory)
let calldata: BytesLike
if (isSingleFactorySwap) {
({ swapDescription, calldata } = await processSingleFactorySwaps(
@@ -97,7 +97,7 @@ export default async function generateSwapCalldata({
async function processSingleFactorySwaps(
factory: Factory,
swapDescription: ExchangeWithGenericSwap.SwapDescriptionStruct,
path: SafeArray<SwapInfo>,
path: SafeArray<SingleSwap>,
recipient: string,
amount: BigNumberish,
swapExecutorContractAddress: string,
@@ -160,7 +160,7 @@ async function processSingleFactorySwaps(
async function processMultiFactorySwaps(
swapDescription: ExchangeWithGenericSwap.SwapDescriptionStruct,
path: SafeArray<SwapInfo>,
path: SafeArray<SingleSwap>,
recipient: string,
amount: BigNumberish,
swapExecutorContractAddress: string,