@defisaver/sdk 1.0.65 → 1.0.66-dev-2

package/esm/src/triggers/index.js

@@ -18,3 +18,4 @@ export * from './SparkQuotePriceTrigger';
 export * from './LiquityDebtInFrontWithLimitTrigger';
 export * from './CurveUsdCollRatioTrigger';
 export * from './MorphoBlueRatioTrigger';
+export * from './OffchainPriceTrigger';

package/esm/src/utils/index.d.ts

@@ -6,5 +6,4 @@ import mstableAssetPairs from './mstableAssetPairs';
 import * as curveUtils from './curve-utils';
 import * as curveusdUtils from './curveusd-utils';
 import * as basicUtils from './basic-utils';
-import * as llamaLenUtils from './llamalend-utils';
-export { zeroExExchange, uniswapLP, uniswapV3LP, mstableAssetPairs, convexUtils, curveUtils, curveusdUtils, basicUtils, llamaLenUtils, };
+export { zeroExExchange, uniswapLP, uniswapV3LP, mstableAssetPairs, convexUtils, curveUtils, curveusdUtils, basicUtils, };

package/esm/src/utils/index.js

@@ -6,5 +6,4 @@ import mstableAssetPairs from './mstableAssetPairs';
 import * as curveUtils from './curve-utils';
 import * as curveusdUtils from './curveusd-utils';
 import * as basicUtils from './basic-utils';
-import * as llamaLenUtils from './llamalend-utils';
-export { zeroExExchange, uniswapLP, uniswapV3LP, mstableAssetPairs, convexUtils, curveUtils, curveusdUtils, basicUtils, llamaLenUtils, };
+export { zeroExExchange, uniswapLP, uniswapV3LP, mstableAssetPairs, convexUtils, curveUtils, curveusdUtils, basicUtils, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/sdk",
-  "version": "1.0.65",
+  "version": "1.0.66-dev-2",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/src/index.js",

package/src/actions/basic/ExecuteSafeTxAction.ts

@@ -0,0 +1,85 @@
+import { Action } from '../../Action';
+import { getAddr } from '../../addresses';
+import {
+  EthAddress,
+  bytes,
+  uint256,
+  uint8,
+} from '../../types';
+
+/**
+ * ExecuteSafeTxAction - Execute Safe transaction
+ *
+ * @category BasicActions
+ */
+export class ExecuteSafeTxAction extends Action {
+  /**
+   * @param safe Address of the Safe wallet
+   * @param to Destination address of Safe transaction
+   * @param value Ether value of Safe transaction
+   * @param data Data payload of Safe transaction
+   * @param operation Operation type of Safe transaction. 0 = call, 1 = delegateCall
+   * @param safeTxGas Gas that should be used for the Safe transaction
+   * @param baseGas Gas costs that are independent of the transaction execution(e.g. base transaction fee, signature check, payment of the refund)
+   * @param gasPrice Gas price that should be used for the payment calculation
+   * @param gasToken  Token address (or 0 if ETH) that is used for the payment
+   * @param refundReceiver Address of receiver of gas payment (or 0 if tx.origin
+   * @param signatures Packed signature data ({bytes32 r}{bytes32 s}{uint8 v})
+   */
+  constructor(
+    safe: EthAddress,
+    to: EthAddress,
+    value: uint256,
+    data: bytes,
+    operation: uint8,
+    safeTxGas: uint256,
+    baseGas: uint256,
+    gasPrice: uint256,
+    gasToken: EthAddress,
+    refundReceiver: EthAddress,
+    signatures: bytes,
+  ) {
+    super(
+      'ExecuteSafeTx',
+      getAddr('ExecuteSafeTx'),
+      [
+        'address',
+        'address',
+        'uint256',
+        'bytes',
+        'uint8',
+        'uint256',
+        'uint256',
+        'uint256',
+        'address',
+        'address',
+        'bytes',
+      ],
+      [
+        safe,
+        to,
+        value,
+        data,
+        operation,
+        safeTxGas,
+        baseGas,
+        gasPrice,
+        gasToken,
+        refundReceiver,
+        signatures,
+      ],
+    );
+
+    this.mappableArgs = [
+      this.args[0],
+      this.args[1],
+      this.args[2],
+      this.args[4],
+      this.args[5],
+      this.args[6],
+      this.args[7],
+      this.args[8],
+      this.args[9],
+    ];
+  }
+}

package/src/actions/basic/LimitSellAction.ts

@@ -0,0 +1,63 @@
+import AbiCoder from 'web3-eth-abi';
+import { getAssetInfoByAddress } from '@defisaver/tokens';
+import ActionAbi from '../../abis/Action.json';
+import { ActionWithL2 } from '../../ActionWithL2';
+import { requireAddress } from '../../utils/general';
+import { getAddr } from '../../addresses';
+import { EthAddress, uint256 } from '../../types';
+
+/**
+ * Limit sell action used as part of the LimitSell Strategy
+ *
+ * @category BasicActions
+ */
+export class LimitSellAction extends ActionWithL2 {
+  protocolFee:string;
+
+  /**
+   * @param exchangeOrder Standard DFS Exchange data
+   * @param from Order sender
+   * @param to Order recipient
+   * @param gasUsed Amount of gas spent as part of the strategy
+   * @param protocolFee 0x fee (amount of ETH in Wei)
+   */
+  constructor(exchangeOrder:Array<any>, from:EthAddress, to:EthAddress, gasUsed: uint256, protocolFee = '0') {
+    requireAddress(to);
+    super(
+      'LimitSell',
+      getAddr('LimitSell'),
+      [
+        ['address', 'address', 'uint256', 'uint256', 'uint256', 'uint256', 'address', 'address', 'bytes', ['address', 'address', 'address', 'uint256', 'uint256', 'bytes']],
+        'address',
+        'address',
+        'uint256',
+      ],
+      [exchangeOrder, from, to, gasUsed],
+    );
+
+    this.protocolFee = protocolFee;
+
+    this.mappableArgs = [
+      this.args[0][0],
+      this.args[0][1],
+      this.args[0][2],
+      this.args[1],
+      this.args[2],
+    ];
+  }
+
+  encodeInputs() {
+    const executeActionDirectAbi: any = (ActionAbi.find(({ name }) => name === 'executeActionDirect'))!;
+    return AbiCoder.encodeFunctionCall(executeActionDirectAbi, this._encodeForCall());
+  }
+
+  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';
+  }
+}

