@atomiqlabs/chain-evm 1.0.0-dev.38 → 1.0.0-dev.40

package/src/evm/chain/modules/EVMTransactions.ts

@@ -1,257 +1,257 @@
-import {EVMModule} from "../EVMModule";
-import {Transaction, TransactionRequest} from "ethers";
-import {timeoutPromise} from "../../../utils/Utils";
-import {EVMSigner} from "../../wallet/EVMSigner";
-
-export type EVMTx = TransactionRequest;
-
-export type EVMTxTrace = {
-    from: string,
-    gas: string,
-    gasused: string,
-    to: string,
-    input: string,
-    output: string,
-    error: string,
-    revertReason: string,
-    calls: EVMTxTrace[],
-    type: "CREATE" | "CALL" | "STATICCALL"
-};
-
-export class EVMTransactions extends EVMModule<any> {
-
-    private readonly latestConfirmedNonces: {[address: string]: number} = {};
-
-    private cbkBeforeTxSigned: (tx: TransactionRequest) => Promise<void>;
-    private cbkSendTransaction: (tx: string) => Promise<string>;
-
-    /**
-     * Waits for transaction confirmation using WS subscription and occasional HTTP polling, also re-sends
-     *  the transaction at regular interval
-     *
-     * @param tx EVM transaction to wait for confirmation for
-     * @param abortSignal signal to abort waiting for tx confirmation
-     * @private
-     */
-    private async confirmTransaction(tx: {nonce: number, from: string, hash: string}, abortSignal?: AbortSignal) {
-        let state = "pending";
-        while(state==="pending" || state==="not_found") {
-            await timeoutPromise(3000, abortSignal);
-            state = await this.getTxIdStatus(tx.hash);
-            //Don't re-send transactions
-            // if(state==="not_found") await this.sendSignedTransaction(tx).catch(e => {
-            //     if(e.baseError?.code === 59) return; //Transaction already in the mempool
-            //     this.logger.error("confirmTransaction(): Error on transaction re-send: ", e);
-            // });
-        }
-        const nextAccountNonce = tx.nonce + 1;
-        const currentNonce = this.latestConfirmedNonces[tx.from];
-        if(currentNonce==null || nextAccountNonce > currentNonce) {
-            this.latestConfirmedNonces[tx.from] = nextAccountNonce;
-        }
-        if(state==="reverted") throw new Error("Transaction reverted!");
-    }
-
-    /**
-     * Prepares starknet transactions, checks if the account is deployed, assigns nonces if needed & calls beforeTxSigned callback
-     *
-     * @param signer
-     * @param txs
-     * @private
-     */
-    private async prepareTransactions(signer: EVMSigner, txs: TransactionRequest[]): Promise<void> {
-        let nonce: number = (await signer.getNonce()) ?? await this.root.provider.getTransactionCount(signer.getAddress(), "pending");
-        const latestConfirmedNonce = this.latestConfirmedNonces[signer.getAddress()];
-        if(latestConfirmedNonce!=null && latestConfirmedNonce > nonce) {
-            this.logger.debug("prepareTransactions(): Using nonce from local cache!");
-            nonce = latestConfirmedNonce;
-        }
-
-        for(let i=0;i<txs.length;i++) {
-            const tx = txs[i];
-            tx.chainId = this.root.evmChainId;
-            tx.from = signer.getAddress();
-            if(tx.nonce!=null) nonce = tx.nonce; //Take the nonce from last tx
-            if(nonce==null) nonce = await this.root.provider.getTransactionCount(signer.getAddress(), "pending"); //Fetch the nonce
-            if(tx.nonce==null) tx.nonce = nonce;
-
-            this.logger.debug("sendAndConfirm(): transaction prepared ("+(i+1)+"/"+txs.length+"), nonce: "+tx.nonce);
-
-            nonce++;
-
-            if(this.cbkBeforeTxSigned!=null) await this.cbkBeforeTxSigned(tx);
-        }
-    }
-
-    /**
-     * Sends out a signed transaction to the RPC
-     *
-     * @param tx EVM tx to send
-     * @param onBeforePublish a callback called before every transaction is published
-     * @private
-     */
-    private async sendSignedTransaction(
-        tx: Transaction,
-        onBeforePublish?: (txId: string, rawTx: string) => Promise<void>,
-    ): Promise<string> {
-        if(onBeforePublish!=null) await onBeforePublish(tx.hash, await this.serializeTx(tx));
-        this.logger.debug("sendSignedTransaction(): sending transaction: ", tx.hash);
-
-        const serializedTx = tx.serialized;
-
-        let result: string;
-        if(this.cbkSendTransaction!=null) result = await this.cbkSendTransaction(serializedTx);
-        if(result==null) {
-            const broadcastResult = await this.provider.broadcastTransaction(tx.serialized);
-            result = broadcastResult.hash;
-        }
-
-        this.logger.info("sendSignedTransaction(): tx sent, txHash: "+result);
-        return result;
-    }
-
-    /**
-     * Prepares, signs, sends (in parallel or sequentially) & optionally waits for confirmation
-     *  of a batch of EVM transactions
-     *
-     * @param signer
-     * @param txs transactions to send
-     * @param waitForConfirmation whether to wait for transaction confirmations (this also makes sure the transactions
-     *  are re-sent at regular intervals)
-     * @param abortSignal abort signal to abort waiting for transaction confirmations
-     * @param parallel whether the send all the transaction at once in parallel or sequentially (such that transactions
-     *  are executed in order)
-     * @param onBeforePublish a callback called before every transaction is published, NOTE: callback is not called when using browser-based wallet!
-     */
-    public async sendAndConfirm(signer: EVMSigner, txs: TransactionRequest[], waitForConfirmation?: boolean, abortSignal?: AbortSignal, parallel?: boolean, onBeforePublish?: (txId: string, rawTx: string) => Promise<void>): Promise<string[]> {
-        await this.prepareTransactions(signer, txs);
-        const signedTxs: Transaction[] = [];
-
-        //Don't separate the signing process from the sending when using browser-based wallet
-        if(!signer.isBrowserWallet) for(let i=0;i<txs.length;i++) {
-            const tx = txs[i];
-            const signedTx = Transaction.from(await signer.account.signTransaction(tx));
-            signedTxs.push(signedTx);
-            this.logger.debug("sendAndConfirm(): transaction signed ("+(i+1)+"/"+txs.length+"): "+signedTx);
-        }
-
-        this.logger.debug("sendAndConfirm(): sending transactions, count: "+txs.length+
-            " waitForConfirmation: "+waitForConfirmation+" parallel: "+parallel);
-
-        const txIds: string[] = [];
-        if(parallel) {
-            const promises: Promise<void>[] = [];
-            for(let i=0;i<signedTxs.length;i++) {
-                let tx: {nonce: number, from: string, hash: string};
-                if(signer.isBrowserWallet) {
-                    tx = await signer.account.sendTransaction(txs[i]);
-                } else {
-                    const signedTx = signedTxs[i];
-                    await this.sendSignedTransaction(signedTx, onBeforePublish);
-                    tx = signedTx;
-                }
-                if(waitForConfirmation) promises.push(this.confirmTransaction(tx, abortSignal));
-                txIds.push(tx.hash);
-                this.logger.debug("sendAndConfirm(): transaction sent ("+(i+1)+"/"+signedTxs.length+"): "+tx.hash);
-            }
-            if(promises.length>0) await Promise.all(promises);
-        } else {
-            for(let i=0;i<signedTxs.length;i++) {
-                let tx: {nonce: number, from: string, hash: string};
-                if(signer.isBrowserWallet) {
-                    tx = await signer.account.sendTransaction(txs[i]);
-                } else {
-                    const signedTx = signedTxs[i];
-                    await this.sendSignedTransaction(signedTx, onBeforePublish);
-                    tx = signedTx;
-                }
-                const confirmPromise = this.confirmTransaction(tx, abortSignal);
-                this.logger.debug("sendAndConfirm(): transaction sent ("+(i+1)+"/"+txs.length+"): "+tx.hash);
-                //Don't await the last promise when !waitForConfirmation
-                if(i<txs.length-1 || waitForConfirmation) await confirmPromise;
-                txIds.push(tx.hash);
-            }
-        }
-
-        this.logger.info("sendAndConfirm(): sent transactions, count: "+txs.length+
-            " waitForConfirmation: "+waitForConfirmation+" parallel: "+parallel);
-
-        return txIds;
-    }
-
-    /**
-     * Serializes the signed EVM transaction
-     *
-     * @param tx
-     */
-    public serializeTx(tx: Transaction): Promise<string> {
-        return Promise.resolve(tx.serialized);
-    }
-
-    /**
-     * Deserializes signed EVM transaction
-     *
-     * @param txData
-     */
-    public deserializeTx(txData: string): Promise<Transaction> {
-        return Promise.resolve(Transaction.from(txData));
-    }
-
-    /**
-     * Gets the status of the raw starknet transaction
-     *
-     * @param tx
-     */
-    public async getTxStatus(tx: string): Promise<"pending" | "success" | "not_found" | "reverted"> {
-        const parsedTx: Transaction = await this.deserializeTx(tx);
-        return await this.getTxIdStatus(parsedTx.hash);
-    }
-
-    /**
-     * Gets the status of the starknet transaction with a specific txId
-     *
-     * @param txId
-     */
-    public async getTxIdStatus(txId: string): Promise<"pending" | "success" | "not_found" | "reverted"> {
-        const txResponse = await this.provider.getTransaction(txId);
-        if(txResponse==null) return "not_found";
-        if(txResponse.blockHash==null) return "pending";
-
-        const [safeBlockNumber, txReceipt] = await Promise.all([
-            this.root.config.safeBlockTag==="latest" ? Promise.resolve(null) : this.provider.getBlock(this.root.config.safeBlockTag).then(res => res.number),
-            this.provider.getTransactionReceipt(txId)
-        ]);
-
-        if(txReceipt==null || (safeBlockNumber!=null && txReceipt.blockNumber < safeBlockNumber)) return "pending";
-        if(txReceipt.status===0) return "reverted";
-        return "success";
-    }
-
-    public onBeforeTxSigned(callback: (tx: TransactionRequest) => Promise<void>): void {
-        this.cbkBeforeTxSigned = callback;
-    }
-
-    public offBeforeTxSigned(callback: (tx: TransactionRequest) => Promise<void>): boolean {
-        this.cbkBeforeTxSigned = null;
-        return true;
-    }
-
-    public onSendTransaction(callback: (tx: string) => Promise<string>): void {
-        this.cbkSendTransaction = callback;
-    }
-
-    public offSendTransaction(callback: (tx: string) => Promise<string>): boolean {
-        this.cbkSendTransaction = null;
-        return true;
-    }
-
-    public traceTransaction(txId: string): Promise<EVMTxTrace> {
-        return this.provider.send("debug_traceTransaction", [
-            txId,
-            {
-                tracer: "callTracer"
-            }
-        ]);
-    }
-
-}
+import {EVMModule} from "../EVMModule";
+import {Transaction, TransactionRequest} from "ethers";
+import {timeoutPromise} from "../../../utils/Utils";
+import {EVMSigner} from "../../wallet/EVMSigner";
+
+export type EVMTx = TransactionRequest;
+
+export type EVMTxTrace = {
+    from: string,
+    gas: string,
+    gasused: string,
+    to: string,
+    input: string,
+    output: string,
+    error: string,
+    revertReason: string,
+    calls: EVMTxTrace[],
+    type: "CREATE" | "CALL" | "STATICCALL"
+};
+
+export class EVMTransactions extends EVMModule<any> {
+
+    private readonly latestConfirmedNonces: {[address: string]: number} = {};
+
+    private cbkBeforeTxSigned: (tx: TransactionRequest) => Promise<void>;
+    private cbkSendTransaction: (tx: string) => Promise<string>;
+
+    /**
+     * Waits for transaction confirmation using WS subscription and occasional HTTP polling, also re-sends
+     *  the transaction at regular interval
+     *
+     * @param tx EVM transaction to wait for confirmation for
+     * @param abortSignal signal to abort waiting for tx confirmation
+     * @private
+     */
+    private async confirmTransaction(tx: {nonce: number, from: string, hash: string}, abortSignal?: AbortSignal) {
+        let state = "pending";
+        while(state==="pending" || state==="not_found") {
+            await timeoutPromise(3000, abortSignal);
+            state = await this.getTxIdStatus(tx.hash);
+            //Don't re-send transactions
+            // if(state==="not_found") await this.sendSignedTransaction(tx).catch(e => {
+            //     if(e.baseError?.code === 59) return; //Transaction already in the mempool
+            //     this.logger.error("confirmTransaction(): Error on transaction re-send: ", e);
+            // });
+        }
+        const nextAccountNonce = tx.nonce + 1;
+        const currentNonce = this.latestConfirmedNonces[tx.from];
+        if(currentNonce==null || nextAccountNonce > currentNonce) {
+            this.latestConfirmedNonces[tx.from] = nextAccountNonce;
+        }
+        if(state==="reverted") throw new Error("Transaction reverted!");
+    }
+
+    /**
+     * Prepares starknet transactions, checks if the account is deployed, assigns nonces if needed & calls beforeTxSigned callback
+     *
+     * @param signer
+     * @param txs
+     * @private
+     */
+    private async prepareTransactions(signer: EVMSigner, txs: TransactionRequest[]): Promise<void> {
+        let nonce: number = (await signer.getNonce()) ?? await this.root.provider.getTransactionCount(signer.getAddress(), "pending");
+        const latestConfirmedNonce = this.latestConfirmedNonces[signer.getAddress()];
+        if(latestConfirmedNonce!=null && latestConfirmedNonce > nonce) {
+            this.logger.debug("prepareTransactions(): Using nonce from local cache!");
+            nonce = latestConfirmedNonce;
+        }
+
+        for(let i=0;i<txs.length;i++) {
+            const tx = txs[i];
+            tx.chainId = this.root.evmChainId;
+            tx.from = signer.getAddress();
+            if(tx.nonce!=null) nonce = tx.nonce; //Take the nonce from last tx
+            if(nonce==null) nonce = await this.root.provider.getTransactionCount(signer.getAddress(), "pending"); //Fetch the nonce
+            if(tx.nonce==null) tx.nonce = nonce;
+
+            this.logger.debug("sendAndConfirm(): transaction prepared ("+(i+1)+"/"+txs.length+"), nonce: "+tx.nonce);
+
+            nonce++;
+
+            if(this.cbkBeforeTxSigned!=null) await this.cbkBeforeTxSigned(tx);
+        }
+    }
+
+    /**
+     * Sends out a signed transaction to the RPC
+     *
+     * @param tx EVM tx to send
+     * @param onBeforePublish a callback called before every transaction is published
+     * @private
+     */
+    private async sendSignedTransaction(
+        tx: Transaction,
+        onBeforePublish?: (txId: string, rawTx: string) => Promise<void>,
+    ): Promise<string> {
+        if(onBeforePublish!=null) await onBeforePublish(tx.hash, await this.serializeTx(tx));
+        this.logger.debug("sendSignedTransaction(): sending transaction: ", tx.hash);
+
+        const serializedTx = tx.serialized;
+
+        let result: string;
+        if(this.cbkSendTransaction!=null) result = await this.cbkSendTransaction(serializedTx);
+        if(result==null) {
+            const broadcastResult = await this.provider.broadcastTransaction(tx.serialized);
+            result = broadcastResult.hash;
+        }
+
+        this.logger.info("sendSignedTransaction(): tx sent, txHash: "+result);
+        return result;
+    }
+
+    /**
+     * Prepares, signs, sends (in parallel or sequentially) & optionally waits for confirmation
+     *  of a batch of EVM transactions
+     *
+     * @param signer
+     * @param txs transactions to send
+     * @param waitForConfirmation whether to wait for transaction confirmations (this also makes sure the transactions
+     *  are re-sent at regular intervals)
+     * @param abortSignal abort signal to abort waiting for transaction confirmations
+     * @param parallel whether the send all the transaction at once in parallel or sequentially (such that transactions
+     *  are executed in order)
+     * @param onBeforePublish a callback called before every transaction is published, NOTE: callback is not called when using browser-based wallet!
+     */
+    public async sendAndConfirm(signer: EVMSigner, txs: TransactionRequest[], waitForConfirmation?: boolean, abortSignal?: AbortSignal, parallel?: boolean, onBeforePublish?: (txId: string, rawTx: string) => Promise<void>): Promise<string[]> {
+        await this.prepareTransactions(signer, txs);
+        const signedTxs: Transaction[] = [];
+
+        //Don't separate the signing process from the sending when using browser-based wallet
+        if(!signer.isBrowserWallet) for(let i=0;i<txs.length;i++) {
+            const tx = txs[i];
+            const signedTx = Transaction.from(await signer.account.signTransaction(tx));
+            signedTxs.push(signedTx);
+            this.logger.debug("sendAndConfirm(): transaction signed ("+(i+1)+"/"+txs.length+"): "+signedTx);
+        }
+
+        this.logger.debug("sendAndConfirm(): sending transactions, count: "+txs.length+
+            " waitForConfirmation: "+waitForConfirmation+" parallel: "+parallel);
+
+        const txIds: string[] = [];
+        if(parallel) {
+            const promises: Promise<void>[] = [];
+            for(let i=0;i<signedTxs.length;i++) {
+                let tx: {nonce: number, from: string, hash: string};
+                if(signer.isBrowserWallet) {
+                    tx = await signer.account.sendTransaction(txs[i]);
+                } else {
+                    const signedTx = signedTxs[i];
+                    await this.sendSignedTransaction(signedTx, onBeforePublish);
+                    tx = signedTx;
+                }
+                if(waitForConfirmation) promises.push(this.confirmTransaction(tx, abortSignal));
+                txIds.push(tx.hash);
+                this.logger.debug("sendAndConfirm(): transaction sent ("+(i+1)+"/"+signedTxs.length+"): "+tx.hash);
+            }
+            if(promises.length>0) await Promise.all(promises);
+        } else {
+            for(let i=0;i<signedTxs.length;i++) {
+                let tx: {nonce: number, from: string, hash: string};
+                if(signer.isBrowserWallet) {
+                    tx = await signer.account.sendTransaction(txs[i]);
+                } else {
+                    const signedTx = signedTxs[i];
+                    await this.sendSignedTransaction(signedTx, onBeforePublish);
+                    tx = signedTx;
+                }
+                const confirmPromise = this.confirmTransaction(tx, abortSignal);
+                this.logger.debug("sendAndConfirm(): transaction sent ("+(i+1)+"/"+txs.length+"): "+tx.hash);
+                //Don't await the last promise when !waitForConfirmation
+                if(i<txs.length-1 || waitForConfirmation) await confirmPromise;
+                txIds.push(tx.hash);
+            }
+        }
+
+        this.logger.info("sendAndConfirm(): sent transactions, count: "+txs.length+
+            " waitForConfirmation: "+waitForConfirmation+" parallel: "+parallel);
+
+        return txIds;
+    }
+
+    /**
+     * Serializes the signed EVM transaction
+     *
+     * @param tx
+     */
+    public serializeTx(tx: Transaction): Promise<string> {
+        return Promise.resolve(tx.serialized);
+    }
+
+    /**
+     * Deserializes signed EVM transaction
+     *
+     * @param txData
+     */
+    public deserializeTx(txData: string): Promise<Transaction> {
+        return Promise.resolve(Transaction.from(txData));
+    }
+
+    /**
+     * Gets the status of the raw starknet transaction
+     *
+     * @param tx
+     */
+    public async getTxStatus(tx: string): Promise<"pending" | "success" | "not_found" | "reverted"> {
+        const parsedTx: Transaction = await this.deserializeTx(tx);
+        return await this.getTxIdStatus(parsedTx.hash);
+    }
+
+    /**
+     * Gets the status of the starknet transaction with a specific txId
+     *
+     * @param txId
+     */
+    public async getTxIdStatus(txId: string): Promise<"pending" | "success" | "not_found" | "reverted"> {
+        const txResponse = await this.provider.getTransaction(txId);
+        if(txResponse==null) return "not_found";
+        if(txResponse.blockHash==null) return "pending";
+
+        const [safeBlockNumber, txReceipt] = await Promise.all([
+            this.root.config.safeBlockTag==="latest" ? Promise.resolve(null) : this.provider.getBlock(this.root.config.safeBlockTag).then(res => res.number),
+            this.provider.getTransactionReceipt(txId)
+        ]);
+
+        if(txReceipt==null || (safeBlockNumber!=null && txReceipt.blockNumber < safeBlockNumber)) return "pending";
+        if(txReceipt.status===0) return "reverted";
+        return "success";
+    }
+
+    public onBeforeTxSigned(callback: (tx: TransactionRequest) => Promise<void>): void {
+        this.cbkBeforeTxSigned = callback;
+    }
+
+    public offBeforeTxSigned(callback: (tx: TransactionRequest) => Promise<void>): boolean {
+        this.cbkBeforeTxSigned = null;
+        return true;
+    }
+
+    public onSendTransaction(callback: (tx: string) => Promise<string>): void {
+        this.cbkSendTransaction = callback;
+    }
+
+    public offSendTransaction(callback: (tx: string) => Promise<string>): boolean {
+        this.cbkSendTransaction = null;
+        return true;
+    }
+
+    public traceTransaction(txId: string): Promise<EVMTxTrace> {
+        return this.provider.send("debug_traceTransaction", [
+            txId,
+            {
+                tracer: "callTracer"
+            }
+        ]);
+    }
+
+}

