@defisaver/sdk 0.3.16 → 0.3.18

package/package.json

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

package/src/ActionWithL2.js

@@ -1,7 +1,5 @@
 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 {
   /**
@@ -12,12 +10,7 @@ class ActionWithL2 extends Action {
 
   encodeForL2Recipe() { return `0x${this.encodeInputs().slice(10)}`; } // cut the method id
 
-  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)]);
-  }
+  encodeInputs() { throw new Error('Use implementation from specific ActionWithL2'); }
 
   addressToBytes20(address) { return address.slice(2); }
 

package/src/actions/compoundV3/CompoundV3AllowAction.js

@@ -0,0 +1,26 @@
+const Action = require("../../Action");
+const {requireAddress} = require("../../utils/general");
+const { getAddr } = require('../../addresses.js');
+
+/**
+ * CompoundV3AllowAction - Change if manager has authority over owner based on isAllowed from CompoundV3
+ */
+ class CompoundV3AllowAction extends Action {
+    /**
+     * @param market {EthAddress} Comet proxy address of the market
+     * @param manager {EthAddress} address of manager
+     * @param isAllowed {bool}
+     */
+    constructor(market, manager, isAllowed) {
+      requireAddress(manager);
+      super('CompV3Allow', getAddr('CompV3Allow'), ['address', 'address','bool'], [...arguments]);
+
+      this.mappableArgs = [
+        this.args[0],
+        this.args[1],
+        this.args[2],
+      ];
+    }
+  }
+  
+  module.exports = CompoundV3AllowAction;

package/src/actions/compoundV3/CompoundV3BorrowAction.js

@@ -0,0 +1,26 @@
+const Action = require("../../Action");
+const {requireAddress} = require("../../utils/general");
+const { getAddr } = require('../../addresses.js');
+
+/**
+ * CompoundV3BorrowAction - Borrow base tokens from CompoundV3
+ */
+ class CompoundV3BorrowAction extends Action {
+    /**
+     * @param market {EthAddress} Comet proxy address of the market
+     * @param amount {string} Wei amount in underlying asset decimals (not cAsset) - ie. 18 dec for cETH, not 8
+     * @param to {EthAddress}
+     */
+    constructor(market, amount, to) {
+      requireAddress(to);
+      super('CompV3Borrow', getAddr('CompV3Borrow'), ['address','uint256','address'], [...arguments]);
+
+      this.mappableArgs = [
+        this.args[0],
+        this.args[1],
+        this.args[2],
+      ];
+    }
+  }
+  
+  module.exports = CompoundV3BorrowAction;

package/src/actions/compoundV3/CompoundV3ClaimAction.js

@@ -0,0 +1,34 @@
+const Action = require("../../Action");
+const { requireAddress } = require("../../utils/general");
+const { getAddr } = require("../../addresses.js");
+
+/**
+ * CompoundV3ClaimAction - Claims Comp tokens to, and for, a specified address
+ */
+class CompoundV3ClaimAction extends Action {
+  /**
+   * @param market {EthAddress} Comet proxy address of the market
+   * @param onBehalfOf {EthAddress} The owner to claim for
+   * @param to {EthAddress} The address to receive the rewards
+   * @param shouldAccrue {bool} If true, the protocol will account for the rewards owed to the account as of the current block before transferring
+   */
+  constructor(market, onBehalfOf, to, shouldAccrue) {
+    requireAddress(onBehalfOf);
+    requireAddress(to);
+    super(
+      "CompV3Claim",
+      getAddr("CompV3Claim"),
+      ["address","address", "address", "bool"],
+      [...arguments]
+    );
+
+    this.mappableArgs = [
+      this.args[0],
+      this.args[1],
+      this.args[2],
+      this.args[3],
+    ];
+  }
+}
+
+module.exports = CompoundV3ClaimAction;

package/src/actions/compoundV3/CompoundV3PaybackAction.js

@@ -0,0 +1,44 @@
+const Action = require("../../Action");
+const {requireAddress} = require("../../utils/general");
+const { getAddr } = require('../../addresses.js');
+const {getAssetInfoByAddress} = require("@defisaver/tokens");
+
+/**
+ * CompoundV3PaybackAction - Repays specified amount of base token
+ */
+ class CompoundV3PaybackAction extends Action {
+    /**
+     * @param market {EthAddress} Comet proxy address of the market
+     * @param amount {uint256} amount of base token to be paid back
+     * @param from {EthAddress} address from which funds are paid
+     * @param onBehalf {EthAddress} address for which the funds are paid back
+     * @param asset {EthAddress} address for which the funds are paid back
+     */
+    constructor(market, amount, from, onBehalf,asset) {
+      requireAddress(from);
+      requireAddress(onBehalf);
+      requireAddress(asset)
+      super(
+        'CompV3Payback',
+        getAddr('CompV3Payback'),
+        ['address','uint256','address','address'],
+        [...arguments].slice(0,4)
+      );
+      this.mappableArgs = [
+        this.args[0],
+        this.args[1],
+        this.args[2],
+        this.args[3],
+      ];
+      this.tokenForApproval = asset;
+    }
+
+    async getAssetsToApprove() {
+      const asset = getAssetInfoByAddress(this.tokenForApproval);
+
+      if (asset.symbol !== 'ETH') return [{asset: this.tokenForApproval, owner: this.args[2]}];
+      return [];
+    }
+  }
+
+  module.exports = CompoundV3PaybackAction;

package/src/actions/compoundV3/CompoundV3SupplyAction.js

@@ -0,0 +1,36 @@
+const Action = require("../../Action");
+const {requireAddress} = require("../../utils/general");
+const { getAddr } = require('../../addresses.js');
+const {getAssetInfoByAddress} = require("@defisaver/tokens");
+
+/**
+ * CompoundV3SupplyAction - Supply specified amount of token (base or collateral)
+ */
+ class CompoundV3SupplyAction extends Action {
+    /**
+     * @param market {EthAddress} Comet proxy address of the market
+     * @param tokenAddr {EthAddress}
+     * @param amount {uint256} wei amount of asset to supply
+     * @param from {EthAddress}
+     */
+     constructor(market, tokenAddr, amount, from,) {
+        super('CompV3Supply', getAddr('CompV3Supply'), ['address','address','uint256','address'], [market, tokenAddr, amount, from]);
+
+        this.mappableArgs = [
+          this.args[0],
+          this.args[1],
+          this.args[2],
+          this.args[3]
+        ];
+        this.tokenForApproval = tokenAddr;
+      }
+
+      async getAssetsToApprove() {
+        const asset = getAssetInfoByAddress(this.tokenForApproval);
+
+        if (asset.symbol !== 'ETH') return [{asset: this.tokenForApproval, owner: this.args[1]}];
+        return [];
+      }
+  }
+
+  module.exports = CompoundV3SupplyAction;

package/src/actions/compoundV3/CompoundV3TransferAction.js

@@ -0,0 +1,37 @@
+const Action = require("../../Action");
+const {requireAddress} = require("../../utils/general");
+const { getAddr } = require('../../addresses.js');
+
+/**
+ * CompoundV3TransferAction - Transfer specified amount of assets from src address to dst
+ */
+ class CompoundV3TransferAction extends Action {
+    /**
+     * @param market {EthAddress} Comet proxy address of the market
+     * @param from {EthAddress} address of src
+     * @param to {EthAddress} address of dst
+     * @param asset {EthAddress} address of ERC20 token
+     * @param amount {uint256} amount of assets to be transferred
+     */
+    constructor(market, from, to, asset, amount) {
+      requireAddress(from);
+      requireAddress(to);
+      requireAddress(asset);
+      super(
+        'CompV3Transfer', 
+        getAddr('CompV3Transfer'), 
+        ['address','address','address','address','uint256'], 
+        [...arguments]
+      );
+
+      this.mappableArgs = [
+        this.args[0],
+        this.args[1],
+        this.args[2],
+        this.args[3],
+        this.args[4],
+      ];
+    }
+  }
+  
+  module.exports = CompoundV3TransferAction;

package/src/actions/compoundV3/CompoundV3WithdrawAction.js

@@ -0,0 +1,34 @@
+const Action = require("../../Action");
+const { requireAddress } = require("../../utils/general");
+const { getAddr } = require("../../addresses.js");
+
+/**
+ * CompoundV3WithdrawAction - Withdraw token from an Compound position
+ */
+class CompoundV3WithdrawAction extends Action {
+  /**
+   * @param market {EthAddress} Comet proxy address of the market
+   * @param to {EthAddress} Address of the recipient
+   * @param asset {EthAddress} Address of asset to withdraw
+   * @param amount {string} Wei amount in specified asset
+   */
+  constructor(market, to, asset, amount) {
+    requireAddress(to);
+    requireAddress(asset);
+    super(
+      "CompV3Withdraw",
+      getAddr("CompV3Withdraw"),
+      ["address","address", "address", "uint256"],
+      [...arguments]
+    );
+
+    this.mappableArgs = [
+      this.args[0],
+      this.args[1],
+      this.args[2],
+      this.args[3],
+    ];
+  }
+}
+
+module.exports = CompoundV3WithdrawAction;

package/src/actions/compoundV3/index.js

@@ -0,0 +1,17 @@
+const CompoundV3SupplyAction = require('./CompoundV3SupplyAction');
+const CompoundV3BorrowAction = require('./CompoundV3BorrowAction');
+const CompoundV3PaybackAction = require('./CompoundV3PaybackAction');
+const CompoundV3WithdrawAction = require('./CompoundV3WithdrawAction');
+const CompoundV3ClaimAction = require('./CompoundV3ClaimAction');
+const CompoundV3AllowAction = require('./CompoundV3AllowAction');
+const CompoundV3TransferAction = require('./CompoundV3TransferAction');
+
+module.exports = {
+    CompoundV3SupplyAction,
+    CompoundV3BorrowAction,
+    CompoundV3PaybackAction,
+    CompoundV3WithdrawAction,
+    CompoundV3TransferAction,
+    CompoundV3AllowAction,
+    CompoundV3ClaimAction,
+}

package/src/actions/index.js

@@ -19,6 +19,7 @@ const mstable = require('./mstable');
 const rari = require('./rari');
 const aaveV3 = require('./aaveV3');
 const convex = require('./convex');
+const compoundV3 = require('./compoundV3');
 
 module.exports = {
   maker,
@@ -42,4 +43,5 @@ module.exports = {
   rari,
   aaveV3,
   convex,
+  compoundV3,
 };

package/src/actions/uniswapV3/UniswapV3CollectAction.js

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

package/src/actions/uniswapV3/UniswapV3CreatePoolAction.js

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

package/src/actions/uniswapV3/UniswapV3MintAction.js

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

package/src/actions/uniswapV3/UniswapV3SupplyAction.js

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

package/src/actions/uniswapV3/UniswapV3WithdrawAction.js

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

package/src/addresses.js

@@ -79,7 +79,7 @@ const actionAddresses = {
 
     // yearn
     YearnSupply: '0x837D6E7F469b3cC820B0a6Da25415D5aE0A861c4',
-    YearnWithdraw: '0x563eF9b1075628E62aDc657702517dEA72ca08d6', // CHECK IF REDEPLOY
+    YearnWithdraw: '0x563eF9b1075628E62aDc657702517dEA72ca08d6',
 
     // liquity
     LiquityClose: '0x4B2d174129789a88e92D46342201F207132144b7',
@@ -136,6 +136,15 @@ const actionAddresses = {
     ConvexDeposit: '0x3Ecc4F1FD5aA09D2E13Ec9ebFdF102063d66F458',
     ConvexWithdraw: '0x2B2c235F9e27A121947c34A39d447bD4C585aA15',
     ConvexClaim: '0xA012afAA97B48894b8FCB2ECC007045Be7a8E8B6',
+
+    // CompV3
+    CompV3Allow: '0xC4a80f22bf56E0dFa2CB378561B934F41E14bc9f',
+    CompV3Borrow: '0xAb01C815063178C3021a516ecaf56915fD0E6534',
+    CompV3Claim: '0x4CEa369B63daAc0dA3423c5038a57483c5150986',
+    CompV3Payback: '0x6d14b9d69aADcb0d31a3e5d89fba75AB053fc9f0',
+    CompV3Supply: '0xAB53342d922Cc52b33486B92dC5dc361b7E4B436',
+    CompV3Transfer: '0x0fB2390AEDB2dBeE08cec363c0eD72e9D8e64535',
+    CompV3Withdraw: '0x59fED9975cd3bb07bB75490e86751D6025ce0bC2',
   },
   [NETWORKS.optimism.chainId]: {
     DFSSell: '0xBA0f6039b95CC0A02B5fc983eCf0FC4437BaacC7',
@@ -147,7 +156,6 @@ const actionAddresses = {
     PullToken: '0x392579E020a688068422A925c85f28bFD12a7EBB',
     SendTokenAndUnwrap: '0x8000174366066923D554cb466e190258A6FF3b1f',
     ToggleSub: '0x988C5C24AE6348404196267e19962f36961CAc29',
-    TokenBalance: '0xC6FF5b01f7c7b35b6e093fF70D2332B361C5Be5A',
 
 
     // aave v3
@@ -162,16 +170,10 @@ 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',
@@ -183,7 +185,7 @@ const actionAddresses = {
     PullToken: '0xD8B3769f74bd9F196C3416a42a91E786948898e6',
     SendTokenAndUnwrap: '0x0fb867A5Ee1CA9426D3dAb95e613Be166218b977',
     ToggleSub: '0x71015226EADFd4aC887fB56556F64338e352439b',
-    TokenBalance: '0x483B903E702F60698Dd8124558C6199922737f1F',
+
 
     // aave v3
     AaveV3ATokenPayback: '0x261906e5E0D0D38D9cBb5c10dB9c4031aabdf8C1',
@@ -198,13 +200,6 @@ const actionAddresses = {
     FLAaveV3: '0x3Cc0d5DAE1B94e294152C3150aA732b97af603E1',
     GasFeeTakerL2: '0x2F64f73B222B4978CAfd0295c0fa106cE5f34996',
     AaveV3RatioCheck: '0x4a5c2cbCFB921b596Dec049389899CC8Eb4678ED',
-
-    // uniswap V3
-    UniCollectV3: '0xd521cbEfE58440d1C31FD0baF41fdfE18D028704',
-    UniMintV3: '0x7AC778fB7CaB7D368f37d6E7CE3c293077969331',
-    UniSupplyV3: '0x55675C6041A33EE9BDd796Edaa0f098AC7F3534f',
-    UniWithdrawV3: '0xa004c22eFd0CD87847DE83Ce9ab92af5382c2efe',
-    UniCreatePoolV3: '0x334Ab3C12a4c0315566fd9308880Dad71F838Dc5',
   }
 };
 
@@ -235,8 +230,6 @@ const otherAddresses = {
     AdminVault: '0x136b1bEAfff362530F98f10E3D8C38f3a3F3d38C',
     DefisaverLogger: '0xFc2f1355296ab7dd98a1260E3Ff5E906999d4Acb',
     Empty: '0x0000000000000000000000000000000000000000',
-
-    UniswapV3PositionManager : '0xC36442b4a4522E871399CD717aBDD847Ab11FE88',
   },
   [NETWORKS.arbitrum.chainId]: {
     RecipeExecutor: '0xe775c59e5662597bcE8aB4432C06380709554883',
@@ -247,8 +240,6 @@ const otherAddresses = {
     AdminVault: '0xd47D8D97cAd12A866900eEc6Cde1962529F25351',
     DefisaverLogger: '0xE6f9A5C850dbcD12bc64f40d692F537250aDEC38',
     Empty: '0x0000000000000000000000000000000000000000',
-
-    UniswapV3PositionManager : '0xC36442b4a4522E871399CD717aBDD847Ab11FE88',
   },
 };