@paraswap/dex-lib 2.48.4-etherfi.2 → 2.48.4-etherfi.4
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 +14 -1
- package/build/dex/etherfi.js.map +1 -1
- package/package.json +1 -1
- package/src/dex/etherfi.ts +19 -2
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";
|
|
@@ -68,7 +69,19 @@ class EtherFi extends simple_exchange_1.SimpleExchange {
|
|
|
68
69
|
throw new Error('LOGIC ERROR');
|
|
69
70
|
})();
|
|
70
71
|
const swapData = Interface.encodeFunctionData(swapFunction, swapFunctionParams);
|
|
71
|
-
|
|
72
|
+
// if src token is WETH, we need to withdraw from weth and pass eth value on call. For other cases, we need to approve and perform call
|
|
73
|
+
const isSrcTokenWeth = this.isWETH(srcToken);
|
|
74
|
+
return this.buildSimpleParamWithoutWETHConversion(isSrcTokenWeth ? constants_1.ETHER_ADDRESS : srcToken, srcAmount, destToken, destAmount, swapData, swapCallee, swapCallee, '0', isSrcTokenWeth
|
|
75
|
+
? {
|
|
76
|
+
callees: [this.dexHelper.config.data.wrappedNativeTokenAddress],
|
|
77
|
+
calldata: [
|
|
78
|
+
this.erc20Interface.encodeFunctionData(types_1.WethFunctions.withdraw, [
|
|
79
|
+
srcAmount,
|
|
80
|
+
]),
|
|
81
|
+
],
|
|
82
|
+
values: ['0'],
|
|
83
|
+
}
|
|
84
|
+
: undefined);
|
|
72
85
|
}
|
|
73
86
|
getAdapterParam(srcToken, destToken, srcAmount, destAmount, data, side) {
|
|
74
87
|
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,
|
|
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
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Interface, JsonFragment } from '@ethersproject/abi';
|
|
2
|
-
import { NULL_ADDRESS, SwapSide } from '../constants';
|
|
2
|
+
import { ETHER_ADDRESS, NULL_ADDRESS, SwapSide } from '../constants';
|
|
3
3
|
import { AdapterExchangeParam, Address, SimpleExchangeParam } from '../types';
|
|
4
4
|
import { IDexTxBuilder } from './idex';
|
|
5
5
|
import { SimpleExchange } from './simple-exchange';
|
|
@@ -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
|
|
|
@@ -117,13 +118,29 @@ export class EtherFi
|
|
|
117
118
|
swapFunctionParams,
|
|
118
119
|
);
|
|
119
120
|
|
|
121
|
+
// if src token is WETH, we need to withdraw from weth and pass eth value on call. For other cases, we need to approve and perform call
|
|
122
|
+
const isSrcTokenWeth = this.isWETH(srcToken);
|
|
123
|
+
|
|
120
124
|
return this.buildSimpleParamWithoutWETHConversion(
|
|
121
|
-
srcToken,
|
|
125
|
+
isSrcTokenWeth ? ETHER_ADDRESS : srcToken,
|
|
122
126
|
srcAmount,
|
|
123
127
|
destToken,
|
|
124
128
|
destAmount,
|
|
125
129
|
swapData,
|
|
126
130
|
swapCallee,
|
|
131
|
+
swapCallee,
|
|
132
|
+
'0',
|
|
133
|
+
isSrcTokenWeth
|
|
134
|
+
? {
|
|
135
|
+
callees: [this.dexHelper.config.data.wrappedNativeTokenAddress],
|
|
136
|
+
calldata: [
|
|
137
|
+
this.erc20Interface.encodeFunctionData(WethFunctions.withdraw, [
|
|
138
|
+
srcAmount,
|
|
139
|
+
]),
|
|
140
|
+
],
|
|
141
|
+
values: ['0'],
|
|
142
|
+
}
|
|
143
|
+
: undefined,
|
|
127
144
|
);
|
|
128
145
|
}
|
|
129
146
|
|