Mirror/orionprotocol-sdk
1
0
Fork 0
mirror of https://github.com/orionprotocol/sdk.git synced 2026-04-10 04:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

fee parameter should be in exchange decimals

Browse Source
This commit is contained in:
Steam Deck User
2023-12-18 11:10:35 +04:00
parent fabce0540e
commit 7cd71b2c60
2 changed files with 5 additions and 5 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", "name": "@orionprotocol/sdk",
"version": "0.20.34-rc-1", "version": "0.20.34-rc-2",
"description": "Orion Protocol SDK", "description": "Orion Protocol SDK",
"main": "./lib/index.cjs", "main": "./lib/index.cjs",
"module": "./lib/index.js", "module": "./lib/index.js",

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

@@ -138,6 +138,7 @@ export async function generateSwapCalldata({
flags: 0, flags: 0,
}; };
const amountNativeDecimals = await exchangeToNativeDecimals(srcToken, amount, provider); const amountNativeDecimals = await exchangeToNativeDecimals(srcToken, amount, provider);
const feeNativeDecimals = await exchangeToNativeDecimals(feeToken, fee, provider)
path = SafeArray.from(arrayLikePath).map((singleSwap) => { path = SafeArray.from(arrayLikePath).map((singleSwap) => {
if (singleSwap.assetIn == ethers.ZeroAddress) singleSwap.assetIn = wethAddress; if (singleSwap.assetIn == ethers.ZeroAddress) singleSwap.assetIn = wethAddress;
@@ -152,7 +153,7 @@ export async function generateSwapCalldata({
amountNativeDecimals, amountNativeDecimals,
matcher, matcher,
feeToken, feeToken,
fee, feeNativeDecimals,
wethAddress, wethAddress,
swapExecutorContractAddress, swapExecutorContractAddress,
curveRegistryAddress, curveRegistryAddress,
@@ -210,7 +211,7 @@ async function processSwaps(
)); ));
} }
({swapDescription, calls} = payFeeToMatcher(matcher, feeToken, fee, calls, swapDescription)); ({swapDescription, calls} = await payFeeToMatcher(matcher, feeToken, fee, calls, swapDescription));
({ swapDescription, calls } = wrapOrUnwrapIfNeeded( ({ swapDescription, calls } = wrapOrUnwrapIfNeeded(
amount, amount,
@@ -331,14 +332,13 @@ async function processMultiFactorySwaps(
return { swapDescription, calls }; return { swapDescription, calls };
} }
function payFeeToMatcher( async function payFeeToMatcher(
matcher: AddressLike, matcher: AddressLike,
feeToken: AddressLike, feeToken: AddressLike,
feeAmount: BigNumberish, feeAmount: BigNumberish,
calls: BytesLike[], calls: BytesLike[],
swapDescription: LibValidator.SwapDescriptionStruct, swapDescription: LibValidator.SwapDescriptionStruct,
) { ) {
feeAmount = BigInt(feeAmount)
if (feeAmount !== 0n && feeToken === swapDescription.dstToken) { if (feeAmount !== 0n && feeToken === swapDescription.dstToken) {
const feePaymentCall = generateFeePaymentCall(matcher, feeToken, feeAmount) const feePaymentCall = generateFeePaymentCall(matcher, feeToken, feeAmount)
calls.push(feePaymentCall) calls.push(feePaymentCall)