@paraswap/dex-lib 2.48.4-etherfi.2 → 2.48.4-etherfi.3
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.
- package/build/dex/etherfi.js +20 -1
- package/build/dex/etherfi.js.map +1 -1
- package/package.json +1 -1
- package/src/dex/etherfi.ts +26 -8
package/build/dex/etherfi.js
CHANGED
|
@@ -11,6 +11,7 @@ const eETHPool_json_1 = __importDefault(require("../abi/etherfi/eETHPool.json"))
|
|
|
11
11
|
const weETH_json_1 = __importDefault(require("../abi/etherfi/weETH.json"));
|
|
12
12
|
const utils_1 = require("../utils");
|
|
13
13
|
const ts_essentials_1 = require("ts-essentials");
|
|
14
|
+
const types_1 = require("./weth/types");
|
|
14
15
|
var EtherFiFunctions;
|
|
15
16
|
(function (EtherFiFunctions) {
|
|
16
17
|
EtherFiFunctions["deposit"] = "deposit";
|
|
@@ -37,6 +38,16 @@ class EtherFi extends simple_exchange_1.SimpleExchange {
|
|
|
37
38
|
this.weETH = EtherFiConfig[this.network].weETH.toLowerCase();
|
|
38
39
|
}
|
|
39
40
|
async getSimpleParam(srcToken, destToken, srcAmount, destAmount, data, side) {
|
|
41
|
+
const callees = [];
|
|
42
|
+
const calldata = [];
|
|
43
|
+
const values = [];
|
|
44
|
+
// if token is wETH need to withdraw first
|
|
45
|
+
if (this.isWETH(srcToken)) {
|
|
46
|
+
const wethUnwrapData = this.erc20Interface.encodeFunctionData(types_1.WethFunctions.withdraw, [srcAmount]);
|
|
47
|
+
callees.push(this.dexHelper.config.data.wrappedNativeTokenAddress);
|
|
48
|
+
calldata.push(wethUnwrapData);
|
|
49
|
+
values.push('0');
|
|
50
|
+
}
|
|
40
51
|
const [Interface, swapCallee, swapFunction, swapFunctionParams] = (() => {
|
|
41
52
|
if (this.is_weETH(destToken)) {
|
|
42
53
|
(0, ts_essentials_1.assert)(this.is_eETH(srcToken), 'srcToken should be eETH');
|
|
@@ -68,7 +79,15 @@ class EtherFi extends simple_exchange_1.SimpleExchange {
|
|
|
68
79
|
throw new Error('LOGIC ERROR');
|
|
69
80
|
})();
|
|
70
81
|
const swapData = Interface.encodeFunctionData(swapFunction, swapFunctionParams);
|
|
71
|
-
|
|
82
|
+
callees.push(swapCallee);
|
|
83
|
+
calldata.push(swapData);
|
|
84
|
+
values.push(srcAmount);
|
|
85
|
+
return {
|
|
86
|
+
callees,
|
|
87
|
+
calldata,
|
|
88
|
+
values,
|
|
89
|
+
networkFee: '0',
|
|
90
|
+
};
|
|
72
91
|
}
|
|
73
92
|
getAdapterParam(srcToken, destToken, srcAmount, destAmount, data, side) {
|
|
74
93
|
return {
|
package/build/dex/etherfi.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"etherfi.js","sourceRoot":"","sources":["../../src/dex/etherfi.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA6D;AAC7D,4CAAsD;AAGtD,uDAAmD;AACnD,iFAAuD;AACvD,2EAAiD;AAEjD,oCAAwC;AACxC,iDAAuC;
|
|
1
|
+
{"version":3,"file":"etherfi.js","sourceRoot":"","sources":["../../src/dex/etherfi.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/dex/etherfi.ts
CHANGED
|
@@ -8,6 +8,7 @@ import weETHABI from '../abi/etherfi/weETH.json';
|
|
|
8
8
|
import { IDexHelper } from '../dex-helper';
|
|
9
9
|
import { isETHAddress } from '../utils';
|
|
10
10
|
import { assert } from 'ts-essentials';
|
|
11
|
+
import { WethFunctions } from './weth/types';
|
|
11
12
|
|
|
12
13
|
type EtherFiData = void;
|
|
13
14
|
|
|
@@ -70,6 +71,21 @@ export class EtherFi
|
|
|
70
71
|
data: EtherFiData,
|
|
71
72
|
side: SwapSide,
|
|
72
73
|
): Promise<SimpleExchangeParam> {
|
|
74
|
+
const callees = [];
|
|
75
|
+
const calldata = [];
|
|
76
|
+
const values = [];
|
|
77
|
+
|
|
78
|
+
// if token is wETH need to withdraw first
|
|
79
|
+
if (this.isWETH(srcToken)) {
|
|
80
|
+
const wethUnwrapData = this.erc20Interface.encodeFunctionData(
|
|
81
|
+
WethFunctions.withdraw,
|
|
82
|
+
[srcAmount],
|
|
83
|
+
);
|
|
84
|
+
callees.push(this.dexHelper.config.data.wrappedNativeTokenAddress);
|
|
85
|
+
calldata.push(wethUnwrapData);
|
|
86
|
+
values.push('0');
|
|
87
|
+
}
|
|
88
|
+
|
|
73
89
|
const [Interface, swapCallee, swapFunction, swapFunctionParams] = ((): [
|
|
74
90
|
Interface,
|
|
75
91
|
Address,
|
|
@@ -117,14 +133,16 @@ export class EtherFi
|
|
|
117
133
|
swapFunctionParams,
|
|
118
134
|
);
|
|
119
135
|
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
136
|
+
callees.push(swapCallee);
|
|
137
|
+
calldata.push(swapData);
|
|
138
|
+
values.push(srcAmount);
|
|
139
|
+
|
|
140
|
+
return {
|
|
141
|
+
callees,
|
|
142
|
+
calldata,
|
|
143
|
+
values,
|
|
144
|
+
networkFee: '0',
|
|
145
|
+
};
|
|
128
146
|
}
|
|
129
147
|
|
|
130
148
|
getAdapterParam(
|