@paraswap/dex-lib 2.16.5-direct-swaps.8 → 2.16.5-direct-swaps.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DirectSwap = void 0;
|
|
4
4
|
const constants_1 = require("../constants");
|
|
5
|
+
const payload_encoder_1 = require("./payload-encoder");
|
|
5
6
|
class DirectSwap {
|
|
6
7
|
constructor(dexAdapterService) {
|
|
7
8
|
this.dexAdapterService = dexAdapterService;
|
|
@@ -37,9 +38,9 @@ class DirectSwap {
|
|
|
37
38
|
const expectedAmount = priceRoute.side === constants_1.SwapSide.SELL
|
|
38
39
|
? priceRoute.destAmount
|
|
39
40
|
: priceRoute.srcAmount;
|
|
40
|
-
return dex.getDirectParam(priceRoute.srcToken, priceRoute.destToken, srcAmount, destAmount, expectedAmount, swapExchange.data, priceRoute.side, permit, uuid,
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
return dex.getDirectParam(priceRoute.srcToken, priceRoute.destToken, srcAmount, destAmount, expectedAmount, swapExchange.data, priceRoute.side, permit, uuid, referrerAddress
|
|
42
|
+
? (0, payload_encoder_1.encodeFeePercentForReferrer)(priceRoute.side)
|
|
43
|
+
: (0, payload_encoder_1.encodeFeePercent)(partnerFeePercent, positiveSlippageToUser, priceRoute.side), deadline, referrerAddress || partnerAddress, beneficiary, priceRoute.contractMethod);
|
|
43
44
|
}
|
|
44
45
|
}
|
|
45
46
|
exports.DirectSwap = DirectSwap;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"directswap.js","sourceRoot":"","sources":["../../src/router/directswap.ts"],"names":[],"mappings":";;;AAGA,4CAAwC;
|
|
1
|
+
{"version":3,"file":"directswap.js","sourceRoot":"","sources":["../../src/router/directswap.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/router/directswap.ts
CHANGED
|
@@ -4,6 +4,10 @@ import { Address, OptimalRate, TxInfo, Adapters } from '../types';
|
|
|
4
4
|
import { SwapSide } from '../constants';
|
|
5
5
|
import { DexAdapterService } from '../dex';
|
|
6
6
|
import { assert } from 'ts-essentials';
|
|
7
|
+
import {
|
|
8
|
+
encodeFeePercent,
|
|
9
|
+
encodeFeePercentForReferrer,
|
|
10
|
+
} from './payload-encoder';
|
|
7
11
|
|
|
8
12
|
export class DirectSwap<DexDirectReturn> implements IRouter<DexDirectReturn> {
|
|
9
13
|
// This is just psuedo name as the DirectSwap
|
|
@@ -75,10 +79,15 @@ export class DirectSwap<DexDirectReturn> implements IRouter<DexDirectReturn> {
|
|
|
75
79
|
priceRoute.side,
|
|
76
80
|
permit,
|
|
77
81
|
uuid,
|
|
78
|
-
|
|
79
|
-
|
|
82
|
+
referrerAddress
|
|
83
|
+
? encodeFeePercentForReferrer(priceRoute.side)
|
|
84
|
+
: encodeFeePercent(
|
|
85
|
+
partnerFeePercent,
|
|
86
|
+
positiveSlippageToUser,
|
|
87
|
+
priceRoute.side,
|
|
88
|
+
),
|
|
80
89
|
deadline,
|
|
81
|
-
partnerAddress,
|
|
90
|
+
referrerAddress || partnerAddress,
|
|
82
91
|
beneficiary,
|
|
83
92
|
priceRoute.contractMethod,
|
|
84
93
|
);
|
package/tests/constants-e2e.ts
CHANGED
|
@@ -570,12 +570,10 @@ export const Tokens: {
|
|
|
570
570
|
decimals: 6,
|
|
571
571
|
},
|
|
572
572
|
USDT: {
|
|
573
|
-
address: '0xde3A24028580884448a5397872046a019649b084',
|
|
574
|
-
decimals: 6,
|
|
575
|
-
},
|
|
576
|
-
USDt: {
|
|
577
573
|
address: '0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7',
|
|
578
574
|
decimals: 6,
|
|
575
|
+
addAllowance: _allowancesFn,
|
|
576
|
+
addBalance: balanceOfFn,
|
|
579
577
|
},
|
|
580
578
|
POPS: {
|
|
581
579
|
address: '0x240248628B7B6850352764C5dFa50D1592A033A8',
|
|
@@ -584,6 +582,8 @@ export const Tokens: {
|
|
|
584
582
|
WAVAX: {
|
|
585
583
|
address: '0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7',
|
|
586
584
|
decimals: 18,
|
|
585
|
+
addAllowance: allowanceFn,
|
|
586
|
+
addBalance: balanceOfFn,
|
|
587
587
|
},
|
|
588
588
|
sAVAX: {
|
|
589
589
|
address: '0x2b2C81e08f1Af8835a78Bb2A90AE924ACE0eA4bE',
|
|
@@ -917,8 +917,8 @@ export const Holders: {
|
|
|
917
917
|
RADIO: '0x60531b9c3645546d864604ee0fc5b7d6adc81cc2',
|
|
918
918
|
HANZO: '0x8a151b6ec99c7b90b342ab401d511b480309b220',
|
|
919
919
|
RVLT: '0x815f87ca3db2b9491115a7769aeacb140361c5a9',
|
|
920
|
-
stMATIC: '
|
|
921
|
-
axlUSDC: '
|
|
920
|
+
stMATIC: '0x6725b8cd3cdbc82a6044689a8bbc64a915d200e7',
|
|
921
|
+
axlUSDC: '0xe743a49f04f2f77eb2d3b753ae3ad599de8cea84',
|
|
922
922
|
deUSDC: '0x94d5ead1f80cf0b4d3480ab59dff16d47c93e9fe',
|
|
923
923
|
amUSDT: '0x832b11846a27b3ba25d68ae80c39fab155d18c49',
|
|
924
924
|
amUSDC: '0x6e7f19cd23049c7118e14470e2bf85d2e26ee0ae',
|
|
@@ -968,7 +968,6 @@ export const Holders: {
|
|
|
968
968
|
USDCe: '0x3a2434c698f8d79af1f5a9e43013157ca8b11a66',
|
|
969
969
|
USDC: '0xbf14db80d9275fb721383a77c00ae180fc40ae98',
|
|
970
970
|
USDTe: '0x84d34f4f83a87596cd3fb6887cff8f17bf5a7b83',
|
|
971
|
-
USDT: '0x715f3c533Cf264215Ba8BE00838a053284351086',
|
|
972
971
|
WETHe: '0xD291B51f7a1a1F4917D085F2a7731A447E4aF82D',
|
|
973
972
|
POPS: '0x5268c2331658cb0b2858cfa9db27d8f22f5434bc',
|
|
974
973
|
ETH: '0x9852e84b5AA485683d8AeE7B0332e42442763b75',
|
|
@@ -983,7 +982,7 @@ export const Holders: {
|
|
|
983
982
|
TSD: '0x691A89db352B72dDb249bFe16503494eC0D920A4',
|
|
984
983
|
THO: '0xc40d16c47394a506d451475c8a7c46c1175c1da1',
|
|
985
984
|
aAvaUSDT: '0x50B1Ba98Cf117c9682048D56628B294ebbAA4ec2',
|
|
986
|
-
|
|
985
|
+
USDT: '0x4aeFa39caEAdD662aE31ab0CE7c8C2c9c0a013E8',
|
|
987
986
|
aAvaWAVAX: '0x1B18Df70863636AEe4BfBAb6F7C70ceBCA9bA404',
|
|
988
987
|
oldFRAX: '0x4e3376018add04ebe4c46bf6f924ddec8c67aa7b',
|
|
989
988
|
newFRAX: '0x4e3376018add04ebe4c46bf6f924ddec8c67aa7b',
|