@paraswap/dex-lib 2.48.4-etherfi.0 → 2.48.4-etherfi.2

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.
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.EtherFi = void 0;
7
7
  const abi_1 = require("@ethersproject/abi");
8
+ const constants_1 = require("../constants");
8
9
  const simple_exchange_1 = require("./simple-exchange");
9
10
  const eETHPool_json_1 = __importDefault(require("../abi/etherfi/eETHPool.json"));
10
11
  const weETH_json_1 = __importDefault(require("../abi/etherfi/weETH.json"));
@@ -37,15 +38,6 @@ class EtherFi extends simple_exchange_1.SimpleExchange {
37
38
  }
38
39
  async getSimpleParam(srcToken, destToken, srcAmount, destAmount, data, side) {
39
40
  const [Interface, swapCallee, swapFunction, swapFunctionParams] = (() => {
40
- if (this.is_eETH(destToken)) {
41
- (0, ts_essentials_1.assert)(this.isWETH(srcToken) || (0, utils_1.isETHAddress)(srcToken), 'srcToken should be eth');
42
- return [
43
- this.eETHPoolInterface,
44
- this.eETHPool,
45
- EtherFiFunctions.deposit,
46
- [],
47
- ];
48
- }
49
41
  if (this.is_weETH(destToken)) {
50
42
  (0, ts_essentials_1.assert)(this.is_eETH(srcToken), 'srcToken should be eETH');
51
43
  return [
@@ -64,6 +56,15 @@ class EtherFi extends simple_exchange_1.SimpleExchange {
64
56
  [srcAmount],
65
57
  ];
66
58
  }
59
+ if (this.is_eETH(destToken)) {
60
+ (0, ts_essentials_1.assert)(this.isWETH(srcToken) || (0, utils_1.isETHAddress)(srcToken), 'srcToken should be (w)eth');
61
+ return [
62
+ this.eETHPoolInterface,
63
+ this.eETHPool,
64
+ EtherFiFunctions.deposit,
65
+ [],
66
+ ];
67
+ }
67
68
  throw new Error('LOGIC ERROR');
68
69
  })();
69
70
  const swapData = Interface.encodeFunctionData(swapFunction, swapFunctionParams);
@@ -71,7 +72,7 @@ class EtherFi extends simple_exchange_1.SimpleExchange {
71
72
  }
72
73
  getAdapterParam(srcToken, destToken, srcAmount, destAmount, data, side) {
73
74
  return {
74
- targetExchange: '0x',
75
+ targetExchange: constants_1.NULL_ADDRESS,
75
76
  payload: '0x',
76
77
  networkFee: '0',
77
78
  };
@@ -1 +1 @@
1
- {"version":3,"file":"etherfi.js","sourceRoot":"","sources":["../../src/dex/etherfi.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"etherfi.js","sourceRoot":"","sources":["../../src/dex/etherfi.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@paraswap/dex-lib",
3
- "version": "2.48.4-etherfi.0",
3
+ "version": "2.48.4-etherfi.2",
4
4
  "main": "build/index.js",
5
5
  "types": "build/index.d.ts",
6
6
  "repository": "https://github.com/paraswap/paraswap-dex-lib",
@@ -1,5 +1,5 @@
1
1
  import { Interface, JsonFragment } from '@ethersproject/abi';
2
- import { SwapSide } from '../constants';
2
+ import { 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';
@@ -76,19 +76,6 @@ export class EtherFi
76
76
  EtherFiFunctions,
77
77
  EtherFiParam,
78
78
  ] => {
79
- if (this.is_eETH(destToken)) {
80
- assert(
81
- this.isWETH(srcToken) || isETHAddress(srcToken),
82
- 'srcToken should be eth',
83
- );
84
- return [
85
- this.eETHPoolInterface,
86
- this.eETHPool,
87
- EtherFiFunctions.deposit,
88
- [],
89
- ];
90
- }
91
-
92
79
  if (this.is_weETH(destToken)) {
93
80
  assert(this.is_eETH(srcToken), 'srcToken should be eETH');
94
81
  return [
@@ -109,6 +96,19 @@ export class EtherFi
109
96
  ];
110
97
  }
111
98
 
99
+ if (this.is_eETH(destToken)) {
100
+ assert(
101
+ this.isWETH(srcToken) || isETHAddress(srcToken),
102
+ 'srcToken should be (w)eth',
103
+ );
104
+ return [
105
+ this.eETHPoolInterface,
106
+ this.eETHPool,
107
+ EtherFiFunctions.deposit,
108
+ [],
109
+ ];
110
+ }
111
+
112
112
  throw new Error('LOGIC ERROR');
113
113
  })();
114
114
 
@@ -136,7 +136,7 @@ export class EtherFi
136
136
  side: SwapSide,
137
137
  ): AdapterExchangeParam {
138
138
  return {
139
- targetExchange: '0x',
139
+ targetExchange: NULL_ADDRESS,
140
140
  payload: '0x',
141
141
  networkFee: '0',
142
142
  };