dequanto 0.1.97 → 0.2.6

package/src/explorer/ContractVerifier.ts

@@ -87,12 +87,17 @@ export class ContractVerifier {
         address?: TEth.Address
         proxyFor?: TEth.Address
         constructorParams?: any[]
+        tx?: TEth.Hex
     }): Promise<TSubmissionStatus> {
         let client = this.deployments.client;
         let contractName = typeof Ctor === 'string' ? Ctor : Ctor.name;
-        let deployment = await this.deployments.store.getDeploymentInfo(Ctor, opts);
-        $require.notNull(deployment, `Deployment not found for ${opts?.id ?? contractName}`);
-        let address = opts?.address ?? deployment.implementation ?? deployment.address;
+        let address = opts?.address;
+
+        if ($is.Address(address) === false) {
+            let deployment = await this.deployments.store.getDeploymentInfo(Ctor, opts);
+            $require.notNull(deployment, `Deployment not found for ${opts?.id ?? contractName}`);
+            address = deployment.implementation ?? deployment.address;
+        }
 
         try {
             this.logger.log(`Checking if already verified ${address}`);
@@ -119,8 +124,14 @@ export class ContractVerifier {
         let ctorAbi = abi.find(x => x.type === 'constructor');
         if (ctorAbi?.inputs?.length > 0) {
             if (opts?.constructorParams == null) {
-                let tx = await this.deployments.client.getTransaction(deployment.tx);
-                $require.notNull(tx, `Tx ${deployment.tx} not found in ${this.deployments.client.network}`);
+                let txHash = opts.tx;
+                if (txHash == null) {
+                    let deployment = await this.deployments.store.getDeploymentInfo(Ctor, opts);
+                    $require.notNull(deployment, `Deployment not found for ${opts?.id ?? contractName}`);
+                    txHash = deployment.tx;
+                }
+                let tx = await this.deployments.client.getTransaction(txHash);
+                $require.notNull(tx, `Tx ${txHash} not found in ${this.deployments.client.network}`);
                 let parsedArguments = $contract.decodeDeploymentArguments(tx.input, ctorAbi);
                 constructorArguments = parsedArguments.encoded;
             } else {

package/src/explorer/Etherscan.ts

@@ -1,14 +1,74 @@
 import di from 'a-di';
+import memd from 'memd';
 import { $config } from '@dequanto/utils/$config';
 import { EthWeb3Client } from '@dequanto/clients/EthWeb3Client';
 import { TPlatform } from '@dequanto/models/TPlatform';
+import { IBlockchainExplorer, IBlockchainTransferEvent } from './IBlockchainExplorer';
 import { BlockchainExplorer } from './BlockchainExplorer';
+import { IContractDetails } from '@dequanto/models/IContractDetails';
+import { TAddress } from '@dequanto/models/TAddress';
+import { TEth } from '@dequanto/models/TEth';
 
 const contracts = $config.get('contracts.eth', [])
-export class Etherscan extends BlockchainExplorer {
 
-    constructor () {
-        super({
+
+export class Etherscan implements IBlockchainExplorer {
+    inMemoryDb: IContractDetails[];
+    getContractMeta(q: string) {
+        return this.getExplorer().getContractMeta(q);
+    }
+    getContractCreation(address: TEth.Address) {
+        return this.getExplorer().getContractCreation(address);
+    }
+    getContractAbi(address: TEth.Address, opts?) {
+        return this.getExplorer().getContractAbi(address, opts);
+    }
+    getContractSource(address: TEth.Address) {
+        return this.getExplorer().getContractSource(address);
+    }
+    submitContractVerification(contractData) {
+        return this.getExplorer().submitContractVerification(contractData);
+    }
+    checkContractVerificationSubmission(submission) {
+        return this.getExplorer().checkContractVerificationSubmission(submission);
+    }
+    submitContractProxyVerification(contractData) {
+        return this.getExplorer().submitContractProxyVerification(contractData);
+    }
+    checkContractProxyVerificationSubmission(submission: { guid: any; }): Promise<string> {
+        return this.getExplorer().checkContractProxyVerificationSubmission(submission);
+    }
+    getTransactions(address: TEth.Address, params?) {
+        return this.getExplorer().getTransactions(address, params);
+    }
+    getTransactionsAll(address: TEth.Address) {
+        return this.getExplorer().getTransactionsAll(address);
+    }
+    getInternalTransactions(address: TEth.Address, params) {
+        return this.getExplorer().getInternalTransactions(address, params);
+    }
+    getInternalTransactionsAll(address: TEth.Address): Promise<TEth.TxLike[]> {
+        return this.getExplorer().getInternalTransactionsAll(address);
+    }
+    getErc20Transfers(address: TEth.Address, fromBlockNumber?: number): Promise<IBlockchainTransferEvent[]> {
+        return this.getExplorer().getErc20Transfers(address);
+    }
+    getErc20TransfersAll(address: TEth.Address, fromBlockNumber?: number): Promise<IBlockchainTransferEvent[]> {
+        return this.getExplorer().getErc20TransfersAll(address);
+    }
+    registerAbi(abis: { name: any; address: any; abi: any; }[]) {
+        return this.getExplorer().registerAbi(abis);
+    }
+
+
+
+    @memd.deco.memoize()
+    private getExplorer () {
+        return new BlockchainExplorer(this.getConfig());
+    }
+
+    private getConfig () {
+        return {
             platform: 'eth',
             ABI_CACHE: `./cache/eth/abis.json`,
             CONTRACTS: contracts,
@@ -34,7 +94,7 @@ export class Etherscan extends BlockchainExplorer {
                     www: config?.www,
                 };
             }
-        })
+        }
     }
 }
 

package/src/explorer/Evmscan.ts

@@ -5,6 +5,4 @@ import { BlockchainExplorer } from './BlockchainExplorer';
 /**
  * @obsolete Use BlockchainExplorer class instead.
  */
-export function Evmscan (options: { platform: TPlatform }) {
-    return new BlockchainExplorer(options);
-}
+export const Evmscan = BlockchainExplorer;