@defisaver/sdk 0.1.22 → 0.2.0

package/src/addresses.js

@@ -1,133 +1,133 @@
 
 
 const actionAddresses = {
-  'TaskExecutor': '0xb3e5371d55e1e84bfFE7D0b57Bd9c6A4C6b3C635',
-  'DFSRegistry': '0xD6049E1F5F3EfF1F921f5532aF1A1632bA23929C',
+  'RecipeExecutor': '0xe822d76c2632FC52f3eaa686bDA9Cea3212579D8',
+  'DFSRegistry': '0x287778F121F134C66212FB16c9b53eC991D32f5b',
 
   // utils
-  'WrapEth': '0x9E702937F42Db2cE58342Ca5F213Ef33D51AEF6b',
-  'UnwrapEth': '0x5cD02A169CfE5B0596B352547879Dd60B7033488',
-  'PullToken': '0x795a89f6D4E97A959fe81aa22772441323783479',
-  'SendToken': '0xBbe0D7f2AF01aE678f8A873CB2d2EB73871C9b5A',
-  'SumInputs': '0xCdef35425579fc566B6Ee0499A79256ac88d25cf',
-  'SubInputs': '0x3f71c5b806c2aCFA88bd7Ae5F7f8A14121E0FcA6',
-  'ChangeProxyOwner': '0x32cEdFfF6e64f6cD1907Ae0b27b78c36320587E7',
-  'TokenBalance': '0xFEb82445aEaA675D59A43CD5833f5A6807f97ea2',
-  'AutomationV2Unsub': '0xd3D70313d1E2ab6ae47674C88390Fd9865806201',
+  'WrapEth': '0x8EbBd35f84D7f0DFCBEf08fD30CD09176133251A',
+  'UnwrapEth': '0xDB6C8cFDd7c1C0F8895CDBC01Dbf4A6D4B6d2a29',
+  'PullToken': '0x254cA89a00d53ab61de2Ba5641DBDC01aE48aed4',
+  'SendToken': '0x5612e490c9549486dF16b34EBfD0E8b6cF6a1717',
+  'SumInputs': '0x70907d840aBBc984Fd949311d2f005e6aC4a4D7a',
+  'SubInputs': '0xe1804b756188F63f723d2FECc02988D0Cc1aB823',
+  'ChangeProxyOwner': '0x81cA52CfE66421d0ceF82d5F33230e43b5F23D2B',
+  'TokenBalance': '0xa92B177950F1460119940436515FD857C24494BC',
+  'AutomationV2Unsub': '0xe35Fb12fE9796847751076aCf5ee7d124108612C',
+  'SendTokenAndUnwrap': '0xeecd376026335261c89faD40D89625391b1eFF6a',
 
   // exchange
-  'DFSSell': '0xf4adae649B2c3B2795608b2D222c852929944898',
-  'DFSBuy': '0x939dCad6A3D1fEACccB60Af90876D904468CbF66',
+  'DFSSell': '0x1abDDCae131ce200e66140d9fBd0C37F7a40e642',
 
   // maker
-  'McdGenerate': '0x2bF4586636329Ae930cFe085a1e57BAb4a8f741b',
-  'McdGive': '0xD2dc5DA4172a3901C9f26c7cd29eFE656Fc20332',
-  'McdMerge': '0x66c7f4C7e59b6e780142aaD5c9f427FA5F8dfFc6',
-  'McdOpen': '0x72AFC60B90c976397C37B5c64DDc067Ea521D388',
-  'McdPayback': '0xb7C2c78846493Bed18fa07B51fcc5EAFAc9d629C',
-  'McdSupply': '0x91c3167aC51F92c2f720C6A8418FDF46060698A1',
-  'McdWithdraw': '0x3c232F0ae183C3e2eb421e8e317318Dfe85a7b10',
-  'McdClaim': '0xd78783b50227A84d43604843065494e2666182Ab',
+  'McdGenerate': '0xCb50a91C0f12f439b8bf11E9474B9c1ED62Bf7a3',
+  'McdGive': '0xf9556A87BF424834FDe7De0547b58E36Cb42EF01',
+  'McdMerge': '0x6D06C6c2BCeaEC31b0F8Cd68C594120dDCcCC427',
+  'McdOpen': '0x1b54e8b6073ac7382c42830BE715466aDA11Cf37',
+  'McdPayback': '0xE68AeD979Af6f85516fF485D098804c0f9eD9A5b',
+  'McdSupply': '0x84372e73e1A2E95510869D2D81A3ef1AEC9e0Da8',
+  'McdWithdraw': '0xa704FBBe2f7ea8eF45a8280f6Bf96939eBC73252',
+  'McdClaim': '0xc0FC0f5Ba156E16217F8C7f400AEc0a658419C13',
 
   // reflexer
-  'ReflexerSupply': '0x24C537A93A9ab75b5A593BA0B2dc03200345A844',
-  'ReflexerWithdraw': '0xcA99fB3430180E43bC1929a3a84d0500E3118e0A',
-  'ReflexerPayback': '0x0c8320033340277791C5dCD9BC87d20f086BB34b',
-  'ReflexerGenerate': '0x28E78093dF6d370Ca9ea1aC85668d8a097f09087',
-  'ReflexerOpen': '0xcf174aFFbB7be200afa37Dfc4CD067ae3Cb91054',
-  'ReflexerNativeUniV2SaviourDeposit':'0x5F66CC360657Bf224aa280Ae104550b5042E185a',
-  'ReflexerNativeUniV2SaviourGetReserves':'0x9C7518F7a0f5bC4D57702fcE8C0778F7Fb2f09f8',
-  'ReflexerNativeUniV2SaviourWithdraw':'0x6a61363243Cad1BE5caaE5e53284520592deB154',
+  'ReflexerSupply': '0xd7a36CD4ce7CCc2F1376Dc5C48BaC84380A4f698',
+  'ReflexerWithdraw': '0xD8a14d447AB6789F3bf1Eb763b6306db3FC3d666',
+  'ReflexerPayback': '0xcC6838d8a61a4b29Ea565d39C38b830f1491cb29',
+  'ReflexerGenerate': '0x8e8Fd178A5FAE3A29F9CB1A06aBBBCFd5B83beb7',
+  'ReflexerOpen': '0x4704a7cBd4d913d1233765B70531D601b4384011',
+
+  // not deployed as currently not used
+  'ReflexerNativeUniV2SaviourDeposit':'0x0000000000000000000000000000000000000000',
+  'ReflexerNativeUniV2SaviourGetReserves':'0x0000000000000000000000000000000000000000',
+  'ReflexerNativeUniV2SaviourWithdraw':'0x0000000000000000000000000000000000000000',
 
   // aave
-  'AaveBorrow': '0xEdBbF97C505309e5174E164fbec3cAE774d310Ea',
-  'AavePayback': '0xb583Bc7603E5E482F475Ec9Ea90129029D53fbc8',
-  'AaveSupply': '0xC71113E9122465e8bCd42123f840Df99abaF29F1',
-  'AaveWithdraw': '0xE06Fc1CBD78Eb0799d5B0ca62D51B065886e08FC',
-  'AaveCollateralSwitch': '0x27d77c80A88665342C98Ea31B687A5fc8ca9a445',
+  'AaveBorrow': '0x1B95E800a869bc3F89914470a7901D93D1401cD1',
+  'AavePayback': '0x066225964999F1D07C888c5Ac4a6C885bDa88b9A',
+  'AaveSupply': '0xEbB200a529058B561B42Eab510DA157a63243CEc',
+  'AaveWithdraw': '0x754C58fA92246414a448c1ed44ea3D1AD446d482',
+  'AaveCollateralSwitch': '0xFf5dfF1B90bd5Aa6E12768AB497dB90cc9DE6F5d',
 
   // compound
-  'CompBorrow': '0xde1b05266f2D05Bf9216B76500583c2b7785b7e9',
-  'CompClaim': '0xAA165C03fF61301b79f35649157f6738263739A3',
-  'CompPayback': '0x67D2CC825730cCb70FD4579E55cDb3cf3152fcb6',
-  'CompSupply': '0x1F22890C166B30cE8769b7B55354064C254e063F',
-  'CompWithdraw': '0xD326a003bcfDbad0E9A4Ccc37a76Ce264345F38a',
-  'CompGetDebt': '0x009109AB7b8CAFf748cdA2F272F36043528Bef2C',
-  'CompCollateralSwitch': '0x1c0BD1E4da2c3108f6caA64609E89a37531B0f86',
+  'CompBorrow': '0x8495579BF6Ae848f7E59686536F834f1d2CCd79C',
+  'CompClaim': '0x81F488cF7A0128A9DB5e7207042cCAB1CB0ac902',
+  'CompPayback': '0x2881590d5FfBd1e88BFc0Dc292f10e5377977f87',
+  'CompSupply': '0xB4CEDe40b249b756Ce0EAa3e14F6af89f25f9a3d',
+  'CompWithdraw': '0x3792F83D6A82091cb53052458038CC86e206463F',
+  'CompGetDebt': '0xc2B8f8423bc8Fe2e9A44cA9d364d835D1751b725',
+  'CompCollateralSwitch': '0xC3d89139508A3883775D3d1E62E2A0fea363b448',
 
   // flashloan
-  'FLAaveV2': '0x45F17B18134B4398468A5bcdCdf22f0e1cAbEad5',
-  'FLDyDx': '0x973065599BACa33FC9CAD2823710f1332D2B7805',
-  'FLMaker': '0xEA2C6B373Ea3e596995d2523a74592E22EE49BFF',
-  'FLBalancer': '0x81c69A428fDB21bBaB8A7434fF511382058c29dC',
+  'FLAaveV2': '0xa4d52ED15018a5be4adE5796899e5d75cc8759C1',
+  'FLDyDx': '0x08AC78B418fCB0DDF1096533856A757C28d430d7',
+  'FLMaker': '0xd393582bE148A45585aB202Fa7Cc789Fa5127223',
+  'FLBalancer': '0x5C7a9f4635AE4F95da2e45317311AAe255FB71B3',
 
   // uniswap
-  'UniSupply': '0xcAE220B5398AfAad75bfeb946164f6C23CF65A98',
-  'UniWithdraw': '0x847aF4eFDf64E4F54Af95D3b867DfC92f4Ea91B4',
+  'UniSupply': '0x9935e12F0218E61c27D7f23eAC9A9D6881a078eC',
+  'UniWithdraw': '0xf8bb8F68b0A45DC315F3f7602a60cfb274B00951',
 
   // uniswap V3
-  'UniCollectV3': '0x4D49FB2Cc0DF856b936CCA1816A9e6DD0ADFa232',
-  'UniMintV3': '0x488794Aa06Ec668fDeC29375CB8B6629f4692B0B',
-  'UniSupplyV3': '0x1dc3C2c16195bD6e49f6ED05F1f482c3C7FD35Af',
-  'UniWithdrawV3': '0xe5FAB89bdC01130c686B35540531EB1cBbaE8ff3',
-  'UniCreatePoolV3': '0xAD599cA05C7295a0cbc5CD696BF3f7E633402C99',
+  'UniCollectV3': '0x331D7C3F6E710cB6cFE94c4Aa04AC3345AC00e00',
+  'UniMintV3': '0x3dF75BE8Fb0a6186BE9705cACaa6dD2a4Ec3e40C',
+  'UniSupplyV3': '0x0CA4255b37DD083dBD48Ca74d575F46037992520',
+  'UniWithdrawV3': '0xe06224593D9c860B2fBF39eEA3b9B8A85b77Fbc4',
+  'UniCreatePoolV3': '0x9058aAbEdEfe652b1d85DBBAB48Dfa78db613C44',
 
   // dydx
-  'DyDxSupply': '0xA8D1C1eea86573cBcC919fbf28Db542bDfE7Ed5b',
-  'DyDxWithdraw': '0x55AA33F42D79DbD3f1885b410e4796d641549bC3',
+  'DyDxWithdraw': '0x827089C5Fc7653655c4080c660Cd8f755F818443',
 
   // yearn
-  'YearnSupply': '0x3B8538B070a0890ef7E13FF60c9d19F893a93B8a',
-  'YearnWithdraw': '0x03CC90F24C23C9F766902917c32411417c28Db92',
+  'YearnSupply': '0x837D6E7F469b3cC820B0a6Da25415D5aE0A861c4',
+  'YearnWithdraw': '0x563eF9b1075628E62aDc657702517dEA72ca08d6',
 
   // liquity
-  'LiquityClose': '0x9C563dc9F8e3FcCF996DAB4b6B6003fb7Bbca90f',
-  'LiquityBorrow': '0x46e8fE6bbE3C08eCc250295583490be9ac97B969',
-  'LiquityOpen': '0x50D69350E2629987551C563E19D29dee6Faf3A78',
-  'LiquityPayback': '0x86eCa72dF81ae76AfF0dEeC01521154F33147e46',
-  'LiquityWithdraw': '0x8CDA51bB0D7E03252d554Ba5Bbb9254f3deB8441',
-  'LiquitySupply': '0x7d9157a022A263EFd34C867Fd261235D45B48453',
-  'LiquitySPDeposit': '0x20D85391A69E9906b67238cb82E51114dE7116a9',
-  'LiquitySPWithdraw': '0x621ac2A927cc9323C23f7792e8FD25aAbc9cC04B',
-  'LiquityStake': '0xF0782DE9d734e54aa080B985d6a9235880C48Fe5',
-  'LiquityUnstake': '0xc39DdBa031D014BFC1E3b6158842Ffb43f8D47e9',
-  'LiquityEthGainToTrove': '0x60427bD08785527FDca7d84d2A75871273E9F209',
-  'LiquityClaim': '0x5a2E638DE65323c55f1245f920B84dB4603002eE',
-  'LiquityRedeem': '0x6C5Dd88D033c8857254Cc94098BF75Ac275B17c7',
+  'LiquityClose': '0x4B2d174129789a88e92D46342201F207132144b7',
+  'LiquityBorrow': '0xF978d6C5c8af80a059AdB85EEb64F14C9c436D68',
+  'LiquityOpen': '0x4EFF392cc69B31Ad159EcfA10305251b2d8E40E0',
+  'LiquityPayback': '0x8fc7D24414e9740ed9841d9205D458e3677e71f7',
+  'LiquityWithdraw': '0x733F53579bEcdd3Ed07e745A55Ee9af8B9669048',
+  'LiquitySupply': '0xD539943e080C2a29e3f1DB2d45Ea7240d7ddDEE2',
+  'LiquitySPDeposit': '0x5aB0244a00a733f16E6b238B462bdF3538C698E1',
+  'LiquitySPWithdraw': '0xa71817957eaF993fAA9a1F4B5c2402c0aeFCd9C6',
+  'LiquityStake': '0x671280800B540cbF073561d84A297a2c4c5D529F',
+  'LiquityUnstake': '0x86FDD4A6438D448a794A44ABBe47D57590b3350d',
+  'LiquityEthGainToTrove': '0x65e19f967B3F3cB6466110aD238039F5423E3177',
+  'LiquityClaim': '0x526735aDcBe5c9059275c5ED2E0574b4a24b875e',
+  'LiquityRedeem': '0x20B78854658011394C931EF2BF3cEEA2Fe62E7f0',
 
   // lido
-  'LidoStake': '0x71D44c05B94438fe09a4A7F4dB75fb421dEC1067',
-  'LidoWrap': '0x752e08eB2882DA273Cb8b70151f6c6c33f34D62b',
-  'LidoUnwrap': '0x37800CF1Fe630efc5F2E15A2e182E5C5084861D9',
+  'LidoStake': '0x4a7dd38D2BcA817fb68165155F869ca4179d8060',
+  'LidoWrap': '0xE637544390db79EdDE0a9CAF352ED0FfF7451bDB',
+  'LidoUnwrap': '0x910F73Fb8C0Bd15423c0D0BaD9F1ed95187a48fD',
 
   // insta
-  'ClaimInstMaker': '0x15E22A8160F0bDb619C6846C982F8D208A5670D2',
-  'InstPullTokens': '0x37FC940Be30e11d578243dEBea4f9B950E22aC99',
+  'InstPullTokens': '0xf2c87782D6Eff0511e82007119BAC40e9ba86F69',
 
   // balancer
-  'BalancerV2Supply': '0xD78E5D95A28a67F7851b0a94505790813A92E405',
-  'BalancerV2Withdraw': '0xCcf4b96407BEF25D7df1c95045CCF64950e73E97',
-  'BalancerV2Claim': '0x259Ae83567858B7960d2De0D00F3717a764aD73B',
+  'BalancerV2Supply': '0xE48123018Db5e9075841C61EA702cEca51621191',
+  'BalancerV2Withdraw': '0xbED38692438b90AF738F8A7A3142C217DE8fB069',
+  'BalancerV2Claim': '0xEac7c5bEFaA6E17f1A2e86947eEd6419c74A7C03',
 
   // GUni
-   'GUniWithdraw': '0xa329263fFac25F86E03481Ec39307bbf5DbeDD83',
-   'GUniDeposit': '0xe943958f01630038c23f8471a2d0ea4378e58b0d',
+  'GUniWithdraw': '0x6F7cD7C0Dd3634E14bAB91FDF3bCE0a4315b3C59',
+  'GUniDeposit': '0xb247cD4cab056800cCDa7cE1AFB781a8bFA9b57A',
+
+  // Rari
+  'RariDeposit': '0x77A05c15f62F1fA6471D466001E21C1B189fcA9F',
+  'RariWithdraw': '0xa052eD427EFa63B5bb87c409449a47e7C50317e3',
 
-   // Rari
-   'RariDeposit': '0xC627A3F12c4f7236218a511DC10e3f5ead1a1D7c',
-   'RariWithdraw': '0x8408EeCcC2c2FC25F2cF720398DAAD0A05EfE487',
+  // mStable
+  'MStableDeposit': '0xdf24ed1250fbfa274316b50Bc9A009aFA8F61E16',
+  'MStableWithdraw': '0xa4d5d3e56012C1eD8aba4bE246964962DC3F735f',
 
-   // mStable
-   'MStableDeposit': '0x1887235CFE1927782a3e7eD15fb073586c949858',
-   'MStableWithdraw': '0xb164456190577fbBe8FB8bF5Fa48a106b328A579',
+  'MStableClaim': '0xD56F0EC66267958e08c91547c259cCAC006BF118',
 
-   'MStableDepositNew': '0x2AFfE3899d985212aD8ee99e1269D7Dd17576f1d',
-   'MStableWithdrawNew': '0x6468215Bf4811244Ab78599e1df9206716A35aB7',
+  'McdRatioCheck': '0x3f09773e5e945C6Aa1bc8a8B3492f507620DE1e1',
+  'GasFeeTaker': '0x431F1E1A9859EF99953801dbdeB31d2846ADcc0d',
 
-   'MStableClaim': '0x28279A806aDeDedFD33e39C7375dc0c0ee943847',
-  
-   'CurveStethPoolDeposit': '0x0f042a5CC97C4cd8D8136c28F966839f195D08B9',
-   'CurveStethPoolWithdraw': '0x2F4ad71Bd8045d0633B304BD2d94ef349eB09105',
+  'CurveStethPoolDeposit': '0x5Ae5870dC0C780e9eb68bE7a223eCd7F3BDad12B',
+  'CurveStethPoolWithdraw': '0x4089731d843Ce52699Fe64F68556aBbD95D70D00',
 };
 
 const otherAddresses = {

package/src/triggers/ChainLinkPriceTrigger.js

@@ -0,0 +1,12 @@
+const Action = require("../Action");
+const {getAddr} = require("../addresses.js");
+
+class ChainLinkPriceTrigger extends Action {
+
+  constructor(tokenAddr, price, state) {
+    super("ChainLinkPriceTrigger", getAddr("ChainLinkPriceTrigger"), [["address", "uint256", "uint8"]], [[...arguments]]);
+  }
+
+}
+
+module.exports = ChainLinkPriceTrigger;

package/src/triggers/CompoundRatioTrigger.js

@@ -0,0 +1,11 @@
+const Action = require("../Action");
+const {getAddr} = require("../addresses.js");
+
+class CompoundRatioTrigger extends Action {
+
+  constructor(user, ratio, state) {
+    super("CompoundRatioTrigger", getAddr("CompoundRatioTrigger"), [["address", "uint256", "uint8"]], [[...arguments]]);
+  }
+}
+
+module.exports = CompoundRatioTrigger;

package/src/triggers/GasPriceTrigger.js

@@ -0,0 +1,11 @@
+const Action = require("../Action");
+const {getAddr} = require("../addresses.js");
+
+class GasPriceTrigger extends Action {
+
+  constructor(maxGasPrice) {
+    super("GasPriceTrigger", getAddr("GasPriceTrigger"), [["uint256"]], [[...arguments]]);
+  }
+}
+
+module.exports = GasPriceTrigger;

package/src/triggers/LiquityRatioTrigger.js

@@ -0,0 +1,15 @@
+const Action = require("../Action");
+
+class LiquityRatioTrigger extends Action {
+
+  constructor(troveOwner, ratio, state) {
+    super(
+      "LiquityRatioTrigger",
+      getAddr("LiquityRatioTrigger"),
+      [["addresss", "uint256", "uint8"]],
+      [[...arguments]]
+    );
+  }
+}
+
+module.exports = LiquityRatioTrigger;

package/src/triggers/MakerRatioTrigger.js

@@ -0,0 +1,15 @@
+const Action = require("../Action");
+const {getAddr} = require("../addresses.js");
+
+class MakerRatioTrigger extends Action {
+
+  constructor(vaultId, ratio, state) {
+    super("McdRatioTrigger", getAddr("McdRatioTrigger"), [["uint256", "uint256", "uint8"]], [[...arguments]]);
+  }
+
+  async getEthValue() {
+    return this.args[0];
+  }
+}
+
+module.exports = MakerRatioTrigger;

package/src/triggers/ReflexerRatioTrigger.js

@@ -0,0 +1,10 @@
+const Action = require("../Action");
+
+class ReflexerRatioTrigger extends Action {
+
+  constructor(vaultId, ratio, state) {
+    super("ReflexerRatioTrigger", getAddr("ReflexerRatioTrigger"), [["uint256", "uint256", "uint8"]], [[...arguments]]);
+  }
+}
+
+module.exports = ReflexerRatioTrigger;

package/src/triggers/TimestampTrigger.js

@@ -0,0 +1,11 @@
+const Action = require("../Action");
+const {getAddr} = require("../addresses.js");
+
+class TimestampTrigger extends Action {
+
+  constructor(nextTimestamp) {
+    super("TimestampTrigger", getAddr("TimestampTrigger"), [["uint256"]], [[...arguments]]);
+  }
+}
+
+module.exports = TimestampTrigger;

package/src/triggers/UniV3CurrentTickTrigger.js

@@ -0,0 +1,12 @@
+const Action = require("../Action");
+const {getAddr} = require("../addresses.js");
+
+class UniV3CurrentTickTrigger extends Action {
+
+  constructor(tokenId, state) {
+    super("UniV3CurrentTickTrigger", getAddr("UniV3CurrentTickTrigger"), [["uint256", "uint8"]], [[...arguments]]);
+  }
+
+}
+
+module.exports = UniV3CurrentTickTrigger;

package/src/triggers/index.js

@@ -0,0 +1,19 @@
+const MakerRatioTrigger = require('./MakerRatioTrigger');
+const ChainLinkPriceTrigger = require('./ChainLinkPriceTrigger');
+const UniV3CurrentTickTrigger = require('./UniV3CurrentTickTrigger');
+const TimestampTrigger = require('./TimestampTrigger');
+const GasPriceTrigger = require('./GasPriceTrigger');
+const CompoundRatioTrigger = require('./CompoundRatioTrigger');
+const ReflexerRatioTrigger = require('./ReflexerRatioTrigger');
+const LiquityRatioTrigger = require('./LiquityRatioTrigger');
+
+module.exports = {
+    MakerRatioTrigger,
+    ChainLinkPriceTrigger,
+    UniV3CurrentTickTrigger,
+    TimestampTrigger,
+    GasPriceTrigger,
+    CompoundRatioTrigger,
+    ReflexerRatioTrigger,
+    LiquityRatioTrigger,
+}

package/src/utils/general.js

@@ -2,6 +2,8 @@ const Dec = require('decimal.js');
 const {getAssetInfo} = require('@defisaver/tokens');
 
 module.exports.requireAddress = (address) => {
+  if (address.startsWith('%') || address.startsWith('&')) return;
+
   if (typeof address !== 'string') throw new Error('Address is not a string');
   if (address === '') throw new Error('Address is empty string');
   if (address.length < 42) throw new Error(`Address too short (${address.length} instead of 42)`);

package/src/utils/zeroExExchange.js

@@ -7,7 +7,6 @@ const axios = require('axios');
 const {assetAmountInWei, getAssetInfo} = require('@defisaver/tokens');
 
 const SellAction = require('../actions/basic/SellAction');
-const BuyAction = require('../actions/basic/BuyAction');
 const {parsePriceFromContract, formatPriceForContract} = require('./general');
 const API_URL = 'https://api.0x.org/swap/v1/';
 const ZEROX_WRAPPER = '0x0c4e16899f2059F4e41ddB164317414a5c0d2988';
@@ -124,7 +123,7 @@ module.exports.estimateBuyPrice = async (buyAmount, buyToken, sellToken) => esti
  * @param shouldSell {Boolean} look for price to sell or to buy (if false sellToken becomes becomes buyToken and vice-versa)
  * @param fromAccount {EthAddress} Withdraw funds from this addr
  * @param toAccount {EthAddress} Send funds to this addr
- * @return {Promise<(SellAction|BuyAction)>} SellAction or BuyAction
+ * @return {Promise<(SellAction>} SellAction
  *
  * @private
  */
@@ -179,9 +178,7 @@ const createExchangeAction = async (
     '0x', // wrapperData,
     offchainDataArray,
   ];
-  return shouldSell
-    ? new SellAction(orderData, fromAccount, toAccount, protocolFee)
-    : new BuyAction(orderData, fromAccount, toAccount, protocolFee)
+  return new SellAction(orderData, fromAccount, toAccount, protocolFee)
 };
 
 /**
@@ -217,38 +214,3 @@ module.exports.createSellAction = async (
   fromAccount,
   toAccount,
 );
-
-
-/**
- * Fetches prices and creates order ready to be passed to transaction.
- * This should only be called when before sending tx, not to be used for just querying the price.
- * For that purpose, the estimateBuyPrice method can be used.
- *
- * @param buyAmount {string} Amount of asset being bought ('1500.123')
- * @param buyToken {string} Symbol for asset being bought ('DAI')
- * @param sellToken {string} Symbol for asset being sold ('ETH')
- * @param expectedPrice {string} Price received from estimatePrice (so minPrice can be calculated based on what user saw)
- * @param acceptedSlippagePercent {string|Number} Slippage percentage tolerated [0-100]
- * @param fromAccount {EthAddress} Withdraw funds from this addr
- * @param toAccount {EthAddress} Send funds to this addr
- * @return {Promise<BuyAction>}
- */
-module.exports.createBuyAction = async (
-  buyAmount,
-  buyToken,
-  sellToken,
-  expectedPrice,
-  acceptedSlippagePercent,
-  fromAccount,
-  toAccount,
-) => createExchangeAction(
-  sellToken,
-  buyToken,
-  '0',
-  buyAmount,
-  expectedPrice,
-  acceptedSlippagePercent,
-  false,
-  fromAccount,
-  toAccount,
-);

package/test/accessLists/MockAccessLists.json

@@ -626,23 +626,6 @@
         ]
        ]
     ],
