@paraswap/dex-lib 3.11.5-fluid-dex-changes.2 → 3.11.5

package/build/dex/jarvis.js

@@ -8,6 +8,7 @@ const abi_1 = require("@ethersproject/abi");
 const constants_1 = require("../constants");
 const simple_exchange_1 = require("./simple-exchange");
 const Jarvis_json_1 = __importDefault(require("../abi/Jarvis.json"));
+const utils_1 = require("../executor/utils");
 const THIRTY_MINUTES = 60 * 30;
 var JarvisFunctions;
 (function (JarvisFunctions) {
@@ -99,6 +100,63 @@ class Jarvis extends simple_exchange_1.SimpleExchange {
         ]);
         return this.buildSimpleParamWithoutWETHConversion(srcToken, srcAmount, destToken, destAmount, swapData, data.pools[0]);
     }
+    getDexParam(srcToken, destToken, srcAmount, destAmount, recipient, data, side) {
+        const swapFunction = data.method;
+        const timestamp = (Date.now() / 1000 + THIRTY_MINUTES).toFixed(0);
+        let swapFunctionParams;
+        let outputName;
+        switch (swapFunction) {
+            case JarvisFunctions.mint:
+                swapFunctionParams = [
+                    data.derivatives,
+                    destAmount,
+                    srcAmount,
+                    data.fee,
+                    timestamp,
+                    recipient,
+                ];
+                outputName = 'syntheticTokensMinted';
+                break;
+            case JarvisFunctions.redeem:
+                swapFunctionParams = [
+                    data.derivatives,
+                    srcAmount,
+                    destAmount,
+                    data.fee,
+                    timestamp,
+                    recipient,
+                ];
+                outputName = 'collateralRedeemed';
+                break;
+            case JarvisFunctions.exchange:
+                swapFunctionParams = [
+                    data.derivatives,
+                    data.pools[1],
+                    data.destDerivatives,
+                    srcAmount,
+                    destAmount,
+                    data.fee,
+                    timestamp,
+                    recipient,
+                ];
+                outputName = 'destNumTokensMinted';
+                break;
+            default:
+                throw new Error(`Unknown function ${swapFunction}`);
+        }
+        const swapData = this.poolInterface.encodeFunctionData(swapFunction, [
+            swapFunctionParams,
+        ]);
+        return {
+            needWrapNative: this.needWrapNative,
+            dexFuncHasRecipient: true,
+            exchangeData: swapData,
+            targetExchange: data.pools[0],
+            returnAmountPos: side === constants_1.SwapSide.SELL
+                ? (0, utils_1.extractReturnAmountPosition)(this.poolInterface, swapFunction, outputName)
+                : undefined,
+        };
+    }
 }
 exports.Jarvis = Jarvis;
 Jarvis.dexKeys = ['jarvis'];

package/build/dex/jarvis.js.map

