Merge pull request #486 from multiversx/TOOL-262-unify-network-provid…

…ers-in-sdk-js Update folder structure and remove network providers dependency
multiversx · Oct 2, 2024 · 6ffd9d3 · 6ffd9d3
2 parents e303053 + cc5bce9
commit 6ffd9d3
Show file tree

Hide file tree

Showing 44 changed files with 35 additions and 65 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,7 +44,6 @@
     "keccak": "3.0.2"
   },
   "devDependencies": {
-    "@multiversx/sdk-network-providers": "2.6.0",
     "@multiversx/sdk-wallet": "4.5.1",
     "@types/assert": "1.4.6",
     "@types/chai": "4.2.11",

diff --git a/src/converters/transactionsConverters.spec.ts b/src/converters/transactionsConverters.spec.ts
@@ -2,11 +2,11 @@ import {
     ContractResultItem,
     ContractResults,
     TransactionEventData,
-    TransactionEvent as TransactionEventOnNetwork,
+    TransactionEventOnNetwork,
     TransactionEventTopic,
-    TransactionLogs as TransactionLogsOnNetwork,
+    TransactionLogsOnNetwork,
     TransactionOnNetwork,
-} from "@multiversx/sdk-network-providers";
+} from "../networkProviders";
 import { assert } from "chai";
 import { Address } from "../address";
 import { Transaction } from "../transaction";

diff --git a/src/index.ts b/src/index.ts
@@ -33,3 +33,4 @@ export * from "./transactionWatcher";
 export * from "./transactionsFactories";
 export * from "./transactionsOutcomeParsers";
 export * from "./utils";
+export * from "./networkProviders";
diff --git a/src-network-providers/.npmignore → src/networkProviders/.npmignore b/src-network-providers/.npmignore → src/networkProviders/.npmignore
diff --git a/src-network-providers/accounts.ts → src/networkProviders/accounts.ts b/src-network-providers/accounts.ts → src/networkProviders/accounts.ts
diff --git a/src-network-providers/apiNetworkProvider.ts → src/networkProviders/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts → src/networkProviders/apiNetworkProvider.ts
diff --git a/src-network-providers/config.ts → src/networkProviders/config.ts b/src-network-providers/config.ts → src/networkProviders/config.ts
diff --git a/src-network-providers/constants.ts → src/networkProviders/constants.ts b/src-network-providers/constants.ts → src/networkProviders/constants.ts
diff --git a/...network-providers/contractQueryRequest.ts → src/networkProviders/contractQueryRequest.ts b/...network-providers/contractQueryRequest.ts → src/networkProviders/contractQueryRequest.ts
diff --git a/...etwork-providers/contractQueryResponse.ts → ...networkProviders/contractQueryResponse.ts b/...etwork-providers/contractQueryResponse.ts → ...networkProviders/contractQueryResponse.ts
diff --git a/src-network-providers/contractResults.ts → src/networkProviders/contractResults.ts b/src-network-providers/contractResults.ts → src/networkProviders/contractResults.ts
diff --git a/src-network-providers/errors.ts → src/networkProviders/errors.ts b/src-network-providers/errors.ts → src/networkProviders/errors.ts
diff --git a/src-network-providers/index.ts → src/networkProviders/index.ts b/src-network-providers/index.ts → src/networkProviders/index.ts
@@ -4,8 +4,12 @@ export { ProxyNetworkProvider } from "./proxyNetworkProvider";
 export { AccountOnNetwork } from "./accounts";
 export { ContractQueryResponse } from "./contractQueryResponse";
 export { ContractResultItem, ContractResults } from "./contractResults";
-export { TransactionEvent, TransactionEventData, TransactionEventTopic } from "./transactionEvents";
-export { TransactionLogs } from "./transactionLogs";
+export {
+    TransactionEvent as TransactionEventOnNetwork,
+    TransactionEventData,
+    TransactionEventTopic,
+} from "./transactionEvents";
+export { TransactionLogs as TransactionLogsOnNetwork } from "./transactionLogs";
 export { TransactionReceipt } from "./transactionReceipt";
 export { TransactionStatus } from "./transactionStatus";
 export { TransactionOnNetwork } from "./transactions";
