@shapeshiftoss/swapper 3.0.3 → 3.0.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.
|
@@ -37,8 +37,8 @@ const constants_1 = require("../utils/constants");
|
|
|
37
37
|
const helpers_1 = require("../utils/helpers/helpers");
|
|
38
38
|
const zrxService_1 = require("../utils/zrxService");
|
|
39
39
|
async function ZrxBuildQuoteTx({ adapterManager, web3 }, { input, wallet }) {
|
|
40
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j
|
|
41
|
-
const { sellAsset, buyAsset, sellAmount, buyAmount, slippage, sellAssetAccountId, buyAssetAccountId
|
|
40
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
41
|
+
const { sellAsset, buyAsset, sellAmount, buyAmount, slippage, sellAssetAccountId, buyAssetAccountId } = input;
|
|
42
42
|
if ((buyAmount && sellAmount) || (!buyAmount && !sellAmount)) {
|
|
43
43
|
throw new __1.SwapError('ZrxSwapper:ZrxBuildQuoteTx Exactly one of buyAmount or sellAmount is required');
|
|
44
44
|
}
|
|
@@ -114,7 +114,6 @@ async function ZrxBuildQuoteTx({ adapterManager, web3 }, { input, wallet }) {
|
|
|
114
114
|
receiveAddress,
|
|
115
115
|
slippage,
|
|
116
116
|
success: true,
|
|
117
|
-
statusCode: 0,
|
|
118
117
|
rate: data.price,
|
|
119
118
|
depositAddress: data.to,
|
|
120
119
|
feeData: {
|
|
@@ -129,18 +128,15 @@ async function ZrxBuildQuoteTx({ adapterManager, web3 }, { input, wallet }) {
|
|
|
129
128
|
txData: data.data,
|
|
130
129
|
sellAmount: data.sellAmount,
|
|
131
130
|
buyAmount: data.buyAmount,
|
|
132
|
-
guaranteedPrice: data.guaranteedPrice,
|
|
133
131
|
allowanceContract: data.allowanceTarget,
|
|
134
|
-
sources: ((_a = data.sources) === null || _a === void 0 ? void 0 : _a.filter((s) => parseFloat(s.proportion) > 0)) || constants_1.DEFAULT_SOURCE
|
|
135
|
-
priceImpact
|
|
132
|
+
sources: ((_a = data.sources) === null || _a === void 0 ? void 0 : _a.filter((s) => parseFloat(s.proportion) > 0)) || constants_1.DEFAULT_SOURCE
|
|
136
133
|
};
|
|
137
134
|
const allowanceRequired = await (0, helpers_1.getAllowanceRequired)({
|
|
138
135
|
quote,
|
|
139
136
|
web3,
|
|
140
137
|
erc20AllowanceAbi: erc20Allowance_abi_1.erc20AllowanceAbi
|
|
141
138
|
});
|
|
142
|
-
|
|
143
|
-
if (quote.allowanceGrantRequired) {
|
|
139
|
+
if (allowanceRequired) {
|
|
144
140
|
quote.feeData = {
|
|
145
141
|
fee: ((_b = quote.feeData) === null || _b === void 0 ? void 0 : _b.fee) || '0',
|
|
146
142
|
chainSpecific: {
|
|
@@ -152,15 +148,13 @@ async function ZrxBuildQuoteTx({ adapterManager, web3 }, { input, wallet }) {
|
|
|
152
148
|
return quote;
|
|
153
149
|
}
|
|
154
150
|
catch (e) {
|
|
155
|
-
const
|
|
156
|
-
|
|
157
|
-
((_q = (_p = e === null || e === void 0 ? void 0 : e.response) === null || _p === void 0 ? void 0 : _p.data) === null || _q === void 0 ? void 0 : _q.reason) ||
|
|
151
|
+
const statusReason = ((_g = (_f = (_e = (_d = e === null || e === void 0 ? void 0 : e.response) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.validationErrors) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.reason) ||
|
|
152
|
+
((_j = (_h = e === null || e === void 0 ? void 0 : e.response) === null || _h === void 0 ? void 0 : _h.data) === null || _j === void 0 ? void 0 : _j.reason) ||
|
|
158
153
|
'Unknown Error';
|
|
159
154
|
return {
|
|
160
155
|
sellAsset,
|
|
161
156
|
buyAsset,
|
|
162
157
|
success: false,
|
|
163
|
-
statusCode,
|
|
164
158
|
statusReason
|
|
165
159
|
};
|
|
166
160
|
}
|
|
@@ -11,8 +11,8 @@ const helpers_1 = require("../utils/helpers/helpers");
|
|
|
11
11
|
const zrxService_1 = require("../utils/zrxService");
|
|
12
12
|
const ZrxSwapper_1 = require("../ZrxSwapper");
|
|
13
13
|
async function getZrxQuote(input) {
|
|
14
|
-
var _a, _b, _c, _d, _e, _f, _g
|
|
15
|
-
const { sellAsset, buyAsset, sellAmount, buyAmount,
|
|
14
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
15
|
+
const { sellAsset, buyAsset, sellAmount, buyAmount, minimum: minQuoteSellAmount, slippage } = input;
|
|
16
16
|
if (!buyAsset) {
|
|
17
17
|
throw new ZrxSwapper_1.ZrxError('getQuote - Missing buyAsset');
|
|
18
18
|
}
|
|
@@ -62,12 +62,6 @@ async function getZrxQuote(input) {
|
|
|
62
62
|
}
|
|
63
63
|
});
|
|
64
64
|
const { data } = quoteResponse;
|
|
65
|
-
const quotePrice = new bignumber_js_1.default(data.price);
|
|
66
|
-
const priceDifference = quotePrice.minus(minimumPrice);
|
|
67
|
-
const priceImpact = priceDifference
|
|
68
|
-
.dividedBy(minimumPrice)
|
|
69
|
-
.abs()
|
|
70
|
-
.valueOf();
|
|
71
65
|
const estimatedGas = data.estimatedGas
|
|
72
66
|
? new bignumber_js_1.default(data.estimatedGas).times(1.5)
|
|
73
67
|
: new bignumber_js_1.default(0);
|
|
@@ -75,10 +69,8 @@ async function getZrxQuote(input) {
|
|
|
75
69
|
return {
|
|
76
70
|
sellAsset,
|
|
77
71
|
buyAsset,
|
|
78
|
-
priceImpact,
|
|
79
72
|
slippage,
|
|
80
73
|
success: true,
|
|
81
|
-
statusCode: 0,
|
|
82
74
|
rate,
|
|
83
75
|
minimum: minQuoteSellAmount,
|
|
84
76
|
maximum: constants_1.MAX_ZRX_TRADE,
|
|
@@ -95,15 +87,13 @@ async function getZrxQuote(input) {
|
|
|
95
87
|
},
|
|
96
88
|
sellAmount: data.sellAmount,
|
|
97
89
|
buyAmount: data.buyAmount,
|
|
98
|
-
guaranteedPrice: data.guaranteedPrice,
|
|
99
90
|
sources: ((_a = data.sources) === null || _a === void 0 ? void 0 : _a.filter((s) => parseFloat(s.proportion) > 0)) || constants_1.DEFAULT_SOURCE,
|
|
100
91
|
allowanceContract: data.allowanceTarget
|
|
101
92
|
};
|
|
102
93
|
}
|
|
103
94
|
catch (e) {
|
|
104
|
-
const
|
|
105
|
-
|
|
106
|
-
((_o = (_m = e === null || e === void 0 ? void 0 : e.response) === null || _m === void 0 ? void 0 : _m.data) === null || _o === void 0 ? void 0 : _o.reason) ||
|
|
95
|
+
const statusReason = ((_e = (_d = (_c = (_b = e === null || e === void 0 ? void 0 : e.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.validationErrors) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.reason) ||
|
|
96
|
+
((_g = (_f = e === null || e === void 0 ? void 0 : e.response) === null || _f === void 0 ? void 0 : _f.data) === null || _g === void 0 ? void 0 : _g.reason) ||
|
|
107
97
|
'Unknown Error';
|
|
108
98
|
return {
|
|
109
99
|
sellAsset,
|
|
@@ -111,7 +101,6 @@ async function getZrxQuote(input) {
|
|
|
111
101
|
minimum: minQuoteSellAmount,
|
|
112
102
|
maximum: constants_1.MAX_ZRX_TRADE,
|
|
113
103
|
success: false,
|
|
114
|
-
statusCode,
|
|
115
104
|
statusReason
|
|
116
105
|
};
|
|
117
106
|
}
|