@defisaver/sdk 1.3.33 → 1.3.35-npm-token-dev

package/src/abis/DFSProxyRegistry.json

@@ -3,50 +3,144 @@
     "inputs": [
       {
         "internalType": "address",
-        "name": "_user",
+        "name": "proxy",
+        "type": "address"
+      }
+    ],
+    "name": "InvalidDSProxy",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NonContractCall",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "SenderNotAdmin",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "SenderNotOwner",
+    "type": "error"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "sender",
         "type": "address"
       },
       {
         "internalType": "address",
-        "name": "_proxy",
+        "name": "user",
         "type": "address"
       }
     ],
-    "name": "addAdditionalProxy",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
+    "name": "SenderNotUserOrOwner",
+    "type": "error"
   },
   {
+    "anonymous": false,
     "inputs": [
       {
+        "indexed": true,
         "internalType": "address",
-        "name": "",
+        "name": "user",
         "type": "address"
       },
       {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
+        "indexed": true,
+        "internalType": "address",
+        "name": "proxy",
+        "type": "address"
       }
     ],
-    "name": "additionalProxies",
-    "outputs": [
+    "name": "AdditionalProxyAdded",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
       {
+        "indexed": true,
         "internalType": "address",
-        "name": "",
+        "name": "user",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "proxy",
         "type": "address"
       }
     ],
-    "stateMutability": "view",
-    "type": "function"
+    "name": "AdditionalProxyRemoved",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "user",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "proxy",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "caller",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "bool",
+        "name": "excluded",
+        "type": "bool"
+      }
+    ],
+    "name": "ProxyExclusionUpdated",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "proxy",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "oldOwner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "newOwner",
+        "type": "address"
+      }
+    ],
+    "name": "ProxySynced",
+    "type": "event"
   },
   {
     "inputs": [],
-    "name": "adminVault",
+    "name": "MCD_REGISTRY",
     "outputs": [
       {
-        "internalType": "contract AdminVault",
+        "internalType": "contract IDSProxyRegistry",
         "name": "",
         "type": "address"
       }
@@ -58,47 +152,82 @@
     "inputs": [
       {
         "internalType": "address",
-        "name": "_newAdminVault",
+        "name": "user",
         "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
       }
     ],
-    "name": "changeAdminVault",
-    "outputs": [],
-    "stateMutability": "nonpayable",
+    "name": "additionalProxies",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "proxies",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
     "type": "function"
   },
   {
     "inputs": [
       {
         "internalType": "address",
-        "name": "_user",
+        "name": "user",
         "type": "address"
       },
       {
         "internalType": "address",
-        "name": "_proxy",
+        "name": "proxy",
         "type": "address"
       }
     ],
-    "name": "changeMcdOwner",
-    "outputs": [],
-    "stateMutability": "nonpayable",
+    "name": "additionalProxyIndex",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "indexPlusOne",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "adminVault",
+    "outputs": [
+      {
+        "internalType": "contract IAdminVault",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
     "type": "function"
   },
   {
     "inputs": [
       {
         "internalType": "address",
-        "name": "",
+        "name": "_user",
         "type": "address"
       }
     ],
-    "name": "changedOwners",
+    "name": "getAllProxies",
     "outputs": [
       {
         "internalType": "address",
-        "name": "",
+        "name": "mcdProxy",
         "type": "address"
+      },
+      {
+        "internalType": "address[]",
+        "name": "validAdditionalProxies",
+        "type": "address[]"
       }
     ],
     "stateMutability": "view",
@@ -112,20 +241,33 @@
         "type": "address"
       }
     ],
-    "name": "getAllProxies",
+    "name": "getMcdProxy",
     "outputs": [
       {
         "internalType": "address",
-        "name": "",
+        "name": "proxy",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_user",
         "type": "address"
       },
       {
         "internalType": "address[]",
-        "name": "",
+        "name": "_proxies",
         "type": "address[]"
       }
     ],
-    "stateMutability": "view",
+    "name": "removeAdditionalProxies",
+    "outputs": [],
+    "stateMutability": "nonpayable",
     "type": "function"
   },
   {
@@ -134,33 +276,99 @@
         "internalType": "address",
         "name": "_user",
         "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "_proxy",
+        "type": "address"
       }
     ],
-    "name": "getMcdProxy",
-    "outputs": [
+    "name": "removeAdditionalProxy",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       {
         "internalType": "address",
-        "name": "",
+        "name": "user",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "proxy",
         "type": "address"
       }
     ],