-    "DyDxSupply": [
-       [
-        "0xA8D1C1eea86573cBcC919fbf28Db542bDfE7Ed5b",
-        [ 1, 0, 14, 5, 3, 12 ]
-       ],
-       [
-        "0x1E0447b19BB6EcFdAe1e4AE1694b0C3659614e4e",
-        [ 13, 1, 12, 10, 9 ]
-       ],
-       [
-        "0x5c55B921f590a89C1Ebe84dF170E655a82b62126",
-        [
-          10, 6,  1, 7,
-           0, 5, 13
-        ]
-       ]
-    ],
     "DyDxWithdraw": [
        [
         "0x55AA33F42D79DbD3f1885b410e4796d641549bC3",
@@ -893,41 +876,6 @@
         [ 3, 5, 14, 7, 6, 11 ]
        ]
     ],
-    "ClaimInstMaker": [
-       [
-        "0x15E22A8160F0bDb619C6846C982F8D208A5670D2",
-        [
-           0, 12, 6, 1,
-          13,  5, 9
-        ]
-       ],
-       [
-        "0x2971AdFa57b20E5a416aE5a708A8655A9c74f723",
-        [ 7, 3, 9, 5, 15 ]
-       ],
-       [
-        "0x5ef30b9986345249bc32d8928B7ee64DE9435E39",
-        [ 3, 8, 1, 9, 4, 7 ]
-       ],
-       [
-        "0xAC838332afc2937FdED89c16a59b2ED8e8e2743c",
-        [ 10, 4, 3, 0, 1, 15 ]
-       ],
-       [
-        "0x6f40d4A6237C257fff2dB00FA0510DeEECd303eb",
-        [
-          14, 11,  5, 10,
-           6,  9, 12, 13
-        ]
-       ],
-       [
-        "0x5c55B921f590a89C1Ebe84dF170E655a82b62126",
-        [
-          12,  4,  1, 9,
-           5, 10, 11, 0
-        ]
-       ]
-    ],
     "InstPullTokens": [
        [
         "0x37FC940Be30e11d578243dEBea4f9B950E22aC99",
@@ -1397,26 +1345,6 @@
         [ 10, 3, 8, 13, 6, 9 ]
        ]
     ],
