@defisaver/sdk 0.3.12 → 0.3.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/sdk",
-  "version": "0.3.12",
+  "version": "0.3.14",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/ActionWithL2.js

@@ -1,5 +1,7 @@
 const Action = require('./Action');
 const Dec = require('decimal.js');
+const AbiCoder = require('web3-eth-abi');
+const ActionAbi = require('./abis/Action.json');
 
 class ActionWithL2 extends Action {
   /**
@@ -10,7 +12,12 @@ class ActionWithL2 extends Action {
 
   encodeForL2Recipe() { return `0x${this.encodeInputs().slice(10)}`; } // cut the method id
 
-  encodeInputs() { throw new Error('Use implementation from specific ActionWithL2'); }
+  encodeInputs() {
+    let _arg = this._replaceWithPlaceholders(this.args, this.paramTypes);
+    let _paramType = this._formatType(this.paramTypes);
+    const executeActionDirectAbi = ActionAbi.find(({ name }) => name === 'executeActionDirect');
+    return AbiCoder.encodeFunctionCall(executeActionDirectAbi, [AbiCoder.encodeParameter(_paramType, _arg)]);
+  }
 
   addressToBytes20(address) { return address.slice(2); }
 

package/src/actions/uniswapV3/UniswapV3CollectAction.js

@@ -1,10 +1,10 @@
-const Action = require("../../Action");
-const {getAddr} = require('../../addresses.js');
+const ActionWithL2 = require('../../ActionWithL2');
+const { getAddr } = require('../../addresses.js');
 
 /**
  * Collects fees earned by user on position identified by tokenId
  */
-class UniswapV3CollectAction extends Action {
+class UniswapV3CollectAction extends ActionWithL2 {
   /**
    * @param {string} tokenId
    * @param {EthAddress} recipient

package/src/actions/uniswapV3/UniswapV3CreatePoolAction.js

@@ -1,11 +1,12 @@
-const Action = require("../../Action");
-const {getAddr} = require('../../addresses.js');
-const {getAssetInfoByAddress} = require("@defisaver/tokens");
+const { getAssetInfoByAddress } = require('@defisaver/tokens');
+
+const ActionWithL2 = require('../../ActionWithL2');
+const { getAddr } = require('../../addresses.js');
 
 /**
  * Create a uniswap v3 pool
  */
-class UniswapV3CreatePoolAction extends Action {
+class UniswapV3CreatePoolAction extends ActionWithL2 {
   /**
    * @param {EthAddress} token0
    * @param {EthAddress} token1

package/src/actions/uniswapV3/UniswapV3MintAction.js

@@ -1,12 +1,13 @@
-const Action = require("../../Action");
-const {getAddr} = require('../../addresses.js');
-const {getAssetInfoByAddress} = require("@defisaver/tokens");
+const { getAssetInfoByAddress } = require('@defisaver/tokens');
+
+const ActionWithL2 = require('../../ActionWithL2');
+const { getAddr } = require('../../addresses.js');
 
 
 /**
  * Creates a new Uniswap v3 LP supply position
  */
-class UniswapV3MintAction extends Action {
+class UniswapV3MintAction extends ActionWithL2 {
   /**
    * @param {EthAddress} token0
    * @param {EthAddress} token1

package/src/actions/uniswapV3/UniswapV3SupplyAction.js

@@ -1,11 +1,12 @@
-const {getAssetInfoByAddress} = require("@defisaver/tokens");
-const Action = require("../../Action");
-const {getAddr} = require('../../addresses.js');
+const { getAssetInfoByAddress } = require('@defisaver/tokens');
+
+const ActionWithL2 = require('../../ActionWithL2');
+const { getAddr } = require('../../addresses.js');
 
 /**
  * Supplies a pair of tokens to an existing Uniswap v3 position identified by tokenId
  */
-class UniswapV3SupplyAction extends Action {
+class UniswapV3SupplyAction extends ActionWithL2 {
   /**
    * @param {string} tokenId
    * @param {string} amount0Desired

package/src/actions/uniswapV3/UniswapV3WithdrawAction.js

@@ -1,10 +1,10 @@
-const Action = require("../../Action");
-const {getAddr} = require('../../addresses.js');
+const ActionWithL2 = require('../../ActionWithL2');
+const { getAddr } = require('../../addresses.js');
 
 /**
  * Burns liquidity, and returns underlying tokens to recipient
  */
-class UniswapV3WithdrawAction extends Action {
+class UniswapV3WithdrawAction extends ActionWithL2 {
   /**
    * @param {string} tokenId
    * @param {string} liquidity

package/src/addresses.js

@@ -161,10 +161,16 @@ const actionAddresses = {
     AaveV3ClaimRewards: '0xBE8e8cea67085F869C1C0040fD52F9F3115E962e',
 
     FLAaveV3: '0x352D4a1622f2DC34c738F542934372855f219F05',
-
     AaveV3RatioTrigger: '0xB76e3f7694589D0f34ba43b17AD0D15350Ab5f85',
     GasFeeTakerL2: '0xB3dB299622A9DB0E944ccda2Ef899d6fF365B082',
     AaveV3RatioCheck: '0x7A36779a7b5F1128B28932604057d5b63361297c',
+
+    // uniswap V3
+    UniCollectV3: '0xad1D55a73D6d8b2218a4aD599c88d9550fb54cd7',
+    UniMintV3: '0x7548E3923A9f9e4e182C939CC78FA30050414D12',
+    UniSupplyV3: '0x533aDec68Eed581F4a7F202493Eaf4Df77b89EC0',
+    UniWithdrawV3: '0xE920235ED2d52EcF6157BBAFedfB5bbbcF7c5825',
+    UniCreatePoolV3: '0xAF45d1380d89dB7260DC2684158c5dfA4E147d3e',
   },
   [NETWORKS.arbitrum.chainId]: {
     DFSSell: '0x77c02Bb7CbBb2F896c5Ea14e1b60D65f81e552db',
@@ -177,7 +183,6 @@ const actionAddresses = {
     SendTokenAndUnwrap: '0x0fb867A5Ee1CA9426D3dAb95e613Be166218b977',
     ToggleSub: '0x71015226EADFd4aC887fB56556F64338e352439b',
 
-
     // aave v3
     AaveV3ATokenPayback: '0x261906e5E0D0D38D9cBb5c10dB9c4031aabdf8C1',
     AaveV3Borrow: '0x5786809DA660dB613994460F096F19fcd19eD4c9',
@@ -191,6 +196,13 @@ const actionAddresses = {
     FLAaveV3: '0x3Cc0d5DAE1B94e294152C3150aA732b97af603E1',
     GasFeeTakerL2: '0x2F64f73B222B4978CAfd0295c0fa106cE5f34996',
     AaveV3RatioCheck: '0x4a5c2cbCFB921b596Dec049389899CC8Eb4678ED',
+
+    // uniswap V3
+    UniCollectV3: '0xd521cbEfE58440d1C31FD0baF41fdfE18D028704',
+    UniMintV3: '0x7AC778fB7CaB7D368f37d6E7CE3c293077969331',
+    UniSupplyV3: '0x55675C6041A33EE9BDd796Edaa0f098AC7F3534f',
+    UniWithdrawV3: '0xa004c22eFd0CD87847DE83Ce9ab92af5382c2efe',
+    UniCreatePoolV3: '0x334Ab3C12a4c0315566fd9308880Dad71F838Dc5',
   }
 };
 
@@ -221,6 +233,8 @@ const otherAddresses = {
     AdminVault: '0x136b1bEAfff362530F98f10E3D8C38f3a3F3d38C',
     DefisaverLogger: '0xFc2f1355296ab7dd98a1260E3Ff5E906999d4Acb',
     Empty: '0x0000000000000000000000000000000000000000',
+
+    UniswapV3PositionManager : '0xC36442b4a4522E871399CD717aBDD847Ab11FE88',
   },
   [NETWORKS.arbitrum.chainId]: {
     RecipeExecutor: '0xe775c59e5662597bcE8aB4432C06380709554883',
@@ -231,6 +245,8 @@ const otherAddresses = {
     AdminVault: '0xd47D8D97cAd12A866900eEc6Cde1962529F25351',
     DefisaverLogger: '0xE6f9A5C850dbcD12bc64f40d692F537250aDEC38',
     Empty: '0x0000000000000000000000000000000000000000',
+
+    UniswapV3PositionManager : '0xC36442b4a4522E871399CD717aBDD847Ab11FE88',
   },
 };