diff --git a/src/index.ts b/src/index.ts index fd82a4eb..64b8861f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -16,7 +16,6 @@ export * from "./delegation"; export * from "./entrypoints"; export * from "./errors"; export * from "./interface"; -export * from "./interfaceOfNetwork"; export * from "./logger"; export * from "./message"; export * from "./networkParams"; diff --git a/src/interface.ts b/src/interface.ts index d867b462..62ac22c3 100644 --- a/src/interface.ts +++ b/src/interface.ts @@ -26,3 +26,10 @@ export interface IPlainTransactionObject { guardianSignature?: string; relayerSignature?: string; } + +export interface INetworkConfig { + MinGasLimit: number; + GasPerDataByte: number; + GasPriceModifier: number; + ChainID: string; +} diff --git a/src/interfaceOfNetwork.ts b/src/interfaceOfNetwork.ts deleted file mode 100644 index e3a4e7e5..00000000 --- a/src/interfaceOfNetwork.ts +++ /dev/null @@ -1,95 +0,0 @@ -import { Address } from "./address"; - -export interface IAccountOnNetwork { - nonce: bigint; - balance: bigint; -} - -export interface INetworkConfig { - MinGasLimit: number; - GasPerDataByte: number; - GasPriceModifier: number; - ChainID: string; -} - -export interface ITransactionOnNetwork { - isCompleted?: boolean; - - hash: string; - type: string; - value: string; - receiver: Address; - sender: Address; - function?: string; - data: Buffer; - status: ITransactionStatus; - receipt: ITransactionReceipt; - contractResults: IContractResults; - logs: ITransactionLogs; -} - -export interface ITransactionStatus { - isPending(): boolean; - isFailed(): boolean; - isInvalid(): boolean; - isExecuted(): boolean; - isSuccessful(): boolean; - valueOf(): string; -} - -export interface ITransactionReceipt { - data: string; -} - -export interface IContractResults { - items: IContractResultItem[]; -} - -export interface IContractResultItem { - hash: string; - nonce: number; - receiver: Address; - sender: Address; - data: string; - returnMessage: string; - logs: ITransactionLogs; - previousHash?: string; -} - -export interface IContractQueryResponse { - returnCode: IContractReturnCode; - returnMessage: string; - getReturnDataParts(): Buffer[]; -} - -export interface IContractReturnCode { - toString(): string; -} - -export interface ITransactionLogs { - address: Address; - events: ITransactionEvent[]; - - findSingleOrNoneEvent( - identifier: string, - predicate?: (event: ITransactionEvent) => boolean, - ): ITransactionEvent | undefined; -} - -export interface ITransactionEvent { - readonly address: Address; - readonly identifier: string; - readonly topics: ITransactionEventTopic[]; - readonly data: string; - // See https://github.com/multiversx/mx-sdk-js-network-providers/blob/v2.4.0/src/transactionEvents.ts#L13 - readonly dataPayload?: { valueOf(): Uint8Array }; - readonly additionalData?: { valueOf(): Uint8Array }[]; - - findFirstOrNoneTopic(predicate: (topic: ITransactionEventTopic) => boolean): ITransactionEventTopic | undefined; - getLastTopic(): ITransactionEventTopic; -} - -export interface ITransactionEventTopic { - toString(): string; - hex(): string; -} diff --git a/src/testutils/mockNetworkProvider.ts b/src/testutils/mockNetworkProvider.ts index 0a147d21..1d888308 100644 --- a/src/testutils/mockNetworkProvider.ts +++ b/src/testutils/mockNetworkProvider.ts @@ -2,7 +2,6 @@ import { Address } from "../address"; import { AsyncTimer } from "../asyncTimer"; import * as errors from "../errors"; import { ErrMock } from "../errors"; -import { IAccountOnNetwork } from "../interfaceOfNetwork"; import { AccountOnNetwork, DefinitionOfFungibleTokenOnNetwork, @@ -123,7 +122,7 @@ export class MockNetworkProvider implements INetworkProvider { throw new Error("Method not implemented."); } - mockUpdateAccount(address: Address, mutate: (item: IAccountOnNetwork) => void) { + mockUpdateAccount(address: Address, mutate: (item: AccountOnNetwork) => void) { let account = this.accounts.get(address.toBech32()); if (account) { mutate(account); diff --git a/src/testutils/wallets.ts b/src/testutils/wallets.ts index ab0c9a74..7cb88fb9 100644 --- a/src/testutils/wallets.ts +++ b/src/testutils/wallets.ts @@ -2,7 +2,7 @@ import * as fs from "fs"; import * as path from "path"; import { Account } from "../accounts"; import { Address } from "../address"; -import { IAccountOnNetwork } from "../interfaceOfNetwork"; +import { AccountOnNetwork } from "../networkProviders"; import { getAxios } from "../utils"; import { UserSecretKey, UserSigner } from "./../wallet"; import { readTestFile } from "./files"; @@ -11,7 +11,7 @@ import { isOnBrowserTests } from "./utils"; export const DummyMnemonicOf12Words = "matter trumpet twenty parade fame north lift sail valve salon foster cinnamon"; interface IAccountFetcher { - getAccount(address: Address): Promise; + getAccount(address: Address): Promise; } export async function loadAndSyncTestWallets(provider: IAccountFetcher): Promise> { diff --git a/src/transaction.ts b/src/transaction.ts index c6e68505..a792173e 100644 --- a/src/transaction.ts +++ b/src/transaction.ts @@ -1,8 +1,7 @@ import { BigNumber } from "bignumber.js"; import { Address } from "./address"; import { TRANSACTION_MIN_GAS_PRICE, TRANSACTION_OPTIONS_DEFAULT, TRANSACTION_VERSION_DEFAULT } from "./constants"; -import { IPlainTransactionObject } from "./interface"; -import { INetworkConfig } from "./interfaceOfNetwork"; +import { INetworkConfig, IPlainTransactionObject } from "./interface"; import { interpretSignatureAsBuffer } from "./signature"; import { TransactionComputer } from "./transactionComputer"; diff --git a/src/transactionComputer.ts b/src/transactionComputer.ts index 4384c621..1d204046 100644 --- a/src/transactionComputer.ts +++ b/src/transactionComputer.ts @@ -6,7 +6,7 @@ import { TRANSACTION_OPTIONS_TX_HASH_SIGN, } from "./constants"; import * as errors from "./errors"; -import { INetworkConfig } from "./interfaceOfNetwork"; +import { INetworkConfig } from "./interface"; import { ProtoSerializer } from "./proto"; import { Transaction } from "./transaction"; diff --git a/src/transactionWatcher.ts b/src/transactionWatcher.ts index 98bf2073..3442b117 100644 --- a/src/transactionWatcher.ts +++ b/src/transactionWatcher.ts @@ -7,12 +7,12 @@ import { ErrIsCompletedFieldIsMissingOnTransaction, } from "./errors"; import { ITransactionFetcher } from "./interface"; -import { ITransactionStatus } from "./interfaceOfNetwork"; import { Logger } from "./logger"; import { TransactionEvent } from "./transactionEvents"; import { TransactionOnNetwork } from "./transactionOnNetwork"; +import { TransactionStatus } from "./transactionStatus"; -export type PredicateIsAwaitedStatus = (status: ITransactionStatus) => boolean; +export type PredicateIsAwaitedStatus = (status: TransactionStatus) => boolean; /** * Internal interface: a transaction, as seen from the perspective of a {@link TransactionWatcher}. @@ -29,7 +29,7 @@ export class TransactionWatcher { static DefaultTimeout: number = TransactionWatcher.DefaultPollingInterval * 15; static DefaultPatience: number = 0; - static NoopOnStatusReceived = (_: ITransactionStatus) => {}; + static NoopOnStatusReceived = (_: TransactionStatus) => {}; protected readonly fetcher: ITransactionFetcher; protected readonly pollingIntervalMilliseconds: number;