dequanto 0.1.99 → 0.2.6

package/src/clients/ClientEventsStream.ts

@@ -41,9 +41,8 @@ export class ClientEventsStream<T extends TClientEventsStreamData<unknown[]> = a
         //     this.subscriptions.connection = null;
         // }
         this.innerStream = web3Subscription;
-        web3Subscription.on('data', this.onDataInner);
+        web3Subscription.subscribe(this.onDataInner, this.onErrorInner);
         web3Subscription.on('connected', this.onConnectedInner);
-        web3Subscription.on('error', this.onErrorInner);
     }
 
     subscribe (cb: (x: T) => void, onError?: (x: Error | any) => void) {

package/src/clients/handlers/RateLimitGuard.ts

@@ -12,6 +12,8 @@ let rateLimitRgx = {
         /exceed.+request/i,
         /try.+later/i,
         /request.+rate/i,
+        /max.+rate/i,
+        /max.+calls/i,
         /\b429\b/i,
         [/\bCUPS\b/i, /(\b(maximum|limit)\b)i/]
     ],

package/src/contracts/ContractBase.ts

@@ -308,7 +308,7 @@ export abstract class ContractBase {
         let stream = this.getContractStream();
         let events = stream.on(event);
         if (cb) {
-            events.onData(cb);
+            events.subscribe(cb);
         }
         return events;
     }

package/src/contracts/TxContract.ts

@@ -1,6 +1,5 @@
 import di from 'a-di';
 import alot from 'alot';
-import { Etherscan } from '@dequanto/explorer/Etherscan';
 import { IBlockchainExplorer } from '@dequanto/explorer/IBlockchainExplorer';
 import { ITransactionDetails } from '@dequanto/models/ITransactionDetails';
 import { ContractProvider } from './ContractProvider';
@@ -11,8 +10,8 @@ export class TxContract {
 
     private provider: ContractProvider;
 
-    constructor (private explorer: IBlockchainExplorer = di.resolve(Etherscan)) {
-        this.provider = di.resolve(ContractProvider, this.explorer);
+    constructor (private explorer: IBlockchainExplorer) {
+        this.provider = di.resolve(ContractProvider, explorer);
     }
 
     async parseTransaction (tx: TEth.TxLike)  {

package/src/explorer/BlockchainExplorer.ts

@@ -19,6 +19,7 @@ import { $http } from '@dequanto/utils/$http';
 import { IVerifier } from './verifiers/IVerifier';
 import { FsHtmlVerifier } from './verifiers/FsHtmlVerifier';
 import { TExplorer, TExplorerDefinition } from '@dequanto/models/TExplorer';
+import { RateLimitGuard } from '@dequanto/clients/handlers/RateLimitGuard';
 
 
 /** @deprecated use TExplorerDefinition instead */
@@ -627,18 +628,20 @@ class HttpClient {
         let data = resp.data;
         if (data.message === 'NOTOK') {
             let str = data.result;
-            if (/Max rate/i.test(str)) {
-                let count = opts?.retryCount ?? 3;
+            let error = new Error(str);
+            if (RateLimitGuard.isRateLimited(error)) {
+                const MAX = 3;
+                let count = opts?.retryCount ?? MAX;
                 if (--count === 0) {
-                    throw new Error(str);
+                    throw error;
                 }
-                await $promise.wait(200);
+                await $promise.wait(300 * (MAX - count + 1));
                 return this.getInner(url, {
                     ...(opts ?? {}),
                     retryCount: count
                 });
             }
-            throw new Error(str);
+            throw error;
         }
         if (data.result == null) {
             $logger.warn(`Blockchain "${url}" explorer returned empty result`, data);

package/src/explorer/BlockchainExplorerFactory.ts

@@ -22,11 +22,11 @@ export namespace BlockchainExplorerFactory {
         registry[platform] = explorer;
     }
 
-    export function get (platform: TPlatform | number)
-    export function get (config: TExplorerDefinition)
+    export function get (platform: TPlatform | number): IBlockchainExplorer
+    export function get (config: TExplorerDefinition): IBlockchainExplorer
     /** @obsolete */
-    export function get (platform: TPlatform | number, opts: IBlockchainExplorerFactoryParams)
-    export function get (mix: TPlatform | number | TExplorerDefinition, opts?: IBlockchainExplorerFactoryParams) {
+    export function get (platform: TPlatform | number, opts: IBlockchainExplorerFactoryParams): IBlockchainExplorer
+    export function get (mix: TPlatform | number | TExplorerDefinition, opts?: IBlockchainExplorerFactoryParams): IBlockchainExplorer {
 
         $require.notNull(mix, `ArgumentException: no platform in BlockchainExplorerFactory`);
 
@@ -35,8 +35,8 @@ export namespace BlockchainExplorerFactory {
 
         let cfg =  $config.getExplorerOptions(platform);
         let params = {
-            ...(opts ?? {}),
             ...(cfg ?? {}),
+            ...(opts ?? {}),
         } as any;
 
         let Ctor = registry[platform];
@@ -51,7 +51,7 @@ export namespace BlockchainExplorerFactory {
     }
 
     /** Same as sync variation, but ensures the config is being fetched */
-    export async function getAsync (platform: TPlatform, opts?: IBlockchainExplorerFactoryParams) {
+    export async function getAsync (platform: TPlatform, opts?: IBlockchainExplorerFactoryParams): Promise<IBlockchainExplorer> {
         await Config.get();
         return get(platform, opts);
     }

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;