package/src/actions/basic/RemoveTokenApprovalAction.ts

@@ -0,0 +1,39 @@
+import { requireAddress } from '../../utils/general';
+import { Action } from '../../Action';
+import { getAddr } from '../../addresses';
+import { EthAddress, uint256 } from '../../types';
+
+/**
+ * Remove approval for a spender to pull tokens from user wallet
+ *
+ * @category BasicActions
+ */
+export class RemoveTokenApprovalAction extends Action {
+  /**
+   * @param token Token address
+   * @param spender Spender address
+   */
+  constructor(token:EthAddress, spender:EthAddress) {
+    requireAddress(spender);
+    super(
+      'RemoveTokenApproval',
+      getAddr('RemoveTokenApproval'),
+      [
+        'address',
+        'address',
+      ],
+      [
+        token,
+        spender,
+      ],
+    );
+    this.mappableArgs = [
+      this.args[0],
+      this.args[1],
+    ];
+  }
+
+  async getAssetsToApprove() {
+    return [];
+  }
+}

package/src/actions/basic/WrapEthAction.ts

@@ -10,13 +10,14 @@ import { uint256 } from '../../types';
 export class WrapEthAction extends ActionWithL2 {
   /**
    * @param amount Wrap amount
+   * @param includeEthInTx If true, the transaction will include the ETH value in the transaction
    */
-  constructor(amount:uint256) {
-    super('WrapEth', getAddr('WrapEth'), ['uint256'], [amount]);
+  constructor(amount:uint256, includeEthInTx = true) {
+    super('WrapEth', getAddr('WrapEth'), ['uint256', 'bool'], [amount, includeEthInTx]);
   }
 
   async getEthValue() {
-    return this.args[0];
+    return this.args[1] ? this.args[0] : 0;
   }
 
   encodeInputs() {

package/src/actions/basic/index.ts

@@ -24,3 +24,6 @@ export * from './TokenizedVaultAdapterDepositAction';
 export * from './TokenizedVaultAdapterMintAction';
 export * from './TokenizedVaultAdapterRedeemAction';
 export * from './TokenizedVaultAdapterWithdrawAction';
+export * from './LimitSellAction';
+export * from './ExecuteSafeTxAction';
+export * from './RemoveTokenApprovalAction';

package/src/actions/index.ts

@@ -27,7 +27,6 @@ import * as lsv from './lsv';
 import * as curveusd from './curveusd';
 import * as spark from './spark';
 import * as morphoblue from './morpho-blue';
-import * as llamalend from './llamalend';
 
 export {
   aave,
@@ -59,5 +58,4 @@ export {
   spark,
   curveusd,
   morphoblue,
-  llamalend,
 };

package/src/actions/maker/MakerGiveAction.ts

@@ -12,12 +12,11 @@ export class MakerGiveAction extends Action {
   /**
    * @param vaultId
    * @param newOwner
-   * @param createProxy
    * @param mcdManager
    */
-  constructor(vaultId:uint256, newOwner:EthAddress, createProxy:boolean, mcdManager:EthAddress = getAddr('McdCdpManager')) {
+  constructor(vaultId:uint256, newOwner:EthAddress, mcdManager:EthAddress = getAddr('McdCdpManager')) {
     requireAddress(newOwner);
-    super('McdGive', getAddr('McdGive'), ['uint256', 'address', 'bool', 'address'], [vaultId, newOwner, createProxy, mcdManager]);
+    super('McdGive', getAddr('McdGive'), ['uint256', 'address', 'address'], [vaultId, newOwner, mcdManager]);
 
     this.mappableArgs = [
       this.args[0],

package/src/addresses.ts

@@ -24,7 +24,7 @@ export const actionAddresses = {
     TokenizedVaultAdapter: '0x3944364Ce3a273D269707484F3a676fCa17E08b8',
 
     // exchange
-    DFSSell: '0x951D7B421f45FF0e4A8ddE0288aE3f9C2C69b784',
+    DFSSell: '0x561013c605A17f5dC5b738C8a3fF9c5F33DbC3d8',
 
     // maker
     McdGenerate: '0xCb50a91C0f12f439b8bf11E9474B9c1ED62Bf7a3',
@@ -122,7 +122,7 @@ export const actionAddresses = {
     FLMaker: '0x672DE08e36A1698fD5e9E34045F81558dB4c1AFE',
     FLBalancer: '0x540a83E36E5E6Aa916A6c591934d800e17115048',
     FLSpark: '0xe9Fe5a0f5e4B370Ae60d837da58744666D5C06F7',
-    FLAction: '0x72915D41982DfCAf30b871290618E59C45Edba7F',
+    FLAction: '0x2b10B000292745099Deb15304A247c0816bd8b73',
     FLUniV3: '0x9CAdAC8Be718572F82B672b950c53F0b58483A35',
     FLGho: '0xbb67b81dD080a406227A38965d0393f396ddECBc',
     FLMorphoBlue: '0x6206C96EAc5EAC546861438A9f953B6BEa50EBAB',
@@ -257,14 +257,6 @@ export const actionAddresses = {
     MorphoBluePayback: '0x9f437E5F705E02d77adC2e72C34926978776b085',
     MorphoBlueSetAuth: '0xf30935e20c6357c7bcecd5e58ad6de26d54b9f64',
     MorphoBlueSetAuthWithSig: '0xE2d5fCDBf73BAd24A0FCAf6B2733933A98021808',
-
-    // llamalend
-    LlamaLendCreate: '0x4349be191ea63173eD98b7fC1b0DeC1ef9Bc6c11',
-    LlamaLendSupply: '0x1900eF943bD1b038c58d9F35C3825F119F9BB730',
-    LlamaLendBorrow: '0xCF693585C47049F3eACc2285E7Fe4e80123b2520',
-    LlamaLendWithdraw: '0x2593Da3c4110C531541424e9e847cd7905894C52',
-    LlamaLendPayback: '0x5b506b7a0117dbcd086632575da599bb603eb602',
-    LlamaLendSelfLiquidate: '0xe4944e0e46177300fa4c351ef72b95b9655e8394',
   },
   [NETWORKS.optimism.chainId]: {
     DFSSell: '0xC6c601fcAa870efd26C624F8c65fbc54cBe533b1',
@@ -400,7 +392,7 @@ export const actionAddresses = {
 
 export const otherAddresses = {
   [NETWORKS.ethereum.chainId]: {
-    RecipeExecutor: '0x1D6DEdb49AF91A11B5C5F34954FD3E8cC4f03A86',
+    RecipeExecutor: '0x10B748Dc504C2515Bb6A9e23CB2F686090b6c584',
     DFSRegistry: '0x287778F121F134C66212FB16c9b53eC991D32f5b',
     DFSProxyRegistry: '0x29474FdaC7142f9aB7773B8e38264FA15E3805ed',
     ProxyRegistry: '0x4678f0a6958e4D2Bc4F1BAF7Bc52E8F3564f3fE4',

package/src/triggers/OffchainPriceTrigger.ts

@@ -0,0 +1,14 @@
+import { Action } from '../Action';
+import { getAddr } from '../addresses';
+import { uint256, uint8 } from '../types';
+
+/**
+ *
+ *
+ * @category Triggers
+ */
+export class OffchainPriceTrigger extends Action {
+  constructor(limitPrice:uint256, limitType: uint8) {
+    super('OffchainPriceTrigger', getAddr('OffchainPriceTrigger'), ['uint256', 'uint8'], [limitPrice, limitType]);
+  }
+}

package/src/triggers/index.ts

@@ -18,3 +18,5 @@ export * from './SparkQuotePriceTrigger';
 export * from './LiquityDebtInFrontWithLimitTrigger';
 export * from './CurveUsdCollRatioTrigger';
 export * from './MorphoBlueRatioTrigger';
+export * from './OffchainPriceTrigger';
+

package/src/utils/index.ts

@@ -6,7 +6,6 @@ import mstableAssetPairs from './mstableAssetPairs';
 import * as curveUtils from './curve-utils';
 import * as curveusdUtils from './curveusd-utils';
 import * as basicUtils from './basic-utils';
-import * as llamaLenUtils from './llamalend-utils';
 
 export {
   zeroExExchange,
@@ -17,5 +16,4 @@ export {
   curveUtils,
   curveusdUtils,
   basicUtils,
-  llamaLenUtils,
 };