Update contract address handling and types across projects

typescript/base/src/domain/types.ts

@@ -1,6 +1,9 @@
-export type ContractAddress = string;
+export type ContractAddress = `0x${string}`;
 export type ContractName = string;
 export type MainContractAddress = ContractAddress;
+export type ContractAddressMap = {
+    [contractName: ContractName]: ContractAddress
+}
 
 export interface AbiFragmentType {
     readonly name?: string;

typescript/base/src/instance.ts

@@ -1,6 +1,7 @@
 import * as semver from "semver";
 import {
     ContractAddress,
+    ContractAddressMap,
     ContractName,
     MainContractAddress,
     SkaleABIFile
@@ -64,18 +65,24 @@ const processPep440 = (pyVersion: Pep440Version) => {
 export abstract class Instance<ContractType> {
     protected project: Project<ContractType>;
 
-    address: MainContractAddress;
+    addressContainer: ContractAddressMap;
 
     abi: SkaleABIFile | undefined;
 
     version: string | undefined;
 
     constructor (
         project: Project<ContractType>,
-        address: MainContractAddress
+        addressOrAddressContainer: MainContractAddress | ContractAddressMap
     ) {
         this.project = project;
-        this.address = address;
+        if (typeof addressOrAddressContainer === "string") {
+            this.addressContainer = {
+                [this.project.mainContractName]: addressOrAddressContainer
+            };
+        } else {
+            this.addressContainer = addressOrAddressContainer;
+        }
     }
 
     get adapter () {
@@ -103,7 +110,7 @@ export abstract class Instance<ContractType> {
         return this.project.network.adapter.makeCall(
             {
                 "abi": defaultVersionAbi,
-                "address": this.address
+                "address": this.mainContractAddress
             },
             {
                 "args": [],
@@ -117,6 +124,10 @@ export abstract class Instance<ContractType> {
         return abi[contractName];
     }
 
+    get mainContractAddress () {
+        return this.addressContainer[this.project.mainContractName];
+    }
+
     // Private
 
     private async getVersion () {

typescript/base/src/project.ts

@@ -1,6 +1,10 @@
 import * as semver from "semver";
+import {
+    ContractAddressMap,
+    MainContractAddress,
+    SkaleABIFile
+} from "./domain/types";
 import { Instance, InstanceData } from "./instance";
-import { MainContractAddress, SkaleABIFile } from "./domain/types";
 import axios, { HttpStatusCode } from "axios";
 import { InstanceNotFound } from "./domain/errors/instance/instanceNotFound";
 import { ListedNetwork } from "./listedNetwork";
@@ -34,6 +38,8 @@ export abstract class Project<ContractType> {
 
     abstract githubRepo: string;
 
+    abstract mainContractName: string;
+
     constructor (
         network: Network<ContractType>,
         metadata: ProjectMetadata
@@ -42,11 +48,12 @@ export abstract class Project<ContractType> {
         this.metadata = metadata;
     }
 
-    getInstance (aliasOrAddress: string) {
-        if (this.network.adapter.isAddress(aliasOrAddress)) {
-            return this.getInstanceByAddress(aliasOrAddress);
+    getInstance (target: string | MainContractAddress | ContractAddressMap) {
+        if (typeof target === "string" && this.network.adapter.isAddress(target) || typeof target === "object") {
+            return this.getInstanceByAddress(
+                target as MainContractAddress | ContractAddressMap);
         }
-        return this.getInstanceByAlias(aliasOrAddress);
+        return this.getInstanceByAlias(target);
     }
 
     async downloadAbiFile (version: string) {
@@ -89,12 +96,12 @@ export abstract class Project<ContractType> {
         throw new NetworkNotFoundError("Network is unknown");
     }
 
-    abstract createInstance(address: MainContractAddress):
+    abstract createInstance(address: MainContractAddress | ContractAddressMap):
         Instance<ContractType>;
 
     // Private
 
-    private getInstanceByAddress (address: string) {
+    private getInstanceByAddress (address: MainContractAddress | ContractAddressMap) {
         return this.createInstance(address);
     }
 

typescript/base/src/projects/ima/ImaInstance.ts

@@ -33,7 +33,7 @@ export abstract class ImaInstance<ContractType> extends
         return this.project.network.adapter.makeCall(
             {
                 "abi": messageProxyAbi,
-                "address": this.address
+                "address": this.mainContractAddress
             },
             {
                 args,

typescript/base/src/projects/ima/mainnet/MainnetImaInstance.ts

@@ -1,4 +1,5 @@
 import { ContractData } from "../../../adapter";
+import { ContractAddress } from "../../../domain/types";
 import { ImaInstance } from "../ImaInstance";
 
 
@@ -29,9 +30,9 @@ export class MainnetImaInstance<ContractType> extends
     ImaInstance<ContractType> {
     private contractManager: ContractData | undefined;
 
-    async getContractAddress (name: string): Promise<string> {
+    async getContractAddress (name: string): Promise<ContractAddress> {
         if (name === "MessageProxyForMainnet") {
-            return Promise.resolve(this.address);
+            return Promise.resolve(this.mainContractAddress);
         } else if (name === "CommunityPool") {
             return this.project.network.adapter.makeCall(
                 {
@@ -43,15 +44,15 @@ export class MainnetImaInstance<ContractType> extends
                     "args": [],
                     "functionName": "communityPool"
                 }
-            ) as Promise<string>;
+            ) as Promise<ContractAddress>;
         }
         return this.project.network.adapter.makeCall(
             await this.getContractManager(),
             {
                 "args": [name],
                 "functionName": "getContract"
             }
-        ) as Promise<string>;
+        ) as Promise<ContractAddress>;
     }
 
     // Private
@@ -63,7 +64,7 @@ export class MainnetImaInstance<ContractType> extends
                     {
                         "abi":
                             await this.getContractAbi("MessageProxyForMainnet"),
-                        "address": this.address
+                        "address": this.mainContractAddress
                     },
                     {
                         "args": [],

typescript/base/src/projects/ima/mainnet/MainnetImaProject.ts

@@ -1,17 +1,21 @@
+import { ContractAddressMap, MainContractAddress } from "../../../domain/types";
 import { ImaProject } from "../ImaProject";
 import { Instance } from "../../../instance";
 import { MainnetImaInstance } from "./MainnetImaInstance";
 
 export class MainnetImaProject<ContractType> extends
     ImaProject<ContractType> {
+    mainContractName = "MessageProxyForMainnet";
+
     getAbiFilename (version: string) {
         return `${this.metadata.name}-${version}-abi.json`;
     }
 
-    createInstance (address: string): Instance<ContractType> {
+    createInstance (target: MainContractAddress | ContractAddressMap)
+        : Instance<ContractType> {
         return new MainnetImaInstance(
             this,
-            address
+            target
         );
     }
 }

typescript/base/src/projects/ima/schain/SchainImaInstance.ts

@@ -1,3 +1,4 @@
+import { ContractAddress } from "../../../domain/types";
 import { ImaInstance } from "../ImaInstance";
 
 
@@ -46,13 +47,13 @@ export class SchainImaInstance<ContractType> extends
         ]
     ]);
 
-    getContractAddress (name: string): Promise<string> {
-        if (name === "MessageProxyForSchain") {
-            return Promise.resolve(this.address);
+    getContractAddress (name: string): Promise<ContractAddress> {
+        if (name in this.addressContainer) {
+            return Promise.resolve(this.addressContainer[name]);
         }
         if (SchainImaInstance.PREDEPLOYED.has(name)) {
             return Promise.resolve(SchainImaInstance.PREDEPLOYED.
-                get(name) as string);
+                get(name) as ContractAddress);
         }
         throw new Error(`Can't get address of ${name} contract`);
     }

typescript/base/src/projects/ima/schain/SchainImaProject.ts

@@ -1,26 +1,34 @@
+import {
+    ContractAddress,
+    ContractAddressMap,
+    MainContractAddress
+} from "../../../domain/types";
 import { ImaProject } from "../ImaProject";
 import { Instance } from "../../../instance";
 import { PREDEPLOYED_ALIAS } from "../../../domain/constants";
 import { SchainImaInstance } from "./SchainImaInstance";
 
 export class SchainImaProject<ContractType> extends
     ImaProject<ContractType> {
+    mainContractName = "MessageProxyForSchain";
+
     getAbiFilename (version: string) {
         return `${this.metadata.name}-${version}-abi.json`;
     }
 
-    getInstance (aliasOrAddress: string) {
-        if (aliasOrAddress === PREDEPLOYED_ALIAS) {
+    getInstance (target: string | MainContractAddress | ContractAddressMap) {
+        if (target === PREDEPLOYED_ALIAS) {
             return this.createInstance(SchainImaInstance.PREDEPLOYED.
-                get("MessageProxyForSchain")!);
+                get("MessageProxyForSchain")! as ContractAddress);
         }
-        return super.getInstance(aliasOrAddress);
+        return super.getInstance(target);
     }
 
-    createInstance (address: string): Instance<ContractType> {
+    createInstance (target: MainContractAddress | ContractAddressMap)
+        : Instance<ContractType> {
         return new SchainImaInstance(
             this,
-            address
+            target
         );
     }
 }

typescript/base/src/projects/paymaster/paymasterInstance.ts

@@ -12,7 +12,7 @@ export class PaymasterInstance<ContractType> extends
             "Paymaster",
             "FastForwardPaymaster"
         ].includes(name)) {
-            return this.address;
+            return this.mainContractAddress;
         }
         if (name === "PaymasterAccessManager") {
             return await this.callPaymaster(
@@ -29,7 +29,7 @@ export class PaymasterInstance<ContractType> extends
         return this.project.network.adapter.makeCall(
             {
                 "abi": await this.getContractAbi("Paymaster"),
-                "address": this.address
+                "address": this.mainContractAddress
             },
             {
                 args,

typescript/base/src/projects/paymaster/paymasterProject.ts

@@ -1,3 +1,4 @@
+import { ContractAddressMap, MainContractAddress } from "../../domain/types";
 import { Instance } from "../../instance";
 import { PaymasterInstance } from "./paymasterInstance";
 import { Project } from "../../project";
@@ -6,7 +7,10 @@ export class PaymasterProject<ContractType> extends
     Project<ContractType> {
     githubRepo = "https://github.com/skalenetwork/paymaster/";
 
-    createInstance (address: string): Instance<ContractType> {
+    mainContractName = "Paymaster";
+
+    createInstance (address: MainContractAddress | ContractAddressMap)
+        : Instance<ContractType> {
         return new PaymasterInstance(
             this,
             address

typescript/base/src/projects/skale-allocator/skaleAllocatorInstance.ts

@@ -12,7 +12,7 @@ export class SkaleAllocatorInstance<ContractType> extends
         args?: unknown[]
     ): Promise<ContractAddress> {
         if (name === "Allocator") {
-            return Promise.resolve(this.address);
+            return Promise.resolve(this.mainContractAddress);
         }
         if (name === "Escrow") {
             const firstArgument = 0;

typescript/base/src/projects/skale-allocator/skaleAllocatorProject.ts

@@ -1,3 +1,4 @@
+import { ContractAddressMap, MainContractAddress } from "../../domain/types";
 import { Instance } from "../../instance";
 import { Project } from "../../project";
 import { SkaleAllocatorInstance } from "./skaleAllocatorInstance";
@@ -6,7 +7,10 @@ export class SkaleAllocatorProject<ContractType> extends
     Project<ContractType> {
     githubRepo = "https://github.com/skalenetwork/skale-allocator/";
 
-    createInstance (address: string): Instance<ContractType> {
+    mainContractName = "SkaleAllocator";
+
+    createInstance (address: MainContractAddress | ContractAddressMap)
+        : Instance<ContractType> {
         return new SkaleAllocatorInstance(
             this,
             address

typescript/base/src/projects/skale-manager/skaleManagerInstance.ts

@@ -1,6 +1,7 @@
 import {
     ContractAddress,
-    ContractName
+    ContractName,
+    MainContractAddress
 } from "../../domain/types";
 import { Instance } from "../../instance";
 
@@ -72,7 +73,7 @@ export class SkaleManagerInstance<ContractType> extends
                 "args": [this.actualName(name)],
                 "functionName": "getContract"
             }
-        ) as string;
+        ) as MainContractAddress;
     }
 
     // Private
@@ -88,7 +89,7 @@ export class SkaleManagerInstance<ContractType> extends
         return this.project.network.adapter.makeCall(
             {
                 "abi": skaleManagerAbi,
-                "address": this.address
+                "address": this.mainContractAddress
             },
             {
                 args,

typescript/base/src/projects/skale-manager/skaleManagerProject.ts

@@ -1,3 +1,4 @@
+import { ContractAddressMap, MainContractAddress } from "../../domain/types";
 import { Instance } from "../../instance";
 import { Project } from "../../project";
 import { SkaleManagerInstance } from "./skaleManagerInstance";
@@ -6,7 +7,10 @@ export class SkaleManagerProject<ContractType> extends
     Project<ContractType> {
     githubRepo = "https://github.com/skalenetwork/skale-manager/";
 
-    createInstance (address: string): Instance<ContractType> {
+    mainContractName = "SkaleManager";
+
+    createInstance (address: MainContractAddress | ContractAddressMap)
+        : Instance<ContractType> {
         return new SkaleManagerInstance(
             this,
             address