Mirror/orionprotocol-sdk
1
0
Fork 0
mirror of https://github.com/orionprotocol/sdk.git synced 2026-03-26 15:47:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Convert ZeroAddress to WETH in path

Browse Source
This commit is contained in:
lomonoshka
2023-08-21 09:15:29 +03:00
parent 8ea9cdfbd4
commit c118230818
2 changed files with 14 additions and 19 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.48-dev.2",
"version": "0.19.48-dev.3",
"description": "Orion Protocol SDK",
"main": "./lib/index.cjs",
"module": "./lib/index.js",

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

@@ -64,14 +64,11 @@ 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)();
const path = SafeArray.from(path_).map((swapInfo) => {
const swapInfoWithAddresses: SwapInfo = swapInfo
swapInfoWithAddresses.assetIn = safeGet(assetToAddress, swapInfo.assetIn);
swapInfoWithAddresses.assetOut = safeGet(assetToAddress, swapInfo.assetOut);
return swapInfoWithAddresses;
});
let path = SafeArray.from(path_).map((swapInfo) => {
swapInfo.assetIn = safeGet(assetToAddress, swapInfo.assetIn);
swapInfo.assetOut = safeGet(assetToAddress, swapInfo.assetOut);
return swapInfo;
})
const factory = path.first().factory
if (!path.every(swapInfo => swapInfo.factory === factory)) {
throw new Error(`Supporting only swaps with single factory`);
@@ -86,6 +83,12 @@ export default async function generateSwapCalldata({
minReturnAmount: minReturnAmount,
flags: 0
}
path = SafeArray.from(path_).map((swapInfo) => {
if (swapInfo.assetIn == ethers.constants.AddressZero) swapInfo.assetIn = wethAddress
if (swapInfo.assetOut == ethers.constants.AddressZero) swapInfo.assetOut = wethAddress
return swapInfo;
});
let calldata: string
switch (exchangeToType[factory]) {
@@ -100,11 +103,11 @@ export default async function generateSwapCalldata({
break;
}
case "UniswapV3": {
calldata = await generateUni3Calls(amount, exchangeContractAddress, wethAddress, path, unit.provider)
calldata = await generateUni3Calls(amount, exchangeContractAddress, path, unit.provider)
break;
}
case "OrionV3": {
calldata = await generateOrion3Calls(amount, exchangeContractAddress, wethAddress, path, unit.provider)
calldata = await generateOrion3Calls(amount, exchangeContractAddress, path, unit.provider)
break;
}
case "Curve": {
@@ -163,7 +166,6 @@ export async function generateUni2Calls(
async function generateUni3Calls(
amount: string,
exchangeContractAddress: string,
weth: string,
path: SafeArray<SwapInfo>,
provider: ethers.providers.JsonRpcProvider
) {
@@ -173,9 +175,6 @@ async function generateUni3Calls(
const token0 = await pool.token0()
const zeroForOne = token0 === swap.assetIn
const unwrapWETH = swap.assetOut === ethers.constants.AddressZero
if (unwrapWETH) {
swap.assetOut = weth
}
let encodedPool = ethers.utils.solidityPack(["uint256"], [pool.address])
encodedPool = ethers.utils.hexDataSlice(encodedPool, 1)
@@ -196,7 +195,6 @@ async function generateUni3Calls(
async function generateOrion3Calls(
amount: string,
exchangeContractAddress: string,
weth: string,
path: SafeArray<SwapInfo>,
provider: ethers.providers.JsonRpcProvider
) {
@@ -206,9 +204,6 @@ async function generateOrion3Calls(
const token0 = await pool.token0()
const zeroForOne = token0 === swap.assetIn
const unwrapWETH = swap.assetOut === ethers.constants.AddressZero
if (unwrapWETH) {
swap.assetOut = weth
}
let encodedPool = ethers.utils.solidityPack(["uint256"], [pool.address])
encodedPool = ethers.utils.hexDataSlice(encodedPool, 1)