@@ -17,4 +21,3 @@ export { NetworkConfig } from "./networkConfig";
 export { NetworkGeneralStatistics } from "./networkGeneralStatistics";
 export { NetworkStake } from "./networkStake";
 export { NetworkStatus } from "./networkStatus";
-
diff --git a/src-network-providers/interface.ts → src/networkProviders/interface.ts b/src-network-providers/interface.ts → src/networkProviders/interface.ts
diff --git a/src-network-providers/networkConfig.ts → src/networkProviders/networkConfig.ts b/src-network-providers/networkConfig.ts → src/networkProviders/networkConfig.ts
diff --git a/...ork-providers/networkGeneralStatistics.ts → ...workProviders/networkGeneralStatistics.ts b/...ork-providers/networkGeneralStatistics.ts → ...workProviders/networkGeneralStatistics.ts
diff --git a/...etwork-providers/networkProviderConfig.ts → ...networkProviders/networkProviderConfig.ts b/...etwork-providers/networkProviderConfig.ts → ...networkProviders/networkProviderConfig.ts
diff --git a/src-network-providers/networkStake.ts → src/networkProviders/networkStake.ts b/src-network-providers/networkStake.ts → src/networkProviders/networkStake.ts
diff --git a/src-network-providers/networkStatus.ts → src/networkProviders/networkStatus.ts b/src-network-providers/networkStatus.ts → src/networkProviders/networkStatus.ts
diff --git a/src-network-providers/pairs.ts → src/networkProviders/pairs.ts b/src-network-providers/pairs.ts → src/networkProviders/pairs.ts
diff --git a/src-network-providers/primitives.spec.ts → src/networkProviders/primitives.spec.ts b/src-network-providers/primitives.spec.ts → src/networkProviders/primitives.spec.ts
diff --git a/src-network-providers/primitives.ts → src/networkProviders/primitives.ts b/src-network-providers/primitives.ts → src/networkProviders/primitives.ts
diff --git a/...twork-providers/providers.dev.net.spec.ts → ...etworkProviders/providers.dev.net.spec.ts b/...twork-providers/providers.dev.net.spec.ts → ...etworkProviders/providers.dev.net.spec.ts
diff --git a/...network-providers/proxyNetworkProvider.ts → src/networkProviders/proxyNetworkProvider.ts b/...network-providers/proxyNetworkProvider.ts → src/networkProviders/proxyNetworkProvider.ts
diff --git a/src-network-providers/serialization.spec.ts → src/networkProviders/serialization.spec.ts b/src-network-providers/serialization.spec.ts → src/networkProviders/serialization.spec.ts
diff --git a/...twork-providers/testscommon/dummyQuery.ts → ...etworkProviders/testscommon/dummyQuery.ts b/...twork-providers/testscommon/dummyQuery.ts → ...etworkProviders/testscommon/dummyQuery.ts
diff --git a/src-network-providers/tokenDefinitions.ts → src/networkProviders/tokenDefinitions.ts b/src-network-providers/tokenDefinitions.ts → src/networkProviders/tokenDefinitions.ts
diff --git a/src-network-providers/tokens.ts → src/networkProviders/tokens.ts b/src-network-providers/tokens.ts → src/networkProviders/tokens.ts
diff --git a/src-network-providers/transactionEvents.ts → src/networkProviders/transactionEvents.ts b/src-network-providers/transactionEvents.ts → src/networkProviders/transactionEvents.ts
diff --git a/src-network-providers/transactionLogs.ts → src/networkProviders/transactionLogs.ts b/src-network-providers/transactionLogs.ts → src/networkProviders/transactionLogs.ts
diff --git a/src-network-providers/transactionReceipt.ts → src/networkProviders/transactionReceipt.ts b/src-network-providers/transactionReceipt.ts → src/networkProviders/transactionReceipt.ts
diff --git a/src-network-providers/transactionStatus.ts → src/networkProviders/transactionStatus.ts b/src-network-providers/transactionStatus.ts → src/networkProviders/transactionStatus.ts
diff --git a/src-network-providers/transactions.ts → src/networkProviders/transactions.ts b/src-network-providers/transactions.ts → src/networkProviders/transactions.ts
diff --git a/src-network-providers/userAgent.ts → src/networkProviders/userAgent.ts b/src-network-providers/userAgent.ts → src/networkProviders/userAgent.ts
diff --git a/src/smartContractQueriesController.spec.ts b/src/smartContractQueriesController.spec.ts
@@ -1,4 +1,4 @@
-import { ContractQueryResponse } from "@multiversx/sdk-network-providers";
+import { ContractQueryResponse } from "./networkProviders";
 import BigNumber from "bignumber.js";
 import { assert } from "chai";
 import { QueryRunnerAdapter } from "./adapters/queryRunnerAdapter";