+    "name": "removedProxies",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "removed",
+        "type": "bool"
+      }
+    ],
     "stateMutability": "view",
     "type": "function"
   },
   {
-    "inputs": [],
-    "name": "kill",
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_user",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "_proxy",
+        "type": "address"
+      }
+    ],
+    "name": "restoreAdditionalProxy",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
   },
   {
-    "inputs": [],
-    "name": "mcdRegistry",
+    "inputs": [
+      {
+        "internalType": "address[]",
+        "name": "_proxies",
+        "type": "address[]"
+      }
+    ],
+    "name": "syncProxies",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_proxy",
+        "type": "address"
+      }
+    ],
+    "name": "syncProxy",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "proxy",
+        "type": "address"
+      }
+    ],
+    "name": "trackedOwner",
     "outputs": [
       {
-        "internalType": "contract IProxyRegistry",
-        "name": "",
+        "internalType": "address",
+        "name": "owner",
         "type": "address"
       }
     ],
@@ -190,4 +398,4 @@
     "stateMutability": "nonpayable",
     "type": "function"
   }
-]
+]

package/src/actions/aavev4/AaveV4DelegateBorrowAction.ts

@@ -0,0 +1,36 @@
+import { Action } from '../../Action';
+import { getAddr } from '../../addresses';
+import { EthAddress, uint256 } from '../../types';
+
+/**
+ * AaveV4DelegateBorrowAction - Approves a spender to borrow from the specified reserve on behalf of the wallet.
+ *
+ * @category AaveV4DelegateBorrow
+ */
+export class AaveV4DelegateBorrowAction extends Action {
+  /**
+   * @param spoke Address of the spoke.
+   * @param reserveId Reserve id.
+   * @param spender Address that will receive the borrow allowance.
+   * @param amount Amount of borrow allowance.
+   */
+  constructor(
+    spoke: EthAddress,
+    reserveId: uint256,
+    spender: EthAddress,
+    amount: uint256,
+  ) {
+    super(
+      'AaveV4DelegateBorrow',
+      getAddr('AaveV4DelegateBorrow'),
+      ['address', 'uint256', 'address', 'uint256'],
+      [spoke, reserveId, spender, amount],
+    );
+    this.mappableArgs = [
+      this.args[0],
+      this.args[1],
+      this.args[2],
+      this.args[3],
+    ];
+  }
+}

package/src/actions/aavev4/AaveV4DelegateSetUsingAsCollateralAction.ts

@@ -0,0 +1,33 @@
+import { Action } from '../../Action';
+import { getAddr } from '../../addresses';
+import { EthAddress } from '../../types';
+
+/**
+ * AaveV4DelegateSetUsingAsCollateralAction - Approves a delegatee to set using as collateral on behalf of the wallet.
+ *
+ * @category AaveV4DelegateSetUsingAsCollateral
+ */
+export class AaveV4DelegateSetUsingAsCollateralAction extends Action {
+  /**
+   * @param spoke Address of the spoke.
+   * @param delegatee Address that will receive the permission.
+   * @param permission Whether the delegatee can set using as collateral.
+   */
+  constructor(
+    spoke: EthAddress,
+    delegatee: EthAddress,
+    permission: boolean,
+  ) {
+    super(
+      'AaveV4DelegateSetUsingAsCollateral',
+      getAddr('AaveV4DelegateSetUsingAsCollateral'),
+      ['address', 'address', 'bool'],
+      [spoke, delegatee, permission],
+    );
+    this.mappableArgs = [
+      this.args[0],
+      this.args[1],
+      this.args[2],
+    ];
+  }
+}

package/src/actions/aavev4/AaveV4DelegateWithdrawAction.ts

@@ -0,0 +1,36 @@
+import { Action } from '../../Action';
+import { getAddr } from '../../addresses';
+import { EthAddress, uint256 } from '../../types';
+
+/**
+ * AaveV4DelegateWithdrawAction - Approves a spender to withdraw from the specified reserve on behalf of the wallet.
+ *
+ * @category AaveV4DelegateWithdraw
+ */
+export class AaveV4DelegateWithdrawAction extends Action {
+  /**
+   * @param spoke Address of the spoke.
+   * @param reserveId Reserve id.
+   * @param spender Address that will receive the withdraw allowance.
+   * @param amount Amount of withdraw allowance.
+   */
+  constructor(
+    spoke: EthAddress,
+    reserveId: uint256,
+    spender: EthAddress,
+    amount: uint256,
+  ) {
+    super(
+      'AaveV4DelegateWithdraw',
+      getAddr('AaveV4DelegateWithdraw'),
+      ['address', 'uint256', 'address', 'uint256'],
+      [spoke, reserveId, spender, amount],
+    );
+    this.mappableArgs = [
+      this.args[0],
+      this.args[1],
+      this.args[2],
+      this.args[3],
+    ];
+  }
+}

