@dolomite-exchange/zap-sdk 0.3.30 → 0.3.32
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/dist/__tests__/lib/estimators/GmxV2GmEstimator.test.js +9 -8
- package/dist/__tests__/lib/estimators/GmxV2GmEstimator.test.js.map +1 -1
- package/dist/src/lib/estimators/GmxV2GmEstimator.js +2 -2
- package/dist/src/lib/estimators/GmxV2GmEstimator.js.map +1 -1
- package/package.json +3 -3
- package/src/lib/estimators/GmxV2GmEstimator.ts +3 -3
|
@@ -89,8 +89,8 @@ describe('GmxV2GmEstimator', function () {
|
|
|
89
89
|
return [4 /*yield*/, estimator.getUnwrappedAmount(gmEthIsolationModeAddress, gmAmountIn, ArbitrumOneConstants_1.NATIVE_USDC_MARKET.marketId, marketsMap, config)];
|
|
90
90
|
case 2:
|
|
91
91
|
usdcAmount = _a.sent();
|
|
92
|
-
console.log('GM amounts
|
|
93
|
-
console.log('GM amounts
|
|
92
|
+
console.log('GM amounts unwrapped amount [ETH]:', ethAmount.amountOut.toString());
|
|
93
|
+
console.log('GM amounts unwrapped amount [USDC]:', usdcAmount.amountOut.toString());
|
|
94
94
|
return [2 /*return*/];
|
|
95
95
|
}
|
|
96
96
|
});
|
|
@@ -99,19 +99,20 @@ describe('GmxV2GmEstimator', function () {
|
|
|
99
99
|
describe('#getWrappedAmount', function () {
|
|
100
100
|
it('should work normally', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
101
101
|
var ethAmountIn, usdcAmountIn, marketAmountOutFromEth, marketAmountOutFromUsdc;
|
|
102
|
-
|
|
103
|
-
|
|
102
|
+
var _a, _b;
|
|
103
|
+
return __generator(this, function (_c) {
|
|
104
|
+
switch (_c.label) {
|
|
104
105
|
case 0:
|
|
105
106
|
ethAmountIn = new bignumber_js_1.default((0, utils_1.parseEther)('0.1').toString());
|
|
106
107
|
usdcAmountIn = new bignumber_js_1.default('300000000');
|
|
107
108
|
return [4 /*yield*/, estimator.getWrappedAmount(gmEthIsolationModeAddress, ethAmountIn, ArbitrumOneConstants_1.WETH_MARKET.marketId, marketsMap, config)];
|
|
108
109
|
case 1:
|
|
109
|
-
marketAmountOutFromEth =
|
|
110
|
-
console.log('GM
|
|
110
|
+
marketAmountOutFromEth = _c.sent();
|
|
111
|
+
console.log('GM wrapped amount [from ETH, from USDC]:', marketAmountOutFromEth.amountOut.toString(), (_a = marketAmountOutFromEth.extraData) === null || _a === void 0 ? void 0 : _a.executionFee.div((0, utils_1.parseEther)('1').toString()).toFixed(6));
|
|
111
112
|
return [4 /*yield*/, estimator.getWrappedAmount(gmEthIsolationModeAddress, usdcAmountIn, ArbitrumOneConstants_1.NATIVE_USDC_MARKET.marketId, marketsMap, config)];
|
|
112
113
|
case 2:
|
|
113
|
-
marketAmountOutFromUsdc =
|
|
114
|
-
console.log('GM
|
|
114
|
+
marketAmountOutFromUsdc = _c.sent();
|
|
115
|
+
console.log('GM wrapped amount [from ETH, from USDC]:', marketAmountOutFromUsdc.amountOut.toString(), (_b = marketAmountOutFromUsdc.extraData) === null || _b === void 0 ? void 0 : _b.executionFee.div((0, utils_1.parseEther)('1').toString()).toFixed(6));
|
|
115
116
|
return [2 /*return*/];
|
|
116
117
|
}
|
|
117
118
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GmxV2GmEstimator.test.js","sourceRoot":"","sources":["../../../../__tests__/lib/estimators/GmxV2GmEstimator.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wHAA6F;AAC7F,8DAAqC;AACrC,iCAAgC;AAChC,0CAA8C;AAC9C,oCAA6D;AAC7D,iFAAgF;AAChF,2EAAqF;AAErF,QAAQ,CAAC,kBAAkB,EAAE;;IAC3B,IAAM,OAAO,GAAG,aAAO,CAAC,YAAY,CAAC;IACrC,IAAM,YAAY,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACzF,IAAM,aAAa,GAAG,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;IACvC,IAAM,SAAS,GAAG,IAAI,mCAAgB,CAAC,OAAO,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;IAC7E,IAAM,UAAU;QACd,GAAC,kCAAW,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAG,kCAAW;QAC7C,GAAC,yCAAkB,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAG,yCAAkB;WAC5D,CAAC;IACF,IAAM,MAAM,GAAc;QACxB,aAAa,EAAE,IAAI,sBAAS,CAAC,WAAW,CAAC;QACzC,QAAQ,EAAE,QAAQ;QAClB,mCAAmC,EAAE,KAAK;QAC1C,aAAa,EAAE,KAAK;QACpB,aAAa,EAAE,KAAK;QACpB,iBAAiB,EAAE,KAAK;QACxB,gBAAgB,EAAE,IAAI,sBAAS,CAAC,OAAO,CAAC;QACxC,kBAAkB,EAAE,KAAK;KAC1B,CAAA;IAED,IAAM,yBAAyB,GAAG,0BAAW,CAAC,iCAAiC,CAAC,OAAO,CAAE,CAAC,OAAO,CAAC;IAElG,QAAQ,CAAC,aAAa,EAAE;QACtB,EAAE,CAAC,8CAA8C,EAAE;YACjD,IAAM,oBAAoB,GAAG,IAAI,sBAAS,CAAC,GAAG,CAAC,CAAC;YAChD,MAAM,CAAC;gBACL,kCAAkC;gBAClC,IAAI,mCAAgB,CAAC,OAAO,EAAE,YAAY,EAAE,oBAAoB,CAAC,CAAC;YACpE,CAAC,CAAC,CAAC,OAAO,CAAC,kEAA2D,oBAAoB,CAAC,OAAO,EAAE,CAAE,CAAC,CAAA;QACzG,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qBAAqB,EAAE;QAC9B,EAAE,CAAC,sBAAsB,EAAE;;;;;wBACnB,UAAU,GAAG,IAAI,sBAAS,CAAC,IAAA,kBAAU,EAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;wBAC7C,qBAAM,SAAS,CAAC,kBAAkB,CAClD,yBAAyB,EACzB,UAAU,EACV,kCAAW,CAAC,QAAQ,EACpB,UAAU,EACV,MAAM,CACP,EAAA;;wBANK,SAAS,GAAG,SAMjB;wBACkB,qBAAM,SAAS,CAAC,kBAAkB,CACnD,yBAAyB,EACzB,UAAU,EACV,yCAAkB,CAAC,QAAQ,EAC3B,UAAU,EACV,MAAM,CACP,EAAA;;wBANK,UAAU,GAAG,SAMlB;wBACD,OAAO,CAAC,GAAG,CACT
|
|
1
|
+
{"version":3,"file":"GmxV2GmEstimator.test.js","sourceRoot":"","sources":["../../../../__tests__/lib/estimators/GmxV2GmEstimator.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,8 +84,8 @@ var SwapPricingType;
|
|
|
84
84
|
SwapPricingType[SwapPricingType["Atomic"] = 2] = "Atomic";
|
|
85
85
|
})(SwapPricingType || (SwapPricingType = {}));
|
|
86
86
|
var abiCoder = ethers_1.ethers.utils.defaultAbiCoder;
|
|
87
|
-
var CALLBACK_GAS_LIMIT = ethers_1.ethers.BigNumber.from(
|
|
88
|
-
var DEPOSIT_GAS_LIMIT_KEY = (0, utils_1.keccak256)(abiCoder.encode(['bytes32'
|
|
87
|
+
var CALLBACK_GAS_LIMIT = ethers_1.ethers.BigNumber.from(3000000);
|
|
88
|
+
var DEPOSIT_GAS_LIMIT_KEY = (0, utils_1.keccak256)(abiCoder.encode(['bytes32'], [(0, utils_1.keccak256)(abiCoder.encode(['string'], ['DEPOSIT_GAS_LIMIT']))]));
|
|
89
89
|
var SINGLE_SWAP_GAS_LIMIT_KEY = (0, utils_1.keccak256)(abiCoder.encode(['string'], ['SINGLE_SWAP_GAS_LIMIT']));
|
|
90
90
|
var WITHDRAWAL_GAS_LIMIT_KEY = (0, utils_1.keccak256)(abiCoder.encode(['bytes32'], [(0, utils_1.keccak256)(abiCoder.encode(['string'], ['WITHDRAWAL_GAS_LIMIT']))]));
|
|
91
91
|
var POOL_AMOUNT_KEY = (0, utils_1.keccak256)(abiCoder.encode(['string'], ['POOL_AMOUNT']));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GmxV2GmEstimator.js","sourceRoot":"","sources":["../../../../src/lib/estimators/GmxV2GmEstimator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAqC;AACrC,iCAA8C;AAC9C,0CAA8D;AAC9D,2FAAmE;AACnE,yFAAiE;AACjE,mFAA2D;AAI3D,yDAAwD;AACxD,wCAA8G;AAC9G,0CAOsB;AACtB,4CAA2C;AAG3C,IAAK,eAIJ;AAJD,WAAK,eAAe;IAClB,2DAAO,CAAA;IACP,uDAAK,CAAA;IACL,yDAAM,CAAA;AACR,CAAC,EAJI,eAAe,KAAf,eAAe,QAInB;AAQD,IAAM,QAAQ,GAAG,eAAM,CAAC,KAAK,CAAC,eAAe,CAAC;AAE9C,IAAM,kBAAkB,GAAG,eAAM,CAAC,SAAS,CAAC,IAAI,CAAC,OAAS,CAAC,CAAC;AAE5D,IAAM,qBAAqB,GAAG,IAAA,iBAAS,EACrC,QAAQ,CAAC,MAAM,CACb,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"GmxV2GmEstimator.js","sourceRoot":"","sources":["../../../../src/lib/estimators/GmxV2GmEstimator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dolomite-exchange/zap-sdk",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.32",
|
|
4
4
|
"description": "SDK for zapping any asset to any asset on Dolomite.",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"test": "NODE_ENV=test jest --runInBand",
|
|
7
|
-
"test:specific": "NODE_ENV=test jest __tests__/
|
|
7
|
+
"test:specific": "NODE_ENV=test jest __tests__/lib/estimators/GmxV2GmEstimator.test.ts",
|
|
8
8
|
"coverage": "NODE_ENV=test jest --coverage --runInBand --forceExit --coverageReporters=text-lcov | node_modules/.bin/coveralls",
|
|
9
9
|
"build": "rm -rf dist/ && node_modules/.bin/tsc --module commonjs",
|
|
10
10
|
"prepublishOnly": "npm run build"
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"types": "dist/src/index.d.ts",
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"@dolomite-exchange/modules-deployments": "^0.0.28",
|
|
32
|
-
"axios": "^
|
|
32
|
+
"axios": "^0.29.0",
|
|
33
33
|
"bignumber.js": "^9.1.1",
|
|
34
34
|
"dotenv-flow": "^0.4.0",
|
|
35
35
|
"ethers": "^5.5.3"
|
|
@@ -34,12 +34,12 @@ interface SignedPriceData {
|
|
|
34
34
|
|
|
35
35
|
const abiCoder = ethers.utils.defaultAbiCoder;
|
|
36
36
|
|
|
37
|
-
const CALLBACK_GAS_LIMIT = ethers.BigNumber.from(
|
|
37
|
+
const CALLBACK_GAS_LIMIT = ethers.BigNumber.from(3_000_000);
|
|
38
38
|
|
|
39
39
|
const DEPOSIT_GAS_LIMIT_KEY = keccak256(
|
|
40
40
|
abiCoder.encode(
|
|
41
|
-
['bytes32'
|
|
42
|
-
[keccak256(abiCoder.encode(['string'], ['DEPOSIT_GAS_LIMIT']))
|
|
41
|
+
['bytes32'],
|
|
42
|
+
[keccak256(abiCoder.encode(['string'], ['DEPOSIT_GAS_LIMIT']))],
|
|
43
43
|
),
|
|
44
44
|
);
|
|
45
45
|
|