Merge pull request #488 from multiversx/feat/unify

Add Network provider sdk into sdk-core js

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.6.3",
+  "version": "13.7.0",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",
@@ -44,14 +44,12 @@
     "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",
     "@types/mocha": "9.1.0",
     "@types/node": "13.13.2",
     "assert": "2.0.0",
-    "axios": "^1.7.4",
     "browserify": "17.0.0",
     "chai": "4.2.0",
     "mocha": "9.2.2",
@@ -66,6 +64,7 @@
   },
   "peerDependencies": {
     "bignumber.js": "^9.0.1",
-    "protobufjs": "^7.2.6"
+    "protobufjs": "^7.2.6",
+    "axios": "^1.7.4"
   }
 }

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";

src/index.ts

@@ -33,3 +33,4 @@ export * from "./transactionWatcher";
 export * from "./transactionsFactories";
 export * from "./transactionsOutcomeParsers";
 export * from "./utils";
+export * from "./networkProviders";

src/networkProviders/accounts.ts

@@ -0,0 +1,80 @@
+import BigNumber from "bignumber.js";
+import { IAddress } from "./interface";
+import { Address } from "./primitives";
+
+/**
+ * A plain view of an account, as queried from the Network.
+ */
+export class AccountOnNetwork {
+    address: IAddress = new Address("");
+    nonce: number = 0;
+    balance: BigNumber = new BigNumber(0);
+    code: string = "";
+    userName: string = "";
+
+    constructor(init?: Partial<AccountOnNetwork>) {
+        Object.assign(this, init);
+    }
+
+    static fromHttpResponse(payload: any): AccountOnNetwork {
+        let result = new AccountOnNetwork();
+
+        result.address = new Address(payload["address"] || "");
+        result.nonce = Number(payload["nonce"] || 0);
+        result.balance = new BigNumber(payload["balance"] || 0);
+        result.code = payload["code"] || "";
+        result.userName = payload["username"] || "";
+
+        return result;
+    }
+}
+
+export class GuardianData {
+    guarded: boolean = false;
+    activeGuardian?: Guardian;
+    pendingGuardian?: Guardian;
+
+    constructor(init?: Partial<GuardianData>) {
+        Object.assign(this, init);
+    }
+
+    static fromHttpResponse(response: any): GuardianData {
+        const result = new GuardianData();
+
+        result.guarded = response["guarded"] || false;
+
+        if (response["activeGuardian"]) {
+            result.activeGuardian = Guardian.fromHttpResponse(response["activeGuardian"]);
+        }
+
+        if (response["pendingGuardian"]) {
+            result.pendingGuardian = Guardian.fromHttpResponse(response["pendingGuardian"]);
+        }
+
+        return result;
+    }
+
+    getCurrentGuardianAddress(): IAddress | undefined {
+        if (!this.guarded) {
+            return undefined;
+        }
+
+        return this.activeGuardian?.address;
+    }
+}
+
+class Guardian {
+    activationEpoch: number = 0;
+    address: IAddress = new Address("");
+    serviceUID: string = "";
+
+    static fromHttpResponse(responsePart: any): Guardian {
+        const result = new Guardian();
+
+        result.activationEpoch = Number(responsePart["activationEpoch"] || 0);
+        result.address = new Address(responsePart["address"] || "");
+        result.serviceUID = responsePart["serviceUID"] || "";
+
+        return result;
+    }
+}