multiversx · danielailie · Nov 13, 2024 · Nov 13, 2024 · Nov 13, 2024
diff --git a/src/smartcontracts/argSerializer.spec.ts → src/abi/argSerializer.spec.ts b/src/smartcontracts/argSerializer.spec.ts → src/abi/argSerializer.spec.ts
diff --git a/src/smartcontracts/argSerializer.ts → src/abi/argSerializer.ts b/src/smartcontracts/argSerializer.ts → src/abi/argSerializer.ts
diff --git a/src/smartcontracts/argumentErrorContext.ts → src/abi/argumentErrorContext.ts b/src/smartcontracts/argumentErrorContext.ts → src/abi/argumentErrorContext.ts
diff --git a/src/smartcontracts/code.spec.ts → src/abi/code.spec.ts b/src/smartcontracts/code.spec.ts → src/abi/code.spec.ts
diff --git a/src/smartcontracts/code.ts → src/abi/code.ts b/src/smartcontracts/code.ts → src/abi/code.ts
diff --git a/src/smartcontracts/codeMetadata.spec.ts → src/abi/codeMetadata.spec.ts b/src/smartcontracts/codeMetadata.spec.ts → src/abi/codeMetadata.spec.ts
diff --git a/src/smartcontracts/codeMetadata.ts → src/abi/codeMetadata.ts b/src/smartcontracts/codeMetadata.ts → src/abi/codeMetadata.ts
diff --git a/src/smartcontracts/codec/address.ts → src/abi/codec/address.ts b/src/smartcontracts/codec/address.ts → src/abi/codec/address.ts
diff --git a/src/smartcontracts/codec/arrayVec.ts → src/abi/codec/arrayVec.ts b/src/smartcontracts/codec/arrayVec.ts → src/abi/codec/arrayVec.ts
diff --git a/src/smartcontracts/codec/binary.spec.ts → src/abi/codec/binary.spec.ts b/src/smartcontracts/codec/binary.spec.ts → src/abi/codec/binary.spec.ts
diff --git a/src/smartcontracts/codec/binary.ts → src/abi/codec/binary.ts b/src/smartcontracts/codec/binary.ts → src/abi/codec/binary.ts
diff --git a/src/smartcontracts/codec/binaryCodecUtils.ts → src/abi/codec/binaryCodecUtils.ts b/src/smartcontracts/codec/binaryCodecUtils.ts → src/abi/codec/binaryCodecUtils.ts
diff --git a/src/smartcontracts/codec/boolean.ts → src/abi/codec/boolean.ts b/src/smartcontracts/codec/boolean.ts → src/abi/codec/boolean.ts
diff --git a/src/smartcontracts/codec/bytes.ts → src/abi/codec/bytes.ts b/src/smartcontracts/codec/bytes.ts → src/abi/codec/bytes.ts
diff --git a/src/smartcontracts/codec/codemetadata.ts → src/abi/codec/codemetadata.ts b/src/smartcontracts/codec/codemetadata.ts → src/abi/codec/codemetadata.ts
diff --git a/src/smartcontracts/codec/constants.ts → src/abi/codec/constants.ts b/src/smartcontracts/codec/constants.ts → src/abi/codec/constants.ts
diff --git a/src/smartcontracts/codec/enum.ts → src/abi/codec/enum.ts b/src/smartcontracts/codec/enum.ts → src/abi/codec/enum.ts
diff --git a/src/smartcontracts/codec/explicit-enum.ts → src/abi/codec/explicit-enum.ts b/src/smartcontracts/codec/explicit-enum.ts → src/abi/codec/explicit-enum.ts
diff --git a/src/smartcontracts/codec/fields.ts → src/abi/codec/fields.ts b/src/smartcontracts/codec/fields.ts → src/abi/codec/fields.ts
diff --git a/src/smartcontracts/codec/h256.ts → src/abi/codec/h256.ts b/src/smartcontracts/codec/h256.ts → src/abi/codec/h256.ts
diff --git a/src/smartcontracts/codec/index.ts → src/abi/codec/index.ts b/src/smartcontracts/codec/index.ts → src/abi/codec/index.ts
diff --git a/src/smartcontracts/codec/list.ts → src/abi/codec/list.ts b/src/smartcontracts/codec/list.ts → src/abi/codec/list.ts
diff --git a/src/smartcontracts/codec/managedDecimal.ts → src/abi/codec/managedDecimal.ts b/src/smartcontracts/codec/managedDecimal.ts → src/abi/codec/managedDecimal.ts
diff --git a/...rtcontracts/codec/managedDecimalSigned.ts → src/abi/codec/managedDecimalSigned.ts b/...rtcontracts/codec/managedDecimalSigned.ts → src/abi/codec/managedDecimalSigned.ts
diff --git a/src/smartcontracts/codec/nothing.ts → src/abi/codec/nothing.ts b/src/smartcontracts/codec/nothing.ts → src/abi/codec/nothing.ts
diff --git a/src/smartcontracts/codec/numerical.ts → src/abi/codec/numerical.ts b/src/smartcontracts/codec/numerical.ts → src/abi/codec/numerical.ts
diff --git a/src/smartcontracts/codec/option.ts → src/abi/codec/option.ts b/src/smartcontracts/codec/option.ts → src/abi/codec/option.ts
diff --git a/src/smartcontracts/codec/primitive.ts → src/abi/codec/primitive.ts b/src/smartcontracts/codec/primitive.ts → src/abi/codec/primitive.ts
diff --git a/src/smartcontracts/codec/string.ts → src/abi/codec/string.ts b/src/smartcontracts/codec/string.ts → src/abi/codec/string.ts
diff --git a/src/smartcontracts/codec/struct.ts → src/abi/codec/struct.ts b/src/smartcontracts/codec/struct.ts → src/abi/codec/struct.ts
diff --git a/src/smartcontracts/codec/tokenIdentifier.ts → src/abi/codec/tokenIdentifier.ts b/src/smartcontracts/codec/tokenIdentifier.ts → src/abi/codec/tokenIdentifier.ts
diff --git a/src/smartcontracts/codec/tuple.ts → src/abi/codec/tuple.ts b/src/smartcontracts/codec/tuple.ts → src/abi/codec/tuple.ts
diff --git a/src/smartcontracts/codec/utils.ts → src/abi/codec/utils.ts b/src/smartcontracts/codec/utils.ts → src/abi/codec/utils.ts
diff --git a/src/smartcontracts/function.ts → src/abi/function.ts b/src/smartcontracts/function.ts → src/abi/function.ts
diff --git a/src/smartcontracts/index.ts → src/abi/index.ts b/src/smartcontracts/index.ts → src/abi/index.ts
diff --git a/...rtcontracts/interaction.local.net.spec.ts → src/abi/interaction.local.net.spec.ts b/...rtcontracts/interaction.local.net.spec.ts → src/abi/interaction.local.net.spec.ts
@@ -1,20 +1,20 @@
 import BigNumber from "bignumber.js";
 import { assert } from "chai";