-    "DFSBuy": [
-       [
-        "0x939dCad6A3D1fEACccB60Af90876D904468CbF66",
-        [ 11, 5, 8, 0, 9, 12 ]
-       ],
-       [
-        "0x25dd3F51e0C3c3Ff164DDC02A8E4D65Bb9cBB12D",
-        [
-          1,  5,  3, 14,
-          7, 11, 12,  4
-        ]
-       ],
-       [
-        "0x5c55B921f590a89C1Ebe84dF170E655a82b62126",
-        [
-          1,  3, 2, 9,
-          0, 15, 6
-        ]
-       ]
-    ],
     "SendToken": [
        [
         "0xBbe0D7f2AF01aE678f8A873CB2d2EB73871C9b5A",

package/test/accessLists/Recipe.js

@@ -21,7 +21,7 @@ class Recipe {
 
     this.name = name;
     this.actions = actions;
-    this.taskExecutorAddress = getAddr('TaskExecutor');
+    this.recipeExecutorAddress = getAddr('RecipeExecutor');
   }
 
   /**
@@ -56,7 +56,7 @@ class Recipe {
   encodeForDsProxyCall() {
     const executeTaskAbi = RecipeAbi.find(({name}) => name === 'executeTask');
     return [
-      this.taskExecutorAddress,
+      this.recipeExecutorAddress,
       AbiCoder.encodeFunctionCall(executeTaskAbi, this._encodeForCall()),
     ];
   }
@@ -107,7 +107,7 @@ class Recipe {
    */
   getAccessList() {
     const addressMapping = {
-      [getAddr('TaskExecutor')]: [],
+      [getAddr('RecipeExecutor')]: [],
       [getAddr('DFSRegistry')]: [],
     };
     this.actions.forEach((action) => {

package/test/actions/insta/InstPullTokensAction.js

@@ -3,14 +3,14 @@ const {encodeForDsProxyCall, encodeForRecipe} = require('../../_actionUtils');
 const {assert} = require('chai');
 const { getAddr } = require('../../../src/addresses.js');
 
-describe('Action: ClaimInstMakerAction', () => {
+describe('Action: InstPullTokensAction', () => {
   let action;
 
   const dsaAddress = '0x63bf1D484d7D799722b1BA9c91f5ffa6d416D60A';
   const to = '0x0a80C3C540eEF99811f4579fa7b1A0617294e06f';
 
 
-  context('Claim INST tokens for Maker vault', () => {
+  context('InstPullTokensAction action test', () => {
     it('constructor', () => {
       action = new dfs.actions.insta.InstPullTokensAction(
         dsaAddress,

package/test/utils/zeroExExchange.js

@@ -83,12 +83,4 @@ describe('Exchange utils', () => {
     }).timeout(10000);
   })
 
-  context('Get BuyAction via 0x', function() {
-    it('Creates action', async () => {
-      const action = await exchangeUtils.createBuyAction('10000', 'DAI', 'ETH', '0', 0, myAddr, myAddr);
-      assert.instanceOf(action, dfs.actions.basic.BuyAction);
-      assert.equal(action.args[1], myAddr);
-      assert.equal(action.args[2], myAddr);
-    }).timeout(10000);
-  })
 })

package/src/actions/basic/BuyAction.js

@@ -1,53 +0,0 @@
-const Action = require("../../Action");
-const {requireAddress} = require("../../utils/general");
-const {getAssetInfoByAddress} = require("@defisaver/tokens");
-const {getAddr} = require('../../addresses.js');
-const Dec = require('decimal.js');
-const {parsePriceFromContract} = require('../../utils/general');
-
-/**
- * Buys an exact amount of dest token on DeFi Saver exchange aggregator
- */
-class BuyAction extends Action {
-  /**
-   * @param exchangeOrder {Array} Standard DFS Exchange data
-   * @param from {string} Order sender
-   * @param to {string} Order recipient
-   * @param protocolFee {string} 0x fee (amount of ETH in Wei)
-   */
-  constructor(exchangeOrder, from, to, protocolFee) {
-    requireAddress(to);
-    super(
-      'DFSBuy',
-      getAddr('DFSBuy'),
-      [
-        ["address","address","uint256","uint256","uint256","uint256","address","address","bytes",["address","address","address","uint256","uint256","bytes"]],
-        "address",
-        "address",
-      ],
-      [exchangeOrder, from, to]
-    );
-
-    this.protocolFee = protocolFee;
-
-    this.mappableArgs = [
-      this.args[0][0],
-      this.args[0][1],
-      this.args[0][3],
-      this.args[1],
-      this.args[2],
-    ];
-  }
-
-  async getAssetsToApprove() {
-    const asset = getAssetInfoByAddress(this.args[0][0]);
-    if (asset.symbol !== 'ETH') return [{asset: this.args[0][0], owner: this.args[1]}];
-    return [];
-  }
-
-  async getEthValue() {
-    return this.protocolFee || '0';
-  }
-}
-
-module.exports = BuyAction;