package/src/evm/contract/EVMContractBase.ts

@@ -1,63 +1,63 @@
-import {BaseContract, Contract, EventFragment, Log, TransactionDescription, EventLog} from "ethers";
-import {EVMChainInterface} from "../chain/EVMChainInterface";
-import {EVMContractEvents} from "./modules/EVMContractEvents";
-import {TypedContractMethod, TypedEventLog} from "../typechain/common";
-
-type __TypechainOutputObject<T> = T extends TypedContractMethod<
-        infer V
-    >
-    ? V
-    : never;
-
-type KeysOfType<T, ValueType> = keyof {
-    [K in keyof T]: T[K] extends ValueType ? K : never;
-};
-
-export interface TypedFunctionCall<TCMethod extends TypedContractMethod>
-    extends Omit<TransactionDescription, "args"> {
-    args: __TypechainOutputObject<TCMethod>;
-}
-
-/**
- * Base class providing program specific utilities
- */
-export class EVMContractBase<T extends BaseContract> {
-
-    contract: T;
-
-    public readonly Events: EVMContractEvents<T>;
-    public readonly Chain: EVMChainInterface<any>;
-
-    public readonly contractAddress: string;
-    public readonly contractDeploymentHeight: number;
-
-    constructor(
-        chainInterface: EVMChainInterface<any>,
-        contractAddress: string,
-        contractAbi: any,
-        contractDeploymentHeight?: number,
-    ) {
-        this.Chain = chainInterface;
-        this.contract = new Contract(contractAddress, contractAbi, chainInterface.provider) as unknown as T;
-        this.Events = new EVMContractEvents<T>(chainInterface, this);
-        this.contractAddress = contractAddress;
-        this.contractDeploymentHeight = contractDeploymentHeight;
-    }
-
-    toTypedEvent<TEventName extends keyof T["filters"] = keyof T["filters"]>(log: Log): TypedEventLog<T["filters"][TEventName]> {
-        let foundFragment: EventFragment;
-        try {
-            foundFragment = this.contract.interface.getEvent(log.topics[0]);
-        } catch (error) { }
-        if(!foundFragment) return null;
-
-        try {
-            return new EventLog(log, this.contract.interface, foundFragment) as unknown as TypedEventLog<T["filters"][TEventName]>;
-        } catch (error: any) { }
-    }
-
-    parseCalldata<TMethod extends TypedContractMethod>(calldata: string): TypedFunctionCall<TMethod> {
-        return this.contract.interface.parseTransaction({data: calldata}) as unknown as TypedFunctionCall<TMethod>;
-    }
-
-}
+import {BaseContract, Contract, EventFragment, Log, TransactionDescription, EventLog} from "ethers";
+import {EVMChainInterface} from "../chain/EVMChainInterface";
+import {EVMContractEvents} from "./modules/EVMContractEvents";
+import {TypedContractMethod, TypedEventLog} from "../typechain/common";
+
+type __TypechainOutputObject<T> = T extends TypedContractMethod<
+        infer V
+    >
+    ? V
+    : never;
+
+type KeysOfType<T, ValueType> = keyof {
+    [K in keyof T]: T[K] extends ValueType ? K : never;
+};
+
+export interface TypedFunctionCall<TCMethod extends TypedContractMethod>
+    extends Omit<TransactionDescription, "args"> {
+    args: __TypechainOutputObject<TCMethod>;
+}
+
+/**
+ * Base class providing program specific utilities
+ */
+export class EVMContractBase<T extends BaseContract> {
+
+    contract: T;
+
+    public readonly Events: EVMContractEvents<T>;
+    public readonly Chain: EVMChainInterface<any>;
+
+    public readonly contractAddress: string;
+    public readonly contractDeploymentHeight: number;
+
+    constructor(
+        chainInterface: EVMChainInterface<any>,
+        contractAddress: string,
+        contractAbi: any,
+        contractDeploymentHeight?: number,
+    ) {
+        this.Chain = chainInterface;
+        this.contract = new Contract(contractAddress, contractAbi, chainInterface.provider) as unknown as T;
+        this.Events = new EVMContractEvents<T>(chainInterface, this);
+        this.contractAddress = contractAddress;
+        this.contractDeploymentHeight = contractDeploymentHeight;
+    }
+
+    toTypedEvent<TEventName extends keyof T["filters"] = keyof T["filters"]>(log: Log): TypedEventLog<T["filters"][TEventName]> {
+        let foundFragment: EventFragment;
+        try {
+            foundFragment = this.contract.interface.getEvent(log.topics[0]);
+        } catch (error) { }
+        if(!foundFragment) return null;
+
+        try {
+            return new EventLog(log, this.contract.interface, foundFragment) as unknown as TypedEventLog<T["filters"][TEventName]>;
+        } catch (error: any) { }
+    }
+
+    parseCalldata<TMethod extends TypedContractMethod>(calldata: string): TypedFunctionCall<TMethod> {
+        return this.contract.interface.parseTransaction({data: calldata}) as unknown as TypedFunctionCall<TMethod>;
+    }
+
+}