diff --git a/src/smartcontracts/interaction.spec.ts b/src/smartcontracts/interaction.spec.ts
@@ -1,4 +1,4 @@
-import { ContractQueryResponse } from "@multiversx/sdk-network-providers";
+import { ContractQueryResponse } from "../networkProviders";
 import BigNumber from "bignumber.js";
 import { assert } from "chai";
 import { Address } from "../address";

diff --git a/src/smartcontracts/resultsParser.spec.ts b/src/smartcontracts/resultsParser.spec.ts
@@ -2,12 +2,12 @@ import {
     ContractQueryResponse,
     ContractResultItem,
     ContractResults,
-    TransactionEvent,
+    TransactionEventOnNetwork,
     TransactionEventTopic,
-    TransactionLogs,
+    TransactionLogsOnNetwork,
     TransactionOnNetwork,
-} from "@multiversx/sdk-network-providers";
-import { TransactionEventData } from "@multiversx/sdk-network-providers/out/transactionEvents";
+    TransactionEventData,
+} from "../networkProviders";
 import BigNumber from "bignumber.js";
 import { assert } from "chai";
 import * as fs from "fs";
@@ -220,10 +220,10 @@ describe("test smart contract results parser", () => {
 
     it("should parse contract outcome, on signal error", async () => {
         let transaction = new TransactionOnNetwork({
-            logs: new TransactionLogs({
+            logs: new TransactionLogsOnNetwork({
                 address: Address.empty(),
                 events: [
-                    new TransactionEvent({
+                    new TransactionEventOnNetwork({
                         identifier: "signalError",
                         topics: [new TransactionEventTopic(Buffer.from("something happened").toString("base64"))],
                         data: `@${Buffer.from("user error").toString("hex")}@07`,
@@ -240,10 +240,10 @@ describe("test smart contract results parser", () => {
 
     it("should parse contract outcome, on too much gas warning", async () => {
         let transaction = new TransactionOnNetwork({
-            logs: new TransactionLogs({
+            logs: new TransactionLogsOnNetwork({
                 address: Address.empty(),
                 events: [
-                    new TransactionEvent({
+                    new TransactionEventOnNetwork({
                         identifier: "writeLog",
                         topics: [
                             new TransactionEventTopic(
@@ -269,7 +269,7 @@ describe("test smart contract results parser", () => {
         const abiRegistry = await loadAbiRegistry("src/testdata/esdt-safe.abi.json");
         const eventDefinition = abiRegistry.getEvent("deposit");
 
-        const event = new TransactionEvent({
+        const event = new TransactionEventOnNetwork({
             topics: [
                 new TransactionEventTopic("ZGVwb3NpdA=="),
                 new TransactionEventTopic("cmzC1LRt1r10pMhNAnFb+FyudjGMq4G8CefCYdQUmmc="),

diff --git a/src/smartcontracts/smartContract.spec.ts b/src/smartcontracts/smartContract.spec.ts
@@ -1,4 +1,4 @@
-import { TransactionStatus } from "@multiversx/sdk-network-providers";
+import { TransactionStatus } from "../networkProviders";
 import { assert } from "chai";
 import { Address } from "../address";
 import {

diff --git a/src/testutils/mockNetworkProvider.ts b/src/testutils/mockNetworkProvider.ts
@@ -1,9 +1,4 @@
-import {
-    ContractResultItem,
-    ContractResults,
-    TransactionOnNetwork,
-    TransactionStatus,
-} from "@multiversx/sdk-network-providers";
+import { ContractResultItem, ContractResults, TransactionOnNetwork, TransactionStatus } from "../networkProviders";
 import { Address } from "../address";
 import { AsyncTimer } from "../asyncTimer";
 import * as errors from "../errors";

diff --git a/src/testutils/networkProviders.ts b/src/testutils/networkProviders.ts
@@ -1,4 +1,4 @@
-import { ApiNetworkProvider, ProxyNetworkProvider } from "@multiversx/sdk-network-providers";
+import { ApiNetworkProvider, ProxyNetworkProvider } from "../networkProviders";
 import { IAddress } from "../interface";
 import {
     IAccountOnNetwork,

diff --git a/src/transactionWatcher.spec.ts b/src/transactionWatcher.spec.ts
@@ -1,4 +1,4 @@
-import { TransactionOnNetwork, TransactionStatus } from "@multiversx/sdk-network-providers";
+import { TransactionOnNetwork, TransactionStatus } from "./networkProviders";
 import { assert } from "chai";
 import { MarkCompleted, MockNetworkProvider, Wait } from "./testutils";
 import { TransactionHash } from "./transaction";

diff --git a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.spec.ts b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.spec.ts
@@ -3,9 +3,9 @@ import {
     ContractResults,
     TransactionEventTopic,
     TransactionOnNetwork,
-    TransactionEvent as TransactionOnNetworkEvent,
-    TransactionLogs as TransactionOnNetworkLogs,
-} from "@multiversx/sdk-network-providers";
+    TransactionEventOnNetwork,
+    TransactionLogsOnNetwork,
+} from "../networkProviders";
 import BigNumber from "bignumber.js";
 import { assert } from "chai";
 import { Address } from "../address";
@@ -60,9 +60,9 @@ describe("test smart contract transactions outcome parser", () => {
 
         const transactionOnNetwork = new TransactionOnNetwork({
             nonce: 7,
-            logs: new TransactionOnNetworkLogs({
+            logs: new TransactionLogsOnNetwork({
                 events: [
-                    new TransactionOnNetworkEvent({
+                    new TransactionEventOnNetwork({
                         identifier: "SCDeploy",
                         topics: [
                             new TransactionEventTopic(contract.getPublicKey().toString("base64")),
@@ -102,9 +102,9 @@ describe("test smart contract transactions outcome parser", () => {
 
         const transactionOnNetwork = new TransactionOnNetwork({
             nonce: 7,
-            logs: new TransactionOnNetworkLogs({
+            logs: new TransactionLogsOnNetwork({
                 events: [
-                    new TransactionOnNetworkEvent({
+                    new TransactionEventOnNetwork({
                         identifier: "signalError",
                         topics: [
                             new TransactionEventTopic(deployer.getPublicKey().toString("base64")),

diff --git a/src/transactionsOutcomeParsers/transactionEventsParser.spec.ts b/src/transactionsOutcomeParsers/transactionEventsParser.spec.ts
@@ -2,11 +2,11 @@ import {
     ContractResultItem,
     ContractResults,
     TransactionEventData,
-    TransactionEvent as TransactionEventOnNetwork,
+    TransactionEventOnNetwork,
     TransactionEventTopic,
-    TransactionLogs as TransactionLogsOnNetwork,
+    TransactionLogsOnNetwork,
     TransactionOnNetwork,
-} from "@multiversx/sdk-network-providers";
+} from "../networkProviders";
 import BigNumber from "bignumber.js";
 import { assert } from "chai";
 import { Address } from "../address";