package/src/actions/aavev4/AaveV4SetUserManagersAction.ts

@@ -0,0 +1,26 @@
+import { Action } from '../../Action';
+import { getAddr } from '../../addresses';
+import { EthAddress } from '../../types';
+
+/**
+ * AaveV4SetUserManagersAction - Sets position managers for the user's wallet.
+ *
+ * @category AaveV4
+ */
+export class AaveV4SetUserManagersAction extends Action {
+  /**
+   * @param spoke Address of the spoke.
+   * @param updates The array of position manager updates.
+   */
+  constructor(
+    spoke: EthAddress,
+    updates: Array<[EthAddress, boolean]>,
+  ) {
+    super(
+      'AaveV4SetUserManagers',
+      getAddr('AaveV4SetUserManagers'),
+      ['address', 'tuple(address,bool)[]'],
+      [spoke, updates],
+    );
+  }
+}

package/src/actions/aavev4/index.ts

@@ -8,4 +8,8 @@ export * from './AaveV4RefreshPremiumAction';
 export * from './AaveV4DelegateBorrowWithSigAction';
 export * from './AaveV4DelegateWithdrawWithSigAction';
 export * from './AaveV4SetUserManagersWithSigAction';
-export * from './AaveV4DelegateSetUsingAsCollateralWithSigAction';
+export * from './AaveV4DelegateSetUsingAsCollateralWithSigAction';
+export * from './AaveV4DelegateBorrowAction';
+export * from './AaveV4DelegateWithdrawAction';
+export * from './AaveV4DelegateSetUsingAsCollateralAction';
+export * from './AaveV4SetUserManagersAction';

package/src/addresses.ts