+import { promises } from "fs";
+import { QueryRunnerAdapter } from "../adapters/queryRunnerAdapter";
+import { SmartContractQueriesController } from "../smartContractQueriesController";
 import { loadAbiRegistry, loadTestWallets, prepareDeployment, TestWallet } from "../testutils";
 import { ContractController } from "../testutils/contractController";
 import { createLocalnetProvider } from "../testutils/networkProviders";
 import { Transaction } from "../transaction";
 import { TransactionComputer } from "../transactionComputer";
+import { TransactionsFactoryConfig } from "../transactionsFactories";
+import { SmartContractTransactionsFactory } from "../transactionsFactories/smartContractTransactionsFactory";
+import { TransactionWatcher } from "../transactionWatcher";
 import { Interaction } from "./interaction";
+import { ResultsParser } from "./resultsParser";
 import { ReturnCode } from "./returnCode";
 import { SmartContract } from "./smartContract";
-import { TransactionsFactoryConfig } from "../transactionsFactories/transactionsFactoryConfig";
-import { SmartContractTransactionsFactory } from "../transactionsFactories/smartContractTransactionsFactory";
-import { promises } from "fs";
-import { ResultsParser } from "./resultsParser";
-import { TransactionWatcher } from "../transactionWatcher";
-import { SmartContractQueriesController } from "../smartContractQueriesController";
-import { QueryRunnerAdapter } from "../adapters/queryRunnerAdapter";
 import { ManagedDecimalSignedValue, ManagedDecimalValue } from "./typesystem";
 
 describe("test smart contract interactor", function () {

diff --git a/src/smartcontracts/interaction.spec.ts → src/abi/interaction.spec.ts b/src/smartcontracts/interaction.spec.ts → src/abi/interaction.spec.ts
@@ -1,7 +1,7 @@
-import { ContractQueryResponse } from "../networkProviders";
 import BigNumber from "bignumber.js";
 import { assert } from "chai";
 import { Address } from "../address";
+import { ContractQueryResponse } from "../networkProviders";
 import {
     loadAbiRegistry,
     loadTestWallets,
@@ -16,8 +16,7 @@ import { ContractFunction } from "./function";
 import { Interaction } from "./interaction";
 import { ReturnCode } from "./returnCode";
 import { SmartContract } from "./smartContract";
-import { BigUIntValue, OptionalValue, OptionValue, TokenIdentifierValue, U32Value } from "./typesystem";
-import { BytesValue } from "./typesystem/bytes";
+import { BigUIntValue, BytesValue, OptionalValue, OptionValue, TokenIdentifierValue, U32Value } from "./typesystem";
 
 describe("test smart contract interactor", function () {
     let dummyAddress = new Address("erd1qqqqqqqqqqqqqpgqak8zt22wl2ph4tswtyc39namqx6ysa2sd8ss4xmlj3");

diff --git a/src/smartcontracts/interaction.ts → src/abi/interaction.ts b/src/smartcontracts/interaction.ts → src/abi/interaction.ts
diff --git a/...smartcontracts/interactionChecker.spec.ts → src/abi/interactionChecker.spec.ts b/...smartcontracts/interactionChecker.spec.ts → src/abi/interactionChecker.spec.ts
@@ -9,13 +9,13 @@ import { SmartContract } from "./smartContract";
 import {
     BigUIntType,
     BigUIntValue,
+    BytesValue,
     OptionalType,
     OptionalValue,
     OptionValue,
     TokenIdentifierValue,
     U32Value,
 } from "./typesystem";
-import { BytesValue } from "./typesystem/bytes";
 
 describe("integration tests: test checker within interactor", function () {
     let dummyAddress = new Address("erd1qqqqqqqqqqqqqpgqak8zt22wl2ph4tswtyc39namqx6ysa2sd8ss4xmlj3");

diff --git a/src/smartcontracts/interactionChecker.ts → src/abi/interactionChecker.ts b/src/smartcontracts/interactionChecker.ts → src/abi/interactionChecker.ts
diff --git a/src/smartcontracts/interface.ts → src/abi/interface.ts b/src/smartcontracts/interface.ts → src/abi/interface.ts
diff --git a/src/smartcontracts/nativeSerializer.spec.ts → src/abi/nativeSerializer.spec.ts b/src/smartcontracts/nativeSerializer.spec.ts → src/abi/nativeSerializer.spec.ts
diff --git a/src/smartcontracts/nativeSerializer.ts → src/abi/nativeSerializer.ts b/src/smartcontracts/nativeSerializer.ts → src/abi/nativeSerializer.ts
diff --git a/src/smartcontracts/query.spec.ts → src/abi/query.spec.ts b/src/smartcontracts/query.spec.ts → src/abi/query.spec.ts
diff --git a/src/smartcontracts/query.ts → src/abi/query.ts b/src/smartcontracts/query.ts → src/abi/query.ts
diff --git a/src/smartcontracts/resultsParser.spec.ts → src/abi/resultsParser.spec.ts b/src/smartcontracts/resultsParser.spec.ts → src/abi/resultsParser.spec.ts
diff --git a/src/smartcontracts/resultsParser.ts → src/abi/resultsParser.ts b/src/smartcontracts/resultsParser.ts → src/abi/resultsParser.ts
diff --git a/src/smartcontracts/returnCode.ts → src/abi/returnCode.ts b/src/smartcontracts/returnCode.ts → src/abi/returnCode.ts
diff --git a/...contracts/smartContract.local.net.spec.ts → src/abi/smartContract.local.net.spec.ts b/...contracts/smartContract.local.net.spec.ts → src/abi/smartContract.local.net.spec.ts
@@ -7,15 +7,22 @@ import { prepareDeployment } from "../testutils";
 import { createLocalnetProvider } from "../testutils/networkProviders";
 import { loadTestWallets, TestWallet } from "../testutils/wallets";
 import { TransactionComputer } from "../transactionComputer";
+import { TransactionsFactoryConfig } from "../transactionsFactories";
 import { SmartContractTransactionsFactory } from "../transactionsFactories/smartContractTransactionsFactory";
-import { TransactionsFactoryConfig } from "../transactionsFactories/transactionsFactoryConfig";
 import { TransactionWatcher } from "../transactionWatcher";
 import { decodeUnsignedNumber } from "./codec";
 import { ContractFunction } from "./function";
 import { ResultsParser } from "./resultsParser";
 import { SmartContract } from "./smartContract";
-import { AddressValue, BigUIntValue, OptionalValue, OptionValue, TokenIdentifierValue, U32Value } from "./typesystem";
-import { BytesValue } from "./typesystem/bytes";
+import {
+    AddressValue,
+    BigUIntValue,
+    BytesValue,
+    OptionalValue,
+    OptionValue,
+    TokenIdentifierValue,
+    U32Value,
+} from "./typesystem";
 
 describe("test on local testnet", function () {
     let alice: TestWallet, bob: TestWallet, carol: TestWallet;

diff --git a/src/smartcontracts/smartContract.spec.ts → src/abi/smartContract.spec.ts b/src/smartcontracts/smartContract.spec.ts → src/abi/smartContract.spec.ts
diff --git a/src/smartcontracts/smartContract.ts → src/abi/smartContract.ts b/src/smartcontracts/smartContract.ts → src/abi/smartContract.ts
diff --git a/...ts/smartContractResults.local.net.spec.ts → ...bi/smartContractResults.local.net.spec.ts b/...ts/smartContractResults.local.net.spec.ts → ...bi/smartContractResults.local.net.spec.ts
diff --git a/...tracts/transactionPayloadBuilders.spec.ts → src/abi/transactionPayloadBuilders.spec.ts b/...tracts/transactionPayloadBuilders.spec.ts → src/abi/transactionPayloadBuilders.spec.ts
diff --git a/...rtcontracts/transactionPayloadBuilders.ts → src/abi/transactionPayloadBuilders.ts b/...rtcontracts/transactionPayloadBuilders.ts → src/abi/transactionPayloadBuilders.ts
diff --git a/...tcontracts/typesystem/abiRegistry.spec.ts → src/abi/typesystem/abiRegistry.spec.ts b/...tcontracts/typesystem/abiRegistry.spec.ts → src/abi/typesystem/abiRegistry.spec.ts
diff --git a/src/smartcontracts/typesystem/abiRegistry.ts → src/abi/typesystem/abiRegistry.ts b/src/smartcontracts/typesystem/abiRegistry.ts → src/abi/typesystem/abiRegistry.ts
diff --git a/src/smartcontracts/typesystem/address.ts → src/abi/typesystem/address.ts b/src/smartcontracts/typesystem/address.ts → src/abi/typesystem/address.ts
diff --git a/src/smartcontracts/typesystem/algebraic.ts → src/abi/typesystem/algebraic.ts b/src/smartcontracts/typesystem/algebraic.ts → src/abi/typesystem/algebraic.ts
diff --git a/src/smartcontracts/typesystem/boolean.ts → src/abi/typesystem/boolean.ts b/src/smartcontracts/typesystem/boolean.ts → src/abi/typesystem/boolean.ts
diff --git a/src/smartcontracts/typesystem/bytes.ts → src/abi/typesystem/bytes.ts b/src/smartcontracts/typesystem/bytes.ts → src/abi/typesystem/bytes.ts
diff --git a/...smartcontracts/typesystem/codeMetadata.ts → src/abi/typesystem/codeMetadata.ts b/...smartcontracts/typesystem/codeMetadata.ts → src/abi/typesystem/codeMetadata.ts
diff --git a/src/smartcontracts/typesystem/collections.ts → src/abi/typesystem/collections.ts b/src/smartcontracts/typesystem/collections.ts → src/abi/typesystem/collections.ts
diff --git a/...artcontracts/typesystem/composite.spec.ts → src/abi/typesystem/composite.spec.ts b/...artcontracts/typesystem/composite.spec.ts → src/abi/typesystem/composite.spec.ts
diff --git a/src/smartcontracts/typesystem/composite.ts → src/abi/typesystem/composite.ts b/src/smartcontracts/typesystem/composite.ts → src/abi/typesystem/composite.ts
diff --git a/...martcontracts/typesystem/endpoint.spec.ts → src/abi/typesystem/endpoint.spec.ts b/...martcontracts/typesystem/endpoint.spec.ts → src/abi/typesystem/endpoint.spec.ts
diff --git a/src/smartcontracts/typesystem/endpoint.ts → src/abi/typesystem/endpoint.ts b/src/smartcontracts/typesystem/endpoint.ts → src/abi/typesystem/endpoint.ts
diff --git a/src/smartcontracts/typesystem/enum.spec.ts → src/abi/typesystem/enum.spec.ts b/src/smartcontracts/typesystem/enum.spec.ts → src/abi/typesystem/enum.spec.ts
diff --git a/src/smartcontracts/typesystem/enum.ts → src/abi/typesystem/enum.ts b/src/smartcontracts/typesystem/enum.ts → src/abi/typesystem/enum.ts
diff --git a/src/smartcontracts/typesystem/event.ts → src/abi/typesystem/event.ts b/src/smartcontracts/typesystem/event.ts → src/abi/typesystem/event.ts
diff --git a/...ontracts/typesystem/explicit-enum.spec.ts → src/abi/typesystem/explicit-enum.spec.ts b/...ontracts/typesystem/explicit-enum.spec.ts → src/abi/typesystem/explicit-enum.spec.ts
diff --git a/...martcontracts/typesystem/explicit-enum.ts → src/abi/typesystem/explicit-enum.ts b/...martcontracts/typesystem/explicit-enum.ts → src/abi/typesystem/explicit-enum.ts
diff --git a/...smartcontracts/typesystem/factory.spec.ts → src/abi/typesystem/factory.spec.ts b/...smartcontracts/typesystem/factory.spec.ts → src/abi/typesystem/factory.spec.ts
diff --git a/src/smartcontracts/typesystem/factory.ts → src/abi/typesystem/factory.ts b/src/smartcontracts/typesystem/factory.ts → src/abi/typesystem/factory.ts
diff --git a/src/smartcontracts/typesystem/fields.ts → src/abi/typesystem/fields.ts b/src/smartcontracts/typesystem/fields.ts → src/abi/typesystem/fields.ts
diff --git a/src/smartcontracts/typesystem/generic.ts → src/abi/typesystem/generic.ts b/src/smartcontracts/typesystem/generic.ts → src/abi/typesystem/generic.ts
diff --git a/...smartcontracts/typesystem/genericArray.ts → src/abi/typesystem/genericArray.ts b/...smartcontracts/typesystem/genericArray.ts → src/abi/typesystem/genericArray.ts
diff --git a/src/smartcontracts/typesystem/h256.ts → src/abi/typesystem/h256.ts b/src/smartcontracts/typesystem/h256.ts → src/abi/typesystem/h256.ts
diff --git a/src/smartcontracts/typesystem/index.ts → src/abi/typesystem/index.ts b/src/smartcontracts/typesystem/index.ts → src/abi/typesystem/index.ts
@@ -12,6 +12,7 @@ export * from "./codeMetadata";
 export * from "./composite";
 export * from "./endpoint";
 export * from "./enum";
+export * from "./event";
 export * from "./explicit-enum";
 export * from "./factory";
 export * from "./fields";

diff --git a/...ntracts/typesystem/managedDecimal.spec.ts → src/abi/typesystem/managedDecimal.spec.ts b/...ntracts/typesystem/managedDecimal.spec.ts → src/abi/typesystem/managedDecimal.spec.ts
diff --git a/...artcontracts/typesystem/managedDecimal.ts → src/abi/typesystem/managedDecimal.ts b/...artcontracts/typesystem/managedDecimal.ts → src/abi/typesystem/managedDecimal.ts
diff --git a/...tracts/typesystem/managedDecimalSigned.ts → src/abi/typesystem/managedDecimalSigned.ts b/...tracts/typesystem/managedDecimalSigned.ts → src/abi/typesystem/managedDecimalSigned.ts
diff --git a/src/smartcontracts/typesystem/matchers.ts → src/abi/typesystem/matchers.ts b/src/smartcontracts/typesystem/matchers.ts → src/abi/typesystem/matchers.ts
diff --git a/src/smartcontracts/typesystem/nothing.ts → src/abi/typesystem/nothing.ts b/src/smartcontracts/typesystem/nothing.ts → src/abi/typesystem/nothing.ts
diff --git a/src/smartcontracts/typesystem/numerical.ts → src/abi/typesystem/numerical.ts b/src/smartcontracts/typesystem/numerical.ts → src/abi/typesystem/numerical.ts
diff --git a/src/smartcontracts/typesystem/string.ts → src/abi/typesystem/string.ts b/src/smartcontracts/typesystem/string.ts → src/abi/typesystem/string.ts
diff --git a/src/smartcontracts/typesystem/struct.spec.ts → src/abi/typesystem/struct.spec.ts b/src/smartcontracts/typesystem/struct.spec.ts → src/abi/typesystem/struct.spec.ts
diff --git a/src/smartcontracts/typesystem/struct.ts → src/abi/typesystem/struct.ts b/src/smartcontracts/typesystem/struct.ts → src/abi/typesystem/struct.ts
diff --git a/...rtcontracts/typesystem/tokenIdentifier.ts → src/abi/typesystem/tokenIdentifier.ts b/...rtcontracts/typesystem/tokenIdentifier.ts → src/abi/typesystem/tokenIdentifier.ts
diff --git a/src/smartcontracts/typesystem/tuple.ts → src/abi/typesystem/tuple.ts b/src/smartcontracts/typesystem/tuple.ts → src/abi/typesystem/tuple.ts
diff --git a/...s/typesystem/typeExpressionParser.spec.ts → ...i/typesystem/typeExpressionParser.spec.ts b/...s/typesystem/typeExpressionParser.spec.ts → ...i/typesystem/typeExpressionParser.spec.ts
diff --git a/...tracts/typesystem/typeExpressionParser.ts → src/abi/typesystem/typeExpressionParser.ts b/...tracts/typesystem/typeExpressionParser.ts → src/abi/typesystem/typeExpressionParser.ts
diff --git a/...rtcontracts/typesystem/typeMapper.spec.ts → src/abi/typesystem/typeMapper.spec.ts b/...rtcontracts/typesystem/typeMapper.spec.ts → src/abi/typesystem/typeMapper.spec.ts
diff --git a/src/smartcontracts/typesystem/typeMapper.ts → src/abi/typesystem/typeMapper.ts b/src/smartcontracts/typesystem/typeMapper.ts → src/abi/typesystem/typeMapper.ts
diff --git a/src/smartcontracts/typesystem/types.spec.ts → src/abi/typesystem/types.spec.ts b/src/smartcontracts/typesystem/types.spec.ts → src/abi/typesystem/types.spec.ts
diff --git a/src/smartcontracts/typesystem/types.ts → src/abi/typesystem/types.ts b/src/smartcontracts/typesystem/types.ts → src/abi/typesystem/types.ts
diff --git a/src/smartcontracts/typesystem/variadic.ts → src/abi/typesystem/variadic.ts b/src/smartcontracts/typesystem/variadic.ts → src/abi/typesystem/variadic.ts
diff --git a/src/converters/transactionsConverter.ts b/src/converters/transactionsConverter.ts
@@ -1,6 +1,6 @@
+import { ResultsParser } from "../abi";
 import { IPlainTransactionObject, ITransaction } from "../interface";
 import { IContractResultItem, ITransactionEvent, ITransactionOnNetwork } from "../interfaceOfNetwork";
-import { ResultsParser } from "../smartcontracts";
 import { Transaction } from "../transaction";
 import {
     SmartContractCallOutcome,

diff --git a/src/index.ts b/src/index.ts
@@ -6,6 +6,7 @@
 
 require("./globals");
 
+export * from "./abi";
 export * from "./account";
 export * from "./adapters";
 export * from "./address";
@@ -19,19 +20,18 @@ export * from "./interfaceOfNetwork";
 export * from "./logger";
 export * from "./message";
 export * from "./networkParams";
+export * from "./networkProviders";
 export * from "./relayedTransactionV1Builder";
 export * from "./relayedTransactionV2Builder";
 export * from "./signableMessage";
 export * from "./smartContractQueriesController";
-export * from "./smartcontracts";
 export * from "./tokenOperations";
 export * from "./tokens";
 export * from "./transaction";
 export * from "./transactionComputer";
 export * from "./transactionPayload";
-export * from "./transactionWatcher";
 export * from "./transactionsFactories";
 export * from "./transactionsOutcomeParsers";
+export * from "./transactionWatcher";
 export * from "./utils";
-export * from "./networkProviders";
 export * from "./wallet";
diff --git a/src/proto/serializer.ts b/src/proto/serializer.ts
@@ -1,9 +1,9 @@
 import BigNumber from "bignumber.js";
+import { bigIntToBuffer } from "../abi/codec/utils";
 import { Address } from "../address";
 import { TRANSACTION_OPTIONS_DEFAULT, TRANSACTION_OPTIONS_TX_GUARDED } from "../constants";
 import * as errors from "../errors";
 import { ITransaction, ITransactionValue } from "../interface";
-import { bigIntToBuffer } from "../smartcontracts/codec/utils";
 import { Transaction } from "../transaction";
 
 /**
@@ -16,7 +16,7 @@
     * Serializes a Transaction object to a Buffer. Handles low-level conversion logic and field-mappings as well.
     */
    serializeTransaction(transaction: Transaction): Buffer {
        const proto = require("./compiled").proto;

        const protoTransaction = this.convertToProtoMessage(transaction);
        const encoded = proto.Transaction.encode(protoTransaction).finish();

diff --git a/src/relayedTransactionV2Builder.ts b/src/relayedTransactionV2Builder.ts
@@ -1,7 +1,7 @@
+import { AddressValue, ArgSerializer, BytesValue, U64Value } from "./abi";
 import { ErrGasLimitShouldBe0ForInnerTransaction, ErrInvalidRelayedV2BuilderArguments } from "./errors";
 import { IAddress, IGasLimit, INonce } from "./interface";
 import { INetworkConfig } from "./interfaceOfNetwork";
-import { AddressValue, ArgSerializer, BytesValue, U64Value } from "./smartcontracts";
 import { Transaction } from "./transaction";
 import { TransactionPayload } from "./transactionPayload";
 

diff --git a/src/smartContractQueriesController.spec.ts b/src/smartContractQueriesController.spec.ts
@@ -1,12 +1,12 @@
-import { ContractQueryResponse } from "./networkProviders";
 import BigNumber from "bignumber.js";
 import { assert } from "chai";
+import { AbiRegistry, BigUIntValue, BooleanValue, BytesValue, Tuple, U16Value, U64Value } from "./abi";
 import { QueryRunnerAdapter } from "./adapters/queryRunnerAdapter";
+import { ContractQueryResponse } from "./networkProviders";
 import { SmartContractQueriesController } from "./smartContractQueriesController";
 import { SmartContractQueryResponse } from "./smartContractQuery";
-import { AbiRegistry, BigUIntValue, BooleanValue, BytesValue, Tuple, U16Value, U64Value } from "./smartcontracts";
-import { bigIntToBuffer } from "./smartcontracts/codec/utils";
 import { MockNetworkProvider, loadAbiRegistry } from "./testutils";
+import { bigIntToBuffer } from "./tokenOperations/codec";
 
 describe("test smart contract queries controller", () => {
     describe("createQuery", () => {

diff --git a/src/smartContractQueriesController.ts b/src/smartContractQueriesController.ts
@@ -1,8 +1,7 @@
+import { ArgSerializer, ContractFunction, EndpointDefinition, isTyped, NativeSerializer, ResultsParser } from "./abi";
 import { Err, ErrSmartContractQuery } from "./errors";
 import { IContractQueryResponse } from "./interfaceOfNetwork";
 import { SmartContractQuery, SmartContractQueryResponse } from "./smartContractQuery";
-import { ArgSerializer, ContractFunction, EndpointDefinition, NativeSerializer, ResultsParser } from "./smartcontracts";
-import { isTyped } from "./smartcontracts/typesystem";
 
 interface IAbi {
     getEndpoint(name: string | ContractFunction): EndpointDefinition;

diff --git a/src/testutils/contractController.ts b/src/testutils/contractController.ts
@@ -1,8 +1,6 @@
+import { Interaction, ResultsParser, TypedOutcomeBundle, UntypedOutcomeBundle } from "../abi";
 import { ITransactionOnNetwork } from "../interfaceOfNetwork";
 import { Logger } from "../logger";
-import { Interaction } from "../smartcontracts/interaction";
-import { TypedOutcomeBundle, UntypedOutcomeBundle } from "../smartcontracts/interface";
-import { ResultsParser } from "../smartcontracts/resultsParser";
 import { Transaction } from "../transaction";
 import { TransactionWatcher } from "../transactionWatcher";
 import { INetworkProvider } from "./networkProviders";

diff --git a/src/testutils/mockNetworkProvider.ts b/src/testutils/mockNetworkProvider.ts
@@ -1,4 +1,4 @@
-import { ContractResultItem, ContractResults, TransactionOnNetwork, TransactionStatus } from "../networkProviders";
+import { Query } from "../abi/query";
 import { Address } from "../address";
 import { AsyncTimer } from "../asyncTimer";
 import * as errors from "../errors";
@@ -11,7 +11,7 @@ import {
     ITransactionOnNetwork,
     ITransactionStatus,
 } from "../interfaceOfNetwork";
-import { Query } from "../smartcontracts/query";
+import { ContractResultItem, ContractResults, TransactionOnNetwork, TransactionStatus } from "../networkProviders";
 import { Transaction, TransactionHash } from "../transaction";
 import { createAccountBalance } from "./utils";
 

diff --git a/src/testutils/utils.ts b/src/testutils/utils.ts
@@ -1,10 +1,8 @@
 import BigNumber from "bignumber.js";
 import * as fs from "fs";
 import { PathLike } from "fs";
+import { AbiRegistry, Code, SmartContract, TypedValue } from "../abi";
 import { IChainID, IGasLimit } from "../interface";
-import { Code } from "../smartcontracts/code";
-import { SmartContract } from "../smartcontracts/smartContract";
-import { AbiRegistry, TypedValue } from "../smartcontracts/typesystem";
 import { Transaction } from "../transaction";
 import { TransactionWatcher } from "../transactionWatcher";
 import { getAxios } from "../utils";

diff --git a/src/tokenOperations/codec.ts b/src/tokenOperations/codec.ts
@@ -1,5 +1,5 @@
 import BigNumber from "bignumber.js";
-import * as contractsCodecUtils from "../smartcontracts/codec/utils";
+import * as contractsCodecUtils from "../abi/codec/utils";
 import * as codecUtils from "../utils.codec";
 
 export function stringToBuffer(value: string): Buffer {
@@ -22,7 +22,7 @@ export function bigIntToBuffer(value: BigNumber.Value): Buffer {
     return contractsCodecUtils.bigIntToBuffer(value);
 }
 
-export { utf8ToHex, bigIntToHex, addressToHex } from "../utils.codec";
+export { addressToHex, bigIntToHex, utf8ToHex } from "../utils.codec";
 
 export function bufferToHex(value: Buffer) {
     const hex = value.toString("hex");

diff --git a/src/tokenTransferBuilders.ts b/src/tokenTransferBuilders.ts
@@ -1,7 +1,6 @@
+import { AddressValue, ArgSerializer, BigUIntValue, BytesValue, TypedValue, U16Value, U64Value } from "./abi";
 import { Address } from "./address";
 import { IAddress, ITokenTransfer } from "./interface";
-import { ArgSerializer } from "./smartcontracts/argSerializer";
-import { AddressValue, BigUIntValue, BytesValue, TypedValue, U16Value, U64Value } from "./smartcontracts/typesystem";
 import { TokenTransfer } from "./tokens";
 import { TransactionPayload } from "./transactionPayload";
 

diff --git a/src/transactionsFactories/delegationTransactionsFactory.ts b/src/transactionsFactories/delegationTransactionsFactory.ts
@@ -1,8 +1,8 @@
+import { ArgSerializer, BigUIntValue, BytesValue, StringValue } from "../abi";
 import { Address } from "../address";
 import { DELEGATION_MANAGER_SC_ADDRESS_HEX } from "../constants";
 import { Err } from "../errors";
 import { IAddress } from "../interface";
-import { ArgSerializer, BigUIntValue, BytesValue, StringValue } from "../smartcontracts";
 import { Transaction } from "../transaction";
 import { TransactionBuilder } from "./transactionBuilder";
 

diff --git a/src/transactionsFactories/relayedTransactionsFactory.ts b/src/transactionsFactories/relayedTransactionsFactory.ts
@@ -1,8 +1,8 @@
 import BigNumber from "bignumber.js";
+import { AddressValue, ArgSerializer, BytesValue, U64Value } from "../abi";
 import { Address } from "../address";
 import { ErrInvalidInnerTransaction } from "../errors";
 import { IAddress, ITransaction } from "../interface";
-import { AddressValue, ArgSerializer, BytesValue, U64Value } from "../smartcontracts";
 import { Transaction } from "../transaction";
 
 const JSONbig = require("json-bigint");

diff --git a/src/transactionsFactories/smartContractTransactionsFactory.spec.ts b/src/transactionsFactories/smartContractTransactionsFactory.spec.ts
@@ -1,9 +1,7 @@
 import { assert } from "chai";
+import { AbiRegistry, Code, U32Value } from "../abi";
 import { Address } from "../address";
 import { Err } from "../errors";
-import { U32Value } from "../smartcontracts";
-import { Code } from "../smartcontracts/code";
-import { AbiRegistry } from "../smartcontracts/typesystem/abiRegistry";
 import { loadAbiRegistry, loadContractCode } from "../testutils/utils";
 import { Token, TokenTransfer } from "../tokens";
 import { SmartContractTransactionsFactory } from "./smartContractTransactionsFactory";

diff --git a/src/transactionsFactories/smartContractTransactionsFactory.ts b/src/transactionsFactories/smartContractTransactionsFactory.ts
@@ -1,11 +1,9 @@
+import { ArgSerializer, CodeMetadata, ContractFunction, EndpointDefinition, isTyped, NativeSerializer } from "../abi";
 import { Address } from "../address";
 import { CONTRACT_DEPLOY_ADDRESS_HEX, VM_TYPE_WASM_VM } from "../constants";
 import { Err } from "../errors";
 import { IAddress } from "../interface";
 import { Logger } from "../logger";
-import { ArgSerializer, CodeMetadata, ContractFunction, EndpointDefinition } from "../smartcontracts";
-import { NativeSerializer } from "../smartcontracts/nativeSerializer";
-import { isTyped } from "../smartcontracts/typesystem";
 import { TokenComputer, TokenTransfer } from "../tokens";
 import { Transaction } from "../transaction";
 import { byteArrayToHex, utf8ToHex } from "../utils.codec";

diff --git a/src/transactionsFactories/tokenManagementTransactionsFactory.ts b/src/transactionsFactories/tokenManagementTransactionsFactory.ts
@@ -1,9 +1,9 @@
+import { AddressValue, ArgSerializer, BigUIntValue, BytesValue, StringValue } from "../abi";
 import { Address } from "../address";
 import { ESDT_CONTRACT_ADDRESS_HEX } from "../constants";
 import { ErrBadUsage } from "../errors";
 import { IAddress } from "../interface";
 import { Logger } from "../logger";
-import { AddressValue, ArgSerializer, BigUIntValue, BytesValue, StringValue } from "../smartcontracts";
 import { Transaction } from "../transaction";
 import { TransactionBuilder } from "./transactionBuilder";
 

diff --git a/src/transactionsFactories/tokenTransfersDataBuilder.ts b/src/transactionsFactories/tokenTransfersDataBuilder.ts
@@ -1,6 +1,5 @@
+import { AddressValue, ArgSerializer, BigUIntValue, TokenIdentifierValue, TypedValue, U32Value } from "../abi";
 import { IAddress } from "../interface";
-import { ArgSerializer } from "../smartcontracts/argSerializer";
-import { AddressValue, BigUIntValue, TokenIdentifierValue, TypedValue, U32Value } from "../smartcontracts/typesystem";
 import { TokenComputer, TokenTransfer } from "../tokens";
 
 export class TokenTransfersDataBuilder {

diff --git a/src/transactionsFactories/transferTransactionsFactory.ts b/src/transactionsFactories/transferTransactionsFactory.ts
@@ -1,3 +1,4 @@
+import { AddressValue, ArgSerializer, BigUIntValue, BytesValue, TypedValue, U16Value, U64Value } from "../abi";
 import { EGLD_IDENTIFIER_FOR_MULTI_ESDTNFT_TRANSFER } from "../constants";
 import { Err, ErrBadUsage } from "../errors";
 import {
@@ -10,15 +11,6 @@ import {
     ITransactionPayload,
     ITransactionValue,
 } from "../interface";
-import {
-    AddressValue,
-    ArgSerializer,
-    BigUIntValue,
-    BytesValue,
-    TypedValue,
-    U16Value,
-    U64Value,
-} from "../smartcontracts";
 import { TokenComputer, TokenTransfer } from "../tokens";
 import { Transaction } from "../transaction";
 import { TransactionPayload } from "../transactionPayload";

diff --git a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.ts b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.ts
@@ -1,15 +1,8 @@
+import { ArgSerializer, EndpointDefinition, ResultsParser, ReturnCode, Type, UntypedOutcomeBundle } from "../abi";
 import { Address } from "../address";
 import { ARGUMENTS_SEPARATOR } from "../constants";
 import { Err } from "../errors";
 import { IContractResultItem, ITransactionEvent, ITransactionOnNetwork } from "../interfaceOfNetwork";
-import {
-    ArgSerializer,
-    EndpointDefinition,
-    ResultsParser,
-    ReturnCode,
-    Type,
-    UntypedOutcomeBundle,
-} from "../smartcontracts";
 import { SmartContractCallOutcome, TransactionOutcome, findEventsByIdentifier } from "./resources";
 
 enum Events {

diff --git a/src/transactionsOutcomeParsers/tokenManagementTransactionsOutcomeParser.ts b/src/transactionsOutcomeParsers/tokenManagementTransactionsOutcomeParser.ts
@@ -1,8 +1,8 @@
+import { bufferToBigInt } from "../abi/codec/utils";
 import { Address } from "../address";
 import { TransactionsConverter } from "../converters/transactionsConverter";
 import { ErrParseTransactionOutcome } from "../errors";
 import { ITransactionOnNetwork } from "../interfaceOfNetwork";
-import { bufferToBigInt } from "../smartcontracts/codec/utils";
 import { TransactionEvent, TransactionOutcome, findEventsByIdentifier } from "./resources";
 
 export class TokenManagementTransactionsOutcomeParser {

diff --git a/src/transactionsOutcomeParsers/transactionEventsParser.spec.ts b/src/transactionsOutcomeParsers/transactionEventsParser.spec.ts
@@ -1,3 +1,8 @@
+import BigNumber from "bignumber.js";
+import { assert } from "chai";
+import { AbiRegistry } from "../abi";
+import { Address } from "../address";
+import { TransactionsConverter } from "../converters/transactionsConverter";
 import {
     ContractResultItem,
     ContractResults,
@@ -7,11 +12,6 @@ import {
     TransactionLogsOnNetwork,
     TransactionOnNetwork,
 } from "../networkProviders";
-import BigNumber from "bignumber.js";
-import { assert } from "chai";
-import { Address } from "../address";
-import { TransactionsConverter } from "../converters/transactionsConverter";
-import { AbiRegistry } from "../smartcontracts";
 import { loadAbiRegistry } from "../testutils";
 import { TransactionEvent, findEventsByFirstTopic } from "./resources";
 import { TransactionEventsParser } from "./transactionEventsParser";

diff --git a/src/transactionsOutcomeParsers/transactionEventsParser.ts b/src/transactionsOutcomeParsers/transactionEventsParser.ts
@@ -1,5 +1,4 @@
-import { ResultsParser } from "../smartcontracts";
-import { EventDefinition } from "../smartcontracts/typesystem/event";
+import { EventDefinition, ResultsParser } from "../abi";
 import { TransactionEvent } from "./resources";
 
 interface IAbi {

diff --git a/src/utils.codec.ts b/src/utils.codec.ts
@@ -1,7 +1,7 @@
 import BigNumber from "bignumber.js";
+import * as contractsCodecUtils from "./abi/codec/utils";
 import { Address } from "./address";
 import { IAddress } from "./interface";
-import * as contractsCodecUtils from "./smartcontracts/codec/utils";
 
 export function numberToPaddedHex(value: bigint | number | BigNumber.Value) {
     let hexableNumber: { toString(radix?: number): string };