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

Merge branch 'main' into feat/OP-4308-cross-chain-swap

Browse Source 
# Conflicts:
#	package.json
This commit is contained in:
TheJuze
2024-01-19 12:28:18 +03:00
parent fcc30178ab 769719293f
commit 0d9d19b116
2 changed files with 9 additions and 18 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.20.42-rc6",
"version": "0.20.42-rc7",
"description": "Orion Protocol SDK",
"main": "./lib/index.cjs",
"module": "./lib/index.js",

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

@@ -23,27 +23,22 @@ import { generateFeePaymentCall } from "./callGenerators/feePayment.js";
export type Factory = "UniswapV2" | "UniswapV3" | "Curve" | "OrionV2" | "OrionV3";
export type GenerateSwapCalldataWithUnitParams = {
type BaseGenerateSwapCalldataParams = {
amount: BigNumberish;
minReturnAmount: BigNumberish;
initiatorAddress: string;
receiverAddress: string;
matcher: AddressLike,
feeToken: AddressLike,
fee: BigNumberish;
path: ArrayLike<SingleSwap>;
matcher?: AddressLike,
feeToken?: AddressLike,
fee?: BigNumberish;
}
export type GenerateSwapCalldataWithUnitParams = BaseGenerateSwapCalldataParams & {
unit: Unit;
};
export type GenerateSwapCalldataParams = {
amount: BigNumberish;
minReturnAmount: BigNumberish;
initiatorAddress: string;
receiverAddress: string;
path: ArrayLike<SingleSwap>;
matcher: AddressLike,
feeToken: AddressLike,
fee: BigNumberish;
export type GenerateSwapCalldataParams = BaseGenerateSwapCalldataParams & {
exchangeContractAddress: AddressLike;
wethAddress: AddressLike;
curveRegistryAddress: AddressLike;
@@ -347,10 +342,6 @@ async function payFeeToMatcher(
calls: BytesLike[],
swapDescription: LibValidator.SwapDescriptionStruct,
) {
console.log(matcher)
console.log(feeAmount)
console.log(feeToken)
console.log(swapDescription.dstToken)
if (BigInt(feeAmount) !== 0n && feeToken === swapDescription.dstToken) {
const feePaymentCall = generateFeePaymentCall(matcher, feeToken, feeAmount)
calls.push(feePaymentCall)