@@ -1 +1 @@
-{"version":3,"file":"jarvis.js","sourceRoot":"","sources":["../../src/dex/jarvis.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jarvis.js","sourceRoot":"","sources":["../../src/dex/jarvis.ts"],"names":[],"mappings":"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"}

package/build/dex/maker-psm/scripts/gem.abi.json

@@ -0,0 +1,136 @@
+[
+    {
+        "inputs": [
+            { "internalType": "address", "name": "vat_", "type": "address" },
+            { "internalType": "bytes32", "name": "ilk_", "type": "bytes32" },
+            { "internalType": "address", "name": "gem_", "type": "address" }
+        ],
+        "stateMutability": "nonpayable",
+        "type": "constructor"
+    },
+    {
+        "anonymous": true,
+        "inputs": [
+            {
+                "indexed": true,
+                "internalType": "bytes4",
+                "name": "sig",
+                "type": "bytes4"
+            },
+            {
+                "indexed": true,
+                "internalType": "address",
+                "name": "usr",
+                "type": "address"
+            },
+            {
+                "indexed": true,
+                "internalType": "bytes32",
+                "name": "arg1",
+                "type": "bytes32"
+            },
+            {
+                "indexed": true,
+                "internalType": "bytes32",
+                "name": "arg2",
+                "type": "bytes32"
+            },
+            {
+                "indexed": false,
+                "internalType": "bytes",
+                "name": "data",
+                "type": "bytes"
+            }
+        ],
+        "name": "LogNote",
+        "type": "event"
+    },
+    {
+        "inputs": [],
+        "name": "cage",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "dec",
+        "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [{ "internalType": "address", "name": "usr", "type": "address" }],
+        "name": "deny",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            { "internalType": "address", "name": "guy", "type": "address" },
+            { "internalType": "uint256", "name": "wad", "type": "uint256" }
+        ],
+        "name": "exit",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "gem",
+        "outputs": [
+            { "internalType": "contract GemLike_2", "name": "", "type": "address" }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "ilk",
+        "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            { "internalType": "address", "name": "urn", "type": "address" },
+            { "internalType": "uint256", "name": "wad", "type": "uint256" },
+            { "internalType": "address", "name": "_msgSender", "type": "address" }
+        ],
+        "name": "join",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "live",
+        "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [{ "internalType": "address", "name": "usr", "type": "address" }],
+        "name": "rely",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "vat",
+        "outputs": [
+            { "internalType": "contract VatLike_4", "name": "", "type": "address" }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
+        "name": "wards",
+        "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+        "stateMutability": "view",
+        "type": "function"
+    }
+]

package/build/dex/maker-psm/scripts/validate-state.js

@@ -0,0 +1,185 @@
+"use strict";
+// /* eslint-disable no-console */
+// import dotenv from 'dotenv';
+// dotenv.config();
+// import { Network } from '../../../constants';
+// import { DummyDexHelper } from '../../../dex-helper';
+// import { BlockHeader } from 'web3-eth';
+// import { MakerPsmConfig } from '../config';
+// import { BigNumber, ethers } from 'ethers';
+// import { Interface } from '@ethersproject/abi';
+// import _ from 'lodash';
+// import vatABI from './vat.abi.json';
+// import gemABI from './gem.abi.json';
+// // @ts-ignore
+// import { Tokens } from '../../../../tests/constants-e2e';
+// const tokens = Tokens[Network.MAINNET];
+// const vatInterface = new Interface(vatABI);
+// const gemInterface = new Interface(gemABI);
+// const erc20Interface = new Interface([
+//   {
+//     constant: true,
+//     inputs: [{ internalType: 'address', name: '', type: 'address' }],
+//     name: 'balanceOf',
+//     outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
+//     payable: false,
+//     stateMutability: 'view',
+//     type: 'function',
+//   },
+// ]);
+// const network = Network.MAINNET;
+// const vat = MakerPsmConfig.MakerPsm[Network.MAINNET].vatAddress;
+// const MOVE_TOPIC =
+//   '0xbb35783b00000000000000000000000000000000000000000000000000000000';
+// const dexHelper = new DummyDexHelper(network);
+// async function findNewGems(): Promise<boolean> {
+//   const network = Network.MAINNET;
+//   const dexHelper = new DummyDexHelper(network);
+//   const lastBlockNumber = await dexHelper.provider.getBlockNumber();
+//   const startBlockNumber = lastBlockNumber - 1_000_000;
+//   const endBlockNumber = lastBlockNumber;
+//   // const startBlockNumber = endBlockNumber - 700_000;
+//   const totalRange = endBlockNumber - startBlockNumber;
+//   const smallChunkSize = 10_000;
+//   const bigChunkSize = 100_000;
+//   const bigChunks = Math.ceil(totalRange / bigChunkSize);
+//   const smallChunks = Math.ceil(bigChunkSize / smallChunkSize);
+//   const uniquePotentialGemJoinsSet = new Set();
+//   for (let i = 0; i < bigChunks; i++) {
+//     console.log('Processing chunk', i + 1, 'of', bigChunks);
+//     const from = startBlockNumber + i * bigChunkSize;
+//     console.log(
+//       new Array(smallChunks).fill(0).map((_, smallChunkNumber) => ({
+//         fromBlock: from + smallChunkNumber * smallChunkSize,
+//         toBlock: from + smallChunkNumber * smallChunkSize + smallChunkSize,
+//       })),
+//     );
+//     const logsToDispatch = (
+//       await Promise.all(
+//         new Array(smallChunks).fill(0).map((_, smallChunkNumber) =>
+//           dexHelper.provider.getLogs({
+//             fromBlock: from + smallChunkNumber * smallChunkSize,
+//             toBlock: from + smallChunkNumber * smallChunkSize + smallChunkSize,
+//             address: vat,
+//           }),
+//         ),
+//       )
+//     ).flat();
+//     const moveLogs = logsToDispatch.filter(l => l.topics[0] === MOVE_TOPIC);
+//     const potentialGemJoins = moveLogs.map(
+//       l => ethers.utils.defaultAbiCoder.decode(['address'], l.topics[1])[0],
+//     );
+//     potentialGemJoins.forEach(gemJoin =>
+//       uniquePotentialGemJoinsSet.add(gemJoin),
+//     );
+//   }
+//   const uniquePotentialGemJoins = Array.from(uniquePotentialGemJoinsSet);
+//   console.log('unique potential gem joins', uniquePotentialGemJoins.length);
+//   const gemJoinCalldata = uniquePotentialGemJoins
+//     .map(gemJoin => {
+//       return [
+//         {
+//           target: gemJoin,
+//           callData: vatInterface.encodeFunctionData('gemJoin'),
+//         },
+//       ];
+//     })
+//     .flat();
+//   const slicedGemJoinCallData = _.chunk(gemJoinCalldata, 500);
+//   const gemJoinData = (
+//     await Promise.all(
+//       slicedGemJoinCallData.map(async _multiCallData =>
+//         dexHelper.multiContract.methods
+//           .tryAggregate(false, _multiCallData)
+//           .call({}),
+//       ),
+//     )
+//   ).flat();
+//   // console.log(
+//   //   gemJoinData
+//   //     .map((data, i) => ({ ...data, index: i }))
+//   //     .filter(d => d.returnData !== '0x' && d.returnData.length === 66)
+//   //     .map(d => [d.returnData, gemJoinCalldata[d.index]]),
+//   // );
+//   const gemJoins = gemJoinData
+//     .filter(d => d.returnData !== '0x' && d.returnData.length === 66)
+//     .map(
+//       d => ethers.utils.defaultAbiCoder.decode(['address'], d.returnData)[0],
+//     );
+//   const uniqueGemJoins = [...new Set(gemJoins)];
+//   console.log('unique gem joins', uniqueGemJoins.length);
+//   const gemCalldata = uniqueGemJoins
+//     .map(gemJoin => {
+//       return [
+//         {
+//           target: gemJoin,
+//           callData: gemInterface.encodeFunctionData('gem'),
+//         },
+//       ];
+//     })
+//     .flat();
+//   const returnGemData = await dexHelper.multiContract.methods
+//     .tryAggregate(false, gemCalldata)
+//     .call({});
+//   const gems = returnGemData
+//     .filter((d: any) => d.returnData !== '0x')
+//     .map(
+//       (d: any) =>
+//         ethers.utils.defaultAbiCoder.decode(['address'], d.returnData)[0],
+//     );
+//   const balanceCalldata = gems
+//     .map((gem: any, i: number) => {
+//       return [
+//         {
+//           target: gem,
+//           callData: erc20Interface.encodeFunctionData('balanceOf', [
+//             uniqueGemJoins[i],
+//           ]),
+//         },
+//       ];
+//     })
+//     .flat();
+//   const returnBalanceData = await dexHelper.multiContract.methods
+//     .tryAggregate(false, balanceCalldata)
+//     .call({});
+//   console.log(returnBalanceData);
+//   const balances: BigNumber[] = returnBalanceData
+//     .filter((d: any) => d.returnData !== '0x')
+//     .map(
+//       (d: any) =>
+//         ethers.utils.defaultAbiCoder.decode(['uint256'], d.returnData)[0],
+//     );
+//   console.log(balances.map(b => b.toString()));
+//   const data = uniqueGemJoins.map((gemJoin, i) => {
+//     const token = Object.values(tokens).find(
+//       t => t.address.toLowerCase() === gems[i].toLowerCase(),
+//     );
+//     const symbol = token
+//       ? Object.entries(tokens).find(
+//           ([symbol, t]) => t.address.toLowerCase() === gems[i].toLowerCase(),
+//         )?.[0]
+//       : 'Not found';
+//     const balance = token
+//       ? Number(ethers.utils.formatUnits(balances[i], token.decimals))
+//       : balances[i].toString();
+//     return {
+//       gemJoin,
+//       gem: gems[i],
+//       balance,
+//       ...(token
+//         ? {
+//             address: gems[i],
+//             decimals: token.decimals,
+//             symbol,
+//           }
+//         : { address: gems[i] }),
+//     };
+//   });
+//   console.log(data);
+//   // const address = logsToDispatch[0].address;
+//   return true;
+// }
+// findNewGems()
+//   .then(() => console.log('Done'))
+//   .catch(e => console.error(e));
+//# sourceMappingURL=validate-state.js.map

package/build/dex/maker-psm/scripts/validate-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate-state.js","sourceRoot":"","sources":["../../../../src/dex/maker-psm/scripts/validate-state.ts"],"names":[],"mappings":"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"}

package/build/dex/maker-psm/scripts/vat.abi.json

@@ -0,0 +1,243 @@
+[
+    {
+        "inputs": [
+            { "internalType": "address", "name": "gemJoin_", "type": "address" },
+            { "internalType": "address", "name": "daiJoin_", "type": "address" },
+            { "internalType": "address", "name": "vow_", "type": "address" }
+        ],
+        "stateMutability": "nonpayable",
+        "type": "constructor"
+    },
+    {
+        "anonymous": false,
+        "inputs": [
+            {
+                "indexed": true,
+                "internalType": "address",
+                "name": "owner",
+                "type": "address"
+            },
+            {
+                "indexed": false,
+                "internalType": "uint256",
+                "name": "value",
+                "type": "uint256"
+            },
+            {
+                "indexed": false,
+                "internalType": "uint256",
+                "name": "fee",
+                "type": "uint256"
+            }
+        ],
+        "name": "BuyGem",
+        "type": "event"
+    },
+    {
+        "anonymous": false,
+        "inputs": [
+            {
+                "indexed": false,
+                "internalType": "address",
+                "name": "user",
+                "type": "address"
+            }
+        ],
+        "name": "Deny",
+        "type": "event"
+    },
+    {
+        "anonymous": false,
+        "inputs": [
+            {
+                "indexed": true,
+                "internalType": "bytes32",
+                "name": "what",
+                "type": "bytes32"
+            },
+            {
+                "indexed": false,
+                "internalType": "uint256",
+                "name": "data",
+                "type": "uint256"
+            }
+        ],
+        "name": "File",
+        "type": "event"
+    },
+    {
+        "anonymous": false,
+        "inputs": [
+            {
+                "indexed": false,
+                "internalType": "address",
+                "name": "user",
+                "type": "address"
+            }
+        ],
+        "name": "Rely",
+        "type": "event"
+    },
+    {
+        "anonymous": false,
+        "inputs": [
+            {
+                "indexed": true,
+                "internalType": "address",
+                "name": "owner",
+                "type": "address"
+            },
+            {
+                "indexed": false,
+                "internalType": "uint256",
+                "name": "value",
+                "type": "uint256"
+            },
+            {
+                "indexed": false,
+                "internalType": "uint256",
+                "name": "fee",
+                "type": "uint256"
+            }
+        ],
+        "name": "SellGem",
+        "type": "event"
+    },
+    {
+        "inputs": [
+            { "internalType": "address", "name": "usr", "type": "address" },
+            { "internalType": "uint256", "name": "gemAmt", "type": "uint256" }
+        ],
+        "name": "buyGem",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "dai",
+        "outputs": [
+            { "internalType": "contract DaiAbstract", "name": "", "type": "address" }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "daiJoin",
+        "outputs": [
+            {
+                "internalType": "contract DaiJoinAbstract",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [{ "internalType": "address", "name": "usr", "type": "address" }],
+        "name": "deny",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            { "internalType": "bytes32", "name": "what", "type": "bytes32" },
+            { "internalType": "uint256", "name": "data", "type": "uint256" }
+        ],
+        "name": "file",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "gemJoin",
+        "outputs": [
+            {
+                "internalType": "contract AuthGemJoinAbstract",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [{ "internalType": "address", "name": "usr", "type": "address" }],
+        "name": "hope",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "ilk",
+        "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [{ "internalType": "address", "name": "usr", "type": "address" }],
+        "name": "nope",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [{ "internalType": "address", "name": "usr", "type": "address" }],
+        "name": "rely",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            { "internalType": "address", "name": "usr", "type": "address" },
+            { "internalType": "uint256", "name": "gemAmt", "type": "uint256" }
+        ],
+        "name": "sellGem",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "tin",
+        "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "tout",
+        "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "vat",
+        "outputs": [
+            { "internalType": "contract VatAbstract", "name": "", "type": "address" }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "vow",
+        "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
+        "name": "wards",
+        "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+        "stateMutability": "view",
+        "type": "function"
+    }
+]

package/build/dex/platypus/platypus.d.ts

@@ -1,5 +1,5 @@
 import { Interface } from '@ethersproject/abi';
-import { Token, Address, ExchangePrices, PoolPrices, AdapterExchangeParam, SimpleExchangeParam, PoolLiquidity, Logger } from '../../types';
+import { Token, Address, ExchangePrices, PoolPrices, AdapterExchangeParam, SimpleExchangeParam, PoolLiquidity, Logger, NumberAsString, DexExchangeParam } from '../../types';
 import { SwapSide, Network } from '../../constants';
 import { IDex } from '../../dex/idex';
 import { IDexHelper } from '../../dex-helper/idex-helper';
@@ -57,6 +57,7 @@ export declare class Platypus extends SimpleExchange implements IDex<PlatypusDat
     getCalldataGasCost(poolPrices: PoolPrices<PlatypusData>): number | number[];
     getAdapterParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: PlatypusData, side: SwapSide): AdapterExchangeParam;
     getSimpleParam(srcToken: string, destToken: string, srcAmount: string, destAmount: string, data: PlatypusData, side: SwapSide): Promise<SimpleExchangeParam>;
+    getDexParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: PlatypusData, side: SwapSide): DexExchangeParam;
     updatePoolState(): Promise<void>;
     getTopPoolsForToken(tokenAddress: Address, limit: number): Promise<PoolLiquidity[]>;
 }