@@ -11,7 +11,7 @@ export const actionAddresses = {
     SendTokens: '0x7d05c0ABeF6d91300a237026507c4a2631ddAdEa',
     SumInputs: '0x70907d840aBBc984Fd949311d2f005e6aC4a4D7a',
     SubInputs: '0xe1804b756188F63f723d2FECc02988D0Cc1aB823',
-    ChangeProxyOwner: '0x81cA52CfE66421d0ceF82d5F33230e43b5F23D2B',
+    ChangeProxyOwner: '0x1cc4A7f6B17a4C900F2afe4A0718A73714AC33f2',
     TokenBalance: '0xa92B177950F1460119940436515FD857C24494BC',
     AutomationV2Unsub: '0xe35Fb12fE9796847751076aCf5ee7d124108612C',
     SendTokenAndUnwrap: '0x4155537e6933E59a62deb68f6ad93d237d07242a',
@@ -404,6 +404,10 @@ export const actionAddresses = {
     AaveV4DelegateWithdrawWithSig: '0x81864dBd69c46B19463eC7BEC6cE0B271126531a',
     AaveV4DelegateBorrowWithSig: '0x9D68b41BB9f9e9Ac1E1ee49d3566CAd4624886BA',
     AaveV4DelegateSetUsingAsCollateralWithSig: '0xF3D7C7e8F5154c669EAA0dE996cdE0575D7d3A00',
+    AaveV4DelegateBorrow: '0x4284B4e09c46Ee2b4E703dB8e5A2F892d12638e1',
+    AaveV4DelegateWithdraw: '0x5e7c404d46971E7BD3a95570A80Bc37F38bf9E29',
+    AaveV4DelegateSetUsingAsCollateral: '0xa97f8E483C147f27aE7370DeaC4E6585A37884A2',
+    AaveV4SetUserManagers: '0x61e5d59bD82FFC61B916d2F2114eF671b17d0662',
 
     MidnightPaybackDirect: '0x2911FFF5C567Ac71d653AAf5919410A3e078D186',
     MidnightBorrowFromOrders: '0xB37fB30b93e1D5b0E870312997426c4a04Cff8Ce',
@@ -431,7 +435,7 @@ export const actionAddresses = {
     CreateSub: '0x2daED8030BFC87B3d27c02E2f044B9CF4841Ff3e',
     TokenBalance: '0xC6FF5b01f7c7b35b6e093fF70D2332B361C5Be5A',
     TokenizedVaultAdapter: '0xdf31669FEd440f5BfF658ca0bBF0D22B8abdeb73',
-    ChangeProxyOwner: '0x62769258ea8b3a85cc6fb4332fc2760a122dbc9e',
+    ChangeProxyOwner: '0xf573585C38d947D8A70F7F6c83D060F1F89855AE',
     PermitToken: '0xE70c05125E7Cfe929f7ccC1baD348004aCF0f0d6',
     HandleAuth: '0x7f143607250ee51e4dce31254c8ad33ec4c2dad5',
     MerklClaim: '0xa7574a72D93D236040648b1dc80ddA3E7A4de40F',
@@ -500,7 +504,7 @@ export const actionAddresses = {
     CreateSub: '0xbFD17a0a844b75976585a382a5BcCaFC9EAd731f',
     TokenBalance: '0x483B903E702F60698Dd8124558C6199922737f1F',
     TokenizedVaultAdapter: '0xD05C512bDFf6D3eAc5328807B3bC075F35271167',
-    ChangeProxyOwner: '0x29F66A5fcB601c806E7156f29FDEC771BdC9c08d',
+    ChangeProxyOwner: '0xacf5bAD9543A98EcAcC620cF6CB989Ec88f1650D',
     PermitToken: '0x2E5E7a691092C158bb8341b936eF24FCcA6c0e00',
     HandleAuth: '0xbfcab1339e1a56a0a836cbca6457eaf71f148fcb',
     UpdateSub: '0x3511f444362F8cBd185DbF21C9488D16c1306461',
@@ -612,7 +616,7 @@ export const actionAddresses = {
     SumInputs: '0xC856ef8fe425B2EFe373e0e7038fAFF4a4f764fE',
     SubInputs: '0xd244B1991Fcb8FC0f32FA55bce37714fc5929B95',
     TokenBalance: '0xc44bcE580B1b3339fE9272D3bC3d6566083ea59C',
-    ChangeProxyOwner: '0x1947a44d3717a47556175d64fdc208619aa08874',
+    ChangeProxyOwner: '0x7b55d25BfF49Fd62563823570f47E9a35AA39541',
     PermitToken: '0x57c8ae94a5A11dA33e0518054102488b604628D0',
     HandleAuth: '0x18a90e6db79199ace00140631ef931e0bd97837c',
     ToggleSub: '0x5F16C0a08d52b67fc73706c494F7535Dd3382b58',
@@ -796,7 +800,7 @@ export const otherAddresses = {
   [NETWORKS.ethereum.chainId]: {
     RecipeExecutor: '0xbc3Fc959FeF3F12a41738f406c02198cdeE7481F',
     DFSRegistry: '0x287778F121F134C66212FB16c9b53eC991D32f5b',
-    DFSProxyRegistry: '0x29474FdaC7142f9aB7773B8e38264FA15E3805ed',
+    DFSProxyRegistry: '0x0cCB1F91beb8590949880D2a61C26C11d6280319',
     ProxyRegistry: '0x4678f0a6958e4D2Bc4F1BAF7Bc52E8F3564f3fE4',
     SFProxyEntryPoint: '0xAa15ca459659F35B1064EC546A44d962d54bA89e',
 

package/test/DfsWeb3.js

@@ -5,13 +5,15 @@ const dfs = require('../src');
 const {getIlkInfo, assetAmountInWei} = require("@defisaver/tokens");
 
 describe('DfsWeb3', () => {
+  // Current owner of previously used test proxy 0x9cCf... (ownership transferred from 0x0a80...)
+  const testAccount = '0xa9BB3c0637a9Bc10A43b6D9565A8e1C287B3d2DE';
   let dfsWeb3;
   before(async () => {
     const web3 = new Web3(process.env.RPC);
 
-    web3.eth.getAccounts = () => ['0x0a80C3C540eEF99811f4579fa7b1A0617294e06f'];
+    web3.eth.getAccounts = () => [testAccount];
     dfsWeb3 = new dfs.DfsWeb3(web3);
-    dfsWeb3.account = '0x0a80C3C540eEF99811f4579fa7b1A0617294e06f';
+    dfsWeb3.account = testAccount;
 
     await dfsWeb3.prepareAccount();
     assert.containsAllKeys(dfsWeb3, ['web3', 'account', 'proxy']);

package/test/accessLists/MockAccessLists.json

@@ -1372,19 +1372,6 @@
         [ 8, 4, 12, 3, 13, 9 ]
        ]
     ],
-    "ChangeProxyOwner": [
-       [
-        "0x32cEdFfF6e64f6cD1907Ae0b27b78c36320587E7",
-        [ 3, 11, 1, 15, 10, 8 ]
-       ],
-       [
-        "0xF8f8B3C98Cf2E63Df3041b73f80F362a4cf3A576",
-        [
-          10, 5, 8, 6,
-          13, 2, 0
-        ]
-       ]
-    ],
     "TokenBalance": [
        [
         "0xFEb82445aEaA675D59A43CD5833f5A6807f97ea2",