@orbs-network/twap 1.7.11 → 1.7.13

package/dist/src/configs.d.ts

@@ -74,6 +74,7 @@ export declare const ChainConfigs: {
 export declare const Configs: {
     SpiritSwap: Config;
     SpookySwap: Config;
+    Pangolin: Config;
 };
 export declare const nativeTokenAddresses: string[];
 export declare const isNativeAddress: (address: string) => boolean;

package/dist/src/configs.js

@@ -49,8 +49,8 @@ exports.ChainConfigs = {
     },
     avax: {
         chainId: 43114,
-        twapAddress: "",
-        lensAddress: "",
+        twapAddress: "0xD63430c74C8E70D9dbdCA04C6a9E6E9E929028DA",
+        lensAddress: "0xD13609A8ace04D11Ea2FFE176B69dF77C6d9375E",
         bidDelaySeconds: 60,
         minChunkSizeUsd: 10,
         wToken: {
@@ -64,6 +64,7 @@ exports.ChainConfigs = {
 exports.Configs = {
     SpiritSwap: Object.assign(Object.assign({}, exports.ChainConfigs.ftm), { partner: "SpiritSwap", exchangeAddress: "0xAd19179201be5A51D1cBd3bB2fC651BB05822404", exchangeType: "ParaswapExchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.SpiritSwap }),
     SpookySwap: Object.assign(Object.assign({}, exports.ChainConfigs.ftm), { partner: "SpookySwap", exchangeAddress: "0x37F427DA0D12Fe2C80aCa09EE08e7e92A1B2B114", exchangeType: "UniswapV2Exchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.SpookySwap }),
+    Pangolin: Object.assign(Object.assign({}, exports.ChainConfigs.avax), { partner: "Pangolin", exchangeAddress: "0x25a0A78f5ad07b2474D3D42F1c1432178465936d", exchangeType: "UniswapV2Exchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.Pangolin }),
 };
 // export const UniswapV2Config: Config = {
 //   ...ChainConfigs.eth,

package/dist/src/lib.d.ts

@@ -41,6 +41,15 @@ export declare class TWAPLib {
     private sendTx;
     parseOrder(r: any): Order;
     getToken(address: string): Promise<TokenData>;
+    deployTaker(priorityFeePerGas?: BN.Value, maxFeePerGas?: BN.Value): Promise<void>;
+    getSwapData(orderId: number): Promise<{
+        srcToken: TokenData;
+        dstToken: TokenData;
+        srcAmountIn: BN;
+        dstAmountOut: BN;
+        path: any;
+        data: string;
+    }>;
 }
 export interface Order {
     id: number;

package/dist/src/lib.js

@@ -21,6 +21,7 @@ const TWAP_json_1 = __importDefault(require("../artifacts/contracts/TWAP.sol/TWA
 const Lens_json_1 = __importDefault(require("../artifacts/contracts/periphery/Lens.sol/Lens.json"));
 const Taker_json_1 = __importDefault(require("../artifacts/contracts/periphery/Taker.sol/Taker.json"));
 const lodash_1 = __importDefault(require("lodash"));
+const paraswap_1 = require("./paraswap");
 exports.twapAbi = TWAP_json_1.default.abi;
 exports.lensAbi = Lens_json_1.default.abi;
 exports.takerAbi = Taker_json_1.default.abi;
@@ -170,14 +171,9 @@ class TWAPLib {
     }
     sendTx(tx, priorityFeePerGas, maxFeePerGas, amount) {
         return __awaiter(this, void 0, void 0, function* () {
-            let gas = 500000;
-            try {
-                gas = Math.max(gas, Math.floor((yield tx.estimateGas()) * 1.2));
-            }
-            catch (ignore) { }
             return yield tx.send({
                 from: this.maker,
-                gas,
+                gas: Math.floor((yield tx.estimateGas({ from: this.maker, value: amount ? (0, bignumber_js_1.default)(amount).toFixed(0) : undefined })) * 1.2),
                 maxPriorityFeePerGas: priorityFeePerGas ? (0, bignumber_js_1.default)(priorityFeePerGas).toFixed(0) : undefined,
                 maxFeePerGas: maxFeePerGas ? (0, bignumber_js_1.default)(maxFeePerGas).toFixed(0) : undefined,
                 value: amount ? (0, bignumber_js_1.default)(amount).toFixed(0) : undefined,
@@ -222,6 +218,47 @@ class TWAPLib {
             return { address, decimals: yield t.decimals(), symbol: yield t.methods.symbol().call() };
         });
     }
+    // TODO
+    deployTaker(priorityFeePerGas, maxFeePerGas) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const taker = (0, web3_candies_1.contract)(exports.takerAbi, "");
+            yield this.sendTx(taker.deploy({ data: Taker_json_1.default.bytecode, arguments: [this.config.twapAddress, [this.maker]] }), priorityFeePerGas, maxFeePerGas);
+        });
+    }
+    //TODO
+    getSwapData(orderId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const order = yield this.getOrder(orderId);
+            const srcAmountIn = order.ask.srcBidAmount;
+            const srcToken = yield this.getToken(order.ask.srcToken);
+            const dstToken = yield this.getToken(order.ask.dstToken);
+            const paraswapRoute = yield paraswap_1.Paraswap.findRoute(this.config.chainId, srcToken, dstToken, srcAmountIn, this.config.pathfinderKey);
+            const dstAmountOut = (0, bignumber_js_1.default)(paraswapRoute.destAmount);
+            const path = paraswap_1.Paraswap.directPath(paraswapRoute, this.config.pathfinderKey);
+            switch (this.config.exchangeType) {
+                case "UniswapV2Exchange":
+                    return {
+                        srcToken,
+                        dstToken,
+                        srcAmountIn,
+                        dstAmountOut,
+                        path,
+                        data: (0, web3_candies_1.web3)().eth.abi.encodeParameters(["bool", "address[]"], [false, path]),
+                    };
+                case "ParaswapExchange":
+                    return {
+                        srcToken,
+                        dstToken,
+                        srcAmountIn,
+                        dstAmountOut,
+                        path,
+                        data: yield paraswap_1.Paraswap.buildSwapData(paraswapRoute, this.config.twapAddress),
+                    };
+                default:
+                    throw new Error(`unhandled exchange ${this.config.exchangeType}`);
+            }
+        });
+    }
 }
 exports.TWAPLib = TWAPLib;
 var Status;

package/dist/src/paraswap.d.ts

@@ -7,7 +7,8 @@ export declare namespace Paraswap {
         QuickSwap = "QuickSwap",
         SpiritSwap = "SpiritSwap,SpiritSwapV2",
         SpookySwap = "SpookySwap",
-        Pangolin = "PangolinDex"
+        Pangolin = "PangolinDEX",
+        TraderJoe = "TraderJoe"
     }
     interface ParaswapRoute {
         blockNumber: number;
@@ -39,5 +40,6 @@ export declare namespace Paraswap {
     }>;
     function priceUsd(chainId: number, token: TokenData): Promise<BN>;
     function findRoute(chainId: number, src: TokenData, dst: TokenData, amountIn: BN.Value, onlyDex?: OnlyDex): Promise<ParaswapRoute>;
+    function directPath(route: ParaswapRoute, onlyDex: OnlyDex): any;
     function buildSwapData(paraswapRoute: ParaswapRoute, exchangeAdapter: string): Promise<string>;
 }

package/dist/src/paraswap.js

@@ -26,7 +26,8 @@ var Paraswap;
         OnlyDex["QuickSwap"] = "QuickSwap";
         OnlyDex["SpiritSwap"] = "SpiritSwap,SpiritSwapV2";
         OnlyDex["SpookySwap"] = "SpookySwap";
-        OnlyDex["Pangolin"] = "PangolinDex";
+        OnlyDex["Pangolin"] = "PangolinDEX";
+        OnlyDex["TraderJoe"] = "TraderJoe";
     })(OnlyDex = Paraswap.OnlyDex || (Paraswap.OnlyDex = {}));
     function gasPrices(chainId) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -69,10 +70,14 @@ var Paraswap;
             const response = yield fetch(`${URL}/prices/?${params}`);
             if (response.status < 200 || response.status >= 400)
                 throw new Error(`${response.statusText}`);
-            return (yield response.json()).priceRoute;
+            return (yield response.json()).priceRoute; //TODO pangolin onlyDex not working?
         });
     }
     Paraswap.findRoute = findRoute;
+    function directPath(route, onlyDex) {
+        return route.bestRoute[0].swaps[0].swapExchanges[0].data.path; // TODO find?
+    }
+    Paraswap.directPath = directPath;
     function buildSwapData(paraswapRoute, exchangeAdapter) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield fetch(`${URL}/transactions/${paraswapRoute.network}?ignoreChecks=true`, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbs-network/twap",
-  "version": "1.7.11",
+  "version": "1.7.13",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/orbs-network/twap.git"
@@ -24,11 +24,13 @@
     "typechain": "npm run clean && hardhat typechain",
     "prebuild": "npm run prettier && npm run typechain",
     "build": "hardhat compile && solhint 'contracts/**/*.sol' && tsc",
-    "test:logs": "for t in eth ftm poly; do DEBUG=web3-candies npm run test:$t -- --logs; done",
-    "test": "for t in eth ftm poly; do npm run test:$t; done",
-    "test:eth": "NETWORK=ETH BLOCK=14908980 hardhat test",
-    "test:ftm": "NETWORK=FTM BLOCK=39838819 hardhat test",
-    "test:poly": "NETWORK=POLY BLOCK=29194866 hardhat test"
+    "prepublishOnly": "npm run build",
+    "test:logs": "for t in eth ftm poly avax; do DEBUG=web3-candies npm run test:$t -- --logs; done",
+    "test": "for t in eth ftm poly avax; do npm run test:$t; done",
+    "test:eth": "NETWORK=ETH BLOCK=14905987 hardhat test",
+    "test:ftm": "NETWORK=FTM BLOCK=39800909 hardhat test",
+    "test:poly": "NETWORK=POLY BLOCK=29174252 hardhat test",
+    "test:avax": "NETWORK=AVAX BLOCK=15609313 hardhat test"
   },
   "prettier": {
     "printWidth": 120