updates to clients initialization

src/clients/aTokensClient.ts

@@ -14,10 +14,18 @@ export class ATokensClient extends AptosContractWrapperBaseClass {
   tokensContract: TokensContract;
 
   constructor(provider: AptosProvider, signer?: Ed25519Account) {
-    super(provider, signer || provider.getATokensProfileAccount());
+    super(provider, signer);
     this.tokensContract = new TokensContract(provider);
   }
 
+  public static buildWithDefaultSigner(provider: AptosProvider): ATokensClient {
+    const client = new ATokensClient(
+      provider,
+      provider.getATokensProfileAccount(),
+    );
+    return client;
+  }
+
   public async createToken(
     maximumSupply: bigint,
     name: string,

src/clients/aclClient.ts

@@ -11,10 +11,15 @@ export class AclClient extends AptosContractWrapperBaseClass {
   AclManagerContract: AclManagerContract;
 
   constructor(provider: AptosProvider, signer?: Ed25519Account) {
-    super(provider, signer || provider.getAclProfileAccount());
+    super(provider, signer);
     this.AclManagerContract = new AclManagerContract(provider);
   }
 
+  public static buildWithDefaultSigner(provider: AptosProvider): AclClient {
+    const client = new AclClient(provider, provider.getAclProfileAccount());
+    return client;
+  }
+
   public async hasRole(role: string, user: AccountAddress): Promise<boolean> {
     const [resp] = await this.callViewMethod(
       this.AclManagerContract.hasRoleFuncAddr,

src/clients/aptosProvider.ts

@@ -381,6 +381,11 @@ export class AptosProvider {
   public getProfileAccountPrivateKeyByName(
     profileName: string,
   ): Ed25519PrivateKey {
+    if (!this.profileAccountMap.has(profileName)) {
+      throw new Error(
+        `Account "${profileName}" was not found in the profiles map`,
+      );
+    }
     return this.profileAccountMap.get(profileName);
   }
 
@@ -393,6 +398,11 @@ export class AptosProvider {
 
   /** Returns the profile address by name if found. */
   public getProfileAddressByName(profileName: string): AccountAddress {
+    if (!this.profileAddressMap.has(profileName)) {
+      throw new Error(
+        `Address of account "${profileName}" was not found in the profile addresses map`,
+      );
+    }
     return this.profileAddressMap.get(profileName);
   }
 

src/clients/baseClass.ts

@@ -95,12 +95,12 @@ async function view(
 }
 
 export class AptosContractWrapperBaseClass {
-  protected signer: Ed25519Account;
+  protected signer?: Ed25519Account;
   protected moduleSigner: Ed25519Account;
 
   protected readonly aptosProvider: AptosProvider;
 
-  constructor(aptosProvider: AptosProvider, signer: Ed25519Account) {
+  constructor(aptosProvider: AptosProvider, signer?: Ed25519Account) {
     this.aptosProvider = aptosProvider;
     this.signer = signer;
     this.moduleSigner = signer;
@@ -113,13 +113,13 @@ export class AptosContractWrapperBaseClass {
 
   /** Sets the signer. */
   public withSigner(senderAccount: Ed25519Account) {
-    this.signer = senderAccount;
+    this.setSigner(senderAccount);
     return this;
   }
 
   /** Sets the module signer. */
   public withModuleSigner() {
-    this.signer = this.moduleSigner;
+    this.setSigner(this.moduleSigner);
     return this;
   }
 

src/clients/bridgeClient.ts

@@ -11,10 +11,15 @@ export class BridgeClient extends AptosContractWrapperBaseClass {
   bridgeContract: BridgeContract;
 
   constructor(provider: AptosProvider, signer?: Ed25519Account) {
-    super(provider, signer || provider.getPoolProfileAccount());
+    super(provider, signer);
     this.bridgeContract = new BridgeContract(provider);
   }
 
+  public static buildWithDefaultSigner(provider: AptosProvider): BridgeClient {
+    const client = new BridgeClient(provider, provider.getPoolProfileAccount());
+    return client;
+  }
+
   public async backUnbacked(
     asset: AccountAddress,
     amount: bigint,

src/clients/coreClient.ts

@@ -13,10 +13,15 @@ export class CoreClient extends AptosContractWrapperBaseClass {
   supplyBorrowContract: SupplyBorrowContract;
 
   constructor(provider: AptosProvider, signer?: Ed25519Account) {
-    super(provider, signer || provider.getPoolProfileAccount());
+    super(provider, signer);
     this.supplyBorrowContract = new SupplyBorrowContract(provider);
   }
 
+  public static buildWithDefaultSigner(provider: AptosProvider): CoreClient {
+    const client = new CoreClient(provider, provider.getPoolProfileAccount());
+    return client;
+  }
+
   /// User supplies
   public async supply(
     asset: AccountAddress,

src/clients/flashloanClient.ts

@@ -11,10 +11,20 @@ export class FlashloanClient extends AptosContractWrapperBaseClass {
   flashloanContract: FlashLoanContract;
 
   constructor(provider: AptosProvider, signer?: Ed25519Account) {
-    super(provider, signer || provider.getPoolProfileAccount());
+    super(provider, signer);
     this.flashloanContract = new FlashLoanContract(provider);
   }
 
+  public static buildWithDefaultSigner(
+    provider: AptosProvider,
+  ): FlashloanClient {
+    const client = new FlashloanClient(
+      provider,
+      provider.getPoolProfileAccount(),
+    );
+    return client;
+  }
+
   public async flashloan(
     receiverAddress: AccountAddress,
     assets: Array<AccountAddress>,

src/clients/oracleClient.ts

@@ -12,10 +12,18 @@ export class OracleClient extends AptosContractWrapperBaseClass {
   oracleContract: OracleContract;
 
   constructor(provider: AptosProvider, signer?: Ed25519Account) {
-    super(provider, signer || provider.getOracleProfileAccount());
+    super(provider, signer);
     this.oracleContract = new OracleContract(provider);
   }
 
+  public static buildWithDefaultSigner(provider: AptosProvider): OracleClient {
+    const client = new OracleClient(
+      provider,
+      provider.getOracleProfileAccount(),
+    );
+    return client;
+  }
+
   public async setMock(mock: boolean): Promise<CommittedTransactionResponse> {
     return this.sendTxAndAwaitResponse(this.oracleContract.SetMockFuncAddr, [
       mock,

src/clients/poolAddressesProviderClient.ts

@@ -12,10 +12,20 @@ export class PoolAddressesProviderClient extends AptosContractWrapperBaseClass {
   poolContract: PoolContract;
 
   constructor(provider: AptosProvider, signer?: Ed25519Account) {
-    super(provider, signer || provider.getPoolProfileAccount());
+    super(provider, signer);
     this.poolContract = new PoolContract(provider);
   }
 
+  public static buildWithDefaultSigner(
+    provider: AptosProvider,
+  ): PoolAddressesProviderClient {
+    const client = new PoolAddressesProviderClient(
+      provider,
+      provider.getPoolProfileAccount(),
+    );
+    return client;
+  }
+
   public async hasIdMappedAccount(id: string): Promise<boolean> {
     const [resp] = await this.callViewMethod(
       this.poolContract.HasIdMappedAccountFuncAddr,

src/clients/poolClient.ts

@@ -86,10 +86,15 @@ export class PoolClient extends AptosContractWrapperBaseClass {
   poolContract: PoolContract;
 
   constructor(provider: AptosProvider, signer?: Ed25519Account) {
-    super(provider, signer || provider.getPoolProfileAccount());
+    super(provider, signer);
     this.poolContract = new PoolContract(provider);
   }
 
+  public static buildWithDefaultSigner(provider: AptosProvider): PoolClient {
+    const client = new PoolClient(provider, provider.getPoolProfileAccount());
+    return client;
+  }
+
   public async mintToTreasury(
     assets: Array<AccountAddress>,
   ): Promise<CommittedTransactionResponse> {

src/clients/uiIncentiveDataProvider.ts

@@ -179,12 +179,22 @@ export class UiIncentiveDataProviderClient extends AptosContractWrapperBaseClass
   uiPoolDataProviderContract: UiIncentiveDataProviderContract;
 
   constructor(provider: AptosProvider, signer?: Ed25519Account) {
-    super(provider, signer || provider.getPoolProfileAccount());
+    super(provider, signer);
     this.uiPoolDataProviderContract = new UiIncentiveDataProviderContract(
       provider,
     );
   }
 
+  public static buildWithDefaultSigner(
+    provider: AptosProvider,
+  ): UiIncentiveDataProviderClient {
+    const client = new UiIncentiveDataProviderClient(
+      provider,
+      provider.getPoolProfileAccount(),
+    );
+    return client;
+  }
+
   public async uiPoolDataProviderV3DataAddress(): Promise<AccountAddress> {
     const [resp] = await this.callViewMethod(
       this.uiPoolDataProviderContract.uiIncentiveDataProviderV3DataAddress,

src/clients/uiPoolDataProvider.ts

@@ -84,10 +84,20 @@ export class UiPoolDataProviderClient extends AptosContractWrapperBaseClass {
   uiPoolDataProviderContract: UiPoolDataProviderContract;
 
   constructor(provider: AptosProvider, signer?: Ed25519Account) {
-    super(provider, signer || provider.getPoolProfileAccount());
+    super(provider, signer);
     this.uiPoolDataProviderContract = new UiPoolDataProviderContract(provider);
   }
 
+  public static buildWithDefaultSigner(
+    provider: AptosProvider,
+  ): UiPoolDataProviderClient {
+    const client = new UiPoolDataProviderClient(
+      provider,
+      provider.getPoolProfileAccount(),
+    );
+    return client;
+  }
+
   public async uiPoolDataProviderV32DataAddress(): Promise<AccountAddress> {
     const [resp] = await this.callViewMethod(
       this.uiPoolDataProviderContract.uiPoolDataProviderV32DataAddress,

src/clients/underlyingTokensClient.ts

@@ -14,10 +14,20 @@ export class UnderlyingTokensClient extends AptosContractWrapperBaseClass {
   tokensContract: TokensContract;
 
   constructor(provider: AptosProvider, signer?: Ed25519Account) {
-    super(provider, signer || provider.getPoolProfileAccount());
+    super(provider, signer);
     this.tokensContract = new TokensContract(provider);
   }
 
+  public static buildWithDefaultSigner(
+    provider: AptosProvider,
+  ): UnderlyingTokensClient {
+    const client = new UnderlyingTokensClient(
+      provider,
+      provider.getPoolProfileAccount(),
+    );
+    return client;
+  }
+
   public async createToken(
     maximumSupply: bigint,
     name: string,

src/clients/variableTokensClient.ts

@@ -14,10 +14,20 @@ export class VariableTokensClient extends AptosContractWrapperBaseClass {
   tokensContract: TokensContract;
 
   constructor(provider: AptosProvider, signer?: Ed25519Account) {
-    super(provider, signer || provider.getPoolProfileAccount());
+    super(provider, signer);
     this.tokensContract = new TokensContract(provider);
   }
 
+  public static buildWithDefaultSigner(
+    provider: AptosProvider,
+  ): VariableTokensClient {
+    const client = new VariableTokensClient(
+      provider,
+      provider.getPoolProfileAccount(),
+    );
+    return client;
+  }
+
   public async createToken(
     maximumSupply: bigint,
     name: string,

src/contracts/oracle.ts

@@ -18,7 +18,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();