UX improvements (#51)

* Updated version

* Deleted spaces form toJSON converter

* Renamed misc to name

* Fix. Used setAsDeployed

* Fix setAsDeployed

* Renamed misc to name

* Deleted redundant 0 spaces

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solarity/hardhat-migrate",
-  "version": "2.0.0-alpha.7",
+  "version": "2.0.0-alpha.8",
   "description": "Automatic deployment and verification of smart contracts",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

src/deployer/adapters/AbstractEthersAdapter.ts

@@ -15,7 +15,7 @@ import "../../type-extensions";
 
 import { bytecodeToString, fillParameters, getMethodString, getSignerHelper } from "../../utils";
 
-import { OverridesAndLibs, OverridesAndMisc } from "../../types/deployer";
+import { OverridesAndLibs, OverridesAndName } from "../../types/deployer";
 import { KeyTransactionFields } from "../../types/tools";
 import { EthersContract, BytecodeFactory } from "../../types/adapter";
 
@@ -31,7 +31,7 @@ export abstract class AbstractEthersAdapter extends Adapter {
     return bytecodeToString(instance.bytecode);
   }
 
-  public async fromInstance<A, I>(instance: Factory<A, I>, parameters: OverridesAndMisc): Promise<MinimalContract> {
+  public async fromInstance<A, I>(instance: Factory<A, I>, parameters: OverridesAndName): Promise<MinimalContract> {
     return new MinimalContract(
       this._config,
       this.getRawBytecode(instance),

src/deployer/adapters/Adapter.ts

@@ -6,13 +6,13 @@ import { catchError } from "../../utils";
 
 import { Instance } from "../../types/adapter";
 import { MigrateConfig } from "../../types/migrations";
-import { OverridesAndLibs, OverridesAndMisc } from "../../types/deployer";
+import { OverridesAndLibs, OverridesAndName } from "../../types/deployer";
 
 @catchError
 export abstract class Adapter {
   public constructor(protected _config: MigrateConfig) {}
 
-  public abstract fromInstance<A, I>(instance: Instance<A, I>, parameters: OverridesAndMisc): Promise<MinimalContract>;
+  public abstract fromInstance<A, I>(instance: Instance<A, I>, parameters: OverridesAndName): Promise<MinimalContract>;
 
   public abstract toInstance<A, I>(instance: Instance<A, I>, address: string, parameters: OverridesAndLibs): Promise<I>;
 
@@ -22,5 +22,5 @@ export abstract class Adapter {
 
   public abstract getRawBytecode<A, I>(instance: Instance<A, I>): string;
 
-  public abstract getContractName<A, I>(instance: Instance<A, I>, parameters: OverridesAndMisc): string;
+  public abstract getContractName<A, I>(instance: Instance<A, I>, parameters: OverridesAndName): string;
 }

src/deployer/adapters/EthersContractAdapter.ts

@@ -5,7 +5,7 @@ import { AbstractEthersAdapter } from "./AbstractEthersAdapter";
 import { catchError, getSignerHelper } from "../../utils";
 
 import { EthersContract } from "../../types/adapter";
-import { OverridesAndMisc } from "../../types/deployer";
+import { OverridesAndName } from "../../types/deployer";
 
 import { ArtifactProcessor } from "../../tools/storage/ArtifactProcessor";
 
@@ -19,9 +19,9 @@ export class EthersContractAdapter extends AbstractEthersAdapter {
     return instance.abi;
   }
 
-  public getContractName<A, I>(instance: EthersContract<A, I>, parameters: OverridesAndMisc): string {
-    if (parameters.misc) {
-      return parameters.misc;
+  public getContractName<A, I>(instance: EthersContract<A, I>, parameters: OverridesAndName): string {
+    if (parameters.name) {
+      return parameters.name;
     }
 
     try {

src/deployer/adapters/TruffleAdapter.ts

@@ -14,7 +14,7 @@ import { EthersContract, Instance, TruffleFactory } from "../../types/adapter";
 import {
   BaseTruffleMethod,
   OverridesAndLibs,
-  OverridesAndMisc,
+  OverridesAndName,
   TruffleTransactionResponse,
 } from "../../types/deployer";
 import { KeyTransactionFields } from "../../types/tools";
@@ -32,7 +32,7 @@ export class TruffleAdapter extends Adapter {
 
   public async fromInstance<A, I>(
     instance: EthersContract<A, I>,
-    parameters: OverridesAndMisc,
+    parameters: OverridesAndName,
   ): Promise<MinimalContract> {
     return new MinimalContract(
       this._config,
@@ -43,12 +43,15 @@ export class TruffleAdapter extends Adapter {
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public async toInstance<I>(instance: TruffleFactory<I>, address: string, _: OverridesAndMisc): Promise<I> {
+  public async toInstance<I>(instance: TruffleFactory<I>, address: string, _: OverridesAndName): Promise<I> {
     const contract = this._hre.artifacts.require(instance.contractName!);
 
     await this._overrideConnectMethod(contract);
 
-    return contract.at(address);
+    const contractInstance = await contract.at(address);
+    (instance as any).setAsDeployed(contractInstance);
+
+    return contractInstance;
   }
 
   public getInterface(instance: TruffleContract): Interface {
@@ -63,9 +66,9 @@ export class TruffleAdapter extends Adapter {
     return bytecodeToString(instance.bytecode);
   }
 
-  public getContractName<A, I>(instance: Instance<A, I>, parameters: OverridesAndMisc): string {
-    if (parameters.misc) {
-      return parameters.misc;
+  public getContractName<A, I>(instance: Instance<A, I>, parameters: OverridesAndName): string {
+    if (parameters.name) {
+      return parameters.name;
     }
 
     try {

src/types/deployer.ts

@@ -6,9 +6,9 @@ export type Bytecode = BytesLike;
 
 export type Args = Parameters<ContractFactory["getDeployTransaction"]>;
 
-export type OverridesAndMisc = Overrides & { misc?: string };
+export type OverridesAndName = Overrides & { name?: string };
 
-export type OverridesAndLibs = OverridesAndMisc & { libraries?: Libraries };
+export type OverridesAndLibs = OverridesAndName & { libraries?: Libraries };
 
 export type ContractDeployTransactionWithContractName = ContractDeployTransaction & { contractName: string };
 

src/utils.ts

@@ -67,7 +67,7 @@ export async function getChainId(): Promise<bigint> {
 }
 
 export function toJSON(data: any): string {
-  return JSON.stringify(data, JSONConvertor, 2);
+  return JSON.stringify(data, JSONConvertor);
 }
 
 export function JSONConvertor(_key: any, value: any) {