@augustdigital/sdk 4.2.6-alpha → 4.3.0

package/lib/abis/WrapperAdapter.d.ts

@@ -1,60 +1,71 @@
-export declare const WRAPPER_ADAPTER_ABI: ({
-    inputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    stateMutability: string;
-    type: string;
-    name?: undefined;
-    anonymous?: undefined;
-    outputs?: undefined;
-} | {
-    inputs: any[];
-    name: string;
-    type: string;
-    stateMutability?: undefined;
-    anonymous?: undefined;
-    outputs?: undefined;
-} | {
-    anonymous: boolean;
-    inputs: {
-        indexed: boolean;
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    type: string;
-    stateMutability?: undefined;
-    outputs?: undefined;
-} | {
-    inputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    outputs: any[];
-    stateMutability: string;
-    type: string;
-    anonymous?: undefined;
-} | {
-    inputs: any[];
-    name: string;
-    outputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    stateMutability: string;
-    type: string;
-    anonymous?: undefined;
-} | {
-    stateMutability: string;
-    type: string;
-    inputs?: undefined;
-    name?: undefined;
-    anonymous?: undefined;
-    outputs?: undefined;
-})[];
+export declare const ABI_WRAPPER_ADAPTER: readonly [{
+    readonly inputs: readonly [{
+        readonly internalType: "address";
+        readonly name: "referralId";
+        readonly type: "address";
+    }];
+    readonly name: "depositETH";
+    readonly outputs: readonly [];
+    readonly stateMutability: "payable";
+    readonly type: "function";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "uint256";
+        readonly name: "amount";
+        readonly type: "uint256";
+    }, {
+        readonly internalType: "address";
+        readonly name: "referralId";
+        readonly type: "address";
+    }];
+    readonly name: "depositWETH";
+    readonly outputs: readonly [];
+    readonly stateMutability: "nonpayable";
+    readonly type: "function";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "address";
+        readonly name: "referralId";
+        readonly type: "address";
+    }];
+    readonly name: "getRSETHWithETH";
+    readonly outputs: readonly [];
+    readonly stateMutability: "payable";
+    readonly type: "function";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "address";
+        readonly name: "asset";
+        readonly type: "address";
+    }, {
+        readonly internalType: "uint256";
+        readonly name: "depositAmount";
+        readonly type: "uint256";
+    }, {
+        readonly internalType: "string";
+        readonly name: "referralId";
+        readonly type: "string";
+    }];
+    readonly name: "getRSETHWithERC20";
+    readonly outputs: readonly [];
+    readonly stateMutability: "nonpayable";
+    readonly type: "function";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "address";
+        readonly name: "asset";
+        readonly type: "address";
+    }, {
+        readonly internalType: "uint256";
+        readonly name: "depositAmount";
+        readonly type: "uint256";
+    }];
+    readonly name: "getRsETHAmountToMint";
+    readonly outputs: readonly [{
+        readonly internalType: "uint256";
+        readonly name: "rsETHAmount";
+        readonly type: "uint256";
+    }];
+    readonly stateMutability: "view";
+    readonly type: "function";
+}];

package/lib/abis/WrapperAdapter.js

