fix(contracts): add configuration view method and update types

ar-io · Mar 22, 2024 · 4fae4a2 · 4fae4a2
1 parent 1bdcfeb
commit 4fae4a2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/src/common/ant.ts b/src/common/ant.ts
@@ -47,8 +47,9 @@ export class ANT implements ANTContract, BaseContract<ANTState> {
   connect(signer: ContractSigner): this {
     this.signer = signer;
     if (this.contract instanceof RemoteContract) {
+      const config = this.contract.configuration();
       this.contract = new WarpContract<ANTState>({
-        contractTxId: this.contract.contractTxId,
+        ...config,
         signer,
       });
     }

diff --git a/src/common/ar-io.ts b/src/common/ar-io.ts
@@ -64,8 +64,9 @@ export class ArIO implements ArIOContract, BaseContract<ArIOState> {
   connect(signer: ContractSigner): this {
     this.signer = signer;
     if (this.contract instanceof RemoteContract) {
+      const config = this.contract.configuration();
       this.contract = new WarpContract<ArIOState>({
-        contractTxId: this.contract.contractTxId,
+        ...config,
         signer,
       });
     }

diff --git a/src/common/contracts/remote-contract.ts b/src/common/contracts/remote-contract.ts
@@ -16,6 +16,7 @@
  */
 import {
   BaseContract,
+  ContractConfiguration,
   ContractSigner,
   EvaluationParameters,
   HTTPClient,
@@ -29,7 +30,7 @@ import { DefaultLogger } from '../logger.js';
 export class RemoteContract<T> implements BaseContract<T>, ReadContract {
   private logger: Logger;
   private http: HTTPClient;
-  public readonly contractTxId: string;
+  private contractTxId: string;
 
   constructor({
     url = 'https://api.arns.app',
@@ -47,6 +48,12 @@ export class RemoteContract<T> implements BaseContract<T>, ReadContract {
     });
   }
 
+  configuration(): { contractTxId: string } {
+    return {
+      contractTxId: this.contractTxId,
+    };
+  }
+
   /* eslint-disable */
   // @ts-ignore
   connect(signer: ContractSigner): this {

diff --git a/src/common/contracts/warp-contract.ts b/src/common/contracts/warp-contract.ts
@@ -25,6 +25,7 @@ import {
 
 import {
   BaseContract,
+  ContractConfiguration,
   ContractSigner,
   EvaluationParameters,
   ReadContract,
@@ -37,7 +38,7 @@ LoggerFactory.INST.setOptions({
 
 export class WarpContract<T> implements BaseContract<T>, ReadContract {
   private contract: Contract<T>;
-  protected contractTxId: string;
+  private contractTxId: string;
   private cacheUrl: string | undefined;
 
   constructor({
@@ -57,6 +58,12 @@ export class WarpContract<T> implements BaseContract<T>, ReadContract {
     this.cacheUrl = cacheUrl;
   }
 
+  configuration(): { contractTxId: string } {
+    return {
+      contractTxId: this.contractTxId,
+    };
+  }
+
   // base contract methods
   connect(signer: ContractSigner) {
     // TODO: Update type to use Signer interface