Merge pull request #2 from aave/feat/sdk-fixes

Feat/sdk fixes

.gitignore

@@ -69,8 +69,10 @@ bundle.*
 # docs files
 docs
 
+
 #.env files
 .env
 
 # Misc
 .DS_Store
+

.prettierrc

@@ -0,0 +1 @@
+{}

package.json

@@ -12,8 +12,11 @@
         "clean-dist": "rimraf dist/*",
         "build-esm": "tsc --project tsconfig.esm.json",
         "build-commonjs": "tsc --project tsconfig.commonjs.json",
+        "build-esm:watch": "tsc --project tsconfig.esm.json --watch",
+        "build-commonjs:watch": "tsc --project tsconfig.commonjs.json --watch",
         "build-bundle": "webpack",
         "build": "npm-run-all clean-dist build-*",
+        "dev": "run-p build-commonjs:watch build-esm:watch",
         "update-version-major": "pnpm version major",
         "update-version-minor": "pnpm version minor",
         "update-version-patch": "pnpm version patch",

src/clients/aptosProvider.ts

@@ -8,6 +8,7 @@ import {
   Ed25519Account,
 } from "@aptos-labs/ts-sdk";
 import YAML from "yaml";
+import { map } from "yaml/dist/schema/common/map";
 
 export interface AptosProviderConfig {
   network: Network;
@@ -62,8 +63,8 @@ export class AptosProvider {
 
   private oracleUrl: string;
 
-  private profileAddressMap: Map<string, AccountAddress> = new Map();
-  private profileAccountMap: Map<string, Ed25519PrivateKey> = new Map();
+  private profileAddressMap = new Map<string, AccountAddress>();
+  private profileAccountMap = new Map<string, Ed25519PrivateKey>();
 
   private aptos: Aptos;
 
@@ -386,9 +387,13 @@ export class AptosProvider {
 
   /** Returns the profile private key by name if found. */
   public getProfileAccountByName(profileName: string): Ed25519Account {
-    return Account.fromPrivateKey({
-      privateKey: this.getProfileAccountPrivateKeyByName(profileName),
-    });
+    const profileAccount = this.getProfileAccountPrivateKeyByName(profileName);
+    if (profileAccount) {
+      return Account.fromPrivateKey({
+        privateKey: this.getProfileAccountPrivateKeyByName(profileName),
+      });
+    }
+    return undefined;
   }
 
   /** Returns the profile address by name if found. */

src/clients/uiPoolDataProvider.ts

@@ -68,6 +68,7 @@ export type UserReserveData = {
   scaledATokenBalance: bigint;
   usageAsCollateralEnabledOnUser: boolean;
   scaledVariableDebt: bigint;
+  decimals: number;
 };
 
 export type ReservesData = {
@@ -211,6 +212,7 @@ export class UiPoolDataProviderClient extends AptosContractWrapperBaseClass {
           usageAsCollateralEnabledOnUser:
             item.usage_as_collateral_enabled_on_user as boolean,
           scaledVariableDebt: BigInt(item.scaled_variable_debt),
+          decimals: Number(item.decimals.toString()),
         }) as UserReserveData,
     );
 

src/contracts/acl_manage.ts

@@ -70,7 +70,7 @@ export class AclManagerContract {
   setRoleAdmin: MoveFunctionId;
 
   constructor(provider: AptosProvider) {
-    const AclManager = provider.getProfileAccountByName(AAVE_PROFILES.AAVE_ACL);
+    const AclManager = provider.getProfileAddressByName(AAVE_PROFILES.AAVE_ACL);
     const AclManagerAccountAddress = AclManager.toString();
     this.hasRoleFuncAddr = `${AclManagerAccountAddress}::acl_manage::has_role`;
     this.grantRoleFuncAddr = `${AclManagerAccountAddress}::acl_manage::grant_role`;

src/contracts/bridge.ts

@@ -8,7 +8,7 @@ export class BridgeContract {
   BackUnbackedFuncAddr: MoveFunctionId;
 
   constructor(provider: AptosProvider) {
-    const BridgeManager = provider.getProfileAccountByName(
+    const BridgeManager = provider.getProfileAddressByName(
       AAVE_PROFILES.AAVE_POOL,
     );
     const BridgeManagerAccountAddress = BridgeManager.toString();

src/contracts/flashloan.ts

@@ -12,7 +12,7 @@ export class FlashLoanContract {
   PayFlashLoanSimpleFuncAddr: MoveFunctionId;
 
   constructor(provider: AptosProvider) {
-    const FlashLoanManager = provider.getProfileAccountByName(
+    const FlashLoanManager = provider.getProfileAddressByName(
       AAVE_PROFILES.AAVE_POOL,
     );
     const FlashLoanManagerAccountAddress = FlashLoanManager.toString();

src/contracts/oracle.ts

@@ -16,7 +16,7 @@ export class OracleContract {
   GetGracePeriodFuncAddr: MoveFunctionId;
 
   constructor(provider: AptosProvider) {
-    const OracleManager = provider.getProfileAccountByName(
+    const OracleManager = provider.getProfileAddressByName(
       AAVE_PROFILES.AAVE_MOCK_ORACLE,
     );
     const OracleManagerAccountAddress = OracleManager.toString();

src/contracts/pool.ts

@@ -247,7 +247,7 @@ export class PoolContract {
   SetPoolDataProviderFuncAddr: MoveFunctionId;
 
   constructor(provider: AptosProvider) {
-    const PoolManager = provider.getProfileAccountByName(
+    const PoolManager = provider.getProfileAddressByName(
       AAVE_PROFILES.AAVE_POOL,
     );
     const PoolManagerAccountAddress = PoolManager.toString();

src/contracts/supply_borrow.ts

@@ -32,7 +32,7 @@ export class SupplyBorrowContract {
   GetUserAccountDataFuncAddr: MoveFunctionId;
 
   constructor(provider: AptosProvider) {
-    const SupplyBorrowManager = provider.getProfileAccountByName(
+    const SupplyBorrowManager = provider.getProfileAddressByName(
       AAVE_PROFILES.AAVE_POOL,
     );
     const SupplyBorrowManagerAccountAddress = SupplyBorrowManager.toString();

src/contracts/tokens.ts

@@ -90,7 +90,7 @@ export class TokensContract {
 
   constructor(provider: AptosProvider) {
     // Underlying Token
-    const AaveTokensManager = provider.getProfileAccountByName(
+    const AaveTokensManager = provider.getProfileAddressByName(
       AAVE_PROFILES.AAVE_POOL,
     );
     const AaveTokensManagerAccountAddress = AaveTokensManager.toString();

src/contracts/uiIncentiveDataProvider.ts

@@ -21,7 +21,7 @@ export class UiIncentiveDataProviderContract {
   getUserReservesIncentivesData: MoveFunctionId;
 
   constructor(provider: AptosProvider) {
-    const PeripheryManager = provider.getProfileAccountByName(
+    const PeripheryManager = provider.getProfileAddressByName(
       AAVE_PROFILES.AAVE_POOL,
     );
     const PeripheryManagerAccountAddress = PeripheryManager.toString();

src/contracts/uiPoolDataProvider.ts

@@ -21,7 +21,7 @@ export class UiPoolDataProviderContract {
   getUserReservesData: MoveFunctionId;
 
   constructor(provider: AptosProvider) {
-    const PeripheryManager = provider.getProfileAccountByName(
+    const PeripheryManager = provider.getProfileAddressByName(
       AAVE_PROFILES.AAVE_POOL,
     );
     const PeripheryManagerAccountAddress = PeripheryManager.toString();

tsconfig.json

@@ -21,7 +21,6 @@
         "noImplicitAny": false,
         "noImplicitThis": false,
         "skipLibCheck": true,
-        "strictNullChecks": false,
         "downlevelIteration": true,
         "esModuleInterop": true,
         "outDir": "dist",