@@ -1,63 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WRAPPER_ADAPTER_ABI = void 0;
-exports.WRAPPER_ADAPTER_ABI = [
-    {
-        inputs: [
-            { internalType: 'address', name: 'ownerAddr', type: 'address' },
-            { internalType: 'contract IWETH', name: '_weth', type: 'address' },
-            { internalType: 'contract IERC4626', name: '_vault', type: 'address' },
-            { internalType: 'contract ISTETH', name: '_stEth', type: 'address' },
-            { internalType: 'contract IWSTETH', name: '_wstEth', type: 'address' },
-        ],
-        stateMutability: 'nonpayable',
-        type: 'constructor',
-    },
-    { inputs: [], name: 'CallFailed', type: 'error' },
-    { inputs: [], name: 'InsufficientBalance', type: 'error' },
-    { inputs: [], name: 'OwnerOnly', type: 'error' },
-    { inputs: [], name: 'ReentrantCall', type: 'error' },
-    { inputs: [], name: 'ZeroAddress', type: 'error' },
-    { inputs: [], name: 'ZeroAmount', type: 'error' },
-    {
-        anonymous: false,
-        inputs: [
-            { indexed: true, internalType: 'address', name: 'user', type: 'address' },
-            {
-                indexed: false,
-                internalType: 'uint256',
-                name: 'amount',
-                type: 'uint256',
-            },
-            {
-                indexed: false,
-                internalType: 'address',
-                name: 'referralId',
-                type: 'address',
-            },
-        ],
-        name: 'Deposit',
-        type: 'event',
-    },
-    {
-        anonymous: false,
-        inputs: [
-            {
-                indexed: true,
-                internalType: 'address',
-                name: 'previousOwner',
-                type: 'address',
-            },
-            {
-                indexed: true,
-                internalType: 'address',
-                name: 'newOwner',
-                type: 'address',
-            },
-        ],
-        name: 'OwnershipTransferred',
-        type: 'event',
-    },
+exports.ABI_WRAPPER_ADAPTER = void 0;
+exports.ABI_WRAPPER_ADAPTER = [
     {
         inputs: [{ internalType: 'address', name: 'referralId', type: 'address' }],
         name: 'depositETH',
@@ -76,75 +20,58 @@ exports.WRAPPER_ADAPTER_ABI = [
         type: 'function',
     },
     {
-        inputs: [
-            { internalType: 'contract IERC20', name: 'token', type: 'address' },
-        ],
-        name: 'emergencyWithdraw',
-        outputs: [],
-        stateMutability: 'nonpayable',
-        type: 'function',
-    },
-    {
-        inputs: [],
-        name: 'emergencyWithdrawETH',
+        inputs: [{ internalType: 'address', name: 'referralId', type: 'address' }],
+        name: 'getRSETHWithETH',
         outputs: [],
-        stateMutability: 'nonpayable',
-        type: 'function',
-    },
-    {
-        inputs: [],
-        name: 'owner',
-        outputs: [{ internalType: 'address', name: '', type: 'address' }],
-        stateMutability: 'view',
+        stateMutability: 'payable',
         type: 'function',
     },
     {
         inputs: [
-            { internalType: 'contract IWETH', name: '_weth', type: 'address' },
-            { internalType: 'contract IERC4626', name: '_vault', type: 'address' },
-            { internalType: 'contract ISTETH', name: '_stEth', type: 'address' },
-            { internalType: 'contract IWSTETH', name: '_wstEth', type: 'address' },
+            {
+                internalType: 'address',
+                name: 'asset',
+                type: 'address',
+            },
+            {
+                internalType: 'uint256',
+                name: 'depositAmount',
+                type: 'uint256',
+            },
+            {
+                internalType: 'string',
+                name: 'referralId',
+                type: 'string',
+            },
         ],
-        name: 'resetAdapter',
+        name: 'getRSETHWithERC20',
         outputs: [],
         stateMutability: 'nonpayable',
         type: 'function',
     },
     {
-        inputs: [],
-        name: 'stEth',
-        outputs: [{ internalType: 'contract ISTETH', name: '', type: 'address' }],
-        stateMutability: 'view',
-        type: 'function',
-    },
-    {
-        inputs: [{ internalType: 'address', name: 'newOwner', type: 'address' }],
-        name: 'transferOwnership',
-        outputs: [],
-        stateMutability: 'nonpayable',
-        type: 'function',
-    },
-    {
-        inputs: [],
-        name: 'vault',
-        outputs: [{ internalType: 'contract IERC4626', name: '', type: 'address' }],
-        stateMutability: 'view',
-        type: 'function',
-    },
-    {
-        inputs: [],
-        name: 'weth',
-        outputs: [{ internalType: 'contract IWETH', name: '', type: 'address' }],
-        stateMutability: 'view',
-        type: 'function',
-    },
-    {
-        inputs: [],
-        name: 'wstEth',
-        outputs: [{ internalType: 'contract IWSTETH', name: '', type: 'address' }],
+        inputs: [
+            {
+                internalType: 'address',
+                name: 'asset',
+                type: 'address',
+            },
+            {
+                internalType: 'uint256',
+                name: 'depositAmount',
+                type: 'uint256',
+            },
+        ],
+        name: 'getRsETHAmountToMint',
+        outputs: [
+            {
+                internalType: 'uint256',
+                name: 'rsETHAmount',
+                type: 'uint256',
+            },
+        ],
         stateMutability: 'view',
         type: 'function',
     },
-    { stateMutability: 'payable', type: 'receive' },
 ];
 //# sourceMappingURL=WrapperAdapter.js.map

package/lib/abis/WrapperAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"WrapperAdapter.js","sourceRoot":"","sources":["../../src.ts/abis/WrapperAdapter.ts"],"names":[],"mappings":";;;AAAa,QAAA,mBAAmB,GAAG;IACjC;QACE,MAAM,EAAE;YACN,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;YAC/D,EAAE,YAAY,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;YAClE,EAAE,YAAY,EAAE,mBAAmB,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;YACtE,EAAE,YAAY,EAAE,iBAAiB,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;YACpE,EAAE,YAAY,EAAE,kBAAkB,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;SACvE;QACD,eAAe,EAAE,YAAY;QAC7B,IAAI,EAAE,aAAa;KACpB;IACD,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE;IACjD,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAE,OAAO,EAAE;IAC1D,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE;IAChD,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE;IACpD,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE;IAClD,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE;IACjD;QACE,SAAS,EAAE,KAAK;QAChB,MAAM,EAAE;YACN,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;YACzE;gBACE,OAAO,EAAE,KAAK;gBACd,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,OAAO,EAAE,KAAK;gBACd,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,SAAS;aAChB;SACF;QACD,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,OAAO;KACd;IACD;QACE,SAAS,EAAE,KAAK;QAChB,MAAM,EAAE;YACN;gBACE,OAAO,EAAE,IAAI;gBACb,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,eAAe;gBACrB,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,OAAO,EAAE,IAAI;gBACb,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,SAAS;aAChB;SACF;QACD,IAAI,EAAE,sBAAsB;QAC5B,IAAI,EAAE,OAAO;KACd;IACD;QACE,MAAM,EAAE,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC1E,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,SAAS;QAC1B,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE;YACN,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;YAC5D,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE;SACjE;QACD,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;QAC7B,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE;YACN,EAAE,YAAY,EAAE,iBAAiB,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;SACpE;QACD,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;QAC7B,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;QAC7B,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QACjE,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE;YACN,EAAE,YAAY,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;YAClE,EAAE,YAAY,EAAE,mBAAmB,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;YACtE,EAAE,YAAY,EAAE,iBAAiB,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;YACpE,EAAE,YAAY,EAAE,kBAAkB,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;SACvE;QACD,IAAI,EAAE,cAAc;QACpB,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;QAC7B,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,CAAC,EAAE,YAAY,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QACzE,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QACxE,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;QAC7B,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,CAAC,EAAE,YAAY,EAAE,mBAAmB,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC3E,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,CAAC,EAAE,YAAY,EAAE,gBAAgB,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QACxE,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,CAAC,EAAE,YAAY,EAAE,kBAAkB,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC1E,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;IACD,EAAE,eAAe,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;CAChD,CAAC"}
+{"version":3,"file":"WrapperAdapter.js","sourceRoot":"","sources":["../../src.ts/abis/WrapperAdapter.ts"],"names":[],"mappings":";;;AAAa,QAAA,mBAAmB,GAAG;IACjC;QACE,MAAM,EAAE,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC1E,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,SAAS;QAC1B,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE;YACN,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;YAC5D,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE;SACjE;QACD,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;QAC7B,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC1E,IAAI,EAAE,iBAAiB;QACvB,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,SAAS;QAC1B,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE;YACN;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,eAAe;gBACrB,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,YAAY,EAAE,QAAQ;gBACtB,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,QAAQ;aACf;SACF;QACD,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;QAC7B,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE;YACN;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,eAAe;gBACrB,IAAI,EAAE,SAAS;aAChB;SACF;QACD,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE;YACP;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,SAAS;aAChB;SACF;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;CACO,CAAC"}

package/lib/adapters/evm/getters.d.ts

@@ -1,4 +1,4 @@
-import { IVaultBaseOptions } from '../../modules/vaults';
 import { ITokenizedVault } from '../../types';
+import { IVaultBaseOptions } from '../../modules/vaults';
 export declare const getEvmVaultV1: (tokenizedVault: ITokenizedVault, options: IVaultBaseOptions) => Promise<import("../../types").IVault>;
 export declare const getEvmVaultV2: (tokenizedVault: ITokenizedVault, options: IVaultBaseOptions) => Promise<import("../../types").IVault>;

package/lib/adapters/evm/getters.js

@@ -3,30 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEvmVaultV2 = exports.getEvmVaultV1 = void 0;
 const abis_1 = require("../../abis");
 const core_1 = require("../../core");
-const vaults_1 = require("../../modules/vaults");
 const utils_1 = require("../../modules/vaults/utils");
 const TokenizedVaultV2_1 = require("../../abis/TokenizedVaultV2");
 const TokenizedVaultV2Receipt_1 = require("../../abis/TokenizedVaultV2Receipt");
 const TokenizedVaultV2WhitelistedAssets_1 = require("../../abis/TokenizedVaultV2WhitelistedAssets");
 const getEvmVaultV1 = async (tokenizedVault, options) => {
-    const provider = (0, core_1.createProvider)(options.rpcUrl);
     const vault = tokenizedVault.address;
     if (!vault) {
         throw new Error('Vault address is undefined');
     }
     if (tokenizedVault.status === 'closed' &&
         tokenizedVault.is_visible === false) {
-        console.log('#getVault::closed:', tokenizedVault.vault_name);
+        core_1.Logger.log.warn('getEvmVaultV1', `closed: ${tokenizedVault.vault_name}`);
         return null;
     }
+    const provider = (0, core_1.createProvider)(options.rpcUrl);
     const vaultContract = (0, core_1.createContract)({
         address: vault,
         abi: abis_1.ABI_LENDING_POOL_V2,
         provider,
     });
-    const vaultContractCalls = await Promise.all(vaults_1.VAULT_FUNCTIONS_V1.map((f) => {
+    const vaultContractCalls = await Promise.all(core_1.VAULT_FUNCTIONS_V1.map((f) => {
         if ((f === 'totalSupply' || f === 'totalAssets') &&
-            vaults_1.MULTI_ASSET_VAULTS.includes(vault)) {
+            core_1.MULTI_ASSET_VAULTS.includes(vault)) {
             return 0;
         }
         if (f === 'symbol') {
@@ -39,28 +38,28 @@ const getEvmVaultV1 = async (tokenizedVault, options) => {
     }));
     const formattedContractCalls = vaultContractCalls.reduce((acc, curr, i) => {
         let val;
-        if (vaults_1.VAULT_FUNCTIONS_V1[i] === 'totalSupply' ||
-            vaults_1.VAULT_FUNCTIONS_V1[i] === 'totalAssets' ||
-            vaults_1.VAULT_FUNCTIONS_V1[i] === 'globalLoansAmount' ||
-            vaults_1.VAULT_FUNCTIONS_V1[i] === 'maxSupply') {
+        if (core_1.VAULT_FUNCTIONS_V1[i] === 'totalSupply' ||
+            core_1.VAULT_FUNCTIONS_V1[i] === 'totalAssets' ||
+            core_1.VAULT_FUNCTIONS_V1[i] === 'globalLoansAmount' ||
+            core_1.VAULT_FUNCTIONS_V1[i] === 'maxSupply') {
             val = (0, core_1.toNormalizedBn)(curr, vaultContractCalls[0]);
         }
-        else if (vaults_1.VAULT_FUNCTIONS_V1[i] === 'getTotalLoansDeployed') {
+        else if (core_1.VAULT_FUNCTIONS_V1[i] === 'getTotalLoansDeployed') {
             val = (0, core_1.toNormalizedBn)(curr, 0);
         }
-        else if (vaults_1.VAULT_FUNCTIONS_V1[i] === 'withdrawalFee') {
+        else if (core_1.VAULT_FUNCTIONS_V1[i] === 'withdrawalFee') {
             val = (0, core_1.toNormalizedBn)(curr, 2);
         }
-        else if (vaults_1.VAULT_FUNCTIONS_V1[i] === 'decimals') {
+        else if (core_1.VAULT_FUNCTIONS_V1[i] === 'decimals') {
             val = Number(curr.toString());
         }
-        else if (vaults_1.VAULT_FUNCTIONS_V1[i] === 'loansOperator') {
+        else if (core_1.VAULT_FUNCTIONS_V1[i] === 'loansOperator') {
             val = '0x4DCb388488622e47683EAd1a147947140a31e485';
         }
         else {
             val = curr;
         }
-        return { ...acc, [vaults_1.VAULT_FUNCTIONS_V1[i]]: val };
+        return { ...acc, [core_1.VAULT_FUNCTIONS_V1[i]]: val };
     }, {});
     const returnObj = await (0, utils_1.buildFormattedVault)(provider, tokenizedVault, formattedContractCalls);
     return returnObj;
@@ -74,7 +73,7 @@ const getEvmVaultV2 = async (tokenizedVault, options) => {
     }
     if (tokenizedVault.status === 'closed' &&
         tokenizedVault.is_visible === false) {
-        console.log('#getVault::closed:', tokenizedVault.vault_name);
+        core_1.Logger.log.warn('getEvmVaultV2', `closed: ${tokenizedVault.vault_name}`);
         return null;
     }
     const vaultContract = (0, core_1.createContract)({
@@ -82,16 +81,16 @@ const getEvmVaultV2 = async (tokenizedVault, options) => {
         abi: TokenizedVaultV2_1.ABI_TOKENIZED_VAULT_V2,
         provider,
     });
-    const vaultContractCalls = await Promise.all(vaults_1.VAULT_FUNCTIONS_V2.map((f) => {
+    const vaultContractCalls = await Promise.all(core_1.VAULT_FUNCTIONS_V2.map((f) => {
         return vaultContract[f]();
     }));
-    const receiptAddress = vaultContractCalls[vaults_1.VAULT_FUNCTIONS_V2.length - 1];
+    const receiptAddress = vaultContractCalls[core_1.VAULT_FUNCTIONS_V2.length - 1];
     const reciptContract = (0, core_1.createContract)({
         address: receiptAddress,
         abi: TokenizedVaultV2Receipt_1.ABI_TOKENIZED_VAULT_V2_RECEIPT,
         provider,
     });
-    const receiptContractCalls = await Promise.all(vaults_1.VAULT_FUNCTIONS_V2_RECEIPT.map((f) => {
+    const receiptContractCalls = await Promise.all(core_1.VAULT_FUNCTIONS_V2_RECEIPT.map((f) => {
         if (f === 'symbol') {
             return (0, core_1.getSymbol)(provider, receiptAddress);
         }
@@ -106,7 +105,7 @@ const getEvmVaultV2 = async (tokenizedVault, options) => {
         abi: TokenizedVaultV2WhitelistedAssets_1.ABI_TOKENIZED_VAULT_V2_WHITELISTED_ASSETS,
         provider,
     });
-    const whitelistedAssetsContractCalls = await Promise.all(vaults_1.VAULT_FUNCTIONS_V2_WHITELISTED_ASSETS.map((f) => {
+    const whitelistedAssetsContractCalls = await Promise.all(core_1.VAULT_FUNCTIONS_V2_WHITELISTED_ASSETS.map((f) => {
         return whitelistedAssetsContract[f]();
     }));
     const combinedCalls = [
@@ -115,9 +114,9 @@ const getEvmVaultV2 = async (tokenizedVault, options) => {
         ...whitelistedAssetsContractCalls,
     ];
     const combinedFunctions = [
-        ...vaults_1.VAULT_FUNCTIONS_V2,
-        ...vaults_1.VAULT_FUNCTIONS_V2_RECEIPT,
-        ...vaults_1.VAULT_FUNCTIONS_V2_WHITELISTED_ASSETS,
+        ...core_1.VAULT_FUNCTIONS_V2,
+        ...core_1.VAULT_FUNCTIONS_V2_RECEIPT,
+        ...core_1.VAULT_FUNCTIONS_V2_WHITELISTED_ASSETS,
     ];
     const formattedContractCalls = combinedCalls.reduce((acc, curr, i) => {
         let val;

package/lib/adapters/evm/getters.js.map

@@ -1 +1 @@
-{"version":3,"file":"getters.js","sourceRoot":"","sources":["../../../src.ts/adapters/evm/getters.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getters.js","sourceRoot":"","sources":["../../../src.ts/adapters/evm/getters.ts"],"names":[],"mappings":"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"}

package/lib/adapters/evm/index.d.ts

@@ -1,10 +1,12 @@
-import { Signer, Wallet } from 'ethers';
 import { IContractWriteOptions } from '../../modules/vaults/write.actions';
+import { CompatibleSigner } from '../../core/helpers.signer';
 export * from './getters';
 declare class EVMAdapter {
     private signer?;
-    constructor(signer?: Signer | Wallet);
-    setSigner(signer: Signer | Wallet): void;
+    private rawSigner?;
+    constructor(signer?: CompatibleSigner);
+    setSigner(signer: CompatibleSigner): void;
+    private getSigner;
     vaultApprove(options: IContractWriteOptions): Promise<string>;
     vaultAllowance(options: IContractWriteOptions): Promise<import("../..").INormalizedNumber>;
     vaultDeposit(options: IContractWriteOptions): Promise<string>;

package/lib/adapters/evm/index.js

@@ -16,38 +16,45 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const write_actions_1 = require("../../modules/vaults/write.actions");
 const read_actions_1 = require("../../modules/vaults/read.actions");
+const helpers_signer_1 = require("../../core/helpers.signer");
 __exportStar(require("./getters"), exports);
 class EVMAdapter {
     constructor(signer) {
-        this.signer = signer;
+        this.rawSigner = signer;
     }
     setSigner(signer) {
-        this.signer = signer;
+        this.rawSigner = signer;
+        this.signer = undefined;
     }
-    async vaultApprove(options) {
-        if (!this.signer)
+    async getSigner() {
+        if (!this.rawSigner) {
             throw new Error('No signer provided');
-        return (0, write_actions_1.vaultApprove)(this.signer, options);
+        }
+        if (this.signer) {
+            return this.signer;
+        }
+        this.signer = await (0, helpers_signer_1.normalizeSigner)(this.rawSigner);
+        return this.signer;
+    }
+    async vaultApprove(options) {
+        const signer = await this.getSigner();
+        return (0, write_actions_1.vaultApprove)(signer, options);
     }
     async vaultAllowance(options) {
-        if (!this.signer)
-            throw new Error('No signer provided');
-        return (0, read_actions_1.vaultAllowance)(this.signer, options);
+        const signer = await this.getSigner();
+        return (0, read_actions_1.vaultAllowance)(signer, options);
     }
     async vaultDeposit(options) {
-        if (!this.signer)
-            throw new Error('No signer provided');
-        return (0, write_actions_1.vaultDeposit)(this.signer, options);
+        const signer = await this.getSigner();
+        return (0, write_actions_1.vaultDeposit)(signer, options);
     }
     async vaultRequestRedeem(options) {
-        if (!this.signer)
-            throw new Error('No signer provided');
-        return (0, write_actions_1.vaultRequestRedeem)(this.signer, options);
+        const signer = await this.getSigner();
+        return (0, write_actions_1.vaultRequestRedeem)(signer, options);
     }
     async vaultRedeem(options) {
-        if (!this.signer)
-            throw new Error('No signer provided');
-        return (0, write_actions_1.vaultRedeem)(this.signer, options);
+        const signer = await this.getSigner();
+        return (0, write_actions_1.vaultRedeem)(signer, options);
     }
 }
 exports.default = EVMAdapter;

package/lib/adapters/evm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src.ts/adapters/evm/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,sEAM4C;AAC5C,oEAAmE;AAEnE,4CAA0B;AAE1B,MAAM,UAAU;IAGd,YAAY,MAAwB;QAClC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,SAAS,CAAC,MAAuB;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAGD,KAAK,CAAC,YAAY,CAAC,OAA8B;QAC/C,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACxD,OAAO,IAAA,4BAAY,EAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAA8B;QACjD,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACxD,OAAO,IAAA,6BAAc,EAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;IAGD,KAAK,CAAC,YAAY,CAAC,OAA8B;QAC/C,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACxD,OAAO,IAAA,4BAAY,EAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,OAA8B;QACrD,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACxD,OAAO,IAAA,kCAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,WAAW,CACf,OAKC;QAED,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACxD,OAAO,IAAA,2BAAW,EAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;CACF;AAED,kBAAe,UAAU,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src.ts/adapters/evm/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,sEAM4C;AAC5C,oEAAmE;AACnE,8DAA8E;AAE9E,4CAA0B;AAM1B,MAAM,UAAU;IAId,YAAY,MAAyB;QACnC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC;IAE1B,CAAC;IAMD,SAAS,CAAC,MAAwB;QAChC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC1B,CAAC;IAMO,KAAK,CAAC,SAAS;QACrB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACxC,CAAC;QAGD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;QAGD,IAAI,CAAC,MAAM,GAAG,MAAM,IAAA,gCAAe,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAGD,KAAK,CAAC,YAAY,CAAC,OAA8B;QAC/C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,OAAO,IAAA,4BAAY,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAA8B;QACjD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,OAAO,IAAA,6BAAc,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAGD,KAAK,CAAC,YAAY,CAAC,OAA8B;QAC/C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,OAAO,IAAA,4BAAY,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,OAA8B;QACrD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,OAAO,IAAA,kCAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,WAAW,CACf,OAKC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,OAAO,IAAA,2BAAW,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,CAAC;CACF;AAED,kBAAe,UAAU,CAAC"}

package/lib/adapters/solana/getters.js

@@ -16,7 +16,7 @@ const getSolanaVault = async (tokenizedVault, options) => {
         depositMint = await _1.Solana.utils.getToken({
             mintAddress: vaultState.vaultState.depositMint,
             endpoint: solanaRpcUrl,
-            connection: options?.solanaService.connection,
+            connection: options?.solanaService?.connection,
         });
     }
     const apy = {
@@ -34,7 +34,7 @@ const getSolanaVault = async (tokenizedVault, options) => {
         if (shareMintAccountInfo?.value) {
             const parsedData = shareMintAccountInfo.value.data;
             const { supply, decimals } = parsedData.parsed.info;
-            totalSupply = (0, core_1.toNormalizedBn)(supply, decimals);
+            totalSupply = (0, core_1.toNormalizedBn)(BigInt(supply), decimals);
         }
     }
     catch (error) {
@@ -63,17 +63,17 @@ const getSolanaVault = async (tokenizedVault, options) => {
         symbol: tokenizedVault?.receipt_token_symbol || 'upSOL',
         description: tokenizedVault?.description || 'Description here',
         startDatetime: new Date(tokenizedVault?.start_datetime).toISOString(),
-        status: 'active',
+        status: tokenizedVault.status,
         tags: [tokenizedVault?.public_type || 'Defi Yield'],
         version: 'sol-0',
         isFeatured: tokenizedVault?.is_featured || false,
-        isVisible: tokenizedVault?.is_visible || true,
+        isVisible: tokenizedVault?.is_visible || false,
         reserveTarget: tokenizedVault?.reserve_target || 0,
         reserveTolerance: tokenizedVault?.reserve_tolerance || 0,
         decimals: vaultState.depositMintDecimals || 0,
         totalAssets: totalAssets,
         totalSupply: totalSupply,
-        maxSupply: (0, core_1.toNormalizedBn)(1000000000000),
+        maxSupply: (0, core_1.toNormalizedBn)(1000000000),
         apy: apy,
         rewards: {
             points: '0',
@@ -121,13 +121,11 @@ const getSolanaVault = async (tokenizedVault, options) => {
             redeemable: (0, core_1.toNormalizedBn)(0),
             walletBalance: (0, core_1.toNormalizedBn)(0),
         },
-        strategists: [
-            {
-                address: '0xE926502EdBcE3d56A409ef5dA352B5b522542D7c',
-                logo: '/img/strategist/august.svg',
-                name: 'August',
-            },
-        ],
+        strategists: tokenizedVault.subaccounts?.map((s) => ({
+            address: s.address,
+            logo: s.strategist?.strategist_logo,
+            name: s.strategist?.strategist_name,
+        })),
     };
     return returnObj;
 };