From 058e93aa40c02d03ec5aca7a01852c93f2dd6873 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Thu, 3 Dec 2020 15:21:27 +0200
Subject: [PATCH 001/338] Sketch mnemonic class.

---
 src-wallet/mnemonic.spec.ts | 21 +++++++++++++++
 src-wallet/mnemonic.ts      | 52 +++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 src-wallet/mnemonic.spec.ts
 create mode 100644 src-wallet/mnemonic.ts

diff --git a/src-wallet/mnemonic.spec.ts b/src-wallet/mnemonic.spec.ts
new file mode 100644
index 000000000..2abfb70ce
--- /dev/null
+++ b/src-wallet/mnemonic.spec.ts
@@ -0,0 +1,21 @@
+import { assert } from "chai";
+import { Mnemonic } from "./mnemonic";
+import { TestWallets } from "../testutils";
+
+describe("test mnemonic", () => {
+    let wallets = new TestWallets();
+
+    it("should generate mnemonic", () => {
+        let mnemonic = Mnemonic.generate();
+        let words = mnemonic.getWords();
+        assert.lengthOf(words, 24);
+    });
+
+    it("should derive keys", () => {
+        let mnemonic = Mnemonic.fromString(wallets.mnemonic);
+
+        assert.equal(mnemonic.deriveKey(0).toString(), wallets.alice.privateKey);
+        assert.equal(mnemonic.deriveKey(1).toString(), wallets.bob.privateKey);
+        assert.equal(mnemonic.deriveKey(2).toString(), wallets.carol.privateKey);
+    });
+});
diff --git a/src-wallet/mnemonic.ts b/src-wallet/mnemonic.ts
new file mode 100644
index 000000000..43b77adc0
--- /dev/null
+++ b/src-wallet/mnemonic.ts
@@ -0,0 +1,52 @@
+import * as errors from "../errors";
+import { generateMnemonic, validateMnemonic, mnemonicToSeedSync } from "bip39";
+import { PrivateKey } from "./privateKey";
+import { derivePath } from "ed25519-hd-key";
+
+const MNEMONIC_STRENGTH = 256;
+const BIP44_DERIVATION_PREFIX = "m/44'/508'/0'/0'";
+
+export class Mnemonic {
+    private readonly text: string;
+
+    private constructor(text: string) {
+        this.text = text;
+    }
+
+    static generate(): Mnemonic {
+        let text = generateMnemonic(MNEMONIC_STRENGTH);
+        return new Mnemonic(text);
+    }
+
+    static fromString(text: string) {
+        text = text.trim();
+        
+        Mnemonic.assertTextIsValid(text);
+        return new Mnemonic(text);
+    }
+
+    private static assertTextIsValid(text: string) {
+        let isValid = validateMnemonic(text);
+
+        if (!isValid) {
+            throw new errors.ErrWrongMnemonic();
+        }
+    }
+
+    // TODO: Question for review: @ccorcoveanu, accountIndex or addressIndex?
+    deriveKey(index: number = 0, password: string = ""): PrivateKey {
+        let seed = mnemonicToSeedSync(this.text, password);
+        let derivationPath = `${BIP44_DERIVATION_PREFIX}/${index}'`;
+        let derivationResult = derivePath(derivationPath, seed.toString("hex"));
+        let key = derivationResult.key;
+        return new PrivateKey(key);
+    }
+
+    getWords(): string[] {
+        return this.text.split(" ");
+    }
+
+    toString(): string {
+        return this.text;
+    }
+}

From 4fe35336f14d24d64d3cb63686b4fa95c6dd35e5 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Thu, 3 Dec 2020 15:22:18 +0200
Subject: [PATCH 002/338] Sketch private key class.

---
 src-wallet/privateKey.spec.ts | 22 ++++++++++++++++++++
 src-wallet/privateKey.ts      | 38 +++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 src-wallet/privateKey.spec.ts
 create mode 100644 src-wallet/privateKey.ts

diff --git a/src-wallet/privateKey.spec.ts b/src-wallet/privateKey.spec.ts
new file mode 100644
index 000000000..9908a1b97
--- /dev/null
+++ b/src-wallet/privateKey.spec.ts
@@ -0,0 +1,22 @@
+import * as errors from "../errors";
+import { assert } from "chai";
+import { TestWallets } from "../testutils";
+import { PrivateKey } from "./privateKey";
+
+describe("test private key", () => {
+    let wallets = new TestWallets();
+
+    it("should create", () => {
+        let keyHex = wallets.alice.privateKey;
+        let fromBuffer = new PrivateKey(Buffer.from(keyHex, "hex"));
+        let fromHex = PrivateKey.fromString(keyHex);
+
+        assert.equal(fromBuffer.toString(), keyHex);
+        assert.equal(fromHex.toString(), keyHex);
+    });
+
+    it("should throw error when invalid input", () => {
+        assert.throw(() => new PrivateKey(Buffer.alloc(42)), errors.ErrInvariantFailed);
+        assert.throw(() => PrivateKey.fromString("foobar"), errors.ErrInvariantFailed);
+    });
+});
diff --git a/src-wallet/privateKey.ts b/src-wallet/privateKey.ts
new file mode 100644
index 000000000..f807bf16d
--- /dev/null
+++ b/src-wallet/privateKey.ts
@@ -0,0 +1,38 @@
+import * as errors from "../errors";
+import { guardLength } from "../utils";
+
+export class PrivateKey {
+    private readonly buffer: Buffer;
+
+    constructor(value: Buffer) {
+        guardLength(value, 32);
+        
+        this.buffer = value;
+    }
+
+    static fromString(value: string): PrivateKey {
+        guardLength(value, 64);
+
+        let buffer = Buffer.from(value, "hex");
+        return new PrivateKey(buffer);
+    }
+
+    static fromKeyFileObject() {
+
+    }
+
+    static fromPEM() {
+    }
+
+    toPEM() {
+    }
+
+    toString(): string {
+        return this.buffer.toString("hex");
+    }
+
+    valueOf(): Buffer {
+        return this.buffer;
+    }
+}
+

From fe7e0efeb642b0de19f452d63113c9584af35780 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Thu, 3 Dec 2020 20:21:24 +0200
Subject: [PATCH 003/338] Compute public keys.

---
 src-wallet/privateKey.spec.ts | 16 ++++++++++++++++
 src-wallet/privateKey.ts      | 19 ++++++++++++++-----
 src-wallet/publicKey.ts       | 20 ++++++++++++++++++++
 3 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 src-wallet/publicKey.ts

diff --git a/src-wallet/privateKey.spec.ts b/src-wallet/privateKey.spec.ts
index 9908a1b97..7a63560c1 100644
--- a/src-wallet/privateKey.spec.ts
+++ b/src-wallet/privateKey.spec.ts
@@ -15,6 +15,22 @@ describe("test private key", () => {
         assert.equal(fromHex.toString(), keyHex);
     });
 
+    it("should compute public key (and address)", () => {
+        let privateKey: PrivateKey;
+
+        privateKey = new PrivateKey(Buffer.from(wallets.alice.privateKey, "hex"));
+        assert.equal(privateKey.toPublicKey().toString(), wallets.alice.address.hex());
+        assert.isTrue(privateKey.toPublicKey().toAddress().equals(wallets.alice.address));
+
+        privateKey = new PrivateKey(Buffer.from(wallets.bob.privateKey, "hex"));
+        assert.equal(privateKey.toPublicKey().toString(), wallets.bob.address.hex());
+        assert.isTrue(privateKey.toPublicKey().toAddress().equals(wallets.bob.address));
+
+        privateKey = new PrivateKey(Buffer.from(wallets.carol.privateKey, "hex"));
+        assert.equal(privateKey.toPublicKey().toString(), wallets.carol.address.hex());
+        assert.isTrue(privateKey.toPublicKey().toAddress().equals(wallets.carol.address));
+    });
+
     it("should throw error when invalid input", () => {
         assert.throw(() => new PrivateKey(Buffer.alloc(42)), errors.ErrInvariantFailed);
         assert.throw(() => PrivateKey.fromString("foobar"), errors.ErrInvariantFailed);
diff --git a/src-wallet/privateKey.ts b/src-wallet/privateKey.ts
index f807bf16d..f5a25a15b 100644
--- a/src-wallet/privateKey.ts
+++ b/src-wallet/privateKey.ts
@@ -1,13 +1,15 @@
 import * as errors from "../errors";
+import * as tweetnacl from "tweetnacl";
 import { guardLength } from "../utils";
+import {PublicKey} from "./publicKey";
 
 export class PrivateKey {
     private readonly buffer: Buffer;
-
-    constructor(value: Buffer) {
-        guardLength(value, 32);
+    
+    constructor(buffer: Buffer) {
+        guardLength(buffer, 32);
         
-        this.buffer = value;
+        this.buffer = buffer;
     }
 
     static fromString(value: string): PrivateKey {
@@ -27,6 +29,14 @@ export class PrivateKey {
     toPEM() {
     }
 
+    toPublicKey(): PublicKey {
+        // TODO: Question for review: @ccorcoveanu, @AdoAdoAdo, here we use "fromSeed" (instead of fromSecretKey, which wouldn't work on 32-byte private keys).
+        // TODO: Question for review: is this all right?
+        let keyPair = tweetnacl.sign.keyPair.fromSeed(this.buffer);
+        let buffer = Buffer.from(keyPair.publicKey);
+        return new PublicKey(buffer);
+    }
+
     toString(): string {
         return this.buffer.toString("hex");
     }
@@ -35,4 +45,3 @@ export class PrivateKey {
         return this.buffer;
     }
 }
-
diff --git a/src-wallet/publicKey.ts b/src-wallet/publicKey.ts
new file mode 100644
index 000000000..65bf95ee0
--- /dev/null
+++ b/src-wallet/publicKey.ts
@@ -0,0 +1,20 @@
+import { Address } from "../address";
+import { guardLength } from "../utils";
+
+export class PublicKey {
+    private readonly buffer: Buffer;
+
+    constructor(buffer: Buffer) {
+        guardLength(buffer, 32);
+        
+        this.buffer = buffer;
+    }
+
+    toString(): string {
+        return this.buffer.toString("hex");
+    }
+
+    toAddress(): Address {
+        return new Address(this.buffer);
+    }
+}

From 4b7344dab158494aa179f3608c321c08693e8118 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Thu, 3 Dec 2020 20:42:53 +0200
Subject: [PATCH 004/338] WIP - Migrate toKeyFileObject.

---
 src-wallet/keyFilePayload.ts |  3 ++
 src-wallet/privateKey.ts     | 70 ++++++++++++++++++++++++++++++++++--
 2 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 src-wallet/keyFilePayload.ts

diff --git a/src-wallet/keyFilePayload.ts b/src-wallet/keyFilePayload.ts
new file mode 100644
index 000000000..7e186478e
--- /dev/null
+++ b/src-wallet/keyFilePayload.ts
@@ -0,0 +1,3 @@
+class KeyFilePayload {
+    
+}
diff --git a/src-wallet/privateKey.ts b/src-wallet/privateKey.ts
index f5a25a15b..e54b1eedd 100644
--- a/src-wallet/privateKey.ts
+++ b/src-wallet/privateKey.ts
@@ -1,14 +1,18 @@
 import * as errors from "../errors";
 import * as tweetnacl from "tweetnacl";
 import { guardLength } from "../utils";
-import {PublicKey} from "./publicKey";
+import { PublicKey } from "./publicKey";
+import nacl from "tweetnacl";
+const crypto = require("crypto");
+const uuid = require("uuid/v4");
+const scryptsy = require("scryptsy");
 
 export class PrivateKey {
     private readonly buffer: Buffer;
-    
+
     constructor(buffer: Buffer) {
         guardLength(buffer, 32);
-        
+
         this.buffer = buffer;
     }
 
@@ -19,6 +23,66 @@ export class PrivateKey {
         return new PrivateKey(buffer);
     }
 
+    /**
+     * WIP! This PR is not ready for review yet!
+     * 
+     * Copied from: https://github.com/ElrondNetwork/elrond-core-js/blob/v1.28.0/src/account.js#L76
+     * Notes: adjustements (code refactoring, no change in logic), in terms of: 
+     *  - typing (since this is the TypeScript version)
+     *  - error handling (in line with erdjs's error system)
+     *  - references to crypto functions
+     *  - references to object members
+     * 
+     * Given a password, it will generate the contents for a file containing the current initialised account's private
+     * key, passed through a password based key derivation function.
+     */
+    toKeyFileObject(password: string) {
+        let privateKey = this.buffer;
+        let publicKey = this.toPublicKey();
+
+        const salt = Buffer.from(nacl.randomBytes(32));
+        const iv = Buffer.from(nacl.randomBytes(16));
+        const [kdParams, derivedKey] = this.generateDerivedKey(password, salt);
+        const cipher = crypto.createCipheriv("aes-128-ctr", derivedKey.slice(0, 16), iv);
+        const ciphertext = Buffer.concat([cipher.update(privateKey), cipher.final()]);
+
+        const mac = crypto.createHmac("sha256", derivedKey.slice(16, 32))
+            .update(ciphertext)
+            .digest();
+
+        const id = uuid({ random: crypto.randomBytes(16) });
+
+        return {
+            version: 4,
+            id: id,
+            address: publicKey.toString(),
+            bech32: publicKey.toAddress().toString(),
+            crypto: {
+                ciphertext: ciphertext.toString("hex"),
+                cipherparams: {
+                    iv: iv.toString("hex")
+                },
+                cipher: "aes-128-ctr",
+                kdf: "scrypt",
+                kdfparams: kdParams,
+                mac: mac.toString("hex"),
+            }
+        };
+    }
+
+    private generateDerivedKey(password: string, salt: Buffer): [derivedKey: any, params: any] {
+        const kdParams = {
+            dklen: 32,
+            salt: salt.toString("hex"),
+            n: 4096,
+            r: 8,
+            p: 1,
+        };
+
+        const derivedKey = scryptsy(Buffer.from(password), salt, kdParams.n, kdParams.r, kdParams.p, kdParams.dklen);
+        return [derivedKey, kdParams];
+    }
+
     static fromKeyFileObject() {
 
     }

From c192bb4bc8a67540971ebafcb6072d29b230027d Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Mon, 7 Dec 2020 17:26:34 +0200
Subject: [PATCH 005/338] JSON keyfiles - generate and load. Tests.

---
 src-wallet/encryptedKey.spec.ts |  54 +++++++++++
 src-wallet/encryptedKey.ts      | 157 ++++++++++++++++++++++++++++++++
 src-wallet/keyFilePayload.ts    |   3 -
 src-wallet/privateKey.ts        |  69 --------------
 src-wallet/publicKey.ts         |   4 +
 5 files changed, 215 insertions(+), 72 deletions(-)
 create mode 100644 src-wallet/encryptedKey.spec.ts
 create mode 100644 src-wallet/encryptedKey.ts
 delete mode 100644 src-wallet/keyFilePayload.ts

diff --git a/src-wallet/encryptedKey.spec.ts b/src-wallet/encryptedKey.spec.ts
new file mode 100644
index 000000000..23f138dcb
--- /dev/null
+++ b/src-wallet/encryptedKey.spec.ts
@@ -0,0 +1,54 @@
+import { assert } from "chai";
+import { TestWallets } from "../testutils";
+import { PrivateKey } from "./privateKey";
+import { EncryptedKey, Randomness } from "./encryptedKey";
+
+describe("test encrypted key file", () => {
+    let wallets = new TestWallets();
+    let alice = wallets.alice;
+    let bob = wallets.bob;
+    let carol = wallets.carol;
+    let password = wallets.password;
+
+    it("should create and load encrypted files", () => {
+        let alicePrivateKey = PrivateKey.fromString(alice.privateKey);
+        let bobPrivateKey = PrivateKey.fromString(bob.privateKey);
+        let carolPrivateKey = PrivateKey.fromString(carol.privateKey);
+        
+        let aliceKeyFile = new EncryptedKey(alicePrivateKey, password);
+        let bobKeyFile = new EncryptedKey(bobPrivateKey, password);
+        let carolKeyFile = new EncryptedKey(carolPrivateKey, password);
+
+        assert.equal(aliceKeyFile.toJSON().bech32, alice.address.bech32());
+        assert.equal(bobKeyFile.toJSON().bech32, bob.address.bech32());
+        assert.equal(carolKeyFile.toJSON().bech32, carol.address.bech32());
+
+        assert.deepEqual(EncryptedKey.load(aliceKeyFile.toJSON(), password), alicePrivateKey);
+        assert.deepEqual(EncryptedKey.load(bobKeyFile.toJSON(), password), bobPrivateKey);
+        assert.deepEqual(EncryptedKey.load(carolKeyFile.toJSON(), password), carolPrivateKey);
+
+        // With provided randomness, in order to reproduce our development wallets
+
+        aliceKeyFile = new EncryptedKey(alicePrivateKey, password, new Randomness({
+            id: alice.keyFileObject.id,
+            iv: Buffer.from(alice.keyFileObject.crypto.cipherparams.iv, "hex"),
+            salt: Buffer.from(alice.keyFileObject.crypto.kdfparams.salt, "hex")
+        }));
+
+        bobKeyFile = new EncryptedKey(bobPrivateKey, password, new Randomness({
+            id: bob.keyFileObject.id,
+            iv: Buffer.from(bob.keyFileObject.crypto.cipherparams.iv, "hex"),
+            salt: Buffer.from(bob.keyFileObject.crypto.kdfparams.salt, "hex")
+        }));
+
+        carolKeyFile = new EncryptedKey(carolPrivateKey, password, new Randomness({
+            id: carol.keyFileObject.id,
+            iv: Buffer.from(carol.keyFileObject.crypto.cipherparams.iv, "hex"),
+            salt: Buffer.from(carol.keyFileObject.crypto.kdfparams.salt, "hex")
+        }));
+
+        assert.deepEqual(aliceKeyFile.toJSON(), alice.keyFileObject);
+        assert.deepEqual(bobKeyFile.toJSON(), bob.keyFileObject);
+        assert.deepEqual(carolKeyFile.toJSON(), carol.keyFileObject);
+    });
+});
diff --git a/src-wallet/encryptedKey.ts b/src-wallet/encryptedKey.ts
new file mode 100644
index 000000000..16cb54b14
--- /dev/null
+++ b/src-wallet/encryptedKey.ts
@@ -0,0 +1,157 @@
+import { PrivateKey } from "./privateKey";
+import * as errors from "../errors";
+import nacl from "tweetnacl";
+import { PublicKey } from "./publicKey";
+const crypto = require("crypto");
+const uuid = require("uuid/v4");
+const scryptsy = require("scryptsy");
+
+const Version = 4;
+const CipherAlgorithm = "aes-128-ctr";
+const DigestAlgorithm = "sha256";
+const KeyDerivationFunction = "scrypt";
+
+class ScryptKeyDerivationParams {
+    /**
+     * numIterations
+     */
+    n = 4096;
+
+    /**
+     * memFactor
+     */
+    r = 8;
+
+    /**
+     * pFactor
+     */
+    p = 1;
+
+    dklen = 32;
+}
+
+export class Randomness {
+    salt: Buffer;
+    iv: Buffer;
+    id: string;
+
+    constructor(init?: Partial<Randomness>) {
+        this.salt = init?.salt || Buffer.from(nacl.randomBytes(32));
+        this.iv = init?.iv || Buffer.from(nacl.randomBytes(16));
+        this.id = init?.id || uuid({ random: crypto.randomBytes(16) });
+    }
+}
+
+export class EncryptedKey {
+    private readonly publicKey: PublicKey;
+    private readonly randomness: Randomness;
+    private readonly ciphertext: Buffer;
+    private readonly mac: Buffer;
+    private readonly kdfparams: ScryptKeyDerivationParams;
+
+    /**
+     * WIP! This PR is not ready for review yet!
+     * 
+     * Copied from: https://github.com/ElrondNetwork/elrond-core-js/blob/v1.28.0/src/account.js#L76
+     * Notes: adjustements (code refactoring, no change in logic), in terms of: 
+     *  - typing (since this is the TypeScript version)
+     *  - error handling (in line with erdjs's error system)
+     *  - references to crypto functions
+     *  - references to object members
+     * 
+     * Given a password, it will generate the contents for a file containing the current initialised account's private
+     * key, passed through a password-based key derivation function (kdf).
+     */
+    constructor(privateKey: PrivateKey, password: string, randomness: Randomness = new Randomness()) {
+        const kdParams = new ScryptKeyDerivationParams();
+        const derivedKey = EncryptedKey.generateDerivedKey(Buffer.from(password), randomness.salt, kdParams);
+        const derivedKeyFirstHalf = derivedKey.slice(0, 16);
+        const derivedKeySecondHalf = derivedKey.slice(16, 32);
+        const cipher = crypto.createCipheriv(CipherAlgorithm, derivedKeyFirstHalf, randomness.iv);
+
+        const text = Buffer.concat([privateKey.valueOf(), privateKey.toPublicKey().valueOf()]);
+        const ciphertext = Buffer.concat([cipher.update(text), cipher.final()]);
+        const mac = crypto.createHmac(DigestAlgorithm, derivedKeySecondHalf).update(ciphertext).digest();
+
+        this.publicKey = privateKey.toPublicKey();
+        this.randomness = randomness;
+        this.ciphertext = ciphertext;
+        this.mac = mac;
+        this.kdfparams = kdParams;
+    }
+
+    /**
+     * WIP! This PR is not ready for review yet!
+     * 
+     * Copied from: https://github.com/ElrondNetwork/elrond-core-js/blob/v1.28.0/src/account.js#L42
+     * Notes: adjustements (code refactoring, no change in logic), in terms of: 
+     *  - typing (since this is the TypeScript version)
+     *  - error handling (in line with erdjs's error system)
+     *  - references to crypto functions
+     *  - references to object members
+     * 
+     * From an encrypted keyfile, given the password, load the private key and the public key.
+     */
+    static load(keyFileObject: any, password: string): PrivateKey {
+        const kdfparams = keyFileObject.crypto.kdfparams;
+        const salt = Buffer.from(kdfparams.salt, "hex");
+        const iv = Buffer.from(keyFileObject.crypto.cipherparams.iv, "hex");
+        const ciphertext = Buffer.from(keyFileObject.crypto.ciphertext, "hex");
+        const derivedKey = EncryptedKey.generateDerivedKey(Buffer.from(password), salt, kdfparams);
+        const derivedKeyFirstHalf = derivedKey.slice(0, 16);
+        const derivedKeySecondHalf = derivedKey.slice(16, 32);
+        
+        const computedMAC = crypto.createHmac(DigestAlgorithm, derivedKeySecondHalf).update(ciphertext).digest();
+        const actualMAC = keyFileObject.crypto.mac;
+
+        if (computedMAC.toString("hex") !== actualMAC) {
+            throw new errors.ErrWallet("MAC mismatch, possibly wrong password");
+        }
+
+        const decipher = crypto.createDecipheriv(keyFileObject.crypto.cipher, derivedKeyFirstHalf, iv);
+
+        let text = Buffer.concat([decipher.update(ciphertext), decipher.final()]);
+        while (text.length < 32) {
+            let zeroPadding = Buffer.from([0x00]);
+            text = Buffer.concat([zeroPadding, text]);
+        }
+
+        let seed = text.slice(0, 32);
+        return new PrivateKey(seed);
+    }
+
+    // TODO: load() (static), then decrypt(password)...
+
+    private static generateDerivedKey(password: Buffer, salt: Buffer, kdfparams: ScryptKeyDerivationParams): Buffer {
+        // Question for review: @ccorcoveanu, why not this implementation?
+        // https://nodejs.org/api/crypto.html#crypto_crypto_scrypt_password_salt_keylen_options_callback
+        const derivedKey = scryptsy(password, salt, kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen);
+        return derivedKey;
+    }
+
+    /**
+     * Converts the encrypted keyfile to plain JavaScript object.
+     */
+    toJSON(): any {
+        return {
+            version: Version,
+            id: this.randomness.id,
+            address: this.publicKey.toString(),
+            bech32: this.publicKey.toAddress().toString(),
+            crypto: {
+                ciphertext: this.ciphertext.toString("hex"),
+                cipherparams: { iv: this.randomness.iv.toString("hex") },
+                cipher: CipherAlgorithm,
+                kdf: KeyDerivationFunction,
+                kdfparams: {
+                    dklen: this.kdfparams.dklen,
+                    salt: this.randomness.salt.toString("hex"),
+                    n: this.kdfparams.n,
+                    r: this.kdfparams.r,
+                    p: this.kdfparams.p
+                },
+                mac: this.mac.toString("hex"),
+            }
+        };
+    }
+}
diff --git a/src-wallet/keyFilePayload.ts b/src-wallet/keyFilePayload.ts
deleted file mode 100644
index 7e186478e..000000000
--- a/src-wallet/keyFilePayload.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-class KeyFilePayload {
-    
-}
diff --git a/src-wallet/privateKey.ts b/src-wallet/privateKey.ts
index e54b1eedd..2922153de 100644
--- a/src-wallet/privateKey.ts
+++ b/src-wallet/privateKey.ts
@@ -1,11 +1,6 @@
-import * as errors from "../errors";
 import * as tweetnacl from "tweetnacl";
 import { guardLength } from "../utils";
 import { PublicKey } from "./publicKey";
-import nacl from "tweetnacl";
-const crypto = require("crypto");
-const uuid = require("uuid/v4");
-const scryptsy = require("scryptsy");
 
 export class PrivateKey {
     private readonly buffer: Buffer;
@@ -23,70 +18,6 @@ export class PrivateKey {
         return new PrivateKey(buffer);
     }
 
-    /**
-     * WIP! This PR is not ready for review yet!
-     * 
-     * Copied from: https://github.com/ElrondNetwork/elrond-core-js/blob/v1.28.0/src/account.js#L76
-     * Notes: adjustements (code refactoring, no change in logic), in terms of: 
-     *  - typing (since this is the TypeScript version)
-     *  - error handling (in line with erdjs's error system)
-     *  - references to crypto functions
-     *  - references to object members
-     * 
-     * Given a password, it will generate the contents for a file containing the current initialised account's private
-     * key, passed through a password based key derivation function.
-     */
-    toKeyFileObject(password: string) {
-        let privateKey = this.buffer;
-        let publicKey = this.toPublicKey();
-
-        const salt = Buffer.from(nacl.randomBytes(32));
-        const iv = Buffer.from(nacl.randomBytes(16));
-        const [kdParams, derivedKey] = this.generateDerivedKey(password, salt);
-        const cipher = crypto.createCipheriv("aes-128-ctr", derivedKey.slice(0, 16), iv);
-        const ciphertext = Buffer.concat([cipher.update(privateKey), cipher.final()]);
-
-        const mac = crypto.createHmac("sha256", derivedKey.slice(16, 32))
-            .update(ciphertext)
-            .digest();
-
-        const id = uuid({ random: crypto.randomBytes(16) });
-
-        return {
-            version: 4,
-            id: id,
-            address: publicKey.toString(),
-            bech32: publicKey.toAddress().toString(),
-            crypto: {
-                ciphertext: ciphertext.toString("hex"),
-                cipherparams: {
-                    iv: iv.toString("hex")
-                },
-                cipher: "aes-128-ctr",
-                kdf: "scrypt",
-                kdfparams: kdParams,
-                mac: mac.toString("hex"),
-            }
-        };
-    }
-
-    private generateDerivedKey(password: string, salt: Buffer): [derivedKey: any, params: any] {
-        const kdParams = {
-            dklen: 32,
-            salt: salt.toString("hex"),
-            n: 4096,
-            r: 8,
-            p: 1,
-        };
-
-        const derivedKey = scryptsy(Buffer.from(password), salt, kdParams.n, kdParams.r, kdParams.p, kdParams.dklen);
-        return [derivedKey, kdParams];
-    }
-
-    static fromKeyFileObject() {
-
-    }
-
     static fromPEM() {
     }
 
diff --git a/src-wallet/publicKey.ts b/src-wallet/publicKey.ts
index 65bf95ee0..4f4cf1a12 100644
--- a/src-wallet/publicKey.ts
+++ b/src-wallet/publicKey.ts
@@ -17,4 +17,8 @@ export class PublicKey {
     toAddress(): Address {
         return new Address(this.buffer);
     }
+
+    valueOf(): Buffer {
+        return this.buffer;
+    }
 }

From 7afc3b7f8102f9348f75eda6555e1d9719884cbc Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 9 Dec 2020 09:27:33 +0200
Subject: [PATCH 006/338] Bit of benchmarking for scryptsy.

---
 src-wallet/encryptedKey.spec.ts | 8 +++++++-
 src-wallet/encryptedKey.ts      | 7 +++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src-wallet/encryptedKey.spec.ts b/src-wallet/encryptedKey.spec.ts
index 23f138dcb..6dd2897b5 100644
--- a/src-wallet/encryptedKey.spec.ts
+++ b/src-wallet/encryptedKey.spec.ts
@@ -10,22 +10,28 @@ describe("test encrypted key file", () => {
     let carol = wallets.carol;
     let password = wallets.password;
 
-    it("should create and load encrypted files", () => {
+    it("should create and load encrypted files", function() {
+        this.timeout(10000);
+
         let alicePrivateKey = PrivateKey.fromString(alice.privateKey);
         let bobPrivateKey = PrivateKey.fromString(bob.privateKey);
         let carolPrivateKey = PrivateKey.fromString(carol.privateKey);
         
+        console.time("encrypt");
         let aliceKeyFile = new EncryptedKey(alicePrivateKey, password);
         let bobKeyFile = new EncryptedKey(bobPrivateKey, password);
         let carolKeyFile = new EncryptedKey(carolPrivateKey, password);
+        console.timeEnd("encrypt");
 
         assert.equal(aliceKeyFile.toJSON().bech32, alice.address.bech32());
         assert.equal(bobKeyFile.toJSON().bech32, bob.address.bech32());
         assert.equal(carolKeyFile.toJSON().bech32, carol.address.bech32());
 
+        console.time("decrypt");
         assert.deepEqual(EncryptedKey.load(aliceKeyFile.toJSON(), password), alicePrivateKey);
         assert.deepEqual(EncryptedKey.load(bobKeyFile.toJSON(), password), bobPrivateKey);
         assert.deepEqual(EncryptedKey.load(carolKeyFile.toJSON(), password), carolPrivateKey);
+        console.timeEnd("decrypt");
 
         // With provided randomness, in order to reproduce our development wallets
 
diff --git a/src-wallet/encryptedKey.ts b/src-wallet/encryptedKey.ts
index 16cb54b14..849f4f027 100644
--- a/src-wallet/encryptedKey.ts
+++ b/src-wallet/encryptedKey.ts
@@ -122,6 +122,13 @@ export class EncryptedKey {
 
     // TODO: load() (static), then decrypt(password)...
 
+    /**
+     * Will take about:
+     *  - 80-90 ms in Node.js, on a i3-8100 CPU @ 3.60GHz
+     *  - 350-360 ms in browser (Firefox), on a i3-8100 CPU @ 3.60GHz
+     * 
+     * TODO: Question for review: @ccorcoveanu, @AdoAdoAdo, is this all right?
+     */
     private static generateDerivedKey(password: Buffer, salt: Buffer, kdfparams: ScryptKeyDerivationParams): Buffer {
         // Question for review: @ccorcoveanu, why not this implementation?
         // https://nodejs.org/api/crypto.html#crypto_crypto_scrypt_password_salt_keylen_options_callback

From 661d6a326678f29f6b518aeb50d2fbac9ff4565a Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 9 Dec 2020 14:28:12 +0200
Subject: [PATCH 007/338] Sketch BLS migration.

---
 src-wallet/validatorKey.spec.ts | 19 +++++++++++++++
 src-wallet/validatorKey.ts      | 41 +++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 src-wallet/validatorKey.spec.ts
 create mode 100644 src-wallet/validatorKey.ts

diff --git a/src-wallet/validatorKey.spec.ts b/src-wallet/validatorKey.spec.ts
new file mode 100644
index 000000000..e4eb357d6
--- /dev/null
+++ b/src-wallet/validatorKey.spec.ts
@@ -0,0 +1,19 @@
+import * as errors from "../errors";
+import { assert } from "chai";
+import { TestWallets } from "../testutils";
+import { BLS, ValidatorKey } from "./validatorKey";
+
+describe("test validator key", () => {
+    let wallets = new TestWallets();
+
+    it("should create", async () => {
+        await BLS.initIfNecessary();
+        let privateKey = Buffer.from(Buffer.from("N2NmZjk5YmQ2NzE1MDJkYjdkMTViYzhhYmMwYzlhODA0ZmI5MjU0MDZmYmRkNTBmMWU0YzE3YTRjZDc3NDI0Nw==", "base64").toString(), "hex");
+        let key = new ValidatorKey(privateKey);
+        assert.equal(key.toString(), "e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208");
+
+        privateKey = Buffer.from(Buffer.from("ODA4NWJhMWQ3ZjdjM2RiOTM4YWQ3MDU5NWEyYmRhYjA5NjQ0ZjFlYzM4MDNiZTE3MWMzM2YxNGJjODBkNGUzYg==", "base64").toString(), "hex");
+        key = new ValidatorKey(privateKey);
+        assert.equal(key.toString(), "78689fd4b1e2e434d567fe01e61598a42717d83124308266bd09ccc15d2339dd318c019914b86ac29adbae5dd8a02d0307425e9bd85a296e94943708c72f8c670f0b7c50a890a5719088dbd9f1d062cad9acffa06df834106eebe1a4257ef00d");
+    });
+});
diff --git a/src-wallet/validatorKey.ts b/src-wallet/validatorKey.ts
new file mode 100644
index 000000000..c32c730a8
--- /dev/null
+++ b/src-wallet/validatorKey.ts
@@ -0,0 +1,41 @@
+import { guardLength } from "../utils";
+
+const bls = require('@elrondnetwork/bls-wasm');
+
+export class BLS {
+    private static isInitialized: boolean = false;
+
+    static async initIfNecessary() {
+        if (BLS.isInitialized) {
+            return;
+        }
+
+        await bls.init(bls.BLS12_381);
+
+        BLS.isInitialized = true;
+    }
+}
+
+export class ValidatorKey {
+    private readonly secretKey: any;
+    private readonly publicKey: any;
+
+    constructor(buffer: Buffer) {
+        guardLength(buffer, 32);
+
+        this.secretKey = new bls.SecretKey();
+        this.secretKey.setLittleEndian(Uint8Array.from(buffer));
+        this.publicKey = this.secretKey.getPublicKey();
+    }
+
+    sign(message: Buffer): Buffer {
+        let signatureObject = this.secretKey.sign(message);
+        let signature = signatureObject.serialize();
+        return signature;
+    }
+
+    toString(): string {
+        return Buffer.from(this.publicKey.serialize()).toString("hex");
+    }
+}
+

From 77d7244866188c1a6af53f980b17b1f319d6cdff Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Mon, 11 Jan 2021 14:15:48 +0200
Subject: [PATCH 008/338] Fix, test signing.

---
 src-wallet/validatorKey.spec.ts | 8 +++++++-
 src-wallet/validatorKey.ts      | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src-wallet/validatorKey.spec.ts b/src-wallet/validatorKey.spec.ts
index e4eb357d6..ea0ab634a 100644
--- a/src-wallet/validatorKey.spec.ts
+++ b/src-wallet/validatorKey.spec.ts
@@ -1,4 +1,3 @@
-import * as errors from "../errors";
 import { assert } from "chai";
 import { TestWallets } from "../testutils";
 import { BLS, ValidatorKey } from "./validatorKey";
@@ -8,12 +7,19 @@ describe("test validator key", () => {
 
     it("should create", async () => {
         await BLS.initIfNecessary();
+
         let privateKey = Buffer.from(Buffer.from("N2NmZjk5YmQ2NzE1MDJkYjdkMTViYzhhYmMwYzlhODA0ZmI5MjU0MDZmYmRkNTBmMWU0YzE3YTRjZDc3NDI0Nw==", "base64").toString(), "hex");
         let key = new ValidatorKey(privateKey);
         assert.equal(key.toString(), "e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208");
 
+        let signature = key.sign(Buffer.from("hello"));
+        assert.equal(signature.toString("hex"), "84fd0a3a9d4f1ea2d4b40c6da67f9b786284a1c3895b7253fec7311597cda3f757862bb0690a92a13ce612c33889fd86");
+
         privateKey = Buffer.from(Buffer.from("ODA4NWJhMWQ3ZjdjM2RiOTM4YWQ3MDU5NWEyYmRhYjA5NjQ0ZjFlYzM4MDNiZTE3MWMzM2YxNGJjODBkNGUzYg==", "base64").toString(), "hex");
         key = new ValidatorKey(privateKey);
         assert.equal(key.toString(), "78689fd4b1e2e434d567fe01e61598a42717d83124308266bd09ccc15d2339dd318c019914b86ac29adbae5dd8a02d0307425e9bd85a296e94943708c72f8c670f0b7c50a890a5719088dbd9f1d062cad9acffa06df834106eebe1a4257ef00d");
+
+        signature = key.sign(Buffer.from("hello"));
+        assert.equal(signature.toString("hex"), "be2e593ff10899a2ee8e1d5c8094e36c9f48e04b87e129991ff09475808743e07bb41bf6e7bc1463fa554c4b46594b98");
     });
 });
diff --git a/src-wallet/validatorKey.ts b/src-wallet/validatorKey.ts
index c32c730a8..97b0a9760 100644
--- a/src-wallet/validatorKey.ts
+++ b/src-wallet/validatorKey.ts
@@ -30,7 +30,7 @@ export class ValidatorKey {
 
     sign(message: Buffer): Buffer {
         let signatureObject = this.secretKey.sign(message);
-        let signature = signatureObject.serialize();
+        let signature = Buffer.from(signatureObject.serialize());
         return signature;
     }
 

From df33d2cd196ee0a78d00d1803bc9e5567a5e64f8 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Mon, 11 Jan 2021 19:53:06 +0200
Subject: [PATCH 009/338] Rename files, re-group.

---
 src-wallet/encryptedKey.spec.ts               |  60 ----------
 src-wallet/mnemonic.spec.ts                   |  21 ----
 src-wallet/mnemonic.ts                        |   6 +-
 src-wallet/privateKey.spec.ts                 |  38 ------
 src-wallet/privateKey.ts                      |  42 -------
 src-wallet/publicKey.ts                       |  24 ----
 src-wallet/userKeys.ts                        |  68 +++++++++++
 src-wallet/{encryptedKey.ts => userWallet.ts} |  94 +++++++--------
 src-wallet/users.spec.ts                      | 110 ++++++++++++++++++
 .../{validatorKey.ts => validatorKeys.ts}     |  13 ++-
 ...alidatorKey.spec.ts => validators.spec.ts} |  16 ++-
 11 files changed, 247 insertions(+), 245 deletions(-)
 delete mode 100644 src-wallet/encryptedKey.spec.ts
 delete mode 100644 src-wallet/mnemonic.spec.ts
 delete mode 100644 src-wallet/privateKey.spec.ts
 delete mode 100644 src-wallet/privateKey.ts
 delete mode 100644 src-wallet/publicKey.ts
 create mode 100644 src-wallet/userKeys.ts
 rename src-wallet/{encryptedKey.ts => userWallet.ts} (82%)
 create mode 100644 src-wallet/users.spec.ts
 rename src-wallet/{validatorKey.ts => validatorKeys.ts} (85%)
 rename src-wallet/{validatorKey.spec.ts => validators.spec.ts} (72%)

diff --git a/src-wallet/encryptedKey.spec.ts b/src-wallet/encryptedKey.spec.ts
deleted file mode 100644
index 6dd2897b5..000000000
--- a/src-wallet/encryptedKey.spec.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { assert } from "chai";
-import { TestWallets } from "../testutils";
-import { PrivateKey } from "./privateKey";
-import { EncryptedKey, Randomness } from "./encryptedKey";
-
-describe("test encrypted key file", () => {
-    let wallets = new TestWallets();
-    let alice = wallets.alice;
-    let bob = wallets.bob;
-    let carol = wallets.carol;
-    let password = wallets.password;
-
-    it("should create and load encrypted files", function() {
-        this.timeout(10000);
-
-        let alicePrivateKey = PrivateKey.fromString(alice.privateKey);
-        let bobPrivateKey = PrivateKey.fromString(bob.privateKey);
-        let carolPrivateKey = PrivateKey.fromString(carol.privateKey);
-        
-        console.time("encrypt");
-        let aliceKeyFile = new EncryptedKey(alicePrivateKey, password);
-        let bobKeyFile = new EncryptedKey(bobPrivateKey, password);
-        let carolKeyFile = new EncryptedKey(carolPrivateKey, password);
-        console.timeEnd("encrypt");
-
-        assert.equal(aliceKeyFile.toJSON().bech32, alice.address.bech32());
-        assert.equal(bobKeyFile.toJSON().bech32, bob.address.bech32());
-        assert.equal(carolKeyFile.toJSON().bech32, carol.address.bech32());
-
-        console.time("decrypt");
-        assert.deepEqual(EncryptedKey.load(aliceKeyFile.toJSON(), password), alicePrivateKey);
-        assert.deepEqual(EncryptedKey.load(bobKeyFile.toJSON(), password), bobPrivateKey);
-        assert.deepEqual(EncryptedKey.load(carolKeyFile.toJSON(), password), carolPrivateKey);
-        console.timeEnd("decrypt");
-
-        // With provided randomness, in order to reproduce our development wallets
-
-        aliceKeyFile = new EncryptedKey(alicePrivateKey, password, new Randomness({
-            id: alice.keyFileObject.id,
-            iv: Buffer.from(alice.keyFileObject.crypto.cipherparams.iv, "hex"),
-            salt: Buffer.from(alice.keyFileObject.crypto.kdfparams.salt, "hex")
-        }));
-
-        bobKeyFile = new EncryptedKey(bobPrivateKey, password, new Randomness({
-            id: bob.keyFileObject.id,
-            iv: Buffer.from(bob.keyFileObject.crypto.cipherparams.iv, "hex"),
-            salt: Buffer.from(bob.keyFileObject.crypto.kdfparams.salt, "hex")
-        }));
-
-        carolKeyFile = new EncryptedKey(carolPrivateKey, password, new Randomness({
-            id: carol.keyFileObject.id,
-            iv: Buffer.from(carol.keyFileObject.crypto.cipherparams.iv, "hex"),
-            salt: Buffer.from(carol.keyFileObject.crypto.kdfparams.salt, "hex")
-        }));
-
-        assert.deepEqual(aliceKeyFile.toJSON(), alice.keyFileObject);
-        assert.deepEqual(bobKeyFile.toJSON(), bob.keyFileObject);
-        assert.deepEqual(carolKeyFile.toJSON(), carol.keyFileObject);
-    });
-});
diff --git a/src-wallet/mnemonic.spec.ts b/src-wallet/mnemonic.spec.ts
deleted file mode 100644
index 2abfb70ce..000000000
--- a/src-wallet/mnemonic.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { assert } from "chai";
-import { Mnemonic } from "./mnemonic";
-import { TestWallets } from "../testutils";
-
-describe("test mnemonic", () => {
-    let wallets = new TestWallets();
-
-    it("should generate mnemonic", () => {
-        let mnemonic = Mnemonic.generate();
-        let words = mnemonic.getWords();
-        assert.lengthOf(words, 24);
-    });
-
-    it("should derive keys", () => {
-        let mnemonic = Mnemonic.fromString(wallets.mnemonic);
-
-        assert.equal(mnemonic.deriveKey(0).toString(), wallets.alice.privateKey);
-        assert.equal(mnemonic.deriveKey(1).toString(), wallets.bob.privateKey);
-        assert.equal(mnemonic.deriveKey(2).toString(), wallets.carol.privateKey);
-    });
-});
diff --git a/src-wallet/mnemonic.ts b/src-wallet/mnemonic.ts
index 43b77adc0..ede903f5c 100644
--- a/src-wallet/mnemonic.ts
+++ b/src-wallet/mnemonic.ts
@@ -1,6 +1,6 @@
 import * as errors from "../errors";
 import { generateMnemonic, validateMnemonic, mnemonicToSeedSync } from "bip39";
-import { PrivateKey } from "./privateKey";
+import { UserPrivateKey } from "./userKeys";
 import { derivePath } from "ed25519-hd-key";
 
 const MNEMONIC_STRENGTH = 256;
@@ -34,12 +34,12 @@ export class Mnemonic {
     }
 
     // TODO: Question for review: @ccorcoveanu, accountIndex or addressIndex?
-    deriveKey(index: number = 0, password: string = ""): PrivateKey {
+    deriveKey(index: number = 0, password: string = ""): UserPrivateKey {
         let seed = mnemonicToSeedSync(this.text, password);
         let derivationPath = `${BIP44_DERIVATION_PREFIX}/${index}'`;
         let derivationResult = derivePath(derivationPath, seed.toString("hex"));
         let key = derivationResult.key;
-        return new PrivateKey(key);
+        return new UserPrivateKey(key);
     }
 
     getWords(): string[] {
diff --git a/src-wallet/privateKey.spec.ts b/src-wallet/privateKey.spec.ts
deleted file mode 100644
index 7a63560c1..000000000
--- a/src-wallet/privateKey.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import * as errors from "../errors";
-import { assert } from "chai";
-import { TestWallets } from "../testutils";
-import { PrivateKey } from "./privateKey";
-
-describe("test private key", () => {
-    let wallets = new TestWallets();
-
-    it("should create", () => {
-        let keyHex = wallets.alice.privateKey;
-        let fromBuffer = new PrivateKey(Buffer.from(keyHex, "hex"));
-        let fromHex = PrivateKey.fromString(keyHex);
-
-        assert.equal(fromBuffer.toString(), keyHex);
-        assert.equal(fromHex.toString(), keyHex);
-    });
-
-    it("should compute public key (and address)", () => {
-        let privateKey: PrivateKey;
-
-        privateKey = new PrivateKey(Buffer.from(wallets.alice.privateKey, "hex"));
-        assert.equal(privateKey.toPublicKey().toString(), wallets.alice.address.hex());
-        assert.isTrue(privateKey.toPublicKey().toAddress().equals(wallets.alice.address));
-
-        privateKey = new PrivateKey(Buffer.from(wallets.bob.privateKey, "hex"));
-        assert.equal(privateKey.toPublicKey().toString(), wallets.bob.address.hex());
-        assert.isTrue(privateKey.toPublicKey().toAddress().equals(wallets.bob.address));
-
-        privateKey = new PrivateKey(Buffer.from(wallets.carol.privateKey, "hex"));
-        assert.equal(privateKey.toPublicKey().toString(), wallets.carol.address.hex());
-        assert.isTrue(privateKey.toPublicKey().toAddress().equals(wallets.carol.address));
-    });
-
-    it("should throw error when invalid input", () => {
-        assert.throw(() => new PrivateKey(Buffer.alloc(42)), errors.ErrInvariantFailed);
-        assert.throw(() => PrivateKey.fromString("foobar"), errors.ErrInvariantFailed);
-    });
-});
diff --git a/src-wallet/privateKey.ts b/src-wallet/privateKey.ts
deleted file mode 100644
index 2922153de..000000000
--- a/src-wallet/privateKey.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import * as tweetnacl from "tweetnacl";
-import { guardLength } from "../utils";
-import { PublicKey } from "./publicKey";
-
-export class PrivateKey {
-    private readonly buffer: Buffer;
-
-    constructor(buffer: Buffer) {
-        guardLength(buffer, 32);
-
-        this.buffer = buffer;
-    }
-
-    static fromString(value: string): PrivateKey {
-        guardLength(value, 64);
-
-        let buffer = Buffer.from(value, "hex");
-        return new PrivateKey(buffer);
-    }
-
-    static fromPEM() {
-    }
-
-    toPEM() {
-    }
-
-    toPublicKey(): PublicKey {
-        // TODO: Question for review: @ccorcoveanu, @AdoAdoAdo, here we use "fromSeed" (instead of fromSecretKey, which wouldn't work on 32-byte private keys).
-        // TODO: Question for review: is this all right?
-        let keyPair = tweetnacl.sign.keyPair.fromSeed(this.buffer);
-        let buffer = Buffer.from(keyPair.publicKey);
-        return new PublicKey(buffer);
-    }
-
-    toString(): string {
-        return this.buffer.toString("hex");
-    }
-
-    valueOf(): Buffer {
-        return this.buffer;
-    }
-}
diff --git a/src-wallet/publicKey.ts b/src-wallet/publicKey.ts
deleted file mode 100644
index 4f4cf1a12..000000000
--- a/src-wallet/publicKey.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Address } from "../address";
-import { guardLength } from "../utils";
-
-export class PublicKey {
-    private readonly buffer: Buffer;
-
-    constructor(buffer: Buffer) {
-        guardLength(buffer, 32);
-        
-        this.buffer = buffer;
-    }
-
-    toString(): string {
-        return this.buffer.toString("hex");
-    }
-
-    toAddress(): Address {
-        return new Address(this.buffer);
-    }
-
-    valueOf(): Buffer {
-        return this.buffer;
-    }
-}
diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
new file mode 100644
index 000000000..5adcb0467
--- /dev/null
+++ b/src-wallet/userKeys.ts
@@ -0,0 +1,68 @@
+import * as tweetnacl from "tweetnacl";
+import { Address } from "../address";
+import { guardLength } from "../utils";
+
+export const SEED_LENGTH = 32;
+
+export class UserPrivateKey {
+    private readonly buffer: Buffer;
+
+    constructor(buffer: Buffer) {
+        guardLength(buffer, SEED_LENGTH);
+
+        this.buffer = buffer;
+    }
+
+    static fromString(value: string): UserPrivateKey {
+        guardLength(value, SEED_LENGTH * 2);
+
+        let buffer = Buffer.from(value, "hex");
+        return new UserPrivateKey(buffer);
+    }
+
+    static fromPEM() {
+        // todo
+    }
+
+    toPEM() {
+        // todo
+    }
+
+    toPublicKey(): UserPublicKey {
+        // TODO: Question for review: @ccorcoveanu, @AdoAdoAdo, as opposed to core-js, here we use "fromSeed" (instead of fromSecretKey, which wouldn't work on 32-byte private keys).
+        // TODO: Question for review: is this all right?
+        let keyPair = tweetnacl.sign.keyPair.fromSeed(this.buffer);
+        let buffer = Buffer.from(keyPair.publicKey);
+        return new UserPublicKey(buffer);
+    }
+
+    toString(): string {
+        return this.buffer.toString("hex");
+    }
+
+    valueOf(): Buffer {
+        return this.buffer;
+    }
+}
+
+export class UserPublicKey {
+    private readonly buffer: Buffer;
+
+    constructor(buffer: Buffer) {
+        guardLength(buffer, 32);
+        
+        this.buffer = buffer;
+    }
+
+    toString(): string {
+        return this.buffer.toString("hex");
+    }
+
+    toAddress(): Address {
+        return new Address(this.buffer);
+    }
+
+    valueOf(): Buffer {
+        return this.buffer;
+    }
+}
diff --git a/src-wallet/encryptedKey.ts b/src-wallet/userWallet.ts
similarity index 82%
rename from src-wallet/encryptedKey.ts
rename to src-wallet/userWallet.ts
index 849f4f027..08fd6e255 100644
--- a/src-wallet/encryptedKey.ts
+++ b/src-wallet/userWallet.ts
@@ -1,57 +1,24 @@
-import { PrivateKey } from "./privateKey";
 import * as errors from "../errors";
 import nacl from "tweetnacl";
-import { PublicKey } from "./publicKey";
+import { UserPublicKey, UserPrivateKey } from "./userKeys";
 const crypto = require("crypto");
 const uuid = require("uuid/v4");
 const scryptsy = require("scryptsy");
 
+// In a future PR, improve versioning infrastructure for key-file objects in erdjs.
 const Version = 4;
 const CipherAlgorithm = "aes-128-ctr";
 const DigestAlgorithm = "sha256";
 const KeyDerivationFunction = "scrypt";
 
-class ScryptKeyDerivationParams {
-    /**
-     * numIterations
-     */
-    n = 4096;
-
-    /**
-     * memFactor
-     */
-    r = 8;
-
-    /**
-     * pFactor
-     */
-    p = 1;
-
-    dklen = 32;
-}
-
-export class Randomness {
-    salt: Buffer;
-    iv: Buffer;
-    id: string;
-
-    constructor(init?: Partial<Randomness>) {
-        this.salt = init?.salt || Buffer.from(nacl.randomBytes(32));
-        this.iv = init?.iv || Buffer.from(nacl.randomBytes(16));
-        this.id = init?.id || uuid({ random: crypto.randomBytes(16) });
-    }
-}
-
-export class EncryptedKey {
-    private readonly publicKey: PublicKey;
+export class UserWallet {
+    private readonly publicKey: UserPublicKey;
     private readonly randomness: Randomness;
     private readonly ciphertext: Buffer;
     private readonly mac: Buffer;
     private readonly kdfparams: ScryptKeyDerivationParams;
 
     /**
-     * WIP! This PR is not ready for review yet!
-     * 
      * Copied from: https://github.com/ElrondNetwork/elrond-core-js/blob/v1.28.0/src/account.js#L76
      * Notes: adjustements (code refactoring, no change in logic), in terms of: 
      *  - typing (since this is the TypeScript version)
@@ -59,12 +26,12 @@ export class EncryptedKey {
      *  - references to crypto functions
      *  - references to object members
      * 
-     * Given a password, it will generate the contents for a file containing the current initialised account's private
-     * key, passed through a password-based key derivation function (kdf).
+     * Given a password, generates the contents for a file containing the account's private key,
+     * passed through a password-based key derivation function (kdf).
      */
-    constructor(privateKey: PrivateKey, password: string, randomness: Randomness = new Randomness()) {
+    constructor(privateKey: UserPrivateKey, password: string, randomness: Randomness = new Randomness()) {
         const kdParams = new ScryptKeyDerivationParams();
-        const derivedKey = EncryptedKey.generateDerivedKey(Buffer.from(password), randomness.salt, kdParams);
+        const derivedKey = UserWallet.generateDerivedKey(Buffer.from(password), randomness.salt, kdParams);
         const derivedKeyFirstHalf = derivedKey.slice(0, 16);
         const derivedKeySecondHalf = derivedKey.slice(16, 32);
         const cipher = crypto.createCipheriv(CipherAlgorithm, derivedKeyFirstHalf, randomness.iv);
@@ -81,8 +48,6 @@ export class EncryptedKey {
     }
 
     /**
-     * WIP! This PR is not ready for review yet!
-     * 
      * Copied from: https://github.com/ElrondNetwork/elrond-core-js/blob/v1.28.0/src/account.js#L42
      * Notes: adjustements (code refactoring, no change in logic), in terms of: 
      *  - typing (since this is the TypeScript version)
@@ -90,14 +55,14 @@ export class EncryptedKey {
      *  - references to crypto functions
      *  - references to object members
      * 
-     * From an encrypted keyfile, given the password, load the private key and the public key.
+     * From an encrypted keyfile, given the password, loads the private key and the public key.
      */
-    static load(keyFileObject: any, password: string): PrivateKey {
+    static load(keyFileObject: any, password: string): UserPrivateKey {
         const kdfparams = keyFileObject.crypto.kdfparams;
         const salt = Buffer.from(kdfparams.salt, "hex");
         const iv = Buffer.from(keyFileObject.crypto.cipherparams.iv, "hex");
         const ciphertext = Buffer.from(keyFileObject.crypto.ciphertext, "hex");
-        const derivedKey = EncryptedKey.generateDerivedKey(Buffer.from(password), salt, kdfparams);
+        const derivedKey = UserWallet.generateDerivedKey(Buffer.from(password), salt, kdfparams);
         const derivedKeyFirstHalf = derivedKey.slice(0, 16);
         const derivedKeySecondHalf = derivedKey.slice(16, 32);
         
@@ -117,17 +82,13 @@ export class EncryptedKey {
         }
 
         let seed = text.slice(0, 32);
-        return new PrivateKey(seed);
+        return new UserPrivateKey(seed);
     }
 
-    // TODO: load() (static), then decrypt(password)...
-
     /**
      * Will take about:
      *  - 80-90 ms in Node.js, on a i3-8100 CPU @ 3.60GHz
      *  - 350-360 ms in browser (Firefox), on a i3-8100 CPU @ 3.60GHz
-     * 
-     * TODO: Question for review: @ccorcoveanu, @AdoAdoAdo, is this all right?
      */
     private static generateDerivedKey(password: Buffer, salt: Buffer, kdfparams: ScryptKeyDerivationParams): Buffer {
         // Question for review: @ccorcoveanu, why not this implementation?
@@ -162,3 +123,34 @@ export class EncryptedKey {
         };
     }
 }
+
+class ScryptKeyDerivationParams {
+    /**
+     * numIterations
+     */
+    n = 4096;
+
+    /**
+     * memFactor
+     */
+    r = 8;
+
+    /**
+     * pFactor
+     */
+    p = 1;
+
+    dklen = 32;
+}
+
+export class Randomness {
+    salt: Buffer;
+    iv: Buffer;
+    id: string;
+
+    constructor(init?: Partial<Randomness>) {
+        this.salt = init?.salt || Buffer.from(nacl.randomBytes(32));
+        this.iv = init?.iv || Buffer.from(nacl.randomBytes(16));
+        this.id = init?.id || uuid({ random: crypto.randomBytes(16) });
+    }
+}
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
new file mode 100644
index 000000000..22e1161f2
--- /dev/null
+++ b/src-wallet/users.spec.ts
@@ -0,0 +1,110 @@
+import * as errors from "../errors";
+import { assert } from "chai";
+import { TestWallets } from "../testutils";
+import { UserPrivateKey } from "./userKeys";
+import { Mnemonic } from "./mnemonic";
+import { UserWallet, Randomness } from "./userWallet";
+
+describe("test user wallets", () => {
+    let wallets = new TestWallets();
+    let alice = wallets.alice;
+    let bob = wallets.bob;
+    let carol = wallets.carol;
+    let password = wallets.password;
+
+    it("should generate mnemonic", () => {
+        let mnemonic = Mnemonic.generate();
+        let words = mnemonic.getWords();
+        assert.lengthOf(words, 24);
+    });
+
+    it("should derive keys", () => {
+        let mnemonic = Mnemonic.fromString(wallets.mnemonic);
+
+        assert.equal(mnemonic.deriveKey(0).toString(), alice.privateKey);
+        assert.equal(mnemonic.deriveKey(1).toString(), bob.privateKey);
+        assert.equal(mnemonic.deriveKey(2).toString(), carol.privateKey);
+    });
+
+    it("should create private key", () => {
+        let keyHex = wallets.alice.privateKey;
+        let fromBuffer = new UserPrivateKey(Buffer.from(keyHex, "hex"));
+        let fromHex = UserPrivateKey.fromString(keyHex);
+
+        assert.equal(fromBuffer.toString(), keyHex);
+        assert.equal(fromHex.toString(), keyHex);
+    });
+
+    it("should compute public key (and address)", () => {
+        let privateKey: UserPrivateKey;
+
+        privateKey = new UserPrivateKey(Buffer.from(alice.privateKey, "hex"));
+        assert.equal(privateKey.toPublicKey().toString(), alice.address.hex());
+        assert.isTrue(privateKey.toPublicKey().toAddress().equals(alice.address));
+
+        privateKey = new UserPrivateKey(Buffer.from(bob.privateKey, "hex"));
+        assert.equal(privateKey.toPublicKey().toString(), bob.address.hex());
+        assert.isTrue(privateKey.toPublicKey().toAddress().equals(bob.address));
+
+        privateKey = new UserPrivateKey(Buffer.from(carol.privateKey, "hex"));
+        assert.equal(privateKey.toPublicKey().toString(), carol.address.hex());
+        assert.isTrue(privateKey.toPublicKey().toAddress().equals(carol.address));
+    });
+
+    it("should throw error when invalid input", () => {
+        assert.throw(() => new UserPrivateKey(Buffer.alloc(42)), errors.ErrInvariantFailed);
+        assert.throw(() => UserPrivateKey.fromString("foobar"), errors.ErrInvariantFailed);
+    });
+
+    it("should handle PEM files", () => {
+
+    });
+
+    it("should create and load encrypted files", function () {
+        this.timeout(10000);
+
+        let alicePrivateKey = UserPrivateKey.fromString(alice.privateKey);
+        let bobPrivateKey = UserPrivateKey.fromString(bob.privateKey);
+        let carolPrivateKey = UserPrivateKey.fromString(carol.privateKey);
+
+        console.time("encrypt");
+        let aliceKeyFile = new UserWallet(alicePrivateKey, password);
+        let bobKeyFile = new UserWallet(bobPrivateKey, password);
+        let carolKeyFile = new UserWallet(carolPrivateKey, password);
+        console.timeEnd("encrypt");
+
+        assert.equal(aliceKeyFile.toJSON().bech32, alice.address.bech32());
+        assert.equal(bobKeyFile.toJSON().bech32, bob.address.bech32());
+        assert.equal(carolKeyFile.toJSON().bech32, carol.address.bech32());
+
+        console.time("decrypt");
+        assert.deepEqual(UserWallet.load(aliceKeyFile.toJSON(), password), alicePrivateKey);
+        assert.deepEqual(UserWallet.load(bobKeyFile.toJSON(), password), bobPrivateKey);
+        assert.deepEqual(UserWallet.load(carolKeyFile.toJSON(), password), carolPrivateKey);
+        console.timeEnd("decrypt");
+
+        // With provided randomness, in order to reproduce our development wallets
+
+        aliceKeyFile = new UserWallet(alicePrivateKey, password, new Randomness({
+            id: alice.keyFileObject.id,
+            iv: Buffer.from(alice.keyFileObject.crypto.cipherparams.iv, "hex"),
+            salt: Buffer.from(alice.keyFileObject.crypto.kdfparams.salt, "hex")
+        }));
+
+        bobKeyFile = new UserWallet(bobPrivateKey, password, new Randomness({
+            id: bob.keyFileObject.id,
+            iv: Buffer.from(bob.keyFileObject.crypto.cipherparams.iv, "hex"),
+            salt: Buffer.from(bob.keyFileObject.crypto.kdfparams.salt, "hex")
+        }));
+
+        carolKeyFile = new UserWallet(carolPrivateKey, password, new Randomness({
+            id: carol.keyFileObject.id,
+            iv: Buffer.from(carol.keyFileObject.crypto.cipherparams.iv, "hex"),
+            salt: Buffer.from(carol.keyFileObject.crypto.kdfparams.salt, "hex")
+        }));
+
+        assert.deepEqual(aliceKeyFile.toJSON(), alice.keyFileObject);
+        assert.deepEqual(bobKeyFile.toJSON(), bob.keyFileObject);
+        assert.deepEqual(carolKeyFile.toJSON(), carol.keyFileObject);
+    });
+});
diff --git a/src-wallet/validatorKey.ts b/src-wallet/validatorKeys.ts
similarity index 85%
rename from src-wallet/validatorKey.ts
rename to src-wallet/validatorKeys.ts
index 97b0a9760..91d977b6b 100644
--- a/src-wallet/validatorKey.ts
+++ b/src-wallet/validatorKeys.ts
@@ -16,7 +16,7 @@ export class BLS {
     }
 }
 
-export class ValidatorKey {
+export class ValidatorPrivateKey {
     private readonly secretKey: any;
     private readonly publicKey: any;
 
@@ -28,6 +28,14 @@ export class ValidatorKey {
         this.publicKey = this.secretKey.getPublicKey();
     }
 
+    static fromPEM() {
+        // todo
+    }
+
+    toPEM() {
+        // todo
+    }
+
     sign(message: Buffer): Buffer {
         let signatureObject = this.secretKey.sign(message);
         let signature = Buffer.from(signatureObject.serialize());
@@ -39,3 +47,6 @@ export class ValidatorKey {
     }
 }
 
+export class ValidatorPublicKey {
+    
+}
diff --git a/src-wallet/validatorKey.spec.ts b/src-wallet/validators.spec.ts
similarity index 72%
rename from src-wallet/validatorKey.spec.ts
rename to src-wallet/validators.spec.ts
index ea0ab634a..c03b30b9f 100644
--- a/src-wallet/validatorKey.spec.ts
+++ b/src-wallet/validators.spec.ts
@@ -1,25 +1,31 @@
 import { assert } from "chai";
 import { TestWallets } from "../testutils";
-import { BLS, ValidatorKey } from "./validatorKey";
+import { BLS, ValidatorPrivateKey } from "./validatorKeys";
 
-describe("test validator key", () => {
+describe("test validator keys", () => {
     let wallets = new TestWallets();
 
-    it("should create", async () => {
+    it("should create private key and sign a message", async () => {
         await BLS.initIfNecessary();
 
         let privateKey = Buffer.from(Buffer.from("N2NmZjk5YmQ2NzE1MDJkYjdkMTViYzhhYmMwYzlhODA0ZmI5MjU0MDZmYmRkNTBmMWU0YzE3YTRjZDc3NDI0Nw==", "base64").toString(), "hex");
-        let key = new ValidatorKey(privateKey);
+        let key = new ValidatorPrivateKey(privateKey);
         assert.equal(key.toString(), "e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208");
 
         let signature = key.sign(Buffer.from("hello"));
+        // Expected signature computed using `elrond-sdk-go-tools/cmd/signer/mcl_signer.go`
         assert.equal(signature.toString("hex"), "84fd0a3a9d4f1ea2d4b40c6da67f9b786284a1c3895b7253fec7311597cda3f757862bb0690a92a13ce612c33889fd86");
 
         privateKey = Buffer.from(Buffer.from("ODA4NWJhMWQ3ZjdjM2RiOTM4YWQ3MDU5NWEyYmRhYjA5NjQ0ZjFlYzM4MDNiZTE3MWMzM2YxNGJjODBkNGUzYg==", "base64").toString(), "hex");
-        key = new ValidatorKey(privateKey);
+        key = new ValidatorPrivateKey(privateKey);
         assert.equal(key.toString(), "78689fd4b1e2e434d567fe01e61598a42717d83124308266bd09ccc15d2339dd318c019914b86ac29adbae5dd8a02d0307425e9bd85a296e94943708c72f8c670f0b7c50a890a5719088dbd9f1d062cad9acffa06df834106eebe1a4257ef00d");
 
         signature = key.sign(Buffer.from("hello"));
+        // Expected signature computed using `elrond-sdk-go-tools/cmd/signer/mcl_signer.go`
         assert.equal(signature.toString("hex"), "be2e593ff10899a2ee8e1d5c8094e36c9f48e04b87e129991ff09475808743e07bb41bf6e7bc1463fa554c4b46594b98");
     });
+
+    it("should handle PEM files", () => {
+        
+    });
 });

From eb22b24e01a1cb90fd2a33978f773e3adfb9cfdc Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Mon, 11 Jan 2021 23:37:20 +0200
Subject: [PATCH 010/338] PEM files. Signer components.

---
 src-wallet/index.ts           |  7 +++++
 src-wallet/pem.ts             | 47 ++++++++++++++++++++++++++++++
 src-wallet/userKeys.ts        | 22 +++++++++-----
 src-wallet/userSigner.ts      | 55 +++++++++++++++++++++++++++++++++++
 src-wallet/userWallet.ts      |  2 +-
 src-wallet/users.spec.ts      | 53 ++++++++++++++++++++++++++-------
 src-wallet/validatorKeys.ts   | 32 +++++++++++++++-----
 src-wallet/validatorSigner.ts | 21 +++++++++++++
 8 files changed, 212 insertions(+), 27 deletions(-)
 create mode 100644 src-wallet/index.ts
 create mode 100644 src-wallet/pem.ts
 create mode 100644 src-wallet/userSigner.ts
 create mode 100644 src-wallet/validatorSigner.ts

diff --git a/src-wallet/index.ts b/src-wallet/index.ts
new file mode 100644
index 000000000..64dda6d9e
--- /dev/null
+++ b/src-wallet/index.ts
@@ -0,0 +1,7 @@
+export * from "./mnemonic";
+export * from "./pem";
+export * from "./userWallet";
+export * from "./userKeys";
+export * from "./validatorKeys";
+export * from "./userSigner";
+export * from "./validatorSigner";
diff --git a/src-wallet/pem.ts b/src-wallet/pem.ts
new file mode 100644
index 000000000..3a79a5c94
--- /dev/null
+++ b/src-wallet/pem.ts
@@ -0,0 +1,47 @@
+import { UserPrivateKey } from "./userKeys";
+import { ValidatorPrivateKey } from "./validatorKeys";
+
+export function parseUserKey(text: string, index: number = 0): UserPrivateKey {
+    let keys = parseUserKeys(text);
+    let key = keys[index];
+    return key;
+}
+
+export function parseUserKeys(text: string): UserPrivateKey[] {
+    let buffers = parse(text);
+    let keys = buffers.map(buffer => new UserPrivateKey(buffer.slice(0, 32)));
+    return keys;
+}
+
+export function parseValidatorKey(text: string, index: number = 0): ValidatorPrivateKey {
+    let keys = parseValidatorKeys(text);
+    let key = keys[index];
+    return key;
+}
+
+export function parseValidatorKeys(text: string): ValidatorPrivateKey[] {
+    let buffers = parse(text);
+    let keys = buffers.map(buffer => new ValidatorPrivateKey(buffer));
+    return keys;
+}
+
+function parse(text: string): Buffer[] {
+    let lines = text.split(/\r?\n/);
+    let buffers: Buffer[] = [];
+    let linesAccumulator: string[] = [];
+
+    for (const line of lines) {
+        if (line.startsWith("-----BEGIN")) {
+            linesAccumulator = [];
+        } else if (line.startsWith("-----END")) {
+            let asBase64 = linesAccumulator.join("");
+            let asHex = Buffer.from(asBase64, "base64").toString();
+            let asBytes = Buffer.from(asHex, "hex");
+            buffers.push(asBytes);
+        } else {
+            linesAccumulator.push(line);
+        }
+    }
+
+    return buffers;
+}
diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index 5adcb0467..5c7dd5815 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -1,6 +1,7 @@
 import * as tweetnacl from "tweetnacl";
 import { Address } from "../address";
 import { guardLength } from "../utils";
+import { parseUserKey } from "./pem";
 
 export const SEED_LENGTH = 32;
 
@@ -20,12 +21,8 @@ export class UserPrivateKey {
         return new UserPrivateKey(buffer);
     }
 
-    static fromPEM() {
-        // todo
-    }
-
-    toPEM() {
-        // todo
+    static fromPem(text: string, index: number = 0): UserPrivateKey {
+        return parseUserKey(text, index);
     }
 
     toPublicKey(): UserPublicKey {
@@ -36,7 +33,16 @@ export class UserPrivateKey {
         return new UserPublicKey(buffer);
     }
 
-    toString(): string {
+    sign(message: Buffer): Buffer {
+        let pair = tweetnacl.sign.keyPair.fromSeed(this.buffer);
+        let signingKey = pair.secretKey;
+        let signature = tweetnacl.sign(new Uint8Array(message), signingKey);
+        signature = signature.slice(0, signature.length - message.length);
+
+        return Buffer.from(signature);
+    }
+
+    hex(): string {
         return this.buffer.toString("hex");
     }
 
@@ -54,7 +60,7 @@ export class UserPublicKey {
         this.buffer = buffer;
     }
 
-    toString(): string {
+    hex(): string {
         return this.buffer.toString("hex");
     }
 
diff --git a/src-wallet/userSigner.ts b/src-wallet/userSigner.ts
new file mode 100644
index 000000000..0e27bfbfa
--- /dev/null
+++ b/src-wallet/userSigner.ts
@@ -0,0 +1,55 @@
+import * as errors from "../errors";
+import { Address } from "../address";
+import { ISignable, ISigner } from "../interface";
+import { Signature } from "../signature";
+import { UserPrivateKey } from "./userKeys";
+import { UserWallet } from "./userWallet";
+
+/**
+ * ed25519 signer
+ */
+export class UserSigner implements ISigner {
+    private readonly privateKey: UserPrivateKey;
+
+    constructor(privateKey: UserPrivateKey) {
+        this.privateKey = privateKey;
+    }
+
+    static fromWallet(keyFileObject: any, password: string): ISigner {
+        let privateKey = UserWallet.loadPrivateKey(keyFileObject, password);
+        return new UserSigner(privateKey);
+    }
+
+    static fromPem(text: string, index: number = 0) {
+        let privateKey = UserPrivateKey.fromPem(text, index);
+        return new UserSigner(privateKey);
+    }
+    
+    /**
+     * Signs a message.
+     * @param signable the message to be signed (e.g. a {@link Transaction}).
+     */
+    async sign(signable: ISignable): Promise<void> {
+        try {
+            this.trySign(signable);
+        } catch (err) {
+            throw new errors.ErrSignerCannotSign(err);
+        }
+    }
+
+    private trySign(signable: ISignable) {
+        let signedBy = this.getAddress();
+        let bufferToSign = signable.serializeForSigning(signedBy);
+        let signatureBuffer = this.privateKey.sign(bufferToSign);
+        let signature = new Signature(signatureBuffer);
+
+        signable.applySignature(signature, signedBy);
+    }
+
+    /**
+     * Gets the address of the signer.
+     */
+    getAddress(): Address {
+        return this.privateKey.toPublicKey().toAddress();
+    }
+}
diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index 08fd6e255..cec6d0167 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -57,7 +57,7 @@ export class UserWallet {
      * 
      * From an encrypted keyfile, given the password, loads the private key and the public key.
      */
-    static load(keyFileObject: any, password: string): UserPrivateKey {
+    static loadPrivateKey(keyFileObject: any, password: string): UserPrivateKey {
         const kdfparams = keyFileObject.crypto.kdfparams;
         const salt = Buffer.from(kdfparams.salt, "hex");
         const iv = Buffer.from(keyFileObject.crypto.cipherparams.iv, "hex");
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 22e1161f2..24bcbc4bb 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -4,6 +4,13 @@ import { TestWallets } from "../testutils";
 import { UserPrivateKey } from "./userKeys";
 import { Mnemonic } from "./mnemonic";
 import { UserWallet, Randomness } from "./userWallet";
+import { Address } from "../address";
+import { UserSigner } from "./userSigner";
+import { Transaction } from "../transaction";
+import { Nonce } from "../nonce";
+import { Balance } from "../balance";
+import { ChainID, GasLimit, GasPrice, TransactionVersion } from "../networkParams";
+import { TransactionPayload } from "../transactionPayload";
 
 describe("test user wallets", () => {
     let wallets = new TestWallets();
@@ -21,9 +28,9 @@ describe("test user wallets", () => {
     it("should derive keys", () => {
         let mnemonic = Mnemonic.fromString(wallets.mnemonic);
 
-        assert.equal(mnemonic.deriveKey(0).toString(), alice.privateKey);
-        assert.equal(mnemonic.deriveKey(1).toString(), bob.privateKey);
-        assert.equal(mnemonic.deriveKey(2).toString(), carol.privateKey);
+        assert.equal(mnemonic.deriveKey(0).hex(), alice.privateKey);
+        assert.equal(mnemonic.deriveKey(1).hex(), bob.privateKey);
+        assert.equal(mnemonic.deriveKey(2).hex(), carol.privateKey);
     });
 
     it("should create private key", () => {
@@ -31,23 +38,23 @@ describe("test user wallets", () => {
         let fromBuffer = new UserPrivateKey(Buffer.from(keyHex, "hex"));
         let fromHex = UserPrivateKey.fromString(keyHex);
 
-        assert.equal(fromBuffer.toString(), keyHex);
-        assert.equal(fromHex.toString(), keyHex);
+        assert.equal(fromBuffer.hex(), keyHex);
+        assert.equal(fromHex.hex(), keyHex);
     });
 
     it("should compute public key (and address)", () => {
         let privateKey: UserPrivateKey;
 
         privateKey = new UserPrivateKey(Buffer.from(alice.privateKey, "hex"));
-        assert.equal(privateKey.toPublicKey().toString(), alice.address.hex());
+        assert.equal(privateKey.toPublicKey().hex(), alice.address.hex());
         assert.isTrue(privateKey.toPublicKey().toAddress().equals(alice.address));
 
         privateKey = new UserPrivateKey(Buffer.from(bob.privateKey, "hex"));
-        assert.equal(privateKey.toPublicKey().toString(), bob.address.hex());
+        assert.equal(privateKey.toPublicKey().hex(), bob.address.hex());
         assert.isTrue(privateKey.toPublicKey().toAddress().equals(bob.address));
 
         privateKey = new UserPrivateKey(Buffer.from(carol.privateKey, "hex"));
-        assert.equal(privateKey.toPublicKey().toString(), carol.address.hex());
+        assert.equal(privateKey.toPublicKey().hex(), carol.address.hex());
         assert.isTrue(privateKey.toPublicKey().toAddress().equals(carol.address));
     });
 
@@ -78,9 +85,9 @@ describe("test user wallets", () => {
         assert.equal(carolKeyFile.toJSON().bech32, carol.address.bech32());
 
         console.time("decrypt");
-        assert.deepEqual(UserWallet.load(aliceKeyFile.toJSON(), password), alicePrivateKey);
-        assert.deepEqual(UserWallet.load(bobKeyFile.toJSON(), password), bobPrivateKey);
-        assert.deepEqual(UserWallet.load(carolKeyFile.toJSON(), password), carolPrivateKey);
+        assert.deepEqual(UserWallet.loadPrivateKey(aliceKeyFile.toJSON(), password), alicePrivateKey);
+        assert.deepEqual(UserWallet.loadPrivateKey(bobKeyFile.toJSON(), password), bobPrivateKey);
+        assert.deepEqual(UserWallet.loadPrivateKey(carolKeyFile.toJSON(), password), carolPrivateKey);
         console.timeEnd("decrypt");
 
         // With provided randomness, in order to reproduce our development wallets
@@ -107,4 +114,28 @@ describe("test user wallets", () => {
         assert.deepEqual(bobKeyFile.toJSON(), bob.keyFileObject);
         assert.deepEqual(carolKeyFile.toJSON(), carol.keyFileObject);
     });
+
+    it("should sign", async () => {
+        let signer = new UserSigner(UserPrivateKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
+        let sender = new Address("erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz");
+        let receiver = new Address("erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r");
+
+
+        let transaction = new Transaction({
+            nonce: new Nonce(0),
+            value: Balance.Zero(),
+            receiver: receiver,
+            gasPrice: new GasPrice(1000000000),
+            gasLimit: new GasLimit(50000),
+            data: new TransactionPayload("foo"),
+            chainID: new ChainID("1"),
+            version: new TransactionVersion(1)
+        });
+
+        let serialized = transaction.serializeForSigning(sender).toString();
+        await signer.sign(transaction);
+
+        assert.equal(serialized, `{"nonce":0,"value":"0","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1}`);
+        assert.equal(transaction.signature.hex(), "b5fddb8c16fa7f6123cb32edc854f1e760a3eb62c6dc420b5a4c0473c58befd45b621b31a448c5b59e21428f2bc128c80d0ee1caa4f2bf05a12be857ad451b00");
+    });
 });
diff --git a/src-wallet/validatorKeys.ts b/src-wallet/validatorKeys.ts
index 91d977b6b..b3afca8df 100644
--- a/src-wallet/validatorKeys.ts
+++ b/src-wallet/validatorKeys.ts
@@ -1,4 +1,5 @@
 import { guardLength } from "../utils";
+import { parseValidatorKey } from "./pem";
 
 const bls = require('@elrondnetwork/bls-wasm');
 
@@ -28,12 +29,13 @@ export class ValidatorPrivateKey {
         this.publicKey = this.secretKey.getPublicKey();
     }
 
-    static fromPEM() {
-        // todo
+    static fromPem(text: string, index: number = 0) {
+        return parseValidatorKey(text, index);
     }
 
-    toPEM() {
-        // todo
+    toPublicKey(): ValidatorPublicKey {
+        let buffer = Buffer.from(this.publicKey.serialize());
+        return new ValidatorPublicKey(buffer);
     }
 
     sign(message: Buffer): Buffer {
@@ -42,11 +44,27 @@ export class ValidatorPrivateKey {
         return signature;
     }
 
-    toString(): string {
-        return Buffer.from(this.publicKey.serialize()).toString("hex");
+    hex(): string {
+        return this.valueOf().toString("hex");
+    }
+
+    valueOf(): Buffer {
+        return Buffer.from(this.secretKey.serialize());
     }
 }
 
 export class ValidatorPublicKey {
-    
+    private readonly buffer: Buffer;
+
+    constructor(buffer: Buffer) {
+        this.buffer = buffer;
+    }
+
+    hex(): string {
+        return this.buffer.toString("hex");
+    }
+
+    valueOf(): Buffer {
+        return this.buffer;
+    }
 }
diff --git a/src-wallet/validatorSigner.ts b/src-wallet/validatorSigner.ts
new file mode 100644
index 000000000..811282fcf
--- /dev/null
+++ b/src-wallet/validatorSigner.ts
@@ -0,0 +1,21 @@
+import * as errors from "../errors";
+import { BLS, ValidatorPrivateKey } from "./validatorKeys";
+
+/**
+ * Validator signer (BLS signer)
+ */
+export class ValidatorSigner {
+    /**
+     * Signs a message.
+     */
+    async signUsingPem(pemText: string, pemIndex: number = 0, signable: Buffer): Promise<void> {
+        await BLS.initIfNecessary();
+
+        try {
+            let privateKey = ValidatorPrivateKey.fromPem(pemText, pemIndex);
+            privateKey.sign(signable);
+        } catch (err) {
+            throw new errors.ErrSignerCannotSign(err);
+        }
+    }
+}

From 70eb4a27287b1f372843844e5d035bf12458c260 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Mon, 11 Jan 2021 23:42:42 +0200
Subject: [PATCH 011/338] Rename private -> secret.

---
 src-wallet/mnemonic.ts        |  6 ++--
 src-wallet/pem.ts             | 16 ++++-----
 src-wallet/userKeys.ts        |  8 ++---
 src-wallet/userSigner.ts      | 20 +++++------
 src-wallet/userWallet.ts      | 16 ++++-----
 src-wallet/users.spec.ts      | 67 +++++++++++++++++------------------
 src-wallet/validatorKeys.ts   |  2 +-
 src-wallet/validatorSigner.ts |  6 ++--
 src-wallet/validators.spec.ts | 12 +++----
 9 files changed, 76 insertions(+), 77 deletions(-)

diff --git a/src-wallet/mnemonic.ts b/src-wallet/mnemonic.ts
index ede903f5c..170a6703e 100644
--- a/src-wallet/mnemonic.ts
+++ b/src-wallet/mnemonic.ts
@@ -1,6 +1,6 @@
 import * as errors from "../errors";
 import { generateMnemonic, validateMnemonic, mnemonicToSeedSync } from "bip39";
-import { UserPrivateKey } from "./userKeys";
+import { UserSecretKey } from "./userKeys";
 import { derivePath } from "ed25519-hd-key";
 
 const MNEMONIC_STRENGTH = 256;
@@ -34,12 +34,12 @@ export class Mnemonic {
     }
 
     // TODO: Question for review: @ccorcoveanu, accountIndex or addressIndex?
-    deriveKey(index: number = 0, password: string = ""): UserPrivateKey {
+    deriveKey(index: number = 0, password: string = ""): UserSecretKey {
         let seed = mnemonicToSeedSync(this.text, password);
         let derivationPath = `${BIP44_DERIVATION_PREFIX}/${index}'`;
         let derivationResult = derivePath(derivationPath, seed.toString("hex"));
         let key = derivationResult.key;
-        return new UserPrivateKey(key);
+        return new UserSecretKey(key);
     }
 
     getWords(): string[] {
diff --git a/src-wallet/pem.ts b/src-wallet/pem.ts
index 3a79a5c94..e3569fbd7 100644
--- a/src-wallet/pem.ts
+++ b/src-wallet/pem.ts
@@ -1,27 +1,27 @@
-import { UserPrivateKey } from "./userKeys";
-import { ValidatorPrivateKey } from "./validatorKeys";
+import { UserSecretKey } from "./userKeys";
+import { ValidatorSecretKey } from "./validatorKeys";
 
-export function parseUserKey(text: string, index: number = 0): UserPrivateKey {
+export function parseUserKey(text: string, index: number = 0): UserSecretKey {
     let keys = parseUserKeys(text);
     let key = keys[index];
     return key;
 }
 
-export function parseUserKeys(text: string): UserPrivateKey[] {
+export function parseUserKeys(text: string): UserSecretKey[] {
     let buffers = parse(text);
-    let keys = buffers.map(buffer => new UserPrivateKey(buffer.slice(0, 32)));
+    let keys = buffers.map(buffer => new UserSecretKey(buffer.slice(0, 32)));
     return keys;
 }
 
-export function parseValidatorKey(text: string, index: number = 0): ValidatorPrivateKey {
+export function parseValidatorKey(text: string, index: number = 0): ValidatorSecretKey {
     let keys = parseValidatorKeys(text);
     let key = keys[index];
     return key;
 }
 
-export function parseValidatorKeys(text: string): ValidatorPrivateKey[] {
+export function parseValidatorKeys(text: string): ValidatorSecretKey[] {
     let buffers = parse(text);
-    let keys = buffers.map(buffer => new ValidatorPrivateKey(buffer));
+    let keys = buffers.map(buffer => new ValidatorSecretKey(buffer));
     return keys;
 }
 
diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index 5c7dd5815..c829d10e4 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -5,7 +5,7 @@ import { parseUserKey } from "./pem";
 
 export const SEED_LENGTH = 32;
 
-export class UserPrivateKey {
+export class UserSecretKey {
     private readonly buffer: Buffer;
 
     constructor(buffer: Buffer) {
@@ -14,14 +14,14 @@ export class UserPrivateKey {
         this.buffer = buffer;
     }
 
-    static fromString(value: string): UserPrivateKey {
+    static fromString(value: string): UserSecretKey {
         guardLength(value, SEED_LENGTH * 2);
 
         let buffer = Buffer.from(value, "hex");
-        return new UserPrivateKey(buffer);
+        return new UserSecretKey(buffer);
     }
 
-    static fromPem(text: string, index: number = 0): UserPrivateKey {
+    static fromPem(text: string, index: number = 0): UserSecretKey {
         return parseUserKey(text, index);
     }
 
diff --git a/src-wallet/userSigner.ts b/src-wallet/userSigner.ts
index 0e27bfbfa..95b9ad139 100644
--- a/src-wallet/userSigner.ts
+++ b/src-wallet/userSigner.ts
@@ -2,27 +2,27 @@ import * as errors from "../errors";
 import { Address } from "../address";
 import { ISignable, ISigner } from "../interface";
 import { Signature } from "../signature";
-import { UserPrivateKey } from "./userKeys";
+import { UserSecretKey } from "./userKeys";
 import { UserWallet } from "./userWallet";
 
 /**
  * ed25519 signer
  */
 export class UserSigner implements ISigner {
-    private readonly privateKey: UserPrivateKey;
+    private readonly secretKey: UserSecretKey;
 
-    constructor(privateKey: UserPrivateKey) {
-        this.privateKey = privateKey;
+    constructor(secretKey: UserSecretKey) {
+        this.secretKey = secretKey;
     }
 
     static fromWallet(keyFileObject: any, password: string): ISigner {
-        let privateKey = UserWallet.loadPrivateKey(keyFileObject, password);
-        return new UserSigner(privateKey);
+        let secretKey = UserWallet.decryptSecretKey(keyFileObject, password);
+        return new UserSigner(secretKey);
     }
 
     static fromPem(text: string, index: number = 0) {
-        let privateKey = UserPrivateKey.fromPem(text, index);
-        return new UserSigner(privateKey);
+        let secretKey = UserSecretKey.fromPem(text, index);
+        return new UserSigner(secretKey);
     }
     
     /**
@@ -40,7 +40,7 @@ export class UserSigner implements ISigner {
     private trySign(signable: ISignable) {
         let signedBy = this.getAddress();
         let bufferToSign = signable.serializeForSigning(signedBy);
-        let signatureBuffer = this.privateKey.sign(bufferToSign);
+        let signatureBuffer = this.secretKey.sign(bufferToSign);
         let signature = new Signature(signatureBuffer);
 
         signable.applySignature(signature, signedBy);
@@ -50,6 +50,6 @@ export class UserSigner implements ISigner {
      * Gets the address of the signer.
      */
     getAddress(): Address {
-        return this.privateKey.toPublicKey().toAddress();
+        return this.secretKey.toPublicKey().toAddress();
     }
 }
diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index cec6d0167..87706baa3 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -1,6 +1,6 @@
 import * as errors from "../errors";
 import nacl from "tweetnacl";
-import { UserPublicKey, UserPrivateKey } from "./userKeys";
+import { UserPublicKey, UserSecretKey } from "./userKeys";
 const crypto = require("crypto");
 const uuid = require("uuid/v4");
 const scryptsy = require("scryptsy");
@@ -26,21 +26,21 @@ export class UserWallet {
      *  - references to crypto functions
      *  - references to object members
      * 
-     * Given a password, generates the contents for a file containing the account's private key,
+     * Given a password, generates the contents for a file containing the account's secret key,
      * passed through a password-based key derivation function (kdf).
      */
-    constructor(privateKey: UserPrivateKey, password: string, randomness: Randomness = new Randomness()) {
+    constructor(secretKey: UserSecretKey, password: string, randomness: Randomness = new Randomness()) {
         const kdParams = new ScryptKeyDerivationParams();
         const derivedKey = UserWallet.generateDerivedKey(Buffer.from(password), randomness.salt, kdParams);
         const derivedKeyFirstHalf = derivedKey.slice(0, 16);
         const derivedKeySecondHalf = derivedKey.slice(16, 32);
         const cipher = crypto.createCipheriv(CipherAlgorithm, derivedKeyFirstHalf, randomness.iv);
 
-        const text = Buffer.concat([privateKey.valueOf(), privateKey.toPublicKey().valueOf()]);
+        const text = Buffer.concat([secretKey.valueOf(), secretKey.toPublicKey().valueOf()]);
         const ciphertext = Buffer.concat([cipher.update(text), cipher.final()]);
         const mac = crypto.createHmac(DigestAlgorithm, derivedKeySecondHalf).update(ciphertext).digest();
 
-        this.publicKey = privateKey.toPublicKey();
+        this.publicKey = secretKey.toPublicKey();
         this.randomness = randomness;
         this.ciphertext = ciphertext;
         this.mac = mac;
@@ -55,9 +55,9 @@ export class UserWallet {
      *  - references to crypto functions
      *  - references to object members
      * 
-     * From an encrypted keyfile, given the password, loads the private key and the public key.
+     * From an encrypted keyfile, given the password, loads the secret key and the public key.
      */
-    static loadPrivateKey(keyFileObject: any, password: string): UserPrivateKey {
+    static decryptSecretKey(keyFileObject: any, password: string): UserSecretKey {
         const kdfparams = keyFileObject.crypto.kdfparams;
         const salt = Buffer.from(kdfparams.salt, "hex");
         const iv = Buffer.from(keyFileObject.crypto.cipherparams.iv, "hex");
@@ -82,7 +82,7 @@ export class UserWallet {
         }
 
         let seed = text.slice(0, 32);
-        return new UserPrivateKey(seed);
+        return new UserSecretKey(seed);
     }
 
     /**
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 24bcbc4bb..8801c3b38 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -1,7 +1,7 @@
 import * as errors from "../errors";
 import { assert } from "chai";
 import { TestWallets } from "../testutils";
-import { UserPrivateKey } from "./userKeys";
+import { UserSecretKey } from "./userKeys";
 import { Mnemonic } from "./mnemonic";
 import { UserWallet, Randomness } from "./userWallet";
 import { Address } from "../address";
@@ -28,39 +28,39 @@ describe("test user wallets", () => {
     it("should derive keys", () => {
         let mnemonic = Mnemonic.fromString(wallets.mnemonic);
 
-        assert.equal(mnemonic.deriveKey(0).hex(), alice.privateKey);
-        assert.equal(mnemonic.deriveKey(1).hex(), bob.privateKey);
-        assert.equal(mnemonic.deriveKey(2).hex(), carol.privateKey);
+        assert.equal(mnemonic.deriveKey(0).hex(), alice.secretKeyHex);
+        assert.equal(mnemonic.deriveKey(1).hex(), bob.secretKeyHex);
+        assert.equal(mnemonic.deriveKey(2).hex(), carol.secretKeyHex);
     });
 
-    it("should create private key", () => {
-        let keyHex = wallets.alice.privateKey;
-        let fromBuffer = new UserPrivateKey(Buffer.from(keyHex, "hex"));
-        let fromHex = UserPrivateKey.fromString(keyHex);
+    it("should create secret key", () => {
+        let keyHex = wallets.alice.secretKeyHex;
+        let fromBuffer = new UserSecretKey(Buffer.from(keyHex, "hex"));
+        let fromHex = UserSecretKey.fromString(keyHex);
 
         assert.equal(fromBuffer.hex(), keyHex);
         assert.equal(fromHex.hex(), keyHex);
     });
 
     it("should compute public key (and address)", () => {
-        let privateKey: UserPrivateKey;
+        let secretKey: UserSecretKey;
 
-        privateKey = new UserPrivateKey(Buffer.from(alice.privateKey, "hex"));
-        assert.equal(privateKey.toPublicKey().hex(), alice.address.hex());
-        assert.isTrue(privateKey.toPublicKey().toAddress().equals(alice.address));
+        secretKey = new UserSecretKey(Buffer.from(alice.secretKeyHex, "hex"));
+        assert.equal(secretKey.toPublicKey().hex(), alice.address.hex());
+        assert.isTrue(secretKey.toPublicKey().toAddress().equals(alice.address));
 
-        privateKey = new UserPrivateKey(Buffer.from(bob.privateKey, "hex"));
-        assert.equal(privateKey.toPublicKey().hex(), bob.address.hex());
-        assert.isTrue(privateKey.toPublicKey().toAddress().equals(bob.address));
+        secretKey = new UserSecretKey(Buffer.from(bob.secretKeyHex, "hex"));
+        assert.equal(secretKey.toPublicKey().hex(), bob.address.hex());
+        assert.isTrue(secretKey.toPublicKey().toAddress().equals(bob.address));
 
-        privateKey = new UserPrivateKey(Buffer.from(carol.privateKey, "hex"));
-        assert.equal(privateKey.toPublicKey().hex(), carol.address.hex());
-        assert.isTrue(privateKey.toPublicKey().toAddress().equals(carol.address));
+        secretKey = new UserSecretKey(Buffer.from(carol.secretKeyHex, "hex"));
+        assert.equal(secretKey.toPublicKey().hex(), carol.address.hex());
+        assert.isTrue(secretKey.toPublicKey().toAddress().equals(carol.address));
     });
 
     it("should throw error when invalid input", () => {
-        assert.throw(() => new UserPrivateKey(Buffer.alloc(42)), errors.ErrInvariantFailed);
-        assert.throw(() => UserPrivateKey.fromString("foobar"), errors.ErrInvariantFailed);
+        assert.throw(() => new UserSecretKey(Buffer.alloc(42)), errors.ErrInvariantFailed);
+        assert.throw(() => UserSecretKey.fromString("foobar"), errors.ErrInvariantFailed);
     });
 
     it("should handle PEM files", () => {
@@ -70,14 +70,14 @@ describe("test user wallets", () => {
     it("should create and load encrypted files", function () {
         this.timeout(10000);
 
-        let alicePrivateKey = UserPrivateKey.fromString(alice.privateKey);
-        let bobPrivateKey = UserPrivateKey.fromString(bob.privateKey);
-        let carolPrivateKey = UserPrivateKey.fromString(carol.privateKey);
+        let aliceSecretKey = UserSecretKey.fromString(alice.secretKeyHex);
+        let bobSecretKey = UserSecretKey.fromString(bob.secretKeyHex);
+        let carolSecretKey = UserSecretKey.fromString(carol.secretKeyHex);
 
         console.time("encrypt");
-        let aliceKeyFile = new UserWallet(alicePrivateKey, password);
-        let bobKeyFile = new UserWallet(bobPrivateKey, password);
-        let carolKeyFile = new UserWallet(carolPrivateKey, password);
+        let aliceKeyFile = new UserWallet(aliceSecretKey, password);
+        let bobKeyFile = new UserWallet(bobSecretKey, password);
+        let carolKeyFile = new UserWallet(carolSecretKey, password);
         console.timeEnd("encrypt");
 
         assert.equal(aliceKeyFile.toJSON().bech32, alice.address.bech32());
@@ -85,26 +85,26 @@ describe("test user wallets", () => {
         assert.equal(carolKeyFile.toJSON().bech32, carol.address.bech32());
 
         console.time("decrypt");
-        assert.deepEqual(UserWallet.loadPrivateKey(aliceKeyFile.toJSON(), password), alicePrivateKey);
-        assert.deepEqual(UserWallet.loadPrivateKey(bobKeyFile.toJSON(), password), bobPrivateKey);
-        assert.deepEqual(UserWallet.loadPrivateKey(carolKeyFile.toJSON(), password), carolPrivateKey);
+        assert.deepEqual(UserWallet.decryptSecretKey(aliceKeyFile.toJSON(), password), aliceSecretKey);
+        assert.deepEqual(UserWallet.decryptSecretKey(bobKeyFile.toJSON(), password), bobSecretKey);
+        assert.deepEqual(UserWallet.decryptSecretKey(carolKeyFile.toJSON(), password), carolSecretKey);
         console.timeEnd("decrypt");
 
         // With provided randomness, in order to reproduce our development wallets
 
-        aliceKeyFile = new UserWallet(alicePrivateKey, password, new Randomness({
+        aliceKeyFile = new UserWallet(aliceSecretKey, password, new Randomness({
             id: alice.keyFileObject.id,
             iv: Buffer.from(alice.keyFileObject.crypto.cipherparams.iv, "hex"),
             salt: Buffer.from(alice.keyFileObject.crypto.kdfparams.salt, "hex")
         }));
 
-        bobKeyFile = new UserWallet(bobPrivateKey, password, new Randomness({
+        bobKeyFile = new UserWallet(bobSecretKey, password, new Randomness({
             id: bob.keyFileObject.id,
             iv: Buffer.from(bob.keyFileObject.crypto.cipherparams.iv, "hex"),
             salt: Buffer.from(bob.keyFileObject.crypto.kdfparams.salt, "hex")
         }));
 
-        carolKeyFile = new UserWallet(carolPrivateKey, password, new Randomness({
+        carolKeyFile = new UserWallet(carolSecretKey, password, new Randomness({
             id: carol.keyFileObject.id,
             iv: Buffer.from(carol.keyFileObject.crypto.cipherparams.iv, "hex"),
             salt: Buffer.from(carol.keyFileObject.crypto.kdfparams.salt, "hex")
@@ -116,11 +116,10 @@ describe("test user wallets", () => {
     });
 
     it("should sign", async () => {
-        let signer = new UserSigner(UserPrivateKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
+        let signer = new UserSigner(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
         let sender = new Address("erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz");
         let receiver = new Address("erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r");
 
-
         let transaction = new Transaction({
             nonce: new Nonce(0),
             value: Balance.Zero(),
diff --git a/src-wallet/validatorKeys.ts b/src-wallet/validatorKeys.ts
index b3afca8df..7651029f6 100644
--- a/src-wallet/validatorKeys.ts
+++ b/src-wallet/validatorKeys.ts
@@ -17,7 +17,7 @@ export class BLS {
     }
 }
 
-export class ValidatorPrivateKey {
+export class ValidatorSecretKey {
     private readonly secretKey: any;
     private readonly publicKey: any;
 
diff --git a/src-wallet/validatorSigner.ts b/src-wallet/validatorSigner.ts
index 811282fcf..887587f57 100644
--- a/src-wallet/validatorSigner.ts
+++ b/src-wallet/validatorSigner.ts
@@ -1,5 +1,5 @@
 import * as errors from "../errors";
-import { BLS, ValidatorPrivateKey } from "./validatorKeys";
+import { BLS, ValidatorSecretKey } from "./validatorKeys";
 
 /**
  * Validator signer (BLS signer)
@@ -12,8 +12,8 @@ export class ValidatorSigner {
         await BLS.initIfNecessary();
 
         try {
-            let privateKey = ValidatorPrivateKey.fromPem(pemText, pemIndex);
-            privateKey.sign(signable);
+            let secretKey = ValidatorSecretKey.fromPem(pemText, pemIndex);
+            secretKey.sign(signable);
         } catch (err) {
             throw new errors.ErrSignerCannotSign(err);
         }
diff --git a/src-wallet/validators.spec.ts b/src-wallet/validators.spec.ts
index c03b30b9f..82e00df27 100644
--- a/src-wallet/validators.spec.ts
+++ b/src-wallet/validators.spec.ts
@@ -1,23 +1,23 @@
 import { assert } from "chai";
 import { TestWallets } from "../testutils";
-import { BLS, ValidatorPrivateKey } from "./validatorKeys";
+import { BLS, ValidatorSecretKey } from "./validatorKeys";
 
 describe("test validator keys", () => {
     let wallets = new TestWallets();
 
-    it("should create private key and sign a message", async () => {
+    it("should create secret key and sign a message", async () => {
         await BLS.initIfNecessary();
 
-        let privateKey = Buffer.from(Buffer.from("N2NmZjk5YmQ2NzE1MDJkYjdkMTViYzhhYmMwYzlhODA0ZmI5MjU0MDZmYmRkNTBmMWU0YzE3YTRjZDc3NDI0Nw==", "base64").toString(), "hex");
-        let key = new ValidatorPrivateKey(privateKey);
+        let secretKey = Buffer.from(Buffer.from("N2NmZjk5YmQ2NzE1MDJkYjdkMTViYzhhYmMwYzlhODA0ZmI5MjU0MDZmYmRkNTBmMWU0YzE3YTRjZDc3NDI0Nw==", "base64").toString(), "hex");
+        let key = new ValidatorSecretKey(secretKey);
         assert.equal(key.toString(), "e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208");
 
         let signature = key.sign(Buffer.from("hello"));
         // Expected signature computed using `elrond-sdk-go-tools/cmd/signer/mcl_signer.go`
         assert.equal(signature.toString("hex"), "84fd0a3a9d4f1ea2d4b40c6da67f9b786284a1c3895b7253fec7311597cda3f757862bb0690a92a13ce612c33889fd86");
 
-        privateKey = Buffer.from(Buffer.from("ODA4NWJhMWQ3ZjdjM2RiOTM4YWQ3MDU5NWEyYmRhYjA5NjQ0ZjFlYzM4MDNiZTE3MWMzM2YxNGJjODBkNGUzYg==", "base64").toString(), "hex");
-        key = new ValidatorPrivateKey(privateKey);
+        secretKey = Buffer.from(Buffer.from("ODA4NWJhMWQ3ZjdjM2RiOTM4YWQ3MDU5NWEyYmRhYjA5NjQ0ZjFlYzM4MDNiZTE3MWMzM2YxNGJjODBkNGUzYg==", "base64").toString(), "hex");
+        key = new ValidatorSecretKey(secretKey);
         assert.equal(key.toString(), "78689fd4b1e2e434d567fe01e61598a42717d83124308266bd09ccc15d2339dd318c019914b86ac29adbae5dd8a02d0307425e9bd85a296e94943708c72f8c670f0b7c50a890a5719088dbd9f1d062cad9acffa06df834106eebe1a4257ef00d");
 
         signature = key.sign(Buffer.from("hello"));

From b48994b5410d641215fd19dae5c412d9e08e3941 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Tue, 12 Jan 2021 00:22:43 +0200
Subject: [PATCH 012/338] Add tests, fix tests.

---
 src-wallet/userWallet.ts      |  6 +++---
 src-wallet/users.spec.ts      | 24 ++++++++++++++++++++++--
 src-wallet/validators.spec.ts | 14 ++++++++++----
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index 87706baa3..cb3e8eb9d 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -2,7 +2,7 @@ import * as errors from "../errors";
 import nacl from "tweetnacl";
 import { UserPublicKey, UserSecretKey } from "./userKeys";
 const crypto = require("crypto");
-const uuid = require("uuid/v4");
+import { v4 as uuidv4 } from "uuid";
 const scryptsy = require("scryptsy");
 
 // In a future PR, improve versioning infrastructure for key-file objects in erdjs.
@@ -104,7 +104,7 @@ export class UserWallet {
         return {
             version: Version,
             id: this.randomness.id,
-            address: this.publicKey.toString(),
+            address: this.publicKey.hex(),
             bech32: this.publicKey.toAddress().toString(),
             crypto: {
                 ciphertext: this.ciphertext.toString("hex"),
@@ -151,6 +151,6 @@ export class Randomness {
     constructor(init?: Partial<Randomness>) {
         this.salt = init?.salt || Buffer.from(nacl.randomBytes(32));
         this.iv = init?.iv || Buffer.from(nacl.randomBytes(16));
-        this.id = init?.id || uuid({ random: crypto.randomBytes(16) });
+        this.id = init?.id || uuidv4({ random: crypto.randomBytes(16) });
     }
 }
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 8801c3b38..7432b99e0 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -64,7 +64,9 @@ describe("test user wallets", () => {
     });
 
     it("should handle PEM files", () => {
-
+        assert.equal(UserSecretKey.fromPem(alice.pemFileText).hex(), alice.secretKeyHex);
+        assert.equal(UserSecretKey.fromPem(bob.pemFileText).hex(), bob.secretKeyHex);
+        assert.equal(UserSecretKey.fromPem(carol.pemFileText).hex(), carol.secretKeyHex);
     });
 
     it("should create and load encrypted files", function () {
@@ -115,11 +117,12 @@ describe("test user wallets", () => {
         assert.deepEqual(carolKeyFile.toJSON(), carol.keyFileObject);
     });
 
-    it("should sign", async () => {
+    it("should sign transactions", async () => {
         let signer = new UserSigner(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
         let sender = new Address("erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz");
         let receiver = new Address("erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r");
 
+        // With data field
         let transaction = new Transaction({
             nonce: new Nonce(0),
             value: Balance.Zero(),
@@ -136,5 +139,22 @@ describe("test user wallets", () => {
 
         assert.equal(serialized, `{"nonce":0,"value":"0","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1}`);
         assert.equal(transaction.signature.hex(), "b5fddb8c16fa7f6123cb32edc854f1e760a3eb62c6dc420b5a4c0473c58befd45b621b31a448c5b59e21428f2bc128c80d0ee1caa4f2bf05a12be857ad451b00");
+    
+        // Without data field
+        transaction = new Transaction({
+            nonce: new Nonce(8),
+            value: Balance.fromString("10000000000000000000"),
+            receiver: receiver,
+            gasPrice: new GasPrice(1000000000),
+            gasLimit: new GasLimit(50000),
+            chainID: new ChainID("1"),
+            version: new TransactionVersion(1)
+        });
+
+        serialized = transaction.serializeForSigning(sender).toString();
+        await signer.sign(transaction);
+
+        assert.equal(serialized, `{"nonce":8,"value":"10000000000000000000","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","version":1}`);
+        assert.equal(transaction.signature.hex(), "4a6d8186eae110894e7417af82c9bf9592696c0600faf110972e0e5310d8485efc656b867a2336acec2b4c1e5f76c9cc70ba1803c6a46455ed7f1e2989a90105");
     });
 });
diff --git a/src-wallet/validators.spec.ts b/src-wallet/validators.spec.ts
index 82e00df27..df771c7bb 100644
--- a/src-wallet/validators.spec.ts
+++ b/src-wallet/validators.spec.ts
@@ -10,7 +10,7 @@ describe("test validator keys", () => {
 
         let secretKey = Buffer.from(Buffer.from("N2NmZjk5YmQ2NzE1MDJkYjdkMTViYzhhYmMwYzlhODA0ZmI5MjU0MDZmYmRkNTBmMWU0YzE3YTRjZDc3NDI0Nw==", "base64").toString(), "hex");
         let key = new ValidatorSecretKey(secretKey);
-        assert.equal(key.toString(), "e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208");
+        assert.equal(key.toPublicKey().hex(), "e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208");
 
         let signature = key.sign(Buffer.from("hello"));
         // Expected signature computed using `elrond-sdk-go-tools/cmd/signer/mcl_signer.go`
@@ -18,14 +18,20 @@ describe("test validator keys", () => {
 
         secretKey = Buffer.from(Buffer.from("ODA4NWJhMWQ3ZjdjM2RiOTM4YWQ3MDU5NWEyYmRhYjA5NjQ0ZjFlYzM4MDNiZTE3MWMzM2YxNGJjODBkNGUzYg==", "base64").toString(), "hex");
         key = new ValidatorSecretKey(secretKey);
-        assert.equal(key.toString(), "78689fd4b1e2e434d567fe01e61598a42717d83124308266bd09ccc15d2339dd318c019914b86ac29adbae5dd8a02d0307425e9bd85a296e94943708c72f8c670f0b7c50a890a5719088dbd9f1d062cad9acffa06df834106eebe1a4257ef00d");
+        assert.equal(key.toPublicKey().hex(), "78689fd4b1e2e434d567fe01e61598a42717d83124308266bd09ccc15d2339dd318c019914b86ac29adbae5dd8a02d0307425e9bd85a296e94943708c72f8c670f0b7c50a890a5719088dbd9f1d062cad9acffa06df834106eebe1a4257ef00d");
 
         signature = key.sign(Buffer.from("hello"));
         // Expected signature computed using `elrond-sdk-go-tools/cmd/signer/mcl_signer.go`
         assert.equal(signature.toString("hex"), "be2e593ff10899a2ee8e1d5c8094e36c9f48e04b87e129991ff09475808743e07bb41bf6e7bc1463fa554c4b46594b98");
     });
 
-    it("should handle PEM files", () => {
-        
+    it("should handle PEM files", async () => {
+        await BLS.initIfNecessary();
+
+        let text = `-----BEGIN foobar
+N2NmZjk5YmQ2NzE1MDJkYjdkMTViYzhhYmMwYzlhODA0ZmI5MjU0MDZmYmRkNTBmMWU0YzE3YTRjZDc3NDI0Nw==
+-----END foobar`;
+        assert.equal(ValidatorSecretKey.fromPem(text).hex(), "7cff99bd671502db7d15bc8abc0c9a804fb925406fbdd50f1e4c17a4cd774247");
+        assert.equal(ValidatorSecretKey.fromPem(text).toPublicKey().hex(), "e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208");
     });
 });

From 38c145a8b97a33638ede35da9fcc61d2a33e2e74 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Tue, 12 Jan 2021 10:33:22 +0200
Subject: [PATCH 013/338] Fix after merge.

---
 src-wallet/users.spec.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 7432b99e0..7e1c2601f 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -130,15 +130,14 @@ describe("test user wallets", () => {
             gasPrice: new GasPrice(1000000000),
             gasLimit: new GasLimit(50000),
             data: new TransactionPayload("foo"),
-            chainID: new ChainID("1"),
-            version: new TransactionVersion(1)
+            chainID: new ChainID("1")
         });
 
         let serialized = transaction.serializeForSigning(sender).toString();
         await signer.sign(transaction);
 
         assert.equal(serialized, `{"nonce":0,"value":"0","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1}`);
-        assert.equal(transaction.signature.hex(), "b5fddb8c16fa7f6123cb32edc854f1e760a3eb62c6dc420b5a4c0473c58befd45b621b31a448c5b59e21428f2bc128c80d0ee1caa4f2bf05a12be857ad451b00");
+        assert.equal(transaction.getSignature().hex(), "b5fddb8c16fa7f6123cb32edc854f1e760a3eb62c6dc420b5a4c0473c58befd45b621b31a448c5b59e21428f2bc128c80d0ee1caa4f2bf05a12be857ad451b00");
     
         // Without data field
         transaction = new Transaction({
@@ -147,14 +146,13 @@ describe("test user wallets", () => {
             receiver: receiver,
             gasPrice: new GasPrice(1000000000),
             gasLimit: new GasLimit(50000),
-            chainID: new ChainID("1"),
-            version: new TransactionVersion(1)
+            chainID: new ChainID("1")
         });
 
         serialized = transaction.serializeForSigning(sender).toString();
         await signer.sign(transaction);
 
         assert.equal(serialized, `{"nonce":8,"value":"10000000000000000000","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","version":1}`);
-        assert.equal(transaction.signature.hex(), "4a6d8186eae110894e7417af82c9bf9592696c0600faf110972e0e5310d8485efc656b867a2336acec2b4c1e5f76c9cc70ba1803c6a46455ed7f1e2989a90105");
+        assert.equal(transaction.getSignature().hex(), "4a6d8186eae110894e7417af82c9bf9592696c0600faf110972e0e5310d8485efc656b867a2336acec2b4c1e5f76c9cc70ba1803c6a46455ed7f1e2989a90105");
     });
 });

From 676b984e1fefdc7317b66d30927e23cd5bcabf74 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Fri, 15 Jan 2021 13:37:07 +0200
Subject: [PATCH 014/338] Fix after review, part 1.

---
 src-wallet/mnemonic.ts        |  5 ++---
 src-wallet/pem.ts             | 12 ++++--------
 src-wallet/userKeys.ts        | 10 +++++-----
 src-wallet/userSigner.ts      |  2 +-
 src-wallet/userWallet.ts      |  4 ++--
 src-wallet/users.spec.ts      | 12 ++++++------
 src-wallet/validatorKeys.ts   |  9 +++++++--
 src-wallet/validators.spec.ts |  6 +++---
 8 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src-wallet/mnemonic.ts b/src-wallet/mnemonic.ts
index 170a6703e..69c298d66 100644
--- a/src-wallet/mnemonic.ts
+++ b/src-wallet/mnemonic.ts
@@ -33,10 +33,9 @@ export class Mnemonic {
         }
     }
 
-    // TODO: Question for review: @ccorcoveanu, accountIndex or addressIndex?
-    deriveKey(index: number = 0, password: string = ""): UserSecretKey {
+    deriveKey(addressIndex: number = 0, password: string = ""): UserSecretKey {
         let seed = mnemonicToSeedSync(this.text, password);
-        let derivationPath = `${BIP44_DERIVATION_PREFIX}/${index}'`;
+        let derivationPath = `${BIP44_DERIVATION_PREFIX}/${addressIndex}'`;
         let derivationResult = derivePath(derivationPath, seed.toString("hex"));
         let key = derivationResult.key;
         return new UserSecretKey(key);
diff --git a/src-wallet/pem.ts b/src-wallet/pem.ts
index e3569fbd7..5cb189143 100644
--- a/src-wallet/pem.ts
+++ b/src-wallet/pem.ts
@@ -3,26 +3,22 @@ import { ValidatorSecretKey } from "./validatorKeys";
 
 export function parseUserKey(text: string, index: number = 0): UserSecretKey {
     let keys = parseUserKeys(text);
-    let key = keys[index];
-    return key;
+    return keys[index];
 }
 
 export function parseUserKeys(text: string): UserSecretKey[] {
     let buffers = parse(text);
-    let keys = buffers.map(buffer => new UserSecretKey(buffer.slice(0, 32)));
-    return keys;
+    return buffers.map(buffer => new UserSecretKey(buffer.slice(0, 32)));
 }
 
 export function parseValidatorKey(text: string, index: number = 0): ValidatorSecretKey {
     let keys = parseValidatorKeys(text);
-    let key = keys[index];
-    return key;
+    return keys[index];
 }
 
 export function parseValidatorKeys(text: string): ValidatorSecretKey[] {
     let buffers = parse(text);
-    let keys = buffers.map(buffer => new ValidatorSecretKey(buffer));
-    return keys;
+    return buffers.map(buffer => new ValidatorSecretKey(buffer));
 }
 
 function parse(text: string): Buffer[] {
diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index c829d10e4..0294818ab 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -3,7 +3,8 @@ import { Address } from "../address";
 import { guardLength } from "../utils";
 import { parseUserKey } from "./pem";
 
-export const SEED_LENGTH = 32;
+const SEED_LENGTH = 32;
+const PUBKEY_LENGTH = 32;
 
 export class UserSecretKey {
     private readonly buffer: Buffer;
@@ -25,9 +26,7 @@ export class UserSecretKey {
         return parseUserKey(text, index);
     }
 
-    toPublicKey(): UserPublicKey {
-        // TODO: Question for review: @ccorcoveanu, @AdoAdoAdo, as opposed to core-js, here we use "fromSeed" (instead of fromSecretKey, which wouldn't work on 32-byte private keys).
-        // TODO: Question for review: is this all right?
+    generatePublicKey(): UserPublicKey {
         let keyPair = tweetnacl.sign.keyPair.fromSeed(this.buffer);
         let buffer = Buffer.from(keyPair.publicKey);
         return new UserPublicKey(buffer);
@@ -37,6 +36,7 @@ export class UserSecretKey {
         let pair = tweetnacl.sign.keyPair.fromSeed(this.buffer);
         let signingKey = pair.secretKey;
         let signature = tweetnacl.sign(new Uint8Array(message), signingKey);
+        // "tweetnacl.sign()" returns the concatenated [signature, message], therfore we remove the appended message:
         signature = signature.slice(0, signature.length - message.length);
 
         return Buffer.from(signature);
@@ -55,7 +55,7 @@ export class UserPublicKey {
     private readonly buffer: Buffer;
 
     constructor(buffer: Buffer) {
-        guardLength(buffer, 32);
+        guardLength(buffer, PUBKEY_LENGTH);
         
         this.buffer = buffer;
     }
diff --git a/src-wallet/userSigner.ts b/src-wallet/userSigner.ts
index 95b9ad139..be0b30e84 100644
--- a/src-wallet/userSigner.ts
+++ b/src-wallet/userSigner.ts
@@ -50,6 +50,6 @@ export class UserSigner implements ISigner {
      * Gets the address of the signer.
      */
     getAddress(): Address {
-        return this.secretKey.toPublicKey().toAddress();
+        return this.secretKey.generatePublicKey().toAddress();
     }
 }
diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index cb3e8eb9d..a2fb39dda 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -36,11 +36,11 @@ export class UserWallet {
         const derivedKeySecondHalf = derivedKey.slice(16, 32);
         const cipher = crypto.createCipheriv(CipherAlgorithm, derivedKeyFirstHalf, randomness.iv);
 
-        const text = Buffer.concat([secretKey.valueOf(), secretKey.toPublicKey().valueOf()]);
+        const text = Buffer.concat([secretKey.valueOf(), secretKey.generatePublicKey().valueOf()]);
         const ciphertext = Buffer.concat([cipher.update(text), cipher.final()]);
         const mac = crypto.createHmac(DigestAlgorithm, derivedKeySecondHalf).update(ciphertext).digest();
 
-        this.publicKey = secretKey.toPublicKey();
+        this.publicKey = secretKey.generatePublicKey();
         this.randomness = randomness;
         this.ciphertext = ciphertext;
         this.mac = mac;
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 7432b99e0..510aa39a4 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -46,16 +46,16 @@ describe("test user wallets", () => {
         let secretKey: UserSecretKey;
 
         secretKey = new UserSecretKey(Buffer.from(alice.secretKeyHex, "hex"));
-        assert.equal(secretKey.toPublicKey().hex(), alice.address.hex());
-        assert.isTrue(secretKey.toPublicKey().toAddress().equals(alice.address));
+        assert.equal(secretKey.generatePublicKey().hex(), alice.address.hex());
+        assert.isTrue(secretKey.generatePublicKey().toAddress().equals(alice.address));
 
         secretKey = new UserSecretKey(Buffer.from(bob.secretKeyHex, "hex"));
-        assert.equal(secretKey.toPublicKey().hex(), bob.address.hex());
-        assert.isTrue(secretKey.toPublicKey().toAddress().equals(bob.address));
+        assert.equal(secretKey.generatePublicKey().hex(), bob.address.hex());
+        assert.isTrue(secretKey.generatePublicKey().toAddress().equals(bob.address));
 
         secretKey = new UserSecretKey(Buffer.from(carol.secretKeyHex, "hex"));
-        assert.equal(secretKey.toPublicKey().hex(), carol.address.hex());
-        assert.isTrue(secretKey.toPublicKey().toAddress().equals(carol.address));
+        assert.equal(secretKey.generatePublicKey().hex(), carol.address.hex());
+        assert.isTrue(secretKey.generatePublicKey().toAddress().equals(carol.address));
     });
 
     it("should throw error when invalid input", () => {
diff --git a/src-wallet/validatorKeys.ts b/src-wallet/validatorKeys.ts
index 7651029f6..de085ff46 100644
--- a/src-wallet/validatorKeys.ts
+++ b/src-wallet/validatorKeys.ts
@@ -3,6 +3,9 @@ import { parseValidatorKey } from "./pem";
 
 const bls = require('@elrondnetwork/bls-wasm');
 
+const SECRETKEY_LENGTH = 32;
+const PUBKEY_LENGTH = 96;
+
 export class BLS {
     private static isInitialized: boolean = false;
 
@@ -22,7 +25,7 @@ export class ValidatorSecretKey {
     private readonly publicKey: any;
 
     constructor(buffer: Buffer) {
-        guardLength(buffer, 32);
+        guardLength(buffer, SECRETKEY_LENGTH);
 
         this.secretKey = new bls.SecretKey();
         this.secretKey.setLittleEndian(Uint8Array.from(buffer));
@@ -33,7 +36,7 @@ export class ValidatorSecretKey {
         return parseValidatorKey(text, index);
     }
 
-    toPublicKey(): ValidatorPublicKey {
+    generatePublicKey(): ValidatorPublicKey {
         let buffer = Buffer.from(this.publicKey.serialize());
         return new ValidatorPublicKey(buffer);
     }
@@ -57,6 +60,8 @@ export class ValidatorPublicKey {
     private readonly buffer: Buffer;
 
     constructor(buffer: Buffer) {
+        guardLength(buffer, PUBKEY_LENGTH);
+
         this.buffer = buffer;
     }
 
diff --git a/src-wallet/validators.spec.ts b/src-wallet/validators.spec.ts
index df771c7bb..e737e2f5f 100644
--- a/src-wallet/validators.spec.ts
+++ b/src-wallet/validators.spec.ts
@@ -10,7 +10,7 @@ describe("test validator keys", () => {
 
         let secretKey = Buffer.from(Buffer.from("N2NmZjk5YmQ2NzE1MDJkYjdkMTViYzhhYmMwYzlhODA0ZmI5MjU0MDZmYmRkNTBmMWU0YzE3YTRjZDc3NDI0Nw==", "base64").toString(), "hex");
         let key = new ValidatorSecretKey(secretKey);
-        assert.equal(key.toPublicKey().hex(), "e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208");
+        assert.equal(key.generatePublicKey().hex(), "e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208");
 
         let signature = key.sign(Buffer.from("hello"));
         // Expected signature computed using `elrond-sdk-go-tools/cmd/signer/mcl_signer.go`
@@ -18,7 +18,7 @@ describe("test validator keys", () => {
 
         secretKey = Buffer.from(Buffer.from("ODA4NWJhMWQ3ZjdjM2RiOTM4YWQ3MDU5NWEyYmRhYjA5NjQ0ZjFlYzM4MDNiZTE3MWMzM2YxNGJjODBkNGUzYg==", "base64").toString(), "hex");
         key = new ValidatorSecretKey(secretKey);
-        assert.equal(key.toPublicKey().hex(), "78689fd4b1e2e434d567fe01e61598a42717d83124308266bd09ccc15d2339dd318c019914b86ac29adbae5dd8a02d0307425e9bd85a296e94943708c72f8c670f0b7c50a890a5719088dbd9f1d062cad9acffa06df834106eebe1a4257ef00d");
+        assert.equal(key.generatePublicKey().hex(), "78689fd4b1e2e434d567fe01e61598a42717d83124308266bd09ccc15d2339dd318c019914b86ac29adbae5dd8a02d0307425e9bd85a296e94943708c72f8c670f0b7c50a890a5719088dbd9f1d062cad9acffa06df834106eebe1a4257ef00d");
 
         signature = key.sign(Buffer.from("hello"));
         // Expected signature computed using `elrond-sdk-go-tools/cmd/signer/mcl_signer.go`
@@ -32,6 +32,6 @@ describe("test validator keys", () => {
 N2NmZjk5YmQ2NzE1MDJkYjdkMTViYzhhYmMwYzlhODA0ZmI5MjU0MDZmYmRkNTBmMWU0YzE3YTRjZDc3NDI0Nw==
 -----END foobar`;
         assert.equal(ValidatorSecretKey.fromPem(text).hex(), "7cff99bd671502db7d15bc8abc0c9a804fb925406fbdd50f1e4c17a4cd774247");
-        assert.equal(ValidatorSecretKey.fromPem(text).toPublicKey().hex(), "e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208");
+        assert.equal(ValidatorSecretKey.fromPem(text).generatePublicKey().hex(), "e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208");
     });
 });

From 674880377a29db3b6517f8b3a634ee0a52277018 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Fri, 15 Jan 2021 14:13:01 +0200
Subject: [PATCH 015/338] Fix after review, part 2.

---
 src-wallet/userWallet.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index a2fb39dda..423cfaea5 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -3,7 +3,7 @@ import nacl from "tweetnacl";
 import { UserPublicKey, UserSecretKey } from "./userKeys";
 const crypto = require("crypto");
 import { v4 as uuidv4 } from "uuid";
-const scryptsy = require("scryptsy");
+import scryptsy from "scryptsy";
 
 // In a future PR, improve versioning infrastructure for key-file objects in erdjs.
 const Version = 4;

From 66760e420a50353c9e75d4f18bb0ef6b0b8a910f Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 10 Feb 2021 11:18:20 +0200
Subject: [PATCH 016/338] Add test for signing using PEM file.

---
 src-wallet/users.spec.ts | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 510aa39a4..d0b6a159f 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -157,4 +157,22 @@ describe("test user wallets", () => {
         assert.equal(serialized, `{"nonce":8,"value":"10000000000000000000","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","version":1}`);
         assert.equal(transaction.signature.hex(), "4a6d8186eae110894e7417af82c9bf9592696c0600faf110972e0e5310d8485efc656b867a2336acec2b4c1e5f76c9cc70ba1803c6a46455ed7f1e2989a90105");
     });
+
+    it("should sign transactions using PEM files", async () => {
+        let signer = UserSigner.fromPem(alice.pemFileText);
+        
+        let transaction = new Transaction({
+            nonce: new Nonce(0),
+            value: Balance.Zero(),
+            receiver: new Address("erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r"),
+            gasPrice: new GasPrice(1000000000),
+            gasLimit: new GasLimit(50000),
+            data: new TransactionPayload("foo"),
+            chainID: new ChainID("1"),
+            version: new TransactionVersion(1)
+        });
+
+        await signer.sign(transaction);
+        assert.equal(transaction.signature.hex(), "c0bd2b3b33a07b9cc5ee7435228acb0936b3829c7008aacabceea35163e555e19a34def2c03a895cf36b0bcec30a7e11215c11efc0da29294a11234eb2b3b906");
+    });
 });

From a6478f8f260ec9a5bcd14907c105bc2c5f0368df Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 10 Feb 2021 13:49:33 +0200
Subject: [PATCH 017/338] Extra checks, error handling and tests for PEM
 parsing etc.

---
 src-wallet/pem.spec.ts      | 93 +++++++++++++++++++++++++++++++++++++
 src-wallet/pem.ts           | 27 ++++++++---
 src-wallet/userKeys.ts      | 10 ++--
 src-wallet/validatorKeys.ts | 16 +++++--
 4 files changed, 130 insertions(+), 16 deletions(-)
 create mode 100644 src-wallet/pem.spec.ts

diff --git a/src-wallet/pem.spec.ts b/src-wallet/pem.spec.ts
new file mode 100644
index 000000000..591e379b8
--- /dev/null
+++ b/src-wallet/pem.spec.ts
@@ -0,0 +1,93 @@
+import * as errors from "../errors";
+import { assert } from "chai";
+import { TestWallets } from "../testutils";
+import { parse, parseUserKey, parseValidatorKey } from "./pem";
+import { BLS } from ".";
+import { Buffer } from "buffer";
+
+describe("test PEMs", () => {
+    let wallets = new TestWallets();
+    let alice = wallets.alice;
+    let bob = wallets.bob;
+    let carol = wallets.carol;
+
+    it("should parseUserKey", () => {
+        let aliceKey = parseUserKey(alice.pemFileText);
+        
+        assert.equal(aliceKey.hex(), alice.secretKeyHex);
+        assert.equal(aliceKey.generatePublicKey().toAddress().bech32(), alice.address.bech32());
+    });
+
+    it("should parseValidatorKey", async () => {
+        await BLS.initIfNecessary();
+        
+        let pem = `-----BEGIN PRIVATE KEY for e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208-----
+N2NmZjk5YmQ2NzE1MDJkYjdkMTViYzhhYmMwYzlhODA0ZmI5MjU0MDZmYmRkNTBm
+MWU0YzE3YTRjZDc3NDI0Nw==
+-----END PRIVATE KEY for e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208-----`;
+
+        let validatorKey = parseValidatorKey(pem);
+        
+        assert.equal(validatorKey.hex(), "7cff99bd671502db7d15bc8abc0c9a804fb925406fbdd50f1e4c17a4cd774247");
+        assert.equal(validatorKey.generatePublicKey().hex(), "e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208");
+    });
+
+    it("should parse multi-key PEM files", () => {
+        // The user PEM files encode both the seed and the pubkey in their payloads.
+        let payloadAlice = Buffer.from(alice.secretKeyHex + alice.address.hex()).toString("base64");
+        let payloadBob = Buffer.from(bob.secretKeyHex + bob.address.hex()).toString("base64");
+        let payloadCarol = Buffer.from(carol.secretKeyHex + carol.address.hex()).toString("base64");
+
+        let expected = [
+            Buffer.concat([alice.secretKey, alice.address.pubkey()]),
+            Buffer.concat([bob.secretKey, bob.address.pubkey()]),
+            Buffer.concat([carol.secretKey, carol.address.pubkey()])
+        ];
+
+        let trivialContent = `-----BEGIN PRIVATE KEY for alice
+${payloadAlice}
+-----END PRIVATE KEY for alice
+-----BEGIN PRIVATE KEY for bob
+${payloadBob}
+-----END PRIVATE KEY for bob
+-----BEGIN PRIVATE KEY for carol
+${payloadCarol}
+-----END PRIVATE KEY for carol
+`;
+
+        assert.deepEqual(parse(trivialContent, 64),  expected);
+
+        let contentWithWhitespaces = `
+-----BEGIN PRIVATE KEY for alice
+        ${payloadAlice}
+        -----END PRIVATE KEY for alice
+
+        -----BEGIN PRIVATE KEY for bob
+        ${payloadBob}
+        -----END PRIVATE KEY for bob
+        -----BEGIN PRIVATE KEY for carol
+
+
+        ${payloadCarol}
+        -----END PRIVATE KEY for carol
+        `;
+
+        assert.deepEqual(parse(contentWithWhitespaces, 64), expected);
+    });
+
+    it("should report parsing errors", () => {
+        let contentWithoutEnd = `-----BEGIN PRIVATE KEY for alice
+        NDEzZjQyNTc1ZjdmMjZmYWQzMzE3YTc3ODc3MTIxMmZkYjgwMjQ1ODUwOTgxZTQ4
+        YjU4YTRmMjVlMzQ0ZThmOTAxMzk0NzJlZmY2ODg2NzcxYTk4MmYzMDgzZGE1ZDQy
+        MWYyNGMyOTE4MWU2Mzg4ODIyOGRjODFjYTYwZDY5ZTE=`;
+
+        assert.throw(() => parseUserKey(contentWithoutEnd), errors.ErrBadPEM);
+
+        let contentWithBadData = `-----BEGIN PRIVATE KEY for alice
+        NDEzZjQyNTc1ZjdmMjZmYWQzMzE3YTc3ODc3MTIxMmZkYjgwMjQ1ODUwOTgxZTQ4
+        YjU4YTRmMjVlMzQ0ZThmOTAxMzk0NzJlZmY2ODg2NzcxYTk4MmYzMDgzZGE1Zfoo
+        -----END PRIVATE KEY for alice`;
+
+        assert.throw(() => parseUserKey(contentWithBadData), errors.ErrBadPEM);
+    });
+});
diff --git a/src-wallet/pem.ts b/src-wallet/pem.ts
index 5cb189143..45724efc8 100644
--- a/src-wallet/pem.ts
+++ b/src-wallet/pem.ts
@@ -1,5 +1,6 @@
-import { UserSecretKey } from "./userKeys";
-import { ValidatorSecretKey } from "./validatorKeys";
+import * as errors from "../errors";
+import { UserSecretKey, USER_PUBKEY_LENGTH, USER_SEED_LENGTH } from "./userKeys";
+import { ValidatorSecretKey, VALIDATOR_SECRETKEY_LENGTH } from "./validatorKeys";
 
 export function parseUserKey(text: string, index: number = 0): UserSecretKey {
     let keys = parseUserKeys(text);
@@ -7,8 +8,9 @@ export function parseUserKey(text: string, index: number = 0): UserSecretKey {
 }
 
 export function parseUserKeys(text: string): UserSecretKey[] {
-    let buffers = parse(text);
-    return buffers.map(buffer => new UserSecretKey(buffer.slice(0, 32)));
+    // The user PEM files encode both the seed and the pubkey in their payloads.
+    let buffers = parse(text, USER_SEED_LENGTH + USER_PUBKEY_LENGTH);
+    return buffers.map(buffer => new UserSecretKey(buffer.slice(0, USER_SEED_LENGTH)));
 }
 
 export function parseValidatorKey(text: string, index: number = 0): ValidatorSecretKey {
@@ -17,12 +19,13 @@ export function parseValidatorKey(text: string, index: number = 0): ValidatorSec
 }
 
 export function parseValidatorKeys(text: string): ValidatorSecretKey[] {
-    let buffers = parse(text);
+    let buffers = parse(text, VALIDATOR_SECRETKEY_LENGTH);
     return buffers.map(buffer => new ValidatorSecretKey(buffer));
 }
 
-function parse(text: string): Buffer[] {
-    let lines = text.split(/\r?\n/);
+export function parse(text: string, expectedLength: number): Buffer[] {
+    // Split by newlines, trim whitespace, then discard remaining empty lines.
+    let lines = text.split(/\r?\n/).map(line => line.trim()).filter(line => line.length > 0);
     let buffers: Buffer[] = [];
     let linesAccumulator: string[] = [];
 
@@ -33,11 +36,21 @@ function parse(text: string): Buffer[] {
             let asBase64 = linesAccumulator.join("");
             let asHex = Buffer.from(asBase64, "base64").toString();
             let asBytes = Buffer.from(asHex, "hex");
+
+            if (asBytes.length != expectedLength) {
+                throw new errors.ErrBadPEM("incorrect key length");
+            }
+
             buffers.push(asBytes);
+            linesAccumulator = [];
         } else {
             linesAccumulator.push(line);
         }
     }
 
+    if (linesAccumulator.length != 0) {
+        throw new errors.ErrBadPEM("incorrect file structure");
+    }
+
     return buffers;
 }
diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index 0294818ab..54e5ab54f 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -3,20 +3,20 @@ import { Address } from "../address";
 import { guardLength } from "../utils";
 import { parseUserKey } from "./pem";
 
-const SEED_LENGTH = 32;
-const PUBKEY_LENGTH = 32;
+export const USER_SEED_LENGTH = 32;
+export const USER_PUBKEY_LENGTH = 32;
 
 export class UserSecretKey {
     private readonly buffer: Buffer;
 
     constructor(buffer: Buffer) {
-        guardLength(buffer, SEED_LENGTH);
+        guardLength(buffer, USER_SEED_LENGTH);
 
         this.buffer = buffer;
     }
 
     static fromString(value: string): UserSecretKey {
-        guardLength(value, SEED_LENGTH * 2);
+        guardLength(value, USER_SEED_LENGTH * 2);
 
         let buffer = Buffer.from(value, "hex");
         return new UserSecretKey(buffer);
@@ -55,7 +55,7 @@ export class UserPublicKey {
     private readonly buffer: Buffer;
 
     constructor(buffer: Buffer) {
-        guardLength(buffer, PUBKEY_LENGTH);
+        guardLength(buffer, USER_PUBKEY_LENGTH);
         
         this.buffer = buffer;
     }
diff --git a/src-wallet/validatorKeys.ts b/src-wallet/validatorKeys.ts
index de085ff46..8b1ee75b0 100644
--- a/src-wallet/validatorKeys.ts
+++ b/src-wallet/validatorKeys.ts
@@ -1,10 +1,11 @@
+import * as errors from "../errors";
 import { guardLength } from "../utils";
 import { parseValidatorKey } from "./pem";
 
 const bls = require('@elrondnetwork/bls-wasm');
 
-const SECRETKEY_LENGTH = 32;
-const PUBKEY_LENGTH = 96;
+export const VALIDATOR_SECRETKEY_LENGTH = 32;
+export const VALIDATOR_PUBKEY_LENGTH = 96;
 
 export class BLS {
     private static isInitialized: boolean = false;
@@ -18,6 +19,12 @@ export class BLS {
 
         BLS.isInitialized = true;
     }
+
+    static guardInitialized() {
+        if (!BLS.isInitialized) {
+            throw new errors.ErrInvariantFailed("BLS modules are not initalized. Make sure that 'await BLS.initIfNecessary()' is called correctly.");
+        }
+    }
 }
 
 export class ValidatorSecretKey {
@@ -25,7 +32,8 @@ export class ValidatorSecretKey {
     private readonly publicKey: any;
 
     constructor(buffer: Buffer) {
-        guardLength(buffer, SECRETKEY_LENGTH);
+        BLS.guardInitialized();
+        guardLength(buffer, VALIDATOR_SECRETKEY_LENGTH);
 
         this.secretKey = new bls.SecretKey();
         this.secretKey.setLittleEndian(Uint8Array.from(buffer));
@@ -60,7 +68,7 @@ export class ValidatorPublicKey {
     private readonly buffer: Buffer;
 
     constructor(buffer: Buffer) {
-        guardLength(buffer, PUBKEY_LENGTH);
+        guardLength(buffer, VALIDATOR_PUBKEY_LENGTH);
 
         this.buffer = buffer;
     }

From 937001e00cf5fe9445b8ba96b555f0e7cd4adcfa Mon Sep 17 00:00:00 2001
From: Tudor Morar <tudor.morar@elrond.com>
Date: Wed, 10 Feb 2021 16:03:21 +0200
Subject: [PATCH 018/338] Make tweetnacl use Uint8Array

---
 src-wallet/userKeys.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index 54e5ab54f..7c9cf513d 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -27,13 +27,13 @@ export class UserSecretKey {
     }
 
     generatePublicKey(): UserPublicKey {
-        let keyPair = tweetnacl.sign.keyPair.fromSeed(this.buffer);
+        let keyPair = tweetnacl.sign.keyPair.fromSeed(new Uint8Array(this.buffer));
         let buffer = Buffer.from(keyPair.publicKey);
         return new UserPublicKey(buffer);
     }
 
     sign(message: Buffer): Buffer {
-        let pair = tweetnacl.sign.keyPair.fromSeed(this.buffer);
+        let pair = tweetnacl.sign.keyPair.fromSeed(new Uint8Array(this.buffer));
         let signingKey = pair.secretKey;
         let signature = tweetnacl.sign(new Uint8Array(message), signingKey);
         // "tweetnacl.sign()" returns the concatenated [signature, message], therfore we remove the appended message:

From f369b669e79b95bc22305e12f5600d4983599b7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?=
 <andreibancioiu@users.noreply.github.com>
Date: Wed, 17 Feb 2021 09:59:54 +0200
Subject: [PATCH 019/338] Fixes necessary for automatic publishing of
 elrond-sdk-docs (#201)

* Sketch workflow to build docs.

* Fix typedoc configuration (upon upgrade to 0.20).

* Try out various options for grouping components (in docs).
---
 src-wallet/index.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src-wallet/index.ts b/src-wallet/index.ts
index 64dda6d9e..07fa2a2e2 100644
--- a/src-wallet/index.ts
+++ b/src-wallet/index.ts
@@ -1,3 +1,8 @@
+/**
+ * @packageDocumentation
+ * @module wallet
+ */
+
 export * from "./mnemonic";
 export * from "./pem";
 export * from "./userWallet";

From fc88864ba14d907fdc637926b4d4072a0aa9804b Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 17 Feb 2021 23:25:23 +0200
Subject: [PATCH 020/338] Fix some tests upon merge.

---
 src-wallet/users.spec.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index a33f25402..78cfa1601 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -166,11 +166,10 @@ describe("test user wallets", () => {
             gasPrice: new GasPrice(1000000000),
             gasLimit: new GasLimit(50000),
             data: new TransactionPayload("foo"),
-            chainID: new ChainID("1"),
-            version: new TransactionVersion(1)
+            chainID: new ChainID("1")
         });
 
         await signer.sign(transaction);
-        assert.equal(transaction.signature.hex(), "c0bd2b3b33a07b9cc5ee7435228acb0936b3829c7008aacabceea35163e555e19a34def2c03a895cf36b0bcec30a7e11215c11efc0da29294a11234eb2b3b906");
+        assert.equal(transaction.getSignature().hex(), "c0bd2b3b33a07b9cc5ee7435228acb0936b3829c7008aacabceea35163e555e19a34def2c03a895cf36b0bcec30a7e11215c11efc0da29294a11234eb2b3b906");
     });
 });

From 2607ddc959449fbe33a4144fa83dbc53584e3530 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 10 Mar 2021 23:32:14 +0200
Subject: [PATCH 021/338] Fix after review.

---
 src-wallet/userWallet.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index 423cfaea5..d42c468ae 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -91,8 +91,6 @@ export class UserWallet {
      *  - 350-360 ms in browser (Firefox), on a i3-8100 CPU @ 3.60GHz
      */
     private static generateDerivedKey(password: Buffer, salt: Buffer, kdfparams: ScryptKeyDerivationParams): Buffer {
-        // Question for review: @ccorcoveanu, why not this implementation?
-        // https://nodejs.org/api/crypto.html#crypto_crypto_scrypt_password_salt_keylen_options_callback
         const derivedKey = scryptsy(password, salt, kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen);
         return derivedKey;
     }

From e7344a6e49b0dcd0dcb8618bac2764d203ea35cc Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Fri, 18 Jun 2021 14:41:41 +0300
Subject: [PATCH 022/338] implemented encryption component

---
 src-wallet/crypto/constants.ts        |  5 +++
 src-wallet/crypto/decryptor.ts        | 27 ++++++++++++++++
 src-wallet/crypto/derivationParams.ts | 36 +++++++++++++++++++++
 src-wallet/crypto/encrypt.spec.ts     | 13 ++++++++
 src-wallet/crypto/encryptedData.ts    | 46 +++++++++++++++++++++++++++
 src-wallet/crypto/encryptor.ts        | 30 +++++++++++++++++
 src-wallet/crypto/index.ts            |  5 +++
 src-wallet/crypto/randomness.ts       | 15 +++++++++
 8 files changed, 177 insertions(+)
 create mode 100644 src-wallet/crypto/constants.ts
 create mode 100644 src-wallet/crypto/decryptor.ts
 create mode 100644 src-wallet/crypto/derivationParams.ts
 create mode 100644 src-wallet/crypto/encrypt.spec.ts
 create mode 100644 src-wallet/crypto/encryptedData.ts
 create mode 100644 src-wallet/crypto/encryptor.ts
 create mode 100644 src-wallet/crypto/index.ts
 create mode 100644 src-wallet/crypto/randomness.ts

diff --git a/src-wallet/crypto/constants.ts b/src-wallet/crypto/constants.ts
new file mode 100644
index 000000000..a9fe61a54
--- /dev/null
+++ b/src-wallet/crypto/constants.ts
@@ -0,0 +1,5 @@
+// In a future PR, improve versioning infrastructure for key-file objects in erdjs.
+export const Version = 4;
+export const CipherAlgorithm = "aes-128-ctr";
+export const DigestAlgorithm = "sha256";
+export const KeyDerivationFunction = "scrypt";
diff --git a/src-wallet/crypto/decryptor.ts b/src-wallet/crypto/decryptor.ts
new file mode 100644
index 000000000..35baace91
--- /dev/null
+++ b/src-wallet/crypto/decryptor.ts
@@ -0,0 +1,27 @@
+import crypto from "crypto";
+import {EncryptedData} from "./encryptedData";
+import * as errors from "../errors";
+import { DigestAlgorithm } from "./constants";
+
+export class Decryptor {
+  public static decrypt(data: EncryptedData, password: string): Buffer {
+    const kdfparams = data.kdfparams;
+    const salt = Buffer.from(data.salt, "hex");
+    const iv = Buffer.from(data.iv, "hex");
+    const ciphertext = Buffer.from(data.ciphertext, "hex");
+    const derivedKey = kdfparams.generateDerivedKey(Buffer.from(password), salt);
+    const derivedKeyFirstHalf = derivedKey.slice(0, 16);
+    const derivedKeySecondHalf = derivedKey.slice(16, 32);
+
+    const computedMAC = crypto.createHmac(DigestAlgorithm, derivedKeySecondHalf).update(ciphertext).digest();
+    const actualMAC = data.mac;
+
+    if (computedMAC.toString("hex") !== actualMAC) {
+      throw new errors.ErrWallet("MAC mismatch, possibly wrong password");
+    }
+
+    const decipher = crypto.createDecipheriv(data.cipher, derivedKeyFirstHalf, iv);
+
+    return Buffer.concat([decipher.update(ciphertext), decipher.final()]);
+  }
+}
diff --git a/src-wallet/crypto/derivationParams.ts b/src-wallet/crypto/derivationParams.ts
new file mode 100644
index 000000000..134a95343
--- /dev/null
+++ b/src-wallet/crypto/derivationParams.ts
@@ -0,0 +1,36 @@
+import scryptsy from "scryptsy";
+
+export class ScryptKeyDerivationParams {
+  /**
+   * numIterations
+   */
+  n = 4096;
+
+  /**
+   * memFactor
+   */
+  r = 8;
+
+  /**
+   * pFactor
+   */
+  p = 1;
+
+  dklen = 32;
+
+  constructor(n = 4096, r = 8, p = 1, dklen = 32) {
+    this.n = n;
+    this. r = r;
+    this.p = p;
+    this.dklen = dklen;
+  }
+
+  /**
+   * Will take about:
+   *  - 80-90 ms in Node.js, on a i3-8100 CPU @ 3.60GHz
+   *  - 350-360 ms in browser (Firefox), on a i3-8100 CPU @ 3.60GHz
+   */
+  public generateDerivedKey(password: Buffer, salt: Buffer): Buffer {
+    return scryptsy(password, salt, this.n, this.r, this.p, this.dklen);
+  }
+}
diff --git a/src-wallet/crypto/encrypt.spec.ts b/src-wallet/crypto/encrypt.spec.ts
new file mode 100644
index 000000000..bd15c3f93
--- /dev/null
+++ b/src-wallet/crypto/encrypt.spec.ts
@@ -0,0 +1,13 @@
+import { assert } from "chai";
+import { Encryptor } from "./encryptor";
+import { Decryptor } from "./decryptor";
+
+describe("test address", () => {
+  it("encrypts/decrypts",  () => {
+    const sensitiveData = Buffer.from("my mnemonic");
+    const encryptedData = Encryptor.encrypt(sensitiveData, "password123");
+    const decryptedBuffer = Decryptor.decrypt(encryptedData, "password123");
+
+    assert.equal(sensitiveData.toString('hex'), decryptedBuffer.toString('hex'));
+  });
+});
\ No newline at end of file
diff --git a/src-wallet/crypto/encryptedData.ts b/src-wallet/crypto/encryptedData.ts
new file mode 100644
index 000000000..7477ca65e
--- /dev/null
+++ b/src-wallet/crypto/encryptedData.ts
@@ -0,0 +1,46 @@
+import { ScryptKeyDerivationParams } from "./derivationParams";
+
+export class EncryptedData {
+  id: string;
+  version: number;
+  cipher: string;
+  ciphertext: string;
+  iv: string;
+  kdf: string;
+  kdfparams: ScryptKeyDerivationParams;
+  salt: string;
+  mac: string;
+
+  constructor(data: Omit<EncryptedData, "toJSON">) {
+    this.id = data.id;
+    this.version = data.version;
+    this.ciphertext = data.ciphertext;
+    this.iv = data.iv;
+    this.cipher = data.cipher;
+    this.kdf = data.kdf;
+    this.kdfparams = data.kdfparams;
+    this.mac = data.mac;
+    this.salt = data.salt;
+  }
+
+  toJSON(): any {
+    return {
+      version: this.version,
+      id: this.id,
+      crypto: {
+        ciphertext: this.ciphertext,
+        cipherparams: { iv: this.iv },
+        cipher: this.cipher,
+        kdf: this.kdf,
+        kdfparams: {
+          dklen: this.kdfparams.dklen,
+          salt: this.salt,
+          n: this.kdfparams.n,
+          r: this.kdfparams.r,
+          p: this.kdfparams.p
+        },
+        mac: this.mac,
+      }
+    };
+  }
+}
\ No newline at end of file
diff --git a/src-wallet/crypto/encryptor.ts b/src-wallet/crypto/encryptor.ts
new file mode 100644
index 000000000..e329dbb9c
--- /dev/null
+++ b/src-wallet/crypto/encryptor.ts
@@ -0,0 +1,30 @@
+import crypto from "crypto";
+import { Randomness } from "./randomness";
+import { ScryptKeyDerivationParams } from "./derivationParams";
+import { CipherAlgorithm, DigestAlgorithm, Version, KeyDerivationFunction } from "./constants";
+import {EncryptedData} from "./encryptedData";
+
+export class Encryptor {
+  public static encrypt(data: Buffer, password: string, randomness: Randomness = new Randomness()): EncryptedData {
+    const kdParams = new ScryptKeyDerivationParams();
+    const derivedKey = kdParams.generateDerivedKey(Buffer.from(password), randomness.salt);
+    const derivedKeyFirstHalf = derivedKey.slice(0, 16);
+    const derivedKeySecondHalf = derivedKey.slice(16, 32);
+    const cipher = crypto.createCipheriv(CipherAlgorithm, derivedKeyFirstHalf, randomness.iv);
+
+    const ciphertext = Buffer.concat([cipher.update(data), cipher.final()]);
+    const mac = crypto.createHmac(DigestAlgorithm, derivedKeySecondHalf).update(ciphertext).digest();
+
+    return new EncryptedData({
+      version: Version,
+      id: randomness.id,
+      ciphertext: ciphertext.toString('hex'),
+      iv: randomness.iv.toString('hex'),
+      cipher: CipherAlgorithm,
+      kdf: KeyDerivationFunction,
+      kdfparams: kdParams,
+      mac: mac.toString('hex'),
+      salt: randomness.salt.toString('hex')
+    });
+  }
+}
diff --git a/src-wallet/crypto/index.ts b/src-wallet/crypto/index.ts
new file mode 100644
index 000000000..d674cb91f
--- /dev/null
+++ b/src-wallet/crypto/index.ts
@@ -0,0 +1,5 @@
+export * from "./constants";
+export * from "./encryptor";
+export * from "./decryptor";
+export * from "./encryptedData";
+export * from "./randomness";
diff --git a/src-wallet/crypto/randomness.ts b/src-wallet/crypto/randomness.ts
new file mode 100644
index 000000000..f045dc676
--- /dev/null
+++ b/src-wallet/crypto/randomness.ts
@@ -0,0 +1,15 @@
+import nacl from "tweetnacl";
+import {v4 as uuidv4} from "uuid";
+const crypto = require("crypto");
+
+export class Randomness {
+  salt: Buffer;
+  iv: Buffer;
+  id: string;
+
+  constructor(init?: Partial<Randomness>) {
+    this.salt = init?.salt || Buffer.from(nacl.randomBytes(32));
+    this.iv = init?.iv || Buffer.from(nacl.randomBytes(16));
+    this.id = init?.id || uuidv4({ random: crypto.randomBytes(16) });
+  }
+}

From 702268d8a031e05bcb9ee16c9109e9935a0fb145 Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Fri, 18 Jun 2021 14:41:41 +0300
Subject: [PATCH 023/338] implemented encryption component

---
 src-wallet/userWallet.ts | 125 ++++++++++-----------------------------
 src-wallet/users.spec.ts |   3 +-
 2 files changed, 34 insertions(+), 94 deletions(-)

diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index d42c468ae..22d581829 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -1,22 +1,10 @@
-import * as errors from "../errors";
-import nacl from "tweetnacl";
 import { UserPublicKey, UserSecretKey } from "./userKeys";
-const crypto = require("crypto");
-import { v4 as uuidv4 } from "uuid";
-import scryptsy from "scryptsy";
-
-// In a future PR, improve versioning infrastructure for key-file objects in erdjs.
-const Version = 4;
-const CipherAlgorithm = "aes-128-ctr";
-const DigestAlgorithm = "sha256";
-const KeyDerivationFunction = "scrypt";
+import { EncryptedData, Encryptor, Decryptor, CipherAlgorithm, Version, KeyDerivationFunction, Randomness } from "../crypto";
+import {ScryptKeyDerivationParams} from "../crypto/derivationParams";
 
 export class UserWallet {
     private readonly publicKey: UserPublicKey;
-    private readonly randomness: Randomness;
-    private readonly ciphertext: Buffer;
-    private readonly mac: Buffer;
-    private readonly kdfparams: ScryptKeyDerivationParams;
+    private readonly encryptedData: EncryptedData;
 
     /**
      * Copied from: https://github.com/ElrondNetwork/elrond-core-js/blob/v1.28.0/src/account.js#L76
@@ -30,21 +18,9 @@ export class UserWallet {
      * passed through a password-based key derivation function (kdf).
      */
     constructor(secretKey: UserSecretKey, password: string, randomness: Randomness = new Randomness()) {
-        const kdParams = new ScryptKeyDerivationParams();
-        const derivedKey = UserWallet.generateDerivedKey(Buffer.from(password), randomness.salt, kdParams);
-        const derivedKeyFirstHalf = derivedKey.slice(0, 16);
-        const derivedKeySecondHalf = derivedKey.slice(16, 32);
-        const cipher = crypto.createCipheriv(CipherAlgorithm, derivedKeyFirstHalf, randomness.iv);
-
         const text = Buffer.concat([secretKey.valueOf(), secretKey.generatePublicKey().valueOf()]);
-        const ciphertext = Buffer.concat([cipher.update(text), cipher.final()]);
-        const mac = crypto.createHmac(DigestAlgorithm, derivedKeySecondHalf).update(ciphertext).digest();
-
+        this.encryptedData = Encryptor.encrypt(text, password, randomness);
         this.publicKey = secretKey.generatePublicKey();
-        this.randomness = randomness;
-        this.ciphertext = ciphertext;
-        this.mac = mac;
-        this.kdfparams = kdParams;
     }
 
     /**
@@ -58,24 +34,9 @@ export class UserWallet {
      * From an encrypted keyfile, given the password, loads the secret key and the public key.
      */
     static decryptSecretKey(keyFileObject: any, password: string): UserSecretKey {
-        const kdfparams = keyFileObject.crypto.kdfparams;
-        const salt = Buffer.from(kdfparams.salt, "hex");
-        const iv = Buffer.from(keyFileObject.crypto.cipherparams.iv, "hex");
-        const ciphertext = Buffer.from(keyFileObject.crypto.ciphertext, "hex");
-        const derivedKey = UserWallet.generateDerivedKey(Buffer.from(password), salt, kdfparams);
-        const derivedKeyFirstHalf = derivedKey.slice(0, 16);
-        const derivedKeySecondHalf = derivedKey.slice(16, 32);
-        
-        const computedMAC = crypto.createHmac(DigestAlgorithm, derivedKeySecondHalf).update(ciphertext).digest();
-        const actualMAC = keyFileObject.crypto.mac;
-
-        if (computedMAC.toString("hex") !== actualMAC) {
-            throw new errors.ErrWallet("MAC mismatch, possibly wrong password");
-        }
-
-        const decipher = crypto.createDecipheriv(keyFileObject.crypto.cipher, derivedKeyFirstHalf, iv);
+        const encryptedData = UserWallet.ecFromJSON(keyFileObject)
 
-        let text = Buffer.concat([decipher.update(ciphertext), decipher.final()]);
+        let text = Decryptor.decrypt(encryptedData, password);
         while (text.length < 32) {
             let zeroPadding = Buffer.from([0x00]);
             text = Buffer.concat([zeroPadding, text]);
@@ -85,14 +46,23 @@ export class UserWallet {
         return new UserSecretKey(seed);
     }
 
-    /**
-     * Will take about:
-     *  - 80-90 ms in Node.js, on a i3-8100 CPU @ 3.60GHz
-     *  - 350-360 ms in browser (Firefox), on a i3-8100 CPU @ 3.60GHz
-     */
-    private static generateDerivedKey(password: Buffer, salt: Buffer, kdfparams: ScryptKeyDerivationParams): Buffer {
-        const derivedKey = scryptsy(password, salt, kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen);
-        return derivedKey;
+    static ecFromJSON(keyfileObject: any): EncryptedData {
+        return new EncryptedData({
+            version: Version,
+            id: keyfileObject.id,
+            cipher: keyfileObject.crypto.cipher,
+            ciphertext: keyfileObject.crypto.ciphertext,
+            iv: keyfileObject.crypto.cipherparams.iv,
+            kdf: keyfileObject.crypto.kdf,
+            kdfparams: new ScryptKeyDerivationParams(
+              keyfileObject.crypto.kdfparams.n,
+              keyfileObject.crypto.kdfparams.r,
+              keyfileObject.crypto.kdfparams.p,
+              keyfileObject.crypto.kdfparams.dklen
+            ),
+            salt: keyfileObject.crypto.kdfparams.salt,
+            mac: keyfileObject.crypto.mac,
+        });
     }
 
     /**
@@ -101,54 +71,23 @@ export class UserWallet {
     toJSON(): any {
         return {
             version: Version,
-            id: this.randomness.id,
+            id: this.encryptedData.id,
             address: this.publicKey.hex(),
             bech32: this.publicKey.toAddress().toString(),
             crypto: {
-                ciphertext: this.ciphertext.toString("hex"),
-                cipherparams: { iv: this.randomness.iv.toString("hex") },
+                ciphertext: this.encryptedData.ciphertext,
+                cipherparams: { iv: this.encryptedData.iv },
                 cipher: CipherAlgorithm,
                 kdf: KeyDerivationFunction,
                 kdfparams: {
-                    dklen: this.kdfparams.dklen,
-                    salt: this.randomness.salt.toString("hex"),
-                    n: this.kdfparams.n,
-                    r: this.kdfparams.r,
-                    p: this.kdfparams.p
+                    dklen: this.encryptedData.kdfparams.dklen,
+                    salt: this.encryptedData.salt,
+                    n: this.encryptedData.kdfparams.n,
+                    r: this.encryptedData.kdfparams.r,
+                    p: this.encryptedData.kdfparams.p
                 },
-                mac: this.mac.toString("hex"),
+                mac: this.encryptedData.mac,
             }
         };
     }
 }
-
-class ScryptKeyDerivationParams {
-    /**
-     * numIterations
-     */
-    n = 4096;
-
-    /**
-     * memFactor
-     */
-    r = 8;
-
-    /**
-     * pFactor
-     */
-    p = 1;
-
-    dklen = 32;
-}
-
-export class Randomness {
-    salt: Buffer;
-    iv: Buffer;
-    id: string;
-
-    constructor(init?: Partial<Randomness>) {
-        this.salt = init?.salt || Buffer.from(nacl.randomBytes(32));
-        this.iv = init?.iv || Buffer.from(nacl.randomBytes(16));
-        this.id = init?.id || uuidv4({ random: crypto.randomBytes(16) });
-    }
-}
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 78cfa1601..4f57c11f0 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -3,7 +3,8 @@ import { assert } from "chai";
 import { TestWallets } from "../testutils";
 import { UserSecretKey } from "./userKeys";
 import { Mnemonic } from "./mnemonic";
-import { UserWallet, Randomness } from "./userWallet";
+import { UserWallet } from "./userWallet";
+import { Randomness } from "../crypto";
 import { Address } from "../address";
 import { UserSigner } from "./userSigner";
 import { Transaction } from "../transaction";

From 77f33066d921843fdc9fae2f50fdeb5ca8b66377 Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Tue, 22 Jun 2021 13:49:27 +0300
Subject: [PATCH 024/338] add json decoed function for EncryptedData

---
 src-wallet/crypto/encrypt.spec.ts  |  9 +++++++++
 src-wallet/crypto/encryptedData.ts | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/src-wallet/crypto/encrypt.spec.ts b/src-wallet/crypto/encrypt.spec.ts
index bd15c3f93..9b7eaf0af 100644
--- a/src-wallet/crypto/encrypt.spec.ts
+++ b/src-wallet/crypto/encrypt.spec.ts
@@ -1,6 +1,7 @@
 import { assert } from "chai";
 import { Encryptor } from "./encryptor";
 import { Decryptor } from "./decryptor";
+import { EncryptedData } from "./encryptedData";
 
 describe("test address", () => {
   it("encrypts/decrypts",  () => {
@@ -10,4 +11,12 @@ describe("test address", () => {
 
     assert.equal(sensitiveData.toString('hex'), decryptedBuffer.toString('hex'));
   });
+
+  it("encodes/decodes kdfparams", () => {
+    const sensitiveData = Buffer.from("my mnemonic");
+    const encryptedData = Encryptor.encrypt(sensitiveData, "password123");
+    const decodedData = EncryptedData.fromJSON(encryptedData.toJSON());
+
+    assert.deepEqual(decodedData, encryptedData, "invalid decoded data");
+  });
 });
\ No newline at end of file
diff --git a/src-wallet/crypto/encryptedData.ts b/src-wallet/crypto/encryptedData.ts
index 7477ca65e..14ff97ae9 100644
--- a/src-wallet/crypto/encryptedData.ts
+++ b/src-wallet/crypto/encryptedData.ts
@@ -43,4 +43,23 @@ export class EncryptedData {
       }
     };
   }
+
+  static fromJSON(data: any): EncryptedData {
+    return new EncryptedData({
+      version: data.version,
+      id: data.id,
+      ciphertext: data.crypto.ciphertext,
+      iv: data.crypto.cipherparams.iv,
+      cipher: data.crypto.cipher,
+      kdf: data.crypto.kdf,
+      kdfparams: new ScryptKeyDerivationParams(
+        data.crypto.kdfparams.n,
+        data.crypto.kdfparams.r,
+        data.crypto.kdfparams.p,
+        data.crypto.kdfparams.dklen,
+      ),
+      salt: data.crypto.kdfparams.salt,
+      mac: data.crypto.mac,
+    });
+  }
 }
\ No newline at end of file

From 114519229486cae91817309a1aea96c65db1a0a1 Mon Sep 17 00:00:00 2001
From: Claudiu-Marcel Bruda <claudiu725@yahoo.com>
Date: Mon, 28 Jun 2021 17:24:14 +0300
Subject: [PATCH 025/338] Add contract wrapper

---
 src-wallet/pem.spec.ts        | 18 +++++++++---------
 src-wallet/pem.ts             |  2 +-
 src-wallet/users.spec.ts      | 23 ++++++++++++-----------
 src-wallet/validators.spec.ts |  2 --
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src-wallet/pem.spec.ts b/src-wallet/pem.spec.ts
index 591e379b8..89fb76469 100644
--- a/src-wallet/pem.spec.ts
+++ b/src-wallet/pem.spec.ts
@@ -1,33 +1,33 @@
 import * as errors from "../errors";
 import { assert } from "chai";
-import { TestWallets } from "../testutils";
+import { loadTestWallets, TestWallet } from "../testutils";
 import { parse, parseUserKey, parseValidatorKey } from "./pem";
 import { BLS } from ".";
 import { Buffer } from "buffer";
 
 describe("test PEMs", () => {
-    let wallets = new TestWallets();
-    let alice = wallets.alice;
-    let bob = wallets.bob;
-    let carol = wallets.carol;
+    let alice: TestWallet, bob: TestWallet, carol: TestWallet;
+    before(async function () {
+        ({ alice, bob, carol } = await loadTestWallets());
+    });
 
     it("should parseUserKey", () => {
         let aliceKey = parseUserKey(alice.pemFileText);
-        
+
         assert.equal(aliceKey.hex(), alice.secretKeyHex);
         assert.equal(aliceKey.generatePublicKey().toAddress().bech32(), alice.address.bech32());
     });
 
     it("should parseValidatorKey", async () => {
         await BLS.initIfNecessary();
-        
+
         let pem = `-----BEGIN PRIVATE KEY for e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208-----
 N2NmZjk5YmQ2NzE1MDJkYjdkMTViYzhhYmMwYzlhODA0ZmI5MjU0MDZmYmRkNTBm
 MWU0YzE3YTRjZDc3NDI0Nw==
 -----END PRIVATE KEY for e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208-----`;
 
         let validatorKey = parseValidatorKey(pem);
-        
+
         assert.equal(validatorKey.hex(), "7cff99bd671502db7d15bc8abc0c9a804fb925406fbdd50f1e4c17a4cd774247");
         assert.equal(validatorKey.generatePublicKey().hex(), "e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208");
     });
@@ -55,7 +55,7 @@ ${payloadCarol}
 -----END PRIVATE KEY for carol
 `;
 
-        assert.deepEqual(parse(trivialContent, 64),  expected);
+        assert.deepEqual(parse(trivialContent, 64), expected);
 
         let contentWithWhitespaces = `
 -----BEGIN PRIVATE KEY for alice
diff --git a/src-wallet/pem.ts b/src-wallet/pem.ts
index 45724efc8..546ab0cdd 100644
--- a/src-wallet/pem.ts
+++ b/src-wallet/pem.ts
@@ -38,7 +38,7 @@ export function parse(text: string, expectedLength: number): Buffer[] {
             let asBytes = Buffer.from(asHex, "hex");
 
             if (asBytes.length != expectedLength) {
-                throw new errors.ErrBadPEM("incorrect key length");
+                throw new errors.ErrBadPEM(`incorrect key length: expected ${expectedLength}, found ${asBytes.length}`);
             }
 
             buffers.push(asBytes);
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 78cfa1601..6ffff61f7 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -1,6 +1,6 @@
 import * as errors from "../errors";
 import { assert } from "chai";
-import { TestWallets } from "../testutils";
+import { loadMnemonic, loadPassword, loadTestWallets, TestWallet } from "../testutils";
 import { UserSecretKey } from "./userKeys";
 import { Mnemonic } from "./mnemonic";
 import { UserWallet, Randomness } from "./userWallet";
@@ -13,11 +13,12 @@ import { ChainID, GasLimit, GasPrice, TransactionVersion } from "../networkParam
 import { TransactionPayload } from "../transactionPayload";
 
 describe("test user wallets", () => {
-    let wallets = new TestWallets();
-    let alice = wallets.alice;
-    let bob = wallets.bob;
-    let carol = wallets.carol;
-    let password = wallets.password;
+    let alice: TestWallet, bob: TestWallet, carol: TestWallet;
+    let password: string;
+    before(async function () {
+        ({ alice, bob, carol } = await loadTestWallets());
+        password = await loadPassword();
+    });
 
     it("should generate mnemonic", () => {
         let mnemonic = Mnemonic.generate();
@@ -25,8 +26,8 @@ describe("test user wallets", () => {
         assert.lengthOf(words, 24);
     });
 
-    it("should derive keys", () => {
-        let mnemonic = Mnemonic.fromString(wallets.mnemonic);
+    it("should derive keys", async () => {
+        let mnemonic = Mnemonic.fromString(await loadMnemonic());
 
         assert.equal(mnemonic.deriveKey(0).hex(), alice.secretKeyHex);
         assert.equal(mnemonic.deriveKey(1).hex(), bob.secretKeyHex);
@@ -34,7 +35,7 @@ describe("test user wallets", () => {
     });
 
     it("should create secret key", () => {
-        let keyHex = wallets.alice.secretKeyHex;
+        let keyHex = alice.secretKeyHex;
         let fromBuffer = new UserSecretKey(Buffer.from(keyHex, "hex"));
         let fromHex = UserSecretKey.fromString(keyHex);
 
@@ -138,7 +139,7 @@ describe("test user wallets", () => {
 
         assert.equal(serialized, `{"nonce":0,"value":"0","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1}`);
         assert.equal(transaction.getSignature().hex(), "b5fddb8c16fa7f6123cb32edc854f1e760a3eb62c6dc420b5a4c0473c58befd45b621b31a448c5b59e21428f2bc128c80d0ee1caa4f2bf05a12be857ad451b00");
-    
+
         // Without data field
         transaction = new Transaction({
             nonce: new Nonce(8),
@@ -158,7 +159,7 @@ describe("test user wallets", () => {
 
     it("should sign transactions using PEM files", async () => {
         let signer = UserSigner.fromPem(alice.pemFileText);
-        
+
         let transaction = new Transaction({
             nonce: new Nonce(0),
             value: Balance.Zero(),
diff --git a/src-wallet/validators.spec.ts b/src-wallet/validators.spec.ts
index e737e2f5f..609098cca 100644
--- a/src-wallet/validators.spec.ts
+++ b/src-wallet/validators.spec.ts
@@ -1,9 +1,7 @@
 import { assert } from "chai";
-import { TestWallets } from "../testutils";
 import { BLS, ValidatorSecretKey } from "./validatorKeys";
 
 describe("test validator keys", () => {
-    let wallets = new TestWallets();
 
     it("should create secret key and sign a message", async () => {
         await BLS.initIfNecessary();

From 1f93e0dd790ae40c4141eb51b3ed14de6a9e37a1 Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Tue, 29 Jun 2021 14:06:15 +0300
Subject: [PATCH 026/338] added empty line

---
 src-wallet/crypto/encrypt.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-wallet/crypto/encrypt.spec.ts b/src-wallet/crypto/encrypt.spec.ts
index 9b7eaf0af..b076b3111 100644
--- a/src-wallet/crypto/encrypt.spec.ts
+++ b/src-wallet/crypto/encrypt.spec.ts
@@ -19,4 +19,4 @@ describe("test address", () => {
 
     assert.deepEqual(decodedData, encryptedData, "invalid decoded data");
   });
-});
\ No newline at end of file
+});

From a4b511e0354f5f860f1bdf90fb0303f4d96cc9b7 Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Tue, 29 Jun 2021 14:07:26 +0300
Subject: [PATCH 027/338] added empty line

---
 src-wallet/crypto/encryptedData.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-wallet/crypto/encryptedData.ts b/src-wallet/crypto/encryptedData.ts
index 14ff97ae9..b882a5707 100644
--- a/src-wallet/crypto/encryptedData.ts
+++ b/src-wallet/crypto/encryptedData.ts
@@ -62,4 +62,4 @@ export class EncryptedData {
       mac: data.crypto.mac,
     });
   }
-}
\ No newline at end of file
+}

From a0950fc7be5f2d51b6e635fb63ac4cf50167f3f2 Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Thu, 1 Jul 2021 10:37:18 +0300
Subject: [PATCH 028/338] typo fix

---
 src-wallet/userWallet.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index 22d581829..c0f7064d8 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -34,7 +34,7 @@ export class UserWallet {
      * From an encrypted keyfile, given the password, loads the secret key and the public key.
      */
     static decryptSecretKey(keyFileObject: any, password: string): UserSecretKey {
-        const encryptedData = UserWallet.ecFromJSON(keyFileObject)
+        const encryptedData = UserWallet.edFromJSON(keyFileObject)
 
         let text = Decryptor.decrypt(encryptedData, password);
         while (text.length < 32) {
@@ -46,7 +46,7 @@ export class UserWallet {
         return new UserSecretKey(seed);
     }
 
-    static ecFromJSON(keyfileObject: any): EncryptedData {
+    static edFromJSON(keyfileObject: any): EncryptedData {
         return new EncryptedData({
             version: Version,
             id: keyfileObject.id,

From 0cd37007832fd98d1a94b8cc925a3b5b6be91a5d Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Thu, 15 Jul 2021 10:01:53 +0300
Subject: [PATCH 029/338] message signing progress

---
 src-wallet/userKeys.ts     | 13 +++++++++++++
 src-wallet/userVerifier.ts | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 src-wallet/userVerifier.ts

diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index 7c9cf513d..415a9ea19 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -2,6 +2,8 @@ import * as tweetnacl from "tweetnacl";
 import { Address } from "../address";
 import { guardLength } from "../utils";
 import { parseUserKey } from "./pem";
+import {SignableMessage} from "../signableMessage";
+import {Logger} from "../logger";
 
 export const USER_SEED_LENGTH = 32;
 export const USER_PUBKEY_LENGTH = 32;
@@ -60,6 +62,17 @@ export class UserPublicKey {
         this.buffer = buffer;
     }
 
+    verify(message: Buffer, signature: Buffer): boolean {
+        try {
+            const unopenedMessage = Buffer.concat([Buffer.from(message.signature.hex(), "hex"), message]);
+            const unsignedMessage = tweetnacl.sign.open(unopenedMessage, this.address.pubkey());
+            return unsignedMessage != null;
+        } catch (err) {
+            Logger.error(err);
+            return false;
+        }
+    }
+
     hex(): string {
         return this.buffer.toString("hex");
     }
diff --git a/src-wallet/userVerifier.ts b/src-wallet/userVerifier.ts
new file mode 100644
index 000000000..a2a8e6814
--- /dev/null
+++ b/src-wallet/userVerifier.ts
@@ -0,0 +1,32 @@
+import { IVerifier } from "../interface";
+import { SignableMessage } from "../signableMessage";
+import * as errors from "../errors";
+import { Address } from "../address";
+import * as tweetnacl from "tweetnacl";
+import {Logger} from "../logger";
+
+/**
+ * ed25519 signature verification
+ */
+export class UserVerifier implements IVerifier {
+
+  address: Address;
+  constructor(address: Address) {
+    this.address = address;
+  }
+
+  /**
+   * Verify a message's signature.
+   * @param message the message to be verified.
+   */
+  async verify(message: SignableMessage): Promise<boolean> {
+    try {
+      const unopenedMessage = Buffer.concat([Buffer.from(message.signature.hex(), "hex"), message.serializeForSigning()]);
+      const unsignedMessage = tweetnacl.sign.open(unopenedMessage, this.address.pubkey());
+      return unsignedMessage != null;
+    } catch (err) {
+      Logger.error(err);
+      return false;
+    }
+  }
+}

From cf5774084f37d47e43a557f00fb198cdce10e658 Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Thu, 15 Jul 2021 12:34:28 +0300
Subject: [PATCH 030/338] finished message signing implementation

---
 src-wallet/userKeys.ts     |  4 ++--
 src-wallet/userVerifier.ts | 33 +++++++++++++++------------------
 src-wallet/users.spec.ts   | 19 +++++++++++++++++--
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index 415a9ea19..1bb44f5e1 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -64,8 +64,8 @@ export class UserPublicKey {
 
     verify(message: Buffer, signature: Buffer): boolean {
         try {
-            const unopenedMessage = Buffer.concat([Buffer.from(message.signature.hex(), "hex"), message]);
-            const unsignedMessage = tweetnacl.sign.open(unopenedMessage, this.address.pubkey());
+            const unopenedMessage = Buffer.concat([signature, message]);
+            const unsignedMessage = tweetnacl.sign.open(unopenedMessage, this.buffer);
             return unsignedMessage != null;
         } catch (err) {
             Logger.error(err);
diff --git a/src-wallet/userVerifier.ts b/src-wallet/userVerifier.ts
index a2a8e6814..d39bfa885 100644
--- a/src-wallet/userVerifier.ts
+++ b/src-wallet/userVerifier.ts
@@ -1,32 +1,29 @@
-import { IVerifier } from "../interface";
-import { SignableMessage } from "../signableMessage";
-import * as errors from "../errors";
-import { Address } from "../address";
-import * as tweetnacl from "tweetnacl";
-import {Logger} from "../logger";
+import {IVerifiable, IVerifier} from "../interface";
+import {Address} from "../address";
+import {UserPublicKey} from "./userKeys";
 
 /**
  * ed25519 signature verification
  */
 export class UserVerifier implements IVerifier {
 
-  address: Address;
-  constructor(address: Address) {
-    this.address = address;
+  publicKey: UserPublicKey;
+  constructor(publicKey: UserPublicKey) {
+    this.publicKey = publicKey;
+  }
+
+  static fromAddress(address: Address): IVerifier {
+    let publicKey = new UserPublicKey(address.pubkey());
+    return new UserVerifier(publicKey);
   }
 
   /**
    * Verify a message's signature.
    * @param message the message to be verified.
    */
-  async verify(message: SignableMessage): Promise<boolean> {
-    try {
-      const unopenedMessage = Buffer.concat([Buffer.from(message.signature.hex(), "hex"), message.serializeForSigning()]);
-      const unsignedMessage = tweetnacl.sign.open(unopenedMessage, this.address.pubkey());
-      return unsignedMessage != null;
-    } catch (err) {
-      Logger.error(err);
-      return false;
-    }
+  verify(message: IVerifiable): boolean {
+    return this.publicKey.verify(
+      message.serializeForSigning(this.publicKey.toAddress()),
+      Buffer.from(message.getSignature().hex(), 'hex'));
   }
 }
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 4f57c11f0..d42a42155 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -10,8 +10,10 @@ import { UserSigner } from "./userSigner";
 import { Transaction } from "../transaction";
 import { Nonce } from "../nonce";
 import { Balance } from "../balance";
-import { ChainID, GasLimit, GasPrice, TransactionVersion } from "../networkParams";
+import { ChainID, GasLimit, GasPrice } from "../networkParams";
 import { TransactionPayload } from "../transactionPayload";
+import {UserVerifier} from "./userVerifier";
+import {SignableMessage} from "../signableMessage";
 
 describe("test user wallets", () => {
     let wallets = new TestWallets();
@@ -120,6 +122,7 @@ describe("test user wallets", () => {
 
     it("should sign transactions", async () => {
         let signer = new UserSigner(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
+        let verifier = new UserVerifier(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf").generatePublicKey());
         let sender = new Address("erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz");
         let receiver = new Address("erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r");
 
@@ -139,7 +142,7 @@ describe("test user wallets", () => {
 
         assert.equal(serialized, `{"nonce":0,"value":"0","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1}`);
         assert.equal(transaction.getSignature().hex(), "b5fddb8c16fa7f6123cb32edc854f1e760a3eb62c6dc420b5a4c0473c58befd45b621b31a448c5b59e21428f2bc128c80d0ee1caa4f2bf05a12be857ad451b00");
-    
+        assert.isTrue(verifier.verify(transaction));
         // Without data field
         transaction = new Transaction({
             nonce: new Nonce(8),
@@ -173,4 +176,16 @@ describe("test user wallets", () => {
         await signer.sign(transaction);
         assert.equal(transaction.getSignature().hex(), "c0bd2b3b33a07b9cc5ee7435228acb0936b3829c7008aacabceea35163e555e19a34def2c03a895cf36b0bcec30a7e11215c11efc0da29294a11234eb2b3b906");
     });
+
+    it("signs a general message", function() {
+        let signer = new UserSigner(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
+        let verifier = new UserVerifier(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf").generatePublicKey());
+        const message = new SignableMessage({
+            message: Buffer.from("hello world")
+        });
+
+        signer.sign(message);
+        assert.isNotEmpty(message.signature);
+        assert.isTrue(verifier.verify(message));
+    });
 });

From 57c6a7ab14eadff9e7639e7d438bb87716daf663 Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Tue, 20 Jul 2021 12:14:38 +0300
Subject: [PATCH 031/338] exported user verifier

---
 src-wallet/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src-wallet/index.ts b/src-wallet/index.ts
index 07fa2a2e2..acf9c06b9 100644
--- a/src-wallet/index.ts
+++ b/src-wallet/index.ts
@@ -9,4 +9,5 @@ export * from "./userWallet";
 export * from "./userKeys";
 export * from "./validatorKeys";
 export * from "./userSigner";
+export * from "./userVerifier";
 export * from "./validatorSigner";

From cdc8d55da3536a7cd2b6e913cbb95b95ba857b42 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Mon, 21 Feb 2022 13:30:07 +0200
Subject: [PATCH 032/338] Sketch interface INetworkProvider, proxy
 implementation.

---
 .../networkProvider/proxyNetworkProvider.ts   | 193 ++++++++++++++++++
 1 file changed, 193 insertions(+)
 create mode 100644 src-network-providers/networkProvider/proxyNetworkProvider.ts

diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
new file mode 100644
index 000000000..643e0f9a9
--- /dev/null
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -0,0 +1,193 @@
+import axios, { AxiosRequestConfig } from "axios";
+import { BigNumber } from "bignumber.js";
+import { AccountOnNetwork, TokenOfAccountOnNetwork } from "../account";
+import { Address } from "../address";
+import { defaultConfig } from "../constants";
+import { ErrApiProviderGet, ErrContractQuery } from "../errors";
+import { INetworkProvider } from "../interface.networkProvider";
+import { Logger } from "../logger";
+import { NetworkConfig } from "../networkConfig";
+import { NetworkStake } from "../networkStake";
+import { NetworkStatus } from "../networkStatus";
+import { Query, QueryResponse } from "../smartcontracts";
+import { Stats } from "../stats";
+import { Token } from "../token";
+import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
+import { TransactionOnNetwork } from "../transactionOnNetwork";
+
+
+export class NetworkProxyProvider implements INetworkProvider {
+    private url: string;
+    private config: AxiosRequestConfig;
+
+    /**
+     * Creates a new {@link INetworkProvider} backed by an Elrond Proxy.
+     * @param url the URL of the Elrond Proxy
+     * @param config axios request config options
+     */
+    constructor(url: string, config?: AxiosRequestConfig) {
+        this.url = url;
+        this.config = { ...defaultConfig, ...config };
+    }
+
+    async getNetworkConfig(): Promise<NetworkConfig> {
+        let response = await this.doGetGeneric("network/config");
+        let networkConfig = NetworkConfig.fromHttpResponse(response.config);
+        return networkConfig;
+    }
+
+    async getNetworkStatus(): Promise<NetworkStatus> {
+        let response = await this.doGetGeneric("network/status/4294967295");
+        let networkStatus = NetworkStatus.fromHttpResponse(response.status);
+        return networkStatus;
+    }
+
+    async getAccount(address: Address): Promise<AccountOnNetwork> {
+        let response = await this.doGetGeneric(`address/${address.bech32()}`);
+        let account = AccountOnNetwork.fromHttpResponse(response.account);
+        return account;
+    }
+
+    async getAddressEsdtList(address: Address): Promise<TokenOfAccountOnNetwork[]> {
+        let url = `address/${address.bech32()}/esdt`;
+        let response = await this.doGetGeneric(url);
+        let tokens = Object.values(response.esdts).map(item => TokenOfAccountOnNetwork.fromHttpResponse(item));
+        return tokens;
+    }
+
+    async getAddressEsdt(address: Address, tokenIdentifier: string): Promise<any> {
+        let response = await this.doGetGeneric(`address/${address.bech32()}/esdt/${tokenIdentifier}`);
+        let tokenData = response.tokenData;
+        return tokenData;
+    }
+
+    async getAddressNft(address: Address, tokenIdentifier: string, nonce: BigNumber.Value): Promise<any> {
+        let response = await this.doGetGeneric(`address/${address.bech32()}/nft/${tokenIdentifier}/nonce/${nonce}`);
+        let tokenData = response.tokenData;
+        return tokenData;
+    }
+
+    async getTransaction(txHash: TransactionHash, hintSender?: Address): Promise<TransactionOnNetwork> {
+        let url = this.buildUrlWithQueryParameters(`transaction/${txHash.toString()}`, {
+            withSender: hintSender ? hintSender.bech32() : "",
+            withResults: "true"
+        });
+
+        let response = await this.doGetGeneric(url);
+        let transaction = TransactionOnNetwork.fromHttpResponse(txHash, response.transaction);
+        return transaction;
+    }
+
+    async getTransactionStatus(txHash: TransactionHash): Promise<TransactionStatus> {
+        let response = await this.doGetGeneric(`transaction/${txHash.toString()}/status`);
+        let status = new TransactionStatus(response.status);
+        return status;
+    }
+
+    async sendTransaction(tx: Transaction): Promise<TransactionHash> {
+        let response = await this.doPostGeneric("transaction/send", tx.toSendable());
+        let hash = new TransactionHash(response.txHash)
+        return hash;
+    }
+
+    async simulateTransaction(tx: Transaction): Promise<any> {
+        let response = await this.doPostGeneric("transaction/simulate", tx.toSendable(), (response) => response);
+        return response;
+    }
+
+    async queryContract(query: Query): Promise<QueryResponse> {
+        try {
+            let data = query.toHttpRequest();
+            let response = await this.doPostGeneric("vm-values/query", data);
+            let queryResponse = QueryResponse.fromHttpResponse(response.data || response.vmOutput)
+            return queryResponse;
+        } catch (err: any) {
+            throw ErrContractQuery.increaseSpecificity(err);
+        }
+    }
+
+    getNetworkStake(): Promise<NetworkStake> {
+        // TODO: Implement wrt.:
+        // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/stake/stake.service.ts
+        throw new Error("Method not implemented.");
+    }
+
+    getNetworkStats(): Promise<Stats> {
+        // TODO: Implement wrt. (full implementation may not be possible):
+        // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/network/network.service.ts
+        throw new Error("Method not implemented.");
+    }
+
+    getToken(_tokenIdentifier: string): Promise<Token> {
+        // TODO: Implement wrt.:
+        // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/esdt/esdt.service.ts#L221
+        throw new Error("Method not implemented.");
+    }
+
+    getDefinitionOfTokenCollection(): Promise<any> {
+        // TODO: Implement wrt.:
+        // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/collections/collection.service.ts
+        // https://docs.elrond.com/developers/esdt-tokens/#get-esdt-token-properties
+        throw new Error("Method not implemented.");
+    }
+
+    async doGetGeneric(resourceUrl: string): Promise<any> {
+        let response = await this.doGet(resourceUrl);
+        return response;
+    }
+
+    async doPostGeneric(resourceUrl: string, payload: any): Promise<any> {
+        let response = await this.doPost(resourceUrl, payload);
+        return response;
+    }
+
+    private async doGet(resourceUrl: string): Promise<any> {
+        try {
+            let url = `${this.url}/${resourceUrl}`;
+            let response = await axios.get(url, this.config);
+            let payload = response.data.data;
+            return payload;
+        } catch (error) {
+            this.handleApiError(error, resourceUrl);
+        }
+    }
+
+    private async doPost(resourceUrl: string, payload: any): Promise<any> {
+        try {
+            let url = `${this.url}/${resourceUrl}`;
+            let response = await axios.post(url, payload, {
+                ...this.config,
+                headers: {
+                    "Content-Type": "application/json",
+                },
+            });
+            let responsePayload = response.data.data;
+            return responsePayload;
+        } catch (error) {
+            this.handleApiError(error, resourceUrl);
+        }
+    }
+
+    private buildUrlWithQueryParameters(endpoint: string, params: Record<string, string>): string {
+        let searchParams = new URLSearchParams();
+
+        for (let [key, value] of Object.entries(params)) {
+            if (value) {
+                searchParams.append(key, value);
+            }
+        }
+
+        return `${endpoint}?${searchParams.toString()}`;
+    }
+
+    private handleApiError(error: any, resourceUrl: string) {
+        if (!error.response) {
+            Logger.warn(error);
+            throw new ErrApiProviderGet(resourceUrl, error.toString(), error);
+        }
+
+        let errorData = error.response.data;
+        let originalErrorMessage = errorData.error || errorData.message || JSON.stringify(errorData);
+        throw new ErrApiProviderGet(resourceUrl, originalErrorMessage, error);
+    }
+}

From cbe64af51256ef5ddb0c85347029be6fc09aa31b Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Mon, 21 Feb 2022 15:19:31 +0200
Subject: [PATCH 033/338] Sketch implementation.

---
 .../networkProvider/apiNetworkProvider.ts     | 184 ++++++++++++++++++
 .../networkProvider/proxyNetworkProvider.ts   |  40 ++--
 2 files changed, 207 insertions(+), 17 deletions(-)
 create mode 100644 src-network-providers/networkProvider/apiNetworkProvider.ts

diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
new file mode 100644
index 000000000..cae27e70d
--- /dev/null
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -0,0 +1,184 @@
+import axios, { AxiosRequestConfig } from "axios";
+import { BigNumber } from "bignumber.js";
+import { AccountOnNetwork, TokenOfAccountOnNetwork } from "../account";
+import { Address } from "../address";
+import { defaultConfig } from "../constants";
+import { ErrApiProviderGet, ErrContractQuery } from "../errors";
+import { INetworkProvider } from "../interface.networkProvider";
+import { Logger } from "../logger";
+import { NetworkConfig } from "../networkConfig";
+import { NetworkStake } from "../networkStake";
+import { NetworkStatus } from "../networkStatus";
+import { NFTToken } from "../nftToken";
+import { Query, QueryResponse } from "../smartcontracts";
+import { getHexMagnitudeOfBigInt } from "../smartcontracts/codec/utils";
+import { Stats } from "../stats";
+import { Token } from "../token";
+import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
+import { TransactionOnNetwork } from "../transactionOnNetwork";
+import { ProxyNetworkProvider } from "./proxyNetworkProvider";
+
+/**
+ * This is a temporary change, this will be the only provider used, ProxyProvider will be deprecated
+ */
+export class ApiNetworkProvider implements INetworkProvider {
+    private url: string;
+    private config: AxiosRequestConfig;
+    private backingProxyNetworkProvider;
+
+    /**
+     * Creates a new ApiProvider.
+     * @param url the URL of the Elrond Api
+     * @param config axios request config options
+     */
+    constructor(url: string, config?: AxiosRequestConfig) {
+        this.url = url;
+        this.config = { ...defaultConfig, ...config };
+        this.backingProxyNetworkProvider = new ProxyNetworkProvider(url, config);
+    }
+
+    async getNetworkConfig(): Promise<NetworkConfig> {
+        return await this.backingProxyNetworkProvider.getNetworkConfig();
+    }
+
+    async getNetworkStatus(): Promise<NetworkStatus> {
+        return await this.backingProxyNetworkProvider.getNetworkStatus();
+    }
+
+    async getNetworkStake(): Promise<NetworkStake> {
+        let response = await this.doGetGeneric("stake");
+        let networkStake = NetworkStake.fromHttpResponse(response)
+        return networkStake;
+    }
+
+    async getNetworkStats(): Promise<Stats> {
+        let response = await this.doGetGeneric("stats");
+        let stats = Stats.fromHttpResponse(response)
+        return stats;
+    }
+
+    async getAccount(address: Address): Promise<AccountOnNetwork> {
+        let response = await this.doGetGeneric(`accounts/${address.bech32()}`);
+        let account = AccountOnNetwork.fromHttpResponse(response);
+        return account;
+    }
+
+    async getAddressEsdtList(address: Address): Promise<TokenOfAccountOnNetwork[]> {
+        let url = `accounts/${address.bech32()}/tokens`;
+        let response: any[] = await this.doGetGeneric(url);
+        let tokens = response.map(item => TokenOfAccountOnNetwork.fromHttpResponse(item));
+        return tokens;
+    }
+
+    async getAddressEsdt(address: Address, tokenIdentifier: string): Promise<any> {
+        let response = await this.doGetGeneric(`accounts/${address.bech32()}/tokens/${tokenIdentifier}`);
+        let tokenData = response.tokenData;
+        return tokenData;
+    }
+
+    async getAddressNft(address: Address, collection: string, nonce: BigNumber.Value): Promise<any> {
+        let nonceHex = getHexMagnitudeOfBigInt(new BigNumber(nonce));
+        let response = await this.doGetGeneric(`accounts/${address.bech32()}/nfts/${collection}-${nonceHex}`);
+        let tokenData = response.tokenData;
+        return tokenData;
+    }
+
+    async getTransaction(txHash: TransactionHash): Promise<TransactionOnNetwork> {
+        let response = await this.doGetGeneric(`transactions/${txHash.toString()}`);
+        let transaction = TransactionOnNetwork.fromHttpResponse(txHash, response.transaction);
+        return transaction;
+    }
+
+    async getTransactionStatus(txHash: TransactionHash): Promise<TransactionStatus> {
+        let response = await this.doGetGeneric(`transactions/${txHash.toString()}?fields=status`);
+        let status = new TransactionStatus(response.status);
+        return status;
+    }
+
+    async sendTransaction(tx: Transaction): Promise<TransactionHash> {
+        let response = await this.doPostGeneric("transactions", tx.toSendable());
+        // Also see: https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/transactions/entities/transaction.send.result.ts
+        let hash = new TransactionHash(response.txHash);
+        return hash;
+    }
+
+    async simulateTransaction(tx: Transaction): Promise<any> {
+        return await this.backingProxyNetworkProvider.simulateTransaction(tx);
+    }
+
+    async queryContract(query: Query): Promise<QueryResponse> {
+        try {
+            let data = query.toHttpRequest();
+            let response = await this.doPostGeneric("query", data);
+            let queryResponse = QueryResponse.fromHttpResponse(response)
+            return queryResponse;
+        } catch (err: any) {
+            throw ErrContractQuery.increaseSpecificity(err);
+        }
+    }
+
+    async getToken(tokenIdentifier: string): Promise<Token> {
+        let response = await this.doGetGeneric(`tokens/${tokenIdentifier}`);
+        let token = Token.fromHttpResponse(response);
+        return token;
+    }
+
+    async getNFTToken(tokenIdentifier: string): Promise<NFTToken> {
+        let response = await this.doGetGeneric(`nfts/${tokenIdentifier}`);
+        let token = NFTToken.fromHttpResponse(response);
+        return token;
+    }
+
+    async getDefinitionOfTokenCollection(collection: string): Promise<any> {
+        let response = await this.doGetGeneric(`collections/${collection}`);
+        return response;
+    }
+
+    async doGetGeneric(resourceUrl: string): Promise<any> {
+        let response = await this.doGet(resourceUrl);
+        return response;
+    }
+
+    async doPostGeneric(resourceUrl: string, payload: any): Promise<any> {
+        let response = await this.doPost(resourceUrl, payload);
+        return response;
+    }
+
+    private async doGet(resourceUrl: string): Promise<any> {
+        try {
+            let url = `${this.url}/${resourceUrl}`;
+            let response = await axios.get(url, this.config);
+
+            return response.data;
+        } catch (error) {
+            this.handleApiError(error, resourceUrl);
+        }
+    }
+
+    private async doPost(resourceUrl: string, payload: any): Promise<any> {
+        try {
+            let url = `${this.url}/${resourceUrl}`;
+            let response = await axios.post(url, payload, {
+                ...this.config,
+                headers: {
+                    "Content-Type": "application/json",
+                },
+            });
+            let responsePayload = response.data;
+            return responsePayload;
+        } catch (error) {
+            this.handleApiError(error, resourceUrl);
+        }
+    }
+
+    private handleApiError(error: any, resourceUrl: string) {
+        if (!error.response) {
+            Logger.warn(error);
+            throw new ErrApiProviderGet(resourceUrl, error.toString(), error);
+        }
+
+        let errorData = error.response.data;
+        let originalErrorMessage = errorData.error || errorData.message || JSON.stringify(errorData);
+        throw new ErrApiProviderGet(resourceUrl, originalErrorMessage, error);
+    }
+}
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index 643e0f9a9..6f819b270 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -9,6 +9,7 @@ import { Logger } from "../logger";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
 import { NetworkStatus } from "../networkStatus";
+import { NFTToken } from "../nftToken";
 import { Query, QueryResponse } from "../smartcontracts";
 import { Stats } from "../stats";
 import { Token } from "../token";
@@ -16,7 +17,7 @@ import { Transaction, TransactionHash, TransactionStatus } from "../transaction"
 import { TransactionOnNetwork } from "../transactionOnNetwork";
 
 
-export class NetworkProxyProvider implements INetworkProvider {
+export class ProxyNetworkProvider implements INetworkProvider {
     private url: string;
     private config: AxiosRequestConfig;
 
@@ -42,6 +43,18 @@ export class NetworkProxyProvider implements INetworkProvider {
         return networkStatus;
     }
 
+    async getNetworkStake(): Promise<NetworkStake> {
+        // TODO: Implement wrt.:
+        // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/stake/stake.service.ts
+        throw new Error("Method not implemented.");
+    }
+
+    async getNetworkStats(): Promise<Stats> {
+        // TODO: Implement wrt. (full implementation may not be possible):
+        // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/network/network.service.ts
+        throw new Error("Method not implemented.");
+    }
+
     async getAccount(address: Address): Promise<AccountOnNetwork> {
         let response = await this.doGetGeneric(`address/${address.bech32()}`);
         let account = AccountOnNetwork.fromHttpResponse(response.account);
@@ -61,8 +74,8 @@ export class NetworkProxyProvider implements INetworkProvider {
         return tokenData;
     }
 
-    async getAddressNft(address: Address, tokenIdentifier: string, nonce: BigNumber.Value): Promise<any> {
-        let response = await this.doGetGeneric(`address/${address.bech32()}/nft/${tokenIdentifier}/nonce/${nonce}`);
+    async getAddressNft(address: Address, collection: string, nonce: BigNumber.Value): Promise<any> {
+        let response = await this.doGetGeneric(`address/${address.bech32()}/nft/${collection}/nonce/${nonce}`);
         let tokenData = response.tokenData;
         return tokenData;
     }
@@ -86,12 +99,12 @@ export class NetworkProxyProvider implements INetworkProvider {
 
     async sendTransaction(tx: Transaction): Promise<TransactionHash> {
         let response = await this.doPostGeneric("transaction/send", tx.toSendable());
-        let hash = new TransactionHash(response.txHash)
+        let hash = new TransactionHash(response.txHash);
         return hash;
     }
 
     async simulateTransaction(tx: Transaction): Promise<any> {
-        let response = await this.doPostGeneric("transaction/simulate", tx.toSendable(), (response) => response);
+        let response = await this.doPostGeneric("transaction/simulate", tx.toSendable());
         return response;
     }
 
@@ -99,32 +112,25 @@ export class NetworkProxyProvider implements INetworkProvider {
         try {
             let data = query.toHttpRequest();
             let response = await this.doPostGeneric("vm-values/query", data);
-            let queryResponse = QueryResponse.fromHttpResponse(response.data || response.vmOutput)
+            let queryResponse = QueryResponse.fromHttpResponse(response.data)
             return queryResponse;
         } catch (err: any) {
             throw ErrContractQuery.increaseSpecificity(err);
         }
     }
 
-    getNetworkStake(): Promise<NetworkStake> {
+    async getToken(_tokenIdentifier: string): Promise<Token> {
         // TODO: Implement wrt.:
-        // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/stake/stake.service.ts
-        throw new Error("Method not implemented.");
-    }
-
-    getNetworkStats(): Promise<Stats> {
-        // TODO: Implement wrt. (full implementation may not be possible):
-        // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/network/network.service.ts
+        // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/esdt/esdt.service.ts#L221
         throw new Error("Method not implemented.");
     }
 
-    getToken(_tokenIdentifier: string): Promise<Token> {
+    async getNFTToken(_tokenIdentifier: string): Promise<NFTToken> {
         // TODO: Implement wrt.:
-        // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/esdt/esdt.service.ts#L221
         throw new Error("Method not implemented.");
     }
 
-    getDefinitionOfTokenCollection(): Promise<any> {
+    async getDefinitionOfTokenCollection(_collection: string): Promise<any> {
         // TODO: Implement wrt.:
         // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/collections/collection.service.ts
         // https://docs.elrond.com/developers/esdt-tokens/#get-esdt-token-properties

From cc9324b2bfbdb2eabd8b3b0e569d61c31e9e2133 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Mon, 21 Feb 2022 19:34:09 +0200
Subject: [PATCH 034/338] WIP.

---
 .../networkProvider/apiNetworkProvider.ts     | 28 ++++++----
 .../networkProvider/index.ts                  |  2 +
 .../networkProvider/proxyNetworkProvider.ts   | 34 ++++++++----
 .../networkProvider/tokens.ts                 | 54 +++++++++++++++++++
 4 files changed, 100 insertions(+), 18 deletions(-)
 create mode 100644 src-network-providers/networkProvider/index.ts
 create mode 100644 src-network-providers/networkProvider/tokens.ts

diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
index cae27e70d..fec48aa1a 100644
--- a/src-network-providers/networkProvider/apiNetworkProvider.ts
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -1,6 +1,6 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { BigNumber } from "bignumber.js";
-import { AccountOnNetwork, TokenOfAccountOnNetwork } from "../account";
+import { AccountOnNetwork } from "../account";
 import { Address } from "../address";
 import { defaultConfig } from "../constants";
 import { ErrApiProviderGet, ErrContractQuery } from "../errors";
@@ -17,6 +17,7 @@ import { Token } from "../token";
 import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
 import { TransactionOnNetwork } from "../transactionOnNetwork";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
+import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 
 /**
  * This is a temporary change, this will be the only provider used, ProxyProvider will be deprecated
@@ -45,13 +46,13 @@ export class ApiNetworkProvider implements INetworkProvider {
         return await this.backingProxyNetworkProvider.getNetworkStatus();
     }
 
-    async getNetworkStake(): Promise<NetworkStake> {
+    async getNetworkStakeStatistics(): Promise<NetworkStake> {
         let response = await this.doGetGeneric("stake");
         let networkStake = NetworkStake.fromHttpResponse(response)
         return networkStake;
     }
 
-    async getNetworkStats(): Promise<Stats> {
+    async getNetworkGeneralStatistics(): Promise<Stats> {
         let response = await this.doGetGeneric("stats");
         let stats = Stats.fromHttpResponse(response)
         return stats;
@@ -63,23 +64,32 @@ export class ApiNetworkProvider implements INetworkProvider {
         return account;
     }
 
-    async getAddressEsdtList(address: Address): Promise<TokenOfAccountOnNetwork[]> {
+    async getFungibleTokensOfAccount(address: Address): Promise<FungibleTokenOfAccountOnNetwork[]> {
         let url = `accounts/${address.bech32()}/tokens`;
         let response: any[] = await this.doGetGeneric(url);
-        let tokens = response.map(item => TokenOfAccountOnNetwork.fromHttpResponse(item));
+        let tokens = response.map(item => FungibleTokenOfAccountOnNetwork.fromHttpResponse(item));
+        tokens.sort((a, b) => a.tokenIdentifier.localeCompare(b.tokenIdentifier));
         return tokens;
     }
 
-    async getAddressEsdt(address: Address, tokenIdentifier: string): Promise<any> {
+    async getNonFungibleTokensOfAccount(address: Address): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
+        let url = `accounts/${address.bech32()}/nfts`;
+        let response: any[] = await this.doGetGeneric(url);
+        let tokens = response.map(item => NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(item));
+        tokens.sort((a, b) => a.tokenIdentifier.localeCompare(b.tokenIdentifier));
+        return tokens;
+    }
+
+    async getFungibleTokenOfAccount(address: Address, tokenIdentifier: string): Promise<any> {
         let response = await this.doGetGeneric(`accounts/${address.bech32()}/tokens/${tokenIdentifier}`);
-        let tokenData = response.tokenData;
+        let tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response.tokenData);
         return tokenData;
     }
 
-    async getAddressNft(address: Address, collection: string, nonce: BigNumber.Value): Promise<any> {
+    async getNonFungibleTokenOfAccount(address: Address, collection: string, nonce: BigNumber.Value): Promise<NonFungibleTokenOfAccountOnNetwork> {
         let nonceHex = getHexMagnitudeOfBigInt(new BigNumber(nonce));
         let response = await this.doGetGeneric(`accounts/${address.bech32()}/nfts/${collection}-${nonceHex}`);
-        let tokenData = response.tokenData;
+        let tokenData = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response.tokenData);
         return tokenData;
     }
 
diff --git a/src-network-providers/networkProvider/index.ts b/src-network-providers/networkProvider/index.ts
new file mode 100644
index 000000000..0969c4dbc
--- /dev/null
+++ b/src-network-providers/networkProvider/index.ts
@@ -0,0 +1,2 @@
+export * from "./apiNetworkProvider";
+export * from "./proxyNetworkProvider";
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index 6f819b270..9f77bcc4c 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -1,6 +1,6 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { BigNumber } from "bignumber.js";
-import { AccountOnNetwork, TokenOfAccountOnNetwork } from "../account";
+import { AccountOnNetwork } from "../account";
 import { Address } from "../address";
 import { defaultConfig } from "../constants";
 import { ErrApiProviderGet, ErrContractQuery } from "../errors";
@@ -15,6 +15,7 @@ import { Stats } from "../stats";
 import { Token } from "../token";
 import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
 import { TransactionOnNetwork } from "../transactionOnNetwork";
+import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 
 
 export class ProxyNetworkProvider implements INetworkProvider {
@@ -43,13 +44,13 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return networkStatus;
     }
 
-    async getNetworkStake(): Promise<NetworkStake> {
+    async getNetworkStakeStatistics(): Promise<NetworkStake> {
         // TODO: Implement wrt.:
         // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/stake/stake.service.ts
         throw new Error("Method not implemented.");
     }
 
-    async getNetworkStats(): Promise<Stats> {
+    async getNetworkGeneralStatistics(): Promise<Stats> {
         // TODO: Implement wrt. (full implementation may not be possible):
         // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/network/network.service.ts
         throw new Error("Method not implemented.");
@@ -61,22 +62,37 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return account;
     }
 
-    async getAddressEsdtList(address: Address): Promise<TokenOfAccountOnNetwork[]> {
+    async getFungibleTokensOfAccount(address: Address): Promise<FungibleTokenOfAccountOnNetwork[]> {
         let url = `address/${address.bech32()}/esdt`;
         let response = await this.doGetGeneric(url);
-        let tokens = Object.values(response.esdts).map(item => TokenOfAccountOnNetwork.fromHttpResponse(item));
+        let responseItems: any[] = Object.values(response.esdts);
+        // Skip NFTs / SFTs.
+        let responseItemsFiltered = responseItems.filter(item => !item.attributes); 
+        let tokens = responseItemsFiltered.map(item => FungibleTokenOfAccountOnNetwork.fromHttpResponse(item));
+        tokens.sort((a, b) => a.tokenIdentifier.localeCompare(b.tokenIdentifier));
         return tokens;
     }
 
-    async getAddressEsdt(address: Address, tokenIdentifier: string): Promise<any> {
+    async getNonFungibleTokensOfAccount(address: Address): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
+        let url = `address/${address.bech32()}/esdt`;
+        let response = await this.doGetGeneric(url);
+        let responseItems: any[] = Object.values(response.esdts);
+        // Skip fungible tokens.
+        let responseItemsFiltered = responseItems.filter(item => item.nonce >= 0);
+        let tokens = responseItemsFiltered.map(item => NonFungibleTokenOfAccountOnNetwork.fromProxyHttpResponse(item));
+        tokens.sort((a, b) => a.tokenIdentifier.localeCompare(b.tokenIdentifier));
+        return tokens;
+    }
+
+    async getFungibleTokenOfAccount(address: Address, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`address/${address.bech32()}/esdt/${tokenIdentifier}`);
-        let tokenData = response.tokenData;
+        let tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response.tokenData);
         return tokenData;
     }
 
-    async getAddressNft(address: Address, collection: string, nonce: BigNumber.Value): Promise<any> {
+    async getNonFungibleTokenOfAccount(address: Address, collection: string, nonce: BigNumber.Value): Promise<NonFungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`address/${address.bech32()}/nft/${collection}/nonce/${nonce}`);
-        let tokenData = response.tokenData;
+        let tokenData = NonFungibleTokenOfAccountOnNetwork.fromProxyHttpResponse(response.tokenData);
         return tokenData;
     }
 
diff --git a/src-network-providers/networkProvider/tokens.ts b/src-network-providers/networkProvider/tokens.ts
new file mode 100644
index 000000000..fdb780f96
--- /dev/null
+++ b/src-network-providers/networkProvider/tokens.ts
@@ -0,0 +1,54 @@
+import { BigNumber } from "bignumber.js";
+import { Address } from "../address";
+import { IFungibleTokenOfAccountOnNetwork, INonFungibleTokenOfAccountOnNetwork } from "../interface.networkProvider";
+import { Nonce } from "../nonce";
+
+export class FungibleTokenOfAccountOnNetwork implements IFungibleTokenOfAccountOnNetwork {
+    tokenIdentifier: string = "";
+    balance: BigNumber = new BigNumber(0);
+    
+    static fromHttpResponse(payload: any): FungibleTokenOfAccountOnNetwork {
+        let result = new FungibleTokenOfAccountOnNetwork();
+
+        result.tokenIdentifier = payload.tokenIdentifier || payload.identifier || "";
+        result.balance = new BigNumber(payload.balance || 0);
+
+        return result;
+    }
+}
+
+export class NonFungibleTokenOfAccountOnNetwork implements INonFungibleTokenOfAccountOnNetwork {
+    tokenIdentifier: string = "";
+    attributes: Buffer = Buffer.from([]);
+    balance: BigNumber = new BigNumber(0);
+    nonce: Nonce = new Nonce(0);
+    creator: Address = new Address("");
+    royalties: BigNumber = new BigNumber(0);
+
+    static fromProxyHttpResponse(payload: any): NonFungibleTokenOfAccountOnNetwork {
+        let result = new NonFungibleTokenOfAccountOnNetwork();
+
+        result.tokenIdentifier = payload.tokenIdentifier || payload.identifier || "";
+        result.attributes = Buffer.from(payload.attributes || "", "base64");
+        result.balance = new BigNumber(payload.balance || 0);
+        result.nonce = new Nonce(payload.nonce || 0);
+        result.creator = new Address(payload.creator || "");
+        result.royalties = new BigNumber(payload.royalties || 0).div(100);
+
+        return result;
+    }
+
+    static fromApiHttpResponse(payload: any): NonFungibleTokenOfAccountOnNetwork {
+        let result = new NonFungibleTokenOfAccountOnNetwork();
+
+        result.tokenIdentifier = payload.tokenIdentifier || payload.identifier || "";
+        result.attributes = Buffer.from(payload.attributes || "", "base64");
+        // On API, missing balance means NFT.
+        result.balance = new BigNumber(payload.balance || 1);
+        result.nonce = new Nonce(payload.nonce || 0);
+        result.creator = new Address(payload.creator || "");
+        result.royalties = new BigNumber(payload.royalties || 0);
+
+        return result;
+    }
+}

From 807fa8cf4b617c710391c985a50b8fdb49b65c22 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Mon, 21 Feb 2022 23:02:02 +0200
Subject: [PATCH 035/338] WIP. Tests.

---
 .../networkProvider/apiNetworkProvider.ts     |  31 ++--
 .../networkProvider/providers.dev.net.spec.ts | 149 ++++++++++++++++++
 .../networkProvider/proxyNetworkProvider.ts   |  17 +-
 3 files changed, 179 insertions(+), 18 deletions(-)
 create mode 100644 src-network-providers/networkProvider/providers.dev.net.spec.ts

diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
index fec48aa1a..c82b3a715 100644
--- a/src-network-providers/networkProvider/apiNetworkProvider.ts
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -4,7 +4,7 @@ import { AccountOnNetwork } from "../account";
 import { Address } from "../address";
 import { defaultConfig } from "../constants";
 import { ErrApiProviderGet, ErrContractQuery } from "../errors";
-import { INetworkProvider } from "../interface.networkProvider";
+import { IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, Pagination } from "../interface.networkProvider";
 import { Logger } from "../logger";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
@@ -19,9 +19,6 @@ import { TransactionOnNetwork } from "../transactionOnNetwork";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 
-/**
- * This is a temporary change, this will be the only provider used, ProxyProvider will be deprecated
- */
 export class ApiNetworkProvider implements INetworkProvider {
     private url: string;
     private config: AxiosRequestConfig;
@@ -64,29 +61,37 @@ export class ApiNetworkProvider implements INetworkProvider {
         return account;
     }
 
-    async getFungibleTokensOfAccount(address: Address): Promise<FungibleTokenOfAccountOnNetwork[]> {
-        let url = `accounts/${address.bech32()}/tokens`;
+    async getFungibleTokensOfAccount(address: Address, pagination?: Pagination): Promise<IFungibleTokenOfAccountOnNetwork[]> {
+        pagination = pagination || Pagination.default();
+
+        let url = `accounts/${address.bech32()}/tokens?${this.buildPaginationParams(pagination)}`;
         let response: any[] = await this.doGetGeneric(url);
         let tokens = response.map(item => FungibleTokenOfAccountOnNetwork.fromHttpResponse(item));
+
+        // TODO: Fix sorting
         tokens.sort((a, b) => a.tokenIdentifier.localeCompare(b.tokenIdentifier));
         return tokens;
     }
 
-    async getNonFungibleTokensOfAccount(address: Address): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
-        let url = `accounts/${address.bech32()}/nfts`;
+    async getNonFungibleTokensOfAccount(address: Address, pagination?: Pagination): Promise<INonFungibleTokenOfAccountOnNetwork[]> {
+        pagination = pagination || Pagination.default();
+
+        let url = `accounts/${address.bech32()}/nfts?${this.buildPaginationParams(pagination)}`;
         let response: any[] = await this.doGetGeneric(url);
         let tokens = response.map(item => NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(item));
+        
+        // TODO: Fix sorting
         tokens.sort((a, b) => a.tokenIdentifier.localeCompare(b.tokenIdentifier));
         return tokens;
     }
 
-    async getFungibleTokenOfAccount(address: Address, tokenIdentifier: string): Promise<any> {
+    async getFungibleTokenOfAccount(address: Address, tokenIdentifier: string): Promise<IFungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`accounts/${address.bech32()}/tokens/${tokenIdentifier}`);
-        let tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response.tokenData);
+        let tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response);
         return tokenData;
     }
 
-    async getNonFungibleTokenOfAccount(address: Address, collection: string, nonce: BigNumber.Value): Promise<NonFungibleTokenOfAccountOnNetwork> {
+    async getNonFungibleTokenOfAccount(address: Address, collection: string, nonce: BigNumber.Value): Promise<INonFungibleTokenOfAccountOnNetwork> {
         let nonceHex = getHexMagnitudeOfBigInt(new BigNumber(nonce));
         let response = await this.doGetGeneric(`accounts/${address.bech32()}/nfts/${collection}-${nonceHex}`);
         let tokenData = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response.tokenData);
@@ -154,6 +159,10 @@ export class ApiNetworkProvider implements INetworkProvider {
         return response;
     }
 
+    private buildPaginationParams(pagination: Pagination) {
+        return `from=${pagination.from}&size=${pagination.size}`;
+    }
+
     private async doGet(resourceUrl: string): Promise<any> {
         try {
             let url = `${this.url}/${resourceUrl}`;
diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/networkProvider/providers.dev.net.spec.ts
new file mode 100644
index 000000000..a0a9c7d28
--- /dev/null
+++ b/src-network-providers/networkProvider/providers.dev.net.spec.ts
@@ -0,0 +1,149 @@
+import { assert } from "chai";
+import { ApiNetworkProvider, ProxyNetworkProvider } from ".";
+import { Hash } from "../hash";
+import { TransactionOnNetwork, TransactionOnNetworkType } from "../transactionOnNetwork";
+import { INetworkProvider } from "../interface.networkProvider";
+import { Address } from "../address";
+import { loadTestWallets, TestWallet } from "../testutils";
+
+describe("test network providers on devnet: Proxy and API", function () {
+    let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 5000 });
+    let proxyProvider: INetworkProvider = new ProxyNetworkProvider("https://devnet-gateway.elrond.com", { timeout: 5000 });
+
+    let alice: TestWallet;
+    let bob: TestWallet;
+    let carol: TestWallet;
+    let dan: TestWallet;
+
+    before(async function () {
+        ({ alice, bob, carol, dan } = await loadTestWallets());
+    });
+
+    it("should have same response for getNetworkConfig()", async function () {
+        let apiResponse = await apiProvider.getNetworkConfig();
+        let proxyResponse = await proxyProvider.getNetworkConfig();
+        assert.deepEqual(apiResponse, proxyResponse);
+    });
+
+    it("should have same response for getNetworkStatus()", async function () {
+        let apiResponse = await apiProvider.getNetworkStatus();
+        let proxyResponse = await proxyProvider.getNetworkStatus();
+        assert.deepEqual(apiResponse, proxyResponse);
+    });
+
+    // TODO: Enable test after implementing ProxyNetworkProvider.getNetworkStakeStatistics().
+    it.skip("should have same response for getNetworkStakeStatistics()", async function () {
+        let apiResponse = await apiProvider.getNetworkStakeStatistics();
+        let proxyResponse = await proxyProvider.getNetworkStakeStatistics();
+        assert.deepEqual(apiResponse, proxyResponse);
+    });
+
+    // TODO: Enable test after implementing ProxyNetworkProvider.getNetworkGeneralStatistics().
+    it.skip("should have same response for getNetworkGeneralStatistics()", async function () {
+        let apiResponse = await apiProvider.getNetworkGeneralStatistics();
+        let proxyResponse = await proxyProvider.getNetworkGeneralStatistics();
+        assert.deepEqual(apiResponse, proxyResponse);
+    });
+
+    it("should have same response for getAccount()", async function () {
+        for (const user of [alice, bob, carol, dan]) {
+            let apiResponse = await apiProvider.getAccount(user.address);
+            let proxyResponse = await proxyProvider.getAccount(user.address);
+            assert.deepEqual(apiResponse, proxyResponse);
+        }
+    });
+
+    it.only("should have same response for getFungibleTokensOfAccount(), getFungibleTokenOfAccount()", async function () {
+        this.timeout(10000);
+
+        for (const user of [alice, bob, carol, dan]) {
+            let apiResponse = await apiProvider.getFungibleTokensOfAccount(user.address);
+            let proxyResponse = await proxyProvider.getFungibleTokensOfAccount(user.address);
+            assert.deepEqual(apiResponse.slice(0, 100), proxyResponse.slice(0, 100));
+
+            for (const item of apiResponse.slice(0, 5)) {
+                let apiResponse = await apiProvider.getFungibleTokenOfAccount(user.address, item.tokenIdentifier);
+                let proxyResponse = await proxyProvider.getFungibleTokenOfAccount(user.address, item.tokenIdentifier);
+                //assert.deepEqual(apiResponse, proxyResponse, `user: ${user.address.bech32()}, token: ${item.tokenIdentifier}`);
+            }
+        }
+    });
+
+    it("should have same response for getNonFungibleTokensOfAccount(), getNonFungibleTokenOfAccount", async function () {
+        this.timeout(10000);
+
+        for (const user of [alice, bob, carol, dan]) {
+            let apiResponse = await apiProvider.getNonFungibleTokensOfAccount(user.address);
+            let proxyResponse = await proxyProvider.getNonFungibleTokensOfAccount(user.address);
+            assert.deepEqual(apiResponse.slice(0, 100), proxyResponse.slice(0, 100));
+
+            for (const item of apiResponse.slice(0, 5)) {
+                // let apiResponse = await apiProvider.getNonFungibleTokenOfAccount(user.address, item.tokenIdentifier);
+                // let proxyResponse = await proxyProvider.getNonFungibleTokenOfAccount(user.address, item.tokenIdentifier);
+                assert.deepEqual(apiResponse, proxyResponse, `user: ${user.address.bech32()}, token: ${item.tokenIdentifier}`);
+            }
+        }
+    });
+
+    // it("check get transaction", async function () {
+    //     this.timeout(20000);
+
+    //     let sender = new Address("erd1testnlersh4z0wsv8kjx39me4rmnvjkwu8dsaea7ukdvvc9z396qykv7z7");
+    //     let proxyProvider = chooseProxyProvider("elrond-devnet");
+    //     let apiProvider = chooseApiProvider("elrond-devnet");
+
+    //     let hashes = [
+    //         new TransactionHash("b41f5fc39e96b1f194d07761c6efd6cb92278b95f5012ab12cbc910058ca8b54"),
+    //         new TransactionHash("7757397a59378e9d0f6d5f08cc934c260e33a50ae0d73fdf869f7c02b6b47b33"),
+    //         new TransactionHash("b87238089e81527158a6daee520280324bc7e5322ba54d1b3c9a5678abe953ea"),
+    //         new TransactionHash("b45dd5e598bc85ba71639f2cbce8c5dff2fbe93159e637852fddeb16c0e84a48"),
+    //         new TransactionHash("83db780e98d4d3c917668c47b33ba51445591efacb0df2a922f88e7dfbb5fc7d"),
+    //         new TransactionHash("c2eb62b28cc7320da2292d87944c5424a70e1f443323c138c1affada7f6e9705")
+    //     ]
+
+    //     for (const hash of hashes) {
+    //         let transactionOnProxy = await proxyProvider.getTransaction(hash, sender, true);
+    //         let transactionOnAPI = await apiProvider.getTransaction(hash);
+
+    //         ignoreKnownDifferencesBetweenProviders(transactionOnProxy, transactionOnAPI);
+    //         assert.deepEqual(transactionOnProxy, transactionOnAPI);
+    //     }
+    // });
+
+    // // TODO: Strive to have as little differences as possible between Proxy and API.
+    // // ... On client-side (erdjs), try to handle the differences in ProxyProvider & ApiProvider, or in TransactionOnNetwork.
+    // // ... Merging the providers (in the future) should solve this as well.
+    // function ignoreKnownDifferencesBetweenProviders(transactionOnProxy: TransactionOnNetwork, transactionOnAPI: TransactionOnNetwork) {
+    //     // Ignore status, since it differs between Proxy and API (for smart contract calls):
+    //     transactionOnProxy.status = new TransactionStatus("unknown");
+    //     transactionOnAPI.status = new TransactionStatus("unknown");
+
+    //     // Ignore fields which are not present on API response:
+    //     transactionOnProxy.epoch = 0;
+    //     transactionOnProxy.type = new TransactionOnNetworkType();
+    //     transactionOnProxy.blockNonce = new Nonce(0);
+    //     transactionOnProxy.hyperblockNonce = new Nonce(0);
+    //     transactionOnProxy.hyperblockHash = new Hash("");
+
+    //     let immediateContractResultOnAPI: SmartContractResultItem = (<any>transactionOnAPI).results.immediate;
+    //     let contractResultsOnAPI: SmartContractResultItem[] = (<any>transactionOnAPI).results.items;
+    //     let resultingCallsOnAPI: SmartContractResultItem[] = (<any>transactionOnAPI).results.resultingCalls;
+    //     let allContractResults = [immediateContractResultOnAPI].concat(resultingCallsOnAPI).concat(contractResultsOnAPI);
+
+    //     // Important issue (existing bug)! When working with TransactionOnNetwork objects, SCRs cannot be parsed correctly from API, only from Proxy.
+    //     // On API response, base64 decode "data" from smart contract results:
+    //     for (const item of allContractResults) {
+    //         item.data = Buffer.from(item.data, "base64").toString();
+    //     }
+
+    //     // On API response, convert "callType" of smart contract results to a number:
+    //     for (const item of allContractResults) {
+    //         item.callType = Number(item.callType);
+    //     }
+
+    //     // On API response, sort contract results by nonce:
+    //     contractResultsOnAPI.sort(function (a: SmartContractResultItem, b: SmartContractResultItem) {
+    //         return a.nonce.valueOf() - b.nonce.valueOf();
+    //     });
+    // }
+});
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index 9f77bcc4c..340b060c3 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -4,7 +4,7 @@ import { AccountOnNetwork } from "../account";
 import { Address } from "../address";
 import { defaultConfig } from "../constants";
 import { ErrApiProviderGet, ErrContractQuery } from "../errors";
-import { INetworkProvider } from "../interface.networkProvider";
+import { IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, Pagination } from "../interface.networkProvider";
 import { Logger } from "../logger";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
@@ -17,7 +17,6 @@ import { Transaction, TransactionHash, TransactionStatus } from "../transaction"
 import { TransactionOnNetwork } from "../transactionOnNetwork";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 
-
 export class ProxyNetworkProvider implements INetworkProvider {
     private url: string;
     private config: AxiosRequestConfig;
@@ -62,35 +61,39 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return account;
     }
 
-    async getFungibleTokensOfAccount(address: Address): Promise<FungibleTokenOfAccountOnNetwork[]> {
+    async getFungibleTokensOfAccount(address: Address, _pagination?: Pagination): Promise<IFungibleTokenOfAccountOnNetwork[]> {
         let url = `address/${address.bech32()}/esdt`;
         let response = await this.doGetGeneric(url);
         let responseItems: any[] = Object.values(response.esdts);
         // Skip NFTs / SFTs.
-        let responseItemsFiltered = responseItems.filter(item => !item.attributes); 
+        let responseItemsFiltered = responseItems.filter(item => !item.nonce);
         let tokens = responseItemsFiltered.map(item => FungibleTokenOfAccountOnNetwork.fromHttpResponse(item));
+
+        // TODO: Fix sorting
         tokens.sort((a, b) => a.tokenIdentifier.localeCompare(b.tokenIdentifier));
         return tokens;
     }
 
-    async getNonFungibleTokensOfAccount(address: Address): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
+    async getNonFungibleTokensOfAccount(address: Address, _pagination?: Pagination): Promise<INonFungibleTokenOfAccountOnNetwork[]> {
         let url = `address/${address.bech32()}/esdt`;
         let response = await this.doGetGeneric(url);
         let responseItems: any[] = Object.values(response.esdts);
         // Skip fungible tokens.
         let responseItemsFiltered = responseItems.filter(item => item.nonce >= 0);
         let tokens = responseItemsFiltered.map(item => NonFungibleTokenOfAccountOnNetwork.fromProxyHttpResponse(item));
+
+        // TODO: Fix sorting
         tokens.sort((a, b) => a.tokenIdentifier.localeCompare(b.tokenIdentifier));
         return tokens;
     }
 
-    async getFungibleTokenOfAccount(address: Address, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork> {
+    async getFungibleTokenOfAccount(address: Address, tokenIdentifier: string): Promise<IFungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`address/${address.bech32()}/esdt/${tokenIdentifier}`);
         let tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response.tokenData);
         return tokenData;
     }
 
-    async getNonFungibleTokenOfAccount(address: Address, collection: string, nonce: BigNumber.Value): Promise<NonFungibleTokenOfAccountOnNetwork> {
+    async getNonFungibleTokenOfAccount(address: Address, collection: string, nonce: BigNumber.Value): Promise<INonFungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`address/${address.bech32()}/nft/${collection}/nonce/${nonce}`);
         let tokenData = NonFungibleTokenOfAccountOnNetwork.fromProxyHttpResponse(response.tokenData);
         return tokenData;

From 4ab793ef077da44340417fa859df0c07eac4f649 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Tue, 22 Feb 2022 11:31:00 +0200
Subject: [PATCH 036/338] WIP.

---
 .../networkProvider/apiNetworkProvider.ts     |  17 ++-
 .../networkProvider/index.ts                  |   3 +
 .../networkProvider/providers.dev.net.spec.ts | 118 +++++++-----------
 .../networkProvider/proxyNetworkProvider.ts   |  14 +--
 .../networkProvider/tokens.ts                 |  13 +-
 .../networkProvider/transactions.ts           |  90 +++++++++++++
 6 files changed, 165 insertions(+), 90 deletions(-)
 create mode 100644 src-network-providers/networkProvider/transactions.ts

diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
index c82b3a715..93eddac85 100644
--- a/src-network-providers/networkProvider/apiNetworkProvider.ts
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -4,20 +4,20 @@ import { AccountOnNetwork } from "../account";
 import { Address } from "../address";
 import { defaultConfig } from "../constants";
 import { ErrApiProviderGet, ErrContractQuery } from "../errors";
-import { IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, Pagination } from "../interface.networkProvider";
+import { IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, ITransactionOnNetwork, Pagination } from "../interface.networkProvider";
 import { Logger } from "../logger";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
 import { NetworkStatus } from "../networkStatus";
 import { NFTToken } from "../nftToken";
+import { Nonce } from "../nonce";
 import { Query, QueryResponse } from "../smartcontracts";
-import { getHexMagnitudeOfBigInt } from "../smartcontracts/codec/utils";
 import { Stats } from "../stats";
 import { Token } from "../token";
 import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
-import { TransactionOnNetwork } from "../transactionOnNetwork";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
+import { TransactionOnNetwork } from "./transactions";
 
 export class ApiNetworkProvider implements INetworkProvider {
     private url: string;
@@ -91,16 +91,15 @@ export class ApiNetworkProvider implements INetworkProvider {
         return tokenData;
     }
 
-    async getNonFungibleTokenOfAccount(address: Address, collection: string, nonce: BigNumber.Value): Promise<INonFungibleTokenOfAccountOnNetwork> {
-        let nonceHex = getHexMagnitudeOfBigInt(new BigNumber(nonce));
-        let response = await this.doGetGeneric(`accounts/${address.bech32()}/nfts/${collection}-${nonceHex}`);
-        let tokenData = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response.tokenData);
+    async getNonFungibleTokenOfAccount(address: Address, collection: string, nonce: Nonce): Promise<INonFungibleTokenOfAccountOnNetwork> {
+        let response = await this.doGetGeneric(`accounts/${address.bech32()}/nfts/${collection}-${nonce.hex()}`);
+        let tokenData = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response);
         return tokenData;
     }
 
-    async getTransaction(txHash: TransactionHash): Promise<TransactionOnNetwork> {
+    async getTransaction(txHash: TransactionHash): Promise<ITransactionOnNetwork> {
         let response = await this.doGetGeneric(`transactions/${txHash.toString()}`);
-        let transaction = TransactionOnNetwork.fromHttpResponse(txHash, response.transaction);
+        let transaction = TransactionOnNetwork.fromApiHttpResponse(txHash, response);
         return transaction;
     }
 
diff --git a/src-network-providers/networkProvider/index.ts b/src-network-providers/networkProvider/index.ts
index 0969c4dbc..a4276ae73 100644
--- a/src-network-providers/networkProvider/index.ts
+++ b/src-network-providers/networkProvider/index.ts
@@ -1,2 +1,5 @@
 export * from "./apiNetworkProvider";
 export * from "./proxyNetworkProvider";
+
+// do not export "./tokens" (encapsulation)
+// do not export "./transactions" (encapsulation)
diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/networkProvider/providers.dev.net.spec.ts
index a0a9c7d28..2ef52b30a 100644
--- a/src-network-providers/networkProvider/providers.dev.net.spec.ts
+++ b/src-network-providers/networkProvider/providers.dev.net.spec.ts
@@ -1,10 +1,11 @@
 import { assert } from "chai";
 import { ApiNetworkProvider, ProxyNetworkProvider } from ".";
 import { Hash } from "../hash";
-import { TransactionOnNetwork, TransactionOnNetworkType } from "../transactionOnNetwork";
-import { INetworkProvider } from "../interface.networkProvider";
+import { INetworkProvider, ITransactionOnNetwork } from "../interface.networkProvider";
 import { Address } from "../address";
 import { loadTestWallets, TestWallet } from "../testutils";
+import { TransactionHash, TransactionStatus } from "../transaction";
+import { Nonce } from "../nonce";
 
 describe("test network providers on devnet: Proxy and API", function () {
     let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 5000 });
@@ -53,7 +54,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         }
     });
 
-    it.only("should have same response for getFungibleTokensOfAccount(), getFungibleTokenOfAccount()", async function () {
+    it("should have same response for getFungibleTokensOfAccount(), getFungibleTokenOfAccount()", async function () {
         this.timeout(10000);
 
         for (const user of [alice, bob, carol, dan]) {
@@ -61,15 +62,15 @@ describe("test network providers on devnet: Proxy and API", function () {
             let proxyResponse = await proxyProvider.getFungibleTokensOfAccount(user.address);
             assert.deepEqual(apiResponse.slice(0, 100), proxyResponse.slice(0, 100));
 
-            for (const item of apiResponse.slice(0, 5)) {
-                let apiResponse = await apiProvider.getFungibleTokenOfAccount(user.address, item.tokenIdentifier);
-                let proxyResponse = await proxyProvider.getFungibleTokenOfAccount(user.address, item.tokenIdentifier);
-                //assert.deepEqual(apiResponse, proxyResponse, `user: ${user.address.bech32()}, token: ${item.tokenIdentifier}`);
-            }
+            // for (const item of apiResponse.slice(0, 5)) {
+            //     let apiResponse = await apiProvider.getFungibleTokenOfAccount(user.address, item.tokenIdentifier);
+            //     let proxyResponse = await proxyProvider.getFungibleTokenOfAccount(user.address, item.tokenIdentifier);
+            //     //assert.deepEqual(apiResponse, proxyResponse, `user: ${user.address.bech32()}, token: ${item.tokenIdentifier}`);
+            // }
         }
     });
 
-    it("should have same response for getNonFungibleTokensOfAccount(), getNonFungibleTokenOfAccount", async function () {
+    it.only("should have same response for getNonFungibleTokensOfAccount(), getNonFungibleTokenOfAccount", async function () {
         this.timeout(10000);
 
         for (const user of [alice, bob, carol, dan]) {
@@ -78,72 +79,45 @@ describe("test network providers on devnet: Proxy and API", function () {
             assert.deepEqual(apiResponse.slice(0, 100), proxyResponse.slice(0, 100));
 
             for (const item of apiResponse.slice(0, 5)) {
-                // let apiResponse = await apiProvider.getNonFungibleTokenOfAccount(user.address, item.tokenIdentifier);
-                // let proxyResponse = await proxyProvider.getNonFungibleTokenOfAccount(user.address, item.tokenIdentifier);
+                let apiResponse = await apiProvider.getNonFungibleTokenOfAccount(user.address, item.collection, item.nonce);
+                let proxyResponse = await proxyProvider.getNonFungibleTokenOfAccount(user.address, item.collection, item.nonce);
                 assert.deepEqual(apiResponse, proxyResponse, `user: ${user.address.bech32()}, token: ${item.tokenIdentifier}`);
             }
         }
     });
 
-    // it("check get transaction", async function () {
-    //     this.timeout(20000);
-
-    //     let sender = new Address("erd1testnlersh4z0wsv8kjx39me4rmnvjkwu8dsaea7ukdvvc9z396qykv7z7");
-    //     let proxyProvider = chooseProxyProvider("elrond-devnet");
-    //     let apiProvider = chooseApiProvider("elrond-devnet");
-
-    //     let hashes = [
-    //         new TransactionHash("b41f5fc39e96b1f194d07761c6efd6cb92278b95f5012ab12cbc910058ca8b54"),
-    //         new TransactionHash("7757397a59378e9d0f6d5f08cc934c260e33a50ae0d73fdf869f7c02b6b47b33"),
-    //         new TransactionHash("b87238089e81527158a6daee520280324bc7e5322ba54d1b3c9a5678abe953ea"),
-    //         new TransactionHash("b45dd5e598bc85ba71639f2cbce8c5dff2fbe93159e637852fddeb16c0e84a48"),
-    //         new TransactionHash("83db780e98d4d3c917668c47b33ba51445591efacb0df2a922f88e7dfbb5fc7d"),
-    //         new TransactionHash("c2eb62b28cc7320da2292d87944c5424a70e1f443323c138c1affada7f6e9705")
-    //     ]
-
-    //     for (const hash of hashes) {
-    //         let transactionOnProxy = await proxyProvider.getTransaction(hash, sender, true);
-    //         let transactionOnAPI = await apiProvider.getTransaction(hash);
-
-    //         ignoreKnownDifferencesBetweenProviders(transactionOnProxy, transactionOnAPI);
-    //         assert.deepEqual(transactionOnProxy, transactionOnAPI);
-    //     }
-    // });
-
-    // // TODO: Strive to have as little differences as possible between Proxy and API.
-    // // ... On client-side (erdjs), try to handle the differences in ProxyProvider & ApiProvider, or in TransactionOnNetwork.
-    // // ... Merging the providers (in the future) should solve this as well.
-    // function ignoreKnownDifferencesBetweenProviders(transactionOnProxy: TransactionOnNetwork, transactionOnAPI: TransactionOnNetwork) {
-    //     // Ignore status, since it differs between Proxy and API (for smart contract calls):
-    //     transactionOnProxy.status = new TransactionStatus("unknown");
-    //     transactionOnAPI.status = new TransactionStatus("unknown");
-
-    //     // Ignore fields which are not present on API response:
-    //     transactionOnProxy.epoch = 0;
-    //     transactionOnProxy.type = new TransactionOnNetworkType();
-    //     transactionOnProxy.blockNonce = new Nonce(0);
-    //     transactionOnProxy.hyperblockNonce = new Nonce(0);
-    //     transactionOnProxy.hyperblockHash = new Hash("");
-
-    //     let immediateContractResultOnAPI: SmartContractResultItem = (<any>transactionOnAPI).results.immediate;
-    //     let contractResultsOnAPI: SmartContractResultItem[] = (<any>transactionOnAPI).results.items;
-    //     let resultingCallsOnAPI: SmartContractResultItem[] = (<any>transactionOnAPI).results.resultingCalls;
-    //     let allContractResults = [immediateContractResultOnAPI].concat(resultingCallsOnAPI).concat(contractResultsOnAPI);
-
-    //     // Important issue (existing bug)! When working with TransactionOnNetwork objects, SCRs cannot be parsed correctly from API, only from Proxy.
-    //     // On API response, base64 decode "data" from smart contract results:
-    //     for (const item of allContractResults) {
-    //         item.data = Buffer.from(item.data, "base64").toString();
-    //     }
-
-    //     // On API response, convert "callType" of smart contract results to a number:
-    //     for (const item of allContractResults) {
-    //         item.callType = Number(item.callType);
-    //     }
-
-    //     // On API response, sort contract results by nonce:
-    //     contractResultsOnAPI.sort(function (a: SmartContractResultItem, b: SmartContractResultItem) {
-    //         return a.nonce.valueOf() - b.nonce.valueOf();
-    //     });
-    // }
+    it("should have same response for getTransaction(), getTransactionStatus()", async function () {
+        this.timeout(20000);
+
+        let sender = new Address("erd1testnlersh4z0wsv8kjx39me4rmnvjkwu8dsaea7ukdvvc9z396qykv7z7");
+
+        let hashes = [
+            new TransactionHash("b41f5fc39e96b1f194d07761c6efd6cb92278b95f5012ab12cbc910058ca8b54"),
+            new TransactionHash("7757397a59378e9d0f6d5f08cc934c260e33a50ae0d73fdf869f7c02b6b47b33"),
+            new TransactionHash("b87238089e81527158a6daee520280324bc7e5322ba54d1b3c9a5678abe953ea"),
+            new TransactionHash("b45dd5e598bc85ba71639f2cbce8c5dff2fbe93159e637852fddeb16c0e84a48"),
+            new TransactionHash("83db780e98d4d3c917668c47b33ba51445591efacb0df2a922f88e7dfbb5fc7d"),
+            new TransactionHash("c2eb62b28cc7320da2292d87944c5424a70e1f443323c138c1affada7f6e9705")
+        ];
+
+        for (const hash of hashes) {
+            let apiResponse = await apiProvider.getTransaction(hash);
+            let proxyResponse = await proxyProvider.getTransaction(hash, sender);
+            
+            ignoreKnownTxDifferencesBetweenProviders(apiResponse, proxyResponse);
+            assert.deepEqual(apiResponse, proxyResponse);
+        }
+    });
+
+    // TODO: Strive to have as little differences as possible between Proxy and API.
+    function ignoreKnownTxDifferencesBetweenProviders(apiResponse: ITransactionOnNetwork, proxyResponse: ITransactionOnNetwork) {
+        apiResponse.status = proxyResponse.status = new TransactionStatus("ignore");
+        apiResponse.type = proxyResponse.type = { value: "ignore" };
+
+        // Ignore fields which are not present on API response:
+        proxyResponse.epoch = 0;
+        proxyResponse.blockNonce = new Nonce(0);
+        proxyResponse.hyperblockNonce = new Nonce(0);
+        proxyResponse.hyperblockHash = new Hash("");
+    }
 });
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index 340b060c3..99874e9de 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -1,21 +1,21 @@
 import axios, { AxiosRequestConfig } from "axios";
-import { BigNumber } from "bignumber.js";
 import { AccountOnNetwork } from "../account";
 import { Address } from "../address";
 import { defaultConfig } from "../constants";
 import { ErrApiProviderGet, ErrContractQuery } from "../errors";
-import { IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, Pagination } from "../interface.networkProvider";
+import { IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, ITransactionOnNetwork, Pagination } from "../interface.networkProvider";
 import { Logger } from "../logger";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
 import { NetworkStatus } from "../networkStatus";
 import { NFTToken } from "../nftToken";
+import { Nonce } from "../nonce";
 import { Query, QueryResponse } from "../smartcontracts";
 import { Stats } from "../stats";
 import { Token } from "../token";
 import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
-import { TransactionOnNetwork } from "../transactionOnNetwork";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
+import { TransactionOnNetwork } from "./transactions";
 
 export class ProxyNetworkProvider implements INetworkProvider {
     private url: string;
@@ -93,20 +93,20 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokenData;
     }
 
-    async getNonFungibleTokenOfAccount(address: Address, collection: string, nonce: BigNumber.Value): Promise<INonFungibleTokenOfAccountOnNetwork> {
-        let response = await this.doGetGeneric(`address/${address.bech32()}/nft/${collection}/nonce/${nonce}`);
+    async getNonFungibleTokenOfAccount(address: Address, collection: string, nonce: Nonce): Promise<INonFungibleTokenOfAccountOnNetwork> {
+        let response = await this.doGetGeneric(`address/${address.bech32()}/nft/${collection}/nonce/${nonce.hex()}`);
         let tokenData = NonFungibleTokenOfAccountOnNetwork.fromProxyHttpResponse(response.tokenData);
         return tokenData;
     }
 
-    async getTransaction(txHash: TransactionHash, hintSender?: Address): Promise<TransactionOnNetwork> {
+    async getTransaction(txHash: TransactionHash, hintSender?: Address): Promise<ITransactionOnNetwork> {
         let url = this.buildUrlWithQueryParameters(`transaction/${txHash.toString()}`, {
             withSender: hintSender ? hintSender.bech32() : "",
             withResults: "true"
         });
 
         let response = await this.doGetGeneric(url);
-        let transaction = TransactionOnNetwork.fromHttpResponse(txHash, response.transaction);
+        let transaction = TransactionOnNetwork.fromProxyHttpResponse(txHash, response.transaction);
         return transaction;
     }
 
diff --git a/src-network-providers/networkProvider/tokens.ts b/src-network-providers/networkProvider/tokens.ts
index fdb780f96..5cf66794b 100644
--- a/src-network-providers/networkProvider/tokens.ts
+++ b/src-network-providers/networkProvider/tokens.ts
@@ -19,6 +19,7 @@ export class FungibleTokenOfAccountOnNetwork implements IFungibleTokenOfAccountO
 
 export class NonFungibleTokenOfAccountOnNetwork implements INonFungibleTokenOfAccountOnNetwork {
     tokenIdentifier: string = "";
+    collection: string = "";
     attributes: Buffer = Buffer.from([]);
     balance: BigNumber = new BigNumber(0);
     nonce: Nonce = new Nonce(0);
@@ -28,7 +29,8 @@ export class NonFungibleTokenOfAccountOnNetwork implements INonFungibleTokenOfAc
     static fromProxyHttpResponse(payload: any): NonFungibleTokenOfAccountOnNetwork {
         let result = new NonFungibleTokenOfAccountOnNetwork();
 
-        result.tokenIdentifier = payload.tokenIdentifier || payload.identifier || "";
+        result.tokenIdentifier = payload.tokenIdentifier || "";
+        result.collection = NonFungibleTokenOfAccountOnNetwork.parseCollectionFromIdentifier(result.tokenIdentifier);
         result.attributes = Buffer.from(payload.attributes || "", "base64");
         result.balance = new BigNumber(payload.balance || 0);
         result.nonce = new Nonce(payload.nonce || 0);
@@ -38,10 +40,17 @@ export class NonFungibleTokenOfAccountOnNetwork implements INonFungibleTokenOfAc
         return result;
     }
 
+    private static parseCollectionFromIdentifier(identifier: string): string {
+        let parts = identifier.split("-");
+        let collection = parts.slice(0, 2).join("-");
+        return collection;
+    }
+
     static fromApiHttpResponse(payload: any): NonFungibleTokenOfAccountOnNetwork {
         let result = new NonFungibleTokenOfAccountOnNetwork();
 
-        result.tokenIdentifier = payload.tokenIdentifier || payload.identifier || "";
+        result.tokenIdentifier = payload.identifier || "";
+        result.collection = payload.collection || "";
         result.attributes = Buffer.from(payload.attributes || "", "base64");
         // On API, missing balance means NFT.
         result.balance = new BigNumber(payload.balance || 1);
diff --git a/src-network-providers/networkProvider/transactions.ts b/src-network-providers/networkProvider/transactions.ts
new file mode 100644
index 000000000..0e9a76c32
--- /dev/null
+++ b/src-network-providers/networkProvider/transactions.ts
@@ -0,0 +1,90 @@
+import { Address } from "../address";
+import { Balance } from "../balance";
+import { Hash } from "../hash";
+import { ITransactionOnNetwork, ITypeOfTransactionOnNetwork } from "../interface.networkProvider";
+import { GasLimit, GasPrice } from "../networkParams";
+import { Nonce } from "../nonce";
+import { Signature } from "../signature";
+import { TransactionHash, TransactionStatus } from "../transaction";
+import { TransactionPayload } from "../transactionPayload";
+
+ export class TransactionOnNetwork implements ITransactionOnNetwork {
+    hash: TransactionHash = new TransactionHash("");
+    type: ITypeOfTransactionOnNetwork = new TypeOfTransactionOnNetwork();
+    nonce: Nonce = new Nonce(0);
+    round: number = 0;
+    epoch: number = 0;
+    value: Balance = Balance.Zero();
+    receiver: Address = new Address();
+    sender: Address = new Address();
+    gasPrice: GasPrice = new GasPrice(0);
+    gasLimit: GasLimit = new GasLimit(0);
+    data: TransactionPayload = new TransactionPayload();
+    signature: Signature = Signature.empty();
+    status: TransactionStatus = TransactionStatus.createUnknown();
+    timestamp: number = 0;
+
+    blockNonce: Nonce = new Nonce(0);
+    hyperblockNonce: Nonce = new Nonce(0);
+    hyperblockHash: Hash = Hash.empty();
+
+    static fromProxyHttpResponse(txHash: TransactionHash, response: any): TransactionOnNetwork {
+        let transactionOnNetwork = new TransactionOnNetwork();
+
+        transactionOnNetwork.hash = txHash;
+        transactionOnNetwork.type = new TypeOfTransactionOnNetwork(response.type || "");
+        transactionOnNetwork.nonce = new Nonce(response.nonce || 0);
+        transactionOnNetwork.round = response.round;
+        transactionOnNetwork.epoch = response.epoch || 0;
+        transactionOnNetwork.value = Balance.fromString(response.value);
+        transactionOnNetwork.sender = Address.fromBech32(response.sender);
+        transactionOnNetwork.receiver = Address.fromBech32(response.receiver);
+        transactionOnNetwork.gasPrice = new GasPrice(response.gasPrice);
+        transactionOnNetwork.gasLimit = new GasLimit(response.gasLimit);
+        transactionOnNetwork.data = TransactionPayload.fromEncoded(response.data);
+        transactionOnNetwork.status = new TransactionStatus(response.status);
+        transactionOnNetwork.timestamp = response.timestamp || 0;
+
+        transactionOnNetwork.blockNonce = new Nonce(response.blockNonce || 0);
+        transactionOnNetwork.hyperblockNonce = new Nonce(response.hyperblockNonce || 0);
+        transactionOnNetwork.hyperblockHash = new Hash(response.hyperblockHash);
+
+        return transactionOnNetwork;
+    }
+
+    static fromApiHttpResponse(txHash: TransactionHash, response: any): TransactionOnNetwork {
+        let transactionOnNetwork = new TransactionOnNetwork();
+
+        transactionOnNetwork.hash = txHash;
+        transactionOnNetwork.type = new TypeOfTransactionOnNetwork(response.type || "");
+        transactionOnNetwork.nonce = new Nonce(response.nonce || 0);
+        transactionOnNetwork.round = response.round;
+        transactionOnNetwork.epoch = response.epoch || 0;
+        transactionOnNetwork.value = Balance.fromString(response.value);
+        transactionOnNetwork.sender = Address.fromBech32(response.sender);
+        transactionOnNetwork.receiver = Address.fromBech32(response.receiver);
+        transactionOnNetwork.gasPrice = new GasPrice(response.gasPrice);
+        transactionOnNetwork.gasLimit = new GasLimit(response.gasLimit);
+        transactionOnNetwork.data = TransactionPayload.fromEncoded(response.data);
+        transactionOnNetwork.status = new TransactionStatus(response.status);
+        transactionOnNetwork.timestamp = response.timestamp || 0;
+
+        transactionOnNetwork.blockNonce = new Nonce(response.blockNonce || 0);
+        transactionOnNetwork.hyperblockNonce = new Nonce(response.hyperblockNonce || 0);
+        transactionOnNetwork.hyperblockHash = new Hash(response.hyperblockHash);
+
+        return transactionOnNetwork;
+    }
+
+    getDateTime(): Date {
+        return new Date(this.timestamp * 1000);
+    }
+}
+
+class TypeOfTransactionOnNetwork implements ITypeOfTransactionOnNetwork {
+    readonly value: string;
+
+    constructor(value?: string) {
+        this.value = value || "unknown";
+    }
+}

From a9b7f6d647478df7ee46ae93ba6f93e936729081 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Tue, 22 Feb 2022 11:54:12 +0200
Subject: [PATCH 037/338] WIP.

---
 .../networkProvider/providers.dev.net.spec.ts | 24 +++++++++----------
 .../networkProvider/proxyNetworkProvider.ts   |  4 ++--
 .../networkProvider/tokens.ts                 | 19 +++++++++++++++
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/networkProvider/providers.dev.net.spec.ts
index 2ef52b30a..fa7448ed1 100644
--- a/src-network-providers/networkProvider/providers.dev.net.spec.ts
+++ b/src-network-providers/networkProvider/providers.dev.net.spec.ts
@@ -8,8 +8,8 @@ import { TransactionHash, TransactionStatus } from "../transaction";
 import { Nonce } from "../nonce";
 
 describe("test network providers on devnet: Proxy and API", function () {
-    let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 5000 });
-    let proxyProvider: INetworkProvider = new ProxyNetworkProvider("https://devnet-gateway.elrond.com", { timeout: 5000 });
+    let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 10000 });
+    let proxyProvider: INetworkProvider = new ProxyNetworkProvider("https://devnet-gateway.elrond.com", { timeout: 10000 });
 
     let alice: TestWallet;
     let bob: TestWallet;
@@ -47,7 +47,7 @@ describe("test network providers on devnet: Proxy and API", function () {
     });
 
     it("should have same response for getAccount()", async function () {
-        for (const user of [alice, bob, carol, dan]) {
+        for (const user of [bob, carol, dan]) {
             let apiResponse = await apiProvider.getAccount(user.address);
             let proxyResponse = await proxyProvider.getAccount(user.address);
             assert.deepEqual(apiResponse, proxyResponse);
@@ -55,23 +55,23 @@ describe("test network providers on devnet: Proxy and API", function () {
     });
 
     it("should have same response for getFungibleTokensOfAccount(), getFungibleTokenOfAccount()", async function () {
-        this.timeout(10000);
+        this.timeout(30000);
 
-        for (const user of [alice, bob, carol, dan]) {
+        for (const user of [carol, dan]) {
             let apiResponse = await apiProvider.getFungibleTokensOfAccount(user.address);
             let proxyResponse = await proxyProvider.getFungibleTokensOfAccount(user.address);
             assert.deepEqual(apiResponse.slice(0, 100), proxyResponse.slice(0, 100));
 
-            // for (const item of apiResponse.slice(0, 5)) {
-            //     let apiResponse = await apiProvider.getFungibleTokenOfAccount(user.address, item.tokenIdentifier);
-            //     let proxyResponse = await proxyProvider.getFungibleTokenOfAccount(user.address, item.tokenIdentifier);
-            //     //assert.deepEqual(apiResponse, proxyResponse, `user: ${user.address.bech32()}, token: ${item.tokenIdentifier}`);
-            // }
+            for (const item of apiResponse.slice(0, 5)) {
+                let apiResponse = await apiProvider.getFungibleTokenOfAccount(user.address, item.tokenIdentifier);
+                let proxyResponse = await proxyProvider.getFungibleTokenOfAccount(user.address, item.tokenIdentifier);
+                assert.deepEqual(apiResponse, proxyResponse, `user: ${user.address.bech32()}, token: ${item.tokenIdentifier}`);
+            }
         }
     });
 
-    it.only("should have same response for getNonFungibleTokensOfAccount(), getNonFungibleTokenOfAccount", async function () {
-        this.timeout(10000);
+    it("should have same response for getNonFungibleTokensOfAccount(), getNonFungibleTokenOfAccount", async function () {
+        this.timeout(30000);
 
         for (const user of [alice, bob, carol, dan]) {
             let apiResponse = await apiProvider.getNonFungibleTokensOfAccount(user.address);
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index 99874e9de..b615aa13b 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -94,8 +94,8 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     async getNonFungibleTokenOfAccount(address: Address, collection: string, nonce: Nonce): Promise<INonFungibleTokenOfAccountOnNetwork> {
-        let response = await this.doGetGeneric(`address/${address.bech32()}/nft/${collection}/nonce/${nonce.hex()}`);
-        let tokenData = NonFungibleTokenOfAccountOnNetwork.fromProxyHttpResponse(response.tokenData);
+        let response = await this.doGetGeneric(`address/${address.bech32()}/nft/${collection}/nonce/${nonce.valueOf()}`);
+        let tokenData = NonFungibleTokenOfAccountOnNetwork.fromProxyHttpResponseByNonce(response.tokenData);
         return tokenData;
     }
 
diff --git a/src-network-providers/networkProvider/tokens.ts b/src-network-providers/networkProvider/tokens.ts
index 5cf66794b..54a73efe3 100644
--- a/src-network-providers/networkProvider/tokens.ts
+++ b/src-network-providers/networkProvider/tokens.ts
@@ -40,6 +40,20 @@ export class NonFungibleTokenOfAccountOnNetwork implements INonFungibleTokenOfAc
         return result;
     }
 
+    static fromProxyHttpResponseByNonce(payload: any): NonFungibleTokenOfAccountOnNetwork {
+        let result = new NonFungibleTokenOfAccountOnNetwork();
+
+        result.attributes = Buffer.from(payload.attributes || "", "base64");
+        result.balance = new BigNumber(payload.balance || 0);
+        result.nonce = new Nonce(payload.nonce || 0);
+        result.creator = new Address(payload.creator || "");
+        result.royalties = new BigNumber(payload.royalties || 0).div(100);
+        result.tokenIdentifier = `${payload.tokenIdentifier}-${result.nonce.hex()}`;
+        result.collection = payload.tokenIdentifier || "";
+        
+        return result;
+    }
+
     private static parseCollectionFromIdentifier(identifier: string): string {
         let parts = identifier.split("-");
         let collection = parts.slice(0, 2).join("-");
@@ -58,6 +72,11 @@ export class NonFungibleTokenOfAccountOnNetwork implements INonFungibleTokenOfAc
         result.creator = new Address(payload.creator || "");
         result.royalties = new BigNumber(payload.royalties || 0);
 
+        if (!payload.creator) {
+            console.log(payload);
+            throw new Error("??? api");
+        }
+
         return result;
     }
 }

From 8baba731835d55677b9d7d4250bafc4b2f2ca3a7 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Tue, 22 Feb 2022 12:31:03 +0200
Subject: [PATCH 038/338] Simplifications.

---
 .../networkProvider/providers.dev.net.spec.ts   | 17 ++++++++++++-----
 .../networkProvider/proxyNetworkProvider.ts     |  8 ++------
 .../networkProvider/transactions.ts             | 12 +-----------
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/networkProvider/providers.dev.net.spec.ts
index fa7448ed1..c177ad09b 100644
--- a/src-network-providers/networkProvider/providers.dev.net.spec.ts
+++ b/src-network-providers/networkProvider/providers.dev.net.spec.ts
@@ -102,17 +102,24 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         for (const hash of hashes) {
             let apiResponse = await apiProvider.getTransaction(hash);
-            let proxyResponse = await proxyProvider.getTransaction(hash, sender);
+            let proxyResponse = await proxyProvider.getTransaction(hash);
             
-            ignoreKnownTxDifferencesBetweenProviders(apiResponse, proxyResponse);
-            assert.deepEqual(apiResponse, proxyResponse);
+            ignoreKnownTransactionDifferencesBetweenProviders(apiResponse, proxyResponse);
+            assert.deepEqual(apiResponse, proxyResponse, `transaction: ${hash}`);
+        }
+
+        for (const hash of hashes) {
+            let apiResponse = await apiProvider.getTransactionStatus(hash);
+            let proxyResponse = await proxyProvider.getTransactionStatus(hash);
+            
+            // TODO: Fix differences of "tx.status".
+            // assert.deepEqual(apiResponse, proxyResponse, `transaction: ${hash}`);
         }
     });
 
     // TODO: Strive to have as little differences as possible between Proxy and API.
-    function ignoreKnownTxDifferencesBetweenProviders(apiResponse: ITransactionOnNetwork, proxyResponse: ITransactionOnNetwork) {
+    function ignoreKnownTransactionDifferencesBetweenProviders(apiResponse: ITransactionOnNetwork, proxyResponse: ITransactionOnNetwork) {
         apiResponse.status = proxyResponse.status = new TransactionStatus("ignore");
-        apiResponse.type = proxyResponse.type = { value: "ignore" };
 
         // Ignore fields which are not present on API response:
         proxyResponse.epoch = 0;
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index b615aa13b..d5ef1f8b6 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -99,12 +99,8 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokenData;
     }
 
-    async getTransaction(txHash: TransactionHash, hintSender?: Address): Promise<ITransactionOnNetwork> {
-        let url = this.buildUrlWithQueryParameters(`transaction/${txHash.toString()}`, {
-            withSender: hintSender ? hintSender.bech32() : "",
-            withResults: "true"
-        });
-
+    async getTransaction(txHash: TransactionHash): Promise<ITransactionOnNetwork> {
+        let url = this.buildUrlWithQueryParameters(`transaction/${txHash.toString()}`, { withResults: "true" });
         let response = await this.doGetGeneric(url);
         let transaction = TransactionOnNetwork.fromProxyHttpResponse(txHash, response.transaction);
         return transaction;
diff --git a/src-network-providers/networkProvider/transactions.ts b/src-network-providers/networkProvider/transactions.ts
index 0e9a76c32..fd46e4fb1 100644
--- a/src-network-providers/networkProvider/transactions.ts
+++ b/src-network-providers/networkProvider/transactions.ts
@@ -1,7 +1,7 @@
 import { Address } from "../address";
 import { Balance } from "../balance";
 import { Hash } from "../hash";
-import { ITransactionOnNetwork, ITypeOfTransactionOnNetwork } from "../interface.networkProvider";
+import { ITransactionOnNetwork } from "../interface.networkProvider";
 import { GasLimit, GasPrice } from "../networkParams";
 import { Nonce } from "../nonce";
 import { Signature } from "../signature";
@@ -10,7 +10,6 @@ import { TransactionPayload } from "../transactionPayload";
 
  export class TransactionOnNetwork implements ITransactionOnNetwork {
     hash: TransactionHash = new TransactionHash("");
-    type: ITypeOfTransactionOnNetwork = new TypeOfTransactionOnNetwork();
     nonce: Nonce = new Nonce(0);
     round: number = 0;
     epoch: number = 0;
@@ -32,7 +31,6 @@ import { TransactionPayload } from "../transactionPayload";
         let transactionOnNetwork = new TransactionOnNetwork();
 
         transactionOnNetwork.hash = txHash;
-        transactionOnNetwork.type = new TypeOfTransactionOnNetwork(response.type || "");
         transactionOnNetwork.nonce = new Nonce(response.nonce || 0);
         transactionOnNetwork.round = response.round;
         transactionOnNetwork.epoch = response.epoch || 0;
@@ -56,7 +54,6 @@ import { TransactionPayload } from "../transactionPayload";
         let transactionOnNetwork = new TransactionOnNetwork();
 
         transactionOnNetwork.hash = txHash;
-        transactionOnNetwork.type = new TypeOfTransactionOnNetwork(response.type || "");
         transactionOnNetwork.nonce = new Nonce(response.nonce || 0);
         transactionOnNetwork.round = response.round;
         transactionOnNetwork.epoch = response.epoch || 0;
@@ -81,10 +78,3 @@ import { TransactionPayload } from "../transactionPayload";
     }
 }
 
-class TypeOfTransactionOnNetwork implements ITypeOfTransactionOnNetwork {
-    readonly value: string;
-
-    constructor(value?: string) {
-        this.value = value || "unknown";
-    }
-}

From 1b97a67d6630a8bc26b566a63207d91cda6ea2d2 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Tue, 22 Feb 2022 20:19:20 +0200
Subject: [PATCH 039/338] WIP.

---
 .../networkProvider/apiNetworkProvider.ts     | 31 ++++----
 .../networkProvider/providers.dev.net.spec.ts | 58 +++++++++++++--
 .../networkProvider/proxyNetworkProvider.ts   | 19 ++---
 .../networkProvider/tokenDefinitions.ts       | 73 +++++++++++++++++++
 .../networkProvider/tokens.ts                 | 25 +++----
 5 files changed, 158 insertions(+), 48 deletions(-)
 create mode 100644 src-network-providers/networkProvider/tokenDefinitions.ts

diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
index 93eddac85..f27e1f65d 100644
--- a/src-network-providers/networkProvider/apiNetworkProvider.ts
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -1,21 +1,19 @@
 import axios, { AxiosRequestConfig } from "axios";
-import { BigNumber } from "bignumber.js";
 import { AccountOnNetwork } from "../account";
 import { Address } from "../address";
 import { defaultConfig } from "../constants";
 import { ErrApiProviderGet, ErrContractQuery } from "../errors";
-import { IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, ITransactionOnNetwork, Pagination } from "../interface.networkProvider";
+import { IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, ITransactionOnNetwork, Pagination } from "../interface.networkProvider";
 import { Logger } from "../logger";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
 import { NetworkStatus } from "../networkStatus";
-import { NFTToken } from "../nftToken";
 import { Nonce } from "../nonce";
 import { Query, QueryResponse } from "../smartcontracts";
 import { Stats } from "../stats";
-import { Token } from "../token";
 import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
+import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork } from "./transactions";
 
@@ -69,7 +67,7 @@ export class ApiNetworkProvider implements INetworkProvider {
         let tokens = response.map(item => FungibleTokenOfAccountOnNetwork.fromHttpResponse(item));
 
         // TODO: Fix sorting
-        tokens.sort((a, b) => a.tokenIdentifier.localeCompare(b.tokenIdentifier));
+        tokens.sort((a, b) => a.identifier.localeCompare(b.identifier));
         return tokens;
     }
 
@@ -81,7 +79,7 @@ export class ApiNetworkProvider implements INetworkProvider {
         let tokens = response.map(item => NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(item));
         
         // TODO: Fix sorting
-        tokens.sort((a, b) => a.tokenIdentifier.localeCompare(b.tokenIdentifier));
+        tokens.sort((a, b) => a.identifier.localeCompare(b.identifier));
         return tokens;
     }
 
@@ -131,21 +129,22 @@ export class ApiNetworkProvider implements INetworkProvider {
         }
     }
 
-    async getToken(tokenIdentifier: string): Promise<Token> {
+    async getDefinitionOfFungibleToken(tokenIdentifier: string): Promise<IDefinitionOfFungibleTokenOnNetwork> {
         let response = await this.doGetGeneric(`tokens/${tokenIdentifier}`);
-        let token = Token.fromHttpResponse(response);
-        return token;
+        let definition = DefinitionOfFungibleTokenOnNetwork.fromApiHttpResponse(response);
+        return definition;
     }
 
-    async getNFTToken(tokenIdentifier: string): Promise<NFTToken> {
-        let response = await this.doGetGeneric(`nfts/${tokenIdentifier}`);
-        let token = NFTToken.fromHttpResponse(response);
-        return token;
+    async getDefinitionOfTokenCollection(collection: string): Promise<IDefinitionOfTokenCollectionOnNetwork> {
+        let response = await this.doGetGeneric(`collections/${collection}`);
+        let definition = DefinitionOfTokenCollectionOnNetwork.fromApiHttpResponse(response);
+        return definition;
     }
 
-    async getDefinitionOfTokenCollection(collection: string): Promise<any> {
-        let response = await this.doGetGeneric(`collections/${collection}`);
-        return response;
+    async getNonFungibleToken(collection: string, nonce: Nonce): Promise<INonFungibleTokenOfAccountOnNetwork> {
+        let response = await this.doGetGeneric(`nfts/${collection}-${nonce.hex()}`);
+        let token = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response);
+        return token;
     }
 
     async doGetGeneric(resourceUrl: string): Promise<any> {
diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/networkProvider/providers.dev.net.spec.ts
index c177ad09b..871a282d6 100644
--- a/src-network-providers/networkProvider/providers.dev.net.spec.ts
+++ b/src-network-providers/networkProvider/providers.dev.net.spec.ts
@@ -63,9 +63,9 @@ describe("test network providers on devnet: Proxy and API", function () {
             assert.deepEqual(apiResponse.slice(0, 100), proxyResponse.slice(0, 100));
 
             for (const item of apiResponse.slice(0, 5)) {
-                let apiResponse = await apiProvider.getFungibleTokenOfAccount(user.address, item.tokenIdentifier);
-                let proxyResponse = await proxyProvider.getFungibleTokenOfAccount(user.address, item.tokenIdentifier);
-                assert.deepEqual(apiResponse, proxyResponse, `user: ${user.address.bech32()}, token: ${item.tokenIdentifier}`);
+                let apiResponse = await apiProvider.getFungibleTokenOfAccount(user.address, item.identifier);
+                let proxyResponse = await proxyProvider.getFungibleTokenOfAccount(user.address, item.identifier);
+                assert.deepEqual(apiResponse, proxyResponse, `user: ${user.address.bech32()}, token: ${item.identifier}`);
             }
         }
     });
@@ -81,7 +81,7 @@ describe("test network providers on devnet: Proxy and API", function () {
             for (const item of apiResponse.slice(0, 5)) {
                 let apiResponse = await apiProvider.getNonFungibleTokenOfAccount(user.address, item.collection, item.nonce);
                 let proxyResponse = await proxyProvider.getNonFungibleTokenOfAccount(user.address, item.collection, item.nonce);
-                assert.deepEqual(apiResponse, proxyResponse, `user: ${user.address.bech32()}, token: ${item.tokenIdentifier}`);
+                assert.deepEqual(apiResponse, proxyResponse, `user: ${user.address.bech32()}, token: ${item.identifier}`);
             }
         }
     });
@@ -103,7 +103,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         for (const hash of hashes) {
             let apiResponse = await apiProvider.getTransaction(hash);
             let proxyResponse = await proxyProvider.getTransaction(hash);
-            
+
             ignoreKnownTransactionDifferencesBetweenProviders(apiResponse, proxyResponse);
             assert.deepEqual(apiResponse, proxyResponse, `transaction: ${hash}`);
         }
@@ -111,7 +111,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         for (const hash of hashes) {
             let apiResponse = await apiProvider.getTransactionStatus(hash);
             let proxyResponse = await proxyProvider.getTransactionStatus(hash);
-            
+
             // TODO: Fix differences of "tx.status".
             // assert.deepEqual(apiResponse, proxyResponse, `transaction: ${hash}`);
         }
@@ -127,4 +127,50 @@ describe("test network providers on devnet: Proxy and API", function () {
         proxyResponse.hyperblockNonce = new Nonce(0);
         proxyResponse.hyperblockHash = new Hash("");
     }
+
+    it("should have same response for getDefinitionOfFungibleToken()", async function () {
+        this.timeout(10000);
+
+        let identifiers = ["MEX-b6bb7d", "WEGLD-88600a", "RIDE-482531", "USDC-a32906"];
+
+        for (const identifier of identifiers) {
+            let apiResponse = await apiProvider.getDefinitionOfFungibleToken(identifier);
+
+            assert.equal(apiResponse.identifier, identifier);
+
+            // TODO: Uncomment after implementing the function in the proxy provider.
+            // let proxyResponse = await proxyProvider.getDefinitionOfFungibleToken(identifier);
+            // assert.deepEqual(apiResponse, proxyResponse);
+        }
+    });
+
+    it("should have same response for getDefinitionOfTokenCollection()", async function () {
+        this.timeout(10000);
+
+        let collections = ["LKMEX-9acade", "LKFARM-c20c1c", "MEXFARM-bab93a", "ART-264971", "MOS-ff0040"];
+
+        for (const collection of collections) {
+            let apiResponse = await apiProvider.getDefinitionOfTokenCollection(collection);
+            assert.equal(apiResponse.collection, collection);
+
+            // TODO: Uncomment after implementing the function in the proxy provider.
+            // let proxyResponse = await proxyProvider.getDefinitionOfTokenCollection(identifier);
+            // assert.deepEqual(apiResponse, proxyResponse);
+        }
+    });
+
+    it("should have same response for getNonFungibleToken()", async function () {
+        this.timeout(10000);
+
+        let tokens = [{ id: "ERDJSNFT-4a5669", nonce: new Nonce(1) }];
+
+        for (const token of tokens) {
+            let apiResponse = await apiProvider.getNonFungibleToken(token.id, token.nonce);
+            assert.equal(apiResponse.collection, token.id);
+
+            // TODO: Uncomment after implementing the function in the proxy provider.
+            // let proxyResponse = await proxyProvider.getNonFungibleToken(token.id, token.nonce);
+            // assert.deepEqual(apiResponse, proxyResponse);
+        }
+    });
 });
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index d5ef1f8b6..0db43da35 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -3,16 +3,14 @@ import { AccountOnNetwork } from "../account";
 import { Address } from "../address";
 import { defaultConfig } from "../constants";
 import { ErrApiProviderGet, ErrContractQuery } from "../errors";
-import { IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, ITransactionOnNetwork, Pagination } from "../interface.networkProvider";
+import { IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, ITransactionOnNetwork, Pagination } from "../interface.networkProvider";
 import { Logger } from "../logger";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
 import { NetworkStatus } from "../networkStatus";
-import { NFTToken } from "../nftToken";
 import { Nonce } from "../nonce";
 import { Query, QueryResponse } from "../smartcontracts";
 import { Stats } from "../stats";
-import { Token } from "../token";
 import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork } from "./transactions";
@@ -70,7 +68,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
         let tokens = responseItemsFiltered.map(item => FungibleTokenOfAccountOnNetwork.fromHttpResponse(item));
 
         // TODO: Fix sorting
-        tokens.sort((a, b) => a.tokenIdentifier.localeCompare(b.tokenIdentifier));
+        tokens.sort((a, b) => a.identifier.localeCompare(b.identifier));
         return tokens;
     }
 
@@ -83,7 +81,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
         let tokens = responseItemsFiltered.map(item => NonFungibleTokenOfAccountOnNetwork.fromProxyHttpResponse(item));
 
         // TODO: Fix sorting
-        tokens.sort((a, b) => a.tokenIdentifier.localeCompare(b.tokenIdentifier));
+        tokens.sort((a, b) => a.identifier.localeCompare(b.identifier));
         return tokens;
     }
 
@@ -134,21 +132,20 @@ export class ProxyNetworkProvider implements INetworkProvider {
         }
     }
 
-    async getToken(_tokenIdentifier: string): Promise<Token> {
+    async getDefinitionOfFungibleToken(_tokenIdentifier: string): Promise<IDefinitionOfFungibleTokenOnNetwork> {
         // TODO: Implement wrt.:
         // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/esdt/esdt.service.ts#L221
         throw new Error("Method not implemented.");
     }
 
-    async getNFTToken(_tokenIdentifier: string): Promise<NFTToken> {
+    async getDefinitionOfTokenCollection(_collection: string): Promise<IDefinitionOfTokenCollectionOnNetwork> {
         // TODO: Implement wrt.:
+        // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/collections/collection.service.ts
+        // https://docs.elrond.com/developers/esdt-tokens/#get-esdt-token-properties
         throw new Error("Method not implemented.");
     }
 
-    async getDefinitionOfTokenCollection(_collection: string): Promise<any> {
-        // TODO: Implement wrt.:
-        // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/collections/collection.service.ts
-        // https://docs.elrond.com/developers/esdt-tokens/#get-esdt-token-properties
+    async getNonFungibleToken(_collection: string, _nonce: Nonce): Promise<INonFungibleTokenOfAccountOnNetwork> {
         throw new Error("Method not implemented.");
     }
 
diff --git a/src-network-providers/networkProvider/tokenDefinitions.ts b/src-network-providers/networkProvider/tokenDefinitions.ts
new file mode 100644
index 000000000..407e05d19
--- /dev/null
+++ b/src-network-providers/networkProvider/tokenDefinitions.ts
@@ -0,0 +1,73 @@
+import { BigNumber } from "bignumber.js";
+import { Address } from "../address";
+import { IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, INonFungibleTokenOfAccountOnNetwork } from "../interface.networkProvider";
+
+export class DefinitionOfFungibleTokenOnNetwork implements IDefinitionOfFungibleTokenOnNetwork {
+    identifier: string = "";
+    name: string = "";
+    ticker: string = "";
+    owner: Address = new Address();
+    decimals: number = 0;
+    supply: BigNumber = new BigNumber(0);
+    isPaused: boolean = false;
+    canUpgrade: boolean = false;
+    canMint: boolean = false;
+    canBurn: boolean = false;
+    canChangeOwner: boolean = false;
+    canPause: boolean = false;
+    canFreeze: boolean = false;
+    canWipe: boolean = false;
+    canAddSpecialRoles: boolean = false;
+
+    static fromApiHttpResponse(payload: any): DefinitionOfFungibleTokenOnNetwork {
+        let result = new DefinitionOfFungibleTokenOnNetwork();
+
+        result.identifier = payload.identifier || "";
+        result.name = payload.name || "";
+        result.ticker = payload.ticker || "";
+        result.owner = new Address(payload.owner || "");
+        result.decimals = payload.decimals || 0;
+        result.supply = new BigNumber(payload.supply || "0");
+        result.isPaused = payload.isPaused || false;
+        result.canUpgrade = payload.canUpgrade || false;
+        result.canMint = payload.canMint || false;
+        result.canBurn = payload.canBurn || false;
+        result.canChangeOwner = payload.canChangeOwner || false;
+        result.canPause = payload.canPause || false;
+        result.canFreeze = payload.canFreeze || false;
+        result.canWipe = payload.canWipe || false;
+        result.canAddSpecialRoles = payload.canAddSpecialRoles || false;
+
+        return result;
+    }
+}
+
+export class DefinitionOfTokenCollectionOnNetwork implements IDefinitionOfTokenCollectionOnNetwork {
+    collection: string = "";
+    type: string = "";
+    name: string = "";
+    ticker: string = "";
+    owner: Address = new Address();
+    decimals: number = 0;
+    canPause: boolean = false;
+    canFreeze: boolean = false;
+    canWipe: boolean = false;
+    canTransferRole: boolean = false;
+
+    static fromApiHttpResponse(payload: any): DefinitionOfTokenCollectionOnNetwork {
+        let result = new DefinitionOfTokenCollectionOnNetwork();
+
+        result.collection = payload.collection || "";
+        result.type = payload.type || "";
+        result.name = payload.name || "";
+        result.ticker = payload.ticker || "";
+        result.owner = new Address(payload.owner || "");
+        result.decimals = payload.decimals || 0;
+        result.canPause = payload.canPause || false;
+        result.canFreeze = payload.canFreeze || false;
+        result.canWipe = payload.canWipe || false;
+        result.canTransferRole = payload.canTransferRole || false;
+
+        return result;
+    }
+}
diff --git a/src-network-providers/networkProvider/tokens.ts b/src-network-providers/networkProvider/tokens.ts
index 54a73efe3..235c33f89 100644
--- a/src-network-providers/networkProvider/tokens.ts
+++ b/src-network-providers/networkProvider/tokens.ts
@@ -4,13 +4,13 @@ import { IFungibleTokenOfAccountOnNetwork, INonFungibleTokenOfAccountOnNetwork }
 import { Nonce } from "../nonce";
 
 export class FungibleTokenOfAccountOnNetwork implements IFungibleTokenOfAccountOnNetwork {
-    tokenIdentifier: string = "";
+    identifier: string = "";
     balance: BigNumber = new BigNumber(0);
-    
+
     static fromHttpResponse(payload: any): FungibleTokenOfAccountOnNetwork {
         let result = new FungibleTokenOfAccountOnNetwork();
 
-        result.tokenIdentifier = payload.tokenIdentifier || payload.identifier || "";
+        result.identifier = payload.tokenIdentifier || payload.identifier || "";
         result.balance = new BigNumber(payload.balance || 0);
 
         return result;
@@ -18,7 +18,7 @@ export class FungibleTokenOfAccountOnNetwork implements IFungibleTokenOfAccountO
 }
 
 export class NonFungibleTokenOfAccountOnNetwork implements INonFungibleTokenOfAccountOnNetwork {
-    tokenIdentifier: string = "";
+    identifier: string = "";
     collection: string = "";
     attributes: Buffer = Buffer.from([]);
     balance: BigNumber = new BigNumber(0);
@@ -29,8 +29,8 @@ export class NonFungibleTokenOfAccountOnNetwork implements INonFungibleTokenOfAc
     static fromProxyHttpResponse(payload: any): NonFungibleTokenOfAccountOnNetwork {
         let result = new NonFungibleTokenOfAccountOnNetwork();
 
-        result.tokenIdentifier = payload.tokenIdentifier || "";
-        result.collection = NonFungibleTokenOfAccountOnNetwork.parseCollectionFromIdentifier(result.tokenIdentifier);
+        result.identifier = payload.tokenIdentifier || "";
+        result.collection = NonFungibleTokenOfAccountOnNetwork.parseCollectionFromIdentifier(result.identifier);
         result.attributes = Buffer.from(payload.attributes || "", "base64");
         result.balance = new BigNumber(payload.balance || 0);
         result.nonce = new Nonce(payload.nonce || 0);
@@ -48,9 +48,9 @@ export class NonFungibleTokenOfAccountOnNetwork implements INonFungibleTokenOfAc
         result.nonce = new Nonce(payload.nonce || 0);
         result.creator = new Address(payload.creator || "");
         result.royalties = new BigNumber(payload.royalties || 0).div(100);
-        result.tokenIdentifier = `${payload.tokenIdentifier}-${result.nonce.hex()}`;
+        result.identifier = `${payload.tokenIdentifier}-${result.nonce.hex()}`;
         result.collection = payload.tokenIdentifier || "";
-        
+
         return result;
     }
 
@@ -63,7 +63,7 @@ export class NonFungibleTokenOfAccountOnNetwork implements INonFungibleTokenOfAc
     static fromApiHttpResponse(payload: any): NonFungibleTokenOfAccountOnNetwork {
         let result = new NonFungibleTokenOfAccountOnNetwork();
 
-        result.tokenIdentifier = payload.identifier || "";
+        result.identifier = payload.identifier || "";
         result.collection = payload.collection || "";
         result.attributes = Buffer.from(payload.attributes || "", "base64");
         // On API, missing balance means NFT.
@@ -71,12 +71,7 @@ export class NonFungibleTokenOfAccountOnNetwork implements INonFungibleTokenOfAc
         result.nonce = new Nonce(payload.nonce || 0);
         result.creator = new Address(payload.creator || "");
         result.royalties = new BigNumber(payload.royalties || 0);
-
-        if (!payload.creator) {
-            console.log(payload);
-            throw new Error("??? api");
-        }
-
+        
         return result;
     }
 }

From 3976cffd3a2582160a7c0e976d1be12cdc87c8d2 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 23 Feb 2022 12:31:27 +0200
Subject: [PATCH 040/338] Contract queries. WIP.

---
 .../networkProvider/apiNetworkProvider.ts     | 25 ++++-----
 .../networkProvider/contractResults.ts        | 34 ++++++++++++
 .../networkProvider/providers.dev.net.spec.ts | 53 +++++++++++++++++++
 .../networkProvider/proxyNetworkProvider.ts   | 25 ++++-----
 4 files changed, 109 insertions(+), 28 deletions(-)
 create mode 100644 src-network-providers/networkProvider/contractResults.ts

diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
index f27e1f65d..1b87925cc 100644
--- a/src-network-providers/networkProvider/apiNetworkProvider.ts
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -2,16 +2,17 @@ import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "../account";
 import { Address } from "../address";
 import { defaultConfig } from "../constants";
-import { ErrApiProviderGet, ErrContractQuery } from "../errors";
-import { IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, ITransactionOnNetwork, Pagination } from "../interface.networkProvider";
+import { ErrNetworkProvider } from "../errors";
+import { IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, ITransactionOnNetwork, Pagination } from "../interface.networkProvider";
 import { Logger } from "../logger";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
 import { NetworkStatus } from "../networkStatus";
 import { Nonce } from "../nonce";
-import { Query, QueryResponse } from "../smartcontracts";
+import { Query } from "../smartcontracts";
 import { Stats } from "../stats";
 import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
+import { ContractQueryResponse } from "./contractResults";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
@@ -118,15 +119,11 @@ export class ApiNetworkProvider implements INetworkProvider {
         return await this.backingProxyNetworkProvider.simulateTransaction(tx);
     }
 
-    async queryContract(query: Query): Promise<QueryResponse> {
-        try {
-            let data = query.toHttpRequest();
-            let response = await this.doPostGeneric("query", data);
-            let queryResponse = QueryResponse.fromHttpResponse(response)
-            return queryResponse;
-        } catch (err: any) {
-            throw ErrContractQuery.increaseSpecificity(err);
-        }
+    async queryContract(query: Query): Promise<IContractQueryResponse> {
+        let data = query.toHttpRequest();
+        let response = await this.doPostGeneric("query", data);
+        let queryResponse = ContractQueryResponse.fromHttpResponse(response);
+        return queryResponse;
     }
 
     async getDefinitionOfFungibleToken(tokenIdentifier: string): Promise<IDefinitionOfFungibleTokenOnNetwork> {
@@ -191,11 +188,11 @@ export class ApiNetworkProvider implements INetworkProvider {
     private handleApiError(error: any, resourceUrl: string) {
         if (!error.response) {
             Logger.warn(error);
-            throw new ErrApiProviderGet(resourceUrl, error.toString(), error);
+            throw new ErrNetworkProvider(resourceUrl, error.toString(), error);
         }
 
         let errorData = error.response.data;
         let originalErrorMessage = errorData.error || errorData.message || JSON.stringify(errorData);
-        throw new ErrApiProviderGet(resourceUrl, originalErrorMessage, error);
+        throw new ErrNetworkProvider(resourceUrl, originalErrorMessage, error);
     }
 }
diff --git a/src-network-providers/networkProvider/contractResults.ts b/src-network-providers/networkProvider/contractResults.ts
new file mode 100644
index 000000000..457dd6480
--- /dev/null
+++ b/src-network-providers/networkProvider/contractResults.ts
@@ -0,0 +1,34 @@
+import { BigNumber } from "bignumber.js";
+import { IContractQueryResponse } from "../interface.networkProvider";
+import { GasLimit } from "../networkParams";
+import { ArgSerializer, EndpointDefinition, MaxUint64, ReturnCode, TypedValue } from "../smartcontracts";
+
+export class ContractQueryResponse implements IContractQueryResponse {
+    returnData: string[] = [];
+    returnCode: ReturnCode = ReturnCode.None;
+    returnMessage: string = "";
+    gasUsed: GasLimit = new GasLimit(0);
+
+    static fromHttpResponse(payload: any): ContractQueryResponse {
+        let response = new ContractQueryResponse();
+        let gasRemaining = new BigNumber(payload["gasRemaining"] || payload["GasRemaining"] || 0);
+
+        response.returnData = payload["returnData"] || [];
+        response.returnCode = payload["returnCode"] || "";
+        response.returnMessage = payload["returnMessage"] || "";
+        response.gasUsed = new GasLimit(MaxUint64.minus(gasRemaining).toNumber());
+
+        return response;
+    }
+
+    getOutputUntyped(): Buffer[] {
+        let buffers = this.returnData.map((item) => Buffer.from(item || "", "base64"));
+        return buffers;
+    }
+
+    getOutputTyped(endpointDefinition: EndpointDefinition): TypedValue[] {
+        let buffers = this.getOutputUntyped();
+        let values = new ArgSerializer().buffersToValues(buffers, endpointDefinition!.output);
+        return values;
+    }
+}
diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/networkProvider/providers.dev.net.spec.ts
index 871a282d6..63aa28e43 100644
--- a/src-network-providers/networkProvider/providers.dev.net.spec.ts
+++ b/src-network-providers/networkProvider/providers.dev.net.spec.ts
@@ -6,6 +6,10 @@ import { Address } from "../address";
 import { loadTestWallets, TestWallet } from "../testutils";
 import { TransactionHash, TransactionStatus } from "../transaction";
 import { Nonce } from "../nonce";
+import { ContractFunction, Query } from "../smartcontracts";
+import { BigUIntValue, U32Value, BytesValue, VariadicValue, VariadicType, CompositeType, BytesType, BooleanType } from "../smartcontracts/typesystem";
+import { BigNumber } from "bignumber.js";
+import { Balance } from "../balance";
 
 describe("test network providers on devnet: Proxy and API", function () {
     let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 10000 });
@@ -173,4 +177,53 @@ describe("test network providers on devnet: Proxy and API", function () {
             // assert.deepEqual(apiResponse, proxyResponse);
         }
     });
+
+    // TODO: enable when API fixes the imprecision around "gasRemaining".
+    // TODO: enable when API supports queries with "value".
+    it.skip("should have same response for queryContract()", async function () {
+        this.timeout(10000);
+
+        // Query: get ultimate answer
+        let query = new Query({
+            address: new Address("erd1qqqqqqqqqqqqqpgqggww7tjryk9saqzfpq09tw3vm06kl8h3396qqz277y"),
+            func: new ContractFunction("getUltimateAnswer"),
+            args: []
+        });
+
+        let apiResponse = await apiProvider.queryContract(query);
+        let proxyResponse = await proxyProvider.queryContract(query);
+        assert.deepEqual(apiResponse, proxyResponse);
+        assert.deepEqual(apiResponse.getOutputUntyped(), proxyResponse.getOutputUntyped());
+
+        // Query: increment counter
+        query = new Query({
+            address: new Address("erd1qqqqqqqqqqqqqpgqz045rw74nthgzw2te9lytgah775n3l08396q3wt4qq"),
+            func: new ContractFunction("increment"),
+            args: []
+        });
+
+        apiResponse = await apiProvider.queryContract(query);
+        proxyResponse = await proxyProvider.queryContract(query);
+        assert.deepEqual(apiResponse, proxyResponse);
+        assert.deepEqual(apiResponse.getOutputUntyped(), proxyResponse.getOutputUntyped());
+
+        // Query: issue ESDT
+        query = new Query({
+            address: new Address("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u"),
+            func: new ContractFunction("issue"),
+            value: Balance.egld(0.05),
+            args: [
+                BytesValue.fromUTF8("FOO"),
+                BytesValue.fromUTF8("FOO"),
+                new BigUIntValue(new BigNumber("10000")),
+                new U32Value(18),
+                new VariadicValue(new VariadicType(new CompositeType(new BytesType(), new BooleanType())), [])
+            ]
+        });
+
+        apiResponse = await apiProvider.queryContract(query);
+        proxyResponse = await proxyProvider.queryContract(query);
+        assert.deepEqual(apiResponse, proxyResponse);
+        assert.deepEqual(apiResponse.getOutputUntyped(), proxyResponse.getOutputUntyped());
+    });
 });
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index 0db43da35..c9f1d3485 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -2,16 +2,17 @@ import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "../account";
 import { Address } from "../address";
 import { defaultConfig } from "../constants";
-import { ErrApiProviderGet, ErrContractQuery } from "../errors";
-import { IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, ITransactionOnNetwork, Pagination } from "../interface.networkProvider";
+import { ErrNetworkProvider } from "../errors";
+import { IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, ITransactionOnNetwork, Pagination } from "../interface.networkProvider";
 import { Logger } from "../logger";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
 import { NetworkStatus } from "../networkStatus";
 import { Nonce } from "../nonce";
-import { Query, QueryResponse } from "../smartcontracts";
+import { Query } from "../smartcontracts";
 import { Stats } from "../stats";
 import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
+import { ContractQueryResponse } from "./contractResults";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork } from "./transactions";
 
@@ -121,15 +122,11 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return response;
     }
 
-    async queryContract(query: Query): Promise<QueryResponse> {
-        try {
-            let data = query.toHttpRequest();
-            let response = await this.doPostGeneric("vm-values/query", data);
-            let queryResponse = QueryResponse.fromHttpResponse(response.data)
-            return queryResponse;
-        } catch (err: any) {
-            throw ErrContractQuery.increaseSpecificity(err);
-        }
+    async queryContract(query: Query): Promise<IContractQueryResponse> {
+        let data = query.toHttpRequest();
+        let response = await this.doPostGeneric("vm-values/query", data);
+        let queryResponse = ContractQueryResponse.fromHttpResponse(response.data);
+        return queryResponse;
     }
 
     async getDefinitionOfFungibleToken(_tokenIdentifier: string): Promise<IDefinitionOfFungibleTokenOnNetwork> {
@@ -201,11 +198,11 @@ export class ProxyNetworkProvider implements INetworkProvider {
     private handleApiError(error: any, resourceUrl: string) {
         if (!error.response) {
             Logger.warn(error);
-            throw new ErrApiProviderGet(resourceUrl, error.toString(), error);
+            throw new ErrNetworkProvider(resourceUrl, error.toString(), error);
         }
 
         let errorData = error.response.data;
         let originalErrorMessage = errorData.error || errorData.message || JSON.stringify(errorData);
-        throw new ErrApiProviderGet(resourceUrl, originalErrorMessage, error);
+        throw new ErrNetworkProvider(resourceUrl, originalErrorMessage, error);
     }
 }

From 281eafb9ded1bb10115e86d2f592c1f850bad45c Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 23 Feb 2022 14:57:44 +0200
Subject: [PATCH 041/338] Logs, results, refactor, WIP.

---
 .../networkProvider/contractResults.ts        | 35 ++++++++++++++++-
 .../networkProvider/providers.dev.net.spec.ts |  8 ++--
 .../networkProvider/tokens.ts                 | 38 +++++++++----------
 3 files changed, 56 insertions(+), 25 deletions(-)

diff --git a/src-network-providers/networkProvider/contractResults.ts b/src-network-providers/networkProvider/contractResults.ts
index 457dd6480..0915d5251 100644
--- a/src-network-providers/networkProvider/contractResults.ts
+++ b/src-network-providers/networkProvider/contractResults.ts
@@ -1,8 +1,39 @@
 import { BigNumber } from "bignumber.js";
-import { IContractQueryResponse } from "../interface.networkProvider";
-import { GasLimit } from "../networkParams";
+import { Address } from "../address";
+import { Balance } from "../balance";
+import { Hash } from "../hash";
+import { IContractQueryResponse, IContractResultItem, IContractResults } from "../interface.networkProvider";
+import { GasLimit, GasPrice } from "../networkParams";
+import { Nonce } from "../nonce";
 import { ArgSerializer, EndpointDefinition, MaxUint64, ReturnCode, TypedValue } from "../smartcontracts";
 
+export class ContractResults implements IContractResults {
+    readonly items: IContractResultItem[];
+
+    constructor(items: IContractResultItem[]) {
+        this.items = items;
+    }
+
+    static empty(): ContractResults {
+        return new ContractResults([]);
+    }
+}
+
+export class ContractResultItem implements IContractResultItem {
+    hash: Hash = Hash.empty();
+    nonce: Nonce = new Nonce(0);
+    value: Balance = Balance.Zero();
+    receiver: Address = new Address();
+    sender: Address = new Address();
+    data: string = "";
+    previousHash: Hash = Hash.empty();
+    originalHash: Hash = Hash.empty();
+    gasLimit: GasLimit = new GasLimit(0);
+    gasPrice: GasPrice = new GasPrice(0);
+    callType: number = 0;
+    returnMessage: string = "";
+}
+
 export class ContractQueryResponse implements IContractQueryResponse {
     returnData: string[] = [];
     returnCode: ReturnCode = ReturnCode.None;
diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/networkProvider/providers.dev.net.spec.ts
index 63aa28e43..817bc6f7d 100644
--- a/src-network-providers/networkProvider/providers.dev.net.spec.ts
+++ b/src-network-providers/networkProvider/providers.dev.net.spec.ts
@@ -93,15 +93,17 @@ describe("test network providers on devnet: Proxy and API", function () {
     it("should have same response for getTransaction(), getTransactionStatus()", async function () {
         this.timeout(20000);
 
-        let sender = new Address("erd1testnlersh4z0wsv8kjx39me4rmnvjkwu8dsaea7ukdvvc9z396qykv7z7");
-
         let hashes = [
             new TransactionHash("b41f5fc39e96b1f194d07761c6efd6cb92278b95f5012ab12cbc910058ca8b54"),
             new TransactionHash("7757397a59378e9d0f6d5f08cc934c260e33a50ae0d73fdf869f7c02b6b47b33"),
             new TransactionHash("b87238089e81527158a6daee520280324bc7e5322ba54d1b3c9a5678abe953ea"),
             new TransactionHash("b45dd5e598bc85ba71639f2cbce8c5dff2fbe93159e637852fddeb16c0e84a48"),
             new TransactionHash("83db780e98d4d3c917668c47b33ba51445591efacb0df2a922f88e7dfbb5fc7d"),
-            new TransactionHash("c2eb62b28cc7320da2292d87944c5424a70e1f443323c138c1affada7f6e9705")
+            new TransactionHash("c2eb62b28cc7320da2292d87944c5424a70e1f443323c138c1affada7f6e9705"),
+            new TransactionHash("98e913c2a78cafdf4fa7f0113c1285fb29c2409bd7a746bb6f5506ad76841d54"),
+            new TransactionHash("5b05945be8ba2635e7c13d792ad727533494358308b5fcf36a816e52b5b272b8"),
+            new TransactionHash("47b089b5f0220299a017359003694a01fd75d075100166b8072c418d5143fe06"),
+            new TransactionHash("85021f20b06662240d8302d62f68031bbf7261bacb53b84e3dc9346c0f10a8e7")
         ];
 
         for (const hash of hashes) {
diff --git a/src-network-providers/networkProvider/tokens.ts b/src-network-providers/networkProvider/tokens.ts
index 235c33f89..716de7770 100644
--- a/src-network-providers/networkProvider/tokens.ts
+++ b/src-network-providers/networkProvider/tokens.ts
@@ -27,51 +27,49 @@ export class NonFungibleTokenOfAccountOnNetwork implements INonFungibleTokenOfAc
     royalties: BigNumber = new BigNumber(0);
 
     static fromProxyHttpResponse(payload: any): NonFungibleTokenOfAccountOnNetwork {
-        let result = new NonFungibleTokenOfAccountOnNetwork();
+        let result = NonFungibleTokenOfAccountOnNetwork.fromHttpResponse(payload);
 
         result.identifier = payload.tokenIdentifier || "";
         result.collection = NonFungibleTokenOfAccountOnNetwork.parseCollectionFromIdentifier(result.identifier);
-        result.attributes = Buffer.from(payload.attributes || "", "base64");
-        result.balance = new BigNumber(payload.balance || 0);
-        result.nonce = new Nonce(payload.nonce || 0);
-        result.creator = new Address(payload.creator || "");
         result.royalties = new BigNumber(payload.royalties || 0).div(100);
 
         return result;
     }
 
     static fromProxyHttpResponseByNonce(payload: any): NonFungibleTokenOfAccountOnNetwork {
-        let result = new NonFungibleTokenOfAccountOnNetwork();
+        let result = NonFungibleTokenOfAccountOnNetwork.fromHttpResponse(payload);
 
-        result.attributes = Buffer.from(payload.attributes || "", "base64");
-        result.balance = new BigNumber(payload.balance || 0);
-        result.nonce = new Nonce(payload.nonce || 0);
-        result.creator = new Address(payload.creator || "");
-        result.royalties = new BigNumber(payload.royalties || 0).div(100);
         result.identifier = `${payload.tokenIdentifier}-${result.nonce.hex()}`;
         result.collection = payload.tokenIdentifier || "";
+        result.royalties = new BigNumber(payload.royalties || 0).div(100);
 
         return result;
     }
 
-    private static parseCollectionFromIdentifier(identifier: string): string {
-        let parts = identifier.split("-");
-        let collection = parts.slice(0, 2).join("-");
-        return collection;
-    }
-
     static fromApiHttpResponse(payload: any): NonFungibleTokenOfAccountOnNetwork {
-        let result = new NonFungibleTokenOfAccountOnNetwork();
+        let result = NonFungibleTokenOfAccountOnNetwork.fromHttpResponse(payload);
 
         result.identifier = payload.identifier || "";
         result.collection = payload.collection || "";
+
+        return result;
+    }
+
+    private static fromHttpResponse(payload: any): NonFungibleTokenOfAccountOnNetwork {
+        let result = new NonFungibleTokenOfAccountOnNetwork();
+
         result.attributes = Buffer.from(payload.attributes || "", "base64");
-        // On API, missing balance means NFT.
         result.balance = new BigNumber(payload.balance || 1);
         result.nonce = new Nonce(payload.nonce || 0);
         result.creator = new Address(payload.creator || "");
         result.royalties = new BigNumber(payload.royalties || 0);
-        
+
         return result;
     }
+
+    private static parseCollectionFromIdentifier(identifier: string): string {
+        let parts = identifier.split("-");
+        let collection = parts.slice(0, 2).join("-");
+        return collection;
+    }
 }

From 97581a8aa0ed555e10f888a14820b81f98e80ca9 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 23 Feb 2022 16:12:14 +0200
Subject: [PATCH 042/338] SCRs, tests.

---
 .../networkProvider/contractResults.ts        | 48 ++++++++++++
 .../networkProvider/providers.dev.net.spec.ts | 38 +++++++---
 .../networkProvider/transactions.ts           | 74 +++++++++----------
 3 files changed, 112 insertions(+), 48 deletions(-)

diff --git a/src-network-providers/networkProvider/contractResults.ts b/src-network-providers/networkProvider/contractResults.ts
index 0915d5251..ef719ef58 100644
--- a/src-network-providers/networkProvider/contractResults.ts
+++ b/src-network-providers/networkProvider/contractResults.ts
@@ -6,17 +6,32 @@ import { IContractQueryResponse, IContractResultItem, IContractResults } from ".
 import { GasLimit, GasPrice } from "../networkParams";
 import { Nonce } from "../nonce";
 import { ArgSerializer, EndpointDefinition, MaxUint64, ReturnCode, TypedValue } from "../smartcontracts";
+import { TransactionHash } from "../transaction";
 
 export class ContractResults implements IContractResults {
     readonly items: IContractResultItem[];
 
     constructor(items: IContractResultItem[]) {
         this.items = items;
+
+        this.items.sort(function (a: IContractResultItem, b: IContractResultItem) {
+            return a.nonce.valueOf() - b.nonce.valueOf();
+        });
     }
 
     static empty(): ContractResults {
         return new ContractResults([]);
     }
+
+    static fromProxyHttpResponse(results: any[]): ContractResults {
+        let items = results.map(item => ContractResultItem.fromProxyHttpResponse(item));
+        return new ContractResults(items);
+    }
+
+    static fromApiHttpResponse(results: any[]): ContractResults {
+        let items = results.map(item => ContractResultItem.fromApiHttpResponse(item));
+        return new ContractResults(items);
+    }
 }
 
 export class ContractResultItem implements IContractResultItem {
@@ -32,6 +47,39 @@ export class ContractResultItem implements IContractResultItem {
     gasPrice: GasPrice = new GasPrice(0);
     callType: number = 0;
     returnMessage: string = "";
+
+    static fromProxyHttpResponse(response: any): ContractResultItem {
+        let item = ContractResultItem.fromHttpResponse(response);
+        return item;
+    }
+
+    static fromApiHttpResponse(response: any): ContractResultItem {
+        let item = ContractResultItem.fromHttpResponse(response);
+
+        item.data = Buffer.from(item.data, "base64").toString();
+        item.callType = Number(item.callType);
+
+        return item;
+    }
+
+    private static fromHttpResponse(response: any): ContractResultItem {
+        let item = new ContractResultItem();
+
+        item.hash = new TransactionHash(response.hash);
+        item.nonce = new Nonce(response.nonce || 0);
+        item.value = Balance.fromString(response.value);
+        item.receiver = new Address(response.receiver);
+        item.sender = new Address(response.sender);
+        item.previousHash = new TransactionHash(response.prevTxHash);
+        item.originalHash = new TransactionHash(response.originalTxHash);
+        item.gasLimit = new GasLimit(response.gasLimit);
+        item.gasPrice = new GasPrice(response.gasPrice);
+        item.data = response.data || "";
+        item.callType = response.callType;
+        item.returnMessage = response.returnMessage;
+
+        return item;
+    }
 }
 
 export class ContractQueryResponse implements IContractQueryResponse {
diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/networkProvider/providers.dev.net.spec.ts
index 817bc6f7d..280c66fe2 100644
--- a/src-network-providers/networkProvider/providers.dev.net.spec.ts
+++ b/src-network-providers/networkProvider/providers.dev.net.spec.ts
@@ -90,7 +90,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         }
     });
 
-    it("should have same response for getTransaction(), getTransactionStatus()", async function () {
+    it("should have same response for getTransaction()", async function () {
         this.timeout(20000);
 
         let hashes = [
@@ -100,7 +100,8 @@ describe("test network providers on devnet: Proxy and API", function () {
             new TransactionHash("b45dd5e598bc85ba71639f2cbce8c5dff2fbe93159e637852fddeb16c0e84a48"),
             new TransactionHash("83db780e98d4d3c917668c47b33ba51445591efacb0df2a922f88e7dfbb5fc7d"),
             new TransactionHash("c2eb62b28cc7320da2292d87944c5424a70e1f443323c138c1affada7f6e9705"),
-            new TransactionHash("98e913c2a78cafdf4fa7f0113c1285fb29c2409bd7a746bb6f5506ad76841d54"),
+            // TODO: Uncomment once the Gateway returns all SCRs in this case, as well.
+            // new TransactionHash("98e913c2a78cafdf4fa7f0113c1285fb29c2409bd7a746bb6f5506ad76841d54"),
             new TransactionHash("5b05945be8ba2635e7c13d792ad727533494358308b5fcf36a816e52b5b272b8"),
             new TransactionHash("47b089b5f0220299a017359003694a01fd75d075100166b8072c418d5143fe06"),
             new TransactionHash("85021f20b06662240d8302d62f68031bbf7261bacb53b84e3dc9346c0f10a8e7")
@@ -113,18 +114,11 @@ describe("test network providers on devnet: Proxy and API", function () {
             ignoreKnownTransactionDifferencesBetweenProviders(apiResponse, proxyResponse);
             assert.deepEqual(apiResponse, proxyResponse, `transaction: ${hash}`);
         }
-
-        for (const hash of hashes) {
-            let apiResponse = await apiProvider.getTransactionStatus(hash);
-            let proxyResponse = await proxyProvider.getTransactionStatus(hash);
-
-            // TODO: Fix differences of "tx.status".
-            // assert.deepEqual(apiResponse, proxyResponse, `transaction: ${hash}`);
-        }
     });
 
     // TODO: Strive to have as little differences as possible between Proxy and API.
     function ignoreKnownTransactionDifferencesBetweenProviders(apiResponse: ITransactionOnNetwork, proxyResponse: ITransactionOnNetwork) {
+        // TODO: Remove this once "tx.status" is uniformized.
         apiResponse.status = proxyResponse.status = new TransactionStatus("ignore");
 
         // Ignore fields which are not present on API response:
@@ -134,6 +128,30 @@ describe("test network providers on devnet: Proxy and API", function () {
         proxyResponse.hyperblockHash = new Hash("");
     }
 
+    // TODO: Fix differences of "tx.status", then enable this test.
+    it.skip("should have same response for getTransactionStatus()", async function () {
+        this.timeout(20000);
+
+        let hashes = [
+            new TransactionHash("b41f5fc39e96b1f194d07761c6efd6cb92278b95f5012ab12cbc910058ca8b54"),
+            new TransactionHash("7757397a59378e9d0f6d5f08cc934c260e33a50ae0d73fdf869f7c02b6b47b33"),
+            new TransactionHash("b87238089e81527158a6daee520280324bc7e5322ba54d1b3c9a5678abe953ea"),
+            new TransactionHash("b45dd5e598bc85ba71639f2cbce8c5dff2fbe93159e637852fddeb16c0e84a48"),
+            new TransactionHash("83db780e98d4d3c917668c47b33ba51445591efacb0df2a922f88e7dfbb5fc7d"),
+            new TransactionHash("c2eb62b28cc7320da2292d87944c5424a70e1f443323c138c1affada7f6e9705"),
+            new TransactionHash("98e913c2a78cafdf4fa7f0113c1285fb29c2409bd7a746bb6f5506ad76841d54"),
+            new TransactionHash("5b05945be8ba2635e7c13d792ad727533494358308b5fcf36a816e52b5b272b8"),
+            new TransactionHash("47b089b5f0220299a017359003694a01fd75d075100166b8072c418d5143fe06"),
+            new TransactionHash("85021f20b06662240d8302d62f68031bbf7261bacb53b84e3dc9346c0f10a8e7")
+        ];
+
+        for (const hash of hashes) {
+            let apiResponse = await apiProvider.getTransactionStatus(hash);
+            let proxyResponse = await proxyProvider.getTransactionStatus(hash);
+            assert.deepEqual(apiResponse, proxyResponse, `transaction: ${hash}`);
+        }
+    });
+
     it("should have same response for getDefinitionOfFungibleToken()", async function () {
         this.timeout(10000);
 
diff --git a/src-network-providers/networkProvider/transactions.ts b/src-network-providers/networkProvider/transactions.ts
index fd46e4fb1..91ae09bbc 100644
--- a/src-network-providers/networkProvider/transactions.ts
+++ b/src-network-providers/networkProvider/transactions.ts
@@ -1,12 +1,14 @@
 import { Address } from "../address";
 import { Balance } from "../balance";
 import { Hash } from "../hash";
-import { ITransactionOnNetwork } from "../interface.networkProvider";
+import { IContractResults, ITransactionOnNetwork } from "../interface.networkProvider";
 import { GasLimit, GasPrice } from "../networkParams";
 import { Nonce } from "../nonce";
 import { Signature } from "../signature";
 import { TransactionHash, TransactionStatus } from "../transaction";
+import { TransactionLogs } from "../transactionLogs";
 import { TransactionPayload } from "../transactionPayload";
+import { ContractResults } from "./contractResults";
 
  export class TransactionOnNetwork implements ITransactionOnNetwork {
     hash: TransactionHash = new TransactionHash("");
@@ -27,50 +29,46 @@ import { TransactionPayload } from "../transactionPayload";
     hyperblockNonce: Nonce = new Nonce(0);
     hyperblockHash: Hash = Hash.empty();
 
-    static fromProxyHttpResponse(txHash: TransactionHash, response: any): TransactionOnNetwork {
-        let transactionOnNetwork = new TransactionOnNetwork();
-
-        transactionOnNetwork.hash = txHash;
-        transactionOnNetwork.nonce = new Nonce(response.nonce || 0);
-        transactionOnNetwork.round = response.round;
-        transactionOnNetwork.epoch = response.epoch || 0;
-        transactionOnNetwork.value = Balance.fromString(response.value);
-        transactionOnNetwork.sender = Address.fromBech32(response.sender);
-        transactionOnNetwork.receiver = Address.fromBech32(response.receiver);
-        transactionOnNetwork.gasPrice = new GasPrice(response.gasPrice);
-        transactionOnNetwork.gasLimit = new GasLimit(response.gasLimit);
-        transactionOnNetwork.data = TransactionPayload.fromEncoded(response.data);
-        transactionOnNetwork.status = new TransactionStatus(response.status);
-        transactionOnNetwork.timestamp = response.timestamp || 0;
+    logs: TransactionLogs = TransactionLogs.empty();
+    contractResults: IContractResults = ContractResults.empty();
 
-        transactionOnNetwork.blockNonce = new Nonce(response.blockNonce || 0);
-        transactionOnNetwork.hyperblockNonce = new Nonce(response.hyperblockNonce || 0);
-        transactionOnNetwork.hyperblockHash = new Hash(response.hyperblockHash);
-
-        return transactionOnNetwork;
+    static fromProxyHttpResponse(txHash: TransactionHash, response: any): TransactionOnNetwork {
+        let result = TransactionOnNetwork.fromHttpResponse(txHash, response);
+        result.contractResults = ContractResults.fromProxyHttpResponse(response.smartContractResults || []);
+        // TODO: uniformize transaction status
+        return result;
     }
 
     static fromApiHttpResponse(txHash: TransactionHash, response: any): TransactionOnNetwork {
-        let transactionOnNetwork = new TransactionOnNetwork();
+        let result = TransactionOnNetwork.fromHttpResponse(txHash, response);
+        result.contractResults = ContractResults.fromApiHttpResponse(response.results || []);
+        // TODO: uniformize transaction status
+        return result;
+    }
+
+    private static fromHttpResponse(txHash: TransactionHash, response: any): TransactionOnNetwork {
+        let result = new TransactionOnNetwork();
+
+        result.hash = txHash;
+        result.nonce = new Nonce(response.nonce || 0);
+        result.round = response.round;
+        result.epoch = response.epoch || 0;
+        result.value = Balance.fromString(response.value);
+        result.sender = Address.fromBech32(response.sender);
+        result.receiver = Address.fromBech32(response.receiver);
+        result.gasPrice = new GasPrice(response.gasPrice);
+        result.gasLimit = new GasLimit(response.gasLimit);
+        result.data = TransactionPayload.fromEncoded(response.data);
+        result.status = new TransactionStatus(response.status);
+        result.timestamp = response.timestamp || 0;
 
-        transactionOnNetwork.hash = txHash;
-        transactionOnNetwork.nonce = new Nonce(response.nonce || 0);
-        transactionOnNetwork.round = response.round;
-        transactionOnNetwork.epoch = response.epoch || 0;
-        transactionOnNetwork.value = Balance.fromString(response.value);
-        transactionOnNetwork.sender = Address.fromBech32(response.sender);
-        transactionOnNetwork.receiver = Address.fromBech32(response.receiver);
-        transactionOnNetwork.gasPrice = new GasPrice(response.gasPrice);
-        transactionOnNetwork.gasLimit = new GasLimit(response.gasLimit);
-        transactionOnNetwork.data = TransactionPayload.fromEncoded(response.data);
-        transactionOnNetwork.status = new TransactionStatus(response.status);
-        transactionOnNetwork.timestamp = response.timestamp || 0;
+        result.blockNonce = new Nonce(response.blockNonce || 0);
+        result.hyperblockNonce = new Nonce(response.hyperblockNonce || 0);
+        result.hyperblockHash = new Hash(response.hyperblockHash);
 
-        transactionOnNetwork.blockNonce = new Nonce(response.blockNonce || 0);
-        transactionOnNetwork.hyperblockNonce = new Nonce(response.hyperblockNonce || 0);
-        transactionOnNetwork.hyperblockHash = new Hash(response.hyperblockHash);
+        result.logs = TransactionLogs.fromHttpResponse(response.logs || {});
 
-        return transactionOnNetwork;
+        return result;
     }
 
     getDateTime(): Date {

From 4958a0c2375399bb936ce34f1f2bf3b99f110a04 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 23 Feb 2022 16:45:05 +0200
Subject: [PATCH 043/338] Fix after self-review.

---
 .../networkProvider/apiNetworkProvider.ts         |  7 -------
 src-network-providers/networkProvider/index.ts    |  4 ++--
 .../networkProvider/providers.dev.net.spec.ts     | 15 +++++++++++++++
 .../networkProvider/proxyNetworkProvider.ts       |  5 -----
 .../networkProvider/tokenDefinitions.ts           |  2 +-
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
index 1b87925cc..d297e213c 100644
--- a/src-network-providers/networkProvider/apiNetworkProvider.ts
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -23,11 +23,6 @@ export class ApiNetworkProvider implements INetworkProvider {
     private config: AxiosRequestConfig;
     private backingProxyNetworkProvider;
 
-    /**
-     * Creates a new ApiProvider.
-     * @param url the URL of the Elrond Api
-     * @param config axios request config options
-     */
     constructor(url: string, config?: AxiosRequestConfig) {
         this.url = url;
         this.config = { ...defaultConfig, ...config };
@@ -110,7 +105,6 @@ export class ApiNetworkProvider implements INetworkProvider {
 
     async sendTransaction(tx: Transaction): Promise<TransactionHash> {
         let response = await this.doPostGeneric("transactions", tx.toSendable());
-        // Also see: https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/transactions/entities/transaction.send.result.ts
         let hash = new TransactionHash(response.txHash);
         return hash;
     }
@@ -162,7 +156,6 @@ export class ApiNetworkProvider implements INetworkProvider {
         try {
             let url = `${this.url}/${resourceUrl}`;
             let response = await axios.get(url, this.config);
-
             return response.data;
         } catch (error) {
             this.handleApiError(error, resourceUrl);
diff --git a/src-network-providers/networkProvider/index.ts b/src-network-providers/networkProvider/index.ts
index a4276ae73..0c4e6aa0f 100644
--- a/src-network-providers/networkProvider/index.ts
+++ b/src-network-providers/networkProvider/index.ts
@@ -1,5 +1,5 @@
 export * from "./apiNetworkProvider";
 export * from "./proxyNetworkProvider";
 
-// do not export "./tokens" (encapsulation)
-// do not export "./transactions" (encapsulation)
+// we do not export "./tokens"
+// we do not export "./transactions"
diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/networkProvider/providers.dev.net.spec.ts
index 280c66fe2..8fb4c2671 100644
--- a/src-network-providers/networkProvider/providers.dev.net.spec.ts
+++ b/src-network-providers/networkProvider/providers.dev.net.spec.ts
@@ -27,12 +27,14 @@ describe("test network providers on devnet: Proxy and API", function () {
     it("should have same response for getNetworkConfig()", async function () {
         let apiResponse = await apiProvider.getNetworkConfig();
         let proxyResponse = await proxyProvider.getNetworkConfig();
+
         assert.deepEqual(apiResponse, proxyResponse);
     });
 
     it("should have same response for getNetworkStatus()", async function () {
         let apiResponse = await apiProvider.getNetworkStatus();
         let proxyResponse = await proxyProvider.getNetworkStatus();
+
         assert.deepEqual(apiResponse, proxyResponse);
     });
 
@@ -40,6 +42,7 @@ describe("test network providers on devnet: Proxy and API", function () {
     it.skip("should have same response for getNetworkStakeStatistics()", async function () {
         let apiResponse = await apiProvider.getNetworkStakeStatistics();
         let proxyResponse = await proxyProvider.getNetworkStakeStatistics();
+
         assert.deepEqual(apiResponse, proxyResponse);
     });
 
@@ -47,6 +50,7 @@ describe("test network providers on devnet: Proxy and API", function () {
     it.skip("should have same response for getNetworkGeneralStatistics()", async function () {
         let apiResponse = await apiProvider.getNetworkGeneralStatistics();
         let proxyResponse = await proxyProvider.getNetworkGeneralStatistics();
+
         assert.deepEqual(apiResponse, proxyResponse);
     });
 
@@ -54,6 +58,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         for (const user of [bob, carol, dan]) {
             let apiResponse = await apiProvider.getAccount(user.address);
             let proxyResponse = await proxyProvider.getAccount(user.address);
+
             assert.deepEqual(apiResponse, proxyResponse);
         }
     });
@@ -64,11 +69,13 @@ describe("test network providers on devnet: Proxy and API", function () {
         for (const user of [carol, dan]) {
             let apiResponse = await apiProvider.getFungibleTokensOfAccount(user.address);
             let proxyResponse = await proxyProvider.getFungibleTokensOfAccount(user.address);
+
             assert.deepEqual(apiResponse.slice(0, 100), proxyResponse.slice(0, 100));
 
             for (const item of apiResponse.slice(0, 5)) {
                 let apiResponse = await apiProvider.getFungibleTokenOfAccount(user.address, item.identifier);
                 let proxyResponse = await proxyProvider.getFungibleTokenOfAccount(user.address, item.identifier);
+
                 assert.deepEqual(apiResponse, proxyResponse, `user: ${user.address.bech32()}, token: ${item.identifier}`);
             }
         }
@@ -80,11 +87,13 @@ describe("test network providers on devnet: Proxy and API", function () {
         for (const user of [alice, bob, carol, dan]) {
             let apiResponse = await apiProvider.getNonFungibleTokensOfAccount(user.address);
             let proxyResponse = await proxyProvider.getNonFungibleTokensOfAccount(user.address);
+
             assert.deepEqual(apiResponse.slice(0, 100), proxyResponse.slice(0, 100));
 
             for (const item of apiResponse.slice(0, 5)) {
                 let apiResponse = await apiProvider.getNonFungibleTokenOfAccount(user.address, item.collection, item.nonce);
                 let proxyResponse = await proxyProvider.getNonFungibleTokenOfAccount(user.address, item.collection, item.nonce);
+
                 assert.deepEqual(apiResponse, proxyResponse, `user: ${user.address.bech32()}, token: ${item.identifier}`);
             }
         }
@@ -148,6 +157,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         for (const hash of hashes) {
             let apiResponse = await apiProvider.getTransactionStatus(hash);
             let proxyResponse = await proxyProvider.getTransactionStatus(hash);
+
             assert.deepEqual(apiResponse, proxyResponse, `transaction: ${hash}`);
         }
     });
@@ -175,6 +185,7 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         for (const collection of collections) {
             let apiResponse = await apiProvider.getDefinitionOfTokenCollection(collection);
+
             assert.equal(apiResponse.collection, collection);
 
             // TODO: Uncomment after implementing the function in the proxy provider.
@@ -190,6 +201,7 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         for (const token of tokens) {
             let apiResponse = await apiProvider.getNonFungibleToken(token.id, token.nonce);
+
             assert.equal(apiResponse.collection, token.id);
 
             // TODO: Uncomment after implementing the function in the proxy provider.
@@ -212,6 +224,7 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         let apiResponse = await apiProvider.queryContract(query);
         let proxyResponse = await proxyProvider.queryContract(query);
+
         assert.deepEqual(apiResponse, proxyResponse);
         assert.deepEqual(apiResponse.getOutputUntyped(), proxyResponse.getOutputUntyped());
 
@@ -224,6 +237,7 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         apiResponse = await apiProvider.queryContract(query);
         proxyResponse = await proxyProvider.queryContract(query);
+
         assert.deepEqual(apiResponse, proxyResponse);
         assert.deepEqual(apiResponse.getOutputUntyped(), proxyResponse.getOutputUntyped());
 
@@ -243,6 +257,7 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         apiResponse = await apiProvider.queryContract(query);
         proxyResponse = await proxyProvider.queryContract(query);
+        
         assert.deepEqual(apiResponse, proxyResponse);
         assert.deepEqual(apiResponse.getOutputUntyped(), proxyResponse.getOutputUntyped());
     });
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index c9f1d3485..45d6f644b 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -20,11 +20,6 @@ export class ProxyNetworkProvider implements INetworkProvider {
     private url: string;
     private config: AxiosRequestConfig;
 
-    /**
-     * Creates a new {@link INetworkProvider} backed by an Elrond Proxy.
-     * @param url the URL of the Elrond Proxy
-     * @param config axios request config options
-     */
     constructor(url: string, config?: AxiosRequestConfig) {
         this.url = url;
         this.config = { ...defaultConfig, ...config };
diff --git a/src-network-providers/networkProvider/tokenDefinitions.ts b/src-network-providers/networkProvider/tokenDefinitions.ts
index 407e05d19..3e0581092 100644
--- a/src-network-providers/networkProvider/tokenDefinitions.ts
+++ b/src-network-providers/networkProvider/tokenDefinitions.ts
@@ -1,6 +1,6 @@
 import { BigNumber } from "bignumber.js";
 import { Address } from "../address";
-import { IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, INonFungibleTokenOfAccountOnNetwork } from "../interface.networkProvider";
+import { IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork } from "../interface.networkProvider";
 
 export class DefinitionOfFungibleTokenOnNetwork implements IDefinitionOfFungibleTokenOnNetwork {
     identifier: string = "";

From 86480d61f92a0e124b3878a4163c3dd62225853c Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 23 Feb 2022 16:52:31 +0200
Subject: [PATCH 044/338] Fix after self-review.

---
 .../networkProvider/contractResults.ts                 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src-network-providers/networkProvider/contractResults.ts b/src-network-providers/networkProvider/contractResults.ts
index ef719ef58..69e5f574b 100644
--- a/src-network-providers/networkProvider/contractResults.ts
+++ b/src-network-providers/networkProvider/contractResults.ts
@@ -80,6 +80,16 @@ export class ContractResultItem implements IContractResultItem {
 
         return item;
     }
+
+    getOutputUntyped(): Buffer[] {
+        // TODO: Decide how to parse "data" (immediate results vs. other results).
+        throw new Error("Method not implemented.");
+    }
+
+    getOutputTyped(_endpointDefinition: EndpointDefinition): TypedValue[] {
+        // TODO: Decide how to parse "data" (immediate results vs. other results).
+        throw new Error("Method not implemented.");
+    }
 }
 
 export class ContractQueryResponse implements IContractQueryResponse {

From 66fee8043308072ecd58cdc952e32bc751dbec43 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Thu, 24 Feb 2022 12:22:08 +0200
Subject: [PATCH 045/338] Fix after review.

---
 .../networkProvider/apiNetworkProvider.ts     |   3 +-
 .../networkProvider/contractResults.ts        |   2 +-
 .../networkProvider/interface.ts              | 229 ++++++++++++++++++
 .../networkProvider/providers.dev.net.spec.ts |   2 +-
 .../networkProvider/proxyNetworkProvider.ts   |   3 +-
 .../networkProvider/tokenDefinitions.ts       |   2 +-
 .../networkProvider/tokens.ts                 |   2 +-
 .../networkProvider/transactions.ts           |   2 +-
 8 files changed, 238 insertions(+), 7 deletions(-)
 create mode 100644 src-network-providers/networkProvider/interface.ts

diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
index d297e213c..3d809404a 100644
--- a/src-network-providers/networkProvider/apiNetworkProvider.ts
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -3,7 +3,7 @@ import { AccountOnNetwork } from "../account";
 import { Address } from "../address";
 import { defaultConfig } from "../constants";
 import { ErrNetworkProvider } from "../errors";
-import { IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, ITransactionOnNetwork, Pagination } from "../interface.networkProvider";
+import { IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, ITransactionOnNetwork, Pagination } from "./interface";
 import { Logger } from "../logger";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
@@ -18,6 +18,7 @@ import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwor
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork } from "./transactions";
 
+// TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ApiNetworkProvider implements INetworkProvider {
     private url: string;
     private config: AxiosRequestConfig;
diff --git a/src-network-providers/networkProvider/contractResults.ts b/src-network-providers/networkProvider/contractResults.ts
index 69e5f574b..c4b0126ad 100644
--- a/src-network-providers/networkProvider/contractResults.ts
+++ b/src-network-providers/networkProvider/contractResults.ts
@@ -2,7 +2,7 @@ import { BigNumber } from "bignumber.js";
 import { Address } from "../address";
 import { Balance } from "../balance";
 import { Hash } from "../hash";
-import { IContractQueryResponse, IContractResultItem, IContractResults } from "../interface.networkProvider";
+import { IContractQueryResponse, IContractResultItem, IContractResults } from "./interface";
 import { GasLimit, GasPrice } from "../networkParams";
 import { Nonce } from "../nonce";
 import { ArgSerializer, EndpointDefinition, MaxUint64, ReturnCode, TypedValue } from "../smartcontracts";
diff --git a/src-network-providers/networkProvider/interface.ts b/src-network-providers/networkProvider/interface.ts
new file mode 100644
index 000000000..a5f9689c7
--- /dev/null
+++ b/src-network-providers/networkProvider/interface.ts
@@ -0,0 +1,229 @@
+import { BigNumber } from "bignumber.js";
+import { Balance, GasLimit, GasPrice, Nonce, TransactionPayload } from "..";
+import { AccountOnNetwork } from "../account";
+import { Address } from "../address";
+import { Hash } from "../hash";
+import { NetworkConfig } from "../networkConfig";
+import { NetworkStake } from "../networkStake";
+import { NetworkStatus } from "../networkStatus";
+import { Signature } from "../signature";
+import { EndpointDefinition, Query, ReturnCode, TypedValue } from "../smartcontracts";
+import { Stats } from "../stats";
+import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
+import { TransactionLogs } from "../transactionLogs";
+
+/**
+ * An interface that defines the endpoints of an HTTP API Provider.
+ */
+export interface INetworkProvider {
+    /**
+     * Fetches the Network configuration.
+     */
+    getNetworkConfig(): Promise<NetworkConfig>;
+
+    /**
+     * Fetches the Network status.
+     */
+    getNetworkStatus(): Promise<NetworkStatus>;
+
+    /**
+     * Fetches stake statistics.
+     */
+    getNetworkStakeStatistics(): Promise<NetworkStake>;
+
+    /**
+     * Fetches general statistics.
+     */
+    getNetworkGeneralStatistics(): Promise<Stats>;
+
+    /**
+     * Fetches the state of an {@link Account}.
+     */
+    getAccount(address: Address): Promise<AccountOnNetwork>;
+
+    /**
+     * Fetches data about the fungible tokens held by an account.
+     */
+    getFungibleTokensOfAccount(address: Address, pagination?: Pagination): Promise<IFungibleTokenOfAccountOnNetwork[]>;
+
+    /**
+     * Fetches data about the non-fungible tokens held by account.
+     */
+    getNonFungibleTokensOfAccount(address: Address, pagination?: Pagination): Promise<INonFungibleTokenOfAccountOnNetwork[]>;
+
+    /**
+     * Fetches data about a specific fungible token held by an account.
+     */
+    getFungibleTokenOfAccount(address: Address, tokenIdentifier: string): Promise<IFungibleTokenOfAccountOnNetwork>;
+
+    /**
+     * Fetches data about a specific non-fungible token (instance) held by an account.
+     */
+    getNonFungibleTokenOfAccount(address: Address, collection: string, nonce: Nonce): Promise<INonFungibleTokenOfAccountOnNetwork>;
+
+    /**
+     * Fetches the state of a {@link Transaction}.
+     */
+    getTransaction(txHash: TransactionHash): Promise<ITransactionOnNetwork>;
+
+    /**
+     * Queries the status of a {@link Transaction}.
+     */
+    getTransactionStatus(txHash: TransactionHash): Promise<TransactionStatus>;
+
+    /**
+     * Broadcasts an already-signed {@link Transaction}.
+     */
+    sendTransaction(tx: Transaction): Promise<TransactionHash>;
+
+    /**
+     * Simulates the processing of an already-signed {@link Transaction}.
+     * 
+     */
+    simulateTransaction(tx: Transaction): Promise<IContractSimulation>;
+
+    /**
+     * Queries a Smart Contract - runs a pure function defined by the contract and returns its results.
+     */
+    queryContract(query: Query): Promise<IContractQueryResponse>;
+
+    /**
+     * Fetches the definition of a fungible token.
+     *
+     */
+    getDefinitionOfFungibleToken(tokenIdentifier: string): Promise<IDefinitionOfFungibleTokenOnNetwork>;
+
+    /**
+     * Fetches the definition of a SFT (including Meta ESDT) or NFT.
+     * 
+     */
+    getDefinitionOfTokenCollection(collection: string): Promise<IDefinitionOfTokenCollectionOnNetwork>;
+
+    /**
+     * Fetches data about a specific non-fungible token (instance).
+     */
+    getNonFungibleToken(collection: string, nonce: Nonce): Promise<INonFungibleTokenOfAccountOnNetwork>;
+
+    /**
+     * Performs a generic GET action against the provider (useful for new HTTP endpoints, not yet supported by erdjs).
+     */
+    doGetGeneric(resourceUrl: string): Promise<any>;
+
+    /**
+     * Performs a generic POST action against the provider (useful for new HTTP endpoints, not yet supported by erdjs).
+     */
+    doPostGeneric(resourceUrl: string, payload: any): Promise<any>;
+}
+
+export interface IFungibleTokenOfAccountOnNetwork {
+    identifier: string;
+    balance: BigNumber;
+}
+
+export interface INonFungibleTokenOfAccountOnNetwork {
+    identifier: string;
+    collection: string;
+    attributes: Buffer;
+    balance: BigNumber;
+    nonce: Nonce;
+    creator: Address;
+    royalties: BigNumber;
+}
+
+
+export interface IDefinitionOfFungibleTokenOnNetwork {
+    identifier: string;
+    name: string;
+    ticker: string;
+    owner: Address;
+    decimals: number;
+    supply: BigNumber;
+    isPaused: boolean;
+    canUpgrade: boolean;
+    canMint: boolean;
+    canBurn: boolean;
+    canChangeOwner: boolean;
+    canPause: boolean;
+    canFreeze: boolean;
+    canWipe: boolean;
+    canAddSpecialRoles: boolean;
+}
+
+export interface IDefinitionOfTokenCollectionOnNetwork {
+    collection: string;
+    type: string;
+    name: string;
+    ticker: string;
+    owner: Address;
+    decimals: number;
+    canPause: boolean;
+    canFreeze: boolean;
+    canWipe: boolean;
+    canTransferRole: boolean;
+    // TODO: add "assets", "roles"
+}
+
+export interface ITransactionOnNetwork {
+    hash: TransactionHash;
+    nonce: Nonce;
+    round: number;
+    epoch: number;
+    value: Balance;
+    receiver: Address;
+    sender: Address;
+    gasPrice: GasPrice;
+    gasLimit: GasLimit;
+    data: TransactionPayload;
+    signature: Signature;
+    status: TransactionStatus;
+    timestamp: number;
+    blockNonce: Nonce;
+    hyperblockNonce: Nonce;
+    hyperblockHash: Hash;
+    logs: TransactionLogs;
+    contractResults: IContractResults;
+}
+
+export interface IContractResults {
+    items: IContractResultItem[];
+}
+
+export interface IContractResultItem {
+    hash: Hash;
+    nonce: Nonce;
+    value: Balance;
+    receiver: Address;
+    sender: Address;
+    data: string;
+    previousHash: Hash;
+    originalHash: Hash;
+    gasLimit: GasLimit;
+    gasPrice: GasPrice;
+    callType: number;
+    returnMessage: string;
+
+    getOutputUntyped(): Buffer[];
+    getOutputTyped(endpointDefinition: EndpointDefinition): TypedValue[];
+}
+
+export interface IContractQueryResponse {
+    returnData: string[];
+    returnCode: ReturnCode;
+    returnMessage: string;
+    gasUsed: GasLimit;
+
+    getOutputUntyped(): Buffer[];
+    getOutputTyped(endpointDefinition: EndpointDefinition): TypedValue[];
+}
+
+export interface IContractSimulation {
+}
+
+export class Pagination {
+    from: number = 0;
+    size: number = 100;
+
+    static default(): Pagination {
+        return { from: 0, size: 100 };
+    }
+}
diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/networkProvider/providers.dev.net.spec.ts
index 8fb4c2671..7c953b5be 100644
--- a/src-network-providers/networkProvider/providers.dev.net.spec.ts
+++ b/src-network-providers/networkProvider/providers.dev.net.spec.ts
@@ -1,7 +1,7 @@
 import { assert } from "chai";
 import { ApiNetworkProvider, ProxyNetworkProvider } from ".";
 import { Hash } from "../hash";
-import { INetworkProvider, ITransactionOnNetwork } from "../interface.networkProvider";
+import { INetworkProvider, ITransactionOnNetwork } from "./interface";
 import { Address } from "../address";
 import { loadTestWallets, TestWallet } from "../testutils";
 import { TransactionHash, TransactionStatus } from "../transaction";
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index 45d6f644b..57f5b238b 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -3,7 +3,7 @@ import { AccountOnNetwork } from "../account";
 import { Address } from "../address";
 import { defaultConfig } from "../constants";
 import { ErrNetworkProvider } from "../errors";
-import { IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, ITransactionOnNetwork, Pagination } from "../interface.networkProvider";
+import { IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, ITransactionOnNetwork, Pagination } from "./interface";
 import { Logger } from "../logger";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
@@ -16,6 +16,7 @@ import { ContractQueryResponse } from "./contractResults";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork } from "./transactions";
 
+// TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ProxyNetworkProvider implements INetworkProvider {
     private url: string;
     private config: AxiosRequestConfig;
diff --git a/src-network-providers/networkProvider/tokenDefinitions.ts b/src-network-providers/networkProvider/tokenDefinitions.ts
index 3e0581092..77b784e66 100644
--- a/src-network-providers/networkProvider/tokenDefinitions.ts
+++ b/src-network-providers/networkProvider/tokenDefinitions.ts
@@ -1,6 +1,6 @@
 import { BigNumber } from "bignumber.js";
 import { Address } from "../address";
-import { IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork } from "../interface.networkProvider";
+import { IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork } from "./interface";
 
 export class DefinitionOfFungibleTokenOnNetwork implements IDefinitionOfFungibleTokenOnNetwork {
     identifier: string = "";
diff --git a/src-network-providers/networkProvider/tokens.ts b/src-network-providers/networkProvider/tokens.ts
index 716de7770..303fdb7ca 100644
--- a/src-network-providers/networkProvider/tokens.ts
+++ b/src-network-providers/networkProvider/tokens.ts
@@ -1,6 +1,6 @@
 import { BigNumber } from "bignumber.js";
 import { Address } from "../address";
-import { IFungibleTokenOfAccountOnNetwork, INonFungibleTokenOfAccountOnNetwork } from "../interface.networkProvider";
+import { IFungibleTokenOfAccountOnNetwork, INonFungibleTokenOfAccountOnNetwork } from "./interface";
 import { Nonce } from "../nonce";
 
 export class FungibleTokenOfAccountOnNetwork implements IFungibleTokenOfAccountOnNetwork {
diff --git a/src-network-providers/networkProvider/transactions.ts b/src-network-providers/networkProvider/transactions.ts
index 91ae09bbc..6fd3c906c 100644
--- a/src-network-providers/networkProvider/transactions.ts
+++ b/src-network-providers/networkProvider/transactions.ts
@@ -1,7 +1,7 @@
 import { Address } from "../address";
 import { Balance } from "../balance";
 import { Hash } from "../hash";
-import { IContractResults, ITransactionOnNetwork } from "../interface.networkProvider";
+import { IContractResults, ITransactionOnNetwork } from "./interface";
 import { GasLimit, GasPrice } from "../networkParams";
 import { Nonce } from "../nonce";
 import { Signature } from "../signature";

From 58bc47e9a5ea86c8818a2c65e337c16a57031122 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Mon, 14 Mar 2022 11:04:14 +0200
Subject: [PATCH 046/338] Fix remaining imports.

---
 src-wallet/pem.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-wallet/pem.spec.ts b/src-wallet/pem.spec.ts
index 89fb76469..f44260e6c 100644
--- a/src-wallet/pem.spec.ts
+++ b/src-wallet/pem.spec.ts
@@ -2,8 +2,8 @@ import * as errors from "../errors";
 import { assert } from "chai";
 import { loadTestWallets, TestWallet } from "../testutils";
 import { parse, parseUserKey, parseValidatorKey } from "./pem";
-import { BLS } from ".";
 import { Buffer } from "buffer";
+import { BLS } from "./validatorKeys";
 
 describe("test PEMs", () => {
     let alice: TestWallet, bob: TestWallet, carol: TestWallet;

From 790a3528f152fa5fba4421d51bfad0b65223d3cf Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Mon, 14 Mar 2022 11:04:14 +0200
Subject: [PATCH 047/338] Fix remaining imports.

---
 src-network-providers/networkProvider/interface.ts           | 5 ++++-
 .../networkProvider/providers.dev.net.spec.ts                | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src-network-providers/networkProvider/interface.ts b/src-network-providers/networkProvider/interface.ts
index a5f9689c7..287fd791d 100644
--- a/src-network-providers/networkProvider/interface.ts
+++ b/src-network-providers/networkProvider/interface.ts
@@ -1,16 +1,19 @@
 import { BigNumber } from "bignumber.js";
-import { Balance, GasLimit, GasPrice, Nonce, TransactionPayload } from "..";
 import { AccountOnNetwork } from "../account";
 import { Address } from "../address";
+import { Balance } from "../balance";
 import { Hash } from "../hash";
 import { NetworkConfig } from "../networkConfig";
+import { GasLimit, GasPrice } from "../networkParams";
 import { NetworkStake } from "../networkStake";
 import { NetworkStatus } from "../networkStatus";
+import { Nonce } from "../nonce";
 import { Signature } from "../signature";
 import { EndpointDefinition, Query, ReturnCode, TypedValue } from "../smartcontracts";
 import { Stats } from "../stats";
 import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
 import { TransactionLogs } from "../transactionLogs";
+import { TransactionPayload } from "../transactionPayload";
 
 /**
  * An interface that defines the endpoints of an HTTP API Provider.
diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/networkProvider/providers.dev.net.spec.ts
index 7c953b5be..8ee0031b7 100644
--- a/src-network-providers/networkProvider/providers.dev.net.spec.ts
+++ b/src-network-providers/networkProvider/providers.dev.net.spec.ts
@@ -1,5 +1,4 @@
 import { assert } from "chai";
-import { ApiNetworkProvider, ProxyNetworkProvider } from ".";
 import { Hash } from "../hash";
 import { INetworkProvider, ITransactionOnNetwork } from "./interface";
 import { Address } from "../address";
@@ -10,6 +9,8 @@ import { ContractFunction, Query } from "../smartcontracts";
 import { BigUIntValue, U32Value, BytesValue, VariadicValue, VariadicType, CompositeType, BytesType, BooleanType } from "../smartcontracts/typesystem";
 import { BigNumber } from "bignumber.js";
 import { Balance } from "../balance";
+import { ApiNetworkProvider } from "./apiNetworkProvider";
+import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 
 describe("test network providers on devnet: Proxy and API", function () {
     let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 10000 });

From 41084c6739401a667c576ce985fb8473efbe87bf Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Sun, 20 Mar 2022 11:20:29 +0200
Subject: [PATCH 048/338] Refactor contract results (breaking change).

---
 .../networkProvider/contractResults.ts        | 23 +++----------------
 .../networkProvider/interface.ts              | 10 +++-----
 .../networkProvider/providers.dev.net.spec.ts |  6 ++---
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/src-network-providers/networkProvider/contractResults.ts b/src-network-providers/networkProvider/contractResults.ts
index c4b0126ad..8cebbb3e0 100644
--- a/src-network-providers/networkProvider/contractResults.ts
+++ b/src-network-providers/networkProvider/contractResults.ts
@@ -5,7 +5,7 @@ import { Hash } from "../hash";
 import { IContractQueryResponse, IContractResultItem, IContractResults } from "./interface";
 import { GasLimit, GasPrice } from "../networkParams";
 import { Nonce } from "../nonce";
-import { ArgSerializer, EndpointDefinition, MaxUint64, ReturnCode, TypedValue } from "../smartcontracts";
+import { MaxUint64, ReturnCode } from "../smartcontracts";
 import { TransactionHash } from "../transaction";
 
 export class ContractResults implements IContractResults {
@@ -80,16 +80,6 @@ export class ContractResultItem implements IContractResultItem {
 
         return item;
     }
-
-    getOutputUntyped(): Buffer[] {
-        // TODO: Decide how to parse "data" (immediate results vs. other results).
-        throw new Error("Method not implemented.");
-    }
-
-    getOutputTyped(_endpointDefinition: EndpointDefinition): TypedValue[] {
-        // TODO: Decide how to parse "data" (immediate results vs. other results).
-        throw new Error("Method not implemented.");
-    }
 }
 
 export class ContractQueryResponse implements IContractQueryResponse {
@@ -110,14 +100,7 @@ export class ContractQueryResponse implements IContractQueryResponse {
         return response;
     }
 
-    getOutputUntyped(): Buffer[] {
-        let buffers = this.returnData.map((item) => Buffer.from(item || "", "base64"));
-        return buffers;
-    }
-
-    getOutputTyped(endpointDefinition: EndpointDefinition): TypedValue[] {
-        let buffers = this.getOutputUntyped();
-        let values = new ArgSerializer().buffersToValues(buffers, endpointDefinition!.output);
-        return values;
+    getReturnDataParts(): Buffer[] {
+        return this.returnData.map((item) => Buffer.from(item || ""));
     }
 }
diff --git a/src-network-providers/networkProvider/interface.ts b/src-network-providers/networkProvider/interface.ts
index 287fd791d..4f21dbe49 100644
--- a/src-network-providers/networkProvider/interface.ts
+++ b/src-network-providers/networkProvider/interface.ts
@@ -9,7 +9,7 @@ import { NetworkStake } from "../networkStake";
 import { NetworkStatus } from "../networkStatus";
 import { Nonce } from "../nonce";
 import { Signature } from "../signature";
-import { EndpointDefinition, Query, ReturnCode, TypedValue } from "../smartcontracts";
+import { Query, ReturnCode } from "../smartcontracts";
 import { Stats } from "../stats";
 import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
 import { TransactionLogs } from "../transactionLogs";
@@ -204,9 +204,6 @@ export interface IContractResultItem {
     gasPrice: GasPrice;
     callType: number;
     returnMessage: string;
-
-    getOutputUntyped(): Buffer[];
-    getOutputTyped(endpointDefinition: EndpointDefinition): TypedValue[];
 }
 
 export interface IContractQueryResponse {
@@ -214,9 +211,8 @@ export interface IContractQueryResponse {
     returnCode: ReturnCode;
     returnMessage: string;
     gasUsed: GasLimit;
-
-    getOutputUntyped(): Buffer[];
-    getOutputTyped(endpointDefinition: EndpointDefinition): TypedValue[];
+    
+    getReturnDataParts(): Buffer[];
 }
 
 export interface IContractSimulation {
diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/networkProvider/providers.dev.net.spec.ts
index 8ee0031b7..affbd8d0b 100644
--- a/src-network-providers/networkProvider/providers.dev.net.spec.ts
+++ b/src-network-providers/networkProvider/providers.dev.net.spec.ts
@@ -227,7 +227,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         let proxyResponse = await proxyProvider.queryContract(query);
 
         assert.deepEqual(apiResponse, proxyResponse);
-        assert.deepEqual(apiResponse.getOutputUntyped(), proxyResponse.getOutputUntyped());
+        assert.deepEqual(apiResponse.getReturnDataParts(), proxyResponse.getReturnDataParts());
 
         // Query: increment counter
         query = new Query({
@@ -240,7 +240,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         proxyResponse = await proxyProvider.queryContract(query);
 
         assert.deepEqual(apiResponse, proxyResponse);
-        assert.deepEqual(apiResponse.getOutputUntyped(), proxyResponse.getOutputUntyped());
+        assert.deepEqual(apiResponse.getReturnDataParts(), proxyResponse.getReturnDataParts());
 
         // Query: issue ESDT
         query = new Query({
@@ -260,6 +260,6 @@ describe("test network providers on devnet: Proxy and API", function () {
         proxyResponse = await proxyProvider.queryContract(query);
         
         assert.deepEqual(apiResponse, proxyResponse);
-        assert.deepEqual(apiResponse.getOutputUntyped(), proxyResponse.getOutputUntyped());
+        assert.deepEqual(apiResponse.getReturnDataParts(), proxyResponse.getReturnDataParts());
     });
 });

From b2d88da88e719ae95ccc6ecd9fa445802cb5fdd6 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 23 Mar 2022 13:52:41 +0200
Subject: [PATCH 049/338] Partial fixes after extraction.

---
 src-wallet/address.ts          | 71 ++++++++++++++++++++++++++++++++++
 src-wallet/crypto/decryptor.ts |  6 +--
 src-wallet/errors.ts           | 56 +++++++++++++++++++++++++++
 src-wallet/index.ts            |  5 ---
 src-wallet/interface.ts        | 59 ++++++++++++++++++++++++++++
 src-wallet/mnemonic.ts         |  4 +-
 src-wallet/pem.spec.ts         |  6 +--
 src-wallet/pem.ts              |  6 +--
 src-wallet/signature.ts        | 14 +++++++
 src-wallet/userKeys.ts         |  8 ++--
 src-wallet/userSigner.ts       | 12 +++---
 src-wallet/userVerifier.ts     |  6 +--
 src-wallet/userWallet.ts       |  4 +-
 src-wallet/users.spec.ts       |  6 +--
 src-wallet/utils.ts            |  9 +++++
 src-wallet/validatorKeys.ts    |  6 +--
 src-wallet/validatorSigner.ts  |  4 +-
 17 files changed, 242 insertions(+), 40 deletions(-)
 create mode 100644 src-wallet/address.ts
 create mode 100644 src-wallet/errors.ts
 create mode 100644 src-wallet/interface.ts
 create mode 100644 src-wallet/signature.ts
 create mode 100644 src-wallet/utils.ts

diff --git a/src-wallet/address.ts b/src-wallet/address.ts
new file mode 100644
index 000000000..a31749c08
--- /dev/null
+++ b/src-wallet/address.ts
@@ -0,0 +1,71 @@
+import * as bech32 from "bech32";
+
+/**
+ * The human-readable-part of the bech32 addresses.
+ */
+const HRP = "erd";
+
+/**
+ * An Elrond Address, as an immutable object.
+ */
+export class Address {
+    private readonly buffer: Buffer;
+
+    public constructor(buffer: Buffer) {
+        this.buffer = buffer;
+    }
+
+    /**
+     * Returns the hex representation of the address (pubkey)
+     */
+    hex(): string {
+        return this.buffer.toString("hex");
+    }
+
+    /**
+     * Returns the bech32 representation of the address
+     */
+    bech32(): string {
+        let words = bech32.toWords(this.pubkey());
+        let address = bech32.encode(HRP, words);
+        return address;
+    }
+
+    /**
+     * Returns the pubkey as raw bytes (buffer)
+     */
+    pubkey(): Buffer {
+        return this.buffer;
+    }
+
+    /**
+     * Returns whether the address is empty.
+     */
+    isEmpty() {
+        return !this.buffer;
+    }
+
+    /**
+     * Compares the address to another address
+     */
+    equals(other: Address): boolean {
+        return this.buffer.compare(other.buffer) == 0;
+    }
+
+    /**
+     * Returns the bech32 representation of the address
+     */
+    toString(): string {
+        return this.bech32();
+    }
+
+    /**
+     * Converts the address to a pretty, plain JavaScript object.
+     */
+    toJSON(): object {
+        return {
+            bech32: this.bech32(),
+            pubkey: this.hex()
+        };
+    }
+}
diff --git a/src-wallet/crypto/decryptor.ts b/src-wallet/crypto/decryptor.ts
index 35baace91..6a859d1d3 100644
--- a/src-wallet/crypto/decryptor.ts
+++ b/src-wallet/crypto/decryptor.ts
@@ -1,7 +1,7 @@
 import crypto from "crypto";
-import {EncryptedData} from "./encryptedData";
-import * as errors from "../errors";
+import { EncryptedData } from "./encryptedData";
 import { DigestAlgorithm } from "./constants";
+import { ErrWrongPassword } from "../errors";
 
 export class Decryptor {
   public static decrypt(data: EncryptedData, password: string): Buffer {
@@ -17,7 +17,7 @@ export class Decryptor {
     const actualMAC = data.mac;
 
     if (computedMAC.toString("hex") !== actualMAC) {
-      throw new errors.ErrWallet("MAC mismatch, possibly wrong password");
+      throw new ErrWrongPassword("MAC mismatch");
     }
 
     const decipher = crypto.createDecipheriv(data.cipher, derivedKeyFirstHalf, iv);
diff --git a/src-wallet/errors.ts b/src-wallet/errors.ts
new file mode 100644
index 000000000..e27b36bc9
--- /dev/null
+++ b/src-wallet/errors.ts
@@ -0,0 +1,56 @@
+/**
+ * The base class for `erdjs` exceptions (errors).
+ */
+export class Err extends Error {
+    inner: Error | undefined = undefined;
+
+    public constructor(message: string, inner?: Error) {
+        super(message);
+        this.inner = inner;
+    }
+}
+
+/**
+ * Signals that an invariant failed.
+ */
+export class ErrInvariantFailed extends Err {
+    public constructor(message: string) {
+        super(`"Invariant failed: ${message}`);
+    }
+}
+
+/**
+ * Signals a wrong mnemonic format.
+ */
+export class ErrWrongMnemonic extends Err {
+    public constructor() {
+        super("Wrong mnemonic format");
+    }
+}
+
+/**
+ * Signals a wrong password.
+ */
+ export class ErrWrongPassword extends Err {
+    public constructor(message: string) {
+        super(`Possibly wrong password: ${message}`);
+    }
+}
+
+/**
+ * Signals a bad PEM file.
+ */
+export class ErrBadPEM extends Err {
+    public constructor(message?: string) {
+        super(message ? `Bad PEM: ${message}` : `Bad PEM`);
+    }
+}
+
+/**
+ * Signals an error related to signing a message (a transaction).
+ */
+export class ErrSignerCannotSign extends Err {
+    public constructor(inner: Error) {
+        super(`Cannot sign`, inner);
+    }
+}
diff --git a/src-wallet/index.ts b/src-wallet/index.ts
index acf9c06b9..c5d518dfd 100644
--- a/src-wallet/index.ts
+++ b/src-wallet/index.ts
@@ -1,8 +1,3 @@
-/**
- * @packageDocumentation
- * @module wallet
- */
-
 export * from "./mnemonic";
 export * from "./pem";
 export * from "./userWallet";
diff --git a/src-wallet/interface.ts b/src-wallet/interface.ts
new file mode 100644
index 000000000..a721048c7
--- /dev/null
+++ b/src-wallet/interface.ts
@@ -0,0 +1,59 @@
+export interface IAddress {
+    hex(): string;
+    bech32(): string;
+}
+
+export interface ISignature {
+    hex(): string;
+}
+
+/**
+ * An interface that defines a signing-capable object.
+ */
+export interface ISigner {
+    /**
+     * Gets the {@link Address} of the signer.
+     */
+    getAddress(): IAddress;
+
+    /**
+     * Signs a message (e.g. a transaction).
+     */
+    sign(signable: ISignable): Promise<void>;
+}
+
+export interface IVerifier {
+    verify(message: IVerifiable): boolean;
+}
+
+/**
+ * An interface that defines a signable object (e.g. a transaction).
+ */
+export interface ISignable {
+    /**
+     * Returns the signable object in its raw form - a sequence of bytes to be signed.
+     */
+    serializeForSigning(signedBy: IAddress): Buffer;
+
+    /**
+     * Applies the computed signature on the object itself.
+     *
+     * @param signature The computed signature
+     * @param signedBy The address of the {@link ISignature}
+     */
+    applySignature(signature: ISignature, signedBy: IAddress): void;
+}
+
+/**
+ * Interface that defines a signed and verifiable object
+ */
+export interface IVerifiable {
+    /**
+     * Returns the signature that should be verified
+     */
+    getSignature(): ISignature;
+    /**
+     * Returns the signable object in its raw form - a sequence of bytes to be verified.
+     */
+    serializeForSigning(signedBy?: IAddress): Buffer;
+}
diff --git a/src-wallet/mnemonic.ts b/src-wallet/mnemonic.ts
index 69c298d66..b9dba56ae 100644
--- a/src-wallet/mnemonic.ts
+++ b/src-wallet/mnemonic.ts
@@ -1,7 +1,7 @@
-import * as errors from "../errors";
 import { generateMnemonic, validateMnemonic, mnemonicToSeedSync } from "bip39";
 import { UserSecretKey } from "./userKeys";
 import { derivePath } from "ed25519-hd-key";
+import { ErrWrongMnemonic } from "./errors";
 
 const MNEMONIC_STRENGTH = 256;
 const BIP44_DERIVATION_PREFIX = "m/44'/508'/0'/0'";
@@ -29,7 +29,7 @@ export class Mnemonic {
         let isValid = validateMnemonic(text);
 
         if (!isValid) {
-            throw new errors.ErrWrongMnemonic();
+            throw new ErrWrongMnemonic();
         }
     }
 
diff --git a/src-wallet/pem.spec.ts b/src-wallet/pem.spec.ts
index f44260e6c..2b6a7e74d 100644
--- a/src-wallet/pem.spec.ts
+++ b/src-wallet/pem.spec.ts
@@ -1,9 +1,9 @@
-import * as errors from "../errors";
 import { assert } from "chai";
 import { loadTestWallets, TestWallet } from "../testutils";
 import { parse, parseUserKey, parseValidatorKey } from "./pem";
 import { Buffer } from "buffer";
 import { BLS } from "./validatorKeys";
+import { ErrBadPEM } from "./errors";
 
 describe("test PEMs", () => {
     let alice: TestWallet, bob: TestWallet, carol: TestWallet;
@@ -81,13 +81,13 @@ ${payloadCarol}
         YjU4YTRmMjVlMzQ0ZThmOTAxMzk0NzJlZmY2ODg2NzcxYTk4MmYzMDgzZGE1ZDQy
         MWYyNGMyOTE4MWU2Mzg4ODIyOGRjODFjYTYwZDY5ZTE=`;
 
-        assert.throw(() => parseUserKey(contentWithoutEnd), errors.ErrBadPEM);
+        assert.throw(() => parseUserKey(contentWithoutEnd), ErrBadPEM);
 
         let contentWithBadData = `-----BEGIN PRIVATE KEY for alice
         NDEzZjQyNTc1ZjdmMjZmYWQzMzE3YTc3ODc3MTIxMmZkYjgwMjQ1ODUwOTgxZTQ4
         YjU4YTRmMjVlMzQ0ZThmOTAxMzk0NzJlZmY2ODg2NzcxYTk4MmYzMDgzZGE1Zfoo
         -----END PRIVATE KEY for alice`;
 
-        assert.throw(() => parseUserKey(contentWithBadData), errors.ErrBadPEM);
+        assert.throw(() => parseUserKey(contentWithBadData), ErrBadPEM);
     });
 });
diff --git a/src-wallet/pem.ts b/src-wallet/pem.ts
index 546ab0cdd..f9add5494 100644
--- a/src-wallet/pem.ts
+++ b/src-wallet/pem.ts
@@ -1,4 +1,4 @@
-import * as errors from "../errors";
+import { ErrBadPEM } from "./errors";
 import { UserSecretKey, USER_PUBKEY_LENGTH, USER_SEED_LENGTH } from "./userKeys";
 import { ValidatorSecretKey, VALIDATOR_SECRETKEY_LENGTH } from "./validatorKeys";
 
@@ -38,7 +38,7 @@ export function parse(text: string, expectedLength: number): Buffer[] {
             let asBytes = Buffer.from(asHex, "hex");
 
             if (asBytes.length != expectedLength) {
-                throw new errors.ErrBadPEM(`incorrect key length: expected ${expectedLength}, found ${asBytes.length}`);
+                throw new ErrBadPEM(`incorrect key length: expected ${expectedLength}, found ${asBytes.length}`);
             }
 
             buffers.push(asBytes);
@@ -49,7 +49,7 @@ export function parse(text: string, expectedLength: number): Buffer[] {
     }
 
     if (linesAccumulator.length != 0) {
-        throw new errors.ErrBadPEM("incorrect file structure");
+        throw new ErrBadPEM("incorrect file structure");
     }
 
     return buffers;
diff --git a/src-wallet/signature.ts b/src-wallet/signature.ts
new file mode 100644
index 000000000..ec10ea536
--- /dev/null
+++ b/src-wallet/signature.ts
@@ -0,0 +1,14 @@
+/**
+ * Signature, as an immutable object.
+ */
+export class Signature {
+    private readonly buffer: Buffer;
+
+    constructor(buffer: Buffer) {
+        this.buffer = buffer;
+    }
+
+    hex() {
+        return this.buffer.toString("hex");
+    }
+}
diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index 1bb44f5e1..8d43d51aa 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -1,9 +1,7 @@
 import * as tweetnacl from "tweetnacl";
-import { Address } from "../address";
-import { guardLength } from "../utils";
+import { Address } from "./address";
+import { guardLength } from "./utils";
 import { parseUserKey } from "./pem";
-import {SignableMessage} from "../signableMessage";
-import {Logger} from "../logger";
 
 export const USER_SEED_LENGTH = 32;
 export const USER_PUBKEY_LENGTH = 32;
@@ -68,7 +66,7 @@ export class UserPublicKey {
             const unsignedMessage = tweetnacl.sign.open(unopenedMessage, this.buffer);
             return unsignedMessage != null;
         } catch (err) {
-            Logger.error(err);
+            console.error(err);
             return false;
         }
     }
diff --git a/src-wallet/userSigner.ts b/src-wallet/userSigner.ts
index be0b30e84..1370ca5e0 100644
--- a/src-wallet/userSigner.ts
+++ b/src-wallet/userSigner.ts
@@ -1,9 +1,9 @@
-import * as errors from "../errors";
-import { Address } from "../address";
-import { ISignable, ISigner } from "../interface";
-import { Signature } from "../signature";
+import { Address } from "./address";
+import { ISignable, ISigner } from "./interface";
+import { Signature } from "./signature";
 import { UserSecretKey } from "./userKeys";
 import { UserWallet } from "./userWallet";
+import { ErrSignerCannotSign } from "./errors";
 
 /**
  * ed25519 signer
@@ -32,8 +32,8 @@ export class UserSigner implements ISigner {
     async sign(signable: ISignable): Promise<void> {
         try {
             this.trySign(signable);
-        } catch (err) {
-            throw new errors.ErrSignerCannotSign(err);
+        } catch (err: any) {
+            throw new ErrSignerCannotSign(err);
         }
     }
 
diff --git a/src-wallet/userVerifier.ts b/src-wallet/userVerifier.ts
index d39bfa885..050b53ef9 100644
--- a/src-wallet/userVerifier.ts
+++ b/src-wallet/userVerifier.ts
@@ -1,6 +1,6 @@
-import {IVerifiable, IVerifier} from "../interface";
-import {Address} from "../address";
-import {UserPublicKey} from "./userKeys";
+import { IVerifiable, IVerifier } from "./interface";
+import { Address } from "./address";
+import { UserPublicKey } from "./userKeys";
 
 /**
  * ed25519 signature verification
diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index c0f7064d8..63100a9e2 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -1,6 +1,6 @@
 import { UserPublicKey, UserSecretKey } from "./userKeys";
-import { EncryptedData, Encryptor, Decryptor, CipherAlgorithm, Version, KeyDerivationFunction, Randomness } from "../crypto";
-import {ScryptKeyDerivationParams} from "../crypto/derivationParams";
+import { EncryptedData, Encryptor, Decryptor, CipherAlgorithm, Version, KeyDerivationFunction, Randomness } from "./crypto";
+import { ScryptKeyDerivationParams } from "./crypto/derivationParams";
 
 export class UserWallet {
     private readonly publicKey: UserPublicKey;
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 27b64670c..04ba8239d 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -1,4 +1,3 @@
-import * as errors from "../errors";
 import { assert } from "chai";
 import { loadMnemonic, loadPassword, loadTestWallets, TestWallet } from "../testutils";
 import { UserSecretKey } from "./userKeys";
@@ -14,6 +13,7 @@ import { ChainID, GasLimit, GasPrice } from "../networkParams";
 import { TransactionPayload } from "../transactionPayload";
 import { UserVerifier } from "./userVerifier";
 import { SignableMessage } from "../signableMessage";
+import { ErrInvariantFailed } from "./errors";
 
 describe("test user wallets", () => {
     let alice: TestWallet, bob: TestWallet, carol: TestWallet;
@@ -63,8 +63,8 @@ describe("test user wallets", () => {
     });
 
     it("should throw error when invalid input", () => {
-        assert.throw(() => new UserSecretKey(Buffer.alloc(42)), errors.ErrInvariantFailed);
-        assert.throw(() => UserSecretKey.fromString("foobar"), errors.ErrInvariantFailed);
+        assert.throw(() => new UserSecretKey(Buffer.alloc(42)), ErrInvariantFailed);
+        assert.throw(() => UserSecretKey.fromString("foobar"), ErrInvariantFailed);
     });
 
     it("should handle PEM files", () => {
diff --git a/src-wallet/utils.ts b/src-wallet/utils.ts
new file mode 100644
index 000000000..80602639c
--- /dev/null
+++ b/src-wallet/utils.ts
@@ -0,0 +1,9 @@
+import { ErrInvariantFailed } from "./errors";
+
+export function guardLength(withLength: { length?: number }, expectedLength: number) {
+    let actualLength = withLength.length || 0;
+
+    if (actualLength != expectedLength) {
+        throw new ErrInvariantFailed(`wrong length, expected: ${expectedLength}, actual: ${actualLength}`);
+    }
+}
diff --git a/src-wallet/validatorKeys.ts b/src-wallet/validatorKeys.ts
index 8b1ee75b0..c077bdd2d 100644
--- a/src-wallet/validatorKeys.ts
+++ b/src-wallet/validatorKeys.ts
@@ -1,5 +1,5 @@
-import * as errors from "../errors";
-import { guardLength } from "../utils";
+import { guardLength } from "./utils";
+import { ErrInvariantFailed } from "./errors";
 import { parseValidatorKey } from "./pem";
 
 const bls = require('@elrondnetwork/bls-wasm');
@@ -22,7 +22,7 @@ export class BLS {
 
     static guardInitialized() {
         if (!BLS.isInitialized) {
-            throw new errors.ErrInvariantFailed("BLS modules are not initalized. Make sure that 'await BLS.initIfNecessary()' is called correctly.");
+            throw new ErrInvariantFailed("BLS modules are not initalized. Make sure that 'await BLS.initIfNecessary()' is called correctly.");
         }
     }
 }
diff --git a/src-wallet/validatorSigner.ts b/src-wallet/validatorSigner.ts
index 887587f57..501f8892f 100644
--- a/src-wallet/validatorSigner.ts
+++ b/src-wallet/validatorSigner.ts
@@ -1,4 +1,4 @@
-import * as errors from "../errors";
+import { ErrSignerCannotSign } from "./errors";
 import { BLS, ValidatorSecretKey } from "./validatorKeys";
 
 /**
@@ -15,7 +15,7 @@ export class ValidatorSigner {
             let secretKey = ValidatorSecretKey.fromPem(pemText, pemIndex);
             secretKey.sign(signable);
         } catch (err) {
-            throw new errors.ErrSignerCannotSign(err);
+            throw new ErrSignerCannotSign(err);
         }
     }
 }

From dc389ca57557e5ea7d7087fab828c5628657c51b Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 23 Mar 2022 20:41:35 +0200
Subject: [PATCH 050/338] Fix tests upon extraction. Implement dummy test
 doubles.

---
 src-wallet/errors.ts                      |  9 +++
 src-wallet/interface.ts                   |  2 +
 src-wallet/pem.spec.ts                    |  7 +-
 src-wallet/testdata/alice.json            | 22 +++++++
 src-wallet/testdata/alice.pem             |  5 ++
 src-wallet/testdata/bob.json              | 22 +++++++
 src-wallet/testdata/bob.pem               |  5 ++
 src-wallet/testdata/carol.json            | 22 +++++++
 src-wallet/testdata/carol.pem             |  5 ++
 src-wallet/testutils/files.ts             | 28 ++++++++
 src-wallet/testutils/message.ts           | 33 ++++++++++
 src-wallet/testutils/signature.ts         | 13 ++++
 src-wallet/testutils/transaction.ts       | 55 ++++++++++++++++
 src-wallet/testutils/wallets.ts           | 35 ++++++++++
 src-wallet/{address.ts => userAddress.ts} | 24 ++++++-
 src-wallet/userKeys.ts                    |  7 +-
 src-wallet/userSigner.ts                  |  5 +-
 src-wallet/userVerifier.ts                |  5 +-
 src-wallet/userWallet.ts                  |  2 +-
 src-wallet/users.spec.ts                  | 80 +++++++++++------------
 src-wallet/validatorSigner.ts             |  2 +-
 21 files changed, 331 insertions(+), 57 deletions(-)
 create mode 100644 src-wallet/testdata/alice.json
 create mode 100644 src-wallet/testdata/alice.pem
 create mode 100644 src-wallet/testdata/bob.json
 create mode 100644 src-wallet/testdata/bob.pem
 create mode 100644 src-wallet/testdata/carol.json
 create mode 100644 src-wallet/testdata/carol.pem
 create mode 100644 src-wallet/testutils/files.ts
 create mode 100644 src-wallet/testutils/message.ts
 create mode 100644 src-wallet/testutils/signature.ts
 create mode 100644 src-wallet/testutils/transaction.ts
 create mode 100644 src-wallet/testutils/wallets.ts
 rename src-wallet/{address.ts => userAddress.ts} (69%)

diff --git a/src-wallet/errors.ts b/src-wallet/errors.ts
index e27b36bc9..38e092196 100644
--- a/src-wallet/errors.ts
+++ b/src-wallet/errors.ts
@@ -54,3 +54,12 @@ export class ErrSignerCannotSign extends Err {
         super(`Cannot sign`, inner);
     }
 }
+
+/**
+ * Signals a bad user address.
+ */
+ export class ErrBadAddress extends Err {
+    public constructor(value: string, inner?: Error) {
+        super(`Bad address: ${value}`, inner);
+    }
+}
diff --git a/src-wallet/interface.ts b/src-wallet/interface.ts
index a721048c7..b76da53c7 100644
--- a/src-wallet/interface.ts
+++ b/src-wallet/interface.ts
@@ -1,6 +1,7 @@
 export interface IAddress {
     hex(): string;
     bech32(): string;
+    pubkey(): Buffer;
 }
 
 export interface ISignature {
@@ -51,6 +52,7 @@ export interface IVerifiable {
     /**
      * Returns the signature that should be verified
      */
+
     getSignature(): ISignature;
     /**
      * Returns the signable object in its raw form - a sequence of bytes to be verified.
diff --git a/src-wallet/pem.spec.ts b/src-wallet/pem.spec.ts
index 2b6a7e74d..4861b230b 100644
--- a/src-wallet/pem.spec.ts
+++ b/src-wallet/pem.spec.ts
@@ -1,14 +1,17 @@
 import { assert } from "chai";
-import { loadTestWallets, TestWallet } from "../testutils";
 import { parse, parseUserKey, parseValidatorKey } from "./pem";
 import { Buffer } from "buffer";
 import { BLS } from "./validatorKeys";
 import { ErrBadPEM } from "./errors";
+import { loadTestWallet, TestWallet } from "./testutils/wallets";
 
 describe("test PEMs", () => {
     let alice: TestWallet, bob: TestWallet, carol: TestWallet;
+
     before(async function () {
-        ({ alice, bob, carol } = await loadTestWallets());
+        alice = await loadTestWallet("alice");
+        bob = await loadTestWallet("bob");
+        carol = await loadTestWallet("carol");
     });
 
     it("should parseUserKey", () => {
diff --git a/src-wallet/testdata/alice.json b/src-wallet/testdata/alice.json
new file mode 100644
index 000000000..9e83170cf
--- /dev/null
+++ b/src-wallet/testdata/alice.json
@@ -0,0 +1,22 @@
+{
+    "version": 4,
+    "id": "0dc10c02-b59b-4bac-9710-6b2cfa4284ba",
+    "address": "0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1",
+    "bech32": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+    "crypto": {
+        "ciphertext": "4c41ef6fdfd52c39b1585a875eb3c86d30a315642d0e35bb8205b6372c1882f135441099b11ff76345a6f3a930b5665aaf9f7325a32c8ccd60081c797aa2d538",
+        "cipherparams": {
+            "iv": "033182afaa1ebaafcde9ccc68a5eac31"
+        },
+        "cipher": "aes-128-ctr",
+        "kdf": "scrypt",
+        "kdfparams": {
+            "dklen": 32,
+            "salt": "4903bd0e7880baa04fc4f886518ac5c672cdc745a6bd13dcec2b6c12e9bffe8d",
+            "n": 4096,
+            "r": 8,
+            "p": 1
+        },
+        "mac": "5b4a6f14ab74ba7ca23db6847e28447f0e6a7724ba9664cf425df707a84f5a8b"
+    }
+}
diff --git a/src-wallet/testdata/alice.pem b/src-wallet/testdata/alice.pem
new file mode 100644
index 000000000..d27bb68b4
--- /dev/null
+++ b/src-wallet/testdata/alice.pem
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY for erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th-----
+NDEzZjQyNTc1ZjdmMjZmYWQzMzE3YTc3ODc3MTIxMmZkYjgwMjQ1ODUwOTgxZTQ4
+YjU4YTRmMjVlMzQ0ZThmOTAxMzk0NzJlZmY2ODg2NzcxYTk4MmYzMDgzZGE1ZDQy
+MWYyNGMyOTE4MWU2Mzg4ODIyOGRjODFjYTYwZDY5ZTE=
+-----END PRIVATE KEY for erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th-----
\ No newline at end of file
diff --git a/src-wallet/testdata/bob.json b/src-wallet/testdata/bob.json
new file mode 100644
index 000000000..439b394a5
--- /dev/null
+++ b/src-wallet/testdata/bob.json
@@ -0,0 +1,22 @@
+{
+    "version": 4,
+    "id": "85fdc8a7-7119-479d-b7fb-ab4413ed038d",
+    "address": "8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8",
+    "bech32": "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+    "crypto": {
+        "ciphertext": "c2664a31350aaf6a00525560db75c254d0aea65dc466441356c1dd59253cceb9e83eb05730ef3f42a11573c9a0e33dd952d488f00535b35357bb41d127b1eb82",
+        "cipherparams": {
+            "iv": "18378411e31f6c4e99f1435d9ab82831"
+        },
+        "cipher": "aes-128-ctr",
+        "kdf": "scrypt",
+        "kdfparams": {
+            "dklen": 32,
+            "salt": "18304455ac2dbe2a2018bda162bd03ef95b81622e99d8275c34a6d5e6932a68b",
+            "n": 4096,
+            "r": 8,
+            "p": 1
+        },
+        "mac": "23756172195ac483fa29025dc331bc7aa2c139533922a8dc08642eb0a677541f"
+    }
+}
diff --git a/src-wallet/testdata/bob.pem b/src-wallet/testdata/bob.pem
new file mode 100644
index 000000000..00b5bc4ef
--- /dev/null
+++ b/src-wallet/testdata/bob.pem
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY for erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx-----
+YjhjYTZmODIwM2ZiNGI1NDVhOGU4M2M1Mzg0ZGEwMzNjNDE1ZGIxNTViNTNmYjVi
+OGViYTdmZjVhMDM5ZDYzOTgwNDlkNjM5ZTVhNjk4MGQxY2QyMzkyYWJjY2U0MTAy
+OWNkYTc0YTE1NjM1MjNhMjAyZjA5NjQxY2MyNjE4Zjg=
+-----END PRIVATE KEY for erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx-----
\ No newline at end of file
diff --git a/src-wallet/testdata/carol.json b/src-wallet/testdata/carol.json
new file mode 100644
index 000000000..3614a5ba2
--- /dev/null
+++ b/src-wallet/testdata/carol.json
@@ -0,0 +1,22 @@
+{
+    "version": 4,
+    "id": "65894f35-d142-41d2-9335-6ad02e0ed0be",
+    "address": "b2a11555ce521e4944e09ab17549d85b487dcd26c84b5017a39e31a3670889ba",
+    "bech32": "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8",
+    "crypto": {
+        "ciphertext": "bdfb984a1e7c7460f0a289749609730cdc99d7ce85b59305417c2c0f007b2a6aaa7203dd94dbf27315bced39b0b281769fbc70b01e6e57f89ae2f2a9e9100007",
+        "cipherparams": {
+            "iv": "258ed2b4dc506b4dc9d274b0449b0eb0"
+        },
+        "cipher": "aes-128-ctr",
+        "kdf": "scrypt",
+        "kdfparams": {
+            "dklen": 32,
+            "salt": "4f2f5530ce28dc0210962589b908f52714f75c8fb79ff18bdd0024c43c7a220b",
+            "n": 4096,
+            "r": 8,
+            "p": 1
+        },
+        "mac": "f8de52e2627024eaa33f2ee5eadcd3d3815e10dd274ea966dc083d000cc8b258"
+    }
+}
diff --git a/src-wallet/testdata/carol.pem b/src-wallet/testdata/carol.pem
new file mode 100644
index 000000000..5551c9c0e
--- /dev/null
+++ b/src-wallet/testdata/carol.pem
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY for erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8-----
+ZTI1M2E1NzFjYTE1M2RjMmFlZTg0NTgxOWY3NGJjYzk3NzNiMDU4NmVkZWFkMTVh
+OTRjYjcyMzVhNTAyNzQzNmIyYTExNTU1Y2U1MjFlNDk0NGUwOWFiMTc1NDlkODVi
+NDg3ZGNkMjZjODRiNTAxN2EzOWUzMWEzNjcwODg5YmE=
+-----END PRIVATE KEY for erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8-----
\ No newline at end of file
diff --git a/src-wallet/testutils/files.ts b/src-wallet/testutils/files.ts
new file mode 100644
index 000000000..09abdf1fe
--- /dev/null
+++ b/src-wallet/testutils/files.ts
@@ -0,0 +1,28 @@
+import * as fs from "fs";
+import axios from "axios";
+
+export async function readTestFile(filePath: string): Promise<string> {
+    if (isOnBrowserTests()) {
+        return await downloadTextFile(filePath);
+    }
+
+    return await fs.promises.readFile(filePath, { encoding: "utf8" });
+}
+
+export function isOnBrowserTests() {
+    const BROWSER_TESTS_URL = "browser-tests";
+
+    let noWindow = typeof window === "undefined";
+    if (noWindow) {
+        return false;
+    }
+
+    let isOnTests = window.location.href.includes(BROWSER_TESTS_URL);
+    return isOnTests;
+}
+
+export async function downloadTextFile(url: string) {
+    let response = await axios.get(url, { responseType: "text", transformResponse: [] });
+    let text = response.data.toString();
+    return text;
+}
diff --git a/src-wallet/testutils/message.ts b/src-wallet/testutils/message.ts
new file mode 100644
index 000000000..84bd3710c
--- /dev/null
+++ b/src-wallet/testutils/message.ts
@@ -0,0 +1,33 @@
+import { IAddress, ISignable, ISignature, IVerifiable } from "../interface";
+import { TestSignature } from "./signature";
+
+/**
+ * A dummy message used in tests.
+ */
+export class TestMessage implements ISignable, IVerifiable {
+    foo: string = "";
+    bar: string = "";
+    signature: string = "";
+
+    constructor(init?: Partial<TestMessage>) {
+        Object.assign(this, init);
+    }
+
+    serializeForSigning(_signedBy: IAddress): Buffer {
+        let plainObject = {
+            foo: this.foo,
+            bar: this.bar
+        };
+
+        let serialized = JSON.stringify(plainObject);
+        return Buffer.from(serialized);
+    }
+
+    applySignature(signature: ISignature, _signedBy: IAddress): void {
+        this.signature = signature.hex();
+    }
+
+    getSignature(): ISignature {
+        return new TestSignature(this.signature);
+    }
+}
diff --git a/src-wallet/testutils/signature.ts b/src-wallet/testutils/signature.ts
new file mode 100644
index 000000000..0f9db1a23
--- /dev/null
+++ b/src-wallet/testutils/signature.ts
@@ -0,0 +1,13 @@
+import { ISignature } from "../interface";
+
+export class TestSignature implements ISignature {
+    readonly value: string;
+
+    constructor(value: string) {
+        this.value = value;
+    }
+
+    hex(): string {
+        return this.value;
+    }
+}
diff --git a/src-wallet/testutils/transaction.ts b/src-wallet/testutils/transaction.ts
new file mode 100644
index 000000000..4db892e3e
--- /dev/null
+++ b/src-wallet/testutils/transaction.ts
@@ -0,0 +1,55 @@
+import { IAddress, ISignable, ISignature, IVerifiable } from "../interface";
+import { TestSignature } from "./signature";
+
+/**
+ * A dummy transaction used in tests.
+ */
+export class TestTransaction implements ISignable, IVerifiable {
+    nonce: number = 0;
+    value: string = "";
+    receiver: string = "";
+    gasPrice: number = 0;
+    gasLimit: number = 0;
+    data: string = "";
+    chainID: string = "";
+    version: number = 1;
+    options: number = 0;
+
+    sender: string = "";
+    signature: string = "";
+
+    constructor(init?: Partial<TestTransaction>) {
+        Object.assign(this, init);
+    }
+
+    serializeForSigning(signedBy: IAddress): Buffer {
+        let sender = signedBy.bech32();
+        let dataEncoded = this.data ? Buffer.from(this.data).toString("base64") : undefined;
+        let options = this.options ? this.options : undefined;
+
+        let plainObject = {
+            nonce: this.nonce,
+            value: this.value,
+            receiver: this.receiver,
+            sender: sender,
+            gasPrice: this.gasPrice,
+            gasLimit: this.gasLimit,
+            data: dataEncoded,
+            chainID: this.chainID,
+            version: this.version,
+            options: options
+        };
+
+        let serialized = JSON.stringify(plainObject);
+        return Buffer.from(serialized);
+    }
+
+    applySignature(signature: ISignature, signedBy: IAddress): void {
+        this.sender = signedBy.bech32();
+        this.signature = signature.hex();
+    }
+
+    getSignature(): ISignature {
+        return new TestSignature(this.signature);
+    }
+}
diff --git a/src-wallet/testutils/wallets.ts b/src-wallet/testutils/wallets.ts
new file mode 100644
index 000000000..353c777d5
--- /dev/null
+++ b/src-wallet/testutils/wallets.ts
@@ -0,0 +1,35 @@
+import * as path from "path";
+import { UserAddress } from "../userAddress";
+import { UserSecretKey } from "../userKeys";
+import { readTestFile } from "./files";
+
+export const DummyPassword = "password";
+export const DummyMnemonic = "moral volcano peasant pass circle pen over picture flat shop clap goat never lyrics gather prepare woman film husband gravity behind test tiger improve";
+
+export async function loadTestWallet(name: string): Promise<TestWallet> {
+    let testdataPath = path.resolve(__dirname, "..", "testdata");
+    let jsonFilePath = path.resolve(testdataPath, `${name}.json`);
+    let pemFilePath = path.resolve(testdataPath, `${name}.pem`);
+
+    let jsonWallet = JSON.parse(await readTestFile(jsonFilePath));
+    let pemText = await readTestFile(pemFilePath);
+    let pemKey = UserSecretKey.fromPem(pemText);
+    let address = new UserAddress(Buffer.from(jsonWallet.address, "hex"));
+    return new TestWallet(address, pemKey.hex(), jsonWallet, pemText);
+}
+
+export class TestWallet {
+    readonly address: UserAddress;
+    readonly secretKeyHex: string;
+    readonly secretKey: Buffer;
+    readonly keyFileObject: any;
+    readonly pemFileText: any;
+
+    constructor(address: UserAddress, secretKeyHex: string, keyFileObject: any, pemFileText: any) {
+        this.address = address;
+        this.secretKeyHex = secretKeyHex;
+        this.secretKey = Buffer.from(secretKeyHex, "hex");
+        this.keyFileObject = keyFileObject;
+        this.pemFileText = pemFileText;
+    }
+}
diff --git a/src-wallet/address.ts b/src-wallet/userAddress.ts
similarity index 69%
rename from src-wallet/address.ts
rename to src-wallet/userAddress.ts
index a31749c08..f87ae8722 100644
--- a/src-wallet/address.ts
+++ b/src-wallet/userAddress.ts
@@ -1,4 +1,5 @@
 import * as bech32 from "bech32";
+import { ErrBadAddress } from "./errors";
 
 /**
  * The human-readable-part of the bech32 addresses.
@@ -6,15 +7,32 @@ import * as bech32 from "bech32";
 const HRP = "erd";
 
 /**
- * An Elrond Address, as an immutable object.
+ * A user Address, as an immutable object.
  */
-export class Address {
+export class UserAddress {
     private readonly buffer: Buffer;
 
     public constructor(buffer: Buffer) {
         this.buffer = buffer;
     }
 
+    static fromBech32(value: string): UserAddress {
+        let decoded;
+
+        try {
+            decoded = bech32.decode(value);
+        } catch (err: any) {
+            throw new ErrBadAddress(value, err);
+        }
+
+        if (decoded.prefix != HRP) {
+            throw new ErrBadAddress(value);
+        }
+
+        let pubkey = Buffer.from(bech32.fromWords(decoded.words));
+        return new UserAddress(pubkey);
+    }
+
     /**
      * Returns the hex representation of the address (pubkey)
      */
@@ -48,7 +66,7 @@ export class Address {
     /**
      * Compares the address to another address
      */
-    equals(other: Address): boolean {
+    equals(other: UserAddress): boolean {
         return this.buffer.compare(other.buffer) == 0;
     }
 
diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index 8d43d51aa..d18ddf49b 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -1,7 +1,8 @@
 import * as tweetnacl from "tweetnacl";
-import { Address } from "./address";
+import { UserAddress } from "./userAddress";
 import { guardLength } from "./utils";
 import { parseUserKey } from "./pem";
+import { IAddress } from "./interface";
 
 export const USER_SEED_LENGTH = 32;
 export const USER_PUBKEY_LENGTH = 32;
@@ -75,8 +76,8 @@ export class UserPublicKey {
         return this.buffer.toString("hex");
     }
 
-    toAddress(): Address {
-        return new Address(this.buffer);
+    toAddress(): IAddress {
+        return new UserAddress(this.buffer);
     }
 
     valueOf(): Buffer {
diff --git a/src-wallet/userSigner.ts b/src-wallet/userSigner.ts
index 1370ca5e0..c7cdde4e0 100644
--- a/src-wallet/userSigner.ts
+++ b/src-wallet/userSigner.ts
@@ -1,5 +1,4 @@
-import { Address } from "./address";
-import { ISignable, ISigner } from "./interface";
+import { IAddress, ISignable, ISigner } from "./interface";
 import { Signature } from "./signature";
 import { UserSecretKey } from "./userKeys";
 import { UserWallet } from "./userWallet";
@@ -49,7 +48,7 @@ export class UserSigner implements ISigner {
     /**
      * Gets the address of the signer.
      */
-    getAddress(): Address {
+    getAddress(): IAddress {
         return this.secretKey.generatePublicKey().toAddress();
     }
 }
diff --git a/src-wallet/userVerifier.ts b/src-wallet/userVerifier.ts
index 050b53ef9..73e8e4f6b 100644
--- a/src-wallet/userVerifier.ts
+++ b/src-wallet/userVerifier.ts
@@ -1,5 +1,4 @@
-import { IVerifiable, IVerifier } from "./interface";
-import { Address } from "./address";
+import { IAddress, IVerifiable, IVerifier } from "./interface";
 import { UserPublicKey } from "./userKeys";
 
 /**
@@ -12,7 +11,7 @@ export class UserVerifier implements IVerifier {
     this.publicKey = publicKey;
   }
 
-  static fromAddress(address: Address): IVerifier {
+  static fromAddress(address: IAddress): IVerifier {
     let publicKey = new UserPublicKey(address.pubkey());
     return new UserVerifier(publicKey);
   }
diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index 63100a9e2..485e97a3c 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -34,7 +34,7 @@ export class UserWallet {
      * From an encrypted keyfile, given the password, loads the secret key and the public key.
      */
     static decryptSecretKey(keyFileObject: any, password: string): UserSecretKey {
-        const encryptedData = UserWallet.edFromJSON(keyFileObject)
+        const encryptedData = UserWallet.edFromJSON(keyFileObject);
 
         let text = Decryptor.decrypt(encryptedData, password);
         while (text.length < 32) {
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 04ba8239d..ef8c0af00 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -1,26 +1,24 @@
 import { assert } from "chai";
-import { loadMnemonic, loadPassword, loadTestWallets, TestWallet } from "../testutils";
 import { UserSecretKey } from "./userKeys";
 import { Mnemonic } from "./mnemonic";
 import { UserWallet } from "./userWallet";
-import { Randomness } from "../crypto";
-import { Address } from "../address";
+import { Randomness } from "./crypto";
+import { UserAddress } from "./userAddress";
 import { UserSigner } from "./userSigner";
-import { Transaction } from "../transaction";
-import { Nonce } from "../nonce";
-import { Balance } from "../balance";
-import { ChainID, GasLimit, GasPrice } from "../networkParams";
-import { TransactionPayload } from "../transactionPayload";
 import { UserVerifier } from "./userVerifier";
-import { SignableMessage } from "../signableMessage";
 import { ErrInvariantFailed } from "./errors";
+import { TestMessage } from "./testutils/message";
+import { DummyMnemonic, DummyPassword, loadTestWallet, TestWallet } from "./testutils/wallets";
+import { TestTransaction } from "./testutils/transaction";
 
 describe("test user wallets", () => {
     let alice: TestWallet, bob: TestWallet, carol: TestWallet;
-    let password: string;
+    let password: string = DummyPassword;
+
     before(async function () {
-        ({ alice, bob, carol } = await loadTestWallets());
-        password = await loadPassword();
+        alice = await loadTestWallet("alice");
+        bob = await loadTestWallet("bob");
+        carol = await loadTestWallet("carol");
     });
 
     it("should generate mnemonic", () => {
@@ -30,7 +28,7 @@ describe("test user wallets", () => {
     });
 
     it("should derive keys", async () => {
-        let mnemonic = Mnemonic.fromString(await loadMnemonic());
+        let mnemonic = Mnemonic.fromString(DummyMnemonic);
 
         assert.equal(mnemonic.deriveKey(0).hex(), alice.secretKeyHex);
         assert.equal(mnemonic.deriveKey(1).hex(), bob.secretKeyHex);
@@ -124,18 +122,17 @@ describe("test user wallets", () => {
     it("should sign transactions", async () => {
         let signer = new UserSigner(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
         let verifier = new UserVerifier(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf").generatePublicKey());
-        let sender = new Address("erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz");
-        let receiver = new Address("erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r");
-
+        let sender = UserAddress.fromBech32("erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz");
+        
         // With data field
-        let transaction = new Transaction({
-            nonce: new Nonce(0),
-            value: Balance.Zero(),
-            receiver: receiver,
-            gasPrice: new GasPrice(1000000000),
-            gasLimit: new GasLimit(50000),
-            data: new TransactionPayload("foo"),
-            chainID: new ChainID("1")
+        let transaction = new TestTransaction({
+            nonce: 0,
+            value: "0",
+            receiver: "erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r",
+            gasPrice: 1000000000,
+            gasLimit: 50000,
+            data: "foo",
+            chainID: "1"
         });
 
         let serialized = transaction.serializeForSigning(sender).toString();
@@ -145,13 +142,13 @@ describe("test user wallets", () => {
         assert.equal(transaction.getSignature().hex(), "b5fddb8c16fa7f6123cb32edc854f1e760a3eb62c6dc420b5a4c0473c58befd45b621b31a448c5b59e21428f2bc128c80d0ee1caa4f2bf05a12be857ad451b00");
         assert.isTrue(verifier.verify(transaction));
         // Without data field
-        transaction = new Transaction({
-            nonce: new Nonce(8),
-            value: Balance.fromString("10000000000000000000"),
-            receiver: receiver,
-            gasPrice: new GasPrice(1000000000),
-            gasLimit: new GasLimit(50000),
-            chainID: new ChainID("1")
+        transaction = new TestTransaction({
+            nonce: 8,
+            value: "10000000000000000000",
+            receiver: "erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r",
+            gasPrice: 1000000000,
+            gasLimit: 50000,
+            chainID: "1"
         });
 
         serialized = transaction.serializeForSigning(sender).toString();
@@ -164,14 +161,14 @@ describe("test user wallets", () => {
     it("should sign transactions using PEM files", async () => {
         let signer = UserSigner.fromPem(alice.pemFileText);
 
-        let transaction = new Transaction({
-            nonce: new Nonce(0),
-            value: Balance.Zero(),
-            receiver: new Address("erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r"),
-            gasPrice: new GasPrice(1000000000),
-            gasLimit: new GasLimit(50000),
-            data: new TransactionPayload("foo"),
-            chainID: new ChainID("1")
+        let transaction = new TestTransaction({
+            nonce: 0,
+            value: "0",
+            receiver: "erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r",
+            gasPrice: 1000000000,
+            gasLimit: 50000,
+            data: "foo",
+            chainID: "1"
         });
 
         await signer.sign(transaction);
@@ -181,8 +178,9 @@ describe("test user wallets", () => {
     it("signs a general message", function () {
         let signer = new UserSigner(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
         let verifier = new UserVerifier(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf").generatePublicKey());
-        const message = new SignableMessage({
-            message: Buffer.from("hello world")
+        const message = new TestMessage({
+            foo: "hello",
+            bar: "world"
         });
 
         signer.sign(message);
diff --git a/src-wallet/validatorSigner.ts b/src-wallet/validatorSigner.ts
index 501f8892f..92e4e2249 100644
--- a/src-wallet/validatorSigner.ts
+++ b/src-wallet/validatorSigner.ts
@@ -14,7 +14,7 @@ export class ValidatorSigner {
         try {
             let secretKey = ValidatorSecretKey.fromPem(pemText, pemIndex);
             secretKey.sign(signable);
-        } catch (err) {
+        } catch (err: any) {
             throw new ErrSignerCannotSign(err);
         }
     }

From a24eeea480fb034e5d709750959fde0f1b0eee96 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 23 Mar 2022 21:26:49 +0200
Subject: [PATCH 051/338] Fix browser tests.

---
 src-wallet/users.spec.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index ef8c0af00..ee71c03e5 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -49,15 +49,15 @@ describe("test user wallets", () => {
 
         secretKey = new UserSecretKey(Buffer.from(alice.secretKeyHex, "hex"));
         assert.equal(secretKey.generatePublicKey().hex(), alice.address.hex());
-        assert.isTrue(secretKey.generatePublicKey().toAddress().equals(alice.address));
+        assert.deepEqual(secretKey.generatePublicKey().toAddress(), alice.address);
 
         secretKey = new UserSecretKey(Buffer.from(bob.secretKeyHex, "hex"));
         assert.equal(secretKey.generatePublicKey().hex(), bob.address.hex());
-        assert.isTrue(secretKey.generatePublicKey().toAddress().equals(bob.address));
+        assert.deepEqual(secretKey.generatePublicKey().toAddress(), bob.address);
 
         secretKey = new UserSecretKey(Buffer.from(carol.secretKeyHex, "hex"));
         assert.equal(secretKey.generatePublicKey().hex(), carol.address.hex());
-        assert.isTrue(secretKey.generatePublicKey().toAddress().equals(carol.address));
+        assert.deepEqual(secretKey.generatePublicKey().toAddress(), carol.address);
     });
 
     it("should throw error when invalid input", () => {

From cdc7b74a629189b3cf0aca832502c81b8a2c837e Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 23 Mar 2022 21:43:59 +0200
Subject: [PATCH 052/338] Fix after self-review.

---
 src-wallet/errors.ts                |  4 ++--
 src-wallet/interface.ts             |  2 +-
 src-wallet/testutils/message.ts     |  4 ++--
 src-wallet/testutils/signature.ts   | 13 -------------
 src-wallet/testutils/transaction.ts |  4 ++--
 src-wallet/userAddress.ts           | 14 --------------
 6 files changed, 7 insertions(+), 34 deletions(-)
 delete mode 100644 src-wallet/testutils/signature.ts

diff --git a/src-wallet/errors.ts b/src-wallet/errors.ts
index 38e092196..68b49a8dd 100644
--- a/src-wallet/errors.ts
+++ b/src-wallet/errors.ts
@@ -1,5 +1,5 @@
 /**
- * The base class for `erdjs` exceptions (errors).
+ * The base class for exceptions (errors).
  */
 export class Err extends Error {
     inner: Error | undefined = undefined;
@@ -56,7 +56,7 @@ export class ErrSignerCannotSign extends Err {
 }
 
 /**
- * Signals a bad user address.
+ * Signals a bad address.
  */
  export class ErrBadAddress extends Err {
     public constructor(value: string, inner?: Error) {
diff --git a/src-wallet/interface.ts b/src-wallet/interface.ts
index b76da53c7..04c4fdee3 100644
--- a/src-wallet/interface.ts
+++ b/src-wallet/interface.ts
@@ -52,8 +52,8 @@ export interface IVerifiable {
     /**
      * Returns the signature that should be verified
      */
-
     getSignature(): ISignature;
+
     /**
      * Returns the signable object in its raw form - a sequence of bytes to be verified.
      */
diff --git a/src-wallet/testutils/message.ts b/src-wallet/testutils/message.ts
index 84bd3710c..1fe2f542b 100644
--- a/src-wallet/testutils/message.ts
+++ b/src-wallet/testutils/message.ts
@@ -1,5 +1,5 @@
 import { IAddress, ISignable, ISignature, IVerifiable } from "../interface";
-import { TestSignature } from "./signature";
+import { Signature } from "../signature";
 
 /**
  * A dummy message used in tests.
@@ -28,6 +28,6 @@ export class TestMessage implements ISignable, IVerifiable {
     }
 
     getSignature(): ISignature {
-        return new TestSignature(this.signature);
+        return new Signature(Buffer.from(this.signature, "hex"));
     }
 }
diff --git a/src-wallet/testutils/signature.ts b/src-wallet/testutils/signature.ts
deleted file mode 100644
index 0f9db1a23..000000000
--- a/src-wallet/testutils/signature.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { ISignature } from "../interface";
-
-export class TestSignature implements ISignature {
-    readonly value: string;
-
-    constructor(value: string) {
-        this.value = value;
-    }
-
-    hex(): string {
-        return this.value;
-    }
-}
diff --git a/src-wallet/testutils/transaction.ts b/src-wallet/testutils/transaction.ts
index 4db892e3e..bd0d04c06 100644
--- a/src-wallet/testutils/transaction.ts
+++ b/src-wallet/testutils/transaction.ts
@@ -1,5 +1,5 @@
 import { IAddress, ISignable, ISignature, IVerifiable } from "../interface";
-import { TestSignature } from "./signature";
+import { Signature } from "../signature";
 
 /**
  * A dummy transaction used in tests.
@@ -50,6 +50,6 @@ export class TestTransaction implements ISignable, IVerifiable {
     }
 
     getSignature(): ISignature {
-        return new TestSignature(this.signature);
+        return new Signature(Buffer.from(this.signature, "hex"));
     }
 }
diff --git a/src-wallet/userAddress.ts b/src-wallet/userAddress.ts
index f87ae8722..3ed7efe8f 100644
--- a/src-wallet/userAddress.ts
+++ b/src-wallet/userAddress.ts
@@ -56,20 +56,6 @@ export class UserAddress {
         return this.buffer;
     }
 
-    /**
-     * Returns whether the address is empty.
-     */
-    isEmpty() {
-        return !this.buffer;
-    }
-
-    /**
-     * Compares the address to another address
-     */
-    equals(other: UserAddress): boolean {
-        return this.buffer.compare(other.buffer) == 0;
-    }
-
     /**
      * Returns the bech32 representation of the address
      */

From 336a46c207b193bae0da01e5da07987ea318f837 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Fri, 25 Mar 2022 10:34:23 +0200
Subject: [PATCH 053/338] Fix after review.

---
 src-wallet/{utils.ts => assertions.ts} | 0
 src-wallet/crypto/decryptor.ts         | 4 ++--
 src-wallet/errors.ts                   | 9 ---------
 src-wallet/userKeys.ts                 | 2 +-
 src-wallet/validatorKeys.ts            | 2 +-
 5 files changed, 4 insertions(+), 13 deletions(-)
 rename src-wallet/{utils.ts => assertions.ts} (100%)

diff --git a/src-wallet/utils.ts b/src-wallet/assertions.ts
similarity index 100%
rename from src-wallet/utils.ts
rename to src-wallet/assertions.ts
diff --git a/src-wallet/crypto/decryptor.ts b/src-wallet/crypto/decryptor.ts
index 6a859d1d3..7d6dbac90 100644
--- a/src-wallet/crypto/decryptor.ts
+++ b/src-wallet/crypto/decryptor.ts
@@ -1,7 +1,7 @@
 import crypto from "crypto";
 import { EncryptedData } from "./encryptedData";
 import { DigestAlgorithm } from "./constants";
-import { ErrWrongPassword } from "../errors";
+import { Err } from "../errors";
 
 export class Decryptor {
   public static decrypt(data: EncryptedData, password: string): Buffer {
@@ -17,7 +17,7 @@ export class Decryptor {
     const actualMAC = data.mac;
 
     if (computedMAC.toString("hex") !== actualMAC) {
-      throw new ErrWrongPassword("MAC mismatch");
+      throw new Err("MAC mismatch, possibly wrong password");
     }
 
     const decipher = crypto.createDecipheriv(data.cipher, derivedKeyFirstHalf, iv);
diff --git a/src-wallet/errors.ts b/src-wallet/errors.ts
index 68b49a8dd..19f1ac852 100644
--- a/src-wallet/errors.ts
+++ b/src-wallet/errors.ts
@@ -28,15 +28,6 @@ export class ErrWrongMnemonic extends Err {
     }
 }
 
-/**
- * Signals a wrong password.
- */
- export class ErrWrongPassword extends Err {
-    public constructor(message: string) {
-        super(`Possibly wrong password: ${message}`);
-    }
-}
-
 /**
  * Signals a bad PEM file.
  */
diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index d18ddf49b..eab6b92f2 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -1,6 +1,6 @@
 import * as tweetnacl from "tweetnacl";
 import { UserAddress } from "./userAddress";
-import { guardLength } from "./utils";
+import { guardLength } from "./assertions";
 import { parseUserKey } from "./pem";
 import { IAddress } from "./interface";
 
diff --git a/src-wallet/validatorKeys.ts b/src-wallet/validatorKeys.ts
index c077bdd2d..441c4ac07 100644
--- a/src-wallet/validatorKeys.ts
+++ b/src-wallet/validatorKeys.ts
@@ -1,4 +1,4 @@
-import { guardLength } from "./utils";
+import { guardLength } from "./assertions";
 import { ErrInvariantFailed } from "./errors";
 import { parseValidatorKey } from "./pem";
 

From 9b645b648aa296f5c1c91ef9ff83b3b9aafc2b42 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Tue, 5 Apr 2022 18:05:28 +0300
Subject: [PATCH 054/338] Preparatory refactoring.

---
 .../networkProvider/contractResults.ts        | 11 ++-
 .../networkProvider/interface.ts              | 47 ++++++++++++-
 .../networkProvider/receipt.ts                | 26 +++++++
 .../transactionCompletionStrategy.ts          | 68 +++++++++++++++++++
 .../networkProvider/transactionEvents.ts      | 58 ++++++++++++++++
 .../networkProvider/transactionLogs.ts        | 47 +++++++++++++
 .../networkProvider/transactions.ts           | 40 +++++++++--
 7 files changed, 288 insertions(+), 9 deletions(-)
 create mode 100644 src-network-providers/networkProvider/receipt.ts
 create mode 100644 src-network-providers/networkProvider/transactionCompletionStrategy.ts
 create mode 100644 src-network-providers/networkProvider/transactionEvents.ts
 create mode 100644 src-network-providers/networkProvider/transactionLogs.ts

diff --git a/src-network-providers/networkProvider/contractResults.ts b/src-network-providers/networkProvider/contractResults.ts
index 8cebbb3e0..0defc915d 100644
--- a/src-network-providers/networkProvider/contractResults.ts
+++ b/src-network-providers/networkProvider/contractResults.ts
@@ -2,11 +2,12 @@ import { BigNumber } from "bignumber.js";
 import { Address } from "../address";
 import { Balance } from "../balance";
 import { Hash } from "../hash";
-import { IContractQueryResponse, IContractResultItem, IContractResults } from "./interface";
+import { IContractQueryResponse, IContractResultItem, IContractResults, ITransactionLogs } from "./interface";
 import { GasLimit, GasPrice } from "../networkParams";
 import { Nonce } from "../nonce";
 import { MaxUint64, ReturnCode } from "../smartcontracts";
 import { TransactionHash } from "../transaction";
+import { TransactionLogs } from "./transactionLogs";
 
 export class ContractResults implements IContractResults {
     readonly items: IContractResultItem[];
@@ -47,6 +48,12 @@ export class ContractResultItem implements IContractResultItem {
     gasPrice: GasPrice = new GasPrice(0);
     callType: number = 0;
     returnMessage: string = "";
+    logs: ITransactionLogs = TransactionLogs.empty();
+
+    constructor(init?: Partial<IContractResultItem>) {
+        Object.assign(this, init);
+    }
+
 
     static fromProxyHttpResponse(response: any): ContractResultItem {
         let item = ContractResultItem.fromHttpResponse(response);
@@ -78,6 +85,8 @@ export class ContractResultItem implements IContractResultItem {
         item.callType = response.callType;
         item.returnMessage = response.returnMessage;
 
+        item.logs = TransactionLogs.fromHttpResponse(response.logs || {});
+
         return item;
     }
 }
diff --git a/src-network-providers/networkProvider/interface.ts b/src-network-providers/networkProvider/interface.ts
index 4f21dbe49..8a240de23 100644
--- a/src-network-providers/networkProvider/interface.ts
+++ b/src-network-providers/networkProvider/interface.ts
@@ -12,7 +12,6 @@ import { Signature } from "../signature";
 import { Query, ReturnCode } from "../smartcontracts";
 import { Stats } from "../stats";
 import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
-import { TransactionLogs } from "../transactionLogs";
 import { TransactionPayload } from "../transactionPayload";
 
 /**
@@ -168,6 +167,7 @@ export interface IDefinitionOfTokenCollectionOnNetwork {
 
 export interface ITransactionOnNetwork {
     hash: TransactionHash;
+    type: string;
     nonce: Nonce;
     round: number;
     epoch: number;
@@ -181,10 +181,25 @@ export interface ITransactionOnNetwork {
     status: TransactionStatus;
     timestamp: number;
     blockNonce: Nonce;
+    // Not available on API.
     hyperblockNonce: Nonce;
+    // Not available on API.
     hyperblockHash: Hash;
-    logs: TransactionLogs;
+    // Not available on Gateway.
+    pendingResults: boolean;
+    receipt: ITransactionReceipt;
     contractResults: IContractResults;
+    logs: ITransactionLogs;
+
+    isCompleted(): boolean;
+    getAllEvents(): ITransactionEvent[];
+}
+
+export interface ITransactionReceipt {
+    value: Balance;
+    sender: Address;
+    data: string;
+    hash: TransactionHash;
 }
 
 export interface IContractResults {
@@ -198,12 +213,38 @@ export interface IContractResultItem {
     receiver: Address;
     sender: Address;
     data: string;
+    returnMessage: string;
     previousHash: Hash;
     originalHash: Hash;
     gasLimit: GasLimit;
     gasPrice: GasPrice;
     callType: number;
-    returnMessage: string;
+    logs: ITransactionLogs;
+}
+
+export interface ITransactionLogs {
+    address: Address;
+    events: ITransactionEvent[];
+
+    findSingleOrNoneEvent(identifier: string, predicate?: (event: ITransactionEvent) => boolean): ITransactionEvent | undefined;
+    findFirstOrNoneEvent(identifier: string, predicate?: (event: ITransactionEvent) => boolean): ITransactionEvent | undefined;
+    findEvents(identifier: string, predicate?: (event: ITransactionEvent) => boolean): ITransactionEvent[];
+}
+
+export interface ITransactionEvent {
+    readonly address: Address;
+    readonly identifier: string;
+    readonly topics: ITransactionEventTopic[];
+    readonly data: string;
+
+    findFirstOrNoneTopic(predicate: (topic: ITransactionEventTopic) => boolean): ITransactionEventTopic | undefined;
+    getLastTopic(): ITransactionEventTopic;
+}
+
+export interface ITransactionEventTopic {
+    toString(): string;
+    hex(): string;
+    valueOf(): Buffer;
 }
 
 export interface IContractQueryResponse {
diff --git a/src-network-providers/networkProvider/receipt.ts b/src-network-providers/networkProvider/receipt.ts
new file mode 100644
index 000000000..64b45c96b
--- /dev/null
+++ b/src-network-providers/networkProvider/receipt.ts
@@ -0,0 +1,26 @@
+import { Address } from "../address";
+import { Balance } from "../balance";
+import { TransactionHash } from "../transaction";
+
+export class Receipt {
+    value: Balance = Balance.Zero();
+    sender: Address = new Address();
+    data: string = "";
+    hash: TransactionHash = TransactionHash.empty();
+
+    static fromHttpResponse(response: {
+        value: string,
+        sender: string,
+        data: string,
+        txHash: string
+    }): Receipt {
+        let receipt = new Receipt();
+
+        receipt.value = Balance.fromString(response.value);
+        receipt.sender = new Address(response.sender);
+        receipt.data = response.data;
+        receipt.hash = new TransactionHash(response.txHash);
+
+        return receipt;
+    }
+}
diff --git a/src-network-providers/networkProvider/transactionCompletionStrategy.ts b/src-network-providers/networkProvider/transactionCompletionStrategy.ts
new file mode 100644
index 000000000..2a50bdd1a
--- /dev/null
+++ b/src-network-providers/networkProvider/transactionCompletionStrategy.ts
@@ -0,0 +1,68 @@
+import { ITransactionLogs } from "./interface";
+import { Nonce } from "../nonce";
+import { TransactionStatus } from "../transaction";
+import { TransactionPayload } from "../transactionPayload";
+import { isPaddedHex } from "../utils.codec";
+
+/**
+ * Internal interface: a transaction, as seen from the perspective of a {@link TransactionCompletionStrategy}.
+ */
+interface ITransactionOnNetwork {
+    logs: ITransactionLogs;
+    status: TransactionStatus;
+    hyperblockNonce: Nonce;
+    data: TransactionPayload;
+}
+
+const WellKnownCompletionEvents = ["completedTxEvent", "SCDeploy", "signalError"];
+
+/**
+ * Algorithm for detecting transaction completion.
+ * Based on some heuristics (a bit imprecise therefore, at this moment).
+ */
+export class TransactionCompletionStrategy {
+    isCompleted(transaction: ITransactionOnNetwork): boolean {
+        if (transaction.status.isPending()) {
+            // Certainly not completed.
+            return false;
+        }
+
+        // Handle gateway mechanics:
+        for (const completionEvent of WellKnownCompletionEvents) {
+            if (transaction.logs.findFirstOrNoneEvent(completionEvent)) {
+                // Certainly completed.
+                console.debug("TransactionCompletionStrategy.isCompleted(), found event:", completionEvent);
+                return true;
+            }
+        }
+
+        if (this.isCertainlyMoveBalance(transaction.data.toString())) {
+            return transaction.status.isExecuted();
+        }
+
+        let hyperblockNonce = transaction.hyperblockNonce.valueOf();
+
+        // Imprecise condition, uncertain completion (usually sufficient, though).
+        // This is WRONG when (at least): timeOf(block with execution at destination is notarized) < timeOf(the "completedTxEvent" occurs).
+        if (hyperblockNonce > 0) {
+            console.debug("TransactionCompletionStrategy.isCompleted(), found hyperblock nonce:", hyperblockNonce);
+            return true;
+        }
+
+        return false;
+    }
+
+    private isCertainlyMoveBalance(transactionData: string): boolean {
+        let parts = transactionData.split("@");
+        let prefix = parts[0];
+        let otherParts = parts.slice(1);
+        let emptyPrefix = !prefix;
+        let somePartsAreNotValidArguments = !otherParts.every(this.looksLikeValidArgument);
+        
+        return emptyPrefix || somePartsAreNotValidArguments;
+    }
+
+    private looksLikeValidArgument(arg: string) {
+        return isPaddedHex(arg);
+    }
+}
diff --git a/src-network-providers/networkProvider/transactionEvents.ts b/src-network-providers/networkProvider/transactionEvents.ts
new file mode 100644
index 000000000..5fb723ac0
--- /dev/null
+++ b/src-network-providers/networkProvider/transactionEvents.ts
@@ -0,0 +1,58 @@
+import { Address } from "../address";
+import { ITransactionEventTopic } from "./interface";
+
+export class TransactionEvent {
+    readonly address: Address;
+    readonly identifier: string;
+    readonly topics: ITransactionEventTopic[];
+    readonly data: string;
+
+    constructor(address: Address, identifier: string, topics: ITransactionEventTopic[], data: string) {
+        this.address = address;
+        this.identifier = identifier;
+        this.topics = topics;
+        this.data = data;
+    }
+
+    static fromHttpResponse(responsePart: {
+        address: string,
+        identifier: string,
+        topics: string[],
+        data: string
+    }): TransactionEvent {
+        let topics = (responsePart.topics || []).map(topic => new TransactionEventTopic(topic));
+        let address = new Address(responsePart.address);
+        let identifier = responsePart.identifier || "";
+        let data = Buffer.from(responsePart.data || "", "base64").toString();
+        let event = new TransactionEvent(address, identifier, topics, data);
+        return event;
+    }
+
+    findFirstOrNoneTopic(predicate: (topic: ITransactionEventTopic) => boolean): ITransactionEventTopic | undefined {
+        return this.topics.filter(topic => predicate(topic))[0];
+    }
+
+    getLastTopic(): ITransactionEventTopic {
+        return this.topics[this.topics.length - 1];
+    }
+}
+
+export class TransactionEventTopic {
+    private readonly raw: Buffer;
+
+    constructor(topic: string) {
+        this.raw = Buffer.from(topic || "", "base64");
+    }
+
+    toString(): string {
+        return this.raw.toString("utf8");
+    }
+
+    hex(): string {
+        return this.raw.toString("hex");
+    }
+
+    valueOf(): Buffer {
+        return this.raw;
+    }
+}
diff --git a/src-network-providers/networkProvider/transactionLogs.ts b/src-network-providers/networkProvider/transactionLogs.ts
new file mode 100644
index 000000000..21be82b4d
--- /dev/null
+++ b/src-network-providers/networkProvider/transactionLogs.ts
@@ -0,0 +1,47 @@
+import { Address } from "../address";
+import { ErrUnexpectedCondition } from "../errors";
+import { TransactionEvent } from "./transactionEvents";
+
+export class TransactionLogs {
+    readonly address: Address;
+    readonly events: TransactionEvent[];
+
+    constructor(address: Address, events: TransactionEvent[]) {
+        this.address = address;
+        this.events = events;
+    }
+
+    static empty(): TransactionLogs {
+        return new TransactionLogs(new Address(), []);
+    }
+
+    static fromHttpResponse(logs: any): TransactionLogs {
+        let address = new Address(logs.address);
+        let events = (logs.events || []).map((event: any) => TransactionEvent.fromHttpResponse(event));
+        return new TransactionLogs(address, events);
+    }
+
+    findSingleOrNoneEvent(identifier: string, predicate?: (event: TransactionEvent) => boolean): TransactionEvent | undefined {
+        let events = this.findEvents(identifier, predicate);
+
+        if (events.length > 1) {
+            throw new ErrUnexpectedCondition(`more than one event of type ${identifier}`);
+        }
+
+        return events[0];
+    }
+
+    findFirstOrNoneEvent(identifier: string, predicate?: (event: TransactionEvent) => boolean): TransactionEvent | undefined {
+        return this.findEvents(identifier, predicate)[0];
+    }
+
+    findEvents(identifier: string, predicate?: (event: TransactionEvent) => boolean): TransactionEvent[] {
+        let events = this.events.filter(event => event.identifier == identifier);
+
+        if (predicate) {
+            events = events.filter(event => predicate(event));
+        }
+
+        return events;
+    }
+}
diff --git a/src-network-providers/networkProvider/transactions.ts b/src-network-providers/networkProvider/transactions.ts
index 6fd3c906c..94bdd0606 100644
--- a/src-network-providers/networkProvider/transactions.ts
+++ b/src-network-providers/networkProvider/transactions.ts
@@ -1,17 +1,20 @@
 import { Address } from "../address";
 import { Balance } from "../balance";
 import { Hash } from "../hash";
-import { IContractResults, ITransactionOnNetwork } from "./interface";
+import { IContractResults, ITransactionEvent, ITransactionLogs, ITransactionOnNetwork, ITransactionReceipt } from "./interface";
 import { GasLimit, GasPrice } from "../networkParams";
 import { Nonce } from "../nonce";
 import { Signature } from "../signature";
 import { TransactionHash, TransactionStatus } from "../transaction";
-import { TransactionLogs } from "../transactionLogs";
 import { TransactionPayload } from "../transactionPayload";
 import { ContractResults } from "./contractResults";
+import { TransactionCompletionStrategy } from "./transactionCompletionStrategy";
+import { TransactionLogs } from "./transactionLogs";
+import { Receipt } from "./receipt";
 
  export class TransactionOnNetwork implements ITransactionOnNetwork {
     hash: TransactionHash = new TransactionHash("");
+    type: string = "";
     nonce: Nonce = new Nonce(0);
     round: number = 0;
     epoch: number = 0;
@@ -28,21 +31,29 @@ import { ContractResults } from "./contractResults";
     blockNonce: Nonce = new Nonce(0);
     hyperblockNonce: Nonce = new Nonce(0);
     hyperblockHash: Hash = Hash.empty();
+    pendingResults: boolean = false;
 
-    logs: TransactionLogs = TransactionLogs.empty();
+    receipt: ITransactionReceipt = new Receipt();
     contractResults: IContractResults = ContractResults.empty();
+    logs: ITransactionLogs = TransactionLogs.empty();
+
+    constructor(init?: Partial<TransactionOnNetwork>) {
+        Object.assign(this, init);
+    }
 
     static fromProxyHttpResponse(txHash: TransactionHash, response: any): TransactionOnNetwork {
         let result = TransactionOnNetwork.fromHttpResponse(txHash, response);
         result.contractResults = ContractResults.fromProxyHttpResponse(response.smartContractResults || []);
-        // TODO: uniformize transaction status
+        // TODO: uniformize transaction status.
+        // TODO: Use specific completion detection strategy.
         return result;
     }
 
     static fromApiHttpResponse(txHash: TransactionHash, response: any): TransactionOnNetwork {
         let result = TransactionOnNetwork.fromHttpResponse(txHash, response);
         result.contractResults = ContractResults.fromApiHttpResponse(response.results || []);
-        // TODO: uniformize transaction status
+        // TODO: uniformize transaction status.
+        // TODO: Use specific completion detection strategy.
         return result;
     }
 
@@ -50,6 +61,7 @@ import { ContractResults } from "./contractResults";
         let result = new TransactionOnNetwork();
 
         result.hash = txHash;
+        result.type = response.type || "";
         result.nonce = new Nonce(response.nonce || 0);
         result.round = response.round;
         result.epoch = response.epoch || 0;
@@ -65,7 +77,9 @@ import { ContractResults } from "./contractResults";
         result.blockNonce = new Nonce(response.blockNonce || 0);
         result.hyperblockNonce = new Nonce(response.hyperblockNonce || 0);
         result.hyperblockHash = new Hash(response.hyperblockHash);
+        result.pendingResults = response.pendingResults || false;
 
+        result.receipt = Receipt.fromHttpResponse(response.receipt || {});
         result.logs = TransactionLogs.fromHttpResponse(response.logs || {});
 
         return result;
@@ -74,5 +88,21 @@ import { ContractResults } from "./contractResults";
     getDateTime(): Date {
         return new Date(this.timestamp * 1000);
     }
+
+    isCompleted(): boolean {
+        // TODO: When using separate constructors of TransactionOnNetwork (for API response vs. for Gateway response, see package "networkProvider"),
+        // we will be able to use different transaction completion strategies.
+        return new TransactionCompletionStrategy().isCompleted(this);
+    }
+
+    getAllEvents(): ITransactionEvent[] {
+        let result = [...this.logs.events];
+
+        for (const resultItem of this.contractResults.items) {
+            result.push(...resultItem.logs.events);
+        }
+
+        return result;
+    }
 }
 

From 49f2cdc016c21402d6f93c78942b97ca199bb44e Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Tue, 5 Apr 2022 18:11:39 +0300
Subject: [PATCH 055/338] Fix circular dependency.

---
 src-network-providers/networkProvider/contractResults.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src-network-providers/networkProvider/contractResults.ts b/src-network-providers/networkProvider/contractResults.ts
index 0defc915d..e1a1acda3 100644
--- a/src-network-providers/networkProvider/contractResults.ts
+++ b/src-network-providers/networkProvider/contractResults.ts
@@ -5,9 +5,10 @@ import { Hash } from "../hash";
 import { IContractQueryResponse, IContractResultItem, IContractResults, ITransactionLogs } from "./interface";
 import { GasLimit, GasPrice } from "../networkParams";
 import { Nonce } from "../nonce";
-import { MaxUint64, ReturnCode } from "../smartcontracts";
 import { TransactionHash } from "../transaction";
 import { TransactionLogs } from "./transactionLogs";
+import { ReturnCode } from "../smartcontracts/returnCode";
+import { MaxUint64 } from "../smartcontracts/query";
 
 export class ContractResults implements IContractResults {
     readonly items: IContractResultItem[];

From 6da4cfcad1b5c0c9f75e7460b78f51d28cb13fbe Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Tue, 5 Apr 2022 20:12:17 +0300
Subject: [PATCH 056/338] Move interfaces to where they are used.

---
 .../networkProvider/apiNetworkProvider.ts     |  4 +-
 .../networkProvider/contractResults.ts        | 17 ++--
 .../networkProvider/interface.ts              | 91 +------------------
 .../networkProvider/providers.dev.net.spec.ts |  5 +-
 .../networkProvider/proxyNetworkProvider.ts   |  4 +-
 .../transactionCompletionStrategy.ts          |  4 +-
 .../networkProvider/transactionEvents.ts      |  9 +-
 .../{receipt.ts => transactionReceipt.ts}     |  6 +-
 .../networkProvider/transactions.ts           | 16 ++--
 9 files changed, 35 insertions(+), 121 deletions(-)
 rename src-network-providers/networkProvider/{receipt.ts => transactionReceipt.ts} (85%)

diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
index 3d809404a..6e4e12fbc 100644
--- a/src-network-providers/networkProvider/apiNetworkProvider.ts
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -3,7 +3,7 @@ import { AccountOnNetwork } from "../account";
 import { Address } from "../address";
 import { defaultConfig } from "../constants";
 import { ErrNetworkProvider } from "../errors";
-import { IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, ITransactionOnNetwork, Pagination } from "./interface";
+import { IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, Pagination } from "./interface";
 import { Logger } from "../logger";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
@@ -92,7 +92,7 @@ export class ApiNetworkProvider implements INetworkProvider {
         return tokenData;
     }
 
-    async getTransaction(txHash: TransactionHash): Promise<ITransactionOnNetwork> {
+    async getTransaction(txHash: TransactionHash): Promise<TransactionOnNetwork> {
         let response = await this.doGetGeneric(`transactions/${txHash.toString()}`);
         let transaction = TransactionOnNetwork.fromApiHttpResponse(txHash, response);
         return transaction;
diff --git a/src-network-providers/networkProvider/contractResults.ts b/src-network-providers/networkProvider/contractResults.ts
index e1a1acda3..57c625e40 100644
--- a/src-network-providers/networkProvider/contractResults.ts
+++ b/src-network-providers/networkProvider/contractResults.ts
@@ -2,7 +2,7 @@ import { BigNumber } from "bignumber.js";
 import { Address } from "../address";
 import { Balance } from "../balance";
 import { Hash } from "../hash";
-import { IContractQueryResponse, IContractResultItem, IContractResults, ITransactionLogs } from "./interface";
+import { IContractQueryResponse } from "./interface";
 import { GasLimit, GasPrice } from "../networkParams";
 import { Nonce } from "../nonce";
 import { TransactionHash } from "../transaction";
@@ -10,13 +10,13 @@ import { TransactionLogs } from "./transactionLogs";
 import { ReturnCode } from "../smartcontracts/returnCode";
 import { MaxUint64 } from "../smartcontracts/query";
 
-export class ContractResults implements IContractResults {
-    readonly items: IContractResultItem[];
+export class ContractResults {
+    readonly items: ContractResultItem[];
 
-    constructor(items: IContractResultItem[]) {
+    constructor(items: ContractResultItem[]) {
         this.items = items;
 
-        this.items.sort(function (a: IContractResultItem, b: IContractResultItem) {
+        this.items.sort(function (a: ContractResultItem, b: ContractResultItem) {
             return a.nonce.valueOf() - b.nonce.valueOf();
         });
     }
@@ -36,7 +36,7 @@ export class ContractResults implements IContractResults {
     }
 }
 
-export class ContractResultItem implements IContractResultItem {
+export class ContractResultItem {
     hash: Hash = Hash.empty();
     nonce: Nonce = new Nonce(0);
     value: Balance = Balance.Zero();
@@ -49,13 +49,12 @@ export class ContractResultItem implements IContractResultItem {
     gasPrice: GasPrice = new GasPrice(0);
     callType: number = 0;
     returnMessage: string = "";
-    logs: ITransactionLogs = TransactionLogs.empty();
+    logs: TransactionLogs = TransactionLogs.empty();
 
-    constructor(init?: Partial<IContractResultItem>) {
+    constructor(init?: Partial<ContractResultItem>) {
         Object.assign(this, init);
     }
 
-
     static fromProxyHttpResponse(response: any): ContractResultItem {
         let item = ContractResultItem.fromHttpResponse(response);
         return item;
diff --git a/src-network-providers/networkProvider/interface.ts b/src-network-providers/networkProvider/interface.ts
index 8a240de23..6d2e0bf62 100644
--- a/src-network-providers/networkProvider/interface.ts
+++ b/src-network-providers/networkProvider/interface.ts
@@ -1,18 +1,15 @@
 import { BigNumber } from "bignumber.js";
 import { AccountOnNetwork } from "../account";
 import { Address } from "../address";
-import { Balance } from "../balance";
-import { Hash } from "../hash";
 import { NetworkConfig } from "../networkConfig";
-import { GasLimit, GasPrice } from "../networkParams";
+import { GasLimit } from "../networkParams";
 import { NetworkStake } from "../networkStake";
 import { NetworkStatus } from "../networkStatus";
 import { Nonce } from "../nonce";
-import { Signature } from "../signature";
 import { Query, ReturnCode } from "../smartcontracts";
 import { Stats } from "../stats";
 import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
-import { TransactionPayload } from "../transactionPayload";
+import { TransactionOnNetwork } from "./transactions";
 
 /**
  * An interface that defines the endpoints of an HTTP API Provider.
@@ -66,7 +63,7 @@ export interface INetworkProvider {
     /**
      * Fetches the state of a {@link Transaction}.
      */
-    getTransaction(txHash: TransactionHash): Promise<ITransactionOnNetwork>;
+    getTransaction(txHash: TransactionHash): Promise<TransactionOnNetwork>;
 
     /**
      * Queries the status of a {@link Transaction}.
@@ -165,88 +162,6 @@ export interface IDefinitionOfTokenCollectionOnNetwork {
     // TODO: add "assets", "roles"
 }
 
-export interface ITransactionOnNetwork {
-    hash: TransactionHash;
-    type: string;
-    nonce: Nonce;
-    round: number;
-    epoch: number;
-    value: Balance;
-    receiver: Address;
-    sender: Address;
-    gasPrice: GasPrice;
-    gasLimit: GasLimit;
-    data: TransactionPayload;
-    signature: Signature;
-    status: TransactionStatus;
-    timestamp: number;
-    blockNonce: Nonce;
-    // Not available on API.
-    hyperblockNonce: Nonce;
-    // Not available on API.
-    hyperblockHash: Hash;
-    // Not available on Gateway.
-    pendingResults: boolean;
-    receipt: ITransactionReceipt;
-    contractResults: IContractResults;
-    logs: ITransactionLogs;
-
-    isCompleted(): boolean;
-    getAllEvents(): ITransactionEvent[];
-}
-
-export interface ITransactionReceipt {
-    value: Balance;
-    sender: Address;
-    data: string;
-    hash: TransactionHash;
-}
-
-export interface IContractResults {
-    items: IContractResultItem[];
-}
-
-export interface IContractResultItem {
-    hash: Hash;
-    nonce: Nonce;
-    value: Balance;
-    receiver: Address;
-    sender: Address;
-    data: string;
-    returnMessage: string;
-    previousHash: Hash;
-    originalHash: Hash;
-    gasLimit: GasLimit;
-    gasPrice: GasPrice;
-    callType: number;
-    logs: ITransactionLogs;
-}
-
-export interface ITransactionLogs {
-    address: Address;
-    events: ITransactionEvent[];
-
-    findSingleOrNoneEvent(identifier: string, predicate?: (event: ITransactionEvent) => boolean): ITransactionEvent | undefined;
-    findFirstOrNoneEvent(identifier: string, predicate?: (event: ITransactionEvent) => boolean): ITransactionEvent | undefined;
-    findEvents(identifier: string, predicate?: (event: ITransactionEvent) => boolean): ITransactionEvent[];
-}
-
-export interface ITransactionEvent {
-    readonly address: Address;
-    readonly identifier: string;
-    readonly topics: ITransactionEventTopic[];
-    readonly data: string;
-
-    findFirstOrNoneTopic(predicate: (topic: ITransactionEventTopic) => boolean): ITransactionEventTopic | undefined;
-    getLastTopic(): ITransactionEventTopic;
-}
-
-export interface ITransactionEventTopic {
-    toString(): string;
-    hex(): string;
-    valueOf(): Buffer;
-}
-
 export interface IContractQueryResponse {
     returnData: string[];
     returnCode: ReturnCode;
diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/networkProvider/providers.dev.net.spec.ts
index affbd8d0b..f376feedf 100644
--- a/src-network-providers/networkProvider/providers.dev.net.spec.ts
+++ b/src-network-providers/networkProvider/providers.dev.net.spec.ts
@@ -1,6 +1,6 @@
 import { assert } from "chai";
 import { Hash } from "../hash";
-import { INetworkProvider, ITransactionOnNetwork } from "./interface";
+import { INetworkProvider } from "./interface";
 import { Address } from "../address";
 import { loadTestWallets, TestWallet } from "../testutils";
 import { TransactionHash, TransactionStatus } from "../transaction";
@@ -11,6 +11,7 @@ import { BigNumber } from "bignumber.js";
 import { Balance } from "../balance";
 import { ApiNetworkProvider } from "./apiNetworkProvider";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
+import { TransactionOnNetwork } from "./transactions";
 
 describe("test network providers on devnet: Proxy and API", function () {
     let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 10000 });
@@ -127,7 +128,7 @@ describe("test network providers on devnet: Proxy and API", function () {
     });
 
     // TODO: Strive to have as little differences as possible between Proxy and API.
-    function ignoreKnownTransactionDifferencesBetweenProviders(apiResponse: ITransactionOnNetwork, proxyResponse: ITransactionOnNetwork) {
+    function ignoreKnownTransactionDifferencesBetweenProviders(apiResponse: TransactionOnNetwork, proxyResponse: TransactionOnNetwork) {
         // TODO: Remove this once "tx.status" is uniformized.
         apiResponse.status = proxyResponse.status = new TransactionStatus("ignore");
 
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index 57f5b238b..54e5ee85a 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -3,7 +3,7 @@ import { AccountOnNetwork } from "../account";
 import { Address } from "../address";
 import { defaultConfig } from "../constants";
 import { ErrNetworkProvider } from "../errors";
-import { IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, ITransactionOnNetwork, Pagination } from "./interface";
+import { IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, Pagination } from "./interface";
 import { Logger } from "../logger";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
@@ -94,7 +94,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokenData;
     }
 
-    async getTransaction(txHash: TransactionHash): Promise<ITransactionOnNetwork> {
+    async getTransaction(txHash: TransactionHash): Promise<TransactionOnNetwork> {
         let url = this.buildUrlWithQueryParameters(`transaction/${txHash.toString()}`, { withResults: "true" });
         let response = await this.doGetGeneric(url);
         let transaction = TransactionOnNetwork.fromProxyHttpResponse(txHash, response.transaction);
diff --git a/src-network-providers/networkProvider/transactionCompletionStrategy.ts b/src-network-providers/networkProvider/transactionCompletionStrategy.ts
index 2a50bdd1a..e95673b7a 100644
--- a/src-network-providers/networkProvider/transactionCompletionStrategy.ts
+++ b/src-network-providers/networkProvider/transactionCompletionStrategy.ts
@@ -1,14 +1,14 @@
-import { ITransactionLogs } from "./interface";
 import { Nonce } from "../nonce";
 import { TransactionStatus } from "../transaction";
 import { TransactionPayload } from "../transactionPayload";
 import { isPaddedHex } from "../utils.codec";
+import { TransactionLogs } from "./transactionLogs";
 
 /**
  * Internal interface: a transaction, as seen from the perspective of a {@link TransactionCompletionStrategy}.
  */
 interface ITransactionOnNetwork {
-    logs: ITransactionLogs;
+    logs: TransactionLogs;
     status: TransactionStatus;
     hyperblockNonce: Nonce;
     data: TransactionPayload;
diff --git a/src-network-providers/networkProvider/transactionEvents.ts b/src-network-providers/networkProvider/transactionEvents.ts
index 5fb723ac0..60c8e75b2 100644
--- a/src-network-providers/networkProvider/transactionEvents.ts
+++ b/src-network-providers/networkProvider/transactionEvents.ts
@@ -1,13 +1,12 @@
 import { Address } from "../address";
-import { ITransactionEventTopic } from "./interface";
 
 export class TransactionEvent {
     readonly address: Address;
     readonly identifier: string;
-    readonly topics: ITransactionEventTopic[];
+    readonly topics: TransactionEventTopic[];
     readonly data: string;
 
-    constructor(address: Address, identifier: string, topics: ITransactionEventTopic[], data: string) {
+    constructor(address: Address, identifier: string, topics: TransactionEventTopic[], data: string) {
         this.address = address;
         this.identifier = identifier;
         this.topics = topics;
@@ -28,11 +27,11 @@ export class TransactionEvent {
         return event;
     }
 
-    findFirstOrNoneTopic(predicate: (topic: ITransactionEventTopic) => boolean): ITransactionEventTopic | undefined {
+    findFirstOrNoneTopic(predicate: (topic: TransactionEventTopic) => boolean): TransactionEventTopic | undefined {
         return this.topics.filter(topic => predicate(topic))[0];
     }
 
-    getLastTopic(): ITransactionEventTopic {
+    getLastTopic(): TransactionEventTopic {
         return this.topics[this.topics.length - 1];
     }
 }
diff --git a/src-network-providers/networkProvider/receipt.ts b/src-network-providers/networkProvider/transactionReceipt.ts
similarity index 85%
rename from src-network-providers/networkProvider/receipt.ts
rename to src-network-providers/networkProvider/transactionReceipt.ts
index 64b45c96b..8a6e6ec27 100644
--- a/src-network-providers/networkProvider/receipt.ts
+++ b/src-network-providers/networkProvider/transactionReceipt.ts
@@ -2,7 +2,7 @@ import { Address } from "../address";
 import { Balance } from "../balance";
 import { TransactionHash } from "../transaction";
 
-export class Receipt {
+export class TransactionReceipt {
     value: Balance = Balance.Zero();
     sender: Address = new Address();
     data: string = "";
@@ -13,8 +13,8 @@ export class Receipt {
         sender: string,
         data: string,
         txHash: string
-    }): Receipt {
-        let receipt = new Receipt();
+    }): TransactionReceipt {
+        let receipt = new TransactionReceipt();
 
         receipt.value = Balance.fromString(response.value);
         receipt.sender = new Address(response.sender);
diff --git a/src-network-providers/networkProvider/transactions.ts b/src-network-providers/networkProvider/transactions.ts
index 94bdd0606..840b67251 100644
--- a/src-network-providers/networkProvider/transactions.ts
+++ b/src-network-providers/networkProvider/transactions.ts
@@ -1,7 +1,6 @@
 import { Address } from "../address";
 import { Balance } from "../balance";
 import { Hash } from "../hash";
-import { IContractResults, ITransactionEvent, ITransactionLogs, ITransactionOnNetwork, ITransactionReceipt } from "./interface";
 import { GasLimit, GasPrice } from "../networkParams";
 import { Nonce } from "../nonce";
 import { Signature } from "../signature";
@@ -9,10 +8,11 @@ import { TransactionHash, TransactionStatus } from "../transaction";
 import { TransactionPayload } from "../transactionPayload";
 import { ContractResults } from "./contractResults";
 import { TransactionCompletionStrategy } from "./transactionCompletionStrategy";
+import { TransactionEvent } from "./transactionEvents";
 import { TransactionLogs } from "./transactionLogs";
-import { Receipt } from "./receipt";
+import { TransactionReceipt } from "./transactionReceipt";
 
- export class TransactionOnNetwork implements ITransactionOnNetwork {
+ export class TransactionOnNetwork {
     hash: TransactionHash = new TransactionHash("");
     type: string = "";
     nonce: Nonce = new Nonce(0);
@@ -33,9 +33,9 @@ import { Receipt } from "./receipt";
     hyperblockHash: Hash = Hash.empty();
     pendingResults: boolean = false;
 
-    receipt: ITransactionReceipt = new Receipt();
-    contractResults: IContractResults = ContractResults.empty();
-    logs: ITransactionLogs = TransactionLogs.empty();
+    receipt: TransactionReceipt = new TransactionReceipt();
+    contractResults: ContractResults = ContractResults.empty();
+    logs: TransactionLogs = TransactionLogs.empty();
 
     constructor(init?: Partial<TransactionOnNetwork>) {
         Object.assign(this, init);
@@ -79,7 +79,7 @@ import { Receipt } from "./receipt";
         result.hyperblockHash = new Hash(response.hyperblockHash);
         result.pendingResults = response.pendingResults || false;
 
-        result.receipt = Receipt.fromHttpResponse(response.receipt || {});
+        result.receipt = TransactionReceipt.fromHttpResponse(response.receipt || {});
         result.logs = TransactionLogs.fromHttpResponse(response.logs || {});
 
         return result;
@@ -95,7 +95,7 @@ import { Receipt } from "./receipt";
         return new TransactionCompletionStrategy().isCompleted(this);
     }
 
-    getAllEvents(): ITransactionEvent[] {
+    getAllEvents(): TransactionEvent[] {
         let result = [...this.logs.events];
 
         for (const resultItem of this.contractResults.items) {

From 5e24e20d29a8cdccb6aa89b66d8f56f49fd5159d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 5 Apr 2022 20:47:36 +0300
Subject: [PATCH 057/338] Make ./networkProvider less dependent on outside
 definitions.

---
 .../networkProvider/providers.dev.net.spec.ts |  7 +++---
 .../transactionCompletionStrategy.ts          |  5 ++--
 .../networkProvider/transactions.ts           | 25 ++++++++-----------
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/networkProvider/providers.dev.net.spec.ts
index f376feedf..5903b9a37 100644
--- a/src-network-providers/networkProvider/providers.dev.net.spec.ts
+++ b/src-network-providers/networkProvider/providers.dev.net.spec.ts
@@ -1,5 +1,4 @@
 import { assert } from "chai";
-import { Hash } from "../hash";
 import { INetworkProvider } from "./interface";
 import { Address } from "../address";
 import { loadTestWallets, TestWallet } from "../testutils";
@@ -134,9 +133,9 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         // Ignore fields which are not present on API response:
         proxyResponse.epoch = 0;
-        proxyResponse.blockNonce = new Nonce(0);
-        proxyResponse.hyperblockNonce = new Nonce(0);
-        proxyResponse.hyperblockHash = new Hash("");
+        proxyResponse.blockNonce = 0;
+        proxyResponse.hyperblockNonce = 0;
+        proxyResponse.hyperblockHash = "";
     }
 
     // TODO: Fix differences of "tx.status", then enable this test.
diff --git a/src-network-providers/networkProvider/transactionCompletionStrategy.ts b/src-network-providers/networkProvider/transactionCompletionStrategy.ts
index e95673b7a..59823688d 100644
--- a/src-network-providers/networkProvider/transactionCompletionStrategy.ts
+++ b/src-network-providers/networkProvider/transactionCompletionStrategy.ts
@@ -1,4 +1,3 @@
-import { Nonce } from "../nonce";
 import { TransactionStatus } from "../transaction";
 import { TransactionPayload } from "../transactionPayload";
 import { isPaddedHex } from "../utils.codec";
@@ -10,7 +9,7 @@ import { TransactionLogs } from "./transactionLogs";
 interface ITransactionOnNetwork {
     logs: TransactionLogs;
     status: TransactionStatus;
-    hyperblockNonce: Nonce;
+    hyperblockNonce: number;
     data: TransactionPayload;
 }
 
@@ -40,7 +39,7 @@ export class TransactionCompletionStrategy {
             return transaction.status.isExecuted();
         }
 
-        let hyperblockNonce = transaction.hyperblockNonce.valueOf();
+        let hyperblockNonce = transaction.hyperblockNonce;
 
         // Imprecise condition, uncertain completion (usually sufficient, though).
         // This is WRONG when (at least): timeOf(block with execution at destination is notarized) < timeOf(the "completedTxEvent" occurs).
diff --git a/src-network-providers/networkProvider/transactions.ts b/src-network-providers/networkProvider/transactions.ts
index 840b67251..7298e6644 100644
--- a/src-network-providers/networkProvider/transactions.ts
+++ b/src-network-providers/networkProvider/transactions.ts
@@ -1,9 +1,6 @@
 import { Address } from "../address";
 import { Balance } from "../balance";
-import { Hash } from "../hash";
-import { GasLimit, GasPrice } from "../networkParams";
 import { Nonce } from "../nonce";
-import { Signature } from "../signature";
 import { TransactionHash, TransactionStatus } from "../transaction";
 import { TransactionPayload } from "../transactionPayload";
 import { ContractResults } from "./contractResults";
@@ -21,16 +18,16 @@ import { TransactionReceipt } from "./transactionReceipt";
     value: Balance = Balance.Zero();
     receiver: Address = new Address();
     sender: Address = new Address();
-    gasPrice: GasPrice = new GasPrice(0);
-    gasLimit: GasLimit = new GasLimit(0);
+    gasPrice: number = 0;
+    gasLimit: number = 0;
     data: TransactionPayload = new TransactionPayload();
-    signature: Signature = Signature.empty();
+    signature: string = "";
     status: TransactionStatus = TransactionStatus.createUnknown();
     timestamp: number = 0;
 
-    blockNonce: Nonce = new Nonce(0);
-    hyperblockNonce: Nonce = new Nonce(0);
-    hyperblockHash: Hash = Hash.empty();
+    blockNonce: number = 0;
+    hyperblockNonce: number = 0;
+    hyperblockHash: string = "";
     pendingResults: boolean = false;
 
     receipt: TransactionReceipt = new TransactionReceipt();
@@ -68,15 +65,15 @@ import { TransactionReceipt } from "./transactionReceipt";
         result.value = Balance.fromString(response.value);
         result.sender = Address.fromBech32(response.sender);
         result.receiver = Address.fromBech32(response.receiver);
-        result.gasPrice = new GasPrice(response.gasPrice);
-        result.gasLimit = new GasLimit(response.gasLimit);
+        result.gasPrice = response.gasPrice || 0;
+        result.gasLimit = response.gasLimit || 0;
         result.data = TransactionPayload.fromEncoded(response.data);
         result.status = new TransactionStatus(response.status);
         result.timestamp = response.timestamp || 0;
 
-        result.blockNonce = new Nonce(response.blockNonce || 0);
-        result.hyperblockNonce = new Nonce(response.hyperblockNonce || 0);
-        result.hyperblockHash = new Hash(response.hyperblockHash);
+        result.blockNonce = response.blockNonce || 0;
+        result.hyperblockNonce = response.hyperblockNonce || 0;
+        result.hyperblockHash = response.hyperblockHash;
         result.pendingResults = response.pendingResults || false;
 
         result.receipt = TransactionReceipt.fromHttpResponse(response.receipt || {});

From 3c572343f656fbea5726d654da3cae48ee530a46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 5 Apr 2022 22:26:50 +0300
Subject: [PATCH 058/338] Prepare extraction of networkProvider. WIP.

---
 .../networkProvider/apiNetworkProvider.ts     | 19 ++--
 .../networkProvider/interface.ts              | 15 +++-
 .../networkProvider/primitives.ts             | 61 +++++++++++++
 .../networkProvider/providers.dev.net.spec.ts |  3 +-
 .../networkProvider/proxyNetworkProvider.ts   | 14 +--
 .../transactionCompletionStrategy.ts          |  6 +-
 .../networkProvider/transactionStatus.ts      | 87 +++++++++++++++++++
 .../networkProvider/transactions.ts           | 34 ++++----
 8 files changed, 198 insertions(+), 41 deletions(-)
 create mode 100644 src-network-providers/networkProvider/primitives.ts
 create mode 100644 src-network-providers/networkProvider/transactionStatus.ts

diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
index 6e4e12fbc..bcca7ccee 100644
--- a/src-network-providers/networkProvider/apiNetworkProvider.ts
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -3,20 +3,21 @@ import { AccountOnNetwork } from "../account";
 import { Address } from "../address";
 import { defaultConfig } from "../constants";
 import { ErrNetworkProvider } from "../errors";
-import { IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, Pagination } from "./interface";
+import { IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, IHexable, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, Pagination } from "./interface";
 import { Logger } from "../logger";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
 import { NetworkStatus } from "../networkStatus";
-import { Nonce } from "../nonce";
 import { Query } from "../smartcontracts";
 import { Stats } from "../stats";
-import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
+import { Transaction } from "../transaction";
 import { ContractQueryResponse } from "./contractResults";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork } from "./transactions";
+import { TransactionStatus } from "./transactionStatus";
+import { Hash } from "./primitives";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ApiNetworkProvider implements INetworkProvider {
@@ -86,27 +87,27 @@ export class ApiNetworkProvider implements INetworkProvider {
         return tokenData;
     }
 
-    async getNonFungibleTokenOfAccount(address: Address, collection: string, nonce: Nonce): Promise<INonFungibleTokenOfAccountOnNetwork> {
+    async getNonFungibleTokenOfAccount(address: Address, collection: string, nonce: IHexable): Promise<INonFungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`accounts/${address.bech32()}/nfts/${collection}-${nonce.hex()}`);
         let tokenData = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response);
         return tokenData;
     }
 
-    async getTransaction(txHash: TransactionHash): Promise<TransactionOnNetwork> {
+    async getTransaction(txHash: IHash): Promise<TransactionOnNetwork> {
         let response = await this.doGetGeneric(`transactions/${txHash.toString()}`);
         let transaction = TransactionOnNetwork.fromApiHttpResponse(txHash, response);
         return transaction;
     }
 
-    async getTransactionStatus(txHash: TransactionHash): Promise<TransactionStatus> {
+    async getTransactionStatus(txHash: IHash): Promise<TransactionStatus> {
         let response = await this.doGetGeneric(`transactions/${txHash.toString()}?fields=status`);
         let status = new TransactionStatus(response.status);
         return status;
     }
 
-    async sendTransaction(tx: Transaction): Promise<TransactionHash> {
+    async sendTransaction(tx: Transaction): Promise<IHash> {
         let response = await this.doPostGeneric("transactions", tx.toSendable());
-        let hash = new TransactionHash(response.txHash);
+        let hash = new Hash(response.txHash);
         return hash;
     }
 
@@ -133,7 +134,7 @@ export class ApiNetworkProvider implements INetworkProvider {
         return definition;
     }
 
-    async getNonFungibleToken(collection: string, nonce: Nonce): Promise<INonFungibleTokenOfAccountOnNetwork> {
+    async getNonFungibleToken(collection: string, nonce: IHexable): Promise<INonFungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`nfts/${collection}-${nonce.hex()}`);
         let token = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response);
         return token;
diff --git a/src-network-providers/networkProvider/interface.ts b/src-network-providers/networkProvider/interface.ts
index 6d2e0bf62..145a7887a 100644
--- a/src-network-providers/networkProvider/interface.ts
+++ b/src-network-providers/networkProvider/interface.ts
@@ -8,8 +8,9 @@ import { NetworkStatus } from "../networkStatus";
 import { Nonce } from "../nonce";
 import { Query, ReturnCode } from "../smartcontracts";
 import { Stats } from "../stats";
-import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
+import { Transaction } from "../transaction";
 import { TransactionOnNetwork } from "./transactions";
+import { TransactionStatus } from "./transactionStatus";
 
 /**
  * An interface that defines the endpoints of an HTTP API Provider.
@@ -63,17 +64,17 @@ export interface INetworkProvider {
     /**
      * Fetches the state of a {@link Transaction}.
      */
-    getTransaction(txHash: TransactionHash): Promise<TransactionOnNetwork>;
+    getTransaction(txHash: IHash): Promise<TransactionOnNetwork>;
 
     /**
      * Queries the status of a {@link Transaction}.
      */
-    getTransactionStatus(txHash: TransactionHash): Promise<TransactionStatus>;
+    getTransactionStatus(txHash: IHash): Promise<TransactionStatus>;
 
     /**
      * Broadcasts an already-signed {@link Transaction}.
      */
-    sendTransaction(tx: Transaction): Promise<TransactionHash>;
+    sendTransaction(tx: Transaction): Promise<IHash>;
 
     /**
      * Simulates the processing of an already-signed {@link Transaction}.
@@ -182,3 +183,9 @@ export class Pagination {
         return { from: 0, size: 100 };
     }
 }
+
+export interface IHash { hex(): string; }
+export interface IAddress { bech32(): string; }
+export interface INonce { valueOf(): number; }
+export interface IHexable { hex(): string }
+export interface ITransactionPayload { encoded(): string; }
diff --git a/src-network-providers/networkProvider/primitives.ts b/src-network-providers/networkProvider/primitives.ts
new file mode 100644
index 000000000..1c9bfe0eb
--- /dev/null
+++ b/src-network-providers/networkProvider/primitives.ts
@@ -0,0 +1,61 @@
+import { IAddress, IHash, INonce, ITransactionPayload } from "./interface";
+
+export class Hash implements IHash {
+    private readonly value: string;
+
+    constructor(value: string) {
+        this.value = value;
+    }
+
+    hex(): string {
+        return this.value;
+    }
+}
+
+export class Address implements IAddress {
+    private readonly value: string;
+
+    constructor(value: string) {
+        this.value = value;
+    }
+
+    bech32(): string {
+        return this.value;
+    }
+}
+
+export class Nonce implements INonce {
+    private readonly value: number;
+
+    constructor(value: number) {
+        this.value = value;
+    }
+
+    valueOf(): number {
+        return this.value;
+    }
+}
+
+export class TransactionValue {
+    private readonly value: string;
+
+    constructor(value: string) {
+        this.value = value;
+    }
+
+    toString(): string {
+        return this.value;
+    }
+}
+
+export class TransactionPayload implements ITransactionPayload {
+    private readonly base64: string;
+
+    constructor(base64: string) {
+        this.base64 = base64;
+    }
+
+    encoded(): string {
+        return this.base64;
+    }
+}
diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/networkProvider/providers.dev.net.spec.ts
index 5903b9a37..479fd40b7 100644
--- a/src-network-providers/networkProvider/providers.dev.net.spec.ts
+++ b/src-network-providers/networkProvider/providers.dev.net.spec.ts
@@ -2,7 +2,7 @@ import { assert } from "chai";
 import { INetworkProvider } from "./interface";
 import { Address } from "../address";
 import { loadTestWallets, TestWallet } from "../testutils";
-import { TransactionHash, TransactionStatus } from "../transaction";
+import { TransactionHash } from "../transaction";
 import { Nonce } from "../nonce";
 import { ContractFunction, Query } from "../smartcontracts";
 import { BigUIntValue, U32Value, BytesValue, VariadicValue, VariadicType, CompositeType, BytesType, BooleanType } from "../smartcontracts/typesystem";
@@ -11,6 +11,7 @@ import { Balance } from "../balance";
 import { ApiNetworkProvider } from "./apiNetworkProvider";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { TransactionOnNetwork } from "./transactions";
+import { TransactionStatus } from "./transactionStatus";
 
 describe("test network providers on devnet: Proxy and API", function () {
     let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 10000 });
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index 54e5ee85a..2a0786a26 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -3,7 +3,7 @@ import { AccountOnNetwork } from "../account";
 import { Address } from "../address";
 import { defaultConfig } from "../constants";
 import { ErrNetworkProvider } from "../errors";
-import { IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, Pagination } from "./interface";
+import { IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, Pagination } from "./interface";
 import { Logger } from "../logger";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
@@ -11,10 +11,12 @@ import { NetworkStatus } from "../networkStatus";
 import { Nonce } from "../nonce";
 import { Query } from "../smartcontracts";
 import { Stats } from "../stats";
-import { Transaction, TransactionHash, TransactionStatus } from "../transaction";
+import { Transaction } from "../transaction";
 import { ContractQueryResponse } from "./contractResults";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork } from "./transactions";
+import { TransactionStatus } from "./transactionStatus";
+import { Hash } from "./primitives";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ProxyNetworkProvider implements INetworkProvider {
@@ -94,22 +96,22 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokenData;
     }
 
-    async getTransaction(txHash: TransactionHash): Promise<TransactionOnNetwork> {
+    async getTransaction(txHash: IHash): Promise<TransactionOnNetwork> {
         let url = this.buildUrlWithQueryParameters(`transaction/${txHash.toString()}`, { withResults: "true" });
         let response = await this.doGetGeneric(url);
         let transaction = TransactionOnNetwork.fromProxyHttpResponse(txHash, response.transaction);
         return transaction;
     }
 
-    async getTransactionStatus(txHash: TransactionHash): Promise<TransactionStatus> {
+    async getTransactionStatus(txHash: IHash): Promise<TransactionStatus> {
         let response = await this.doGetGeneric(`transaction/${txHash.toString()}/status`);
         let status = new TransactionStatus(response.status);
         return status;
     }
 
-    async sendTransaction(tx: Transaction): Promise<TransactionHash> {
+    async sendTransaction(tx: Transaction): Promise<IHash> {
         let response = await this.doPostGeneric("transaction/send", tx.toSendable());
-        let hash = new TransactionHash(response.txHash);
+        let hash = new Hash(response.txHash);
         return hash;
     }
 
diff --git a/src-network-providers/networkProvider/transactionCompletionStrategy.ts b/src-network-providers/networkProvider/transactionCompletionStrategy.ts
index 59823688d..afdff5642 100644
--- a/src-network-providers/networkProvider/transactionCompletionStrategy.ts
+++ b/src-network-providers/networkProvider/transactionCompletionStrategy.ts
@@ -1,6 +1,6 @@
-import { TransactionStatus } from "../transaction";
-import { TransactionPayload } from "../transactionPayload";
+import { TransactionStatus } from "./transactionStatus";
 import { isPaddedHex } from "../utils.codec";
+import { ITransactionPayload } from "./interface";
 import { TransactionLogs } from "./transactionLogs";
 
 /**
@@ -10,7 +10,7 @@ interface ITransactionOnNetwork {
     logs: TransactionLogs;
     status: TransactionStatus;
     hyperblockNonce: number;
-    data: TransactionPayload;
+    data: ITransactionPayload;
 }
 
 const WellKnownCompletionEvents = ["completedTxEvent", "SCDeploy", "signalError"];
diff --git a/src-network-providers/networkProvider/transactionStatus.ts b/src-network-providers/networkProvider/transactionStatus.ts
new file mode 100644
index 000000000..e7346cf87
--- /dev/null
+++ b/src-network-providers/networkProvider/transactionStatus.ts
@@ -0,0 +1,87 @@
+/**
+ * An abstraction for handling and interpreting the "status" field of a transaction.
+ */
+export class TransactionStatus {
+    /**
+     * The raw status, as fetched from the Network.
+     */
+    readonly status: string;
+
+    /**
+     * Creates a new TransactionStatus object.
+     */
+    constructor(status: string) {
+        this.status = (status || "").toLowerCase();
+    }
+
+    /**
+     * Creates an unknown status.
+     */
+    static createUnknown(): TransactionStatus {
+        return new TransactionStatus("unknown");
+    }
+
+    /**
+     * Returns whether the transaction is pending (e.g. in mempool).
+     */
+    isPending(): boolean {
+        return (
+            this.status == "received" ||
+            this.status == "pending" ||
+            this.status == "partially-executed"
+        );
+    }
+
+    /**
+     * Returns whether the transaction has been executed (not necessarily with success).
+     */
+    isExecuted(): boolean {
+        return this.isSuccessful() || this.isFailed() || this.isInvalid();
+    }
+
+    /**
+     * Returns whether the transaction has been executed successfully.
+     */
+    isSuccessful(): boolean {
+        return (
+            this.status == "executed" ||
+            this.status == "success" ||
+            this.status == "successful"
+        );
+    }
+
+    /**
+     * Returns whether the transaction has been executed, but with a failure.
+     */
+    isFailed(): boolean {
+        return (
+            this.status == "fail" ||
+            this.status == "failed" ||
+            this.status == "unsuccessful" ||
+            this.isInvalid()
+        );
+    }
+
+    /**
+     * Returns whether the transaction has been executed, but marked as invalid (e.g. due to "insufficient funds").
+     */
+    isInvalid(): boolean {
+        return this.status == "invalid";
+    }
+
+    toString(): string {
+        return this.status;
+    }
+
+    valueOf(): string {
+        return this.status;
+    }
+
+    equals(other: TransactionStatus) {
+        if (!other) {
+            return false;
+        }
+
+        return this.status == other.status;
+    }
+}
diff --git a/src-network-providers/networkProvider/transactions.ts b/src-network-providers/networkProvider/transactions.ts
index 7298e6644..60d73e6ed 100644
--- a/src-network-providers/networkProvider/transactions.ts
+++ b/src-network-providers/networkProvider/transactions.ts
@@ -1,26 +1,24 @@
-import { Address } from "../address";
-import { Balance } from "../balance";
-import { Nonce } from "../nonce";
-import { TransactionHash, TransactionStatus } from "../transaction";
-import { TransactionPayload } from "../transactionPayload";
+import { TransactionStatus } from "./transactionStatus";
 import { ContractResults } from "./contractResults";
+import { Address, Hash, Nonce, TransactionValue, TransactionPayload } from "./primitives";
+import { IAddress, IHash, INonce, ITransactionPayload } from "./interface";
 import { TransactionCompletionStrategy } from "./transactionCompletionStrategy";
 import { TransactionEvent } from "./transactionEvents";
 import { TransactionLogs } from "./transactionLogs";
 import { TransactionReceipt } from "./transactionReceipt";
 
  export class TransactionOnNetwork {
-    hash: TransactionHash = new TransactionHash("");
+    hash: IHash = new Hash("");
     type: string = "";
-    nonce: Nonce = new Nonce(0);
+    nonce: INonce = new Nonce(0);
     round: number = 0;
     epoch: number = 0;
-    value: Balance = Balance.Zero();
-    receiver: Address = new Address();
-    sender: Address = new Address();
+    value: TransactionValue = new TransactionValue("");
+    receiver: IAddress = new Address("");
+    sender: IAddress = new Address("");
     gasPrice: number = 0;
     gasLimit: number = 0;
-    data: TransactionPayload = new TransactionPayload();
+    data: ITransactionPayload = new TransactionPayload("");
     signature: string = "";
     status: TransactionStatus = TransactionStatus.createUnknown();
     timestamp: number = 0;
@@ -38,7 +36,7 @@ import { TransactionReceipt } from "./transactionReceipt";
         Object.assign(this, init);
     }
 
-    static fromProxyHttpResponse(txHash: TransactionHash, response: any): TransactionOnNetwork {
+    static fromProxyHttpResponse(txHash: IHash, response: any): TransactionOnNetwork {
         let result = TransactionOnNetwork.fromHttpResponse(txHash, response);
         result.contractResults = ContractResults.fromProxyHttpResponse(response.smartContractResults || []);
         // TODO: uniformize transaction status.
@@ -46,7 +44,7 @@ import { TransactionReceipt } from "./transactionReceipt";
         return result;
     }
 
-    static fromApiHttpResponse(txHash: TransactionHash, response: any): TransactionOnNetwork {
+    static fromApiHttpResponse(txHash: IHash, response: any): TransactionOnNetwork {
         let result = TransactionOnNetwork.fromHttpResponse(txHash, response);
         result.contractResults = ContractResults.fromApiHttpResponse(response.results || []);
         // TODO: uniformize transaction status.
@@ -54,7 +52,7 @@ import { TransactionReceipt } from "./transactionReceipt";
         return result;
     }
 
-    private static fromHttpResponse(txHash: TransactionHash, response: any): TransactionOnNetwork {
+    private static fromHttpResponse(txHash: IHash, response: any): TransactionOnNetwork {
         let result = new TransactionOnNetwork();
 
         result.hash = txHash;
@@ -62,12 +60,12 @@ import { TransactionReceipt } from "./transactionReceipt";
         result.nonce = new Nonce(response.nonce || 0);
         result.round = response.round;
         result.epoch = response.epoch || 0;
-        result.value = Balance.fromString(response.value);
-        result.sender = Address.fromBech32(response.sender);
-        result.receiver = Address.fromBech32(response.receiver);
+        result.value = new TransactionValue(response.value);
+        result.sender = new Address(response.sender);
+        result.receiver = new Address(response.receiver);
         result.gasPrice = response.gasPrice || 0;
         result.gasLimit = response.gasLimit || 0;
-        result.data = TransactionPayload.fromEncoded(response.data);
+        result.data = new TransactionPayload(response.data);
         result.status = new TransactionStatus(response.status);
         result.timestamp = response.timestamp || 0;
 

From 3041339c8e5a215353fdc449d645d27141b47eda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 5 Apr 2022 22:51:49 +0300
Subject: [PATCH 059/338] Continue decoupling of package networkProvider.

---
 .../networkProvider/apiNetworkProvider.ts     | 17 +++++------
 .../networkProvider/errors.ts                 | 30 +++++++++++++++++++
 .../networkProvider/interface.ts              | 30 +++++++++----------
 .../networkProvider/primitives.ts             | 25 ++++++++++++++++
 .../networkProvider/proxyNetworkProvider.ts   | 18 +++++------
 .../networkProvider/tokenDefinitions.ts       |  8 ++---
 .../networkProvider/tokens.ts                 |  9 +++---
 .../transactionCompletionStrategy.ts          |  4 +--
 .../networkProvider/transactionEvents.ts      |  7 +++--
 .../networkProvider/transactionLogs.ts        | 11 +++----
 .../networkProvider/transactionReceipt.ts     | 15 +++++-----
 11 files changed, 112 insertions(+), 62 deletions(-)
 create mode 100644 src-network-providers/networkProvider/errors.ts

diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
index bcca7ccee..57a65d5c1 100644
--- a/src-network-providers/networkProvider/apiNetworkProvider.ts
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -1,9 +1,7 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "../account";
-import { Address } from "../address";
 import { defaultConfig } from "../constants";
-import { ErrNetworkProvider } from "../errors";
-import { IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, IHexable, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, Pagination } from "./interface";
+import { IAddress, IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonce, INonFungibleTokenOfAccountOnNetwork, Pagination } from "./interface";
 import { Logger } from "../logger";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
@@ -18,6 +16,7 @@ import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } f
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 import { Hash } from "./primitives";
+import { ErrNetworkProvider } from "./errors";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ApiNetworkProvider implements INetworkProvider {
@@ -51,13 +50,13 @@ export class ApiNetworkProvider implements INetworkProvider {
         return stats;
     }
 
-    async getAccount(address: Address): Promise<AccountOnNetwork> {
+    async getAccount(address: IAddress): Promise<AccountOnNetwork> {
         let response = await this.doGetGeneric(`accounts/${address.bech32()}`);
         let account = AccountOnNetwork.fromHttpResponse(response);
         return account;
     }
 
-    async getFungibleTokensOfAccount(address: Address, pagination?: Pagination): Promise<IFungibleTokenOfAccountOnNetwork[]> {
+    async getFungibleTokensOfAccount(address: IAddress, pagination?: Pagination): Promise<IFungibleTokenOfAccountOnNetwork[]> {
         pagination = pagination || Pagination.default();
 
         let url = `accounts/${address.bech32()}/tokens?${this.buildPaginationParams(pagination)}`;
@@ -69,7 +68,7 @@ export class ApiNetworkProvider implements INetworkProvider {
         return tokens;
     }
 
-    async getNonFungibleTokensOfAccount(address: Address, pagination?: Pagination): Promise<INonFungibleTokenOfAccountOnNetwork[]> {
+    async getNonFungibleTokensOfAccount(address: IAddress, pagination?: Pagination): Promise<INonFungibleTokenOfAccountOnNetwork[]> {
         pagination = pagination || Pagination.default();
 
         let url = `accounts/${address.bech32()}/nfts?${this.buildPaginationParams(pagination)}`;
@@ -81,13 +80,13 @@ export class ApiNetworkProvider implements INetworkProvider {
         return tokens;
     }
 
-    async getFungibleTokenOfAccount(address: Address, tokenIdentifier: string): Promise<IFungibleTokenOfAccountOnNetwork> {
+    async getFungibleTokenOfAccount(address: IAddress, tokenIdentifier: string): Promise<IFungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`accounts/${address.bech32()}/tokens/${tokenIdentifier}`);
         let tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response);
         return tokenData;
     }
 
-    async getNonFungibleTokenOfAccount(address: Address, collection: string, nonce: IHexable): Promise<INonFungibleTokenOfAccountOnNetwork> {
+    async getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: INonce): Promise<INonFungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`accounts/${address.bech32()}/nfts/${collection}-${nonce.hex()}`);
         let tokenData = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response);
         return tokenData;
@@ -134,7 +133,7 @@ export class ApiNetworkProvider implements INetworkProvider {
         return definition;
     }
 
-    async getNonFungibleToken(collection: string, nonce: IHexable): Promise<INonFungibleTokenOfAccountOnNetwork> {
+    async getNonFungibleToken(collection: string, nonce: INonce): Promise<INonFungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`nfts/${collection}-${nonce.hex()}`);
         let token = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response);
         return token;
diff --git a/src-network-providers/networkProvider/errors.ts b/src-network-providers/networkProvider/errors.ts
new file mode 100644
index 000000000..586e5cf83
--- /dev/null
+++ b/src-network-providers/networkProvider/errors.ts
@@ -0,0 +1,30 @@
+/**
+ * The base class for exceptions (errors).
+ */
+export class Err extends Error {
+    inner: Error | undefined = undefined;
+
+    public constructor(message: string, inner?: Error) {
+        super(message);
+        this.inner = inner;
+    }
+}
+
+/**
+ * Signals an unexpected condition.
+ */
+export class ErrUnexpectedCondition extends Err {
+    public constructor(message: string) {
+        super(`Unexpected condition: [${message}]`);
+    }
+}
+
+/**
+ * Signals an error that happened during a request against the Network.
+ */
+export class ErrNetworkProvider extends Err {
+    public constructor(url: string, error: string, inner?: Error) {
+        let message = `Request error on url [${url}]: [${error}]`;
+        super(message, inner);
+    }
+}
diff --git a/src-network-providers/networkProvider/interface.ts b/src-network-providers/networkProvider/interface.ts
index 145a7887a..0b822b68b 100644
--- a/src-network-providers/networkProvider/interface.ts
+++ b/src-network-providers/networkProvider/interface.ts
@@ -1,11 +1,9 @@
 import { BigNumber } from "bignumber.js";
 import { AccountOnNetwork } from "../account";
-import { Address } from "../address";
 import { NetworkConfig } from "../networkConfig";
 import { GasLimit } from "../networkParams";
 import { NetworkStake } from "../networkStake";
 import { NetworkStatus } from "../networkStatus";
-import { Nonce } from "../nonce";
 import { Query, ReturnCode } from "../smartcontracts";
 import { Stats } from "../stats";
 import { Transaction } from "../transaction";
@@ -39,27 +37,27 @@ export interface INetworkProvider {
     /**
      * Fetches the state of an {@link Account}.
      */
-    getAccount(address: Address): Promise<AccountOnNetwork>;
+    getAccount(address: IAddress): Promise<AccountOnNetwork>;
 
     /**
      * Fetches data about the fungible tokens held by an account.
      */
-    getFungibleTokensOfAccount(address: Address, pagination?: Pagination): Promise<IFungibleTokenOfAccountOnNetwork[]>;
+    getFungibleTokensOfAccount(address: IAddress, pagination?: Pagination): Promise<IFungibleTokenOfAccountOnNetwork[]>;
 
     /**
      * Fetches data about the non-fungible tokens held by account.
      */
-    getNonFungibleTokensOfAccount(address: Address, pagination?: Pagination): Promise<INonFungibleTokenOfAccountOnNetwork[]>;
+    getNonFungibleTokensOfAccount(address: IAddress, pagination?: Pagination): Promise<INonFungibleTokenOfAccountOnNetwork[]>;
 
     /**
      * Fetches data about a specific fungible token held by an account.
      */
-    getFungibleTokenOfAccount(address: Address, tokenIdentifier: string): Promise<IFungibleTokenOfAccountOnNetwork>;
+    getFungibleTokenOfAccount(address: IAddress, tokenIdentifier: string): Promise<IFungibleTokenOfAccountOnNetwork>;
 
     /**
      * Fetches data about a specific non-fungible token (instance) held by an account.
      */
-    getNonFungibleTokenOfAccount(address: Address, collection: string, nonce: Nonce): Promise<INonFungibleTokenOfAccountOnNetwork>;
+    getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: INonce): Promise<INonFungibleTokenOfAccountOnNetwork>;
 
     /**
      * Fetches the state of a {@link Transaction}.
@@ -102,7 +100,7 @@ export interface INetworkProvider {
     /**
      * Fetches data about a specific non-fungible token (instance).
      */
-    getNonFungibleToken(collection: string, nonce: Nonce): Promise<INonFungibleTokenOfAccountOnNetwork>;
+    getNonFungibleToken(collection: string, nonce: INonce): Promise<INonFungibleTokenOfAccountOnNetwork>;
 
     /**
      * Performs a generic GET action against the provider (useful for new HTTP endpoints, not yet supported by erdjs).
@@ -125,8 +123,8 @@ export interface INonFungibleTokenOfAccountOnNetwork {
     collection: string;
     attributes: Buffer;
     balance: BigNumber;
-    nonce: Nonce;
-    creator: Address;
+    nonce: INonce;
+    creator: IAddress;
     royalties: BigNumber;
 }
 
@@ -135,7 +133,7 @@ export interface IDefinitionOfFungibleTokenOnNetwork {
     identifier: string;
     name: string;
     ticker: string;
-    owner: Address;
+    owner: IAddress;
     decimals: number;
     supply: BigNumber;
     isPaused: boolean;
@@ -154,7 +152,7 @@ export interface IDefinitionOfTokenCollectionOnNetwork {
     type: string;
     name: string;
     ticker: string;
-    owner: Address;
+    owner: IAddress;
     decimals: number;
     canPause: boolean;
     canFreeze: boolean;
@@ -168,7 +166,7 @@ export interface IContractQueryResponse {
     returnCode: ReturnCode;
     returnMessage: string;
     gasUsed: GasLimit;
-    
+
     getReturnDataParts(): Buffer[];
 }
 
@@ -184,8 +182,8 @@ export class Pagination {
     }
 }
 
-export interface IHash { hex(): string; }
-export interface IAddress { bech32(): string; }
-export interface INonce { valueOf(): number; }
 export interface IHexable { hex(): string }
+export interface IHash extends IHexable { };
+export interface IAddress { bech32(): string; }
+export interface INonce extends IHexable { valueOf(): number; }
 export interface ITransactionPayload { encoded(): string; }
diff --git a/src-network-providers/networkProvider/primitives.ts b/src-network-providers/networkProvider/primitives.ts
index 1c9bfe0eb..30efe13aa 100644
--- a/src-network-providers/networkProvider/primitives.ts
+++ b/src-network-providers/networkProvider/primitives.ts
@@ -34,6 +34,10 @@ export class Nonce implements INonce {
     valueOf(): number {
         return this.value;
     }
+
+    hex(): string {
+        return numberToPaddedHex(this.value);
+    }
 }
 
 export class TransactionValue {
@@ -59,3 +63,24 @@ export class TransactionPayload implements ITransactionPayload {
         return this.base64;
     }
 }
+
+export function numberToPaddedHex(value: number) {
+    let hex = value.toString(16);
+    return zeroPadStringIfOddLength(hex);
+}
+
+export function isPaddedHex(input: string) {
+    input = input || "";
+    let decodedThenEncoded = Buffer.from(input, "hex").toString("hex");
+    return input.toUpperCase() == decodedThenEncoded.toUpperCase();
+}
+
+export function zeroPadStringIfOddLength(input: string): string {
+    input = input || "";
+
+    if (input.length % 2 == 1) {
+        return "0" + input;
+    }
+
+    return input;
+}
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index 2a0786a26..cba920d8a 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -1,14 +1,11 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "../account";
-import { Address } from "../address";
 import { defaultConfig } from "../constants";
-import { ErrNetworkProvider } from "../errors";
-import { IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonFungibleTokenOfAccountOnNetwork, Pagination } from "./interface";
+import { IAddress, IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonce, INonFungibleTokenOfAccountOnNetwork, Pagination } from "./interface";
 import { Logger } from "../logger";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
 import { NetworkStatus } from "../networkStatus";
-import { Nonce } from "../nonce";
 import { Query } from "../smartcontracts";
 import { Stats } from "../stats";
 import { Transaction } from "../transaction";
@@ -17,6 +14,7 @@ import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } f
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 import { Hash } from "./primitives";
+import { ErrNetworkProvider } from "./errors";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ProxyNetworkProvider implements INetworkProvider {
@@ -52,13 +50,13 @@ export class ProxyNetworkProvider implements INetworkProvider {
         throw new Error("Method not implemented.");
     }
 
-    async getAccount(address: Address): Promise<AccountOnNetwork> {
+    async getAccount(address: IAddress): Promise<AccountOnNetwork> {
         let response = await this.doGetGeneric(`address/${address.bech32()}`);
         let account = AccountOnNetwork.fromHttpResponse(response.account);
         return account;
     }
 
-    async getFungibleTokensOfAccount(address: Address, _pagination?: Pagination): Promise<IFungibleTokenOfAccountOnNetwork[]> {
+    async getFungibleTokensOfAccount(address: IAddress, _pagination?: Pagination): Promise<IFungibleTokenOfAccountOnNetwork[]> {
         let url = `address/${address.bech32()}/esdt`;
         let response = await this.doGetGeneric(url);
         let responseItems: any[] = Object.values(response.esdts);
@@ -71,7 +69,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokens;
     }
 
-    async getNonFungibleTokensOfAccount(address: Address, _pagination?: Pagination): Promise<INonFungibleTokenOfAccountOnNetwork[]> {
+    async getNonFungibleTokensOfAccount(address: IAddress, _pagination?: Pagination): Promise<INonFungibleTokenOfAccountOnNetwork[]> {
         let url = `address/${address.bech32()}/esdt`;
         let response = await this.doGetGeneric(url);
         let responseItems: any[] = Object.values(response.esdts);
@@ -84,13 +82,13 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokens;
     }
 
-    async getFungibleTokenOfAccount(address: Address, tokenIdentifier: string): Promise<IFungibleTokenOfAccountOnNetwork> {
+    async getFungibleTokenOfAccount(address: IAddress, tokenIdentifier: string): Promise<IFungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`address/${address.bech32()}/esdt/${tokenIdentifier}`);
         let tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response.tokenData);
         return tokenData;
     }
 
-    async getNonFungibleTokenOfAccount(address: Address, collection: string, nonce: Nonce): Promise<INonFungibleTokenOfAccountOnNetwork> {
+    async getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: INonce): Promise<INonFungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`address/${address.bech32()}/nft/${collection}/nonce/${nonce.valueOf()}`);
         let tokenData = NonFungibleTokenOfAccountOnNetwork.fromProxyHttpResponseByNonce(response.tokenData);
         return tokenData;
@@ -140,7 +138,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
         throw new Error("Method not implemented.");
     }
 
-    async getNonFungibleToken(_collection: string, _nonce: Nonce): Promise<INonFungibleTokenOfAccountOnNetwork> {
+    async getNonFungibleToken(_collection: string, _nonce: INonce): Promise<INonFungibleTokenOfAccountOnNetwork> {
         throw new Error("Method not implemented.");
     }
 
diff --git a/src-network-providers/networkProvider/tokenDefinitions.ts b/src-network-providers/networkProvider/tokenDefinitions.ts
index 77b784e66..c10644854 100644
--- a/src-network-providers/networkProvider/tokenDefinitions.ts
+++ b/src-network-providers/networkProvider/tokenDefinitions.ts
@@ -1,12 +1,12 @@
 import { BigNumber } from "bignumber.js";
-import { Address } from "../address";
-import { IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork } from "./interface";
+import { Address } from "./primitives";
+import { IAddress, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork } from "./interface";
 
 export class DefinitionOfFungibleTokenOnNetwork implements IDefinitionOfFungibleTokenOnNetwork {
     identifier: string = "";
     name: string = "";
     ticker: string = "";
-    owner: Address = new Address();
+    owner: IAddress = new Address("");
     decimals: number = 0;
     supply: BigNumber = new BigNumber(0);
     isPaused: boolean = false;
@@ -47,7 +47,7 @@ export class DefinitionOfTokenCollectionOnNetwork implements IDefinitionOfTokenC
     type: string = "";
     name: string = "";
     ticker: string = "";
-    owner: Address = new Address();
+    owner: IAddress = new Address("");
     decimals: number = 0;
     canPause: boolean = false;
     canFreeze: boolean = false;
diff --git a/src-network-providers/networkProvider/tokens.ts b/src-network-providers/networkProvider/tokens.ts
index 303fdb7ca..3223f178a 100644
--- a/src-network-providers/networkProvider/tokens.ts
+++ b/src-network-providers/networkProvider/tokens.ts
@@ -1,7 +1,6 @@
 import { BigNumber } from "bignumber.js";
-import { Address } from "../address";
-import { IFungibleTokenOfAccountOnNetwork, INonFungibleTokenOfAccountOnNetwork } from "./interface";
-import { Nonce } from "../nonce";
+import { Address, Nonce } from "./primitives";
+import { IAddress, IFungibleTokenOfAccountOnNetwork, INonce, INonFungibleTokenOfAccountOnNetwork } from "./interface";
 
 export class FungibleTokenOfAccountOnNetwork implements IFungibleTokenOfAccountOnNetwork {
     identifier: string = "";
@@ -22,8 +21,8 @@ export class NonFungibleTokenOfAccountOnNetwork implements INonFungibleTokenOfAc
     collection: string = "";
     attributes: Buffer = Buffer.from([]);
     balance: BigNumber = new BigNumber(0);
-    nonce: Nonce = new Nonce(0);
-    creator: Address = new Address("");
+    nonce: INonce = new Nonce(0);
+    creator: IAddress = new Address("");
     royalties: BigNumber = new BigNumber(0);
 
     static fromProxyHttpResponse(payload: any): NonFungibleTokenOfAccountOnNetwork {
diff --git a/src-network-providers/networkProvider/transactionCompletionStrategy.ts b/src-network-providers/networkProvider/transactionCompletionStrategy.ts
index afdff5642..60de758ed 100644
--- a/src-network-providers/networkProvider/transactionCompletionStrategy.ts
+++ b/src-network-providers/networkProvider/transactionCompletionStrategy.ts
@@ -1,7 +1,7 @@
 import { TransactionStatus } from "./transactionStatus";
-import { isPaddedHex } from "../utils.codec";
 import { ITransactionPayload } from "./interface";
 import { TransactionLogs } from "./transactionLogs";
+import { isPaddedHex } from "./primitives";
 
 /**
  * Internal interface: a transaction, as seen from the perspective of a {@link TransactionCompletionStrategy}.
@@ -56,7 +56,7 @@ export class TransactionCompletionStrategy {
         let prefix = parts[0];
         let otherParts = parts.slice(1);
         let emptyPrefix = !prefix;
-        let somePartsAreNotValidArguments = !otherParts.every(this.looksLikeValidArgument);
+        let somePartsAreNotValidArguments = !otherParts.every(part => this.looksLikeValidArgument(part));
         
         return emptyPrefix || somePartsAreNotValidArguments;
     }
diff --git a/src-network-providers/networkProvider/transactionEvents.ts b/src-network-providers/networkProvider/transactionEvents.ts
index 60c8e75b2..3ff2a5c4e 100644
--- a/src-network-providers/networkProvider/transactionEvents.ts
+++ b/src-network-providers/networkProvider/transactionEvents.ts
@@ -1,12 +1,13 @@
-import { Address } from "../address";
+import { IAddress } from "./interface";
+import { Address } from "./primitives";
 
 export class TransactionEvent {
-    readonly address: Address;
+    readonly address: IAddress;
     readonly identifier: string;
     readonly topics: TransactionEventTopic[];
     readonly data: string;
 
-    constructor(address: Address, identifier: string, topics: TransactionEventTopic[], data: string) {
+    constructor(address: IAddress, identifier: string, topics: TransactionEventTopic[], data: string) {
         this.address = address;
         this.identifier = identifier;
         this.topics = topics;
diff --git a/src-network-providers/networkProvider/transactionLogs.ts b/src-network-providers/networkProvider/transactionLogs.ts
index 21be82b4d..91586ef00 100644
--- a/src-network-providers/networkProvider/transactionLogs.ts
+++ b/src-network-providers/networkProvider/transactionLogs.ts
@@ -1,18 +1,19 @@
-import { Address } from "../address";
-import { ErrUnexpectedCondition } from "../errors";
+import { ErrUnexpectedCondition } from "./errors";
+import { IAddress } from "./interface";
+import { Address } from "./primitives";
 import { TransactionEvent } from "./transactionEvents";
 
 export class TransactionLogs {
-    readonly address: Address;
+    readonly address: IAddress;
     readonly events: TransactionEvent[];
 
-    constructor(address: Address, events: TransactionEvent[]) {
+    constructor(address: IAddress, events: TransactionEvent[]) {
         this.address = address;
         this.events = events;
     }
 
     static empty(): TransactionLogs {
-        return new TransactionLogs(new Address(), []);
+        return new TransactionLogs(new Address(""), []);
     }
 
     static fromHttpResponse(logs: any): TransactionLogs {
diff --git a/src-network-providers/networkProvider/transactionReceipt.ts b/src-network-providers/networkProvider/transactionReceipt.ts
index 8a6e6ec27..358661692 100644
--- a/src-network-providers/networkProvider/transactionReceipt.ts
+++ b/src-network-providers/networkProvider/transactionReceipt.ts
@@ -1,12 +1,11 @@
-import { Address } from "../address";
-import { Balance } from "../balance";
-import { TransactionHash } from "../transaction";
+import { IAddress, IHash } from "./interface";
+import { Address, Hash, TransactionValue } from "./primitives";
 
 export class TransactionReceipt {
-    value: Balance = Balance.Zero();
-    sender: Address = new Address();
+    value: TransactionValue = new TransactionValue("");
+    sender: IAddress = new Address("");
     data: string = "";
-    hash: TransactionHash = TransactionHash.empty();
+    hash: IHash = new Hash("");
 
     static fromHttpResponse(response: {
         value: string,
@@ -16,10 +15,10 @@ export class TransactionReceipt {
     }): TransactionReceipt {
         let receipt = new TransactionReceipt();
 
-        receipt.value = Balance.fromString(response.value);
+        receipt.value = new TransactionValue(response.value);
         receipt.sender = new Address(response.sender);
         receipt.data = response.data;
-        receipt.hash = new TransactionHash(response.txHash);
+        receipt.hash = new Hash(response.txHash);
 
         return receipt;
     }

From f6cbf031744a28b18d6107959550922fc914caa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 5 Apr 2022 23:04:44 +0300
Subject: [PATCH 060/338] Continue decoupling.

---
 .../networkProvider/apiNetworkProvider.ts     | 14 +++---
 .../networkProvider/config.ts                 | 11 +++++
 .../networkProvider/contractResults.ts        | 43 ++++++++-----------
 .../networkProvider/interface.ts              | 10 ++++-
 .../networkProvider/proxyNetworkProvider.ts   | 14 +++---
 .../networkProvider/transactions.ts           |  6 +--
 6 files changed, 53 insertions(+), 45 deletions(-)
 create mode 100644 src-network-providers/networkProvider/config.ts

diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
index 57a65d5c1..6bed3490c 100644
--- a/src-network-providers/networkProvider/apiNetworkProvider.ts
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -1,14 +1,11 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "../account";
-import { defaultConfig } from "../constants";
-import { IAddress, IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonce, INonFungibleTokenOfAccountOnNetwork, Pagination } from "./interface";
-import { Logger } from "../logger";
+import { IAddress, IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonce, INonFungibleTokenOfAccountOnNetwork, ITransaction, Pagination } from "./interface";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
 import { NetworkStatus } from "../networkStatus";
 import { Query } from "../smartcontracts";
 import { Stats } from "../stats";
-import { Transaction } from "../transaction";
 import { ContractQueryResponse } from "./contractResults";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
@@ -17,6 +14,7 @@ import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 import { Hash } from "./primitives";
 import { ErrNetworkProvider } from "./errors";
+import { defaultAxiosConfig } from "./config";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ApiNetworkProvider implements INetworkProvider {
@@ -26,7 +24,7 @@ export class ApiNetworkProvider implements INetworkProvider {
 
     constructor(url: string, config?: AxiosRequestConfig) {
         this.url = url;
-        this.config = { ...defaultConfig, ...config };
+        this.config = { ...defaultAxiosConfig, ...config };
         this.backingProxyNetworkProvider = new ProxyNetworkProvider(url, config);
     }
 
@@ -104,13 +102,13 @@ export class ApiNetworkProvider implements INetworkProvider {
         return status;
     }
 
-    async sendTransaction(tx: Transaction): Promise<IHash> {
+    async sendTransaction(tx: ITransaction): Promise<IHash> {
         let response = await this.doPostGeneric("transactions", tx.toSendable());
         let hash = new Hash(response.txHash);
         return hash;
     }
 
-    async simulateTransaction(tx: Transaction): Promise<any> {
+    async simulateTransaction(tx: ITransaction): Promise<any> {
         return await this.backingProxyNetworkProvider.simulateTransaction(tx);
     }
 
@@ -181,7 +179,7 @@ export class ApiNetworkProvider implements INetworkProvider {
 
     private handleApiError(error: any, resourceUrl: string) {
         if (!error.response) {
-            Logger.warn(error);
+            console.warn(error);
             throw new ErrNetworkProvider(resourceUrl, error.toString(), error);
         }
 
diff --git a/src-network-providers/networkProvider/config.ts b/src-network-providers/networkProvider/config.ts
new file mode 100644
index 000000000..9d352c9d1
--- /dev/null
+++ b/src-network-providers/networkProvider/config.ts
@@ -0,0 +1,11 @@
+const JSONbig = require("json-bigint");
+
+export const defaultAxiosConfig = {
+    timeout: 1000,
+    // See: https://github.com/axios/axios/issues/983 regarding transformResponse
+    transformResponse: [
+        function (data: any) {
+            return JSONbig.parse(data);
+        }
+    ]
+};
diff --git a/src-network-providers/networkProvider/contractResults.ts b/src-network-providers/networkProvider/contractResults.ts
index 57c625e40..9f3880276 100644
--- a/src-network-providers/networkProvider/contractResults.ts
+++ b/src-network-providers/networkProvider/contractResults.ts
@@ -1,14 +1,9 @@
 import { BigNumber } from "bignumber.js";
-import { Address } from "../address";
-import { Balance } from "../balance";
-import { Hash } from "../hash";
-import { IContractQueryResponse } from "./interface";
-import { GasLimit, GasPrice } from "../networkParams";
-import { Nonce } from "../nonce";
-import { TransactionHash } from "../transaction";
+import { IAddress, IContractQueryResponse, IGasLimit, IGasPrice, IHash, INonce } from "./interface";
 import { TransactionLogs } from "./transactionLogs";
 import { ReturnCode } from "../smartcontracts/returnCode";
 import { MaxUint64 } from "../smartcontracts/query";
+import { Address, Hash, Nonce, TransactionValue } from "./primitives";
 
 export class ContractResults {
     readonly items: ContractResultItem[];
@@ -37,16 +32,16 @@ export class ContractResults {
 }
 
 export class ContractResultItem {
-    hash: Hash = Hash.empty();
-    nonce: Nonce = new Nonce(0);
-    value: Balance = Balance.Zero();
-    receiver: Address = new Address();
-    sender: Address = new Address();
+    hash: IHash = new Hash("")
+    nonce: INonce = new Nonce(0);
+    value: TransactionValue = new TransactionValue("");
+    receiver: IAddress = new Address("");
+    sender: IAddress = new Address("");
     data: string = "";
-    previousHash: Hash = Hash.empty();
-    originalHash: Hash = Hash.empty();
-    gasLimit: GasLimit = new GasLimit(0);
-    gasPrice: GasPrice = new GasPrice(0);
+    previousHash: Hash = new Hash("");
+    originalHash: Hash = new Hash("");
+    gasLimit: IGasLimit = 0;
+    gasPrice: IGasPrice = 0;
     callType: number = 0;
     returnMessage: string = "";
     logs: TransactionLogs = TransactionLogs.empty();
@@ -72,15 +67,15 @@ export class ContractResultItem {
     private static fromHttpResponse(response: any): ContractResultItem {
         let item = new ContractResultItem();
 
-        item.hash = new TransactionHash(response.hash);
+        item.hash = new Hash(response.hash);
         item.nonce = new Nonce(response.nonce || 0);
-        item.value = Balance.fromString(response.value);
+        item.value = new TransactionValue(response.value || "");
         item.receiver = new Address(response.receiver);
         item.sender = new Address(response.sender);
-        item.previousHash = new TransactionHash(response.prevTxHash);
-        item.originalHash = new TransactionHash(response.originalTxHash);
-        item.gasLimit = new GasLimit(response.gasLimit);
-        item.gasPrice = new GasPrice(response.gasPrice);
+        item.previousHash = new Hash(response.prevTxHash);
+        item.originalHash = new Hash(response.originalTxHash);
+        item.gasLimit = response.gasLimit || 0;
+        item.gasPrice = response.gasPrice || 0;
         item.data = response.data || "";
         item.callType = response.callType;
         item.returnMessage = response.returnMessage;
@@ -95,7 +90,7 @@ export class ContractQueryResponse implements IContractQueryResponse {
     returnData: string[] = [];
     returnCode: ReturnCode = ReturnCode.None;
     returnMessage: string = "";
-    gasUsed: GasLimit = new GasLimit(0);
+    gasUsed: IGasLimit = 0;
 
     static fromHttpResponse(payload: any): ContractQueryResponse {
         let response = new ContractQueryResponse();
@@ -104,7 +99,7 @@ export class ContractQueryResponse implements IContractQueryResponse {
         response.returnData = payload["returnData"] || [];
         response.returnCode = payload["returnCode"] || "";
         response.returnMessage = payload["returnMessage"] || "";
-        response.gasUsed = new GasLimit(MaxUint64.minus(gasRemaining).toNumber());
+        response.gasUsed = MaxUint64.minus(gasRemaining).toNumber();
 
         return response;
     }
diff --git a/src-network-providers/networkProvider/interface.ts b/src-network-providers/networkProvider/interface.ts
index 0b822b68b..9bfb77441 100644
--- a/src-network-providers/networkProvider/interface.ts
+++ b/src-network-providers/networkProvider/interface.ts
@@ -165,7 +165,7 @@ export interface IContractQueryResponse {
     returnData: string[];
     returnCode: ReturnCode;
     returnMessage: string;
-    gasUsed: GasLimit;
+    gasUsed: IGasLimit;
 
     getReturnDataParts(): Buffer[];
 }
@@ -182,8 +182,14 @@ export class Pagination {
     }
 }
 
+export interface ITransaction {
+    toSendable(): any;
+}
+
 export interface IHexable { hex(): string }
-export interface IHash extends IHexable { };
+export interface IHash extends IHexable { }
 export interface IAddress { bech32(): string; }
 export interface INonce extends IHexable { valueOf(): number; }
 export interface ITransactionPayload { encoded(): string; }
+export interface IGasLimit { valueOf(): number; }
+export interface IGasPrice { valueOf(): number; }
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index cba920d8a..00201c284 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -1,20 +1,18 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "../account";
-import { defaultConfig } from "../constants";
-import { IAddress, IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonce, INonFungibleTokenOfAccountOnNetwork, Pagination } from "./interface";
-import { Logger } from "../logger";
+import { IAddress, IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonce, INonFungibleTokenOfAccountOnNetwork, ITransaction, Pagination } from "./interface";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
 import { NetworkStatus } from "../networkStatus";
 import { Query } from "../smartcontracts";
 import { Stats } from "../stats";
-import { Transaction } from "../transaction";
 import { ContractQueryResponse } from "./contractResults";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 import { Hash } from "./primitives";
 import { ErrNetworkProvider } from "./errors";
+import { defaultAxiosConfig } from "./config";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ProxyNetworkProvider implements INetworkProvider {
@@ -23,7 +21,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
 
     constructor(url: string, config?: AxiosRequestConfig) {
         this.url = url;
-        this.config = { ...defaultConfig, ...config };
+        this.config = { ...defaultAxiosConfig, ...config };
     }
 
     async getNetworkConfig(): Promise<NetworkConfig> {
@@ -107,13 +105,13 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return status;
     }
 
-    async sendTransaction(tx: Transaction): Promise<IHash> {
+    async sendTransaction(tx: ITransaction): Promise<IHash> {
         let response = await this.doPostGeneric("transaction/send", tx.toSendable());
         let hash = new Hash(response.txHash);
         return hash;
     }
 
-    async simulateTransaction(tx: Transaction): Promise<any> {
+    async simulateTransaction(tx: ITransaction): Promise<any> {
         let response = await this.doPostGeneric("transaction/simulate", tx.toSendable());
         return response;
     }
@@ -193,7 +191,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
 
     private handleApiError(error: any, resourceUrl: string) {
         if (!error.response) {
-            Logger.warn(error);
+            console.warn(error);
             throw new ErrNetworkProvider(resourceUrl, error.toString(), error);
         }
 
diff --git a/src-network-providers/networkProvider/transactions.ts b/src-network-providers/networkProvider/transactions.ts
index 60d73e6ed..632c19f8e 100644
--- a/src-network-providers/networkProvider/transactions.ts
+++ b/src-network-providers/networkProvider/transactions.ts
@@ -1,7 +1,7 @@
 import { TransactionStatus } from "./transactionStatus";
 import { ContractResults } from "./contractResults";
 import { Address, Hash, Nonce, TransactionValue, TransactionPayload } from "./primitives";
-import { IAddress, IHash, INonce, ITransactionPayload } from "./interface";
+import { IAddress, IGasLimit, IGasPrice, IHash, INonce, ITransactionPayload } from "./interface";
 import { TransactionCompletionStrategy } from "./transactionCompletionStrategy";
 import { TransactionEvent } from "./transactionEvents";
 import { TransactionLogs } from "./transactionLogs";
@@ -16,8 +16,8 @@ import { TransactionReceipt } from "./transactionReceipt";
     value: TransactionValue = new TransactionValue("");
     receiver: IAddress = new Address("");
     sender: IAddress = new Address("");
-    gasPrice: number = 0;
-    gasLimit: number = 0;
+    gasLimit: IGasLimit = 0;
+    gasPrice: IGasPrice = 0;
     data: ITransactionPayload = new TransactionPayload("");
     signature: string = "";
     status: TransactionStatus = TransactionStatus.createUnknown();

From 2aa4f2cc2abdae91fd611eaa669701f3291ac806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 5 Apr 2022 23:16:47 +0300
Subject: [PATCH 061/338] Continue decoupling.

---
 .../networkProvider/contractResults.ts             |  9 ++++-----
 src-network-providers/networkProvider/interface.ts | 14 ++++++++------
 .../networkProvider/primitives.ts                  | 12 ++++++++++++
 .../networkProvider/providers.dev.net.spec.ts      |  6 ++----
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src-network-providers/networkProvider/contractResults.ts b/src-network-providers/networkProvider/contractResults.ts
index 9f3880276..71f12e0cb 100644
--- a/src-network-providers/networkProvider/contractResults.ts
+++ b/src-network-providers/networkProvider/contractResults.ts
@@ -1,9 +1,8 @@
 import { BigNumber } from "bignumber.js";
-import { IAddress, IContractQueryResponse, IGasLimit, IGasPrice, IHash, INonce } from "./interface";
+import { IAddress, IContractQueryResponse, IContractReturnCode, IGasLimit, IGasPrice, IHash, INonce } from "./interface";
 import { TransactionLogs } from "./transactionLogs";
-import { ReturnCode } from "../smartcontracts/returnCode";
 import { MaxUint64 } from "../smartcontracts/query";
-import { Address, Hash, Nonce, TransactionValue } from "./primitives";
+import { Address, ContractReturnCode, Hash, Nonce, TransactionValue } from "./primitives";
 
 export class ContractResults {
     readonly items: ContractResultItem[];
@@ -88,7 +87,7 @@ export class ContractResultItem {
 
 export class ContractQueryResponse implements IContractQueryResponse {
     returnData: string[] = [];
-    returnCode: ReturnCode = ReturnCode.None;
+    returnCode: IContractReturnCode = new ContractReturnCode("");
     returnMessage: string = "";
     gasUsed: IGasLimit = 0;
 
@@ -97,7 +96,7 @@ export class ContractQueryResponse implements IContractQueryResponse {
         let gasRemaining = new BigNumber(payload["gasRemaining"] || payload["GasRemaining"] || 0);
 
         response.returnData = payload["returnData"] || [];
-        response.returnCode = payload["returnCode"] || "";
+        response.returnCode = new ContractReturnCode(payload["returnCode"] || "");
         response.returnMessage = payload["returnMessage"] || "";
         response.gasUsed = MaxUint64.minus(gasRemaining).toNumber();
 
diff --git a/src-network-providers/networkProvider/interface.ts b/src-network-providers/networkProvider/interface.ts
index 9bfb77441..5d4a2c453 100644
--- a/src-network-providers/networkProvider/interface.ts
+++ b/src-network-providers/networkProvider/interface.ts
@@ -1,12 +1,10 @@
 import { BigNumber } from "bignumber.js";
 import { AccountOnNetwork } from "../account";
 import { NetworkConfig } from "../networkConfig";
-import { GasLimit } from "../networkParams";
 import { NetworkStake } from "../networkStake";
 import { NetworkStatus } from "../networkStatus";
-import { Query, ReturnCode } from "../smartcontracts";
+import { Query } from "../smartcontracts";
 import { Stats } from "../stats";
-import { Transaction } from "../transaction";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 
@@ -72,13 +70,13 @@ export interface INetworkProvider {
     /**
      * Broadcasts an already-signed {@link Transaction}.
      */
-    sendTransaction(tx: Transaction): Promise<IHash>;
+    sendTransaction(tx: ITransaction): Promise<IHash>;
 
     /**
      * Simulates the processing of an already-signed {@link Transaction}.
      * 
      */
-    simulateTransaction(tx: Transaction): Promise<IContractSimulation>;
+    simulateTransaction(tx: ITransaction): Promise<IContractSimulation>;
 
     /**
      * Queries a Smart Contract - runs a pure function defined by the contract and returns its results.
@@ -163,13 +161,17 @@ export interface IDefinitionOfTokenCollectionOnNetwork {
 
 export interface IContractQueryResponse {
     returnData: string[];
-    returnCode: ReturnCode;
+    returnCode: IContractReturnCode;
     returnMessage: string;
     gasUsed: IGasLimit;
 
     getReturnDataParts(): Buffer[];
 }
 
+export interface IContractReturnCode {
+    toString(): string;
+}
+
 export interface IContractSimulation {
 }
 
diff --git a/src-network-providers/networkProvider/primitives.ts b/src-network-providers/networkProvider/primitives.ts
index 30efe13aa..25d4e5191 100644
--- a/src-network-providers/networkProvider/primitives.ts
+++ b/src-network-providers/networkProvider/primitives.ts
@@ -64,6 +64,18 @@ export class TransactionPayload implements ITransactionPayload {
     }
 }
 
+export class ContractReturnCode {
+    private readonly value: string;
+
+    constructor(value: string) {
+        this.value = value;
+    }
+
+    toString() {
+        return this.value;
+    }
+}
+
 export function numberToPaddedHex(value: number) {
     let hex = value.toString(16);
     return zeroPadStringIfOddLength(hex);
diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/networkProvider/providers.dev.net.spec.ts
index 479fd40b7..2c8d8787a 100644
--- a/src-network-providers/networkProvider/providers.dev.net.spec.ts
+++ b/src-network-providers/networkProvider/providers.dev.net.spec.ts
@@ -1,17 +1,15 @@
 import { assert } from "chai";
 import { INetworkProvider } from "./interface";
-import { Address } from "../address";
 import { loadTestWallets, TestWallet } from "../testutils";
 import { TransactionHash } from "../transaction";
-import { Nonce } from "../nonce";
 import { ContractFunction, Query } from "../smartcontracts";
 import { BigUIntValue, U32Value, BytesValue, VariadicValue, VariadicType, CompositeType, BytesType, BooleanType } from "../smartcontracts/typesystem";
 import { BigNumber } from "bignumber.js";
-import { Balance } from "../balance";
 import { ApiNetworkProvider } from "./apiNetworkProvider";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
+import { Address, Nonce, TransactionValue } from "./primitives";
 
 describe("test network providers on devnet: Proxy and API", function () {
     let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 10000 });
@@ -247,7 +245,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         query = new Query({
             address: new Address("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u"),
             func: new ContractFunction("issue"),
-            value: Balance.egld(0.05),
+            value: new TransactionValue("42"),
             args: [
                 BytesValue.fromUTF8("FOO"),
                 BytesValue.fromUTF8("FOO"),

From 52dfa3190d53fff7f00c4ab1d60bdc95682489c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 5 Apr 2022 23:36:45 +0300
Subject: [PATCH 062/338] Fix after self review.

---
 src-network-providers/networkProvider/transactions.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src-network-providers/networkProvider/transactions.ts b/src-network-providers/networkProvider/transactions.ts
index 632c19f8e..6df35186f 100644
--- a/src-network-providers/networkProvider/transactions.ts
+++ b/src-network-providers/networkProvider/transactions.ts
@@ -85,8 +85,7 @@ import { TransactionReceipt } from "./transactionReceipt";
     }
 
     isCompleted(): boolean {
-        // TODO: When using separate constructors of TransactionOnNetwork (for API response vs. for Gateway response, see package "networkProvider"),
-        // we will be able to use different transaction completion strategies.
+        // TODO: use different transaction completion strategies - API / Proxy.
         return new TransactionCompletionStrategy().isCompleted(this);
     }
 

From f1efc27094d97648661fb13056b1c33f695a5d6d Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 6 Apr 2022 10:17:35 +0300
Subject: [PATCH 063/338] Fixes (upon running the tests).

---
 src-network-providers/networkProvider/primitives.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src-network-providers/networkProvider/primitives.ts b/src-network-providers/networkProvider/primitives.ts
index 25d4e5191..2f77a8769 100644
--- a/src-network-providers/networkProvider/primitives.ts
+++ b/src-network-providers/networkProvider/primitives.ts
@@ -53,14 +53,18 @@ export class TransactionValue {
 }
 
 export class TransactionPayload implements ITransactionPayload {
-    private readonly base64: string;
+    private readonly decoded: Buffer;
 
-    constructor(base64: string) {
-        this.base64 = base64;
+    constructor(encoded: string) {
+        this.decoded = Buffer.from(encoded || "", "base64");
     }
 
     encoded(): string {
-        return this.base64;
+        return this.decoded.toString("base64");
+    }
+
+    toString() {
+        return this.decoded.toString();
     }
 }
 

From 68c29465c694f985b244f3eef541b1bd19a7db5e Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 6 Apr 2022 10:50:45 +0300
Subject: [PATCH 064/338] Tests and fixes.

---
 .../networkProvider/contractResults.ts        |  6 +--
 .../networkProvider/providers.dev.net.spec.ts | 39 +++++++------------
 .../networkProvider/transactions.ts           |  4 +-
 3 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/src-network-providers/networkProvider/contractResults.ts b/src-network-providers/networkProvider/contractResults.ts
index 71f12e0cb..3d9b4299e 100644
--- a/src-network-providers/networkProvider/contractResults.ts
+++ b/src-network-providers/networkProvider/contractResults.ts
@@ -68,13 +68,13 @@ export class ContractResultItem {
 
         item.hash = new Hash(response.hash);
         item.nonce = new Nonce(response.nonce || 0);
-        item.value = new TransactionValue(response.value || "");
+        item.value = new TransactionValue((response.value || 0).toString());
         item.receiver = new Address(response.receiver);
         item.sender = new Address(response.sender);
         item.previousHash = new Hash(response.prevTxHash);
         item.originalHash = new Hash(response.originalTxHash);
-        item.gasLimit = response.gasLimit || 0;
-        item.gasPrice = response.gasPrice || 0;
+        item.gasLimit = Number(response.gasLimit || 0);
+        item.gasPrice = Number(response.gasPrice || 0);
         item.data = response.data || "";
         item.callType = response.callType;
         item.returnMessage = response.returnMessage;
diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/networkProvider/providers.dev.net.spec.ts
index 2c8d8787a..0b21855a5 100644
--- a/src-network-providers/networkProvider/providers.dev.net.spec.ts
+++ b/src-network-providers/networkProvider/providers.dev.net.spec.ts
@@ -103,17 +103,12 @@ describe("test network providers on devnet: Proxy and API", function () {
         this.timeout(20000);
 
         let hashes = [
-            new TransactionHash("b41f5fc39e96b1f194d07761c6efd6cb92278b95f5012ab12cbc910058ca8b54"),
-            new TransactionHash("7757397a59378e9d0f6d5f08cc934c260e33a50ae0d73fdf869f7c02b6b47b33"),
-            new TransactionHash("b87238089e81527158a6daee520280324bc7e5322ba54d1b3c9a5678abe953ea"),
-            new TransactionHash("b45dd5e598bc85ba71639f2cbce8c5dff2fbe93159e637852fddeb16c0e84a48"),
-            new TransactionHash("83db780e98d4d3c917668c47b33ba51445591efacb0df2a922f88e7dfbb5fc7d"),
-            new TransactionHash("c2eb62b28cc7320da2292d87944c5424a70e1f443323c138c1affada7f6e9705"),
-            // TODO: Uncomment once the Gateway returns all SCRs in this case, as well.
-            // new TransactionHash("98e913c2a78cafdf4fa7f0113c1285fb29c2409bd7a746bb6f5506ad76841d54"),
-            new TransactionHash("5b05945be8ba2635e7c13d792ad727533494358308b5fcf36a816e52b5b272b8"),
-            new TransactionHash("47b089b5f0220299a017359003694a01fd75d075100166b8072c418d5143fe06"),
-            new TransactionHash("85021f20b06662240d8302d62f68031bbf7261bacb53b84e3dc9346c0f10a8e7")
+            new TransactionHash("a069c663831002651fd542479869cc61103465f3284dace772e7480f81429fa8"),
+            new TransactionHash("de3bc87f3e057e28ea6a625acd6d6d332e24f35ea73e820462b71256c8ecffb7"),
+            new TransactionHash("dbefa0299fe6b2336eb0bc3123fa623845c276e5c6e2a175adf1a562d5e77718"),
+            new TransactionHash("2a8ccbd91b7d9460a86174b5a8d4e6aa073b38674d1ee8107e728980a66f0676"),
+            // TODO: uncomment after fix (SCR missing on API)
+            // new TransactionHash("be7914b1eb4c6bd352ba1d86991959b443e446e0ad49fb796be3495c287b2472")
         ];
 
         for (const hash of hashes) {
@@ -131,6 +126,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         apiResponse.status = proxyResponse.status = new TransactionStatus("ignore");
 
         // Ignore fields which are not present on API response:
+        proxyResponse.type = "";
         proxyResponse.epoch = 0;
         proxyResponse.blockNonce = 0;
         proxyResponse.hyperblockNonce = 0;
@@ -142,16 +138,11 @@ describe("test network providers on devnet: Proxy and API", function () {
         this.timeout(20000);
 
         let hashes = [
-            new TransactionHash("b41f5fc39e96b1f194d07761c6efd6cb92278b95f5012ab12cbc910058ca8b54"),
-            new TransactionHash("7757397a59378e9d0f6d5f08cc934c260e33a50ae0d73fdf869f7c02b6b47b33"),
-            new TransactionHash("b87238089e81527158a6daee520280324bc7e5322ba54d1b3c9a5678abe953ea"),
-            new TransactionHash("b45dd5e598bc85ba71639f2cbce8c5dff2fbe93159e637852fddeb16c0e84a48"),
-            new TransactionHash("83db780e98d4d3c917668c47b33ba51445591efacb0df2a922f88e7dfbb5fc7d"),
-            new TransactionHash("c2eb62b28cc7320da2292d87944c5424a70e1f443323c138c1affada7f6e9705"),
-            new TransactionHash("98e913c2a78cafdf4fa7f0113c1285fb29c2409bd7a746bb6f5506ad76841d54"),
-            new TransactionHash("5b05945be8ba2635e7c13d792ad727533494358308b5fcf36a816e52b5b272b8"),
-            new TransactionHash("47b089b5f0220299a017359003694a01fd75d075100166b8072c418d5143fe06"),
-            new TransactionHash("85021f20b06662240d8302d62f68031bbf7261bacb53b84e3dc9346c0f10a8e7")
+            new TransactionHash("a069c663831002651fd542479869cc61103465f3284dace772e7480f81429fa8"),
+            new TransactionHash("de3bc87f3e057e28ea6a625acd6d6d332e24f35ea73e820462b71256c8ecffb7"),
+            new TransactionHash("dbefa0299fe6b2336eb0bc3123fa623845c276e5c6e2a175adf1a562d5e77718"),
+            new TransactionHash("2a8ccbd91b7d9460a86174b5a8d4e6aa073b38674d1ee8107e728980a66f0676"),
+            new TransactionHash("be7914b1eb4c6bd352ba1d86991959b443e446e0ad49fb796be3495c287b2472")
         ];
 
         for (const hash of hashes) {
@@ -165,7 +156,7 @@ describe("test network providers on devnet: Proxy and API", function () {
     it("should have same response for getDefinitionOfFungibleToken()", async function () {
         this.timeout(10000);
 
-        let identifiers = ["MEX-b6bb7d", "WEGLD-88600a", "RIDE-482531", "USDC-a32906"];
+        let identifiers = ["FOO-b6f543", "BAR-c80d29", "COUNTER-b7401d"];
 
         for (const identifier of identifiers) {
             let apiResponse = await apiProvider.getDefinitionOfFungibleToken(identifier);
@@ -181,7 +172,7 @@ describe("test network providers on devnet: Proxy and API", function () {
     it("should have same response for getDefinitionOfTokenCollection()", async function () {
         this.timeout(10000);
 
-        let collections = ["LKMEX-9acade", "LKFARM-c20c1c", "MEXFARM-bab93a", "ART-264971", "MOS-ff0040"];
+        let collections = ["ERDJS-38f249"];
 
         for (const collection of collections) {
             let apiResponse = await apiProvider.getDefinitionOfTokenCollection(collection);
@@ -197,7 +188,7 @@ describe("test network providers on devnet: Proxy and API", function () {
     it("should have same response for getNonFungibleToken()", async function () {
         this.timeout(10000);
 
-        let tokens = [{ id: "ERDJSNFT-4a5669", nonce: new Nonce(1) }];
+        let tokens = [{ id: "ERDJS-38f249", nonce: new Nonce(1) }];
 
         for (const token of tokens) {
             let apiResponse = await apiProvider.getNonFungibleToken(token.id, token.nonce);
diff --git a/src-network-providers/networkProvider/transactions.ts b/src-network-providers/networkProvider/transactions.ts
index 6df35186f..4cd351cb3 100644
--- a/src-network-providers/networkProvider/transactions.ts
+++ b/src-network-providers/networkProvider/transactions.ts
@@ -60,7 +60,7 @@ import { TransactionReceipt } from "./transactionReceipt";
         result.nonce = new Nonce(response.nonce || 0);
         result.round = response.round;
         result.epoch = response.epoch || 0;
-        result.value = new TransactionValue(response.value);
+        result.value = new TransactionValue((response.value || 0).toString());
         result.sender = new Address(response.sender);
         result.receiver = new Address(response.receiver);
         result.gasPrice = response.gasPrice || 0;
@@ -71,7 +71,7 @@ import { TransactionReceipt } from "./transactionReceipt";
 
         result.blockNonce = response.blockNonce || 0;
         result.hyperblockNonce = response.hyperblockNonce || 0;
-        result.hyperblockHash = response.hyperblockHash;
+        result.hyperblockHash = response.hyperblockHash || "";
         result.pendingResults = response.pendingResults || false;
 
         result.receipt = TransactionReceipt.fromHttpResponse(response.receipt || {});

From dd1369038f9c484787c3028a9fddb3792a1f2782 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 6 Apr 2022 11:21:15 +0300
Subject: [PATCH 065/338] Remove deprecated status (fix after review).

---
 src-network-providers/networkProvider/transactionStatus.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src-network-providers/networkProvider/transactionStatus.ts b/src-network-providers/networkProvider/transactionStatus.ts
index e7346cf87..bb509cbcf 100644
--- a/src-network-providers/networkProvider/transactionStatus.ts
+++ b/src-network-providers/networkProvider/transactionStatus.ts
@@ -27,8 +27,7 @@ export class TransactionStatus {
     isPending(): boolean {
         return (
             this.status == "received" ||
-            this.status == "pending" ||
-            this.status == "partially-executed"
+            this.status == "pending"
         );
     }
 

From 22640f35a296a769c228012f7ee7399cee59d47d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 6 Apr 2022 14:03:18 +0300
Subject: [PATCH 066/338] Move "accountOnNetwork" to "networkProvider". Further
 decoupling.

---
 .../networkProvider/accounts.ts               | 30 +++++++++++++++++++
 .../networkProvider/apiNetworkProvider.ts     |  2 +-
 .../networkProvider/interface.ts              |  3 +-
 .../networkProvider/primitives.ts             | 12 ++++++++
 .../networkProvider/proxyNetworkProvider.ts   |  2 +-
 5 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 src-network-providers/networkProvider/accounts.ts

diff --git a/src-network-providers/networkProvider/accounts.ts b/src-network-providers/networkProvider/accounts.ts
new file mode 100644
index 000000000..6c7133588
--- /dev/null
+++ b/src-network-providers/networkProvider/accounts.ts
@@ -0,0 +1,30 @@
+import { IAccountBalance, IAddress, INonce } from "./interface";
+import { AccountBalance, Address, Nonce } from "./primitives";
+
+/**
+ * A plain view of an account, as queried from the Network.
+ */
+ export class AccountOnNetwork {
+    address: IAddress = new Address("");
+    nonce: INonce = new Nonce(0);
+    balance: IAccountBalance = new AccountBalance("");
+    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"] || 0);
+        result.nonce = new Nonce(payload["nonce"] || 0);
+        result.balance = new AccountBalance(payload["balance"] || "0");
+        result.code = payload["code"] || "";
+        result.userName = payload["username"] || "";
+
+        return result;
+    }
+}
+
diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
index 6bed3490c..4be146c44 100644
--- a/src-network-providers/networkProvider/apiNetworkProvider.ts
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -1,5 +1,5 @@
 import axios, { AxiosRequestConfig } from "axios";
-import { AccountOnNetwork } from "../account";
+import { AccountOnNetwork } from "./accounts";
 import { IAddress, IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonce, INonFungibleTokenOfAccountOnNetwork, ITransaction, Pagination } from "./interface";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
diff --git a/src-network-providers/networkProvider/interface.ts b/src-network-providers/networkProvider/interface.ts
index 5d4a2c453..6bd5232e3 100644
--- a/src-network-providers/networkProvider/interface.ts
+++ b/src-network-providers/networkProvider/interface.ts
@@ -1,5 +1,5 @@
 import { BigNumber } from "bignumber.js";
-import { AccountOnNetwork } from "../account";
+import { AccountOnNetwork } from "./accounts";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";
 import { NetworkStatus } from "../networkStatus";
@@ -195,3 +195,4 @@ export interface INonce extends IHexable { valueOf(): number; }
 export interface ITransactionPayload { encoded(): string; }
 export interface IGasLimit { valueOf(): number; }
 export interface IGasPrice { valueOf(): number; }
+export interface IAccountBalance { toString(): string; }
diff --git a/src-network-providers/networkProvider/primitives.ts b/src-network-providers/networkProvider/primitives.ts
index 2f77a8769..0adef98a7 100644
--- a/src-network-providers/networkProvider/primitives.ts
+++ b/src-network-providers/networkProvider/primitives.ts
@@ -80,6 +80,18 @@ export class ContractReturnCode {
     }
 }
 
+export class AccountBalance {
+    private readonly value: string;
+
+    constructor(value: string) {
+        this.value = value;
+    }
+
+    toString(): string {
+        return this.value;
+    }
+}
+
 export function numberToPaddedHex(value: number) {
     let hex = value.toString(16);
     return zeroPadStringIfOddLength(hex);
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index 00201c284..1d7ab16dd 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -1,5 +1,5 @@
 import axios, { AxiosRequestConfig } from "axios";
-import { AccountOnNetwork } from "../account";
+import { AccountOnNetwork } from "./accounts";
 import { IAddress, IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonce, INonFungibleTokenOfAccountOnNetwork, ITransaction, Pagination } from "./interface";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "../networkStake";

From d64729451b7fa244b9389f775ef7a950006c4b38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 6 Apr 2022 14:29:03 +0300
Subject: [PATCH 067/338] Move networkStatus, networkStake to networkProvider
 package.

---
 .../networkProvider/apiNetworkProvider.ts     |  4 +-
 .../networkProvider/interface.ts              |  4 +-
 .../networkProvider/networkStake.ts           | 47 +++++++++++
 .../networkProvider/networkStatus.ts          | 82 +++++++++++++++++++
 .../networkProvider/proxyNetworkProvider.ts   |  4 +-
 5 files changed, 135 insertions(+), 6 deletions(-)
 create mode 100644 src-network-providers/networkProvider/networkStake.ts
 create mode 100644 src-network-providers/networkProvider/networkStatus.ts

diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
index 4be146c44..3e703c241 100644
--- a/src-network-providers/networkProvider/apiNetworkProvider.ts
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -2,8 +2,7 @@ import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "./accounts";
 import { IAddress, IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonce, INonFungibleTokenOfAccountOnNetwork, ITransaction, Pagination } from "./interface";
 import { NetworkConfig } from "../networkConfig";
-import { NetworkStake } from "../networkStake";
-import { NetworkStatus } from "../networkStatus";
+import { NetworkStake } from "./networkStake";
 import { Query } from "../smartcontracts";
 import { Stats } from "../stats";
 import { ContractQueryResponse } from "./contractResults";
@@ -15,6 +14,7 @@ import { TransactionStatus } from "./transactionStatus";
 import { Hash } from "./primitives";
 import { ErrNetworkProvider } from "./errors";
 import { defaultAxiosConfig } from "./config";
+import { NetworkStatus } from "./networkStatus";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ApiNetworkProvider implements INetworkProvider {
diff --git a/src-network-providers/networkProvider/interface.ts b/src-network-providers/networkProvider/interface.ts
index 6bd5232e3..1c6c98f4a 100644
--- a/src-network-providers/networkProvider/interface.ts
+++ b/src-network-providers/networkProvider/interface.ts
@@ -1,12 +1,12 @@
 import { BigNumber } from "bignumber.js";
 import { AccountOnNetwork } from "./accounts";
 import { NetworkConfig } from "../networkConfig";
-import { NetworkStake } from "../networkStake";
-import { NetworkStatus } from "../networkStatus";
+import { NetworkStake } from "./networkStake";
 import { Query } from "../smartcontracts";
 import { Stats } from "../stats";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
+import { NetworkStatus } from "./networkStatus";
 
 /**
  * An interface that defines the endpoints of an HTTP API Provider.
diff --git a/src-network-providers/networkProvider/networkStake.ts b/src-network-providers/networkProvider/networkStake.ts
new file mode 100644
index 000000000..cab48b60b
--- /dev/null
+++ b/src-network-providers/networkProvider/networkStake.ts
@@ -0,0 +1,47 @@
+import BigNumber from "bignumber.js";
+
+/**
+ * An object holding Network stake parameters.
+ */
+export class NetworkStake {
+  private static default: NetworkStake;
+
+  /**
+   * The Total Validators Number.
+   */
+  public TotalValidators: number;
+
+  /**
+   * The Active Validators Number.
+   */
+  public ActiveValidators: number;
+  /**
+   * The Queue Size.
+   */
+  public QueueSize: number;
+  /**
+   * The Total Validators Number.
+   */
+  public TotalStaked: BigNumber;
+
+  constructor() {
+    this.TotalValidators = 0;
+    this.ActiveValidators = 0;
+    this.QueueSize = 0;
+    this.TotalStaked = new BigNumber(0);
+  }
+
+  /**
+   * Constructs a configuration object from a HTTP response (as returned by the provider).
+   */
+  static fromHttpResponse(payload: any): NetworkStake {
+    let networkStake = new NetworkStake();
+
+    networkStake.TotalValidators = Number(payload["totalValidators"]);
+    networkStake.ActiveValidators = Number(payload["activeValidators"]);
+    networkStake.QueueSize = Number(payload["queueSize"]);
+    networkStake.TotalStaked = new BigNumber(payload["totalStaked"]);
+
+    return networkStake;
+  }
+}
diff --git a/src-network-providers/networkProvider/networkStatus.ts b/src-network-providers/networkProvider/networkStatus.ts
new file mode 100644
index 000000000..ec42a479c
--- /dev/null
+++ b/src-network-providers/networkProvider/networkStatus.ts
@@ -0,0 +1,82 @@
+/**
+ * An object holding network status configuration parameters.
+ */
+export class NetworkStatus {
+    private static default: NetworkStatus;
+
+    /**
+     * The current round.
+     */
+    public CurrentRound: number;
+
+    /**
+     * The epoch number.
+     */
+    public EpochNumber: number;
+
+    /**
+     * The Highest final nonce.
+     */
+    public HighestFinalNonce: number;
+
+    /**
+     * The erd nonce.
+     */
+    public Nonce: number;
+
+    /**
+     * The nonce at epoch start.
+     */
+    public NonceAtEpochStart: number;
+
+    /**
+     * The nonces passed in current epoch.
+     */
+    public NoncesPassedInCurrentEpoch: number;
+
+    /**
+     * The round at epoch start
+     */
+    public RoundAtEpochStart: number;
+
+    /**
+     * The rounds passed in current epoch
+     */
+    public RoundsPassedInCurrentEpoch: number;
+
+    /**
+     * The rounds per epoch
+     */
+    public RoundsPerEpoch: number;
+
+    constructor() {
+        this.CurrentRound = 0;
+        this.EpochNumber = 0;
+        this.HighestFinalNonce = 0;
+        this.Nonce = 0;
+        this.NonceAtEpochStart = 0;
+        this.NoncesPassedInCurrentEpoch = 0;
+        this.RoundAtEpochStart = 0;
+        this.RoundsPassedInCurrentEpoch = 0;
+        this.RoundsPerEpoch = 0;
+    }
+
+    /**
+     * Constructs a configuration object from a HTTP response (as returned by the provider).
+     */
+    static fromHttpResponse(payload: any): NetworkStatus {
+        let networkStatus = new NetworkStatus();
+
+        networkStatus.CurrentRound = Number(payload["erd_current_round"]);
+        networkStatus.EpochNumber = Number(payload["erd_epoch_number"]);
+        networkStatus.HighestFinalNonce = Number(payload["erd_highest_final_nonce"]);
+        networkStatus.Nonce = Number(payload["erd_nonce"]);
+        networkStatus.NonceAtEpochStart = Number(payload["erd_nonce_at_epoch_start"]);
+        networkStatus.NoncesPassedInCurrentEpoch = Number(payload["erd_nonces_passed_in_current_epoch"]);
+        networkStatus.RoundAtEpochStart = Number(payload["erd_round_at_epoch_start"]);
+        networkStatus.RoundsPassedInCurrentEpoch = Number(payload["erd_rounds_passed_in_current_epoch"]);
+        networkStatus.RoundsPerEpoch = Number(payload["erd_rounds_per_epoch"]);
+
+        return networkStatus;
+    }
+}
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index 1d7ab16dd..21494b1b7 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -2,8 +2,7 @@ import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "./accounts";
 import { IAddress, IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonce, INonFungibleTokenOfAccountOnNetwork, ITransaction, Pagination } from "./interface";
 import { NetworkConfig } from "../networkConfig";
-import { NetworkStake } from "../networkStake";
-import { NetworkStatus } from "../networkStatus";
+import { NetworkStake } from "./networkStake";
 import { Query } from "../smartcontracts";
 import { Stats } from "../stats";
 import { ContractQueryResponse } from "./contractResults";
@@ -13,6 +12,7 @@ import { TransactionStatus } from "./transactionStatus";
 import { Hash } from "./primitives";
 import { ErrNetworkProvider } from "./errors";
 import { defaultAxiosConfig } from "./config";
+import { NetworkStatus } from "./networkStatus";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ProxyNetworkProvider implements INetworkProvider {

From 96220918e368b5876fc9f7433dafcc0e161c4695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 6 Apr 2022 15:02:14 +0300
Subject: [PATCH 068/338] Move "stats" to networkProvider.

---
 .../networkProvider/apiNetworkProvider.ts     |  2 +-
 .../networkProvider/interface.ts              |  2 +-
 .../networkProvider/proxyNetworkProvider.ts   |  2 +-
 .../networkProvider/stats.ts                  | 69 +++++++++++++++++++
 4 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 src-network-providers/networkProvider/stats.ts

diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
index 3e703c241..cf2bc4288 100644
--- a/src-network-providers/networkProvider/apiNetworkProvider.ts
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -4,7 +4,7 @@ import { IAddress, IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork,
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "./networkStake";
 import { Query } from "../smartcontracts";
-import { Stats } from "../stats";
+import { Stats } from "./stats";
 import { ContractQueryResponse } from "./contractResults";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
diff --git a/src-network-providers/networkProvider/interface.ts b/src-network-providers/networkProvider/interface.ts
index 1c6c98f4a..121821fee 100644
--- a/src-network-providers/networkProvider/interface.ts
+++ b/src-network-providers/networkProvider/interface.ts
@@ -3,7 +3,7 @@ import { AccountOnNetwork } from "./accounts";
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "./networkStake";
 import { Query } from "../smartcontracts";
-import { Stats } from "../stats";
+import { Stats } from "./stats";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 import { NetworkStatus } from "./networkStatus";
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index 21494b1b7..9912ef4a5 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -4,7 +4,7 @@ import { IAddress, IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork,
 import { NetworkConfig } from "../networkConfig";
 import { NetworkStake } from "./networkStake";
 import { Query } from "../smartcontracts";
-import { Stats } from "../stats";
+import { Stats } from "./stats";
 import { ContractQueryResponse } from "./contractResults";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork } from "./transactions";
diff --git a/src-network-providers/networkProvider/stats.ts b/src-network-providers/networkProvider/stats.ts
new file mode 100644
index 000000000..e2c63f965
--- /dev/null
+++ b/src-network-providers/networkProvider/stats.ts
@@ -0,0 +1,69 @@
+/**
+ * An object holding Network stats parameters.
+ */
+export class Stats {
+    private static default: Stats;
+
+    /**
+     * The number of Shards.
+     */
+    public Shards: number;
+
+    /**
+     * The Number of Blocks.
+     */
+    public Blocks: number;
+    /**
+     * The Number of Accounts.
+     */
+    public Accounts: number;
+    /**
+     * The Number of transactions.
+     */
+    public Transactions: number;
+    /**
+     * The Refresh rate.
+     */
+    public RefreshRate: number;
+    /**
+     * The Number of the current Epoch.
+     */
+    public Epoch: number;
+    /**
+     * The Number of rounds passed.
+     */
+    public RoundsPassed: number;
+    /**
+     * The Number of Rounds per epoch.
+     */
+    public RoundsPerEpoch: number;
+
+    constructor() {
+        this.Shards = 0;
+        this.Blocks = 0;
+        this.Accounts = 0;
+        this.Transactions = 0;
+        this.RefreshRate = 0;
+        this.Epoch = 0;
+        this.RoundsPassed = 0;
+        this.RoundsPerEpoch = 0;
+    }
+
+    /**
+     * Constructs a stats object from a HTTP response (as returned by the provider).
+     */
+    static fromHttpResponse(payload: any): Stats {
+        let stats = new Stats();
+
+        stats.Shards = Number(payload["shards"]);
+        stats.Blocks = Number(payload["blocks"]);
+        stats.Accounts = Number(payload["accounts"]);
+        stats.Transactions = Number(payload["transactions"]);
+        stats.RefreshRate = Number(payload["refreshRate"]);
+        stats.Epoch = Number(payload["epoch"]);
+        stats.RoundsPassed = Number(payload["roundsPassed"]);
+        stats.RoundsPerEpoch = Number(payload["roundsPerEpoch"]);
+
+        return stats;
+    }
+}

From 5edfba1162efd713f9fadd55eec3db371ab6eafb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 6 Apr 2022 15:45:17 +0300
Subject: [PATCH 069/338] Move "networkConfig" to networkProvider.

---
 .../networkProvider/apiNetworkProvider.ts     |  2 +-
 .../networkProvider/interface.ts              |  5 +-
 .../networkProvider/networkConfig.ts          | 88 +++++++++++++++++++
 .../networkProvider/proxyNetworkProvider.ts   |  2 +-
 4 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 src-network-providers/networkProvider/networkConfig.ts

diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
index cf2bc4288..e25a2679d 100644
--- a/src-network-providers/networkProvider/apiNetworkProvider.ts
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -1,7 +1,7 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "./accounts";
 import { IAddress, IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonce, INonFungibleTokenOfAccountOnNetwork, ITransaction, Pagination } from "./interface";
-import { NetworkConfig } from "../networkConfig";
+import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
 import { Query } from "../smartcontracts";
 import { Stats } from "./stats";
diff --git a/src-network-providers/networkProvider/interface.ts b/src-network-providers/networkProvider/interface.ts
index 121821fee..bfbc8a263 100644
--- a/src-network-providers/networkProvider/interface.ts
+++ b/src-network-providers/networkProvider/interface.ts
@@ -1,6 +1,6 @@
 import { BigNumber } from "bignumber.js";
 import { AccountOnNetwork } from "./accounts";
-import { NetworkConfig } from "../networkConfig";
+import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
 import { Query } from "../smartcontracts";
 import { Stats } from "./stats";
@@ -195,4 +195,7 @@ export interface INonce extends IHexable { valueOf(): number; }
 export interface ITransactionPayload { encoded(): string; }
 export interface IGasLimit { valueOf(): number; }
 export interface IGasPrice { valueOf(): number; }
+export interface IChainID { valueOf(): string; }
+export interface IGasPriceModifier { valueOf(): number; }
+export interface ITransactionVersion { valueOf(): number; }
 export interface IAccountBalance { toString(): string; }
diff --git a/src-network-providers/networkProvider/networkConfig.ts b/src-network-providers/networkProvider/networkConfig.ts
new file mode 100644
index 000000000..690609c4f
--- /dev/null
+++ b/src-network-providers/networkProvider/networkConfig.ts
@@ -0,0 +1,88 @@
+import BigNumber from "bignumber.js";
+import { IChainID, IGasLimit, IGasPrice, IGasPriceModifier, ITransactionVersion } from "./interface";
+
+/**
+ * An object holding Network configuration parameters.
+ */
+export class NetworkConfig {
+    /**
+     * The chain ID. E.g. "1" for the Mainnet.
+     */
+    public ChainID: IChainID;
+
+    /**
+     * The gas required by the Network to process a byte of the {@link TransactionPayload}.
+     */
+    public GasPerDataByte: number;
+    /**
+     * The round duration.
+     */
+    public RoundDuration: number;
+    /**
+     * The number of rounds per epoch.
+     */
+    public RoundsPerEpoch: number;
+
+    /**
+     * The Top Up Factor for APR calculation
+     */
+    public TopUpFactor: number;
+
+    /**
+     * The Top Up Factor for APR calculation
+     */
+    public TopUpRewardsGradientPoint: BigNumber;
+
+    /**
+     *
+     */
+    public GasPriceModifier: IGasPriceModifier;
+
+    /**
+     * The minimum gas limit required to be set when broadcasting a {@link Transaction}.
+     */
+    public MinGasLimit: IGasLimit;
+
+    /**
+     * The minimum gas price required to be set when broadcasting a {@link Transaction}.
+     */
+    public MinGasPrice: IGasPrice;
+
+    /**
+     * The oldest transaction version accepted by the Network.
+     */
+    public MinTransactionVersion: ITransactionVersion;
+
+    constructor() {
+        this.ChainID = "T";
+        this.GasPerDataByte = 1500;
+        this.TopUpFactor = 0;
+        this.RoundDuration = 0;
+        this.RoundsPerEpoch = 0;
+        this.TopUpRewardsGradientPoint = new BigNumber(0);
+        this.MinGasLimit = 50000;
+        this.MinGasPrice = 1000000000;
+        this.GasPriceModifier = 1;
+        this.MinTransactionVersion = 1;
+    }
+
+    /**
+     * Constructs a configuration object from a HTTP response (as returned by the provider).
+     */
+    static fromHttpResponse(payload: any): NetworkConfig {
+        let networkConfig = new NetworkConfig();
+
+        networkConfig.ChainID = String(payload["erd_chain_id"]);
+        networkConfig.GasPerDataByte = Number(payload["erd_gas_per_data_byte"]);
+        networkConfig.TopUpFactor = Number(payload["erd_top_up_factor"]);
+        networkConfig.RoundDuration = Number(payload["erd_round_duration"]);
+        networkConfig.RoundsPerEpoch = Number(payload["erd_rounds_per_epoch"]);
+        networkConfig.TopUpRewardsGradientPoint = new BigNumber(payload["erd_rewards_top_up_gradient_point"]);
+        networkConfig.MinGasLimit = Number(payload["erd_min_gas_limit"]);
+        networkConfig.MinGasPrice = Number(payload["erd_min_gas_price"]);
+        networkConfig.MinTransactionVersion = Number(payload["erd_min_transaction_version"]);
+        networkConfig.GasPriceModifier = Number(payload["erd_gas_price_modifier"]);
+
+        return networkConfig;
+    }
+}
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index 9912ef4a5..07318e170 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -1,7 +1,7 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "./accounts";
 import { IAddress, IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonce, INonFungibleTokenOfAccountOnNetwork, ITransaction, Pagination } from "./interface";
-import { NetworkConfig } from "../networkConfig";
+import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
 import { Query } from "../smartcontracts";
 import { Stats } from "./stats";

From 10945a9599d9a1962c735750df8b8bcbc3ce83d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 6 Apr 2022 17:46:25 +0300
Subject: [PATCH 070/338] Move "queryResponse" to "networkProvider".

---
 .../networkProvider/apiNetworkProvider.ts     |  7 +--
 .../networkProvider/constants.ts              |  3 +
 .../networkProvider/contractQueryResponse.ts  | 57 +++++++++++++++++++
 .../networkProvider/contractResults.ts        | 29 +---------
 .../networkProvider/interface.ts              | 14 ++---
 .../networkProvider/primitives.ts             |  6 ++
 .../networkProvider/proxyNetworkProvider.ts   |  7 +--
 7 files changed, 79 insertions(+), 44 deletions(-)
 create mode 100644 src-network-providers/networkProvider/constants.ts
 create mode 100644 src-network-providers/networkProvider/contractQueryResponse.ts

diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
index e25a2679d..dc9df71bb 100644
--- a/src-network-providers/networkProvider/apiNetworkProvider.ts
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -1,11 +1,9 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "./accounts";
-import { IAddress, IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonce, INonFungibleTokenOfAccountOnNetwork, ITransaction, Pagination } from "./interface";
+import { IAddress, IContractQuery, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonce, INonFungibleTokenOfAccountOnNetwork, ITransaction, Pagination } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
-import { Query } from "../smartcontracts";
 import { Stats } from "./stats";
-import { ContractQueryResponse } from "./contractResults";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
@@ -15,6 +13,7 @@ import { Hash } from "./primitives";
 import { ErrNetworkProvider } from "./errors";
 import { defaultAxiosConfig } from "./config";
 import { NetworkStatus } from "./networkStatus";
+import { ContractQueryResponse } from "./contractQueryResponse";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ApiNetworkProvider implements INetworkProvider {
@@ -112,7 +111,7 @@ export class ApiNetworkProvider implements INetworkProvider {
         return await this.backingProxyNetworkProvider.simulateTransaction(tx);
     }
 
-    async queryContract(query: Query): Promise<IContractQueryResponse> {
+    async queryContract(query: IContractQuery): Promise<ContractQueryResponse> {
         let data = query.toHttpRequest();
         let response = await this.doPostGeneric("query", data);
         let queryResponse = ContractQueryResponse.fromHttpResponse(response);
diff --git a/src-network-providers/networkProvider/constants.ts b/src-network-providers/networkProvider/constants.ts
new file mode 100644
index 000000000..404af70a6
--- /dev/null
+++ b/src-network-providers/networkProvider/constants.ts
@@ -0,0 +1,3 @@
+import BigNumber from "bignumber.js";
+
+export const MaxUint64 = new BigNumber("18446744073709551615");
diff --git a/src-network-providers/networkProvider/contractQueryResponse.ts b/src-network-providers/networkProvider/contractQueryResponse.ts
new file mode 100644
index 000000000..51e858d10
--- /dev/null
+++ b/src-network-providers/networkProvider/contractQueryResponse.ts
@@ -0,0 +1,57 @@
+import BigNumber from "bignumber.js";
+import { MaxUint64 } from "./constants";
+import { IContractReturnCode, IGasLimit } from "./interface";
+import { ContractReturnCode } from "./primitives";
+
+export class ContractQueryResponse {
+    returnData: string[];
+    returnCode: IContractReturnCode;
+    returnMessage: string;
+    gasUsed: IGasLimit;
+
+    constructor(init?: Partial<ContractQueryResponse>) {
+        this.returnData = init?.returnData || [];
+        this.returnCode = init?.returnCode || new ContractReturnCode("");
+        this.returnMessage = init?.returnMessage || "";
+        this.gasUsed = init?.gasUsed || 0;
+    }
+
+    /**
+     * Constructs a QueryResponse object from a HTTP response (as returned by the provider).
+     */
+    static fromHttpResponse(payload: any): ContractQueryResponse {
+        let returnData = <string[]>payload["returnData"] || payload["ReturnData"];
+        let returnCode = payload["returnCode"] || payload["ReturnCode"];
+        let returnMessage = payload["returnMessage"] || payload["ReturnMessage"];
+        let gasRemaining = new BigNumber(payload["gasRemaining"] || payload["GasRemaining"] || 0);
+        let gasUsed = new Number(MaxUint64.minus(gasRemaining).toNumber());
+
+        return new ContractQueryResponse({
+            returnData: returnData,
+            returnCode: new ContractReturnCode(returnCode),
+            returnMessage: returnMessage,
+            gasUsed: gasUsed,
+        });
+    }
+
+    getReturnDataParts(): Buffer[] {
+        return this.returnData.map((item) => Buffer.from(item || "", "base64"));
+    }
+
+    isSuccess(): boolean {
+        return this.returnCode.isSuccess();
+    }
+
+    /**
+     * Converts the object to a pretty, plain JavaScript object.
+     */
+    toJSON(): object {
+        return {
+            success: this.isSuccess(),
+            returnData: this.returnData,
+            returnCode: this.returnCode,
+            returnMessage: this.returnMessage,
+            gasUsed: this.gasUsed.valueOf(),
+        };
+    }
+}
diff --git a/src-network-providers/networkProvider/contractResults.ts b/src-network-providers/networkProvider/contractResults.ts
index 3d9b4299e..8ecfeacf9 100644
--- a/src-network-providers/networkProvider/contractResults.ts
+++ b/src-network-providers/networkProvider/contractResults.ts
@@ -1,8 +1,6 @@
-import { BigNumber } from "bignumber.js";
-import { IAddress, IContractQueryResponse, IContractReturnCode, IGasLimit, IGasPrice, IHash, INonce } from "./interface";
+import { IAddress, IGasLimit, IGasPrice, IHash, INonce } from "./interface";
 import { TransactionLogs } from "./transactionLogs";
-import { MaxUint64 } from "../smartcontracts/query";
-import { Address, ContractReturnCode, Hash, Nonce, TransactionValue } from "./primitives";
+import { Address, Hash, Nonce, TransactionValue } from "./primitives";
 
 export class ContractResults {
     readonly items: ContractResultItem[];
@@ -84,26 +82,3 @@ export class ContractResultItem {
         return item;
     }
 }
-
-export class ContractQueryResponse implements IContractQueryResponse {
-    returnData: string[] = [];
-    returnCode: IContractReturnCode = new ContractReturnCode("");
-    returnMessage: string = "";
-    gasUsed: IGasLimit = 0;
-
-    static fromHttpResponse(payload: any): ContractQueryResponse {
-        let response = new ContractQueryResponse();
-        let gasRemaining = new BigNumber(payload["gasRemaining"] || payload["GasRemaining"] || 0);
-
-        response.returnData = payload["returnData"] || [];
-        response.returnCode = new ContractReturnCode(payload["returnCode"] || "");
-        response.returnMessage = payload["returnMessage"] || "";
-        response.gasUsed = MaxUint64.minus(gasRemaining).toNumber();
-
-        return response;
-    }
-
-    getReturnDataParts(): Buffer[] {
-        return this.returnData.map((item) => Buffer.from(item || ""));
-    }
-}
diff --git a/src-network-providers/networkProvider/interface.ts b/src-network-providers/networkProvider/interface.ts
index bfbc8a263..2bcae8e68 100644
--- a/src-network-providers/networkProvider/interface.ts
+++ b/src-network-providers/networkProvider/interface.ts
@@ -2,11 +2,11 @@ import { BigNumber } from "bignumber.js";
 import { AccountOnNetwork } from "./accounts";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
-import { Query } from "../smartcontracts";
 import { Stats } from "./stats";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 import { NetworkStatus } from "./networkStatus";
+import { ContractQueryResponse } from "./contractQueryResponse";
 
 /**
  * An interface that defines the endpoints of an HTTP API Provider.
@@ -81,7 +81,7 @@ export interface INetworkProvider {
     /**
      * Queries a Smart Contract - runs a pure function defined by the contract and returns its results.
      */
-    queryContract(query: Query): Promise<IContractQueryResponse>;
+    queryContract(query: IContractQuery): Promise<ContractQueryResponse>;
 
     /**
      * Fetches the definition of a fungible token.
@@ -159,17 +159,13 @@ export interface IDefinitionOfTokenCollectionOnNetwork {
     // TODO: add "assets", "roles"
 }
 
-export interface IContractQueryResponse {
-    returnData: string[];
-    returnCode: IContractReturnCode;
-    returnMessage: string;
-    gasUsed: IGasLimit;
-
-    getReturnDataParts(): Buffer[];
+export interface IContractQuery {
+    toHttpRequest(): any;
 }
 
 export interface IContractReturnCode {
     toString(): string;
+    isSuccess(): boolean;
 }
 
 export interface IContractSimulation {
diff --git a/src-network-providers/networkProvider/primitives.ts b/src-network-providers/networkProvider/primitives.ts
index 0adef98a7..1a32caa38 100644
--- a/src-network-providers/networkProvider/primitives.ts
+++ b/src-network-providers/networkProvider/primitives.ts
@@ -69,6 +69,8 @@ export class TransactionPayload implements ITransactionPayload {
 }
 
 export class ContractReturnCode {
+    private static OK: string = "ok";
+
     private readonly value: string;
 
     constructor(value: string) {
@@ -78,6 +80,10 @@ export class ContractReturnCode {
     toString() {
         return this.value;
     }
+
+    isSuccess(): boolean {
+        return this.value == ContractReturnCode.OK;
+    }
 }
 
 export class AccountBalance {
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index 07318e170..822e8be0b 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -1,11 +1,9 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "./accounts";
-import { IAddress, IContractQueryResponse, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonce, INonFungibleTokenOfAccountOnNetwork, ITransaction, Pagination } from "./interface";
+import { IAddress, IContractQuery, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonce, INonFungibleTokenOfAccountOnNetwork, ITransaction, Pagination } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
-import { Query } from "../smartcontracts";
 import { Stats } from "./stats";
-import { ContractQueryResponse } from "./contractResults";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
@@ -13,6 +11,7 @@ import { Hash } from "./primitives";
 import { ErrNetworkProvider } from "./errors";
 import { defaultAxiosConfig } from "./config";
 import { NetworkStatus } from "./networkStatus";
+import { ContractQueryResponse } from "./contractQueryResponse";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ProxyNetworkProvider implements INetworkProvider {
@@ -116,7 +115,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return response;
     }
 
-    async queryContract(query: Query): Promise<IContractQueryResponse> {
+    async queryContract(query: IContractQuery): Promise<ContractQueryResponse> {
         let data = query.toHttpRequest();
         let response = await this.doPostGeneric("vm-values/query", data);
         let queryResponse = ContractQueryResponse.fromHttpResponse(response.data);

From 65e4970cace2cf685aea8cb1b6f1d829be69445e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 6 Apr 2022 18:01:23 +0300
Subject: [PATCH 071/338] Fix after review.

---
 src-network-providers/networkProvider/constants.ts            | 2 +-
 .../networkProvider/contractQueryResponse.ts                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-network-providers/networkProvider/constants.ts b/src-network-providers/networkProvider/constants.ts
index 404af70a6..f4ab70a0a 100644
--- a/src-network-providers/networkProvider/constants.ts
+++ b/src-network-providers/networkProvider/constants.ts
@@ -1,3 +1,3 @@
 import BigNumber from "bignumber.js";
 
-export const MaxUint64 = new BigNumber("18446744073709551615");
+export const MaxUint64AsBigNumber = new BigNumber("18446744073709551615");
diff --git a/src-network-providers/networkProvider/contractQueryResponse.ts b/src-network-providers/networkProvider/contractQueryResponse.ts
index 51e858d10..404d96006 100644
--- a/src-network-providers/networkProvider/contractQueryResponse.ts
+++ b/src-network-providers/networkProvider/contractQueryResponse.ts
@@ -1,5 +1,5 @@
 import BigNumber from "bignumber.js";
-import { MaxUint64 } from "./constants";
+import { MaxUint64AsBigNumber } from "./constants";
 import { IContractReturnCode, IGasLimit } from "./interface";
 import { ContractReturnCode } from "./primitives";
 
@@ -24,7 +24,7 @@ export class ContractQueryResponse {
         let returnCode = payload["returnCode"] || payload["ReturnCode"];
         let returnMessage = payload["returnMessage"] || payload["ReturnMessage"];
         let gasRemaining = new BigNumber(payload["gasRemaining"] || payload["GasRemaining"] || 0);
-        let gasUsed = new Number(MaxUint64.minus(gasRemaining).toNumber());
+        let gasUsed = new Number(MaxUint64AsBigNumber.minus(gasRemaining).toNumber());
 
         return new ContractQueryResponse({
             returnData: returnData,

From 3a3bbfe3da602f7126a592e99e0b53a60af583db Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 6 Apr 2022 20:53:46 +0300
Subject: [PATCH 072/338] Move old providers to networkProvider package.

---
 .../networkProvider/apiProvider.ts            |  98 ++++++++++
 .../networkProvider/nftToken.ts               |  63 +++++++
 .../networkProvider/proxyProvider.ts          | 172 ++++++++++++++++++
 3 files changed, 333 insertions(+)
 create mode 100644 src-network-providers/networkProvider/apiProvider.ts
 create mode 100644 src-network-providers/networkProvider/nftToken.ts
 create mode 100644 src-network-providers/networkProvider/proxyProvider.ts

diff --git a/src-network-providers/networkProvider/apiProvider.ts b/src-network-providers/networkProvider/apiProvider.ts
new file mode 100644
index 000000000..ed5fd849b
--- /dev/null
+++ b/src-network-providers/networkProvider/apiProvider.ts
@@ -0,0 +1,98 @@
+import axios, { AxiosRequestConfig } from "axios";
+import { IApiProvider, IHash } from "./interface";
+import * as errors from "./errors";
+import { Logger } from "./logger";
+import { Token } from "./token";
+import { NFTToken } from "./nftToken";
+import { defaultConfig } from "./constants";
+import { ApiNetworkProvider } from "./networkProvider/apiNetworkProvider";
+import { INetworkStake, INetworkStats, ITransactionOnNetwork, ITransactionStatus } from "./interfaceOfNetwork";
+
+/**
+ * This is a temporary change, this will be the only provider used, ProxyProvider will be deprecated
+ */
+export class ApiProvider implements IApiProvider {
+    private url: string;
+    private config: AxiosRequestConfig;
+    /**
+     * @deprecated used only for preparatory refactoring (unifying network providers)
+     */
+    private readonly backingProvider: ApiNetworkProvider;
+
+    /**
+     * Creates a new ApiProvider.
+     * @param url the URL of the Elrond Api
+     * @param config axios request config options
+     */
+    constructor(url: string, config?: AxiosRequestConfig) {
+      this.url = url;
+      this.config = {...defaultConfig, ...config};
+      this.backingProvider = new ApiNetworkProvider(url, config);
+    }
+
+    /**
+     * Fetches the Network Stake.
+     */
+    async getNetworkStake(): Promise<INetworkStake> {
+        return await this.backingProvider.getNetworkStakeStatistics();
+    }
+
+    /**
+     * Fetches the Network Stats.
+     */
+    async getNetworkStats(): Promise<INetworkStats> {
+        return await this.backingProvider.getNetworkGeneralStatistics();
+    }
+
+    /**
+     * Fetches the state of a {@link Transaction}.
+     */
+    async getTransaction(txHash: IHash): Promise<ITransactionOnNetwork> {
+        return await this.backingProvider.getTransaction(txHash);
+    }
+
+    /**
+     * Queries the status of a {@link Transaction}.
+     */
+    async getTransactionStatus(txHash: IHash): Promise<ITransactionStatus> {
+        return await this.backingProvider.getTransactionStatus(txHash);
+    }
+
+    async getToken(tokenIdentifier: string): Promise<Token> {
+        return this.doGetGeneric(`tokens/${tokenIdentifier}`, (response) => Token.fromHttpResponse(response));
+    }
+
+    async getNFTToken(tokenIdentifier: string): Promise<NFTToken> {
+        return this.doGetGeneric(`nfts/${tokenIdentifier}`, (response) => NFTToken.fromHttpResponse(response));
+    }
+
+    /**
+     * Get method that receives the resource url and on callback the method used to map the response.
+     */
+    async doGetGeneric(resourceUrl: string, callback: (response: any) => any): Promise<any> {
+        let response = await this.doGet(resourceUrl);
+        return callback(response);
+    }
+
+    private async doGet(resourceUrl: string): Promise<any> {
+        try {
+            let url = `${this.url}/${resourceUrl}`;
+            let response = await axios.get(url, this.config);
+
+            return response.data;
+        } catch (error) {
+            this.handleApiError(error, resourceUrl);
+        }
+    }
+
+    private handleApiError(error: any, resourceUrl: string) {
+        if (!error.response) {
+            Logger.warn(error);
+            throw new errors.ErrApiProviderGet(resourceUrl, error.toString(), error);
+        }
+
+        let errorData = error.response.data;
+        let originalErrorMessage = errorData.error || errorData.message || JSON.stringify(errorData);
+        throw new errors.ErrApiProviderGet(resourceUrl, originalErrorMessage, error);
+    }
+}
diff --git a/src-network-providers/networkProvider/nftToken.ts b/src-network-providers/networkProvider/nftToken.ts
new file mode 100644
index 000000000..3132eeae9
--- /dev/null
+++ b/src-network-providers/networkProvider/nftToken.ts
@@ -0,0 +1,63 @@
+
+export class NFTToken {
+    token: string = '';
+    name: string = '';
+    type: string = '';
+    owner: string = '';
+    minted: string = '';
+    burnt: string = '';
+    decimals: number = 0;
+    isPaused: boolean = false;
+    canUpgrade: boolean = false;
+    canMint: boolean = false;
+    canBurn: boolean = false;
+    canChangeOwner: boolean = false;
+    canPause: boolean = false;
+    canFreeze: boolean = false;
+    canWipe: boolean = false;
+    canAddSpecialRoles: boolean = false;
+    canTransferNFTCreateRole: boolean = false;
+    NFTCreateStopped: boolean = false;
+    wiped: string = '0';
+
+    constructor(init?: Partial<NFTToken>) {
+        Object.assign(this, init);
+    }
+
+    static fromHttpResponse(response: {
+        token: string,
+        name: string,
+        type: string,
+        owner: string,
+        minted: string,
+        burnt: string,
+        decimals: number,
+        isPaused: boolean,
+        canUpgrade: boolean,
+        canMint: boolean,
+        canBurn: boolean,
+        canChangeOwner: boolean,
+        canPause: boolean,
+        canFreeze: boolean,
+        canWipe: boolean,
+        canAddSpecialRoles: boolean,
+        canTransferNFTCreateRole: boolean,
+        NFTCreateStopped: boolean,
+        wiped: string
+    }) {
+        let nftToken = new NFTToken(response);
+        return nftToken;
+    }
+
+    getTokenName() {
+        return this.name;
+    }
+
+    getTokenIdentifier() {
+        return this.token;
+    }
+
+    getTokenType() {
+        return this.type;
+    }
+}
diff --git a/src-network-providers/networkProvider/proxyProvider.ts b/src-network-providers/networkProvider/proxyProvider.ts
new file mode 100644
index 000000000..a47d128d2
--- /dev/null
+++ b/src-network-providers/networkProvider/proxyProvider.ts
@@ -0,0 +1,172 @@
+import axios, { AxiosRequestConfig } from "axios";
+import BigNumber from "bignumber.js";
+
+import { IHash, IProvider } from "./interface";
+import { Transaction, TransactionHash } from "./transaction";
+import { Address } from "./address";
+import * as errors from "./errors";
+import { Query } from "./smartcontracts/query";
+import { Logger } from "./logger";
+import { defaultConfig } from "./constants";
+import { ProxyNetworkProvider } from "./networkProvider/proxyNetworkProvider";
+import { IAccountOnNetwork, IContractQueryResponse, IFungibleTokenOfAccountOnNetwork, INetworkConfig, INetworkStatus, ITransactionOnNetwork, ITransactionStatus } from "./interfaceOfNetwork";
+
+export class ProxyProvider implements IProvider {
+    private url: string;
+    private config: AxiosRequestConfig;
+    /**
+     * @deprecated used only for preparatory refactoring (unifying network providers)
+     */
+    private readonly backingProvider: ProxyNetworkProvider;
+
+    /**
+     * Creates a new ProxyProvider.
+     * @param url the URL of the Elrond Proxy
+     * @param config axios request config options
+     */
+    constructor(url: string, config?: AxiosRequestConfig) {
+        this.url = url;
+        this.config = {...defaultConfig, ...config};
+        this.backingProvider = new ProxyNetworkProvider(url, config);
+    }
+
+    /**
+     * Fetches the state of an account.
+     */
+    async getAccount(address: Address): Promise<IAccountOnNetwork> {
+        return await this.backingProvider.getAccount(address);
+    }
+
+    async getAddressEsdtList(address: Address): Promise<IFungibleTokenOfAccountOnNetwork[]> {
+        return await this.backingProvider.getFungibleTokensOfAccount(address);
+    }
+
+    async getAddressEsdt(address: Address, tokenIdentifier: string): Promise<any> {
+        return this.doGetGeneric(`address/${address.bech32()}/esdt/${tokenIdentifier}`, (response) =>
+            response.tokenData
+        );
+    }
+
+    async getAddressNft(address: Address, tokenIdentifier: string, nonce: BigNumber): Promise<any> {
+        return this.doGetGeneric(`address/${address.bech32()}/nft/${tokenIdentifier}/nonce/${nonce}`, (response) =>
+            response.tokenData
+        );
+    }
+
+    /**
+     * Queries a Smart Contract - runs a pure function defined by the contract and returns its results.
+     */
+    async queryContract(query: Query): Promise<IContractQueryResponse> {
+        return await this.backingProvider.queryContract(query);
+    }
+
+    /**
+     * Broadcasts an already-signed {@link Transaction}.
+     */
+    async sendTransaction(tx: Transaction): Promise<IHash> {
+        return await this.backingProvider.sendTransaction(tx);
+    }
+
+    /**
+     * Simulates the processing of an already-signed {@link Transaction}.
+     */
+    async simulateTransaction(tx: Transaction): Promise<any> {
+        return await this.backingProvider.simulateTransaction(tx);
+    }
+
+    /**
+     * Fetches the state of a {@link Transaction}.
+     */
+    async getTransaction(
+        txHash: TransactionHash
+    ): Promise<ITransactionOnNetwork> {
+        return await this.backingProvider.getTransaction(txHash);
+    }
+
+    /**
+     * Queries the status of a {@link Transaction}.
+     */
+    async getTransactionStatus(txHash: TransactionHash): Promise<ITransactionStatus> {
+        return await this.backingProvider.getTransactionStatus(txHash);
+    }
+
+    /**
+     * Fetches the Network configuration.
+     */
+    async getNetworkConfig(): Promise<INetworkConfig> {
+        return await this.backingProvider.getNetworkConfig();
+    }
+
+    /**
+     * Fetches the network status configuration.
+     */
+    async getNetworkStatus(): Promise<INetworkStatus> {
+        return await this.backingProvider.getNetworkStatus();
+    }
+
+    /**
+     * Get method that receives the resource url and on callback the method used to map the response.
+     */
+    async doGetGeneric(resourceUrl: string, callback: (response: any) => any): Promise<any> {
+        let response = await this.doGet(resourceUrl);
+        return callback(response);
+    }
+
+    /**
+     * Post method that receives the resource url, the post payload and on callback the method used to map the response.
+     */
+    async doPostGeneric(resourceUrl: string, payload: any, callback: (response: any) => any): Promise<any> {
+        let response = await this.doPost(resourceUrl, payload);
+        return callback(response);
+    }
+
+    private async doGet(resourceUrl: string): Promise<any> {
+        try {
+            let url = `${this.url}/${resourceUrl}`;
+            let response = await axios.get(url, this.config);
+            let payload = response.data.data;
+            return payload;
+        } catch (error) {
+            this.handleApiError(error, resourceUrl);
+        }
+    }
+
+    private async doPost(resourceUrl: string, payload: any): Promise<any> {
+        try {
+            let url = `${this.url}/${resourceUrl}`;
+            let response = await axios.post(url, payload, {
+                ...this.config,
+                headers: {
+                    "Content-Type": "application/json",
+                },
+            });
+            let responsePayload = response.data.data;
+            return responsePayload;
+        } catch (error) {
+            this.handleApiError(error, resourceUrl);
+        }
+    }
+
+    private buildUrlWithQueryParameters(endpoint: string, params: Record<string, string>): string {
+        let searchParams = new URLSearchParams();
+
+        for (let [key, value] of Object.entries(params)) {
+            if (value) {
+                searchParams.append(key, value);
+            }
+        }
+
+        return `${endpoint}?${searchParams.toString()}`;
+    }
+
+    private handleApiError(error: any, resourceUrl: string) {
+        if (!error.response) {
+            Logger.warn(error);
+            throw new errors.ErrApiProviderGet(resourceUrl, error.toString(), error);
+        }
+
+        let errorData = error.response.data;
+        let originalErrorMessage = errorData.error || errorData.message || JSON.stringify(errorData);
+        throw new errors.ErrApiProviderGet(resourceUrl, originalErrorMessage, error);
+    }
+}

From 97394cd70ea8ed6168f9ad870f71719bfa804933 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Thu, 7 Apr 2022 10:43:35 +0300
Subject: [PATCH 073/338] Adjust implementation of old providers.

---
 .../networkProvider/apiProvider.ts            |  38 ++---
 .../networkProvider/errors.ts                 |  20 +++
 .../networkProvider/index.ts                  |   4 +
 .../networkProvider/proxyProvider.ts          | 133 +++++-------------
 4 files changed, 81 insertions(+), 114 deletions(-)

diff --git a/src-network-providers/networkProvider/apiProvider.ts b/src-network-providers/networkProvider/apiProvider.ts
index ed5fd849b..fee358787 100644
--- a/src-network-providers/networkProvider/apiProvider.ts
+++ b/src-network-providers/networkProvider/apiProvider.ts
@@ -1,17 +1,19 @@
 import axios, { AxiosRequestConfig } from "axios";
-import { IApiProvider, IHash } from "./interface";
+import { IHash } from "./interface";
 import * as errors from "./errors";
-import { Logger } from "./logger";
-import { Token } from "./token";
 import { NFTToken } from "./nftToken";
-import { defaultConfig } from "./constants";
-import { ApiNetworkProvider } from "./networkProvider/apiNetworkProvider";
-import { INetworkStake, INetworkStats, ITransactionOnNetwork, ITransactionStatus } from "./interfaceOfNetwork";
+import { defaultAxiosConfig } from "./config";
+import { ApiNetworkProvider } from "./apiNetworkProvider";
+import { TransactionOnNetwork } from "./transactions";
+import { Stats } from "./stats";
+import { NetworkStake } from "./networkStake";
+import { TransactionStatus } from "./transactionStatus";
+import { DefinitionOfFungibleTokenOnNetwork } from "./tokenDefinitions";
 
 /**
- * This is a temporary change, this will be the only provider used, ProxyProvider will be deprecated
+ * @deprecated
  */
-export class ApiProvider implements IApiProvider {
+export class ApiProvider {
     private url: string;
     private config: AxiosRequestConfig;
     /**
@@ -26,40 +28,40 @@ export class ApiProvider implements IApiProvider {
      */
     constructor(url: string, config?: AxiosRequestConfig) {
       this.url = url;
-      this.config = {...defaultConfig, ...config};
+      this.config = {...defaultAxiosConfig, ...config};
       this.backingProvider = new ApiNetworkProvider(url, config);
     }
 
     /**
      * Fetches the Network Stake.
      */
-    async getNetworkStake(): Promise<INetworkStake> {
+    async getNetworkStake(): Promise<NetworkStake> {
         return await this.backingProvider.getNetworkStakeStatistics();
     }
 
     /**
      * Fetches the Network Stats.
      */
-    async getNetworkStats(): Promise<INetworkStats> {
+    async getNetworkStats(): Promise<Stats> {
         return await this.backingProvider.getNetworkGeneralStatistics();
     }
 
     /**
-     * Fetches the state of a {@link Transaction}.
+     * Fetches the state of a transaction.
      */
-    async getTransaction(txHash: IHash): Promise<ITransactionOnNetwork> {
+    async getTransaction(txHash: IHash): Promise<TransactionOnNetwork> {
         return await this.backingProvider.getTransaction(txHash);
     }
 
     /**
-     * Queries the status of a {@link Transaction}.
+     * Queries the status of a transaction.
      */
-    async getTransactionStatus(txHash: IHash): Promise<ITransactionStatus> {
+    async getTransactionStatus(txHash: IHash): Promise<TransactionStatus> {
         return await this.backingProvider.getTransactionStatus(txHash);
     }
 
-    async getToken(tokenIdentifier: string): Promise<Token> {
-        return this.doGetGeneric(`tokens/${tokenIdentifier}`, (response) => Token.fromHttpResponse(response));
+    async getToken(tokenIdentifier: string): Promise<DefinitionOfFungibleTokenOnNetwork> {
+        return await this.backingProvider.getDefinitionOfFungibleToken(tokenIdentifier);
     }
 
     async getNFTToken(tokenIdentifier: string): Promise<NFTToken> {
@@ -87,7 +89,7 @@ export class ApiProvider implements IApiProvider {
 
     private handleApiError(error: any, resourceUrl: string) {
         if (!error.response) {
-            Logger.warn(error);
+            console.warn(error);
             throw new errors.ErrApiProviderGet(resourceUrl, error.toString(), error);
         }
 
diff --git a/src-network-providers/networkProvider/errors.ts b/src-network-providers/networkProvider/errors.ts
index 586e5cf83..bed8984f8 100644
--- a/src-network-providers/networkProvider/errors.ts
+++ b/src-network-providers/networkProvider/errors.ts
@@ -28,3 +28,23 @@ export class ErrNetworkProvider extends Err {
         super(message, inner);
     }
 }
+
+/**
+ * Signals an error that happened during a HTTP GET request.
+ */
+export class ErrApiProviderGet extends Err {
+    public constructor(url: string, error: string, inner?: Error) {
+        let message = `Cannot GET ${url}: [${error}]`;
+        super(message, inner);
+    }
+}
+
+/**
+ * Signals an error that happened during a HTTP POST request.
+ */
+export class ErrApiProviderPost extends Err {
+    public constructor(url: string, error: string, inner?: Error) {
+        let message = `Cannot POST ${url}: [${error}]`;
+        super(message, inner);
+    }
+}
diff --git a/src-network-providers/networkProvider/index.ts b/src-network-providers/networkProvider/index.ts
index 0c4e6aa0f..0bc03d2d0 100644
--- a/src-network-providers/networkProvider/index.ts
+++ b/src-network-providers/networkProvider/index.ts
@@ -1,5 +1,9 @@
 export * from "./apiNetworkProvider";
 export * from "./proxyNetworkProvider";
 
+// The old providers.
+export * from "./proxyProvider";
+export * from "./apiProvider";
+
 // we do not export "./tokens"
 // we do not export "./transactions"
diff --git a/src-network-providers/networkProvider/proxyProvider.ts b/src-network-providers/networkProvider/proxyProvider.ts
index a47d128d2..53ae97839 100644
--- a/src-network-providers/networkProvider/proxyProvider.ts
+++ b/src-network-providers/networkProvider/proxyProvider.ts
@@ -1,19 +1,20 @@
-import axios, { AxiosRequestConfig } from "axios";
+import { AxiosRequestConfig } from "axios";
 import BigNumber from "bignumber.js";
-
-import { IHash, IProvider } from "./interface";
-import { Transaction, TransactionHash } from "./transaction";
-import { Address } from "./address";
-import * as errors from "./errors";
-import { Query } from "./smartcontracts/query";
-import { Logger } from "./logger";
-import { defaultConfig } from "./constants";
-import { ProxyNetworkProvider } from "./networkProvider/proxyNetworkProvider";
-import { IAccountOnNetwork, IContractQueryResponse, IFungibleTokenOfAccountOnNetwork, INetworkConfig, INetworkStatus, ITransactionOnNetwork, ITransactionStatus } from "./interfaceOfNetwork";
-
-export class ProxyProvider implements IProvider {
-    private url: string;
-    private config: AxiosRequestConfig;
+import { IAddress, IContractQuery, IHash, ITransaction } from "./interface";
+import { ProxyNetworkProvider } from "./proxyNetworkProvider";
+import { ContractQueryResponse } from "./contractQueryResponse";
+import { AccountOnNetwork } from "./accounts";
+import { FungibleTokenOfAccountOnNetwork } from "./tokens";
+import { TransactionStatus } from "./transactionStatus";
+import { TransactionOnNetwork } from "./transactions";
+import { NetworkConfig } from "./networkConfig";
+import { NetworkStatus } from "./networkStatus";
+import { Nonce } from "./primitives";
+
+/**
+ * @deprecated
+ */
+export class ProxyProvider {
     /**
      * @deprecated used only for preparatory refactoring (unifying network providers)
      */
@@ -25,148 +26,88 @@ export class ProxyProvider implements IProvider {
      * @param config axios request config options
      */
     constructor(url: string, config?: AxiosRequestConfig) {
-        this.url = url;
-        this.config = {...defaultConfig, ...config};
         this.backingProvider = new ProxyNetworkProvider(url, config);
     }
 
     /**
      * Fetches the state of an account.
      */
-    async getAccount(address: Address): Promise<IAccountOnNetwork> {
+    async getAccount(address: IAddress): Promise<AccountOnNetwork> {
         return await this.backingProvider.getAccount(address);
     }
 
-    async getAddressEsdtList(address: Address): Promise<IFungibleTokenOfAccountOnNetwork[]> {
+    async getAddressEsdtList(address: IAddress): Promise<FungibleTokenOfAccountOnNetwork[]> {
         return await this.backingProvider.getFungibleTokensOfAccount(address);
     }
 
-    async getAddressEsdt(address: Address, tokenIdentifier: string): Promise<any> {
-        return this.doGetGeneric(`address/${address.bech32()}/esdt/${tokenIdentifier}`, (response) =>
-            response.tokenData
-        );
+    async getAddressEsdt(address: IAddress, tokenIdentifier: string): Promise<any> {
+        return await this.backingProvider.getFungibleTokenOfAccount(address, tokenIdentifier);
     }
 
-    async getAddressNft(address: Address, tokenIdentifier: string, nonce: BigNumber): Promise<any> {
-        return this.doGetGeneric(`address/${address.bech32()}/nft/${tokenIdentifier}/nonce/${nonce}`, (response) =>
-            response.tokenData
-        );
+    async getAddressNft(address: IAddress, tokenIdentifier: string, nonce: BigNumber): Promise<any> {
+        return await this.backingProvider.getNonFungibleTokenOfAccount(address, tokenIdentifier, new Nonce(nonce.toNumber()));
     }
 
     /**
      * Queries a Smart Contract - runs a pure function defined by the contract and returns its results.
      */
-    async queryContract(query: Query): Promise<IContractQueryResponse> {
+    async queryContract(query: IContractQuery): Promise<ContractQueryResponse> {
         return await this.backingProvider.queryContract(query);
     }
 
     /**
-     * Broadcasts an already-signed {@link Transaction}.
+     * Broadcasts an already-signed transaction.
      */
-    async sendTransaction(tx: Transaction): Promise<IHash> {
+    async sendTransaction(tx: ITransaction): Promise<IHash> {
         return await this.backingProvider.sendTransaction(tx);
     }
 
     /**
-     * Simulates the processing of an already-signed {@link Transaction}.
+     * Simulates the processing of an already-signed transaction.
      */
-    async simulateTransaction(tx: Transaction): Promise<any> {
+    async simulateTransaction(tx: ITransaction): Promise<any> {
         return await this.backingProvider.simulateTransaction(tx);
     }
 
     /**
-     * Fetches the state of a {@link Transaction}.
+     * Fetches the state of a transaction.
      */
-    async getTransaction(
-        txHash: TransactionHash
-    ): Promise<ITransactionOnNetwork> {
+    async getTransaction(txHash: IHash): Promise<TransactionOnNetwork> {
         return await this.backingProvider.getTransaction(txHash);
     }
 
     /**
-     * Queries the status of a {@link Transaction}.
+     * Queries the status of a transaction.
      */
-    async getTransactionStatus(txHash: TransactionHash): Promise<ITransactionStatus> {
+    async getTransactionStatus(txHash: IHash): Promise<TransactionStatus> {
         return await this.backingProvider.getTransactionStatus(txHash);
     }
 
     /**
      * Fetches the Network configuration.
      */
-    async getNetworkConfig(): Promise<INetworkConfig> {
+    async getNetworkConfig(): Promise<NetworkConfig> {
         return await this.backingProvider.getNetworkConfig();
     }
 
     /**
      * Fetches the network status configuration.
      */
-    async getNetworkStatus(): Promise<INetworkStatus> {
+    async getNetworkStatus(): Promise<NetworkStatus> {
         return await this.backingProvider.getNetworkStatus();
     }
 
     /**
      * Get method that receives the resource url and on callback the method used to map the response.
      */
-    async doGetGeneric(resourceUrl: string, callback: (response: any) => any): Promise<any> {
-        let response = await this.doGet(resourceUrl);
-        return callback(response);
+    async doGetGeneric(resourceUrl: string): Promise<any> {
+        return await this.backingProvider.doGetGeneric(resourceUrl);
     }
 
     /**
      * Post method that receives the resource url, the post payload and on callback the method used to map the response.
      */
-    async doPostGeneric(resourceUrl: string, payload: any, callback: (response: any) => any): Promise<any> {
-        let response = await this.doPost(resourceUrl, payload);
-        return callback(response);
-    }
-
-    private async doGet(resourceUrl: string): Promise<any> {
-        try {
-            let url = `${this.url}/${resourceUrl}`;
-            let response = await axios.get(url, this.config);
-            let payload = response.data.data;
-            return payload;
-        } catch (error) {
-            this.handleApiError(error, resourceUrl);
-        }
-    }
-
-    private async doPost(resourceUrl: string, payload: any): Promise<any> {
-        try {
-            let url = `${this.url}/${resourceUrl}`;
-            let response = await axios.post(url, payload, {
-                ...this.config,
-                headers: {
-                    "Content-Type": "application/json",
-                },
-            });
-            let responsePayload = response.data.data;
-            return responsePayload;
-        } catch (error) {
-            this.handleApiError(error, resourceUrl);
-        }
-    }
-
-    private buildUrlWithQueryParameters(endpoint: string, params: Record<string, string>): string {
-        let searchParams = new URLSearchParams();
-
-        for (let [key, value] of Object.entries(params)) {
-            if (value) {
-                searchParams.append(key, value);
-            }
-        }
-
-        return `${endpoint}?${searchParams.toString()}`;
-    }
-
-    private handleApiError(error: any, resourceUrl: string) {
-        if (!error.response) {
-            Logger.warn(error);
-            throw new errors.ErrApiProviderGet(resourceUrl, error.toString(), error);
-        }
-
-        let errorData = error.response.data;
-        let originalErrorMessage = errorData.error || errorData.message || JSON.stringify(errorData);
-        throw new errors.ErrApiProviderGet(resourceUrl, originalErrorMessage, error);
+    async doPostGeneric(resourceUrl: string, payload: any): Promise<any> {
+        return await this.backingProvider.doPostGeneric(resourceUrl, payload);
     }
 }

From 1a49eb613b605a1cf28a47b2b4e595276dfd4206 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Thu, 7 Apr 2022 10:49:43 +0300
Subject: [PATCH 074/338] Rename files.

---
 ...piProvider.ts => deprecatedApiProvider.ts} |  2 +-
 ...Provider.ts => deprecatedProxyProvider.ts} | 40 +------------------
 .../networkProvider/index.ts                  |  4 +-
 3 files changed, 4 insertions(+), 42 deletions(-)
 rename src-network-providers/networkProvider/{apiProvider.ts => deprecatedApiProvider.ts} (98%)
 rename src-network-providers/networkProvider/{proxyProvider.ts => deprecatedProxyProvider.ts} (72%)

diff --git a/src-network-providers/networkProvider/apiProvider.ts b/src-network-providers/networkProvider/deprecatedApiProvider.ts
similarity index 98%
rename from src-network-providers/networkProvider/apiProvider.ts
rename to src-network-providers/networkProvider/deprecatedApiProvider.ts
index fee358787..12246b253 100644
--- a/src-network-providers/networkProvider/apiProvider.ts
+++ b/src-network-providers/networkProvider/deprecatedApiProvider.ts
@@ -13,7 +13,7 @@ import { DefinitionOfFungibleTokenOnNetwork } from "./tokenDefinitions";
 /**
  * @deprecated
  */
-export class ApiProvider {
+export class DeprecatedApiProvider {
     private url: string;
     private config: AxiosRequestConfig;
     /**
diff --git a/src-network-providers/networkProvider/proxyProvider.ts b/src-network-providers/networkProvider/deprecatedProxyProvider.ts
similarity index 72%
rename from src-network-providers/networkProvider/proxyProvider.ts
rename to src-network-providers/networkProvider/deprecatedProxyProvider.ts
index 53ae97839..e1ba0ca4b 100644
--- a/src-network-providers/networkProvider/proxyProvider.ts
+++ b/src-network-providers/networkProvider/deprecatedProxyProvider.ts
@@ -14,24 +14,13 @@ import { Nonce } from "./primitives";
 /**
  * @deprecated
  */
-export class ProxyProvider {
-    /**
-     * @deprecated used only for preparatory refactoring (unifying network providers)
-     */
+export class DeprecatedProxyProvider {
     private readonly backingProvider: ProxyNetworkProvider;
 
-    /**
-     * Creates a new ProxyProvider.
-     * @param url the URL of the Elrond Proxy
-     * @param config axios request config options
-     */
     constructor(url: string, config?: AxiosRequestConfig) {
         this.backingProvider = new ProxyNetworkProvider(url, config);
     }
 
-    /**
-     * Fetches the state of an account.
-     */
     async getAccount(address: IAddress): Promise<AccountOnNetwork> {
         return await this.backingProvider.getAccount(address);
     }
@@ -48,65 +37,38 @@ export class ProxyProvider {
         return await this.backingProvider.getNonFungibleTokenOfAccount(address, tokenIdentifier, new Nonce(nonce.toNumber()));
     }
 
-    /**
-     * Queries a Smart Contract - runs a pure function defined by the contract and returns its results.
-     */
     async queryContract(query: IContractQuery): Promise<ContractQueryResponse> {
         return await this.backingProvider.queryContract(query);
     }
 
-    /**
-     * Broadcasts an already-signed transaction.
-     */
     async sendTransaction(tx: ITransaction): Promise<IHash> {
         return await this.backingProvider.sendTransaction(tx);
     }
 
-    /**
-     * Simulates the processing of an already-signed transaction.
-     */
     async simulateTransaction(tx: ITransaction): Promise<any> {
         return await this.backingProvider.simulateTransaction(tx);
     }
 
-    /**
-     * Fetches the state of a transaction.
-     */
     async getTransaction(txHash: IHash): Promise<TransactionOnNetwork> {
         return await this.backingProvider.getTransaction(txHash);
     }
 
-    /**
-     * Queries the status of a transaction.
-     */
     async getTransactionStatus(txHash: IHash): Promise<TransactionStatus> {
         return await this.backingProvider.getTransactionStatus(txHash);
     }
 
-    /**
-     * Fetches the Network configuration.
-     */
     async getNetworkConfig(): Promise<NetworkConfig> {
         return await this.backingProvider.getNetworkConfig();
     }
 
-    /**
-     * Fetches the network status configuration.
-     */
     async getNetworkStatus(): Promise<NetworkStatus> {
         return await this.backingProvider.getNetworkStatus();
     }
 
-    /**
-     * Get method that receives the resource url and on callback the method used to map the response.
-     */
     async doGetGeneric(resourceUrl: string): Promise<any> {
         return await this.backingProvider.doGetGeneric(resourceUrl);
     }
 
-    /**
-     * Post method that receives the resource url, the post payload and on callback the method used to map the response.
-     */
     async doPostGeneric(resourceUrl: string, payload: any): Promise<any> {
         return await this.backingProvider.doPostGeneric(resourceUrl, payload);
     }
diff --git a/src-network-providers/networkProvider/index.ts b/src-network-providers/networkProvider/index.ts
index 0bc03d2d0..111212f94 100644
--- a/src-network-providers/networkProvider/index.ts
+++ b/src-network-providers/networkProvider/index.ts
@@ -2,8 +2,8 @@ export * from "./apiNetworkProvider";
 export * from "./proxyNetworkProvider";
 
 // The old providers.
-export * from "./proxyProvider";
-export * from "./apiProvider";
+export * from "./deprecatedProxyProvider";
+export * from "./deprecatedApiProvider";
 
 // we do not export "./tokens"
 // we do not export "./transactions"

From c451acf3582f9caaffab5a30f4bff60e51b462cc Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Thu, 7 Apr 2022 11:08:20 +0300
Subject: [PATCH 075/338] Remove deprecated API provider.

---
 .../networkProvider/deprecatedApiProvider.ts  | 100 ------------------
 .../networkProvider/index.ts                  |   1 -
 .../networkProvider/nftToken.ts               |  63 -----------
 3 files changed, 164 deletions(-)
 delete mode 100644 src-network-providers/networkProvider/deprecatedApiProvider.ts
 delete mode 100644 src-network-providers/networkProvider/nftToken.ts

diff --git a/src-network-providers/networkProvider/deprecatedApiProvider.ts b/src-network-providers/networkProvider/deprecatedApiProvider.ts
deleted file mode 100644
index 12246b253..000000000
--- a/src-network-providers/networkProvider/deprecatedApiProvider.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import axios, { AxiosRequestConfig } from "axios";
-import { IHash } from "./interface";
-import * as errors from "./errors";
-import { NFTToken } from "./nftToken";
-import { defaultAxiosConfig } from "./config";
-import { ApiNetworkProvider } from "./apiNetworkProvider";
-import { TransactionOnNetwork } from "./transactions";
-import { Stats } from "./stats";
-import { NetworkStake } from "./networkStake";
-import { TransactionStatus } from "./transactionStatus";
-import { DefinitionOfFungibleTokenOnNetwork } from "./tokenDefinitions";
-
-/**
- * @deprecated
- */
-export class DeprecatedApiProvider {
-    private url: string;
-    private config: AxiosRequestConfig;
-    /**
-     * @deprecated used only for preparatory refactoring (unifying network providers)
-     */
-    private readonly backingProvider: ApiNetworkProvider;
-
-    /**
-     * Creates a new ApiProvider.
-     * @param url the URL of the Elrond Api
-     * @param config axios request config options
-     */
-    constructor(url: string, config?: AxiosRequestConfig) {
-      this.url = url;
-      this.config = {...defaultAxiosConfig, ...config};
-      this.backingProvider = new ApiNetworkProvider(url, config);
-    }
-
-    /**
-     * Fetches the Network Stake.
-     */
-    async getNetworkStake(): Promise<NetworkStake> {
-        return await this.backingProvider.getNetworkStakeStatistics();
-    }
-
-    /**
-     * Fetches the Network Stats.
-     */
-    async getNetworkStats(): Promise<Stats> {
-        return await this.backingProvider.getNetworkGeneralStatistics();
-    }
-
-    /**
-     * Fetches the state of a transaction.
-     */
-    async getTransaction(txHash: IHash): Promise<TransactionOnNetwork> {
-        return await this.backingProvider.getTransaction(txHash);
-    }
-
-    /**
-     * Queries the status of a transaction.
-     */
-    async getTransactionStatus(txHash: IHash): Promise<TransactionStatus> {
-        return await this.backingProvider.getTransactionStatus(txHash);
-    }
-
-    async getToken(tokenIdentifier: string): Promise<DefinitionOfFungibleTokenOnNetwork> {
-        return await this.backingProvider.getDefinitionOfFungibleToken(tokenIdentifier);
-    }
-
-    async getNFTToken(tokenIdentifier: string): Promise<NFTToken> {
-        return this.doGetGeneric(`nfts/${tokenIdentifier}`, (response) => NFTToken.fromHttpResponse(response));
-    }
-
-    /**
-     * Get method that receives the resource url and on callback the method used to map the response.
-     */
-    async doGetGeneric(resourceUrl: string, callback: (response: any) => any): Promise<any> {
-        let response = await this.doGet(resourceUrl);
-        return callback(response);
-    }
-
-    private async doGet(resourceUrl: string): Promise<any> {
-        try {
-            let url = `${this.url}/${resourceUrl}`;
-            let response = await axios.get(url, this.config);
-
-            return response.data;
-        } catch (error) {
-            this.handleApiError(error, resourceUrl);
-        }
-    }
-
-    private handleApiError(error: any, resourceUrl: string) {
-        if (!error.response) {
-            console.warn(error);
-            throw new errors.ErrApiProviderGet(resourceUrl, error.toString(), error);
-        }
-
-        let errorData = error.response.data;
-        let originalErrorMessage = errorData.error || errorData.message || JSON.stringify(errorData);
-        throw new errors.ErrApiProviderGet(resourceUrl, originalErrorMessage, error);
-    }
-}
diff --git a/src-network-providers/networkProvider/index.ts b/src-network-providers/networkProvider/index.ts
index 111212f94..035453f64 100644
--- a/src-network-providers/networkProvider/index.ts
+++ b/src-network-providers/networkProvider/index.ts
@@ -3,7 +3,6 @@ export * from "./proxyNetworkProvider";
 
 // The old providers.
 export * from "./deprecatedProxyProvider";
-export * from "./deprecatedApiProvider";
 
 // we do not export "./tokens"
 // we do not export "./transactions"
diff --git a/src-network-providers/networkProvider/nftToken.ts b/src-network-providers/networkProvider/nftToken.ts
deleted file mode 100644
index 3132eeae9..000000000
--- a/src-network-providers/networkProvider/nftToken.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-
-export class NFTToken {
-    token: string = '';
-    name: string = '';
-    type: string = '';
-    owner: string = '';
-    minted: string = '';
-    burnt: string = '';
-    decimals: number = 0;
-    isPaused: boolean = false;
-    canUpgrade: boolean = false;
-    canMint: boolean = false;
-    canBurn: boolean = false;
-    canChangeOwner: boolean = false;
-    canPause: boolean = false;
-    canFreeze: boolean = false;
-    canWipe: boolean = false;
-    canAddSpecialRoles: boolean = false;
-    canTransferNFTCreateRole: boolean = false;
-    NFTCreateStopped: boolean = false;
-    wiped: string = '0';
-
-    constructor(init?: Partial<NFTToken>) {
-        Object.assign(this, init);
-    }
-
-    static fromHttpResponse(response: {
-        token: string,
-        name: string,
-        type: string,
-        owner: string,
-        minted: string,
-        burnt: string,
-        decimals: number,
-        isPaused: boolean,
-        canUpgrade: boolean,
-        canMint: boolean,
-        canBurn: boolean,
-        canChangeOwner: boolean,
-        canPause: boolean,
-        canFreeze: boolean,
-        canWipe: boolean,
-        canAddSpecialRoles: boolean,
-        canTransferNFTCreateRole: boolean,
-        NFTCreateStopped: boolean,
-        wiped: string
-    }) {
-        let nftToken = new NFTToken(response);
-        return nftToken;
-    }
-
-    getTokenName() {
-        return this.name;
-    }
-
-    getTokenIdentifier() {
-        return this.token;
-    }
-
-    getTokenType() {
-        return this.type;
-    }
-}

From 669dbe57b66a0549d0f9811dee295e41cc9d5d03 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Thu, 7 Apr 2022 11:08:35 +0300
Subject: [PATCH 076/338] Add missing fields on NFT token.

---
 .../networkProvider/interface.ts              |  9 +++++++-
 .../networkProvider/tokens.ts                 | 23 +++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src-network-providers/networkProvider/interface.ts b/src-network-providers/networkProvider/interface.ts
index 2bcae8e68..4a3913a2e 100644
--- a/src-network-providers/networkProvider/interface.ts
+++ b/src-network-providers/networkProvider/interface.ts
@@ -119,11 +119,18 @@ export interface IFungibleTokenOfAccountOnNetwork {
 export interface INonFungibleTokenOfAccountOnNetwork {
     identifier: string;
     collection: string;
+    timestamp: number;
     attributes: Buffer;
-    balance: BigNumber;
     nonce: INonce;
+    type: string;
+    name: string;
     creator: IAddress;
+    isWhitelistedStorage: boolean;
+    supply: BigNumber;
+    decimals: number;
     royalties: BigNumber;
+    ticker: string;
+    assets: string[];
 }
 
 
diff --git a/src-network-providers/networkProvider/tokens.ts b/src-network-providers/networkProvider/tokens.ts
index 3223f178a..d089c9ed2 100644
--- a/src-network-providers/networkProvider/tokens.ts
+++ b/src-network-providers/networkProvider/tokens.ts
@@ -19,11 +19,22 @@ export class FungibleTokenOfAccountOnNetwork implements IFungibleTokenOfAccountO
 export class NonFungibleTokenOfAccountOnNetwork implements INonFungibleTokenOfAccountOnNetwork {
     identifier: string = "";
     collection: string = "";
+    timestamp: number = 0;
     attributes: Buffer = Buffer.from([]);
-    balance: BigNumber = new BigNumber(0);
     nonce: INonce = new Nonce(0);
+    type: string = "";
+    name: string = "";
     creator: IAddress = new Address("");
+    isWhitelistedStorage: boolean = false;
+    supply: BigNumber = new BigNumber(0);
+    decimals: number = 0;
     royalties: BigNumber = new BigNumber(0);
+    ticker: string = "";
+    assets: string[] = [];
+
+    constructor(init?: Partial<NonFungibleTokenOfAccountOnNetwork>) {
+        Object.assign(this, init);
+    }
 
     static fromProxyHttpResponse(payload: any): NonFungibleTokenOfAccountOnNetwork {
         let result = NonFungibleTokenOfAccountOnNetwork.fromHttpResponse(payload);
@@ -54,14 +65,22 @@ export class NonFungibleTokenOfAccountOnNetwork implements INonFungibleTokenOfAc
         return result;
     }
 
+    // TODO: Compare results from Proxy and API and try to reconciliate them.
     private static fromHttpResponse(payload: any): NonFungibleTokenOfAccountOnNetwork {
         let result = new NonFungibleTokenOfAccountOnNetwork();
 
+        result.timestamp = Number(payload.timestamp || 0);
         result.attributes = Buffer.from(payload.attributes || "", "base64");
-        result.balance = new BigNumber(payload.balance || 1);
         result.nonce = new Nonce(payload.nonce || 0);
+        result.type = payload.type || "";
+        result.name = payload.name || "";
         result.creator = new Address(payload.creator || "");
+        result.isWhitelistedStorage = payload.isWhitelistedStorage || false;
+        result.decimals = Number(payload.decimals || 0);
+        result.supply = new BigNumber(payload.balance || 1);
         result.royalties = new BigNumber(payload.royalties || 0);
+        result.ticker = payload.ticker || "";
+        result.assets = payload.assets || [];
 
         return result;
     }

From a66f6a0dc748b2dcc1ef009ceb5f7212272f2fd0 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Thu, 7 Apr 2022 11:25:35 +0300
Subject: [PATCH 077/338] Move deprecated proxy provider to contractWrappers
 (it depends on it).

---
 .../deprecatedProxyProvider.ts                | 75 -------------------
 .../networkProvider/index.ts                  |  3 -
 2 files changed, 78 deletions(-)
 delete mode 100644 src-network-providers/networkProvider/deprecatedProxyProvider.ts

diff --git a/src-network-providers/networkProvider/deprecatedProxyProvider.ts b/src-network-providers/networkProvider/deprecatedProxyProvider.ts
deleted file mode 100644
index e1ba0ca4b..000000000
--- a/src-network-providers/networkProvider/deprecatedProxyProvider.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { AxiosRequestConfig } from "axios";
-import BigNumber from "bignumber.js";
-import { IAddress, IContractQuery, IHash, ITransaction } from "./interface";
-import { ProxyNetworkProvider } from "./proxyNetworkProvider";
-import { ContractQueryResponse } from "./contractQueryResponse";
-import { AccountOnNetwork } from "./accounts";
-import { FungibleTokenOfAccountOnNetwork } from "./tokens";
-import { TransactionStatus } from "./transactionStatus";
-import { TransactionOnNetwork } from "./transactions";
-import { NetworkConfig } from "./networkConfig";
-import { NetworkStatus } from "./networkStatus";
-import { Nonce } from "./primitives";
-
-/**
- * @deprecated
- */
-export class DeprecatedProxyProvider {
-    private readonly backingProvider: ProxyNetworkProvider;
-
-    constructor(url: string, config?: AxiosRequestConfig) {
-        this.backingProvider = new ProxyNetworkProvider(url, config);
-    }
-
-    async getAccount(address: IAddress): Promise<AccountOnNetwork> {
-        return await this.backingProvider.getAccount(address);
-    }
-
-    async getAddressEsdtList(address: IAddress): Promise<FungibleTokenOfAccountOnNetwork[]> {
-        return await this.backingProvider.getFungibleTokensOfAccount(address);
-    }
-
-    async getAddressEsdt(address: IAddress, tokenIdentifier: string): Promise<any> {
-        return await this.backingProvider.getFungibleTokenOfAccount(address, tokenIdentifier);
-    }
-
-    async getAddressNft(address: IAddress, tokenIdentifier: string, nonce: BigNumber): Promise<any> {
-        return await this.backingProvider.getNonFungibleTokenOfAccount(address, tokenIdentifier, new Nonce(nonce.toNumber()));
-    }
-
-    async queryContract(query: IContractQuery): Promise<ContractQueryResponse> {
-        return await this.backingProvider.queryContract(query);
-    }
-
-    async sendTransaction(tx: ITransaction): Promise<IHash> {
-        return await this.backingProvider.sendTransaction(tx);
-    }
-
-    async simulateTransaction(tx: ITransaction): Promise<any> {
-        return await this.backingProvider.simulateTransaction(tx);
-    }
-
-    async getTransaction(txHash: IHash): Promise<TransactionOnNetwork> {
-        return await this.backingProvider.getTransaction(txHash);
-    }
-
-    async getTransactionStatus(txHash: IHash): Promise<TransactionStatus> {
-        return await this.backingProvider.getTransactionStatus(txHash);
-    }
-
-    async getNetworkConfig(): Promise<NetworkConfig> {
-        return await this.backingProvider.getNetworkConfig();
-    }
-
-    async getNetworkStatus(): Promise<NetworkStatus> {
-        return await this.backingProvider.getNetworkStatus();
-    }
-
-    async doGetGeneric(resourceUrl: string): Promise<any> {
-        return await this.backingProvider.doGetGeneric(resourceUrl);
-    }
-
-    async doPostGeneric(resourceUrl: string, payload: any): Promise<any> {
-        return await this.backingProvider.doPostGeneric(resourceUrl, payload);
-    }
-}
diff --git a/src-network-providers/networkProvider/index.ts b/src-network-providers/networkProvider/index.ts
index 035453f64..0c4e6aa0f 100644
--- a/src-network-providers/networkProvider/index.ts
+++ b/src-network-providers/networkProvider/index.ts
@@ -1,8 +1,5 @@
 export * from "./apiNetworkProvider";
 export * from "./proxyNetworkProvider";
 
-// The old providers.
-export * from "./deprecatedProxyProvider";
-
 // we do not export "./tokens"
 // we do not export "./transactions"

From 0b964bbdb0d8e9d0e4e3330d3095dc7c81bd7614 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Thu, 7 Apr 2022 11:43:19 +0300
Subject: [PATCH 078/338] Remove some interfaces.

---
 .../networkProvider/apiNetworkProvider.ts     | 16 ++---
 .../networkProvider/interface.ts              | 72 +++----------------
 .../networkProvider/proxyNetworkProvider.ts   | 17 ++---
 .../networkProvider/tokenDefinitions.ts       |  6 +-
 .../networkProvider/tokens.ts                 |  6 +-
 5 files changed, 32 insertions(+), 85 deletions(-)

diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
index dc9df71bb..f8e407b7f 100644
--- a/src-network-providers/networkProvider/apiNetworkProvider.ts
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -1,6 +1,6 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "./accounts";
-import { IAddress, IContractQuery, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonce, INonFungibleTokenOfAccountOnNetwork, ITransaction, Pagination } from "./interface";
+import { IAddress, IContractQuery, IHash, INetworkProvider, INonce, ITransaction, Pagination } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
 import { Stats } from "./stats";
@@ -53,7 +53,7 @@ export class ApiNetworkProvider implements INetworkProvider {
         return account;
     }
 
-    async getFungibleTokensOfAccount(address: IAddress, pagination?: Pagination): Promise<IFungibleTokenOfAccountOnNetwork[]> {
+    async getFungibleTokensOfAccount(address: IAddress, pagination?: Pagination): Promise<FungibleTokenOfAccountOnNetwork[]> {
         pagination = pagination || Pagination.default();
 
         let url = `accounts/${address.bech32()}/tokens?${this.buildPaginationParams(pagination)}`;
@@ -65,7 +65,7 @@ export class ApiNetworkProvider implements INetworkProvider {
         return tokens;
     }
 
-    async getNonFungibleTokensOfAccount(address: IAddress, pagination?: Pagination): Promise<INonFungibleTokenOfAccountOnNetwork[]> {
+    async getNonFungibleTokensOfAccount(address: IAddress, pagination?: Pagination): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
         pagination = pagination || Pagination.default();
 
         let url = `accounts/${address.bech32()}/nfts?${this.buildPaginationParams(pagination)}`;
@@ -77,13 +77,13 @@ export class ApiNetworkProvider implements INetworkProvider {
         return tokens;
     }
 
-    async getFungibleTokenOfAccount(address: IAddress, tokenIdentifier: string): Promise<IFungibleTokenOfAccountOnNetwork> {
+    async getFungibleTokenOfAccount(address: IAddress, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`accounts/${address.bech32()}/tokens/${tokenIdentifier}`);
         let tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response);
         return tokenData;
     }
 
-    async getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: INonce): Promise<INonFungibleTokenOfAccountOnNetwork> {
+    async getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: INonce): Promise<NonFungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`accounts/${address.bech32()}/nfts/${collection}-${nonce.hex()}`);
         let tokenData = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response);
         return tokenData;
@@ -118,19 +118,19 @@ export class ApiNetworkProvider implements INetworkProvider {
         return queryResponse;
     }
 
-    async getDefinitionOfFungibleToken(tokenIdentifier: string): Promise<IDefinitionOfFungibleTokenOnNetwork> {
+    async getDefinitionOfFungibleToken(tokenIdentifier: string): Promise<DefinitionOfFungibleTokenOnNetwork> {
         let response = await this.doGetGeneric(`tokens/${tokenIdentifier}`);
         let definition = DefinitionOfFungibleTokenOnNetwork.fromApiHttpResponse(response);
         return definition;
     }
 
-    async getDefinitionOfTokenCollection(collection: string): Promise<IDefinitionOfTokenCollectionOnNetwork> {
+    async getDefinitionOfTokenCollection(collection: string): Promise<DefinitionOfTokenCollectionOnNetwork> {
         let response = await this.doGetGeneric(`collections/${collection}`);
         let definition = DefinitionOfTokenCollectionOnNetwork.fromApiHttpResponse(response);
         return definition;
     }
 
-    async getNonFungibleToken(collection: string, nonce: INonce): Promise<INonFungibleTokenOfAccountOnNetwork> {
+    async getNonFungibleToken(collection: string, nonce: INonce): Promise<NonFungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`nfts/${collection}-${nonce.hex()}`);
         let token = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response);
         return token;
diff --git a/src-network-providers/networkProvider/interface.ts b/src-network-providers/networkProvider/interface.ts
index 4a3913a2e..762c95041 100644
--- a/src-network-providers/networkProvider/interface.ts
+++ b/src-network-providers/networkProvider/interface.ts
@@ -1,4 +1,3 @@
-import { BigNumber } from "bignumber.js";
 import { AccountOnNetwork } from "./accounts";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
@@ -7,6 +6,8 @@ import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 import { NetworkStatus } from "./networkStatus";
 import { ContractQueryResponse } from "./contractQueryResponse";
+import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
+import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 
 /**
  * An interface that defines the endpoints of an HTTP API Provider.
@@ -40,22 +41,22 @@ export interface INetworkProvider {
     /**
      * Fetches data about the fungible tokens held by an account.
      */
-    getFungibleTokensOfAccount(address: IAddress, pagination?: Pagination): Promise<IFungibleTokenOfAccountOnNetwork[]>;
+    getFungibleTokensOfAccount(address: IAddress, pagination?: Pagination): Promise<FungibleTokenOfAccountOnNetwork[]>;
 
     /**
      * Fetches data about the non-fungible tokens held by account.
      */
-    getNonFungibleTokensOfAccount(address: IAddress, pagination?: Pagination): Promise<INonFungibleTokenOfAccountOnNetwork[]>;
+    getNonFungibleTokensOfAccount(address: IAddress, pagination?: Pagination): Promise<NonFungibleTokenOfAccountOnNetwork[]>;
 
     /**
      * Fetches data about a specific fungible token held by an account.
      */
-    getFungibleTokenOfAccount(address: IAddress, tokenIdentifier: string): Promise<IFungibleTokenOfAccountOnNetwork>;
+    getFungibleTokenOfAccount(address: IAddress, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork>;
 
     /**
      * Fetches data about a specific non-fungible token (instance) held by an account.
      */
-    getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: INonce): Promise<INonFungibleTokenOfAccountOnNetwork>;
+    getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: INonce): Promise<NonFungibleTokenOfAccountOnNetwork>;
 
     /**
      * Fetches the state of a {@link Transaction}.
@@ -87,18 +88,18 @@ export interface INetworkProvider {
      * Fetches the definition of a fungible token.
      *
      */
-    getDefinitionOfFungibleToken(tokenIdentifier: string): Promise<IDefinitionOfFungibleTokenOnNetwork>;
+    getDefinitionOfFungibleToken(tokenIdentifier: string): Promise<DefinitionOfFungibleTokenOnNetwork>;
 
     /**
      * Fetches the definition of a SFT (including Meta ESDT) or NFT.
      * 
      */
-    getDefinitionOfTokenCollection(collection: string): Promise<IDefinitionOfTokenCollectionOnNetwork>;
+    getDefinitionOfTokenCollection(collection: string): Promise<DefinitionOfTokenCollectionOnNetwork>;
 
     /**
      * Fetches data about a specific non-fungible token (instance).
      */
-    getNonFungibleToken(collection: string, nonce: INonce): Promise<INonFungibleTokenOfAccountOnNetwork>;
+    getNonFungibleToken(collection: string, nonce: INonce): Promise<NonFungibleTokenOfAccountOnNetwork>;
 
     /**
      * Performs a generic GET action against the provider (useful for new HTTP endpoints, not yet supported by erdjs).
@@ -111,61 +112,6 @@ export interface INetworkProvider {
     doPostGeneric(resourceUrl: string, payload: any): Promise<any>;
 }
 
-export interface IFungibleTokenOfAccountOnNetwork {
-    identifier: string;
-    balance: BigNumber;
-}
-
-export interface INonFungibleTokenOfAccountOnNetwork {
-    identifier: string;
-    collection: string;
-    timestamp: number;
-    attributes: Buffer;
-    nonce: INonce;
-    type: string;
-    name: string;
-    creator: IAddress;
-    isWhitelistedStorage: boolean;
-    supply: BigNumber;
-    decimals: number;
-    royalties: BigNumber;
-    ticker: string;
-    assets: string[];
-}
-
-
-export interface IDefinitionOfFungibleTokenOnNetwork {
-    identifier: string;
-    name: string;
-    ticker: string;
-    owner: IAddress;
-    decimals: number;
-    supply: BigNumber;
-    isPaused: boolean;
-    canUpgrade: boolean;
-    canMint: boolean;
-    canBurn: boolean;
-    canChangeOwner: boolean;
-    canPause: boolean;
-    canFreeze: boolean;
-    canWipe: boolean;
-    canAddSpecialRoles: boolean;
-}
-
-export interface IDefinitionOfTokenCollectionOnNetwork {
-    collection: string;
-    type: string;
-    name: string;
-    ticker: string;
-    owner: IAddress;
-    decimals: number;
-    canPause: boolean;
-    canFreeze: boolean;
-    canWipe: boolean;
-    canTransferRole: boolean;
-    // TODO: add "assets", "roles"
-}
-
 export interface IContractQuery {
     toHttpRequest(): any;
 }
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index 822e8be0b..a24dde7de 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -1,6 +1,6 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "./accounts";
-import { IAddress, IContractQuery, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork, IFungibleTokenOfAccountOnNetwork, IHash, INetworkProvider, INonce, INonFungibleTokenOfAccountOnNetwork, ITransaction, Pagination } from "./interface";
+import { IAddress, IContractQuery, IHash, INetworkProvider, INonce, ITransaction, Pagination } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
 import { Stats } from "./stats";
@@ -12,6 +12,7 @@ import { ErrNetworkProvider } from "./errors";
 import { defaultAxiosConfig } from "./config";
 import { NetworkStatus } from "./networkStatus";
 import { ContractQueryResponse } from "./contractQueryResponse";
+import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ProxyNetworkProvider implements INetworkProvider {
@@ -53,7 +54,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return account;
     }
 
-    async getFungibleTokensOfAccount(address: IAddress, _pagination?: Pagination): Promise<IFungibleTokenOfAccountOnNetwork[]> {
+    async getFungibleTokensOfAccount(address: IAddress, _pagination?: Pagination): Promise<FungibleTokenOfAccountOnNetwork[]> {
         let url = `address/${address.bech32()}/esdt`;
         let response = await this.doGetGeneric(url);
         let responseItems: any[] = Object.values(response.esdts);
@@ -66,7 +67,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokens;
     }
 
-    async getNonFungibleTokensOfAccount(address: IAddress, _pagination?: Pagination): Promise<INonFungibleTokenOfAccountOnNetwork[]> {
+    async getNonFungibleTokensOfAccount(address: IAddress, _pagination?: Pagination): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
         let url = `address/${address.bech32()}/esdt`;
         let response = await this.doGetGeneric(url);
         let responseItems: any[] = Object.values(response.esdts);
@@ -79,13 +80,13 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokens;
     }
 
-    async getFungibleTokenOfAccount(address: IAddress, tokenIdentifier: string): Promise<IFungibleTokenOfAccountOnNetwork> {
+    async getFungibleTokenOfAccount(address: IAddress, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`address/${address.bech32()}/esdt/${tokenIdentifier}`);
         let tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response.tokenData);
         return tokenData;
     }
 
-    async getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: INonce): Promise<INonFungibleTokenOfAccountOnNetwork> {
+    async getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: INonce): Promise<NonFungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`address/${address.bech32()}/nft/${collection}/nonce/${nonce.valueOf()}`);
         let tokenData = NonFungibleTokenOfAccountOnNetwork.fromProxyHttpResponseByNonce(response.tokenData);
         return tokenData;
@@ -122,20 +123,20 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return queryResponse;
     }
 
-    async getDefinitionOfFungibleToken(_tokenIdentifier: string): Promise<IDefinitionOfFungibleTokenOnNetwork> {
+    async getDefinitionOfFungibleToken(_tokenIdentifier: string): Promise<DefinitionOfFungibleTokenOnNetwork> {
         // TODO: Implement wrt.:
         // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/esdt/esdt.service.ts#L221
         throw new Error("Method not implemented.");
     }
 
-    async getDefinitionOfTokenCollection(_collection: string): Promise<IDefinitionOfTokenCollectionOnNetwork> {
+    async getDefinitionOfTokenCollection(_collection: string): Promise<DefinitionOfTokenCollectionOnNetwork> {
         // TODO: Implement wrt.:
         // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/collections/collection.service.ts
         // https://docs.elrond.com/developers/esdt-tokens/#get-esdt-token-properties
         throw new Error("Method not implemented.");
     }
 
-    async getNonFungibleToken(_collection: string, _nonce: INonce): Promise<INonFungibleTokenOfAccountOnNetwork> {
+    async getNonFungibleToken(_collection: string, _nonce: INonce): Promise<NonFungibleTokenOfAccountOnNetwork> {
         throw new Error("Method not implemented.");
     }
 
diff --git a/src-network-providers/networkProvider/tokenDefinitions.ts b/src-network-providers/networkProvider/tokenDefinitions.ts
index c10644854..0a7f156d4 100644
--- a/src-network-providers/networkProvider/tokenDefinitions.ts
+++ b/src-network-providers/networkProvider/tokenDefinitions.ts
@@ -1,8 +1,8 @@
 import { BigNumber } from "bignumber.js";
 import { Address } from "./primitives";
-import { IAddress, IDefinitionOfFungibleTokenOnNetwork, IDefinitionOfTokenCollectionOnNetwork } from "./interface";
+import { IAddress } from "./interface";
 
-export class DefinitionOfFungibleTokenOnNetwork implements IDefinitionOfFungibleTokenOnNetwork {
+export class DefinitionOfFungibleTokenOnNetwork {
     identifier: string = "";
     name: string = "";
     ticker: string = "";
@@ -42,7 +42,7 @@ export class DefinitionOfFungibleTokenOnNetwork implements IDefinitionOfFungible
     }
 }
 
-export class DefinitionOfTokenCollectionOnNetwork implements IDefinitionOfTokenCollectionOnNetwork {
+export class DefinitionOfTokenCollectionOnNetwork {
     collection: string = "";
     type: string = "";
     name: string = "";
diff --git a/src-network-providers/networkProvider/tokens.ts b/src-network-providers/networkProvider/tokens.ts
index d089c9ed2..6e1670283 100644
--- a/src-network-providers/networkProvider/tokens.ts
+++ b/src-network-providers/networkProvider/tokens.ts
@@ -1,8 +1,8 @@
 import { BigNumber } from "bignumber.js";
 import { Address, Nonce } from "./primitives";
-import { IAddress, IFungibleTokenOfAccountOnNetwork, INonce, INonFungibleTokenOfAccountOnNetwork } from "./interface";
+import { IAddress, INonce } from "./interface";
 
-export class FungibleTokenOfAccountOnNetwork implements IFungibleTokenOfAccountOnNetwork {
+export class FungibleTokenOfAccountOnNetwork {
     identifier: string = "";
     balance: BigNumber = new BigNumber(0);
 
@@ -16,7 +16,7 @@ export class FungibleTokenOfAccountOnNetwork implements IFungibleTokenOfAccountO
     }
 }
 
-export class NonFungibleTokenOfAccountOnNetwork implements INonFungibleTokenOfAccountOnNetwork {
+export class NonFungibleTokenOfAccountOnNetwork {
     identifier: string = "";
     collection: string = "";
     timestamp: number = 0;

From bb34980c2effe0e3239cd234edd2a4d0a85842b8 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Thu, 7 Apr 2022 11:51:45 +0300
Subject: [PATCH 079/338] More specific error for vm queries (as before).

---
 .../networkProvider/apiNetworkProvider.ts      | 12 +++++++-----
 .../networkProvider/errors.ts                  | 18 ++++--------------
 .../networkProvider/proxyNetworkProvider.ts    | 12 +++++++-----
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/networkProvider/apiNetworkProvider.ts
index f8e407b7f..5438c4d29 100644
--- a/src-network-providers/networkProvider/apiNetworkProvider.ts
+++ b/src-network-providers/networkProvider/apiNetworkProvider.ts
@@ -10,7 +10,7 @@ import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } f
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 import { Hash } from "./primitives";
-import { ErrNetworkProvider } from "./errors";
+import { ErrContractQuery, ErrNetworkProvider } from "./errors";
 import { defaultAxiosConfig } from "./config";
 import { NetworkStatus } from "./networkStatus";
 import { ContractQueryResponse } from "./contractQueryResponse";
@@ -112,10 +112,12 @@ export class ApiNetworkProvider implements INetworkProvider {
     }
 
     async queryContract(query: IContractQuery): Promise<ContractQueryResponse> {
-        let data = query.toHttpRequest();
-        let response = await this.doPostGeneric("query", data);
-        let queryResponse = ContractQueryResponse.fromHttpResponse(response);
-        return queryResponse;
+        try {
+            let response = await this.doPostGeneric("query", query.toHttpRequest());
+            return ContractQueryResponse.fromHttpResponse(response);
+        } catch (error: any) {
+            throw new ErrContractQuery(error);
+        }
     }
 
     async getDefinitionOfFungibleToken(tokenIdentifier: string): Promise<DefinitionOfFungibleTokenOnNetwork> {
diff --git a/src-network-providers/networkProvider/errors.ts b/src-network-providers/networkProvider/errors.ts
index bed8984f8..73882ecdb 100644
--- a/src-network-providers/networkProvider/errors.ts
+++ b/src-network-providers/networkProvider/errors.ts
@@ -29,22 +29,12 @@ export class ErrNetworkProvider extends Err {
     }
 }
 
-/**
- * Signals an error that happened during a HTTP GET request.
- */
-export class ErrApiProviderGet extends Err {
-    public constructor(url: string, error: string, inner?: Error) {
-        let message = `Cannot GET ${url}: [${error}]`;
-        super(message, inner);
-    }
-}
 
 /**
- * Signals an error that happened during a HTTP POST request.
+ * Signals a generic error in the context of querying Smart Contracts.
  */
-export class ErrApiProviderPost extends Err {
-    public constructor(url: string, error: string, inner?: Error) {
-        let message = `Cannot POST ${url}: [${error}]`;
-        super(message, inner);
+export class ErrContractQuery extends Err {
+    public constructor(originalError: Error) {
+        super(originalError.message.replace("executeQuery:", ""));
     }
 }
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/networkProvider/proxyNetworkProvider.ts
index a24dde7de..9313d045a 100644
--- a/src-network-providers/networkProvider/proxyNetworkProvider.ts
+++ b/src-network-providers/networkProvider/proxyNetworkProvider.ts
@@ -8,7 +8,7 @@ import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } f
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 import { Hash } from "./primitives";
-import { ErrNetworkProvider } from "./errors";
+import { ErrContractQuery, ErrNetworkProvider } from "./errors";
 import { defaultAxiosConfig } from "./config";
 import { NetworkStatus } from "./networkStatus";
 import { ContractQueryResponse } from "./contractQueryResponse";
@@ -117,10 +117,12 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     async queryContract(query: IContractQuery): Promise<ContractQueryResponse> {
-        let data = query.toHttpRequest();
-        let response = await this.doPostGeneric("vm-values/query", data);
-        let queryResponse = ContractQueryResponse.fromHttpResponse(response.data);
-        return queryResponse;
+        try {
+            let response = await this.doPostGeneric("vm-values/query", query.toHttpRequest());
+            return ContractQueryResponse.fromHttpResponse(response.data);
+        } catch (error: any) {
+            throw new ErrContractQuery(error);
+        }
     }
 
     async getDefinitionOfFungibleToken(_tokenIdentifier: string): Promise<DefinitionOfFungibleTokenOnNetwork> {

From 3944eaaf773e4ae953326d6e14d914ba1042e9ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Thu, 7 Apr 2022 15:37:47 +0300
Subject: [PATCH 080/338] Move files one-level up.

---
 src-network-providers/{networkProvider => }/accounts.ts           | 0
 src-network-providers/{networkProvider => }/apiNetworkProvider.ts | 0
 src-network-providers/{networkProvider => }/config.ts             | 0
 src-network-providers/{networkProvider => }/constants.ts          | 0
 .../{networkProvider => }/contractQueryResponse.ts                | 0
 src-network-providers/{networkProvider => }/contractResults.ts    | 0
 src-network-providers/{networkProvider => }/errors.ts             | 0
 src-network-providers/{networkProvider => }/index.ts              | 0
 src-network-providers/{networkProvider => }/interface.ts          | 0
 src-network-providers/{networkProvider => }/networkConfig.ts      | 0
 src-network-providers/{networkProvider => }/networkStake.ts       | 0
 src-network-providers/{networkProvider => }/networkStatus.ts      | 0
 src-network-providers/{networkProvider => }/primitives.ts         | 0
 .../{networkProvider => }/providers.dev.net.spec.ts               | 0
 .../{networkProvider => }/proxyNetworkProvider.ts                 | 0
 src-network-providers/{networkProvider => }/stats.ts              | 0
 src-network-providers/{networkProvider => }/tokenDefinitions.ts   | 0
 src-network-providers/{networkProvider => }/tokens.ts             | 0
 .../{networkProvider => }/transactionCompletionStrategy.ts        | 0
 src-network-providers/{networkProvider => }/transactionEvents.ts  | 0
 src-network-providers/{networkProvider => }/transactionLogs.ts    | 0
 src-network-providers/{networkProvider => }/transactionReceipt.ts | 0
 src-network-providers/{networkProvider => }/transactionStatus.ts  | 0
 src-network-providers/{networkProvider => }/transactions.ts       | 0
 24 files changed, 0 insertions(+), 0 deletions(-)
 rename src-network-providers/{networkProvider => }/accounts.ts (100%)
 rename src-network-providers/{networkProvider => }/apiNetworkProvider.ts (100%)
 rename src-network-providers/{networkProvider => }/config.ts (100%)
 rename src-network-providers/{networkProvider => }/constants.ts (100%)
 rename src-network-providers/{networkProvider => }/contractQueryResponse.ts (100%)
 rename src-network-providers/{networkProvider => }/contractResults.ts (100%)
 rename src-network-providers/{networkProvider => }/errors.ts (100%)
 rename src-network-providers/{networkProvider => }/index.ts (100%)
 rename src-network-providers/{networkProvider => }/interface.ts (100%)
 rename src-network-providers/{networkProvider => }/networkConfig.ts (100%)
 rename src-network-providers/{networkProvider => }/networkStake.ts (100%)
 rename src-network-providers/{networkProvider => }/networkStatus.ts (100%)
 rename src-network-providers/{networkProvider => }/primitives.ts (100%)
 rename src-network-providers/{networkProvider => }/providers.dev.net.spec.ts (100%)
 rename src-network-providers/{networkProvider => }/proxyNetworkProvider.ts (100%)
 rename src-network-providers/{networkProvider => }/stats.ts (100%)
 rename src-network-providers/{networkProvider => }/tokenDefinitions.ts (100%)
 rename src-network-providers/{networkProvider => }/tokens.ts (100%)
 rename src-network-providers/{networkProvider => }/transactionCompletionStrategy.ts (100%)
 rename src-network-providers/{networkProvider => }/transactionEvents.ts (100%)
 rename src-network-providers/{networkProvider => }/transactionLogs.ts (100%)
 rename src-network-providers/{networkProvider => }/transactionReceipt.ts (100%)
 rename src-network-providers/{networkProvider => }/transactionStatus.ts (100%)
 rename src-network-providers/{networkProvider => }/transactions.ts (100%)

diff --git a/src-network-providers/networkProvider/accounts.ts b/src-network-providers/accounts.ts
similarity index 100%
rename from src-network-providers/networkProvider/accounts.ts
rename to src-network-providers/accounts.ts
diff --git a/src-network-providers/networkProvider/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
similarity index 100%
rename from src-network-providers/networkProvider/apiNetworkProvider.ts
rename to src-network-providers/apiNetworkProvider.ts
diff --git a/src-network-providers/networkProvider/config.ts b/src-network-providers/config.ts
similarity index 100%
rename from src-network-providers/networkProvider/config.ts
rename to src-network-providers/config.ts
diff --git a/src-network-providers/networkProvider/constants.ts b/src-network-providers/constants.ts
similarity index 100%
rename from src-network-providers/networkProvider/constants.ts
rename to src-network-providers/constants.ts
diff --git a/src-network-providers/networkProvider/contractQueryResponse.ts b/src-network-providers/contractQueryResponse.ts
similarity index 100%
rename from src-network-providers/networkProvider/contractQueryResponse.ts
rename to src-network-providers/contractQueryResponse.ts
diff --git a/src-network-providers/networkProvider/contractResults.ts b/src-network-providers/contractResults.ts
similarity index 100%
rename from src-network-providers/networkProvider/contractResults.ts
rename to src-network-providers/contractResults.ts
diff --git a/src-network-providers/networkProvider/errors.ts b/src-network-providers/errors.ts
similarity index 100%
rename from src-network-providers/networkProvider/errors.ts
rename to src-network-providers/errors.ts
diff --git a/src-network-providers/networkProvider/index.ts b/src-network-providers/index.ts
similarity index 100%
rename from src-network-providers/networkProvider/index.ts
rename to src-network-providers/index.ts
diff --git a/src-network-providers/networkProvider/interface.ts b/src-network-providers/interface.ts
similarity index 100%
rename from src-network-providers/networkProvider/interface.ts
rename to src-network-providers/interface.ts
diff --git a/src-network-providers/networkProvider/networkConfig.ts b/src-network-providers/networkConfig.ts
similarity index 100%
rename from src-network-providers/networkProvider/networkConfig.ts
rename to src-network-providers/networkConfig.ts
diff --git a/src-network-providers/networkProvider/networkStake.ts b/src-network-providers/networkStake.ts
similarity index 100%
rename from src-network-providers/networkProvider/networkStake.ts
rename to src-network-providers/networkStake.ts
diff --git a/src-network-providers/networkProvider/networkStatus.ts b/src-network-providers/networkStatus.ts
similarity index 100%
rename from src-network-providers/networkProvider/networkStatus.ts
rename to src-network-providers/networkStatus.ts
diff --git a/src-network-providers/networkProvider/primitives.ts b/src-network-providers/primitives.ts
similarity index 100%
rename from src-network-providers/networkProvider/primitives.ts
rename to src-network-providers/primitives.ts
diff --git a/src-network-providers/networkProvider/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
similarity index 100%
rename from src-network-providers/networkProvider/providers.dev.net.spec.ts
rename to src-network-providers/providers.dev.net.spec.ts
diff --git a/src-network-providers/networkProvider/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
similarity index 100%
rename from src-network-providers/networkProvider/proxyNetworkProvider.ts
rename to src-network-providers/proxyNetworkProvider.ts
diff --git a/src-network-providers/networkProvider/stats.ts b/src-network-providers/stats.ts
similarity index 100%
rename from src-network-providers/networkProvider/stats.ts
rename to src-network-providers/stats.ts
diff --git a/src-network-providers/networkProvider/tokenDefinitions.ts b/src-network-providers/tokenDefinitions.ts
similarity index 100%
rename from src-network-providers/networkProvider/tokenDefinitions.ts
rename to src-network-providers/tokenDefinitions.ts
diff --git a/src-network-providers/networkProvider/tokens.ts b/src-network-providers/tokens.ts
similarity index 100%
rename from src-network-providers/networkProvider/tokens.ts
rename to src-network-providers/tokens.ts
diff --git a/src-network-providers/networkProvider/transactionCompletionStrategy.ts b/src-network-providers/transactionCompletionStrategy.ts
similarity index 100%
rename from src-network-providers/networkProvider/transactionCompletionStrategy.ts
rename to src-network-providers/transactionCompletionStrategy.ts
diff --git a/src-network-providers/networkProvider/transactionEvents.ts b/src-network-providers/transactionEvents.ts
similarity index 100%
rename from src-network-providers/networkProvider/transactionEvents.ts
rename to src-network-providers/transactionEvents.ts
diff --git a/src-network-providers/networkProvider/transactionLogs.ts b/src-network-providers/transactionLogs.ts
similarity index 100%
rename from src-network-providers/networkProvider/transactionLogs.ts
rename to src-network-providers/transactionLogs.ts
diff --git a/src-network-providers/networkProvider/transactionReceipt.ts b/src-network-providers/transactionReceipt.ts
similarity index 100%
rename from src-network-providers/networkProvider/transactionReceipt.ts
rename to src-network-providers/transactionReceipt.ts
diff --git a/src-network-providers/networkProvider/transactionStatus.ts b/src-network-providers/transactionStatus.ts
similarity index 100%
rename from src-network-providers/networkProvider/transactionStatus.ts
rename to src-network-providers/transactionStatus.ts
diff --git a/src-network-providers/networkProvider/transactions.ts b/src-network-providers/transactions.ts
similarity index 100%
rename from src-network-providers/networkProvider/transactions.ts
rename to src-network-providers/transactions.ts

From 0344d432c857b0c7c60bbaf3ef4951aa378afb44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Thu, 7 Apr 2022 17:45:42 +0300
Subject: [PATCH 081/338] Fix / improve tests.

---
 src-network-providers/apiNetworkProvider.ts   |  12 +-
 src-network-providers/interface.ts            |   1 +
 .../providers.dev.net.spec.ts                 | 130 ++++++++++--------
 src-network-providers/proxyNetworkProvider.ts |  12 +-
 .../testscommon/dummyQuery.ts                 |  23 ++++
 src-network-providers/tokens.ts               |   4 -
 6 files changed, 110 insertions(+), 72 deletions(-)
 create mode 100644 src-network-providers/testscommon/dummyQuery.ts

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 5438c4d29..27e85b735 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -90,13 +90,13 @@ export class ApiNetworkProvider implements INetworkProvider {
     }
 
     async getTransaction(txHash: IHash): Promise<TransactionOnNetwork> {
-        let response = await this.doGetGeneric(`transactions/${txHash.toString()}`);
+        let response = await this.doGetGeneric(`transactions/${txHash.hex()}`);
         let transaction = TransactionOnNetwork.fromApiHttpResponse(txHash, response);
         return transaction;
     }
 
     async getTransactionStatus(txHash: IHash): Promise<TransactionStatus> {
-        let response = await this.doGetGeneric(`transactions/${txHash.toString()}?fields=status`);
+        let response = await this.doGetGeneric(`transactions/${txHash.hex()}?fields=status`);
         let status = new TransactionStatus(response.status);
         return status;
     }
@@ -153,8 +153,10 @@ export class ApiNetworkProvider implements INetworkProvider {
     }
 
     private async doGet(resourceUrl: string): Promise<any> {
+        let url = `${this.url}/${resourceUrl}`;
+        console.debug(`ApiNetworkProvider.doGet(): ${url}`);
+
         try {
-            let url = `${this.url}/${resourceUrl}`;
             let response = await axios.get(url, this.config);
             return response.data;
         } catch (error) {
@@ -163,8 +165,10 @@ export class ApiNetworkProvider implements INetworkProvider {
     }
 
     private async doPost(resourceUrl: string, payload: any): Promise<any> {
+        let url = `${this.url}/${resourceUrl}`;
+        console.debug(`ApiNetworkProvider.doPost(): ${url}`);
+
         try {
-            let url = `${this.url}/${resourceUrl}`;
             let response = await axios.post(url, payload, {
                 ...this.config,
                 headers: {
diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index 762c95041..b34a0b7b4 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -112,6 +112,7 @@ export interface INetworkProvider {
     doPostGeneric(resourceUrl: string, payload: any): Promise<any>;
 }
 
+// TODO: network-providers package should be responsible with formatting the http request.
 export interface IContractQuery {
     toHttpRequest(): any;
 }
diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 0b21855a5..1987b9512 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -1,29 +1,22 @@
 import { assert } from "chai";
 import { INetworkProvider } from "./interface";
-import { loadTestWallets, TestWallet } from "../testutils";
-import { TransactionHash } from "../transaction";
-import { ContractFunction, Query } from "../smartcontracts";
-import { BigUIntValue, U32Value, BytesValue, VariadicValue, VariadicType, CompositeType, BytesType, BooleanType } from "../smartcontracts/typesystem";
-import { BigNumber } from "bignumber.js";
+import { Hash } from "./primitives";
 import { ApiNetworkProvider } from "./apiNetworkProvider";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
-import { Address, Nonce, TransactionValue } from "./primitives";
+import { Address, Nonce } from "./primitives";
+import { DummyQuery } from "./testscommon/dummyQuery";
 
 describe("test network providers on devnet: Proxy and API", function () {
+    let alice = new Address("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
+    let bob = new Address("erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx");
+    let carol = new Address("erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
+    let dan = new Address("erd1kyaqzaprcdnv4luvanah0gfxzzsnpaygsy6pytrexll2urtd05ts9vegu7");
+
     let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 10000 });
     let proxyProvider: INetworkProvider = new ProxyNetworkProvider("https://devnet-gateway.elrond.com", { timeout: 10000 });
 
-    let alice: TestWallet;
-    let bob: TestWallet;
-    let carol: TestWallet;
-    let dan: TestWallet;
-
-    before(async function () {
-        ({ alice, bob, carol, dan } = await loadTestWallets());
-    });
-
     it("should have same response for getNetworkConfig()", async function () {
         let apiResponse = await apiProvider.getNetworkConfig();
         let proxyResponse = await proxyProvider.getNetworkConfig();
@@ -56,8 +49,8 @@ describe("test network providers on devnet: Proxy and API", function () {
 
     it("should have same response for getAccount()", async function () {
         for (const user of [bob, carol, dan]) {
-            let apiResponse = await apiProvider.getAccount(user.address);
-            let proxyResponse = await proxyProvider.getAccount(user.address);
+            let apiResponse = await apiProvider.getAccount(user);
+            let proxyResponse = await proxyProvider.getAccount(user);
 
             assert.deepEqual(apiResponse, proxyResponse);
         }
@@ -67,16 +60,16 @@ describe("test network providers on devnet: Proxy and API", function () {
         this.timeout(30000);
 
         for (const user of [carol, dan]) {
-            let apiResponse = await apiProvider.getFungibleTokensOfAccount(user.address);
-            let proxyResponse = await proxyProvider.getFungibleTokensOfAccount(user.address);
+            let apiResponse = await apiProvider.getFungibleTokensOfAccount(user);
+            let proxyResponse = await proxyProvider.getFungibleTokensOfAccount(user);
 
             assert.deepEqual(apiResponse.slice(0, 100), proxyResponse.slice(0, 100));
 
             for (const item of apiResponse.slice(0, 5)) {
-                let apiResponse = await apiProvider.getFungibleTokenOfAccount(user.address, item.identifier);
-                let proxyResponse = await proxyProvider.getFungibleTokenOfAccount(user.address, item.identifier);
+                let apiResponse = await apiProvider.getFungibleTokenOfAccount(user, item.identifier);
+                let proxyResponse = await proxyProvider.getFungibleTokenOfAccount(user, item.identifier);
 
-                assert.deepEqual(apiResponse, proxyResponse, `user: ${user.address.bech32()}, token: ${item.identifier}`);
+                assert.deepEqual(apiResponse, proxyResponse, `user: ${user.bech32()}, token: ${item.identifier}`);
             }
         }
     });
@@ -85,16 +78,24 @@ describe("test network providers on devnet: Proxy and API", function () {
         this.timeout(30000);
 
         for (const user of [alice, bob, carol, dan]) {
-            let apiResponse = await apiProvider.getNonFungibleTokensOfAccount(user.address);
-            let proxyResponse = await proxyProvider.getNonFungibleTokensOfAccount(user.address);
+            let apiResponse = await apiProvider.getNonFungibleTokensOfAccount(user);
+            let proxyResponse = await proxyProvider.getNonFungibleTokensOfAccount(user);
+
+            for (const item of apiResponse) {
+                // Gateway does not provide "type".
+                item.type = "";
+            }
 
             assert.deepEqual(apiResponse.slice(0, 100), proxyResponse.slice(0, 100));
 
             for (const item of apiResponse.slice(0, 5)) {
-                let apiResponse = await apiProvider.getNonFungibleTokenOfAccount(user.address, item.collection, item.nonce);
-                let proxyResponse = await proxyProvider.getNonFungibleTokenOfAccount(user.address, item.collection, item.nonce);
+                let apiResponse = await apiProvider.getNonFungibleTokenOfAccount(user, item.collection, item.nonce);
+                let proxyResponse = await proxyProvider.getNonFungibleTokenOfAccount(user, item.collection, item.nonce);
+
+                // Gateway does not provide "type".
+                apiResponse.type = "";
 
-                assert.deepEqual(apiResponse, proxyResponse, `user: ${user.address.bech32()}, token: ${item.identifier}`);
+                assert.deepEqual(apiResponse, proxyResponse, `user: ${user.bech32()}, token: ${item.identifier}`);
             }
         }
     });
@@ -103,10 +104,10 @@ describe("test network providers on devnet: Proxy and API", function () {
         this.timeout(20000);
 
         let hashes = [
-            new TransactionHash("a069c663831002651fd542479869cc61103465f3284dace772e7480f81429fa8"),
-            new TransactionHash("de3bc87f3e057e28ea6a625acd6d6d332e24f35ea73e820462b71256c8ecffb7"),
-            new TransactionHash("dbefa0299fe6b2336eb0bc3123fa623845c276e5c6e2a175adf1a562d5e77718"),
-            new TransactionHash("2a8ccbd91b7d9460a86174b5a8d4e6aa073b38674d1ee8107e728980a66f0676"),
+            new Hash("a069c663831002651fd542479869cc61103465f3284dace772e7480f81429fa8"),
+            new Hash("de3bc87f3e057e28ea6a625acd6d6d332e24f35ea73e820462b71256c8ecffb7"),
+            new Hash("dbefa0299fe6b2336eb0bc3123fa623845c276e5c6e2a175adf1a562d5e77718"),
+            new Hash("2a8ccbd91b7d9460a86174b5a8d4e6aa073b38674d1ee8107e728980a66f0676"),
             // TODO: uncomment after fix (SCR missing on API)
             // new TransactionHash("be7914b1eb4c6bd352ba1d86991959b443e446e0ad49fb796be3495c287b2472")
         ];
@@ -138,11 +139,11 @@ describe("test network providers on devnet: Proxy and API", function () {
         this.timeout(20000);
 
         let hashes = [
-            new TransactionHash("a069c663831002651fd542479869cc61103465f3284dace772e7480f81429fa8"),
-            new TransactionHash("de3bc87f3e057e28ea6a625acd6d6d332e24f35ea73e820462b71256c8ecffb7"),
-            new TransactionHash("dbefa0299fe6b2336eb0bc3123fa623845c276e5c6e2a175adf1a562d5e77718"),
-            new TransactionHash("2a8ccbd91b7d9460a86174b5a8d4e6aa073b38674d1ee8107e728980a66f0676"),
-            new TransactionHash("be7914b1eb4c6bd352ba1d86991959b443e446e0ad49fb796be3495c287b2472")
+            new Hash("a069c663831002651fd542479869cc61103465f3284dace772e7480f81429fa8"),
+            new Hash("de3bc87f3e057e28ea6a625acd6d6d332e24f35ea73e820462b71256c8ecffb7"),
+            new Hash("dbefa0299fe6b2336eb0bc3123fa623845c276e5c6e2a175adf1a562d5e77718"),
+            new Hash("2a8ccbd91b7d9460a86174b5a8d4e6aa073b38674d1ee8107e728980a66f0676"),
+            new Hash("be7914b1eb4c6bd352ba1d86991959b443e446e0ad49fb796be3495c287b2472")
         ];
 
         for (const hash of hashes) {
@@ -201,55 +202,64 @@ describe("test network providers on devnet: Proxy and API", function () {
         }
     });
 
-    // TODO: enable when API fixes the imprecision around "gasRemaining".
-    // TODO: enable when API supports queries with "value".
-    it.skip("should have same response for queryContract()", async function () {
+    it("should have same response for queryContract()", async function () {
         this.timeout(10000);
 
-        // Query: get ultimate answer
-        let query = new Query({
-            address: new Address("erd1qqqqqqqqqqqqqpgqggww7tjryk9saqzfpq09tw3vm06kl8h3396qqz277y"),
-            func: new ContractFunction("getUltimateAnswer"),
-            args: []
+        // Query: get sum (of adder contract)
+        let query = new DummyQuery({
+            contract: "erd1qqqqqqqqqqqqqpgquykqja5c4v33zdmnwglj3jphqwrelzdn396qlc9g33",
+            function: "getSum"
         });
 
         let apiResponse = await apiProvider.queryContract(query);
         let proxyResponse = await proxyProvider.queryContract(query);
 
+        // Ignore "gasUsed" due to numerical imprecision (API).
+        apiResponse.gasUsed = 0;
+        proxyResponse.gasUsed = 0;
+
         assert.deepEqual(apiResponse, proxyResponse);
         assert.deepEqual(apiResponse.getReturnDataParts(), proxyResponse.getReturnDataParts());
 
         // Query: increment counter
-        query = new Query({
-            address: new Address("erd1qqqqqqqqqqqqqpgqz045rw74nthgzw2te9lytgah775n3l08396q3wt4qq"),
-            func: new ContractFunction("increment"),
-            args: []
+        query = new DummyQuery({
+            contract: "erd1qqqqqqqqqqqqqpgqzeq07xvhs5g7cg4ama85upaqarrcgu49396q0gz4yf",
+            function: "increment",
+            arguments: []
         });
 
         apiResponse = await apiProvider.queryContract(query);
         proxyResponse = await proxyProvider.queryContract(query);
 
+        // Ignore "gasUsed" due to numerical imprecision (API).
+        apiResponse.gasUsed = 0;
+        proxyResponse.gasUsed = 0;
+
         assert.deepEqual(apiResponse, proxyResponse);
         assert.deepEqual(apiResponse.getReturnDataParts(), proxyResponse.getReturnDataParts());
+    });
+
+    it.skip("should have same response for queryContract() (2)", async function () {
+        this.timeout(10000);
 
         // Query: issue ESDT
-        query = new Query({
-            address: new Address("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u"),
-            func: new ContractFunction("issue"),
-            value: new TransactionValue("42"),
-            args: [
-                BytesValue.fromUTF8("FOO"),
-                BytesValue.fromUTF8("FOO"),
-                new BigUIntValue(new BigNumber("10000")),
-                new U32Value(18),
-                new VariadicValue(new VariadicType(new CompositeType(new BytesType(), new BooleanType())), [])
+        let query = new DummyQuery({
+            contract: "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+            function: "issue",
+            value: "50000000000000000",
+            arguments: [
+                Buffer.from("HELLO").toString("hex"),
+                Buffer.from("WORLD").toString("hex"),
+                "0A", // Supply
+                "03" // Decimals
             ]
         });
 
-        apiResponse = await apiProvider.queryContract(query);
-        proxyResponse = await proxyProvider.queryContract(query);
+        let apiResponse = await apiProvider.queryContract(query);
+        let proxyResponse = await proxyProvider.queryContract(query);
         
         assert.deepEqual(apiResponse, proxyResponse);
         assert.deepEqual(apiResponse.getReturnDataParts(), proxyResponse.getReturnDataParts());
     });
 });
+
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index 9313d045a..e560d7b37 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -93,14 +93,14 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     async getTransaction(txHash: IHash): Promise<TransactionOnNetwork> {
-        let url = this.buildUrlWithQueryParameters(`transaction/${txHash.toString()}`, { withResults: "true" });
+        let url = this.buildUrlWithQueryParameters(`transaction/${txHash.hex()}`, { withResults: "true" });
         let response = await this.doGetGeneric(url);
         let transaction = TransactionOnNetwork.fromProxyHttpResponse(txHash, response.transaction);
         return transaction;
     }
 
     async getTransactionStatus(txHash: IHash): Promise<TransactionStatus> {
-        let response = await this.doGetGeneric(`transaction/${txHash.toString()}/status`);
+        let response = await this.doGetGeneric(`transaction/${txHash.hex()}/status`);
         let status = new TransactionStatus(response.status);
         return status;
     }
@@ -153,8 +153,10 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     private async doGet(resourceUrl: string): Promise<any> {
+        let url = `${this.url}/${resourceUrl}`;
+        console.debug(`ProxyNetworkProvider.doGet(): ${url}`);
+
         try {
-            let url = `${this.url}/${resourceUrl}`;
             let response = await axios.get(url, this.config);
             let payload = response.data.data;
             return payload;
@@ -164,8 +166,10 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     private async doPost(resourceUrl: string, payload: any): Promise<any> {
+        let url = `${this.url}/${resourceUrl}`;
+        console.debug(`ProxyNetworkProvider.doPost(): ${url}`);
+
         try {
-            let url = `${this.url}/${resourceUrl}`;
             let response = await axios.post(url, payload, {
                 ...this.config,
                 headers: {
diff --git a/src-network-providers/testscommon/dummyQuery.ts b/src-network-providers/testscommon/dummyQuery.ts
new file mode 100644
index 000000000..7b3ac3ecd
--- /dev/null
+++ b/src-network-providers/testscommon/dummyQuery.ts
@@ -0,0 +1,23 @@
+import { IContractQuery } from "../interface";
+
+export class DummyQuery implements IContractQuery {
+    contract: string = "";
+    function: string = "";
+    arguments: string[] = [];
+    value: string = "";
+    caller: string = "";
+
+    constructor(init?: Partial<DummyQuery>) {
+        Object.assign(this, init);
+    }
+
+    toHttpRequest() {
+        return {
+            "scAddress": this.contract,
+            "funcName": this.function,
+            "args": this.arguments,
+            "value": this.value,
+            "caller": this.caller
+        }
+    }
+}
diff --git a/src-network-providers/tokens.ts b/src-network-providers/tokens.ts
index 6e1670283..39e140335 100644
--- a/src-network-providers/tokens.ts
+++ b/src-network-providers/tokens.ts
@@ -25,11 +25,9 @@ export class NonFungibleTokenOfAccountOnNetwork {
     type: string = "";
     name: string = "";
     creator: IAddress = new Address("");
-    isWhitelistedStorage: boolean = false;
     supply: BigNumber = new BigNumber(0);
     decimals: number = 0;
     royalties: BigNumber = new BigNumber(0);
-    ticker: string = "";
     assets: string[] = [];
 
     constructor(init?: Partial<NonFungibleTokenOfAccountOnNetwork>) {
@@ -75,11 +73,9 @@ export class NonFungibleTokenOfAccountOnNetwork {
         result.type = payload.type || "";
         result.name = payload.name || "";
         result.creator = new Address(payload.creator || "");
-        result.isWhitelistedStorage = payload.isWhitelistedStorage || false;
         result.decimals = Number(payload.decimals || 0);
         result.supply = new BigNumber(payload.balance || 1);
         result.royalties = new BigNumber(payload.royalties || 0);
-        result.ticker = payload.ticker || "";
         result.assets = payload.assets || [];
 
         return result;

From 7c8bc1888449bc96459e0db2109eef7c373b5a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Thu, 7 Apr 2022 17:47:35 +0300
Subject: [PATCH 082/338] Linting.

---
 src-network-providers/apiNetworkProvider.ts     | 4 ++--
 src-network-providers/contractResults.ts        | 2 +-
 src-network-providers/interface.ts              | 2 +-
 src-network-providers/testscommon/dummyQuery.ts | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 27e85b735..33b8c1e5b 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -37,13 +37,13 @@ export class ApiNetworkProvider implements INetworkProvider {
 
     async getNetworkStakeStatistics(): Promise<NetworkStake> {
         let response = await this.doGetGeneric("stake");
-        let networkStake = NetworkStake.fromHttpResponse(response)
+        let networkStake = NetworkStake.fromHttpResponse(response);
         return networkStake;
     }
 
     async getNetworkGeneralStatistics(): Promise<Stats> {
         let response = await this.doGetGeneric("stats");
-        let stats = Stats.fromHttpResponse(response)
+        let stats = Stats.fromHttpResponse(response);
         return stats;
     }
 
diff --git a/src-network-providers/contractResults.ts b/src-network-providers/contractResults.ts
index 8ecfeacf9..194189fbd 100644
--- a/src-network-providers/contractResults.ts
+++ b/src-network-providers/contractResults.ts
@@ -29,7 +29,7 @@ export class ContractResults {
 }
 
 export class ContractResultItem {
-    hash: IHash = new Hash("")
+    hash: IHash = new Hash("");
     nonce: INonce = new Nonce(0);
     value: TransactionValue = new TransactionValue("");
     receiver: IAddress = new Address("");
diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index b34a0b7b4..cf16f9a3d 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -138,7 +138,7 @@ export interface ITransaction {
     toSendable(): any;
 }
 
-export interface IHexable { hex(): string }
+export interface IHexable { hex(): string; }
 export interface IHash extends IHexable { }
 export interface IAddress { bech32(): string; }
 export interface INonce extends IHexable { valueOf(): number; }
diff --git a/src-network-providers/testscommon/dummyQuery.ts b/src-network-providers/testscommon/dummyQuery.ts
index 7b3ac3ecd..a19a4ade7 100644
--- a/src-network-providers/testscommon/dummyQuery.ts
+++ b/src-network-providers/testscommon/dummyQuery.ts
@@ -18,6 +18,6 @@ export class DummyQuery implements IContractQuery {
             "args": this.arguments,
             "value": this.value,
             "caller": this.caller
-        }
+        };
     }
 }

From 528c8632caf79be16ed2e9f79d77389b1da1bd5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Thu, 7 Apr 2022 18:13:36 +0300
Subject: [PATCH 083/338] Add factory of network providers.

---
 src-network-providers/factory.ts                | 12 ++++++++++++
 src-network-providers/index.ts                  |  6 ++----
 src-network-providers/interface.ts              | 10 +++++-----
 src-network-providers/providers.dev.net.spec.ts |  7 +++----
 4 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 src-network-providers/factory.ts

diff --git a/src-network-providers/factory.ts b/src-network-providers/factory.ts
new file mode 100644
index 000000000..192b133df
--- /dev/null
+++ b/src-network-providers/factory.ts
@@ -0,0 +1,12 @@
+import { AxiosRequestConfig } from "axios";
+import { ApiNetworkProvider } from "./apiNetworkProvider";
+import { INetworkProvider } from "./interface";
+import { ProxyNetworkProvider } from "./proxyNetworkProvider";
+
+export function createProxyNetworkProvider(url: string, config?: AxiosRequestConfig): INetworkProvider {
+    return new ProxyNetworkProvider(url, config);
+}
+
+export function createApiNetworkProvider(url: string, config?: AxiosRequestConfig): INetworkProvider {
+    return new ApiNetworkProvider(url, config);
+}
diff --git a/src-network-providers/index.ts b/src-network-providers/index.ts
index 0c4e6aa0f..9bbac2ef9 100644
--- a/src-network-providers/index.ts
+++ b/src-network-providers/index.ts
@@ -1,5 +1,3 @@
-export * from "./apiNetworkProvider";
-export * from "./proxyNetworkProvider";
+export * from "./factory";
 
-// we do not export "./tokens"
-// we do not export "./transactions"
+// Important: we do not export any other components.
diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index cf16f9a3d..3328b9fc7 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -34,7 +34,7 @@ export interface INetworkProvider {
     getNetworkGeneralStatistics(): Promise<Stats>;
 
     /**
-     * Fetches the state of an {@link Account}.
+     * Fetches the state of an account.
      */
     getAccount(address: IAddress): Promise<AccountOnNetwork>;
 
@@ -59,22 +59,22 @@ export interface INetworkProvider {
     getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: INonce): Promise<NonFungibleTokenOfAccountOnNetwork>;
 
     /**
-     * Fetches the state of a {@link Transaction}.
+     * Fetches the state of a transaction.
      */
     getTransaction(txHash: IHash): Promise<TransactionOnNetwork>;
 
     /**
-     * Queries the status of a {@link Transaction}.
+     * Queries the status of a transaction.
      */
     getTransactionStatus(txHash: IHash): Promise<TransactionStatus>;
 
     /**
-     * Broadcasts an already-signed {@link Transaction}.
+     * Broadcasts an already-signed transaction.
      */
     sendTransaction(tx: ITransaction): Promise<IHash>;
 
     /**
-     * Simulates the processing of an already-signed {@link Transaction}.
+     * Simulates the processing of an already-signed transaction.
      * 
      */
     simulateTransaction(tx: ITransaction): Promise<IContractSimulation>;
diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 1987b9512..b230496d3 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -1,12 +1,11 @@
 import { assert } from "chai";
 import { INetworkProvider } from "./interface";
 import { Hash } from "./primitives";
-import { ApiNetworkProvider } from "./apiNetworkProvider";
-import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 import { Address, Nonce } from "./primitives";
 import { DummyQuery } from "./testscommon/dummyQuery";
+import { createApiNetworkProvider, createProxyNetworkProvider } from "./factory";
 
 describe("test network providers on devnet: Proxy and API", function () {
     let alice = new Address("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
@@ -14,8 +13,8 @@ describe("test network providers on devnet: Proxy and API", function () {
     let carol = new Address("erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
     let dan = new Address("erd1kyaqzaprcdnv4luvanah0gfxzzsnpaygsy6pytrexll2urtd05ts9vegu7");
 
-    let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 10000 });
-    let proxyProvider: INetworkProvider = new ProxyNetworkProvider("https://devnet-gateway.elrond.com", { timeout: 10000 });
+    let apiProvider: INetworkProvider = createApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 10000 });
+    let proxyProvider: INetworkProvider = createProxyNetworkProvider("https://devnet-gateway.elrond.com", { timeout: 10000 });
 
     it("should have same response for getNetworkConfig()", async function () {
         let apiResponse = await apiProvider.getNetworkConfig();

From dbca42e290bac42cd5060bccaaeeea2066f38cd3 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Thu, 7 Apr 2022 22:19:47 +0300
Subject: [PATCH 084/338] Add IPagination interface, instead of Pagination.

---
 src-network-providers/apiNetworkProvider.ts   | 14 +++++++-------
 src-network-providers/config.ts               |  7 +++++++
 src-network-providers/interface.ts            | 14 +++++---------
 src-network-providers/proxyNetworkProvider.ts |  6 +++---
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 33b8c1e5b..045dad198 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -1,6 +1,6 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "./accounts";
-import { IAddress, IContractQuery, IHash, INetworkProvider, INonce, ITransaction, Pagination } from "./interface";
+import { IAddress, IContractQuery, IHash, INetworkProvider, INonce, ITransaction, IPagination } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
 import { Stats } from "./stats";
@@ -11,7 +11,7 @@ import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 import { Hash } from "./primitives";
 import { ErrContractQuery, ErrNetworkProvider } from "./errors";
-import { defaultAxiosConfig } from "./config";
+import { defaultAxiosConfig, defaultPagination } from "./config";
 import { NetworkStatus } from "./networkStatus";
 import { ContractQueryResponse } from "./contractQueryResponse";
 
@@ -53,8 +53,8 @@ export class ApiNetworkProvider implements INetworkProvider {
         return account;
     }
 
-    async getFungibleTokensOfAccount(address: IAddress, pagination?: Pagination): Promise<FungibleTokenOfAccountOnNetwork[]> {
-        pagination = pagination || Pagination.default();
+    async getFungibleTokensOfAccount(address: IAddress, pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]> {
+        pagination = pagination || defaultPagination;
 
         let url = `accounts/${address.bech32()}/tokens?${this.buildPaginationParams(pagination)}`;
         let response: any[] = await this.doGetGeneric(url);
@@ -65,8 +65,8 @@ export class ApiNetworkProvider implements INetworkProvider {
         return tokens;
     }
 
-    async getNonFungibleTokensOfAccount(address: IAddress, pagination?: Pagination): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
-        pagination = pagination || Pagination.default();
+    async getNonFungibleTokensOfAccount(address: IAddress, pagination?: IPagination): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
+        pagination = pagination || defaultPagination;
 
         let url = `accounts/${address.bech32()}/nfts?${this.buildPaginationParams(pagination)}`;
         let response: any[] = await this.doGetGeneric(url);
@@ -148,7 +148,7 @@ export class ApiNetworkProvider implements INetworkProvider {
         return response;
     }
 
-    private buildPaginationParams(pagination: Pagination) {
+    private buildPaginationParams(pagination: IPagination) {
         return `from=${pagination.from}&size=${pagination.size}`;
     }
 
diff --git a/src-network-providers/config.ts b/src-network-providers/config.ts
index 9d352c9d1..a5b2215b4 100644
--- a/src-network-providers/config.ts
+++ b/src-network-providers/config.ts
@@ -1,3 +1,5 @@
+import { IPagination } from "./interface";
+
 const JSONbig = require("json-bigint");
 
 export const defaultAxiosConfig = {
@@ -9,3 +11,8 @@ export const defaultAxiosConfig = {
         }
     ]
 };
+
+export const defaultPagination: IPagination = {
+    from: 0,
+    size: 100
+};
diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index 3328b9fc7..be81fa01c 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -41,12 +41,12 @@ export interface INetworkProvider {
     /**
      * Fetches data about the fungible tokens held by an account.
      */
-    getFungibleTokensOfAccount(address: IAddress, pagination?: Pagination): Promise<FungibleTokenOfAccountOnNetwork[]>;
+    getFungibleTokensOfAccount(address: IAddress, pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]>;
 
     /**
      * Fetches data about the non-fungible tokens held by account.
      */
-    getNonFungibleTokensOfAccount(address: IAddress, pagination?: Pagination): Promise<NonFungibleTokenOfAccountOnNetwork[]>;
+    getNonFungibleTokensOfAccount(address: IAddress, pagination?: IPagination): Promise<NonFungibleTokenOfAccountOnNetwork[]>;
 
     /**
      * Fetches data about a specific fungible token held by an account.
@@ -125,13 +125,9 @@ export interface IContractReturnCode {
 export interface IContractSimulation {
 }
 
-export class Pagination {
-    from: number = 0;
-    size: number = 100;
-
-    static default(): Pagination {
-        return { from: 0, size: 100 };
-    }
+export interface IPagination {
+    from: number;
+    size: number;
 }
 
 export interface ITransaction {
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index e560d7b37..475ac5ea7 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -1,6 +1,6 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "./accounts";
-import { IAddress, IContractQuery, IHash, INetworkProvider, INonce, ITransaction, Pagination } from "./interface";
+import { IAddress, IContractQuery, IHash, INetworkProvider, INonce, IPagination, ITransaction } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
 import { Stats } from "./stats";
@@ -54,7 +54,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return account;
     }
 
-    async getFungibleTokensOfAccount(address: IAddress, _pagination?: Pagination): Promise<FungibleTokenOfAccountOnNetwork[]> {
+    async getFungibleTokensOfAccount(address: IAddress, _pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]> {
         let url = `address/${address.bech32()}/esdt`;
         let response = await this.doGetGeneric(url);
         let responseItems: any[] = Object.values(response.esdts);
@@ -67,7 +67,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokens;
     }
 
-    async getNonFungibleTokensOfAccount(address: IAddress, _pagination?: Pagination): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
+    async getNonFungibleTokensOfAccount(address: IAddress, _pagination?: IPagination): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
         let url = `address/${address.bech32()}/esdt`;
         let response = await this.doGetGeneric(url);
         let responseItems: any[] = Object.values(response.esdts);

From c172f07bbaf72ef57e89f72faf65f6ca45ba94bf Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Thu, 7 Apr 2022 23:11:28 +0300
Subject: [PATCH 085/338] Removed transactionOnNetwork.getAllEvents().

---
 src-network-providers/transactions.ts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
index 4cd351cb3..4b5ef2473 100644
--- a/src-network-providers/transactions.ts
+++ b/src-network-providers/transactions.ts
@@ -88,15 +88,5 @@ import { TransactionReceipt } from "./transactionReceipt";
         // TODO: use different transaction completion strategies - API / Proxy.
         return new TransactionCompletionStrategy().isCompleted(this);
     }
-
-    getAllEvents(): TransactionEvent[] {
-        let result = [...this.logs.events];
-
-        for (const resultItem of this.contractResults.items) {
-            result.push(...resultItem.logs.events);
-        }
-
-        return result;
-    }
 }
 

From b34ebfb24d7c4eb8ea18544e38e563d6d40e4639 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Thu, 7 Apr 2022 23:11:46 +0300
Subject: [PATCH 086/338] Fix interfaces.

---
 src-network-providers/interface.ts     | 5 ++---
 src-network-providers/networkConfig.ts | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index be81fa01c..26836a767 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -77,7 +77,7 @@ export interface INetworkProvider {
      * Simulates the processing of an already-signed transaction.
      * 
      */
-    simulateTransaction(tx: ITransaction): Promise<IContractSimulation>;
+    simulateTransaction(tx: ITransaction): Promise<ISimulationResults>;
 
     /**
      * Queries a Smart Contract - runs a pure function defined by the contract and returns its results.
@@ -122,7 +122,7 @@ export interface IContractReturnCode {
     isSuccess(): boolean;
 }
 
-export interface IContractSimulation {
+export interface ISimulationResults {
 }
 
 export interface IPagination {
@@ -142,6 +142,5 @@ export interface ITransactionPayload { encoded(): string; }
 export interface IGasLimit { valueOf(): number; }
 export interface IGasPrice { valueOf(): number; }
 export interface IChainID { valueOf(): string; }
-export interface IGasPriceModifier { valueOf(): number; }
 export interface ITransactionVersion { valueOf(): number; }
 export interface IAccountBalance { toString(): string; }
diff --git a/src-network-providers/networkConfig.ts b/src-network-providers/networkConfig.ts
index 690609c4f..5f0718ad6 100644
--- a/src-network-providers/networkConfig.ts
+++ b/src-network-providers/networkConfig.ts
@@ -1,5 +1,5 @@
 import BigNumber from "bignumber.js";
-import { IChainID, IGasLimit, IGasPrice, IGasPriceModifier, ITransactionVersion } from "./interface";
+import { IChainID, IGasLimit, IGasPrice, ITransactionVersion } from "./interface";
 
 /**
  * An object holding Network configuration parameters.
@@ -36,7 +36,7 @@ export class NetworkConfig {
     /**
      *
      */
-    public GasPriceModifier: IGasPriceModifier;
+    public GasPriceModifier: number;
 
     /**
      * The minimum gas limit required to be set when broadcasting a {@link Transaction}.

From 2718f8fd19ef14ab6fe6c052ba81deef71695d9c Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Thu, 7 Apr 2022 23:11:54 +0300
Subject: [PATCH 087/338] Fix exports.

---
 src-network-providers/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-network-providers/index.ts b/src-network-providers/index.ts
index 9bbac2ef9..2b3276a72 100644
--- a/src-network-providers/index.ts
+++ b/src-network-providers/index.ts
@@ -1,3 +1,3 @@
-export * from "./factory";
+export { createProxyNetworkProvider, createApiNetworkProvider } from "./factory";
 
 // Important: we do not export any other components.

From d653546a68207a1720c657f15894ee612f540dc9 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Fri, 8 Apr 2022 10:26:59 +0300
Subject: [PATCH 088/338] Fix after extraction: TransactionEvent.

---
 src-network-providers/transactionEvents.ts | 28 ++++++++++------------
 src-network-providers/transactions.ts      |  1 -
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src-network-providers/transactionEvents.ts b/src-network-providers/transactionEvents.ts
index 3ff2a5c4e..780a10340 100644
--- a/src-network-providers/transactionEvents.ts
+++ b/src-network-providers/transactionEvents.ts
@@ -2,16 +2,13 @@ import { IAddress } from "./interface";
 import { Address } from "./primitives";
 
 export class TransactionEvent {
-    readonly address: IAddress;
-    readonly identifier: string;
-    readonly topics: TransactionEventTopic[];
-    readonly data: string;
+    address: IAddress = new Address("");
+    identifier: string = "";
+    topics: TransactionEventTopic[] = [];
+    data: string = "";
 
-    constructor(address: IAddress, identifier: string, topics: TransactionEventTopic[], data: string) {
-        this.address = address;
-        this.identifier = identifier;
-        this.topics = topics;
-        this.data = data;
+    constructor(init?: Partial<TransactionEvent>) {
+        Object.assign(this, init);
     }
 
     static fromHttpResponse(responsePart: {
@@ -20,12 +17,13 @@ export class TransactionEvent {
         topics: string[],
         data: string
     }): TransactionEvent {
-        let topics = (responsePart.topics || []).map(topic => new TransactionEventTopic(topic));
-        let address = new Address(responsePart.address);
-        let identifier = responsePart.identifier || "";
-        let data = Buffer.from(responsePart.data || "", "base64").toString();
-        let event = new TransactionEvent(address, identifier, topics, data);
-        return event;
+        let result = new TransactionEvent();
+        result.address = new Address(responsePart.address);
+        result.identifier = responsePart.identifier || "";
+        result.topics = (responsePart.topics || []).map(topic => new TransactionEventTopic(topic));
+        result.data = Buffer.from(responsePart.data || "", "base64").toString();
+        
+        return result;
     }
 
     findFirstOrNoneTopic(predicate: (topic: TransactionEventTopic) => boolean): TransactionEventTopic | undefined {
diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
index 4b5ef2473..7467e28ae 100644
--- a/src-network-providers/transactions.ts
+++ b/src-network-providers/transactions.ts
@@ -3,7 +3,6 @@ import { ContractResults } from "./contractResults";
 import { Address, Hash, Nonce, TransactionValue, TransactionPayload } from "./primitives";
 import { IAddress, IGasLimit, IGasPrice, IHash, INonce, ITransactionPayload } from "./interface";
 import { TransactionCompletionStrategy } from "./transactionCompletionStrategy";
-import { TransactionEvent } from "./transactionEvents";
 import { TransactionLogs } from "./transactionLogs";
 import { TransactionReceipt } from "./transactionReceipt";
 

From e0ea5f686c281cc6d3d6f7fed72e3e6eb592a81a Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Fri, 8 Apr 2022 10:43:36 +0300
Subject: [PATCH 089/338] Fix exports.

---
 src-network-providers/apiNetworkProvider.ts   |  6 +++---
 src-network-providers/index.ts                | 20 ++++++++++++++++++-
 src-network-providers/interface.ts            |  4 ++--
 .../{stats.ts => networkGeneralStatistics.ts} |  8 +++-----
 .../providers.dev.net.spec.ts                 |  8 ++++----
 src-network-providers/proxyNetworkProvider.ts |  4 ++--
 .../testscommon/dummyQuery.ts                 |  4 ++--
 src-network-providers/transactions.ts         |  2 +-
 8 files changed, 36 insertions(+), 20 deletions(-)
 rename src-network-providers/{stats.ts => networkGeneralStatistics.ts} (90%)

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 045dad198..aaf59b202 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -3,7 +3,7 @@ import { AccountOnNetwork } from "./accounts";
 import { IAddress, IContractQuery, IHash, INetworkProvider, INonce, ITransaction, IPagination } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
-import { Stats } from "./stats";
+import { NetworkGeneralStatistics } from "./networkGeneralStatistics";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
@@ -41,9 +41,9 @@ export class ApiNetworkProvider implements INetworkProvider {
         return networkStake;
     }
 
-    async getNetworkGeneralStatistics(): Promise<Stats> {
+    async getNetworkGeneralStatistics(): Promise<NetworkGeneralStatistics> {
         let response = await this.doGetGeneric("stats");
-        let stats = Stats.fromHttpResponse(response);
+        let stats = NetworkGeneralStatistics.fromHttpResponse(response);
         return stats;
     }
 
diff --git a/src-network-providers/index.ts b/src-network-providers/index.ts
index 2b3276a72..c39389878 100644
--- a/src-network-providers/index.ts
+++ b/src-network-providers/index.ts
@@ -1,3 +1,21 @@
 export { createProxyNetworkProvider, createApiNetworkProvider } from "./factory";
+export { INetworkProvider } from "./interface";
 
-// Important: we do not export any other components.
+export { AccountOnNetwork } from "./accounts";
+
+export { ContractQueryResponse } from "./contractQueryResponse";
+export { ContractResults, ContractResultItem } from "./contractResults";
+
+export { TransactionOnNetwork } from "./transactions";
+export { TransactionEvent, TransactionEventTopic } from "./transactionEvents";
+export { TransactionLogs } from "./transactionLogs";
+export { TransactionReceipt } from "./transactionReceipt";
+export { TransactionStatus } from "./transactionStatus";
+
+export { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
+export { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
+
+export { NetworkConfig } from "./networkConfig";
+export { NetworkGeneralStatistics } from "./networkGeneralStatistics";
+export { NetworkStake } from "./networkStake";
+export { NetworkStatus } from "./networkStatus";
diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index 26836a767..3fdf68176 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -1,7 +1,7 @@
 import { AccountOnNetwork } from "./accounts";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
-import { Stats } from "./stats";
+import { NetworkGeneralStatistics } from "./networkGeneralStatistics";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 import { NetworkStatus } from "./networkStatus";
@@ -31,7 +31,7 @@ export interface INetworkProvider {
     /**
      * Fetches general statistics.
      */
-    getNetworkGeneralStatistics(): Promise<Stats>;
+    getNetworkGeneralStatistics(): Promise<NetworkGeneralStatistics>;
 
     /**
      * Fetches the state of an account.
diff --git a/src-network-providers/stats.ts b/src-network-providers/networkGeneralStatistics.ts
similarity index 90%
rename from src-network-providers/stats.ts
rename to src-network-providers/networkGeneralStatistics.ts
index e2c63f965..7cad59e54 100644
--- a/src-network-providers/stats.ts
+++ b/src-network-providers/networkGeneralStatistics.ts
@@ -1,9 +1,7 @@
 /**
  * An object holding Network stats parameters.
  */
-export class Stats {
-    private static default: Stats;
-
+export class NetworkGeneralStatistics {
     /**
      * The number of Shards.
      */
@@ -52,8 +50,8 @@ export class Stats {
     /**
      * Constructs a stats object from a HTTP response (as returned by the provider).
      */
-    static fromHttpResponse(payload: any): Stats {
-        let stats = new Stats();
+    static fromHttpResponse(payload: any): NetworkGeneralStatistics {
+        let stats = new NetworkGeneralStatistics();
 
         stats.Shards = Number(payload["shards"]);
         stats.Blocks = Number(payload["blocks"]);
diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index b230496d3..e039fea89 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -4,7 +4,7 @@ import { Hash } from "./primitives";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 import { Address, Nonce } from "./primitives";
-import { DummyQuery } from "./testscommon/dummyQuery";
+import { MockQuery } from "./testscommon/dummyQuery";
 import { createApiNetworkProvider, createProxyNetworkProvider } from "./factory";
 
 describe("test network providers on devnet: Proxy and API", function () {
@@ -205,7 +205,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         this.timeout(10000);
 
         // Query: get sum (of adder contract)
-        let query = new DummyQuery({
+        let query = new MockQuery({
             contract: "erd1qqqqqqqqqqqqqpgquykqja5c4v33zdmnwglj3jphqwrelzdn396qlc9g33",
             function: "getSum"
         });
@@ -221,7 +221,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         assert.deepEqual(apiResponse.getReturnDataParts(), proxyResponse.getReturnDataParts());
 
         // Query: increment counter
-        query = new DummyQuery({
+        query = new MockQuery({
             contract: "erd1qqqqqqqqqqqqqpgqzeq07xvhs5g7cg4ama85upaqarrcgu49396q0gz4yf",
             function: "increment",
             arguments: []
@@ -242,7 +242,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         this.timeout(10000);
 
         // Query: issue ESDT
-        let query = new DummyQuery({
+        let query = new MockQuery({
             contract: "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
             function: "issue",
             value: "50000000000000000",
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index 475ac5ea7..81741b44d 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -3,7 +3,7 @@ import { AccountOnNetwork } from "./accounts";
 import { IAddress, IContractQuery, IHash, INetworkProvider, INonce, IPagination, ITransaction } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
-import { Stats } from "./stats";
+import { NetworkGeneralStatistics } from "./networkGeneralStatistics";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
@@ -42,7 +42,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
         throw new Error("Method not implemented.");
     }
 
-    async getNetworkGeneralStatistics(): Promise<Stats> {
+    async getNetworkGeneralStatistics(): Promise<NetworkGeneralStatistics> {
         // TODO: Implement wrt. (full implementation may not be possible):
         // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/network/network.service.ts
         throw new Error("Method not implemented.");
diff --git a/src-network-providers/testscommon/dummyQuery.ts b/src-network-providers/testscommon/dummyQuery.ts
index a19a4ade7..33befef36 100644
--- a/src-network-providers/testscommon/dummyQuery.ts
+++ b/src-network-providers/testscommon/dummyQuery.ts
@@ -1,13 +1,13 @@
 import { IContractQuery } from "../interface";
 
-export class DummyQuery implements IContractQuery {
+export class MockQuery implements IContractQuery {
     contract: string = "";
     function: string = "";
     arguments: string[] = [];
     value: string = "";
     caller: string = "";
 
-    constructor(init?: Partial<DummyQuery>) {
+    constructor(init?: Partial<MockQuery>) {
         Object.assign(this, init);
     }
 
diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
index 7467e28ae..5e90c207c 100644
--- a/src-network-providers/transactions.ts
+++ b/src-network-providers/transactions.ts
@@ -6,7 +6,7 @@ import { TransactionCompletionStrategy } from "./transactionCompletionStrategy";
 import { TransactionLogs } from "./transactionLogs";
 import { TransactionReceipt } from "./transactionReceipt";
 
- export class TransactionOnNetwork {
+export class TransactionOnNetwork {
     hash: IHash = new Hash("");
     type: string = "";
     nonce: INonce = new Nonce(0);

From 4c2212e089d32afc0feb5c0942e13e62f8a3122d Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Fri, 8 Apr 2022 11:11:06 +0300
Subject: [PATCH 090/338] Fix DTOs.

---
 src-network-providers/contractResults.ts |  6 +-----
 src-network-providers/transactionLogs.ts | 21 +++++++++------------
 src-network-providers/transactions.ts    |  4 ++--
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src-network-providers/contractResults.ts b/src-network-providers/contractResults.ts
index 194189fbd..8cabd0487 100644
--- a/src-network-providers/contractResults.ts
+++ b/src-network-providers/contractResults.ts
@@ -13,10 +13,6 @@ export class ContractResults {
         });
     }
 
-    static empty(): ContractResults {
-        return new ContractResults([]);
-    }
-
     static fromProxyHttpResponse(results: any[]): ContractResults {
         let items = results.map(item => ContractResultItem.fromProxyHttpResponse(item));
         return new ContractResults(items);
@@ -41,7 +37,7 @@ export class ContractResultItem {
     gasPrice: IGasPrice = 0;
     callType: number = 0;
     returnMessage: string = "";
-    logs: TransactionLogs = TransactionLogs.empty();
+    logs: TransactionLogs = new TransactionLogs();
 
     constructor(init?: Partial<ContractResultItem>) {
         Object.assign(this, init);
diff --git a/src-network-providers/transactionLogs.ts b/src-network-providers/transactionLogs.ts
index 91586ef00..9e7a6ef18 100644
--- a/src-network-providers/transactionLogs.ts
+++ b/src-network-providers/transactionLogs.ts
@@ -4,22 +4,19 @@ import { Address } from "./primitives";
 import { TransactionEvent } from "./transactionEvents";
 
 export class TransactionLogs {
-    readonly address: IAddress;
-    readonly events: TransactionEvent[];
+    address: IAddress = new Address("");
+    events: TransactionEvent[] = [];
 
-    constructor(address: IAddress, events: TransactionEvent[]) {
-        this.address = address;
-        this.events = events;
-    }
-
-    static empty(): TransactionLogs {
-        return new TransactionLogs(new Address(""), []);
+    constructor(init?: Partial<TransactionLogs>) {
+        Object.assign(this, init);
     }
 
     static fromHttpResponse(logs: any): TransactionLogs {
-        let address = new Address(logs.address);
-        let events = (logs.events || []).map((event: any) => TransactionEvent.fromHttpResponse(event));
-        return new TransactionLogs(address, events);
+        let result = new TransactionLogs();
+        result.address = new Address(logs.address);
+        result.events = (logs.events || []).map((event: any) => TransactionEvent.fromHttpResponse(event));
+        
+        return result;
     }
 
     findSingleOrNoneEvent(identifier: string, predicate?: (event: TransactionEvent) => boolean): TransactionEvent | undefined {
diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
index 5e90c207c..c9cc6321c 100644
--- a/src-network-providers/transactions.ts
+++ b/src-network-providers/transactions.ts
@@ -28,8 +28,8 @@ export class TransactionOnNetwork {
     pendingResults: boolean = false;
 
     receipt: TransactionReceipt = new TransactionReceipt();
-    contractResults: ContractResults = ContractResults.empty();
-    logs: TransactionLogs = TransactionLogs.empty();
+    contractResults: ContractResults = new ContractResults([]);
+    logs: TransactionLogs = new TransactionLogs();
 
     constructor(init?: Partial<TransactionOnNetwork>) {
         Object.assign(this, init);

From d8fac6f8bd4ab8c4fd446ff72f7c82ab1bb39c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Fri, 8 Apr 2022 15:41:08 +0300
Subject: [PATCH 091/338] Handle completion: API vs. Proxy.

---
 src-network-providers/providers.dev.net.spec.ts |  4 ++++
 .../transactionCompletionStrategy.ts            | 17 +++++++++++++----
 src-network-providers/transactions.ts           | 17 ++++++++++-------
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index e039fea89..ba8d9a7fd 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -117,6 +117,10 @@ describe("test network providers on devnet: Proxy and API", function () {
 
             ignoreKnownTransactionDifferencesBetweenProviders(apiResponse, proxyResponse);
             assert.deepEqual(apiResponse, proxyResponse, `transaction: ${hash}`);
+
+            // Also assert completion
+            assert.isTrue(apiResponse.isCompleted());
+            assert.isTrue(proxyResponse.isCompleted());
         }
     });
 
diff --git a/src-network-providers/transactionCompletionStrategy.ts b/src-network-providers/transactionCompletionStrategy.ts
index 60de758ed..5fccc5a63 100644
--- a/src-network-providers/transactionCompletionStrategy.ts
+++ b/src-network-providers/transactionCompletionStrategy.ts
@@ -3,9 +3,6 @@ import { ITransactionPayload } from "./interface";
 import { TransactionLogs } from "./transactionLogs";
 import { isPaddedHex } from "./primitives";
 
-/**
- * Internal interface: a transaction, as seen from the perspective of a {@link TransactionCompletionStrategy}.
- */
 interface ITransactionOnNetwork {
     logs: TransactionLogs;
     status: TransactionStatus;
@@ -19,7 +16,7 @@ const WellKnownCompletionEvents = ["completedTxEvent", "SCDeploy", "signalError"
  * Algorithm for detecting transaction completion.
  * Based on some heuristics (a bit imprecise therefore, at this moment).
  */
-export class TransactionCompletionStrategy {
+export class TransactionCompletionStrategyOnProxy {
     isCompleted(transaction: ITransactionOnNetwork): boolean {
         if (transaction.status.isPending()) {
             // Certainly not completed.
@@ -65,3 +62,15 @@ export class TransactionCompletionStrategy {
         return isPaddedHex(arg);
     }
 }
+
+export class TransactionCompletionStrategyOnAPI {
+    isCompleted(transaction: ITransactionOnNetwork): boolean {
+        return !transaction.status.isPending();
+    }
+}
+
+export class NullTransactionCompletionStrategy {
+    isCompleted(_transaction: ITransactionOnNetwork): boolean {
+        return false;
+    }
+}
diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
index 5e90c207c..003c5bfb9 100644
--- a/src-network-providers/transactions.ts
+++ b/src-network-providers/transactions.ts
@@ -2,11 +2,17 @@ import { TransactionStatus } from "./transactionStatus";
 import { ContractResults } from "./contractResults";
 import { Address, Hash, Nonce, TransactionValue, TransactionPayload } from "./primitives";
 import { IAddress, IGasLimit, IGasPrice, IHash, INonce, ITransactionPayload } from "./interface";
-import { TransactionCompletionStrategy } from "./transactionCompletionStrategy";
+import { NullTransactionCompletionStrategy, TransactionCompletionStrategyOnAPI, TransactionCompletionStrategyOnProxy } from "./transactionCompletionStrategy";
 import { TransactionLogs } from "./transactionLogs";
 import { TransactionReceipt } from "./transactionReceipt";
 
+interface ICompletionStrategy {
+    isCompleted(transaction: TransactionOnNetwork): boolean;
+}
+
 export class TransactionOnNetwork {
+    completionStrategy: ICompletionStrategy = new NullTransactionCompletionStrategy();
+
     hash: IHash = new Hash("");
     type: string = "";
     nonce: INonce = new Nonce(0);
@@ -25,7 +31,6 @@ export class TransactionOnNetwork {
     blockNonce: number = 0;
     hyperblockNonce: number = 0;
     hyperblockHash: string = "";
-    pendingResults: boolean = false;
 
     receipt: TransactionReceipt = new TransactionReceipt();
     contractResults: ContractResults = ContractResults.empty();
@@ -38,16 +43,16 @@ export class TransactionOnNetwork {
     static fromProxyHttpResponse(txHash: IHash, response: any): TransactionOnNetwork {
         let result = TransactionOnNetwork.fromHttpResponse(txHash, response);
         result.contractResults = ContractResults.fromProxyHttpResponse(response.smartContractResults || []);
+        result.completionStrategy = new TransactionCompletionStrategyOnProxy();
         // TODO: uniformize transaction status.
-        // TODO: Use specific completion detection strategy.
         return result;
     }
 
     static fromApiHttpResponse(txHash: IHash, response: any): TransactionOnNetwork {
         let result = TransactionOnNetwork.fromHttpResponse(txHash, response);
         result.contractResults = ContractResults.fromApiHttpResponse(response.results || []);
+        result.completionStrategy = new TransactionCompletionStrategyOnAPI();
         // TODO: uniformize transaction status.
-        // TODO: Use specific completion detection strategy.
         return result;
     }
 
@@ -71,7 +76,6 @@ export class TransactionOnNetwork {
         result.blockNonce = response.blockNonce || 0;
         result.hyperblockNonce = response.hyperblockNonce || 0;
         result.hyperblockHash = response.hyperblockHash || "";
-        result.pendingResults = response.pendingResults || false;
 
         result.receipt = TransactionReceipt.fromHttpResponse(response.receipt || {});
         result.logs = TransactionLogs.fromHttpResponse(response.logs || {});
@@ -84,8 +88,7 @@ export class TransactionOnNetwork {
     }
 
     isCompleted(): boolean {
-        // TODO: use different transaction completion strategies - API / Proxy.
-        return new TransactionCompletionStrategy().isCompleted(this);
+        return this.completionStrategy.isCompleted(this);
     }
 }
 

From bcd8fbc08b79ac8d73620939329dfe1bb24b4a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Fri, 8 Apr 2022 15:46:51 +0300
Subject: [PATCH 092/338] Simplify.

---
 src-network-providers/providers.dev.net.spec.ts |  4 ++--
 src-network-providers/transactions.ts           | 17 ++++-------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index ba8d9a7fd..15ecf3c53 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -119,8 +119,8 @@ describe("test network providers on devnet: Proxy and API", function () {
             assert.deepEqual(apiResponse, proxyResponse, `transaction: ${hash}`);
 
             // Also assert completion
-            assert.isTrue(apiResponse.isCompleted());
-            assert.isTrue(proxyResponse.isCompleted());
+            assert.isTrue(apiResponse.isCompleted);
+            assert.isTrue(proxyResponse.isCompleted);
         }
     });
 
diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
index 003c5bfb9..eaa435111 100644
--- a/src-network-providers/transactions.ts
+++ b/src-network-providers/transactions.ts
@@ -2,17 +2,12 @@ import { TransactionStatus } from "./transactionStatus";
 import { ContractResults } from "./contractResults";
 import { Address, Hash, Nonce, TransactionValue, TransactionPayload } from "./primitives";
 import { IAddress, IGasLimit, IGasPrice, IHash, INonce, ITransactionPayload } from "./interface";
-import { NullTransactionCompletionStrategy, TransactionCompletionStrategyOnAPI, TransactionCompletionStrategyOnProxy } from "./transactionCompletionStrategy";
+import { TransactionCompletionStrategyOnAPI, TransactionCompletionStrategyOnProxy } from "./transactionCompletionStrategy";
 import { TransactionLogs } from "./transactionLogs";
 import { TransactionReceipt } from "./transactionReceipt";
 
-interface ICompletionStrategy {
-    isCompleted(transaction: TransactionOnNetwork): boolean;
-}
-
 export class TransactionOnNetwork {
-    completionStrategy: ICompletionStrategy = new NullTransactionCompletionStrategy();
-
+    isCompleted: boolean = false;
     hash: IHash = new Hash("");
     type: string = "";
     nonce: INonce = new Nonce(0);
@@ -43,7 +38,7 @@ export class TransactionOnNetwork {
     static fromProxyHttpResponse(txHash: IHash, response: any): TransactionOnNetwork {
         let result = TransactionOnNetwork.fromHttpResponse(txHash, response);
         result.contractResults = ContractResults.fromProxyHttpResponse(response.smartContractResults || []);
-        result.completionStrategy = new TransactionCompletionStrategyOnProxy();
+        result.isCompleted = new TransactionCompletionStrategyOnProxy().isCompleted(result);
         // TODO: uniformize transaction status.
         return result;
     }
@@ -51,7 +46,7 @@ export class TransactionOnNetwork {
     static fromApiHttpResponse(txHash: IHash, response: any): TransactionOnNetwork {
         let result = TransactionOnNetwork.fromHttpResponse(txHash, response);
         result.contractResults = ContractResults.fromApiHttpResponse(response.results || []);
-        result.completionStrategy = new TransactionCompletionStrategyOnAPI();
+        result.isCompleted = new TransactionCompletionStrategyOnAPI().isCompleted(result);
         // TODO: uniformize transaction status.
         return result;
     }
@@ -86,9 +81,5 @@ export class TransactionOnNetwork {
     getDateTime(): Date {
         return new Date(this.timestamp * 1000);
     }
-
-    isCompleted(): boolean {
-        return this.completionStrategy.isCompleted(this);
-    }
 }
 

From 5cef3fe6deeaa648378e1a481dba8b09b97417de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Fri, 8 Apr 2022 15:50:23 +0300
Subject: [PATCH 093/338] Cleanup.

---
 src-network-providers/transactionCompletionStrategy.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src-network-providers/transactionCompletionStrategy.ts b/src-network-providers/transactionCompletionStrategy.ts
index 5fccc5a63..e0fe457a1 100644
--- a/src-network-providers/transactionCompletionStrategy.ts
+++ b/src-network-providers/transactionCompletionStrategy.ts
@@ -68,9 +68,3 @@ export class TransactionCompletionStrategyOnAPI {
         return !transaction.status.isPending();
     }
 }
-
-export class NullTransactionCompletionStrategy {
-    isCompleted(_transaction: ITransactionOnNetwork): boolean {
-        return false;
-    }
-}

From 1fb0dcfe0b0ee5d91b15e5c473a5f11d0c762189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Sat, 9 Apr 2022 23:20:47 +0300
Subject: [PATCH 094/338] Formatting etc.

---
 src-network-providers/interface.ts            |  7 +-
 .../networkGeneralStatistics.ts               |  8 ++-
 src-network-providers/networkStake.ts         | 68 +++++++++----------
 3 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index 3fdf68176..1bf3045d7 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -77,7 +77,7 @@ export interface INetworkProvider {
      * Simulates the processing of an already-signed transaction.
      * 
      */
-    simulateTransaction(tx: ITransaction): Promise<ISimulationResults>;
+    simulateTransaction(tx: ITransaction): Promise<any>;
 
     /**
      * Queries a Smart Contract - runs a pure function defined by the contract and returns its results.
@@ -86,13 +86,11 @@ export interface INetworkProvider {
 
     /**
      * Fetches the definition of a fungible token.
-     *
      */
     getDefinitionOfFungibleToken(tokenIdentifier: string): Promise<DefinitionOfFungibleTokenOnNetwork>;
 
     /**
      * Fetches the definition of a SFT (including Meta ESDT) or NFT.
-     * 
      */
     getDefinitionOfTokenCollection(collection: string): Promise<DefinitionOfTokenCollectionOnNetwork>;
 
@@ -122,9 +120,6 @@ export interface IContractReturnCode {
     isSuccess(): boolean;
 }
 
-export interface ISimulationResults {
-}
-
 export interface IPagination {
     from: number;
     size: number;
diff --git a/src-network-providers/networkGeneralStatistics.ts b/src-network-providers/networkGeneralStatistics.ts
index 7cad59e54..2935b1cbc 100644
--- a/src-network-providers/networkGeneralStatistics.ts
+++ b/src-network-providers/networkGeneralStatistics.ts
@@ -1,5 +1,5 @@
 /**
- * An object holding Network stats parameters.
+ * An object holding general Network statistics and parameters.
  */
 export class NetworkGeneralStatistics {
     /**
@@ -11,26 +11,32 @@ export class NetworkGeneralStatistics {
      * The Number of Blocks.
      */
     public Blocks: number;
+    
     /**
      * The Number of Accounts.
      */
     public Accounts: number;
+    
     /**
      * The Number of transactions.
      */
     public Transactions: number;
+    
     /**
      * The Refresh rate.
      */
     public RefreshRate: number;
+    
     /**
      * The Number of the current Epoch.
      */
     public Epoch: number;
+    
     /**
      * The Number of rounds passed.
      */
     public RoundsPassed: number;
+
     /**
      * The Number of Rounds per epoch.
      */
diff --git a/src-network-providers/networkStake.ts b/src-network-providers/networkStake.ts
index cab48b60b..5806f9eb2 100644
--- a/src-network-providers/networkStake.ts
+++ b/src-network-providers/networkStake.ts
@@ -4,44 +4,44 @@ import BigNumber from "bignumber.js";
  * An object holding Network stake parameters.
  */
 export class NetworkStake {
-  private static default: NetworkStake;
+    private static default: NetworkStake;
 
-  /**
-   * The Total Validators Number.
-   */
-  public TotalValidators: number;
+    /**
+     * The Total Validators Number.
+     */
+    public TotalValidators: number;
 
-  /**
-   * The Active Validators Number.
-   */
-  public ActiveValidators: number;
-  /**
-   * The Queue Size.
-   */
-  public QueueSize: number;
-  /**
-   * The Total Validators Number.
-   */
-  public TotalStaked: BigNumber;
+    /**
+     * The Active Validators Number.
+     */
+    public ActiveValidators: number;
+    /**
+     * The Queue Size.
+     */
+    public QueueSize: number;
+    /**
+     * The Total Validators Number.
+     */
+    public TotalStaked: BigNumber;
 
-  constructor() {
-    this.TotalValidators = 0;
-    this.ActiveValidators = 0;
-    this.QueueSize = 0;
-    this.TotalStaked = new BigNumber(0);
-  }
+    constructor() {
+        this.TotalValidators = 0;
+        this.ActiveValidators = 0;
+        this.QueueSize = 0;
+        this.TotalStaked = new BigNumber(0);
+    }
 
-  /**
-   * Constructs a configuration object from a HTTP response (as returned by the provider).
-   */
-  static fromHttpResponse(payload: any): NetworkStake {
-    let networkStake = new NetworkStake();
+    /**
+     * Constructs a configuration object from a HTTP response (as returned by the provider).
+     */
+    static fromHttpResponse(payload: any): NetworkStake {
+        let networkStake = new NetworkStake();
 
-    networkStake.TotalValidators = Number(payload["totalValidators"]);
-    networkStake.ActiveValidators = Number(payload["activeValidators"]);
-    networkStake.QueueSize = Number(payload["queueSize"]);
-    networkStake.TotalStaked = new BigNumber(payload["totalStaked"]);
+        networkStake.TotalValidators = Number(payload["totalValidators"]);
+        networkStake.ActiveValidators = Number(payload["activeValidators"]);
+        networkStake.QueueSize = Number(payload["queueSize"]);
+        networkStake.TotalStaked = new BigNumber(payload["totalStaked"]);
 
-    return networkStake;
-  }
+        return networkStake;
+    }
 }

From f13e771b104c67ec24d94b72c47eb1db202e877d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Sat, 9 Apr 2022 23:24:34 +0300
Subject: [PATCH 095/338] Fix exports.

---
 src-network-providers/factory.ts                | 12 ------------
 src-network-providers/index.ts                  | 10 ++++------
 src-network-providers/providers.dev.net.spec.ts |  7 ++++---
 3 files changed, 8 insertions(+), 21 deletions(-)
 delete mode 100644 src-network-providers/factory.ts

diff --git a/src-network-providers/factory.ts b/src-network-providers/factory.ts
deleted file mode 100644
index 192b133df..000000000
--- a/src-network-providers/factory.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { AxiosRequestConfig } from "axios";
-import { ApiNetworkProvider } from "./apiNetworkProvider";
-import { INetworkProvider } from "./interface";
-import { ProxyNetworkProvider } from "./proxyNetworkProvider";
-
-export function createProxyNetworkProvider(url: string, config?: AxiosRequestConfig): INetworkProvider {
-    return new ProxyNetworkProvider(url, config);
-}
-
-export function createApiNetworkProvider(url: string, config?: AxiosRequestConfig): INetworkProvider {
-    return new ApiNetworkProvider(url, config);
-}
diff --git a/src-network-providers/index.ts b/src-network-providers/index.ts
index c39389878..5f578c85e 100644
--- a/src-network-providers/index.ts
+++ b/src-network-providers/index.ts
@@ -1,16 +1,14 @@
-export { createProxyNetworkProvider, createApiNetworkProvider } from "./factory";
-export { INetworkProvider } from "./interface";
+export { ProxyNetworkProvider } from "./proxyNetworkProvider";
+export { ApiNetworkProvider } from "./apiNetworkProvider";
 
 export { AccountOnNetwork } from "./accounts";
-
-export { ContractQueryResponse } from "./contractQueryResponse";
-export { ContractResults, ContractResultItem } from "./contractResults";
-
 export { TransactionOnNetwork } from "./transactions";
 export { TransactionEvent, TransactionEventTopic } from "./transactionEvents";
 export { TransactionLogs } from "./transactionLogs";
 export { TransactionReceipt } from "./transactionReceipt";
 export { TransactionStatus } from "./transactionStatus";
+export { ContractQueryResponse } from "./contractQueryResponse";
+export { ContractResults, ContractResultItem } from "./contractResults";
 
 export { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 export { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 15ecf3c53..cdbfe610e 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -5,7 +5,8 @@ import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 import { Address, Nonce } from "./primitives";
 import { MockQuery } from "./testscommon/dummyQuery";
-import { createApiNetworkProvider, createProxyNetworkProvider } from "./factory";
+import { ApiNetworkProvider } from "./apiNetworkProvider";
+import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 
 describe("test network providers on devnet: Proxy and API", function () {
     let alice = new Address("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
@@ -13,8 +14,8 @@ describe("test network providers on devnet: Proxy and API", function () {
     let carol = new Address("erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
     let dan = new Address("erd1kyaqzaprcdnv4luvanah0gfxzzsnpaygsy6pytrexll2urtd05ts9vegu7");
 
-    let apiProvider: INetworkProvider = createApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 10000 });
-    let proxyProvider: INetworkProvider = createProxyNetworkProvider("https://devnet-gateway.elrond.com", { timeout: 10000 });
+    let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 10000 });
+    let proxyProvider: INetworkProvider = new ProxyNetworkProvider("https://devnet-gateway.elrond.com", { timeout: 10000 });
 
     it("should have same response for getNetworkConfig()", async function () {
         let apiResponse = await apiProvider.getNetworkConfig();

From 8004195e60002596de02ef6741f1162577af8ba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Sat, 9 Apr 2022 23:50:03 +0300
Subject: [PATCH 096/338] Simplify interfaces etc.

---
 src-network-providers/accounts.ts             | 14 +++++------
 src-network-providers/apiNetworkProvider.ts   | 22 +++++++++--------
 .../contractQueryResponse.ts                  |  6 ++---
 src-network-providers/contractResults.ts      | 20 ++++++++--------
 src-network-providers/interface.ts            | 24 +++++++------------
 src-network-providers/networkConfig.ts        | 18 ++++++--------
 src-network-providers/primitives.ts           |  8 +++----
 .../providers.dev.net.spec.ts                 | 12 +++++-----
 src-network-providers/proxyNetworkProvider.ts | 14 +++++------
 src-network-providers/tokenDefinitions.ts     | 12 +++++-----
 src-network-providers/tokens.ts               | 15 ++++++------
 .../transactionCompletionStrategy.ts          |  5 ++--
 src-network-providers/transactionEvents.ts    |  8 +++----
 src-network-providers/transactionLogs.ts      | 12 +++++-----
 src-network-providers/transactionReceipt.ts   |  8 +++----
 src-network-providers/transactions.ts         | 23 +++++++++---------
 16 files changed, 105 insertions(+), 116 deletions(-)

diff --git a/src-network-providers/accounts.ts b/src-network-providers/accounts.ts
index 6c7133588..c5602eb5e 100644
--- a/src-network-providers/accounts.ts
+++ b/src-network-providers/accounts.ts
@@ -1,13 +1,13 @@
-import { IAccountBalance, IAddress, INonce } from "./interface";
-import { AccountBalance, Address, Nonce } from "./primitives";
+import { IBech32Address } from "./interface";
+import { AccountBalance, Bech32Address } from "./primitives";
 
 /**
  * A plain view of an account, as queried from the Network.
  */
  export class AccountOnNetwork {
-    address: IAddress = new Address("");
-    nonce: INonce = new Nonce(0);
-    balance: IAccountBalance = new AccountBalance("");
+    address: IBech32Address = new Bech32Address("");
+    nonce: number = 0;
+    balance: AccountBalance = new AccountBalance("");
     code: string = "";
     userName: string = "";
 
@@ -18,8 +18,8 @@ import { AccountBalance, Address, Nonce } from "./primitives";
     static fromHttpResponse(payload: any): AccountOnNetwork {
         let result = new AccountOnNetwork();
 
-        result.address = new Address(payload["address"] || 0);
-        result.nonce = new Nonce(payload["nonce"] || 0);
+        result.address = new Bech32Address(payload["address"] || 0);
+        result.nonce = Number(payload["nonce"] || 0);
         result.balance = new AccountBalance(payload["balance"] || "0");
         result.code = payload["code"] || "";
         result.userName = payload["username"] || "";
diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index aaf59b202..8d54a4c81 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -1,6 +1,6 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "./accounts";
-import { IAddress, IContractQuery, IHash, INetworkProvider, INonce, ITransaction, IPagination } from "./interface";
+import { IBech32Address, IContractQuery, IHash, INetworkProvider, ITransaction, IPagination } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
 import { NetworkGeneralStatistics } from "./networkGeneralStatistics";
@@ -9,7 +9,7 @@ import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwor
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
-import { Hash } from "./primitives";
+import { Hash, Nonce } from "./primitives";
 import { ErrContractQuery, ErrNetworkProvider } from "./errors";
 import { defaultAxiosConfig, defaultPagination } from "./config";
 import { NetworkStatus } from "./networkStatus";
@@ -47,13 +47,13 @@ export class ApiNetworkProvider implements INetworkProvider {
         return stats;
     }
 
-    async getAccount(address: IAddress): Promise<AccountOnNetwork> {
+    async getAccount(address: IBech32Address): Promise<AccountOnNetwork> {
         let response = await this.doGetGeneric(`accounts/${address.bech32()}`);
         let account = AccountOnNetwork.fromHttpResponse(response);
         return account;
     }
 
-    async getFungibleTokensOfAccount(address: IAddress, pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]> {
+    async getFungibleTokensOfAccount(address: IBech32Address, pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]> {
         pagination = pagination || defaultPagination;
 
         let url = `accounts/${address.bech32()}/tokens?${this.buildPaginationParams(pagination)}`;
@@ -65,7 +65,7 @@ export class ApiNetworkProvider implements INetworkProvider {
         return tokens;
     }
 
-    async getNonFungibleTokensOfAccount(address: IAddress, pagination?: IPagination): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
+    async getNonFungibleTokensOfAccount(address: IBech32Address, pagination?: IPagination): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
         pagination = pagination || defaultPagination;
 
         let url = `accounts/${address.bech32()}/nfts?${this.buildPaginationParams(pagination)}`;
@@ -77,14 +77,15 @@ export class ApiNetworkProvider implements INetworkProvider {
         return tokens;
     }
 
-    async getFungibleTokenOfAccount(address: IAddress, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork> {
+    async getFungibleTokenOfAccount(address: IBech32Address, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`accounts/${address.bech32()}/tokens/${tokenIdentifier}`);
         let tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response);
         return tokenData;
     }
 
-    async getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: INonce): Promise<NonFungibleTokenOfAccountOnNetwork> {
-        let response = await this.doGetGeneric(`accounts/${address.bech32()}/nfts/${collection}-${nonce.hex()}`);
+    async getNonFungibleTokenOfAccount(address: IBech32Address, collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork> {
+        let nonceAsHex = new Nonce(nonce).hex();
+        let response = await this.doGetGeneric(`accounts/${address.bech32()}/nfts/${collection}-${nonceAsHex}`);
         let tokenData = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response);
         return tokenData;
     }
@@ -132,8 +133,9 @@ export class ApiNetworkProvider implements INetworkProvider {
         return definition;
     }
 
-    async getNonFungibleToken(collection: string, nonce: INonce): Promise<NonFungibleTokenOfAccountOnNetwork> {
-        let response = await this.doGetGeneric(`nfts/${collection}-${nonce.hex()}`);
+    async getNonFungibleToken(collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork> {
+        let nonceAsHex = new Nonce(nonce).hex();
+        let response = await this.doGetGeneric(`nfts/${collection}-${nonceAsHex}`);
         let token = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response);
         return token;
     }
diff --git a/src-network-providers/contractQueryResponse.ts b/src-network-providers/contractQueryResponse.ts
index 404d96006..79cc1452b 100644
--- a/src-network-providers/contractQueryResponse.ts
+++ b/src-network-providers/contractQueryResponse.ts
@@ -1,13 +1,13 @@
 import BigNumber from "bignumber.js";
 import { MaxUint64AsBigNumber } from "./constants";
-import { IContractReturnCode, IGasLimit } from "./interface";
+import { IContractReturnCode } from "./interface";
 import { ContractReturnCode } from "./primitives";
 
 export class ContractQueryResponse {
     returnData: string[];
     returnCode: IContractReturnCode;
     returnMessage: string;
-    gasUsed: IGasLimit;
+    gasUsed: number;
 
     constructor(init?: Partial<ContractQueryResponse>) {
         this.returnData = init?.returnData || [];
@@ -24,7 +24,7 @@ export class ContractQueryResponse {
         let returnCode = payload["returnCode"] || payload["ReturnCode"];
         let returnMessage = payload["returnMessage"] || payload["ReturnMessage"];
         let gasRemaining = new BigNumber(payload["gasRemaining"] || payload["GasRemaining"] || 0);
-        let gasUsed = new Number(MaxUint64AsBigNumber.minus(gasRemaining).toNumber());
+        let gasUsed = MaxUint64AsBigNumber.minus(gasRemaining).toNumber();
 
         return new ContractQueryResponse({
             returnData: returnData,
diff --git a/src-network-providers/contractResults.ts b/src-network-providers/contractResults.ts
index 194189fbd..1eca3afcb 100644
--- a/src-network-providers/contractResults.ts
+++ b/src-network-providers/contractResults.ts
@@ -1,6 +1,6 @@
-import { IAddress, IGasLimit, IGasPrice, IHash, INonce } from "./interface";
+import { IBech32Address, IHash } from "./interface";
 import { TransactionLogs } from "./transactionLogs";
-import { Address, Hash, Nonce, TransactionValue } from "./primitives";
+import { Bech32Address, Hash, Nonce, TransactionValue } from "./primitives";
 
 export class ContractResults {
     readonly items: ContractResultItem[];
@@ -30,15 +30,15 @@ export class ContractResults {
 
 export class ContractResultItem {
     hash: IHash = new Hash("");
-    nonce: INonce = new Nonce(0);
+    nonce: number = 0;
     value: TransactionValue = new TransactionValue("");
-    receiver: IAddress = new Address("");
-    sender: IAddress = new Address("");
+    receiver: IBech32Address = new Bech32Address("");
+    sender: IBech32Address = new Bech32Address("");
     data: string = "";
     previousHash: Hash = new Hash("");
     originalHash: Hash = new Hash("");
-    gasLimit: IGasLimit = 0;
-    gasPrice: IGasPrice = 0;
+    gasLimit: number = 0;
+    gasPrice: number = 0;
     callType: number = 0;
     returnMessage: string = "";
     logs: TransactionLogs = TransactionLogs.empty();
@@ -65,10 +65,10 @@ export class ContractResultItem {
         let item = new ContractResultItem();
 
         item.hash = new Hash(response.hash);
-        item.nonce = new Nonce(response.nonce || 0);
+        item.nonce = Number(response.nonce || 0);
         item.value = new TransactionValue((response.value || 0).toString());
-        item.receiver = new Address(response.receiver);
-        item.sender = new Address(response.sender);
+        item.receiver = new Bech32Address(response.receiver);
+        item.sender = new Bech32Address(response.sender);
         item.previousHash = new Hash(response.prevTxHash);
         item.originalHash = new Hash(response.originalTxHash);
         item.gasLimit = Number(response.gasLimit || 0);
diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index 1bf3045d7..0040002b6 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -36,27 +36,27 @@ export interface INetworkProvider {
     /**
      * Fetches the state of an account.
      */
-    getAccount(address: IAddress): Promise<AccountOnNetwork>;
+    getAccount(address: IBech32Address): Promise<AccountOnNetwork>;
 
     /**
      * Fetches data about the fungible tokens held by an account.
      */
-    getFungibleTokensOfAccount(address: IAddress, pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]>;
+    getFungibleTokensOfAccount(address: IBech32Address, pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]>;
 
     /**
      * Fetches data about the non-fungible tokens held by account.
      */
-    getNonFungibleTokensOfAccount(address: IAddress, pagination?: IPagination): Promise<NonFungibleTokenOfAccountOnNetwork[]>;
+    getNonFungibleTokensOfAccount(address: IBech32Address, pagination?: IPagination): Promise<NonFungibleTokenOfAccountOnNetwork[]>;
 
     /**
      * Fetches data about a specific fungible token held by an account.
      */
-    getFungibleTokenOfAccount(address: IAddress, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork>;
+    getFungibleTokenOfAccount(address: IBech32Address, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork>;
 
     /**
      * Fetches data about a specific non-fungible token (instance) held by an account.
      */
-    getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: INonce): Promise<NonFungibleTokenOfAccountOnNetwork>;
+    getNonFungibleTokenOfAccount(address: IBech32Address, collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork>;
 
     /**
      * Fetches the state of a transaction.
@@ -97,7 +97,7 @@ export interface INetworkProvider {
     /**
      * Fetches data about a specific non-fungible token (instance).
      */
-    getNonFungibleToken(collection: string, nonce: INonce): Promise<NonFungibleTokenOfAccountOnNetwork>;
+    getNonFungibleToken(collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork>;
 
     /**
      * Performs a generic GET action against the provider (useful for new HTTP endpoints, not yet supported by erdjs).
@@ -129,13 +129,5 @@ export interface ITransaction {
     toSendable(): any;
 }
 
-export interface IHexable { hex(): string; }
-export interface IHash extends IHexable { }
-export interface IAddress { bech32(): string; }
-export interface INonce extends IHexable { valueOf(): number; }
-export interface ITransactionPayload { encoded(): string; }
-export interface IGasLimit { valueOf(): number; }
-export interface IGasPrice { valueOf(): number; }
-export interface IChainID { valueOf(): string; }
-export interface ITransactionVersion { valueOf(): number; }
-export interface IAccountBalance { toString(): string; }
+export interface IHash { hex(): string; }
+export interface IBech32Address { bech32(): string; }
diff --git a/src-network-providers/networkConfig.ts b/src-network-providers/networkConfig.ts
index 5f0718ad6..be931e3c4 100644
--- a/src-network-providers/networkConfig.ts
+++ b/src-network-providers/networkConfig.ts
@@ -1,5 +1,4 @@
 import BigNumber from "bignumber.js";
-import { IChainID, IGasLimit, IGasPrice, ITransactionVersion } from "./interface";
 
 /**
  * An object holding Network configuration parameters.
@@ -8,10 +7,10 @@ export class NetworkConfig {
     /**
      * The chain ID. E.g. "1" for the Mainnet.
      */
-    public ChainID: IChainID;
+    public ChainID: string;
 
     /**
-     * The gas required by the Network to process a byte of the {@link TransactionPayload}.
+     * The gas required by the Network to process a byte of the transaction data.
      */
     public GasPerDataByte: number;
     /**
@@ -33,25 +32,22 @@ export class NetworkConfig {
      */
     public TopUpRewardsGradientPoint: BigNumber;
 
-    /**
-     *
-     */
     public GasPriceModifier: number;
 
     /**
-     * The minimum gas limit required to be set when broadcasting a {@link Transaction}.
+     * The minimum gas limit required to be set when broadcasting a transaction.
      */
-    public MinGasLimit: IGasLimit;
+    public MinGasLimit: number;
 
     /**
-     * The minimum gas price required to be set when broadcasting a {@link Transaction}.
+     * The minimum gas price required to be set when broadcasting a transaction.
      */
-    public MinGasPrice: IGasPrice;
+    public MinGasPrice: number;
 
     /**
      * The oldest transaction version accepted by the Network.
      */
-    public MinTransactionVersion: ITransactionVersion;
+    public MinTransactionVersion: number;
 
     constructor() {
         this.ChainID = "T";
diff --git a/src-network-providers/primitives.ts b/src-network-providers/primitives.ts
index 1a32caa38..f123fd0a6 100644
--- a/src-network-providers/primitives.ts
+++ b/src-network-providers/primitives.ts
@@ -1,4 +1,4 @@
-import { IAddress, IHash, INonce, ITransactionPayload } from "./interface";
+import { IBech32Address, IHash } from "./interface";
 
 export class Hash implements IHash {
     private readonly value: string;
@@ -12,7 +12,7 @@ export class Hash implements IHash {
     }
 }
 
-export class Address implements IAddress {
+export class Bech32Address implements IBech32Address {
     private readonly value: string;
 
     constructor(value: string) {
@@ -24,7 +24,7 @@ export class Address implements IAddress {
     }
 }
 
-export class Nonce implements INonce {
+export class Nonce {
     private readonly value: number;
 
     constructor(value: number) {
@@ -52,7 +52,7 @@ export class TransactionValue {
     }
 }
 
-export class TransactionPayload implements ITransactionPayload {
+export class TransactionPayload {
     private readonly decoded: Buffer;
 
     constructor(encoded: string) {
diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index cdbfe610e..25276442b 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -3,16 +3,16 @@ import { INetworkProvider } from "./interface";
 import { Hash } from "./primitives";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
-import { Address, Nonce } from "./primitives";
+import { Bech32Address, Nonce } from "./primitives";
 import { MockQuery } from "./testscommon/dummyQuery";
 import { ApiNetworkProvider } from "./apiNetworkProvider";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 
 describe("test network providers on devnet: Proxy and API", function () {
-    let alice = new Address("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
-    let bob = new Address("erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx");
-    let carol = new Address("erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
-    let dan = new Address("erd1kyaqzaprcdnv4luvanah0gfxzzsnpaygsy6pytrexll2urtd05ts9vegu7");
+    let alice = new Bech32Address("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
+    let bob = new Bech32Address("erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx");
+    let carol = new Bech32Address("erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
+    let dan = new Bech32Address("erd1kyaqzaprcdnv4luvanah0gfxzzsnpaygsy6pytrexll2urtd05ts9vegu7");
 
     let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 10000 });
     let proxyProvider: INetworkProvider = new ProxyNetworkProvider("https://devnet-gateway.elrond.com", { timeout: 10000 });
@@ -193,7 +193,7 @@ describe("test network providers on devnet: Proxy and API", function () {
     it("should have same response for getNonFungibleToken()", async function () {
         this.timeout(10000);
 
-        let tokens = [{ id: "ERDJS-38f249", nonce: new Nonce(1) }];
+        let tokens = [{ id: "ERDJS-38f249", nonce: 1 }];
 
         for (const token of tokens) {
             let apiResponse = await apiProvider.getNonFungibleToken(token.id, token.nonce);
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index 81741b44d..e79f32f23 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -1,6 +1,6 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "./accounts";
-import { IAddress, IContractQuery, IHash, INetworkProvider, INonce, IPagination, ITransaction } from "./interface";
+import { IBech32Address, IContractQuery, IHash, INetworkProvider, IPagination, ITransaction } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
 import { NetworkGeneralStatistics } from "./networkGeneralStatistics";
@@ -48,13 +48,13 @@ export class ProxyNetworkProvider implements INetworkProvider {
         throw new Error("Method not implemented.");
     }
 
-    async getAccount(address: IAddress): Promise<AccountOnNetwork> {
+    async getAccount(address: IBech32Address): Promise<AccountOnNetwork> {
         let response = await this.doGetGeneric(`address/${address.bech32()}`);
         let account = AccountOnNetwork.fromHttpResponse(response.account);
         return account;
     }
 
-    async getFungibleTokensOfAccount(address: IAddress, _pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]> {
+    async getFungibleTokensOfAccount(address: IBech32Address, _pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]> {
         let url = `address/${address.bech32()}/esdt`;
         let response = await this.doGetGeneric(url);
         let responseItems: any[] = Object.values(response.esdts);
@@ -67,7 +67,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokens;
     }
 
-    async getNonFungibleTokensOfAccount(address: IAddress, _pagination?: IPagination): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
+    async getNonFungibleTokensOfAccount(address: IBech32Address, _pagination?: IPagination): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
         let url = `address/${address.bech32()}/esdt`;
         let response = await this.doGetGeneric(url);
         let responseItems: any[] = Object.values(response.esdts);
@@ -80,13 +80,13 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokens;
     }
 
-    async getFungibleTokenOfAccount(address: IAddress, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork> {
+    async getFungibleTokenOfAccount(address: IBech32Address, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`address/${address.bech32()}/esdt/${tokenIdentifier}`);
         let tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response.tokenData);
         return tokenData;
     }
 
-    async getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: INonce): Promise<NonFungibleTokenOfAccountOnNetwork> {
+    async getNonFungibleTokenOfAccount(address: IBech32Address, collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`address/${address.bech32()}/nft/${collection}/nonce/${nonce.valueOf()}`);
         let tokenData = NonFungibleTokenOfAccountOnNetwork.fromProxyHttpResponseByNonce(response.tokenData);
         return tokenData;
@@ -138,7 +138,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
         throw new Error("Method not implemented.");
     }
 
-    async getNonFungibleToken(_collection: string, _nonce: INonce): Promise<NonFungibleTokenOfAccountOnNetwork> {
+    async getNonFungibleToken(_collection: string, _nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork> {
         throw new Error("Method not implemented.");
     }
 
diff --git a/src-network-providers/tokenDefinitions.ts b/src-network-providers/tokenDefinitions.ts
index 0a7f156d4..9f6261d91 100644
--- a/src-network-providers/tokenDefinitions.ts
+++ b/src-network-providers/tokenDefinitions.ts
@@ -1,12 +1,12 @@
 import { BigNumber } from "bignumber.js";
-import { Address } from "./primitives";
-import { IAddress } from "./interface";
+import { Bech32Address } from "./primitives";
+import { IBech32Address } from "./interface";
 
 export class DefinitionOfFungibleTokenOnNetwork {
     identifier: string = "";
     name: string = "";
     ticker: string = "";
-    owner: IAddress = new Address("");
+    owner: IBech32Address = new Bech32Address("");
     decimals: number = 0;
     supply: BigNumber = new BigNumber(0);
     isPaused: boolean = false;
@@ -25,7 +25,7 @@ export class DefinitionOfFungibleTokenOnNetwork {
         result.identifier = payload.identifier || "";
         result.name = payload.name || "";
         result.ticker = payload.ticker || "";
-        result.owner = new Address(payload.owner || "");
+        result.owner = new Bech32Address(payload.owner || "");
         result.decimals = payload.decimals || 0;
         result.supply = new BigNumber(payload.supply || "0");
         result.isPaused = payload.isPaused || false;
@@ -47,7 +47,7 @@ export class DefinitionOfTokenCollectionOnNetwork {
     type: string = "";
     name: string = "";
     ticker: string = "";
-    owner: IAddress = new Address("");
+    owner: IBech32Address = new Bech32Address("");
     decimals: number = 0;
     canPause: boolean = false;
     canFreeze: boolean = false;
@@ -61,7 +61,7 @@ export class DefinitionOfTokenCollectionOnNetwork {
         result.type = payload.type || "";
         result.name = payload.name || "";
         result.ticker = payload.ticker || "";
-        result.owner = new Address(payload.owner || "");
+        result.owner = new Bech32Address(payload.owner || "");
         result.decimals = payload.decimals || 0;
         result.canPause = payload.canPause || false;
         result.canFreeze = payload.canFreeze || false;
diff --git a/src-network-providers/tokens.ts b/src-network-providers/tokens.ts
index 39e140335..d23394f28 100644
--- a/src-network-providers/tokens.ts
+++ b/src-network-providers/tokens.ts
@@ -1,6 +1,6 @@
 import { BigNumber } from "bignumber.js";
-import { Address, Nonce } from "./primitives";
-import { IAddress, INonce } from "./interface";
+import { Bech32Address, Nonce } from "./primitives";
+import { IBech32Address } from "./interface";
 
 export class FungibleTokenOfAccountOnNetwork {
     identifier: string = "";
@@ -21,10 +21,10 @@ export class NonFungibleTokenOfAccountOnNetwork {
     collection: string = "";
     timestamp: number = 0;
     attributes: Buffer = Buffer.from([]);
-    nonce: INonce = new Nonce(0);
+    nonce: number = 0;
     type: string = "";
     name: string = "";
-    creator: IAddress = new Address("");
+    creator: IBech32Address = new Bech32Address("");
     supply: BigNumber = new BigNumber(0);
     decimals: number = 0;
     royalties: BigNumber = new BigNumber(0);
@@ -46,8 +46,9 @@ export class NonFungibleTokenOfAccountOnNetwork {
 
     static fromProxyHttpResponseByNonce(payload: any): NonFungibleTokenOfAccountOnNetwork {
         let result = NonFungibleTokenOfAccountOnNetwork.fromHttpResponse(payload);
+        let nonceAsHex = new Nonce(result.nonce).hex();
 
-        result.identifier = `${payload.tokenIdentifier}-${result.nonce.hex()}`;
+        result.identifier = `${payload.tokenIdentifier}-${nonceAsHex}`;
         result.collection = payload.tokenIdentifier || "";
         result.royalties = new BigNumber(payload.royalties || 0).div(100);
 
@@ -69,10 +70,10 @@ export class NonFungibleTokenOfAccountOnNetwork {
 
         result.timestamp = Number(payload.timestamp || 0);
         result.attributes = Buffer.from(payload.attributes || "", "base64");
-        result.nonce = new Nonce(payload.nonce || 0);
+        result.nonce = payload.nonce || 0;
         result.type = payload.type || "";
         result.name = payload.name || "";
-        result.creator = new Address(payload.creator || "");
+        result.creator = new Bech32Address(payload.creator || "");
         result.decimals = Number(payload.decimals || 0);
         result.supply = new BigNumber(payload.balance || 1);
         result.royalties = new BigNumber(payload.royalties || 0);
diff --git a/src-network-providers/transactionCompletionStrategy.ts b/src-network-providers/transactionCompletionStrategy.ts
index e0fe457a1..50cfea369 100644
--- a/src-network-providers/transactionCompletionStrategy.ts
+++ b/src-network-providers/transactionCompletionStrategy.ts
@@ -1,13 +1,12 @@
 import { TransactionStatus } from "./transactionStatus";
-import { ITransactionPayload } from "./interface";
 import { TransactionLogs } from "./transactionLogs";
-import { isPaddedHex } from "./primitives";
+import { isPaddedHex, TransactionPayload } from "./primitives";
 
 interface ITransactionOnNetwork {
     logs: TransactionLogs;
     status: TransactionStatus;
     hyperblockNonce: number;
-    data: ITransactionPayload;
+    data: TransactionPayload;
 }
 
 const WellKnownCompletionEvents = ["completedTxEvent", "SCDeploy", "signalError"];
diff --git a/src-network-providers/transactionEvents.ts b/src-network-providers/transactionEvents.ts
index 780a10340..d0505ce84 100644
--- a/src-network-providers/transactionEvents.ts
+++ b/src-network-providers/transactionEvents.ts
@@ -1,8 +1,8 @@
-import { IAddress } from "./interface";
-import { Address } from "./primitives";
+import { IBech32Address } from "./interface";
+import { Bech32Address } from "./primitives";
 
 export class TransactionEvent {
-    address: IAddress = new Address("");
+    address: IBech32Address = new Bech32Address("");
     identifier: string = "";
     topics: TransactionEventTopic[] = [];
     data: string = "";
@@ -18,7 +18,7 @@ export class TransactionEvent {
         data: string
     }): TransactionEvent {
         let result = new TransactionEvent();
-        result.address = new Address(responsePart.address);
+        result.address = new Bech32Address(responsePart.address);
         result.identifier = responsePart.identifier || "";
         result.topics = (responsePart.topics || []).map(topic => new TransactionEventTopic(topic));
         result.data = Buffer.from(responsePart.data || "", "base64").toString();
diff --git a/src-network-providers/transactionLogs.ts b/src-network-providers/transactionLogs.ts
index 91586ef00..608d712fb 100644
--- a/src-network-providers/transactionLogs.ts
+++ b/src-network-providers/transactionLogs.ts
@@ -1,23 +1,23 @@
 import { ErrUnexpectedCondition } from "./errors";
-import { IAddress } from "./interface";
-import { Address } from "./primitives";
+import { IBech32Address } from "./interface";
+import { Bech32Address } from "./primitives";
 import { TransactionEvent } from "./transactionEvents";
 
 export class TransactionLogs {
-    readonly address: IAddress;
+    readonly address: IBech32Address;
     readonly events: TransactionEvent[];
 
-    constructor(address: IAddress, events: TransactionEvent[]) {
+    constructor(address: IBech32Address, events: TransactionEvent[]) {
         this.address = address;
         this.events = events;
     }
 
     static empty(): TransactionLogs {
-        return new TransactionLogs(new Address(""), []);
+        return new TransactionLogs(new Bech32Address(""), []);
     }
 
     static fromHttpResponse(logs: any): TransactionLogs {
-        let address = new Address(logs.address);
+        let address = new Bech32Address(logs.address);
         let events = (logs.events || []).map((event: any) => TransactionEvent.fromHttpResponse(event));
         return new TransactionLogs(address, events);
     }
diff --git a/src-network-providers/transactionReceipt.ts b/src-network-providers/transactionReceipt.ts
index 358661692..b24aec645 100644
--- a/src-network-providers/transactionReceipt.ts
+++ b/src-network-providers/transactionReceipt.ts
@@ -1,9 +1,9 @@
-import { IAddress, IHash } from "./interface";
-import { Address, Hash, TransactionValue } from "./primitives";
+import { IBech32Address, IHash } from "./interface";
+import { Bech32Address, Hash, TransactionValue } from "./primitives";
 
 export class TransactionReceipt {
     value: TransactionValue = new TransactionValue("");
-    sender: IAddress = new Address("");
+    sender: IBech32Address = new Bech32Address("");
     data: string = "";
     hash: IHash = new Hash("");
 
@@ -16,7 +16,7 @@ export class TransactionReceipt {
         let receipt = new TransactionReceipt();
 
         receipt.value = new TransactionValue(response.value);
-        receipt.sender = new Address(response.sender);
+        receipt.sender = new Bech32Address(response.sender);
         receipt.data = response.data;
         receipt.hash = new Hash(response.txHash);
 
diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
index eaa435111..a479d06b2 100644
--- a/src-network-providers/transactions.ts
+++ b/src-network-providers/transactions.ts
@@ -1,7 +1,7 @@
 import { TransactionStatus } from "./transactionStatus";
 import { ContractResults } from "./contractResults";
-import { Address, Hash, Nonce, TransactionValue, TransactionPayload } from "./primitives";
-import { IAddress, IGasLimit, IGasPrice, IHash, INonce, ITransactionPayload } from "./interface";
+import { Bech32Address, Hash, TransactionValue, TransactionPayload } from "./primitives";
+import { IBech32Address, IHash } from "./interface";
 import { TransactionCompletionStrategyOnAPI, TransactionCompletionStrategyOnProxy } from "./transactionCompletionStrategy";
 import { TransactionLogs } from "./transactionLogs";
 import { TransactionReceipt } from "./transactionReceipt";
@@ -10,15 +10,15 @@ export class TransactionOnNetwork {
     isCompleted: boolean = false;
     hash: IHash = new Hash("");
     type: string = "";
-    nonce: INonce = new Nonce(0);
+    nonce: number = 0;
     round: number = 0;
     epoch: number = 0;
     value: TransactionValue = new TransactionValue("");
-    receiver: IAddress = new Address("");
-    sender: IAddress = new Address("");
-    gasLimit: IGasLimit = 0;
-    gasPrice: IGasPrice = 0;
-    data: ITransactionPayload = new TransactionPayload("");
+    receiver: IBech32Address = new Bech32Address("");
+    sender: IBech32Address = new Bech32Address("");
+    gasLimit: number = 0;
+    gasPrice: number = 0;
+    data: TransactionPayload = new TransactionPayload("");
     signature: string = "";
     status: TransactionStatus = TransactionStatus.createUnknown();
     timestamp: number = 0;
@@ -56,12 +56,12 @@ export class TransactionOnNetwork {
 
         result.hash = txHash;
         result.type = response.type || "";
-        result.nonce = new Nonce(response.nonce || 0);
+        result.nonce = response.nonce || 0;
         result.round = response.round;
         result.epoch = response.epoch || 0;
         result.value = new TransactionValue((response.value || 0).toString());
-        result.sender = new Address(response.sender);
-        result.receiver = new Address(response.receiver);
+        result.sender = new Bech32Address(response.sender);
+        result.receiver = new Bech32Address(response.receiver);
         result.gasPrice = response.gasPrice || 0;
         result.gasLimit = response.gasLimit || 0;
         result.data = new TransactionPayload(response.data);
@@ -82,4 +82,3 @@ export class TransactionOnNetwork {
         return new Date(this.timestamp * 1000);
     }
 }
-

From a311e1ceb0c37f0c061e1dce49229f5aab31224e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Sun, 10 Apr 2022 00:30:46 +0300
Subject: [PATCH 097/338] Adjust config.

---
 src-network-providers/.npmignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src-network-providers/.npmignore

diff --git a/src-network-providers/.npmignore b/src-network-providers/.npmignore
new file mode 100644
index 000000000..4c56e2af7
--- /dev/null
+++ b/src-network-providers/.npmignore
@@ -0,0 +1 @@
+src/testscommon/**

From e2dc6312b29bd15ab3fd95488395a76dd2d6a4cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Sun, 10 Apr 2022 00:31:06 +0300
Subject: [PATCH 098/338] Simplification (string instead of AccountBalance).

---
 src-network-providers/accounts.ts           |  6 +++---
 src-network-providers/contractResults.ts    |  6 +++---
 src-network-providers/primitives.ts         | 24 ---------------------
 src-network-providers/transactionReceipt.ts |  6 +++---
 src-network-providers/transactions.ts       |  6 +++---
 5 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/src-network-providers/accounts.ts b/src-network-providers/accounts.ts
index c5602eb5e..94a2dcab6 100644
--- a/src-network-providers/accounts.ts
+++ b/src-network-providers/accounts.ts
@@ -1,5 +1,5 @@
 import { IBech32Address } from "./interface";
-import { AccountBalance, Bech32Address } from "./primitives";
+import { Bech32Address } from "./primitives";
 
 /**
  * A plain view of an account, as queried from the Network.
@@ -7,7 +7,7 @@ import { AccountBalance, Bech32Address } from "./primitives";
  export class AccountOnNetwork {
     address: IBech32Address = new Bech32Address("");
     nonce: number = 0;
-    balance: AccountBalance = new AccountBalance("");
+    balance: string = "";
     code: string = "";
     userName: string = "";
 
@@ -20,7 +20,7 @@ import { AccountBalance, Bech32Address } from "./primitives";
 
         result.address = new Bech32Address(payload["address"] || 0);
         result.nonce = Number(payload["nonce"] || 0);
-        result.balance = new AccountBalance(payload["balance"] || "0");
+        result.balance = (payload["balance"] || 0).toString();
         result.code = payload["code"] || "";
         result.userName = payload["username"] || "";
 
diff --git a/src-network-providers/contractResults.ts b/src-network-providers/contractResults.ts
index 1eca3afcb..a89c56787 100644
--- a/src-network-providers/contractResults.ts
+++ b/src-network-providers/contractResults.ts
@@ -1,6 +1,6 @@
 import { IBech32Address, IHash } from "./interface";
 import { TransactionLogs } from "./transactionLogs";
-import { Bech32Address, Hash, Nonce, TransactionValue } from "./primitives";
+import { Bech32Address, Hash } from "./primitives";
 
 export class ContractResults {
     readonly items: ContractResultItem[];
@@ -31,7 +31,7 @@ export class ContractResults {
 export class ContractResultItem {
     hash: IHash = new Hash("");
     nonce: number = 0;
-    value: TransactionValue = new TransactionValue("");
+    value: string = "";
     receiver: IBech32Address = new Bech32Address("");
     sender: IBech32Address = new Bech32Address("");
     data: string = "";
@@ -66,7 +66,7 @@ export class ContractResultItem {
 
         item.hash = new Hash(response.hash);
         item.nonce = Number(response.nonce || 0);
-        item.value = new TransactionValue((response.value || 0).toString());
+        item.value = (response.value || 0).toString();
         item.receiver = new Bech32Address(response.receiver);
         item.sender = new Bech32Address(response.sender);
         item.previousHash = new Hash(response.prevTxHash);
diff --git a/src-network-providers/primitives.ts b/src-network-providers/primitives.ts
index f123fd0a6..2a28fd128 100644
--- a/src-network-providers/primitives.ts
+++ b/src-network-providers/primitives.ts
@@ -40,18 +40,6 @@ export class Nonce {
     }
 }
 
-export class TransactionValue {
-    private readonly value: string;
-
-    constructor(value: string) {
-        this.value = value;
-    }
-
-    toString(): string {
-        return this.value;
-    }
-}
-
 export class TransactionPayload {
     private readonly decoded: Buffer;
 
@@ -86,18 +74,6 @@ export class ContractReturnCode {
     }
 }
 
-export class AccountBalance {
-    private readonly value: string;
-
-    constructor(value: string) {
-        this.value = value;
-    }
-
-    toString(): string {
-        return this.value;
-    }
-}
-
 export function numberToPaddedHex(value: number) {
     let hex = value.toString(16);
     return zeroPadStringIfOddLength(hex);
diff --git a/src-network-providers/transactionReceipt.ts b/src-network-providers/transactionReceipt.ts
index b24aec645..337bf3847 100644
--- a/src-network-providers/transactionReceipt.ts
+++ b/src-network-providers/transactionReceipt.ts
@@ -1,8 +1,8 @@
 import { IBech32Address, IHash } from "./interface";
-import { Bech32Address, Hash, TransactionValue } from "./primitives";
+import { Bech32Address, Hash } from "./primitives";
 
 export class TransactionReceipt {
-    value: TransactionValue = new TransactionValue("");
+    value: string = "";
     sender: IBech32Address = new Bech32Address("");
     data: string = "";
     hash: IHash = new Hash("");
@@ -15,7 +15,7 @@ export class TransactionReceipt {
     }): TransactionReceipt {
         let receipt = new TransactionReceipt();
 
-        receipt.value = new TransactionValue(response.value);
+        receipt.value = (response.value || 0).toString();
         receipt.sender = new Bech32Address(response.sender);
         receipt.data = response.data;
         receipt.hash = new Hash(response.txHash);
diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
index a479d06b2..8ddd330f8 100644
--- a/src-network-providers/transactions.ts
+++ b/src-network-providers/transactions.ts
@@ -1,6 +1,6 @@
 import { TransactionStatus } from "./transactionStatus";
 import { ContractResults } from "./contractResults";
-import { Bech32Address, Hash, TransactionValue, TransactionPayload } from "./primitives";
+import { Bech32Address, Hash, TransactionPayload } from "./primitives";
 import { IBech32Address, IHash } from "./interface";
 import { TransactionCompletionStrategyOnAPI, TransactionCompletionStrategyOnProxy } from "./transactionCompletionStrategy";
 import { TransactionLogs } from "./transactionLogs";
@@ -13,7 +13,7 @@ export class TransactionOnNetwork {
     nonce: number = 0;
     round: number = 0;
     epoch: number = 0;
-    value: TransactionValue = new TransactionValue("");
+    value: string = "";
     receiver: IBech32Address = new Bech32Address("");
     sender: IBech32Address = new Bech32Address("");
     gasLimit: number = 0;
@@ -59,7 +59,7 @@ export class TransactionOnNetwork {
         result.nonce = response.nonce || 0;
         result.round = response.round;
         result.epoch = response.epoch || 0;
-        result.value = new TransactionValue((response.value || 0).toString());
+        result.value = (response.value || 0).toString();
         result.sender = new Bech32Address(response.sender);
         result.receiver = new Bech32Address(response.receiver);
         result.gasPrice = response.gasPrice || 0;

From 9a41acfb69722a98c7b98f6017f70293f9590de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Sun, 10 Apr 2022 12:56:38 +0300
Subject: [PATCH 099/338] Further simplification (transaction payload).

---
 src-network-providers/primitives.ts              | 16 ----------------
 .../transactionCompletionStrategy.ts             | 10 +++++-----
 src-network-providers/transactions.ts            |  6 +++---
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src-network-providers/primitives.ts b/src-network-providers/primitives.ts
index 2a28fd128..6be2af43b 100644
--- a/src-network-providers/primitives.ts
+++ b/src-network-providers/primitives.ts
@@ -40,22 +40,6 @@ export class Nonce {
     }
 }
 
-export class TransactionPayload {
-    private readonly decoded: Buffer;
-
-    constructor(encoded: string) {
-        this.decoded = Buffer.from(encoded || "", "base64");
-    }
-
-    encoded(): string {
-        return this.decoded.toString("base64");
-    }
-
-    toString() {
-        return this.decoded.toString();
-    }
-}
-
 export class ContractReturnCode {
     private static OK: string = "ok";
 
diff --git a/src-network-providers/transactionCompletionStrategy.ts b/src-network-providers/transactionCompletionStrategy.ts
index 50cfea369..cd072c20c 100644
--- a/src-network-providers/transactionCompletionStrategy.ts
+++ b/src-network-providers/transactionCompletionStrategy.ts
@@ -1,12 +1,12 @@
 import { TransactionStatus } from "./transactionStatus";
 import { TransactionLogs } from "./transactionLogs";
-import { isPaddedHex, TransactionPayload } from "./primitives";
+import { isPaddedHex } from "./primitives";
 
 interface ITransactionOnNetwork {
     logs: TransactionLogs;
     status: TransactionStatus;
     hyperblockNonce: number;
-    data: TransactionPayload;
+    data: Buffer;
 }
 
 const WellKnownCompletionEvents = ["completedTxEvent", "SCDeploy", "signalError"];
@@ -31,7 +31,7 @@ export class TransactionCompletionStrategyOnProxy {
             }
         }
 
-        if (this.isCertainlyMoveBalance(transaction.data.toString())) {
+        if (this.isCertainlyMoveBalance(transaction.data)) {
             return transaction.status.isExecuted();
         }
 
@@ -47,8 +47,8 @@ export class TransactionCompletionStrategyOnProxy {
         return false;
     }
 
-    private isCertainlyMoveBalance(transactionData: string): boolean {
-        let parts = transactionData.split("@");
+    private isCertainlyMoveBalance(transactionData: Buffer): boolean {
+        let parts = transactionData.toString().split("@");
         let prefix = parts[0];
         let otherParts = parts.slice(1);
         let emptyPrefix = !prefix;
diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
index 8ddd330f8..728011097 100644
--- a/src-network-providers/transactions.ts
+++ b/src-network-providers/transactions.ts
@@ -1,6 +1,6 @@
 import { TransactionStatus } from "./transactionStatus";
 import { ContractResults } from "./contractResults";
-import { Bech32Address, Hash, TransactionPayload } from "./primitives";
+import { Bech32Address, Hash } from "./primitives";
 import { IBech32Address, IHash } from "./interface";
 import { TransactionCompletionStrategyOnAPI, TransactionCompletionStrategyOnProxy } from "./transactionCompletionStrategy";
 import { TransactionLogs } from "./transactionLogs";
@@ -18,7 +18,7 @@ export class TransactionOnNetwork {
     sender: IBech32Address = new Bech32Address("");
     gasLimit: number = 0;
     gasPrice: number = 0;
-    data: TransactionPayload = new TransactionPayload("");
+    data: Buffer = Buffer.from([]);
     signature: string = "";
     status: TransactionStatus = TransactionStatus.createUnknown();
     timestamp: number = 0;
@@ -64,7 +64,7 @@ export class TransactionOnNetwork {
         result.receiver = new Bech32Address(response.receiver);
         result.gasPrice = response.gasPrice || 0;
         result.gasLimit = response.gasLimit || 0;
-        result.data = new TransactionPayload(response.data);
+        result.data = Buffer.from(response.data || "", "base64");
         result.status = new TransactionStatus(response.status);
         result.timestamp = response.timestamp || 0;
 

From 4b69eed66ee93ee7269b5ce57a2bee283561c304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Sun, 10 Apr 2022 13:07:50 +0300
Subject: [PATCH 100/338] Simplification (contract return code is now a
 string).

---
 src-network-providers/contractQueryResponse.ts | 13 +++----------
 src-network-providers/interface.ts             |  5 -----
 src-network-providers/primitives.ts            | 18 ------------------
 3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/src-network-providers/contractQueryResponse.ts b/src-network-providers/contractQueryResponse.ts
index 79cc1452b..40da09129 100644
--- a/src-network-providers/contractQueryResponse.ts
+++ b/src-network-providers/contractQueryResponse.ts
@@ -1,17 +1,15 @@
 import BigNumber from "bignumber.js";
 import { MaxUint64AsBigNumber } from "./constants";
-import { IContractReturnCode } from "./interface";
-import { ContractReturnCode } from "./primitives";
 
 export class ContractQueryResponse {
     returnData: string[];
-    returnCode: IContractReturnCode;
+    returnCode: string;
     returnMessage: string;
     gasUsed: number;
 
     constructor(init?: Partial<ContractQueryResponse>) {
         this.returnData = init?.returnData || [];
-        this.returnCode = init?.returnCode || new ContractReturnCode("");
+        this.returnCode = init?.returnCode || "";
         this.returnMessage = init?.returnMessage || "";
         this.gasUsed = init?.gasUsed || 0;
     }
@@ -28,7 +26,7 @@ export class ContractQueryResponse {
 
         return new ContractQueryResponse({
             returnData: returnData,
-            returnCode: new ContractReturnCode(returnCode),
+            returnCode: returnCode,
             returnMessage: returnMessage,
             gasUsed: gasUsed,
         });
@@ -38,16 +36,11 @@ export class ContractQueryResponse {
         return this.returnData.map((item) => Buffer.from(item || "", "base64"));
     }
 
-    isSuccess(): boolean {
-        return this.returnCode.isSuccess();
-    }
-
     /**
      * Converts the object to a pretty, plain JavaScript object.
      */
     toJSON(): object {
         return {
-            success: this.isSuccess(),
             returnData: this.returnData,
             returnCode: this.returnCode,
             returnMessage: this.returnMessage,
diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index 0040002b6..014ad666c 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -115,11 +115,6 @@ export interface IContractQuery {
     toHttpRequest(): any;
 }
 
-export interface IContractReturnCode {
-    toString(): string;
-    isSuccess(): boolean;
-}
-
 export interface IPagination {
     from: number;
     size: number;
diff --git a/src-network-providers/primitives.ts b/src-network-providers/primitives.ts
index 6be2af43b..a0b45e7f5 100644
--- a/src-network-providers/primitives.ts
+++ b/src-network-providers/primitives.ts
@@ -40,24 +40,6 @@ export class Nonce {
     }
 }
 
-export class ContractReturnCode {
-    private static OK: string = "ok";
-
-    private readonly value: string;
-
-    constructor(value: string) {
-        this.value = value;
-    }
-
-    toString() {
-        return this.value;
-    }
-
-    isSuccess(): boolean {
-        return this.value == ContractReturnCode.OK;
-    }
-}
-
 export function numberToPaddedHex(value: number) {
     let hex = value.toString(16);
     return zeroPadStringIfOddLength(hex);

From 9e1f86cda12a12a45176618ca0b42a44d546386d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Sun, 10 Apr 2022 15:10:00 +0300
Subject: [PATCH 101/338] Bring query.toHttpRequest() logic in
 network-providers.

---
 src-network-providers/apiNetworkProvider.ts   |  4 +++-
 src-network-providers/contractQueryRequest.ts | 21 +++++++++++++++++++
 src-network-providers/interface.ts            |  7 +++++--
 .../providers.dev.net.spec.ts                 | 16 +++++++-------
 src-network-providers/proxyNetworkProvider.ts |  4 +++-
 .../testscommon/dummyQuery.ts                 | 21 +++++++------------
 6 files changed, 48 insertions(+), 25 deletions(-)
 create mode 100644 src-network-providers/contractQueryRequest.ts

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 8d54a4c81..20a3c500f 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -14,6 +14,7 @@ import { ErrContractQuery, ErrNetworkProvider } from "./errors";
 import { defaultAxiosConfig, defaultPagination } from "./config";
 import { NetworkStatus } from "./networkStatus";
 import { ContractQueryResponse } from "./contractQueryResponse";
+import { ContractQueryRequest } from "./contractQueryRequest";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ApiNetworkProvider implements INetworkProvider {
@@ -114,7 +115,8 @@ export class ApiNetworkProvider implements INetworkProvider {
 
     async queryContract(query: IContractQuery): Promise<ContractQueryResponse> {
         try {
-            let response = await this.doPostGeneric("query", query.toHttpRequest());
+            let request = new ContractQueryRequest(query).toHttpRequest();
+            let response = await this.doPostGeneric("query", request);
             return ContractQueryResponse.fromHttpResponse(response);
         } catch (error: any) {
             throw new ErrContractQuery(error);
diff --git a/src-network-providers/contractQueryRequest.ts b/src-network-providers/contractQueryRequest.ts
new file mode 100644
index 000000000..69b9cebb1
--- /dev/null
+++ b/src-network-providers/contractQueryRequest.ts
@@ -0,0 +1,21 @@
+import { IContractQuery } from "./interface";
+
+export class ContractQueryRequest {
+    private readonly query: IContractQuery;
+
+    constructor(query: IContractQuery) {
+        this.query = query;
+    }
+
+    toHttpRequest() {
+        let request: any = {};
+        let query = this.query;
+        request.scAddress = query.address.bech32();
+        request.caller = query.caller.bech32() ? query.caller.bech32() : undefined;
+        request.funcName = query.func.toString();
+        request.value = query.value.toString();
+        request.args = query.getEncodedArguments();
+        
+        return request;
+    }
+}
diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index 014ad666c..366b48b35 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -110,9 +110,12 @@ export interface INetworkProvider {
     doPostGeneric(resourceUrl: string, payload: any): Promise<any>;
 }
 
-// TODO: network-providers package should be responsible with formatting the http request.
 export interface IContractQuery {
-    toHttpRequest(): any;
+    address: IBech32Address;
+    caller: IBech32Address;
+    func: { toString(): string; };
+    value: { toString(): string; };
+    getEncodedArguments(): string[];
 }
 
 export interface IPagination {
diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 25276442b..bcc39c2f0 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -211,8 +211,8 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         // Query: get sum (of adder contract)
         let query = new MockQuery({
-            contract: "erd1qqqqqqqqqqqqqpgquykqja5c4v33zdmnwglj3jphqwrelzdn396qlc9g33",
-            function: "getSum"
+            address: new Bech32Address("erd1qqqqqqqqqqqqqpgquykqja5c4v33zdmnwglj3jphqwrelzdn396qlc9g33"),
+            func: "getSum"
         });
 
         let apiResponse = await apiProvider.queryContract(query);
@@ -227,9 +227,9 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         // Query: increment counter
         query = new MockQuery({
-            contract: "erd1qqqqqqqqqqqqqpgqzeq07xvhs5g7cg4ama85upaqarrcgu49396q0gz4yf",
-            function: "increment",
-            arguments: []
+            address: new Bech32Address("erd1qqqqqqqqqqqqqpgqzeq07xvhs5g7cg4ama85upaqarrcgu49396q0gz4yf"),
+            func: "increment",
+            args: []
         });
 
         apiResponse = await apiProvider.queryContract(query);
@@ -248,10 +248,10 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         // Query: issue ESDT
         let query = new MockQuery({
-            contract: "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
-            function: "issue",
+            address: new Bech32Address("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u"),
+            func: "issue",
             value: "50000000000000000",
-            arguments: [
+            args: [
                 Buffer.from("HELLO").toString("hex"),
                 Buffer.from("WORLD").toString("hex"),
                 "0A", // Supply
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index e79f32f23..8b0dac69f 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -13,6 +13,7 @@ import { defaultAxiosConfig } from "./config";
 import { NetworkStatus } from "./networkStatus";
 import { ContractQueryResponse } from "./contractQueryResponse";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
+import { ContractQueryRequest } from "./contractQueryRequest";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ProxyNetworkProvider implements INetworkProvider {
@@ -118,7 +119,8 @@ export class ProxyNetworkProvider implements INetworkProvider {
 
     async queryContract(query: IContractQuery): Promise<ContractQueryResponse> {
         try {
-            let response = await this.doPostGeneric("vm-values/query", query.toHttpRequest());
+            let request = new ContractQueryRequest(query).toHttpRequest();
+            let response = await this.doPostGeneric("vm-values/query", request);
             return ContractQueryResponse.fromHttpResponse(response.data);
         } catch (error: any) {
             throw new ErrContractQuery(error);
diff --git a/src-network-providers/testscommon/dummyQuery.ts b/src-network-providers/testscommon/dummyQuery.ts
index 33befef36..437ac4b28 100644
--- a/src-network-providers/testscommon/dummyQuery.ts
+++ b/src-network-providers/testscommon/dummyQuery.ts
@@ -1,23 +1,18 @@
-import { IContractQuery } from "../interface";
+import { IBech32Address, IContractQuery } from "../interface";
+import { Bech32Address } from "../primitives";
 
 export class MockQuery implements IContractQuery {
-    contract: string = "";
-    function: string = "";
-    arguments: string[] = [];
+    caller: IBech32Address = new Bech32Address("");
+    address: IBech32Address = new Bech32Address("");
+    func: string = "";
+    args: string[] = [];
     value: string = "";
-    caller: string = "";
 
     constructor(init?: Partial<MockQuery>) {
         Object.assign(this, init);
     }
 
-    toHttpRequest() {
-        return {
-            "scAddress": this.contract,
-            "funcName": this.function,
-            "args": this.arguments,
-            "value": this.value,
-            "caller": this.caller
-        };
+    getEncodedArguments(): string[] {
+        return this.args;
     }
 }

From 7768419bbd732496384ee6f31e299c6b19f7a8e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Sun, 10 Apr 2022 19:05:38 +0300
Subject: [PATCH 102/338] Simplification: string instead of IHash.

---
 src-network-providers/apiNetworkProvider.ts   | 17 +++++++--------
 src-network-providers/contractResults.ts      | 16 +++++++-------
 src-network-providers/interface.ts            |  7 +++----
 src-network-providers/primitives.ts           | 14 +------------
 .../providers.dev.net.spec.ts                 | 21 +++++++++----------
 src-network-providers/proxyNetworkProvider.ts | 16 +++++++-------
 src-network-providers/transactionReceipt.ts   |  8 +++----
 src-network-providers/transactions.ts         | 12 +++++------
 8 files changed, 47 insertions(+), 64 deletions(-)

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 20a3c500f..5e7f4eb10 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -1,6 +1,6 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "./accounts";
-import { IBech32Address, IContractQuery, IHash, INetworkProvider, ITransaction, IPagination } from "./interface";
+import { IBech32Address, IContractQuery, INetworkProvider, ITransaction, IPagination } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
 import { NetworkGeneralStatistics } from "./networkGeneralStatistics";
@@ -9,7 +9,7 @@ import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwor
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
-import { Hash, Nonce } from "./primitives";
+import { Nonce } from "./primitives";
 import { ErrContractQuery, ErrNetworkProvider } from "./errors";
 import { defaultAxiosConfig, defaultPagination } from "./config";
 import { NetworkStatus } from "./networkStatus";
@@ -91,22 +91,21 @@ export class ApiNetworkProvider implements INetworkProvider {
         return tokenData;
     }
 
-    async getTransaction(txHash: IHash): Promise<TransactionOnNetwork> {
-        let response = await this.doGetGeneric(`transactions/${txHash.hex()}`);
+    async getTransaction(txHash: string): Promise<TransactionOnNetwork> {
+        let response = await this.doGetGeneric(`transactions/${txHash}`);
         let transaction = TransactionOnNetwork.fromApiHttpResponse(txHash, response);
         return transaction;
     }
 
-    async getTransactionStatus(txHash: IHash): Promise<TransactionStatus> {
-        let response = await this.doGetGeneric(`transactions/${txHash.hex()}?fields=status`);
+    async getTransactionStatus(txHash: string): Promise<TransactionStatus> {
+        let response = await this.doGetGeneric(`transactions/${txHash}?fields=status`);
         let status = new TransactionStatus(response.status);
         return status;
     }
 
-    async sendTransaction(tx: ITransaction): Promise<IHash> {
+    async sendTransaction(tx: ITransaction): Promise<string> {
         let response = await this.doPostGeneric("transactions", tx.toSendable());
-        let hash = new Hash(response.txHash);
-        return hash;
+        return response.txHash;
     }
 
     async simulateTransaction(tx: ITransaction): Promise<any> {
diff --git a/src-network-providers/contractResults.ts b/src-network-providers/contractResults.ts
index a89c56787..6d431fe75 100644
--- a/src-network-providers/contractResults.ts
+++ b/src-network-providers/contractResults.ts
@@ -1,6 +1,6 @@
-import { IBech32Address, IHash } from "./interface";
+import { IBech32Address } from "./interface";
 import { TransactionLogs } from "./transactionLogs";
-import { Bech32Address, Hash } from "./primitives";
+import { Bech32Address } from "./primitives";
 
 export class ContractResults {
     readonly items: ContractResultItem[];
@@ -29,14 +29,14 @@ export class ContractResults {
 }
 
 export class ContractResultItem {
-    hash: IHash = new Hash("");
+    hash: string = "";
     nonce: number = 0;
     value: string = "";
     receiver: IBech32Address = new Bech32Address("");
     sender: IBech32Address = new Bech32Address("");
     data: string = "";
-    previousHash: Hash = new Hash("");
-    originalHash: Hash = new Hash("");
+    previousHash: string = "";
+    originalHash: string = "";
     gasLimit: number = 0;
     gasPrice: number = 0;
     callType: number = 0;
@@ -64,13 +64,13 @@ export class ContractResultItem {
     private static fromHttpResponse(response: any): ContractResultItem {
         let item = new ContractResultItem();
 
-        item.hash = new Hash(response.hash);
+        item.hash = response.hash;
         item.nonce = Number(response.nonce || 0);
         item.value = (response.value || 0).toString();
         item.receiver = new Bech32Address(response.receiver);
         item.sender = new Bech32Address(response.sender);
-        item.previousHash = new Hash(response.prevTxHash);
-        item.originalHash = new Hash(response.originalTxHash);
+        item.previousHash = response.prevTxHash;
+        item.originalHash = response.originalTxHash;
         item.gasLimit = Number(response.gasLimit || 0);
         item.gasPrice = Number(response.gasPrice || 0);
         item.data = response.data || "";
diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index 366b48b35..21d701702 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -61,17 +61,17 @@ export interface INetworkProvider {
     /**
      * Fetches the state of a transaction.
      */
-    getTransaction(txHash: IHash): Promise<TransactionOnNetwork>;
+    getTransaction(txHash: string): Promise<TransactionOnNetwork>;
 
     /**
      * Queries the status of a transaction.
      */
-    getTransactionStatus(txHash: IHash): Promise<TransactionStatus>;
+    getTransactionStatus(txHash: string): Promise<TransactionStatus>;
 
     /**
      * Broadcasts an already-signed transaction.
      */
-    sendTransaction(tx: ITransaction): Promise<IHash>;
+    sendTransaction(tx: ITransaction): Promise<string>;
 
     /**
      * Simulates the processing of an already-signed transaction.
@@ -127,5 +127,4 @@ export interface ITransaction {
     toSendable(): any;
 }
 
-export interface IHash { hex(): string; }
 export interface IBech32Address { bech32(): string; }
diff --git a/src-network-providers/primitives.ts b/src-network-providers/primitives.ts
index a0b45e7f5..a39edfeeb 100644
--- a/src-network-providers/primitives.ts
+++ b/src-network-providers/primitives.ts
@@ -1,16 +1,4 @@
-import { IBech32Address, IHash } from "./interface";
-
-export class Hash implements IHash {
-    private readonly value: string;
-
-    constructor(value: string) {
-        this.value = value;
-    }
-
-    hex(): string {
-        return this.value;
-    }
-}
+import { IBech32Address } from "./interface";
 
 export class Bech32Address implements IBech32Address {
     private readonly value: string;
diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index bcc39c2f0..6f55c7f82 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -1,6 +1,5 @@
 import { assert } from "chai";
 import { INetworkProvider } from "./interface";
-import { Hash } from "./primitives";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 import { Bech32Address, Nonce } from "./primitives";
@@ -104,12 +103,12 @@ describe("test network providers on devnet: Proxy and API", function () {
         this.timeout(20000);
 
         let hashes = [
-            new Hash("a069c663831002651fd542479869cc61103465f3284dace772e7480f81429fa8"),
-            new Hash("de3bc87f3e057e28ea6a625acd6d6d332e24f35ea73e820462b71256c8ecffb7"),
-            new Hash("dbefa0299fe6b2336eb0bc3123fa623845c276e5c6e2a175adf1a562d5e77718"),
-            new Hash("2a8ccbd91b7d9460a86174b5a8d4e6aa073b38674d1ee8107e728980a66f0676"),
+            "a069c663831002651fd542479869cc61103465f3284dace772e7480f81429fa8",
+            "de3bc87f3e057e28ea6a625acd6d6d332e24f35ea73e820462b71256c8ecffb7",
+            "dbefa0299fe6b2336eb0bc3123fa623845c276e5c6e2a175adf1a562d5e77718",
+            "2a8ccbd91b7d9460a86174b5a8d4e6aa073b38674d1ee8107e728980a66f0676",
             // TODO: uncomment after fix (SCR missing on API)
-            // new TransactionHash("be7914b1eb4c6bd352ba1d86991959b443e446e0ad49fb796be3495c287b2472")
+            // "be7914b1eb4c6bd352ba1d86991959b443e446e0ad49fb796be3495c287b2472"
         ];
 
         for (const hash of hashes) {
@@ -143,11 +142,11 @@ describe("test network providers on devnet: Proxy and API", function () {
         this.timeout(20000);
 
         let hashes = [
-            new Hash("a069c663831002651fd542479869cc61103465f3284dace772e7480f81429fa8"),
-            new Hash("de3bc87f3e057e28ea6a625acd6d6d332e24f35ea73e820462b71256c8ecffb7"),
-            new Hash("dbefa0299fe6b2336eb0bc3123fa623845c276e5c6e2a175adf1a562d5e77718"),
-            new Hash("2a8ccbd91b7d9460a86174b5a8d4e6aa073b38674d1ee8107e728980a66f0676"),
-            new Hash("be7914b1eb4c6bd352ba1d86991959b443e446e0ad49fb796be3495c287b2472")
+            "a069c663831002651fd542479869cc61103465f3284dace772e7480f81429fa8",
+            "de3bc87f3e057e28ea6a625acd6d6d332e24f35ea73e820462b71256c8ecffb7",
+            "dbefa0299fe6b2336eb0bc3123fa623845c276e5c6e2a175adf1a562d5e77718",
+            "2a8ccbd91b7d9460a86174b5a8d4e6aa073b38674d1ee8107e728980a66f0676",
+            "be7914b1eb4c6bd352ba1d86991959b443e446e0ad49fb796be3495c287b2472"
         ];
 
         for (const hash of hashes) {
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index 8b0dac69f..ba7c62338 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -1,13 +1,12 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "./accounts";
-import { IBech32Address, IContractQuery, IHash, INetworkProvider, IPagination, ITransaction } from "./interface";
+import { IBech32Address, IContractQuery, INetworkProvider, IPagination, ITransaction } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
 import { NetworkGeneralStatistics } from "./networkGeneralStatistics";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
-import { Hash } from "./primitives";
 import { ErrContractQuery, ErrNetworkProvider } from "./errors";
 import { defaultAxiosConfig } from "./config";
 import { NetworkStatus } from "./networkStatus";
@@ -93,23 +92,22 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokenData;
     }
 
-    async getTransaction(txHash: IHash): Promise<TransactionOnNetwork> {
-        let url = this.buildUrlWithQueryParameters(`transaction/${txHash.hex()}`, { withResults: "true" });
+    async getTransaction(txHash: string): Promise<TransactionOnNetwork> {
+        let url = this.buildUrlWithQueryParameters(`transaction/${txHash}`, { withResults: "true" });
         let response = await this.doGetGeneric(url);
         let transaction = TransactionOnNetwork.fromProxyHttpResponse(txHash, response.transaction);
         return transaction;
     }
 
-    async getTransactionStatus(txHash: IHash): Promise<TransactionStatus> {
-        let response = await this.doGetGeneric(`transaction/${txHash.hex()}/status`);
+    async getTransactionStatus(txHash: string): Promise<TransactionStatus> {
+        let response = await this.doGetGeneric(`transaction/${txHash}/status`);
         let status = new TransactionStatus(response.status);
         return status;
     }
 
-    async sendTransaction(tx: ITransaction): Promise<IHash> {
+    async sendTransaction(tx: ITransaction): Promise<string> {
         let response = await this.doPostGeneric("transaction/send", tx.toSendable());
-        let hash = new Hash(response.txHash);
-        return hash;
+        return response.txHash;
     }
 
     async simulateTransaction(tx: ITransaction): Promise<any> {
diff --git a/src-network-providers/transactionReceipt.ts b/src-network-providers/transactionReceipt.ts
index 337bf3847..0cad1476b 100644
--- a/src-network-providers/transactionReceipt.ts
+++ b/src-network-providers/transactionReceipt.ts
@@ -1,11 +1,11 @@
-import { IBech32Address, IHash } from "./interface";
-import { Bech32Address, Hash } from "./primitives";
+import { IBech32Address } from "./interface";
+import { Bech32Address } from "./primitives";
 
 export class TransactionReceipt {
     value: string = "";
     sender: IBech32Address = new Bech32Address("");
     data: string = "";
-    hash: IHash = new Hash("");
+    hash: string = "";
 
     static fromHttpResponse(response: {
         value: string,
@@ -18,7 +18,7 @@ export class TransactionReceipt {
         receipt.value = (response.value || 0).toString();
         receipt.sender = new Bech32Address(response.sender);
         receipt.data = response.data;
-        receipt.hash = new Hash(response.txHash);
+        receipt.hash = response.txHash;
 
         return receipt;
     }
diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
index 728011097..542f708da 100644
--- a/src-network-providers/transactions.ts
+++ b/src-network-providers/transactions.ts
@@ -1,14 +1,14 @@
 import { TransactionStatus } from "./transactionStatus";
 import { ContractResults } from "./contractResults";
-import { Bech32Address, Hash } from "./primitives";
-import { IBech32Address, IHash } from "./interface";
+import { Bech32Address } from "./primitives";
+import { IBech32Address } from "./interface";
 import { TransactionCompletionStrategyOnAPI, TransactionCompletionStrategyOnProxy } from "./transactionCompletionStrategy";
 import { TransactionLogs } from "./transactionLogs";
 import { TransactionReceipt } from "./transactionReceipt";
 
 export class TransactionOnNetwork {
     isCompleted: boolean = false;
-    hash: IHash = new Hash("");
+    hash: string = "";
     type: string = "";
     nonce: number = 0;
     round: number = 0;
@@ -35,7 +35,7 @@ export class TransactionOnNetwork {
         Object.assign(this, init);
     }
 
-    static fromProxyHttpResponse(txHash: IHash, response: any): TransactionOnNetwork {
+    static fromProxyHttpResponse(txHash: string, response: any): TransactionOnNetwork {
         let result = TransactionOnNetwork.fromHttpResponse(txHash, response);
         result.contractResults = ContractResults.fromProxyHttpResponse(response.smartContractResults || []);
         result.isCompleted = new TransactionCompletionStrategyOnProxy().isCompleted(result);
@@ -43,7 +43,7 @@ export class TransactionOnNetwork {
         return result;
     }
 
-    static fromApiHttpResponse(txHash: IHash, response: any): TransactionOnNetwork {
+    static fromApiHttpResponse(txHash: string, response: any): TransactionOnNetwork {
         let result = TransactionOnNetwork.fromHttpResponse(txHash, response);
         result.contractResults = ContractResults.fromApiHttpResponse(response.results || []);
         result.isCompleted = new TransactionCompletionStrategyOnAPI().isCompleted(result);
@@ -51,7 +51,7 @@ export class TransactionOnNetwork {
         return result;
     }
 
-    private static fromHttpResponse(txHash: IHash, response: any): TransactionOnNetwork {
+    private static fromHttpResponse(txHash: string, response: any): TransactionOnNetwork {
         let result = new TransactionOnNetwork();
 
         result.hash = txHash;

From a6d1310ee75de759d92b568dbb768517b0150487 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Tue, 12 Apr 2022 16:15:07 +0300
Subject: [PATCH 103/338] Account.balance as bigNumber.

---
 src-network-providers/accounts.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src-network-providers/accounts.ts b/src-network-providers/accounts.ts
index 94a2dcab6..9249bcb85 100644
--- a/src-network-providers/accounts.ts
+++ b/src-network-providers/accounts.ts
@@ -1,3 +1,4 @@
+import BigNumber from "bignumber.js";
 import { IBech32Address } from "./interface";
 import { Bech32Address } from "./primitives";
 
@@ -7,7 +8,7 @@ import { Bech32Address } from "./primitives";
  export class AccountOnNetwork {
     address: IBech32Address = new Bech32Address("");
     nonce: number = 0;
-    balance: string = "";
+    balance: BigNumber = new BigNumber(0);
     code: string = "";
     userName: string = "";
 
@@ -20,7 +21,7 @@ import { Bech32Address } from "./primitives";
 
         result.address = new Bech32Address(payload["address"] || 0);
         result.nonce = Number(payload["nonce"] || 0);
-        result.balance = (payload["balance"] || 0).toString();
+        result.balance = new BigNumber(payload["balance"] || 0);
         result.code = payload["code"] || "";
         result.userName = payload["username"] || "";
 

From 2cc0af34548e3460e580200ca40a7bf80e161f2e Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Tue, 12 Apr 2022 21:52:56 +0300
Subject: [PATCH 104/338] Rename class (Bech32Address to Address).

---
 src-network-providers/accounts.ts              |  8 ++++----
 src-network-providers/apiNetworkProvider.ts    | 12 ++++++------
 src-network-providers/constants.ts             |  1 +
 src-network-providers/contractResults.ts       | 12 ++++++------
 src-network-providers/interface.ts             | 18 +++++++++---------
 src-network-providers/primitives.ts            | 16 ++++++++++++++--
 .../providers.dev.net.spec.ts                  | 16 ++++++++--------
 src-network-providers/proxyNetworkProvider.ts  | 12 ++++++------
 .../testscommon/dummyQuery.ts                  |  8 ++++----
 src-network-providers/tokenDefinitions.ts      | 12 ++++++------
 src-network-providers/tokens.ts                |  8 ++++----
 src-network-providers/transactionEvents.ts     |  8 ++++----
 src-network-providers/transactionLogs.ts       |  8 ++++----
 src-network-providers/transactionReceipt.ts    |  8 ++++----
 src-network-providers/transactions.ts          | 12 ++++++------
 15 files changed, 86 insertions(+), 73 deletions(-)

diff --git a/src-network-providers/accounts.ts b/src-network-providers/accounts.ts
index 9249bcb85..637248ac5 100644
--- a/src-network-providers/accounts.ts
+++ b/src-network-providers/accounts.ts
@@ -1,12 +1,12 @@
 import BigNumber from "bignumber.js";
-import { IBech32Address } from "./interface";
-import { Bech32Address } from "./primitives";
+import { IAddress } from "./interface";
+import { Address } from "./primitives";
 
 /**
  * A plain view of an account, as queried from the Network.
  */
  export class AccountOnNetwork {
-    address: IBech32Address = new Bech32Address("");
+    address: IAddress = new Address("");
     nonce: number = 0;
     balance: BigNumber = new BigNumber(0);
     code: string = "";
@@ -19,7 +19,7 @@ import { Bech32Address } from "./primitives";
     static fromHttpResponse(payload: any): AccountOnNetwork {
         let result = new AccountOnNetwork();
 
-        result.address = new Bech32Address(payload["address"] || 0);
+        result.address = new Address(payload["address"] || 0);
         result.nonce = Number(payload["nonce"] || 0);
         result.balance = new BigNumber(payload["balance"] || 0);
         result.code = payload["code"] || "";
diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 5e7f4eb10..dea1f7c3e 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -1,6 +1,6 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "./accounts";
-import { IBech32Address, IContractQuery, INetworkProvider, ITransaction, IPagination } from "./interface";
+import { IAddress, IContractQuery, INetworkProvider, ITransaction, IPagination } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
 import { NetworkGeneralStatistics } from "./networkGeneralStatistics";
@@ -48,13 +48,13 @@ export class ApiNetworkProvider implements INetworkProvider {
         return stats;
     }
 
-    async getAccount(address: IBech32Address): Promise<AccountOnNetwork> {
+    async getAccount(address: IAddress): Promise<AccountOnNetwork> {
         let response = await this.doGetGeneric(`accounts/${address.bech32()}`);
         let account = AccountOnNetwork.fromHttpResponse(response);
         return account;
     }
 
-    async getFungibleTokensOfAccount(address: IBech32Address, pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]> {
+    async getFungibleTokensOfAccount(address: IAddress, pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]> {
         pagination = pagination || defaultPagination;
 
         let url = `accounts/${address.bech32()}/tokens?${this.buildPaginationParams(pagination)}`;
@@ -66,7 +66,7 @@ export class ApiNetworkProvider implements INetworkProvider {
         return tokens;
     }
 
-    async getNonFungibleTokensOfAccount(address: IBech32Address, pagination?: IPagination): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
+    async getNonFungibleTokensOfAccount(address: IAddress, pagination?: IPagination): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
         pagination = pagination || defaultPagination;
 
         let url = `accounts/${address.bech32()}/nfts?${this.buildPaginationParams(pagination)}`;
@@ -78,13 +78,13 @@ export class ApiNetworkProvider implements INetworkProvider {
         return tokens;
     }
 
-    async getFungibleTokenOfAccount(address: IBech32Address, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork> {
+    async getFungibleTokenOfAccount(address: IAddress, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`accounts/${address.bech32()}/tokens/${tokenIdentifier}`);
         let tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response);
         return tokenData;
     }
 
-    async getNonFungibleTokenOfAccount(address: IBech32Address, collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork> {
+    async getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork> {
         let nonceAsHex = new Nonce(nonce).hex();
         let response = await this.doGetGeneric(`accounts/${address.bech32()}/nfts/${collection}-${nonceAsHex}`);
         let tokenData = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response);
diff --git a/src-network-providers/constants.ts b/src-network-providers/constants.ts
index f4ab70a0a..c79f74a62 100644
--- a/src-network-providers/constants.ts
+++ b/src-network-providers/constants.ts
@@ -1,3 +1,4 @@
 import BigNumber from "bignumber.js";
+import { Address } from "./primitives";
 
 export const MaxUint64AsBigNumber = new BigNumber("18446744073709551615");
diff --git a/src-network-providers/contractResults.ts b/src-network-providers/contractResults.ts
index 5d2debf28..37046fb0d 100644
--- a/src-network-providers/contractResults.ts
+++ b/src-network-providers/contractResults.ts
@@ -1,6 +1,6 @@
-import { IBech32Address } from "./interface";
+import { IAddress } from "./interface";
 import { TransactionLogs } from "./transactionLogs";
-import { Bech32Address } from "./primitives";
+import { Address } from "./primitives";
 
 export class ContractResults {
     readonly items: ContractResultItem[];
@@ -28,8 +28,8 @@ export class ContractResultItem {
     hash: string = "";
     nonce: number = 0;
     value: string = "";
-    receiver: IBech32Address = new Bech32Address("");
-    sender: IBech32Address = new Bech32Address("");
+    receiver: IAddress = new Address("");
+    sender: IAddress = new Address("");
     data: string = "";
     previousHash: string = "";
     originalHash: string = "";
@@ -63,8 +63,8 @@ export class ContractResultItem {
         item.hash = response.hash;
         item.nonce = Number(response.nonce || 0);
         item.value = (response.value || 0).toString();
-        item.receiver = new Bech32Address(response.receiver);
-        item.sender = new Bech32Address(response.sender);
+        item.receiver = new Address(response.receiver);
+        item.sender = new Address(response.sender);
         item.previousHash = response.prevTxHash;
         item.originalHash = response.originalTxHash;
         item.gasLimit = Number(response.gasLimit || 0);
diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index 21d701702..4d44c32e2 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -36,27 +36,27 @@ export interface INetworkProvider {
     /**
      * Fetches the state of an account.
      */
-    getAccount(address: IBech32Address): Promise<AccountOnNetwork>;
+    getAccount(address: IAddress): Promise<AccountOnNetwork>;
 
     /**
      * Fetches data about the fungible tokens held by an account.
      */
-    getFungibleTokensOfAccount(address: IBech32Address, pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]>;
+    getFungibleTokensOfAccount(address: IAddress, pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]>;
 
     /**
      * Fetches data about the non-fungible tokens held by account.
      */
-    getNonFungibleTokensOfAccount(address: IBech32Address, pagination?: IPagination): Promise<NonFungibleTokenOfAccountOnNetwork[]>;
+    getNonFungibleTokensOfAccount(address: IAddress, pagination?: IPagination): Promise<NonFungibleTokenOfAccountOnNetwork[]>;
 
     /**
      * Fetches data about a specific fungible token held by an account.
      */
-    getFungibleTokenOfAccount(address: IBech32Address, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork>;
+    getFungibleTokenOfAccount(address: IAddress, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork>;
 
     /**
      * Fetches data about a specific non-fungible token (instance) held by an account.
      */
-    getNonFungibleTokenOfAccount(address: IBech32Address, collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork>;
+    getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork>;
 
     /**
      * Fetches the state of a transaction.
@@ -111,10 +111,10 @@ export interface INetworkProvider {
 }
 
 export interface IContractQuery {
-    address: IBech32Address;
-    caller: IBech32Address;
+    address: IAddress;
+    caller?: IAddress;
     func: { toString(): string; };
-    value: { toString(): string; };
+    value?: { toString(): string; };
     getEncodedArguments(): string[];
 }
 
@@ -127,4 +127,4 @@ export interface ITransaction {
     toSendable(): any;
 }
 
-export interface IBech32Address { bech32(): string; }
+export interface IAddress { bech32(): string; }
diff --git a/src-network-providers/primitives.ts b/src-network-providers/primitives.ts
index a39edfeeb..fecbbace0 100644
--- a/src-network-providers/primitives.ts
+++ b/src-network-providers/primitives.ts
@@ -1,12 +1,24 @@
-import { IBech32Address } from "./interface";
+import * as bech32 from "bech32";
+import { IAddress } from "./interface";
 
-export class Bech32Address implements IBech32Address {
+/**
+ * The human-readable-part of the bech32 addresses.
+ */
+const HRP = "erd";
+
+export class Address implements IAddress {
     private readonly value: string;
 
     constructor(value: string) {
         this.value = value;
     }
 
+    static fromPubkey(pubkey: Buffer): IAddress {
+        let words = bech32.toWords(pubkey);
+        let address = bech32.encode(HRP, words);
+        return new Address(address);
+    }
+
     bech32(): string {
         return this.value;
     }
diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 6f55c7f82..c9a9f48d4 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -2,16 +2,16 @@ import { assert } from "chai";
 import { INetworkProvider } from "./interface";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
-import { Bech32Address, Nonce } from "./primitives";
+import { Address } from "./primitives";
 import { MockQuery } from "./testscommon/dummyQuery";
 import { ApiNetworkProvider } from "./apiNetworkProvider";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 
 describe("test network providers on devnet: Proxy and API", function () {
-    let alice = new Bech32Address("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
-    let bob = new Bech32Address("erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx");
-    let carol = new Bech32Address("erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
-    let dan = new Bech32Address("erd1kyaqzaprcdnv4luvanah0gfxzzsnpaygsy6pytrexll2urtd05ts9vegu7");
+    let alice = new Address("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
+    let bob = new Address("erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx");
+    let carol = new Address("erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
+    let dan = new Address("erd1kyaqzaprcdnv4luvanah0gfxzzsnpaygsy6pytrexll2urtd05ts9vegu7");
 
     let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 10000 });
     let proxyProvider: INetworkProvider = new ProxyNetworkProvider("https://devnet-gateway.elrond.com", { timeout: 10000 });
@@ -210,7 +210,7 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         // Query: get sum (of adder contract)
         let query = new MockQuery({
-            address: new Bech32Address("erd1qqqqqqqqqqqqqpgquykqja5c4v33zdmnwglj3jphqwrelzdn396qlc9g33"),
+            address: new Address("erd1qqqqqqqqqqqqqpgquykqja5c4v33zdmnwglj3jphqwrelzdn396qlc9g33"),
             func: "getSum"
         });
 
@@ -226,7 +226,7 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         // Query: increment counter
         query = new MockQuery({
-            address: new Bech32Address("erd1qqqqqqqqqqqqqpgqzeq07xvhs5g7cg4ama85upaqarrcgu49396q0gz4yf"),
+            address: new Address("erd1qqqqqqqqqqqqqpgqzeq07xvhs5g7cg4ama85upaqarrcgu49396q0gz4yf"),
             func: "increment",
             args: []
         });
@@ -247,7 +247,7 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         // Query: issue ESDT
         let query = new MockQuery({
-            address: new Bech32Address("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u"),
+            address: new Address("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u"),
             func: "issue",
             value: "50000000000000000",
             args: [
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index ba7c62338..f7b3d579d 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -1,6 +1,6 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "./accounts";
-import { IBech32Address, IContractQuery, INetworkProvider, IPagination, ITransaction } from "./interface";
+import { IAddress, IContractQuery, INetworkProvider, IPagination, ITransaction } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkStake } from "./networkStake";
 import { NetworkGeneralStatistics } from "./networkGeneralStatistics";
@@ -48,13 +48,13 @@ export class ProxyNetworkProvider implements INetworkProvider {
         throw new Error("Method not implemented.");
     }
 
-    async getAccount(address: IBech32Address): Promise<AccountOnNetwork> {
+    async getAccount(address: IAddress): Promise<AccountOnNetwork> {
         let response = await this.doGetGeneric(`address/${address.bech32()}`);
         let account = AccountOnNetwork.fromHttpResponse(response.account);
         return account;
     }
 
-    async getFungibleTokensOfAccount(address: IBech32Address, _pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]> {
+    async getFungibleTokensOfAccount(address: IAddress, _pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]> {
         let url = `address/${address.bech32()}/esdt`;
         let response = await this.doGetGeneric(url);
         let responseItems: any[] = Object.values(response.esdts);
@@ -67,7 +67,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokens;
     }
 
-    async getNonFungibleTokensOfAccount(address: IBech32Address, _pagination?: IPagination): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
+    async getNonFungibleTokensOfAccount(address: IAddress, _pagination?: IPagination): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
         let url = `address/${address.bech32()}/esdt`;
         let response = await this.doGetGeneric(url);
         let responseItems: any[] = Object.values(response.esdts);
@@ -80,13 +80,13 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokens;
     }
 
-    async getFungibleTokenOfAccount(address: IBech32Address, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork> {
+    async getFungibleTokenOfAccount(address: IAddress, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`address/${address.bech32()}/esdt/${tokenIdentifier}`);
         let tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response.tokenData);
         return tokenData;
     }
 
-    async getNonFungibleTokenOfAccount(address: IBech32Address, collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork> {
+    async getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`address/${address.bech32()}/nft/${collection}/nonce/${nonce.valueOf()}`);
         let tokenData = NonFungibleTokenOfAccountOnNetwork.fromProxyHttpResponseByNonce(response.tokenData);
         return tokenData;
diff --git a/src-network-providers/testscommon/dummyQuery.ts b/src-network-providers/testscommon/dummyQuery.ts
index 437ac4b28..a0cdac9c0 100644
--- a/src-network-providers/testscommon/dummyQuery.ts
+++ b/src-network-providers/testscommon/dummyQuery.ts
@@ -1,9 +1,9 @@
-import { IBech32Address, IContractQuery } from "../interface";
-import { Bech32Address } from "../primitives";
+import { IAddress, IContractQuery } from "../interface";
+import { Address } from "../primitives";
 
 export class MockQuery implements IContractQuery {
-    caller: IBech32Address = new Bech32Address("");
-    address: IBech32Address = new Bech32Address("");
+    caller: IAddress = new Address("");
+    address: IAddress = new Address("");
     func: string = "";
     args: string[] = [];
     value: string = "";
diff --git a/src-network-providers/tokenDefinitions.ts b/src-network-providers/tokenDefinitions.ts
index 9f6261d91..0a7f156d4 100644
--- a/src-network-providers/tokenDefinitions.ts
+++ b/src-network-providers/tokenDefinitions.ts
@@ -1,12 +1,12 @@
 import { BigNumber } from "bignumber.js";
-import { Bech32Address } from "./primitives";
-import { IBech32Address } from "./interface";
+import { Address } from "./primitives";
+import { IAddress } from "./interface";
 
 export class DefinitionOfFungibleTokenOnNetwork {
     identifier: string = "";
     name: string = "";
     ticker: string = "";
-    owner: IBech32Address = new Bech32Address("");
+    owner: IAddress = new Address("");
     decimals: number = 0;
     supply: BigNumber = new BigNumber(0);
     isPaused: boolean = false;
@@ -25,7 +25,7 @@ export class DefinitionOfFungibleTokenOnNetwork {
         result.identifier = payload.identifier || "";
         result.name = payload.name || "";
         result.ticker = payload.ticker || "";
-        result.owner = new Bech32Address(payload.owner || "");
+        result.owner = new Address(payload.owner || "");
         result.decimals = payload.decimals || 0;
         result.supply = new BigNumber(payload.supply || "0");
         result.isPaused = payload.isPaused || false;
@@ -47,7 +47,7 @@ export class DefinitionOfTokenCollectionOnNetwork {
     type: string = "";
     name: string = "";
     ticker: string = "";
-    owner: IBech32Address = new Bech32Address("");
+    owner: IAddress = new Address("");
     decimals: number = 0;
     canPause: boolean = false;
     canFreeze: boolean = false;
@@ -61,7 +61,7 @@ export class DefinitionOfTokenCollectionOnNetwork {
         result.type = payload.type || "";
         result.name = payload.name || "";
         result.ticker = payload.ticker || "";
-        result.owner = new Bech32Address(payload.owner || "");
+        result.owner = new Address(payload.owner || "");
         result.decimals = payload.decimals || 0;
         result.canPause = payload.canPause || false;
         result.canFreeze = payload.canFreeze || false;
diff --git a/src-network-providers/tokens.ts b/src-network-providers/tokens.ts
index d23394f28..5a5745074 100644
--- a/src-network-providers/tokens.ts
+++ b/src-network-providers/tokens.ts
@@ -1,6 +1,6 @@
 import { BigNumber } from "bignumber.js";
-import { Bech32Address, Nonce } from "./primitives";
-import { IBech32Address } from "./interface";
+import { Address, Nonce } from "./primitives";
+import { IAddress } from "./interface";
 
 export class FungibleTokenOfAccountOnNetwork {
     identifier: string = "";
@@ -24,7 +24,7 @@ export class NonFungibleTokenOfAccountOnNetwork {
     nonce: number = 0;
     type: string = "";
     name: string = "";
-    creator: IBech32Address = new Bech32Address("");
+    creator: IAddress = new Address("");
     supply: BigNumber = new BigNumber(0);
     decimals: number = 0;
     royalties: BigNumber = new BigNumber(0);
@@ -73,7 +73,7 @@ export class NonFungibleTokenOfAccountOnNetwork {
         result.nonce = payload.nonce || 0;
         result.type = payload.type || "";
         result.name = payload.name || "";
-        result.creator = new Bech32Address(payload.creator || "");
+        result.creator = new Address(payload.creator || "");
         result.decimals = Number(payload.decimals || 0);
         result.supply = new BigNumber(payload.balance || 1);
         result.royalties = new BigNumber(payload.royalties || 0);
diff --git a/src-network-providers/transactionEvents.ts b/src-network-providers/transactionEvents.ts
index d0505ce84..780a10340 100644
--- a/src-network-providers/transactionEvents.ts
+++ b/src-network-providers/transactionEvents.ts
@@ -1,8 +1,8 @@
-import { IBech32Address } from "./interface";
-import { Bech32Address } from "./primitives";
+import { IAddress } from "./interface";
+import { Address } from "./primitives";
 
 export class TransactionEvent {
-    address: IBech32Address = new Bech32Address("");
+    address: IAddress = new Address("");
     identifier: string = "";
     topics: TransactionEventTopic[] = [];
     data: string = "";
@@ -18,7 +18,7 @@ export class TransactionEvent {
         data: string
     }): TransactionEvent {
         let result = new TransactionEvent();
-        result.address = new Bech32Address(responsePart.address);
+        result.address = new Address(responsePart.address);
         result.identifier = responsePart.identifier || "";
         result.topics = (responsePart.topics || []).map(topic => new TransactionEventTopic(topic));
         result.data = Buffer.from(responsePart.data || "", "base64").toString();
diff --git a/src-network-providers/transactionLogs.ts b/src-network-providers/transactionLogs.ts
index a7733efbe..9e7a6ef18 100644
--- a/src-network-providers/transactionLogs.ts
+++ b/src-network-providers/transactionLogs.ts
@@ -1,10 +1,10 @@
 import { ErrUnexpectedCondition } from "./errors";
-import { IBech32Address } from "./interface";
-import { Bech32Address } from "./primitives";
+import { IAddress } from "./interface";
+import { Address } from "./primitives";
 import { TransactionEvent } from "./transactionEvents";
 
 export class TransactionLogs {
-    address: IBech32Address = new Bech32Address("");
+    address: IAddress = new Address("");
     events: TransactionEvent[] = [];
 
     constructor(init?: Partial<TransactionLogs>) {
@@ -13,7 +13,7 @@ export class TransactionLogs {
 
     static fromHttpResponse(logs: any): TransactionLogs {
         let result = new TransactionLogs();
-        result.address = new Bech32Address(logs.address);
+        result.address = new Address(logs.address);
         result.events = (logs.events || []).map((event: any) => TransactionEvent.fromHttpResponse(event));
         
         return result;
diff --git a/src-network-providers/transactionReceipt.ts b/src-network-providers/transactionReceipt.ts
index 0cad1476b..07e72fb56 100644
--- a/src-network-providers/transactionReceipt.ts
+++ b/src-network-providers/transactionReceipt.ts
@@ -1,9 +1,9 @@
-import { IBech32Address } from "./interface";
-import { Bech32Address } from "./primitives";
+import { IAddress } from "./interface";
+import { Address } from "./primitives";
 
 export class TransactionReceipt {
     value: string = "";
-    sender: IBech32Address = new Bech32Address("");
+    sender: IAddress = new Address("");
     data: string = "";
     hash: string = "";
 
@@ -16,7 +16,7 @@ export class TransactionReceipt {
         let receipt = new TransactionReceipt();
 
         receipt.value = (response.value || 0).toString();
-        receipt.sender = new Bech32Address(response.sender);
+        receipt.sender = new Address(response.sender);
         receipt.data = response.data;
         receipt.hash = response.txHash;
 
diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
index 37ce8061c..95bee527c 100644
--- a/src-network-providers/transactions.ts
+++ b/src-network-providers/transactions.ts
@@ -1,7 +1,7 @@
 import { TransactionStatus } from "./transactionStatus";
 import { ContractResults } from "./contractResults";
-import { Bech32Address } from "./primitives";
-import { IBech32Address } from "./interface";
+import { Address } from "./primitives";
+import { IAddress } from "./interface";
 import { TransactionCompletionStrategyOnAPI, TransactionCompletionStrategyOnProxy } from "./transactionCompletionStrategy";
 import { TransactionLogs } from "./transactionLogs";
 import { TransactionReceipt } from "./transactionReceipt";
@@ -14,8 +14,8 @@ export class TransactionOnNetwork {
     round: number = 0;
     epoch: number = 0;
     value: string = "";
-    receiver: IBech32Address = new Bech32Address("");
-    sender: IBech32Address = new Bech32Address("");
+    receiver: IAddress = new Address("");
+    sender: IAddress = new Address("");
     gasLimit: number = 0;
     gasPrice: number = 0;
     data: Buffer = Buffer.from([]);
@@ -60,8 +60,8 @@ export class TransactionOnNetwork {
         result.round = response.round;
         result.epoch = response.epoch || 0;
         result.value = (response.value || 0).toString();
-        result.sender = new Bech32Address(response.sender);
-        result.receiver = new Bech32Address(response.receiver);
+        result.sender = new Address(response.sender);
+        result.receiver = new Address(response.receiver);
         result.gasPrice = response.gasPrice || 0;
         result.gasLimit = response.gasLimit || 0;
         result.data = Buffer.from(response.data || "", "base64");

From 86aa8072931dc4a5e9e32ef8ada23c53157ec8af Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Tue, 12 Apr 2022 21:53:49 +0300
Subject: [PATCH 105/338] Implement
 ProxyNetworkProvider.getDefinitionOfFungibleToken().

---
 src-network-providers/constants.ts            |  1 +
 src-network-providers/contractQueryRequest.ts |  4 +-
 .../providers.dev.net.spec.ts                 |  6 +--
 src-network-providers/proxyNetworkProvider.ts | 17 +++++--
 src-network-providers/tokenDefinitions.ts     | 49 ++++++++++++++++++-
 5 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/src-network-providers/constants.ts b/src-network-providers/constants.ts
index c79f74a62..932f9595c 100644
--- a/src-network-providers/constants.ts
+++ b/src-network-providers/constants.ts
@@ -2,3 +2,4 @@ import BigNumber from "bignumber.js";
 import { Address } from "./primitives";
 
 export const MaxUint64AsBigNumber = new BigNumber("18446744073709551615");
+export const EsdtContractAddress = new Address("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u");
diff --git a/src-network-providers/contractQueryRequest.ts b/src-network-providers/contractQueryRequest.ts
index 69b9cebb1..d64183c9a 100644
--- a/src-network-providers/contractQueryRequest.ts
+++ b/src-network-providers/contractQueryRequest.ts
@@ -11,9 +11,9 @@ export class ContractQueryRequest {
         let request: any = {};
         let query = this.query;
         request.scAddress = query.address.bech32();
-        request.caller = query.caller.bech32() ? query.caller.bech32() : undefined;
+        request.caller = query.caller?.bech32() ? query.caller.bech32() : undefined;
         request.funcName = query.func.toString();
-        request.value = query.value.toString();
+        request.value = query.value ? query.value.toString() : undefined;
         request.args = query.getEncodedArguments();
         
         return request;
diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index c9a9f48d4..7c5e16dda 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -164,12 +164,10 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         for (const identifier of identifiers) {
             let apiResponse = await apiProvider.getDefinitionOfFungibleToken(identifier);
+            let proxyResponse = await proxyProvider.getDefinitionOfFungibleToken(identifier);
 
             assert.equal(apiResponse.identifier, identifier);
-
-            // TODO: Uncomment after implementing the function in the proxy provider.
-            // let proxyResponse = await proxyProvider.getDefinitionOfFungibleToken(identifier);
-            // assert.deepEqual(apiResponse, proxyResponse);
+            assert.deepEqual(apiResponse, proxyResponse);
         }
     });
 
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index f7b3d579d..0fc6d4e5f 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -13,6 +13,7 @@ import { NetworkStatus } from "./networkStatus";
 import { ContractQueryResponse } from "./contractQueryResponse";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 import { ContractQueryRequest } from "./contractQueryRequest";
+import { EsdtContractAddress } from "./constants";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ProxyNetworkProvider implements INetworkProvider {
@@ -125,10 +126,18 @@ export class ProxyNetworkProvider implements INetworkProvider {
         }
     }
 
-    async getDefinitionOfFungibleToken(_tokenIdentifier: string): Promise<DefinitionOfFungibleTokenOnNetwork> {
-        // TODO: Implement wrt.:
-        // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/esdt/esdt.service.ts#L221
-        throw new Error("Method not implemented.");
+    async getDefinitionOfFungibleToken(tokenIdentifier: string): Promise<DefinitionOfFungibleTokenOnNetwork> {
+        let encodedTokenIdentifier = Buffer.from(tokenIdentifier).toString("hex");
+
+        let queryResponse = await this.queryContract({
+            address: EsdtContractAddress,
+            func: "getTokenProperties",
+            getEncodedArguments: () => [encodedTokenIdentifier]
+        });
+
+        let dataParts = queryResponse.getReturnDataParts();
+        let definition = DefinitionOfFungibleTokenOnNetwork.fromResponseOfGetTokenProperties(tokenIdentifier, dataParts);
+        return definition;
     }
 
     async getDefinitionOfTokenCollection(_collection: string): Promise<DefinitionOfTokenCollectionOnNetwork> {
diff --git a/src-network-providers/tokenDefinitions.ts b/src-network-providers/tokenDefinitions.ts
index 0a7f156d4..8e43150fa 100644
--- a/src-network-providers/tokenDefinitions.ts
+++ b/src-network-providers/tokenDefinitions.ts
@@ -36,10 +36,57 @@ export class DefinitionOfFungibleTokenOnNetwork {
         result.canPause = payload.canPause || false;
         result.canFreeze = payload.canFreeze || false;
         result.canWipe = payload.canWipe || false;
-        result.canAddSpecialRoles = payload.canAddSpecialRoles || false;
 
         return result;
     }
+
+    /**
+     * The implementation has been moved here from the following location:
+     * https://github.com/ElrondNetwork/elrond-sdk-erdjs/blob/release/v9/src/token.ts
+     */
+    static fromResponseOfGetTokenProperties(identifier: string, data: Buffer[]): DefinitionOfFungibleTokenOnNetwork {
+        let result = new DefinitionOfFungibleTokenOnNetwork();
+
+        let [tokenName, _tokenType, owner, supply, ...propertiesBuffers] = data;
+        let properties = this.parseTokenProperties(propertiesBuffers);
+
+        result.identifier = identifier;
+        result.name = tokenName.toString();
+        result.ticker = identifier;
+        result.owner = Address.fromPubkey(owner);
+        result.decimals = properties.NumDecimals.toNumber();
+        result.supply = new BigNumber(supply.toString()).shiftedBy(-result.decimals);
+        result.isPaused = properties.IsPaused;
+        result.canUpgrade = properties.CanUpgrade;
+        result.canMint = properties.CanMint;
+        result.canBurn = properties.CanBurn;
+        result.canChangeOwner = properties.CanChangeOwner;
+        result.canPause = properties.CanPause;
+        result.canFreeze = properties.CanFreeze;
+        result.canWipe = properties.CanWipe;
+
+        return result;
+    }
+
+    private static parseTokenProperties(propertiesBuffers: Buffer[]): Record<string, any> {
+        let properties: Record<string, any> = {};
+
+        for (let buffer of propertiesBuffers) {
+            let [name, value] = buffer.toString().split("-");
+            properties[name] = this.parseValueOfTokenProperty(value);
+        }
+
+        return properties;
+    }
+
+    // This only handles booleans and numbers.
+    private static parseValueOfTokenProperty(value: string): any {
+        switch (value) {
+            case "true": return true;
+            case "false": return false;
+            default: return new BigNumber(value);
+        }
+    }
 }
 
 export class DefinitionOfTokenCollectionOnNetwork {

From 9740713b22d20591434a763fa34a5838bcc1831c Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Tue, 12 Apr 2022 22:10:54 +0300
Subject: [PATCH 106/338] Implement
 ProxyNetworkProvider.getDefinitionOfTokenCollection().

---
 .../providers.dev.net.spec.ts                 |  6 +-
 src-network-providers/proxyNetworkProvider.ts | 17 +++--
 src-network-providers/tokenDefinitions.ts     | 71 +++++++++++++------
 3 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 7c5e16dda..3c67faf00 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -178,12 +178,10 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         for (const collection of collections) {
             let apiResponse = await apiProvider.getDefinitionOfTokenCollection(collection);
+            let proxyResponse = await proxyProvider.getDefinitionOfTokenCollection(collection);
 
             assert.equal(apiResponse.collection, collection);
-
-            // TODO: Uncomment after implementing the function in the proxy provider.
-            // let proxyResponse = await proxyProvider.getDefinitionOfTokenCollection(identifier);
-            // assert.deepEqual(apiResponse, proxyResponse);
+            assert.deepEqual(apiResponse, proxyResponse);
         }
     });
 
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index 0fc6d4e5f..ffa47431e 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -140,11 +140,18 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return definition;
     }
 
-    async getDefinitionOfTokenCollection(_collection: string): Promise<DefinitionOfTokenCollectionOnNetwork> {
-        // TODO: Implement wrt.:
-        // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/collections/collection.service.ts
-        // https://docs.elrond.com/developers/esdt-tokens/#get-esdt-token-properties
-        throw new Error("Method not implemented.");
+    async getDefinitionOfTokenCollection(collection: string): Promise<DefinitionOfTokenCollectionOnNetwork> {
+        let encodedCollection = Buffer.from(collection).toString("hex");
+
+        let queryResponse = await this.queryContract({
+            address: EsdtContractAddress,
+            func: "getTokenProperties",
+            getEncodedArguments: () => [encodedCollection]
+        });
+
+        let dataParts = queryResponse.getReturnDataParts();
+        let definition = DefinitionOfTokenCollectionOnNetwork.fromResponseOfGetTokenProperties(collection, dataParts);
+        return definition;
     }
 
     async getNonFungibleToken(_collection: string, _nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork> {
diff --git a/src-network-providers/tokenDefinitions.ts b/src-network-providers/tokenDefinitions.ts
index 8e43150fa..d769f0dd0 100644
--- a/src-network-providers/tokenDefinitions.ts
+++ b/src-network-providers/tokenDefinitions.ts
@@ -48,7 +48,7 @@ export class DefinitionOfFungibleTokenOnNetwork {
         let result = new DefinitionOfFungibleTokenOnNetwork();
 
         let [tokenName, _tokenType, owner, supply, ...propertiesBuffers] = data;
-        let properties = this.parseTokenProperties(propertiesBuffers);
+        let properties = parseTokenProperties(propertiesBuffers);
 
         result.identifier = identifier;
         result.name = tokenName.toString();
@@ -67,26 +67,6 @@ export class DefinitionOfFungibleTokenOnNetwork {
 
         return result;
     }
-
-    private static parseTokenProperties(propertiesBuffers: Buffer[]): Record<string, any> {
-        let properties: Record<string, any> = {};
-
-        for (let buffer of propertiesBuffers) {
-            let [name, value] = buffer.toString().split("-");
-            properties[name] = this.parseValueOfTokenProperty(value);
-        }
-
-        return properties;
-    }
-
-    // This only handles booleans and numbers.
-    private static parseValueOfTokenProperty(value: string): any {
-        switch (value) {
-            case "true": return true;
-            case "false": return false;
-            default: return new BigNumber(value);
-        }
-    }
 }
 
 export class DefinitionOfTokenCollectionOnNetwork {
@@ -99,7 +79,7 @@ export class DefinitionOfTokenCollectionOnNetwork {
     canPause: boolean = false;
     canFreeze: boolean = false;
     canWipe: boolean = false;
-    canTransferRole: boolean = false;
+    canTransferNftCreateRole: boolean = false;
 
     static fromApiHttpResponse(payload: any): DefinitionOfTokenCollectionOnNetwork {
         let result = new DefinitionOfTokenCollectionOnNetwork();
@@ -113,8 +93,53 @@ export class DefinitionOfTokenCollectionOnNetwork {
         result.canPause = payload.canPause || false;
         result.canFreeze = payload.canFreeze || false;
         result.canWipe = payload.canWipe || false;
-        result.canTransferRole = payload.canTransferRole || false;
+        result.canTransferNftCreateRole = payload.canTransferNftCreateRole || false;
 
         return result;
     }
+
+    /**
+     * The implementation has been moved here from the following location:
+     * https://github.com/ElrondNetwork/elrond-sdk-erdjs/blob/release/v9/src/token.ts
+     */
+     static fromResponseOfGetTokenProperties(collection: string, data: Buffer[]): DefinitionOfTokenCollectionOnNetwork {
+        let result = new DefinitionOfTokenCollectionOnNetwork();
+
+        let [tokenName, tokenType, owner, _, __, ...propertiesBuffers] = data;
+        let properties = parseTokenProperties(propertiesBuffers);
+
+        result.collection = collection;
+        result.type = tokenType.toString();
+        result.name = tokenName.toString();
+        result.ticker = collection;
+        result.owner = Address.fromPubkey(owner);
+        result.decimals = properties.NumDecimals.toNumber();
+        result.canPause = properties.CanPause;
+        result.canFreeze = properties.CanFreeze;
+        result.canWipe = properties.CanWipe;
+        result.canTransferNftCreateRole = properties.CanTransferNFTCreateRole;
+
+        return result;
+    }
+}
+
+// Token properties have the following format: {PropertyName}-{PropertyValue}.
+function parseTokenProperties(propertiesBuffers: Buffer[]): Record<string, any> {
+    let properties: Record<string, any> = {};
+
+    for (let buffer of propertiesBuffers) {
+        let [name, value] = buffer.toString().split("-");
+        properties[name] = parseValueOfTokenProperty(value);
+    }
+
+    return properties;
+}
+
+// This only handles booleans and numbers.
+function parseValueOfTokenProperty(value: string): any {
+    switch (value) {
+        case "true": return true;
+        case "false": return false;
+        default: return new BigNumber(value);
+    }
 }

From 64634c9096b9cf7379ae31025c69a47ce50b9b45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?=
 <andreibancioiu@users.noreply.github.com>
Date: Wed, 13 Apr 2022 11:18:10 +0300
Subject: [PATCH 107/338] Update src/accounts.ts

Co-authored-by: Claudiu-Marcel Bruda <claudiu725@yahoo.com>
---
 src-network-providers/accounts.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-network-providers/accounts.ts b/src-network-providers/accounts.ts
index 637248ac5..4a2958eae 100644
--- a/src-network-providers/accounts.ts
+++ b/src-network-providers/accounts.ts
@@ -19,7 +19,7 @@ import { Address } from "./primitives";
     static fromHttpResponse(payload: any): AccountOnNetwork {
         let result = new AccountOnNetwork();
 
-        result.address = new Address(payload["address"] || 0);
+        result.address = new Address(payload["address"] || "");
         result.nonce = Number(payload["nonce"] || 0);
         result.balance = new BigNumber(payload["balance"] || 0);
         result.code = payload["code"] || "";

From 07962a1f69293395f15f07e9a7cb5b421aadb790 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 13 Apr 2022 11:23:04 +0300
Subject: [PATCH 108/338] Fix after review.

---
 src-network-providers/primitives.spec.ts      | 15 +++++++++++
 src-network-providers/proxyNetworkProvider.ts | 27 +++++++++----------
 2 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100644 src-network-providers/primitives.spec.ts

diff --git a/src-network-providers/primitives.spec.ts b/src-network-providers/primitives.spec.ts
new file mode 100644
index 000000000..e8f3a0c35
--- /dev/null
+++ b/src-network-providers/primitives.spec.ts
@@ -0,0 +1,15 @@
+import { assert } from "chai";
+import { Address } from "./primitives";
+
+describe("test primitives", function () {
+    it("should create address from bech32 and from pubkey", async function () {
+        let aliceBech32 = "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th";
+        let bobBech32 = "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx";
+        let alicePubkey = Buffer.from("0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1", "hex");
+        let bobPubkey = Buffer.from("8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8", "hex");
+
+        assert.equal(new Address(aliceBech32).bech32(), Address.fromPubkey(alicePubkey).bech32());
+        assert.equal(new Address(bobBech32).bech32(), Address.fromPubkey(bobPubkey).bech32());
+    });
+});
+
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index ffa47431e..8cce89f1f 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -127,30 +127,27 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     async getDefinitionOfFungibleToken(tokenIdentifier: string): Promise<DefinitionOfFungibleTokenOnNetwork> {
-        let encodedTokenIdentifier = Buffer.from(tokenIdentifier).toString("hex");
-
-        let queryResponse = await this.queryContract({
-            address: EsdtContractAddress,
-            func: "getTokenProperties",
-            getEncodedArguments: () => [encodedTokenIdentifier]
-        });
-
-        let dataParts = queryResponse.getReturnDataParts();
-        let definition = DefinitionOfFungibleTokenOnNetwork.fromResponseOfGetTokenProperties(tokenIdentifier, dataParts);
+        let properties = await this.getTokenProperties(tokenIdentifier);
+        let definition = DefinitionOfFungibleTokenOnNetwork.fromResponseOfGetTokenProperties(tokenIdentifier, properties);
         return definition;
     }
 
-    async getDefinitionOfTokenCollection(collection: string): Promise<DefinitionOfTokenCollectionOnNetwork> {
-        let encodedCollection = Buffer.from(collection).toString("hex");
+    private async getTokenProperties(identifier: string): Promise<Buffer[]> {
+        let encodedIdentifier = Buffer.from(identifier).toString("hex");
 
         let queryResponse = await this.queryContract({
             address: EsdtContractAddress,
             func: "getTokenProperties",
-            getEncodedArguments: () => [encodedCollection]
+            getEncodedArguments: () => [encodedIdentifier]
         });
 
-        let dataParts = queryResponse.getReturnDataParts();
-        let definition = DefinitionOfTokenCollectionOnNetwork.fromResponseOfGetTokenProperties(collection, dataParts);
+        let properties = queryResponse.getReturnDataParts();
+        return properties;
+    }
+
+    async getDefinitionOfTokenCollection(collection: string): Promise<DefinitionOfTokenCollectionOnNetwork> {
+        let properties = await this.getTokenProperties(collection);
+        let definition = DefinitionOfTokenCollectionOnNetwork.fromResponseOfGetTokenProperties(collection, properties);
         return definition;
     }
 

From 1092457241c288799a401069a9c1a9edfe302479 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Mon, 18 Apr 2022 10:50:15 +0300
Subject: [PATCH 109/338] Less console.debug(). Update readme.

---
 src-network-providers/apiNetworkProvider.ts   | 2 --
 src-network-providers/proxyNetworkProvider.ts | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index dea1f7c3e..b02aac8b5 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -157,7 +157,6 @@ export class ApiNetworkProvider implements INetworkProvider {
 
     private async doGet(resourceUrl: string): Promise<any> {
         let url = `${this.url}/${resourceUrl}`;
-        console.debug(`ApiNetworkProvider.doGet(): ${url}`);
 
         try {
             let response = await axios.get(url, this.config);
@@ -169,7 +168,6 @@ export class ApiNetworkProvider implements INetworkProvider {
 
     private async doPost(resourceUrl: string, payload: any): Promise<any> {
         let url = `${this.url}/${resourceUrl}`;
-        console.debug(`ApiNetworkProvider.doPost(): ${url}`);
 
         try {
             let response = await axios.post(url, payload, {
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index 8cce89f1f..9e540f23f 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -167,7 +167,6 @@ export class ProxyNetworkProvider implements INetworkProvider {
 
     private async doGet(resourceUrl: string): Promise<any> {
         let url = `${this.url}/${resourceUrl}`;
-        console.debug(`ProxyNetworkProvider.doGet(): ${url}`);
 
         try {
             let response = await axios.get(url, this.config);
@@ -180,7 +179,6 @@ export class ProxyNetworkProvider implements INetworkProvider {
 
     private async doPost(resourceUrl: string, payload: any): Promise<any> {
         let url = `${this.url}/${resourceUrl}`;
-        console.debug(`ProxyNetworkProvider.doPost(): ${url}`);
 
         try {
             let response = await axios.post(url, payload, {

From 36583fe31811aea2cb4e12f79baadcdf47891c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Fri, 29 Apr 2022 16:31:15 +0300
Subject: [PATCH 110/338] Sketch fix for assets.

---
 src-network-providers/providers.dev.net.spec.ts | 5 ++++-
 src-network-providers/tokenDefinitions.ts       | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 3c67faf00..de2d8ed9b 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -160,12 +160,15 @@ describe("test network providers on devnet: Proxy and API", function () {
     it("should have same response for getDefinitionOfFungibleToken()", async function () {
         this.timeout(10000);
 
-        let identifiers = ["FOO-b6f543", "BAR-c80d29", "COUNTER-b7401d"];
+        let identifiers = ["FOO-b6f543", "BAR-c80d29", "COUNTER-b7401d", "WEB-5d08be"];
 
         for (const identifier of identifiers) {
             let apiResponse = await apiProvider.getDefinitionOfFungibleToken(identifier);
             let proxyResponse = await proxyProvider.getDefinitionOfFungibleToken(identifier);
 
+            // Assets are only present on API response.
+            apiResponse.assets = {};
+
             assert.equal(apiResponse.identifier, identifier);
             assert.deepEqual(apiResponse, proxyResponse);
         }
diff --git a/src-network-providers/tokenDefinitions.ts b/src-network-providers/tokenDefinitions.ts
index d769f0dd0..fab66f39a 100644
--- a/src-network-providers/tokenDefinitions.ts
+++ b/src-network-providers/tokenDefinitions.ts
@@ -18,6 +18,7 @@ export class DefinitionOfFungibleTokenOnNetwork {
     canFreeze: boolean = false;
     canWipe: boolean = false;
     canAddSpecialRoles: boolean = false;
+    assets: Record<string, any> = {}; 
 
     static fromApiHttpResponse(payload: any): DefinitionOfFungibleTokenOnNetwork {
         let result = new DefinitionOfFungibleTokenOnNetwork();
@@ -36,6 +37,7 @@ export class DefinitionOfFungibleTokenOnNetwork {
         result.canPause = payload.canPause || false;
         result.canFreeze = payload.canFreeze || false;
         result.canWipe = payload.canWipe || false;
+        result.assets = payload.assets || {};
 
         return result;
     }

From e35cf0c9e986f403fd5f2d2728a8f33aaa14dfcb Mon Sep 17 00:00:00 2001
From: schimih <schiopumihaialexandru@gmail.com>
Date: Tue, 14 Jun 2022 14:46:01 +0300
Subject: [PATCH 111/338] DefinitionOfTokenCollectionOnNetwork update

---
 src-network-providers/tokenDefinitions.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src-network-providers/tokenDefinitions.ts b/src-network-providers/tokenDefinitions.ts
index d769f0dd0..f5ec9b2d5 100644
--- a/src-network-providers/tokenDefinitions.ts
+++ b/src-network-providers/tokenDefinitions.ts
@@ -1,4 +1,4 @@
-import { BigNumber } from "bignumber.js";
+import BigNumber from "bignumber.js";
 import { Address } from "./primitives";
 import { IAddress } from "./interface";
 
@@ -79,7 +79,11 @@ export class DefinitionOfTokenCollectionOnNetwork {
     canPause: boolean = false;
     canFreeze: boolean = false;
     canWipe: boolean = false;
+    canUpgrade: boolean = false;
+    canChangeOwner: boolean = false;
+    canAddSpecialRoles: boolean = false;
     canTransferNftCreateRole: boolean = false;
+    canCreateMultiShard: boolean = false;
 
     static fromApiHttpResponse(payload: any): DefinitionOfTokenCollectionOnNetwork {
         let result = new DefinitionOfTokenCollectionOnNetwork();
@@ -102,7 +106,7 @@ export class DefinitionOfTokenCollectionOnNetwork {
      * The implementation has been moved here from the following location:
      * https://github.com/ElrondNetwork/elrond-sdk-erdjs/blob/release/v9/src/token.ts
      */
-     static fromResponseOfGetTokenProperties(collection: string, data: Buffer[]): DefinitionOfTokenCollectionOnNetwork {
+    static fromResponseOfGetTokenProperties(collection: string, data: Buffer[]): DefinitionOfTokenCollectionOnNetwork {
         let result = new DefinitionOfTokenCollectionOnNetwork();
 
         let [tokenName, tokenType, owner, _, __, ...propertiesBuffers] = data;
@@ -117,7 +121,11 @@ export class DefinitionOfTokenCollectionOnNetwork {
         result.canPause = properties.CanPause;
         result.canFreeze = properties.CanFreeze;
         result.canWipe = properties.CanWipe;
+        result.canUpgrade = properties.CanUpgrade;
+        result.canChangeOwner = properties.CanChngeOwner;
+        result.canAddSpecialRoles = properties.CandAddSpecialRoles;
         result.canTransferNftCreateRole = properties.CanTransferNFTCreateRole;
+        result.canCreateMultiShard = properties.CanCreateMultiShard;
 
         return result;
     }

From 622fd514ac0c12e3b4b727a654dfaa1a0b88ba1f Mon Sep 17 00:00:00 2001
From: schimih <schiopumihaialexandru@gmail.com>
Date: Tue, 14 Jun 2022 14:52:14 +0300
Subject: [PATCH 112/338] fix

---
 src-network-providers/tokenDefinitions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-network-providers/tokenDefinitions.ts b/src-network-providers/tokenDefinitions.ts
index f5ec9b2d5..dafc6fb81 100644
--- a/src-network-providers/tokenDefinitions.ts
+++ b/src-network-providers/tokenDefinitions.ts
@@ -122,8 +122,8 @@ export class DefinitionOfTokenCollectionOnNetwork {
         result.canFreeze = properties.CanFreeze;
         result.canWipe = properties.CanWipe;
         result.canUpgrade = properties.CanUpgrade;
-        result.canChangeOwner = properties.CanChngeOwner;
-        result.canAddSpecialRoles = properties.CandAddSpecialRoles;
+        result.canChangeOwner = properties.CanChangeOwner;
+        result.canAddSpecialRoles = properties.CanAddSpecialRoles;
         result.canTransferNftCreateRole = properties.CanTransferNFTCreateRole;
         result.canCreateMultiShard = properties.CanCreateMultiShard;
 

From 041788b22830d908f8f7016f936e9bdd4c4337f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Fri, 1 Jul 2022 12:50:36 +0300
Subject: [PATCH 113/338] Fix (remove) logs, bump version.

---
 src-network-providers/apiNetworkProvider.ts   | 1 -
 src-network-providers/proxyNetworkProvider.ts | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index b02aac8b5..ed0f4667c 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -185,7 +185,6 @@ export class ApiNetworkProvider implements INetworkProvider {
 
     private handleApiError(error: any, resourceUrl: string) {
         if (!error.response) {
-            console.warn(error);
             throw new ErrNetworkProvider(resourceUrl, error.toString(), error);
         }
 
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index 9e540f23f..a8e0fff08 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -208,7 +208,6 @@ export class ProxyNetworkProvider implements INetworkProvider {
 
     private handleApiError(error: any, resourceUrl: string) {
         if (!error.response) {
-            console.warn(error);
             throw new ErrNetworkProvider(resourceUrl, error.toString(), error);
         }
 

From 98b8b07594e03fe3d75ab5932f7ba5ba0b56511e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Mon, 18 Jul 2022 19:50:19 +0300
Subject: [PATCH 114/338] Increase default axios timeout.

---
 src-network-providers/config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-network-providers/config.ts b/src-network-providers/config.ts
index a5b2215b4..ffee0f228 100644
--- a/src-network-providers/config.ts
+++ b/src-network-providers/config.ts
@@ -3,7 +3,7 @@ import { IPagination } from "./interface";
 const JSONbig = require("json-bigint");
 
 export const defaultAxiosConfig = {
-    timeout: 1000,
+    timeout: 5000,
     // See: https://github.com/axios/axios/issues/983 regarding transformResponse
     transformResponse: [
         function (data: any) {

From 2ff1f4bddb5736312b24d7a88ecefb9f55369cca Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Thu, 4 Aug 2022 15:22:34 +0300
Subject: [PATCH 115/338] add more infos for tokens api andpoints

---
 src-network-providers/tokens.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src-network-providers/tokens.ts b/src-network-providers/tokens.ts
index 5a5745074..41b138688 100644
--- a/src-network-providers/tokens.ts
+++ b/src-network-providers/tokens.ts
@@ -5,12 +5,14 @@ import { IAddress } from "./interface";
 export class FungibleTokenOfAccountOnNetwork {
     identifier: string = "";
     balance: BigNumber = new BigNumber(0);
+    plainTokenData: any = {};
 
     static fromHttpResponse(payload: any): FungibleTokenOfAccountOnNetwork {
         let result = new FungibleTokenOfAccountOnNetwork();
 
         result.identifier = payload.tokenIdentifier || payload.identifier || "";
         result.balance = new BigNumber(payload.balance || 0);
+        result.plainTokenData = payload;
 
         return result;
     }
@@ -29,6 +31,7 @@ export class NonFungibleTokenOfAccountOnNetwork {
     decimals: number = 0;
     royalties: BigNumber = new BigNumber(0);
     assets: string[] = [];
+    balance: BigNumber = new BigNumber(0);
 
     constructor(init?: Partial<NonFungibleTokenOfAccountOnNetwork>) {
         Object.assign(this, init);
@@ -78,6 +81,7 @@ export class NonFungibleTokenOfAccountOnNetwork {
         result.supply = new BigNumber(payload.balance || 1);
         result.royalties = new BigNumber(payload.royalties || 0);
         result.assets = payload.assets || [];
+        result.balance = new BigNumber(payload.balance || 0);
 
         return result;
     }

From 425155abbfe3ca35a3615b2ca72b222c0b8924a7 Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Tue, 9 Aug 2022 12:39:37 +0300
Subject: [PATCH 116/338] property rename - fix after review

---
 src-network-providers/tokens.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-network-providers/tokens.ts b/src-network-providers/tokens.ts
index 41b138688..31f685b51 100644
--- a/src-network-providers/tokens.ts
+++ b/src-network-providers/tokens.ts
@@ -5,14 +5,14 @@ import { IAddress } from "./interface";
 export class FungibleTokenOfAccountOnNetwork {
     identifier: string = "";
     balance: BigNumber = new BigNumber(0);
-    plainTokenData: any = {};
+    rawResponse: any = {};
 
     static fromHttpResponse(payload: any): FungibleTokenOfAccountOnNetwork {
         let result = new FungibleTokenOfAccountOnNetwork();
 
         result.identifier = payload.tokenIdentifier || payload.identifier || "";
         result.balance = new BigNumber(payload.balance || 0);
-        result.plainTokenData = payload;
+        result.rawResponse = payload;
 
         return result;
     }

From 651277a271aca3376c2bdccd9002a29f5d2fe488 Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Thu, 11 Aug 2022 17:14:16 +0300
Subject: [PATCH 117/338] encryptor partial implementation

---
 src-wallet/crypto/pubkeyEncryptor.ts     | 32 ++++++++++++++++++++
 src-wallet/crypto/x25519EncryptedData.ts | 37 ++++++++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 src-wallet/crypto/pubkeyEncryptor.ts
 create mode 100644 src-wallet/crypto/x25519EncryptedData.ts

diff --git a/src-wallet/crypto/pubkeyEncryptor.ts b/src-wallet/crypto/pubkeyEncryptor.ts
new file mode 100644
index 000000000..2c5bc5ecc
--- /dev/null
+++ b/src-wallet/crypto/pubkeyEncryptor.ts
@@ -0,0 +1,32 @@
+import nacl from "tweetnacl";
+import ed2curve from "ed2curve";
+import {X25519EncryptedData} from "./x25519EncryptedData";
+import {UserPublicKey, UserSecretKey} from "../userKeys";
+
+export class PubkeyEncryptor {
+    public static encrypt(data: Buffer, endUserPubKey: UserPublicKey, authSecretKey: UserSecretKey): X25519EncryptedData {
+        // create a new x225519 keypair that will be used for EDH
+        const edhPair = nacl.sign.keyPair();
+
+        const endUserDHPubKey = ed2curve.convertPublicKey(endUserPubKey.valueOf());
+        if (endUserDHPubKey === null) {
+            throw new Error("Could not convert ed25519 public key to x25519");
+        }
+
+        const nonce = nacl.randomBytes(24);
+        const encryptedMessage = nacl.box(data, nonce, endUserDHPubKey, edhPair.secretKey);
+
+        // Note that the ciphertext is already authenticated for the ephemeral key - but we want it authenticated by
+        //  the an elrond ed25519 key which the user interacts with. A signature over H(ciphertext | edhPubKey)
+        //  would be enough
+
+
+        return new X25519EncryptedData({
+            version: 1,
+            nonce: Buffer.from(nonce).toString('hex'),
+            cipher: "",
+            ciphertext: Buffer.from(encryptedMessage).toString('hex'),
+            mac: '',
+        });
+    }
+}
\ No newline at end of file
diff --git a/src-wallet/crypto/x25519EncryptedData.ts b/src-wallet/crypto/x25519EncryptedData.ts
new file mode 100644
index 000000000..3c16e61a2
--- /dev/null
+++ b/src-wallet/crypto/x25519EncryptedData.ts
@@ -0,0 +1,37 @@
+export class X25519EncryptedData {
+    nonce: string;
+    version: number;
+    cipher: string;
+    ciphertext: string;
+    mac: string;
+
+    constructor(data: Omit<X25519EncryptedData, "toJSON">) {
+        this.nonce = data.nonce;
+        this.version = data.version;
+        this.cipher = data.cipher;
+        this.ciphertext = data.ciphertext;
+        this.mac = data.mac;
+    }
+
+    toJSON(): any {
+        return {
+            version: this.version,
+            nonce: this.nonce,
+            crypto: {
+                ciphertext: this.ciphertext,
+                cipher: this.cipher,
+                mac: this.mac,
+            }
+        };
+    }
+
+    static fromJSON(data: any): X25519EncryptedData {
+        return new X25519EncryptedData({
+            nonce: data.nonce,
+            version: data.version,
+            ciphertext: data.crypto.ciphertext,
+            cipher: data.crypto.cipher,
+            mac: data.crypto.mac,
+        });
+    }
+}
\ No newline at end of file

From bc5089a1ae1ab63e31a3af56032f8f4faff149b5 Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Fri, 12 Aug 2022 15:16:31 +0300
Subject: [PATCH 118/338] finished encryptor

---
 src-wallet/crypto/constants.ts           |  4 ++++
 src-wallet/crypto/pubkeyEncryptor.ts     | 28 +++++++++++++++++-------
 src-wallet/crypto/x25519EncryptedData.ts |  8 +++++++
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src-wallet/crypto/constants.ts b/src-wallet/crypto/constants.ts
index a9fe61a54..a06ffe2cc 100644
--- a/src-wallet/crypto/constants.ts
+++ b/src-wallet/crypto/constants.ts
@@ -3,3 +3,7 @@ export const Version = 4;
 export const CipherAlgorithm = "aes-128-ctr";
 export const DigestAlgorithm = "sha256";
 export const KeyDerivationFunction = "scrypt";
+
+// X25519 public key encryption
+export const PubKeyEncVersion = 1;
+export const PubKeyEncCipher = "x25519-xsalsa20-poly1305";
diff --git a/src-wallet/crypto/pubkeyEncryptor.ts b/src-wallet/crypto/pubkeyEncryptor.ts
index 2c5bc5ecc..78dfd8ad7 100644
--- a/src-wallet/crypto/pubkeyEncryptor.ts
+++ b/src-wallet/crypto/pubkeyEncryptor.ts
@@ -1,32 +1,44 @@
 import nacl from "tweetnacl";
 import ed2curve from "ed2curve";
+import crypto, {sign} from "crypto";
 import {X25519EncryptedData} from "./x25519EncryptedData";
 import {UserPublicKey, UserSecretKey} from "../userKeys";
+import {PubKeyEncCipher, PubKeyEncVersion} from "./constants";
+import {UserSigner} from "../userSigner";
 
 export class PubkeyEncryptor {
-    public static encrypt(data: Buffer, endUserPubKey: UserPublicKey, authSecretKey: UserSecretKey): X25519EncryptedData {
+    public static encrypt(data: Buffer, recipientPubKey: UserPublicKey, authSecretKey: UserSecretKey): X25519EncryptedData {
         // create a new x225519 keypair that will be used for EDH
         const edhPair = nacl.sign.keyPair();
 
-        const endUserDHPubKey = ed2curve.convertPublicKey(endUserPubKey.valueOf());
-        if (endUserDHPubKey === null) {
+        const recipientDHPubKey = ed2curve.convertPublicKey(recipientPubKey.valueOf());
+        if (recipientDHPubKey === null) {
             throw new Error("Could not convert ed25519 public key to x25519");
         }
 
         const nonce = nacl.randomBytes(24);
-        const encryptedMessage = nacl.box(data, nonce, endUserDHPubKey, edhPair.secretKey);
+        const encryptedMessage = nacl.box(data, nonce, recipientDHPubKey, edhPair.secretKey);
 
         // Note that the ciphertext is already authenticated for the ephemeral key - but we want it authenticated by
         //  the an elrond ed25519 key which the user interacts with. A signature over H(ciphertext | edhPubKey)
         //  would be enough
+        const authSig = crypto.createHash('sha256').update(
+            Buffer.concat([encryptedMessage, edhPair.publicKey])
+        ).digest();
 
+        const signature = authSecretKey.sign(authSig);
 
         return new X25519EncryptedData({
-            version: 1,
+            version: PubKeyEncVersion,
             nonce: Buffer.from(nonce).toString('hex'),
-            cipher: "",
+            cipher: PubKeyEncCipher,
             ciphertext: Buffer.from(encryptedMessage).toString('hex'),
-            mac: '',
+            mac: signature.toString('hex'),
+            identities: {
+                recipient: recipientPubKey.hex(),
+                ephemeralPubKey: Buffer.from(edhPair.publicKey).toString('hex'),
+                originatorPubKey: authSecretKey.generatePublicKey().hex(),
+            }
         });
     }
-}
\ No newline at end of file
+}
diff --git a/src-wallet/crypto/x25519EncryptedData.ts b/src-wallet/crypto/x25519EncryptedData.ts
index 3c16e61a2..21ff2cfdb 100644
--- a/src-wallet/crypto/x25519EncryptedData.ts
+++ b/src-wallet/crypto/x25519EncryptedData.ts
@@ -4,6 +4,11 @@ export class X25519EncryptedData {
     cipher: string;
     ciphertext: string;
     mac: string;
+    identities: {
+        recipient: string,
+        ephemeralPubKey: string,
+        originatorPubKey: string,
+    };
 
     constructor(data: Omit<X25519EncryptedData, "toJSON">) {
         this.nonce = data.nonce;
@@ -11,12 +16,14 @@ export class X25519EncryptedData {
         this.cipher = data.cipher;
         this.ciphertext = data.ciphertext;
         this.mac = data.mac;
+        this.identities = data.identities;
     }
 
     toJSON(): any {
         return {
             version: this.version,
             nonce: this.nonce,
+            identities: this.identities,
             crypto: {
                 ciphertext: this.ciphertext,
                 cipher: this.cipher,
@@ -32,6 +39,7 @@ export class X25519EncryptedData {
             ciphertext: data.crypto.ciphertext,
             cipher: data.crypto.cipher,
             mac: data.crypto.mac,
+            identities: data.identities,
         });
     }
 }
\ No newline at end of file

From 04b0d01e282ad85fa6620dedf79fef3eeb788cf3 Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Tue, 16 Aug 2022 13:41:57 +0300
Subject: [PATCH 119/338] add decryptor and basic unit tests

---
 src-wallet/crypto/constants.ts          |  1 +
 src-wallet/crypto/decryptor.ts          |  2 +-
 src-wallet/crypto/encryptor.ts          |  2 +-
 src-wallet/crypto/pubkeyDecryptor.ts    | 36 +++++++++++++++++++++++++
 src-wallet/crypto/pubkeyEncrypt.spec.ts | 35 ++++++++++++++++++++++++
 src-wallet/crypto/pubkeyEncryptor.ts    | 11 ++++----
 6 files changed, 79 insertions(+), 8 deletions(-)
 create mode 100644 src-wallet/crypto/pubkeyDecryptor.ts
 create mode 100644 src-wallet/crypto/pubkeyEncrypt.spec.ts

diff --git a/src-wallet/crypto/constants.ts b/src-wallet/crypto/constants.ts
index a06ffe2cc..07a4ca7c4 100644
--- a/src-wallet/crypto/constants.ts
+++ b/src-wallet/crypto/constants.ts
@@ -6,4 +6,5 @@ export const KeyDerivationFunction = "scrypt";
 
 // X25519 public key encryption
 export const PubKeyEncVersion = 1;
+export const PubKeyEncNonceLength = 24;
 export const PubKeyEncCipher = "x25519-xsalsa20-poly1305";
diff --git a/src-wallet/crypto/decryptor.ts b/src-wallet/crypto/decryptor.ts
index 7d6dbac90..0a42be1b0 100644
--- a/src-wallet/crypto/decryptor.ts
+++ b/src-wallet/crypto/decryptor.ts
@@ -4,7 +4,7 @@ import { DigestAlgorithm } from "./constants";
 import { Err } from "../errors";
 
 export class Decryptor {
-  public static decrypt(data: EncryptedData, password: string): Buffer {
+  static decrypt(data: EncryptedData, password: string): Buffer {
     const kdfparams = data.kdfparams;
     const salt = Buffer.from(data.salt, "hex");
     const iv = Buffer.from(data.iv, "hex");
diff --git a/src-wallet/crypto/encryptor.ts b/src-wallet/crypto/encryptor.ts
index e329dbb9c..33379cbc3 100644
--- a/src-wallet/crypto/encryptor.ts
+++ b/src-wallet/crypto/encryptor.ts
@@ -5,7 +5,7 @@ import { CipherAlgorithm, DigestAlgorithm, Version, KeyDerivationFunction } from
 import {EncryptedData} from "./encryptedData";
 
 export class Encryptor {
-  public static encrypt(data: Buffer, password: string, randomness: Randomness = new Randomness()): EncryptedData {
+  static encrypt(data: Buffer, password: string, randomness: Randomness = new Randomness()): EncryptedData {
     const kdParams = new ScryptKeyDerivationParams();
     const derivedKey = kdParams.generateDerivedKey(Buffer.from(password), randomness.salt);
     const derivedKeyFirstHalf = derivedKey.slice(0, 16);
diff --git a/src-wallet/crypto/pubkeyDecryptor.ts b/src-wallet/crypto/pubkeyDecryptor.ts
new file mode 100644
index 000000000..9806fcfe0
--- /dev/null
+++ b/src-wallet/crypto/pubkeyDecryptor.ts
@@ -0,0 +1,36 @@
+import crypto from "crypto";
+import nacl from "tweetnacl";
+import ed2curve from "ed2curve";
+import {X25519EncryptedData} from "./x25519EncryptedData";
+import {UserPublicKey, UserSecretKey} from "../userKeys";
+
+export class PubkeyDecryptor {
+    static decrypt(data: X25519EncryptedData, decryptorSecretKey: UserSecretKey): Buffer {
+        const ciphertext = Buffer.from(data.ciphertext, 'hex');
+        const edhPubKey = Buffer.from(data.identities.ephemeralPubKey, 'hex');
+        const originatorPubKeyBuffer = Buffer.from(data.identities.originatorPubKey, 'hex');
+        const originatorPubKey = new UserPublicKey(originatorPubKeyBuffer);
+
+        const authMessage = crypto.createHash('sha256').update(
+            Buffer.concat([ciphertext, edhPubKey])
+        ).digest();
+
+        if (!originatorPubKey.verify(authMessage, Buffer.from(data.mac, 'hex'))) {
+            throw new Error("Invalid authentication for encrypted message originator");
+        }
+
+        const nonce = Buffer.from(data.nonce, 'hex');
+        const x25519Secret = ed2curve.convertSecretKey(decryptorSecretKey.valueOf());
+        const x25519EdhPubKey = ed2curve.convertPublicKey(edhPubKey);
+        if (x25519EdhPubKey === null) {
+            throw new Error("Could not convert ed25519 public key to x25519");
+        }
+
+        const decryptedMessage = nacl.box.open(ciphertext, nonce, x25519EdhPubKey, x25519Secret);
+        if (decryptedMessage === null) {
+            throw new Error("Failed authentication for given ciphertext");
+        }
+
+        return Buffer.from(decryptedMessage);
+    }
+}
diff --git a/src-wallet/crypto/pubkeyEncrypt.spec.ts b/src-wallet/crypto/pubkeyEncrypt.spec.ts
new file mode 100644
index 000000000..53c9cf345
--- /dev/null
+++ b/src-wallet/crypto/pubkeyEncrypt.spec.ts
@@ -0,0 +1,35 @@
+import { assert } from "chai";
+import {loadTestWallet, TestWallet} from "../testutils/wallets";
+import {PubkeyEncryptor} from "./pubkeyEncryptor";
+import {UserPublicKey, UserSecretKey} from "../userKeys";
+import {PubkeyDecryptor} from "./pubkeyDecryptor";
+import {X25519EncryptedData} from "./x25519EncryptedData";
+
+describe("test address", () => {
+    let alice: TestWallet, bob: TestWallet, carol: TestWallet;
+    const sensitiveData = Buffer.from("my secret text for x");
+    let encryptedData: X25519EncryptedData;
+
+    before(async () => {
+        alice = await loadTestWallet("alice");
+        bob = await loadTestWallet("bob");
+        carol = await loadTestWallet("carol");
+
+        encryptedData = PubkeyEncryptor.encrypt(sensitiveData, new UserPublicKey(bob.address.pubkey()), new UserSecretKey(alice.secretKey));
+    });
+
+    it("encrypts/decrypts",  () => {
+        const decryptedData = PubkeyDecryptor.decrypt(encryptedData, new UserSecretKey(bob.secretKey));
+        assert.equal(sensitiveData.toString('hex'), decryptedData.toString('hex'));
+    });
+
+    it("fails for different originator", () => {
+        encryptedData.identities.originatorPubKey = carol.address.hex();
+        assert.throws(() => PubkeyDecryptor.decrypt(encryptedData, new UserSecretKey(bob.secretKey)), "Invalid authentication for encrypted message originator");
+    });
+
+    it("fails for different DH public key", () => {
+        encryptedData.identities.ephemeralPubKey = carol.address.hex();
+        assert.throws(() => PubkeyDecryptor.decrypt(encryptedData, new UserSecretKey(bob.secretKey)), "Invalid authentication for encrypted message originator");
+    });
+});
diff --git a/src-wallet/crypto/pubkeyEncryptor.ts b/src-wallet/crypto/pubkeyEncryptor.ts
index 78dfd8ad7..2dead968d 100644
--- a/src-wallet/crypto/pubkeyEncryptor.ts
+++ b/src-wallet/crypto/pubkeyEncryptor.ts
@@ -3,21 +3,20 @@ import ed2curve from "ed2curve";
 import crypto, {sign} from "crypto";
 import {X25519EncryptedData} from "./x25519EncryptedData";
 import {UserPublicKey, UserSecretKey} from "../userKeys";
-import {PubKeyEncCipher, PubKeyEncVersion} from "./constants";
-import {UserSigner} from "../userSigner";
+import {PubKeyEncCipher, PubKeyEncNonceLength, PubKeyEncVersion} from "./constants";
 
 export class PubkeyEncryptor {
-    public static encrypt(data: Buffer, recipientPubKey: UserPublicKey, authSecretKey: UserSecretKey): X25519EncryptedData {
+    static encrypt(data: Buffer, recipientPubKey: UserPublicKey, authSecretKey: UserSecretKey): X25519EncryptedData {
         // create a new x225519 keypair that will be used for EDH
         const edhPair = nacl.sign.keyPair();
-
         const recipientDHPubKey = ed2curve.convertPublicKey(recipientPubKey.valueOf());
         if (recipientDHPubKey === null) {
             throw new Error("Could not convert ed25519 public key to x25519");
         }
+        const edhConvertedSecretKey = ed2curve.convertSecretKey(edhPair.secretKey);
 
-        const nonce = nacl.randomBytes(24);
-        const encryptedMessage = nacl.box(data, nonce, recipientDHPubKey, edhPair.secretKey);
+        const nonce = nacl.randomBytes(PubKeyEncNonceLength);
+        const encryptedMessage = nacl.box(data, nonce, recipientDHPubKey, edhConvertedSecretKey);
 
         // Note that the ciphertext is already authenticated for the ephemeral key - but we want it authenticated by
         //  the an elrond ed25519 key which the user interacts with. A signature over H(ciphertext | edhPubKey)

From 0f213d91ff19ddcb0dd09c5940ce4e4bcfe31916 Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Tue, 16 Aug 2022 13:43:45 +0300
Subject: [PATCH 120/338] add empty line

---
 src-wallet/crypto/x25519EncryptedData.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-wallet/crypto/x25519EncryptedData.ts b/src-wallet/crypto/x25519EncryptedData.ts
index 21ff2cfdb..4bc3ffbc8 100644
--- a/src-wallet/crypto/x25519EncryptedData.ts
+++ b/src-wallet/crypto/x25519EncryptedData.ts
@@ -42,4 +42,4 @@ export class X25519EncryptedData {
             identities: data.identities,
         });
     }
-}
\ No newline at end of file
+}

From c6e1cfd151ba410ec67e4edd5a360fa0079b4c84 Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Tue, 16 Aug 2022 16:57:42 +0300
Subject: [PATCH 121/338] fix after review

---
 src-wallet/crypto/pubkeyDecryptor.ts    |  4 ++--
 src-wallet/crypto/pubkeyEncrypt.spec.ts | 26 ++++++++++++-------------
 src-wallet/crypto/pubkeyEncryptor.ts    | 10 +++++-----
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src-wallet/crypto/pubkeyDecryptor.ts b/src-wallet/crypto/pubkeyDecryptor.ts
index 9806fcfe0..e9b6d7a00 100644
--- a/src-wallet/crypto/pubkeyDecryptor.ts
+++ b/src-wallet/crypto/pubkeyDecryptor.ts
@@ -1,8 +1,8 @@
 import crypto from "crypto";
 import nacl from "tweetnacl";
 import ed2curve from "ed2curve";
-import {X25519EncryptedData} from "./x25519EncryptedData";
-import {UserPublicKey, UserSecretKey} from "../userKeys";
+import { X25519EncryptedData } from "./x25519EncryptedData";
+import { UserPublicKey, UserSecretKey } from "../userKeys";
 
 export class PubkeyDecryptor {
     static decrypt(data: X25519EncryptedData, decryptorSecretKey: UserSecretKey): Buffer {
diff --git a/src-wallet/crypto/pubkeyEncrypt.spec.ts b/src-wallet/crypto/pubkeyEncrypt.spec.ts
index 53c9cf345..291ca391e 100644
--- a/src-wallet/crypto/pubkeyEncrypt.spec.ts
+++ b/src-wallet/crypto/pubkeyEncrypt.spec.ts
@@ -1,35 +1,35 @@
 import { assert } from "chai";
-import {loadTestWallet, TestWallet} from "../testutils/wallets";
-import {PubkeyEncryptor} from "./pubkeyEncryptor";
-import {UserPublicKey, UserSecretKey} from "../userKeys";
-import {PubkeyDecryptor} from "./pubkeyDecryptor";
-import {X25519EncryptedData} from "./x25519EncryptedData";
+import { loadTestWallet, TestWallet } from "../testutils/wallets";
+import { PubkeyEncryptor } from "./pubkeyEncryptor";
+import { UserPublicKey, UserSecretKey } from "../userKeys";
+import { PubkeyDecryptor } from "./pubkeyDecryptor";
+import { X25519EncryptedData } from "./x25519EncryptedData";
 
 describe("test address", () => {
     let alice: TestWallet, bob: TestWallet, carol: TestWallet;
-    const sensitiveData = Buffer.from("my secret text for x");
-    let encryptedData: X25519EncryptedData;
+    const sensitiveData = Buffer.from("alice's secret text for bob");
+    let encryptedDataOfAliceForBob: X25519EncryptedData;
 
     before(async () => {
         alice = await loadTestWallet("alice");
         bob = await loadTestWallet("bob");
         carol = await loadTestWallet("carol");
 
-        encryptedData = PubkeyEncryptor.encrypt(sensitiveData, new UserPublicKey(bob.address.pubkey()), new UserSecretKey(alice.secretKey));
+        encryptedDataOfAliceForBob = PubkeyEncryptor.encrypt(sensitiveData, new UserPublicKey(bob.address.pubkey()), new UserSecretKey(alice.secretKey));
     });
 
     it("encrypts/decrypts",  () => {
-        const decryptedData = PubkeyDecryptor.decrypt(encryptedData, new UserSecretKey(bob.secretKey));
+        const decryptedData = PubkeyDecryptor.decrypt(encryptedDataOfAliceForBob, new UserSecretKey(bob.secretKey));
         assert.equal(sensitiveData.toString('hex'), decryptedData.toString('hex'));
     });
 
     it("fails for different originator", () => {
-        encryptedData.identities.originatorPubKey = carol.address.hex();
-        assert.throws(() => PubkeyDecryptor.decrypt(encryptedData, new UserSecretKey(bob.secretKey)), "Invalid authentication for encrypted message originator");
+        encryptedDataOfAliceForBob.identities.originatorPubKey = carol.address.hex();
+        assert.throws(() => PubkeyDecryptor.decrypt(encryptedDataOfAliceForBob, new UserSecretKey(bob.secretKey)), "Invalid authentication for encrypted message originator");
     });
 
     it("fails for different DH public key", () => {
-        encryptedData.identities.ephemeralPubKey = carol.address.hex();
-        assert.throws(() => PubkeyDecryptor.decrypt(encryptedData, new UserSecretKey(bob.secretKey)), "Invalid authentication for encrypted message originator");
+        encryptedDataOfAliceForBob.identities.ephemeralPubKey = carol.address.hex();
+        assert.throws(() => PubkeyDecryptor.decrypt(encryptedDataOfAliceForBob, new UserSecretKey(bob.secretKey)), "Invalid authentication for encrypted message originator");
     });
 });
diff --git a/src-wallet/crypto/pubkeyEncryptor.ts b/src-wallet/crypto/pubkeyEncryptor.ts
index 2dead968d..a72c6fd3d 100644
--- a/src-wallet/crypto/pubkeyEncryptor.ts
+++ b/src-wallet/crypto/pubkeyEncryptor.ts
@@ -1,9 +1,9 @@
 import nacl from "tweetnacl";
 import ed2curve from "ed2curve";
-import crypto, {sign} from "crypto";
-import {X25519EncryptedData} from "./x25519EncryptedData";
-import {UserPublicKey, UserSecretKey} from "../userKeys";
-import {PubKeyEncCipher, PubKeyEncNonceLength, PubKeyEncVersion} from "./constants";
+import crypto from "crypto";
+import { X25519EncryptedData } from "./x25519EncryptedData";
+import { UserPublicKey, UserSecretKey } from "../userKeys";
+import { PubKeyEncCipher, PubKeyEncNonceLength, PubKeyEncVersion } from "./constants";
 
 export class PubkeyEncryptor {
     static encrypt(data: Buffer, recipientPubKey: UserPublicKey, authSecretKey: UserSecretKey): X25519EncryptedData {
@@ -19,7 +19,7 @@ export class PubkeyEncryptor {
         const encryptedMessage = nacl.box(data, nonce, recipientDHPubKey, edhConvertedSecretKey);
 
         // Note that the ciphertext is already authenticated for the ephemeral key - but we want it authenticated by
-        //  the an elrond ed25519 key which the user interacts with. A signature over H(ciphertext | edhPubKey)
+        //  the elrond ed25519 key which the user interacts with. A signature over H(ciphertext | edhPubKey)
         //  would be enough
         const authSig = crypto.createHash('sha256').update(
             Buffer.concat([encryptedMessage, edhPair.publicKey])

From 0fc73e521731db1c23b2408fed12d0795f6ea348 Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Tue, 16 Aug 2022 17:29:48 +0300
Subject: [PATCH 122/338] pairs endpoint implementation

---
 src-network-providers/apiNetworkProvider.ts   | 12 ++++
 src-network-providers/pairs.ts                | 55 +++++++++++++++++++
 .../providers.dev.net.spec.ts                 |  2 +-
 3 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 src-network-providers/pairs.ts

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index ed0f4667c..2d69261c0 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -15,6 +15,7 @@ import { defaultAxiosConfig, defaultPagination } from "./config";
 import { NetworkStatus } from "./networkStatus";
 import { ContractQueryResponse } from "./contractQueryResponse";
 import { ContractQueryRequest } from "./contractQueryRequest";
+import {PairOnNetwork} from "./pairs";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ApiNetworkProvider implements INetworkProvider {
@@ -91,6 +92,17 @@ export class ApiNetworkProvider implements INetworkProvider {
         return tokenData;
     }
 
+    async getMexPairs(pagination?: IPagination): Promise<PairOnNetwork[]> {
+        let url = `mex/pairs`;
+        if (pagination) {
+            url = `${url}?from=${pagination.from}&size=${pagination.size}`;
+        }
+
+        let response: any[] = await this.doGetGeneric(url);
+
+        return response.map(item => PairOnNetwork.fromApiHttpResponse(item));
+    }
+
     async getTransaction(txHash: string): Promise<TransactionOnNetwork> {
         let response = await this.doGetGeneric(`transactions/${txHash}`);
         let transaction = TransactionOnNetwork.fromApiHttpResponse(txHash, response);
diff --git a/src-network-providers/pairs.ts b/src-network-providers/pairs.ts
new file mode 100644
index 000000000..723c25b7b
--- /dev/null
+++ b/src-network-providers/pairs.ts
@@ -0,0 +1,55 @@
+import {Address} from "./primitives";
+import {IAddress} from "./interface";
+import BigNumber from "bignumber.js";
+
+export class PairOnNetwork {
+    address: IAddress = new Address("");
+    id: string = "";
+    symbol: string = "";
+    name: string = "";
+    price: BigNumber = new BigNumber(0);
+    baseId: string = "";
+    basePrice: BigNumber = new BigNumber(0);
+    baseSymbol: string = "";
+    baseName: string = "";
+    quoteId: string = "";
+    quotePrice: BigNumber = new BigNumber(0);
+    quoteSymbol: string = "";
+    quoteName: string = "";
+    totalValue: BigNumber = new BigNumber(0);
+    volume24h: BigNumber = new BigNumber(0);
+    state: string = "";
+    type: string = "";
+
+    rawResponse: any = {};
+
+    constructor(init?: Partial<PairOnNetwork>) {
+        Object.assign(this, init);
+    }
+
+    static fromApiHttpResponse(payload: any): PairOnNetwork {
+        let result = new PairOnNetwork();
+
+        result.address = new Address(payload.address || "");
+        result.id = payload.id || "";
+        result.symbol = payload.symbol || "";
+        result.name = payload.name || "";
+        result.price = new BigNumber(payload.price || 0);
+        result.baseId = payload.baseId || "";
+        result.basePrice = new BigNumber(payload.basePrice || 0);
+        result.baseSymbol = payload.baseSymbol || "";
+        result.baseName = payload.baseName || "";
+        result.quoteId = payload.quoteId || "";
+        result.quotePrice = new BigNumber(payload.quotePrice || 0);
+        result.quoteSymbol = payload.quoteSymbol || "";
+        result.quoteName = payload.quoteName || "";
+        result.totalValue = new BigNumber(payload.totalValue || 0);
+        result.volume24h = new BigNumber(payload.volume24h || 0);
+        result.state = payload.state || "";
+        result.type = payload.type || "";
+
+        result.rawResponse = payload;
+
+        return result;
+    }
+}
diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 3c67faf00..017b8418e 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -13,7 +13,7 @@ describe("test network providers on devnet: Proxy and API", function () {
     let carol = new Address("erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
     let dan = new Address("erd1kyaqzaprcdnv4luvanah0gfxzzsnpaygsy6pytrexll2urtd05ts9vegu7");
 
-    let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 10000 });
+    let apiProvider: ApiNetworkProvider = new ApiNetworkProvider("https://api.elrond.com", { timeout: 10000 });
     let proxyProvider: INetworkProvider = new ProxyNetworkProvider("https://devnet-gateway.elrond.com", { timeout: 10000 });
 
     it("should have same response for getNetworkConfig()", async function () {

From fbc06eccb26b8e617c1affde48d2f70f30ef1803 Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Fri, 19 Aug 2022 12:47:45 +0300
Subject: [PATCH 123/338] reverted test

---
 src-network-providers/providers.dev.net.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 017b8418e..3c67faf00 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -13,7 +13,7 @@ describe("test network providers on devnet: Proxy and API", function () {
     let carol = new Address("erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
     let dan = new Address("erd1kyaqzaprcdnv4luvanah0gfxzzsnpaygsy6pytrexll2urtd05ts9vegu7");
 
-    let apiProvider: ApiNetworkProvider = new ApiNetworkProvider("https://api.elrond.com", { timeout: 10000 });
+    let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 10000 });
     let proxyProvider: INetworkProvider = new ProxyNetworkProvider("https://devnet-gateway.elrond.com", { timeout: 10000 });
 
     it("should have same response for getNetworkConfig()", async function () {

From 9572232c2eb24ee5e626e869994a49f07a9a09eb Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Fri, 19 Aug 2022 12:57:45 +0300
Subject: [PATCH 124/338] added new method on the interface

---
 src-network-providers/interface.ts            | 6 ++++++
 src-network-providers/proxyNetworkProvider.ts | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index 4d44c32e2..9d7c95281 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -8,6 +8,7 @@ import { NetworkStatus } from "./networkStatus";
 import { ContractQueryResponse } from "./contractQueryResponse";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
+import {PairOnNetwork} from "./pairs";
 
 /**
  * An interface that defines the endpoints of an HTTP API Provider.
@@ -58,6 +59,11 @@ export interface INetworkProvider {
      */
     getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork>;
 
+    /**
+     * Fetches data about available mex pairs.
+     */
+    getMexPairs(pagination?: IPagination): Promise<PairOnNetwork[]>;
+
     /**
      * Fetches the state of a transaction.
      */
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index a8e0fff08..f7f5ed508 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -14,6 +14,7 @@ import { ContractQueryResponse } from "./contractQueryResponse";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 import { ContractQueryRequest } from "./contractQueryRequest";
 import { EsdtContractAddress } from "./constants";
+import {PairOnNetwork} from "./pairs";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ProxyNetworkProvider implements INetworkProvider {
@@ -93,6 +94,10 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokenData;
     }
 
+    async getMexPairs(_?: IPagination): Promise<PairOnNetwork[]> {
+        throw new Error("Method not implemented.");
+    }
+
     async getTransaction(txHash: string): Promise<TransactionOnNetwork> {
         let url = this.buildUrlWithQueryParameters(`transaction/${txHash}`, { withResults: "true" });
         let response = await this.doGetGeneric(url);

From a23e7d949b16ec51f99b61cc291b9e932328ead2 Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Fri, 19 Aug 2022 13:20:10 +0300
Subject: [PATCH 125/338] removed method from interface

---
 src-network-providers/interface.ts            | 5 -----
 src-network-providers/proxyNetworkProvider.ts | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index 9d7c95281..ef7dbbda0 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -59,11 +59,6 @@ export interface INetworkProvider {
      */
     getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork>;
 
-    /**
-     * Fetches data about available mex pairs.
-     */
-    getMexPairs(pagination?: IPagination): Promise<PairOnNetwork[]>;
-
     /**
      * Fetches the state of a transaction.
      */
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index f7f5ed508..0bc866f38 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -94,10 +94,6 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokenData;
     }
 
-    async getMexPairs(_?: IPagination): Promise<PairOnNetwork[]> {
-        throw new Error("Method not implemented.");
-    }
-
     async getTransaction(txHash: string): Promise<TransactionOnNetwork> {
         let url = this.buildUrlWithQueryParameters(`transaction/${txHash}`, { withResults: "true" });
         let response = await this.doGetGeneric(url);

From 0607faea6b6e1cbacc9bd834184c60cd475f442b Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Fri, 19 Aug 2022 13:22:07 +0300
Subject: [PATCH 126/338] removed importr

---
 src-network-providers/interface.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index ef7dbbda0..4d44c32e2 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -8,7 +8,6 @@ import { NetworkStatus } from "./networkStatus";
 import { ContractQueryResponse } from "./contractQueryResponse";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
-import {PairOnNetwork} from "./pairs";
 
 /**
  * An interface that defines the endpoints of an HTTP API Provider.

From 4c6f161c4a573be9187740577fbe75234608be43 Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Fri, 19 Aug 2022 13:22:30 +0300
Subject: [PATCH 127/338] removed importr

---
 src-network-providers/proxyNetworkProvider.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index 0bc866f38..a8e0fff08 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -14,7 +14,6 @@ import { ContractQueryResponse } from "./contractQueryResponse";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 import { ContractQueryRequest } from "./contractQueryRequest";
 import { EsdtContractAddress } from "./constants";
-import {PairOnNetwork} from "./pairs";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ProxyNetworkProvider implements INetworkProvider {

From 650ac4045c0a75659319f5416bb47c0f9da3527b Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Wed, 24 Aug 2022 10:35:56 +0300
Subject: [PATCH 128/338] fix after review

---
 src-wallet/crypto/pubkeyEncryptor.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-wallet/crypto/pubkeyEncryptor.ts b/src-wallet/crypto/pubkeyEncryptor.ts
index a72c6fd3d..4352b5794 100644
--- a/src-wallet/crypto/pubkeyEncryptor.ts
+++ b/src-wallet/crypto/pubkeyEncryptor.ts
@@ -15,17 +15,17 @@ export class PubkeyEncryptor {
         }
         const edhConvertedSecretKey = ed2curve.convertSecretKey(edhPair.secretKey);
 
-        const nonce = nacl.randomBytes(PubKeyEncNonceLength);
+        const nonce = crypto.createHash('sha256').update(data).digest().slice(0, PubKeyEncNonceLength);
         const encryptedMessage = nacl.box(data, nonce, recipientDHPubKey, edhConvertedSecretKey);
 
         // Note that the ciphertext is already authenticated for the ephemeral key - but we want it authenticated by
         //  the elrond ed25519 key which the user interacts with. A signature over H(ciphertext | edhPubKey)
         //  would be enough
-        const authSig = crypto.createHash('sha256').update(
+        const authMessage = crypto.createHash('sha256').update(
             Buffer.concat([encryptedMessage, edhPair.publicKey])
         ).digest();
 
-        const signature = authSecretKey.sign(authSig);
+        const signature = authSecretKey.sign(authMessage);
 
         return new X25519EncryptedData({
             version: PubKeyEncVersion,

From b48d3b8fdf487c00d883f05842332bba0c80d89b Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Wed, 24 Aug 2022 11:03:10 +0300
Subject: [PATCH 129/338] implement 'half deterministic nonce'

---
 src-wallet/crypto/pubkeyEncryptor.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src-wallet/crypto/pubkeyEncryptor.ts b/src-wallet/crypto/pubkeyEncryptor.ts
index 4352b5794..e63648185 100644
--- a/src-wallet/crypto/pubkeyEncryptor.ts
+++ b/src-wallet/crypto/pubkeyEncryptor.ts
@@ -15,7 +15,11 @@ export class PubkeyEncryptor {
         }
         const edhConvertedSecretKey = ed2curve.convertSecretKey(edhPair.secretKey);
 
-        const nonce = crypto.createHash('sha256').update(data).digest().slice(0, PubKeyEncNonceLength);
+        // For the nonce we use a random component and a deterministic one based on the message
+        //  - this is so we won't completely rely on the random number generator
+        const nonceDeterministic = crypto.createHash('sha256').update(data).digest().slice(0, PubKeyEncNonceLength/2);
+        const nonceRandom = nacl.randomBytes(PubKeyEncNonceLength/2);
+        const nonce = Buffer.concat([nonceDeterministic, nonceRandom]);
         const encryptedMessage = nacl.box(data, nonce, recipientDHPubKey, edhConvertedSecretKey);
 
         // Note that the ciphertext is already authenticated for the ephemeral key - but we want it authenticated by

From 5b3117951f337e8f40771433d2426415ba1c0905 Mon Sep 17 00:00:00 2001
From: Cristi Corcoveanu <cristi.corcoveanu@gmail.com>
Date: Wed, 24 Aug 2022 11:38:58 +0300
Subject: [PATCH 130/338] fixed changelog, export encryptor/decryptor and
 prepared release

---
 src-wallet/crypto/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src-wallet/crypto/index.ts b/src-wallet/crypto/index.ts
index d674cb91f..183a29c0f 100644
--- a/src-wallet/crypto/index.ts
+++ b/src-wallet/crypto/index.ts
@@ -1,5 +1,7 @@
 export * from "./constants";
 export * from "./encryptor";
 export * from "./decryptor";
+export * from "./pubkeyEncryptor";
+export * from "./pubkeyDecryptor";
 export * from "./encryptedData";
 export * from "./randomness";

From b0cb66d4fff996a731b8d0a59800951709bf09b6 Mon Sep 17 00:00:00 2001
From: schimih <schiopumihaialexandru@gmail.com>
Date: Mon, 12 Sep 2022 10:35:18 +0300
Subject: [PATCH 131/338] added guardianSigner

---
 src-wallet/guardianSigner.ts        | 47 +++++++++++++++++++
 src-wallet/index.ts                 |  1 +
 src-wallet/interface.ts             | 34 ++++++++++++--
 src-wallet/testutils/message.ts     |  9 +++-
 src-wallet/testutils/transaction.ts | 24 +++++++---
 src-wallet/userSigner.ts            | 13 +++---
 src-wallet/users.spec.ts            | 70 ++++++++++++++++++++++++-----
 7 files changed, 170 insertions(+), 28 deletions(-)
 create mode 100644 src-wallet/guardianSigner.ts

diff --git a/src-wallet/guardianSigner.ts b/src-wallet/guardianSigner.ts
new file mode 100644
index 000000000..5cc4b095f
--- /dev/null
+++ b/src-wallet/guardianSigner.ts
@@ -0,0 +1,47 @@
+import { ISignable, ISignature } from "./interface";
+import { UserSecretKey } from "./userKeys";
+import { UserSigner } from "./userSigner";
+import { Signature } from "./signature";
+import { ErrSignerCannotSign } from "./errors";
+
+/**
+ * ed25519 signer
+ */
+export class GuardianSigner extends UserSigner {
+    private readonly guardianSecretKey: UserSecretKey;
+
+    constructor(guardianSecretKey: UserSecretKey) {
+        super(guardianSecretKey)
+        this.guardianSecretKey = guardianSecretKey
+    }
+
+    /**
+ * Signs a message.
+ * @param signable the message to be signed (e.g. a {@link Transaction}).
+ */
+    async guard(signable: ISignable): Promise<void> {
+        try {
+            this.tryGuard(signable);
+        } catch (err: any) {
+            throw new ErrSignerCannotSign(err);
+        }
+    }
+
+    private tryGuard(signable: ISignable) {
+        let ownerSignature = signable.getSignature()
+        let bufferToSign = signable.serializeForSigning();
+        let guardianSignatureBuffer = this.guardianSecretKey.sign(bufferToSign);
+        let guardianSignature = new Signature(guardianSignatureBuffer);
+
+        this.addOwnerSignature(signable, ownerSignature)
+        this.doApplySignature(signable, guardianSignature);
+    }
+
+    protected doApplySignature(signable: ISignable, guardianSignature: ISignature): void {
+        signable.applyGuardianSignature(guardianSignature);
+    }
+
+    private addOwnerSignature(signable: ISignable, ownerSignature: ISignature) {
+        signable.applySignature(ownerSignature);
+    }
+}
diff --git a/src-wallet/index.ts b/src-wallet/index.ts
index c5d518dfd..f24c48cc0 100644
--- a/src-wallet/index.ts
+++ b/src-wallet/index.ts
@@ -4,5 +4,6 @@ export * from "./userWallet";
 export * from "./userKeys";
 export * from "./validatorKeys";
 export * from "./userSigner";
+export * from "./guardianSigner"
 export * from "./userVerifier";
 export * from "./validatorSigner";
diff --git a/src-wallet/interface.ts b/src-wallet/interface.ts
index 04c4fdee3..99806f228 100644
--- a/src-wallet/interface.ts
+++ b/src-wallet/interface.ts
@@ -23,6 +23,21 @@ export interface ISigner {
     sign(signable: ISignable): Promise<void>;
 }
 
+/**
+ * An interface that defines a signing-capable object.
+ */
+export interface IGuardianSigner {
+    /**
+     * Gets the {@link Address} of the signer.
+     */
+    getAddress(): IAddress;
+
+    /**
+     * Signs a message (e.g. a transaction).
+     */
+    guard(signable: ISignable): Promise<void>;
+}
+
 export interface IVerifier {
     verify(message: IVerifiable): boolean;
 }
@@ -34,15 +49,26 @@ export interface ISignable {
     /**
      * Returns the signable object in its raw form - a sequence of bytes to be signed.
      */
-    serializeForSigning(signedBy: IAddress): Buffer;
+    serializeForSigning(): Buffer;
+
+    /**
+     * Returns the signature of the sender.
+     */
+    getSignature(): ISignature;
 
     /**
      * Applies the computed signature on the object itself.
      *
      * @param signature The computed signature
-     * @param signedBy The address of the {@link ISignature}
-     */
-    applySignature(signature: ISignature, signedBy: IAddress): void;
+    */
+    applySignature(signature: ISignature): void;
+
+    /**
+    * Applies the guardian signature on the transaction.
+    *
+    * @param guardianSignature The signature, as computed by a guardian.
+    */
+    applyGuardianSignature(guardianSignature: ISignature): void;
 }
 
 /**
diff --git a/src-wallet/testutils/message.ts b/src-wallet/testutils/message.ts
index 1fe2f542b..2f60c5f53 100644
--- a/src-wallet/testutils/message.ts
+++ b/src-wallet/testutils/message.ts
@@ -8,12 +8,13 @@ export class TestMessage implements ISignable, IVerifiable {
     foo: string = "";
     bar: string = "";
     signature: string = "";
+    guardianSignature: string = "";
 
     constructor(init?: Partial<TestMessage>) {
         Object.assign(this, init);
     }
 
-    serializeForSigning(_signedBy: IAddress): Buffer {
+    serializeForSigning(): Buffer {
         let plainObject = {
             foo: this.foo,
             bar: this.bar
@@ -23,10 +24,14 @@ export class TestMessage implements ISignable, IVerifiable {
         return Buffer.from(serialized);
     }
 
-    applySignature(signature: ISignature, _signedBy: IAddress): void {
+    applySignature(signature: ISignature): void {
         this.signature = signature.hex();
     }
 
+    applyGuardianSignature(guardianSignature: ISignature): void {
+        this.guardianSignature = guardianSignature.hex()
+    }
+
     getSignature(): ISignature {
         return new Signature(Buffer.from(this.signature, "hex"));
     }
diff --git a/src-wallet/testutils/transaction.ts b/src-wallet/testutils/transaction.ts
index bd0d04c06..1291c061c 100644
--- a/src-wallet/testutils/transaction.ts
+++ b/src-wallet/testutils/transaction.ts
@@ -16,40 +16,50 @@ export class TestTransaction implements ISignable, IVerifiable {
     options: number = 0;
 
     sender: string = "";
+    guardian: string = "";
+    guardianSignature: string = "";
     signature: string = "";
 
     constructor(init?: Partial<TestTransaction>) {
         Object.assign(this, init);
     }
 
-    serializeForSigning(signedBy: IAddress): Buffer {
-        let sender = signedBy.bech32();
+    serializeForSigning(): Buffer {
         let dataEncoded = this.data ? Buffer.from(this.data).toString("base64") : undefined;
+        let guardian = this.guardian ? this.guardian : undefined;
         let options = this.options ? this.options : undefined;
 
         let plainObject = {
             nonce: this.nonce,
             value: this.value,
             receiver: this.receiver,
-            sender: sender,
+            sender: this.sender,
+            guardian: guardian,
             gasPrice: this.gasPrice,
             gasLimit: this.gasLimit,
             data: dataEncoded,
             chainID: this.chainID,
-            version: this.version,
-            options: options
+            options: options,
+            version: this.version
         };
 
         let serialized = JSON.stringify(plainObject);
         return Buffer.from(serialized);
     }
 
-    applySignature(signature: ISignature, signedBy: IAddress): void {
-        this.sender = signedBy.bech32();
+    applySignature(signature: ISignature): void {
         this.signature = signature.hex();
     }
 
+    applyGuardianSignature(guardianSignature: ISignature): void {
+        this.guardianSignature = guardianSignature.hex()
+    }
+
     getSignature(): ISignature {
         return new Signature(Buffer.from(this.signature, "hex"));
     }
+
+    getGuardianSignature(): ISignature {
+        return new Signature(Buffer.from(this.guardianSignature, "hex"));
+    }
 }
diff --git a/src-wallet/userSigner.ts b/src-wallet/userSigner.ts
index c7cdde4e0..581dcee26 100644
--- a/src-wallet/userSigner.ts
+++ b/src-wallet/userSigner.ts
@@ -1,4 +1,4 @@
-import { IAddress, ISignable, ISigner } from "./interface";
+import { IAddress, ISignable, ISignature, ISigner } from "./interface";
 import { Signature } from "./signature";
 import { UserSecretKey } from "./userKeys";
 import { UserWallet } from "./userWallet";
@@ -23,7 +23,7 @@ export class UserSigner implements ISigner {
         let secretKey = UserSecretKey.fromPem(text, index);
         return new UserSigner(secretKey);
     }
-    
+
     /**
      * Signs a message.
      * @param signable the message to be signed (e.g. a {@link Transaction}).
@@ -37,12 +37,15 @@ export class UserSigner implements ISigner {
     }
 
     private trySign(signable: ISignable) {
-        let signedBy = this.getAddress();
-        let bufferToSign = signable.serializeForSigning(signedBy);
+        let bufferToSign = signable.serializeForSigning();
         let signatureBuffer = this.secretKey.sign(bufferToSign);
         let signature = new Signature(signatureBuffer);
 
-        signable.applySignature(signature, signedBy);
+        this.doApplySignature(signable, signature);
+    }
+
+    protected doApplySignature(signable: ISignable, signature: ISignature) {
+        signable.applySignature(signature);
     }
 
     /**
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index ee71c03e5..3a9f3e846 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -5,6 +5,7 @@ import { UserWallet } from "./userWallet";
 import { Randomness } from "./crypto";
 import { UserAddress } from "./userAddress";
 import { UserSigner } from "./userSigner";
+import { GuardianSigner } from "./guardianSigner"
 import { UserVerifier } from "./userVerifier";
 import { ErrInvariantFailed } from "./errors";
 import { TestMessage } from "./testutils/message";
@@ -122,8 +123,7 @@ describe("test user wallets", () => {
     it("should sign transactions", async () => {
         let signer = new UserSigner(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
         let verifier = new UserVerifier(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf").generatePublicKey());
-        let sender = UserAddress.fromBech32("erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz");
-        
+
         // With data field
         let transaction = new TestTransaction({
             nonce: 0,
@@ -132,14 +132,14 @@ describe("test user wallets", () => {
             gasPrice: 1000000000,
             gasLimit: 50000,
             data: "foo",
-            chainID: "1"
+            chainID: "1",
         });
 
-        let serialized = transaction.serializeForSigning(sender).toString();
+        let serialized = transaction.serializeForSigning().toString();
         await signer.sign(transaction);
 
-        assert.equal(serialized, `{"nonce":0,"value":"0","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1}`);
-        assert.equal(transaction.getSignature().hex(), "b5fddb8c16fa7f6123cb32edc854f1e760a3eb62c6dc420b5a4c0473c58befd45b621b31a448c5b59e21428f2bc128c80d0ee1caa4f2bf05a12be857ad451b00");
+        assert.equal(serialized, `{"nonce":0,"value":"0","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1}`);
+        assert.equal(transaction.getSignature().hex(), "a3b61a2fe461f3393c42e6cb0477a6b52ffd92168f10c111f6aa8d0a310ee0c314fae0670f8313f1ad992933ac637c61a8ff20cc20b6a8b2260a4af1a120a70d");
         assert.isTrue(verifier.verify(transaction));
         // Without data field
         transaction = new TestTransaction({
@@ -151,11 +151,61 @@ describe("test user wallets", () => {
             chainID: "1"
         });
 
-        serialized = transaction.serializeForSigning(sender).toString();
+        serialized = transaction.serializeForSigning().toString();
+        await signer.sign(transaction);
+
+        assert.equal(serialized, `{"nonce":8,"value":"10000000000000000000","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","version":1}`);
+        assert.equal(transaction.getSignature().hex(), "f136c901d37349a7da8cfe3ab5ec8ef333b0bc351517c0e9bef9eb9704aed3077bf222769cade5ff29dffe5f42e4f0c5e0b068bdba90cd2cb41da51fd45d5a03");
+    });
+
+    it("guardian should sign transactions from PEM", async () => {
+        // bob is the guardian
+        let signer = new UserSigner(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
+        let verifier = new UserVerifier(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf").generatePublicKey());
+        let guardianSigner = new GuardianSigner(UserSecretKey.fromPem(bob.pemFileText));
+
+        // With data field
+        let transaction = new TestTransaction({
+            nonce: 0,
+            value: "0",
+            receiver: "erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r",
+            sender: "erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz",
+            gasPrice: 1000000000,
+            gasLimit: 50000,
+            data: "foo",
+            chainID: "1",
+            guardian: "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+            options: 2,
+            version: 2
+        });
+
+        let serialized = transaction.serializeForSigning().toString();
+        await signer.sign(transaction);
+        await guardianSigner.sign(transaction);
+
+        assert.equal(serialized, `{"nonce":0,"value":"0","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","guardian":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","options":2,"version":2}`);
+        assert.equal(transaction.getSignature().hex(), "00b867ae749616954711ef227c0a3f5c6556246f26dbde12ad929a099094065341a0fae7c5ced98e6bdd100ce922c975667444ea859dce9597b46e63cade2a03");
+        assert.equal(transaction.getGuardianSignature().hex(), "1326e44941ef7bfbad3edf346e72abe23704ee32b4b6a6a6a9b793bd7c62b6d4a69d3c6ea2dddf7eabc8df8fe291cd24822409ab9194b6a0f3bbbf1c59b0a10f");
+        assert.isTrue(verifier.verify(transaction));
+        // Without data field
+        transaction = new TestTransaction({
+            nonce: 8,
+            value: "10000000000000000000",
+            receiver: "erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r",
+            sender: "erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz",
+            gasPrice: 1000000000,
+            gasLimit: 50000,
+            chainID: "1",
+            guardian: "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+            options: 2,
+            version: 2,
+        });
+
+        serialized = transaction.serializeForSigning().toString();
         await signer.sign(transaction);
 
-        assert.equal(serialized, `{"nonce":8,"value":"10000000000000000000","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","version":1}`);
-        assert.equal(transaction.getSignature().hex(), "4a6d8186eae110894e7417af82c9bf9592696c0600faf110972e0e5310d8485efc656b867a2336acec2b4c1e5f76c9cc70ba1803c6a46455ed7f1e2989a90105");
+        assert.equal(serialized, `{"nonce":8,"value":"10000000000000000000","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","guardian":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","options":2,"version":2}`);
+        assert.equal(transaction.getSignature().hex(), "49a63fa0e3cfb81a2b6d926c741328fb270ea4f58fa32585fe8aa3cde191245e5a13c5c059d5576f4c05fc24d2534a2124ff79c98d067ce8412c806779066b03");
     });
 
     it("should sign transactions using PEM files", async () => {
@@ -172,7 +222,7 @@ describe("test user wallets", () => {
         });
 
         await signer.sign(transaction);
-        assert.equal(transaction.getSignature().hex(), "c0bd2b3b33a07b9cc5ee7435228acb0936b3829c7008aacabceea35163e555e19a34def2c03a895cf36b0bcec30a7e11215c11efc0da29294a11234eb2b3b906");
+        assert.equal(transaction.getSignature().hex(), "ba4fa95fea1402e4876abf1d5a510615aab374ee48bb76f5230798a7d3f2fcae6ba91ba56c6d62e6e7003ce531ff02f219cb7218dd00dd2ca650ba747f19640a");
     });
 
     it("signs a general message", function () {

From a96e5ca13ca9769c0cf6719d3c8c0f5a1937ab45 Mon Sep 17 00:00:00 2001
From: schimih <schiopumihaialexandru@gmail.com>
Date: Mon, 12 Sep 2022 11:06:58 +0300
Subject: [PATCH 132/338] minor fix

---
 src-wallet/guardianSigner.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-wallet/guardianSigner.ts b/src-wallet/guardianSigner.ts
index 5cc4b095f..0aa2f377c 100644
--- a/src-wallet/guardianSigner.ts
+++ b/src-wallet/guardianSigner.ts
@@ -15,7 +15,7 @@ export class GuardianSigner extends UserSigner {
         this.guardianSecretKey = guardianSecretKey
     }
 
-    /**
+/**
  * Signs a message.
  * @param signable the message to be signed (e.g. a {@link Transaction}).
  */

From 9bce67a94fa1f76b7eac033992ec052256912482 Mon Sep 17 00:00:00 2001
From: Traian Anghel <tanghel@live.com>
Date: Thu, 15 Sep 2022 12:33:18 +0300
Subject: [PATCH 133/338] pass headers when performing post api calls

---
 src-network-providers/apiNetworkProvider.ts   | 1 +
 src-network-providers/proxyNetworkProvider.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 2d69261c0..4fea6117a 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -186,6 +186,7 @@ export class ApiNetworkProvider implements INetworkProvider {
                 ...this.config,
                 headers: {
                     "Content-Type": "application/json",
+                    ...this.config.headers,
                 },
             });
             let responsePayload = response.data;
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index a8e0fff08..972ac32fa 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -185,6 +185,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
                 ...this.config,
                 headers: {
                     "Content-Type": "application/json",
+                    ...this.config.headers,
                 },
             });
             let responsePayload = response.data.data;

From d897ddabcbf1737d9c53932706227b04d1a70232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 18 Oct 2022 23:04:02 +0300
Subject: [PATCH 134/338] Add address.toString().

---
 src-network-providers/primitives.spec.ts | 2 ++
 src-network-providers/primitives.ts      | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src-network-providers/primitives.spec.ts b/src-network-providers/primitives.spec.ts
index e8f3a0c35..202a9dfee 100644
--- a/src-network-providers/primitives.spec.ts
+++ b/src-network-providers/primitives.spec.ts
@@ -10,6 +10,8 @@ describe("test primitives", function () {
 
         assert.equal(new Address(aliceBech32).bech32(), Address.fromPubkey(alicePubkey).bech32());
         assert.equal(new Address(bobBech32).bech32(), Address.fromPubkey(bobPubkey).bech32());
+        assert.equal(new Address(aliceBech32).toString(), aliceBech32);
+        assert.equal(new Address(bobBech32).toString(), bobBech32);
     });
 });
 
diff --git a/src-network-providers/primitives.ts b/src-network-providers/primitives.ts
index fecbbace0..150e758c7 100644
--- a/src-network-providers/primitives.ts
+++ b/src-network-providers/primitives.ts
@@ -22,6 +22,10 @@ export class Address implements IAddress {
     bech32(): string {
         return this.value;
     }
+
+    toString() {
+        return this.value;
+    }
 }
 
 export class Nonce {

From df2335161438d255922b4a9ef3b8284fe8c55be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 19 Oct 2022 11:18:52 +0300
Subject: [PATCH 135/338] Fix after review.

---
 src-network-providers/primitives.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-network-providers/primitives.ts b/src-network-providers/primitives.ts
index 150e758c7..ed50b4efa 100644
--- a/src-network-providers/primitives.ts
+++ b/src-network-providers/primitives.ts
@@ -24,7 +24,7 @@ export class Address implements IAddress {
     }
 
     toString() {
-        return this.value;
+        return this.bech32();
     }
 }
 

From 88c5f9109d37aed360238c82e34107e64ced82cf Mon Sep 17 00:00:00 2001
From: schimih <schiopumihaialexandru@gmail.com>
Date: Wed, 19 Oct 2022 12:02:46 +0300
Subject: [PATCH 136/338] fixes after review

---
 src-wallet/userSigner.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-wallet/userSigner.ts b/src-wallet/userSigner.ts
index 581dcee26..57dd6f8ec 100644
--- a/src-wallet/userSigner.ts
+++ b/src-wallet/userSigner.ts
@@ -41,10 +41,10 @@ export class UserSigner implements ISigner {
         let signatureBuffer = this.secretKey.sign(bufferToSign);
         let signature = new Signature(signatureBuffer);
 
-        this.doApplySignature(signable, signature);
+        this.applySignature(signable, signature);
     }
 
-    protected doApplySignature(signable: ISignable, signature: ISignature) {
+    protected applySignature(signable: ISignable, signature: ISignature) {
         signable.applySignature(signature);
     }
 

From 201be3987abdd669435989e1ba4fb714f956908d Mon Sep 17 00:00:00 2001
From: schimih <schiopumihaialexandru@gmail.com>
Date: Wed, 19 Oct 2022 12:07:14 +0300
Subject: [PATCH 137/338] fix

---
 src-wallet/userSigner.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src-wallet/userSigner.ts b/src-wallet/userSigner.ts
index 57dd6f8ec..0dea38ecd 100644
--- a/src-wallet/userSigner.ts
+++ b/src-wallet/userSigner.ts
@@ -41,10 +41,6 @@ export class UserSigner implements ISigner {
         let signatureBuffer = this.secretKey.sign(bufferToSign);
         let signature = new Signature(signatureBuffer);
 
-        this.applySignature(signable, signature);
-    }
-
-    protected applySignature(signable: ISignable, signature: ISignature) {
         signable.applySignature(signature);
     }
 

From dac65bcff5abdf15ac0b4a963578c72b5f4e0f96 Mon Sep 17 00:00:00 2001
From: schimih <schiopumihaialexandru@gmail.com>
Date: Wed, 19 Oct 2022 13:21:24 +0300
Subject: [PATCH 138/338] changed `guardian.sign()` to `guardian.guard()`

---
 src-wallet/users.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 3a9f3e846..a499f1826 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -181,7 +181,7 @@ describe("test user wallets", () => {
 
         let serialized = transaction.serializeForSigning().toString();
         await signer.sign(transaction);
-        await guardianSigner.sign(transaction);
+        await guardianSigner.guard(transaction);
 
         assert.equal(serialized, `{"nonce":0,"value":"0","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","guardian":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","options":2,"version":2}`);
         assert.equal(transaction.getSignature().hex(), "00b867ae749616954711ef227c0a3f5c6556246f26dbde12ad929a099094065341a0fae7c5ced98e6bdd100ce922c975667444ea859dce9597b46e63cade2a03");

From ec31e5e2265454e371768d50fb954d457bec59c0 Mon Sep 17 00:00:00 2001
From: schimih <schiopumihaialexandru@gmail.com>
Date: Wed, 19 Oct 2022 14:43:00 +0300
Subject: [PATCH 139/338] fixes after review

---
 src-wallet/guardianSigner.ts        | 24 +++++++++++-------------
 src-wallet/testutils/message.ts     |  4 ++--
 src-wallet/testutils/transaction.ts | 14 +++++++-------
 src-wallet/userSigner.ts            |  2 +-
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src-wallet/guardianSigner.ts b/src-wallet/guardianSigner.ts
index 0aa2f377c..39d65751a 100644
--- a/src-wallet/guardianSigner.ts
+++ b/src-wallet/guardianSigner.ts
@@ -8,17 +8,15 @@ import { ErrSignerCannotSign } from "./errors";
  * ed25519 signer
  */
 export class GuardianSigner extends UserSigner {
-    private readonly guardianSecretKey: UserSecretKey;
 
-    constructor(guardianSecretKey: UserSecretKey) {
-        super(guardianSecretKey)
-        this.guardianSecretKey = guardianSecretKey
+    constructor(secretKey: UserSecretKey) {
+        super(secretKey)
     }
 
-/**
- * Signs a message.
- * @param signable the message to be signed (e.g. a {@link Transaction}).
- */
+    /**
+     * Signs a message.
+     * @param signable the message to be signed (e.g. a {@link Transaction}).
+     */
     async guard(signable: ISignable): Promise<void> {
         try {
             this.tryGuard(signable);
@@ -28,16 +26,16 @@ export class GuardianSigner extends UserSigner {
     }
 
     private tryGuard(signable: ISignable) {
-        let ownerSignature = signable.getSignature()
-        let bufferToSign = signable.serializeForSigning();
-        let guardianSignatureBuffer = this.guardianSecretKey.sign(bufferToSign);
-        let guardianSignature = new Signature(guardianSignatureBuffer);
+        const ownerSignature = signable.getSignature()
+        const bufferToSign = signable.serializeForSigning();
+        const guardianSignatureBuffer = this.secretKey.sign(bufferToSign);
+        const guardianSignature = new Signature(guardianSignatureBuffer);
 
         this.addOwnerSignature(signable, ownerSignature)
         this.doApplySignature(signable, guardianSignature);
     }
 
-    protected doApplySignature(signable: ISignable, guardianSignature: ISignature): void {
+    protected doApplySignature(signable: ISignable, guardianSignature: ISignature) {
         signable.applyGuardianSignature(guardianSignature);
     }
 
diff --git a/src-wallet/testutils/message.ts b/src-wallet/testutils/message.ts
index 2f60c5f53..7ed55520d 100644
--- a/src-wallet/testutils/message.ts
+++ b/src-wallet/testutils/message.ts
@@ -24,11 +24,11 @@ export class TestMessage implements ISignable, IVerifiable {
         return Buffer.from(serialized);
     }
 
-    applySignature(signature: ISignature): void {
+    applySignature(signature: ISignature) {
         this.signature = signature.hex();
     }
 
-    applyGuardianSignature(guardianSignature: ISignature): void {
+    applyGuardianSignature(guardianSignature: ISignature) {
         this.guardianSignature = guardianSignature.hex()
     }
 
diff --git a/src-wallet/testutils/transaction.ts b/src-wallet/testutils/transaction.ts
index 1291c061c..e09ee2194 100644
--- a/src-wallet/testutils/transaction.ts
+++ b/src-wallet/testutils/transaction.ts
@@ -25,11 +25,11 @@ export class TestTransaction implements ISignable, IVerifiable {
     }
 
     serializeForSigning(): Buffer {
-        let dataEncoded = this.data ? Buffer.from(this.data).toString("base64") : undefined;
-        let guardian = this.guardian ? this.guardian : undefined;
-        let options = this.options ? this.options : undefined;
+        const dataEncoded = this.data ? Buffer.from(this.data).toString("base64") : undefined;
+        const guardian = this.guardian ? this.guardian : undefined;
+        const options = this.options ? this.options : undefined;
 
-        let plainObject = {
+        const plainObject = {
             nonce: this.nonce,
             value: this.value,
             receiver: this.receiver,
@@ -43,15 +43,15 @@ export class TestTransaction implements ISignable, IVerifiable {
             version: this.version
         };
 
-        let serialized = JSON.stringify(plainObject);
+        const serialized = JSON.stringify(plainObject);
         return Buffer.from(serialized);
     }
 
-    applySignature(signature: ISignature): void {
+    applySignature(signature: ISignature) {
         this.signature = signature.hex();
     }
 
-    applyGuardianSignature(guardianSignature: ISignature): void {
+    applyGuardianSignature(guardianSignature: ISignature) {
         this.guardianSignature = guardianSignature.hex()
     }
 
diff --git a/src-wallet/userSigner.ts b/src-wallet/userSigner.ts
index 0dea38ecd..24f74e07a 100644
--- a/src-wallet/userSigner.ts
+++ b/src-wallet/userSigner.ts
@@ -8,7 +8,7 @@ import { ErrSignerCannotSign } from "./errors";
  * ed25519 signer
  */
 export class UserSigner implements ISigner {
-    private readonly secretKey: UserSecretKey;
+    protected readonly secretKey: UserSecretKey;
 
     constructor(secretKey: UserSecretKey) {
         this.secretKey = secretKey;

From 4e0a57a8a5cfe7ced57d7ce5b6d575eb21da4c13 Mon Sep 17 00:00:00 2001
From: Well <niftyrexnft@gmail.com>
Date: Mon, 7 Nov 2022 20:09:38 +0100
Subject: [PATCH 140/338] Add proxy method to send transaction in bulk

---
 src-network-providers/interface.ts            | 5 +++++
 src-network-providers/proxyNetworkProvider.ts | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index 4d44c32e2..fe24c8c72 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -73,6 +73,11 @@ export interface INetworkProvider {
      */
     sendTransaction(tx: ITransaction): Promise<string>;
 
+    /**
+     * Broadcasts a list of already-signed transactions.
+     */
+    sendBulkTransaction(tx: ITransaction[]): Promise<string>;
+
     /**
      * Simulates the processing of an already-signed transaction.
      * 
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index 972ac32fa..c4aa3f04c 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -111,6 +111,15 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return response.txHash;
     }
 
+    async sendBulkTransaction(txs: ITransaction[]): Promise<string> {
+        let sendable: any = [];
+        txs.forEach((tx) => {
+            sendable.push(tx.toSendable());
+        });
+        let response = await this.doPostGeneric("transaction/send-multiple", sendable);
+        return response.txsHashes;
+    }
+    
     async simulateTransaction(tx: ITransaction): Promise<any> {
         let response = await this.doPostGeneric("transaction/simulate", tx.toSendable());
         return response;

From 1630913f7720040a1de001f398ee594d9c2309c1 Mon Sep 17 00:00:00 2001
From: Well <niftyrexnft@gmail.com>
Date: Mon, 7 Nov 2022 20:19:40 +0100
Subject: [PATCH 141/338] fix sendBulkTransaction api

---
 src-network-providers/apiNetworkProvider.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 4fea6117a..b94a7d246 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -120,6 +120,15 @@ export class ApiNetworkProvider implements INetworkProvider {
         return response.txHash;
     }
 
+    async sendBulkTransaction(txs: ITransaction[]): Promise<string> {
+        let sendable: any = [];
+        txs.forEach((tx) => {
+            sendable.push(tx.toSendable());
+        });
+        let response = await this.doPostGeneric("transaction/send-multiple", sendable);
+        return response.txsHashes;
+    }
+
     async simulateTransaction(tx: ITransaction): Promise<any> {
         return await this.backingProxyNetworkProvider.simulateTransaction(tx);
     }

From add11e3919939f6fed44e67da8ac5f56c8da379f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Mon, 14 Nov 2022 15:58:58 +0200
Subject: [PATCH 142/338] Fix axios deserialization, ignore "_constructor".

---
 src-network-providers/config.ts             |  2 +-
 src-network-providers/serialization.spec.ts | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 src-network-providers/serialization.spec.ts

diff --git a/src-network-providers/config.ts b/src-network-providers/config.ts
index ffee0f228..8239bfda9 100644
--- a/src-network-providers/config.ts
+++ b/src-network-providers/config.ts
@@ -1,6 +1,6 @@
 import { IPagination } from "./interface";
 
-const JSONbig = require("json-bigint");
+const JSONbig = require("json-bigint")({ constructorAction: 'ignore' });
 
 export const defaultAxiosConfig = {
     timeout: 5000,
diff --git a/src-network-providers/serialization.spec.ts b/src-network-providers/serialization.spec.ts
new file mode 100644
index 000000000..6ffc83096
--- /dev/null
+++ b/src-network-providers/serialization.spec.ts
@@ -0,0 +1,16 @@
+import assert from "assert";
+
+describe("test JSON serialization", function () {
+    it("should not deserialize", async function () {
+        const JSONbig = require("json-bigint");
+        const data = `{"Costum":{"foo_constructor":1}}`;
+        assert.throws(() => JSONbig.parse(data));
+    });
+
+    it("should deserialize", async function () {
+        const JSONbig = require("json-bigint")({ constructorAction: 'ignore' });
+        const data = `{"Costum":{"foo_constructor":1}}`;
+        JSONbig.parse(data);
+    });
+});
+

From 7fb3910f6bc923370cadf912cc1a1f30193dceba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Mon, 19 Dec 2022 17:51:00 +0200
Subject: [PATCH 143/338] Fix after community PR (send transactions in bulk).

---
 src-network-providers/apiNetworkProvider.ts   | 29 ++++++++-----------
 src-network-providers/interface.ts            | 12 ++++----
 src-network-providers/proxyNetworkProvider.ts | 27 ++++++++---------
 3 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index b94a7d246..a1b33394c 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -1,21 +1,21 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "./accounts";
-import { IAddress, IContractQuery, INetworkProvider, ITransaction, IPagination } from "./interface";
+import { defaultAxiosConfig, defaultPagination } from "./config";
+import { ContractQueryRequest } from "./contractQueryRequest";
+import { ContractQueryResponse } from "./contractQueryResponse";
+import { ErrContractQuery, ErrNetworkProvider } from "./errors";
+import { IAddress, IContractQuery, INetworkProvider, IPagination, ITransaction } from "./interface";
 import { NetworkConfig } from "./networkConfig";
-import { NetworkStake } from "./networkStake";
 import { NetworkGeneralStatistics } from "./networkGeneralStatistics";
+import { NetworkStake } from "./networkStake";
+import { NetworkStatus } from "./networkStatus";
+import { PairOnNetwork } from "./pairs";
+import { Nonce } from "./primitives";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
-import { Nonce } from "./primitives";
-import { ErrContractQuery, ErrNetworkProvider } from "./errors";
-import { defaultAxiosConfig, defaultPagination } from "./config";
-import { NetworkStatus } from "./networkStatus";
-import { ContractQueryResponse } from "./contractQueryResponse";
-import { ContractQueryRequest } from "./contractQueryRequest";
-import {PairOnNetwork} from "./pairs";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ApiNetworkProvider implements INetworkProvider {
@@ -73,7 +73,7 @@ export class ApiNetworkProvider implements INetworkProvider {
         let url = `accounts/${address.bech32()}/nfts?${this.buildPaginationParams(pagination)}`;
         let response: any[] = await this.doGetGeneric(url);
         let tokens = response.map(item => NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(item));
-        
+
         // TODO: Fix sorting
         tokens.sort((a, b) => a.identifier.localeCompare(b.identifier));
         return tokens;
@@ -120,13 +120,8 @@ export class ApiNetworkProvider implements INetworkProvider {
         return response.txHash;
     }
 
-    async sendBulkTransaction(txs: ITransaction[]): Promise<string> {
-        let sendable: any = [];
-        txs.forEach((tx) => {
-            sendable.push(tx.toSendable());
-        });
-        let response = await this.doPostGeneric("transaction/send-multiple", sendable);
-        return response.txsHashes;
+    async sendTransactions(txs: ITransaction[]): Promise<Map<number, string>> {
+        return await this.backingProxyNetworkProvider.sendTransactions(txs);
     }
 
     async simulateTransaction(tx: ITransaction): Promise<any> {
diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index fe24c8c72..9d9799047 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -1,13 +1,13 @@
 import { AccountOnNetwork } from "./accounts";
+import { ContractQueryResponse } from "./contractQueryResponse";
 import { NetworkConfig } from "./networkConfig";
-import { NetworkStake } from "./networkStake";
 import { NetworkGeneralStatistics } from "./networkGeneralStatistics";
-import { TransactionOnNetwork } from "./transactions";
-import { TransactionStatus } from "./transactionStatus";
+import { NetworkStake } from "./networkStake";
 import { NetworkStatus } from "./networkStatus";
-import { ContractQueryResponse } from "./contractQueryResponse";
-import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
+import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
+import { TransactionOnNetwork } from "./transactions";
+import { TransactionStatus } from "./transactionStatus";
 
 /**
  * An interface that defines the endpoints of an HTTP API Provider.
@@ -76,7 +76,7 @@ export interface INetworkProvider {
     /**
      * Broadcasts a list of already-signed transactions.
      */
-    sendBulkTransaction(tx: ITransaction[]): Promise<string>;
+    sendTransactions(txs: ITransaction[]): Promise<Map<number, string>>;
 
     /**
      * Simulates the processing of an already-signed transaction.
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index c4aa3f04c..ccaef834e 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -1,19 +1,19 @@
 import axios, { AxiosRequestConfig } from "axios";
 import { AccountOnNetwork } from "./accounts";
+import { defaultAxiosConfig } from "./config";
+import { EsdtContractAddress } from "./constants";
+import { ContractQueryRequest } from "./contractQueryRequest";
+import { ContractQueryResponse } from "./contractQueryResponse";
+import { ErrContractQuery, ErrNetworkProvider } from "./errors";
 import { IAddress, IContractQuery, INetworkProvider, IPagination, ITransaction } from "./interface";
 import { NetworkConfig } from "./networkConfig";
-import { NetworkStake } from "./networkStake";
 import { NetworkGeneralStatistics } from "./networkGeneralStatistics";
+import { NetworkStake } from "./networkStake";
+import { NetworkStatus } from "./networkStatus";
+import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
-import { ErrContractQuery, ErrNetworkProvider } from "./errors";
-import { defaultAxiosConfig } from "./config";
-import { NetworkStatus } from "./networkStatus";
-import { ContractQueryResponse } from "./contractQueryResponse";
-import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
-import { ContractQueryRequest } from "./contractQueryRequest";
-import { EsdtContractAddress } from "./constants";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ProxyNetworkProvider implements INetworkProvider {
@@ -111,15 +111,12 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return response.txHash;
     }
 
-    async sendBulkTransaction(txs: ITransaction[]): Promise<string> {
-        let sendable: any = [];
-        txs.forEach((tx) => {
-            sendable.push(tx.toSendable());
-        });
-        let response = await this.doPostGeneric("transaction/send-multiple", sendable);
+    async sendTransactions(txs: ITransaction[]): Promise<Map<number, string>> {
+        const data: any = txs.map(tx => tx.toSendable());
+        const response = await this.doPostGeneric("transaction/send-multiple", data);
         return response.txsHashes;
     }
-    
+
     async simulateTransaction(tx: ITransaction): Promise<any> {
         let response = await this.doPostGeneric("transaction/simulate", tx.toSendable());
         return response;

From 9de774e7db498a14626581cd764a2cb1f3ec52ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Mon, 19 Dec 2022 19:30:02 +0200
Subject: [PATCH 144/338] Unit tests, fix response.

---
 src-network-providers/apiNetworkProvider.ts   |  2 +-
 src-network-providers/interface.ts            |  2 +-
 .../providers.dev.net.spec.ts                 | 66 +++++++++++++++++--
 src-network-providers/proxyNetworkProvider.ts | 10 ++-
 4 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index a1b33394c..9942b9807 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -120,7 +120,7 @@ export class ApiNetworkProvider implements INetworkProvider {
         return response.txHash;
     }
 
-    async sendTransactions(txs: ITransaction[]): Promise<Map<number, string>> {
+    async sendTransactions(txs: ITransaction[]): Promise<string[]> {
         return await this.backingProxyNetworkProvider.sendTransactions(txs);
     }
 
diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index 9d9799047..e5eaa243e 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -76,7 +76,7 @@ export interface INetworkProvider {
     /**
      * Broadcasts a list of already-signed transactions.
      */
-    sendTransactions(txs: ITransaction[]): Promise<Map<number, string>>;
+    sendTransactions(txs: ITransaction[]): Promise<string[]>;
 
     /**
      * Simulates the processing of an already-signed transaction.
diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 3c67faf00..d8209fb4d 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -1,11 +1,11 @@
 import { assert } from "chai";
+import { ApiNetworkProvider } from "./apiNetworkProvider";
 import { INetworkProvider } from "./interface";
-import { TransactionOnNetwork } from "./transactions";
-import { TransactionStatus } from "./transactionStatus";
 import { Address } from "./primitives";
-import { MockQuery } from "./testscommon/dummyQuery";
-import { ApiNetworkProvider } from "./apiNetworkProvider";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
+import { MockQuery } from "./testscommon/dummyQuery";
+import { TransactionOnNetwork } from "./transactions";
+import { TransactionStatus } from "./transactionStatus";
 
 describe("test network providers on devnet: Proxy and API", function () {
     let alice = new Address("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
@@ -99,6 +99,62 @@ describe("test network providers on devnet: Proxy and API", function () {
         }
     });
 
+    it("should be able to send transaction(s)", async function () {
+        this.timeout(5000);
+
+        const txs = [
+            {
+                toSendable: function () {
+                    return {
+                        "nonce": 42,
+                        "value": "1",
+                        "receiver": "erd1testnlersh4z0wsv8kjx39me4rmnvjkwu8dsaea7ukdvvc9z396qykv7z7",
+                        "sender": "erd15x2panzqvfxul2lvstfrmdcl5t4frnsylfrhng8uunwdssxw4y9succ9sq",
+                        "gasPrice": 1000000000,
+                        "gasLimit": 50000,
+                        "chainID": "D",
+                        "version": 1,
+                        "signature": "c8eb539e486db7d703d8c70cab3b7679113f77c4685d8fcc94db027ceacc6b8605115034355386dffd7aa12e63dbefa03251a2f1b1d971f52250187298d12900"
+                    }
+                }
+            },
+            {
+                toSendable: function () {
+                    return {
+                        "nonce": 43,
+                        "value": "1",
+                        "receiver": "erd1testnlersh4z0wsv8kjx39me4rmnvjkwu8dsaea7ukdvvc9z396qykv7z7",
+                        "sender": "erd15x2panzqvfxul2lvstfrmdcl5t4frnsylfrhng8uunwdssxw4y9succ9sq",
+                        "gasPrice": 1000000000,
+                        "gasLimit": 50000,
+                        "chainID": "D",
+                        "version": 1,
+                        "signature": "9c4c22d0ae1b5a10c39583a5ab9020b00b27aa69d4ac8ab4922620dbf0df4036ed890f9946d38a9d0c85d6ac485c0d9b2eac0005e752f249fd0ad863b0471d02"
+                    }
+                }
+            },
+            {
+                toSendable: function () {
+                    return {
+                        "nonce": 44
+                    }
+                }
+            }
+        ];
+
+        const expectedHashes = [
+            "6e2fa63ea02937f00d7549f3e4eb9af241e4ac13027aa65a5300816163626c01",
+            "37d7e84313a5baea2a61c6ab10bb29b52bc54f7ac9e3918a9faeb1e08f42081c",
+            null
+        ]
+
+        assert.equal(await apiProvider.sendTransaction(txs[0]), expectedHashes[0]);
+        assert.equal(await proxyProvider.sendTransaction(txs[1]), expectedHashes[1]);
+
+        assert.deepEqual(await apiProvider.sendTransactions(txs), expectedHashes);
+        assert.deepEqual(await proxyProvider.sendTransactions(txs), expectedHashes);
+    });
+
     it("should have same response for getTransaction()", async function () {
         this.timeout(20000);
 
@@ -256,7 +312,7 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         let apiResponse = await apiProvider.queryContract(query);
         let proxyResponse = await proxyProvider.queryContract(query);
-        
+
         assert.deepEqual(apiResponse, proxyResponse);
         assert.deepEqual(apiResponse.getReturnDataParts(), proxyResponse.getReturnDataParts());
     });
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index ccaef834e..1a7ef38f9 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -111,10 +111,16 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return response.txHash;
     }
 
-    async sendTransactions(txs: ITransaction[]): Promise<Map<number, string>> {
+    async sendTransactions(txs: ITransaction[]): Promise<string[]> {
         const data: any = txs.map(tx => tx.toSendable());
         const response = await this.doPostGeneric("transaction/send-multiple", data);
-        return response.txsHashes;
+        const hashes = Array(txs.length).fill(null);
+
+        for (let i = 0; i < txs.length; i++) {
+            hashes[i] = response.txsHashes[i.toString()] || null;
+        }
+
+        return hashes;
     }
 
     async simulateTransaction(tx: ITransaction): Promise<any> {

From a11a24d17f2a2eeb701c750665fcff1650eb4233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Mon, 19 Dec 2022 19:49:52 +0200
Subject: [PATCH 145/338] Fix comment, formatting etc.

---
 src-network-providers/providers.dev.net.spec.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index de2d8ed9b..d0b3969d2 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -1,11 +1,11 @@
 import { assert } from "chai";
+import { ApiNetworkProvider } from "./apiNetworkProvider";
 import { INetworkProvider } from "./interface";
-import { TransactionOnNetwork } from "./transactions";
-import { TransactionStatus } from "./transactionStatus";
 import { Address } from "./primitives";
-import { MockQuery } from "./testscommon/dummyQuery";
-import { ApiNetworkProvider } from "./apiNetworkProvider";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
+import { MockQuery } from "./testscommon/dummyQuery";
+import { TransactionOnNetwork } from "./transactions";
+import { TransactionStatus } from "./transactionStatus";
 
 describe("test network providers on devnet: Proxy and API", function () {
     let alice = new Address("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
@@ -166,7 +166,7 @@ describe("test network providers on devnet: Proxy and API", function () {
             let apiResponse = await apiProvider.getDefinitionOfFungibleToken(identifier);
             let proxyResponse = await proxyProvider.getDefinitionOfFungibleToken(identifier);
 
-            // Assets are only present on API response.
+            // Assets are only present on API responses, thus we ignore them for comparison.
             apiResponse.assets = {};
 
             assert.equal(apiResponse.identifier, identifier);
@@ -259,7 +259,7 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         let apiResponse = await apiProvider.queryContract(query);
         let proxyResponse = await proxyProvider.queryContract(query);
-        
+
         assert.deepEqual(apiResponse, proxyResponse);
         assert.deepEqual(apiResponse.getReturnDataParts(), proxyResponse.getReturnDataParts());
     });

From 1ab3c697688a6efe1b46483e85bae964c235dae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Fri, 6 Jan 2023 19:33:08 +0200
Subject: [PATCH 146/338] Elrond to MultiversX (part 1).

---
 src-wallet/crypto/pubkeyEncryptor.ts | 12 ++++++------
 src-wallet/userWallet.ts             | 16 ++++++++--------
 src-wallet/validators.spec.ts        |  2 --
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src-wallet/crypto/pubkeyEncryptor.ts b/src-wallet/crypto/pubkeyEncryptor.ts
index e63648185..b3f6517c1 100644
--- a/src-wallet/crypto/pubkeyEncryptor.ts
+++ b/src-wallet/crypto/pubkeyEncryptor.ts
@@ -1,9 +1,9 @@
-import nacl from "tweetnacl";
-import ed2curve from "ed2curve";
 import crypto from "crypto";
-import { X25519EncryptedData } from "./x25519EncryptedData";
+import ed2curve from "ed2curve";
+import nacl from "tweetnacl";
 import { UserPublicKey, UserSecretKey } from "../userKeys";
 import { PubKeyEncCipher, PubKeyEncNonceLength, PubKeyEncVersion } from "./constants";
+import { X25519EncryptedData } from "./x25519EncryptedData";
 
 export class PubkeyEncryptor {
     static encrypt(data: Buffer, recipientPubKey: UserPublicKey, authSecretKey: UserSecretKey): X25519EncryptedData {
@@ -17,13 +17,13 @@ export class PubkeyEncryptor {
 
         // For the nonce we use a random component and a deterministic one based on the message
         //  - this is so we won't completely rely on the random number generator
-        const nonceDeterministic = crypto.createHash('sha256').update(data).digest().slice(0, PubKeyEncNonceLength/2);
-        const nonceRandom = nacl.randomBytes(PubKeyEncNonceLength/2);
+        const nonceDeterministic = crypto.createHash('sha256').update(data).digest().slice(0, PubKeyEncNonceLength / 2);
+        const nonceRandom = nacl.randomBytes(PubKeyEncNonceLength / 2);
         const nonce = Buffer.concat([nonceDeterministic, nonceRandom]);
         const encryptedMessage = nacl.box(data, nonce, recipientDHPubKey, edhConvertedSecretKey);
 
         // Note that the ciphertext is already authenticated for the ephemeral key - but we want it authenticated by
-        //  the elrond ed25519 key which the user interacts with. A signature over H(ciphertext | edhPubKey)
+        //  the ed25519 key which the user interacts with. A signature over H(ciphertext | edhPubKey)
         //  would be enough
         const authMessage = crypto.createHash('sha256').update(
             Buffer.concat([encryptedMessage, edhPair.publicKey])
diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index 485e97a3c..8141b8983 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -1,13 +1,13 @@
-import { UserPublicKey, UserSecretKey } from "./userKeys";
-import { EncryptedData, Encryptor, Decryptor, CipherAlgorithm, Version, KeyDerivationFunction, Randomness } from "./crypto";
+import { CipherAlgorithm, Decryptor, EncryptedData, Encryptor, KeyDerivationFunction, Randomness, Version } from "./crypto";
 import { ScryptKeyDerivationParams } from "./crypto/derivationParams";
+import { UserPublicKey, UserSecretKey } from "./userKeys";
 
 export class UserWallet {
     private readonly publicKey: UserPublicKey;
     private readonly encryptedData: EncryptedData;
 
     /**
-     * Copied from: https://github.com/ElrondNetwork/elrond-core-js/blob/v1.28.0/src/account.js#L76
+     * Copied from: https://github.com/multiversx/mx-deprecated-core-js/blob/v1.28.0/src/account.js#L76
      * Notes: adjustements (code refactoring, no change in logic), in terms of: 
      *  - typing (since this is the TypeScript version)
      *  - error handling (in line with erdjs's error system)
@@ -24,7 +24,7 @@ export class UserWallet {
     }
 
     /**
-     * Copied from: https://github.com/ElrondNetwork/elrond-core-js/blob/v1.28.0/src/account.js#L42
+     * Copied from: https://github.com/multiversx/mx-deprecated-core-js/blob/v1.28.0/src/account.js#L42
      * Notes: adjustements (code refactoring, no change in logic), in terms of: 
      *  - typing (since this is the TypeScript version)
      *  - error handling (in line with erdjs's error system)
@@ -55,10 +55,10 @@ export class UserWallet {
             iv: keyfileObject.crypto.cipherparams.iv,
             kdf: keyfileObject.crypto.kdf,
             kdfparams: new ScryptKeyDerivationParams(
-              keyfileObject.crypto.kdfparams.n,
-              keyfileObject.crypto.kdfparams.r,
-              keyfileObject.crypto.kdfparams.p,
-              keyfileObject.crypto.kdfparams.dklen
+                keyfileObject.crypto.kdfparams.n,
+                keyfileObject.crypto.kdfparams.r,
+                keyfileObject.crypto.kdfparams.p,
+                keyfileObject.crypto.kdfparams.dklen
             ),
             salt: keyfileObject.crypto.kdfparams.salt,
             mac: keyfileObject.crypto.mac,
diff --git a/src-wallet/validators.spec.ts b/src-wallet/validators.spec.ts
index 609098cca..dee84cf8f 100644
--- a/src-wallet/validators.spec.ts
+++ b/src-wallet/validators.spec.ts
@@ -11,7 +11,6 @@ describe("test validator keys", () => {
         assert.equal(key.generatePublicKey().hex(), "e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208");
 
         let signature = key.sign(Buffer.from("hello"));
-        // Expected signature computed using `elrond-sdk-go-tools/cmd/signer/mcl_signer.go`
         assert.equal(signature.toString("hex"), "84fd0a3a9d4f1ea2d4b40c6da67f9b786284a1c3895b7253fec7311597cda3f757862bb0690a92a13ce612c33889fd86");
 
         secretKey = Buffer.from(Buffer.from("ODA4NWJhMWQ3ZjdjM2RiOTM4YWQ3MDU5NWEyYmRhYjA5NjQ0ZjFlYzM4MDNiZTE3MWMzM2YxNGJjODBkNGUzYg==", "base64").toString(), "hex");
@@ -19,7 +18,6 @@ describe("test validator keys", () => {
         assert.equal(key.generatePublicKey().hex(), "78689fd4b1e2e434d567fe01e61598a42717d83124308266bd09ccc15d2339dd318c019914b86ac29adbae5dd8a02d0307425e9bd85a296e94943708c72f8c670f0b7c50a890a5719088dbd9f1d062cad9acffa06df834106eebe1a4257ef00d");
 
         signature = key.sign(Buffer.from("hello"));
-        // Expected signature computed using `elrond-sdk-go-tools/cmd/signer/mcl_signer.go`
         assert.equal(signature.toString("hex"), "be2e593ff10899a2ee8e1d5c8094e36c9f48e04b87e129991ff09475808743e07bb41bf6e7bc1463fa554c4b46594b98");
     });
 

From 5ba013124acf24ad4264a2198ffb352baab889c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Fri, 6 Jan 2023 20:01:29 +0200
Subject: [PATCH 147/338] Rename Elrond to MultiversX.

---
 src-network-providers/providers.dev.net.spec.ts | 4 ++--
 src-network-providers/proxyNetworkProvider.ts   | 4 ++--
 src-network-providers/tokenDefinitions.ts       | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 1d1591169..cb58f22ac 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -13,8 +13,8 @@ describe("test network providers on devnet: Proxy and API", function () {
     let carol = new Address("erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
     let dan = new Address("erd1kyaqzaprcdnv4luvanah0gfxzzsnpaygsy6pytrexll2urtd05ts9vegu7");
 
-    let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.elrond.com", { timeout: 10000 });
-    let proxyProvider: INetworkProvider = new ProxyNetworkProvider("https://devnet-gateway.elrond.com", { timeout: 10000 });
+    let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.multiversx.com", { timeout: 10000 });
+    let proxyProvider: INetworkProvider = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com", { timeout: 10000 });
 
     it("should have same response for getNetworkConfig()", async function () {
         let apiResponse = await apiProvider.getNetworkConfig();
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index 1a7ef38f9..8eb1f582b 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -39,13 +39,13 @@ export class ProxyNetworkProvider implements INetworkProvider {
 
     async getNetworkStakeStatistics(): Promise<NetworkStake> {
         // TODO: Implement wrt.:
-        // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/stake/stake.service.ts
+        // https://github.com/multiversx/mx-api-service/blob/main/src/endpoints/stake/stake.service.ts
         throw new Error("Method not implemented.");
     }
 
     async getNetworkGeneralStatistics(): Promise<NetworkGeneralStatistics> {
         // TODO: Implement wrt. (full implementation may not be possible):
-        // https://github.com/ElrondNetwork/api.elrond.com/blob/main/src/endpoints/network/network.service.ts
+        // https://github.com/multiversx/mx-api-service/blob/main/src/endpoints/network/network.service.ts
         throw new Error("Method not implemented.");
     }
 
diff --git a/src-network-providers/tokenDefinitions.ts b/src-network-providers/tokenDefinitions.ts
index 2c1bf1c90..519e03e48 100644
--- a/src-network-providers/tokenDefinitions.ts
+++ b/src-network-providers/tokenDefinitions.ts
@@ -1,6 +1,6 @@
 import BigNumber from "bignumber.js";
-import { Address } from "./primitives";
 import { IAddress } from "./interface";
+import { Address } from "./primitives";
 
 export class DefinitionOfFungibleTokenOnNetwork {
     identifier: string = "";
@@ -18,7 +18,7 @@ export class DefinitionOfFungibleTokenOnNetwork {
     canFreeze: boolean = false;
     canWipe: boolean = false;
     canAddSpecialRoles: boolean = false;
-    assets: Record<string, any> = {}; 
+    assets: Record<string, any> = {};
 
     static fromApiHttpResponse(payload: any): DefinitionOfFungibleTokenOnNetwork {
         let result = new DefinitionOfFungibleTokenOnNetwork();
@@ -44,7 +44,7 @@ export class DefinitionOfFungibleTokenOnNetwork {
 
     /**
      * The implementation has been moved here from the following location:
-     * https://github.com/ElrondNetwork/elrond-sdk-erdjs/blob/release/v9/src/token.ts
+     * https://github.com/multiversx/mx-sdk-erdjs/blob/release/v9/src/token.ts
      */
     static fromResponseOfGetTokenProperties(identifier: string, data: Buffer[]): DefinitionOfFungibleTokenOnNetwork {
         let result = new DefinitionOfFungibleTokenOnNetwork();
@@ -106,7 +106,7 @@ export class DefinitionOfTokenCollectionOnNetwork {
 
     /**
      * The implementation has been moved here from the following location:
-     * https://github.com/ElrondNetwork/elrond-sdk-erdjs/blob/release/v9/src/token.ts
+     * https://github.com/multiversx/mx-sdk-erdjs/blob/release/v9/src/token.ts
      */
     static fromResponseOfGetTokenProperties(collection: string, data: Buffer[]): DefinitionOfTokenCollectionOnNetwork {
         let result = new DefinitionOfTokenCollectionOnNetwork();

From 9429911ed601efddc68c13625ad413687cc3d375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 10 Jan 2023 21:13:21 +0200
Subject: [PATCH 148/338] Rename erdjs to sdk-js.

---
 src-network-providers/interface.ts        | 4 ++--
 src-network-providers/tokenDefinitions.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index e5eaa243e..641097237 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -105,12 +105,12 @@ export interface INetworkProvider {
     getNonFungibleToken(collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork>;
 
     /**
-     * Performs a generic GET action against the provider (useful for new HTTP endpoints, not yet supported by erdjs).
+     * Performs a generic GET action against the provider (useful for new HTTP endpoints).
      */
     doGetGeneric(resourceUrl: string): Promise<any>;
 
     /**
-     * Performs a generic POST action against the provider (useful for new HTTP endpoints, not yet supported by erdjs).
+     * Performs a generic POST action against the provider (useful for new HTTP endpoints).
      */
     doPostGeneric(resourceUrl: string, payload: any): Promise<any>;
 }
diff --git a/src-network-providers/tokenDefinitions.ts b/src-network-providers/tokenDefinitions.ts
index 519e03e48..b04440283 100644
--- a/src-network-providers/tokenDefinitions.ts
+++ b/src-network-providers/tokenDefinitions.ts
@@ -44,7 +44,7 @@ export class DefinitionOfFungibleTokenOnNetwork {
 
     /**
      * The implementation has been moved here from the following location:
-     * https://github.com/multiversx/mx-sdk-erdjs/blob/release/v9/src/token.ts
+     * https://github.com/multiversx/mx-sdk-js/blob/release/v9/src/token.ts
      */
     static fromResponseOfGetTokenProperties(identifier: string, data: Buffer[]): DefinitionOfFungibleTokenOnNetwork {
         let result = new DefinitionOfFungibleTokenOnNetwork();
@@ -106,7 +106,7 @@ export class DefinitionOfTokenCollectionOnNetwork {
 
     /**
      * The implementation has been moved here from the following location:
-     * https://github.com/multiversx/mx-sdk-erdjs/blob/release/v9/src/token.ts
+     * https://github.com/multiversx/mx-sdk-js/blob/release/v9/src/token.ts
      */
     static fromResponseOfGetTokenProperties(collection: string, data: Buffer[]): DefinitionOfTokenCollectionOnNetwork {
         let result = new DefinitionOfTokenCollectionOnNetwork();

From 7e1f47ffb3cdfe69799e71c0f19a89fbc1affdab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 11 Jan 2023 11:13:31 +0200
Subject: [PATCH 149/338] Rename package: sdk-network-providers.

---
 src-network-providers/tokenDefinitions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-network-providers/tokenDefinitions.ts b/src-network-providers/tokenDefinitions.ts
index b04440283..fc97af03e 100644
--- a/src-network-providers/tokenDefinitions.ts
+++ b/src-network-providers/tokenDefinitions.ts
@@ -44,7 +44,7 @@ export class DefinitionOfFungibleTokenOnNetwork {
 
     /**
      * The implementation has been moved here from the following location:
-     * https://github.com/multiversx/mx-sdk-js/blob/release/v9/src/token.ts
+     * https://github.com/multiversx/mx-sdk-js-core/blob/release/v9/src/token.ts
      */
     static fromResponseOfGetTokenProperties(identifier: string, data: Buffer[]): DefinitionOfFungibleTokenOnNetwork {
         let result = new DefinitionOfFungibleTokenOnNetwork();
@@ -106,7 +106,7 @@ export class DefinitionOfTokenCollectionOnNetwork {
 
     /**
      * The implementation has been moved here from the following location:
-     * https://github.com/multiversx/mx-sdk-js/blob/release/v9/src/token.ts
+     * https://github.com/multiversx/mx-sdk-js-core/blob/release/v9/src/token.ts
      */
     static fromResponseOfGetTokenProperties(collection: string, data: Buffer[]): DefinitionOfTokenCollectionOnNetwork {
         let result = new DefinitionOfTokenCollectionOnNetwork();

From 6e2f2c360addc48e3bc32af59a36c628ce1caa26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 11 Jan 2023 11:34:11 +0200
Subject: [PATCH 150/338] Rename package: sdk-wallet.

---
 src-wallet/crypto/constants.ts | 2 +-
 src-wallet/userWallet.ts       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-wallet/crypto/constants.ts b/src-wallet/crypto/constants.ts
index 07a4ca7c4..f99a1c365 100644
--- a/src-wallet/crypto/constants.ts
+++ b/src-wallet/crypto/constants.ts
@@ -1,4 +1,4 @@
-// In a future PR, improve versioning infrastructure for key-file objects in erdjs.
+// In a future PR, improve versioning infrastructure for key-file objects.
 export const Version = 4;
 export const CipherAlgorithm = "aes-128-ctr";
 export const DigestAlgorithm = "sha256";
diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index 8141b8983..d365b8c31 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -10,7 +10,7 @@ export class UserWallet {
      * Copied from: https://github.com/multiversx/mx-deprecated-core-js/blob/v1.28.0/src/account.js#L76
      * Notes: adjustements (code refactoring, no change in logic), in terms of: 
      *  - typing (since this is the TypeScript version)
-     *  - error handling (in line with erdjs's error system)
+     *  - error handling (in line with sdk-core's error system)
      *  - references to crypto functions
      *  - references to object members
      * 
@@ -27,7 +27,7 @@ export class UserWallet {
      * Copied from: https://github.com/multiversx/mx-deprecated-core-js/blob/v1.28.0/src/account.js#L42
      * Notes: adjustements (code refactoring, no change in logic), in terms of: 
      *  - typing (since this is the TypeScript version)
-     *  - error handling (in line with erdjs's error system)
+     *  - error handling (in line with sdk-core's error system)
      *  - references to crypto functions
      *  - references to object members
      * 

From 570dfceb0ccef5c932b69214a8c3e9cb18a2d3ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 11 Jan 2023 18:03:07 +0200
Subject: [PATCH 151/338] Use sdk-bls-wasm from new organization.

---
 src-wallet/validatorKeys.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-wallet/validatorKeys.ts b/src-wallet/validatorKeys.ts
index 441c4ac07..bd77ae2f9 100644
--- a/src-wallet/validatorKeys.ts
+++ b/src-wallet/validatorKeys.ts
@@ -2,7 +2,7 @@ import { guardLength } from "./assertions";
 import { ErrInvariantFailed } from "./errors";
 import { parseValidatorKey } from "./pem";
 
-const bls = require('@elrondnetwork/bls-wasm');
+const bls = require('@multiversx/sdk-bls-wasm');
 
 export const VALIDATOR_SECRETKEY_LENGTH = 32;
 export const VALIDATOR_PUBKEY_LENGTH = 96;

From 8c92cff5ff7123206466d3ab40b08d27d16c97bf Mon Sep 17 00:00:00 2001
From: andreibancioiu <andrei.bancioiu@gmail.com>
Date: Mon, 23 Jan 2023 14:38:38 +0200
Subject: [PATCH 152/338] Redo PR 33 (error handling).

---
 src-network-providers/apiNetworkProvider.ts   | 4 ++--
 src-network-providers/proxyNetworkProvider.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 9942b9807..98b57fa45 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -205,8 +205,8 @@ export class ApiNetworkProvider implements INetworkProvider {
             throw new ErrNetworkProvider(resourceUrl, error.toString(), error);
         }
 
-        let errorData = error.response.data;
-        let originalErrorMessage = errorData.error || errorData.message || JSON.stringify(errorData);
+        const errorData = error.response.data;
+        const originalErrorMessage = errorData.message || errorData.error || JSON.stringify(errorData);
         throw new ErrNetworkProvider(resourceUrl, originalErrorMessage, error);
     }
 }
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index 8eb1f582b..fad7ae2d0 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -224,8 +224,8 @@ export class ProxyNetworkProvider implements INetworkProvider {
             throw new ErrNetworkProvider(resourceUrl, error.toString(), error);
         }
 
-        let errorData = error.response.data;
-        let originalErrorMessage = errorData.error || errorData.message || JSON.stringify(errorData);
+        const errorData = error.response.data;
+        const originalErrorMessage = errorData.message || errorData.error || JSON.stringify(errorData);
         throw new ErrNetworkProvider(resourceUrl, originalErrorMessage, error);
     }
 }

From a988993023d126e947c3916f0b281031c7abaea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Thu, 26 Jan 2023 10:37:35 +0200
Subject: [PATCH 153/338] Sketch wallet.json with mnemonic / arbitrary data.

---
 src-wallet/crypto/constants.ts    |   2 -
 src-wallet/crypto/encrypt.spec.ts |   8 +-
 src-wallet/crypto/encryptor.ts    |  14 +-
 src-wallet/userWallet.ts          | 248 +++++++++++++++++++++++++-----
 src-wallet/users.spec.ts          |  64 ++++----
 5 files changed, 263 insertions(+), 73 deletions(-)

diff --git a/src-wallet/crypto/constants.ts b/src-wallet/crypto/constants.ts
index f99a1c365..9d29781d0 100644
--- a/src-wallet/crypto/constants.ts
+++ b/src-wallet/crypto/constants.ts
@@ -1,5 +1,3 @@
-// In a future PR, improve versioning infrastructure for key-file objects.
-export const Version = 4;
 export const CipherAlgorithm = "aes-128-ctr";
 export const DigestAlgorithm = "sha256";
 export const KeyDerivationFunction = "scrypt";
diff --git a/src-wallet/crypto/encrypt.spec.ts b/src-wallet/crypto/encrypt.spec.ts
index b076b3111..4c5f1c517 100644
--- a/src-wallet/crypto/encrypt.spec.ts
+++ b/src-wallet/crypto/encrypt.spec.ts
@@ -1,12 +1,12 @@
 import { assert } from "chai";
-import { Encryptor } from "./encryptor";
 import { Decryptor } from "./decryptor";
 import { EncryptedData } from "./encryptedData";
+import { Encryptor } from "./encryptor";
 
 describe("test address", () => {
-  it("encrypts/decrypts",  () => {
+  it("encrypts/decrypts", () => {
     const sensitiveData = Buffer.from("my mnemonic");
-    const encryptedData = Encryptor.encrypt(sensitiveData, "password123");
+    const encryptedData = Encryptor.encrypt(7, sensitiveData, "password123");
     const decryptedBuffer = Decryptor.decrypt(encryptedData, "password123");
 
     assert.equal(sensitiveData.toString('hex'), decryptedBuffer.toString('hex'));
@@ -14,7 +14,7 @@ describe("test address", () => {
 
   it("encodes/decodes kdfparams", () => {
     const sensitiveData = Buffer.from("my mnemonic");
-    const encryptedData = Encryptor.encrypt(sensitiveData, "password123");
+    const encryptedData = Encryptor.encrypt(7, sensitiveData, "password123");
     const decodedData = EncryptedData.fromJSON(encryptedData.toJSON());
 
     assert.deepEqual(decodedData, encryptedData, "invalid decoded data");
diff --git a/src-wallet/crypto/encryptor.ts b/src-wallet/crypto/encryptor.ts
index 33379cbc3..c0708acfe 100644
--- a/src-wallet/crypto/encryptor.ts
+++ b/src-wallet/crypto/encryptor.ts
@@ -1,11 +1,15 @@
 import crypto from "crypto";
-import { Randomness } from "./randomness";
+import { CipherAlgorithm, DigestAlgorithm, KeyDerivationFunction } from "./constants";
 import { ScryptKeyDerivationParams } from "./derivationParams";
-import { CipherAlgorithm, DigestAlgorithm, Version, KeyDerivationFunction } from "./constants";
-import {EncryptedData} from "./encryptedData";
+import { EncryptedData } from "./encryptedData";
+import { Randomness } from "./randomness";
+
+export enum EncryptorVersion {
+  V4 = 4,
+}
 
 export class Encryptor {
-  static encrypt(data: Buffer, password: string, randomness: Randomness = new Randomness()): EncryptedData {
+  static encrypt(version: EncryptorVersion, data: Buffer, password: string, randomness: Randomness = new Randomness()): EncryptedData {
     const kdParams = new ScryptKeyDerivationParams();
     const derivedKey = kdParams.generateDerivedKey(Buffer.from(password), randomness.salt);
     const derivedKeyFirstHalf = derivedKey.slice(0, 16);
@@ -16,7 +20,7 @@ export class Encryptor {
     const mac = crypto.createHmac(DigestAlgorithm, derivedKeySecondHalf).update(ciphertext).digest();
 
     return new EncryptedData({
-      version: Version,
+      version: version,
       id: randomness.id,
       ciphertext: ciphertext.toString('hex'),
       iv: randomness.iv.toString('hex'),
diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index d365b8c31..f9866a1aa 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -1,26 +1,125 @@
-import { CipherAlgorithm, Decryptor, EncryptedData, Encryptor, KeyDerivationFunction, Randomness, Version } from "./crypto";
+import { CipherAlgorithm, Decryptor, EncryptedData, Encryptor, EncryptorVersion, KeyDerivationFunction, Randomness } from "./crypto";
 import { ScryptKeyDerivationParams } from "./crypto/derivationParams";
+import { Err } from "./errors";
 import { UserPublicKey, UserSecretKey } from "./userKeys";
 
+export enum EnvelopeVersion {
+    // Does not have the "kind" field, and is meant to hold the **secret key**.
+    // The "crypto" section is not versioned.
+    V4 = 4,
+    // Has the "kind" field, and is meant to hold the **secret key** or **the mnemonic** (or any other secret payload).
+    // Furthermore, the "crypto" section is versioned separately.
+    V5 = 5
+}
+
+export enum UserWalletKind {
+    SecretKey = "secretKey",
+    Mnemonic = "mnemonic",
+    Arbitrary = "arbitrary"
+}
+
 export class UserWallet {
-    private readonly publicKey: UserPublicKey;
+    private readonly envelopeVersion: number;
+    private readonly kind: UserWalletKind;
     private readonly encryptedData: EncryptedData;
+    private readonly publicKeyWhenKindIsSecretKey?: UserPublicKey;
 
-    /**
-     * Copied from: https://github.com/multiversx/mx-deprecated-core-js/blob/v1.28.0/src/account.js#L76
-     * Notes: adjustements (code refactoring, no change in logic), in terms of: 
-     *  - typing (since this is the TypeScript version)
-     *  - error handling (in line with sdk-core's error system)
-     *  - references to crypto functions
-     *  - references to object members
-     * 
-     * Given a password, generates the contents for a file containing the account's secret key,
-     * passed through a password-based key derivation function (kdf).
-     */
-    constructor(secretKey: UserSecretKey, password: string, randomness: Randomness = new Randomness()) {
-        const text = Buffer.concat([secretKey.valueOf(), secretKey.generatePublicKey().valueOf()]);
-        this.encryptedData = Encryptor.encrypt(text, password, randomness);
-        this.publicKey = secretKey.generatePublicKey();
+    private constructor({
+        envelopeVersion: envelopeVersion,
+        kind,
+        encryptedData,
+        publicKeyWhenKindIsSecretKey
+    }: {
+        envelopeVersion: EnvelopeVersion;
+        kind: UserWalletKind;
+        encryptedData: EncryptedData;
+        publicKeyWhenKindIsSecretKey?: UserPublicKey;
+    }) {
+        this.envelopeVersion = envelopeVersion;
+        this.kind = kind;
+        this.encryptedData = encryptedData;
+        this.publicKeyWhenKindIsSecretKey = publicKeyWhenKindIsSecretKey;
+    }
+
+    static fromSecretKey({
+        envelopeVersion,
+        encryptorVersion,
+        secretKey,
+        password,
+        randomness,
+    }: {
+        envelopeVersion?: EnvelopeVersion;
+        encryptorVersion?: EncryptorVersion;
+        secretKey: UserSecretKey;
+        password: string;
+        randomness?: Randomness;
+    }): UserWallet {
+        envelopeVersion = envelopeVersion || EnvelopeVersion.V4;
+        encryptorVersion = encryptorVersion || EncryptorVersion.V4;
+        randomness = randomness || new Randomness();
+
+        const publicKey = secretKey.generatePublicKey();
+        const text = Buffer.concat([secretKey.valueOf(), publicKey.valueOf()]);
+        const encryptedData = Encryptor.encrypt(encryptorVersion, text, password, randomness);
+
+        return new UserWallet({
+            envelopeVersion: envelopeVersion,
+            kind: UserWalletKind.SecretKey,
+            encryptedData,
+            publicKeyWhenKindIsSecretKey: publicKey
+        });
+    }
+
+    static fromMnemonic({
+        envelopeVersion,
+        encryptorVersion,
+        mnemonic,
+        password,
+        randomness,
+    }: {
+        envelopeVersion?: EnvelopeVersion;
+        encryptorVersion?: EncryptorVersion;
+        mnemonic: string;
+        password: string;
+        randomness?: Randomness;
+    }): UserWallet {
+        envelopeVersion = envelopeVersion || EnvelopeVersion.V5;
+        encryptorVersion = encryptorVersion || EncryptorVersion.V4;
+        randomness = randomness || new Randomness();
+
+        const encryptedData = Encryptor.encrypt(encryptorVersion, Buffer.from(mnemonic), password, randomness);
+
+        return new UserWallet({
+            envelopeVersion: envelopeVersion,
+            kind: UserWalletKind.Mnemonic,
+            encryptedData
+        });
+    }
+
+    static fromArbitrary({
+        envelopeVersion,
+        encryptorVersion,
+        arbitraryData,
+        password,
+        randomness,
+    }: {
+        envelopeVersion?: EnvelopeVersion;
+        encryptorVersion?: EncryptorVersion;
+        arbitraryData: Buffer;
+        password: string;
+        randomness?: Randomness;
+    }): UserWallet {
+        envelopeVersion = envelopeVersion || EnvelopeVersion.V5;
+        encryptorVersion = encryptorVersion || EncryptorVersion.V4;
+        randomness = randomness || new Randomness();
+
+        const encryptedData = Encryptor.encrypt(encryptorVersion, arbitraryData, password, randomness);
+
+        return new UserWallet({
+            envelopeVersion: envelopeVersion,
+            kind: UserWalletKind.Arbitrary,
+            encryptedData
+        });
     }
 
     /**
@@ -34,6 +133,10 @@ export class UserWallet {
      * From an encrypted keyfile, given the password, loads the secret key and the public key.
      */
     static decryptSecretKey(keyFileObject: any, password: string): UserSecretKey {
+        if (keyFileObject.version >= EnvelopeVersion.V5) {
+            this.requireKind(keyFileObject.kind, UserWalletKind.SecretKey, "decryptSecretKey")
+        }
+
         const encryptedData = UserWallet.edFromJSON(keyFileObject);
 
         let text = Decryptor.decrypt(encryptedData, password);
@@ -42,13 +145,37 @@ export class UserWallet {
             text = Buffer.concat([zeroPadding, text]);
         }
 
-        let seed = text.slice(0, 32);
+        const seed = text.slice(0, 32);
         return new UserSecretKey(seed);
     }
 
+    static decryptMnemonic(keyFileObject: any, password: string): string {
+        this.requireV5OrHigher(keyFileObject.version, "decryptMnemonic");
+        this.requireKind(keyFileObject.kind, UserWalletKind.Mnemonic, "decryptMnemonic")
+
+        const encryptedData = UserWallet.edFromJSON(keyFileObject);
+        const text = Decryptor.decrypt(encryptedData, password);
+        return text.toString();
+    }
+
+    static decryptArbitrary(keyFileObject: any, password: string): Buffer {
+        this.requireV5OrHigher(keyFileObject.version, "decryptArbitrary");
+        this.requireKind(keyFileObject.kind, UserWalletKind.Arbitrary, "decryptArbitrary")
+
+        const encryptedData = UserWallet.edFromJSON(keyFileObject);
+        const data = Decryptor.decrypt(encryptedData, password);
+        return data;
+    }
+
     static edFromJSON(keyfileObject: any): EncryptedData {
+        const encryptorVersion: number = (keyfileObject.version == EnvelopeVersion.V4) ?
+            // In V4, the "crypto" section inherits the version from the envelope.
+            EncryptorVersion.V4 :
+            // In V5, the "crypto" section has its own version.
+            keyfileObject.crypto.version;
+
         return new EncryptedData({
-            version: Version,
+            version: encryptorVersion,
             id: keyfileObject.id,
             cipher: keyfileObject.crypto.cipher,
             ciphertext: keyfileObject.crypto.ciphertext,
@@ -69,25 +196,74 @@ export class UserWallet {
      * Converts the encrypted keyfile to plain JavaScript object.
      */
     toJSON(): any {
+        if (this.kind == UserWalletKind.SecretKey) {
+            return this.getEnvelopeWhenKindIsSecretKey();
+        }
+
+        return this.getEnvelopeWhenKindIsMnemonicOrArbitrary();
+    }
+
+    getEnvelopeWhenKindIsSecretKey(): any {
+        if (!this.publicKeyWhenKindIsSecretKey) {
+            throw new Err("Public key isn't available");
+        }
+
+        const cryptoSection = this.getCryptoSectionAsJSON();
+
+        const envelope: any = {
+            version: this.envelopeVersion,
+            // Adding "kind", if appropriate.
+            ...(this.envelopeVersion >= 5 ? { kind: UserWalletKind.SecretKey } : {}),
+            id: this.encryptedData.id,
+            address: this.publicKeyWhenKindIsSecretKey.hex(),
+            bech32: this.publicKeyWhenKindIsSecretKey.toAddress().toString(),
+            crypto: cryptoSection
+        };
+
+        return envelope;
+    }
+
+    getCryptoSectionAsJSON(): any {
+        const cryptoSection: any = {
+            // Adding "version", if appropriate.
+            ...(this.envelopeVersion >= 5 ? { version: this.encryptedData.version } : {}),
+            ciphertext: this.encryptedData.ciphertext,
+            cipherparams: { iv: this.encryptedData.iv },
+            cipher: CipherAlgorithm,
+            kdf: KeyDerivationFunction,
+            kdfparams: {
+                dklen: this.encryptedData.kdfparams.dklen,
+                salt: this.encryptedData.salt,
+                n: this.encryptedData.kdfparams.n,
+                r: this.encryptedData.kdfparams.r,
+                p: this.encryptedData.kdfparams.p
+            },
+            mac: this.encryptedData.mac,
+        };
+
+        return cryptoSection;
+    }
+
+    getEnvelopeWhenKindIsMnemonicOrArbitrary(): any {
+        const cryptoSection = this.getCryptoSectionAsJSON();
+
         return {
-            version: Version,
+            version: this.envelopeVersion,
             id: this.encryptedData.id,
-            address: this.publicKey.hex(),
-            bech32: this.publicKey.toAddress().toString(),
-            crypto: {
-                ciphertext: this.encryptedData.ciphertext,
-                cipherparams: { iv: this.encryptedData.iv },
-                cipher: CipherAlgorithm,
-                kdf: KeyDerivationFunction,
-                kdfparams: {
-                    dklen: this.encryptedData.kdfparams.dklen,
-                    salt: this.encryptedData.salt,
-                    n: this.encryptedData.kdfparams.n,
-                    r: this.encryptedData.kdfparams.r,
-                    p: this.encryptedData.kdfparams.p
-                },
-                mac: this.encryptedData.mac,
-            }
+            kind: this.kind,
+            crypto: cryptoSection
         };
     }
+
+    private static requireKind(kind: UserWalletKind, expectedKind: UserWalletKind, context: string) {
+        if (kind != expectedKind) {
+            throw new Err(`Expected kind to be ${expectedKind}, but it was ${kind}. Context: ${context}`);
+        }
+    }
+
+    private static requireV5OrHigher(version: EnvelopeVersion, context: string) {
+        if (version < EnvelopeVersion.V5) {
+            throw new Err(`Unsupported version: ${version}. Context: ${context}`);
+        }
+    }
 }
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index ee71c03e5..8dcf00b69 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -1,15 +1,15 @@
 import { assert } from "chai";
-import { UserSecretKey } from "./userKeys";
-import { Mnemonic } from "./mnemonic";
-import { UserWallet } from "./userWallet";
 import { Randomness } from "./crypto";
-import { UserAddress } from "./userAddress";
-import { UserSigner } from "./userSigner";
-import { UserVerifier } from "./userVerifier";
 import { ErrInvariantFailed } from "./errors";
+import { Mnemonic } from "./mnemonic";
 import { TestMessage } from "./testutils/message";
-import { DummyMnemonic, DummyPassword, loadTestWallet, TestWallet } from "./testutils/wallets";
 import { TestTransaction } from "./testutils/transaction";
+import { DummyMnemonic, DummyPassword, loadTestWallet, TestWallet } from "./testutils/wallets";
+import { UserAddress } from "./userAddress";
+import { UserSecretKey } from "./userKeys";
+import { UserSigner } from "./userSigner";
+import { UserVerifier } from "./userVerifier";
+import { UserWallet } from "./userWallet";
 
 describe("test user wallets", () => {
     let alice: TestWallet, bob: TestWallet, carol: TestWallet;
@@ -79,9 +79,9 @@ describe("test user wallets", () => {
         let carolSecretKey = UserSecretKey.fromString(carol.secretKeyHex);
 
         console.time("encrypt");
-        let aliceKeyFile = new UserWallet(aliceSecretKey, password);
-        let bobKeyFile = new UserWallet(bobSecretKey, password);
-        let carolKeyFile = new UserWallet(carolSecretKey, password);
+        let aliceKeyFile = UserWallet.fromSecretKey({ secretKey: aliceSecretKey, password: password });
+        let bobKeyFile = UserWallet.fromSecretKey({ secretKey: bobSecretKey, password: password });
+        let carolKeyFile = UserWallet.fromSecretKey({ secretKey: carolSecretKey, password: password });
         console.timeEnd("encrypt");
 
         assert.equal(aliceKeyFile.toJSON().bech32, alice.address.bech32());
@@ -96,23 +96,35 @@ describe("test user wallets", () => {
 
         // With provided randomness, in order to reproduce our development wallets
 
-        aliceKeyFile = new UserWallet(aliceSecretKey, password, new Randomness({
-            id: alice.keyFileObject.id,
-            iv: Buffer.from(alice.keyFileObject.crypto.cipherparams.iv, "hex"),
-            salt: Buffer.from(alice.keyFileObject.crypto.kdfparams.salt, "hex")
-        }));
+        aliceKeyFile = UserWallet.fromSecretKey({
+            secretKey: aliceSecretKey,
+            password: password,
+            randomness: new Randomness({
+                id: alice.keyFileObject.id,
+                iv: Buffer.from(alice.keyFileObject.crypto.cipherparams.iv, "hex"),
+                salt: Buffer.from(alice.keyFileObject.crypto.kdfparams.salt, "hex")
+            })
+        });
 
-        bobKeyFile = new UserWallet(bobSecretKey, password, new Randomness({
-            id: bob.keyFileObject.id,
-            iv: Buffer.from(bob.keyFileObject.crypto.cipherparams.iv, "hex"),
-            salt: Buffer.from(bob.keyFileObject.crypto.kdfparams.salt, "hex")
-        }));
+        bobKeyFile = UserWallet.fromSecretKey({
+            secretKey: bobSecretKey,
+            password: password,
+            randomness: new Randomness({
+                id: bob.keyFileObject.id,
+                iv: Buffer.from(bob.keyFileObject.crypto.cipherparams.iv, "hex"),
+                salt: Buffer.from(bob.keyFileObject.crypto.kdfparams.salt, "hex")
+            })
+        });
 
-        carolKeyFile = new UserWallet(carolSecretKey, password, new Randomness({
-            id: carol.keyFileObject.id,
-            iv: Buffer.from(carol.keyFileObject.crypto.cipherparams.iv, "hex"),
-            salt: Buffer.from(carol.keyFileObject.crypto.kdfparams.salt, "hex")
-        }));
+        carolKeyFile = UserWallet.fromSecretKey({
+            secretKey: carolSecretKey,
+            password: password,
+            randomness: new Randomness({
+                id: carol.keyFileObject.id,
+                iv: Buffer.from(carol.keyFileObject.crypto.cipherparams.iv, "hex"),
+                salt: Buffer.from(carol.keyFileObject.crypto.kdfparams.salt, "hex")
+            })
+        });
 
         assert.deepEqual(aliceKeyFile.toJSON(), alice.keyFileObject);
         assert.deepEqual(bobKeyFile.toJSON(), bob.keyFileObject);
@@ -123,7 +135,7 @@ describe("test user wallets", () => {
         let signer = new UserSigner(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
         let verifier = new UserVerifier(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf").generatePublicKey());
         let sender = UserAddress.fromBech32("erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz");
-        
+
         // With data field
         let transaction = new TestTransaction({
             nonce: 0,

From 847c733104da96427fed341ec8d1adfec40b4d15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Mon, 30 Jan 2023 19:56:47 +0200
Subject: [PATCH 154/338] Test for shorter mnemonics (12 words).

---
 src-wallet/testutils/wallets.ts |  1 +
 src-wallet/users.spec.ts        | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src-wallet/testutils/wallets.ts b/src-wallet/testutils/wallets.ts
index 353c777d5..dd73701a0 100644
--- a/src-wallet/testutils/wallets.ts
+++ b/src-wallet/testutils/wallets.ts
@@ -5,6 +5,7 @@ import { readTestFile } from "./files";
 
 export const DummyPassword = "password";
 export const DummyMnemonic = "moral volcano peasant pass circle pen over picture flat shop clap goat never lyrics gather prepare woman film husband gravity behind test tiger improve";
+export const DummyMnemonicOf12Words = "matter trumpet twenty parade fame north lift sail valve salon foster cinnamon";
 
 export async function loadTestWallet(name: string): Promise<TestWallet> {
     let testdataPath = path.resolve(__dirname, "..", "testdata");
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 8dcf00b69..a167d635c 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -4,7 +4,7 @@ import { ErrInvariantFailed } from "./errors";
 import { Mnemonic } from "./mnemonic";
 import { TestMessage } from "./testutils/message";
 import { TestTransaction } from "./testutils/transaction";
-import { DummyMnemonic, DummyPassword, loadTestWallet, TestWallet } from "./testutils/wallets";
+import { DummyMnemonic, DummyMnemonicOf12Words, DummyPassword, loadTestWallet, TestWallet } from "./testutils/wallets";
 import { UserAddress } from "./userAddress";
 import { UserSecretKey } from "./userKeys";
 import { UserSigner } from "./userSigner";
@@ -35,6 +35,14 @@ describe("test user wallets", () => {
         assert.equal(mnemonic.deriveKey(2).hex(), carol.secretKeyHex);
     });
 
+    it("should derive keys (12 words)", async () => {
+        const mnemonic = Mnemonic.fromString(DummyMnemonicOf12Words);
+
+        assert.equal(mnemonic.deriveKey(0).generatePublicKey().toAddress().bech32(), "erd1l8g9dk3gz035gkjhwegsjkqzdu3augrwhcfxrnucnyyrpc2220pqg4g7na");
+        assert.equal(mnemonic.deriveKey(1).generatePublicKey().toAddress().bech32(), "erd1fmhwg84rldg0xzngf53m0y607wvefvamh07n2mkypedx27lcqnts4zs09p");
+        assert.equal(mnemonic.deriveKey(2).generatePublicKey().toAddress().bech32(), "erd1tyuyemt4xz2yjvc7rxxp8kyfmk2n3h8gv3aavzd9ru4v2vhrkcksptewtj");
+    });
+
     it("should create secret key", () => {
         let keyHex = alice.secretKeyHex;
         let fromBuffer = new UserSecretKey(Buffer.from(keyHex, "hex"));

From baf215e8a7c58c7de36fec311c222d0fe63e4f72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 31 Jan 2023 00:54:21 +0200
Subject: [PATCH 155/338] Add version checks, add unit tests.

---
 src-wallet/crypto/encrypt.spec.ts |  8 +++-
 src-wallet/crypto/encryptor.ts    |  5 +++
 src-wallet/userWallet.ts          | 35 +++++++++------
 src-wallet/users.spec.ts          | 71 ++++++++++++++++++++++++++++++-
 4 files changed, 102 insertions(+), 17 deletions(-)

diff --git a/src-wallet/crypto/encrypt.spec.ts b/src-wallet/crypto/encrypt.spec.ts
index 4c5f1c517..e09ef6179 100644
--- a/src-wallet/crypto/encrypt.spec.ts
+++ b/src-wallet/crypto/encrypt.spec.ts
@@ -6,7 +6,7 @@ import { Encryptor } from "./encryptor";
 describe("test address", () => {
   it("encrypts/decrypts", () => {
     const sensitiveData = Buffer.from("my mnemonic");
-    const encryptedData = Encryptor.encrypt(7, sensitiveData, "password123");
+    const encryptedData = Encryptor.encrypt(4, sensitiveData, "password123");
     const decryptedBuffer = Decryptor.decrypt(encryptedData, "password123");
 
     assert.equal(sensitiveData.toString('hex'), decryptedBuffer.toString('hex'));
@@ -14,9 +14,13 @@ describe("test address", () => {
 
   it("encodes/decodes kdfparams", () => {
     const sensitiveData = Buffer.from("my mnemonic");
-    const encryptedData = Encryptor.encrypt(7, sensitiveData, "password123");
+    const encryptedData = Encryptor.encrypt(4, sensitiveData, "password123");
     const decodedData = EncryptedData.fromJSON(encryptedData.toJSON());
 
     assert.deepEqual(decodedData, encryptedData, "invalid decoded data");
   });
+
+  it("fails for bad version", () => {
+    assert.throws(() => Encryptor.encrypt(5, Buffer.from(""), ""), "Encryptor: unsupported version 5");
+  });
 });
diff --git a/src-wallet/crypto/encryptor.ts b/src-wallet/crypto/encryptor.ts
index c0708acfe..157ca1657 100644
--- a/src-wallet/crypto/encryptor.ts
+++ b/src-wallet/crypto/encryptor.ts
@@ -1,4 +1,5 @@
 import crypto from "crypto";
+import { Err } from "../errors";
 import { CipherAlgorithm, DigestAlgorithm, KeyDerivationFunction } from "./constants";
 import { ScryptKeyDerivationParams } from "./derivationParams";
 import { EncryptedData } from "./encryptedData";
@@ -10,6 +11,10 @@ export enum EncryptorVersion {
 
 export class Encryptor {
   static encrypt(version: EncryptorVersion, data: Buffer, password: string, randomness: Randomness = new Randomness()): EncryptedData {
+    if (version != EncryptorVersion.V4) {
+      throw new Err(`Encryptor: unsupported version ${version}`);
+    }
+
     const kdParams = new ScryptKeyDerivationParams();
     const derivedKey = kdParams.generateDerivedKey(Buffer.from(password), randomness.salt);
     const derivedKeyFirstHalf = derivedKey.slice(0, 16);
diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index f9866a1aa..2eb13f1f4 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -58,6 +58,8 @@ export class UserWallet {
         encryptorVersion = encryptorVersion || EncryptorVersion.V4;
         randomness = randomness || new Randomness();
 
+        requireVersion(envelopeVersion, [EnvelopeVersion.V4, EnvelopeVersion.V5]);
+
         const publicKey = secretKey.generatePublicKey();
         const text = Buffer.concat([secretKey.valueOf(), publicKey.valueOf()]);
         const encryptedData = Encryptor.encrypt(encryptorVersion, text, password, randomness);
@@ -87,6 +89,8 @@ export class UserWallet {
         encryptorVersion = encryptorVersion || EncryptorVersion.V4;
         randomness = randomness || new Randomness();
 
+        requireVersion(envelopeVersion, [EnvelopeVersion.V5]);
+
         const encryptedData = Encryptor.encrypt(encryptorVersion, Buffer.from(mnemonic), password, randomness);
 
         return new UserWallet({
@@ -113,6 +117,8 @@ export class UserWallet {
         encryptorVersion = encryptorVersion || EncryptorVersion.V4;
         randomness = randomness || new Randomness();
 
+        requireVersion(envelopeVersion, [EnvelopeVersion.V5]);
+
         const encryptedData = Encryptor.encrypt(encryptorVersion, arbitraryData, password, randomness);
 
         return new UserWallet({
@@ -133,8 +139,10 @@ export class UserWallet {
      * From an encrypted keyfile, given the password, loads the secret key and the public key.
      */
     static decryptSecretKey(keyFileObject: any, password: string): UserSecretKey {
+        requireVersion(keyFileObject.version, [EnvelopeVersion.V4, EnvelopeVersion.V5]);
+
         if (keyFileObject.version >= EnvelopeVersion.V5) {
-            this.requireKind(keyFileObject.kind, UserWalletKind.SecretKey, "decryptSecretKey")
+            requireKind(keyFileObject.kind, UserWalletKind.SecretKey)
         }
 
         const encryptedData = UserWallet.edFromJSON(keyFileObject);
@@ -150,8 +158,8 @@ export class UserWallet {
     }
 
     static decryptMnemonic(keyFileObject: any, password: string): string {
-        this.requireV5OrHigher(keyFileObject.version, "decryptMnemonic");
-        this.requireKind(keyFileObject.kind, UserWalletKind.Mnemonic, "decryptMnemonic")
+        requireVersion(keyFileObject.version, [EnvelopeVersion.V5]);
+        requireKind(keyFileObject.kind, UserWalletKind.Mnemonic)
 
         const encryptedData = UserWallet.edFromJSON(keyFileObject);
         const text = Decryptor.decrypt(encryptedData, password);
@@ -159,8 +167,8 @@ export class UserWallet {
     }
 
     static decryptArbitrary(keyFileObject: any, password: string): Buffer {
-        this.requireV5OrHigher(keyFileObject.version, "decryptArbitrary");
-        this.requireKind(keyFileObject.kind, UserWalletKind.Arbitrary, "decryptArbitrary")
+        requireVersion(keyFileObject.version, [EnvelopeVersion.V5]);
+        requireKind(keyFileObject.kind, UserWalletKind.Arbitrary)
 
         const encryptedData = UserWallet.edFromJSON(keyFileObject);
         const data = Decryptor.decrypt(encryptedData, password);
@@ -254,16 +262,17 @@ export class UserWallet {
             crypto: cryptoSection
         };
     }
+}
 
-    private static requireKind(kind: UserWalletKind, expectedKind: UserWalletKind, context: string) {
-        if (kind != expectedKind) {
-            throw new Err(`Expected kind to be ${expectedKind}, but it was ${kind}. Context: ${context}`);
-        }
+function requireKind(kind: UserWalletKind, expectedKind: UserWalletKind) {
+    if (kind != expectedKind) {
+        throw new Err(`Expected kind to be ${expectedKind}, but it was ${kind}.`);
     }
+}
 
-    private static requireV5OrHigher(version: EnvelopeVersion, context: string) {
-        if (version < EnvelopeVersion.V5) {
-            throw new Err(`Unsupported version: ${version}. Context: ${context}`);
-        }
+function requireVersion(version: EnvelopeVersion, allowedVersions: EnvelopeVersion[]) {
+    const isAllowed = allowedVersions.includes(version);
+    if (!isAllowed) {
+        throw new Err(`Envelope version must be one of: [${allowedVersions.join(", ")}].`);
     }
 }
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index a167d635c..1d9956ea9 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -9,7 +9,7 @@ import { UserAddress } from "./userAddress";
 import { UserSecretKey } from "./userKeys";
 import { UserSigner } from "./userSigner";
 import { UserVerifier } from "./userVerifier";
-import { UserWallet } from "./userWallet";
+import { EnvelopeVersion, UserWallet } from "./userWallet";
 
 describe("test user wallets", () => {
     let alice: TestWallet, bob: TestWallet, carol: TestWallet;
@@ -79,7 +79,7 @@ describe("test user wallets", () => {
         assert.equal(UserSecretKey.fromPem(carol.pemFileText).hex(), carol.secretKeyHex);
     });
 
-    it("should create and load encrypted files", function () {
+    it("should create and load keystore files (with secret keys)", function () {
         this.timeout(10000);
 
         let aliceSecretKey = UserSecretKey.fromString(alice.secretKeyHex);
@@ -139,6 +139,73 @@ describe("test user wallets", () => {
         assert.deepEqual(carolKeyFile.toJSON(), carol.keyFileObject);
     });
 
+    it("should create and load keystore files both as V4 and V5", function () {
+        this.timeout(10000);
+
+        const aliceSecretKey = UserSecretKey.fromString(alice.secretKeyHex);
+        const walletV4 = UserWallet.fromSecretKey({ secretKey: aliceSecretKey, password: password });
+        const walletV5 = UserWallet.fromSecretKey({ envelopeVersion: EnvelopeVersion.V5, secretKey: aliceSecretKey, password: password });
+        const jsonV4 = walletV4.toJSON();
+        const jsonV5 = walletV5.toJSON();
+
+        assert.equal(jsonV4.version, 4);
+        assert.isUndefined(jsonV4.kind);
+        assert.equal(jsonV4.bech32, alice.address.bech32());
+
+        assert.equal(jsonV5.version, 5);
+        assert.equal(jsonV5.kind, "secretKey");
+        assert.equal(jsonV5.bech32, alice.address.bech32());
+
+        const secretKeyV4 = UserWallet.decryptSecretKey(jsonV4, password);
+        const secretKeyV5 = UserWallet.decryptSecretKey(jsonV5, password);
+        assert.equal(secretKeyV4.hex(), alice.secretKeyHex);
+        assert.equal(secretKeyV5.hex(), alice.secretKeyHex);
+    });
+
+    it("should create and load keystore files (with mnemonics)", function () {
+        this.timeout(10000);
+
+        const wallet = UserWallet.fromMnemonic({ mnemonic: DummyMnemonic, password: password });
+        const json = wallet.toJSON();
+
+        assert.equal(json.version, 5);
+        assert.equal(json.kind, "mnemonic");
+        assert.isUndefined(json.bech32);
+
+        const mnemonicText = UserWallet.decryptMnemonic(json, password);
+        const mnemonic = Mnemonic.fromString(mnemonicText);
+
+        assert.equal(mnemonicText, DummyMnemonic);
+        assert.equal(mnemonic.deriveKey(0).generatePublicKey().toAddress().bech32(), alice.address.bech32());
+        assert.equal(mnemonic.deriveKey(1).generatePublicKey().toAddress().bech32(), bob.address.bech32());
+        assert.equal(mnemonic.deriveKey(2).generatePublicKey().toAddress().bech32(), carol.address.bech32());
+    });
+
+    it("should create and load keystore files (with arbitrary data)", function () {
+        const data = Buffer.from("hello");
+        const wallet = UserWallet.fromArbitrary({ arbitraryData: data, password: password });
+        const json = wallet.toJSON();
+
+        assert.equal(json.version, 5);
+        assert.equal(json.kind, "arbitrary");
+        assert.isUndefined(json.bech32);
+
+        const decryptedData = UserWallet.decryptArbitrary(json, password);
+        assert.deepEqual(decryptedData, data);
+    });
+
+    it("should fail if using bad versions", function () {
+        const aliceSecretKey = UserSecretKey.fromString(alice.secretKeyHex);
+
+        assert.throws(() => UserWallet.fromSecretKey({ envelopeVersion: 7, secretKey: aliceSecretKey, password: password }), "Envelope version must be one of: [4, 5].");
+        assert.throws(() => UserWallet.fromMnemonic({ envelopeVersion: 4, mnemonic: DummyMnemonic, password: password }), "Envelope version must be one of: [5].");
+        assert.throws(() => UserWallet.fromArbitrary({ envelopeVersion: 4, arbitraryData: Buffer.from(""), password: password }), "Envelope version must be one of: [5].");
+
+        assert.throws(() => UserWallet.decryptSecretKey({ version: 3, crypto: {} }, password), "Envelope version must be one of: [4, 5].");
+        assert.throws(() => UserWallet.decryptMnemonic({ version: 6, crypto: {} }, password), "Envelope version must be one of: [5].");
+        assert.throws(() => UserWallet.decryptArbitrary({ version: 7, crypto: {} }, password), "Envelope version must be one of: [5].");
+    });
+
     it("should sign transactions", async () => {
         let signer = new UserSigner(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
         let verifier = new UserVerifier(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf").generatePublicKey());

From 6f1602759169de2b7cc3178924e0aa9c85f6550a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 1 Feb 2023 22:27:01 +0200
Subject: [PATCH 156/338] Fix after review (point 4).

---
 src-wallet/userWallet.ts | 44 +++-------------------------------------
 src-wallet/users.spec.ts | 19 +++--------------
 2 files changed, 6 insertions(+), 57 deletions(-)

diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index 2eb13f1f4..7db5f1046 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -14,8 +14,7 @@ export enum EnvelopeVersion {
 
 export enum UserWalletKind {
     SecretKey = "secretKey",
-    Mnemonic = "mnemonic",
-    Arbitrary = "arbitrary"
+    Mnemonic = "mnemonic"
 }
 
 export class UserWallet {
@@ -100,34 +99,6 @@ export class UserWallet {
         });
     }
 
-    static fromArbitrary({
-        envelopeVersion,
-        encryptorVersion,
-        arbitraryData,
-        password,
-        randomness,
-    }: {
-        envelopeVersion?: EnvelopeVersion;
-        encryptorVersion?: EncryptorVersion;
-        arbitraryData: Buffer;
-        password: string;
-        randomness?: Randomness;
-    }): UserWallet {
-        envelopeVersion = envelopeVersion || EnvelopeVersion.V5;
-        encryptorVersion = encryptorVersion || EncryptorVersion.V4;
-        randomness = randomness || new Randomness();
-
-        requireVersion(envelopeVersion, [EnvelopeVersion.V5]);
-
-        const encryptedData = Encryptor.encrypt(encryptorVersion, arbitraryData, password, randomness);
-
-        return new UserWallet({
-            envelopeVersion: envelopeVersion,
-            kind: UserWalletKind.Arbitrary,
-            encryptedData
-        });
-    }
-
     /**
      * Copied from: https://github.com/multiversx/mx-deprecated-core-js/blob/v1.28.0/src/account.js#L42
      * Notes: adjustements (code refactoring, no change in logic), in terms of: 
@@ -166,15 +137,6 @@ export class UserWallet {
         return text.toString();
     }
 
-    static decryptArbitrary(keyFileObject: any, password: string): Buffer {
-        requireVersion(keyFileObject.version, [EnvelopeVersion.V5]);
-        requireKind(keyFileObject.kind, UserWalletKind.Arbitrary)
-
-        const encryptedData = UserWallet.edFromJSON(keyFileObject);
-        const data = Decryptor.decrypt(encryptedData, password);
-        return data;
-    }
-
     static edFromJSON(keyfileObject: any): EncryptedData {
         const encryptorVersion: number = (keyfileObject.version == EnvelopeVersion.V4) ?
             // In V4, the "crypto" section inherits the version from the envelope.
@@ -208,7 +170,7 @@ export class UserWallet {
             return this.getEnvelopeWhenKindIsSecretKey();
         }
 
-        return this.getEnvelopeWhenKindIsMnemonicOrArbitrary();
+        return this.getEnvelopeWhenKindIsMnemonic();
     }
 
     getEnvelopeWhenKindIsSecretKey(): any {
@@ -252,7 +214,7 @@ export class UserWallet {
         return cryptoSection;
     }
 
-    getEnvelopeWhenKindIsMnemonicOrArbitrary(): any {
+    getEnvelopeWhenKindIsMnemonic(): any {
         const cryptoSection = this.getCryptoSectionAsJSON();
 
         return {
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 1d9956ea9..e3128f26c 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -162,7 +162,7 @@ describe("test user wallets", () => {
         assert.equal(secretKeyV5.hex(), alice.secretKeyHex);
     });
 
-    it("should create and load keystore files (with mnemonics)", function () {
+    it.only("should create and load keystore files (with mnemonics)", function () {
         this.timeout(10000);
 
         const wallet = UserWallet.fromMnemonic({ mnemonic: DummyMnemonic, password: password });
@@ -172,6 +172,8 @@ describe("test user wallets", () => {
         assert.equal(json.kind, "mnemonic");
         assert.isUndefined(json.bech32);
 
+        console.log(JSON.stringify(json, null, 4));
+
         const mnemonicText = UserWallet.decryptMnemonic(json, password);
         const mnemonic = Mnemonic.fromString(mnemonicText);
 
@@ -181,29 +183,14 @@ describe("test user wallets", () => {
         assert.equal(mnemonic.deriveKey(2).generatePublicKey().toAddress().bech32(), carol.address.bech32());
     });
 
-    it("should create and load keystore files (with arbitrary data)", function () {
-        const data = Buffer.from("hello");
-        const wallet = UserWallet.fromArbitrary({ arbitraryData: data, password: password });
-        const json = wallet.toJSON();
-
-        assert.equal(json.version, 5);
-        assert.equal(json.kind, "arbitrary");
-        assert.isUndefined(json.bech32);
-
-        const decryptedData = UserWallet.decryptArbitrary(json, password);
-        assert.deepEqual(decryptedData, data);
-    });
-
     it("should fail if using bad versions", function () {
         const aliceSecretKey = UserSecretKey.fromString(alice.secretKeyHex);
 
         assert.throws(() => UserWallet.fromSecretKey({ envelopeVersion: 7, secretKey: aliceSecretKey, password: password }), "Envelope version must be one of: [4, 5].");
         assert.throws(() => UserWallet.fromMnemonic({ envelopeVersion: 4, mnemonic: DummyMnemonic, password: password }), "Envelope version must be one of: [5].");
-        assert.throws(() => UserWallet.fromArbitrary({ envelopeVersion: 4, arbitraryData: Buffer.from(""), password: password }), "Envelope version must be one of: [5].");
 
         assert.throws(() => UserWallet.decryptSecretKey({ version: 3, crypto: {} }, password), "Envelope version must be one of: [4, 5].");
         assert.throws(() => UserWallet.decryptMnemonic({ version: 6, crypto: {} }, password), "Envelope version must be one of: [5].");
-        assert.throws(() => UserWallet.decryptArbitrary({ version: 7, crypto: {} }, password), "Envelope version must be one of: [5].");
     });
 
     it("should sign transactions", async () => {

From 1577e466b0cdea96c534dfe1434440c0f24c423c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Thu, 2 Feb 2023 20:38:14 +0200
Subject: [PATCH 157/338] Revert version-related changes. Keystore version
 remains v4.

---
 src-wallet/crypto/encrypt.spec.ts          |  8 +-
 src-wallet/crypto/encryptor.ts             |  9 +-
 src-wallet/testdata/alice.json             |  1 +
 src-wallet/testdata/bob.json               |  1 +
 src-wallet/testdata/carol.json             |  1 +
 src-wallet/testdata/withDummyMnemonic.json | 21 +++++
 src-wallet/testdata/withoutKind.json       | 22 +++++
 src-wallet/testutils/wallets.ts            | 26 ++++--
 src-wallet/userWallet.ts                   | 99 ++++------------------
 src-wallet/users.spec.ts                   | 54 +++++-------
 10 files changed, 105 insertions(+), 137 deletions(-)
 create mode 100644 src-wallet/testdata/withDummyMnemonic.json
 create mode 100644 src-wallet/testdata/withoutKind.json

diff --git a/src-wallet/crypto/encrypt.spec.ts b/src-wallet/crypto/encrypt.spec.ts
index e09ef6179..1f785968d 100644
--- a/src-wallet/crypto/encrypt.spec.ts
+++ b/src-wallet/crypto/encrypt.spec.ts
@@ -6,7 +6,7 @@ import { Encryptor } from "./encryptor";
 describe("test address", () => {
   it("encrypts/decrypts", () => {
     const sensitiveData = Buffer.from("my mnemonic");
-    const encryptedData = Encryptor.encrypt(4, sensitiveData, "password123");
+    const encryptedData = Encryptor.encrypt(sensitiveData, "password123");
     const decryptedBuffer = Decryptor.decrypt(encryptedData, "password123");
 
     assert.equal(sensitiveData.toString('hex'), decryptedBuffer.toString('hex'));
@@ -14,13 +14,9 @@ describe("test address", () => {
 
   it("encodes/decodes kdfparams", () => {
     const sensitiveData = Buffer.from("my mnemonic");
-    const encryptedData = Encryptor.encrypt(4, sensitiveData, "password123");
+    const encryptedData = Encryptor.encrypt(sensitiveData, "password123");
     const decodedData = EncryptedData.fromJSON(encryptedData.toJSON());
 
     assert.deepEqual(decodedData, encryptedData, "invalid decoded data");
   });
-
-  it("fails for bad version", () => {
-    assert.throws(() => Encryptor.encrypt(5, Buffer.from(""), ""), "Encryptor: unsupported version 5");
-  });
 });
diff --git a/src-wallet/crypto/encryptor.ts b/src-wallet/crypto/encryptor.ts
index 157ca1657..a7e357f2e 100644
--- a/src-wallet/crypto/encryptor.ts
+++ b/src-wallet/crypto/encryptor.ts
@@ -1,5 +1,4 @@
 import crypto from "crypto";
-import { Err } from "../errors";
 import { CipherAlgorithm, DigestAlgorithm, KeyDerivationFunction } from "./constants";
 import { ScryptKeyDerivationParams } from "./derivationParams";
 import { EncryptedData } from "./encryptedData";
@@ -10,11 +9,7 @@ export enum EncryptorVersion {
 }
 
 export class Encryptor {
-  static encrypt(version: EncryptorVersion, data: Buffer, password: string, randomness: Randomness = new Randomness()): EncryptedData {
-    if (version != EncryptorVersion.V4) {
-      throw new Err(`Encryptor: unsupported version ${version}`);
-    }
-
+  static encrypt(data: Buffer, password: string, randomness: Randomness = new Randomness()): EncryptedData {
     const kdParams = new ScryptKeyDerivationParams();
     const derivedKey = kdParams.generateDerivedKey(Buffer.from(password), randomness.salt);
     const derivedKeyFirstHalf = derivedKey.slice(0, 16);
@@ -25,7 +20,7 @@ export class Encryptor {
     const mac = crypto.createHmac(DigestAlgorithm, derivedKeySecondHalf).update(ciphertext).digest();
 
     return new EncryptedData({
-      version: version,
+      version: EncryptorVersion.V4,
       id: randomness.id,
       ciphertext: ciphertext.toString('hex'),
       iv: randomness.iv.toString('hex'),
diff --git a/src-wallet/testdata/alice.json b/src-wallet/testdata/alice.json
index 9e83170cf..18c4ea1e9 100644
--- a/src-wallet/testdata/alice.json
+++ b/src-wallet/testdata/alice.json
@@ -1,5 +1,6 @@
 {
     "version": 4,
+    "kind": "secretKey",
     "id": "0dc10c02-b59b-4bac-9710-6b2cfa4284ba",
     "address": "0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1",
     "bech32": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
diff --git a/src-wallet/testdata/bob.json b/src-wallet/testdata/bob.json
index 439b394a5..9efb41109 100644
--- a/src-wallet/testdata/bob.json
+++ b/src-wallet/testdata/bob.json
@@ -1,5 +1,6 @@
 {
     "version": 4,
+    "kind": "secretKey",
     "id": "85fdc8a7-7119-479d-b7fb-ab4413ed038d",
     "address": "8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8",
     "bech32": "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
diff --git a/src-wallet/testdata/carol.json b/src-wallet/testdata/carol.json
index 3614a5ba2..1014a8230 100644
--- a/src-wallet/testdata/carol.json
+++ b/src-wallet/testdata/carol.json
@@ -1,5 +1,6 @@
 {
     "version": 4,
+    "kind": "secretKey",
     "id": "65894f35-d142-41d2-9335-6ad02e0ed0be",
     "address": "b2a11555ce521e4944e09ab17549d85b487dcd26c84b5017a39e31a3670889ba",
     "bech32": "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8",
diff --git a/src-wallet/testdata/withDummyMnemonic.json b/src-wallet/testdata/withDummyMnemonic.json
new file mode 100644
index 000000000..29a585296
--- /dev/null
+++ b/src-wallet/testdata/withDummyMnemonic.json
@@ -0,0 +1,21 @@
+{
+    "version": 4,
+    "id": "5b448dbc-5c72-4d83-8038-938b1f8dff19",
+    "kind": "mnemonic",
+    "crypto": {
+        "ciphertext": "6d70fbdceba874f56f15af4b1d060223799288cfc5d276d9ebb91732f5a38c3c59f83896fa7e7eb6a04c05475a6fe4d154de9b9441864c507abd0eb6987dac521b64c0c82783a3cd1e09270cd6cb5ae493f9af694b891253ac1f1ffded68b5ef39c972307e3c33a8354337540908acc795d4df72298dda1ca28ac920983e6a39a01e2bc988bd0b21f864c6de8b5356d11e4b77bc6f75ef",
+        "cipherparams": {
+            "iv": "2da5620906634972d9a623bc249d63d4"
+        },
+        "cipher": "aes-128-ctr",
+        "kdf": "scrypt",
+        "kdfparams": {
+            "dklen": 32,
+            "salt": "aa9e0ba6b188703071a582c10e5331f2756279feb0e2768f1ba0fd38ec77f035",
+            "n": 4096,
+            "r": 8,
+            "p": 1
+        },
+        "mac": "5bc1b20b6d903b8ef3273eedf028112d65eaf85a5ef4215917c1209ec2df715a"
+    }
+}
diff --git a/src-wallet/testdata/withoutKind.json b/src-wallet/testdata/withoutKind.json
new file mode 100644
index 000000000..9e83170cf
--- /dev/null
+++ b/src-wallet/testdata/withoutKind.json
@@ -0,0 +1,22 @@
+{
+    "version": 4,
+    "id": "0dc10c02-b59b-4bac-9710-6b2cfa4284ba",
+    "address": "0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1",
+    "bech32": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+    "crypto": {
+        "ciphertext": "4c41ef6fdfd52c39b1585a875eb3c86d30a315642d0e35bb8205b6372c1882f135441099b11ff76345a6f3a930b5665aaf9f7325a32c8ccd60081c797aa2d538",
+        "cipherparams": {
+            "iv": "033182afaa1ebaafcde9ccc68a5eac31"
+        },
+        "cipher": "aes-128-ctr",
+        "kdf": "scrypt",
+        "kdfparams": {
+            "dklen": 32,
+            "salt": "4903bd0e7880baa04fc4f886518ac5c672cdc745a6bd13dcec2b6c12e9bffe8d",
+            "n": 4096,
+            "r": 8,
+            "p": 1
+        },
+        "mac": "5b4a6f14ab74ba7ca23db6847e28447f0e6a7724ba9664cf425df707a84f5a8b"
+    }
+}
diff --git a/src-wallet/testutils/wallets.ts b/src-wallet/testutils/wallets.ts
index dd73701a0..1ce1af3e5 100644
--- a/src-wallet/testutils/wallets.ts
+++ b/src-wallet/testutils/wallets.ts
@@ -8,15 +8,25 @@ export const DummyMnemonic = "moral volcano peasant pass circle pen over picture
 export const DummyMnemonicOf12Words = "matter trumpet twenty parade fame north lift sail valve salon foster cinnamon";
 
 export async function loadTestWallet(name: string): Promise<TestWallet> {
-    let testdataPath = path.resolve(__dirname, "..", "testdata");
-    let jsonFilePath = path.resolve(testdataPath, `${name}.json`);
-    let pemFilePath = path.resolve(testdataPath, `${name}.pem`);
+    const keystore = await loadTestKeystore(`${name}.json`)
+    const pemText = await loadTestPemFile(`${name}.pem`)
+    const pemKey = UserSecretKey.fromPem(pemText);
+    const address = new UserAddress(Buffer.from(keystore.address, "hex"));
 
-    let jsonWallet = JSON.parse(await readTestFile(jsonFilePath));
-    let pemText = await readTestFile(pemFilePath);
-    let pemKey = UserSecretKey.fromPem(pemText);
-    let address = new UserAddress(Buffer.from(jsonWallet.address, "hex"));
-    return new TestWallet(address, pemKey.hex(), jsonWallet, pemText);
+    return new TestWallet(address, pemKey.hex(), keystore, pemText);
+}
+
+export async function loadTestKeystore(file: string): Promise<any> {
+    const testdataPath = path.resolve(__dirname, "..", "testdata");
+    const keystorePath = path.resolve(testdataPath, file);
+    const json = await readTestFile(keystorePath);
+    return JSON.parse(json);
+}
+
+export async function loadTestPemFile(file: string): Promise<string> {
+    const testdataPath = path.resolve(__dirname, "..", "testdata");
+    const pemFilePath = path.resolve(testdataPath, file);
+    return await readTestFile(pemFilePath);
 }
 
 export class TestWallet {
diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index 7db5f1046..8ba2014f0 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -3,97 +3,55 @@ import { ScryptKeyDerivationParams } from "./crypto/derivationParams";
 import { Err } from "./errors";
 import { UserPublicKey, UserSecretKey } from "./userKeys";
 
-export enum EnvelopeVersion {
-    // Does not have the "kind" field, and is meant to hold the **secret key**.
-    // The "crypto" section is not versioned.
-    V4 = 4,
-    // Has the "kind" field, and is meant to hold the **secret key** or **the mnemonic** (or any other secret payload).
-    // Furthermore, the "crypto" section is versioned separately.
-    V5 = 5
-}
-
 export enum UserWalletKind {
     SecretKey = "secretKey",
     Mnemonic = "mnemonic"
 }
 
 export class UserWallet {
-    private readonly envelopeVersion: number;
     private readonly kind: UserWalletKind;
     private readonly encryptedData: EncryptedData;
     private readonly publicKeyWhenKindIsSecretKey?: UserPublicKey;
 
-    private constructor({
-        envelopeVersion: envelopeVersion,
-        kind,
-        encryptedData,
-        publicKeyWhenKindIsSecretKey
-    }: {
-        envelopeVersion: EnvelopeVersion;
+    private constructor({ kind, encryptedData, publicKeyWhenKindIsSecretKey }: {
         kind: UserWalletKind;
         encryptedData: EncryptedData;
         publicKeyWhenKindIsSecretKey?: UserPublicKey;
     }) {
-        this.envelopeVersion = envelopeVersion;
         this.kind = kind;
         this.encryptedData = encryptedData;
         this.publicKeyWhenKindIsSecretKey = publicKeyWhenKindIsSecretKey;
     }
 
-    static fromSecretKey({
-        envelopeVersion,
-        encryptorVersion,
-        secretKey,
-        password,
-        randomness,
-    }: {
-        envelopeVersion?: EnvelopeVersion;
+    static fromSecretKey({ secretKey, password, randomness }: {
         encryptorVersion?: EncryptorVersion;
         secretKey: UserSecretKey;
         password: string;
         randomness?: Randomness;
     }): UserWallet {
-        envelopeVersion = envelopeVersion || EnvelopeVersion.V4;
-        encryptorVersion = encryptorVersion || EncryptorVersion.V4;
         randomness = randomness || new Randomness();
 
-        requireVersion(envelopeVersion, [EnvelopeVersion.V4, EnvelopeVersion.V5]);
-
         const publicKey = secretKey.generatePublicKey();
         const text = Buffer.concat([secretKey.valueOf(), publicKey.valueOf()]);
-        const encryptedData = Encryptor.encrypt(encryptorVersion, text, password, randomness);
+        const encryptedData = Encryptor.encrypt(text, password, randomness);
 
         return new UserWallet({
-            envelopeVersion: envelopeVersion,
             kind: UserWalletKind.SecretKey,
             encryptedData,
             publicKeyWhenKindIsSecretKey: publicKey
         });
     }
 
-    static fromMnemonic({
-        envelopeVersion,
-        encryptorVersion,
-        mnemonic,
-        password,
-        randomness,
-    }: {
-        envelopeVersion?: EnvelopeVersion;
-        encryptorVersion?: EncryptorVersion;
+    static fromMnemonic({ mnemonic, password, randomness }: {
         mnemonic: string;
         password: string;
         randomness?: Randomness;
     }): UserWallet {
-        envelopeVersion = envelopeVersion || EnvelopeVersion.V5;
-        encryptorVersion = encryptorVersion || EncryptorVersion.V4;
         randomness = randomness || new Randomness();
 
-        requireVersion(envelopeVersion, [EnvelopeVersion.V5]);
-
-        const encryptedData = Encryptor.encrypt(encryptorVersion, Buffer.from(mnemonic), password, randomness);
+        const encryptedData = Encryptor.encrypt(Buffer.from(mnemonic), password, randomness);
 
         return new UserWallet({
-            envelopeVersion: envelopeVersion,
             kind: UserWalletKind.Mnemonic,
             encryptedData
         });
@@ -110,11 +68,7 @@ export class UserWallet {
      * From an encrypted keyfile, given the password, loads the secret key and the public key.
      */
     static decryptSecretKey(keyFileObject: any, password: string): UserSecretKey {
-        requireVersion(keyFileObject.version, [EnvelopeVersion.V4, EnvelopeVersion.V5]);
-
-        if (keyFileObject.version >= EnvelopeVersion.V5) {
-            requireKind(keyFileObject.kind, UserWalletKind.SecretKey)
-        }
+        // Here, we do not check the "kind" field. Older keystore files holding secret keys do not have this field.
 
         const encryptedData = UserWallet.edFromJSON(keyFileObject);
 
@@ -129,8 +83,9 @@ export class UserWallet {
     }
 
     static decryptMnemonic(keyFileObject: any, password: string): string {
-        requireVersion(keyFileObject.version, [EnvelopeVersion.V5]);
-        requireKind(keyFileObject.kind, UserWalletKind.Mnemonic)
+        if (keyFileObject.kind != UserWalletKind.Mnemonic) {
+            throw new Err(`Expected kind to be ${UserWalletKind.Mnemonic}, but it was ${keyFileObject.kind}.`);
+        }
 
         const encryptedData = UserWallet.edFromJSON(keyFileObject);
         const text = Decryptor.decrypt(encryptedData, password);
@@ -138,14 +93,8 @@ export class UserWallet {
     }
 
     static edFromJSON(keyfileObject: any): EncryptedData {
-        const encryptorVersion: number = (keyfileObject.version == EnvelopeVersion.V4) ?
-            // In V4, the "crypto" section inherits the version from the envelope.
-            EncryptorVersion.V4 :
-            // In V5, the "crypto" section has its own version.
-            keyfileObject.crypto.version;
-
         return new EncryptedData({
-            version: encryptorVersion,
+            version: keyfileObject.version,
             id: keyfileObject.id,
             cipher: keyfileObject.crypto.cipher,
             ciphertext: keyfileObject.crypto.ciphertext,
@@ -167,13 +116,13 @@ export class UserWallet {
      */
     toJSON(): any {
         if (this.kind == UserWalletKind.SecretKey) {
-            return this.getEnvelopeWhenKindIsSecretKey();
+            return this.toJSONWhenKindIsSecretKey();
         }
 
-        return this.getEnvelopeWhenKindIsMnemonic();
+        return this.toJSONWhenKindIsMnemonic();
     }
 
-    getEnvelopeWhenKindIsSecretKey(): any {
+    private toJSONWhenKindIsSecretKey(): any {
         if (!this.publicKeyWhenKindIsSecretKey) {
             throw new Err("Public key isn't available");
         }
@@ -181,9 +130,9 @@ export class UserWallet {
         const cryptoSection = this.getCryptoSectionAsJSON();
 
         const envelope: any = {
-            version: this.envelopeVersion,
+            version: this.encryptedData.version,
             // Adding "kind", if appropriate.
-            ...(this.envelopeVersion >= 5 ? { kind: UserWalletKind.SecretKey } : {}),
+            ...(this.kind ? { kind: this.kind } : {}),
             id: this.encryptedData.id,
             address: this.publicKeyWhenKindIsSecretKey.hex(),
             bech32: this.publicKeyWhenKindIsSecretKey.toAddress().toString(),
@@ -195,8 +144,6 @@ export class UserWallet {
 
     getCryptoSectionAsJSON(): any {
         const cryptoSection: any = {
-            // Adding "version", if appropriate.
-            ...(this.envelopeVersion >= 5 ? { version: this.encryptedData.version } : {}),
             ciphertext: this.encryptedData.ciphertext,
             cipherparams: { iv: this.encryptedData.iv },
             cipher: CipherAlgorithm,
@@ -214,11 +161,11 @@ export class UserWallet {
         return cryptoSection;
     }
 
-    getEnvelopeWhenKindIsMnemonic(): any {
+    toJSONWhenKindIsMnemonic(): any {
         const cryptoSection = this.getCryptoSectionAsJSON();
 
         return {
-            version: this.envelopeVersion,
+            version: this.encryptedData.version,
             id: this.encryptedData.id,
             kind: this.kind,
             crypto: cryptoSection
@@ -226,15 +173,3 @@ export class UserWallet {
     }
 }
 
-function requireKind(kind: UserWalletKind, expectedKind: UserWalletKind) {
-    if (kind != expectedKind) {
-        throw new Err(`Expected kind to be ${expectedKind}, but it was ${kind}.`);
-    }
-}
-
-function requireVersion(version: EnvelopeVersion, allowedVersions: EnvelopeVersion[]) {
-    const isAllowed = allowedVersions.includes(version);
-    if (!isAllowed) {
-        throw new Err(`Envelope version must be one of: [${allowedVersions.join(", ")}].`);
-    }
-}
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index e3128f26c..faf6535a2 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -4,12 +4,12 @@ import { ErrInvariantFailed } from "./errors";
 import { Mnemonic } from "./mnemonic";
 import { TestMessage } from "./testutils/message";
 import { TestTransaction } from "./testutils/transaction";
-import { DummyMnemonic, DummyMnemonicOf12Words, DummyPassword, loadTestWallet, TestWallet } from "./testutils/wallets";
+import { DummyMnemonic, DummyMnemonicOf12Words, DummyPassword, loadTestKeystore, loadTestWallet, TestWallet } from "./testutils/wallets";
 import { UserAddress } from "./userAddress";
 import { UserSecretKey } from "./userKeys";
 import { UserSigner } from "./userSigner";
 import { UserVerifier } from "./userVerifier";
-import { EnvelopeVersion, UserWallet } from "./userWallet";
+import { UserWallet } from "./userWallet";
 
 describe("test user wallets", () => {
     let alice: TestWallet, bob: TestWallet, carol: TestWallet;
@@ -139,41 +139,23 @@ describe("test user wallets", () => {
         assert.deepEqual(carolKeyFile.toJSON(), carol.keyFileObject);
     });
 
-    it("should create and load keystore files both as V4 and V5", function () {
-        this.timeout(10000);
-
-        const aliceSecretKey = UserSecretKey.fromString(alice.secretKeyHex);
-        const walletV4 = UserWallet.fromSecretKey({ secretKey: aliceSecretKey, password: password });
-        const walletV5 = UserWallet.fromSecretKey({ envelopeVersion: EnvelopeVersion.V5, secretKey: aliceSecretKey, password: password });
-        const jsonV4 = walletV4.toJSON();
-        const jsonV5 = walletV5.toJSON();
-
-        assert.equal(jsonV4.version, 4);
-        assert.isUndefined(jsonV4.kind);
-        assert.equal(jsonV4.bech32, alice.address.bech32());
+    it("should load keystore files (with secret keys, but without 'kind' field)", async function () {
+        const keyFileObject = await loadTestKeystore("withoutKind.json");
+        const secretKey = UserWallet.decryptSecretKey(keyFileObject, password);
 
-        assert.equal(jsonV5.version, 5);
-        assert.equal(jsonV5.kind, "secretKey");
-        assert.equal(jsonV5.bech32, alice.address.bech32());
-
-        const secretKeyV4 = UserWallet.decryptSecretKey(jsonV4, password);
-        const secretKeyV5 = UserWallet.decryptSecretKey(jsonV5, password);
-        assert.equal(secretKeyV4.hex(), alice.secretKeyHex);
-        assert.equal(secretKeyV5.hex(), alice.secretKeyHex);
+        assert.equal(secretKey.generatePublicKey().toAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
     });
 
-    it.only("should create and load keystore files (with mnemonics)", function () {
+    it("should create and load keystore files (with mnemonics)", async function () {
         this.timeout(10000);
 
         const wallet = UserWallet.fromMnemonic({ mnemonic: DummyMnemonic, password: password });
         const json = wallet.toJSON();
 
-        assert.equal(json.version, 5);
+        assert.equal(json.version, 4);
         assert.equal(json.kind, "mnemonic");
         assert.isUndefined(json.bech32);
 
-        console.log(JSON.stringify(json, null, 4));
-
         const mnemonicText = UserWallet.decryptMnemonic(json, password);
         const mnemonic = Mnemonic.fromString(mnemonicText);
 
@@ -181,16 +163,20 @@ describe("test user wallets", () => {
         assert.equal(mnemonic.deriveKey(0).generatePublicKey().toAddress().bech32(), alice.address.bech32());
         assert.equal(mnemonic.deriveKey(1).generatePublicKey().toAddress().bech32(), bob.address.bech32());
         assert.equal(mnemonic.deriveKey(2).generatePublicKey().toAddress().bech32(), carol.address.bech32());
-    });
 
-    it("should fail if using bad versions", function () {
-        const aliceSecretKey = UserSecretKey.fromString(alice.secretKeyHex);
-
-        assert.throws(() => UserWallet.fromSecretKey({ envelopeVersion: 7, secretKey: aliceSecretKey, password: password }), "Envelope version must be one of: [4, 5].");
-        assert.throws(() => UserWallet.fromMnemonic({ envelopeVersion: 4, mnemonic: DummyMnemonic, password: password }), "Envelope version must be one of: [5].");
+        // With provided randomness, in order to reproduce our test wallets
+        const expectedDummyWallet = await loadTestKeystore("withDummyMnemonic.json");
+        const dummyWallet = UserWallet.fromMnemonic({
+            mnemonic: DummyMnemonic,
+            password: password,
+            randomness: new Randomness({
+                id: "5b448dbc-5c72-4d83-8038-938b1f8dff19",
+                iv: Buffer.from("2da5620906634972d9a623bc249d63d4", "hex"),
+                salt: Buffer.from("aa9e0ba6b188703071a582c10e5331f2756279feb0e2768f1ba0fd38ec77f035", "hex")
+            })
+        });
 
-        assert.throws(() => UserWallet.decryptSecretKey({ version: 3, crypto: {} }, password), "Envelope version must be one of: [4, 5].");
-        assert.throws(() => UserWallet.decryptMnemonic({ version: 6, crypto: {} }, password), "Envelope version must be one of: [5].");
+        assert.deepEqual(dummyWallet.toJSON(), expectedDummyWallet);
     });
 
     it("should sign transactions", async () => {

From 645a218bb27d03d82035fb914b80b096d64e6d08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Thu, 2 Feb 2023 20:52:48 +0200
Subject: [PATCH 158/338] Extra type safety.

---
 src-wallet/mnemonic.ts   | 8 ++++----
 src-wallet/userWallet.ts | 9 ++++++---
 src-wallet/users.spec.ts | 4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src-wallet/mnemonic.ts b/src-wallet/mnemonic.ts
index b9dba56ae..ed5423b26 100644
--- a/src-wallet/mnemonic.ts
+++ b/src-wallet/mnemonic.ts
@@ -1,7 +1,7 @@
-import { generateMnemonic, validateMnemonic, mnemonicToSeedSync } from "bip39";
-import { UserSecretKey } from "./userKeys";
+import { generateMnemonic, mnemonicToSeedSync, validateMnemonic } from "bip39";
 import { derivePath } from "ed25519-hd-key";
 import { ErrWrongMnemonic } from "./errors";
+import { UserSecretKey } from "./userKeys";
 
 const MNEMONIC_STRENGTH = 256;
 const BIP44_DERIVATION_PREFIX = "m/44'/508'/0'/0'";
@@ -20,12 +20,12 @@ export class Mnemonic {
 
     static fromString(text: string) {
         text = text.trim();
-        
+
         Mnemonic.assertTextIsValid(text);
         return new Mnemonic(text);
     }
 
-    private static assertTextIsValid(text: string) {
+    public static assertTextIsValid(text: string) {
         let isValid = validateMnemonic(text);
 
         if (!isValid) {
diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index 8ba2014f0..5b6f57706 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -1,6 +1,7 @@
 import { CipherAlgorithm, Decryptor, EncryptedData, Encryptor, EncryptorVersion, KeyDerivationFunction, Randomness } from "./crypto";
 import { ScryptKeyDerivationParams } from "./crypto/derivationParams";
 import { Err } from "./errors";
+import { Mnemonic } from "./mnemonic";
 import { UserPublicKey, UserSecretKey } from "./userKeys";
 
 export enum UserWalletKind {
@@ -49,6 +50,7 @@ export class UserWallet {
     }): UserWallet {
         randomness = randomness || new Randomness();
 
+        Mnemonic.assertTextIsValid(mnemonic);
         const encryptedData = Encryptor.encrypt(Buffer.from(mnemonic), password, randomness);
 
         return new UserWallet({
@@ -82,14 +84,15 @@ export class UserWallet {
         return new UserSecretKey(seed);
     }
 
-    static decryptMnemonic(keyFileObject: any, password: string): string {
+    static decryptMnemonic(keyFileObject: any, password: string): Mnemonic {
         if (keyFileObject.kind != UserWalletKind.Mnemonic) {
             throw new Err(`Expected kind to be ${UserWalletKind.Mnemonic}, but it was ${keyFileObject.kind}.`);
         }
 
         const encryptedData = UserWallet.edFromJSON(keyFileObject);
-        const text = Decryptor.decrypt(encryptedData, password);
-        return text.toString();
+        const data = Decryptor.decrypt(encryptedData, password);
+        const mnemonic = Mnemonic.fromString(data.toString())
+        return mnemonic;
     }
 
     static edFromJSON(keyfileObject: any): EncryptedData {
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index faf6535a2..98a1a2d85 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -156,8 +156,8 @@ describe("test user wallets", () => {
         assert.equal(json.kind, "mnemonic");
         assert.isUndefined(json.bech32);
 
-        const mnemonicText = UserWallet.decryptMnemonic(json, password);
-        const mnemonic = Mnemonic.fromString(mnemonicText);
+        const mnemonic = UserWallet.decryptMnemonic(json, password);
+        const mnemonicText = mnemonic.toString();
 
         assert.equal(mnemonicText, DummyMnemonic);
         assert.equal(mnemonic.deriveKey(0).generatePublicKey().toAddress().bech32(), alice.address.bech32());

From ec013a0e79877e7f620e4db002688ec87c3f2e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Thu, 2 Feb 2023 21:04:43 +0200
Subject: [PATCH 159/338] Fix after self-review.

---
 src-wallet/crypto/encryptor.ts |  8 +++++++-
 src-wallet/userWallet.ts       | 25 +++++++++++++++----------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src-wallet/crypto/encryptor.ts b/src-wallet/crypto/encryptor.ts
index a7e357f2e..9d6e33c1b 100644
--- a/src-wallet/crypto/encryptor.ts
+++ b/src-wallet/crypto/encryptor.ts
@@ -4,12 +4,18 @@ import { ScryptKeyDerivationParams } from "./derivationParams";
 import { EncryptedData } from "./encryptedData";
 import { Randomness } from "./randomness";
 
+interface IRandomness {
+  id: string;
+  iv: Buffer;
+  salt: Buffer;
+}
+
 export enum EncryptorVersion {
   V4 = 4,
 }
 
 export class Encryptor {
-  static encrypt(data: Buffer, password: string, randomness: Randomness = new Randomness()): EncryptedData {
+  static encrypt(data: Buffer, password: string, randomness: IRandomness = new Randomness()): EncryptedData {
     const kdParams = new ScryptKeyDerivationParams();
     const derivedKey = kdParams.generateDerivedKey(Buffer.from(password), randomness.salt);
     const derivedKeyFirstHalf = derivedKey.slice(0, 16);
diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index 5b6f57706..8c6e36681 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -1,9 +1,15 @@
-import { CipherAlgorithm, Decryptor, EncryptedData, Encryptor, EncryptorVersion, KeyDerivationFunction, Randomness } from "./crypto";
+import { CipherAlgorithm, Decryptor, EncryptedData, Encryptor, KeyDerivationFunction, Randomness } from "./crypto";
 import { ScryptKeyDerivationParams } from "./crypto/derivationParams";
 import { Err } from "./errors";
 import { Mnemonic } from "./mnemonic";
 import { UserPublicKey, UserSecretKey } from "./userKeys";
 
+interface IRandomness {
+    id: string;
+    iv: Buffer;
+    salt: Buffer;
+}
+
 export enum UserWalletKind {
     SecretKey = "secretKey",
     Mnemonic = "mnemonic"
@@ -25,16 +31,15 @@ export class UserWallet {
     }
 
     static fromSecretKey({ secretKey, password, randomness }: {
-        encryptorVersion?: EncryptorVersion;
         secretKey: UserSecretKey;
         password: string;
-        randomness?: Randomness;
+        randomness?: IRandomness;
     }): UserWallet {
         randomness = randomness || new Randomness();
 
         const publicKey = secretKey.generatePublicKey();
-        const text = Buffer.concat([secretKey.valueOf(), publicKey.valueOf()]);
-        const encryptedData = Encryptor.encrypt(text, password, randomness);
+        const data = Buffer.concat([secretKey.valueOf(), publicKey.valueOf()]);
+        const encryptedData = Encryptor.encrypt(data, password, randomness);
 
         return new UserWallet({
             kind: UserWalletKind.SecretKey,
@@ -46,12 +51,13 @@ export class UserWallet {
     static fromMnemonic({ mnemonic, password, randomness }: {
         mnemonic: string;
         password: string;
-        randomness?: Randomness;
+        randomness?: IRandomness;
     }): UserWallet {
         randomness = randomness || new Randomness();
 
         Mnemonic.assertTextIsValid(mnemonic);
-        const encryptedData = Encryptor.encrypt(Buffer.from(mnemonic), password, randomness);
+        const data = Buffer.from(mnemonic);
+        const encryptedData = Encryptor.encrypt(data, password, randomness);
 
         return new UserWallet({
             kind: UserWalletKind.Mnemonic,
@@ -70,7 +76,7 @@ export class UserWallet {
      * From an encrypted keyfile, given the password, loads the secret key and the public key.
      */
     static decryptSecretKey(keyFileObject: any, password: string): UserSecretKey {
-        // Here, we do not check the "kind" field. Older keystore files holding secret keys do not have this field.
+        // Here, we do not check the "kind" field. Older keystore files (holding only secret keys) do not have this field.
 
         const encryptedData = UserWallet.edFromJSON(keyFileObject);
 
@@ -134,8 +140,7 @@ export class UserWallet {
 
         const envelope: any = {
             version: this.encryptedData.version,
-            // Adding "kind", if appropriate.
-            ...(this.kind ? { kind: this.kind } : {}),
+            kind: this.kind,
             id: this.encryptedData.id,
             address: this.publicKeyWhenKindIsSecretKey.hex(),
             bech32: this.publicKeyWhenKindIsSecretKey.toAddress().toString(),

From 7cdc80ba0416295a4b2cbfb15227e592641e64a4 Mon Sep 17 00:00:00 2001
From: andreibancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 22 Feb 2023 12:10:20 +0200
Subject: [PATCH 160/338] Do not handle user's signature in GuardianSigner
 (simplification).

---
 src-wallet/guardianSigner.ts | 10 ----------
 src-wallet/interface.ts      |  5 -----
 2 files changed, 15 deletions(-)

diff --git a/src-wallet/guardianSigner.ts b/src-wallet/guardianSigner.ts
index 39d65751a..b6237bb0a 100644
--- a/src-wallet/guardianSigner.ts
+++ b/src-wallet/guardianSigner.ts
@@ -26,20 +26,10 @@ export class GuardianSigner extends UserSigner {
     }
 
     private tryGuard(signable: ISignable) {
-        const ownerSignature = signable.getSignature()
         const bufferToSign = signable.serializeForSigning();
         const guardianSignatureBuffer = this.secretKey.sign(bufferToSign);
         const guardianSignature = new Signature(guardianSignatureBuffer);
 
-        this.addOwnerSignature(signable, ownerSignature)
-        this.doApplySignature(signable, guardianSignature);
-    }
-
-    protected doApplySignature(signable: ISignable, guardianSignature: ISignature) {
         signable.applyGuardianSignature(guardianSignature);
     }
-
-    private addOwnerSignature(signable: ISignable, ownerSignature: ISignature) {
-        signable.applySignature(ownerSignature);
-    }
 }
diff --git a/src-wallet/interface.ts b/src-wallet/interface.ts
index 99806f228..0cff489e7 100644
--- a/src-wallet/interface.ts
+++ b/src-wallet/interface.ts
@@ -51,11 +51,6 @@ export interface ISignable {
      */
     serializeForSigning(): Buffer;
 
-    /**
-     * Returns the signature of the sender.
-     */
-    getSignature(): ISignature;
-
     /**
      * Applies the computed signature on the object itself.
      *

From 7ad21ff4c565e8097a94cfc9cd14bd5c578b73f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Thu, 23 Feb 2023 20:15:35 +0200
Subject: [PATCH 161/338] Attempt to avoid breaking change.

---
 src-wallet/guardianSigner.ts | 10 +++++-----
 src-wallet/interface.ts      |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src-wallet/guardianSigner.ts b/src-wallet/guardianSigner.ts
index b6237bb0a..29ba30668 100644
--- a/src-wallet/guardianSigner.ts
+++ b/src-wallet/guardianSigner.ts
@@ -1,8 +1,8 @@
-import { ISignable, ISignature } from "./interface";
+import { ErrSignerCannotSign } from "./errors";
+import { IGuardableSignable } from "./interface";
+import { Signature } from "./signature";
 import { UserSecretKey } from "./userKeys";
 import { UserSigner } from "./userSigner";
-import { Signature } from "./signature";
-import { ErrSignerCannotSign } from "./errors";
 
 /**
  * ed25519 signer
@@ -17,7 +17,7 @@ export class GuardianSigner extends UserSigner {
      * Signs a message.
      * @param signable the message to be signed (e.g. a {@link Transaction}).
      */
-    async guard(signable: ISignable): Promise<void> {
+    async guard(signable: IGuardableSignable): Promise<void> {
         try {
             this.tryGuard(signable);
         } catch (err: any) {
@@ -25,7 +25,7 @@ export class GuardianSigner extends UserSigner {
         }
     }
 
-    private tryGuard(signable: ISignable) {
+    private tryGuard(signable: IGuardableSignable) {
         const bufferToSign = signable.serializeForSigning();
         const guardianSignatureBuffer = this.secretKey.sign(bufferToSign);
         const guardianSignature = new Signature(guardianSignatureBuffer);
diff --git a/src-wallet/interface.ts b/src-wallet/interface.ts
index 0cff489e7..d28dfe1fc 100644
--- a/src-wallet/interface.ts
+++ b/src-wallet/interface.ts
@@ -35,7 +35,7 @@ export interface IGuardianSigner {
     /**
      * Signs a message (e.g. a transaction).
      */
-    guard(signable: ISignable): Promise<void>;
+    guard(signable: IGuardableSignable): Promise<void>;
 }
 
 export interface IVerifier {
@@ -57,7 +57,9 @@ export interface ISignable {
      * @param signature The computed signature
     */
     applySignature(signature: ISignature): void;
+}
 
+export interface IGuardableSignable extends ISignable {
     /**
     * Applies the guardian signature on the transaction.
     *

From c71d332c6d17e86b5b5ead18f9c11d23d2e38e3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Thu, 23 Feb 2023 20:45:57 +0200
Subject: [PATCH 162/338] Drop some interfaces.

---
 src-wallet/interface.ts             | 42 +----------------------------
 src-wallet/testutils/message.ts     |  2 +-
 src-wallet/testutils/transaction.ts |  2 +-
 src-wallet/userKeys.ts              |  7 +++--
 src-wallet/userSigner.ts            | 11 ++++----
 src-wallet/userVerifier.ts          | 14 ++++++----
 6 files changed, 21 insertions(+), 57 deletions(-)

diff --git a/src-wallet/interface.ts b/src-wallet/interface.ts
index d28dfe1fc..dc3c27740 100644
--- a/src-wallet/interface.ts
+++ b/src-wallet/interface.ts
@@ -1,47 +1,7 @@
-export interface IAddress {
-    hex(): string;
-    bech32(): string;
-    pubkey(): Buffer;
-}
-
 export interface ISignature {
     hex(): string;
 }
 
-/**
- * An interface that defines a signing-capable object.
- */
-export interface ISigner {
-    /**
-     * Gets the {@link Address} of the signer.
-     */
-    getAddress(): IAddress;
-
-    /**
-     * Signs a message (e.g. a transaction).
-     */
-    sign(signable: ISignable): Promise<void>;
-}
-
-/**
- * An interface that defines a signing-capable object.
- */
-export interface IGuardianSigner {
-    /**
-     * Gets the {@link Address} of the signer.
-     */
-    getAddress(): IAddress;
-
-    /**
-     * Signs a message (e.g. a transaction).
-     */
-    guard(signable: IGuardableSignable): Promise<void>;
-}
-
-export interface IVerifier {
-    verify(message: IVerifiable): boolean;
-}
-
 /**
  * An interface that defines a signable object (e.g. a transaction).
  */
@@ -80,5 +40,5 @@ export interface IVerifiable {
     /**
      * Returns the signable object in its raw form - a sequence of bytes to be verified.
      */
-    serializeForSigning(signedBy?: IAddress): Buffer;
+    serializeForSigning(): Buffer;
 }
diff --git a/src-wallet/testutils/message.ts b/src-wallet/testutils/message.ts
index 7ed55520d..98c660e34 100644
--- a/src-wallet/testutils/message.ts
+++ b/src-wallet/testutils/message.ts
@@ -1,4 +1,4 @@
-import { IAddress, ISignable, ISignature, IVerifiable } from "../interface";
+import { ISignable, ISignature, IVerifiable } from "../interface";
 import { Signature } from "../signature";
 
 /**
diff --git a/src-wallet/testutils/transaction.ts b/src-wallet/testutils/transaction.ts
index e09ee2194..3a15b3207 100644
--- a/src-wallet/testutils/transaction.ts
+++ b/src-wallet/testutils/transaction.ts
@@ -1,4 +1,4 @@
-import { IAddress, ISignable, ISignature, IVerifiable } from "../interface";
+import { ISignable, ISignature, IVerifiable } from "../interface";
 import { Signature } from "../signature";
 
 /**
diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index eab6b92f2..3d2c4cbc4 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -1,8 +1,7 @@
 import * as tweetnacl from "tweetnacl";
-import { UserAddress } from "./userAddress";
 import { guardLength } from "./assertions";
 import { parseUserKey } from "./pem";
-import { IAddress } from "./interface";
+import { UserAddress } from "./userAddress";
 
 export const USER_SEED_LENGTH = 32;
 export const USER_PUBKEY_LENGTH = 32;
@@ -57,7 +56,7 @@ export class UserPublicKey {
 
     constructor(buffer: Buffer) {
         guardLength(buffer, USER_PUBKEY_LENGTH);
-        
+
         this.buffer = buffer;
     }
 
@@ -76,7 +75,7 @@ export class UserPublicKey {
         return this.buffer.toString("hex");
     }
 
-    toAddress(): IAddress {
+    toAddress(): UserAddress {
         return new UserAddress(this.buffer);
     }
 
diff --git a/src-wallet/userSigner.ts b/src-wallet/userSigner.ts
index 24f74e07a..b0bb1eecd 100644
--- a/src-wallet/userSigner.ts
+++ b/src-wallet/userSigner.ts
@@ -1,20 +1,21 @@
-import { IAddress, ISignable, ISignature, ISigner } from "./interface";
+import { ErrSignerCannotSign } from "./errors";
+import { ISignable } from "./interface";
 import { Signature } from "./signature";
+import { UserAddress } from "./userAddress";
 import { UserSecretKey } from "./userKeys";
 import { UserWallet } from "./userWallet";
-import { ErrSignerCannotSign } from "./errors";
 
 /**
  * ed25519 signer
  */
-export class UserSigner implements ISigner {
+export class UserSigner {
     protected readonly secretKey: UserSecretKey;
 
     constructor(secretKey: UserSecretKey) {
         this.secretKey = secretKey;
     }
 
-    static fromWallet(keyFileObject: any, password: string): ISigner {
+    static fromWallet(keyFileObject: any, password: string): UserSigner {
         let secretKey = UserWallet.decryptSecretKey(keyFileObject, password);
         return new UserSigner(secretKey);
     }
@@ -47,7 +48,7 @@ export class UserSigner implements ISigner {
     /**
      * Gets the address of the signer.
      */
-    getAddress(): IAddress {
+    getAddress(): UserAddress {
         return this.secretKey.generatePublicKey().toAddress();
     }
 }
diff --git a/src-wallet/userVerifier.ts b/src-wallet/userVerifier.ts
index 73e8e4f6b..ae747460a 100644
--- a/src-wallet/userVerifier.ts
+++ b/src-wallet/userVerifier.ts
@@ -1,17 +1,21 @@
-import { IAddress, IVerifiable, IVerifier } from "./interface";
+import { IVerifiable } from "./interface";
 import { UserPublicKey } from "./userKeys";
 
+interface IAddress {
+  pubkey(): Buffer;
+}
+
 /**
  * ed25519 signature verification
  */
-export class UserVerifier implements IVerifier {
-
+export class UserVerifier {
   publicKey: UserPublicKey;
+
   constructor(publicKey: UserPublicKey) {
     this.publicKey = publicKey;
   }
 
-  static fromAddress(address: IAddress): IVerifier {
+  static fromAddress(address: IAddress): UserVerifier {
     let publicKey = new UserPublicKey(address.pubkey());
     return new UserVerifier(publicKey);
   }
@@ -22,7 +26,7 @@ export class UserVerifier implements IVerifier {
    */
   verify(message: IVerifiable): boolean {
     return this.publicKey.verify(
-      message.serializeForSigning(this.publicKey.toAddress()),
+      message.serializeForSigning(),
       Buffer.from(message.getSignature().hex(), 'hex'));
   }
 }

From 0f6f76a14c545a02197fd35d6680906bfbddc8e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Thu, 23 Feb 2023 21:19:09 +0200
Subject: [PATCH 163/338] Simplify test object.

---
 src-wallet/testutils/message.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src-wallet/testutils/message.ts b/src-wallet/testutils/message.ts
index 7ed55520d..e51376d2d 100644
--- a/src-wallet/testutils/message.ts
+++ b/src-wallet/testutils/message.ts
@@ -1,4 +1,4 @@
-import { IAddress, ISignable, ISignature, IVerifiable } from "../interface";
+import { ISignable, ISignature, IVerifiable } from "../interface";
 import { Signature } from "../signature";
 
 /**
@@ -28,10 +28,6 @@ export class TestMessage implements ISignable, IVerifiable {
         this.signature = signature.hex();
     }
 
-    applyGuardianSignature(guardianSignature: ISignature) {
-        this.guardianSignature = guardianSignature.hex()
-    }
-
     getSignature(): ISignature {
         return new Signature(Buffer.from(this.signature, "hex"));
     }

From dd6c5291839365430a1694a9f293ebc55aaf594f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Fri, 24 Feb 2023 16:34:59 +0200
Subject: [PATCH 164/338] Simplified Verify(), to receive the raw data and the
 signature.

---
 src-wallet/interface.ts             | 19 -------------------
 src-wallet/testutils/message.ts     | 11 +++--------
 src-wallet/testutils/transaction.ts |  4 ++--
 src-wallet/userKeys.ts              | 10 +++++-----
 src-wallet/userVerifier.ts          | 18 +++++++++---------
 src-wallet/users.spec.ts            | 12 ++++++++----
 6 files changed, 27 insertions(+), 47 deletions(-)

diff --git a/src-wallet/interface.ts b/src-wallet/interface.ts
index 04c4fdee3..d03e5348d 100644
--- a/src-wallet/interface.ts
+++ b/src-wallet/interface.ts
@@ -23,10 +23,6 @@ export interface ISigner {
     sign(signable: ISignable): Promise<void>;
 }
 
-export interface IVerifier {
-    verify(message: IVerifiable): boolean;
-}
-
 /**
  * An interface that defines a signable object (e.g. a transaction).
  */
@@ -44,18 +40,3 @@ export interface ISignable {
      */
     applySignature(signature: ISignature, signedBy: IAddress): void;
 }
-
-/**
- * Interface that defines a signed and verifiable object
- */
-export interface IVerifiable {
-    /**
-     * Returns the signature that should be verified
-     */
-    getSignature(): ISignature;
-
-    /**
-     * Returns the signable object in its raw form - a sequence of bytes to be verified.
-     */
-    serializeForSigning(signedBy?: IAddress): Buffer;
-}
diff --git a/src-wallet/testutils/message.ts b/src-wallet/testutils/message.ts
index 1fe2f542b..3460290d7 100644
--- a/src-wallet/testutils/message.ts
+++ b/src-wallet/testutils/message.ts
@@ -1,10 +1,9 @@
-import { IAddress, ISignable, ISignature, IVerifiable } from "../interface";
-import { Signature } from "../signature";
+import { IAddress, ISignature } from "../interface";
 
 /**
  * A dummy message used in tests.
  */
-export class TestMessage implements ISignable, IVerifiable {
+export class TestMessage {
     foo: string = "";
     bar: string = "";
     signature: string = "";
@@ -13,7 +12,7 @@ export class TestMessage implements ISignable, IVerifiable {
         Object.assign(this, init);
     }
 
-    serializeForSigning(_signedBy: IAddress): Buffer {
+    serializeForSigning(): Buffer {
         let plainObject = {
             foo: this.foo,
             bar: this.bar
@@ -26,8 +25,4 @@ export class TestMessage implements ISignable, IVerifiable {
     applySignature(signature: ISignature, _signedBy: IAddress): void {
         this.signature = signature.hex();
     }
-
-    getSignature(): ISignature {
-        return new Signature(Buffer.from(this.signature, "hex"));
-    }
 }
diff --git a/src-wallet/testutils/transaction.ts b/src-wallet/testutils/transaction.ts
index bd0d04c06..88b2ccb63 100644
--- a/src-wallet/testutils/transaction.ts
+++ b/src-wallet/testutils/transaction.ts
@@ -1,10 +1,10 @@
-import { IAddress, ISignable, ISignature, IVerifiable } from "../interface";
+import { IAddress, ISignature } from "../interface";
 import { Signature } from "../signature";
 
 /**
  * A dummy transaction used in tests.
  */
-export class TestTransaction implements ISignable, IVerifiable {
+export class TestTransaction {
     nonce: number = 0;
     value: string = "";
     receiver: string = "";
diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index eab6b92f2..aec4d211c 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -1,8 +1,8 @@
 import * as tweetnacl from "tweetnacl";
-import { UserAddress } from "./userAddress";
 import { guardLength } from "./assertions";
-import { parseUserKey } from "./pem";
 import { IAddress } from "./interface";
+import { parseUserKey } from "./pem";
+import { UserAddress } from "./userAddress";
 
 export const USER_SEED_LENGTH = 32;
 export const USER_PUBKEY_LENGTH = 32;
@@ -57,13 +57,13 @@ export class UserPublicKey {
 
     constructor(buffer: Buffer) {
         guardLength(buffer, USER_PUBKEY_LENGTH);
-        
+
         this.buffer = buffer;
     }
 
-    verify(message: Buffer, signature: Buffer): boolean {
+    verify(data: Buffer, signature: Buffer): boolean {
         try {
-            const unopenedMessage = Buffer.concat([signature, message]);
+            const unopenedMessage = Buffer.concat([signature, data]);
             const unsignedMessage = tweetnacl.sign.open(unopenedMessage, this.buffer);
             return unsignedMessage != null;
         } catch (err) {
diff --git a/src-wallet/userVerifier.ts b/src-wallet/userVerifier.ts
index 73e8e4f6b..eed50b21a 100644
--- a/src-wallet/userVerifier.ts
+++ b/src-wallet/userVerifier.ts
@@ -1,28 +1,28 @@
-import { IAddress, IVerifiable, IVerifier } from "./interface";
+import { IAddress } from "./interface";
 import { UserPublicKey } from "./userKeys";
 
 /**
  * ed25519 signature verification
  */
-export class UserVerifier implements IVerifier {
+export class UserVerifier {
 
   publicKey: UserPublicKey;
   constructor(publicKey: UserPublicKey) {
     this.publicKey = publicKey;
   }
 
-  static fromAddress(address: IAddress): IVerifier {
+  static fromAddress(address: IAddress): UserVerifier {
     let publicKey = new UserPublicKey(address.pubkey());
     return new UserVerifier(publicKey);
   }
 
   /**
-   * Verify a message's signature.
-   * @param message the message to be verified.
+   * 
+   * @param data the raw data to be verified (e.g. an already-serialized enveloped message)
+   * @param signature the signature to be verified
+   * @returns true if the signature is valid, false otherwise
    */
-  verify(message: IVerifiable): boolean {
-    return this.publicKey.verify(
-      message.serializeForSigning(this.publicKey.toAddress()),
-      Buffer.from(message.getSignature().hex(), 'hex'));
+  verify(data: Buffer, signature: Buffer): boolean {
+    return this.publicKey.verify(data, signature);
   }
 }
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 98a1a2d85..ca28f2d75 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -200,7 +200,7 @@ describe("test user wallets", () => {
 
         assert.equal(serialized, `{"nonce":0,"value":"0","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1}`);
         assert.equal(transaction.getSignature().hex(), "b5fddb8c16fa7f6123cb32edc854f1e760a3eb62c6dc420b5a4c0473c58befd45b621b31a448c5b59e21428f2bc128c80d0ee1caa4f2bf05a12be857ad451b00");
-        assert.isTrue(verifier.verify(transaction));
+        assert.isTrue(verifier.verify(Buffer.from(serialized), Buffer.from(transaction.signature, "hex")));
         // Without data field
         transaction = new TestTransaction({
             nonce: 8,
@@ -235,7 +235,7 @@ describe("test user wallets", () => {
         assert.equal(transaction.getSignature().hex(), "c0bd2b3b33a07b9cc5ee7435228acb0936b3829c7008aacabceea35163e555e19a34def2c03a895cf36b0bcec30a7e11215c11efc0da29294a11234eb2b3b906");
     });
 
-    it("signs a general message", function () {
+    it("signs a general message", async function () {
         let signer = new UserSigner(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
         let verifier = new UserVerifier(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf").generatePublicKey());
         const message = new TestMessage({
@@ -243,8 +243,12 @@ describe("test user wallets", () => {
             bar: "world"
         });
 
-        signer.sign(message);
+        await signer.sign(message);
+
+        const serialized = message.serializeForSigning();
+        const signature = Buffer.from(message.signature, "hex");
+
         assert.isNotEmpty(message.signature);
-        assert.isTrue(verifier.verify(message));
+        assert.isTrue(verifier.verify(serialized, signature));
     });
 });

From b6294e74e7d57779fa9c610987e6e6b2adb9c5ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Fri, 24 Feb 2023 16:56:17 +0200
Subject: [PATCH 165/338] Remove interfaces: ISigner, ISignable. Now,
 signer.sign() returns the signature, instead of calling applySignature() on
 the signed object.

---
 src-wallet/index.ts                 |  4 +--
 src-wallet/interface.ts             | 42 -----------------------------
 src-wallet/testutils/message.ts     |  7 -----
 src-wallet/testutils/transaction.ts | 30 ++++++---------------
 src-wallet/userKeys.ts              |  3 +--
 src-wallet/userSigner.ts            | 33 +++++++----------------
 src-wallet/userVerifier.ts          |  8 ++++--
 src-wallet/users.spec.ts            | 41 +++++++++++++---------------
 8 files changed, 46 insertions(+), 122 deletions(-)
 delete mode 100644 src-wallet/interface.ts

diff --git a/src-wallet/index.ts b/src-wallet/index.ts
index c5d518dfd..af9ecec6a 100644
--- a/src-wallet/index.ts
+++ b/src-wallet/index.ts
@@ -1,8 +1,8 @@
 export * from "./mnemonic";
 export * from "./pem";
-export * from "./userWallet";
 export * from "./userKeys";
-export * from "./validatorKeys";
 export * from "./userSigner";
 export * from "./userVerifier";
+export * from "./userWallet";
+export * from "./validatorKeys";
 export * from "./validatorSigner";
diff --git a/src-wallet/interface.ts b/src-wallet/interface.ts
deleted file mode 100644
index d03e5348d..000000000
--- a/src-wallet/interface.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-export interface IAddress {
-    hex(): string;
-    bech32(): string;
-    pubkey(): Buffer;
-}
-
-export interface ISignature {
-    hex(): string;
-}
-
-/**
- * An interface that defines a signing-capable object.
- */
-export interface ISigner {
-    /**
-     * Gets the {@link Address} of the signer.
-     */
-    getAddress(): IAddress;
-
-    /**
-     * Signs a message (e.g. a transaction).
-     */
-    sign(signable: ISignable): Promise<void>;
-}
-
-/**
- * An interface that defines a signable object (e.g. a transaction).
- */
-export interface ISignable {
-    /**
-     * Returns the signable object in its raw form - a sequence of bytes to be signed.
-     */
-    serializeForSigning(signedBy: IAddress): Buffer;
-
-    /**
-     * Applies the computed signature on the object itself.
-     *
-     * @param signature The computed signature
-     * @param signedBy The address of the {@link ISignature}
-     */
-    applySignature(signature: ISignature, signedBy: IAddress): void;
-}
diff --git a/src-wallet/testutils/message.ts b/src-wallet/testutils/message.ts
index 3460290d7..c115d20dc 100644
--- a/src-wallet/testutils/message.ts
+++ b/src-wallet/testutils/message.ts
@@ -1,12 +1,9 @@
-import { IAddress, ISignature } from "../interface";
-
 /**
  * A dummy message used in tests.
  */
 export class TestMessage {
     foo: string = "";
     bar: string = "";
-    signature: string = "";
 
     constructor(init?: Partial<TestMessage>) {
         Object.assign(this, init);
@@ -21,8 +18,4 @@ export class TestMessage {
         let serialized = JSON.stringify(plainObject);
         return Buffer.from(serialized);
     }
-
-    applySignature(signature: ISignature, _signedBy: IAddress): void {
-        this.signature = signature.hex();
-    }
 }
diff --git a/src-wallet/testutils/transaction.ts b/src-wallet/testutils/transaction.ts
index 88b2ccb63..f59b13b0a 100644
--- a/src-wallet/testutils/transaction.ts
+++ b/src-wallet/testutils/transaction.ts
@@ -1,6 +1,3 @@
-import { IAddress, ISignature } from "../interface";
-import { Signature } from "../signature";
-
 /**
  * A dummy transaction used in tests.
  */
@@ -16,40 +13,29 @@ export class TestTransaction {
     options: number = 0;
 
     sender: string = "";
-    signature: string = "";
 
     constructor(init?: Partial<TestTransaction>) {
         Object.assign(this, init);
     }
 
-    serializeForSigning(signedBy: IAddress): Buffer {
-        let sender = signedBy.bech32();
-        let dataEncoded = this.data ? Buffer.from(this.data).toString("base64") : undefined;
-        let options = this.options ? this.options : undefined;
+    serializeForSigning(): Buffer {
+        const dataEncoded = this.data ? Buffer.from(this.data).toString("base64") : undefined;
+        const options = this.options ? this.options : undefined;
 
-        let plainObject = {
+        const plainObject = {
             nonce: this.nonce,
             value: this.value,
             receiver: this.receiver,
-            sender: sender,
+            sender: this.sender,
             gasPrice: this.gasPrice,
             gasLimit: this.gasLimit,
             data: dataEncoded,
             chainID: this.chainID,
-            version: this.version,
-            options: options
+            options: options,
+            version: this.version
         };
 
-        let serialized = JSON.stringify(plainObject);
+        const serialized = JSON.stringify(plainObject);
         return Buffer.from(serialized);
     }
-
-    applySignature(signature: ISignature, signedBy: IAddress): void {
-        this.sender = signedBy.bech32();
-        this.signature = signature.hex();
-    }
-
-    getSignature(): ISignature {
-        return new Signature(Buffer.from(this.signature, "hex"));
-    }
 }
diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index aec4d211c..42912cf4b 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -1,6 +1,5 @@
 import * as tweetnacl from "tweetnacl";
 import { guardLength } from "./assertions";
-import { IAddress } from "./interface";
 import { parseUserKey } from "./pem";
 import { UserAddress } from "./userAddress";
 
@@ -76,7 +75,7 @@ export class UserPublicKey {
         return this.buffer.toString("hex");
     }
 
-    toAddress(): IAddress {
+    toAddress(): UserAddress {
         return new UserAddress(this.buffer);
     }
 
diff --git a/src-wallet/userSigner.ts b/src-wallet/userSigner.ts
index c7cdde4e0..d5ab20733 100644
--- a/src-wallet/userSigner.ts
+++ b/src-wallet/userSigner.ts
@@ -1,20 +1,19 @@
-import { IAddress, ISignable, ISigner } from "./interface";
-import { Signature } from "./signature";
+import { ErrSignerCannotSign } from "./errors";
+import { UserAddress } from "./userAddress";
 import { UserSecretKey } from "./userKeys";
 import { UserWallet } from "./userWallet";
-import { ErrSignerCannotSign } from "./errors";
 
 /**
  * ed25519 signer
  */
-export class UserSigner implements ISigner {
-    private readonly secretKey: UserSecretKey;
+export class UserSigner {
+    protected readonly secretKey: UserSecretKey;
 
     constructor(secretKey: UserSecretKey) {
         this.secretKey = secretKey;
     }
 
-    static fromWallet(keyFileObject: any, password: string): ISigner {
+    static fromWallet(keyFileObject: any, password: string): UserSigner {
         let secretKey = UserWallet.decryptSecretKey(keyFileObject, password);
         return new UserSigner(secretKey);
     }
@@ -23,32 +22,20 @@ export class UserSigner implements ISigner {
         let secretKey = UserSecretKey.fromPem(text, index);
         return new UserSigner(secretKey);
     }
-    
-    /**
-     * Signs a message.
-     * @param signable the message to be signed (e.g. a {@link Transaction}).
-     */
-    async sign(signable: ISignable): Promise<void> {
+
+    async sign(data: Buffer): Promise<Buffer> {
         try {
-            this.trySign(signable);
+            const signature = this.secretKey.sign(data);
+            return signature;
         } catch (err: any) {
             throw new ErrSignerCannotSign(err);
         }
     }
 
-    private trySign(signable: ISignable) {
-        let signedBy = this.getAddress();
-        let bufferToSign = signable.serializeForSigning(signedBy);
-        let signatureBuffer = this.secretKey.sign(bufferToSign);
-        let signature = new Signature(signatureBuffer);
-
-        signable.applySignature(signature, signedBy);
-    }
-
     /**
      * Gets the address of the signer.
      */
-    getAddress(): IAddress {
+    getAddress(): UserAddress {
         return this.secretKey.generatePublicKey().toAddress();
     }
 }
diff --git a/src-wallet/userVerifier.ts b/src-wallet/userVerifier.ts
index eed50b21a..78302943f 100644
--- a/src-wallet/userVerifier.ts
+++ b/src-wallet/userVerifier.ts
@@ -1,12 +1,16 @@
-import { IAddress } from "./interface";
 import { UserPublicKey } from "./userKeys";
 
+interface IAddress {
+  pubkey(): Buffer;
+}
+
+
 /**
  * ed25519 signature verification
  */
 export class UserVerifier {
-
   publicKey: UserPublicKey;
+
   constructor(publicKey: UserPublicKey) {
     this.publicKey = publicKey;
   }
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index ca28f2d75..712e94edb 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -5,7 +5,6 @@ import { Mnemonic } from "./mnemonic";
 import { TestMessage } from "./testutils/message";
 import { TestTransaction } from "./testutils/transaction";
 import { DummyMnemonic, DummyMnemonicOf12Words, DummyPassword, loadTestKeystore, loadTestWallet, TestWallet } from "./testutils/wallets";
-import { UserAddress } from "./userAddress";
 import { UserSecretKey } from "./userKeys";
 import { UserSigner } from "./userSigner";
 import { UserVerifier } from "./userVerifier";
@@ -182,7 +181,6 @@ describe("test user wallets", () => {
     it("should sign transactions", async () => {
         let signer = new UserSigner(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
         let verifier = new UserVerifier(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf").generatePublicKey());
-        let sender = UserAddress.fromBech32("erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz");
 
         // With data field
         let transaction = new TestTransaction({
@@ -192,15 +190,15 @@ describe("test user wallets", () => {
             gasPrice: 1000000000,
             gasLimit: 50000,
             data: "foo",
-            chainID: "1"
+            chainID: "1",
         });
 
-        let serialized = transaction.serializeForSigning(sender).toString();
-        await signer.sign(transaction);
+        let serialized = transaction.serializeForSigning();
+        let signature = await signer.sign(serialized);
 
-        assert.equal(serialized, `{"nonce":0,"value":"0","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1}`);
-        assert.equal(transaction.getSignature().hex(), "b5fddb8c16fa7f6123cb32edc854f1e760a3eb62c6dc420b5a4c0473c58befd45b621b31a448c5b59e21428f2bc128c80d0ee1caa4f2bf05a12be857ad451b00");
-        assert.isTrue(verifier.verify(Buffer.from(serialized), Buffer.from(transaction.signature, "hex")));
+        assert.equal(serialized.toString(), `{"nonce":0,"value":"0","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1}`);
+        assert.equal(signature.toString("hex"), "a3b61a2fe461f3393c42e6cb0477a6b52ffd92168f10c111f6aa8d0a310ee0c314fae0670f8313f1ad992933ac637c61a8ff20cc20b6a8b2260a4af1a120a70d");
+        assert.isTrue(verifier.verify(serialized, signature));
         // Without data field
         transaction = new TestTransaction({
             nonce: 8,
@@ -211,17 +209,17 @@ describe("test user wallets", () => {
             chainID: "1"
         });
 
-        serialized = transaction.serializeForSigning(sender).toString();
-        await signer.sign(transaction);
+        serialized = transaction.serializeForSigning();
+        signature = await signer.sign(serialized);
 
-        assert.equal(serialized, `{"nonce":8,"value":"10000000000000000000","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","version":1}`);
-        assert.equal(transaction.getSignature().hex(), "4a6d8186eae110894e7417af82c9bf9592696c0600faf110972e0e5310d8485efc656b867a2336acec2b4c1e5f76c9cc70ba1803c6a46455ed7f1e2989a90105");
+        assert.equal(serialized.toString(), `{"nonce":8,"value":"10000000000000000000","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","version":1}`);
+        assert.equal(signature.toString("hex"), "f136c901d37349a7da8cfe3ab5ec8ef333b0bc351517c0e9bef9eb9704aed3077bf222769cade5ff29dffe5f42e4f0c5e0b068bdba90cd2cb41da51fd45d5a03");
     });
 
     it("should sign transactions using PEM files", async () => {
-        let signer = UserSigner.fromPem(alice.pemFileText);
+        const signer = UserSigner.fromPem(alice.pemFileText);
 
-        let transaction = new TestTransaction({
+        const transaction = new TestTransaction({
             nonce: 0,
             value: "0",
             receiver: "erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r",
@@ -231,24 +229,23 @@ describe("test user wallets", () => {
             chainID: "1"
         });
 
-        await signer.sign(transaction);
-        assert.equal(transaction.getSignature().hex(), "c0bd2b3b33a07b9cc5ee7435228acb0936b3829c7008aacabceea35163e555e19a34def2c03a895cf36b0bcec30a7e11215c11efc0da29294a11234eb2b3b906");
+        const signature = await signer.sign(transaction.serializeForSigning());
+        assert.equal(signature.toString("hex"), "ba4fa95fea1402e4876abf1d5a510615aab374ee48bb76f5230798a7d3f2fcae6ba91ba56c6d62e6e7003ce531ff02f219cb7218dd00dd2ca650ba747f19640a");
     });
 
     it("signs a general message", async function () {
         let signer = new UserSigner(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
         let verifier = new UserVerifier(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf").generatePublicKey());
+
         const message = new TestMessage({
             foo: "hello",
             bar: "world"
         });
 
-        await signer.sign(message);
-
-        const serialized = message.serializeForSigning();
-        const signature = Buffer.from(message.signature, "hex");
+        const data = message.serializeForSigning();
+        const signature = await signer.sign(data);
 
-        assert.isNotEmpty(message.signature);
-        assert.isTrue(verifier.verify(serialized, signature));
+        assert.isTrue(verifier.verify(data, signature));
+        assert.isFalse(verifier.verify(Buffer.from("hello"), signature));
     });
 });

From ec6b3a304188ed22359457a1b81dc35c498422ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Fri, 24 Feb 2023 16:58:39 +0200
Subject: [PATCH 166/338] Fix after self-review.

---
 src-wallet/testutils/transaction.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-wallet/testutils/transaction.ts b/src-wallet/testutils/transaction.ts
index f59b13b0a..a60a7c04d 100644
--- a/src-wallet/testutils/transaction.ts
+++ b/src-wallet/testutils/transaction.ts
@@ -31,8 +31,8 @@ export class TestTransaction {
             gasLimit: this.gasLimit,
             data: dataEncoded,
             chainID: this.chainID,
-            options: options,
-            version: this.version
+            version: this.version,
+            options: options
         };
 
         const serialized = JSON.stringify(plainObject);

From b15f6d18805f16991ad4bb0d8b0ca066e7790096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Mon, 13 Mar 2023 15:59:03 +0200
Subject: [PATCH 167/338] Bit of decoupling.

---
 src-wallet/userSigner.ts | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src-wallet/userSigner.ts b/src-wallet/userSigner.ts
index d5ab20733..144080f9a 100644
--- a/src-wallet/userSigner.ts
+++ b/src-wallet/userSigner.ts
@@ -3,13 +3,23 @@ import { UserAddress } from "./userAddress";
 import { UserSecretKey } from "./userKeys";
 import { UserWallet } from "./userWallet";
 
+interface IUserSecretKey {
+    sign(message: Buffer): Buffer;
+    generatePublicKey(): IUserPublicKey;
+}
+
+interface IUserPublicKey {
+    toAddress(): { bech32(): string; };
+}
+
+
 /**
  * ed25519 signer
  */
 export class UserSigner {
-    protected readonly secretKey: UserSecretKey;
+    protected readonly secretKey: IUserSecretKey;
 
-    constructor(secretKey: UserSecretKey) {
+    constructor(secretKey: IUserSecretKey) {
         this.secretKey = secretKey;
     }
 
@@ -36,6 +46,7 @@ export class UserSigner {
      * Gets the address of the signer.
      */
     getAddress(): UserAddress {
-        return this.secretKey.generatePublicKey().toAddress();
+        const bech32 = this.secretKey.generatePublicKey().toAddress().bech32();
+        return UserAddress.fromBech32(bech32);
     }
 }

From 19dc566bfd5b85b5aab59ddbe5b8222234c86466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 21 Mar 2023 13:55:11 +0200
Subject: [PATCH 168/338] @noble/ed25519 for sign & verify (user wallets).

---
 src-wallet/crypto/pubkeyEncryptor.ts |  2 +-
 src-wallet/crypto/randomness.ts      |  8 ++---
 src-wallet/userKeys.ts               | 27 +++++++-------
 src-wallet/usersBenchmark.spec.ts    | 53 ++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 20 deletions(-)
 create mode 100644 src-wallet/usersBenchmark.spec.ts

diff --git a/src-wallet/crypto/pubkeyEncryptor.ts b/src-wallet/crypto/pubkeyEncryptor.ts
index b3f6517c1..0c89bf16c 100644
--- a/src-wallet/crypto/pubkeyEncryptor.ts
+++ b/src-wallet/crypto/pubkeyEncryptor.ts
@@ -7,7 +7,7 @@ import { X25519EncryptedData } from "./x25519EncryptedData";
 
 export class PubkeyEncryptor {
     static encrypt(data: Buffer, recipientPubKey: UserPublicKey, authSecretKey: UserSecretKey): X25519EncryptedData {
-        // create a new x225519 keypair that will be used for EDH
+        // create a new x25519 keypair that will be used for EDH
         const edhPair = nacl.sign.keyPair();
         const recipientDHPubKey = ed2curve.convertPublicKey(recipientPubKey.valueOf());
         if (recipientDHPubKey === null) {
diff --git a/src-wallet/crypto/randomness.ts b/src-wallet/crypto/randomness.ts
index f045dc676..c6355ff87 100644
--- a/src-wallet/crypto/randomness.ts
+++ b/src-wallet/crypto/randomness.ts
@@ -1,5 +1,5 @@
-import nacl from "tweetnacl";
-import {v4 as uuidv4} from "uuid";
+import { utils } from "@noble/ed25519";
+import { v4 as uuidv4 } from "uuid";
 const crypto = require("crypto");
 
 export class Randomness {
@@ -8,8 +8,8 @@ export class Randomness {
   id: string;
 
   constructor(init?: Partial<Randomness>) {
-    this.salt = init?.salt || Buffer.from(nacl.randomBytes(32));
-    this.iv = init?.iv || Buffer.from(nacl.randomBytes(16));
+    this.salt = init?.salt || Buffer.from(utils.randomBytes(32));
+    this.iv = init?.iv || Buffer.from(utils.randomBytes(16));
     this.id = init?.id || uuidv4({ random: crypto.randomBytes(16) });
   }
 }
diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index 42912cf4b..d8584d023 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -1,4 +1,5 @@
-import * as tweetnacl from "tweetnacl";
+import * as ed from "@noble/ed25519";
+import { sha512 } from "@noble/hashes/sha512";
 import { guardLength } from "./assertions";
 import { parseUserKey } from "./pem";
 import { UserAddress } from "./userAddress";
@@ -6,6 +7,9 @@ import { UserAddress } from "./userAddress";
 export const USER_SEED_LENGTH = 32;
 export const USER_PUBKEY_LENGTH = 32;
 
+// See: https://github.com/paulmillr/noble-ed25519
+ed.utils.sha512Sync = (...m) => sha512(ed.utils.concatBytes(...m));
+
 export class UserSecretKey {
     private readonly buffer: Buffer;
 
@@ -27,18 +31,12 @@ export class UserSecretKey {
     }
 
     generatePublicKey(): UserPublicKey {
-        let keyPair = tweetnacl.sign.keyPair.fromSeed(new Uint8Array(this.buffer));
-        let buffer = Buffer.from(keyPair.publicKey);
+        const buffer = ed.sync.getPublicKey(this.buffer);
         return new UserPublicKey(buffer);
     }
 
     sign(message: Buffer): Buffer {
-        let pair = tweetnacl.sign.keyPair.fromSeed(new Uint8Array(this.buffer));
-        let signingKey = pair.secretKey;
-        let signature = tweetnacl.sign(new Uint8Array(message), signingKey);
-        // "tweetnacl.sign()" returns the concatenated [signature, message], therfore we remove the appended message:
-        signature = signature.slice(0, signature.length - message.length);
-
+        const signature = ed.sync.sign(message, this.buffer);
         return Buffer.from(signature);
     }
 
@@ -54,18 +52,17 @@ export class UserSecretKey {
 export class UserPublicKey {
     private readonly buffer: Buffer;
 
-    constructor(buffer: Buffer) {
+    constructor(buffer: Uint8Array) {
         guardLength(buffer, USER_PUBKEY_LENGTH);
 
-        this.buffer = buffer;
+        this.buffer = Buffer.from(buffer);
     }
 
     verify(data: Buffer, signature: Buffer): boolean {
         try {
-            const unopenedMessage = Buffer.concat([signature, data]);
-            const unsignedMessage = tweetnacl.sign.open(unopenedMessage, this.buffer);
-            return unsignedMessage != null;
-        } catch (err) {
+            const ok = ed.sync.verify(signature, data, this.buffer);
+            return ok;
+        } catch (err: any) {
             console.error(err);
             return false;
         }
diff --git a/src-wallet/usersBenchmark.spec.ts b/src-wallet/usersBenchmark.spec.ts
new file mode 100644
index 000000000..6f86d0aac
--- /dev/null
+++ b/src-wallet/usersBenchmark.spec.ts
@@ -0,0 +1,53 @@
+import { utils } from "@noble/ed25519";
+import { assert } from "chai";
+import { UserPublicKey, UserSecretKey } from "./userKeys";
+
+describe("behchmark sign and verify", () => {
+
+    it.only("should sign and verify", async function () {
+        this.timeout(60000);
+
+        const n = 10000;
+        const secretKeys: UserSecretKey[] = [];
+        const publicKeys: UserPublicKey[] = [];
+        const messages: Buffer[] = [];
+        const goodSignatures: Buffer[] = [];
+
+        for (let i = 0; i < n; i++) {
+            const secretKey = new UserSecretKey(Buffer.from(utils.randomBytes(32)));
+            const publicKey = secretKey.generatePublicKey();
+            const message = Buffer.from(utils.randomBytes(256));
+
+            secretKeys.push(secretKey);
+            publicKeys.push(publicKey);
+            messages.push(message);
+        }
+
+        console.time("sign");
+
+        for (let i = 0; i < n; i++) {
+            const signature = secretKeys[i].sign(messages[i]);
+            goodSignatures.push(signature);
+        }
+
+        console.timeEnd("sign");
+
+        console.time("verify (good)");
+
+        for (let i = 0; i < n; i++) {
+            const ok = publicKeys[i].verify(messages[i], goodSignatures[i]);
+            assert.isTrue(ok);
+        }
+
+        console.timeEnd("verify (good)");
+
+        console.time("verify (bad)");
+
+        for (let i = 0; i < n; i++) {
+            const ok = publicKeys[i].verify(messages[messages.length - i - 1], goodSignatures[i]);
+            assert.isFalse(ok);
+        }
+
+        console.timeEnd("verify (bad)");
+    });
+});

From 88bc18d4909ed6e440156ea8f0a9c730cf70ffe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 21 Mar 2023 15:14:09 +0200
Subject: [PATCH 169/338] Add benchmark for sign & verify (before switching to
 noble crypto libs).

---
 src-wallet/usersBenchmark.spec.ts | 53 +++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 src-wallet/usersBenchmark.spec.ts

diff --git a/src-wallet/usersBenchmark.spec.ts b/src-wallet/usersBenchmark.spec.ts
new file mode 100644
index 000000000..27b87a284
--- /dev/null
+++ b/src-wallet/usersBenchmark.spec.ts
@@ -0,0 +1,53 @@
+import { assert } from "chai";
+import nacl from "tweetnacl";
+import { UserPublicKey, UserSecretKey } from "./userKeys";
+
+describe("behchmark sign and verify", () => {
+    it("should sign and verify", async function () {
+        this.timeout(60000);
+
+        const n = 1000;
+        const secretKeys: UserSecretKey[] = [];
+        const publicKeys: UserPublicKey[] = [];
+        const messages: Buffer[] = [];
+        const goodSignatures: Buffer[] = [];
+
+        for (let i = 0; i < n; i++) {
+            const secretKey = new UserSecretKey(Buffer.from(nacl.randomBytes(32)));
+            const publicKey = secretKey.generatePublicKey();
+            const message = Buffer.from(nacl.randomBytes(256));
+
+            secretKeys.push(secretKey);
+            publicKeys.push(publicKey);
+            messages.push(message);
+        }
+
+        console.info(`N = ${n}`);
+        console.time("sign");
+
+        for (let i = 0; i < n; i++) {
+            const signature = secretKeys[i].sign(messages[i]);
+            goodSignatures.push(signature);
+        }
+
+        console.timeEnd("sign");
+
+        console.time("verify (good)");
+
+        for (let i = 0; i < n; i++) {
+            const ok = publicKeys[i].verify(messages[i], goodSignatures[i]);
+            assert.isTrue(ok);
+        }
+
+        console.timeEnd("verify (good)");
+
+        console.time("verify (bad)");
+
+        for (let i = 0; i < n; i++) {
+            const ok = publicKeys[i].verify(messages[messages.length - i - 1], goodSignatures[i]);
+            assert.isFalse(ok);
+        }
+
+        console.timeEnd("verify (bad)");
+    });
+});

From 5dc401e991b3396a9a9fe61c84a2b45e027a0d63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 21 Mar 2023 17:38:15 +0200
Subject: [PATCH 170/338] Fix after self-review.

---
 src-wallet/userKeys.ts            | 1 +
 src-wallet/usersBenchmark.spec.ts | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index d8584d023..89a163b32 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -8,6 +8,7 @@ export const USER_SEED_LENGTH = 32;
 export const USER_PUBKEY_LENGTH = 32;
 
 // See: https://github.com/paulmillr/noble-ed25519
+// In a future version of sdk-wallet, we'll switch to using the async functions of noble-ed25519.
 ed.utils.sha512Sync = (...m) => sha512(ed.utils.concatBytes(...m));
 
 export class UserSecretKey {
diff --git a/src-wallet/usersBenchmark.spec.ts b/src-wallet/usersBenchmark.spec.ts
index 1d1fc065e..eeb318e0a 100644
--- a/src-wallet/usersBenchmark.spec.ts
+++ b/src-wallet/usersBenchmark.spec.ts
@@ -22,6 +22,8 @@ describe("behchmark sign and verify", () => {
             messages.push(message);
         }
 
+        console.info(`N = ${n}`);
+
         console.time("sign");
 
         for (let i = 0; i < n; i++) {

From 33c5ebc415d525ef0b450c57b958f2e984fb2c8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Thu, 13 Apr 2023 11:35:01 +0300
Subject: [PATCH 171/338] Implement getGuardianData().

---
 src-network-providers/accounts.ts             | 43 ++++++++++++++++++-
 src-network-providers/apiNetworkProvider.ts   |  6 ++-
 src-network-providers/proxyNetworkProvider.ts |  8 +++-
 3 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/src-network-providers/accounts.ts b/src-network-providers/accounts.ts
index 4a2958eae..c7e83f89e 100644
--- a/src-network-providers/accounts.ts
+++ b/src-network-providers/accounts.ts
@@ -5,7 +5,7 @@ import { Address } from "./primitives";
 /**
  * A plain view of an account, as queried from the Network.
  */
- export class AccountOnNetwork {
+export class AccountOnNetwork {
     address: IAddress = new Address("");
     nonce: number = 0;
     balance: BigNumber = new BigNumber(0);
@@ -29,3 +29,44 @@ import { Address } from "./primitives";
     }
 }
 
+export class GuardianData {
+    guarded: boolean = false;
+    activeGuardian?: Guardian;
+    pendingGuardian?: Guardian;
+
+    constructor(init?: Partial<GuardianData>) {
+        Object.assign(this, init);
+    }
+
+    static fromHttpResponse(payload: any): GuardianData {
+        const result = new GuardianData();
+
+        result.guarded = payload["guarded"] || false;
+
+        if (payload["activeGuardian"]) {
+            result.activeGuardian = Guardian.fromHttpResponse(payload["activeGuardian"]);
+        }
+
+        if (payload["pendingGuardian"]) {
+            result.pendingGuardian = Guardian.fromHttpResponse(payload["pendingGuardian"]);
+        }
+
+        return result;
+    }
+}
+
+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;
+    }
+}
diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 98b57fa45..eecea7e3c 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -1,5 +1,5 @@
 import axios, { AxiosRequestConfig } from "axios";
-import { AccountOnNetwork } from "./accounts";
+import { AccountOnNetwork, GuardianData } from "./accounts";
 import { defaultAxiosConfig, defaultPagination } from "./config";
 import { ContractQueryRequest } from "./contractQueryRequest";
 import { ContractQueryResponse } from "./contractQueryResponse";
@@ -55,6 +55,10 @@ export class ApiNetworkProvider implements INetworkProvider {
         return account;
     }
 
+    async getGuardianData(address: IAddress): Promise<GuardianData> {
+        return await this.backingProxyNetworkProvider.getGuardianData(address);
+    }
+
     async getFungibleTokensOfAccount(address: IAddress, pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]> {
         pagination = pagination || defaultPagination;
 
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index fad7ae2d0..2e428b8d6 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -1,5 +1,5 @@
 import axios, { AxiosRequestConfig } from "axios";
-import { AccountOnNetwork } from "./accounts";
+import { AccountOnNetwork, GuardianData } from "./accounts";
 import { defaultAxiosConfig } from "./config";
 import { EsdtContractAddress } from "./constants";
 import { ContractQueryRequest } from "./contractQueryRequest";
@@ -55,6 +55,12 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return account;
     }
 
+    async getGuardianData(address: IAddress): Promise<GuardianData> {
+        const response = await this.doGetGeneric(`address/${address.bech32()}/guardian-data`);
+        const accountGuardian = GuardianData.fromHttpResponse(response.guardianData);
+        return accountGuardian;
+    }
+
     async getFungibleTokensOfAccount(address: IAddress, _pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]> {
         let url = `address/${address.bech32()}/esdt`;
         let response = await this.doGetGeneric(url);

From 930f2488cfe483e4e832283a571545c6ec8de49f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Thu, 13 Apr 2023 11:46:29 +0300
Subject: [PATCH 172/338] Rename param.

---
 src-network-providers/accounts.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src-network-providers/accounts.ts b/src-network-providers/accounts.ts
index c7e83f89e..c94780bd3 100644
--- a/src-network-providers/accounts.ts
+++ b/src-network-providers/accounts.ts
@@ -38,17 +38,17 @@ export class GuardianData {
         Object.assign(this, init);
     }
 
-    static fromHttpResponse(payload: any): GuardianData {
+    static fromHttpResponse(response: any): GuardianData {
         const result = new GuardianData();
 
-        result.guarded = payload["guarded"] || false;
+        result.guarded = response["guarded"] || false;
 
-        if (payload["activeGuardian"]) {
-            result.activeGuardian = Guardian.fromHttpResponse(payload["activeGuardian"]);
+        if (response["activeGuardian"]) {
+            result.activeGuardian = Guardian.fromHttpResponse(response["activeGuardian"]);
         }
 
-        if (payload["pendingGuardian"]) {
-            result.pendingGuardian = Guardian.fromHttpResponse(payload["pendingGuardian"]);
+        if (response["pendingGuardian"]) {
+            result.pendingGuardian = Guardian.fromHttpResponse(response["pendingGuardian"]);
         }
 
         return result;

From af389df6ab14ada9057e395ca1b61e6db67768d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Thu, 13 Apr 2023 13:12:05 +0300
Subject: [PATCH 173/338] Add "getCurrentGuardianAddress".

---
 src-network-providers/accounts.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src-network-providers/accounts.ts b/src-network-providers/accounts.ts
index c94780bd3..7c2a29dc0 100644
--- a/src-network-providers/accounts.ts
+++ b/src-network-providers/accounts.ts
@@ -53,6 +53,14 @@ export class GuardianData {
 
         return result;
     }
+
+    getCurrentGuardianAddress(): IAddress | undefined {
+        if (!this.guarded) {
+            return undefined;
+        }
+
+        return this.activeGuardian?.address;
+    }
 }
 
 class Guardian {

From 8c341c23a81621045a1dc0c2af95d0d972c7e4a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Mon, 8 May 2023 13:16:03 +0300
Subject: [PATCH 174/338] Automatically handle both kinds of keystores in
 "UserWallet.loadSecretKey(), "UserSigner.fromWallet()".

---
 src-wallet/userSigner.ts |  4 ++--
 src-wallet/userWallet.ts | 19 +++++++++++++++++++
 src-wallet/users.spec.ts | 21 +++++++++++++++++++++
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src-wallet/userSigner.ts b/src-wallet/userSigner.ts
index 144080f9a..a1051d4e8 100644
--- a/src-wallet/userSigner.ts
+++ b/src-wallet/userSigner.ts
@@ -23,8 +23,8 @@ export class UserSigner {
         this.secretKey = secretKey;
     }
 
-    static fromWallet(keyFileObject: any, password: string): UserSigner {
-        let secretKey = UserWallet.decryptSecretKey(keyFileObject, password);
+    static fromWallet(keyFileObject: any, password: string, addressIndex?: number): UserSigner {
+        const secretKey = UserWallet.loadSecretKey(keyFileObject, password, addressIndex);
         return new UserSigner(secretKey);
     }
 
diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index 8c6e36681..2bee3209e 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -65,6 +65,25 @@ export class UserWallet {
         });
     }
 
+    static loadSecretKey(keyFileObject: any, password: string, addressIndex?: number): UserSecretKey {
+        const kind = keyFileObject.kind || UserWalletKind.SecretKey;
+
+        if (kind == UserWalletKind.SecretKey) {
+            if (addressIndex !== undefined) {
+                throw new Err("addressIndex must not be provided when kind == 'secretKey'");
+            }
+
+            return UserWallet.decryptSecretKey(keyFileObject, password);
+        }
+
+        if (kind == UserWalletKind.Mnemonic) {
+            const mnemonic = this.decryptMnemonic(keyFileObject, password);
+            return mnemonic.deriveKey(addressIndex || 0);
+        }
+
+        throw new Err(`Unknown kind: ${kind}`);
+    }
+
     /**
      * Copied from: https://github.com/multiversx/mx-deprecated-core-js/blob/v1.28.0/src/account.js#L42
      * Notes: adjustements (code refactoring, no change in logic), in terms of: 
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index b2f47b8c0..6e92c6bb7 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -178,6 +178,27 @@ describe("test user wallets", () => {
         assert.deepEqual(dummyWallet.toJSON(), expectedDummyWallet);
     });
 
+    it("should loadSecretKey, but without 'kind' field", async function () {
+        const keyFileObject = await loadTestKeystore("withoutKind.json");
+        const secretKey = UserWallet.loadSecretKey(keyFileObject, password);
+
+        assert.equal(secretKey.generatePublicKey().toAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
+    });
+
+    it("should throw when calling loadSecretKey with unecessary address index", async function () {
+        const keyFileObject = await loadTestKeystore("alice.json");
+
+        assert.throws(() => UserWallet.loadSecretKey(keyFileObject, password, 42), "addressIndex must not be provided when kind == 'secretKey'");
+    });
+
+    it("should loadSecretKey with mnemonic", async function () {
+        const keyFileObject = await loadTestKeystore("withDummyMnemonic.json");
+
+        assert.equal(UserWallet.loadSecretKey(keyFileObject, password, 0).generatePublicKey().toAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
+        assert.equal(UserWallet.loadSecretKey(keyFileObject, password, 1).generatePublicKey().toAddress().bech32(), "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx");
+        assert.equal(UserWallet.loadSecretKey(keyFileObject, password, 2).generatePublicKey().toAddress().bech32(), "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
+    });
+
     it("should sign transactions", async () => {
         let signer = new UserSigner(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
         let verifier = new UserVerifier(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf").generatePublicKey());

From 67b19c80722fc0ea1e42c9249a655af6f5a593de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Mon, 8 May 2023 13:23:11 +0300
Subject: [PATCH 175/338] Add extra unit test.

---
 src-wallet/users.spec.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 6e92c6bb7..da4136edb 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -323,4 +323,15 @@ describe("test user wallets", () => {
         assert.isTrue(verifier.verify(data, signature));
         assert.isFalse(verifier.verify(Buffer.from("hello"), signature));
     });
+
+    it("should create UserSigner from wallet", async function () {
+        const keyFileObjectWithoutKind = await loadTestKeystore("withoutKind.json");
+        const keyFileObjectWithMnemonic = await loadTestKeystore("withDummyMnemonic.json");
+
+        assert.equal(UserSigner.fromWallet(keyFileObjectWithoutKind, password).getAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
+        assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password).getAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
+        assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 0).getAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
+        assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 1).getAddress().bech32(), "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx");
+        assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 2).getAddress().bech32(), "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
+    });
 });

From 19d14261f24b82eff760ab70f9cfa6b27d79bab1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 9 May 2023 13:54:19 +0300
Subject: [PATCH 176/338] Fix after review.

---
 src-wallet/userSigner.ts |  2 +-
 src-wallet/userWallet.ts |  2 +-
 src-wallet/users.spec.ts | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src-wallet/userSigner.ts b/src-wallet/userSigner.ts
index a1051d4e8..7dfb52811 100644
--- a/src-wallet/userSigner.ts
+++ b/src-wallet/userSigner.ts
@@ -24,7 +24,7 @@ export class UserSigner {
     }
 
     static fromWallet(keyFileObject: any, password: string, addressIndex?: number): UserSigner {
-        const secretKey = UserWallet.loadSecretKey(keyFileObject, password, addressIndex);
+        const secretKey = UserWallet.decrypt(keyFileObject, password, addressIndex);
         return new UserSigner(secretKey);
     }
 
diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index 2bee3209e..3d275993e 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -65,7 +65,7 @@ export class UserWallet {
         });
     }
 
-    static loadSecretKey(keyFileObject: any, password: string, addressIndex?: number): UserSecretKey {
+    static decrypt(keyFileObject: any, password: string, addressIndex?: number): UserSecretKey {
         const kind = keyFileObject.kind || UserWalletKind.SecretKey;
 
         if (kind == UserWalletKind.SecretKey) {
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index da4136edb..469cbd01b 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -180,7 +180,7 @@ describe("test user wallets", () => {
 
     it("should loadSecretKey, but without 'kind' field", async function () {
         const keyFileObject = await loadTestKeystore("withoutKind.json");
-        const secretKey = UserWallet.loadSecretKey(keyFileObject, password);
+        const secretKey = UserWallet.decrypt(keyFileObject, password);
 
         assert.equal(secretKey.generatePublicKey().toAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
     });
@@ -188,15 +188,15 @@ describe("test user wallets", () => {
     it("should throw when calling loadSecretKey with unecessary address index", async function () {
         const keyFileObject = await loadTestKeystore("alice.json");
 
-        assert.throws(() => UserWallet.loadSecretKey(keyFileObject, password, 42), "addressIndex must not be provided when kind == 'secretKey'");
+        assert.throws(() => UserWallet.decrypt(keyFileObject, password, 42), "addressIndex must not be provided when kind == 'secretKey'");
     });
 
     it("should loadSecretKey with mnemonic", async function () {
         const keyFileObject = await loadTestKeystore("withDummyMnemonic.json");
 
-        assert.equal(UserWallet.loadSecretKey(keyFileObject, password, 0).generatePublicKey().toAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
-        assert.equal(UserWallet.loadSecretKey(keyFileObject, password, 1).generatePublicKey().toAddress().bech32(), "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx");
-        assert.equal(UserWallet.loadSecretKey(keyFileObject, password, 2).generatePublicKey().toAddress().bech32(), "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
+        assert.equal(UserWallet.decrypt(keyFileObject, password, 0).generatePublicKey().toAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
+        assert.equal(UserWallet.decrypt(keyFileObject, password, 1).generatePublicKey().toAddress().bech32(), "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx");
+        assert.equal(UserWallet.decrypt(keyFileObject, password, 2).generatePublicKey().toAddress().bech32(), "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
     });
 
     it("should sign transactions", async () => {

From 322257a352287ff7860868972de2318461fd719c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 24 May 2023 13:08:40 +0300
Subject: [PATCH 177/338] Workaround: receive Uint8Array instead of Buffer.

---
 src-wallet/userKeys.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index 89a163b32..9c38410a1 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -12,9 +12,9 @@ export const USER_PUBKEY_LENGTH = 32;
 ed.utils.sha512Sync = (...m) => sha512(ed.utils.concatBytes(...m));
 
 export class UserSecretKey {
-    private readonly buffer: Buffer;
+    private readonly buffer: Uint8Array;
 
-    constructor(buffer: Buffer) {
+    constructor(buffer: Uint8Array) {
         guardLength(buffer, USER_SEED_LENGTH);
 
         this.buffer = buffer;
@@ -23,7 +23,7 @@ export class UserSecretKey {
     static fromString(value: string): UserSecretKey {
         guardLength(value, USER_SEED_LENGTH * 2);
 
-        let buffer = Buffer.from(value, "hex");
+        const buffer = Buffer.from(value, "hex");
         return new UserSecretKey(buffer);
     }
 
@@ -42,11 +42,11 @@ export class UserSecretKey {
     }
 
     hex(): string {
-        return this.buffer.toString("hex");
+        return Buffer.from(this.buffer).toString("hex");
     }
 
     valueOf(): Buffer {
-        return this.buffer;
+        return Buffer.from(this.buffer);
     }
 }
 

From 36d64fd530ade64e76d5c38d0bcbe54f1863715b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 24 May 2023 13:15:15 +0300
Subject: [PATCH 178/338] Reference buffer in globals (temporary workaround).

---
 src-wallet/globals.ts | 3 +++
 src-wallet/index.ts   | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 src-wallet/globals.ts

diff --git a/src-wallet/globals.ts b/src-wallet/globals.ts
new file mode 100644
index 000000000..6169db45b
--- /dev/null
+++ b/src-wallet/globals.ts
@@ -0,0 +1,3 @@
+if (!global.Buffer) {
+    global.Buffer = require("buffer").Buffer;
+}
diff --git a/src-wallet/index.ts b/src-wallet/index.ts
index af9ecec6a..7427d20a7 100644
--- a/src-wallet/index.ts
+++ b/src-wallet/index.ts
@@ -1,3 +1,5 @@
+require("./globals");
+
 export * from "./mnemonic";
 export * from "./pem";
 export * from "./userKeys";

From c91a71db4beed1f09496f42e0c0a64d558d3b51c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 24 May 2023 13:24:56 +0300
Subject: [PATCH 179/338] Workaround on constructor.

---
 src-wallet/userKeys.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index 9c38410a1..71dfba0d0 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -12,12 +12,12 @@ export const USER_PUBKEY_LENGTH = 32;
 ed.utils.sha512Sync = (...m) => sha512(ed.utils.concatBytes(...m));
 
 export class UserSecretKey {
-    private readonly buffer: Uint8Array;
+    private readonly buffer: Buffer;
 
     constructor(buffer: Uint8Array) {
         guardLength(buffer, USER_SEED_LENGTH);
 
-        this.buffer = buffer;
+        this.buffer = Buffer.from(buffer);
     }
 
     static fromString(value: string): UserSecretKey {
@@ -42,11 +42,11 @@ export class UserSecretKey {
     }
 
     hex(): string {
-        return Buffer.from(this.buffer).toString("hex");
+        return this.buffer.toString("hex");
     }
 
     valueOf(): Buffer {
-        return Buffer.from(this.buffer);
+        return this.buffer;
     }
 }
 

From ad1bbe9f76d1afeba101a1813cc1700d0ae7cee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 24 May 2023 13:33:40 +0300
Subject: [PATCH 180/338] Fix get public key.

---
 src-wallet/userKeys.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index 71dfba0d0..82c63325d 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -32,7 +32,7 @@ export class UserSecretKey {
     }
 
     generatePublicKey(): UserPublicKey {
-        const buffer = ed.sync.getPublicKey(this.buffer);
+        const buffer = ed.sync.getPublicKey(new Uint8Array(this.buffer));
         return new UserPublicKey(buffer);
     }
 

From 351abcb6d109aac6a316c793b41a627485781cf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 24 May 2023 13:43:31 +0300
Subject: [PATCH 181/338] Add proper casts.

---
 src-wallet/globals.ts  | 3 ---
 src-wallet/index.ts    | 2 --
 src-wallet/userKeys.ts | 4 ++--
 3 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 src-wallet/globals.ts

diff --git a/src-wallet/globals.ts b/src-wallet/globals.ts
deleted file mode 100644
index 6169db45b..000000000
--- a/src-wallet/globals.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-if (!global.Buffer) {
-    global.Buffer = require("buffer").Buffer;
-}
diff --git a/src-wallet/index.ts b/src-wallet/index.ts
index 7427d20a7..af9ecec6a 100644
--- a/src-wallet/index.ts
+++ b/src-wallet/index.ts
@@ -1,5 +1,3 @@
-require("./globals");
-
 export * from "./mnemonic";
 export * from "./pem";
 export * from "./userKeys";
diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index 82c63325d..ba1177772 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -37,7 +37,7 @@ export class UserSecretKey {
     }
 
     sign(message: Buffer): Buffer {
-        const signature = ed.sync.sign(message, this.buffer);
+        const signature = ed.sync.sign(new Uint8Array(message), new Uint8Array(this.buffer));
         return Buffer.from(signature);
     }
 
@@ -61,7 +61,7 @@ export class UserPublicKey {
 
     verify(data: Buffer, signature: Buffer): boolean {
         try {
-            const ok = ed.sync.verify(signature, data, this.buffer);
+            const ok = ed.sync.verify(new Uint8Array(signature), new Uint8Array(data), new Uint8Array(this.buffer));
             return ok;
         } catch (err: any) {
             console.error(err);

From 4ba9d93b858865b75077284ae098e277a18e2942 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Mon, 26 Jun 2023 15:03:24 +0300
Subject: [PATCH 182/338] add `TransactionEventData` class

---
 .../providers.dev.net.spec.ts                 | 20 +++++++++++++
 src-network-providers/transactionEvents.ts    | 28 +++++++++++++++++--
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index cb58f22ac..c8162de9a 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -193,6 +193,26 @@ describe("test network providers on devnet: Proxy and API", function () {
         proxyResponse.hyperblockHash = "";
     }
 
+    it.only("should have the same response for transactions with events", async function () {
+        const hash = "c451566a6168e38d2980fcb83d4ea154f78d53f7abf3264dd51c2c7c585671aa";
+
+        let apiResponse = await apiProvider.getTransaction(hash);
+        let proxyResponse = await proxyProvider.getTransaction(hash);
+
+        assert.exists(apiResponse.logs);
+        assert.exists(proxyResponse.logs);
+        assert.exists(apiResponse.logs.events)
+        assert.exists(proxyResponse.logs.events)
+        assert.equal(apiResponse.logs.events[0].topics[0].hex(), "5745474c442d643763366262")
+        assert.equal(apiResponse.logs.events[0].topics[1].hex(), "")
+        assert.equal(apiResponse.logs.events[0].topics[2].hex(), "0de0b6b3a7640000")
+        assert.equal(apiResponse.logs.events[0].topics[3].hex(), "00000000000000000500e01285f90311fb5925a9623a1dc62eee41fa8c869a0d")
+        assert.equal(proxyResponse.logs.events[0].topics[0].hex(), "5745474c442d643763366262")
+        assert.equal(proxyResponse.logs.events[0].topics[1].hex(), "")
+        assert.equal(proxyResponse.logs.events[0].topics[2].hex(), "0de0b6b3a7640000")
+        assert.equal(proxyResponse.logs.events[0].topics[3].hex(), "00000000000000000500e01285f90311fb5925a9623a1dc62eee41fa8c869a0d")
+    });
+
     // TODO: Fix differences of "tx.status", then enable this test.
     it.skip("should have same response for getTransactionStatus()", async function () {
         this.timeout(20000);
diff --git a/src-network-providers/transactionEvents.ts b/src-network-providers/transactionEvents.ts
index 780a10340..0fc958dd7 100644
--- a/src-network-providers/transactionEvents.ts
+++ b/src-network-providers/transactionEvents.ts
@@ -5,6 +5,7 @@ export class TransactionEvent {
     address: IAddress = new Address("");
     identifier: string = "";
     topics: TransactionEventTopic[] = [];
+    data_payload: TransactionEventData = new TransactionEventData(Buffer.from("", "utf8"));
     data: string = "";
 
     constructor(init?: Partial<TransactionEvent>) {
@@ -21,8 +22,11 @@ export class TransactionEvent {
         result.address = new Address(responsePart.address);
         result.identifier = responsePart.identifier || "";
         result.topics = (responsePart.topics || []).map(topic => new TransactionEventTopic(topic));
-        result.data = Buffer.from(responsePart.data || "", "base64").toString();
-        
+
+        const raw_data = Buffer.from(responsePart.data || "", "base64")
+        result.data_payload = new TransactionEventData(raw_data);
+        result.data = raw_data.toString();
+
         return result;
     }
 
@@ -35,6 +39,26 @@ export class TransactionEvent {
     }
 }
 
+export class TransactionEventData {
+    private readonly raw: Buffer;
+
+    constructor(data: Buffer) {
+        this.raw = data;
+    }
+
+    toString(): string {
+        return this.raw.toString("utf8");
+    }
+
+    hex(): string {
+        return this.raw.toString("hex");
+    }
+
+    valueOf(): Buffer {
+        return this.raw;
+    }
+}
+
 export class TransactionEventTopic {
     private readonly raw: Buffer;
 

From b61dd61e36f34e5c9a5baffd53941451d0dabde4 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Mon, 26 Jun 2023 15:05:04 +0300
Subject: [PATCH 183/338] fix

---
 src-network-providers/transactionEvents.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-network-providers/transactionEvents.ts b/src-network-providers/transactionEvents.ts
index 0fc958dd7..2d911ca42 100644
--- a/src-network-providers/transactionEvents.ts
+++ b/src-network-providers/transactionEvents.ts
@@ -5,7 +5,7 @@ export class TransactionEvent {
     address: IAddress = new Address("");
     identifier: string = "";
     topics: TransactionEventTopic[] = [];
-    data_payload: TransactionEventData = new TransactionEventData(Buffer.from("", "utf8"));
+    dataPayload: TransactionEventData = new TransactionEventData(Buffer.from("", "utf8"));
     data: string = "";
 
     constructor(init?: Partial<TransactionEvent>) {
@@ -24,7 +24,7 @@ export class TransactionEvent {
         result.topics = (responsePart.topics || []).map(topic => new TransactionEventTopic(topic));
 
         const raw_data = Buffer.from(responsePart.data || "", "base64")
-        result.data_payload = new TransactionEventData(raw_data);
+        result.dataPayload = new TransactionEventData(raw_data);
         result.data = raw_data.toString();
 
         return result;

From 88e409d1695ca21b253f5adf358a9c5ed640cde2 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Mon, 26 Jun 2023 15:10:52 +0300
Subject: [PATCH 184/338] rename variable

---
 src-network-providers/transactionEvents.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-network-providers/transactionEvents.ts b/src-network-providers/transactionEvents.ts
index 2d911ca42..3c8cb1d81 100644
--- a/src-network-providers/transactionEvents.ts
+++ b/src-network-providers/transactionEvents.ts
@@ -23,9 +23,9 @@ export class TransactionEvent {
         result.identifier = responsePart.identifier || "";
         result.topics = (responsePart.topics || []).map(topic => new TransactionEventTopic(topic));
 
-        const raw_data = Buffer.from(responsePart.data || "", "base64")
-        result.dataPayload = new TransactionEventData(raw_data);
-        result.data = raw_data.toString();
+        const rawData = Buffer.from(responsePart.data || "", "base64")
+        result.dataPayload = new TransactionEventData(rawData);
+        result.data = rawData.toString();
 
         return result;
     }

From f1076f9a61349d74649f1829569b3a2dec9fc83e Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Tue, 11 Jul 2023 14:58:34 +0300
Subject: [PATCH 185/338] new tx status for proxy

---
 src-network-providers/proxyNetworkProvider.ts | 20 +++++-
 .../transactionCompletionStrategy.ts          | 69 -------------------
 src-network-providers/transactions.ts         | 22 ++++--
 3 files changed, 32 insertions(+), 79 deletions(-)
 delete mode 100644 src-network-providers/transactionCompletionStrategy.ts

diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index 2e428b8d6..337155a86 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -99,15 +99,29 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokenData;
     }
 
-    async getTransaction(txHash: string): Promise<TransactionOnNetwork> {
+    async getTransaction(txHash: string, with_process_status?: boolean): Promise<TransactionOnNetwork> {
+        let processStatusPromise: Promise<TransactionStatus> | undefined;
+
+        if (with_process_status === true) {
+            processStatusPromise = this.getTransactionStatus(txHash);
+        }
+
         let url = this.buildUrlWithQueryParameters(`transaction/${txHash}`, { withResults: "true" });
         let response = await this.doGetGeneric(url);
-        let transaction = TransactionOnNetwork.fromProxyHttpResponse(txHash, response.transaction);
+
+        let transaction: TransactionOnNetwork;
+        if (processStatusPromise !== undefined) {
+            const processStatus = await processStatusPromise;
+            transaction = TransactionOnNetwork.fromProxyHttpResponse(txHash, response.transaction, processStatus);
+        }
+        else {
+            transaction = TransactionOnNetwork.fromProxyHttpResponse(txHash, response.transaction);
+        }
         return transaction;
     }
 
     async getTransactionStatus(txHash: string): Promise<TransactionStatus> {
-        let response = await this.doGetGeneric(`transaction/${txHash}/status`);
+        let response = await this.doGetGeneric(`transaction/${txHash}/process-status`);
         let status = new TransactionStatus(response.status);
         return status;
     }
diff --git a/src-network-providers/transactionCompletionStrategy.ts b/src-network-providers/transactionCompletionStrategy.ts
deleted file mode 100644
index cd072c20c..000000000
--- a/src-network-providers/transactionCompletionStrategy.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { TransactionStatus } from "./transactionStatus";
-import { TransactionLogs } from "./transactionLogs";
-import { isPaddedHex } from "./primitives";
-
-interface ITransactionOnNetwork {
-    logs: TransactionLogs;
-    status: TransactionStatus;
-    hyperblockNonce: number;
-    data: Buffer;
-}
-
-const WellKnownCompletionEvents = ["completedTxEvent", "SCDeploy", "signalError"];
-
-/**
- * Algorithm for detecting transaction completion.
- * Based on some heuristics (a bit imprecise therefore, at this moment).
- */
-export class TransactionCompletionStrategyOnProxy {
-    isCompleted(transaction: ITransactionOnNetwork): boolean {
-        if (transaction.status.isPending()) {
-            // Certainly not completed.
-            return false;
-        }
-
-        // Handle gateway mechanics:
-        for (const completionEvent of WellKnownCompletionEvents) {
-            if (transaction.logs.findFirstOrNoneEvent(completionEvent)) {
-                // Certainly completed.
-                console.debug("TransactionCompletionStrategy.isCompleted(), found event:", completionEvent);
-                return true;
-            }
-        }
-
-        if (this.isCertainlyMoveBalance(transaction.data)) {
-            return transaction.status.isExecuted();
-        }
-
-        let hyperblockNonce = transaction.hyperblockNonce;
-
-        // Imprecise condition, uncertain completion (usually sufficient, though).
-        // This is WRONG when (at least): timeOf(block with execution at destination is notarized) < timeOf(the "completedTxEvent" occurs).
-        if (hyperblockNonce > 0) {
-            console.debug("TransactionCompletionStrategy.isCompleted(), found hyperblock nonce:", hyperblockNonce);
-            return true;
-        }
-
-        return false;
-    }
-
-    private isCertainlyMoveBalance(transactionData: Buffer): boolean {
-        let parts = transactionData.toString().split("@");
-        let prefix = parts[0];
-        let otherParts = parts.slice(1);
-        let emptyPrefix = !prefix;
-        let somePartsAreNotValidArguments = !otherParts.every(part => this.looksLikeValidArgument(part));
-        
-        return emptyPrefix || somePartsAreNotValidArguments;
-    }
-
-    private looksLikeValidArgument(arg: string) {
-        return isPaddedHex(arg);
-    }
-}
-
-export class TransactionCompletionStrategyOnAPI {
-    isCompleted(transaction: ITransactionOnNetwork): boolean {
-        return !transaction.status.isPending();
-    }
-}
diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
index 95bee527c..42e6836b4 100644
--- a/src-network-providers/transactions.ts
+++ b/src-network-providers/transactions.ts
@@ -2,12 +2,11 @@ import { TransactionStatus } from "./transactionStatus";
 import { ContractResults } from "./contractResults";
 import { Address } from "./primitives";
 import { IAddress } from "./interface";
-import { TransactionCompletionStrategyOnAPI, TransactionCompletionStrategyOnProxy } from "./transactionCompletionStrategy";
 import { TransactionLogs } from "./transactionLogs";
 import { TransactionReceipt } from "./transactionReceipt";
 
 export class TransactionOnNetwork {
-    isCompleted: boolean = false;
+    isCompleted?: boolean;
     hash: string = "";
     type: string = "";
     nonce: number = 0;
@@ -35,19 +34,28 @@ export class TransactionOnNetwork {
         Object.assign(this, init);
     }
 
-    static fromProxyHttpResponse(txHash: string, response: any): TransactionOnNetwork {
+    static fromProxyHttpResponse(txHash: string, response: any, process_status?: TransactionStatus | undefined): TransactionOnNetwork {
         let result = TransactionOnNetwork.fromHttpResponse(txHash, response);
         result.contractResults = ContractResults.fromProxyHttpResponse(response.smartContractResults || []);
-        result.isCompleted = new TransactionCompletionStrategyOnProxy().isCompleted(result);
-        // TODO: uniformize transaction status.
+
+        if (process_status !== undefined) {
+            result.status = process_status;
+
+            if (result.status.isSuccessful() || result.status.isFailed()) {
+                result.isCompleted = true;
+            }
+            else {
+                result.isCompleted = false;
+            }
+        }
+
         return result;
     }
 
     static fromApiHttpResponse(txHash: string, response: any): TransactionOnNetwork {
         let result = TransactionOnNetwork.fromHttpResponse(txHash, response);
         result.contractResults = ContractResults.fromApiHttpResponse(response.results || []);
-        result.isCompleted = new TransactionCompletionStrategyOnAPI().isCompleted(result);
-        // TODO: uniformize transaction status.
+        result.isCompleted = !result.status.isPending();
         return result;
     }
 

From a08003272445645d47d5ff16c6ccc97d1dc786e9 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Tue, 11 Jul 2023 15:57:42 +0300
Subject: [PATCH 186/338] started to fix tests

---
 .../providers.dev.net.spec.ts                 | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index c8162de9a..251c552cc 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -1,6 +1,6 @@
 import { assert } from "chai";
 import { ApiNetworkProvider } from "./apiNetworkProvider";
-import { INetworkProvider } from "./interface";
+import { INetworkProvider, IPagination } from "./interface";
 import { Address } from "./primitives";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { MockQuery } from "./testscommon/dummyQuery";
@@ -27,7 +27,15 @@ describe("test network providers on devnet: Proxy and API", function () {
         let apiResponse = await apiProvider.getNetworkStatus();
         let proxyResponse = await proxyProvider.getNetworkStatus();
 
-        assert.deepEqual(apiResponse, proxyResponse);
+        assert.equal(apiResponse.CurrentRound, proxyResponse.CurrentRound);
+        assert.equal(apiResponse.EpochNumber, proxyResponse.EpochNumber);
+        assert.equal(apiResponse.NonceAtEpochStart, proxyResponse.NonceAtEpochStart);
+        assert.equal(apiResponse.RoundAtEpochStart, proxyResponse.RoundAtEpochStart);
+        assert.equal(apiResponse.RoundsPerEpoch, proxyResponse.RoundsPerEpoch);
+        // done this way because the nonces may change until both requests are executed
+        assert.approximately(apiResponse.HighestFinalNonce, proxyResponse.HighestFinalNonce, 1);
+        assert.approximately(apiResponse.Nonce, proxyResponse.Nonce, 1);
+        assert.approximately(apiResponse.NoncesPassedInCurrentEpoch, proxyResponse.NoncesPassedInCurrentEpoch, 1);
     });
 
     // TODO: Enable test after implementing ProxyNetworkProvider.getNetworkStakeStatistics().
@@ -57,28 +65,29 @@ describe("test network providers on devnet: Proxy and API", function () {
 
     it("should have same response for getFungibleTokensOfAccount(), getFungibleTokenOfAccount()", async function () {
         this.timeout(30000);
-
+        // can't assert for deepequal because the raw response it's not the same
         for (const user of [carol, dan]) {
-            let apiResponse = await apiProvider.getFungibleTokensOfAccount(user);
-            let proxyResponse = await proxyProvider.getFungibleTokensOfAccount(user);
-
-            assert.deepEqual(apiResponse.slice(0, 100), proxyResponse.slice(0, 100));
-
-            for (const item of apiResponse.slice(0, 5)) {
-                let apiResponse = await apiProvider.getFungibleTokenOfAccount(user, item.identifier);
-                let proxyResponse = await proxyProvider.getFungibleTokenOfAccount(user, item.identifier);
-
-                assert.deepEqual(apiResponse, proxyResponse, `user: ${user.bech32()}, token: ${item.identifier}`);
+            let apiResponse = (await apiProvider.getFungibleTokensOfAccount(user)).slice(0, 20);
+            let proxyResponse = (await proxyProvider.getFungibleTokensOfAccount(user)).slice(0, 20);
+
+            for (let i = 0; i < apiResponse.length; i++) {
+                console.log(apiResponse[i]);
+                console.log(proxyResponse[i]);
+                assert.equal(apiResponse[i].identifier, proxyResponse[i].identifier);
+                assert.equal(apiResponse[i].balance.valueOf, proxyResponse[i].balance.valueOf);
             }
         }
     });
 
-    it("should have same response for getNonFungibleTokensOfAccount(), getNonFungibleTokenOfAccount", async function () {
+    it.only("should have same response for getNonFungibleTokensOfAccount(), getNonFungibleTokenOfAccount", async function () {
         this.timeout(30000);
 
         for (const user of [alice, bob, carol, dan]) {
             let apiResponse = await apiProvider.getNonFungibleTokensOfAccount(user);
             let proxyResponse = await proxyProvider.getNonFungibleTokensOfAccount(user);
+            console.log(apiResponse[0]);
+            console.log(proxyResponse[0]);
+            return
 
             for (const item of apiResponse) {
                 // Gateway does not provide "type".
@@ -193,7 +202,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         proxyResponse.hyperblockHash = "";
     }
 
-    it.only("should have the same response for transactions with events", async function () {
+    it("should have the same response for transactions with events", async function () {
         const hash = "c451566a6168e38d2980fcb83d4ea154f78d53f7abf3264dd51c2c7c585671aa";
 
         let apiResponse = await apiProvider.getTransaction(hash);

From 275e1801e8639bd6f9c3d3e5ee3e529f000fa711 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Tue, 11 Jul 2023 16:07:23 +0300
Subject: [PATCH 187/338] change variable names to camel case

---
 src-network-providers/proxyNetworkProvider.ts | 4 ++--
 src-network-providers/transactions.ts         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index 337155a86..ebc25443a 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -99,10 +99,10 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokenData;
     }
 
-    async getTransaction(txHash: string, with_process_status?: boolean): Promise<TransactionOnNetwork> {
+    async getTransaction(txHash: string, withProcessStatus?: boolean): Promise<TransactionOnNetwork> {
         let processStatusPromise: Promise<TransactionStatus> | undefined;
 
-        if (with_process_status === true) {
+        if (withProcessStatus === true) {
             processStatusPromise = this.getTransactionStatus(txHash);
         }
 
diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
index 42e6836b4..d1e98105f 100644
--- a/src-network-providers/transactions.ts
+++ b/src-network-providers/transactions.ts
@@ -34,12 +34,12 @@ export class TransactionOnNetwork {
         Object.assign(this, init);
     }
 
-    static fromProxyHttpResponse(txHash: string, response: any, process_status?: TransactionStatus | undefined): TransactionOnNetwork {
+    static fromProxyHttpResponse(txHash: string, response: any, processStatus?: TransactionStatus | undefined): TransactionOnNetwork {
         let result = TransactionOnNetwork.fromHttpResponse(txHash, response);
         result.contractResults = ContractResults.fromProxyHttpResponse(response.smartContractResults || []);
 
-        if (process_status !== undefined) {
-            result.status = process_status;
+        if (processStatus !== undefined) {
+            result.status = processStatus;
 
             if (result.status.isSuccessful() || result.status.isFailed()) {
                 result.isCompleted = true;

From b95ca008ad47342dfc220ef5469136cb855c81a2 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Tue, 11 Jul 2023 17:45:54 +0300
Subject: [PATCH 188/338] fix tests

---
 src-network-providers/interface.ts            |  2 +-
 .../providers.dev.net.spec.ts                 | 71 +++++++++----------
 src-network-providers/tokenDefinitions.ts     | 20 +++---
 src-network-providers/tokens.ts               |  2 +-
 4 files changed, 46 insertions(+), 49 deletions(-)

diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index 641097237..fa15abf2f 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -61,7 +61,7 @@ export interface INetworkProvider {
     /**
      * Fetches the state of a transaction.
      */
-    getTransaction(txHash: string): Promise<TransactionOnNetwork>;
+    getTransaction(txHash: string, withProcessStatus?: boolean): Promise<TransactionOnNetwork>;
 
     /**
      * Queries the status of a transaction.
diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 251c552cc..361192b96 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -71,41 +71,43 @@ describe("test network providers on devnet: Proxy and API", function () {
             let proxyResponse = (await proxyProvider.getFungibleTokensOfAccount(user)).slice(0, 20);
 
             for (let i = 0; i < apiResponse.length; i++) {
-                console.log(apiResponse[i]);
-                console.log(proxyResponse[i]);
                 assert.equal(apiResponse[i].identifier, proxyResponse[i].identifier);
                 assert.equal(apiResponse[i].balance.valueOf, proxyResponse[i].balance.valueOf);
             }
         }
     });
 
-    it.only("should have same response for getNonFungibleTokensOfAccount(), getNonFungibleTokenOfAccount", async function () {
+    it("should have same response for getNonFungibleTokensOfAccount(), getNonFungibleTokenOfAccount", async function () {
         this.timeout(30000);
 
-        for (const user of [alice, bob, carol, dan]) {
-            let apiResponse = await apiProvider.getNonFungibleTokensOfAccount(user);
-            let proxyResponse = await proxyProvider.getNonFungibleTokensOfAccount(user);
-            console.log(apiResponse[0]);
-            console.log(proxyResponse[0]);
-            return
-
-            for (const item of apiResponse) {
-                // Gateway does not provide "type".
-                item.type = "";
-            }
+        let apiResponse = (await apiProvider.getNonFungibleTokensOfAccount(dan)).slice(0, 20);
+        let proxyResponse = (await proxyProvider.getNonFungibleTokensOfAccount(dan)).slice(0, 20);
+
+        // unset unconsistent fields
+        for (let i = 0; i < apiResponse.length; i++) {
+            apiResponse[i].type = "";
+            proxyResponse[i].type = "";
+            apiResponse[i].name = "";
+            proxyResponse[i].name = "";
+            apiResponse[i].decimals = 0;
+            apiResponse[i].decimals = 0;
+        }
 
-            assert.deepEqual(apiResponse.slice(0, 100), proxyResponse.slice(0, 100));
+        assert.deepEqual(apiResponse, proxyResponse);
 
-            for (const item of apiResponse.slice(0, 5)) {
-                let apiResponse = await apiProvider.getNonFungibleTokenOfAccount(user, item.collection, item.nonce);
-                let proxyResponse = await proxyProvider.getNonFungibleTokenOfAccount(user, item.collection, item.nonce);
+        const item = apiResponse[0];
+        let apiItemResponse = await apiProvider.getNonFungibleTokenOfAccount(dan, item.collection, item.nonce);
+        let proxyItemResponse = await proxyProvider.getNonFungibleTokenOfAccount(dan, item.collection, item.nonce);
 
-                // Gateway does not provide "type".
-                apiResponse.type = "";
+        // unset unconsistent fields
+        apiItemResponse.type = "";
+        proxyItemResponse.type = "";
+        apiItemResponse.name = "";
+        proxyItemResponse.name = "";
+        apiItemResponse.decimals = 0;
+        proxyItemResponse.decimals = 0;
 
-                assert.deepEqual(apiResponse, proxyResponse, `user: ${user.bech32()}, token: ${item.identifier}`);
-            }
-        }
+        assert.deepEqual(apiResponse, proxyResponse, `user: ${dan.bech32()}, token: ${item.identifier}`);
     });
 
     it("should be able to send transaction(s)", async function () {
@@ -168,17 +170,13 @@ describe("test network providers on devnet: Proxy and API", function () {
         this.timeout(20000);
 
         let hashes = [
-            "a069c663831002651fd542479869cc61103465f3284dace772e7480f81429fa8",
-            "de3bc87f3e057e28ea6a625acd6d6d332e24f35ea73e820462b71256c8ecffb7",
-            "dbefa0299fe6b2336eb0bc3123fa623845c276e5c6e2a175adf1a562d5e77718",
-            "2a8ccbd91b7d9460a86174b5a8d4e6aa073b38674d1ee8107e728980a66f0676",
-            // TODO: uncomment after fix (SCR missing on API)
-            // "be7914b1eb4c6bd352ba1d86991959b443e446e0ad49fb796be3495c287b2472"
+            "2e6bd2671dbb57f1f1013c89f044359c2465f1514e0ea718583900e43c1931fe",
+            "c451566a6168e38d2980fcb83d4ea154f78d53f7abf3264dd51c2c7c585671aa"
         ];
 
         for (const hash of hashes) {
             let apiResponse = await apiProvider.getTransaction(hash);
-            let proxyResponse = await proxyProvider.getTransaction(hash);
+            let proxyResponse = await proxyProvider.getTransaction(hash, true);
 
             ignoreKnownTransactionDifferencesBetweenProviders(apiResponse, proxyResponse);
             assert.deepEqual(apiResponse, proxyResponse, `transaction: ${hash}`);
@@ -222,16 +220,13 @@ describe("test network providers on devnet: Proxy and API", function () {
         assert.equal(proxyResponse.logs.events[0].topics[3].hex(), "00000000000000000500e01285f90311fb5925a9623a1dc62eee41fa8c869a0d")
     });
 
-    // TODO: Fix differences of "tx.status", then enable this test.
-    it.skip("should have same response for getTransactionStatus()", async function () {
+    it("should have same response for getTransactionStatus()", async function () {
         this.timeout(20000);
 
         let hashes = [
-            "a069c663831002651fd542479869cc61103465f3284dace772e7480f81429fa8",
-            "de3bc87f3e057e28ea6a625acd6d6d332e24f35ea73e820462b71256c8ecffb7",
-            "dbefa0299fe6b2336eb0bc3123fa623845c276e5c6e2a175adf1a562d5e77718",
-            "2a8ccbd91b7d9460a86174b5a8d4e6aa073b38674d1ee8107e728980a66f0676",
-            "be7914b1eb4c6bd352ba1d86991959b443e446e0ad49fb796be3495c287b2472"
+            "2e6bd2671dbb57f1f1013c89f044359c2465f1514e0ea718583900e43c1931fe",
+            "c451566a6168e38d2980fcb83d4ea154f78d53f7abf3264dd51c2c7c585671aa",
+            "cd2da63a51fd422c8b69a1b5ebcb9edbbf0eb9750c3fe8e199d39ed5d82000e9"
         ];
 
         for (const hash of hashes) {
@@ -245,7 +240,7 @@ describe("test network providers on devnet: Proxy and API", function () {
     it("should have same response for getDefinitionOfFungibleToken()", async function () {
         this.timeout(10000);
 
-        let identifiers = ["FOO-b6f543", "BAR-c80d29", "COUNTER-b7401d", "WEB-5d08be"];
+        let identifiers = ["FOO-b6f543", "BAR-c80d29", "COUNTER-b7401d"];
 
         for (const identifier of identifiers) {
             let apiResponse = await apiProvider.getDefinitionOfFungibleToken(identifier);
diff --git a/src-network-providers/tokenDefinitions.ts b/src-network-providers/tokenDefinitions.ts
index fc97af03e..ea469b8fc 100644
--- a/src-network-providers/tokenDefinitions.ts
+++ b/src-network-providers/tokenDefinitions.ts
@@ -99,6 +99,8 @@ export class DefinitionOfTokenCollectionOnNetwork {
         result.canPause = payload.canPause || false;
         result.canFreeze = payload.canFreeze || false;
         result.canWipe = payload.canWipe || false;
+        result.canUpgrade = payload.canUpgrade || false;
+        result.canAddSpecialRoles = payload.canAddSpecialRoles || false;
         result.canTransferNftCreateRole = payload.canTransferNftCreateRole || false;
 
         return result;
@@ -119,15 +121,15 @@ export class DefinitionOfTokenCollectionOnNetwork {
         result.name = tokenName.toString();
         result.ticker = collection;
         result.owner = Address.fromPubkey(owner);
-        result.decimals = properties.NumDecimals.toNumber();
-        result.canPause = properties.CanPause;
-        result.canFreeze = properties.CanFreeze;
-        result.canWipe = properties.CanWipe;
-        result.canUpgrade = properties.CanUpgrade;
-        result.canChangeOwner = properties.CanChangeOwner;
-        result.canAddSpecialRoles = properties.CanAddSpecialRoles;
-        result.canTransferNftCreateRole = properties.CanTransferNFTCreateRole;
-        result.canCreateMultiShard = properties.CanCreateMultiShard;
+        result.decimals = properties.NumDecimals.toNumber() || 0;
+        result.canPause = properties.CanPause || false;
+        result.canFreeze = properties.CanFreeze || false;
+        result.canWipe = properties.CanWipe || false;
+        result.canUpgrade = properties.CanUpgrade || false;
+        result.canChangeOwner = properties.CanChangeOwner || false;
+        result.canAddSpecialRoles = properties.CanAddSpecialRoles || false;
+        result.canTransferNftCreateRole = properties.CanTransferNFTCreateRole || false;
+        result.canCreateMultiShard = properties.CanCreateMultiShard || false;
 
         return result;
     }
diff --git a/src-network-providers/tokens.ts b/src-network-providers/tokens.ts
index 31f685b51..855d2428e 100644
--- a/src-network-providers/tokens.ts
+++ b/src-network-providers/tokens.ts
@@ -81,7 +81,7 @@ export class NonFungibleTokenOfAccountOnNetwork {
         result.supply = new BigNumber(payload.balance || 1);
         result.royalties = new BigNumber(payload.royalties || 0);
         result.assets = payload.assets || [];
-        result.balance = new BigNumber(payload.balance || 0);
+        result.balance = new BigNumber(payload.balance || 1);
 
         return result;
     }

From a2c07bc8733b64dcce841672c37a085ff1b19620 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Wed, 12 Jul 2023 11:02:46 +0300
Subject: [PATCH 189/338] fix after review

---
 src-network-providers/proxyNetworkProvider.ts | 10 +++-------
 src-network-providers/transactions.ts         |  9 ++-------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index ebc25443a..995f7ac41 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -109,15 +109,11 @@ export class ProxyNetworkProvider implements INetworkProvider {
         let url = this.buildUrlWithQueryParameters(`transaction/${txHash}`, { withResults: "true" });
         let response = await this.doGetGeneric(url);
 
-        let transaction: TransactionOnNetwork;
-        if (processStatusPromise !== undefined) {
+        if (processStatusPromise) {
             const processStatus = await processStatusPromise;
-            transaction = TransactionOnNetwork.fromProxyHttpResponse(txHash, response.transaction, processStatus);
+            return TransactionOnNetwork.fromProxyHttpResponse(txHash, response.transaction, processStatus);
         }
-        else {
-            transaction = TransactionOnNetwork.fromProxyHttpResponse(txHash, response.transaction);
-        }
-        return transaction;
+        return TransactionOnNetwork.fromProxyHttpResponse(txHash, response.transaction);
     }
 
     async getTransactionStatus(txHash: string): Promise<TransactionStatus> {
diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
index d1e98105f..5d701e2bd 100644
--- a/src-network-providers/transactions.ts
+++ b/src-network-providers/transactions.ts
@@ -38,15 +38,10 @@ export class TransactionOnNetwork {
         let result = TransactionOnNetwork.fromHttpResponse(txHash, response);
         result.contractResults = ContractResults.fromProxyHttpResponse(response.smartContractResults || []);
 
-        if (processStatus !== undefined) {
+        if (processStatus) {
             result.status = processStatus;
 
-            if (result.status.isSuccessful() || result.status.isFailed()) {
-                result.isCompleted = true;
-            }
-            else {
-                result.isCompleted = false;
-            }
+            result.isCompleted = result.status.isSuccessful() || result.status.isFailed()
         }
 
         return result;

From a9e35e440bc75e1fa23ffbef6fc261cda0d404be Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Wed, 12 Jul 2023 14:08:30 +0300
Subject: [PATCH 190/338] small fixes & tests refactoring

---
 .../providers.dev.net.spec.ts                 | 45 +++++++++----------
 src-network-providers/transactions.ts         |  1 -
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 361192b96..dcf1a2108 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -1,11 +1,11 @@
 import { assert } from "chai";
 import { ApiNetworkProvider } from "./apiNetworkProvider";
-import { INetworkProvider, IPagination } from "./interface";
+import { INetworkProvider } from "./interface";
 import { Address } from "./primitives";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { MockQuery } from "./testscommon/dummyQuery";
 import { TransactionOnNetwork } from "./transactions";
-import { TransactionStatus } from "./transactionStatus";
+import { NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 
 describe("test network providers on devnet: Proxy and API", function () {
     let alice = new Address("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
@@ -55,7 +55,7 @@ describe("test network providers on devnet: Proxy and API", function () {
     });
 
     it("should have same response for getAccount()", async function () {
-        for (const user of [bob, carol, dan]) {
+        for (const user of [alice, bob, carol, dan]) {
             let apiResponse = await apiProvider.getAccount(user);
             let proxyResponse = await proxyProvider.getAccount(user);
 
@@ -65,7 +65,7 @@ describe("test network providers on devnet: Proxy and API", function () {
 
     it("should have same response for getFungibleTokensOfAccount(), getFungibleTokenOfAccount()", async function () {
         this.timeout(30000);
-        // can't assert for deepequal because the raw response it's not the same
+
         for (const user of [carol, dan]) {
             let apiResponse = (await apiProvider.getFungibleTokensOfAccount(user)).slice(0, 20);
             let proxyResponse = (await proxyProvider.getFungibleTokensOfAccount(user)).slice(0, 20);
@@ -83,14 +83,10 @@ describe("test network providers on devnet: Proxy and API", function () {
         let apiResponse = (await apiProvider.getNonFungibleTokensOfAccount(dan)).slice(0, 20);
         let proxyResponse = (await proxyProvider.getNonFungibleTokensOfAccount(dan)).slice(0, 20);
 
-        // unset unconsistent fields
+        assert.equal(apiResponse.length, proxyResponse.length);
+
         for (let i = 0; i < apiResponse.length; i++) {
-            apiResponse[i].type = "";
-            proxyResponse[i].type = "";
-            apiResponse[i].name = "";
-            proxyResponse[i].name = "";
-            apiResponse[i].decimals = 0;
-            apiResponse[i].decimals = 0;
+            removeInconsistencyForNonFungibleTokenOfAccount(apiResponse[i], proxyResponse[i]);
         }
 
         assert.deepEqual(apiResponse, proxyResponse);
@@ -99,17 +95,21 @@ describe("test network providers on devnet: Proxy and API", function () {
         let apiItemResponse = await apiProvider.getNonFungibleTokenOfAccount(dan, item.collection, item.nonce);
         let proxyItemResponse = await proxyProvider.getNonFungibleTokenOfAccount(dan, item.collection, item.nonce);
 
-        // unset unconsistent fields
-        apiItemResponse.type = "";
-        proxyItemResponse.type = "";
-        apiItemResponse.name = "";
-        proxyItemResponse.name = "";
-        apiItemResponse.decimals = 0;
-        proxyItemResponse.decimals = 0;
-
+        removeInconsistencyForNonFungibleTokenOfAccount(apiItemResponse, proxyItemResponse);
         assert.deepEqual(apiResponse, proxyResponse, `user: ${dan.bech32()}, token: ${item.identifier}`);
     });
 
+    // TODO: Strive to have as little differences as possible between Proxy and API.
+    function removeInconsistencyForNonFungibleTokenOfAccount(apiResponse: NonFungibleTokenOfAccountOnNetwork, proxyResponse: NonFungibleTokenOfAccountOnNetwork) {
+        // unset unconsistent fields
+        apiResponse.type = "";
+        proxyResponse.type = "";
+        apiResponse.name = "";
+        proxyResponse.name = "";
+        apiResponse.decimals = 0;
+        apiResponse.decimals = 0;
+    }
+
     it("should be able to send transaction(s)", async function () {
         this.timeout(5000);
 
@@ -178,7 +178,7 @@ describe("test network providers on devnet: Proxy and API", function () {
             let apiResponse = await apiProvider.getTransaction(hash);
             let proxyResponse = await proxyProvider.getTransaction(hash, true);
 
-            ignoreKnownTransactionDifferencesBetweenProviders(apiResponse, proxyResponse);
+            ignoreKnownTransactionDifferencesBetweenProviders(proxyResponse);
             assert.deepEqual(apiResponse, proxyResponse, `transaction: ${hash}`);
 
             // Also assert completion
@@ -188,10 +188,7 @@ describe("test network providers on devnet: Proxy and API", function () {
     });
 
     // TODO: Strive to have as little differences as possible between Proxy and API.
-    function ignoreKnownTransactionDifferencesBetweenProviders(apiResponse: TransactionOnNetwork, proxyResponse: TransactionOnNetwork) {
-        // TODO: Remove this once "tx.status" is uniformized.
-        apiResponse.status = proxyResponse.status = new TransactionStatus("ignore");
-
+    function ignoreKnownTransactionDifferencesBetweenProviders(proxyResponse: TransactionOnNetwork) {
         // Ignore fields which are not present on API response:
         proxyResponse.type = "";
         proxyResponse.epoch = 0;
diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
index 5d701e2bd..18fcd1d4f 100644
--- a/src-network-providers/transactions.ts
+++ b/src-network-providers/transactions.ts
@@ -40,7 +40,6 @@ export class TransactionOnNetwork {
 
         if (processStatus) {
             result.status = processStatus;
-
             result.isCompleted = result.status.isSuccessful() || result.status.isFailed()
         }
 

From 94ee687abd810af120f6bab18e23f18616ea61fc Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Wed, 12 Jul 2023 14:21:36 +0300
Subject: [PATCH 191/338] update test

---
 src-network-providers/providers.dev.net.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index dcf1a2108..9106baf4e 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -55,7 +55,7 @@ describe("test network providers on devnet: Proxy and API", function () {
     });
 
     it("should have same response for getAccount()", async function () {
-        for (const user of [alice, bob, carol, dan]) {
+        for (const user of [alice, bob]) {
             let apiResponse = await apiProvider.getAccount(user);
             let proxyResponse = await proxyProvider.getAccount(user);
 

From 19166b435404a2da4257b67b9539f6ff2ec33365 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Wed, 12 Jul 2023 14:31:57 +0300
Subject: [PATCH 192/338] update test

---
 src-network-providers/providers.dev.net.spec.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 9106baf4e..e406e3d70 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -54,13 +54,11 @@ describe("test network providers on devnet: Proxy and API", function () {
         assert.deepEqual(apiResponse, proxyResponse);
     });
 
-    it("should have same response for getAccount()", async function () {
-        for (const user of [alice, bob]) {
-            let apiResponse = await apiProvider.getAccount(user);
-            let proxyResponse = await proxyProvider.getAccount(user);
+    it.only("should have same response for getAccount()", async function () {
+        let apiResponse = await apiProvider.getAccount(alice);
+        let proxyResponse = await proxyProvider.getAccount(alice);
 
-            assert.deepEqual(apiResponse, proxyResponse);
-        }
+        assert.deepEqual(apiResponse, proxyResponse);
     });
 
     it("should have same response for getFungibleTokensOfAccount(), getFungibleTokenOfAccount()", async function () {

From 996426d19d3fe6c0b45fa9e1fe9222bab6050c06 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Thu, 13 Jul 2023 12:06:21 +0300
Subject: [PATCH 193/338] fixes after review

---
 src-network-providers/providers.dev.net.spec.ts | 14 +++++++-------
 src-network-providers/tokenDefinitions.ts       |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index e406e3d70..30eaaf4fa 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -9,9 +9,9 @@ import { NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 
 describe("test network providers on devnet: Proxy and API", function () {
     let alice = new Address("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
-    let bob = new Address("erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx");
     let carol = new Address("erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
     let dan = new Address("erd1kyaqzaprcdnv4luvanah0gfxzzsnpaygsy6pytrexll2urtd05ts9vegu7");
+    const MAX_NUMBER_OF_ITEMS_BY_DEFAULT = 20;
 
     let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.multiversx.com", { timeout: 10000 });
     let proxyProvider: INetworkProvider = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com", { timeout: 10000 });
@@ -54,7 +54,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         assert.deepEqual(apiResponse, proxyResponse);
     });
 
-    it.only("should have same response for getAccount()", async function () {
+    it("should have same response for getAccount()", async function () {
         let apiResponse = await apiProvider.getAccount(alice);
         let proxyResponse = await proxyProvider.getAccount(alice);
 
@@ -65,8 +65,8 @@ describe("test network providers on devnet: Proxy and API", function () {
         this.timeout(30000);
 
         for (const user of [carol, dan]) {
-            let apiResponse = (await apiProvider.getFungibleTokensOfAccount(user)).slice(0, 20);
-            let proxyResponse = (await proxyProvider.getFungibleTokensOfAccount(user)).slice(0, 20);
+            let apiResponse = (await apiProvider.getFungibleTokensOfAccount(user)).slice(0, MAX_NUMBER_OF_ITEMS_BY_DEFAULT);
+            let proxyResponse = (await proxyProvider.getFungibleTokensOfAccount(user)).slice(0, MAX_NUMBER_OF_ITEMS_BY_DEFAULT);
 
             for (let i = 0; i < apiResponse.length; i++) {
                 assert.equal(apiResponse[i].identifier, proxyResponse[i].identifier);
@@ -78,8 +78,8 @@ describe("test network providers on devnet: Proxy and API", function () {
     it("should have same response for getNonFungibleTokensOfAccount(), getNonFungibleTokenOfAccount", async function () {
         this.timeout(30000);
 
-        let apiResponse = (await apiProvider.getNonFungibleTokensOfAccount(dan)).slice(0, 20);
-        let proxyResponse = (await proxyProvider.getNonFungibleTokensOfAccount(dan)).slice(0, 20);
+        let apiResponse = (await apiProvider.getNonFungibleTokensOfAccount(dan)).slice(0, MAX_NUMBER_OF_ITEMS_BY_DEFAULT);
+        let proxyResponse = (await proxyProvider.getNonFungibleTokensOfAccount(dan)).slice(0, MAX_NUMBER_OF_ITEMS_BY_DEFAULT);
 
         assert.equal(apiResponse.length, proxyResponse.length);
 
@@ -105,7 +105,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         apiResponse.name = "";
         proxyResponse.name = "";
         apiResponse.decimals = 0;
-        apiResponse.decimals = 0;
+        proxyResponse.decimals = 0;
     }
 
     it("should be able to send transaction(s)", async function () {
diff --git a/src-network-providers/tokenDefinitions.ts b/src-network-providers/tokenDefinitions.ts
index ea469b8fc..63bfa523d 100644
--- a/src-network-providers/tokenDefinitions.ts
+++ b/src-network-providers/tokenDefinitions.ts
@@ -121,7 +121,7 @@ export class DefinitionOfTokenCollectionOnNetwork {
         result.name = tokenName.toString();
         result.ticker = collection;
         result.owner = Address.fromPubkey(owner);
-        result.decimals = properties.NumDecimals.toNumber() || 0;
+        result.decimals = properties.NumDecimals.toNumber() ?? 0;
         result.canPause = properties.CanPause || false;
         result.canFreeze = properties.CanFreeze || false;
         result.canWipe = properties.CanWipe || false;

From 809494c3fd81df4a10e54d8787738e12fa1ba6b8 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Wed, 23 Aug 2023 10:26:40 +0300
Subject: [PATCH 194/338] fix test

---
 src-network-providers/providers.dev.net.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 30eaaf4fa..5b49a9ada 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -27,12 +27,12 @@ describe("test network providers on devnet: Proxy and API", function () {
         let apiResponse = await apiProvider.getNetworkStatus();
         let proxyResponse = await proxyProvider.getNetworkStatus();
 
-        assert.equal(apiResponse.CurrentRound, proxyResponse.CurrentRound);
         assert.equal(apiResponse.EpochNumber, proxyResponse.EpochNumber);
         assert.equal(apiResponse.NonceAtEpochStart, proxyResponse.NonceAtEpochStart);
         assert.equal(apiResponse.RoundAtEpochStart, proxyResponse.RoundAtEpochStart);
         assert.equal(apiResponse.RoundsPerEpoch, proxyResponse.RoundsPerEpoch);
         // done this way because the nonces may change until both requests are executed
+        assert.approximately(apiResponse.CurrentRound, proxyResponse.CurrentRound, 1);
         assert.approximately(apiResponse.HighestFinalNonce, proxyResponse.HighestFinalNonce, 1);
         assert.approximately(apiResponse.Nonce, proxyResponse.Nonce, 1);
         assert.approximately(apiResponse.NoncesPassedInCurrentEpoch, proxyResponse.NoncesPassedInCurrentEpoch, 1);

From 2a18abd8d82fcffdac0ef1a85663729c615f341f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 31 Oct 2023 21:50:38 +0200
Subject: [PATCH 195/338] For Sirius: handle logs.events.additionalData.

---
 .../providers.dev.net.spec.ts                 | 35 ++++++++++++++++++-
 src-network-providers/transactionEvents.ts    | 20 ++++++++---
 2 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 5b49a9ada..de5348758 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -4,8 +4,9 @@ import { INetworkProvider } from "./interface";
 import { Address } from "./primitives";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { MockQuery } from "./testscommon/dummyQuery";
-import { TransactionOnNetwork } from "./transactions";
 import { NonFungibleTokenOfAccountOnNetwork } from "./tokens";
+import { TransactionEventData } from "./transactionEvents";
+import { TransactionOnNetwork } from "./transactions";
 
 describe("test network providers on devnet: Proxy and API", function () {
     let alice = new Address("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
@@ -338,5 +339,37 @@ describe("test network providers on devnet: Proxy and API", function () {
         assert.deepEqual(apiResponse, proxyResponse);
         assert.deepEqual(apiResponse.getReturnDataParts(), proxyResponse.getReturnDataParts());
     });
+
+    it.only("should handle events data on < Sirius and >= Sirius", async function () {
+        this.timeout(50000);
+
+        const beforeSiriusApiProvider = new ApiNetworkProvider("https://devnet2-api.multiversx.com");
+        const beforeSiriusProxyProvider = new ProxyNetworkProvider("https://devnet2-gateway.multiversx.com");
+
+        // We use the Testnet services, since they are backed by nodes with version >= Sirius (November 2023).
+        const afterSiriusApiProvider = new ApiNetworkProvider("https://testnet-api.multiversx.com");
+        const afterSiriusProxyProvider = new ProxyNetworkProvider("https://testnet-gateway.multiversx.com");
+
+        const beforeSiriusApiResponse = await beforeSiriusApiProvider.getTransaction("51e53c6345c25fc4a454e64b96f43812e4a6cf3d01bbe4384da39e562b136aac");
+        const beforeSiriusProxyResponse = await beforeSiriusProxyProvider.getTransaction("51e53c6345c25fc4a454e64b96f43812e4a6cf3d01bbe4384da39e562b136aac");
+
+        const afterSiriusApiResponse = await afterSiriusApiProvider.getTransaction("532087e5021c9ab8be8a4db5ad843cfe0610761f6334d9693b3765992fd05f67");
+        // Contract result of "5320...5f67":
+        const afterSiriusProxyResponse = await afterSiriusProxyProvider.getTransaction("4bb22e85895b41bc3cd195079afa761cc4b430fb4ea19a6862f083de53f110ab");
+
+        assert.equal(beforeSiriusApiResponse.logs.events[0].data, "@6f7574206f662066756e6473");
+        assert.equal(beforeSiriusProxyResponse.logs.events[0].data, "@6f7574206f662066756e6473");
+        assert.deepEqual(beforeSiriusApiResponse.logs.events[0].dataPayload, TransactionEventData.fromBase64("QDZmNzU3NDIwNmY2NjIwNjY3NTZlNjQ3Mw=="));
+        assert.deepEqual(beforeSiriusProxyResponse.logs.events[0].dataPayload, TransactionEventData.fromBase64("QDZmNzU3NDIwNmY2NjIwNjY3NTZlNjQ3Mw=="));
+
+        assert.equal(afterSiriusApiResponse.contractResults.items[0].logs.events[1].data, Buffer.from("AAAAAAAAA9sAAAA=", "base64").toString());
+        assert.equal(afterSiriusProxyResponse.logs.events[1].data, Buffer.from("AAAAAAAAA9sAAAA=", "base64").toString());
+        assert.deepEqual(afterSiriusApiResponse.contractResults.items[0].logs.events[1].dataPayload, TransactionEventData.fromBase64("AAAAAAAAA9sAAAA="));
+        assert.deepEqual(afterSiriusProxyResponse.logs.events[1].dataPayload, TransactionEventData.fromBase64("AAAAAAAAA9sAAAA="));
+        assert.deepEqual(afterSiriusApiResponse.contractResults.items[0].logs.events[1].additionalData, [TransactionEventData.fromBase64("AAAAAAAAA9sAAAA=")]);
+
+        // This should be changed once the Gateway is updated.
+        assert.deepEqual(afterSiriusProxyResponse.logs.events[1].additionalData, []);
+    });
 });
 
diff --git a/src-network-providers/transactionEvents.ts b/src-network-providers/transactionEvents.ts
index 3c8cb1d81..b37d47abc 100644
--- a/src-network-providers/transactionEvents.ts
+++ b/src-network-providers/transactionEvents.ts
@@ -5,8 +5,13 @@ export class TransactionEvent {
     address: IAddress = new Address("");
     identifier: string = "";
     topics: TransactionEventTopic[] = [];
-    dataPayload: TransactionEventData = new TransactionEventData(Buffer.from("", "utf8"));
+
+    /**
+     * @deprecated Use "dataPayload" instead.
+     */
     data: string = "";
+    dataPayload: TransactionEventData = new TransactionEventData(Buffer.from("", "utf8"));
+    additionalData: TransactionEventData[] = [];
 
     constructor(init?: Partial<TransactionEvent>) {
         Object.assign(this, init);
@@ -16,16 +21,17 @@ export class TransactionEvent {
         address: string,
         identifier: string,
         topics: string[],
-        data: string
+        data: string,
+        additionalData?: string[]
     }): TransactionEvent {
         let result = new TransactionEvent();
         result.address = new Address(responsePart.address);
         result.identifier = responsePart.identifier || "";
         result.topics = (responsePart.topics || []).map(topic => new TransactionEventTopic(topic));
 
-        const rawData = Buffer.from(responsePart.data || "", "base64")
-        result.dataPayload = new TransactionEventData(rawData);
-        result.data = rawData.toString();
+        result.dataPayload = TransactionEventData.fromBase64(responsePart.data);
+        result.additionalData = (responsePart.additionalData || []).map(TransactionEventData.fromBase64);
+        result.data = result.dataPayload.toString();
 
         return result;
     }
@@ -46,6 +52,10 @@ export class TransactionEventData {
         this.raw = data;
     }
 
+    static fromBase64(str: string): TransactionEventData {
+        return new TransactionEventData(Buffer.from(str || "", "base64"));
+    }
+
     toString(): string {
         return this.raw.toString("utf8");
     }

From 46f3afc04c31fae3726fc480fc1fef388794f8a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Thu, 9 Nov 2023 10:07:54 +0200
Subject: [PATCH 196/338] Fix tests.

---
 src-network-providers/providers.dev.net.spec.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index de5348758..750d2c3e3 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -340,11 +340,11 @@ describe("test network providers on devnet: Proxy and API", function () {
         assert.deepEqual(apiResponse.getReturnDataParts(), proxyResponse.getReturnDataParts());
     });
 
-    it.only("should handle events data on < Sirius and >= Sirius", async function () {
+    it("should handle events data on < Sirius and >= Sirius", async function () {
         this.timeout(50000);
 
-        const beforeSiriusApiProvider = new ApiNetworkProvider("https://devnet2-api.multiversx.com");
-        const beforeSiriusProxyProvider = new ProxyNetworkProvider("https://devnet2-gateway.multiversx.com");
+        const beforeSiriusApiProvider = new ApiNetworkProvider("https://devnet-api.multiversx.com");
+        const beforeSiriusProxyProvider = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com");
 
         // We use the Testnet services, since they are backed by nodes with version >= Sirius (November 2023).
         const afterSiriusApiProvider = new ApiNetworkProvider("https://testnet-api.multiversx.com");
@@ -357,19 +357,22 @@ describe("test network providers on devnet: Proxy and API", function () {
         // Contract result of "5320...5f67":
         const afterSiriusProxyResponse = await afterSiriusProxyProvider.getTransaction("4bb22e85895b41bc3cd195079afa761cc4b430fb4ea19a6862f083de53f110ab");
 
+        // Before Sirius
         assert.equal(beforeSiriusApiResponse.logs.events[0].data, "@6f7574206f662066756e6473");
         assert.equal(beforeSiriusProxyResponse.logs.events[0].data, "@6f7574206f662066756e6473");
+
         assert.deepEqual(beforeSiriusApiResponse.logs.events[0].dataPayload, TransactionEventData.fromBase64("QDZmNzU3NDIwNmY2NjIwNjY3NTZlNjQ3Mw=="));
         assert.deepEqual(beforeSiriusProxyResponse.logs.events[0].dataPayload, TransactionEventData.fromBase64("QDZmNzU3NDIwNmY2NjIwNjY3NTZlNjQ3Mw=="));
 
+        // After Sirius
         assert.equal(afterSiriusApiResponse.contractResults.items[0].logs.events[1].data, Buffer.from("AAAAAAAAA9sAAAA=", "base64").toString());
         assert.equal(afterSiriusProxyResponse.logs.events[1].data, Buffer.from("AAAAAAAAA9sAAAA=", "base64").toString());
+
         assert.deepEqual(afterSiriusApiResponse.contractResults.items[0].logs.events[1].dataPayload, TransactionEventData.fromBase64("AAAAAAAAA9sAAAA="));
         assert.deepEqual(afterSiriusProxyResponse.logs.events[1].dataPayload, TransactionEventData.fromBase64("AAAAAAAAA9sAAAA="));
-        assert.deepEqual(afterSiriusApiResponse.contractResults.items[0].logs.events[1].additionalData, [TransactionEventData.fromBase64("AAAAAAAAA9sAAAA=")]);
 
-        // This should be changed once the Gateway is updated.
-        assert.deepEqual(afterSiriusProxyResponse.logs.events[1].additionalData, []);
+        assert.deepEqual(afterSiriusApiResponse.contractResults.items[0].logs.events[1].additionalData, [TransactionEventData.fromBase64("AAAAAAAAA9sAAAA=")]);
+        assert.deepEqual(afterSiriusProxyResponse.logs.events[1].additionalData, [TransactionEventData.fromBase64("AAAAAAAAA9sAAAA=")]);
     });
 });
 

From 04517d1b69600e6d092bdc92d2e09bbd653be361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Thu, 9 Nov 2023 10:32:14 +0200
Subject: [PATCH 197/338] Fix tests.

---
 .../providers.dev.net.spec.ts                 | 72 +++++--------------
 1 file changed, 16 insertions(+), 56 deletions(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 750d2c3e3..35980d96b 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -82,6 +82,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         let apiResponse = (await apiProvider.getNonFungibleTokensOfAccount(dan)).slice(0, MAX_NUMBER_OF_ITEMS_BY_DEFAULT);
         let proxyResponse = (await proxyProvider.getNonFungibleTokensOfAccount(dan)).slice(0, MAX_NUMBER_OF_ITEMS_BY_DEFAULT);
 
+        assert.isTrue(apiResponse.length > 0, "For the sake of the test, there should be at least one item.");
         assert.equal(apiResponse.length, proxyResponse.length);
 
         for (let i = 0; i < apiResponse.length; i++) {
@@ -169,8 +170,8 @@ describe("test network providers on devnet: Proxy and API", function () {
         this.timeout(20000);
 
         let hashes = [
-            "2e6bd2671dbb57f1f1013c89f044359c2465f1514e0ea718583900e43c1931fe",
-            "c451566a6168e38d2980fcb83d4ea154f78d53f7abf3264dd51c2c7c585671aa"
+            "08acf8cbd71306a56eb58f9593cb2e23f109c94e27acdd906c82a5c3a5f84d9d",
+            "410efb1db2ab86678b8dbc503beb695b5b7d52754fb0de86c09cbb433de5f6a8"
         ];
 
         for (const hash of hashes) {
@@ -197,7 +198,7 @@ describe("test network providers on devnet: Proxy and API", function () {
     }
 
     it("should have the same response for transactions with events", async function () {
-        const hash = "c451566a6168e38d2980fcb83d4ea154f78d53f7abf3264dd51c2c7c585671aa";
+        const hash = "1b04eb849cf87f2d3086c77b4b825d126437b88014327bbf01437476751cb040";
 
         let apiResponse = await apiProvider.getTransaction(hash);
         let proxyResponse = await proxyProvider.getTransaction(hash);
@@ -206,23 +207,22 @@ describe("test network providers on devnet: Proxy and API", function () {
         assert.exists(proxyResponse.logs);
         assert.exists(apiResponse.logs.events)
         assert.exists(proxyResponse.logs.events)
-        assert.equal(apiResponse.logs.events[0].topics[0].hex(), "5745474c442d643763366262")
+        assert.equal(apiResponse.logs.events[0].topics[0].hex(), "414c4943452d353632376631")
         assert.equal(apiResponse.logs.events[0].topics[1].hex(), "")
-        assert.equal(apiResponse.logs.events[0].topics[2].hex(), "0de0b6b3a7640000")
-        assert.equal(apiResponse.logs.events[0].topics[3].hex(), "00000000000000000500e01285f90311fb5925a9623a1dc62eee41fa8c869a0d")
-        assert.equal(proxyResponse.logs.events[0].topics[0].hex(), "5745474c442d643763366262")
+        assert.equal(apiResponse.logs.events[0].topics[2].hex(), "01")
+        assert.equal(apiResponse.logs.events[0].topics[3].hex(), "0000000000000000050032e141d21536e2dfc3d64b9e7dd0c2c53f201dc469e1")
+        assert.equal(proxyResponse.logs.events[0].topics[0].hex(), "414c4943452d353632376631")
         assert.equal(proxyResponse.logs.events[0].topics[1].hex(), "")
-        assert.equal(proxyResponse.logs.events[0].topics[2].hex(), "0de0b6b3a7640000")
-        assert.equal(proxyResponse.logs.events[0].topics[3].hex(), "00000000000000000500e01285f90311fb5925a9623a1dc62eee41fa8c869a0d")
+        assert.equal(proxyResponse.logs.events[0].topics[2].hex(), "01")
+        assert.equal(proxyResponse.logs.events[0].topics[3].hex(), "0000000000000000050032e141d21536e2dfc3d64b9e7dd0c2c53f201dc469e1")
     });
 
     it("should have same response for getTransactionStatus()", async function () {
         this.timeout(20000);
 
         let hashes = [
-            "2e6bd2671dbb57f1f1013c89f044359c2465f1514e0ea718583900e43c1931fe",
-            "c451566a6168e38d2980fcb83d4ea154f78d53f7abf3264dd51c2c7c585671aa",
-            "cd2da63a51fd422c8b69a1b5ebcb9edbbf0eb9750c3fe8e199d39ed5d82000e9"
+            "08acf8cbd71306a56eb58f9593cb2e23f109c94e27acdd906c82a5c3a5f84d9d",
+            "410efb1db2ab86678b8dbc503beb695b5b7d52754fb0de86c09cbb433de5f6a8"
         ];
 
         for (const hash of hashes) {
@@ -236,7 +236,7 @@ describe("test network providers on devnet: Proxy and API", function () {
     it("should have same response for getDefinitionOfFungibleToken()", async function () {
         this.timeout(10000);
 
-        let identifiers = ["FOO-b6f543", "BAR-c80d29", "COUNTER-b7401d"];
+        let identifiers = ["BEER-b16c6d", "CHOCOLATE-daf625"];
 
         for (const identifier of identifiers) {
             let apiResponse = await apiProvider.getDefinitionOfFungibleToken(identifier);
@@ -253,7 +253,7 @@ describe("test network providers on devnet: Proxy and API", function () {
     it("should have same response for getDefinitionOfTokenCollection()", async function () {
         this.timeout(10000);
 
-        let collections = ["ERDJS-38f249"];
+        let collections = ["TEST-37adcf"];
 
         for (const collection of collections) {
             let apiResponse = await apiProvider.getDefinitionOfTokenCollection(collection);
@@ -267,7 +267,7 @@ describe("test network providers on devnet: Proxy and API", function () {
     it("should have same response for getNonFungibleToken()", async function () {
         this.timeout(10000);
 
-        let tokens = [{ id: "ERDJS-38f249", nonce: 1 }];
+        let tokens = [{ id: "TEST-37adcf", nonce: 1 }];
 
         for (const token of tokens) {
             let apiResponse = await apiProvider.getNonFungibleToken(token.id, token.nonce);
@@ -285,7 +285,7 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         // Query: get sum (of adder contract)
         let query = new MockQuery({
-            address: new Address("erd1qqqqqqqqqqqqqpgquykqja5c4v33zdmnwglj3jphqwrelzdn396qlc9g33"),
+            address: new Address("erd1qqqqqqqqqqqqqpgqfzydqmdw7m2vazsp6u5p95yxz76t2p9rd8ss0zp9ts"),
             func: "getSum"
         });
 
@@ -298,46 +298,6 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         assert.deepEqual(apiResponse, proxyResponse);
         assert.deepEqual(apiResponse.getReturnDataParts(), proxyResponse.getReturnDataParts());
-
-        // Query: increment counter
-        query = new MockQuery({
-            address: new Address("erd1qqqqqqqqqqqqqpgqzeq07xvhs5g7cg4ama85upaqarrcgu49396q0gz4yf"),
-            func: "increment",
-            args: []
-        });
-
-        apiResponse = await apiProvider.queryContract(query);
-        proxyResponse = await proxyProvider.queryContract(query);
-
-        // Ignore "gasUsed" due to numerical imprecision (API).
-        apiResponse.gasUsed = 0;
-        proxyResponse.gasUsed = 0;
-
-        assert.deepEqual(apiResponse, proxyResponse);
-        assert.deepEqual(apiResponse.getReturnDataParts(), proxyResponse.getReturnDataParts());
-    });
-
-    it.skip("should have same response for queryContract() (2)", async function () {
-        this.timeout(10000);
-
-        // Query: issue ESDT
-        let query = new MockQuery({
-            address: new Address("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u"),
-            func: "issue",
-            value: "50000000000000000",
-            args: [
-                Buffer.from("HELLO").toString("hex"),
-                Buffer.from("WORLD").toString("hex"),
-                "0A", // Supply
-                "03" // Decimals
-            ]
-        });
-
-        let apiResponse = await apiProvider.queryContract(query);
-        let proxyResponse = await proxyProvider.queryContract(query);
-
-        assert.deepEqual(apiResponse, proxyResponse);
-        assert.deepEqual(apiResponse.getReturnDataParts(), proxyResponse.getReturnDataParts());
     });
 
     it("should handle events data on < Sirius and >= Sirius", async function () {

From f46cc4cef814a9657df4985301191bfec6a629a7 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Wed, 6 Dec 2023 11:07:27 +0200
Subject: [PATCH 198/338] add extra check

---
 src-wallet/userWallet.ts |  6 +++++-
 src-wallet/users.spec.ts | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index 3d275993e..fea541f07 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -95,7 +95,11 @@ export class UserWallet {
      * From an encrypted keyfile, given the password, loads the secret key and the public key.
      */
     static decryptSecretKey(keyFileObject: any, password: string): UserSecretKey {
-        // Here, we do not check the "kind" field. Older keystore files (holding only secret keys) do not have this field.
+        // Here, we check the "kind" field only for files that have it. Older keystore files (holding only secret keys) do not have this field.
+        const kind = keyFileObject.kind;
+        if (kind && kind !== UserWalletKind.SecretKey){
+            throw new Err(`Expected kind to be ${UserWalletKind.SecretKey}, but it was ${kind}.`);
+        }
 
         const encryptedData = UserWallet.edFromJSON(keyFileObject);
 
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 469cbd01b..7337da0d9 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -334,4 +334,16 @@ describe("test user wallets", () => {
         assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 1).getAddress().bech32(), "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx");
         assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 2).getAddress().bech32(), "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
     });
+
+    it.only("should throw error when decrypting secret key with keystore-mnemonic file", async function () {
+        const userWallet = UserWallet.fromMnemonic({
+            mnemonic: DummyMnemonic,
+            password: ``
+        });
+        const keystoreMnemonic = userWallet.toJSON();
+
+        assert.throws(() => {
+            UserWallet.decryptSecretKey(keystoreMnemonic, ``)
+        }, `Expected kind to be secretKey, but it was mnemonic.`);
+    });
 });

From 87eb57dda6d250369e75fe0588c9ab22f8026650 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Wed, 6 Dec 2023 11:08:39 +0200
Subject: [PATCH 199/338] remove only

---
 src-wallet/users.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 7337da0d9..8b547d44c 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -335,7 +335,7 @@ describe("test user wallets", () => {
         assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 2).getAddress().bech32(), "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
     });
 
-    it.only("should throw error when decrypting secret key with keystore-mnemonic file", async function () {
+    it("should throw error when decrypting secret key with keystore-mnemonic file", async function () {
         const userWallet = UserWallet.fromMnemonic({
             mnemonic: DummyMnemonic,
             password: ``

From cc4d2e643430f446cbf120d9452fd3e7bc26a472 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Wed, 6 Dec 2023 15:24:46 +0200
Subject: [PATCH 200/338] add extra assert for unit test

---
 src-wallet/testdata/withDummySecretKey.json | 23 +++++++++++++++++++++
 src-wallet/users.spec.ts                    |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 src-wallet/testdata/withDummySecretKey.json

diff --git a/src-wallet/testdata/withDummySecretKey.json b/src-wallet/testdata/withDummySecretKey.json
new file mode 100644
index 000000000..f7921ca5a
--- /dev/null
+++ b/src-wallet/testdata/withDummySecretKey.json
@@ -0,0 +1,23 @@
+{
+    "version": 4,
+    "kind": "secretKey",
+    "id": "c1d4b111-b8d2-4916-a213-bcfd237edd29",
+    "address": "0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1",
+    "bech32": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+    "crypto": {
+        "ciphertext": "75fbe213fc1964ce03100cf7d873748edf83a02631c8af9abdb23d210b9a2a15940bea2e56718f7bd710a938df5eb424c629e6a39b6ee056ed80d6e5f3b97791",
+        "cipherparams": {
+            "iv": "226d13be12373603af2b4edefcaa436f"
+        },
+        "cipher": "aes-128-ctr",
+        "kdf": "scrypt",
+        "kdfparams": {
+            "dklen": 32,
+            "salt": "d57862c212bac142a89da97fb9bf9f5c91c8e8ddba952262dafe928e1c8a9906",
+            "n": 4096,
+            "r": 8,
+            "p": 1
+        },
+        "mac": "5bab92263237c5d595f565622dd2e61ea3dfd43580cecda7fd2f42d469b42e7f"
+    }
+}
\ No newline at end of file
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 8b547d44c..2c6c508b2 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -327,9 +327,11 @@ describe("test user wallets", () => {
     it("should create UserSigner from wallet", async function () {
         const keyFileObjectWithoutKind = await loadTestKeystore("withoutKind.json");
         const keyFileObjectWithMnemonic = await loadTestKeystore("withDummyMnemonic.json");
+        const keyFileObjectWithSecretKey = await loadTestKeystore("withDummySecretKey.json");
 
         assert.equal(UserSigner.fromWallet(keyFileObjectWithoutKind, password).getAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
         assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password).getAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
+        assert.equal(UserSigner.fromWallet(keyFileObjectWithSecretKey, password).getAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
         assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 0).getAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
         assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 1).getAddress().bech32(), "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx");
         assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 2).getAddress().bech32(), "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");

From 9e797c5ea3fb7c17af63a3da0cd70d816f3bacb8 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Wed, 6 Dec 2023 16:33:39 +0200
Subject: [PATCH 201/338] add new line

---
 src-wallet/testdata/withDummySecretKey.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-wallet/testdata/withDummySecretKey.json b/src-wallet/testdata/withDummySecretKey.json
index f7921ca5a..cfba75528 100644
--- a/src-wallet/testdata/withDummySecretKey.json
+++ b/src-wallet/testdata/withDummySecretKey.json
@@ -20,4 +20,4 @@
         },
         "mac": "5bab92263237c5d595f565622dd2e61ea3dfd43580cecda7fd2f42d469b42e7f"
     }
-}
\ No newline at end of file
+}

From 1366cf135658c2e8a27d231a605e7133d7eacf13 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Thu, 7 Dec 2023 11:25:50 +0200
Subject: [PATCH 202/338] make error more explicit

---
 src-wallet/userWallet.ts | 4 ++--
 src-wallet/users.spec.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index fea541f07..2a0f04480 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -98,7 +98,7 @@ export class UserWallet {
         // Here, we check the "kind" field only for files that have it. Older keystore files (holding only secret keys) do not have this field.
         const kind = keyFileObject.kind;
         if (kind && kind !== UserWalletKind.SecretKey){
-            throw new Err(`Expected kind to be ${UserWalletKind.SecretKey}, but it was ${kind}.`);
+            throw new Err(`Expected keystore kind to be ${UserWalletKind.SecretKey}, but it was ${kind}.`);
         }
 
         const encryptedData = UserWallet.edFromJSON(keyFileObject);
@@ -115,7 +115,7 @@ export class UserWallet {
 
     static decryptMnemonic(keyFileObject: any, password: string): Mnemonic {
         if (keyFileObject.kind != UserWalletKind.Mnemonic) {
-            throw new Err(`Expected kind to be ${UserWalletKind.Mnemonic}, but it was ${keyFileObject.kind}.`);
+            throw new Err(`Expected keystore kind to be ${UserWalletKind.Mnemonic}, but it was ${keyFileObject.kind}.`);
         }
 
         const encryptedData = UserWallet.edFromJSON(keyFileObject);
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 2c6c508b2..43cd1b464 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -346,6 +346,6 @@ describe("test user wallets", () => {
 
         assert.throws(() => {
             UserWallet.decryptSecretKey(keystoreMnemonic, ``)
-        }, `Expected kind to be secretKey, but it was mnemonic.`);
+        }, `Expected keystore kind to be secretKey, but it was mnemonic.`);
     });
 });

From a0393e3bf8d7001950962cb483344668b2349b81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 9 Jan 2024 18:38:20 +0200
Subject: [PATCH 203/338] Fix integration test.

---
 .../providers.dev.net.spec.ts                 | 37 +++++--------------
 1 file changed, 9 insertions(+), 28 deletions(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 35980d96b..8ff2f6eae 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -300,39 +300,20 @@ describe("test network providers on devnet: Proxy and API", function () {
         assert.deepEqual(apiResponse.getReturnDataParts(), proxyResponse.getReturnDataParts());
     });
 
-    it("should handle events data on < Sirius and >= Sirius", async function () {
+    it("should handle events 'data' and 'additionalData'", async function () {
         this.timeout(50000);
 
-        const beforeSiriusApiProvider = new ApiNetworkProvider("https://devnet-api.multiversx.com");
-        const beforeSiriusProxyProvider = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com");
+        const apiResponse = await apiProvider.getTransaction("a419271407a2ec217739811805e3a751e30dbc72ae0777e3b4c825f036995184");
+        const proxyResponse = await proxyProvider.getTransaction("a419271407a2ec217739811805e3a751e30dbc72ae0777e3b4c825f036995184");
 
-        // We use the Testnet services, since they are backed by nodes with version >= Sirius (November 2023).
-        const afterSiriusApiProvider = new ApiNetworkProvider("https://testnet-api.multiversx.com");
-        const afterSiriusProxyProvider = new ProxyNetworkProvider("https://testnet-gateway.multiversx.com");
+        assert.equal(apiResponse.logs.events[0].data, Buffer.from("test").toString());
+        assert.equal(proxyResponse.logs.events[0].data, Buffer.from("test").toString());
 
-        const beforeSiriusApiResponse = await beforeSiriusApiProvider.getTransaction("51e53c6345c25fc4a454e64b96f43812e4a6cf3d01bbe4384da39e562b136aac");
-        const beforeSiriusProxyResponse = await beforeSiriusProxyProvider.getTransaction("51e53c6345c25fc4a454e64b96f43812e4a6cf3d01bbe4384da39e562b136aac");
+        assert.deepEqual(apiResponse.logs.events[0].dataPayload, TransactionEventData.fromBase64("dGVzdA=="));
+        assert.deepEqual(proxyResponse.logs.events[0].dataPayload, TransactionEventData.fromBase64("dGVzdA=="));
 
-        const afterSiriusApiResponse = await afterSiriusApiProvider.getTransaction("532087e5021c9ab8be8a4db5ad843cfe0610761f6334d9693b3765992fd05f67");
-        // Contract result of "5320...5f67":
-        const afterSiriusProxyResponse = await afterSiriusProxyProvider.getTransaction("4bb22e85895b41bc3cd195079afa761cc4b430fb4ea19a6862f083de53f110ab");
-
-        // Before Sirius
-        assert.equal(beforeSiriusApiResponse.logs.events[0].data, "@6f7574206f662066756e6473");
-        assert.equal(beforeSiriusProxyResponse.logs.events[0].data, "@6f7574206f662066756e6473");
-
-        assert.deepEqual(beforeSiriusApiResponse.logs.events[0].dataPayload, TransactionEventData.fromBase64("QDZmNzU3NDIwNmY2NjIwNjY3NTZlNjQ3Mw=="));
-        assert.deepEqual(beforeSiriusProxyResponse.logs.events[0].dataPayload, TransactionEventData.fromBase64("QDZmNzU3NDIwNmY2NjIwNjY3NTZlNjQ3Mw=="));
-
-        // After Sirius
-        assert.equal(afterSiriusApiResponse.contractResults.items[0].logs.events[1].data, Buffer.from("AAAAAAAAA9sAAAA=", "base64").toString());
-        assert.equal(afterSiriusProxyResponse.logs.events[1].data, Buffer.from("AAAAAAAAA9sAAAA=", "base64").toString());
-
-        assert.deepEqual(afterSiriusApiResponse.contractResults.items[0].logs.events[1].dataPayload, TransactionEventData.fromBase64("AAAAAAAAA9sAAAA="));
-        assert.deepEqual(afterSiriusProxyResponse.logs.events[1].dataPayload, TransactionEventData.fromBase64("AAAAAAAAA9sAAAA="));
-
-        assert.deepEqual(afterSiriusApiResponse.contractResults.items[0].logs.events[1].additionalData, [TransactionEventData.fromBase64("AAAAAAAAA9sAAAA=")]);
-        assert.deepEqual(afterSiriusProxyResponse.logs.events[1].additionalData, [TransactionEventData.fromBase64("AAAAAAAAA9sAAAA=")]);
+        assert.deepEqual(apiResponse.logs.events[0].additionalData, [TransactionEventData.fromBase64("dGVzdA==")]);
+        assert.deepEqual(proxyResponse.logs.events[0].additionalData, [TransactionEventData.fromBase64("dGVzdA==")]);
     });
 });
 

From bc60489599529a4e0e33a023f4cf52484c5bc52c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 17 Jan 2024 17:21:19 +0200
Subject: [PATCH 204/338] Remove Axios as dev-dependency.

---
 src-wallet/testutils/files.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src-wallet/testutils/files.ts b/src-wallet/testutils/files.ts
index 09abdf1fe..51863430e 100644
--- a/src-wallet/testutils/files.ts
+++ b/src-wallet/testutils/files.ts
@@ -1,5 +1,4 @@
 import * as fs from "fs";
-import axios from "axios";
 
 export async function readTestFile(filePath: string): Promise<string> {
     if (isOnBrowserTests()) {
@@ -22,7 +21,7 @@ export function isOnBrowserTests() {
 }
 
 export async function downloadTextFile(url: string) {
-    let response = await axios.get(url, { responseType: "text", transformResponse: [] });
-    let text = response.data.toString();
+    const response = await fetch(url);
+    const text = await response.text();
     return text;
 }

From bf426bb2892f53144a4ac91bd379e8904c071f85 Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Fri, 16 Feb 2024 17:09:09 +0200
Subject: [PATCH 205/338] add suport for TransactionNext

---
 src-network-providers/apiNetworkProvider.ts   | 18 ++++---
 src-network-providers/interface.ts            | 20 +++++++-
 .../providers.dev.net.spec.ts                 | 50 ++++++++++++++++++-
 src-network-providers/proxyNetworkProvider.ts | 34 ++++++++++---
 src-network-providers/transactions.ts         | 22 +++++++-
 5 files changed, 126 insertions(+), 18 deletions(-)

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index eecea7e3c..88ed0bbcc 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -4,7 +4,7 @@ import { defaultAxiosConfig, defaultPagination } from "./config";
 import { ContractQueryRequest } from "./contractQueryRequest";
 import { ContractQueryResponse } from "./contractQueryResponse";
 import { ErrContractQuery, ErrNetworkProvider } from "./errors";
-import { IAddress, IContractQuery, INetworkProvider, IPagination, ITransaction } from "./interface";
+import { IAddress, IContractQuery, INetworkProvider, IPagination, ITransaction, ITransactionNext } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkGeneralStatistics } from "./networkGeneralStatistics";
 import { NetworkStake } from "./networkStake";
@@ -14,7 +14,7 @@ import { Nonce } from "./primitives";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
-import { TransactionOnNetwork } from "./transactions";
+import { TransactionOnNetwork, prepareTransactionNextForBroadcasting } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
@@ -119,16 +119,22 @@ export class ApiNetworkProvider implements INetworkProvider {
         return status;
     }
 
-    async sendTransaction(tx: ITransaction): Promise<string> {
-        let response = await this.doPostGeneric("transactions", tx.toSendable());
+    async sendTransaction(tx: ITransaction | ITransactionNext): Promise<string> {
+        if ("toSendable" in tx){
+            const response = await this.doPostGeneric("transactions", tx.toSendable());
+            return response.txHash;
+        }
+
+        const transaction = prepareTransactionNextForBroadcasting(tx);
+        const response = await this.doPostGeneric("transactions", transaction);
         return response.txHash;
     }
 
-    async sendTransactions(txs: ITransaction[]): Promise<string[]> {
+    async sendTransactions(txs: ITransaction[] | ITransactionNext[]): Promise<string[]> {
         return await this.backingProxyNetworkProvider.sendTransactions(txs);
     }
 
-    async simulateTransaction(tx: ITransaction): Promise<any> {
+    async simulateTransaction(tx: ITransaction | ITransactionNext): Promise<any> {
         return await this.backingProxyNetworkProvider.simulateTransaction(tx);
     }
 
diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index fa15abf2f..1d2d45fc2 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -71,7 +71,7 @@ export interface INetworkProvider {
     /**
      * Broadcasts an already-signed transaction.
      */
-    sendTransaction(tx: ITransaction): Promise<string>;
+    sendTransaction(tx: ITransaction | ITransactionNext): Promise<string>;
 
     /**
      * Broadcasts a list of already-signed transactions.
@@ -133,3 +133,21 @@ export interface ITransaction {
 }
 
 export interface IAddress { bech32(): string; }
+
+export interface ITransactionNext {
+    sender: string;
+    receiver: string;
+    gasLimit: bigint;
+    chainID: string;
+    nonce: bigint;
+    value: bigint;
+    senderUsername: string;
+    receiverUsername: string;
+    gasPrice: bigint;
+    data: Uint8Array;
+    version: number;
+    options: number;
+    guardian: string;
+    signature: Uint8Array;
+    guardianSignature: Uint8Array;
+  }
diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 8ff2f6eae..3b2242e6e 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -1,6 +1,6 @@
 import { assert } from "chai";
 import { ApiNetworkProvider } from "./apiNetworkProvider";
-import { INetworkProvider } from "./interface";
+import { INetworkProvider, ITransactionNext } from "./interface";
 import { Address } from "./primitives";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { MockQuery } from "./testscommon/dummyQuery";
@@ -315,5 +315,51 @@ describe("test network providers on devnet: Proxy and API", function () {
         assert.deepEqual(apiResponse.logs.events[0].additionalData, [TransactionEventData.fromBase64("dGVzdA==")]);
         assert.deepEqual(proxyResponse.logs.events[0].additionalData, [TransactionEventData.fromBase64("dGVzdA==")]);
     });
-});
 
+    it.only("should send both `Transaction` and `TransactionNext`", async function () {
+        this.timeout(50000);
+
+        const transaction = {
+            toSendable: function () {
+                return {
+                    "nonce": 7,
+                    "value": "0",
+                    "receiver": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+                    "sender": "erd1zztjf9fhwvuvquzsllknq4qcmffwad6n0hjtn5dyzytr5tgz7uas0mkgrq",
+                    "gasPrice": 1000000000,
+                    "gasLimit": 50000,
+                    "chainID": "D",
+                    "version": 2,
+                    "signature": "149f1d8296efcb9489c5b3142ae659aacfa3a7daef3645f1d3747a96dc9cee377070dd8b83b322997c15ba3c305ac18daaee0fd25760eba334b14a9272b34802"
+                }
+            }
+        }
+
+        const transactionNext: ITransactionNext = {
+            nonce: BigInt(8),
+            value: BigInt(0),
+            receiver: "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+            sender: "erd1zztjf9fhwvuvquzsllknq4qcmffwad6n0hjtn5dyzytr5tgz7uas0mkgrq",
+            data: new Uint8Array(Buffer.from("test")),
+            gasPrice: BigInt(1000000000),
+            gasLimit: BigInt(80000),
+            chainID: "D",
+            version: 2,
+            signature: new Uint8Array(Buffer.from("3fa42d97b4f85442850340a11411a3cbd63885e06ff3f84c7a75d0ef59c780f7a18aa4f331cf460300bc8bd99352aea10b7c3bc17e40287337ae9f9842470205", "hex")),
+            senderUsername: "",
+            receiverUsername: "",
+            guardian: "",
+            guardianSignature: new Uint8Array(),
+            options: 0
+        }
+
+        const apiLegacyTxHash = await apiProvider.sendTransaction(transaction);
+        const apiTxNextHash = await apiProvider.sendTransaction(transactionNext);
+
+        const proxyLegacyTxHash = await apiProvider.sendTransaction(transaction);
+        const proxyTxNextHash = await apiProvider.sendTransaction(transactionNext);
+
+        assert.equal(apiLegacyTxHash, proxyLegacyTxHash);
+        assert.equal(apiTxNextHash, proxyTxNextHash);
+    });
+});
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index 995f7ac41..653ea4e6a 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -5,14 +5,14 @@ import { EsdtContractAddress } from "./constants";
 import { ContractQueryRequest } from "./contractQueryRequest";
 import { ContractQueryResponse } from "./contractQueryResponse";
 import { ErrContractQuery, ErrNetworkProvider } from "./errors";
-import { IAddress, IContractQuery, INetworkProvider, IPagination, ITransaction } from "./interface";
+import { IAddress, IContractQuery, INetworkProvider, IPagination, ITransaction, ITransactionNext } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkGeneralStatistics } from "./networkGeneralStatistics";
 import { NetworkStake } from "./networkStake";
 import { NetworkStatus } from "./networkStatus";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
-import { TransactionOnNetwork } from "./transactions";
+import { TransactionOnNetwork, prepareTransactionNextForBroadcasting } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
@@ -122,13 +122,25 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return status;
     }
 
-    async sendTransaction(tx: ITransaction): Promise<string> {
-        let response = await this.doPostGeneric("transaction/send", tx.toSendable());
+    async sendTransaction(tx: ITransaction | ITransactionNext): Promise<string> {
+        if ("toSendable" in tx){
+            const response = await this.doPostGeneric("transactions", tx.toSendable());
+            return response.txHash;
+        }
+
+        const transaction = prepareTransactionNextForBroadcasting(tx);
+        const response = await this.doPostGeneric("transactions", transaction);
         return response.txHash;
     }
 
-    async sendTransactions(txs: ITransaction[]): Promise<string[]> {
-        const data: any = txs.map(tx => tx.toSendable());
+    async sendTransactions(txs: ITransaction[] | ITransactionNext[]): Promise<string[]> {
+        let data: any[];
+        if ("toSendable" in txs[0]){
+            data = (txs as ITransaction[]).map(tx => tx.toSendable());
+        } else {
+            data = (txs as ITransactionNext[]).map(tx => prepareTransactionNextForBroadcasting(tx));
+        }
+
         const response = await this.doPostGeneric("transaction/send-multiple", data);
         const hashes = Array(txs.length).fill(null);
 
@@ -139,8 +151,14 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return hashes;
     }
 
-    async simulateTransaction(tx: ITransaction): Promise<any> {
-        let response = await this.doPostGeneric("transaction/simulate", tx.toSendable());
+    async simulateTransaction(tx: ITransaction | ITransactionNext): Promise<any> {
+        if ("toSendable" in tx){
+            const response = await this.doPostGeneric("transaction/simulate", tx.toSendable());
+            return response;
+        }
+        
+        const transaction = prepareTransactionNextForBroadcasting(tx);
+        const response = await this.doPostGeneric("transaction/simulate", transaction);
         return response;
     }
 
diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
index 18fcd1d4f..941bb9d0b 100644
--- a/src-network-providers/transactions.ts
+++ b/src-network-providers/transactions.ts
@@ -1,10 +1,30 @@
 import { TransactionStatus } from "./transactionStatus";
 import { ContractResults } from "./contractResults";
 import { Address } from "./primitives";
-import { IAddress } from "./interface";
+import { IAddress, ITransactionNext } from "./interface";
 import { TransactionLogs } from "./transactionLogs";
 import { TransactionReceipt } from "./transactionReceipt";
 
+export function prepareTransactionNextForBroadcasting(transaction: ITransactionNext): any {
+    return {
+        nonce: Number(transaction.nonce),
+        value: transaction.value.toString(),
+        receiver: transaction.receiver,
+        sender: transaction.sender,
+        senderUsername: transaction.senderUsername ? Buffer.from(transaction.senderUsername).toString("base64") : undefined,
+        receiverUsername: transaction.receiverUsername ? Buffer.from(transaction.receiverUsername).toString("base64") : undefined,
+        gasPrice: Number(transaction.gasPrice),
+        gasLimit: Number(transaction.gasLimit),
+        data: transaction.data.length === 0 ? undefined : Buffer.from(transaction.data).toString("base64"),
+        chainID: transaction.chainID,
+        version: transaction.version,
+        options: transaction.options,
+        guardian: transaction.guardian || undefined,
+        signature: Buffer.from(transaction.signature).toString("hex"),
+        guardianSignature: transaction.guardianSignature.length === 0 ? undefined : Buffer.from(transaction.guardianSignature).toString("hex"),
+    }
+}
+
 export class TransactionOnNetwork {
     isCompleted?: boolean;
     hash: string = "";

From ab6f64a1d9ac0f06ddbd6b3b897ae2880d290cac Mon Sep 17 00:00:00 2001
From: Alexandru Popenta <alexandru.p9913@gmail.com>
Date: Mon, 19 Feb 2024 13:32:38 +0200
Subject: [PATCH 206/338] fixes after review

---
 src-network-providers/apiNetworkProvider.ts   | 11 +++-----
 src-network-providers/errors.ts               |  1 -
 src-network-providers/interface.ts            |  2 +-
 .../providers.dev.net.spec.ts                 |  8 +++---
 src-network-providers/proxyNetworkProvider.ts | 27 +++++--------------
 src-network-providers/transactions.ts         |  8 ++++--
 6 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 88ed0bbcc..086980c41 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -14,7 +14,7 @@ import { Nonce } from "./primitives";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
-import { TransactionOnNetwork, prepareTransactionNextForBroadcasting } from "./transactions";
+import { TransactionOnNetwork, prepareTransactionForBroadcasting } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
@@ -120,17 +120,12 @@ export class ApiNetworkProvider implements INetworkProvider {
     }
 
     async sendTransaction(tx: ITransaction | ITransactionNext): Promise<string> {
-        if ("toSendable" in tx){
-            const response = await this.doPostGeneric("transactions", tx.toSendable());
-            return response.txHash;
-        }
-
-        const transaction = prepareTransactionNextForBroadcasting(tx);
+        const transaction = prepareTransactionForBroadcasting(tx);
         const response = await this.doPostGeneric("transactions", transaction);
         return response.txHash;
     }
 
-    async sendTransactions(txs: ITransaction[] | ITransactionNext[]): Promise<string[]> {
+    async sendTransactions(txs: (ITransaction | ITransactionNext)[]): Promise<string[]> {
         return await this.backingProxyNetworkProvider.sendTransactions(txs);
     }
 
diff --git a/src-network-providers/errors.ts b/src-network-providers/errors.ts
index 73882ecdb..6b297bfd1 100644
--- a/src-network-providers/errors.ts
+++ b/src-network-providers/errors.ts
@@ -29,7 +29,6 @@ export class ErrNetworkProvider extends Err {
     }
 }
 
-
 /**
  * Signals a generic error in the context of querying Smart Contracts.
  */
diff --git a/src-network-providers/interface.ts b/src-network-providers/interface.ts
index 1d2d45fc2..144f05834 100644
--- a/src-network-providers/interface.ts
+++ b/src-network-providers/interface.ts
@@ -76,7 +76,7 @@ export interface INetworkProvider {
     /**
      * Broadcasts a list of already-signed transactions.
      */
-    sendTransactions(txs: ITransaction[]): Promise<string[]>;
+    sendTransactions(txs: (ITransaction | ITransactionNext)[]): Promise<string[]>;
 
     /**
      * Simulates the processing of an already-signed transaction.
diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 3b2242e6e..690b80742 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -316,7 +316,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         assert.deepEqual(proxyResponse.logs.events[0].additionalData, [TransactionEventData.fromBase64("dGVzdA==")]);
     });
 
-    it.only("should send both `Transaction` and `TransactionNext`", async function () {
+    it("should send both `Transaction` and `TransactionNext`", async function () {
         this.timeout(50000);
 
         const transaction = {
@@ -345,7 +345,7 @@ describe("test network providers on devnet: Proxy and API", function () {
             gasLimit: BigInt(80000),
             chainID: "D",
             version: 2,
-            signature: new Uint8Array(Buffer.from("3fa42d97b4f85442850340a11411a3cbd63885e06ff3f84c7a75d0ef59c780f7a18aa4f331cf460300bc8bd99352aea10b7c3bc17e40287337ae9f9842470205", "hex")),
+            signature: Buffer.from("3fa42d97b4f85442850340a11411a3cbd63885e06ff3f84c7a75d0ef59c780f7a18aa4f331cf460300bc8bd99352aea10b7c3bc17e40287337ae9f9842470205", "hex"),
             senderUsername: "",
             receiverUsername: "",
             guardian: "",
@@ -356,8 +356,8 @@ describe("test network providers on devnet: Proxy and API", function () {
         const apiLegacyTxHash = await apiProvider.sendTransaction(transaction);
         const apiTxNextHash = await apiProvider.sendTransaction(transactionNext);
 
-        const proxyLegacyTxHash = await apiProvider.sendTransaction(transaction);
-        const proxyTxNextHash = await apiProvider.sendTransaction(transactionNext);
+        const proxyLegacyTxHash = await proxyProvider.sendTransaction(transaction);
+        const proxyTxNextHash = await proxyProvider.sendTransaction(transactionNext);
 
         assert.equal(apiLegacyTxHash, proxyLegacyTxHash);
         assert.equal(apiTxNextHash, proxyTxNextHash);
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index 653ea4e6a..a3d8d2d1c 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -12,7 +12,7 @@ import { NetworkStake } from "./networkStake";
 import { NetworkStatus } from "./networkStatus";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
-import { TransactionOnNetwork, prepareTransactionNextForBroadcasting } from "./transactions";
+import { TransactionOnNetwork, prepareTransactionForBroadcasting } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
@@ -123,23 +123,13 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     async sendTransaction(tx: ITransaction | ITransactionNext): Promise<string> {
-        if ("toSendable" in tx){
-            const response = await this.doPostGeneric("transactions", tx.toSendable());
-            return response.txHash;
-        }
-
-        const transaction = prepareTransactionNextForBroadcasting(tx);
-        const response = await this.doPostGeneric("transactions", transaction);
+        const transaction = prepareTransactionForBroadcasting(tx);
+        const response = await this.doPostGeneric("transaction/send", transaction);
         return response.txHash;
     }
 
-    async sendTransactions(txs: ITransaction[] | ITransactionNext[]): Promise<string[]> {
-        let data: any[];
-        if ("toSendable" in txs[0]){
-            data = (txs as ITransaction[]).map(tx => tx.toSendable());
-        } else {
-            data = (txs as ITransactionNext[]).map(tx => prepareTransactionNextForBroadcasting(tx));
-        }
+    async sendTransactions(txs: (ITransaction | ITransactionNext)[]): Promise<string[]> {
+        const data = (txs).map((tx) => prepareTransactionForBroadcasting(tx));
 
         const response = await this.doPostGeneric("transaction/send-multiple", data);
         const hashes = Array(txs.length).fill(null);
@@ -152,12 +142,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     async simulateTransaction(tx: ITransaction | ITransactionNext): Promise<any> {
-        if ("toSendable" in tx){
-            const response = await this.doPostGeneric("transaction/simulate", tx.toSendable());
-            return response;
-        }
-        
-        const transaction = prepareTransactionNextForBroadcasting(tx);
+        const transaction = prepareTransactionForBroadcasting(tx);
         const response = await this.doPostGeneric("transaction/simulate", transaction);
         return response;
     }
diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
index 941bb9d0b..0db59e8f4 100644
--- a/src-network-providers/transactions.ts
+++ b/src-network-providers/transactions.ts
@@ -1,11 +1,15 @@
 import { TransactionStatus } from "./transactionStatus";
 import { ContractResults } from "./contractResults";
 import { Address } from "./primitives";
-import { IAddress, ITransactionNext } from "./interface";
+import { IAddress, ITransaction, ITransactionNext } from "./interface";
 import { TransactionLogs } from "./transactionLogs";
 import { TransactionReceipt } from "./transactionReceipt";
 
-export function prepareTransactionNextForBroadcasting(transaction: ITransactionNext): any {
+export function prepareTransactionForBroadcasting(transaction: ITransaction | ITransactionNext): any {
+    if ("toSendable" in transaction){
+        return transaction.toSendable();
+    }
+
     return {
         nonce: Number(transaction.nonce),
         value: transaction.value.toString(),

From fc9cd7e3ed09b16bccc07547a9ddbc06442a31c5 Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Thu, 14 Mar 2024 17:50:15 +0200
Subject: [PATCH 207/338] Add TransactionOnNetwork.function.

---
 src-network-providers/transactions.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src-network-providers/transactions.ts b/src-network-providers/transactions.ts
index 0db59e8f4..beaecc0a8 100644
--- a/src-network-providers/transactions.ts
+++ b/src-network-providers/transactions.ts
@@ -41,6 +41,7 @@ export class TransactionOnNetwork {
     sender: IAddress = new Address("");
     gasLimit: number = 0;
     gasPrice: number = 0;
+    function: string = "";
     data: Buffer = Buffer.from([]);
     signature: string = "";
     status: TransactionStatus = TransactionStatus.createUnknown();
@@ -90,6 +91,7 @@ export class TransactionOnNetwork {
         result.receiver = new Address(response.receiver);
         result.gasPrice = response.gasPrice || 0;
         result.gasLimit = response.gasLimit || 0;
+        result.function = response.function || "";
         result.data = Buffer.from(response.data || "", "base64");
         result.status = new TransactionStatus(response.status);
         result.timestamp = response.timestamp || 0;

From da9293537436abf5f903cdedb19c85d9a3bf133d Mon Sep 17 00:00:00 2001
From: Andrei Bancioiu <andrei.bancioiu@gmail.com>
Date: Wed, 20 Mar 2024 22:52:43 +0200
Subject: [PATCH 208/338] Ignore some differences.

---
 src-network-providers/providers.dev.net.spec.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 690b80742..e6ad6155e 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -178,7 +178,7 @@ describe("test network providers on devnet: Proxy and API", function () {
             let apiResponse = await apiProvider.getTransaction(hash);
             let proxyResponse = await proxyProvider.getTransaction(hash, true);
 
-            ignoreKnownTransactionDifferencesBetweenProviders(proxyResponse);
+            ignoreKnownTransactionDifferencesBetweenProviders(apiResponse, proxyResponse);
             assert.deepEqual(apiResponse, proxyResponse, `transaction: ${hash}`);
 
             // Also assert completion
@@ -188,7 +188,10 @@ describe("test network providers on devnet: Proxy and API", function () {
     });
 
     // TODO: Strive to have as little differences as possible between Proxy and API.
-    function ignoreKnownTransactionDifferencesBetweenProviders(proxyResponse: TransactionOnNetwork) {
+    function ignoreKnownTransactionDifferencesBetweenProviders(apiResponse: TransactionOnNetwork, proxyResponse: TransactionOnNetwork) {
+        // Proxy and API exhibit differences in the "function" field, in case of move-balance transactions.
+        apiResponse.function = proxyResponse.function
+
         // Ignore fields which are not present on API response:
         proxyResponse.type = "";
         proxyResponse.epoch = 0;

From f27408dfd0204f1b799cb0228c77a88a8ae2e4cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Thu, 21 Mar 2024 12:38:08 +0200
Subject: [PATCH 209/338] Accept "Uint8Array", in addition to "Buffer" on the
 main flows.

---
 src-wallet/signature.ts       |  4 ++--
 src-wallet/userKeys.ts        |  4 ++--
 src-wallet/userSigner.ts      |  4 ++--
 src-wallet/userVerifier.ts    |  2 +-
 src-wallet/users.spec.ts      | 19 +++++++++++++++----
 src-wallet/validatorKeys.ts   |  8 ++++----
 src-wallet/validatorSigner.ts |  2 +-
 src-wallet/validators.spec.ts | 12 ++++++++++--
 8 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src-wallet/signature.ts b/src-wallet/signature.ts
index ec10ea536..a99620ed3 100644
--- a/src-wallet/signature.ts
+++ b/src-wallet/signature.ts
@@ -4,8 +4,8 @@
 export class Signature {
     private readonly buffer: Buffer;
 
-    constructor(buffer: Buffer) {
-        this.buffer = buffer;
+    constructor(buffer: Buffer | Uint8Array) {
+        this.buffer = Buffer.from(buffer);
     }
 
     hex() {
diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index ba1177772..52aabf3e5 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -36,7 +36,7 @@ export class UserSecretKey {
         return new UserPublicKey(buffer);
     }
 
-    sign(message: Buffer): Buffer {
+    sign(message: Buffer | Uint8Array): Buffer {
         const signature = ed.sync.sign(new Uint8Array(message), new Uint8Array(this.buffer));
         return Buffer.from(signature);
     }
@@ -59,7 +59,7 @@ export class UserPublicKey {
         this.buffer = Buffer.from(buffer);
     }
 
-    verify(data: Buffer, signature: Buffer): boolean {
+    verify(data: Buffer | Uint8Array, signature: Buffer | Uint8Array): boolean {
         try {
             const ok = ed.sync.verify(new Uint8Array(signature), new Uint8Array(data), new Uint8Array(this.buffer));
             return ok;
diff --git a/src-wallet/userSigner.ts b/src-wallet/userSigner.ts
index 7dfb52811..a66a0b57f 100644
--- a/src-wallet/userSigner.ts
+++ b/src-wallet/userSigner.ts
@@ -4,7 +4,7 @@ import { UserSecretKey } from "./userKeys";
 import { UserWallet } from "./userWallet";
 
 interface IUserSecretKey {
-    sign(message: Buffer): Buffer;
+    sign(message: Buffer | Uint8Array): Buffer;
     generatePublicKey(): IUserPublicKey;
 }
 
@@ -33,7 +33,7 @@ export class UserSigner {
         return new UserSigner(secretKey);
     }
 
-    async sign(data: Buffer): Promise<Buffer> {
+    async sign(data: Buffer | Uint8Array): Promise<Buffer> {
         try {
             const signature = this.secretKey.sign(data);
             return signature;
diff --git a/src-wallet/userVerifier.ts b/src-wallet/userVerifier.ts
index f9ff7cdeb..ca56585a0 100644
--- a/src-wallet/userVerifier.ts
+++ b/src-wallet/userVerifier.ts
@@ -25,7 +25,7 @@ export class UserVerifier {
    * @param signature the signature to be verified
    * @returns true if the signature is valid, false otherwise
    */
-  verify(data: Buffer, signature: Buffer): boolean {
+  verify(data: Buffer | Uint8Array, signature: Buffer | Uint8Array): boolean {
     return this.publicKey.verify(data, signature);
   }
 }
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 43cd1b464..6b2577ac1 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -43,11 +43,13 @@ describe("test user wallets", () => {
     });
 
     it("should create secret key", () => {
-        let keyHex = alice.secretKeyHex;
-        let fromBuffer = new UserSecretKey(Buffer.from(keyHex, "hex"));
-        let fromHex = UserSecretKey.fromString(keyHex);
+        const keyHex = alice.secretKeyHex;
+        const fromBuffer = new UserSecretKey(Buffer.from(keyHex, "hex"));
+        const fromArray = new UserSecretKey(Uint8Array.from(Buffer.from(keyHex, "hex")));
+        const fromHex = UserSecretKey.fromString(keyHex);
 
         assert.equal(fromBuffer.hex(), keyHex);
+        assert.equal(fromArray.hex(), keyHex);
         assert.equal(fromHex.hex(), keyHex);
     });
 
@@ -217,9 +219,11 @@ describe("test user wallets", () => {
         let serialized = transaction.serializeForSigning();
         let signature = await signer.sign(serialized);
 
+        assert.deepEqual(await signer.sign(serialized), await signer.sign(Uint8Array.from(serialized)));
         assert.equal(serialized.toString(), `{"nonce":0,"value":"0","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1}`);
         assert.equal(signature.toString("hex"), "a3b61a2fe461f3393c42e6cb0477a6b52ffd92168f10c111f6aa8d0a310ee0c314fae0670f8313f1ad992933ac637c61a8ff20cc20b6a8b2260a4af1a120a70d");
         assert.isTrue(verifier.verify(serialized, signature));
+        
         // Without data field
         transaction = new TestTransaction({
             nonce: 8,
@@ -233,6 +237,7 @@ describe("test user wallets", () => {
         serialized = transaction.serializeForSigning();
         signature = await signer.sign(serialized);
 
+        assert.deepEqual(await signer.sign(serialized), await signer.sign(Uint8Array.from(serialized)));
         assert.equal(serialized.toString(), `{"nonce":8,"value":"10000000000000000000","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","version":1}`);
         assert.equal(signature.toString("hex"), "f136c901d37349a7da8cfe3ab5ec8ef333b0bc351517c0e9bef9eb9704aed3077bf222769cade5ff29dffe5f42e4f0c5e0b068bdba90cd2cb41da51fd45d5a03");
     });
@@ -304,7 +309,10 @@ describe("test user wallets", () => {
             chainID: "1"
         });
 
-        const signature = await signer.sign(transaction.serializeForSigning());
+        const serialized = transaction.serializeForSigning();
+        const signature = await signer.sign(serialized);
+
+        assert.deepEqual(await signer.sign(serialized), await signer.sign(Uint8Array.from(serialized)));
         assert.equal(signature.toString("hex"), "ba4fa95fea1402e4876abf1d5a510615aab374ee48bb76f5230798a7d3f2fcae6ba91ba56c6d62e6e7003ce531ff02f219cb7218dd00dd2ca650ba747f19640a");
     });
 
@@ -320,8 +328,11 @@ describe("test user wallets", () => {
         const data = message.serializeForSigning();
         const signature = await signer.sign(data);
 
+        assert.deepEqual(await signer.sign(data), await signer.sign(Uint8Array.from(data)));
         assert.isTrue(verifier.verify(data, signature));
+        assert.isTrue(verifier.verify(Uint8Array.from(data), Uint8Array.from(signature)));
         assert.isFalse(verifier.verify(Buffer.from("hello"), signature));
+        assert.isFalse(verifier.verify(new TextEncoder().encode("hello"), signature));
     });
 
     it("should create UserSigner from wallet", async function () {
diff --git a/src-wallet/validatorKeys.ts b/src-wallet/validatorKeys.ts
index bd77ae2f9..3c3497622 100644
--- a/src-wallet/validatorKeys.ts
+++ b/src-wallet/validatorKeys.ts
@@ -31,7 +31,7 @@ export class ValidatorSecretKey {
     private readonly secretKey: any;
     private readonly publicKey: any;
 
-    constructor(buffer: Buffer) {
+    constructor(buffer: Buffer | Uint8Array) {
         BLS.guardInitialized();
         guardLength(buffer, VALIDATOR_SECRETKEY_LENGTH);
 
@@ -49,7 +49,7 @@ export class ValidatorSecretKey {
         return new ValidatorPublicKey(buffer);
     }
 
-    sign(message: Buffer): Buffer {
+    sign(message: Buffer | Uint8Array): Buffer {
         let signatureObject = this.secretKey.sign(message);
         let signature = Buffer.from(signatureObject.serialize());
         return signature;
@@ -67,10 +67,10 @@ export class ValidatorSecretKey {
 export class ValidatorPublicKey {
     private readonly buffer: Buffer;
 
-    constructor(buffer: Buffer) {
+    constructor(buffer: Buffer | Uint8Array) {
         guardLength(buffer, VALIDATOR_PUBKEY_LENGTH);
 
-        this.buffer = buffer;
+        this.buffer = Buffer.from(buffer);
     }
 
     hex(): string {
diff --git a/src-wallet/validatorSigner.ts b/src-wallet/validatorSigner.ts
index 92e4e2249..8c0c028f8 100644
--- a/src-wallet/validatorSigner.ts
+++ b/src-wallet/validatorSigner.ts
@@ -8,7 +8,7 @@ export class ValidatorSigner {
     /**
      * Signs a message.
      */
-    async signUsingPem(pemText: string, pemIndex: number = 0, signable: Buffer): Promise<void> {
+    async signUsingPem(pemText: string, pemIndex: number = 0, signable: Buffer | Uint8Array): Promise<void> {
         await BLS.initIfNecessary();
 
         try {
diff --git a/src-wallet/validators.spec.ts b/src-wallet/validators.spec.ts
index dee84cf8f..5a01b7a45 100644
--- a/src-wallet/validators.spec.ts
+++ b/src-wallet/validators.spec.ts
@@ -8,16 +8,24 @@ describe("test validator keys", () => {
 
         let secretKey = Buffer.from(Buffer.from("N2NmZjk5YmQ2NzE1MDJkYjdkMTViYzhhYmMwYzlhODA0ZmI5MjU0MDZmYmRkNTBmMWU0YzE3YTRjZDc3NDI0Nw==", "base64").toString(), "hex");
         let key = new ValidatorSecretKey(secretKey);
+        
+        assert.deepEqual(new ValidatorSecretKey(secretKey), new ValidatorSecretKey(Uint8Array.from(secretKey)));
         assert.equal(key.generatePublicKey().hex(), "e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208");
 
-        let signature = key.sign(Buffer.from("hello"));
+        const data = Buffer.from("hello");
+
+        let signature = key.sign(data);
+
+        assert.deepEqual(key.sign(data), key.sign(Uint8Array.from(data)));
         assert.equal(signature.toString("hex"), "84fd0a3a9d4f1ea2d4b40c6da67f9b786284a1c3895b7253fec7311597cda3f757862bb0690a92a13ce612c33889fd86");
 
         secretKey = Buffer.from(Buffer.from("ODA4NWJhMWQ3ZjdjM2RiOTM4YWQ3MDU5NWEyYmRhYjA5NjQ0ZjFlYzM4MDNiZTE3MWMzM2YxNGJjODBkNGUzYg==", "base64").toString(), "hex");
         key = new ValidatorSecretKey(secretKey);
         assert.equal(key.generatePublicKey().hex(), "78689fd4b1e2e434d567fe01e61598a42717d83124308266bd09ccc15d2339dd318c019914b86ac29adbae5dd8a02d0307425e9bd85a296e94943708c72f8c670f0b7c50a890a5719088dbd9f1d062cad9acffa06df834106eebe1a4257ef00d");
 
-        signature = key.sign(Buffer.from("hello"));
+        signature = key.sign(data);
+
+        assert.deepEqual(key.sign(data), key.sign(Uint8Array.from(data)));
         assert.equal(signature.toString("hex"), "be2e593ff10899a2ee8e1d5c8094e36c9f48e04b87e129991ff09475808743e07bb41bf6e7bc1463fa554c4b46594b98");
     });
 

From 445bd03716e6eb2876b4a9f1ccb4a5a733120abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Fri, 22 Mar 2024 14:22:55 +0200
Subject: [PATCH 210/338] Export "TransactionEventData".

---
 src-network-providers/index.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src-network-providers/index.ts b/src-network-providers/index.ts
index 5f578c85e..804b15b66 100644
--- a/src-network-providers/index.ts
+++ b/src-network-providers/index.ts
@@ -1,19 +1,20 @@
-export { ProxyNetworkProvider } from "./proxyNetworkProvider";
 export { ApiNetworkProvider } from "./apiNetworkProvider";
+export { ProxyNetworkProvider } from "./proxyNetworkProvider";
 
 export { AccountOnNetwork } from "./accounts";
-export { TransactionOnNetwork } from "./transactions";
-export { TransactionEvent, TransactionEventTopic } from "./transactionEvents";
+export { ContractQueryResponse } from "./contractQueryResponse";
+export { ContractResultItem, ContractResults } from "./contractResults";
+export { TransactionEvent, TransactionEventData, TransactionEventTopic } from "./transactionEvents";
 export { TransactionLogs } from "./transactionLogs";
 export { TransactionReceipt } from "./transactionReceipt";
 export { TransactionStatus } from "./transactionStatus";
-export { ContractQueryResponse } from "./contractQueryResponse";
-export { ContractResults, ContractResultItem } from "./contractResults";
+export { TransactionOnNetwork } from "./transactions";
 
-export { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 export { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
+export { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 
 export { NetworkConfig } from "./networkConfig";
 export { NetworkGeneralStatistics } from "./networkGeneralStatistics";
 export { NetworkStake } from "./networkStake";
 export { NetworkStatus } from "./networkStatus";
+

From cac0eee01f96726bcbf30a26c907f0b4a58cf284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 14 May 2024 16:02:19 +0300
Subject: [PATCH 211/338] Sketch support for custom HRP.

---
 src-wallet/userAddress.ts | 21 +++++++++++++++------
 src-wallet/userKeys.ts    |  4 ++--
 src-wallet/userSigner.ts  |  7 +++----
 src-wallet/userWallet.ts  |  8 ++++----
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src-wallet/userAddress.ts b/src-wallet/userAddress.ts
index 3ed7efe8f..56c879c0c 100644
--- a/src-wallet/userAddress.ts
+++ b/src-wallet/userAddress.ts
@@ -4,16 +4,18 @@ import { ErrBadAddress } from "./errors";
 /**
  * The human-readable-part of the bech32 addresses.
  */
-const HRP = "erd";
+const DEFAULT_HRP = "erd";
 
 /**
  * A user Address, as an immutable object.
  */
 export class UserAddress {
     private readonly buffer: Buffer;
+    private readonly hrp: string;
 
-    public constructor(buffer: Buffer) {
+    public constructor(buffer: Buffer, hrp?: string) {
         this.buffer = buffer;
+        this.hrp = hrp || DEFAULT_HRP;
     }
 
     static fromBech32(value: string): UserAddress {
@@ -25,12 +27,12 @@ export class UserAddress {
             throw new ErrBadAddress(value, err);
         }
 
-        if (decoded.prefix != HRP) {
+        if (decoded.prefix != DEFAULT_HRP) {
             throw new ErrBadAddress(value);
         }
 
         let pubkey = Buffer.from(bech32.fromWords(decoded.words));
-        return new UserAddress(pubkey);
+        return new UserAddress(pubkey, decoded.prefix);
     }
 
     /**
@@ -44,8 +46,8 @@ export class UserAddress {
      * Returns the bech32 representation of the address
      */
     bech32(): string {
-        let words = bech32.toWords(this.pubkey());
-        let address = bech32.encode(HRP, words);
+        const words = bech32.toWords(this.pubkey());
+        const address = bech32.encode(this.hrp, words);
         return address;
     }
 
@@ -56,6 +58,13 @@ export class UserAddress {
         return this.buffer;
     }
 
+    /**
+     * Returns the human-readable-part of the bech32 addresses.
+     */
+    getHrp(): string {
+        return this.hrp;
+    }
+
     /**
      * Returns the bech32 representation of the address
      */
diff --git a/src-wallet/userKeys.ts b/src-wallet/userKeys.ts
index 52aabf3e5..6acb76f00 100644
--- a/src-wallet/userKeys.ts
+++ b/src-wallet/userKeys.ts
@@ -73,8 +73,8 @@ export class UserPublicKey {
         return this.buffer.toString("hex");
     }
 
-    toAddress(): UserAddress {
-        return new UserAddress(this.buffer);
+    toAddress(hrp?: string): UserAddress {
+        return new UserAddress(this.buffer, hrp);
     }
 
     valueOf(): Buffer {
diff --git a/src-wallet/userSigner.ts b/src-wallet/userSigner.ts
index a66a0b57f..ff5bb642f 100644
--- a/src-wallet/userSigner.ts
+++ b/src-wallet/userSigner.ts
@@ -9,10 +9,9 @@ interface IUserSecretKey {
 }
 
 interface IUserPublicKey {
-    toAddress(): { bech32(): string; };
+    toAddress(hrp?: string): { bech32(): string; };
 }
 
-
 /**
  * ed25519 signer
  */
@@ -45,8 +44,8 @@ export class UserSigner {
     /**
      * Gets the address of the signer.
      */
-    getAddress(): UserAddress {
-        const bech32 = this.secretKey.generatePublicKey().toAddress().bech32();
+    getAddress(hrp?: string): UserAddress {
+        const bech32 = this.secretKey.generatePublicKey().toAddress(hrp).bech32();
         return UserAddress.fromBech32(bech32);
     }
 }
diff --git a/src-wallet/userWallet.ts b/src-wallet/userWallet.ts
index 2a0f04480..8c7ff833b 100644
--- a/src-wallet/userWallet.ts
+++ b/src-wallet/userWallet.ts
@@ -146,15 +146,15 @@ export class UserWallet {
     /**
      * Converts the encrypted keyfile to plain JavaScript object.
      */
-    toJSON(): any {
+    toJSON(addressHrp?: string): any {
         if (this.kind == UserWalletKind.SecretKey) {
-            return this.toJSONWhenKindIsSecretKey();
+            return this.toJSONWhenKindIsSecretKey(addressHrp);
         }
 
         return this.toJSONWhenKindIsMnemonic();
     }
 
-    private toJSONWhenKindIsSecretKey(): any {
+    private toJSONWhenKindIsSecretKey(addressHrp?: string): any {
         if (!this.publicKeyWhenKindIsSecretKey) {
             throw new Err("Public key isn't available");
         }
@@ -166,7 +166,7 @@ export class UserWallet {
             kind: this.kind,
             id: this.encryptedData.id,
             address: this.publicKeyWhenKindIsSecretKey.hex(),
-            bech32: this.publicKeyWhenKindIsSecretKey.toAddress().toString(),
+            bech32: this.publicKeyWhenKindIsSecretKey.toAddress(addressHrp).toString(),
             crypto: cryptoSection
         };
 

From 3b4400ee7ce069d93e9a047efaeb455ad328a265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 14 May 2024 16:12:21 +0300
Subject: [PATCH 212/338] Add "newFromBech32", in addition to the legacy
 "fromBech32".

---
 src-wallet/userAddress.ts | 52 ++++++++++++++++++++++++++++-----------
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/src-wallet/userAddress.ts b/src-wallet/userAddress.ts
index 56c879c0c..9db527cc1 100644
--- a/src-wallet/userAddress.ts
+++ b/src-wallet/userAddress.ts
@@ -18,21 +18,21 @@ export class UserAddress {
         this.hrp = hrp || DEFAULT_HRP;
     }
 
-    static fromBech32(value: string): UserAddress {
-        let decoded;
-
-        try {
-            decoded = bech32.decode(value);
-        } catch (err: any) {
-            throw new ErrBadAddress(value, err);
-        }
-
-        if (decoded.prefix != DEFAULT_HRP) {
-            throw new ErrBadAddress(value);
-        }
+    /**
+     * Creates an address object from a bech32-encoded string
+     */
+    static newFromBech32(value: string): UserAddress {
+        const { hrp, pubkey } = decodeFromBech32({ value, allowCustomHrp: true });
+        return new UserAddress(pubkey, hrp);
+    }
 
-        let pubkey = Buffer.from(bech32.fromWords(decoded.words));
-        return new UserAddress(pubkey, decoded.prefix);
+    /**
+     * Use {@link newFromBech32} instead.
+     */
+    static fromBech32(value: string): UserAddress {
+        // On this legacy flow, we do not accept addresses with custom hrp (in order to avoid behavioral breaking changes).
+        const { hrp, pubkey } = decodeFromBech32({ value, allowCustomHrp: false });
+        return new UserAddress(pubkey, hrp);
     }
 
     /**
@@ -82,3 +82,27 @@ export class UserAddress {
         };
     }
 }
+
+function decodeFromBech32(options: { value: string; allowCustomHrp: boolean }): { hrp: string; pubkey: Buffer } {
+    const value = options.value;
+    const allowCustomHrp = options.allowCustomHrp;
+
+    let hrp: string;
+    let pubkey: Buffer;
+
+    try {
+        const decoded = bech32.decode(value);
+
+        hrp = decoded.prefix;
+        pubkey = Buffer.from(bech32.fromWords(decoded.words));
+    } catch (err: any) {
+        throw new ErrBadAddress(value, err);
+    }
+
+    // Workaround, in order to avoid behavioral breaking changes on legacy flows.
+    if (!allowCustomHrp && hrp != DEFAULT_HRP) {
+        throw new ErrBadAddress(value);
+    }
+
+    return { hrp, pubkey };
+}

From ee264ef1a872d6cb64ef9dc0d59891b93c07d4dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 14 May 2024 17:25:22 +0300
Subject: [PATCH 213/338] Undo some changes, add "internal" markers, add some
 tests.

---
 src-wallet/userAddress.ts | 18 +++++-------------
 src-wallet/userSigner.ts  |  2 +-
 src-wallet/users.spec.ts  |  8 ++++++++
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src-wallet/userAddress.ts b/src-wallet/userAddress.ts
index 9db527cc1..ffeb9e962 100644
--- a/src-wallet/userAddress.ts
+++ b/src-wallet/userAddress.ts
@@ -7,7 +7,8 @@ import { ErrBadAddress } from "./errors";
 const DEFAULT_HRP = "erd";
 
 /**
- * A user Address, as an immutable object.
+ * @internal
+ * For internal use only.
  */
 export class UserAddress {
     private readonly buffer: Buffer;
@@ -18,16 +19,14 @@ export class UserAddress {
         this.hrp = hrp || DEFAULT_HRP;
     }
 
-    /**
-     * Creates an address object from a bech32-encoded string
-     */
     static newFromBech32(value: string): UserAddress {
         const { hrp, pubkey } = decodeFromBech32({ value, allowCustomHrp: true });
         return new UserAddress(pubkey, hrp);
     }
 
     /**
-     * Use {@link newFromBech32} instead.
+     * @internal
+     * For internal use only.
      */
     static fromBech32(value: string): UserAddress {
         // On this legacy flow, we do not accept addresses with custom hrp (in order to avoid behavioral breaking changes).
@@ -57,14 +56,7 @@ export class UserAddress {
     pubkey(): Buffer {
         return this.buffer;
     }
-
-    /**
-     * Returns the human-readable-part of the bech32 addresses.
-     */
-    getHrp(): string {
-        return this.hrp;
-    }
-
+    
     /**
      * Returns the bech32 representation of the address
      */
diff --git a/src-wallet/userSigner.ts b/src-wallet/userSigner.ts
index ff5bb642f..b78d5048d 100644
--- a/src-wallet/userSigner.ts
+++ b/src-wallet/userSigner.ts
@@ -46,6 +46,6 @@ export class UserSigner {
      */
     getAddress(hrp?: string): UserAddress {
         const bech32 = this.secretKey.generatePublicKey().toAddress(hrp).bech32();
-        return UserAddress.fromBech32(bech32);
+        return UserAddress.newFromBech32(bech32);
     }
 }
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 6b2577ac1..41a1aa30e 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -40,6 +40,10 @@ describe("test user wallets", () => {
         assert.equal(mnemonic.deriveKey(0).generatePublicKey().toAddress().bech32(), "erd1l8g9dk3gz035gkjhwegsjkqzdu3augrwhcfxrnucnyyrpc2220pqg4g7na");
         assert.equal(mnemonic.deriveKey(1).generatePublicKey().toAddress().bech32(), "erd1fmhwg84rldg0xzngf53m0y607wvefvamh07n2mkypedx27lcqnts4zs09p");
         assert.equal(mnemonic.deriveKey(2).generatePublicKey().toAddress().bech32(), "erd1tyuyemt4xz2yjvc7rxxp8kyfmk2n3h8gv3aavzd9ru4v2vhrkcksptewtj");
+
+        assert.equal(mnemonic.deriveKey(0).generatePublicKey().toAddress("test").bech32(), "test1l8g9dk3gz035gkjhwegsjkqzdu3augrwhcfxrnucnyyrpc2220pqc6tnnf");
+        assert.equal(mnemonic.deriveKey(1).generatePublicKey().toAddress("xerd").bech32(), "xerd1fmhwg84rldg0xzngf53m0y607wvefvamh07n2mkypedx27lcqntsj4adj4");
+        assert.equal(mnemonic.deriveKey(2).generatePublicKey().toAddress("yerd").bech32(), "yerd1tyuyemt4xz2yjvc7rxxp8kyfmk2n3h8gv3aavzd9ru4v2vhrkcksn8p0n5");
     });
 
     it("should create secret key", () => {
@@ -346,6 +350,10 @@ describe("test user wallets", () => {
         assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 0).getAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
         assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 1).getAddress().bech32(), "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx");
         assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 2).getAddress().bech32(), "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
+
+        assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 0).getAddress("test").bech32(), "test1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ss5hqhtr");
+        assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 1).getAddress("xerd").bech32(), "xerd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruq9thc9j");
+        assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 2).getAddress("yerd").bech32(), "yerd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaqgh23pp");
     });
 
     it("should throw error when decrypting secret key with keystore-mnemonic file", async function () {

From 01b9715662274624513d0e0dcd689429faf928a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 14 May 2024 17:27:41 +0300
Subject: [PATCH 214/338] Deprecation notice.

---
 src-wallet/userAddress.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-wallet/userAddress.ts b/src-wallet/userAddress.ts
index ffeb9e962..0c5943937 100644
--- a/src-wallet/userAddress.ts
+++ b/src-wallet/userAddress.ts
@@ -26,7 +26,7 @@ export class UserAddress {
 
     /**
      * @internal
-     * For internal use only.
+     * @deprecated
      */
     static fromBech32(value: string): UserAddress {
         // On this legacy flow, we do not accept addresses with custom hrp (in order to avoid behavioral breaking changes).

From 26ee76a14df2929e11c294ea1d3aee3af016d279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 15 May 2024 14:14:52 +0300
Subject: [PATCH 215/338] Add library config.

---
 src-wallet/config.ts      | 15 +++++++++++++++
 src-wallet/userAddress.ts | 10 +++-------
 2 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 src-wallet/config.ts

diff --git a/src-wallet/config.ts b/src-wallet/config.ts
new file mode 100644
index 000000000..cf60ce5a4
--- /dev/null
+++ b/src-wallet/config.ts
@@ -0,0 +1,15 @@
+/**
+ * Global configuration of the library.
+ *
+ * Generally speaking, this configuration should only be altered on exotic use cases;
+ * it can be seen as a collection of constants (or, to be more precise, rarely changed variables) that are used throughout the library.
+ *
+ * Never alter the configuration within a library!
+ * Only alter the configuration (if needed) within an (end) application that uses this library.
+ */
+export class LibraryConfig {
+    /**
+     * The human-readable-part of the bech32 addresses.
+     */
+    public static DefaultAddressHrp: string = "erd";
+}
diff --git a/src-wallet/userAddress.ts b/src-wallet/userAddress.ts
index 0c5943937..b7a885cf8 100644
--- a/src-wallet/userAddress.ts
+++ b/src-wallet/userAddress.ts
@@ -1,11 +1,7 @@
 import * as bech32 from "bech32";
+import { LibraryConfig } from "./config";
 import { ErrBadAddress } from "./errors";
 
-/**
- * The human-readable-part of the bech32 addresses.
- */
-const DEFAULT_HRP = "erd";
-
 /**
  * @internal
  * For internal use only.
@@ -16,7 +12,7 @@ export class UserAddress {
 
     public constructor(buffer: Buffer, hrp?: string) {
         this.buffer = buffer;
-        this.hrp = hrp || DEFAULT_HRP;
+        this.hrp = hrp || LibraryConfig.DefaultAddressHrp;
     }
 
     static newFromBech32(value: string): UserAddress {
@@ -92,7 +88,7 @@ function decodeFromBech32(options: { value: string; allowCustomHrp: boolean }):
     }
 
     // Workaround, in order to avoid behavioral breaking changes on legacy flows.
-    if (!allowCustomHrp && hrp != DEFAULT_HRP) {
+    if (!allowCustomHrp && hrp != LibraryConfig.DefaultAddressHrp) {
         throw new ErrBadAddress(value);
     }
 

From e08524ed4b501a88b1d0ae347997e473cc605c9d Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 31 Jul 2024 14:44:39 +0300
Subject: [PATCH 216/338] Fix tests and update dependency

---
 .../providers.dev.net.spec.ts                 | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index e6ad6155e..c277159fc 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -193,7 +193,6 @@ describe("test network providers on devnet: Proxy and API", function () {
         apiResponse.function = proxyResponse.function
 
         // Ignore fields which are not present on API response:
-        proxyResponse.type = "";
         proxyResponse.epoch = 0;
         proxyResponse.blockNonce = 0;
         proxyResponse.hyperblockNonce = 0;
@@ -236,21 +235,18 @@ describe("test network providers on devnet: Proxy and API", function () {
         }
     });
 
-    it("should have same response for getDefinitionOfFungibleToken()", async function () {
+    it.only("should have same response for getDefinitionOfFungibleToken()", async function () {
         this.timeout(10000);
 
-        let identifiers = ["BEER-b16c6d", "CHOCOLATE-daf625"];
-
-        for (const identifier of identifiers) {
-            let apiResponse = await apiProvider.getDefinitionOfFungibleToken(identifier);
-            let proxyResponse = await proxyProvider.getDefinitionOfFungibleToken(identifier);
+        let identifier = "CHOCOLATE-daf625";
+        let apiResponse = await apiProvider.getDefinitionOfFungibleToken(identifier);
+        let proxyResponse = await proxyProvider.getDefinitionOfFungibleToken(identifier);
+        // Assets are only present on API responses, thus we ignore them for comparison.
+        apiResponse.assets = {};
 
-            // Assets are only present on API responses, thus we ignore them for comparison.
-            apiResponse.assets = {};
+        assert.equal(apiResponse.identifier, identifier);
+        assert.deepEqual(apiResponse, proxyResponse);
 
-            assert.equal(apiResponse.identifier, identifier);
-            assert.deepEqual(apiResponse, proxyResponse);
-        }
     });
 
     it("should have same response for getDefinitionOfTokenCollection()", async function () {

From 6a09e666b724ddccf784aff58951b8b80a9fdedb Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 31 Jul 2024 14:45:29 +0300
Subject: [PATCH 217/338] Add empty line

---
 src-network-providers/providers.dev.net.spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index c277159fc..579ac9c13 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -239,8 +239,10 @@ describe("test network providers on devnet: Proxy and API", function () {
         this.timeout(10000);
 
         let identifier = "CHOCOLATE-daf625";
+
         let apiResponse = await apiProvider.getDefinitionOfFungibleToken(identifier);
         let proxyResponse = await proxyProvider.getDefinitionOfFungibleToken(identifier);
+
         // Assets are only present on API responses, thus we ignore them for comparison.
         apiResponse.assets = {};
 

From 4ccd63b47ebe3616a3862ff624334fd04564c3ab Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 31 Jul 2024 14:50:04 +0300
Subject: [PATCH 218/338] remove only from tests

---
 src-network-providers/providers.dev.net.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 579ac9c13..f4f4399af 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -235,7 +235,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         }
     });
 
-    it.only("should have same response for getDefinitionOfFungibleToken()", async function () {
+    it("should have same response for getDefinitionOfFungibleToken()", async function () {
         this.timeout(10000);
 
         let identifier = "CHOCOLATE-daf625";

From 1ea1928420528b1ee6f6bd4f9a872cbfd3f2c11d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 20 Aug 2024 11:07:13 +0300
Subject: [PATCH 219/338] Run npm audt fix, update dev dependencies.

---
 package-lock.json | 77 +++++++++++++++++------------------------------
 package.json      |  6 ++--
 2 files changed, 30 insertions(+), 53 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2a8292979..5a42a0970 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.4.0",
+  "version": "13.4.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.4.0",
+      "version": "13.4.1",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
@@ -17,7 +17,7 @@
         "keccak": "3.0.2"
       },
       "devDependencies": {
-        "@multiversx/sdk-network-providers": "2.4.3",
+        "@multiversx/sdk-network-providers": "2.6.0",
         "@multiversx/sdk-wallet": "4.5.0",
         "@types/assert": "1.4.6",
         "@types/chai": "4.2.11",
@@ -26,7 +26,7 @@
         "@typescript-eslint/eslint-plugin": "5.44.0",
         "@typescript-eslint/parser": "5.44.0",
         "assert": "2.0.0",
-        "axios": "1.6.5",
+        "axios": "^1.7.4",
         "browserify": "17.0.0",
         "chai": "4.2.0",
         "eslint": "8.28.0",
@@ -162,27 +162,18 @@
       }
     },
     "node_modules/@multiversx/sdk-network-providers": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/@multiversx/sdk-network-providers/-/sdk-network-providers-2.4.3.tgz",
-      "integrity": "sha512-tJmJuxU+BjtC2q29PuzQOM4Qr6aiXujKwQXgIAPHTiuNbMc3Yi6Q4B0DC1PfI3iG+M4DONwfXknvM1uwqnY2zA==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@multiversx/sdk-network-providers/-/sdk-network-providers-2.6.0.tgz",
+      "integrity": "sha512-fAj7Py3otll00iFunwcDwp7/i7NiHInLN4EhdEFVfKNY5Z+roGI6YwPy3i60l8JApGE6DzmBQ22nVFYv8NzrPA==",
       "dev": true,
       "dependencies": {
-        "axios": "1.6.8",
         "bech32": "1.1.4",
         "bignumber.js": "9.0.1",
         "buffer": "6.0.3",
         "json-bigint": "1.0.0"
-      }
-    },
-    "node_modules/@multiversx/sdk-network-providers/node_modules/axios": {
-      "version": "1.6.8",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
-      "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
-      "dev": true,
-      "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.0",
-        "proxy-from-env": "^1.1.0"
+      },
+      "peerDependencies": {
+        "axios": "^1.7.4"
       }
     },
     "node_modules/@multiversx/sdk-transaction-decoder": {
@@ -916,12 +907,12 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz",
-      "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
+      "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
       "dev": true,
       "dependencies": {
-        "follow-redirects": "^1.15.4",
+        "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }
@@ -1807,9 +1798,9 @@
       }
     },
     "node_modules/elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "version": "6.5.7",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz",
+      "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==",
       "dev": true,
       "dependencies": {
         "bn.js": "^4.11.9",
@@ -5327,29 +5318,15 @@
       "dev": true
     },
     "@multiversx/sdk-network-providers": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/@multiversx/sdk-network-providers/-/sdk-network-providers-2.4.3.tgz",
-      "integrity": "sha512-tJmJuxU+BjtC2q29PuzQOM4Qr6aiXujKwQXgIAPHTiuNbMc3Yi6Q4B0DC1PfI3iG+M4DONwfXknvM1uwqnY2zA==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@multiversx/sdk-network-providers/-/sdk-network-providers-2.6.0.tgz",
+      "integrity": "sha512-fAj7Py3otll00iFunwcDwp7/i7NiHInLN4EhdEFVfKNY5Z+roGI6YwPy3i60l8JApGE6DzmBQ22nVFYv8NzrPA==",
       "dev": true,
       "requires": {
-        "axios": "1.6.8",
         "bech32": "1.1.4",
         "bignumber.js": "9.0.1",
         "buffer": "6.0.3",
         "json-bigint": "1.0.0"
-      },
-      "dependencies": {
-        "axios": {
-          "version": "1.6.8",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
-          "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
-          "dev": true,
-          "requires": {
-            "follow-redirects": "^1.15.6",
-            "form-data": "^4.0.0",
-            "proxy-from-env": "^1.1.0"
-          }
-        }
       }
     },
     "@multiversx/sdk-transaction-decoder": {
@@ -5902,12 +5879,12 @@
       "dev": true
     },
     "axios": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz",
-      "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
+      "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
       "dev": true,
       "requires": {
-        "follow-redirects": "^1.15.4",
+        "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }
@@ -6658,9 +6635,9 @@
       }
     },
     "elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "version": "6.5.7",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz",
+      "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==",
       "dev": true,
       "requires": {
         "bn.js": "^4.11.9",
diff --git a/package.json b/package.json
index fd87ca9e2..0bc48168e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.4.0",
+  "version": "13.4.1",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "main": "out/index.js",
   "types": "out/index.d.js",
@@ -34,14 +34,14 @@
     "keccak": "3.0.2"
   },
   "devDependencies": {
-    "@multiversx/sdk-network-providers": "2.4.3",
+    "@multiversx/sdk-network-providers": "2.6.0",
     "@multiversx/sdk-wallet": "4.5.0",
     "@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.6.5",
+    "axios": "^1.7.4",
     "browserify": "17.0.0",
     "chai": "4.2.0",
     "mocha": "9.2.2",

From 615034c00f6a8198de80df42be6e7c8f4f09651a Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 26 Aug 2024 09:53:19 +0300
Subject: [PATCH 220/338] Add managed decimal

---
 src/abi/typeFormula.ts                        |  13 ++-
 src/abi/typeFormulaParser.ts                  |   6 +-
 src/smartcontracts/codec/binary.ts            |   9 ++
 src/smartcontracts/codec/managedDecimal.ts    |  54 +++++++++
 .../typesystem/abiRegistry.spec.ts            |   2 +
 src/smartcontracts/typesystem/index.ts        |   1 +
 .../typesystem/managedDecimal.ts              | 108 ++++++++++++++++++
 src/smartcontracts/typesystem/matchers.ts     |  10 ++
 .../typesystem/typeExpressionParser.ts        |   2 +-
 src/smartcontracts/typesystem/typeMapper.ts   |   5 +-
 src/smartcontracts/typesystem/types.ts        |   9 +-
 src/testdata/adder.abi.json                   |  17 ++-
 src/testdata/lottery-esdt.abi.json            |  13 +++
 13 files changed, 242 insertions(+), 7 deletions(-)
 create mode 100644 src/smartcontracts/codec/managedDecimal.ts
 create mode 100644 src/smartcontracts/typesystem/managedDecimal.ts

diff --git a/src/abi/typeFormula.ts b/src/abi/typeFormula.ts
index ca24926b8..108be5333 100644
--- a/src/abi/typeFormula.ts
+++ b/src/abi/typeFormula.ts
@@ -1,17 +1,26 @@
 export class TypeFormula {
     name: string;
+    metadata: any;
     typeParameters: TypeFormula[];
 
-    constructor(name: string, typeParameters: TypeFormula[]) {
+    constructor(name: string, typeParameters: TypeFormula[], metadata?: any) {
         this.name = name;
         this.typeParameters = typeParameters;
+        this.metadata = metadata;
     }
 
     toString(): string {
         if (this.typeParameters.length > 0) {
             const typeParameters = this.typeParameters.map((typeParameter) => typeParameter.toString()).join(", ");
-            return `${this.name}<${typeParameters}>`;
+            const name = `${this.name}<${typeParameters}>`;
+            if (this.metadata !== undefined) {
+                return `${name}*${this.metadata}*`;
+            }
+            return name;
         } else {
+            if (this.metadata !== undefined) {
+                return `${this.name}*${this.metadata}*`;
+            }
             return this.name;
         }
     }
diff --git a/src/abi/typeFormulaParser.ts b/src/abi/typeFormulaParser.ts
index 02e7b9612..e18683535 100644
--- a/src/abi/typeFormulaParser.ts
+++ b/src/abi/typeFormulaParser.ts
@@ -83,7 +83,11 @@ export class TypeFormulaParser {
     private acquireTypeWithParameters(stack: any[]): TypeFormula {
         const typeParameters = this.acquireTypeParameters(stack);
         const typeName = stack.pop();
-        const typeFormula = new TypeFormula(typeName, typeParameters.reverse());
+        if (typeName === "ManagedDecimal" || "ManagedDecimalSigned") {
+            const typeFormula = new TypeFormula(typeName, [], typeParameters[0].name);
+            return typeFormula;
+        }
+        const typeFormula = new TypeFormula(typeName, typeParameters);
         return typeFormula;
     }
 
diff --git a/src/smartcontracts/codec/binary.ts b/src/smartcontracts/codec/binary.ts
index 1b9709315..eb52e9d0e 100644
--- a/src/smartcontracts/codec/binary.ts
+++ b/src/smartcontracts/codec/binary.ts
@@ -16,6 +16,8 @@ import {
     Tuple,
     ArrayVecType,
     ArrayVec,
+    ManagedDecimalType,
+    ManagedDecimalValue,
 } from "../typesystem";
 import { guardTrue } from "../../utils";
 import { OptionValueBinaryCodec } from "./option";
@@ -25,6 +27,7 @@ import { StructBinaryCodec } from "./struct";
 import { EnumBinaryCodec } from "./enum";
 import { TupleBinaryCodec } from "./tuple";
 import { ArrayVecBinaryCodec } from "./arrayVec";
+import { ManagedDecimalCodec } from "./managedDecimal";
 
 export class BinaryCodec {
     readonly constraints: BinaryCodecConstraints;
@@ -35,6 +38,7 @@ export class BinaryCodec {
     private readonly structCodec: StructBinaryCodec;
     private readonly tupleCodec: TupleBinaryCodec;
     private readonly enumCodec: EnumBinaryCodec;
+    private readonly managedDecimalCodec: ManagedDecimalCodec;
 
     constructor(constraints: BinaryCodecConstraints | null = null) {
         this.constraints = constraints || new BinaryCodecConstraints();
@@ -45,6 +49,7 @@ export class BinaryCodec {
         this.structCodec = new StructBinaryCodec(this);
         this.tupleCodec = new TupleBinaryCodec(this);
         this.enumCodec = new EnumBinaryCodec(this);
+        this.managedDecimalCodec = new ManagedDecimalCodec(this);
     }
 
     decodeTopLevel<TResult extends TypedValue = TypedValue>(buffer: Buffer, type: Type): TResult {
@@ -58,6 +63,7 @@ export class BinaryCodec {
             onStruct: () => this.structCodec.decodeTopLevel(buffer, <StructType>type),
             onTuple: () => this.tupleCodec.decodeTopLevel(buffer, <TupleType>type),
             onEnum: () => this.enumCodec.decodeTopLevel(buffer, <EnumType>type),
+            onManagedDecimal: () => this.managedDecimalCodec.decodeTopLevel(buffer, <ManagedDecimalType>type),
         });
 
         return <TResult>typedValue;
@@ -74,6 +80,7 @@ export class BinaryCodec {
             onStruct: () => this.structCodec.decodeNested(buffer, <StructType>type),
             onTuple: () => this.tupleCodec.decodeNested(buffer, <TupleType>type),
             onEnum: () => this.enumCodec.decodeNested(buffer, <EnumType>type),
+            onManagedDecimal: () => this.managedDecimalCodec.decodeNested(buffer, <ManagedDecimalType>type),
         });
 
         return [<TResult>typedResult, decodedLength];
@@ -90,6 +97,7 @@ export class BinaryCodec {
             onStruct: () => this.structCodec.encodeNested(<Struct>typedValue),
             onTuple: () => this.tupleCodec.encodeNested(<Tuple>typedValue),
             onEnum: () => this.enumCodec.encodeNested(<EnumValue>typedValue),
+            onManagedDecimal: () => this.managedDecimalCodec.encodeNested(<ManagedDecimalValue>typedValue),
         });
     }
 
@@ -104,6 +112,7 @@ export class BinaryCodec {
             onStruct: () => this.structCodec.encodeTopLevel(<Struct>typedValue),
             onTuple: () => this.tupleCodec.encodeTopLevel(<Tuple>typedValue),
             onEnum: () => this.enumCodec.encodeTopLevel(<EnumValue>typedValue),
+            onManagedDecimal: () => this.managedDecimalCodec.encodeTopLevel(<ManagedDecimalValue>typedValue),
         });
     }
 }
diff --git a/src/smartcontracts/codec/managedDecimal.ts b/src/smartcontracts/codec/managedDecimal.ts
new file mode 100644
index 000000000..04b6689ef
--- /dev/null
+++ b/src/smartcontracts/codec/managedDecimal.ts
@@ -0,0 +1,54 @@
+import BigNumber from "bignumber.js";
+import { ManagedDecimalType, ManagedDecimalValue, NumericalValue } from "../typesystem";
+import { BytesValue } from "../typesystem/bytes";
+import { BinaryCodec } from "./binary";
+import { cloneBuffer } from "./utils";
+
+export class ManagedDecimalCodec {
+    private readonly binaryCodec: BinaryCodec;
+
+    constructor(binaryCodec: BinaryCodec) {
+        this.binaryCodec = binaryCodec;
+    }
+
+    decodeNested(buffer: Buffer, type: ManagedDecimalType): [ManagedDecimalValue, number] {
+        let [bytesValue, length] = this.binaryCodec.decodeNested(buffer);
+        console.log({ bytesValue, length });
+        return [new ManagedDecimalValue(new BigNumber(1), 1), length];
+    }
+
+    decodeTopLevel(buffer: Buffer, type: ManagedDecimalType): ManagedDecimalValue {
+        let payload = cloneBuffer(buffer);
+
+        let empty = buffer.length == 0;
+        if (empty) {
+            return new ManagedDecimalValue(new BigNumber(0));
+        }
+
+        let isPositive = !type.withSign || isMsbZero(payload);
+        if (isPositive) {
+            let value = bufferToBigInt(payload);
+            return new NumericalValue(type, value);
+        }
+
+        // Also see: https://github.com/multiversx/mx-components-big-int/blob/master/twos-complement/twos2bigint.go
+        flipBufferBitsInPlace(payload);
+        let value = bufferToBigInt(payload);
+        let negativeValue = value.multipliedBy(new BigNumber(-1));
+        let negativeValueMinusOne = negativeValue.minus(new BigNumber(1));
+
+        return new NumericalValue(type, negativeValueMinusOne);
+        let bytesValue = this.binaryCodec.decodeTopLevel(buffer);
+        console.log({ bytesValue });
+        return new ManagedDecimalValue(new BigNumber(1), 1);
+    }
+
+    encodeNested(value: ManagedDecimalValue): Buffer {
+        let bytesValue = new BytesValue(Buffer.from(value));
+        return this.binaryCodec.encodeNested(bytesValue);
+    }
+
+    encodeTopLevel(tokenIdentifier: ManagedDecimalValue): Buffer {
+        return Buffer.from(tokenIdentifier.valueOf());
+    }
+}
diff --git a/src/smartcontracts/typesystem/abiRegistry.spec.ts b/src/smartcontracts/typesystem/abiRegistry.spec.ts
index d3d966e8e..0b816db6c 100644
--- a/src/smartcontracts/typesystem/abiRegistry.spec.ts
+++ b/src/smartcontracts/typesystem/abiRegistry.spec.ts
@@ -29,6 +29,7 @@ describe("test abi registry", () => {
         let start = registry.getEndpoint("start");
         let getStatus = registry.getEndpoint("status");
         let getLotteryInfo = registry.getEndpoint("getLotteryInfo");
+        let returnDecimal = registry.getEndpoint("returns_egld_decimal");
 
         assert.isFalse(start.modifiers.isReadonly());
         assert.isTrue(getStatus.modifiers.isReadonly());
@@ -54,6 +55,7 @@ describe("test abi registry", () => {
         assert.instanceOf(getLotteryInfo.input[0].type, BytesType);
         assert.instanceOf(getLotteryInfo.output[0].type, StructType);
         assert.equal(getLotteryInfo.output[0].type.getName(), "LotteryInfo");
+        assert.equal(returnDecimal.output[0].type.getName(), "ManagedDecimal");
 
         let fieldDefinitions = (<StructType>getLotteryInfo.output[0].type).getFieldsDefinitions();
         assert.instanceOf(fieldDefinitions[0].type, TokenIdentifierType);
diff --git a/src/smartcontracts/typesystem/index.ts b/src/smartcontracts/typesystem/index.ts
index f7bc39d45..113fd56b8 100644
--- a/src/smartcontracts/typesystem/index.ts
+++ b/src/smartcontracts/typesystem/index.ts
@@ -27,3 +27,4 @@ export * from "./typeExpressionParser";
 export * from "./typeMapper";
 export * from "./types";
 export * from "./variadic";
+export * from "./managedDecimal";
diff --git a/src/smartcontracts/typesystem/managedDecimal.ts b/src/smartcontracts/typesystem/managedDecimal.ts
new file mode 100644
index 000000000..eb5f19e5f
--- /dev/null
+++ b/src/smartcontracts/typesystem/managedDecimal.ts
@@ -0,0 +1,108 @@
+import BigNumber from "bignumber.js";
+import { Type, TypedValue } from "./types";
+
+export class ManagedDecimalType extends Type {
+    static ClassName = "ManagedDecimalType";
+    private readonly scale: number;
+
+    constructor(scale: number) {
+        super("ManagedDecimal", undefined, undefined, scale);
+        this.scale = scale;
+    }
+
+    getClassName(): string {
+        return ManagedDecimalType.ClassName;
+    }
+}
+
+export class ManagedDecimalValue extends TypedValue {
+    static ClassName = "ManagedDecimalValue";
+    private readonly value: BigNumber;
+    private readonly scale: number;
+
+    constructor(value: BigNumber.Value, scale: number) {
+        super(new ManagedDecimalType(scale));
+        this.value = new BigNumber(value);
+        this.scale = scale;
+    }
+
+    getClassName(): string {
+        return ManagedDecimalValue.ClassName;
+    }
+
+    getPrecision(): number {
+        return this.value.toString(this.scale).replace(".", "").length;
+    }
+
+    /**
+     * Returns whether two objects have the same value.
+     */
+    equals(other: ManagedDecimalValue): boolean {
+        if (this.getPrecision() != other.getPrecision()) {
+            return false;
+        }
+
+        return this.value == other.value;
+    }
+
+    valueOf(): BigNumber {
+        return this.value;
+    }
+
+    toString(): string {
+        return this.value.toString();
+    }
+}
+
+export class ManagedDecimalSignedType extends Type {
+    static ClassName = "ManagedDecimalSignedType";
+    private readonly scale: number;
+
+    constructor(scale: number) {
+        super("ManagedDecimalSigned", undefined, undefined, scale);
+        this.scale = scale;
+    }
+
+    getClassName(): string {
+        return ManagedDecimalType.ClassName;
+    }
+}
+
+export class ManagedDecimalSignedValue extends TypedValue {
+    static ClassName = "ManagedDecimalSignedValue";
+    private readonly value: BigNumber;
+    private readonly scale: number;
+
+    constructor(value: BigNumber, scale: number) {
+        super(new ManagedDecimalType(scale));
+        this.value = value;
+        this.scale = scale;
+    }
+
+    getClassName(): string {
+        return ManagedDecimalValue.ClassName;
+    }
+
+    getPrecision(): number {
+        return this.value.toFixed(this.scale).replace(".", "").length;
+    }
+
+    /**
+     * Returns whether two objects have the same value.
+     */
+    equals(other: ManagedDecimalSignedValue): boolean {
+        if (this.getPrecision() != other.getPrecision()) {
+            return false;
+        }
+
+        return this.value == other.value;
+    }
+
+    valueOf(): BigNumber {
+        return this.value;
+    }
+
+    toString(): string {
+        return this.value.toString();
+    }
+}
diff --git a/src/smartcontracts/typesystem/matchers.ts b/src/smartcontracts/typesystem/matchers.ts
index 43957d535..4fdb0f2f4 100644
--- a/src/smartcontracts/typesystem/matchers.ts
+++ b/src/smartcontracts/typesystem/matchers.ts
@@ -14,6 +14,7 @@ import { Type, PrimitiveType, PrimitiveValue } from "./types";
 import { ArrayVec, ArrayVecType } from "./genericArray";
 import { TypedValue } from "./types";
 import { StringType, StringValue } from "./string";
+import { ManagedDecimalType, ManagedDecimalValue } from "./managedDecimal";
 
 // TODO: Extend functionality or rename wrt. restricted / reduced functionality (not all types are handled: composite, variadic).
 export function onTypeSelect<TResult>(
@@ -26,6 +27,7 @@ export function onTypeSelect<TResult>(
         onStruct: () => TResult;
         onTuple: () => TResult;
         onEnum: () => TResult;
+        onManagedDecimal: () => TResult;
         onOther?: () => TResult;
     },
 ): TResult {
@@ -50,6 +52,9 @@ export function onTypeSelect<TResult>(
     if (type.hasExactClass(EnumType.ClassName)) {
         return selectors.onEnum();
     }
+    if (type.hasExactClass(ManagedDecimalType.ClassName)) {
+        return selectors.onManagedDecimal();
+    }
 
     if (selectors.onOther) {
         return selectors.onOther();
@@ -68,6 +73,7 @@ export function onTypedValueSelect<TResult>(
         onStruct: () => TResult;
         onTuple: () => TResult;
         onEnum: () => TResult;
+        onManagedDecimal: () => TResult;
         onOther?: () => TResult;
     },
 ): TResult {
@@ -92,6 +98,9 @@ export function onTypedValueSelect<TResult>(
     if (value.hasExactClass(EnumValue.ClassName)) {
         return selectors.onEnum();
     }
+    if (value.hasExactClass(ManagedDecimalValue.ClassName)) {
+        return selectors.onManagedDecimal();
+    }
 
     if (selectors.onOther) {
         return selectors.onOther();
@@ -138,6 +147,7 @@ export function onPrimitiveValueSelect<TResult>(
     if (value.hasExactClass(NothingValue.ClassName)) {
         return selectors.onNothing();
     }
+
     if (selectors.onOther) {
         return selectors.onOther();
     }
diff --git a/src/smartcontracts/typesystem/typeExpressionParser.ts b/src/smartcontracts/typesystem/typeExpressionParser.ts
index 62d2216c5..0c61d502f 100644
--- a/src/smartcontracts/typesystem/typeExpressionParser.ts
+++ b/src/smartcontracts/typesystem/typeExpressionParser.ts
@@ -26,6 +26,6 @@ export class TypeExpressionParser {
 
     private typeFormulaToType(typeFormula: TypeFormula): Type {
         const typeParameters = typeFormula.typeParameters.map((typeFormula) => this.typeFormulaToType(typeFormula));
-        return new Type(typeFormula.name, typeParameters);
+        return new Type(typeFormula.name, typeParameters, undefined, typeFormula.metadata);
     }
 }
diff --git a/src/smartcontracts/typesystem/typeMapper.ts b/src/smartcontracts/typesystem/typeMapper.ts
index edc40769f..3ea9a5e42 100644
--- a/src/smartcontracts/typesystem/typeMapper.ts
+++ b/src/smartcontracts/typesystem/typeMapper.ts
@@ -10,6 +10,7 @@ import { FieldDefinition } from "./fields";
 import { ListType, OptionType } from "./generic";
 import { ArrayVecType } from "./genericArray";
 import { H256Type } from "./h256";
+import { ManagedDecimalType } from "./managedDecimal";
 import { NothingType } from "./nothing";
 import {
     BigIntType,
@@ -74,6 +75,7 @@ export class TypeMapper {
             ["array64", (...typeParameters: Type[]) => new ArrayVecType(64, typeParameters[0])],
             ["array128", (...typeParameters: Type[]) => new ArrayVecType(128, typeParameters[0])],
             ["array256", (...typeParameters: Type[]) => new ArrayVecType(256, typeParameters[0])],
+            ["ManagedDecimal", (...metadata: any) => new ManagedDecimalType(parseInt(metadata))],
         ]);
 
         // For closed types, we hold actual type instances instead of type constructors / factories (no type parameters needed).
@@ -134,6 +136,7 @@ export class TypeMapper {
 
     private mapTypeRecursively(type: Type): Type | null {
         let isGeneric = type.isGenericType();
+        let hasMetadata = type.hasMetadata();
 
         let previouslyLearnedType = this.learnedTypesMap.get(type.getName());
         if (previouslyLearnedType) {
@@ -155,7 +158,7 @@ export class TypeMapper {
             return this.mapStructType(<StructType>type);
         }
 
-        if (isGeneric) {
+        if (isGeneric || hasMetadata) {
             // This will call mapType() recursively, for all the type parameters.
             return this.mapGenericType(type);
         }
diff --git a/src/smartcontracts/typesystem/types.ts b/src/smartcontracts/typesystem/types.ts
index b3e68d5bb..9f9e8382d 100644
--- a/src/smartcontracts/typesystem/types.ts
+++ b/src/smartcontracts/typesystem/types.ts
@@ -10,18 +10,21 @@ export class Type {
 
     private readonly name: string;
     private readonly typeParameters: Type[];
-    protected readonly cardinality: TypeCardinality;
+    protected readonly metadata: any;
+    private readonly cardinality: TypeCardinality;
 
     public constructor(
         name: string,
         typeParameters: Type[] = [],
         cardinality: TypeCardinality = TypeCardinality.fixed(1),
+        metadata?: any,
     ) {
         guardValueIsSet("name", name);
 
         this.name = name;
         this.typeParameters = typeParameters;
         this.cardinality = cardinality;
+        this.metadata = metadata;
     }
 
     getName(): string {
@@ -68,6 +71,10 @@ export class Type {
         return this.typeParameters.length > 0;
     }
 
+    hasMetadata(): boolean {
+        return this.metadata !== null && this.metadata !== undefined;
+    }
+
     getFirstTypeParameter(): Type {
         guardTrue(this.typeParameters.length > 0, "type parameters length > 0");
         return this.typeParameters[0];
diff --git a/src/testdata/adder.abi.json b/src/testdata/adder.abi.json
index fd809ce91..1786ce214 100644
--- a/src/testdata/adder.abi.json
+++ b/src/testdata/adder.abi.json
@@ -52,7 +52,22 @@
             ]
         },
         {
-            "docs": ["Add desired amount to the storage variable."],
+            "name": "returns_egld_decimal",
+            "mutability": "mutable",
+            "payableInTokens": [
+                "EGLD"
+            ],
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "ManagedDecimal<18>"
+                }
+            ]
+        },
+        {
+            "docs": [
+                "Add desired amount to the storage variable."
+            ],
             "name": "add",
             "mutability": "mutable",
             "inputs": [
diff --git a/src/testdata/lottery-esdt.abi.json b/src/testdata/lottery-esdt.abi.json
index a9fa48c5e..fd9949457 100644
--- a/src/testdata/lottery-esdt.abi.json
+++ b/src/testdata/lottery-esdt.abi.json
@@ -180,6 +180,19 @@
                     "multi_result": true
                 }
             ]
+        },
+        {
+            "name": "returns_egld_decimal",
+            "mutability": "mutable",
+            "payableInTokens": [
+                "EGLD"
+            ],
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "ManagedDecimal<18>"
+                }
+            ]
         }
     ],
     "hasCallback": false,

From 3c06d22703586a9072633efc45aa7bd05137946e Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 26 Aug 2024 17:48:25 +0300
Subject: [PATCH 221/338] Add user agent info

---
 src-network-providers/apiNetworkProvider.ts   | 19 +++++++++++++++++--
 src-network-providers/proxyNetworkProvider.ts | 18 ++++++++++++++++--
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 086980c41..42c5a7fcb 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -1,4 +1,4 @@
-import axios, { AxiosRequestConfig } from "axios";
+import axios, { AxiosHeaders, AxiosRequestConfig } from "axios";
 import { AccountOnNetwork, GuardianData } from "./accounts";
 import { defaultAxiosConfig, defaultPagination } from "./config";
 import { ContractQueryRequest } from "./contractQueryRequest";
@@ -22,11 +22,26 @@ export class ApiNetworkProvider implements INetworkProvider {
     private url: string;
     private config: AxiosRequestConfig;
     private backingProxyNetworkProvider;
+    private userAgentPrefix = 'sdk-network-providers/api'
 
-    constructor(url: string, config?: AxiosRequestConfig) {
+    constructor(url: string, config?: AxiosRequestConfig, clientName?: string) {
         this.url = url;
         this.config = { ...defaultAxiosConfig, ...config };
         this.backingProxyNetworkProvider = new ProxyNetworkProvider(url, config);
+        this.setUserAgent(config, clientName);
+
+    }
+
+    private setUserAgent(config: AxiosRequestConfig<any> | undefined, clientName: string | undefined) {
+        if (!config?.headers) return;
+
+        const headers = AxiosHeaders.from(config.headers as AxiosHeaders).normalize(true);
+        const resolvedClientName = clientName || 'unknown';
+
+        const currentUserAgent = headers.hasUserAgent() ? headers.getUserAgent() : '';
+        const newUserAgent = `${currentUserAgent} ${this.userAgentPrefix}${resolvedClientName}`.trim();
+
+        headers.setUserAgent(newUserAgent, true);
     }
 
     async getNetworkConfig(): Promise<NetworkConfig> {
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index a3d8d2d1c..68d17459f 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -1,4 +1,4 @@
-import axios, { AxiosRequestConfig } from "axios";
+import axios, { AxiosHeaders, AxiosRequestConfig } from "axios";
 import { AccountOnNetwork, GuardianData } from "./accounts";
 import { defaultAxiosConfig } from "./config";
 import { EsdtContractAddress } from "./constants";
@@ -19,10 +19,24 @@ import { TransactionStatus } from "./transactionStatus";
 export class ProxyNetworkProvider implements INetworkProvider {
     private url: string;
     private config: AxiosRequestConfig;
+    private userAgentPrefix = 'sdk-network-providers/proxy'
 
-    constructor(url: string, config?: AxiosRequestConfig) {
+    constructor(url: string, config?: AxiosRequestConfig, clientName?: string) {
         this.url = url;
         this.config = { ...defaultAxiosConfig, ...config };
+        this.setUserAgent(config, clientName);
+    }
+
+    private setUserAgent(config: AxiosRequestConfig<any> | undefined, clientName: string | undefined) {
+        if (!config?.headers) return;
+
+        const headers = AxiosHeaders.from(config.headers as AxiosHeaders).normalize(true);
+        const resolvedClientName = clientName || 'unknown';
+
+        const currentUserAgent = headers.hasUserAgent() ? headers.getUserAgent() : '';
+        const newUserAgent = `${currentUserAgent} ${this.userAgentPrefix}${resolvedClientName}`.trim();
+
+        headers.setUserAgent(newUserAgent, true);
     }
 
     async getNetworkConfig(): Promise<NetworkConfig> {

From a52a34b636ba43f842f732a2965bab780b2165ba Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Tue, 27 Aug 2024 12:24:44 +0300
Subject: [PATCH 222/338] Extract duplicated code and extend config

---
 .../NetworkProviderConfig.ts                  |  5 ++++
 src-network-providers/apiNetworkProvider.ts   | 23 +++++--------------
 src-network-providers/proxyNetworkProvider.ts | 22 +++++-------------
 src-network-providers/userAgent.ts            | 22 ++++++++++++++++++
 4 files changed, 39 insertions(+), 33 deletions(-)
 create mode 100644 src-network-providers/NetworkProviderConfig.ts
 create mode 100644 src-network-providers/userAgent.ts

diff --git a/src-network-providers/NetworkProviderConfig.ts b/src-network-providers/NetworkProviderConfig.ts
new file mode 100644
index 000000000..ea68c2353
--- /dev/null
+++ b/src-network-providers/NetworkProviderConfig.ts
@@ -0,0 +1,5 @@
+import { AxiosRequestConfig } from 'axios';
+
+export interface ExtendedAxiosRequestConfig extends AxiosRequestConfig {
+    clientName?: string;
+}
diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 42c5a7fcb..6bdfb13e9 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -1,4 +1,4 @@
-import axios, { AxiosHeaders, AxiosRequestConfig } from "axios";
+import axios from "axios";
 import { AccountOnNetwork, GuardianData } from "./accounts";
 import { defaultAxiosConfig, defaultPagination } from "./config";
 import { ContractQueryRequest } from "./contractQueryRequest";
@@ -16,32 +16,21 @@ import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwor
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork, prepareTransactionForBroadcasting } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
+import { setUserAgent } from "./userAgent";
+import { ExtendedAxiosRequestConfig } from "./NetworkProviderConfig";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ApiNetworkProvider implements INetworkProvider {
     private url: string;
-    private config: AxiosRequestConfig;
+    private config: ExtendedAxiosRequestConfig;
     private backingProxyNetworkProvider;
     private userAgentPrefix = 'sdk-network-providers/api'
 
-    constructor(url: string, config?: AxiosRequestConfig, clientName?: string) {
+    constructor(url: string, config?: ExtendedAxiosRequestConfig) {
         this.url = url;
         this.config = { ...defaultAxiosConfig, ...config };
         this.backingProxyNetworkProvider = new ProxyNetworkProvider(url, config);
-        this.setUserAgent(config, clientName);
-
-    }
-
-    private setUserAgent(config: AxiosRequestConfig<any> | undefined, clientName: string | undefined) {
-        if (!config?.headers) return;
-
-        const headers = AxiosHeaders.from(config.headers as AxiosHeaders).normalize(true);
-        const resolvedClientName = clientName || 'unknown';
-
-        const currentUserAgent = headers.hasUserAgent() ? headers.getUserAgent() : '';
-        const newUserAgent = `${currentUserAgent} ${this.userAgentPrefix}${resolvedClientName}`.trim();
-
-        headers.setUserAgent(newUserAgent, true);
+        setUserAgent(this.userAgentPrefix, this.config);
     }
 
     async getNetworkConfig(): Promise<NetworkConfig> {
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index 68d17459f..3b960f129 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -1,4 +1,4 @@
-import axios, { AxiosHeaders, AxiosRequestConfig } from "axios";
+import axios from "axios";
 import { AccountOnNetwork, GuardianData } from "./accounts";
 import { defaultAxiosConfig } from "./config";
 import { EsdtContractAddress } from "./constants";
@@ -14,29 +14,19 @@ import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwor
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork, prepareTransactionForBroadcasting } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
+import { setUserAgent } from "./userAgent";
+import { ExtendedAxiosRequestConfig } from "./NetworkProviderConfig";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ProxyNetworkProvider implements INetworkProvider {
     private url: string;
-    private config: AxiosRequestConfig;
+    private config: ExtendedAxiosRequestConfig;
     private userAgentPrefix = 'sdk-network-providers/proxy'
 
-    constructor(url: string, config?: AxiosRequestConfig, clientName?: string) {
+    constructor(url: string, config?: ExtendedAxiosRequestConfig) {
         this.url = url;
         this.config = { ...defaultAxiosConfig, ...config };
-        this.setUserAgent(config, clientName);
-    }
-
-    private setUserAgent(config: AxiosRequestConfig<any> | undefined, clientName: string | undefined) {
-        if (!config?.headers) return;
-
-        const headers = AxiosHeaders.from(config.headers as AxiosHeaders).normalize(true);
-        const resolvedClientName = clientName || 'unknown';
-
-        const currentUserAgent = headers.hasUserAgent() ? headers.getUserAgent() : '';
-        const newUserAgent = `${currentUserAgent} ${this.userAgentPrefix}${resolvedClientName}`.trim();
-
-        headers.setUserAgent(newUserAgent, true);
+        setUserAgent(this.userAgentPrefix, this.config);
     }
 
     async getNetworkConfig(): Promise<NetworkConfig> {
diff --git a/src-network-providers/userAgent.ts b/src-network-providers/userAgent.ts
new file mode 100644
index 000000000..727226541
--- /dev/null
+++ b/src-network-providers/userAgent.ts
@@ -0,0 +1,22 @@
+import { AxiosHeaders } from "axios";
+import { ExtendedAxiosRequestConfig } from "./NetworkProviderConfig";
+
+export function setUserAgent(userAgentPrefix: string, config: ExtendedAxiosRequestConfig | undefined) {
+    if (!config) {
+        config = { headers: new AxiosHeaders({}) }
+    }
+    if (!config.headers) {
+        config.headers = new AxiosHeaders({})
+    };
+
+    const headers = AxiosHeaders.from(config.headers as AxiosHeaders).normalize(true);
+    if (!config.clientName) {
+        console.log("Can you please provide the client name of the aplication that uses the sdk?")
+    }
+    const resolvedClientName = config.clientName || 'unknown';
+
+    const currentUserAgent = headers.hasUserAgent() ? headers.getUserAgent() : '';
+    const newUserAgent = `${currentUserAgent} ${userAgentPrefix}${resolvedClientName}`.trim();
+
+    headers.setUserAgent(newUserAgent, true);
+}

From 1a18343b276ce91f5e9808ff1e716d5c27c4b19a Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Tue, 27 Aug 2024 14:49:54 +0300
Subject: [PATCH 223/338] refactoring, fix typos, remaning

---
 src-network-providers/NetworkProviderConfig.ts |  5 -----
 src-network-providers/apiNetworkProvider.ts    | 13 +++++++------
 src-network-providers/constants.ts             |  2 ++
 src-network-providers/networkProviderConfig.ts |  5 +++++
 src-network-providers/proxyNetworkProvider.ts  | 14 +++++++-------
 src-network-providers/userAgent.ts             | 18 ++++++++----------
 6 files changed, 29 insertions(+), 28 deletions(-)
 delete mode 100644 src-network-providers/NetworkProviderConfig.ts
 create mode 100644 src-network-providers/networkProviderConfig.ts

diff --git a/src-network-providers/NetworkProviderConfig.ts b/src-network-providers/NetworkProviderConfig.ts
deleted file mode 100644
index ea68c2353..000000000
--- a/src-network-providers/NetworkProviderConfig.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { AxiosRequestConfig } from 'axios';
-
-export interface ExtendedAxiosRequestConfig extends AxiosRequestConfig {
-    clientName?: string;
-}
diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 6bdfb13e9..069d576b3 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -16,21 +16,22 @@ import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwor
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork, prepareTransactionForBroadcasting } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
-import { setUserAgent } from "./userAgent";
-import { ExtendedAxiosRequestConfig } from "./NetworkProviderConfig";
+import { extendUserAgent } from "./userAgent";
+import { NetworkProviderConfig } from "./networkProviderConfig";
+import { MetricsPrefix } from "./constants";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ApiNetworkProvider implements INetworkProvider {
     private url: string;
-    private config: ExtendedAxiosRequestConfig;
+    private config: NetworkProviderConfig;
     private backingProxyNetworkProvider;
-    private userAgentPrefix = 'sdk-network-providers/api'
+    private userAgentPrefix = `${MetricsPrefix}/api`
 
-    constructor(url: string, config?: ExtendedAxiosRequestConfig) {
+    constructor(url: string, config?: NetworkProviderConfig) {
         this.url = url;
         this.config = { ...defaultAxiosConfig, ...config };
         this.backingProxyNetworkProvider = new ProxyNetworkProvider(url, config);
-        setUserAgent(this.userAgentPrefix, this.config);
+        extendUserAgent(this.userAgentPrefix, this.config);
     }
 
     async getNetworkConfig(): Promise<NetworkConfig> {
diff --git a/src-network-providers/constants.ts b/src-network-providers/constants.ts
index 932f9595c..5218a9013 100644
--- a/src-network-providers/constants.ts
+++ b/src-network-providers/constants.ts
@@ -3,3 +3,5 @@ import { Address } from "./primitives";
 
 export const MaxUint64AsBigNumber = new BigNumber("18446744073709551615");
 export const EsdtContractAddress = new Address("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u");
+export const MetricsPrefix = "multiversx-sdk"
+export const UnknownClientName = "unknown"
diff --git a/src-network-providers/networkProviderConfig.ts b/src-network-providers/networkProviderConfig.ts
new file mode 100644
index 000000000..b66bffbcc
--- /dev/null
+++ b/src-network-providers/networkProviderConfig.ts
@@ -0,0 +1,5 @@
+import { AxiosRequestConfig } from 'axios';
+
+export interface NetworkProviderConfig extends AxiosRequestConfig {
+    clientName?: string;
+}
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index 3b960f129..6bc2e2b54 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -1,7 +1,7 @@
 import axios from "axios";
 import { AccountOnNetwork, GuardianData } from "./accounts";
 import { defaultAxiosConfig } from "./config";
-import { EsdtContractAddress } from "./constants";
+import { EsdtContractAddress, MetricsPrefix } from "./constants";
 import { ContractQueryRequest } from "./contractQueryRequest";
 import { ContractQueryResponse } from "./contractQueryResponse";
 import { ErrContractQuery, ErrNetworkProvider } from "./errors";
@@ -14,19 +14,19 @@ import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwor
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork, prepareTransactionForBroadcasting } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
-import { setUserAgent } from "./userAgent";
-import { ExtendedAxiosRequestConfig } from "./NetworkProviderConfig";
+import { extendUserAgent } from "./userAgent";
+import { NetworkProviderConfig } from "./networkProviderConfig";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ProxyNetworkProvider implements INetworkProvider {
     private url: string;
-    private config: ExtendedAxiosRequestConfig;
-    private userAgentPrefix = 'sdk-network-providers/proxy'
+    private config: NetworkProviderConfig;
+    private userAgentPrefix = `${MetricsPrefix}/proxy`
 
-    constructor(url: string, config?: ExtendedAxiosRequestConfig) {
+    constructor(url: string, config?: NetworkProviderConfig) {
         this.url = url;
         this.config = { ...defaultAxiosConfig, ...config };
-        setUserAgent(this.userAgentPrefix, this.config);
+        extendUserAgent(this.userAgentPrefix, this.config);
     }
 
     async getNetworkConfig(): Promise<NetworkConfig> {
diff --git a/src-network-providers/userAgent.ts b/src-network-providers/userAgent.ts
index 727226541..726ee23ee 100644
--- a/src-network-providers/userAgent.ts
+++ b/src-network-providers/userAgent.ts
@@ -1,22 +1,20 @@
 import { AxiosHeaders } from "axios";
-import { ExtendedAxiosRequestConfig } from "./NetworkProviderConfig";
+import { NetworkProviderConfig } from "./networkProviderConfig";
+import { UnknownClientName } from "./constants";
 
-export function setUserAgent(userAgentPrefix: string, config: ExtendedAxiosRequestConfig | undefined) {
-    if (!config) {
-        config = { headers: new AxiosHeaders({}) }
-    }
+export function extendUserAgent(userAgentPrefix: string, config: NetworkProviderConfig) {
     if (!config.headers) {
         config.headers = new AxiosHeaders({})
     };
-
-    const headers = AxiosHeaders.from(config.headers as AxiosHeaders).normalize(true);
     if (!config.clientName) {
-        console.log("Can you please provide the client name of the aplication that uses the sdk?")
+        console.log("Can you please provide the client name of the application that uses the SDK? It will be used for metrics.")
     }
-    const resolvedClientName = config.clientName || 'unknown';
+
+    const headers = AxiosHeaders.from(config.headers as AxiosHeaders).normalize(true);
+    const resolvedClientName = config.clientName || UnknownClientName;
 
     const currentUserAgent = headers.hasUserAgent() ? headers.getUserAgent() : '';
-    const newUserAgent = `${currentUserAgent} ${userAgentPrefix}${resolvedClientName}`.trim();
+    const newUserAgent = `${currentUserAgent} ${userAgentPrefix}/${resolvedClientName}`;
 
     headers.setUserAgent(newUserAgent, true);
 }

From 25d250a119635db027c1733ecb3529c1ba2d4850 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Tue, 27 Aug 2024 16:08:47 +0300
Subject: [PATCH 224/338] Add tests

---
 src-network-providers/apiNetworkProvider.ts   |  3 +-
 .../providers.dev.net.spec.ts                 | 40 +++++++++++++++++--
 src-network-providers/userAgent.ts            |  3 +-
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 069d576b3..53ea6b018 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -30,7 +30,8 @@ export class ApiNetworkProvider implements INetworkProvider {
     constructor(url: string, config?: NetworkProviderConfig) {
         this.url = url;
         this.config = { ...defaultAxiosConfig, ...config };
-        this.backingProxyNetworkProvider = new ProxyNetworkProvider(url, config);
+        const proxyConfig = JSON.parse(JSON.stringify(this.config));
+        this.backingProxyNetworkProvider = new ProxyNetworkProvider(url, proxyConfig);
         extendUserAgent(this.userAgentPrefix, this.config);
     }
 
diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index f4f4399af..890c0e55a 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -1,4 +1,4 @@
-import { assert } from "chai";
+import { assert, expect } from "chai";
 import { ApiNetworkProvider } from "./apiNetworkProvider";
 import { INetworkProvider, ITransactionNext } from "./interface";
 import { Address } from "./primitives";
@@ -7,6 +7,7 @@ import { MockQuery } from "./testscommon/dummyQuery";
 import { NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionEventData } from "./transactionEvents";
 import { TransactionOnNetwork } from "./transactions";
+import { AxiosHeaders } from "axios";
 
 describe("test network providers on devnet: Proxy and API", function () {
     let alice = new Address("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
@@ -14,8 +15,8 @@ describe("test network providers on devnet: Proxy and API", function () {
     let dan = new Address("erd1kyaqzaprcdnv4luvanah0gfxzzsnpaygsy6pytrexll2urtd05ts9vegu7");
     const MAX_NUMBER_OF_ITEMS_BY_DEFAULT = 20;
 
-    let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.multiversx.com", { timeout: 10000 });
-    let proxyProvider: INetworkProvider = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com", { timeout: 10000 });
+    let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.multiversx.com", { timeout: 10000, clientName: 'test' });
+    let proxyProvider: INetworkProvider = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com", { timeout: 10000, clientName: 'test' });
 
     it("should have same response for getNetworkConfig()", async function () {
         let apiResponse = await apiProvider.getNetworkConfig();
@@ -24,6 +25,39 @@ describe("test network providers on devnet: Proxy and API", function () {
         assert.deepEqual(apiResponse, proxyResponse);
     });
 
+    it("should add userAgent unknown for clientName when no clientName passed", async function () {
+        const expectedApiUserAgent = "multiversx-sdk/api/unknown"
+        const expectedProxyUserAgent = "multiversx-sdk/proxy/unknown"
+
+        let localApiProvider: any = new ApiNetworkProvider("https://devnet-api.multiversx.com", { timeout: 10000 });
+        let localProxyProvider: any = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com", { timeout: 10000 });
+
+        assert.equal(localApiProvider.config.headers.getUserAgent(), expectedApiUserAgent);
+        assert.equal(localProxyProvider.config.headers.getUserAgent(), expectedProxyUserAgent);
+    });
+
+    it("should set userAgent with specified clientName ", async function () {
+        const expectedApiUserAgent = "multiversx-sdk/api/test"
+        const expectedProxyUserAgent = "multiversx-sdk/proxy/test"
+
+        let localApiProvider: any = new ApiNetworkProvider("https://devnet-api.multiversx.com", { timeout: 10000, clientName: 'test' });
+        let localProxyProvider: any = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com", { timeout: 10000, clientName: 'test' });
+
+        assert.equal(localApiProvider.config.headers.getUserAgent(), expectedApiUserAgent);
+        assert.equal(localProxyProvider.config.headers.getUserAgent(), expectedProxyUserAgent);
+    });
+
+    it("should keep the set userAgent and add the sdk to it", async function () {
+        const expectedApiUserAgent = "Client-info multiversx-sdk/api/test"
+        const expectedProxyUserAgent = "Client-info multiversx-sdk/proxy/test"
+
+        let localApiProvider: any = new ApiNetworkProvider("https://devnet-api.multiversx.com", { timeout: 10000, headers: new AxiosHeaders({ "User-Agent": "Client-info" }), clientName: 'test' });
+        let localProxyProvider: any = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com", { timeout: 10000, headers: new AxiosHeaders({ "User-Agent": "Client-info" }), clientName: 'test' });
+
+        assert.equal(localApiProvider.config.headers.getUserAgent(), expectedApiUserAgent);
+        assert.equal(localProxyProvider.config.headers.getUserAgent(), expectedProxyUserAgent);
+    });
+
     it("should have same response for getNetworkStatus()", async function () {
         let apiResponse = await apiProvider.getNetworkStatus();
         let proxyResponse = await proxyProvider.getNetworkStatus();
diff --git a/src-network-providers/userAgent.ts b/src-network-providers/userAgent.ts
index 726ee23ee..e102f114b 100644
--- a/src-network-providers/userAgent.ts
+++ b/src-network-providers/userAgent.ts
@@ -9,12 +9,11 @@ export function extendUserAgent(userAgentPrefix: string, config: NetworkProvider
     if (!config.clientName) {
         console.log("Can you please provide the client name of the application that uses the SDK? It will be used for metrics.")
     }
-
     const headers = AxiosHeaders.from(config.headers as AxiosHeaders).normalize(true);
     const resolvedClientName = config.clientName || UnknownClientName;
 
     const currentUserAgent = headers.hasUserAgent() ? headers.getUserAgent() : '';
-    const newUserAgent = `${currentUserAgent} ${userAgentPrefix}/${resolvedClientName}`;
+    const newUserAgent = currentUserAgent ? `${currentUserAgent} ${userAgentPrefix}/${resolvedClientName}` : `${userAgentPrefix}/${resolvedClientName}`;
 
     headers.setUserAgent(newUserAgent, true);
 }

From 8b46cd3e314af36149afb99269365b4c9caf9c78 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Tue, 27 Aug 2024 16:36:43 +0300
Subject: [PATCH 225/338] Small renaming

---
 src-network-providers/apiNetworkProvider.ts   | 4 ++--
 src-network-providers/constants.ts            | 2 +-
 src-network-providers/proxyNetworkProvider.ts | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 53ea6b018..5a3bb530f 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -18,14 +18,14 @@ import { TransactionOnNetwork, prepareTransactionForBroadcasting } from "./trans
 import { TransactionStatus } from "./transactionStatus";
 import { extendUserAgent } from "./userAgent";
 import { NetworkProviderConfig } from "./networkProviderConfig";
-import { MetricsPrefix } from "./constants";
+import { BaseUserAgent } from "./constants";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ApiNetworkProvider implements INetworkProvider {
     private url: string;
     private config: NetworkProviderConfig;
     private backingProxyNetworkProvider;
-    private userAgentPrefix = `${MetricsPrefix}/api`
+    private userAgentPrefix = `${BaseUserAgent}/api`
 
     constructor(url: string, config?: NetworkProviderConfig) {
         this.url = url;
diff --git a/src-network-providers/constants.ts b/src-network-providers/constants.ts
index 5218a9013..ea134f203 100644
--- a/src-network-providers/constants.ts
+++ b/src-network-providers/constants.ts
@@ -3,5 +3,5 @@ import { Address } from "./primitives";
 
 export const MaxUint64AsBigNumber = new BigNumber("18446744073709551615");
 export const EsdtContractAddress = new Address("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u");
-export const MetricsPrefix = "multiversx-sdk"
+export const BaseUserAgent = "multiversx-sdk"
 export const UnknownClientName = "unknown"
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src-network-providers/proxyNetworkProvider.ts
index 6bc2e2b54..c58e4bf15 100644
--- a/src-network-providers/proxyNetworkProvider.ts
+++ b/src-network-providers/proxyNetworkProvider.ts
@@ -1,7 +1,7 @@
 import axios from "axios";
 import { AccountOnNetwork, GuardianData } from "./accounts";
 import { defaultAxiosConfig } from "./config";
-import { EsdtContractAddress, MetricsPrefix } from "./constants";
+import { EsdtContractAddress, BaseUserAgent } from "./constants";
 import { ContractQueryRequest } from "./contractQueryRequest";
 import { ContractQueryResponse } from "./contractQueryResponse";
 import { ErrContractQuery, ErrNetworkProvider } from "./errors";
@@ -21,7 +21,7 @@ import { NetworkProviderConfig } from "./networkProviderConfig";
 export class ProxyNetworkProvider implements INetworkProvider {
     private url: string;
     private config: NetworkProviderConfig;
-    private userAgentPrefix = `${MetricsPrefix}/proxy`
+    private userAgentPrefix = `${BaseUserAgent}/proxy`
 
     constructor(url: string, config?: NetworkProviderConfig) {
         this.url = url;

From cacb1f008508c44bd5e1e02490ee93e3a2590e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 27 Aug 2024 20:27:53 +0300
Subject: [PATCH 226/338] Run npm audit fix, add missing info in package.json.

---
 package-lock.json | 34 +++++++++++++++++-----------------
 package.json      | 18 ++++++++++++++----
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5a42a0970..3b3cc1ad0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.4.1",
+  "version": "13.4.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.4.1",
+      "version": "13.4.2",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
@@ -18,7 +18,7 @@
       },
       "devDependencies": {
         "@multiversx/sdk-network-providers": "2.6.0",
-        "@multiversx/sdk-wallet": "4.5.0",
+        "@multiversx/sdk-wallet": "4.5.1",
         "@types/assert": "1.4.6",
         "@types/chai": "4.2.11",
         "@types/mocha": "9.1.0",
@@ -190,9 +190,9 @@
       "integrity": "sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg=="
     },
     "node_modules/@multiversx/sdk-wallet": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@multiversx/sdk-wallet/-/sdk-wallet-4.5.0.tgz",
-      "integrity": "sha512-2E/bMDcbFV7zl0KuSEPdNrIjIaMOp4e1BfctPO1q2F0Hd6aAHYO7bZIXNcYEj2v1zgvESybgVh5Zi5vQYtNZRg==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/@multiversx/sdk-wallet/-/sdk-wallet-4.5.1.tgz",
+      "integrity": "sha512-rvaMUV6OxNj9gchOn7wSCPZcWc6hjs1nQuY6QwnaEcBfPsHtFemNNt+t3uxPZOrDhAwXqUgyy9WdltvOs8somg==",
       "dev": true,
       "dependencies": {
         "@multiversx/sdk-bls-wasm": "0.3.5",
@@ -3423,12 +3423,12 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -5345,9 +5345,9 @@
       }
     },
     "@multiversx/sdk-wallet": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@multiversx/sdk-wallet/-/sdk-wallet-4.5.0.tgz",
-      "integrity": "sha512-2E/bMDcbFV7zl0KuSEPdNrIjIaMOp4e1BfctPO1q2F0Hd6aAHYO7bZIXNcYEj2v1zgvESybgVh5Zi5vQYtNZRg==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/@multiversx/sdk-wallet/-/sdk-wallet-4.5.1.tgz",
+      "integrity": "sha512-rvaMUV6OxNj9gchOn7wSCPZcWc6hjs1nQuY6QwnaEcBfPsHtFemNNt+t3uxPZOrDhAwXqUgyy9WdltvOs8somg==",
       "dev": true,
       "requires": {
         "@multiversx/sdk-bls-wasm": "0.3.5",
@@ -7850,12 +7850,12 @@
       "dev": true
     },
     "micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
       "requires": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       }
     },
diff --git a/package.json b/package.json
index 0bc48168e..1299a5f24 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,19 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.4.1",
+  "version": "13.4.2",
   "description": "MultiversX SDK for JavaScript and TypeScript",
+  "author": "MultiversX",
+  "homepage": "https://multiversx.com",
+  "license": "MIT",
+  "repository": "github:multiversx/mx-sdk-js-core",
+  "bugs": {
+    "url": "https://github.com/multiversx/mx-sdk-js-core/issues"
+  },
+  "keywords": [
+    "multiversx",
+    "sdk",
+    "blockchain"
+  ],
   "main": "out/index.js",
   "types": "out/index.d.js",
   "files": [
@@ -23,8 +35,6 @@
     "pretest": "npm run compile",
     "prepare": "npm run compile"
   },
-  "author": "MultiversX",
-  "license": "MIT",
   "dependencies": {
     "@multiversx/sdk-transaction-decoder": "1.0.2",
     "json-bigint": "1.0.0",
@@ -35,7 +45,7 @@
   },
   "devDependencies": {
     "@multiversx/sdk-network-providers": "2.6.0",
-    "@multiversx/sdk-wallet": "4.5.0",
+    "@multiversx/sdk-wallet": "4.5.1",
     "@types/assert": "1.4.6",
     "@types/chai": "4.2.11",
     "@types/mocha": "9.1.0",

From d398ddbd8133d3617fd800fa9c440e82338b65d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 27 Aug 2024 20:35:21 +0300
Subject: [PATCH 227/338] Fix CodeQL warning (test code).

---
 README.md                | 2 +-
 browser-tests/index.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7985ca692..d27116ece 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ Feel free to skip this section if you are not a contributor.
 
 ```
 npm install --global browserify
-npm install esmify
+npm install esmify --no-save
 ```
 
 ### Building the library
diff --git a/browser-tests/index.html b/browser-tests/index.html
index ceb4801ca..bbe645670 100644
--- a/browser-tests/index.html
+++ b/browser-tests/index.html
@@ -39,7 +39,7 @@
             </div>
         </div>
     </div>
-    <script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
+    <script src="https://code.jquery.com/jquery-3.5.1.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
     <script src="/node_modules/mocha/mocha.js"></script>
 
     <script>mocha.setup('bdd')</script>

From d4d1385ae7afbffba7c07ff0b81072961e4508a4 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 28 Aug 2024 11:47:19 +0300
Subject: [PATCH 228/338] Fix tests

---
 src-network-providers/apiNetworkProvider.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 5a3bb530f..170b2fb9f 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -29,12 +29,18 @@ export class ApiNetworkProvider implements INetworkProvider {
 
     constructor(url: string, config?: NetworkProviderConfig) {
         this.url = url;
+        let proxyConfig = this.getProxyConfig(config);
         this.config = { ...defaultAxiosConfig, ...config };
-        const proxyConfig = JSON.parse(JSON.stringify(this.config));
         this.backingProxyNetworkProvider = new ProxyNetworkProvider(url, proxyConfig);
         extendUserAgent(this.userAgentPrefix, this.config);
     }
 
+    private getProxyConfig(config: NetworkProviderConfig | undefined) {
+        let proxyConfig = JSON.parse(JSON.stringify(config));
+        proxyConfig = { ...defaultAxiosConfig, ...proxyConfig };
+        return proxyConfig;
+    }
+
     async getNetworkConfig(): Promise<NetworkConfig> {
         return await this.backingProxyNetworkProvider.getNetworkConfig();
     }

From a3014a733a0d3b8027031ce4cbbdd8dde1053ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Fri, 30 Aug 2024 11:47:26 +0300
Subject: [PATCH 229/338] Fix constructor of ApiNetworkProvider, when config is
 not provided.

---
 src-network-providers/apiNetworkProvider.ts     |  6 +++---
 src-network-providers/providers.dev.net.spec.ts | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src-network-providers/apiNetworkProvider.ts b/src-network-providers/apiNetworkProvider.ts
index 170b2fb9f..3d6bc5565 100644
--- a/src-network-providers/apiNetworkProvider.ts
+++ b/src-network-providers/apiNetworkProvider.ts
@@ -1,12 +1,14 @@
 import axios from "axios";
 import { AccountOnNetwork, GuardianData } from "./accounts";
 import { defaultAxiosConfig, defaultPagination } from "./config";
+import { BaseUserAgent } from "./constants";
 import { ContractQueryRequest } from "./contractQueryRequest";
 import { ContractQueryResponse } from "./contractQueryResponse";
 import { ErrContractQuery, ErrNetworkProvider } from "./errors";
 import { IAddress, IContractQuery, INetworkProvider, IPagination, ITransaction, ITransactionNext } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkGeneralStatistics } from "./networkGeneralStatistics";
+import { NetworkProviderConfig } from "./networkProviderConfig";
 import { NetworkStake } from "./networkStake";
 import { NetworkStatus } from "./networkStatus";
 import { PairOnNetwork } from "./pairs";
@@ -17,8 +19,6 @@ import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } f
 import { TransactionOnNetwork, prepareTransactionForBroadcasting } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 import { extendUserAgent } from "./userAgent";
-import { NetworkProviderConfig } from "./networkProviderConfig";
-import { BaseUserAgent } from "./constants";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ApiNetworkProvider implements INetworkProvider {
@@ -36,7 +36,7 @@ export class ApiNetworkProvider implements INetworkProvider {
     }
 
     private getProxyConfig(config: NetworkProviderConfig | undefined) {
-        let proxyConfig = JSON.parse(JSON.stringify(config));
+        let proxyConfig = JSON.parse(JSON.stringify(config || {}));
         proxyConfig = { ...defaultAxiosConfig, ...proxyConfig };
         return proxyConfig;
     }
diff --git a/src-network-providers/providers.dev.net.spec.ts b/src-network-providers/providers.dev.net.spec.ts
index 890c0e55a..8c603c436 100644
--- a/src-network-providers/providers.dev.net.spec.ts
+++ b/src-network-providers/providers.dev.net.spec.ts
@@ -1,4 +1,5 @@
-import { assert, expect } from "chai";
+import { AxiosHeaders } from "axios";
+import { assert } from "chai";
 import { ApiNetworkProvider } from "./apiNetworkProvider";
 import { INetworkProvider, ITransactionNext } from "./interface";
 import { Address } from "./primitives";
@@ -7,7 +8,6 @@ import { MockQuery } from "./testscommon/dummyQuery";
 import { NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionEventData } from "./transactionEvents";
 import { TransactionOnNetwork } from "./transactions";
-import { AxiosHeaders } from "axios";
 
 describe("test network providers on devnet: Proxy and API", function () {
     let alice = new Address("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
@@ -18,6 +18,17 @@ describe("test network providers on devnet: Proxy and API", function () {
     let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.multiversx.com", { timeout: 10000, clientName: 'test' });
     let proxyProvider: INetworkProvider = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com", { timeout: 10000, clientName: 'test' });
 
+    it("should create providers without configuration", async function () {
+        const apiProviderWithoutConfig = new ApiNetworkProvider("https://devnet-api.multiversx.com");
+        const proxyProviderWithoutConfig = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com");
+
+        const apiResponse = await apiProviderWithoutConfig.getNetworkConfig();
+        const proxyResponse = await proxyProviderWithoutConfig.getNetworkConfig();
+        
+        assert.equal(apiResponse.ChainID, "D");
+        assert.equal(proxyResponse.ChainID, "D");
+    });
+
     it("should have same response for getNetworkConfig()", async function () {
         let apiResponse = await apiProvider.getNetworkConfig();
         let proxyResponse = await proxyProvider.getNetworkConfig();

From 5b3ee51c8651c00646de4417bf82f4d3d4a545a7 Mon Sep 17 00:00:00 2001
From: Micha Vie <micha@vleap.io>
Date: Fri, 30 Aug 2024 18:03:34 +0200
Subject: [PATCH 230/338] add codemetadata codec

---
 src/smartcontracts/codec/codemetadata.ts  | 24 +++++++++++++++++++++++
 src/smartcontracts/codec/primitive.ts     |  8 ++++++++
 src/smartcontracts/typesystem/index.ts    |  1 +
 src/smartcontracts/typesystem/matchers.ts | 20 +++++++++++++------
 4 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 src/smartcontracts/codec/codemetadata.ts

diff --git a/src/smartcontracts/codec/codemetadata.ts b/src/smartcontracts/codec/codemetadata.ts
new file mode 100644
index 000000000..a631502d9
--- /dev/null
+++ b/src/smartcontracts/codec/codemetadata.ts
@@ -0,0 +1,24 @@
+import { CodeMetadata } from "../codeMetadata";
+import { CodeMetadataValue } from "../typesystem/codeMetadata";
+
+export class CodeMetadataCodec {
+    decodeNested(buffer: Buffer): [CodeMetadataValue, number] {
+        const codeMetadata = CodeMetadata.fromBuffer(buffer);
+
+        return [new CodeMetadataValue(codeMetadata), length];
+    }
+
+    decodeTopLevel(buffer: Buffer): CodeMetadataValue {
+        const codeMetadata = CodeMetadata.fromBuffer(buffer);
+
+        return new CodeMetadataValue(codeMetadata);
+    }
+
+    encodeNested(codeMetadata: CodeMetadataValue): Buffer {
+        return codeMetadata.valueOf().toBuffer();
+    }
+
+    encodeTopLevel(codeMetadata: CodeMetadataValue): Buffer {
+        return codeMetadata.valueOf().toBuffer();
+    }
+}
diff --git a/src/smartcontracts/codec/primitive.ts b/src/smartcontracts/codec/primitive.ts
index f761c0df2..2a6cd9e26 100644
--- a/src/smartcontracts/codec/primitive.ts
+++ b/src/smartcontracts/codec/primitive.ts
@@ -1,4 +1,5 @@
 import {
+    CodeMetadataValue,
     PrimitiveType,
     PrimitiveValue,
     onPrimitiveTypeSelect,
@@ -19,6 +20,7 @@ import { H256Value } from "../typesystem/h256";
 import { BytesBinaryCodec } from "./bytes";
 import { TokenIdentifierCodec } from "./tokenIdentifier";
 import { TokenIdentifierValue } from "../typesystem/tokenIdentifier";
+import { CodeMetadataCodec } from "./codemetadata";
 import { NothingCodec } from "./nothing";
 import { StringBinaryCodec } from "./string";
 
@@ -32,6 +34,7 @@ export class PrimitiveBinaryCodec {
     private readonly bytesCodec: BytesBinaryCodec;
     private readonly stringCodec: StringBinaryCodec;
     private readonly tokenIdentifierCodec: TokenIdentifierCodec;
+    private readonly codeMetadataCodec: CodeMetadataCodec;
     private readonly nothingCodec: NothingCodec;
 
     constructor(binaryCodec: BinaryCodec) {
@@ -44,6 +47,7 @@ export class PrimitiveBinaryCodec {
         this.bytesCodec = new BytesBinaryCodec();
         this.stringCodec = new StringBinaryCodec();
         this.tokenIdentifierCodec = new TokenIdentifierCodec();
+        this.codeMetadataCodec = new CodeMetadataCodec();
         this.nothingCodec = new NothingCodec();
     }
 
@@ -56,6 +60,7 @@ export class PrimitiveBinaryCodec {
             onString: () => this.stringCodec.decodeNested(buffer),
             onH256: () => this.h256Codec.decodeNested(buffer),
             onTokenIndetifier: () => this.tokenIdentifierCodec.decodeNested(buffer),
+            onCodeMetadata: () => this.codeMetadataCodec.decodeNested(buffer),
             onNothing: () => this.nothingCodec.decodeNested(),
         });
     }
@@ -69,6 +74,7 @@ export class PrimitiveBinaryCodec {
             onString: () => this.stringCodec.decodeTopLevel(buffer),
             onH256: () => this.h256Codec.decodeTopLevel(buffer),
             onTokenIndetifier: () => this.tokenIdentifierCodec.decodeTopLevel(buffer),
+            onCodeMetadata: () => this.codeMetadataCodec.decodeTopLevel(buffer),
             onNothing: () => this.nothingCodec.decodeTopLevel(),
         });
     }
@@ -82,6 +88,7 @@ export class PrimitiveBinaryCodec {
             onString: () => this.stringCodec.encodeNested(<StringValue>value),
             onH256: () => this.h256Codec.encodeNested(<H256Value>value),
             onTypeIdentifier: () => this.tokenIdentifierCodec.encodeNested(<TokenIdentifierValue>value),
+            onCodeMetadata: () => this.codeMetadataCodec.encodeNested(<CodeMetadataValue>value),
             onNothing: () => this.nothingCodec.encodeNested(),
         });
     }
@@ -95,6 +102,7 @@ export class PrimitiveBinaryCodec {
             onString: () => this.stringCodec.encodeTopLevel(<StringValue>value),
             onH256: () => this.h256Codec.encodeTopLevel(<H256Value>value),
             onTypeIdentifier: () => this.tokenIdentifierCodec.encodeTopLevel(<TokenIdentifierValue>value),
+            onCodeMetadata: () => this.codeMetadataCodec.encodeTopLevel(<CodeMetadataValue>value),
             onNothing: () => this.nothingCodec.encodeTopLevel(),
         });
     }
diff --git a/src/smartcontracts/typesystem/index.ts b/src/smartcontracts/typesystem/index.ts
index f7bc39d45..85cc3b444 100644
--- a/src/smartcontracts/typesystem/index.ts
+++ b/src/smartcontracts/typesystem/index.ts
@@ -8,6 +8,7 @@ export * from "./address";
 export * from "./algebraic";
 export * from "./boolean";
 export * from "./bytes";
+export * from "./codeMetadata";
 export * from "./composite";
 export * from "./endpoint";
 export * from "./enum";
diff --git a/src/smartcontracts/typesystem/matchers.ts b/src/smartcontracts/typesystem/matchers.ts
index 43957d535..2b2f2fea6 100644
--- a/src/smartcontracts/typesystem/matchers.ts
+++ b/src/smartcontracts/typesystem/matchers.ts
@@ -2,18 +2,18 @@ import * as errors from "../../errors";
 import { AddressType, AddressValue } from "./address";
 import { BooleanType, BooleanValue } from "./boolean";
 import { BytesType, BytesValue } from "./bytes";
+import { CodeMetadataType, CodeMetadataValue } from "./codeMetadata";
 import { EnumType, EnumValue } from "./enum";
-import { OptionType, OptionValue, List, ListType } from "./generic";
+import { List, ListType, OptionType, OptionValue } from "./generic";
+import { ArrayVec, ArrayVecType } from "./genericArray";
 import { H256Type, H256Value } from "./h256";
-import { NumericalType, NumericalValue } from "./numerical";
 import { NothingType, NothingValue } from "./nothing";
+import { NumericalType, NumericalValue } from "./numerical";
+import { StringType, StringValue } from "./string";
 import { Struct, StructType } from "./struct";
 import { TokenIdentifierType, TokenIdentifierValue } from "./tokenIdentifier";
 import { Tuple, TupleType } from "./tuple";
-import { Type, PrimitiveType, PrimitiveValue } from "./types";
-import { ArrayVec, ArrayVecType } from "./genericArray";
-import { TypedValue } from "./types";
-import { StringType, StringValue } from "./string";
+import { PrimitiveType, PrimitiveValue, Type, TypedValue } from "./types";
 
 // TODO: Extend functionality or rename wrt. restricted / reduced functionality (not all types are handled: composite, variadic).
 export function onTypeSelect<TResult>(
@@ -110,6 +110,7 @@ export function onPrimitiveValueSelect<TResult>(
         onString: () => TResult;
         onH256: () => TResult;
         onTypeIdentifier: () => TResult;
+        onCodeMetadata: () => TResult;
         onNothing: () => TResult;
         onOther?: () => TResult;
     },
@@ -135,6 +136,9 @@ export function onPrimitiveValueSelect<TResult>(
     if (value.hasExactClass(TokenIdentifierValue.ClassName)) {
         return selectors.onTypeIdentifier();
     }
+    if (value.hasExactClass(CodeMetadataValue.ClassName)) {
+        return selectors.onCodeMetadata();
+    }
     if (value.hasExactClass(NothingValue.ClassName)) {
         return selectors.onNothing();
     }
@@ -155,6 +159,7 @@ export function onPrimitiveTypeSelect<TResult>(
         onString: () => TResult;
         onH256: () => TResult;
         onTokenIndetifier: () => TResult;
+        onCodeMetadata: () => TResult;
         onNothing: () => TResult;
         onOther?: () => TResult;
     },
@@ -180,6 +185,9 @@ export function onPrimitiveTypeSelect<TResult>(
     if (type.hasExactClass(TokenIdentifierType.ClassName)) {
         return selectors.onTokenIndetifier();
     }
+    if (type.hasExactClass(CodeMetadataType.ClassName)) {
+        return selectors.onCodeMetadata();
+    }
     if (type.hasExactClass(NothingType.ClassName)) {
         return selectors.onNothing();
     }

From 584d8a07ab917df2d057397972c63c5c1351b4e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Mon, 2 Sep 2024 13:25:10 +0300
Subject: [PATCH 231/338] Bump version.

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3b3cc1ad0..f3857b3e3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.4.2",
+  "version": "13.5.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.4.2",
+      "version": "13.5.0",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index 1299a5f24..2c162158e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.4.2",
+  "version": "13.5.0",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",

From c59657d6be3d9ebb0cdd6c9775b672b49582b285 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Tue, 3 Sep 2024 14:49:02 +0300
Subject: [PATCH 232/338] Extend managed Decimal

---
 src/abi/typeFormulaParser.ts                  |   2 +-
 src/smartcontracts/codec/managedDecimal.ts    |  46 +++++++++---------
 .../typesystem/managedDecimal.ts              |  14 +++++-
 src/smartcontracts/typesystem/typeMapper.ts   |  26 +++++++---
 src/smartcontracts/typesystem/types.ts        |   5 +-
 src/testdata/adder.abi.json                   |  19 ++++++++
 src/testdata/basic-features.wasm              | Bin 0 -> 64826 bytes
 7 files changed, 79 insertions(+), 33 deletions(-)
 create mode 100755 src/testdata/basic-features.wasm

diff --git a/src/abi/typeFormulaParser.ts b/src/abi/typeFormulaParser.ts
index e18683535..2a5824794 100644
--- a/src/abi/typeFormulaParser.ts
+++ b/src/abi/typeFormulaParser.ts
@@ -83,7 +83,7 @@ export class TypeFormulaParser {
     private acquireTypeWithParameters(stack: any[]): TypeFormula {
         const typeParameters = this.acquireTypeParameters(stack);
         const typeName = stack.pop();
-        if (typeName === "ManagedDecimal" || "ManagedDecimalSigned") {
+        if (typeName === "ManagedDecimal" || typeName === "ManagedDecimalSigned") {
             const typeFormula = new TypeFormula(typeName, [], typeParameters[0].name);
             return typeFormula;
         }
diff --git a/src/smartcontracts/codec/managedDecimal.ts b/src/smartcontracts/codec/managedDecimal.ts
index 04b6689ef..69dad84a7 100644
--- a/src/smartcontracts/codec/managedDecimal.ts
+++ b/src/smartcontracts/codec/managedDecimal.ts
@@ -1,6 +1,5 @@
 import BigNumber from "bignumber.js";
-import { ManagedDecimalType, ManagedDecimalValue, NumericalValue } from "../typesystem";
-import { BytesValue } from "../typesystem/bytes";
+import { BigUIntValue, ManagedDecimalType, ManagedDecimalValue, U64Value } from "../typesystem";
 import { BinaryCodec } from "./binary";
 import { cloneBuffer } from "./utils";
 
@@ -12,43 +11,42 @@ export class ManagedDecimalCodec {
     }
 
     decodeNested(buffer: Buffer, type: ManagedDecimalType): [ManagedDecimalValue, number] {
-        let [bytesValue, length] = this.binaryCodec.decodeNested(buffer);
-        console.log({ bytesValue, length });
+        let [bytesValue, length] = this.binaryCodec.decodeNested(buffer, type);
+        console.log(11111, { bytesValue });
         return [new ManagedDecimalValue(new BigNumber(1), 1), length];
     }
 
     decodeTopLevel(buffer: Buffer, type: ManagedDecimalType): ManagedDecimalValue {
         let payload = cloneBuffer(buffer);
-
         let empty = buffer.length == 0;
         if (empty) {
-            return new ManagedDecimalValue(new BigNumber(0));
+            return new ManagedDecimalValue(new BigNumber(0), type.getScale());
         }
 
-        let isPositive = !type.withSign || isMsbZero(payload);
-        if (isPositive) {
-            let value = bufferToBigInt(payload);
-            return new NumericalValue(type, value);
-        }
+        console.log({ bsc: type });
+        const decimalBuff = Buffer.from(this.binaryCodec.encodeTopLevel(new U64Value(type.getScale())));
+        const bigUintSize = buffer.length - decimalBuff.length; // Remaining bytes are for BigUInt
+        console.log({ buffer, l: buffer.length, d: decimalBuff.length, bigUintSize, decimalBuff, sc: type });
 
-        // Also see: https://github.com/multiversx/mx-components-big-int/blob/master/twos-complement/twos2bigint.go
-        flipBufferBitsInPlace(payload);
-        let value = bufferToBigInt(payload);
-        let negativeValue = value.multipliedBy(new BigNumber(-1));
-        let negativeValueMinusOne = negativeValue.minus(new BigNumber(1));
+        // Read BigUInt (dynamic size)
+        const bigUintBuffer = payload.slice(0, bigUintSize);
+        const u64Buffer = payload.slice(bigUintSize, payload.length);
+        const bigUint = new BigNumber(bigUintBuffer.toString("hex"), 16);
+        console.log({ payload, bigUintBuffer, u64Buffer });
+        const u64Value = new U64Value(u64Buffer.toString("hex")).toString();
 
-        return new NumericalValue(type, negativeValueMinusOne);
-        let bytesValue = this.binaryCodec.decodeTopLevel(buffer);
-        console.log({ bytesValue });
-        return new ManagedDecimalValue(new BigNumber(1), 1);
+        console.log({ payload, bigUintBuffer, u64Buffer, u64Value });
+        return new ManagedDecimalValue(bigUint, type.getScale());
     }
 
     encodeNested(value: ManagedDecimalValue): Buffer {
-        let bytesValue = new BytesValue(Buffer.from(value));
-        return this.binaryCodec.encodeNested(bytesValue);
+        let buffers: Buffer[] = [];
+        buffers.push(Buffer.from(this.binaryCodec.encodeTopLevel(new BigUIntValue(value.valueOf()))));
+        buffers.push(Buffer.from(this.binaryCodec.encodeTopLevel(new U64Value(value.getScale()))));
+        return Buffer.concat(buffers);
     }
 
-    encodeTopLevel(tokenIdentifier: ManagedDecimalValue): Buffer {
-        return Buffer.from(tokenIdentifier.valueOf());
+    encodeTopLevel(value: ManagedDecimalValue): Buffer {
+        return this.encodeNested(value);
     }
 }
diff --git a/src/smartcontracts/typesystem/managedDecimal.ts b/src/smartcontracts/typesystem/managedDecimal.ts
index eb5f19e5f..bb48a426e 100644
--- a/src/smartcontracts/typesystem/managedDecimal.ts
+++ b/src/smartcontracts/typesystem/managedDecimal.ts
@@ -13,6 +13,10 @@ export class ManagedDecimalType extends Type {
     getClassName(): string {
         return ManagedDecimalType.ClassName;
     }
+
+    getScale(): number {
+        return this.scale;
+    }
 }
 
 export class ManagedDecimalValue extends TypedValue {
@@ -30,6 +34,10 @@ export class ManagedDecimalValue extends TypedValue {
         return ManagedDecimalValue.ClassName;
     }
 
+    getScale(): number {
+        return this.scale;
+    }
+
     getPrecision(): number {
         return this.value.toString(this.scale).replace(".", "").length;
     }
@@ -50,7 +58,7 @@ export class ManagedDecimalValue extends TypedValue {
     }
 
     toString(): string {
-        return this.value.toString();
+        return this.value.toFixed(this.scale);
     }
 }
 
@@ -66,6 +74,10 @@ export class ManagedDecimalSignedType extends Type {
     getClassName(): string {
         return ManagedDecimalType.ClassName;
     }
+
+    getScale(): number {
+        return this.scale;
+    }
 }
 
 export class ManagedDecimalSignedValue extends TypedValue {
diff --git a/src/smartcontracts/typesystem/typeMapper.ts b/src/smartcontracts/typesystem/typeMapper.ts
index 3ea9a5e42..e156b71f6 100644
--- a/src/smartcontracts/typesystem/typeMapper.ts
+++ b/src/smartcontracts/typesystem/typeMapper.ts
@@ -10,7 +10,7 @@ import { FieldDefinition } from "./fields";
 import { ListType, OptionType } from "./generic";
 import { ArrayVecType } from "./genericArray";
 import { H256Type } from "./h256";
-import { ManagedDecimalType } from "./managedDecimal";
+import { ManagedDecimalSignedType, ManagedDecimalType } from "./managedDecimal";
 import { NothingType } from "./nothing";
 import {
     BigIntType,
@@ -32,14 +32,15 @@ import { CustomType, Type } from "./types";
 import { VariadicType } from "./variadic";
 
 type TypeFactory = (...typeParameters: Type[]) => Type;
+type TypeWithMetadataFactory = (...metadata: any) => Type;
 
 export class TypeMapper {
-    private readonly openTypesFactories: Map<string, TypeFactory>;
+    private readonly openTypesFactories: Map<string, TypeFactory | TypeWithMetadataFactory>;
     private readonly closedTypesMap: Map<string, Type>;
     private readonly learnedTypesMap: Map<string, Type>;
 
     constructor(learnedTypes: CustomType[] = []) {
-        this.openTypesFactories = new Map<string, TypeFactory>([
+        this.openTypesFactories = new Map<string, TypeFactory | TypeWithMetadataFactory>([
             ["Option", (...typeParameters: Type[]) => new OptionType(typeParameters[0])],
             ["List", (...typeParameters: Type[]) => new ListType(typeParameters[0])],
             // For the following open generics, we use a slightly different typing than the one defined by mx-sdk-rs (temporary workaround).
@@ -76,6 +77,7 @@ export class TypeMapper {
             ["array128", (...typeParameters: Type[]) => new ArrayVecType(128, typeParameters[0])],
             ["array256", (...typeParameters: Type[]) => new ArrayVecType(256, typeParameters[0])],
             ["ManagedDecimal", (...metadata: any) => new ManagedDecimalType(parseInt(metadata))],
+            ["ManagedDecimalSigned", (...metadata: any) => new ManagedDecimalSignedType(parseInt(metadata))],
         ]);
 
         // For closed types, we hold actual type instances instead of type constructors / factories (no type parameters needed).
@@ -108,7 +110,11 @@ export class TypeMapper {
 
         // Boostrap from previously learned types, if any.
         for (const type of learnedTypes) {
-            this.learnedTypesMap.set(type.getName(), type);
+            if (type.getName() === "ManagedDecimal" || type.getName() === "ManagedDecimalSigned") {
+                this.learnedTypesMap.set(`${type.getName()}_${type.getMetadata()}`, type);
+            } else {
+                this.learnedTypesMap.set(type.getName(), type);
+            }
         }
     }
 
@@ -167,8 +173,13 @@ export class TypeMapper {
     }
 
     private learnType(type: Type): void {
-        this.learnedTypesMap.delete(type.getName());
-        this.learnedTypesMap.set(type.getName(), type);
+        if (type.getName() === "ManagedDecimal" || type.getName() === "ManagedDecimalSigned") {
+            this.learnedTypesMap.delete(type.getName());
+            this.learnedTypesMap.set(`${type.getName()}_${type.getMetadata()}`, type);
+        } else {
+            this.learnedTypesMap.delete(type.getName());
+            this.learnedTypesMap.set(type.getName(), type);
+        }
     }
 
     private mapStructType(type: StructType): StructType {
@@ -204,6 +215,9 @@ export class TypeMapper {
         if (!factory) {
             throw new errors.ErrTypingSystem(`Cannot map the generic type "${type.getName()}" to a known type`);
         }
+        if (type.hasMetadata()) {
+            return factory(type.getMetadata());
+        }
 
         return factory(...mappedTypeParameters);
     }
diff --git a/src/smartcontracts/typesystem/types.ts b/src/smartcontracts/typesystem/types.ts
index 9f9e8382d..b6bb20b3a 100644
--- a/src/smartcontracts/typesystem/types.ts
+++ b/src/smartcontracts/typesystem/types.ts
@@ -20,7 +20,6 @@ export class Type {
         metadata?: any,
     ) {
         guardValueIsSet("name", name);
-
         this.name = name;
         this.typeParameters = typeParameters;
         this.cardinality = cardinality;
@@ -67,6 +66,10 @@ export class Type {
         return this.typeParameters;
     }
 
+    getMetadata(): any {
+        return this.metadata;
+    }
+
     isGenericType(): boolean {
         return this.typeParameters.length > 0;
     }
diff --git a/src/testdata/adder.abi.json b/src/testdata/adder.abi.json
index 1786ce214..7bfbf6fec 100644
--- a/src/testdata/adder.abi.json
+++ b/src/testdata/adder.abi.json
@@ -64,6 +64,25 @@
                 }
             ]
         },
+        {
+            "name": "managed_decimal_subtraction",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "first",
+                    "type": "ManagedDecimal<2>"
+                },
+                {
+                    "name": "second",
+                    "type": "ManagedDecimal<2>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "ManagedDecimal<2>"
+                }
+            ]
+        },
         {
             "docs": [
                 "Add desired amount to the storage variable."
diff --git a/src/testdata/basic-features.wasm b/src/testdata/basic-features.wasm
new file mode 100755
index 0000000000000000000000000000000000000000..a0da77ca88511f08f401fcc35d94dede9ca8865a
GIT binary patch
literal 64826
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

literal 0
HcmV?d00001


From ad8d5818a148facf27795a0b62276c3dd6f0d1d5 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 4 Sep 2024 12:33:49 +0300
Subject: [PATCH 233/338] Add basic feature abi and update tests

---
 src/abi/typeFormulaParser.ts                  |   7 +-
 src/smartcontracts/codec/managedDecimal.ts    |   1 -
 .../interaction.local.net.spec.ts             |  81 +++++
 src/testdata/basic-features.abi.json          | 334 ++++++++++++++++++
 4 files changed, 419 insertions(+), 4 deletions(-)
 create mode 100644 src/testdata/basic-features.abi.json

diff --git a/src/abi/typeFormulaParser.ts b/src/abi/typeFormulaParser.ts
index 2a5824794..ede40443e 100644
--- a/src/abi/typeFormulaParser.ts
+++ b/src/abi/typeFormulaParser.ts
@@ -12,7 +12,6 @@ export class TypeFormulaParser {
 
     parseExpression(expression: string): TypeFormula {
         expression = expression.trim();
-
         const tokens = this.tokenizeExpression(expression).filter((token) => token !== TypeFormulaParser.COMMA);
         const stack: any[] = [];
 
@@ -31,8 +30,9 @@ export class TypeFormulaParser {
                 // It's a type name. We push it as a simple string.
                 stack.push(token);
             }
+            console.log({ stack });
         }
-
+        console.log({ stack: JSON.stringify(stack) });
         if (stack.length !== 1) {
             throw new Error(`Unexpected stack length at end of parsing: ${stack.length}`);
         }
@@ -83,6 +83,7 @@ export class TypeFormulaParser {
     private acquireTypeWithParameters(stack: any[]): TypeFormula {
         const typeParameters = this.acquireTypeParameters(stack);
         const typeName = stack.pop();
+
         if (typeName === "ManagedDecimal" || typeName === "ManagedDecimalSigned") {
             const typeFormula = new TypeFormula(typeName, [], typeParameters[0].name);
             return typeFormula;
@@ -96,7 +97,7 @@ export class TypeFormulaParser {
 
         while (true) {
             const item = stack.pop();
-
+            console.log({ item });
             if (item === undefined) {
                 throw new Error("Badly specified type parameters");
             }
diff --git a/src/smartcontracts/codec/managedDecimal.ts b/src/smartcontracts/codec/managedDecimal.ts
index 69dad84a7..b6b9a7d87 100644
--- a/src/smartcontracts/codec/managedDecimal.ts
+++ b/src/smartcontracts/codec/managedDecimal.ts
@@ -42,7 +42,6 @@ export class ManagedDecimalCodec {
     encodeNested(value: ManagedDecimalValue): Buffer {
         let buffers: Buffer[] = [];
         buffers.push(Buffer.from(this.binaryCodec.encodeTopLevel(new BigUIntValue(value.valueOf()))));
-        buffers.push(Buffer.from(this.binaryCodec.encodeTopLevel(new U64Value(value.getScale()))));
         return Buffer.concat(buffers);
     }
 
diff --git a/src/smartcontracts/interaction.local.net.spec.ts b/src/smartcontracts/interaction.local.net.spec.ts
index 16247af5f..939e6326a 100644
--- a/src/smartcontracts/interaction.local.net.spec.ts
+++ b/src/smartcontracts/interaction.local.net.spec.ts
@@ -15,6 +15,7 @@ import { ResultsParser } from "./resultsParser";
 import { TransactionWatcher } from "../transactionWatcher";
 import { SmartContractQueriesController } from "../smartContractQueriesController";
 import { QueryRunnerAdapter } from "../adapters/queryRunnerAdapter";
+import { ManagedDecimalValue } from "./typesystem";
 
 describe("test smart contract interactor", function () {
     let provider = createLocalnetProvider();
@@ -184,6 +185,86 @@ describe("test smart contract interactor", function () {
         assert.isTrue(typedBundle.returnCode.equals(ReturnCode.Ok));
     });
 
+    it.only("should interact with 'basic-features' (local testnet) using the SmartContractTransactionsFactory", async function () {
+        this.timeout(140000);
+
+        let abiRegistry = await loadAbiRegistry("src/testdata/basic-features.abi.json");
+        let contract = new SmartContract({ abi: abiRegistry });
+        let controller = new ContractController(provider);
+
+        let network = await provider.getNetworkConfig();
+        await alice.sync(provider);
+
+        // Deploy the contract
+        let deployTransaction = await prepareDeployment({
+            contract: contract,
+            deployer: alice,
+            codePath: "src/testdata/basic-features.wasm",
+            gasLimit: 600000000,
+            initArguments: [],
+            chainID: network.ChainID,
+        });
+
+        let {
+            bundle: { returnCode },
+        } = await controller.deploy(deployTransaction);
+        assert.isTrue(returnCode.isSuccess());
+
+        // let startInteraction = <Interaction>(
+        //     contract.methods
+        //         .returns_egld_decimal([])
+        //         .withGasLimit(8000000)
+        //         .withChainID(network.ChainID)
+        //         .withSender(alice.address)
+        //         .withValue(1)
+        // );
+
+        // // start()
+        // let startTransaction = startInteraction
+        //     .withSender(alice.address)
+        //     .useThenIncrementNonceOf(alice.account)
+        //     .buildTransaction();
+
+        let additionInteraction = <Interaction>contract.methods
+            .managed_decimal_addition([new ManagedDecimalValue(122, 5), new ManagedDecimalValue(3, 6)])
+            .withGasLimit(10000000)
+            .withChainID(network.ChainID)
+            .withSender(alice.address)
+            .withValue(0);
+
+        // addition()
+        let additionTransaction = additionInteraction
+            .withSender(alice.address)
+            .useThenIncrementNonceOf(alice.account)
+            .buildTransaction();
+
+        // let mdLnInteraction = <Interaction>contract.methods
+        //     .managed_decimal_ln([new ManagedDecimalValue(23, 9)])
+        //     .withGasLimit(10000000)
+        //     .withChainID(network.ChainID)
+        //     .withSender(alice.address)
+        //     .withValue(0);
+
+        // // mdLn()
+        // let mdLnTransaction = mdLnInteraction
+        //     .withSender(alice.address)
+        //     .useThenIncrementNonceOf(alice.account)
+        //     .buildTransaction();
+
+        // await signTransaction({ transaction: startTransaction, wallet: alice });
+        // let { bundle: bundleStart } = await controller.execute(startInteraction, startTransaction);
+        // assert.isTrue(bundleStart.returnCode.equals(ReturnCode.Ok));
+        // assert.lengthOf(bundleStart.values, 1);
+        // assert.deepEqual(bundleStart.values[0], new ManagedDecimalValue(1, 18));
+
+        await signTransaction({ transaction: additionTransaction, wallet: alice });
+        let { bundle: bundleAddition } = await controller.execute(additionInteraction, additionTransaction);
+        assert.isTrue(bundleAddition.returnCode.equals(ReturnCode.Ok));
+        assert.lengthOf(bundleAddition.values, 1);
+        assert.deepEqual(bundleAddition.values[0], new ManagedDecimalValue(new BigNumber(5), 2));
+        // assert.deepEqual(bundleAddition.values[0], new ManagedDecimalValue(new BigNumber(3.135553845), 9));
+    });
+
     it("should interact with 'counter' (local testnet)", async function () {
         this.timeout(120000);
 
diff --git a/src/testdata/basic-features.abi.json b/src/testdata/basic-features.abi.json
new file mode 100644
index 000000000..2103af908
--- /dev/null
+++ b/src/testdata/basic-features.abi.json
@@ -0,0 +1,334 @@
+{
+    "buildInfo": {
+        "rustc": {
+            "version": "1.80.0",
+            "commitHash": "051478957371ee0084a7c0913941d2a8c4757bb9",
+            "commitDate": "2024-07-21",
+            "channel": "Stable",
+            "short": "rustc 1.80.0 (051478957 2024-07-21)"
+        },
+        "contractCrate": {
+            "name": "basic-features",
+            "version": "0.0.0",
+            "gitVersion": "v0.52.3-10-gd1f19c0d4"
+        },
+        "framework": {
+            "name": "multiversx-sc",
+            "version": "0.52.3"
+        }
+    },
+    "name": "BasicFeatures",
+    "constructor": {
+        "inputs": [],
+        "outputs": []
+    },
+    "endpoints": [
+        {
+            "name": "managed_decimal_addition",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "first",
+                    "type": "ManagedDecimal<2>"
+                },
+                {
+                    "name": "second",
+                    "type": "ManagedDecimal<2>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "ManagedDecimal<2>"
+                }
+            ]
+        },
+        {
+            "name": "managed_decimal_subtraction",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "first",
+                    "type": "ManagedDecimal<2>"
+                },
+                {
+                    "name": "second",
+                    "type": "ManagedDecimal<2>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "ManagedDecimal<2>"
+                }
+            ]
+        },
+        {
+            "name": "managed_decimal_eq",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "first",
+                    "type": "ManagedDecimal<2>"
+                },
+                {
+                    "name": "second",
+                    "type": "ManagedDecimal<2>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "managed_decimal_trunc",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "managed_decimal_into_raw_units",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "managed_decimal_ln",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "x",
+                    "type": "ManagedDecimal<9>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "ManagedDecimalSigned<9>"
+                }
+            ]
+        },
+        {
+            "name": "managed_decimal_log2",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "x",
+                    "type": "ManagedDecimal<9>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "ManagedDecimalSigned<9>"
+                }
+            ]
+        }
+    ],
+    "events": [
+        {
+            "identifier": "event_err_topic",
+            "inputs": [
+                {
+                    "name": "err_topic",
+                    "type": "CodecErrorTestType",
+                    "indexed": true
+                }
+            ]
+        },
+        {
+            "identifier": "event_err_data",
+            "inputs": [
+                {
+                    "name": "data",
+                    "type": "CodecErrorTestType"
+                }
+            ]
+        },
+        {
+            "identifier": "event_a",
+            "inputs": [
+                {
+                    "name": "data",
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "identifier": "event_b",
+            "inputs": [
+                {
+                    "name": "arg1",
+                    "type": "BigUint",
+                    "indexed": true
+                },
+                {
+                    "name": "arg2",
+                    "type": "Address",
+                    "indexed": true
+                },
+                {
+                    "name": "data",
+                    "type": "List<bytes>"
+                }
+            ]
+        }
+    ],
+    "esdtAttributes": [],
+    "hasCallback": true,
+    "types": {
+        "CodecErrorTestType": {
+            "type": "struct",
+            "docs": [
+                "Helper type to explore encode/decode errors."
+            ]
+        },
+        "EsdtTokenPayment": {
+            "type": "struct",
+            "fields": [
+                {
+                    "name": "token_identifier",
+                    "type": "TokenIdentifier"
+                },
+                {
+                    "name": "token_nonce",
+                    "type": "u64"
+                },
+                {
+                    "name": "amount",
+                    "type": "BigUint"
+                }
+            ]
+        },
+        "ExampleEnumSimple": {
+            "type": "enum",
+            "docs": [
+                "Copied from multiversx-sc serialization tests."
+            ],
+            "variants": [
+                {
+                    "docs": [
+                        "Variant 0 doc comment.",
+                        "This will show up in the ABI."
+                    ],
+                    "name": "Variant0",
+                    "discriminant": 0
+                },
+                {
+                    "name": "Variant1",
+                    "discriminant": 1
+                },
+                {
+                    "docs": [
+                        "One line is enough. The one above doesn't have any."
+                    ],
+                    "name": "Variant2",
+                    "discriminant": 2
+                }
+            ]
+        },
+        "ExampleEnumWithFields": {
+            "type": "enum",
+            "docs": [
+                "Copied from multiversx-sc serialization tests."
+            ],
+            "variants": [
+                {
+                    "name": "Unit",
+                    "discriminant": 0
+                },
+                {
+                    "name": "Newtype",
+                    "discriminant": 1,
+                    "fields": [
+                        {
+                            "name": "0",
+                            "type": "u32"
+                        }
+                    ]
+                },
+                {
+                    "name": "Tuple",
+                    "discriminant": 2,
+                    "fields": [
+                        {
+                            "name": "0",
+                            "type": "u32"
+                        },
+                        {
+                            "name": "1",
+                            "type": "u32"
+                        }
+                    ]
+                },
+                {
+                    "name": "Struct",
+                    "discriminant": 3,
+                    "fields": [
+                        {
+                            "name": "a",
+                            "type": "u32"
+                        }
+                    ]
+                }
+            ]
+        },
+        "ExampleStructManaged": {
+            "type": "struct",
+            "fields": [
+                {
+                    "name": "big_uint",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "int",
+                    "type": "u32"
+                },
+                {
+                    "name": "bytes",
+                    "type": "bytes"
+                }
+            ]
+        },
+        "RgbColor": {
+            "type": "struct",
+            "fields": [
+                {
+                    "name": "r",
+                    "type": "u8"
+                },
+                {
+                    "name": "g",
+                    "type": "u8"
+                },
+                {
+                    "name": "b",
+                    "type": "u8"
+                }
+            ]
+        },
+        "TokenAttributesStruct": {
+            "type": "struct",
+            "fields": [
+                {
+                    "name": "field_biguint",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "field_u64",
+                    "type": "u64"
+                },
+                {
+                    "name": "field_vec_u32",
+                    "type": "List<u32>"
+                }
+            ]
+        }
+    }
+}

From ab476cfeb14a43b734424d91000e504f4420daea Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 5 Sep 2024 11:06:14 +0300
Subject: [PATCH 234/338] Clean up colsole logs

---
 src/abi/typeFormulaParser.ts                  |    5 +-
 src/smartcontracts/codec/managedDecimal.ts    |   39 +-
 .../interaction.local.net.spec.ts             |  106 +-
 .../typesystem/managedDecimal.ts              |   19 +-
 src/smartcontracts/typesystem/typeMapper.ts   |    4 +-
 src/testdata/basic-features.abi.json          | 5859 ++++++++++++++++-
 src/testdata/basic-features.wasm              |  Bin 64826 -> 87521 bytes
 .../smartContractTransactionsFactory.spec.ts  |   56 +-
 ...tContractTransactionsOutcomeParser.spec.ts |    2 +-
 9 files changed, 6013 insertions(+), 77 deletions(-)
 mode change 100755 => 100644 src/testdata/basic-features.wasm

diff --git a/src/abi/typeFormulaParser.ts b/src/abi/typeFormulaParser.ts
index ede40443e..7806cd0cb 100644
--- a/src/abi/typeFormulaParser.ts
+++ b/src/abi/typeFormulaParser.ts
@@ -30,9 +30,7 @@ export class TypeFormulaParser {
                 // It's a type name. We push it as a simple string.
                 stack.push(token);
             }
-            console.log({ stack });
         }
-        console.log({ stack: JSON.stringify(stack) });
         if (stack.length !== 1) {
             throw new Error(`Unexpected stack length at end of parsing: ${stack.length}`);
         }
@@ -88,7 +86,7 @@ export class TypeFormulaParser {
             const typeFormula = new TypeFormula(typeName, [], typeParameters[0].name);
             return typeFormula;
         }
-        const typeFormula = new TypeFormula(typeName, typeParameters);
+        const typeFormula = new TypeFormula(typeName, typeParameters.reverse());
         return typeFormula;
     }
 
@@ -97,7 +95,6 @@ export class TypeFormulaParser {
 
         while (true) {
             const item = stack.pop();
-            console.log({ item });
             if (item === undefined) {
                 throw new Error("Badly specified type parameters");
             }
diff --git a/src/smartcontracts/codec/managedDecimal.ts b/src/smartcontracts/codec/managedDecimal.ts
index b6b9a7d87..976e7cc4c 100644
--- a/src/smartcontracts/codec/managedDecimal.ts
+++ b/src/smartcontracts/codec/managedDecimal.ts
@@ -1,7 +1,7 @@
 import BigNumber from "bignumber.js";
-import { BigUIntValue, ManagedDecimalType, ManagedDecimalValue, U64Value } from "../typesystem";
+import { BigUIntValue, ManagedDecimalType, ManagedDecimalValue, U32Value, U64Value } from "../typesystem";
 import { BinaryCodec } from "./binary";
-import { cloneBuffer } from "./utils";
+import { bufferToBigInt, cloneBuffer } from "./utils";
 
 export class ManagedDecimalCodec {
     private readonly binaryCodec: BinaryCodec;
@@ -12,7 +12,6 @@ export class ManagedDecimalCodec {
 
     decodeNested(buffer: Buffer, type: ManagedDecimalType): [ManagedDecimalValue, number] {
         let [bytesValue, length] = this.binaryCodec.decodeNested(buffer, type);
-        console.log(11111, { bytesValue });
         return [new ManagedDecimalValue(new BigNumber(1), 1), length];
     }
 
@@ -20,28 +19,34 @@ export class ManagedDecimalCodec {
         let payload = cloneBuffer(buffer);
         let empty = buffer.length == 0;
         if (empty) {
-            return new ManagedDecimalValue(new BigNumber(0), type.getScale());
+            return new ManagedDecimalValue(new BigNumber(0), 2);
         }
 
-        console.log({ bsc: type });
-        const decimalBuff = Buffer.from(this.binaryCodec.encodeTopLevel(new U64Value(type.getScale())));
-        const bigUintSize = buffer.length - decimalBuff.length; // Remaining bytes are for BigUInt
-        console.log({ buffer, l: buffer.length, d: decimalBuff.length, bigUintSize, decimalBuff, sc: type });
+        if (type.getMetadata() == "usize") {
+            const u32Size = 4;
+            const bigUintSize = buffer.length - u32Size;
 
-        // Read BigUInt (dynamic size)
-        const bigUintBuffer = payload.slice(0, bigUintSize);
-        const u64Buffer = payload.slice(bigUintSize, payload.length);
-        const bigUint = new BigNumber(bigUintBuffer.toString("hex"), 16);
-        console.log({ payload, bigUintBuffer, u64Buffer });
-        const u64Value = new U64Value(u64Buffer.toString("hex")).toString();
+            // Read BigUInt (dynamic size)
+            const bigUintBuffer = buffer.slice(0, bigUintSize);
+            const bigUint = new BigNumber(bigUintBuffer.toString("hex"), 16);
 
-        console.log({ payload, bigUintBuffer, u64Buffer, u64Value });
-        return new ManagedDecimalValue(bigUint, type.getScale());
+            const u32Offset = bigUintSize;
+            const u32 = buffer.readUInt32BE(u32Offset);
+            return new ManagedDecimalValue(bigUint, parseInt(u32.toString()));
+        }
+        let value = bufferToBigInt(payload);
+        return new ManagedDecimalValue(value, parseInt(type.getMetadata()));
     }
 
     encodeNested(value: ManagedDecimalValue): Buffer {
+        value.getType().getMetadata();
         let buffers: Buffer[] = [];
-        buffers.push(Buffer.from(this.binaryCodec.encodeTopLevel(new BigUIntValue(value.valueOf()))));
+        if (value.getType().getMetadata() == "usize") {
+            buffers.push(Buffer.from(this.binaryCodec.encodeNested(new BigUIntValue(value.valueOf()))));
+            buffers.push(Buffer.from(this.binaryCodec.encodeNested(new U32Value(value.getScale()))));
+        } else {
+            buffers.push(Buffer.from(this.binaryCodec.encodeTopLevel(new BigUIntValue(value.valueOf()))));
+        }
         return Buffer.concat(buffers);
     }
 
diff --git a/src/smartcontracts/interaction.local.net.spec.ts b/src/smartcontracts/interaction.local.net.spec.ts
index 939e6326a..6280181b8 100644
--- a/src/smartcontracts/interaction.local.net.spec.ts
+++ b/src/smartcontracts/interaction.local.net.spec.ts
@@ -15,7 +15,7 @@ import { ResultsParser } from "./resultsParser";
 import { TransactionWatcher } from "../transactionWatcher";
 import { SmartContractQueriesController } from "../smartContractQueriesController";
 import { QueryRunnerAdapter } from "../adapters/queryRunnerAdapter";
-import { ManagedDecimalValue } from "./typesystem";
+import { ManagedDecimalSignedValue, ManagedDecimalValue } from "./typesystem";
 
 describe("test smart contract interactor", function () {
     let provider = createLocalnetProvider();
@@ -210,23 +210,23 @@ describe("test smart contract interactor", function () {
         } = await controller.deploy(deployTransaction);
         assert.isTrue(returnCode.isSuccess());
 
-        // let startInteraction = <Interaction>(
-        //     contract.methods
-        //         .returns_egld_decimal([])
-        //         .withGasLimit(8000000)
-        //         .withChainID(network.ChainID)
-        //         .withSender(alice.address)
-        //         .withValue(1)
-        // );
-
-        // // start()
-        // let startTransaction = startInteraction
-        //     .withSender(alice.address)
-        //     .useThenIncrementNonceOf(alice.account)
-        //     .buildTransaction();
+        let returnEgldInteraction = <Interaction>(
+            contract.methods
+                .returns_egld_decimal([])
+                .withGasLimit(10000000)
+                .withChainID(network.ChainID)
+                .withSender(alice.address)
+                .withValue(1)
+        );
+
+        // returnEgld()
+        let returnEgldTransaction = returnEgldInteraction
+            .withSender(alice.address)
+            .useThenIncrementNonceOf(alice.account)
+            .buildTransaction();
 
         let additionInteraction = <Interaction>contract.methods
-            .managed_decimal_addition([new ManagedDecimalValue(122, 5), new ManagedDecimalValue(3, 6)])
+            .managed_decimal_addition([new ManagedDecimalValue(2, 2), new ManagedDecimalValue(3, 2)])
             .withGasLimit(10000000)
             .withChainID(network.ChainID)
             .withSender(alice.address)
@@ -238,31 +238,63 @@ describe("test smart contract interactor", function () {
             .useThenIncrementNonceOf(alice.account)
             .buildTransaction();
 
-        // let mdLnInteraction = <Interaction>contract.methods
-        //     .managed_decimal_ln([new ManagedDecimalValue(23, 9)])
-        //     .withGasLimit(10000000)
-        //     .withChainID(network.ChainID)
-        //     .withSender(alice.address)
-        //     .withValue(0);
-
-        // // mdLn()
-        // let mdLnTransaction = mdLnInteraction
-        //     .withSender(alice.address)
-        //     .useThenIncrementNonceOf(alice.account)
-        //     .buildTransaction();
-
-        // await signTransaction({ transaction: startTransaction, wallet: alice });
-        // let { bundle: bundleStart } = await controller.execute(startInteraction, startTransaction);
-        // assert.isTrue(bundleStart.returnCode.equals(ReturnCode.Ok));
-        // assert.lengthOf(bundleStart.values, 1);
-        // assert.deepEqual(bundleStart.values[0], new ManagedDecimalValue(1, 18));
+        // log
+        let mdLnInteraction = <Interaction>contract.methods
+            .managed_decimal_ln([new ManagedDecimalValue(23, 9)])
+            .withGasLimit(10000000)
+            .withChainID(network.ChainID)
+            .withSender(alice.address)
+            .withValue(0);
+
+        // mdLn()
+        let mdLnTransaction = mdLnInteraction
+            .withSender(alice.address)
+            .useThenIncrementNonceOf(alice.account)
+            .buildTransaction();
+
+        let additionVarInteraction = <Interaction>contract.methods
+            .managed_decimal_addition_var([
+                new ManagedDecimalValue(378298000000, 9, true),
+                new ManagedDecimalValue(378298000000, 9, true),
+            ])
+            .withGasLimit(50000000)
+            .withChainID(network.ChainID)
+            .withSender(alice.address)
+            .withValue(0);
+
+        // addition()
+        let additionVarTransaction = additionVarInteraction
+            .withSender(alice.address)
+            .useThenIncrementNonceOf(alice.account)
+            .buildTransaction();
+
+        // returnEgld()
+        await signTransaction({ transaction: returnEgldTransaction, wallet: alice });
+        let { bundle: bundleEgld } = await controller.execute(returnEgldInteraction, returnEgldTransaction);
+        assert.isTrue(bundleEgld.returnCode.equals(ReturnCode.Ok));
+        assert.lengthOf(bundleEgld.values, 1);
+        assert.deepEqual(bundleEgld.values[0], new ManagedDecimalValue(1, 18));
 
+        // addition with const decimals()
         await signTransaction({ transaction: additionTransaction, wallet: alice });
-        let { bundle: bundleAddition } = await controller.execute(additionInteraction, additionTransaction);
+        let { bundle: bundleAdditionConst } = await controller.execute(additionInteraction, additionTransaction);
+        assert.isTrue(bundleAdditionConst.returnCode.equals(ReturnCode.Ok));
+        assert.lengthOf(bundleAdditionConst.values, 1);
+        assert.deepEqual(bundleAdditionConst.values[0], new ManagedDecimalValue(5, 2));
+
+        // log
+        await signTransaction({ transaction: mdLnTransaction, wallet: alice });
+        let { bundle: bundleMDLn } = await controller.execute(mdLnInteraction, mdLnTransaction);
+        assert.isTrue(bundleMDLn.returnCode.equals(ReturnCode.Ok));
+        assert.lengthOf(bundleMDLn.values, 1);
+        assert.deepEqual(bundleMDLn.values[0], new ManagedDecimalSignedValue(3.135553845, 9));
+
+        // addition with var decimals
+        await signTransaction({ transaction: additionVarTransaction, wallet: alice });
+        let { bundle: bundleAddition } = await controller.execute(additionVarInteraction, additionVarTransaction);
         assert.isTrue(bundleAddition.returnCode.equals(ReturnCode.Ok));
         assert.lengthOf(bundleAddition.values, 1);
-        assert.deepEqual(bundleAddition.values[0], new ManagedDecimalValue(new BigNumber(5), 2));
-        // assert.deepEqual(bundleAddition.values[0], new ManagedDecimalValue(new BigNumber(3.135553845), 9));
+        assert.deepEqual(bundleAddition.values[0], new ManagedDecimalValue(new BigNumber(6254154138880), 9));
     });
 
     it("should interact with 'counter' (local testnet)", async function () {
diff --git a/src/smartcontracts/typesystem/managedDecimal.ts b/src/smartcontracts/typesystem/managedDecimal.ts
index bb48a426e..39b6f2332 100644
--- a/src/smartcontracts/typesystem/managedDecimal.ts
+++ b/src/smartcontracts/typesystem/managedDecimal.ts
@@ -3,19 +3,18 @@ import { Type, TypedValue } from "./types";
 
 export class ManagedDecimalType extends Type {
     static ClassName = "ManagedDecimalType";
-    private readonly scale: number;
+    private readonly scale: any;
 
-    constructor(scale: number) {
-        super("ManagedDecimal", undefined, undefined, scale);
-        this.scale = scale;
+    constructor(metadata: any) {
+        super("ManagedDecimal", undefined, undefined, metadata);
     }
 
     getClassName(): string {
         return ManagedDecimalType.ClassName;
     }
 
-    getScale(): number {
-        return this.scale;
+    getMetadata(): string {
+        return this.metadata;
     }
 }
 
@@ -24,8 +23,8 @@ export class ManagedDecimalValue extends TypedValue {
     private readonly value: BigNumber;
     private readonly scale: number;
 
-    constructor(value: BigNumber.Value, scale: number) {
-        super(new ManagedDecimalType(scale));
+    constructor(value: BigNumber.Value, scale: number, isVar: boolean = false) {
+        super(new ManagedDecimalType(isVar ? "usize" : scale));
         this.value = new BigNumber(value);
         this.scale = scale;
     }
@@ -85,9 +84,9 @@ export class ManagedDecimalSignedValue extends TypedValue {
     private readonly value: BigNumber;
     private readonly scale: number;
 
-    constructor(value: BigNumber, scale: number) {
+    constructor(value: BigNumber.Value, scale: number) {
         super(new ManagedDecimalType(scale));
-        this.value = value;
+        this.value = new BigNumber(value);
         this.scale = scale;
     }
 
diff --git a/src/smartcontracts/typesystem/typeMapper.ts b/src/smartcontracts/typesystem/typeMapper.ts
index e156b71f6..0c5fa0e82 100644
--- a/src/smartcontracts/typesystem/typeMapper.ts
+++ b/src/smartcontracts/typesystem/typeMapper.ts
@@ -76,8 +76,8 @@ export class TypeMapper {
             ["array64", (...typeParameters: Type[]) => new ArrayVecType(64, typeParameters[0])],
             ["array128", (...typeParameters: Type[]) => new ArrayVecType(128, typeParameters[0])],
             ["array256", (...typeParameters: Type[]) => new ArrayVecType(256, typeParameters[0])],
-            ["ManagedDecimal", (...metadata: any) => new ManagedDecimalType(parseInt(metadata))],
-            ["ManagedDecimalSigned", (...metadata: any) => new ManagedDecimalSignedType(parseInt(metadata))],
+            ["ManagedDecimal", (...metadata: any) => new ManagedDecimalType(metadata)],
+            ["ManagedDecimalSigned", (...metadata: any) => new ManagedDecimalSignedType(metadata)],
         ]);
 
         // For closed types, we hold actual type instances instead of type constructors / factories (no type parameters needed).
diff --git a/src/testdata/basic-features.abi.json b/src/testdata/basic-features.abi.json
index 2103af908..762e044c8 100644
--- a/src/testdata/basic-features.abi.json
+++ b/src/testdata/basic-features.abi.json
@@ -1,16 +1,16 @@
 {
     "buildInfo": {
         "rustc": {
-            "version": "1.80.0",
-            "commitHash": "051478957371ee0084a7c0913941d2a8c4757bb9",
-            "commitDate": "2024-07-21",
+            "version": "1.80.1",
+            "commitHash": "3f5fd8dd41153bc5fdca9427e9e05be2c767ba23",
+            "commitDate": "2024-08-06",
             "channel": "Stable",
-            "short": "rustc 1.80.0 (051478957 2024-07-21)"
+            "short": "rustc 1.80.1 (3f5fd8dd4 2024-08-06)"
         },
         "contractCrate": {
             "name": "basic-features",
             "version": "0.0.0",
-            "gitVersion": "v0.52.3-10-gd1f19c0d4"
+            "gitVersion": "v0.52.3-147-g2659d2399"
         },
         "framework": {
             "name": "multiversx-sc",
@@ -23,6 +23,5768 @@
         "outputs": []
     },
     "endpoints": [
+        {
+            "name": "panicWithMessage",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": []
+        },
+        {
+            "docs": [
+                "Operation that has caused issues in the past"
+            ],
+            "name": "count_ones",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "arg",
+                    "type": "u64"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "endpoint_with_mutable_arg",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "arg1",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "arg2",
+                    "type": "u64"
+                },
+                {
+                    "name": "arg3",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "sqrt_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "sqrt_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "log2_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "log2_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "pow_big_int",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "pow_big_int_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "pow_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "pow_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "big_uint_to_u64",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "bu",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "optional<u64>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "biguint_overwrite_u64",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "bu",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "small",
+                    "type": "u64"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "big_uint_zero",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "big_uint_from_u64_1",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "small",
+                    "type": "u64"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "big_uint_from_u64_2",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "small",
+                    "type": "u64"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "biguint_from_u128",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "big_uint_from_managed_buffer",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "mb",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "big_uint_from_managed_buffer_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "mb",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "big_int_zero",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "big_int_from_i64_1",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "small",
+                    "type": "i64"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "big_int_from_i64_2",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "small",
+                    "type": "i64"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "big_uint_eq_u64",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "bi",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "small",
+                    "type": "u64"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "big_int_to_i64",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "bi",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "optional<i64>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "bigint_overwrite_i64",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "bi",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "small",
+                    "type": "i64"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "add_big_int",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "add_big_int_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "add_big_uint_big_int",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "add_big_int_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "add_big_uint_big_int_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "add_big_int_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "add_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "add_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "sub_big_int",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "sub_big_int_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "sub_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "sub_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "mul_big_int",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "mul_big_int_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "mul_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "mul_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "div_big_int",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "div_big_int_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "div_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "div_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "rem_big_int",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "rem_big_int_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "rem_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "rem_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "add_assign_big_int",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "add_assign_big_int_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "add_assign_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "add_assign_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "sub_assign_big_int",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "sub_assign_big_int_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "sub_assign_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "sub_assign_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "mul_assign_big_int",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "mul_assign_big_int_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "mul_assign_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "mul_assign_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "div_assign_big_int",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "div_assign_big_int_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "div_assign_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "div_assign_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "rem_assign_big_int",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "rem_assign_big_int_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigInt"
+                },
+                {
+                    "name": "b",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "rem_assign_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "rem_assign_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "bit_and_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "bit_and_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "bit_or_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "bit_or_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "bit_xor_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "bit_xor_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "bit_and_assign_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "bit_and_assign_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "bit_or_assign_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "bit_or_assign_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "bit_xor_assign_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "bit_xor_assign_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "shr_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "shr_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "shl_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "shl_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "shr_assign_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "shr_assign_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "shl_assign_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "shl_assign_big_uint_ref",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "b",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "get_block_timestamp",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "get_block_nonce",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "get_block_round",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "get_block_epoch",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "get_block_random_seed",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "array48<u8>"
+                }
+            ]
+        },
+        {
+            "name": "get_prev_block_timestamp",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "get_prev_block_nonce",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "get_prev_block_round",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "get_prev_block_epoch",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "get_prev_block_random_seed",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "array48<u8>"
+                }
+            ]
+        },
+        {
+            "name": "get_caller",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "Address"
+                }
+            ]
+        },
+        {
+            "name": "get_owner_address",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "Address"
+                }
+            ]
+        },
+        {
+            "name": "get_shard_of_address",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "is_smart_contract",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "get_state_root_hash",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "array32<u8>"
+                }
+            ]
+        },
+        {
+            "name": "get_tx_hash",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "array32<u8>"
+                }
+            ]
+        },
+        {
+            "name": "get_gas_left",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "get_cumulated_validator_rewards",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "get_code_metadata",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "CodeMetadata"
+                }
+            ]
+        },
+        {
+            "name": "is_builtin_function",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "function_name",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "codec_err_finish",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "CodecErrorTestType"
+                }
+            ]
+        },
+        {
+            "name": "codec_err_storage_key",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "i32"
+                }
+            ]
+        },
+        {
+            "name": "codec_err_storage_get",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "CodecErrorTestType"
+                }
+            ]
+        },
+        {
+            "name": "codec_err_storage_set",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": []
+        },
+        {
+            "name": "codec_err_event_topic",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": []
+        },
+        {
+            "name": "codec_err_event_data",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": []
+        },
+        {
+            "docs": [
+                "Never actually calls any deploy/upgrade, so it is appropriate in this contract.",
+                "It just covers contract init serialization errors."
+            ],
+            "name": "codec_err_contract_init",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": []
+        },
+        {
+            "docs": [
+                "Never actually calls any async/sync call, so it is appropriate in this contract.",
+                "It just covers contract call serialization errors."
+            ],
+            "name": "codec_err_contract_call",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": []
+        },
+        {
+            "name": "compute_sha256",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "input",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "array32<u8>"
+                }
+            ]
+        },
+        {
+            "name": "compute_keccak256",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "input",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "array32<u8>"
+                }
+            ]
+        },
+        {
+            "name": "compute_ripemd160",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "input",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "array20<u8>"
+                }
+            ]
+        },
+        {
+            "name": "verify_bls_signature",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "key",
+                    "type": "bytes"
+                },
+                {
+                    "name": "message",
+                    "type": "bytes"
+                },
+                {
+                    "name": "signature",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "verify_ed25519_signature",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "key",
+                    "type": "bytes"
+                },
+                {
+                    "name": "message",
+                    "type": "bytes"
+                },
+                {
+                    "name": "signature",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "verify_secp256k1_signature",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "key",
+                    "type": "bytes"
+                },
+                {
+                    "name": "message",
+                    "type": "bytes"
+                },
+                {
+                    "name": "signature",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "compute_secp256k1_der_signature",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "r",
+                    "type": "bytes"
+                },
+                {
+                    "name": "s",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bytes"
+                }
+            ]
+        },
+        {
+            "name": "echo_u64",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "i",
+                    "type": "u64"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "echo_i64",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "i",
+                    "type": "i64"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "i64"
+                }
+            ]
+        },
+        {
+            "name": "echo_i32",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "i",
+                    "type": "i32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "i32"
+                }
+            ]
+        },
+        {
+            "name": "echo_u32",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "i",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "echo_isize",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "i",
+                    "type": "i32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "i32"
+                }
+            ]
+        },
+        {
+            "name": "echo_usize",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "i",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "echo_i8",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "i",
+                    "type": "i8"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "i8"
+                }
+            ]
+        },
+        {
+            "name": "echo_u8",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "i",
+                    "type": "u8"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u8"
+                }
+            ]
+        },
+        {
+            "name": "echo_bool",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "i",
+                    "type": "bool"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "echo_opt_bool",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "i",
+                    "type": "Option<bool>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "Option<bool>"
+                }
+            ]
+        },
+        {
+            "name": "echo_multi_value_u32",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "m",
+                    "type": "variadic<u32>",
+                    "multi_arg": true
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                },
+                {
+                    "type": "variadic<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "echo_multi_value_tuples",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "m",
+                    "type": "variadic<multi<i32,bytes>>",
+                    "multi_arg": true
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "variadic<multi<i32,bytes>>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "echo_ser_example_2",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "se",
+                    "type": "ExampleEnumWithFields"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "ExampleEnumWithFields"
+                }
+            ]
+        },
+        {
+            "name": "echo_simple_enum",
+            "mutability": "readonly",
+            "inputs": [
+                {
+                    "name": "se",
+                    "type": "ExampleEnumSimple"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "ExampleEnumSimple"
+                }
+            ]
+        },
+        {
+            "name": "finish_simple_enum_variant_1",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "ExampleEnumSimple"
+                }
+            ]
+        },
+        {
+            "name": "echo_arrayvec",
+            "mutability": "readonly",
+            "inputs": [
+                {
+                    "name": "av",
+                    "type": "List<i32>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "List<i32>"
+                }
+            ]
+        },
+        {
+            "name": "echo_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "bi",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "echo_big_int",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "bi",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "echo_managed_buffer",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "mb",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bytes"
+                }
+            ]
+        },
+        {
+            "name": "echo_managed_address",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "ma",
+                    "type": "Address"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "Address"
+                }
+            ]
+        },
+        {
+            "docs": [
+                "This tests that nested serialization of big ints within unmanaged types works."
+            ],
+            "name": "echo_big_int_managed_vec",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "x",
+                    "type": "List<BigInt>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "List<BigInt>"
+                }
+            ]
+        },
+        {
+            "docs": [
+                "This tests that nested serialization of big ints within unmanaged types works."
+            ],
+            "name": "echo_big_int_tuple",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "x",
+                    "type": "tuple<BigInt,bytes>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "tuple<BigInt,bytes>"
+                }
+            ]
+        },
+        {
+            "docs": [
+                "This tests that nested serialization of big ints within unmanaged types works."
+            ],
+            "name": "echo_big_int_option",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "x",
+                    "type": "Option<BigInt>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "Option<BigInt>"
+                }
+            ]
+        },
+        {
+            "name": "echo_tuple_into_multiresult",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "addr",
+                    "type": "Address"
+                },
+                {
+                    "name": "vec",
+                    "type": "List<bytes>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "Address"
+                },
+                {
+                    "type": "List<bytes>"
+                }
+            ]
+        },
+        {
+            "name": "echo_managed_vec_of_managed_vec",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "mv",
+                    "type": "List<List<u32>>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "List<List<u32>>"
+                }
+            ]
+        },
+        {
+            "name": "echo_managed_vec_of_token_identifier",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "mv",
+                    "type": "List<TokenIdentifier>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "List<TokenIdentifier>"
+                }
+            ]
+        },
+        {
+            "name": "echo_varags_managed_eager",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "m",
+                    "type": "variadic<u32>",
+                    "multi_arg": true
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                },
+                {
+                    "type": "variadic<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "echo_varags_managed_sum",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "m",
+                    "type": "variadic<multi<u32,u32>>",
+                    "multi_arg": true
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "variadic<multi<u32,u32,u32>>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "compute_get_values",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "curve_bitsize",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "tuple<BigUint,BigUint,BigUint,BigUint,BigUint,u32>"
+                }
+            ]
+        },
+        {
+            "name": "compute_create_ec",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "curve",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "tuple<BigUint,BigUint,BigUint,BigUint,BigUint,u32>"
+                }
+            ]
+        },
+        {
+            "name": "compute_get_ec_length",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "curve_bitsize",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "compute_get_priv_key_byte_length",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "curve_bitsize",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "compute_ec_add",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "curve_bitsize",
+                    "type": "u32"
+                },
+                {
+                    "name": "x_first_point",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "y_first_point",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "x_second_point",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "y_second_point",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                },
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "compute_ec_double",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "curve_bitsize",
+                    "type": "u32"
+                },
+                {
+                    "name": "x_point",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "y_point",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                },
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "compute_is_on_curve_ec",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "curve_bitsize",
+                    "type": "u32"
+                },
+                {
+                    "name": "x_point",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "y_point",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "compute_scalar_mult",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "curve_bitsize",
+                    "type": "u32"
+                },
+                {
+                    "name": "x_point",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "y_point",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "data",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                },
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "compute_scalar_base_mult",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "curve_bitsize",
+                    "type": "u32"
+                },
+                {
+                    "name": "data",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                },
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "compute_marshal_ec",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "curve_bitsize",
+                    "type": "u32"
+                },
+                {
+                    "name": "x_pair",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "y_pair",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bytes"
+                }
+            ]
+        },
+        {
+            "name": "compute_marshal_compressed_ec",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "curve_bitsize",
+                    "type": "u32"
+                },
+                {
+                    "name": "x_pair",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "y_pair",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bytes"
+                }
+            ]
+        },
+        {
+            "name": "compute_unmarshal_ec",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "curve_bitsize",
+                    "type": "u32"
+                },
+                {
+                    "name": "data",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                },
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "compute_unmarshal_compressed_ec",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "curve_bitsize",
+                    "type": "u32"
+                },
+                {
+                    "name": "data",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                },
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "compute_generate_key_ec",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "curve_bitsize",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                },
+                {
+                    "type": "BigUint"
+                },
+                {
+                    "type": "bytes"
+                }
+            ]
+        },
+        {
+            "name": "logEventA",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "data",
+                    "type": "u32"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "docs": [
+                "Logs `event_a` a repeated number of times."
+            ],
+            "name": "logEventARepeat",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "num_logs",
+                    "type": "u32"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "logEventB",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "arg1",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "arg2",
+                    "type": "Address"
+                },
+                {
+                    "name": "data",
+                    "type": "variadic<bytes>",
+                    "multi_arg": true
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "only_owner_endpoint",
+            "onlyOwner": true,
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": []
+        },
+        {
+            "name": "only_user_account_endpoint",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": []
+        },
+        {
+            "name": "require_equals",
+            "mutability": "readonly",
+            "inputs": [
+                {
+                    "name": "a",
+                    "type": "u32"
+                },
+                {
+                    "name": "b",
+                    "type": "u32"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "sc_panic",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": []
+        },
+        {
+            "name": "maddress_from_array",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "array",
+                    "type": "array32<u8>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "Address"
+                }
+            ]
+        },
+        {
+            "name": "maddress_from_managed_buffer",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "managed_buffer",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "Address"
+                }
+            ]
+        },
+        {
+            "name": "mbuffer_new",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "bytes"
+                }
+            ]
+        },
+        {
+            "name": "mbuffer_concat",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "mb1",
+                    "type": "bytes"
+                },
+                {
+                    "name": "mb2",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bytes"
+                }
+            ]
+        },
+        {
+            "name": "mbuffer_copy_slice",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "mb",
+                    "type": "bytes"
+                },
+                {
+                    "name": "starting_position",
+                    "type": "u32"
+                },
+                {
+                    "name": "slice_len",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "optional<bytes>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "mbuffer_set_random",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "nr_bytes",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bytes"
+                }
+            ]
+        },
+        {
+            "name": "mbuffer_eq",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "mb1",
+                    "type": "bytes"
+                },
+                {
+                    "name": "mb2",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "managed_address_zero",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "Address"
+                }
+            ]
+        },
+        {
+            "name": "managed_address_eq",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "mb1",
+                    "type": "Address"
+                },
+                {
+                    "name": "mb2",
+                    "type": "Address"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "managed_vec_new",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "List<BigUint>"
+                }
+            ]
+        },
+        {
+            "name": "managed_vec_biguint_push",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "mv",
+                    "type": "List<BigUint>"
+                },
+                {
+                    "name": "item",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "List<BigUint>"
+                }
+            ]
+        },
+        {
+            "name": "managed_vec_biguint_eq",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "mv1",
+                    "type": "List<BigUint>"
+                },
+                {
+                    "name": "mv2",
+                    "type": "List<BigUint>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "managed_vec_address_push",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "mv",
+                    "type": "List<Address>"
+                },
+                {
+                    "name": "item",
+                    "type": "Address"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "List<Address>"
+                }
+            ]
+        },
+        {
+            "name": "managed_vec_set",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "mv",
+                    "type": "List<BigUint>"
+                },
+                {
+                    "name": "index",
+                    "type": "u32"
+                },
+                {
+                    "name": "item",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "List<BigUint>"
+                }
+            ]
+        },
+        {
+            "name": "managed_vec_remove",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "mv",
+                    "type": "List<BigUint>"
+                },
+                {
+                    "name": "index",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "List<BigUint>"
+                }
+            ]
+        },
+        {
+            "name": "managed_vec_find",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "mv",
+                    "type": "List<BigUint>"
+                },
+                {
+                    "name": "item",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "Option<u32>"
+                }
+            ]
+        },
+        {
+            "name": "managed_vec_contains",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "mv",
+                    "type": "List<BigUint>"
+                },
+                {
+                    "name": "item",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "managed_ref_explicit",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "mv",
+                    "type": "List<BigUint>"
+                },
+                {
+                    "name": "index",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "storage_read_raw",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "storage_key",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bytes"
+                }
+            ]
+        },
+        {
+            "name": "storage_write_raw",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "storage_key",
+                    "type": "bytes"
+                },
+                {
+                    "name": "value",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "storage_read_from_address",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                },
+                {
+                    "name": "storage_key",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bytes"
+                }
+            ]
+        },
+        {
+            "name": "load_bytes",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "bytes"
+                }
+            ]
+        },
+        {
+            "name": "load_big_uint",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "load_big_int",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "load_u64",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "load_usize",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "load_i64",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "i64"
+                }
+            ]
+        },
+        {
+            "name": "load_bool",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "load_addr",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "Address"
+                }
+            ]
+        },
+        {
+            "name": "load_opt_addr",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "optional<Address>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "is_empty_opt_addr",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "get_nr_to_clear",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "clear_storage_value",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": []
+        },
+        {
+            "name": "load_ser_2",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "ExampleEnumWithFields"
+                }
+            ]
+        },
+        {
+            "name": "load_map1",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "addr",
+                    "type": "Address"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "load_map2",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "addr1",
+                    "type": "Address"
+                },
+                {
+                    "name": "addr2",
+                    "type": "Address"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "load_map3",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "x",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "load_from_address_raw",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                },
+                {
+                    "name": "key",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bytes"
+                }
+            ]
+        },
+        {
+            "name": "store_bytes",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "bi",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "store_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "bi",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "store_big_int",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "bi",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "store_usize",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "i",
+                    "type": "u32"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "store_i32",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "i",
+                    "type": "i32"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "store_u64",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "i",
+                    "type": "u64"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "store_i64",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "i",
+                    "type": "i64"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "store_bool",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "i",
+                    "type": "bool"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "store_addr",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "arg",
+                    "type": "Address"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "store_opt_addr",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "opt_addr",
+                    "type": "optional<Address>",
+                    "multi_arg": true
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "store_ser_2",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "arg",
+                    "type": "ExampleEnumWithFields"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "store_map1",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "addr",
+                    "type": "Address"
+                },
+                {
+                    "name": "bi",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "store_map2",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "addr1",
+                    "type": "Address"
+                },
+                {
+                    "name": "addr2",
+                    "type": "Address"
+                },
+                {
+                    "name": "bi",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "store_map3",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "x",
+                    "type": "u32"
+                },
+                {
+                    "name": "b",
+                    "type": "bool"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "store_reserved_i64",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "i",
+                    "type": "i64"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "store_reserved_big_uint",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "i",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "store_reserved_vec_u8",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "i",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "address_to_id_mapper_get_id",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "address_to_id_mapper_get_id_non_zero",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "address_to_id_mapper_get_address",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address_id",
+                    "type": "u64"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "Option<Address>"
+                }
+            ]
+        },
+        {
+            "name": "address_to_id_mapper_contains",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address_id",
+                    "type": "u64"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "address_to_id_mapper_set",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "address_to_id_mapper_get_id_or_insert",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "address_to_id_mapper_remove_by_id",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address_id",
+                    "type": "u64"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "Option<Address>"
+                }
+            ]
+        },
+        {
+            "name": "address_to_id_mapper_remove_by_address",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "getListMapper",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "variadic<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "listMapperPushBack",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "listMapperPushFront",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "listMapperPopFront",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "optional<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "listMapperPopBack",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "optional<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "listMapperFront",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "optional<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "listMapperBack",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "optional<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "listMapperPushAfter",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "node_id",
+                    "type": "u32"
+                },
+                {
+                    "name": "element",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "optional<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "listMapperPushBefore",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "node_id",
+                    "type": "u32"
+                },
+                {
+                    "name": "element",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "optional<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "listMapperRemoveNode",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "node_id",
+                    "type": "u32"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "listMapperRemoveNodeById",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "node_id",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "optional<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "listMapperSetValue",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "node_id",
+                    "type": "u32"
+                },
+                {
+                    "name": "new_value",
+                    "type": "u32"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "listMapperSetValueById",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "node_id",
+                    "type": "u32"
+                },
+                {
+                    "name": "new_value",
+                    "type": "u32"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "listMapperIterateByHand",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "node_id",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "variadic<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "listMapperIterateByIter",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "node_id",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "variadic<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "queue_mapper",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "variadic<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "queue_mapper_push_back",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "queue_mapper_pop_front",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "Option<u32>"
+                }
+            ]
+        },
+        {
+            "name": "queue_mapper_front",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "map_mapper",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "variadic<multi<u32,u32>>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "map_mapper_keys",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "variadic<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "map_mapper_values",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "variadic<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "map_mapper_insert",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                },
+                {
+                    "name": "value",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "Option<u32>"
+                }
+            ]
+        },
+        {
+            "name": "map_mapper_contains_key",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "map_mapper_get",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "Option<u32>"
+                }
+            ]
+        },
+        {
+            "name": "map_mapper_remove",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "Option<u32>"
+                }
+            ]
+        },
+        {
+            "name": "map_mapper_entry_or_default_update_increment",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                },
+                {
+                    "name": "increment",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "map_mapper_entry_or_insert_default",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                },
+                {
+                    "name": "default",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "map_mapper_entry_and_modify",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                },
+                {
+                    "name": "increment",
+                    "type": "u32"
+                },
+                {
+                    "name": "otherwise",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "map_mapper_entry_or_insert_with_key",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                },
+                {
+                    "name": "key_increment",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "map_storage_mapper_view",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "variadic<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "map_storage_mapper_insert_default",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "map_storage_mapper_contains_key",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "map_storage_mapper_get",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "variadic<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "map_storage_mapper_insert_value",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                },
+                {
+                    "name": "key",
+                    "type": "u32"
+                },
+                {
+                    "name": "value",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "Option<u32>"
+                }
+            ]
+        },
+        {
+            "name": "map_storage_mapper_get_value",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                },
+                {
+                    "name": "key",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "Option<u32>"
+                }
+            ]
+        },
+        {
+            "name": "map_storage_mapper_remove",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "map_storage_mapper_clear",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": []
+        },
+        {
+            "name": "map_storage_mapper_entry_or_default_update_increment",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                },
+                {
+                    "name": "key",
+                    "type": "u32"
+                },
+                {
+                    "name": "increment",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "map_storage_mapper_entry_and_modify_increment_or_default",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                },
+                {
+                    "name": "key",
+                    "type": "u32"
+                },
+                {
+                    "name": "value",
+                    "type": "u32"
+                },
+                {
+                    "name": "other",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "map_storage_mapper_entry_or_default_update",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                },
+                {
+                    "name": "key",
+                    "type": "u32"
+                },
+                {
+                    "name": "value",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "Option<u32>"
+                }
+            ]
+        },
+        {
+            "name": "set_mapper",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "variadic<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "set_mapper_insert",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "set_mapper_contains",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "set_mapper_remove",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "set_mapper_front",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "set_mapper_back",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "set_mapper_next",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "set_mapper_previous",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "set_mapper_iter_from_and_count",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "map_my_single_value_mapper",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "my_single_value_mapper_increment_1",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "amount",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "docs": [
+                "Same as my_single_value_mapper_increment_1, but expressed more compactly."
+            ],
+            "name": "my_single_value_mapper_increment_2",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "amount",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "my_single_value_mapper_subtract_with_require",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "amount",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "my_single_value_mapper_set_if_empty",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "value",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "clear_single_value_mapper",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": []
+        },
+        {
+            "name": "get_from_address_single_value_mapper",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "is_empty_single_value_mapper",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "is_empty_at_address_single_value_mapper",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "raw_byte_length_single_value_mapper",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "set_single_value_mapper_with_key",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "key",
+                    "type": "u32"
+                },
+                {
+                    "name": "value",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "vec_mapper",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "variadic<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "vec_mapper_push",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "vec_mapper_get",
+            "mutability": "readonly",
+            "inputs": [
+                {
+                    "name": "index",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "vec_mapper_get_at_address",
+            "mutability": "readonly",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                },
+                {
+                    "name": "index",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "vec_mapper_len",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "vec_mapper_len_at_address",
+            "mutability": "readonly",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "token_attributes_set",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "token_id",
+                    "type": "TokenIdentifier"
+                },
+                {
+                    "name": "token_nonce",
+                    "type": "u64"
+                },
+                {
+                    "name": "attributes",
+                    "type": "TokenAttributesStruct"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "token_attributes_update",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "token_id",
+                    "type": "TokenIdentifier"
+                },
+                {
+                    "name": "token_nonce",
+                    "type": "u64"
+                },
+                {
+                    "name": "attributes",
+                    "type": "TokenAttributesStruct"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "token_attributes_get_attributes",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "token_id",
+                    "type": "TokenIdentifier"
+                },
+                {
+                    "name": "token_nonce",
+                    "type": "u64"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "TokenAttributesStruct"
+                }
+            ]
+        },
+        {
+            "name": "token_attributes_get_nonce",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "token_id",
+                    "type": "TokenIdentifier"
+                },
+                {
+                    "name": "attributes",
+                    "type": "TokenAttributesStruct"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "token_attributes_clear",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "token_id",
+                    "type": "TokenIdentifier"
+                },
+                {
+                    "name": "token_nonce",
+                    "type": "u64"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "token_attributes_has_attributes",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "token_id",
+                    "type": "TokenIdentifier"
+                },
+                {
+                    "name": "token_nonce",
+                    "type": "u64"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "add_to_whitelist",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "remove_from_whitelist",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "check_contains",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "check_contains_at_address",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                },
+                {
+                    "name": "item",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "require_contains",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "require_contains_at_address",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                },
+                {
+                    "name": "item",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "issue_fungible_default_callback",
+            "mutability": "mutable",
+            "payableInTokens": [
+                "EGLD"
+            ],
+            "inputs": [
+                {
+                    "name": "token_ticker",
+                    "type": "bytes"
+                },
+                {
+                    "name": "initial_supply",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "issue_fungible_custom_callback",
+            "mutability": "mutable",
+            "payableInTokens": [
+                "EGLD"
+            ],
+            "inputs": [
+                {
+                    "name": "token_ticker",
+                    "type": "bytes"
+                },
+                {
+                    "name": "initial_supply",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "issue_and_set_all_roles_fungible",
+            "mutability": "mutable",
+            "payableInTokens": [
+                "EGLD"
+            ],
+            "inputs": [
+                {
+                    "name": "token_ticker",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "set_local_roles_fungible",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": []
+        },
+        {
+            "name": "mint_fungible",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "amount",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "EsdtTokenPayment"
+                }
+            ]
+        },
+        {
+            "name": "mint_and_send_fungible",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "to",
+                    "type": "Address"
+                },
+                {
+                    "name": "amount",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "EsdtTokenPayment"
+                }
+            ]
+        },
+        {
+            "name": "burn_fungible",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "amount",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "get_balance_fungible",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "require_same_token_fungible",
+            "mutability": "mutable",
+            "payableInTokens": [
+                "*"
+            ],
+            "inputs": [],
+            "outputs": []
+        },
+        {
+            "name": "require_all_same_token_fungible",
+            "mutability": "mutable",
+            "payableInTokens": [
+                "*"
+            ],
+            "inputs": [],
+            "outputs": []
+        },
+        {
+            "name": "getFungibleTokenId",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "TokenIdentifier"
+                }
+            ]
+        },
+        {
+            "name": "issue_and_set_all_roles_meta",
+            "mutability": "mutable",
+            "payableInTokens": [
+                "EGLD"
+            ],
+            "inputs": [
+                {
+                    "name": "token_ticker",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "mapper_nft_set_token_id",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "token_id",
+                    "type": "TokenIdentifier"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "mapper_nft_create",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "amount",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "attributes",
+                    "type": "RgbColor"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "EsdtTokenPayment"
+                }
+            ]
+        },
+        {
+            "name": "mapper_nft_create_and_send",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "to",
+                    "type": "Address"
+                },
+                {
+                    "name": "amount",
+                    "type": "BigUint"
+                },
+                {
+                    "name": "attributes",
+                    "type": "RgbColor"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "EsdtTokenPayment"
+                }
+            ]
+        },
+        {
+            "name": "mapper_nft_add_quantity",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "token_nonce",
+                    "type": "u64"
+                },
+                {
+                    "name": "amount",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "EsdtTokenPayment"
+                }
+            ]
+        },
+        {
+            "name": "mapper_nft_add_quantity_and_send",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "to",
+                    "type": "Address"
+                },
+                {
+                    "name": "token_nonce",
+                    "type": "u64"
+                },
+                {
+                    "name": "amount",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "EsdtTokenPayment"
+                }
+            ]
+        },
+        {
+            "name": "mapper_nft_burn",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "token_nonce",
+                    "type": "u64"
+                },
+                {
+                    "name": "amount",
+                    "type": "BigUint"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "mapper_nft_get_balance",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "token_nonce",
+                    "type": "u64"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "mapper_get_token_attributes",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "token_nonce",
+                    "type": "u64"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "RgbColor"
+                }
+            ]
+        },
+        {
+            "name": "getNonFungibleTokenId",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "TokenIdentifier"
+                }
+            ]
+        },
+        {
+            "name": "init_unique_id_mapper",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "len",
+                    "type": "u32"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "unique_id_mapper_get",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "index",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "unique_id_mapper_swap_remove",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "index",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "unique_id_mapper_set",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "index",
+                    "type": "u32"
+                },
+                {
+                    "name": "id",
+                    "type": "u32"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "unique_id_mapper",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "variadic<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "unordered_set_mapper",
+            "mutability": "readonly",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "variadic<u32>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "unordered_set_mapper_insert",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "unordered_set_mapper_contains",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "unordered_set_mapper_remove",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "managed_struct_eq",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "s1",
+                    "type": "ExampleStructManaged"
+                },
+                {
+                    "name": "s2",
+                    "type": "ExampleStructManaged"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "no_overflow_usize",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "no_overflow_u8",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u8"
+                }
+            ]
+        },
+        {
+            "name": "no_overflow_u16",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u16"
+                }
+            ]
+        },
+        {
+            "name": "no_overflow_u32",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "no_overflow_u64",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "overflow_usize",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "overflow_u8",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u8"
+                }
+            ]
+        },
+        {
+            "name": "overflow_u16",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u16"
+                }
+            ]
+        },
+        {
+            "name": "overflow_u32",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "overflow_u64",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "no_overflow_isize",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "i32"
+                }
+            ]
+        },
+        {
+            "name": "no_overflow_i8",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "i8"
+                }
+            ]
+        },
+        {
+            "name": "no_overflow_i16",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "i16"
+                }
+            ]
+        },
+        {
+            "name": "no_overflow_i32",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "i32"
+                }
+            ]
+        },
+        {
+            "name": "no_overflow_i64",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "i64"
+                }
+            ]
+        },
+        {
+            "name": "overflow_isize",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "i32"
+                }
+            ]
+        },
+        {
+            "name": "overflow_i8",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "i8"
+                }
+            ]
+        },
+        {
+            "name": "overflow_i16",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "i16"
+                }
+            ]
+        },
+        {
+            "name": "overflow_i32",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "i32"
+                }
+            ]
+        },
+        {
+            "name": "overflow_i64",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "i64"
+                }
+            ]
+        },
+        {
+            "name": "token_identifier_egld",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "EgldOrEsdtTokenIdentifier"
+                }
+            ]
+        },
+        {
+            "name": "token_identifier_is_valid_1",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "token_id",
+                    "type": "EgldOrEsdtTokenIdentifier"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "token_identifier_is_valid_2",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "bytes",
+                    "type": "bytes"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "returns_egld_decimal",
+            "mutability": "mutable",
+            "payableInTokens": [
+                "EGLD"
+            ],
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "ManagedDecimal<18>"
+                }
+            ]
+        },
+        {
+            "name": "set_contract_address",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "is_empty_at_address",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "contains_at_address",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "len_at_address",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "next_at_address",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "previous_at_address",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "front_at_address",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "back_at_address",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "keys_at_address",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "List<u32>"
+                }
+            ]
+        },
+        {
+            "name": "values_at_address",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "List<u32>"
+                }
+            ]
+        },
+        {
+            "name": "contains_unordered_at_address",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "item",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "get_by_index",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "index",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u32"
+                }
+            ]
+        },
+        {
+            "name": "fill_set_mapper",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "value",
+                    "type": "u32"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "fill_map_mapper",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "value",
+                    "type": "u32"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "fill_unordered_set_mapper",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "value",
+                    "type": "u32"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "get_value_from_address_with_keys",
+            "mutability": "readonly",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                },
+                {
+                    "name": "extra_key",
+                    "type": "u32"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bytes"
+                }
+            ]
+        },
         {
             "name": "managed_decimal_addition",
             "mutability": "mutable",
@@ -129,6 +5891,93 @@
                     "type": "ManagedDecimalSigned<9>"
                 }
             ]
+        },
+        {
+            "name": "managed_decimal_addition_var",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "first",
+                    "type": "ManagedDecimal<usize>"
+                },
+                {
+                    "name": "second",
+                    "type": "ManagedDecimal<usize>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "ManagedDecimal<usize>"
+                }
+            ]
+        },
+        {
+            "name": "managed_decimal_subtraction_var",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "first",
+                    "type": "ManagedDecimal<usize>"
+                },
+                {
+                    "name": "second",
+                    "type": "ManagedDecimal<usize>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "ManagedDecimal<usize>"
+                }
+            ]
+        },
+        {
+            "name": "managed_decimal_eq_var",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "first",
+                    "type": "ManagedDecimal<usize>"
+                },
+                {
+                    "name": "second",
+                    "type": "ManagedDecimal<usize>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bool"
+                }
+            ]
+        },
+        {
+            "name": "managed_decimal_ln_var",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "x",
+                    "type": "ManagedDecimal<usize>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "ManagedDecimalSigned<9>"
+                }
+            ]
+        },
+        {
+            "name": "managed_decimal_log2_var",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "x",
+                    "type": "ManagedDecimal<usize>"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "ManagedDecimalSigned<9>"
+                }
+            ]
         }
     ],
     "events": [
diff --git a/src/testdata/basic-features.wasm b/src/testdata/basic-features.wasm
old mode 100755
new mode 100644
index a0da77ca88511f08f401fcc35d94dede9ca8865a..ad7cf557097c94628e4d6e9f719962df170cf40d
GIT binary patch
literal 87521
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
U<T1Y?+?VVp9vZ6+?ZZ6czb)wbp#T5?

literal 64826
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

diff --git a/src/transactionsFactories/smartContractTransactionsFactory.spec.ts b/src/transactionsFactories/smartContractTransactionsFactory.spec.ts
index d108c103d..0a98b5e62 100644
--- a/src/transactionsFactories/smartContractTransactionsFactory.spec.ts
+++ b/src/transactionsFactories/smartContractTransactionsFactory.spec.ts
@@ -1,7 +1,7 @@
 import { assert } from "chai";
 import { Address } from "../address";
 import { Err } from "../errors";
-import { U32Value } from "../smartcontracts";
+import { ManagedDecimalValue, U32Value } from "../smartcontracts";
 import { Code } from "../smartcontracts/code";
 import { AbiRegistry } from "../smartcontracts/typesystem/abiRegistry";
 import { loadAbiRegistry, loadContractCode } from "../testutils/utils";
@@ -142,6 +142,60 @@ describe("test smart contract transactions factory", function () {
         assert.deepEqual(transaction, transactionAbiAware);
     });
 
+    it("should create 'Transaction' for execute and transfer native token", async function () {
+        const sender = Address.fromBech32("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
+        const contract = Address.fromBech32("erd1qqqqqqqqqqqqqpgqhy6nl6zq07rnzry8uyh6rtyq0uzgtk3e69fqgtz9l4");
+        const func = "managed_decimal_subtraction";
+        const gasLimit = 6000000n;
+
+        const transaction = factory.createTransactionForExecute({
+            sender: sender,
+            contract: contract,
+            function: func,
+            gasLimit: gasLimit,
+            arguments: [new ManagedDecimalValue(9, 2), new ManagedDecimalValue(4, 2)],
+        });
+
+        // const transactionAbiAware = abiAwareFactory.createTransactionForExecute({
+        //     sender: sender,
+        //     contract: contract,
+        //     function: func,
+        //     gasLimit: gasLimit,
+        //     arguments: [9, 4],
+        // });
+
+        assert.equal(transaction.sender, "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
+        assert.equal(transaction.receiver, "erd1qqqqqqqqqqqqqpgqhy6nl6zq07rnzry8uyh6rtyq0uzgtk3e69fqgtz9l4");
+        assert.deepEqual(transaction.data, Buffer.from("managed_decimal_subtraction@09@04"));
+    });
+
+    it("should create 'Transaction' for execute and transfer native token", async function () {
+        const sender = Address.fromBech32("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
+        const contract = Address.fromBech32("erd1qqqqqqqqqqqqqpgqhy6nl6zq07rnzry8uyh6rtyq0uzgtk3e69fqgtz9l4");
+        const func = "managed_decimal_ln";
+        const gasLimit = 6000000n;
+
+        const transaction = factory.createTransactionForExecute({
+            sender: sender,
+            contract: contract,
+            function: func,
+            gasLimit: gasLimit,
+            arguments: [new ManagedDecimalValue(23.0, 9)],
+        });
+
+        // const transactionAbiAware = abiAwareFactory.createTransactionForExecute({
+        //     sender: sender,
+        //     contract: contract,
+        //     function: func,
+        //     gasLimit: gasLimit,
+        //     arguments: [9, 4],
+        // });
+
+        assert.equal(transaction.sender, "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
+        assert.equal(transaction.receiver, "erd1qqqqqqqqqqqqqpgqhy6nl6zq07rnzry8uyh6rtyq0uzgtk3e69fqgtz9l4");
+        assert.deepEqual(transaction.data, Buffer.from("managed_decimal_ln@17"));
+    });
+
     it("should create 'Transaction' for execute and transfer single esdt", async function () {
         const sender = Address.fromBech32("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
         const contract = Address.fromBech32("erd1qqqqqqqqqqqqqpgqhy6nl6zq07rnzry8uyh6rtyq0uzgtk3e69fqgtz9l4");
diff --git a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.spec.ts b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.spec.ts
index 5bbcbdd52..7b7cf9128 100644
--- a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.spec.ts
+++ b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.spec.ts
@@ -75,7 +75,7 @@ describe("test smart contract transactions outcome parser", () => {
             contractResults: new ContractResults([
                 new ContractResultItem({
                     nonce: 8,
-                    data: "@6f6b",
+                    data: "@6f6b@fd60b96668",
                 }),
             ]),
         });

From 9dceb1864ad1a1b38c544b033a19d0393b8b6fb2 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 5 Sep 2024 11:21:09 +0300
Subject: [PATCH 235/338] Add encoded nested for managed decimal

---
 src/smartcontracts/codec/managedDecimal.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/smartcontracts/codec/managedDecimal.ts b/src/smartcontracts/codec/managedDecimal.ts
index 976e7cc4c..6f318668c 100644
--- a/src/smartcontracts/codec/managedDecimal.ts
+++ b/src/smartcontracts/codec/managedDecimal.ts
@@ -11,8 +11,13 @@ export class ManagedDecimalCodec {
     }
 
     decodeNested(buffer: Buffer, type: ManagedDecimalType): [ManagedDecimalValue, number] {
-        let [bytesValue, length] = this.binaryCodec.decodeNested(buffer, type);
-        return [new ManagedDecimalValue(new BigNumber(1), 1), length];
+        let offset = 0;
+        let length = buffer.readUInt32BE(0);
+
+        let payload = buffer.slice(offset, offset + length);
+        let result = this.decodeTopLevel(payload, type);
+        let decodedLength = length + offset;
+        return [result, decodedLength];
     }
 
     decodeTopLevel(buffer: Buffer, type: ManagedDecimalType): ManagedDecimalValue {
@@ -26,7 +31,6 @@ export class ManagedDecimalCodec {
             const u32Size = 4;
             const bigUintSize = buffer.length - u32Size;
 
-            // Read BigUInt (dynamic size)
             const bigUintBuffer = buffer.slice(0, bigUintSize);
             const bigUint = new BigNumber(bigUintBuffer.toString("hex"), 16);
 
@@ -39,7 +43,6 @@ export class ManagedDecimalCodec {
     }
 
     encodeNested(value: ManagedDecimalValue): Buffer {
-        value.getType().getMetadata();
         let buffers: Buffer[] = [];
         if (value.getType().getMetadata() == "usize") {
             buffers.push(Buffer.from(this.binaryCodec.encodeNested(new BigUIntValue(value.valueOf()))));

From 06b85fefc3a7c7cca3e72cd9ee0c806bdd432251 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 5 Sep 2024 11:28:34 +0300
Subject: [PATCH 236/338] refactor managed decimal codec

---
 src/abi/typeFormula.ts                     | 20 +++++--------
 src/smartcontracts/codec/managedDecimal.ts | 33 +++++++++++-----------
 2 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/src/abi/typeFormula.ts b/src/abi/typeFormula.ts
index 108be5333..500c051a0 100644
--- a/src/abi/typeFormula.ts
+++ b/src/abi/typeFormula.ts
@@ -10,18 +10,12 @@ export class TypeFormula {
     }
 
     toString(): string {
-        if (this.typeParameters.length > 0) {
-            const typeParameters = this.typeParameters.map((typeParameter) => typeParameter.toString()).join(", ");
-            const name = `${this.name}<${typeParameters}>`;
-            if (this.metadata !== undefined) {
-                return `${name}*${this.metadata}*`;
-            }
-            return name;
-        } else {
-            if (this.metadata !== undefined) {
-                return `${this.name}*${this.metadata}*`;
-            }
-            return this.name;
-        }
+        const hasTypeParameters = this.typeParameters.length > 0;
+        const typeParameters = hasTypeParameters
+            ? `<${this.typeParameters.map((tp) => tp.toString()).join(", ")}>`
+            : "";
+        const baseName = `${this.name}${typeParameters}`;
+
+        return this.metadata !== undefined ? `${baseName}*${this.metadata}*` : baseName;
     }
 }
diff --git a/src/smartcontracts/codec/managedDecimal.ts b/src/smartcontracts/codec/managedDecimal.ts
index 6f318668c..83f7b5291 100644
--- a/src/smartcontracts/codec/managedDecimal.ts
+++ b/src/smartcontracts/codec/managedDecimal.ts
@@ -1,7 +1,7 @@
 import BigNumber from "bignumber.js";
-import { BigUIntValue, ManagedDecimalType, ManagedDecimalValue, U32Value, U64Value } from "../typesystem";
+import { BigUIntValue, ManagedDecimalType, ManagedDecimalValue, U32Value } from "../typesystem";
 import { BinaryCodec } from "./binary";
-import { bufferToBigInt, cloneBuffer } from "./utils";
+import { bufferToBigInt } from "./utils";
 
 export class ManagedDecimalCodec {
     private readonly binaryCodec: BinaryCodec;
@@ -11,34 +11,33 @@ export class ManagedDecimalCodec {
     }
 
     decodeNested(buffer: Buffer, type: ManagedDecimalType): [ManagedDecimalValue, number] {
-        let offset = 0;
-        let length = buffer.readUInt32BE(0);
+        const length = buffer.readUInt32BE(0);
+        const payload = buffer.slice(0, length);
+
+        const result = this.decodeTopLevel(payload, type);
+        const decodedLength = length;
 
-        let payload = buffer.slice(offset, offset + length);
-        let result = this.decodeTopLevel(payload, type);
-        let decodedLength = length + offset;
         return [result, decodedLength];
     }
 
     decodeTopLevel(buffer: Buffer, type: ManagedDecimalType): ManagedDecimalValue {
-        let payload = cloneBuffer(buffer);
-        let empty = buffer.length == 0;
-        if (empty) {
+        if (buffer.length === 0) {
             return new ManagedDecimalValue(new BigNumber(0), 2);
         }
 
-        if (type.getMetadata() == "usize") {
+        const isUsize = type.getMetadata() === "usize";
+
+        if (isUsize) {
             const u32Size = 4;
             const bigUintSize = buffer.length - u32Size;
 
-            const bigUintBuffer = buffer.slice(0, bigUintSize);
-            const bigUint = new BigNumber(bigUintBuffer.toString("hex"), 16);
+            const bigUint = new BigNumber(buffer.slice(0, bigUintSize).toString("hex"), 16);
+            const u32 = buffer.readUInt32BE(bigUintSize);
 
-            const u32Offset = bigUintSize;
-            const u32 = buffer.readUInt32BE(u32Offset);
-            return new ManagedDecimalValue(bigUint, parseInt(u32.toString()));
+            return new ManagedDecimalValue(bigUint, u32);
         }
-        let value = bufferToBigInt(payload);
+
+        const value = bufferToBigInt(buffer);
         return new ManagedDecimalValue(value, parseInt(type.getMetadata()));
     }
 

From e35ad8f0b52f0263bf598117b883c283c24d2674 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 5 Sep 2024 11:44:01 +0300
Subject: [PATCH 237/338] Add tests for abi registry managed decimals

---
 .../interaction.local.net.spec.ts             |  2 +-
 .../typesystem/abiRegistry.spec.ts            | 13 ++++++--
 src/testdata/adder.abi.json                   | 32 -------------------
 src/testdata/lottery-esdt.abi.json            | 13 --------
 4 files changed, 12 insertions(+), 48 deletions(-)

diff --git a/src/smartcontracts/interaction.local.net.spec.ts b/src/smartcontracts/interaction.local.net.spec.ts
index 6280181b8..e5f4a79d5 100644
--- a/src/smartcontracts/interaction.local.net.spec.ts
+++ b/src/smartcontracts/interaction.local.net.spec.ts
@@ -185,7 +185,7 @@ describe("test smart contract interactor", function () {
         assert.isTrue(typedBundle.returnCode.equals(ReturnCode.Ok));
     });
 
-    it.only("should interact with 'basic-features' (local testnet) using the SmartContractTransactionsFactory", async function () {
+    it("should interact with 'basic-features' (local testnet) using the SmartContractTransactionsFactory", async function () {
         this.timeout(140000);
 
         let abiRegistry = await loadAbiRegistry("src/testdata/basic-features.abi.json");
diff --git a/src/smartcontracts/typesystem/abiRegistry.spec.ts b/src/smartcontracts/typesystem/abiRegistry.spec.ts
index 0b816db6c..e7b43117d 100644
--- a/src/smartcontracts/typesystem/abiRegistry.spec.ts
+++ b/src/smartcontracts/typesystem/abiRegistry.spec.ts
@@ -29,7 +29,12 @@ describe("test abi registry", () => {
         let start = registry.getEndpoint("start");
         let getStatus = registry.getEndpoint("status");
         let getLotteryInfo = registry.getEndpoint("getLotteryInfo");
-        let returnDecimal = registry.getEndpoint("returns_egld_decimal");
+
+        // basic-features
+        registry = await loadAbiRegistry("src/testdata/basic-features.abi.json");
+        let returnManagedDecimal = registry.getEndpoint("returns_egld_decimal");
+        let returnsManagedDecimalSigned = registry.getEndpoint("managed_decimal_ln");
+        let returnsManagedDecimalVariable = registry.getEndpoint("managed_decimal_addition_var");
 
         assert.isFalse(start.modifiers.isReadonly());
         assert.isTrue(getStatus.modifiers.isReadonly());
@@ -55,7 +60,11 @@ describe("test abi registry", () => {
         assert.instanceOf(getLotteryInfo.input[0].type, BytesType);
         assert.instanceOf(getLotteryInfo.output[0].type, StructType);
         assert.equal(getLotteryInfo.output[0].type.getName(), "LotteryInfo");
-        assert.equal(returnDecimal.output[0].type.getName(), "ManagedDecimal");
+        assert.equal(returnManagedDecimal.output[0].type.getName(), "ManagedDecimal");
+        assert.equal(returnsManagedDecimalSigned.output[0].type.getName(), "ManagedDecimalSigned");
+        assert.equal(returnsManagedDecimalSigned.output[0].type.getMetadata(), "9");
+        assert.equal(returnsManagedDecimalVariable.output[0].type.getName(), "ManagedDecimal");
+        assert.equal(returnsManagedDecimalVariable.output[0].type.getMetadata(), "usize");
 
         let fieldDefinitions = (<StructType>getLotteryInfo.output[0].type).getFieldsDefinitions();
         assert.instanceOf(fieldDefinitions[0].type, TokenIdentifierType);
diff --git a/src/testdata/adder.abi.json b/src/testdata/adder.abi.json
index 7bfbf6fec..a65dbff8f 100644
--- a/src/testdata/adder.abi.json
+++ b/src/testdata/adder.abi.json
@@ -51,38 +51,6 @@
                 }
             ]
         },
-        {
-            "name": "returns_egld_decimal",
-            "mutability": "mutable",
-            "payableInTokens": [
-                "EGLD"
-            ],
-            "inputs": [],
-            "outputs": [
-                {
-                    "type": "ManagedDecimal<18>"
-                }
-            ]
-        },
-        {
-            "name": "managed_decimal_subtraction",
-            "mutability": "mutable",
-            "inputs": [
-                {
-                    "name": "first",
-                    "type": "ManagedDecimal<2>"
-                },
-                {
-                    "name": "second",
-                    "type": "ManagedDecimal<2>"
-                }
-            ],
-            "outputs": [
-                {
-                    "type": "ManagedDecimal<2>"
-                }
-            ]
-        },
         {
             "docs": [
                 "Add desired amount to the storage variable."
diff --git a/src/testdata/lottery-esdt.abi.json b/src/testdata/lottery-esdt.abi.json
index fd9949457..a9fa48c5e 100644
--- a/src/testdata/lottery-esdt.abi.json
+++ b/src/testdata/lottery-esdt.abi.json
@@ -180,19 +180,6 @@
                     "multi_result": true
                 }
             ]
-        },
-        {
-            "name": "returns_egld_decimal",
-            "mutability": "mutable",
-            "payableInTokens": [
-                "EGLD"
-            ],
-            "inputs": [],
-            "outputs": [
-                {
-                    "type": "ManagedDecimal<18>"
-                }
-            ]
         }
     ],
     "hasCallback": false,

From 6065deec15e158676ede5ad9471c3e2185b67b04 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 5 Sep 2024 12:10:39 +0300
Subject: [PATCH 238/338] remove unused tests

---
 .../typesystem/managedDecimal.ts              |  2 +-
 src/smartcontracts/typesystem/matchers.ts     |  1 +
 .../smartContractTransactionsFactory.spec.ts  | 56 +------------------
 ...tContractTransactionsOutcomeParser.spec.ts |  2 +-
 4 files changed, 4 insertions(+), 57 deletions(-)

diff --git a/src/smartcontracts/typesystem/managedDecimal.ts b/src/smartcontracts/typesystem/managedDecimal.ts
index 39b6f2332..61561e231 100644
--- a/src/smartcontracts/typesystem/managedDecimal.ts
+++ b/src/smartcontracts/typesystem/managedDecimal.ts
@@ -114,6 +114,6 @@ export class ManagedDecimalSignedValue extends TypedValue {
     }
 
     toString(): string {
-        return this.value.toString();
+        return this.value.toFixed(this.scale);
     }
 }
diff --git a/src/smartcontracts/typesystem/matchers.ts b/src/smartcontracts/typesystem/matchers.ts
index 4fdb0f2f4..fab74290a 100644
--- a/src/smartcontracts/typesystem/matchers.ts
+++ b/src/smartcontracts/typesystem/matchers.ts
@@ -52,6 +52,7 @@ export function onTypeSelect<TResult>(
     if (type.hasExactClass(EnumType.ClassName)) {
         return selectors.onEnum();
     }
+
     if (type.hasExactClass(ManagedDecimalType.ClassName)) {
         return selectors.onManagedDecimal();
     }
diff --git a/src/transactionsFactories/smartContractTransactionsFactory.spec.ts b/src/transactionsFactories/smartContractTransactionsFactory.spec.ts
index 0a98b5e62..d108c103d 100644
--- a/src/transactionsFactories/smartContractTransactionsFactory.spec.ts
+++ b/src/transactionsFactories/smartContractTransactionsFactory.spec.ts
@@ -1,7 +1,7 @@
 import { assert } from "chai";
 import { Address } from "../address";
 import { Err } from "../errors";
-import { ManagedDecimalValue, U32Value } from "../smartcontracts";
+import { U32Value } from "../smartcontracts";
 import { Code } from "../smartcontracts/code";
 import { AbiRegistry } from "../smartcontracts/typesystem/abiRegistry";
 import { loadAbiRegistry, loadContractCode } from "../testutils/utils";
@@ -142,60 +142,6 @@ describe("test smart contract transactions factory", function () {
         assert.deepEqual(transaction, transactionAbiAware);
     });
 
-    it("should create 'Transaction' for execute and transfer native token", async function () {
-        const sender = Address.fromBech32("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
-        const contract = Address.fromBech32("erd1qqqqqqqqqqqqqpgqhy6nl6zq07rnzry8uyh6rtyq0uzgtk3e69fqgtz9l4");
-        const func = "managed_decimal_subtraction";
-        const gasLimit = 6000000n;
-
-        const transaction = factory.createTransactionForExecute({
-            sender: sender,
-            contract: contract,
-            function: func,
-            gasLimit: gasLimit,
-            arguments: [new ManagedDecimalValue(9, 2), new ManagedDecimalValue(4, 2)],
-        });
-
-        // const transactionAbiAware = abiAwareFactory.createTransactionForExecute({
-        //     sender: sender,
-        //     contract: contract,
-        //     function: func,
-        //     gasLimit: gasLimit,
-        //     arguments: [9, 4],
-        // });
-
-        assert.equal(transaction.sender, "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
-        assert.equal(transaction.receiver, "erd1qqqqqqqqqqqqqpgqhy6nl6zq07rnzry8uyh6rtyq0uzgtk3e69fqgtz9l4");
-        assert.deepEqual(transaction.data, Buffer.from("managed_decimal_subtraction@09@04"));
-    });
-
-    it("should create 'Transaction' for execute and transfer native token", async function () {
-        const sender = Address.fromBech32("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
-        const contract = Address.fromBech32("erd1qqqqqqqqqqqqqpgqhy6nl6zq07rnzry8uyh6rtyq0uzgtk3e69fqgtz9l4");
-        const func = "managed_decimal_ln";
-        const gasLimit = 6000000n;
-
-        const transaction = factory.createTransactionForExecute({
-            sender: sender,
-            contract: contract,
-            function: func,
-            gasLimit: gasLimit,
-            arguments: [new ManagedDecimalValue(23.0, 9)],
-        });
-
-        // const transactionAbiAware = abiAwareFactory.createTransactionForExecute({
-        //     sender: sender,
-        //     contract: contract,
-        //     function: func,
-        //     gasLimit: gasLimit,
-        //     arguments: [9, 4],
-        // });
-
-        assert.equal(transaction.sender, "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
-        assert.equal(transaction.receiver, "erd1qqqqqqqqqqqqqpgqhy6nl6zq07rnzry8uyh6rtyq0uzgtk3e69fqgtz9l4");
-        assert.deepEqual(transaction.data, Buffer.from("managed_decimal_ln@17"));
-    });
-
     it("should create 'Transaction' for execute and transfer single esdt", async function () {
         const sender = Address.fromBech32("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
         const contract = Address.fromBech32("erd1qqqqqqqqqqqqqpgqhy6nl6zq07rnzry8uyh6rtyq0uzgtk3e69fqgtz9l4");
diff --git a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.spec.ts b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.spec.ts
index 7b7cf9128..5bbcbdd52 100644
--- a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.spec.ts
+++ b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.spec.ts
@@ -75,7 +75,7 @@ describe("test smart contract transactions outcome parser", () => {
             contractResults: new ContractResults([
                 new ContractResultItem({
                     nonce: 8,
-                    data: "@6f6b@fd60b96668",
+                    data: "@6f6b",
                 }),
             ]),
         });

From 0d9e48664696b2e65d6aca02f8334073af0e3603 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 5 Sep 2024 12:38:55 +0300
Subject: [PATCH 239/338] Update native serializer

---
 src/smartcontracts/nativeSerializer.spec.ts | 57 +++++++++++++++++++++
 src/smartcontracts/nativeSerializer.ts      | 16 +++++-
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/src/smartcontracts/nativeSerializer.spec.ts b/src/smartcontracts/nativeSerializer.spec.ts
index 30879d6c2..5b3da3c8c 100644
--- a/src/smartcontracts/nativeSerializer.spec.ts
+++ b/src/smartcontracts/nativeSerializer.spec.ts
@@ -16,6 +16,8 @@ import {
     EndpointModifiers,
     EndpointParameterDefinition,
     ListType,
+    ManagedDecimalType,
+    ManagedDecimalValue,
     NullType,
     OptionalType,
     OptionalValue,
@@ -346,6 +348,12 @@ describe("test native serializer", () => {
                         {
                             type: "u64",
                         },
+                        {
+                            type: "ManagedDecimal<8>",
+                        },
+                        {
+                            type: "ManagedDecimal<usize>",
+                        },
                     ],
                     outputs: [],
                 },
@@ -362,6 +370,8 @@ describe("test native serializer", () => {
                     [45, true],
                 ],
                 46,
+                [2, 8],
+                [12.5644, 6],
             ],
             endpoint,
         );
@@ -375,6 +385,10 @@ describe("test native serializer", () => {
             { field0: new BigNumber(44), field1: false },
             { field0: new BigNumber(45), field1: true },
         ]);
+        assert.deepEqual(typedValues[4].getType(), new ManagedDecimalType(8));
+        assert.deepEqual(typedValues[4].valueOf(), new BigNumber(2));
+        assert.deepEqual(typedValues[5].getType(), new ManagedDecimalType("usize"));
+        assert.deepEqual(typedValues[5].valueOf(), new BigNumber(12.5644));
 
         // Pass a mix of native and typed values
         typedValues = NativeSerializer.nativeToTypedValues(
@@ -386,6 +400,8 @@ describe("test native serializer", () => {
                     [45, new BooleanValue(true)],
                 ],
                 46,
+                [2, 8],
+                [2, 6],
             ],
             endpoint,
         );
@@ -401,6 +417,47 @@ describe("test native serializer", () => {
         ]);
     });
 
+    it("should accept managed decimals with constants and variable decimals", async () => {
+        const endpoint = AbiRegistry.create({
+            endpoints: [
+                {
+                    name: "foo",
+                    inputs: [
+                        {
+                            type: "ManagedDecimal<8>",
+                        },
+                        {
+                            type: "ManagedDecimal<usize>",
+                        },
+                    ],
+                    outputs: [],
+                },
+            ],
+        }).getEndpoint("foo");
+
+        // Pass only native values
+        let typedValues = NativeSerializer.nativeToTypedValues(
+            [
+                [2, 8],
+                [12.5644, 6],
+            ],
+            endpoint,
+        );
+
+        assert.deepEqual(typedValues[0].getType(), new ManagedDecimalType(8));
+        assert.deepEqual(typedValues[0].valueOf(), new BigNumber(2));
+        assert.deepEqual(typedValues[1].getType(), new ManagedDecimalType("usize"));
+        assert.deepEqual(typedValues[1].valueOf(), new BigNumber(12.5644));
+
+        // Pass a mix of native and typed values
+        typedValues = NativeSerializer.nativeToTypedValues([new ManagedDecimalValue(2, 8), [12.5644, 6]], endpoint);
+
+        assert.deepEqual(typedValues[0].getType(), new ManagedDecimalType(8));
+        assert.deepEqual(typedValues[0].valueOf(), new BigNumber(2));
+        assert.deepEqual(typedValues[1].getType(), new ManagedDecimalType("usize"));
+        assert.deepEqual(typedValues[1].valueOf(), new BigNumber(12.5644));
+    });
+
     it("should accept no value for variadic types", async () => {
         const endpoint = AbiRegistry.create({
             endpoints: [
diff --git a/src/smartcontracts/nativeSerializer.ts b/src/smartcontracts/nativeSerializer.ts
index 9375a2a95..e2ed52afa 100644
--- a/src/smartcontracts/nativeSerializer.ts
+++ b/src/smartcontracts/nativeSerializer.ts
@@ -34,6 +34,8 @@ import {
     isTyped,
     List,
     ListType,
+    ManagedDecimalType,
+    ManagedDecimalValue,
     NumericalType,
     OptionalType,
     OptionalValue,
@@ -99,7 +101,6 @@ export namespace NativeSerializer {
         // With respect to the notes of "repackNonCountedVariadicParameters", "getArgumentsCardinality" will not be needed anymore.
         // Currently, it is used only for a arguments count check, which will become redundant.
         const { min, max } = getArgumentsCardinality(endpoint.input);
-
         if (!(min <= args.length && args.length <= max)) {
             throw new ErrInvalidArgument(
                 `Wrong number of arguments for endpoint ${endpoint.name}: expected between ${min} and ${max} arguments, have ${args.length}`,
@@ -202,6 +203,9 @@ export namespace NativeSerializer {
         if (type instanceof EnumType) {
             return toEnumValue(value, type, errorContext);
         }
+        if (type instanceof ManagedDecimalType) {
+            return toManagedDecimal(value, type, errorContext);
+        }
         errorContext.throwError(`convertToTypedValue: unhandled type ${type}`);
     }
 
@@ -333,6 +337,16 @@ export namespace NativeSerializer {
         errorContext.throwError(`(function: toEnumValue) unsupported native type ${typeof native}`);
     }
 
+    function toManagedDecimal(native: any, type: ManagedDecimalType, errorContext: ArgumentErrorContext): TypedValue {
+        if (typeof native === "object") {
+            if (type.getMetadata() == "usize") {
+                return new ManagedDecimalValue(native[0], native[1], true);
+            }
+            return new ManagedDecimalValue(native[0], native[1]);
+        }
+        errorContext.throwError(`(function: toEnumValue) unsupported native type ${typeof native}`);
+    }
+
     // TODO: move logic to typesystem/bytes.ts
     function convertNativeToBytesValue(native: NativeTypes.NativeBytes, errorContext: ArgumentErrorContext) {
         const innerValue = native.valueOf();

From 5a116591c95fce812856c44e733b2764473646da Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 5 Sep 2024 12:40:01 +0300
Subject: [PATCH 240/338] Update native serializer tests

---
 src/smartcontracts/nativeSerializer.spec.ts | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/smartcontracts/nativeSerializer.spec.ts b/src/smartcontracts/nativeSerializer.spec.ts
index 5b3da3c8c..70411eec6 100644
--- a/src/smartcontracts/nativeSerializer.spec.ts
+++ b/src/smartcontracts/nativeSerializer.spec.ts
@@ -348,12 +348,6 @@ describe("test native serializer", () => {
                         {
                             type: "u64",
                         },
-                        {
-                            type: "ManagedDecimal<8>",
-                        },
-                        {
-                            type: "ManagedDecimal<usize>",
-                        },
                     ],
                     outputs: [],
                 },
@@ -370,8 +364,6 @@ describe("test native serializer", () => {
                     [45, true],
                 ],
                 46,
-                [2, 8],
-                [12.5644, 6],
             ],
             endpoint,
         );
@@ -385,10 +377,6 @@ describe("test native serializer", () => {
             { field0: new BigNumber(44), field1: false },
             { field0: new BigNumber(45), field1: true },
         ]);
-        assert.deepEqual(typedValues[4].getType(), new ManagedDecimalType(8));
-        assert.deepEqual(typedValues[4].valueOf(), new BigNumber(2));
-        assert.deepEqual(typedValues[5].getType(), new ManagedDecimalType("usize"));
-        assert.deepEqual(typedValues[5].valueOf(), new BigNumber(12.5644));
 
         // Pass a mix of native and typed values
         typedValues = NativeSerializer.nativeToTypedValues(
@@ -400,8 +388,6 @@ describe("test native serializer", () => {
                     [45, new BooleanValue(true)],
                 ],
                 46,
-                [2, 8],
-                [2, 6],
             ],
             endpoint,
         );

From dada969d1198ccd9cbe3c3f9106a96f233e70241 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 5 Sep 2024 15:42:07 +0300
Subject: [PATCH 241/338] Fix integretion tests

---
 src/smartcontracts/codec/managedDecimal.ts       | 2 +-
 src/smartcontracts/interaction.local.net.spec.ts | 6 +++---
 src/smartcontracts/typesystem/types.ts           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/smartcontracts/codec/managedDecimal.ts b/src/smartcontracts/codec/managedDecimal.ts
index 83f7b5291..a8f113cb1 100644
--- a/src/smartcontracts/codec/managedDecimal.ts
+++ b/src/smartcontracts/codec/managedDecimal.ts
@@ -25,7 +25,7 @@ export class ManagedDecimalCodec {
             return new ManagedDecimalValue(new BigNumber(0), 2);
         }
 
-        const isUsize = type.getMetadata() === "usize";
+        const isUsize = type.getMetadata() == "usize";
 
         if (isUsize) {
             const u32Size = 4;
diff --git a/src/smartcontracts/interaction.local.net.spec.ts b/src/smartcontracts/interaction.local.net.spec.ts
index e5f4a79d5..e809bb1a6 100644
--- a/src/smartcontracts/interaction.local.net.spec.ts
+++ b/src/smartcontracts/interaction.local.net.spec.ts
@@ -240,7 +240,7 @@ describe("test smart contract interactor", function () {
 
         // log
         let mdLnInteraction = <Interaction>contract.methods
-            .managed_decimal_ln([new ManagedDecimalValue(23, 9)])
+            .managed_decimal_ln([new ManagedDecimalValue(23000000000, 9)])
             .withGasLimit(10000000)
             .withChainID(network.ChainID)
             .withSender(alice.address)
@@ -287,7 +287,7 @@ describe("test smart contract interactor", function () {
         let { bundle: bundleMDLn } = await controller.execute(mdLnInteraction, mdLnTransaction);
         assert.isTrue(bundleMDLn.returnCode.equals(ReturnCode.Ok));
         assert.lengthOf(bundleMDLn.values, 1);
-        assert.deepEqual(bundleMDLn.values[0], new ManagedDecimalSignedValue(3.135553845, 9));
+        assert.deepEqual(bundleMDLn.values[0], new ManagedDecimalSignedValue(3135553845, 9));
 
         // addition with var decimals
         await signTransaction({ transaction: additionVarTransaction, wallet: alice });
@@ -357,7 +357,7 @@ describe("test smart contract interactor", function () {
         assert.deepEqual(valueAfterDecrement!.valueOf(), new BigNumber(0));
     });
 
-    it("should interact with 'counter' (local testnet) using the SmartContractTransactionsFactory", async function () {
+    it("should interact with 'basic-features' (local testnet) and use managed Decimal", async function () {
         this.timeout(120000);
 
         let abiRegistry = await loadAbiRegistry("src/testdata/counter.abi.json");
diff --git a/src/smartcontracts/typesystem/types.ts b/src/smartcontracts/typesystem/types.ts
index b6bb20b3a..00ef65b93 100644
--- a/src/smartcontracts/typesystem/types.ts
+++ b/src/smartcontracts/typesystem/types.ts
@@ -10,7 +10,7 @@ export class Type {
 
     private readonly name: string;
     private readonly typeParameters: Type[];
-    protected readonly metadata: any;
+    protected readonly metadata: string;
     private readonly cardinality: TypeCardinality;
 
     public constructor(

From 73670bd3655d791dbf69cc4bd55b280b2cf9105e Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 5 Sep 2024 15:45:37 +0300
Subject: [PATCH 242/338] Core review follow up

---
 src/smartcontracts/nativeSerializer.ts | 2 +-
 src/smartcontracts/typesystem/types.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/smartcontracts/nativeSerializer.ts b/src/smartcontracts/nativeSerializer.ts
index e2ed52afa..b5925b5ae 100644
--- a/src/smartcontracts/nativeSerializer.ts
+++ b/src/smartcontracts/nativeSerializer.ts
@@ -344,7 +344,7 @@ export namespace NativeSerializer {
             }
             return new ManagedDecimalValue(native[0], native[1]);
         }
-        errorContext.throwError(`(function: toEnumValue) unsupported native type ${typeof native}`);
+        errorContext.throwError(`(function: toManagedDecimal) unsupported native type ${typeof native}`);
     }
 
     // TODO: move logic to typesystem/bytes.ts
diff --git a/src/smartcontracts/typesystem/types.ts b/src/smartcontracts/typesystem/types.ts
index 00ef65b93..39fc85e1e 100644
--- a/src/smartcontracts/typesystem/types.ts
+++ b/src/smartcontracts/typesystem/types.ts
@@ -10,8 +10,8 @@ export class Type {
 
     private readonly name: string;
     private readonly typeParameters: Type[];
-    protected readonly metadata: string;
     private readonly cardinality: TypeCardinality;
+    protected readonly metadata: string;
 
     public constructor(
         name: string,

From 1f65ffebec56d1fddafba9d604d1d290e8473fcb Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 5 Sep 2024 15:49:48 +0300
Subject: [PATCH 243/338] Remove unused variable

---
 src/smartcontracts/codec/managedDecimal.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/smartcontracts/codec/managedDecimal.ts b/src/smartcontracts/codec/managedDecimal.ts
index a8f113cb1..d0cde7319 100644
--- a/src/smartcontracts/codec/managedDecimal.ts
+++ b/src/smartcontracts/codec/managedDecimal.ts
@@ -15,9 +15,7 @@ export class ManagedDecimalCodec {
         const payload = buffer.slice(0, length);
 
         const result = this.decodeTopLevel(payload, type);
-        const decodedLength = length;
-
-        return [result, decodedLength];
+        return [result, length];
     }
 
     decodeTopLevel(buffer: Buffer, type: ManagedDecimalType): ManagedDecimalValue {

From 8e054c6563d1b2619bffcafaf181d0e6bac35ee5 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 5 Sep 2024 16:38:26 +0300
Subject: [PATCH 244/338] code review follow up

---
 src/abi/typeFormulaParser.ts                  |  3 ++-
 src/smartcontracts/codec/managedDecimal.ts    | 22 +++++++++----------
 src/smartcontracts/nativeSerializer.ts        |  5 +----
 .../typesystem/managedDecimal.ts              |  6 ++++-
 .../typesystem/typeExpressionParser.ts        |  4 ++--
 src/smartcontracts/typesystem/typeMapper.ts   |  2 +-
 src/smartcontracts/typesystem/types.ts        | 19 ++++++++++------
 7 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/abi/typeFormulaParser.ts b/src/abi/typeFormulaParser.ts
index 7806cd0cb..9cbdc5b93 100644
--- a/src/abi/typeFormulaParser.ts
+++ b/src/abi/typeFormulaParser.ts
@@ -81,9 +81,10 @@ export class TypeFormulaParser {
     private acquireTypeWithParameters(stack: any[]): TypeFormula {
         const typeParameters = this.acquireTypeParameters(stack);
         const typeName = stack.pop();
+        const metadata = typeParameters[0].name;
 
         if (typeName === "ManagedDecimal" || typeName === "ManagedDecimalSigned") {
-            const typeFormula = new TypeFormula(typeName, [], typeParameters[0].name);
+            const typeFormula = new TypeFormula(typeName, [], metadata);
             return typeFormula;
         }
         const typeFormula = new TypeFormula(typeName, typeParameters.reverse());
diff --git a/src/smartcontracts/codec/managedDecimal.ts b/src/smartcontracts/codec/managedDecimal.ts
index d0cde7319..97ed37b77 100644
--- a/src/smartcontracts/codec/managedDecimal.ts
+++ b/src/smartcontracts/codec/managedDecimal.ts
@@ -2,6 +2,7 @@ import BigNumber from "bignumber.js";
 import { BigUIntValue, ManagedDecimalType, ManagedDecimalValue, U32Value } from "../typesystem";
 import { BinaryCodec } from "./binary";
 import { bufferToBigInt } from "./utils";
+import { SizeOfU32 } from "./constants";
 
 export class ManagedDecimalCodec {
     private readonly binaryCodec: BinaryCodec;
@@ -20,28 +21,27 @@ export class ManagedDecimalCodec {
 
     decodeTopLevel(buffer: Buffer, type: ManagedDecimalType): ManagedDecimalValue {
         if (buffer.length === 0) {
-            return new ManagedDecimalValue(new BigNumber(0), 2);
+            return new ManagedDecimalValue(new BigNumber(0), 0);
         }
 
-        const isUsize = type.getMetadata() == "usize";
+        if (type.isVariable()) {
+            const bigUintSize = buffer.length - SizeOfU32;
 
-        if (isUsize) {
-            const u32Size = 4;
-            const bigUintSize = buffer.length - u32Size;
+            const value = new BigNumber(buffer.slice(0, bigUintSize).toString("hex"), 16);
+            const scale = buffer.readUInt32BE(bigUintSize);
 
-            const bigUint = new BigNumber(buffer.slice(0, bigUintSize).toString("hex"), 16);
-            const u32 = buffer.readUInt32BE(bigUintSize);
-
-            return new ManagedDecimalValue(bigUint, u32);
+            return new ManagedDecimalValue(value, scale);
         }
 
         const value = bufferToBigInt(buffer);
-        return new ManagedDecimalValue(value, parseInt(type.getMetadata()));
+        const scale = parseInt(type.getMetadata());
+        return new ManagedDecimalValue(value, scale);
     }
 
     encodeNested(value: ManagedDecimalValue): Buffer {
         let buffers: Buffer[] = [];
-        if (value.getType().getMetadata() == "usize") {
+        const managedDecimalType = value.getType() as ManagedDecimalType;
+        if (managedDecimalType.isVariable()) {
             buffers.push(Buffer.from(this.binaryCodec.encodeNested(new BigUIntValue(value.valueOf()))));
             buffers.push(Buffer.from(this.binaryCodec.encodeNested(new U32Value(value.getScale()))));
         } else {
diff --git a/src/smartcontracts/nativeSerializer.ts b/src/smartcontracts/nativeSerializer.ts
index b5925b5ae..59e8c4925 100644
--- a/src/smartcontracts/nativeSerializer.ts
+++ b/src/smartcontracts/nativeSerializer.ts
@@ -339,10 +339,7 @@ export namespace NativeSerializer {
 
     function toManagedDecimal(native: any, type: ManagedDecimalType, errorContext: ArgumentErrorContext): TypedValue {
         if (typeof native === "object") {
-            if (type.getMetadata() == "usize") {
-                return new ManagedDecimalValue(native[0], native[1], true);
-            }
-            return new ManagedDecimalValue(native[0], native[1]);
+            return new ManagedDecimalValue(native[0], native[1], type.isVariable());
         }
         errorContext.throwError(`(function: toManagedDecimal) unsupported native type ${typeof native}`);
     }
diff --git a/src/smartcontracts/typesystem/managedDecimal.ts b/src/smartcontracts/typesystem/managedDecimal.ts
index 61561e231..0edaa7d15 100644
--- a/src/smartcontracts/typesystem/managedDecimal.ts
+++ b/src/smartcontracts/typesystem/managedDecimal.ts
@@ -16,6 +16,10 @@ export class ManagedDecimalType extends Type {
     getMetadata(): string {
         return this.metadata;
     }
+
+    isVariable(): boolean {
+        return this.metadata == "usize";
+    }
 }
 
 export class ManagedDecimalValue extends TypedValue {
@@ -38,7 +42,7 @@ export class ManagedDecimalValue extends TypedValue {
     }
 
     getPrecision(): number {
-        return this.value.toString(this.scale).replace(".", "").length;
+        return this.value.toFixed(this.scale).replace(".", "").length;
     }
 
     /**
diff --git a/src/smartcontracts/typesystem/typeExpressionParser.ts b/src/smartcontracts/typesystem/typeExpressionParser.ts
index 0c61d502f..23bb4e8a3 100644
--- a/src/smartcontracts/typesystem/typeExpressionParser.ts
+++ b/src/smartcontracts/typesystem/typeExpressionParser.ts
@@ -1,7 +1,7 @@
 import { TypeFormula } from "../../abi/typeFormula";
 import { TypeFormulaParser } from "../../abi/typeFormulaParser";
 import { ErrTypingSystem } from "../../errors";
-import { Type } from "./types";
+import { Type, TypeCardinality } from "./types";
 
 export class TypeExpressionParser {
     private readonly backingTypeFormulaParser: TypeFormulaParser;
@@ -26,6 +26,6 @@ export class TypeExpressionParser {
 
     private typeFormulaToType(typeFormula: TypeFormula): Type {
         const typeParameters = typeFormula.typeParameters.map((typeFormula) => this.typeFormulaToType(typeFormula));
-        return new Type(typeFormula.name, typeParameters, undefined, typeFormula.metadata);
+        return new Type(typeFormula.name, typeParameters, TypeCardinality.fixed(1), typeFormula.metadata);
     }
 }
diff --git a/src/smartcontracts/typesystem/typeMapper.ts b/src/smartcontracts/typesystem/typeMapper.ts
index 0c5fa0e82..09487e440 100644
--- a/src/smartcontracts/typesystem/typeMapper.ts
+++ b/src/smartcontracts/typesystem/typeMapper.ts
@@ -174,7 +174,7 @@ export class TypeMapper {
 
     private learnType(type: Type): void {
         if (type.getName() === "ManagedDecimal" || type.getName() === "ManagedDecimalSigned") {
-            this.learnedTypesMap.delete(type.getName());
+            this.learnedTypesMap.delete(`${type.getName()}_${type.getMetadata()}`);
             this.learnedTypesMap.set(`${type.getName()}_${type.getMetadata()}`, type);
         } else {
             this.learnedTypesMap.delete(type.getName());
diff --git a/src/smartcontracts/typesystem/types.ts b/src/smartcontracts/typesystem/types.ts
index 39fc85e1e..39fc5f4fc 100644
--- a/src/smartcontracts/typesystem/types.ts
+++ b/src/smartcontracts/typesystem/types.ts
@@ -44,13 +44,18 @@ export class Type {
      * Gets the fully qualified name of the type, to allow for better (efficient and non-ambiguous) type comparison within the custom typesystem.
      */
     getFullyQualifiedName(): string {
-        let joinedTypeParameters = this.getTypeParameters()
-            .map((type) => type.getFullyQualifiedName())
-            .join(", ");
+        return this.isGenericType() ? this.getFullNameForGeneric() : `multiversx:types:${this.getName()}`;
+    }
 
-        return this.isGenericType()
-            ? `multiversx:types:${this.getName()}<${joinedTypeParameters}>`
-            : `multiversx:types:${this.getName()}`;
+    private getFullNameForGeneric(): string {
+        const hasTypeParameters = this.getTypeParameters.length > 0;
+        const joinedTypeParameters = hasTypeParameters
+            ? `${this.getTypeParameters()
+                  .map((type) => type.getFullyQualifiedName())
+                  .join(", ")}`
+            : "";
+        const baseName = `multiversx:types:${this.getName()}${joinedTypeParameters}`;
+        return this.metadata !== undefined ? `${baseName}*${this.metadata}*` : baseName;
     }
 
     hasExactClass(className: string): boolean {
@@ -75,7 +80,7 @@ export class Type {
     }
 
     hasMetadata(): boolean {
-        return this.metadata !== null && this.metadata !== undefined;
+        return !!this.metadata;
     }
 
     getFirstTypeParameter(): Type {

From 91353022db5b3aa17645dd5267e5a1cedcb81e5b Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 9 Sep 2024 15:52:34 +0300
Subject: [PATCH 245/338] Add tests for managed decimals

---
 .../typesystem/managedDecimal.spec.ts         | 52 +++++++++++++++++++
 .../typesystem/managedDecimal.ts              | 23 ++++----
 src/smartcontracts/typesystem/types.spec.ts   |  3 ++
 src/smartcontracts/typesystem/types.ts        | 16 ++++--
 4 files changed, 80 insertions(+), 14 deletions(-)
 create mode 100644 src/smartcontracts/typesystem/managedDecimal.spec.ts

diff --git a/src/smartcontracts/typesystem/managedDecimal.spec.ts b/src/smartcontracts/typesystem/managedDecimal.spec.ts
new file mode 100644
index 000000000..004d338ea
--- /dev/null
+++ b/src/smartcontracts/typesystem/managedDecimal.spec.ts
@@ -0,0 +1,52 @@
+import { assert } from "chai";
+import { ManagedDecimalType, ManagedDecimalValue } from "./managedDecimal";
+import BigNumber from "bignumber.js";
+
+describe("test managed decimal", () => {
+    it("should get correct metadata set", () => {
+        let type = new ManagedDecimalType("8");
+        const expectedMetadata = "8";
+
+        assert.equal(type.getMetadata(), expectedMetadata);
+        assert.isFalse(type.isVariable());
+    });
+
+    it("should get correct metadata set when variable", () => {
+        let type = new ManagedDecimalType("usize");
+        const expectedMetadata = "usize";
+
+        assert.equal(type.getMetadata(), expectedMetadata);
+        assert.isTrue(type.isVariable());
+    });
+
+    it("should return the expected values for scale and metadata", () => {
+        let firstValue = new ManagedDecimalValue(new BigNumber(1), 2, false);
+        let secondValue = new ManagedDecimalValue(new BigNumber(2), 2, false);
+        const expectedMetadata = "2";
+        const type = firstValue.getType() as ManagedDecimalType;
+
+        assert.equal(type.getMetadata(), expectedMetadata);
+        assert.isFalse(type.isVariable());
+        assert.equal(firstValue.getScale(), 2);
+        assert.equal(firstValue.toString(), "1.00");
+        assert.isFalse(firstValue.equals(secondValue));
+    });
+
+    it("should compare correctly two managed decimals even with different scale", () => {
+        let firstValue = new ManagedDecimalValue(new BigNumber(1.234), 3, false);
+        let secondValue = new ManagedDecimalValue(new BigNumber(12.34), 2, false);
+
+        assert.isFalse(firstValue.equals(secondValue));
+    });
+
+    it("should set the correct scale when variable decimals", () => {
+        let value = new ManagedDecimalValue(new BigNumber(1.3), 2, true);
+        const expectedMetadata = "usize";
+        const type = value.getType() as ManagedDecimalType;
+
+        assert.equal(type.getMetadata(), expectedMetadata);
+        assert.isTrue(type.isVariable());
+        assert.equal(value.toString(), "1.30");
+        assert.equal(value.getScale(), 2);
+    });
+});
diff --git a/src/smartcontracts/typesystem/managedDecimal.ts b/src/smartcontracts/typesystem/managedDecimal.ts
index 0edaa7d15..195db9fab 100644
--- a/src/smartcontracts/typesystem/managedDecimal.ts
+++ b/src/smartcontracts/typesystem/managedDecimal.ts
@@ -3,7 +3,6 @@ import { Type, TypedValue } from "./types";
 
 export class ManagedDecimalType extends Type {
     static ClassName = "ManagedDecimalType";
-    private readonly scale: any;
 
     constructor(metadata: any) {
         super("ManagedDecimal", undefined, undefined, metadata);
@@ -42,7 +41,9 @@ export class ManagedDecimalValue extends TypedValue {
     }
 
     getPrecision(): number {
-        return this.value.toFixed(this.scale).replace(".", "").length;
+        const response = this.value.toFixed(this.scale).replace(".", "").length;
+        console.log({ response, c: this.value, t: this.scale }, this.value.toFixed(), this.value.toFixed(this.scale));
+        return response;
     }
 
     /**
@@ -67,19 +68,21 @@ export class ManagedDecimalValue extends TypedValue {
 
 export class ManagedDecimalSignedType extends Type {
     static ClassName = "ManagedDecimalSignedType";
-    private readonly scale: number;
 
-    constructor(scale: number) {
-        super("ManagedDecimalSigned", undefined, undefined, scale);
-        this.scale = scale;
+    constructor(metadata: any) {
+        super("ManagedDecimalSigned", undefined, undefined, metadata);
     }
 
     getClassName(): string {
         return ManagedDecimalType.ClassName;
     }
 
-    getScale(): number {
-        return this.scale;
+    getMetadata(): string {
+        return this.metadata;
+    }
+
+    isVariable(): boolean {
+        return this.metadata == "usize";
     }
 }
 
@@ -88,8 +91,8 @@ export class ManagedDecimalSignedValue extends TypedValue {
     private readonly value: BigNumber;
     private readonly scale: number;
 
-    constructor(value: BigNumber.Value, scale: number) {
-        super(new ManagedDecimalType(scale));
+    constructor(value: BigNumber.Value, scale: number, isVariableDecimals: boolean = false) {
+        super(new ManagedDecimalSignedType(isVariableDecimals ? "usize" : scale));
         this.value = new BigNumber(value);
         this.scale = scale;
     }
diff --git a/src/smartcontracts/typesystem/types.spec.ts b/src/smartcontracts/typesystem/types.spec.ts
index 0639b9615..aad279ddb 100644
--- a/src/smartcontracts/typesystem/types.spec.ts
+++ b/src/smartcontracts/typesystem/types.spec.ts
@@ -9,6 +9,7 @@ import { I64Type, NumericalValue, U16Type, U32Type, U32Value } from "./numerical
 import { StringType } from "./string";
 import { TypeExpressionParser } from "./typeExpressionParser";
 import { NullType, PrimitiveType, Type } from "./types";
+import { ManagedDecimalSignedType, ManagedDecimalType } from "./managedDecimal";
 
 describe("test types", () => {
     let parser = new TypeExpressionParser();
@@ -63,6 +64,8 @@ describe("test types", () => {
             parser.parse("Option<u32>").getFullyQualifiedName(),
             "multiversx:types:Option<multiversx:types:u32>",
         );
+        assert.equal(new ManagedDecimalType("8").getFullyQualifiedName(), "multiversx:types:ManagedDecimal*8*");
+        assert.equal(new ManagedDecimalSignedType("8").getFullyQualifiedName(), "multiversx:types:ManagedDecimal*8*");
     });
 
     it("types and values should have correct JavaScript class hierarchy", () => {
diff --git a/src/smartcontracts/typesystem/types.ts b/src/smartcontracts/typesystem/types.ts
index 39fc5f4fc..dddc59d8b 100644
--- a/src/smartcontracts/typesystem/types.ts
+++ b/src/smartcontracts/typesystem/types.ts
@@ -44,18 +44,26 @@ export class Type {
      * Gets the fully qualified name of the type, to allow for better (efficient and non-ambiguous) type comparison within the custom typesystem.
      */
     getFullyQualifiedName(): string {
-        return this.isGenericType() ? this.getFullNameForGeneric() : `multiversx:types:${this.getName()}`;
+        return this.isGenericType() || this.hasMetadata()
+            ? this.getFullNameForGeneric()
+            : `multiversx:types:${this.getName()}`;
     }
 
     private getFullNameForGeneric(): string {
-        const hasTypeParameters = this.getTypeParameters.length > 0;
+        const hasTypeParameters = this.getTypeParameters().length > 0;
         const joinedTypeParameters = hasTypeParameters
             ? `${this.getTypeParameters()
                   .map((type) => type.getFullyQualifiedName())
                   .join(", ")}`
             : "";
-        const baseName = `multiversx:types:${this.getName()}${joinedTypeParameters}`;
-        return this.metadata !== undefined ? `${baseName}*${this.metadata}*` : baseName;
+        let baseName = `multiversx:types:${this.getName()}`;
+        if (hasTypeParameters) {
+            baseName = `${baseName}<${joinedTypeParameters}>`;
+        }
+        if (this.metadata !== undefined) {
+            baseName = `${baseName}*${this.metadata}*`;
+        }
+        return baseName;
     }
 
     hasExactClass(className: string): boolean {

From 33a875dd3432fb1ffcbe8443d9df3ba48d107a74 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 9 Sep 2024 16:12:00 +0300
Subject: [PATCH 246/338] Remove console logs

---
 src/smartcontracts/typesystem/managedDecimal.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/smartcontracts/typesystem/managedDecimal.ts b/src/smartcontracts/typesystem/managedDecimal.ts
index 195db9fab..b3c0144a3 100644
--- a/src/smartcontracts/typesystem/managedDecimal.ts
+++ b/src/smartcontracts/typesystem/managedDecimal.ts
@@ -41,9 +41,7 @@ export class ManagedDecimalValue extends TypedValue {
     }
 
     getPrecision(): number {
-        const response = this.value.toFixed(this.scale).replace(".", "").length;
-        console.log({ response, c: this.value, t: this.scale }, this.value.toFixed(), this.value.toFixed(this.scale));
-        return response;
+        return this.value.toFixed(this.scale).replace(".", "").length;
     }
 
     /**

From 14b2f5fff4023eaa97654432910c30d463f32742 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 9 Sep 2024 17:16:13 +0300
Subject: [PATCH 247/338] Fixed failing test

---
 src/smartcontracts/typesystem/types.spec.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/smartcontracts/typesystem/types.spec.ts b/src/smartcontracts/typesystem/types.spec.ts
index aad279ddb..e07d0e742 100644
--- a/src/smartcontracts/typesystem/types.spec.ts
+++ b/src/smartcontracts/typesystem/types.spec.ts
@@ -65,7 +65,10 @@ describe("test types", () => {
             "multiversx:types:Option<multiversx:types:u32>",
         );
         assert.equal(new ManagedDecimalType("8").getFullyQualifiedName(), "multiversx:types:ManagedDecimal*8*");
-        assert.equal(new ManagedDecimalSignedType("8").getFullyQualifiedName(), "multiversx:types:ManagedDecimal*8*");
+        assert.equal(
+            new ManagedDecimalSignedType("8").getFullyQualifiedName(),
+            "multiversx:types:ManagedDecimalSigned*8*",
+        );
     });
 
     it("types and values should have correct JavaScript class hierarchy", () => {

From 275bb4961b49b1838dfcd3f322c80fe46a282f19 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Tue, 10 Sep 2024 12:11:18 +0300
Subject: [PATCH 248/338] Code review follow up

---
 src/abi/typeFormulaParser.ts                  |  2 +-
 src/smartcontracts/codec/managedDecimal.ts    |  6 ++--
 .../typesystem/managedDecimal.spec.ts         | 33 ++++++++++---------
 .../typesystem/managedDecimal.ts              | 32 ++++++++++++------
 .../typesystem/typeExpressionParser.ts        |  4 +--
 src/smartcontracts/typesystem/typeMapper.ts   | 10 +++---
 src/smartcontracts/typesystem/types.spec.ts   |  9 +++--
 src/smartcontracts/typesystem/types.ts        |  2 +-
 8 files changed, 60 insertions(+), 38 deletions(-)

diff --git a/src/abi/typeFormulaParser.ts b/src/abi/typeFormulaParser.ts
index 9cbdc5b93..4353ed64c 100644
--- a/src/abi/typeFormulaParser.ts
+++ b/src/abi/typeFormulaParser.ts
@@ -81,9 +81,9 @@ export class TypeFormulaParser {
     private acquireTypeWithParameters(stack: any[]): TypeFormula {
         const typeParameters = this.acquireTypeParameters(stack);
         const typeName = stack.pop();
-        const metadata = typeParameters[0].name;
 
         if (typeName === "ManagedDecimal" || typeName === "ManagedDecimalSigned") {
+            const metadata = typeParameters[0].name;
             const typeFormula = new TypeFormula(typeName, [], metadata);
             return typeFormula;
         }
diff --git a/src/smartcontracts/codec/managedDecimal.ts b/src/smartcontracts/codec/managedDecimal.ts
index 97ed37b77..1a0e1c1cd 100644
--- a/src/smartcontracts/codec/managedDecimal.ts
+++ b/src/smartcontracts/codec/managedDecimal.ts
@@ -34,14 +34,14 @@ export class ManagedDecimalCodec {
         }
 
         const value = bufferToBigInt(buffer);
-        const scale = parseInt(type.getMetadata());
+        const metadata = type.getMetadata();
+        const scale = typeof metadata === "number" ? metadata : 0;
         return new ManagedDecimalValue(value, scale);
     }
 
     encodeNested(value: ManagedDecimalValue): Buffer {
         let buffers: Buffer[] = [];
-        const managedDecimalType = value.getType() as ManagedDecimalType;
-        if (managedDecimalType.isVariable()) {
+        if (value.isVariable()) {
             buffers.push(Buffer.from(this.binaryCodec.encodeNested(new BigUIntValue(value.valueOf()))));
             buffers.push(Buffer.from(this.binaryCodec.encodeNested(new U32Value(value.getScale()))));
         } else {
diff --git a/src/smartcontracts/typesystem/managedDecimal.spec.ts b/src/smartcontracts/typesystem/managedDecimal.spec.ts
index 004d338ea..7e2ef25fd 100644
--- a/src/smartcontracts/typesystem/managedDecimal.spec.ts
+++ b/src/smartcontracts/typesystem/managedDecimal.spec.ts
@@ -1,11 +1,10 @@
 import { assert } from "chai";
 import { ManagedDecimalType, ManagedDecimalValue } from "./managedDecimal";
-import BigNumber from "bignumber.js";
 
 describe("test managed decimal", () => {
     it("should get correct metadata set", () => {
-        let type = new ManagedDecimalType("8");
-        const expectedMetadata = "8";
+        const type = new ManagedDecimalType(8);
+        const expectedMetadata = 8;
 
         assert.equal(type.getMetadata(), expectedMetadata);
         assert.isFalse(type.isVariable());
@@ -20,32 +19,36 @@ describe("test managed decimal", () => {
     });
 
     it("should return the expected values for scale and metadata", () => {
-        let firstValue = new ManagedDecimalValue(new BigNumber(1), 2, false);
-        let secondValue = new ManagedDecimalValue(new BigNumber(2), 2, false);
-        const expectedMetadata = "2";
-        const type = firstValue.getType() as ManagedDecimalType;
+        const firstValue = new ManagedDecimalValue("1", 2, false);
+        const secondValue = new ManagedDecimalValue("2", 2, false);
+        const expectedMetadata = 2;
+        const type = firstValue.getType();
 
         assert.equal(type.getMetadata(), expectedMetadata);
-        assert.isFalse(type.isVariable());
+        assert.isFalse(firstValue.isVariable());
         assert.equal(firstValue.getScale(), 2);
         assert.equal(firstValue.toString(), "1.00");
         assert.isFalse(firstValue.equals(secondValue));
     });
 
     it("should compare correctly two managed decimals even with different scale", () => {
-        let firstValue = new ManagedDecimalValue(new BigNumber(1.234), 3, false);
-        let secondValue = new ManagedDecimalValue(new BigNumber(12.34), 2, false);
+        const firstValue = new ManagedDecimalValue("1.234", 3, false);
+        const secondValue = new ManagedDecimalValue("12.34", 2, false);
 
         assert.isFalse(firstValue.equals(secondValue));
     });
 
+    it.only("should compare correctly two managed decimals even with different scale", () => {
+        const firstValue = new ManagedDecimalValue("1.234", 3, false);
+        const secondValue = new ManagedDecimalValue("1.234", 3, false);
+
+        assert.isTrue(firstValue.equals(secondValue));
+    });
+
     it("should set the correct scale when variable decimals", () => {
-        let value = new ManagedDecimalValue(new BigNumber(1.3), 2, true);
-        const expectedMetadata = "usize";
-        const type = value.getType() as ManagedDecimalType;
+        const value = new ManagedDecimalValue("1.3", 2, true);
 
-        assert.equal(type.getMetadata(), expectedMetadata);
-        assert.isTrue(type.isVariable());
+        assert.isTrue(value.isVariable());
         assert.equal(value.toString(), "1.30");
         assert.equal(value.getScale(), 2);
     });
diff --git a/src/smartcontracts/typesystem/managedDecimal.ts b/src/smartcontracts/typesystem/managedDecimal.ts
index b3c0144a3..1522c962c 100644
--- a/src/smartcontracts/typesystem/managedDecimal.ts
+++ b/src/smartcontracts/typesystem/managedDecimal.ts
@@ -4,7 +4,7 @@ import { Type, TypedValue } from "./types";
 export class ManagedDecimalType extends Type {
     static ClassName = "ManagedDecimalType";
 
-    constructor(metadata: any) {
+    constructor(metadata: number | "usize") {
         super("ManagedDecimal", undefined, undefined, metadata);
     }
 
@@ -12,7 +12,7 @@ export class ManagedDecimalType extends Type {
         return ManagedDecimalType.ClassName;
     }
 
-    getMetadata(): string {
+    getMetadata(): number | "usize" {
         return this.metadata;
     }
 
@@ -25,11 +25,13 @@ export class ManagedDecimalValue extends TypedValue {
     static ClassName = "ManagedDecimalValue";
     private readonly value: BigNumber;
     private readonly scale: number;
+    private readonly variable: boolean;
 
-    constructor(value: BigNumber.Value, scale: number, isVar: boolean = false) {
-        super(new ManagedDecimalType(isVar ? "usize" : scale));
+    constructor(value: BigNumber.Value, scale: number, isVariable: boolean = false) {
+        super(new ManagedDecimalType(isVariable ? "usize" : scale));
         this.value = new BigNumber(value);
         this.scale = scale;
+        this.variable = isVariable;
     }
 
     getClassName(): string {
@@ -52,7 +54,7 @@ export class ManagedDecimalValue extends TypedValue {
             return false;
         }
 
-        return this.value == other.value;
+        return new BigNumber(this.value).eq(other.value);
     }
 
     valueOf(): BigNumber {
@@ -62,12 +64,16 @@ export class ManagedDecimalValue extends TypedValue {
     toString(): string {
         return this.value.toFixed(this.scale);
     }
+
+    isVariable(): boolean {
+        return this.variable;
+    }
 }
 
 export class ManagedDecimalSignedType extends Type {
     static ClassName = "ManagedDecimalSignedType";
 
-    constructor(metadata: any) {
+    constructor(metadata: number | "usize") {
         super("ManagedDecimalSigned", undefined, undefined, metadata);
     }
 
@@ -75,7 +81,7 @@ export class ManagedDecimalSignedType extends Type {
         return ManagedDecimalType.ClassName;
     }
 
-    getMetadata(): string {
+    getMetadata(): number | "usize" {
         return this.metadata;
     }
 
@@ -88,11 +94,13 @@ export class ManagedDecimalSignedValue extends TypedValue {
     static ClassName = "ManagedDecimalSignedValue";
     private readonly value: BigNumber;
     private readonly scale: number;
+    private readonly variable: boolean;
 
-    constructor(value: BigNumber.Value, scale: number, isVariableDecimals: boolean = false) {
-        super(new ManagedDecimalSignedType(isVariableDecimals ? "usize" : scale));
+    constructor(value: BigNumber.Value, scale: number, isVariable: boolean = false) {
+        super(new ManagedDecimalSignedType(isVariable ? "usize" : scale));
         this.value = new BigNumber(value);
         this.scale = scale;
+        this.variable = isVariable;
     }
 
     getClassName(): string {
@@ -111,7 +119,7 @@ export class ManagedDecimalSignedValue extends TypedValue {
             return false;
         }
 
-        return this.value == other.value;
+        return new BigNumber(this.value).eq(other.value);
     }
 
     valueOf(): BigNumber {
@@ -121,4 +129,8 @@ export class ManagedDecimalSignedValue extends TypedValue {
     toString(): string {
         return this.value.toFixed(this.scale);
     }
+
+    isVariable(): boolean {
+        return this.variable;
+    }
 }
diff --git a/src/smartcontracts/typesystem/typeExpressionParser.ts b/src/smartcontracts/typesystem/typeExpressionParser.ts
index 23bb4e8a3..0c61d502f 100644
--- a/src/smartcontracts/typesystem/typeExpressionParser.ts
+++ b/src/smartcontracts/typesystem/typeExpressionParser.ts
@@ -1,7 +1,7 @@
 import { TypeFormula } from "../../abi/typeFormula";
 import { TypeFormulaParser } from "../../abi/typeFormulaParser";
 import { ErrTypingSystem } from "../../errors";
-import { Type, TypeCardinality } from "./types";
+import { Type } from "./types";
 
 export class TypeExpressionParser {
     private readonly backingTypeFormulaParser: TypeFormulaParser;
@@ -26,6 +26,6 @@ export class TypeExpressionParser {
 
     private typeFormulaToType(typeFormula: TypeFormula): Type {
         const typeParameters = typeFormula.typeParameters.map((typeFormula) => this.typeFormulaToType(typeFormula));
-        return new Type(typeFormula.name, typeParameters, TypeCardinality.fixed(1), typeFormula.metadata);
+        return new Type(typeFormula.name, typeParameters, undefined, typeFormula.metadata);
     }
 }
diff --git a/src/smartcontracts/typesystem/typeMapper.ts b/src/smartcontracts/typesystem/typeMapper.ts
index 09487e440..f058bacc8 100644
--- a/src/smartcontracts/typesystem/typeMapper.ts
+++ b/src/smartcontracts/typesystem/typeMapper.ts
@@ -174,11 +174,13 @@ export class TypeMapper {
 
     private learnType(type: Type): void {
         if (type.getName() === "ManagedDecimal" || type.getName() === "ManagedDecimalSigned") {
-            this.learnedTypesMap.delete(`${type.getName()}_${type.getMetadata()}`);
-            this.learnedTypesMap.set(`${type.getName()}_${type.getMetadata()}`, type);
+            const learnedTypeKey = `${type.getName()}_${type.getMetadata()}`;
+            this.learnedTypesMap.delete(learnedTypeKey);
+            this.learnedTypesMap.set(learnedTypeKey, type);
         } else {
-            this.learnedTypesMap.delete(type.getName());
-            this.learnedTypesMap.set(type.getName(), type);
+            const learnedTypeKey = type.getName();
+            this.learnedTypesMap.delete(learnedTypeKey);
+            this.learnedTypesMap.set(learnedTypeKey, type);
         }
     }
 
diff --git a/src/smartcontracts/typesystem/types.spec.ts b/src/smartcontracts/typesystem/types.spec.ts
index e07d0e742..06d70e529 100644
--- a/src/smartcontracts/typesystem/types.spec.ts
+++ b/src/smartcontracts/typesystem/types.spec.ts
@@ -64,11 +64,16 @@ describe("test types", () => {
             parser.parse("Option<u32>").getFullyQualifiedName(),
             "multiversx:types:Option<multiversx:types:u32>",
         );
-        assert.equal(new ManagedDecimalType("8").getFullyQualifiedName(), "multiversx:types:ManagedDecimal*8*");
+        assert.equal(new ManagedDecimalType(8).getFullyQualifiedName(), "multiversx:types:ManagedDecimal*8*");
+        assert.equal(new ManagedDecimalType("usize").getFullyQualifiedName(), "multiversx:types:ManagedDecimal*usize*");
         assert.equal(
-            new ManagedDecimalSignedType("8").getFullyQualifiedName(),
+            new ManagedDecimalSignedType(8).getFullyQualifiedName(),
             "multiversx:types:ManagedDecimalSigned*8*",
         );
+        assert.equal(
+            new ManagedDecimalSignedType("usize").getFullyQualifiedName(),
+            "multiversx:types:ManagedDecimalSigned*usize*",
+        );
     });
 
     it("types and values should have correct JavaScript class hierarchy", () => {
diff --git a/src/smartcontracts/typesystem/types.ts b/src/smartcontracts/typesystem/types.ts
index dddc59d8b..792d66e4b 100644
--- a/src/smartcontracts/typesystem/types.ts
+++ b/src/smartcontracts/typesystem/types.ts
@@ -11,7 +11,7 @@ export class Type {
     private readonly name: string;
     private readonly typeParameters: Type[];
     private readonly cardinality: TypeCardinality;
-    protected readonly metadata: string;
+    protected readonly metadata: any;
 
     public constructor(
         name: string,

From 0ca88e9b8e931cce5961c0b701d5a9f7f6b307a6 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Tue, 10 Sep 2024 14:50:09 +0300
Subject: [PATCH 249/338] Fix test name

---
 src/smartcontracts/interaction.local.net.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/smartcontracts/interaction.local.net.spec.ts b/src/smartcontracts/interaction.local.net.spec.ts
index e809bb1a6..db572bfd8 100644
--- a/src/smartcontracts/interaction.local.net.spec.ts
+++ b/src/smartcontracts/interaction.local.net.spec.ts
@@ -357,7 +357,7 @@ describe("test smart contract interactor", function () {
         assert.deepEqual(valueAfterDecrement!.valueOf(), new BigNumber(0));
     });
 
-    it("should interact with 'basic-features' (local testnet) and use managed Decimal", async function () {
+    it("should interact with 'counter' (local testnet) using the SmartContractTransactionsFactory", async function () {
         this.timeout(120000);
 
         let abiRegistry = await loadAbiRegistry("src/testdata/counter.abi.json");

From 3838dc7aaad79de491e6872ab339260733df0078 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Tue, 10 Sep 2024 14:51:32 +0300
Subject: [PATCH 250/338] remove only

---
 src/smartcontracts/typesystem/managedDecimal.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/smartcontracts/typesystem/managedDecimal.spec.ts b/src/smartcontracts/typesystem/managedDecimal.spec.ts
index 7e2ef25fd..2257d5f5d 100644
--- a/src/smartcontracts/typesystem/managedDecimal.spec.ts
+++ b/src/smartcontracts/typesystem/managedDecimal.spec.ts
@@ -38,7 +38,7 @@ describe("test managed decimal", () => {
         assert.isFalse(firstValue.equals(secondValue));
     });
 
-    it.only("should compare correctly two managed decimals even with different scale", () => {
+    it("should compare correctly two managed decimals even with different scale", () => {
         const firstValue = new ManagedDecimalValue("1.234", 3, false);
         const secondValue = new ManagedDecimalValue("1.234", 3, false);
 

From d6522bc6715172c9f9a9b4c92afa91805cdb1bbe Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Tue, 10 Sep 2024 15:35:21 +0300
Subject: [PATCH 251/338] Deprecate interaction checker and bump version

---
 package-lock.json                        | 4 ++--
 package.json                             | 2 +-
 src/smartcontracts/interactionChecker.ts | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f3857b3e3..11b387c15 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.5.0",
+  "version": "13.6.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.5.0",
+      "version": "13.6.0",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index 2c162158e..6a29957f2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.5.0",
+  "version": "13.6.0",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",
diff --git a/src/smartcontracts/interactionChecker.ts b/src/smartcontracts/interactionChecker.ts
index ac122c558..744525f56 100644
--- a/src/smartcontracts/interactionChecker.ts
+++ b/src/smartcontracts/interactionChecker.ts
@@ -10,6 +10,9 @@ import BigNumber from "bignumber.js";
  *  - errors related to calling "non-payable" functions with some value provided
  *  - gas estimation errors (not yet implemented)
  */
+/**
+ * @deprecated The Interaction checker is deprecated due to lack of use.
+ */
 export class InteractionChecker {
     checkInteraction(interaction: Interaction, definition: EndpointDefinition): void {
         this.checkPayable(interaction, definition);

From cd58c8da09dda06da13a64290075733ab79d8834 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 11 Sep 2024 15:04:26 +0300
Subject: [PATCH 252/338] Add workflow

---
 .github/workflows/test-localnet.yml | 61 +++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 .github/workflows/test-localnet.yml

diff --git a/.github/workflows/test-localnet.yml b/.github/workflows/test-localnet.yml
new file mode 100644
index 000000000..d7a2a2fcb
--- /dev/null
+++ b/.github/workflows/test-localnet.yml
@@ -0,0 +1,61 @@
+name: MultiversX Integration Tests
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  integration_tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      # Step 1: Checkout the repository
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      # Step 2: Set up Python environment
+      - name: Set up Python 3.x
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+
+      # Step 3: Install mxpy (MultiversX Python SDK)
+      - name: Install mxpy (MultiversX SDK)
+        run: |
+          pip install mx-sdk-cli
+
+      # Step 4: Set up MultiversX localnet using mxpy
+      - name: Set up MultiversX localnet
+        run: |
+          # Start the local testnet with mxpy
+          mkdir -p ~/localnet && cd ~/localnet
+          mxpy localnet setup
+          mxpy localnet start
+          sleep 60 # Allow time for the testnet to fully start
+
+      # Step 5: Verify that testnet is running using mxpy CLI
+      - name: Verify localnet running
+        run: |
+          mxpy localnet status
+
+      # Step 6: Install Node.js and dependencies
+      - name: Set up Node.js environment
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16.x'
+
+      - name: Install Node.js dependencies
+        run: npm install
+
+      # Step 7: Run integration tests
+      - name: Run integration tests
+        run: |
+          npm run tests-localnet
+
+      # Step 8: Stop the testnet
+      - name: Stop MultiversX local localnet
+        if: success() || failure()
+        run: |
+          mxpy localnet stop

From 865ef1e982a3a043ddee89ddd2f23725b13833be Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 11 Sep 2024 15:06:15 +0300
Subject: [PATCH 253/338] Fix mxpy install

---
 .github/workflows/test-localnet.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-localnet.yml b/.github/workflows/test-localnet.yml
index d7a2a2fcb..d5715e8cd 100644
--- a/.github/workflows/test-localnet.yml
+++ b/.github/workflows/test-localnet.yml
@@ -24,7 +24,7 @@ jobs:
       # Step 3: Install mxpy (MultiversX Python SDK)
       - name: Install mxpy (MultiversX SDK)
         run: |
-          pip install mx-sdk-cli
+          pip install mx-sdk-cli --force
 
       # Step 4: Set up MultiversX localnet using mxpy
       - name: Set up MultiversX localnet

From 04a18763ea15030038959a9261a8231abba814cc Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 11 Sep 2024 15:10:33 +0300
Subject: [PATCH 254/338] Add pipx instalation step

---
 .github/workflows/test-localnet.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-localnet.yml b/.github/workflows/test-localnet.yml
index d5715e8cd..ae33943ea 100644
--- a/.github/workflows/test-localnet.yml
+++ b/.github/workflows/test-localnet.yml
@@ -21,10 +21,17 @@ jobs:
         with:
           python-version: '3.x'
 
+     # Step 2: Set up Python environment
+      - name: Set up pipx
+        run: |
+          apt update
+          apt install pipx
+          pipx ensurepath
+
       # Step 3: Install mxpy (MultiversX Python SDK)
       - name: Install mxpy (MultiversX SDK)
         run: |
-          pip install mx-sdk-cli --force
+          pipx install multiversx-sdk-cli --force
 
       # Step 4: Set up MultiversX localnet using mxpy
       - name: Set up MultiversX localnet

From ba0a321d2c19dcb1f53acc040843b314aca238c1 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 11 Sep 2024 15:13:26 +0300
Subject: [PATCH 255/338] Fix pipx instalation

---
 .github/workflows/test-localnet.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-localnet.yml b/.github/workflows/test-localnet.yml
index ae33943ea..e1ac4f731 100644
--- a/.github/workflows/test-localnet.yml
+++ b/.github/workflows/test-localnet.yml
@@ -21,12 +21,14 @@ jobs:
         with:
           python-version: '3.x'
 
-     # Step 2: Set up Python environment
-      - name: Set up pipx
+    # Step 3: Install pipx (to manage Python tools)
+      - name: Install pipx
         run: |
-          apt update
-          apt install pipx
-          pipx ensurepath
+          python3 -m pip install --user pipx
+          python3 -m pipx ensurepath
+          # Add the pipx binary location to PATH
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+        shell: bash
 
       # Step 3: Install mxpy (MultiversX Python SDK)
       - name: Install mxpy (MultiversX SDK)

From 6f61e602932de56d52f1b8994b60098de0515b92 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 11 Sep 2024 15:18:43 +0300
Subject: [PATCH 256/338] Remove verify step

---
 .github/workflows/test-localnet.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test-localnet.yml b/.github/workflows/test-localnet.yml
index e1ac4f731..ed465ff73 100644
--- a/.github/workflows/test-localnet.yml
+++ b/.github/workflows/test-localnet.yml
@@ -30,12 +30,12 @@ jobs:
           echo "$HOME/.local/bin" >> $GITHUB_PATH
         shell: bash
 
-      # Step 3: Install mxpy (MultiversX Python SDK)
+      # Step 4: Install mxpy (MultiversX Python SDK)
       - name: Install mxpy (MultiversX SDK)
         run: |
           pipx install multiversx-sdk-cli --force
 
-      # Step 4: Set up MultiversX localnet using mxpy
+      # Step 5: Set up MultiversX localnet using mxpy
       - name: Set up MultiversX localnet
         run: |
           # Start the local testnet with mxpy
@@ -44,11 +44,6 @@ jobs:
           mxpy localnet start
           sleep 60 # Allow time for the testnet to fully start
 
-      # Step 5: Verify that testnet is running using mxpy CLI
-      - name: Verify localnet running
-        run: |
-          mxpy localnet status
-
       # Step 6: Install Node.js and dependencies
       - name: Set up Node.js environment
         uses: actions/setup-node@v3

From 3cb06dab6cf1c886c2cf72f2c749027cad971e2f Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 11 Sep 2024 15:27:17 +0300
Subject: [PATCH 257/338] Add nohup

---
 .github/workflows/test-localnet.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-localnet.yml b/.github/workflows/test-localnet.yml
index ed465ff73..c204589ca 100644
--- a/.github/workflows/test-localnet.yml
+++ b/.github/workflows/test-localnet.yml
@@ -41,7 +41,7 @@ jobs:
           # Start the local testnet with mxpy
           mkdir -p ~/localnet && cd ~/localnet
           mxpy localnet setup
-          mxpy localnet start
+          nohup mxpy localnet start
           sleep 60 # Allow time for the testnet to fully start
 
       # Step 6: Install Node.js and dependencies

From 473e284af8c24c95ebbed6a6317f86921603706e Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 11 Sep 2024 15:32:47 +0300
Subject: [PATCH 258/338] Fix start localnet

---
 .github/workflows/test-localnet.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-localnet.yml b/.github/workflows/test-localnet.yml
index c204589ca..2f1802346 100644
--- a/.github/workflows/test-localnet.yml
+++ b/.github/workflows/test-localnet.yml
@@ -41,7 +41,7 @@ jobs:
           # Start the local testnet with mxpy
           mkdir -p ~/localnet && cd ~/localnet
           mxpy localnet setup
-          nohup mxpy localnet start
+          nohup mxpy localnet start &
           sleep 60 # Allow time for the testnet to fully start
 
       # Step 6: Install Node.js and dependencies

From 8ee4554a547bd554e35c63ccd346e9b3e41bdc25 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 12 Sep 2024 15:16:43 +0300
Subject: [PATCH 259/338] Add managed decimal signed codec

---
 src/smartcontracts/codec/binary.ts            |  13 ++++
 src/smartcontracts/codec/managedDecimal.ts    |  15 ++--
 .../codec/managedDecimalSigned.ts             |  56 ++++++++++++++
 .../interaction.local.net.spec.ts             |  17 ++---
 src/smartcontracts/typesystem/index.ts        |   1 +
 .../typesystem/managedDecimal.ts              |  65 ----------------
 .../typesystem/managedDecimalSigned.ts        |  71 ++++++++++++++++++
 src/smartcontracts/typesystem/matchers.ts     |  10 +++
 src/smartcontracts/typesystem/typeMapper.ts   |   3 +-
 src/smartcontracts/typesystem/types.spec.ts   |   3 +-
 src/testdata/basic-features.abi.json          |  12 +--
 src/testdata/basic-features.wasm              | Bin 87521 -> 66700 bytes
 12 files changed, 176 insertions(+), 90 deletions(-)
 create mode 100644 src/smartcontracts/codec/managedDecimalSigned.ts
 create mode 100644 src/smartcontracts/typesystem/managedDecimalSigned.ts
 mode change 100644 => 100755 src/testdata/basic-features.wasm

diff --git a/src/smartcontracts/codec/binary.ts b/src/smartcontracts/codec/binary.ts
index eb52e9d0e..0c5bbdb26 100644
--- a/src/smartcontracts/codec/binary.ts
+++ b/src/smartcontracts/codec/binary.ts
@@ -18,6 +18,8 @@ import {
     ArrayVec,
     ManagedDecimalType,
     ManagedDecimalValue,
+    ManagedDecimalSignedType,
+    ManagedDecimalSignedValue,
 } from "../typesystem";
 import { guardTrue } from "../../utils";
 import { OptionValueBinaryCodec } from "./option";
@@ -28,6 +30,7 @@ import { EnumBinaryCodec } from "./enum";
 import { TupleBinaryCodec } from "./tuple";
 import { ArrayVecBinaryCodec } from "./arrayVec";
 import { ManagedDecimalCodec } from "./managedDecimal";
+import { ManagedDecimalSignedCodec } from "./managedDecimalSigned";
 
 export class BinaryCodec {
     readonly constraints: BinaryCodecConstraints;
@@ -39,6 +42,7 @@ export class BinaryCodec {
     private readonly tupleCodec: TupleBinaryCodec;
     private readonly enumCodec: EnumBinaryCodec;
     private readonly managedDecimalCodec: ManagedDecimalCodec;
+    private readonly managedDecimalSignedCodec: ManagedDecimalSignedCodec;
 
     constructor(constraints: BinaryCodecConstraints | null = null) {
         this.constraints = constraints || new BinaryCodecConstraints();
@@ -50,6 +54,7 @@ export class BinaryCodec {
         this.tupleCodec = new TupleBinaryCodec(this);
         this.enumCodec = new EnumBinaryCodec(this);
         this.managedDecimalCodec = new ManagedDecimalCodec(this);
+        this.managedDecimalSignedCodec = new ManagedDecimalSignedCodec(this);
     }
 
     decodeTopLevel<TResult extends TypedValue = TypedValue>(buffer: Buffer, type: Type): TResult {
@@ -64,6 +69,8 @@ export class BinaryCodec {
             onTuple: () => this.tupleCodec.decodeTopLevel(buffer, <TupleType>type),
             onEnum: () => this.enumCodec.decodeTopLevel(buffer, <EnumType>type),
             onManagedDecimal: () => this.managedDecimalCodec.decodeTopLevel(buffer, <ManagedDecimalType>type),
+            onManagedDecimalSigned: () =>
+                this.managedDecimalSignedCodec.decodeTopLevel(buffer, <ManagedDecimalSignedType>type),
         });
 
         return <TResult>typedValue;
@@ -81,6 +88,8 @@ export class BinaryCodec {
             onTuple: () => this.tupleCodec.decodeNested(buffer, <TupleType>type),
             onEnum: () => this.enumCodec.decodeNested(buffer, <EnumType>type),
             onManagedDecimal: () => this.managedDecimalCodec.decodeNested(buffer, <ManagedDecimalType>type),
+            onManagedDecimalSigned: () =>
+                this.managedDecimalSignedCodec.decodeNested(buffer, <ManagedDecimalSignedType>type),
         });
 
         return [<TResult>typedResult, decodedLength];
@@ -98,6 +107,8 @@ export class BinaryCodec {
             onTuple: () => this.tupleCodec.encodeNested(<Tuple>typedValue),
             onEnum: () => this.enumCodec.encodeNested(<EnumValue>typedValue),
             onManagedDecimal: () => this.managedDecimalCodec.encodeNested(<ManagedDecimalValue>typedValue),
+            onManagedDecimalSigned: () =>
+                this.managedDecimalSignedCodec.encodeNested(<ManagedDecimalSignedValue>typedValue),
         });
     }
 
@@ -113,6 +124,8 @@ export class BinaryCodec {
             onTuple: () => this.tupleCodec.encodeTopLevel(<Tuple>typedValue),
             onEnum: () => this.enumCodec.encodeTopLevel(<EnumValue>typedValue),
             onManagedDecimal: () => this.managedDecimalCodec.encodeTopLevel(<ManagedDecimalValue>typedValue),
+            onManagedDecimalSigned: () =>
+                this.managedDecimalSignedCodec.encodeTopLevel(<ManagedDecimalSignedValue>typedValue),
         });
     }
 }
diff --git a/src/smartcontracts/codec/managedDecimal.ts b/src/smartcontracts/codec/managedDecimal.ts
index 1a0e1c1cd..0718dfa79 100644
--- a/src/smartcontracts/codec/managedDecimal.ts
+++ b/src/smartcontracts/codec/managedDecimal.ts
@@ -1,5 +1,5 @@
 import BigNumber from "bignumber.js";
-import { BigUIntValue, ManagedDecimalType, ManagedDecimalValue, U32Value } from "../typesystem";
+import { BigUIntType, BigUIntValue, ManagedDecimalType, ManagedDecimalValue, U32Value } from "../typesystem";
 import { BinaryCodec } from "./binary";
 import { bufferToBigInt } from "./utils";
 import { SizeOfU32 } from "./constants";
@@ -27,16 +27,15 @@ export class ManagedDecimalCodec {
         if (type.isVariable()) {
             const bigUintSize = buffer.length - SizeOfU32;
 
-            const value = new BigNumber(buffer.slice(0, bigUintSize).toString("hex"), 16);
+            const [value] = this.binaryCodec.decodeNested(buffer.slice(0, bigUintSize), new BigUIntType());
             const scale = buffer.readUInt32BE(bigUintSize);
-
-            return new ManagedDecimalValue(value, scale);
+            return new ManagedDecimalValue(value.valueOf(), scale);
         }
 
         const value = bufferToBigInt(buffer);
         const metadata = type.getMetadata();
-        const scale = typeof metadata === "number" ? metadata : 0;
-        return new ManagedDecimalValue(value, scale);
+        const scale = metadata !== "usize" ? parseInt(metadata.toString()) : 0;
+        return new ManagedDecimalValue(value.shiftedBy(-scale), scale);
     }
 
     encodeNested(value: ManagedDecimalValue): Buffer {
@@ -45,7 +44,9 @@ export class ManagedDecimalCodec {
             buffers.push(Buffer.from(this.binaryCodec.encodeNested(new BigUIntValue(value.valueOf()))));
             buffers.push(Buffer.from(this.binaryCodec.encodeNested(new U32Value(value.getScale()))));
         } else {
-            buffers.push(Buffer.from(this.binaryCodec.encodeTopLevel(new BigUIntValue(value.valueOf()))));
+            buffers.push(
+                this.binaryCodec.encodeTopLevel(new BigUIntValue(value.valueOf().shiftedBy(value.getScale()))),
+            );
         }
         return Buffer.concat(buffers);
     }
diff --git a/src/smartcontracts/codec/managedDecimalSigned.ts b/src/smartcontracts/codec/managedDecimalSigned.ts
new file mode 100644
index 000000000..f6e0654d6
--- /dev/null
+++ b/src/smartcontracts/codec/managedDecimalSigned.ts
@@ -0,0 +1,56 @@
+import BigNumber from "bignumber.js";
+import { BigIntType, BigIntValue, ManagedDecimalSignedType, ManagedDecimalSignedValue, U32Value } from "../typesystem";
+import { BinaryCodec } from "./binary";
+import { bufferToBigInt } from "./utils";
+import { SizeOfU32 } from "./constants";
+
+export class ManagedDecimalSignedCodec {
+    private readonly binaryCodec: BinaryCodec;
+
+    constructor(binaryCodec: BinaryCodec) {
+        this.binaryCodec = binaryCodec;
+    }
+
+    decodeNested(buffer: Buffer, type: ManagedDecimalSignedType): [ManagedDecimalSignedValue, number] {
+        const length = buffer.readUInt32BE(0);
+        const payload = buffer.slice(0, length);
+
+        const result = this.decodeTopLevel(payload, type);
+        return [result, length];
+    }
+
+    decodeTopLevel(buffer: Buffer, type: ManagedDecimalSignedType): ManagedDecimalSignedValue {
+        if (buffer.length === 0) {
+            return new ManagedDecimalSignedValue(new BigNumber(0), 0);
+        }
+
+        if (type.isVariable()) {
+            const bigUintSize = buffer.length - SizeOfU32;
+
+            const [value] = this.binaryCodec.decodeNested(buffer.slice(0, bigUintSize), new BigIntType());
+            const scale = buffer.readUInt32BE(bigUintSize);
+
+            return new ManagedDecimalSignedValue(value.valueOf(), scale);
+        }
+
+        const value = bufferToBigInt(buffer);
+        const metadata = type.getMetadata();
+        const scale = metadata !== "usize" ? parseInt(metadata.toString()) : 0;
+        return new ManagedDecimalSignedValue(value.shiftedBy(-scale), scale);
+    }
+
+    encodeNested(value: ManagedDecimalSignedValue): Buffer {
+        let buffers: Buffer[] = [];
+        if (value.isVariable()) {
+            buffers.push(Buffer.from(this.binaryCodec.encodeNested(new BigIntValue(new BigNumber("23.000000000")))));
+            buffers.push(Buffer.from(this.binaryCodec.encodeNested(new U32Value(value.getScale()))));
+        } else {
+            buffers.push(Buffer.from(this.binaryCodec.encodeTopLevel(new BigIntValue(23.0))));
+        }
+        return Buffer.concat(buffers);
+    }
+
+    encodeTopLevel(value: ManagedDecimalSignedValue): Buffer {
+        return this.encodeNested(value);
+    }
+}
diff --git a/src/smartcontracts/interaction.local.net.spec.ts b/src/smartcontracts/interaction.local.net.spec.ts
index db572bfd8..13e0780e8 100644
--- a/src/smartcontracts/interaction.local.net.spec.ts
+++ b/src/smartcontracts/interaction.local.net.spec.ts
@@ -185,7 +185,7 @@ describe("test smart contract interactor", function () {
         assert.isTrue(typedBundle.returnCode.equals(ReturnCode.Ok));
     });
 
-    it("should interact with 'basic-features' (local testnet) using the SmartContractTransactionsFactory", async function () {
+    it("should interact with 'basic-features' (local testnet)", async function () {
         this.timeout(140000);
 
         let abiRegistry = await loadAbiRegistry("src/testdata/basic-features.abi.json");
@@ -226,13 +226,13 @@ describe("test smart contract interactor", function () {
             .buildTransaction();
 
         let additionInteraction = <Interaction>contract.methods
-            .managed_decimal_addition([new ManagedDecimalValue(2, 2), new ManagedDecimalValue(3, 2)])
+            .managed_decimal_addition([new ManagedDecimalValue("2.5", 2), new ManagedDecimalValue("2.5", 2)])
             .withGasLimit(10000000)
             .withChainID(network.ChainID)
             .withSender(alice.address)
             .withValue(0);
 
-        // addition()
+        // addition();
         let additionTransaction = additionInteraction
             .withSender(alice.address)
             .useThenIncrementNonceOf(alice.account)
@@ -240,7 +240,7 @@ describe("test smart contract interactor", function () {
 
         // log
         let mdLnInteraction = <Interaction>contract.methods
-            .managed_decimal_ln([new ManagedDecimalValue(23000000000, 9)])
+            .managed_decimal_ln([new ManagedDecimalValue(23, 9)])
             .withGasLimit(10000000)
             .withChainID(network.ChainID)
             .withSender(alice.address)
@@ -253,10 +253,7 @@ describe("test smart contract interactor", function () {
             .buildTransaction();
 
         let additionVarInteraction = <Interaction>contract.methods
-            .managed_decimal_addition_var([
-                new ManagedDecimalValue(378298000000, 9, true),
-                new ManagedDecimalValue(378298000000, 9, true),
-            ])
+            .managed_decimal_addition_var([new ManagedDecimalValue(4, 2, true), new ManagedDecimalValue(5, 2, true)])
             .withGasLimit(50000000)
             .withChainID(network.ChainID)
             .withSender(alice.address)
@@ -287,14 +284,14 @@ describe("test smart contract interactor", function () {
         let { bundle: bundleMDLn } = await controller.execute(mdLnInteraction, mdLnTransaction);
         assert.isTrue(bundleMDLn.returnCode.equals(ReturnCode.Ok));
         assert.lengthOf(bundleMDLn.values, 1);
-        assert.deepEqual(bundleMDLn.values[0], new ManagedDecimalSignedValue(3135553845, 9));
+        assert.deepEqual(bundleMDLn.values[0], new ManagedDecimalSignedValue(3.135553845, 9));
 
         // addition with var decimals
         await signTransaction({ transaction: additionVarTransaction, wallet: alice });
         let { bundle: bundleAddition } = await controller.execute(additionVarInteraction, additionVarTransaction);
         assert.isTrue(bundleAddition.returnCode.equals(ReturnCode.Ok));
         assert.lengthOf(bundleAddition.values, 1);
-        assert.deepEqual(bundleAddition.values[0], new ManagedDecimalValue(new BigNumber(6254154138880), 9));
+        assert.deepEqual(bundleAddition.values[0], new ManagedDecimalValue(9, 2));
     });
 
     it("should interact with 'counter' (local testnet)", async function () {
diff --git a/src/smartcontracts/typesystem/index.ts b/src/smartcontracts/typesystem/index.ts
index a2cadaa0d..7f5dd2da7 100644
--- a/src/smartcontracts/typesystem/index.ts
+++ b/src/smartcontracts/typesystem/index.ts
@@ -29,3 +29,4 @@ export * from "./typeMapper";
 export * from "./types";
 export * from "./variadic";
 export * from "./managedDecimal";
+export * from "./managedDecimalSigned";
diff --git a/src/smartcontracts/typesystem/managedDecimal.ts b/src/smartcontracts/typesystem/managedDecimal.ts
index 1522c962c..b65b26a49 100644
--- a/src/smartcontracts/typesystem/managedDecimal.ts
+++ b/src/smartcontracts/typesystem/managedDecimal.ts
@@ -69,68 +69,3 @@ export class ManagedDecimalValue extends TypedValue {
         return this.variable;
     }
 }
-
-export class ManagedDecimalSignedType extends Type {
-    static ClassName = "ManagedDecimalSignedType";
-
-    constructor(metadata: number | "usize") {
-        super("ManagedDecimalSigned", undefined, undefined, metadata);
-    }
-
-    getClassName(): string {
-        return ManagedDecimalType.ClassName;
-    }
-
-    getMetadata(): number | "usize" {
-        return this.metadata;
-    }
-
-    isVariable(): boolean {
-        return this.metadata == "usize";
-    }
-}
-
-export class ManagedDecimalSignedValue extends TypedValue {
-    static ClassName = "ManagedDecimalSignedValue";
-    private readonly value: BigNumber;
-    private readonly scale: number;
-    private readonly variable: boolean;
-
-    constructor(value: BigNumber.Value, scale: number, isVariable: boolean = false) {
-        super(new ManagedDecimalSignedType(isVariable ? "usize" : scale));
-        this.value = new BigNumber(value);
-        this.scale = scale;
-        this.variable = isVariable;
-    }
-
-    getClassName(): string {
-        return ManagedDecimalValue.ClassName;
-    }
-
-    getPrecision(): number {
-        return this.value.toFixed(this.scale).replace(".", "").length;
-    }
-
-    /**
-     * Returns whether two objects have the same value.
-     */
-    equals(other: ManagedDecimalSignedValue): boolean {
-        if (this.getPrecision() != other.getPrecision()) {
-            return false;
-        }
-
-        return new BigNumber(this.value).eq(other.value);
-    }
-
-    valueOf(): BigNumber {
-        return this.value;
-    }
-
-    toString(): string {
-        return this.value.toFixed(this.scale);
-    }
-
-    isVariable(): boolean {
-        return this.variable;
-    }
-}
diff --git a/src/smartcontracts/typesystem/managedDecimalSigned.ts b/src/smartcontracts/typesystem/managedDecimalSigned.ts
new file mode 100644
index 000000000..032626f01
--- /dev/null
+++ b/src/smartcontracts/typesystem/managedDecimalSigned.ts
@@ -0,0 +1,71 @@
+import BigNumber from "bignumber.js";
+import { Type, TypedValue } from "./types";
+
+export class ManagedDecimalSignedType extends Type {
+    static ClassName = "ManagedDecimalSignedType";
+
+    constructor(metadata: number | "usize") {
+        super("ManagedDecimalSigned", undefined, undefined, metadata);
+    }
+
+    getClassName(): string {
+        return ManagedDecimalSignedType.ClassName;
+    }
+
+    getMetadata(): number | "usize" {
+        return this.metadata;
+    }
+
+    isVariable(): boolean {
+        return this.metadata == "usize";
+    }
+}
+
+export class ManagedDecimalSignedValue extends TypedValue {
+    static ClassName = "ManagedDecimalSignedValue";
+    private readonly value: BigNumber;
+    private readonly scale: number;
+    private readonly variable: boolean;
+
+    constructor(value: BigNumber.Value, scale: number, isVariable: boolean = false) {
+        super(new ManagedDecimalSignedType(isVariable ? "usize" : scale));
+        this.value = new BigNumber(value);
+        this.scale = scale;
+        this.variable = isVariable;
+    }
+
+    getClassName(): string {
+        return ManagedDecimalSignedValue.ClassName;
+    }
+
+    getPrecision(): number {
+        return this.value.toFixed(this.scale).replace(".", "").length;
+    }
+
+    getScale(): number {
+        return this.scale;
+    }
+
+    /**
+     * Returns whether two objects have the same value.
+     */
+    equals(other: ManagedDecimalSignedValue): boolean {
+        if (this.getPrecision() != other.getPrecision()) {
+            return false;
+        }
+
+        return new BigNumber(this.value).eq(other.value);
+    }
+
+    valueOf(): BigNumber {
+        return this.value;
+    }
+
+    toString(): string {
+        return this.value.toFixed(this.scale);
+    }
+
+    isVariable(): boolean {
+        return this.variable;
+    }
+}
diff --git a/src/smartcontracts/typesystem/matchers.ts b/src/smartcontracts/typesystem/matchers.ts
index 4bf5280ab..7a901d75f 100644
--- a/src/smartcontracts/typesystem/matchers.ts
+++ b/src/smartcontracts/typesystem/matchers.ts
@@ -16,6 +16,7 @@ import { ArrayVec, ArrayVecType } from "./genericArray";
 import { TypedValue } from "./types";
 import { StringType, StringValue } from "./string";
 import { ManagedDecimalType, ManagedDecimalValue } from "./managedDecimal";
+import { ManagedDecimalSignedType, ManagedDecimalSignedValue } from "./managedDecimalSigned";
 
 // TODO: Extend functionality or rename wrt. restricted / reduced functionality (not all types are handled: composite, variadic).
 export function onTypeSelect<TResult>(
@@ -29,6 +30,7 @@ export function onTypeSelect<TResult>(
         onTuple: () => TResult;
         onEnum: () => TResult;
         onManagedDecimal: () => TResult;
+        onManagedDecimalSigned: () => TResult;
         onOther?: () => TResult;
     },
 ): TResult {
@@ -58,6 +60,10 @@ export function onTypeSelect<TResult>(
         return selectors.onManagedDecimal();
     }
 
+    if (type.hasExactClass(ManagedDecimalSignedType.ClassName)) {
+        return selectors.onManagedDecimalSigned();
+    }
+
     if (selectors.onOther) {
         return selectors.onOther();
     }
@@ -76,6 +82,7 @@ export function onTypedValueSelect<TResult>(
         onTuple: () => TResult;
         onEnum: () => TResult;
         onManagedDecimal: () => TResult;
+        onManagedDecimalSigned: () => TResult;
         onOther?: () => TResult;
     },
 ): TResult {
@@ -103,6 +110,9 @@ export function onTypedValueSelect<TResult>(
     if (value.hasExactClass(ManagedDecimalValue.ClassName)) {
         return selectors.onManagedDecimal();
     }
+    if (value.hasExactClass(ManagedDecimalSignedValue.ClassName)) {
+        return selectors.onManagedDecimalSigned();
+    }
 
     if (selectors.onOther) {
         return selectors.onOther();
diff --git a/src/smartcontracts/typesystem/typeMapper.ts b/src/smartcontracts/typesystem/typeMapper.ts
index f058bacc8..e8ca9a4db 100644
--- a/src/smartcontracts/typesystem/typeMapper.ts
+++ b/src/smartcontracts/typesystem/typeMapper.ts
@@ -10,7 +10,8 @@ import { FieldDefinition } from "./fields";
 import { ListType, OptionType } from "./generic";
 import { ArrayVecType } from "./genericArray";
 import { H256Type } from "./h256";
-import { ManagedDecimalSignedType, ManagedDecimalType } from "./managedDecimal";
+import { ManagedDecimalType } from "./managedDecimal";
+import { ManagedDecimalSignedType } from "./managedDecimalSigned";
 import { NothingType } from "./nothing";
 import {
     BigIntType,
diff --git a/src/smartcontracts/typesystem/types.spec.ts b/src/smartcontracts/typesystem/types.spec.ts
index 06d70e529..eb77985aa 100644
--- a/src/smartcontracts/typesystem/types.spec.ts
+++ b/src/smartcontracts/typesystem/types.spec.ts
@@ -9,7 +9,8 @@ import { I64Type, NumericalValue, U16Type, U32Type, U32Value } from "./numerical
 import { StringType } from "./string";
 import { TypeExpressionParser } from "./typeExpressionParser";
 import { NullType, PrimitiveType, Type } from "./types";
-import { ManagedDecimalSignedType, ManagedDecimalType } from "./managedDecimal";
+import { ManagedDecimalType } from "./managedDecimal";
+import { ManagedDecimalSignedType } from "./managedDecimalSigned";
 
 describe("test types", () => {
     let parser = new TypeExpressionParser();
diff --git a/src/testdata/basic-features.abi.json b/src/testdata/basic-features.abi.json
index 762e044c8..f30c55001 100644
--- a/src/testdata/basic-features.abi.json
+++ b/src/testdata/basic-features.abi.json
@@ -1,20 +1,20 @@
 {
     "buildInfo": {
         "rustc": {
-            "version": "1.80.1",
-            "commitHash": "3f5fd8dd41153bc5fdca9427e9e05be2c767ba23",
-            "commitDate": "2024-08-06",
+            "version": "1.80.0",
+            "commitHash": "051478957371ee0084a7c0913941d2a8c4757bb9",
+            "commitDate": "2024-07-21",
             "channel": "Stable",
-            "short": "rustc 1.80.1 (3f5fd8dd4 2024-08-06)"
+            "short": "rustc 1.80.0 (051478957 2024-07-21)"
         },
         "contractCrate": {
             "name": "basic-features",
             "version": "0.0.0",
-            "gitVersion": "v0.52.3-147-g2659d2399"
+            "gitVersion": "v0.53.0-3-g49a82cb19"
         },
         "framework": {
             "name": "multiversx-sc",
-            "version": "0.52.3"
+            "version": "0.53.0"
         }
     },
     "name": "BasicFeatures",
diff --git a/src/testdata/basic-features.wasm b/src/testdata/basic-features.wasm
old mode 100644
new mode 100755
index ad7cf557097c94628e4d6e9f719962df170cf40d..47005bc7fdcf748b5a46871b2178c46191ec9ff7
GIT binary patch
literal 66700
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
Mqq+GjTeyk+H)j`BkN^Mx

literal 87521
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
U<T1Y?+?VVp9vZ6+?ZZ6czb)wbp#T5?


From 7fd503d82ce1d5c661c013aada8620e7baaeba66 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 12 Sep 2024 15:46:33 +0300
Subject: [PATCH 260/338] Add one more test

---
 src/smartcontracts/codec/managedDecimal.ts    |  8 ++-
 .../interaction.local.net.spec.ts             | 66 ++++++++++++-------
 2 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/src/smartcontracts/codec/managedDecimal.ts b/src/smartcontracts/codec/managedDecimal.ts
index 0718dfa79..b5a494b06 100644
--- a/src/smartcontracts/codec/managedDecimal.ts
+++ b/src/smartcontracts/codec/managedDecimal.ts
@@ -29,7 +29,7 @@ export class ManagedDecimalCodec {
 
             const [value] = this.binaryCodec.decodeNested(buffer.slice(0, bigUintSize), new BigUIntType());
             const scale = buffer.readUInt32BE(bigUintSize);
-            return new ManagedDecimalValue(value.valueOf(), scale);
+            return new ManagedDecimalValue(value.valueOf().shiftedBy(-scale), scale);
         }
 
         const value = bufferToBigInt(buffer);
@@ -41,7 +41,11 @@ export class ManagedDecimalCodec {
     encodeNested(value: ManagedDecimalValue): Buffer {
         let buffers: Buffer[] = [];
         if (value.isVariable()) {
-            buffers.push(Buffer.from(this.binaryCodec.encodeNested(new BigUIntValue(value.valueOf()))));
+            buffers.push(
+                Buffer.from(
+                    this.binaryCodec.encodeNested(new BigUIntValue(value.valueOf().shiftedBy(value.getScale()))),
+                ),
+            );
             buffers.push(Buffer.from(this.binaryCodec.encodeNested(new U32Value(value.getScale()))));
         } else {
             buffers.push(
diff --git a/src/smartcontracts/interaction.local.net.spec.ts b/src/smartcontracts/interaction.local.net.spec.ts
index 13e0780e8..b3d5e589c 100644
--- a/src/smartcontracts/interaction.local.net.spec.ts
+++ b/src/smartcontracts/interaction.local.net.spec.ts
@@ -185,7 +185,7 @@ describe("test smart contract interactor", function () {
         assert.isTrue(typedBundle.returnCode.equals(ReturnCode.Ok));
     });
 
-    it("should interact with 'basic-features' (local testnet)", async function () {
+    it.only("should interact with 'basic-features' (local testnet)", async function () {
         this.timeout(140000);
 
         let abiRegistry = await loadAbiRegistry("src/testdata/basic-features.abi.json");
@@ -210,23 +210,23 @@ describe("test smart contract interactor", function () {
         } = await controller.deploy(deployTransaction);
         assert.isTrue(returnCode.isSuccess());
 
-        let returnEgldInteraction = <Interaction>(
-            contract.methods
-                .returns_egld_decimal([])
-                .withGasLimit(10000000)
-                .withChainID(network.ChainID)
-                .withSender(alice.address)
-                .withValue(1)
-        );
-
-        // returnEgld()
-        let returnEgldTransaction = returnEgldInteraction
-            .withSender(alice.address)
-            .useThenIncrementNonceOf(alice.account)
-            .buildTransaction();
+        // let returnEgldInteraction = <Interaction>(
+        //     contract.methods
+        //         .returns_egld_decimal([])
+        //         .withGasLimit(10000000)
+        //         .withChainID(network.ChainID)
+        //         .withSender(alice.address)
+        //         .withValue(1)
+        // );
+
+        // // returnEgld()
+        // let returnEgldTransaction = returnEgldInteraction
+        //     .withSender(alice.address)
+        //     .useThenIncrementNonceOf(alice.account)
+        //     .buildTransaction();
 
         let additionInteraction = <Interaction>contract.methods
-            .managed_decimal_addition([new ManagedDecimalValue("2.5", 2), new ManagedDecimalValue("2.5", 2)])
+            .managed_decimal_addition([new ManagedDecimalValue(2.5, 2), new ManagedDecimalValue(2.7, 2)])
             .withGasLimit(10000000)
             .withChainID(network.ChainID)
             .withSender(alice.address)
@@ -265,19 +265,32 @@ describe("test smart contract interactor", function () {
             .useThenIncrementNonceOf(alice.account)
             .buildTransaction();
 
-        // returnEgld()
-        await signTransaction({ transaction: returnEgldTransaction, wallet: alice });
-        let { bundle: bundleEgld } = await controller.execute(returnEgldInteraction, returnEgldTransaction);
-        assert.isTrue(bundleEgld.returnCode.equals(ReturnCode.Ok));
-        assert.lengthOf(bundleEgld.values, 1);
-        assert.deepEqual(bundleEgld.values[0], new ManagedDecimalValue(1, 18));
+        let lnVarInteraction = <Interaction>contract.methods
+            .managed_decimal_ln_var([new ManagedDecimalValue(23, 9, true)])
+            .withGasLimit(50000000)
+            .withChainID(network.ChainID)
+            .withSender(alice.address)
+            .withValue(0);
+
+        // managed_decimal_ln_var()
+        let lnVarTransaction = lnVarInteraction
+            .withSender(alice.address)
+            .useThenIncrementNonceOf(alice.account)
+            .buildTransaction();
+
+        // // returnEgld()
+        // await signTransaction({ transaction: returnEgldTransaction, wallet: alice });
+        // let { bundle: bundleEgld } = await controller.execute(returnEgldInteraction, returnEgldTransaction);
+        // assert.isTrue(bundleEgld.returnCode.equals(ReturnCode.Ok));
+        // assert.lengthOf(bundleEgld.values, 1);
+        // assert.deepEqual(bundleEgld.values[0], new ManagedDecimalValue(1, 18));
 
         // addition with const decimals()
         await signTransaction({ transaction: additionTransaction, wallet: alice });
         let { bundle: bundleAdditionConst } = await controller.execute(additionInteraction, additionTransaction);
         assert.isTrue(bundleAdditionConst.returnCode.equals(ReturnCode.Ok));
         assert.lengthOf(bundleAdditionConst.values, 1);
-        assert.deepEqual(bundleAdditionConst.values[0], new ManagedDecimalValue(5, 2));
+        assert.deepEqual(bundleAdditionConst.values[0], new ManagedDecimalValue(5.2, 2));
 
         // log
         await signTransaction({ transaction: mdLnTransaction, wallet: alice });
@@ -292,6 +305,13 @@ describe("test smart contract interactor", function () {
         assert.isTrue(bundleAddition.returnCode.equals(ReturnCode.Ok));
         assert.lengthOf(bundleAddition.values, 1);
         assert.deepEqual(bundleAddition.values[0], new ManagedDecimalValue(9, 2));
+
+        // log
+        await signTransaction({ transaction: lnVarTransaction, wallet: alice });
+        let { bundle: bundleLnVar } = await controller.execute(lnVarInteraction, lnVarTransaction);
+        assert.isTrue(bundleLnVar.returnCode.equals(ReturnCode.Ok));
+        assert.lengthOf(bundleLnVar.values, 1);
+        assert.deepEqual(bundleLnVar.values[0], new ManagedDecimalSignedValue(3.135553845, 9));
     });
 
     it("should interact with 'counter' (local testnet)", async function () {

From f235986e5f28daca8dc6da281e25437cc153f86a Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 12 Sep 2024 15:47:53 +0300
Subject: [PATCH 261/338] Update workflow

---
 .github/workflows/test-localnet.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-localnet.yml b/.github/workflows/test-localnet.yml
index 2f1802346..8d20a4df9 100644
--- a/.github/workflows/test-localnet.yml
+++ b/.github/workflows/test-localnet.yml
@@ -62,4 +62,4 @@ jobs:
       - name: Stop MultiversX local localnet
         if: success() || failure()
         run: |
-          mxpy localnet stop
+          mxpy localnet clean

From ca53fb3fadf7ab7c17423b001ae19231ee1b8bd1 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 12 Sep 2024 16:01:01 +0300
Subject: [PATCH 262/338] Fix test

---
 .../interaction.local.net.spec.ts             | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/smartcontracts/interaction.local.net.spec.ts b/src/smartcontracts/interaction.local.net.spec.ts
index b3d5e589c..cc810fd6c 100644
--- a/src/smartcontracts/interaction.local.net.spec.ts
+++ b/src/smartcontracts/interaction.local.net.spec.ts
@@ -210,23 +210,23 @@ describe("test smart contract interactor", function () {
         } = await controller.deploy(deployTransaction);
         assert.isTrue(returnCode.isSuccess());
 
-        // let returnEgldInteraction = <Interaction>(
-        //     contract.methods
-        //         .returns_egld_decimal([])
-        //         .withGasLimit(10000000)
-        //         .withChainID(network.ChainID)
-        //         .withSender(alice.address)
-        //         .withValue(1)
-        // );
-
-        // // returnEgld()
-        // let returnEgldTransaction = returnEgldInteraction
-        //     .withSender(alice.address)
-        //     .useThenIncrementNonceOf(alice.account)
-        //     .buildTransaction();
+        let returnEgldInteraction = <Interaction>(
+            contract.methods
+                .returns_egld_decimal([])
+                .withGasLimit(10000000)
+                .withChainID(network.ChainID)
+                .withSender(alice.address)
+                .withValue(1)
+        );
+
+        // returnEgld()
+        let returnEgldTransaction = returnEgldInteraction
+            .withSender(alice.address)
+            .useThenIncrementNonceOf(alice.account)
+            .buildTransaction();
 
         let additionInteraction = <Interaction>contract.methods
-            .managed_decimal_addition([new ManagedDecimalValue(2.5, 2), new ManagedDecimalValue(2.7, 2)])
+            .managed_decimal_addition([new ManagedDecimalValue("2.5", 2), new ManagedDecimalValue("2.7", 2)])
             .withGasLimit(10000000)
             .withChainID(network.ChainID)
             .withSender(alice.address)
@@ -240,7 +240,7 @@ describe("test smart contract interactor", function () {
 
         // log
         let mdLnInteraction = <Interaction>contract.methods
-            .managed_decimal_ln([new ManagedDecimalValue(23, 9)])
+            .managed_decimal_ln([new ManagedDecimalValue("23", 9)])
             .withGasLimit(10000000)
             .withChainID(network.ChainID)
             .withSender(alice.address)
@@ -253,7 +253,10 @@ describe("test smart contract interactor", function () {
             .buildTransaction();
 
         let additionVarInteraction = <Interaction>contract.methods
-            .managed_decimal_addition_var([new ManagedDecimalValue(4, 2, true), new ManagedDecimalValue(5, 2, true)])
+            .managed_decimal_addition_var([
+                new ManagedDecimalValue("4", 2, true),
+                new ManagedDecimalValue("5", 2, true),
+            ])
             .withGasLimit(50000000)
             .withChainID(network.ChainID)
             .withSender(alice.address)
@@ -266,7 +269,7 @@ describe("test smart contract interactor", function () {
             .buildTransaction();
 
         let lnVarInteraction = <Interaction>contract.methods
-            .managed_decimal_ln_var([new ManagedDecimalValue(23, 9, true)])
+            .managed_decimal_ln_var([new ManagedDecimalValue("23", 9, true)])
             .withGasLimit(50000000)
             .withChainID(network.ChainID)
             .withSender(alice.address)
@@ -278,40 +281,40 @@ describe("test smart contract interactor", function () {
             .useThenIncrementNonceOf(alice.account)
             .buildTransaction();
 
-        // // returnEgld()
-        // await signTransaction({ transaction: returnEgldTransaction, wallet: alice });
-        // let { bundle: bundleEgld } = await controller.execute(returnEgldInteraction, returnEgldTransaction);
-        // assert.isTrue(bundleEgld.returnCode.equals(ReturnCode.Ok));
-        // assert.lengthOf(bundleEgld.values, 1);
-        // assert.deepEqual(bundleEgld.values[0], new ManagedDecimalValue(1, 18));
+        // returnEgld()
+        await signTransaction({ transaction: returnEgldTransaction, wallet: alice });
+        let { bundle: bundleEgld } = await controller.execute(returnEgldInteraction, returnEgldTransaction);
+        assert.isTrue(bundleEgld.returnCode.equals(ReturnCode.Ok));
+        assert.lengthOf(bundleEgld.values, 1);
+        assert.deepEqual(bundleEgld.values[0], new ManagedDecimalValue("0.000000000000000001", 18));
 
         // addition with const decimals()
         await signTransaction({ transaction: additionTransaction, wallet: alice });
         let { bundle: bundleAdditionConst } = await controller.execute(additionInteraction, additionTransaction);
         assert.isTrue(bundleAdditionConst.returnCode.equals(ReturnCode.Ok));
         assert.lengthOf(bundleAdditionConst.values, 1);
-        assert.deepEqual(bundleAdditionConst.values[0], new ManagedDecimalValue(5.2, 2));
+        assert.deepEqual(bundleAdditionConst.values[0], new ManagedDecimalValue("5.2", 2));
 
         // log
         await signTransaction({ transaction: mdLnTransaction, wallet: alice });
         let { bundle: bundleMDLn } = await controller.execute(mdLnInteraction, mdLnTransaction);
         assert.isTrue(bundleMDLn.returnCode.equals(ReturnCode.Ok));
         assert.lengthOf(bundleMDLn.values, 1);
-        assert.deepEqual(bundleMDLn.values[0], new ManagedDecimalSignedValue(3.135553845, 9));
+        assert.deepEqual(bundleMDLn.values[0], new ManagedDecimalSignedValue("3.135553845", 9));
 
         // addition with var decimals
         await signTransaction({ transaction: additionVarTransaction, wallet: alice });
         let { bundle: bundleAddition } = await controller.execute(additionVarInteraction, additionVarTransaction);
         assert.isTrue(bundleAddition.returnCode.equals(ReturnCode.Ok));
         assert.lengthOf(bundleAddition.values, 1);
-        assert.deepEqual(bundleAddition.values[0], new ManagedDecimalValue(9, 2));
+        assert.deepEqual(bundleAddition.values[0], new ManagedDecimalValue("9", 2));
 
         // log
         await signTransaction({ transaction: lnVarTransaction, wallet: alice });
         let { bundle: bundleLnVar } = await controller.execute(lnVarInteraction, lnVarTransaction);
         assert.isTrue(bundleLnVar.returnCode.equals(ReturnCode.Ok));
         assert.lengthOf(bundleLnVar.values, 1);
-        assert.deepEqual(bundleLnVar.values[0], new ManagedDecimalSignedValue(3.135553845, 9));
+        assert.deepEqual(bundleLnVar.values[0], new ManagedDecimalSignedValue("3.135553845", 9));
     });
 
     it("should interact with 'counter' (local testnet)", async function () {

From d6eb8b2613ff1a61a84f9cd4ac5c71a40154fe52 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 12 Sep 2024 16:01:37 +0300
Subject: [PATCH 263/338] remove only

---
 src/smartcontracts/interaction.local.net.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/smartcontracts/interaction.local.net.spec.ts b/src/smartcontracts/interaction.local.net.spec.ts
index cc810fd6c..e1b546da6 100644
--- a/src/smartcontracts/interaction.local.net.spec.ts
+++ b/src/smartcontracts/interaction.local.net.spec.ts
@@ -185,7 +185,7 @@ describe("test smart contract interactor", function () {
         assert.isTrue(typedBundle.returnCode.equals(ReturnCode.Ok));
     });
 
-    it.only("should interact with 'basic-features' (local testnet)", async function () {
+    it("should interact with 'basic-features' (local testnet)", async function () {
         this.timeout(140000);
 
         let abiRegistry = await loadAbiRegistry("src/testdata/basic-features.abi.json");

From 4f6a84cb0398be0c74693dd686f5418c65764e7b Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 12 Sep 2024 16:04:58 +0300
Subject: [PATCH 264/338] Update signed codec

---
 src/smartcontracts/codec/managedDecimalSigned.ts | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/smartcontracts/codec/managedDecimalSigned.ts b/src/smartcontracts/codec/managedDecimalSigned.ts
index f6e0654d6..6e79900d5 100644
--- a/src/smartcontracts/codec/managedDecimalSigned.ts
+++ b/src/smartcontracts/codec/managedDecimalSigned.ts
@@ -30,7 +30,7 @@ export class ManagedDecimalSignedCodec {
             const [value] = this.binaryCodec.decodeNested(buffer.slice(0, bigUintSize), new BigIntType());
             const scale = buffer.readUInt32BE(bigUintSize);
 
-            return new ManagedDecimalSignedValue(value.valueOf(), scale);
+            return new ManagedDecimalSignedValue(value.valueOf().shiftedBy(-scale), scale);
         }
 
         const value = bufferToBigInt(buffer);
@@ -42,10 +42,20 @@ export class ManagedDecimalSignedCodec {
     encodeNested(value: ManagedDecimalSignedValue): Buffer {
         let buffers: Buffer[] = [];
         if (value.isVariable()) {
-            buffers.push(Buffer.from(this.binaryCodec.encodeNested(new BigIntValue(new BigNumber("23.000000000")))));
+            buffers.push(
+                Buffer.from(
+                    this.binaryCodec.encodeNested(
+                        new BigIntValue(new BigNumber(value.valueOf().shiftedBy(value.getScale()))),
+                    ),
+                ),
+            );
             buffers.push(Buffer.from(this.binaryCodec.encodeNested(new U32Value(value.getScale()))));
         } else {
-            buffers.push(Buffer.from(this.binaryCodec.encodeTopLevel(new BigIntValue(23.0))));
+            buffers.push(
+                Buffer.from(
+                    this.binaryCodec.encodeTopLevel(new BigIntValue(value.valueOf().shiftedBy(value.getScale()))),
+                ),
+            );
         }
         return Buffer.concat(buffers);
     }

From f15a44ba2f5cd83a056a16cf3a7b66644a57587c Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 12 Sep 2024 16:20:12 +0300
Subject: [PATCH 265/338] Update workflow to stop when finish

---
 .github/workflows/test-localnet.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-localnet.yml b/.github/workflows/test-localnet.yml
index 8d20a4df9..0bb7c4d7e 100644
--- a/.github/workflows/test-localnet.yml
+++ b/.github/workflows/test-localnet.yml
@@ -41,7 +41,7 @@ jobs:
           # Start the local testnet with mxpy
           mkdir -p ~/localnet && cd ~/localnet
           mxpy localnet setup
-          nohup mxpy localnet start &
+          nohup mxpy localnet start > localnet.log 2>&1 & echo $! > localnet.pid
           sleep 60 # Allow time for the testnet to fully start
 
       # Step 6: Install Node.js and dependencies
@@ -58,8 +58,8 @@ jobs:
         run: |
           npm run tests-localnet
 
-      # Step 8: Stop the testnet
-      - name: Stop MultiversX local localnet
+      # Step 8: Stop the testnet using the stored PID
+      - name: Stop MultiversX local testnet
         if: success() || failure()
         run: |
-          mxpy localnet clean
+          kill $(cat localnet.pid) || echo "Testnet already stopped"

From c113ff5027afd42b48bf87ca520c992e27721571 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 12 Sep 2024 16:32:32 +0300
Subject: [PATCH 266/338] Fix variable name

---
 src/smartcontracts/codec/managedDecimalSigned.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/smartcontracts/codec/managedDecimalSigned.ts b/src/smartcontracts/codec/managedDecimalSigned.ts
index 6e79900d5..0f92fd7ef 100644
--- a/src/smartcontracts/codec/managedDecimalSigned.ts
+++ b/src/smartcontracts/codec/managedDecimalSigned.ts
@@ -25,10 +25,10 @@ export class ManagedDecimalSignedCodec {
         }
 
         if (type.isVariable()) {
-            const bigUintSize = buffer.length - SizeOfU32;
+            const bigintSize = buffer.length - SizeOfU32;
 
-            const [value] = this.binaryCodec.decodeNested(buffer.slice(0, bigUintSize), new BigIntType());
-            const scale = buffer.readUInt32BE(bigUintSize);
+            const [value] = this.binaryCodec.decodeNested(buffer.slice(0, bigintSize), new BigIntType());
+            const scale = buffer.readUInt32BE(bigintSize);
 
             return new ManagedDecimalSignedValue(value.valueOf().shiftedBy(-scale), scale);
         }

From 490dbecb229acf026298773b5a119ad9f168c198 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 16 Sep 2024 10:39:36 +0300
Subject: [PATCH 267/338] Extract variable

---
 src/smartcontracts/codec/managedDecimal.ts       | 11 +++--------
 src/smartcontracts/codec/managedDecimalSigned.ts | 15 +++------------
 src/smartcontracts/interaction.local.net.spec.ts |  2 +-
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/smartcontracts/codec/managedDecimal.ts b/src/smartcontracts/codec/managedDecimal.ts
index b5a494b06..0e2c5e43c 100644
--- a/src/smartcontracts/codec/managedDecimal.ts
+++ b/src/smartcontracts/codec/managedDecimal.ts
@@ -40,17 +40,12 @@ export class ManagedDecimalCodec {
 
     encodeNested(value: ManagedDecimalValue): Buffer {
         let buffers: Buffer[] = [];
+        const rawValue = new BigUIntValue(value.valueOf().shiftedBy(value.getScale()));
         if (value.isVariable()) {
-            buffers.push(
-                Buffer.from(
-                    this.binaryCodec.encodeNested(new BigUIntValue(value.valueOf().shiftedBy(value.getScale()))),
-                ),
-            );
+            buffers.push(Buffer.from(this.binaryCodec.encodeNested(rawValue)));
             buffers.push(Buffer.from(this.binaryCodec.encodeNested(new U32Value(value.getScale()))));
         } else {
-            buffers.push(
-                this.binaryCodec.encodeTopLevel(new BigUIntValue(value.valueOf().shiftedBy(value.getScale()))),
-            );
+            buffers.push(this.binaryCodec.encodeTopLevel(rawValue));
         }
         return Buffer.concat(buffers);
     }
diff --git a/src/smartcontracts/codec/managedDecimalSigned.ts b/src/smartcontracts/codec/managedDecimalSigned.ts
index 0f92fd7ef..181d275b8 100644
--- a/src/smartcontracts/codec/managedDecimalSigned.ts
+++ b/src/smartcontracts/codec/managedDecimalSigned.ts
@@ -41,21 +41,12 @@ export class ManagedDecimalSignedCodec {
 
     encodeNested(value: ManagedDecimalSignedValue): Buffer {
         let buffers: Buffer[] = [];
+        const rawValue = new BigIntValue(value.valueOf().shiftedBy(value.getScale()));
         if (value.isVariable()) {
-            buffers.push(
-                Buffer.from(
-                    this.binaryCodec.encodeNested(
-                        new BigIntValue(new BigNumber(value.valueOf().shiftedBy(value.getScale()))),
-                    ),
-                ),
-            );
+            buffers.push(Buffer.from(this.binaryCodec.encodeNested(rawValue)));
             buffers.push(Buffer.from(this.binaryCodec.encodeNested(new U32Value(value.getScale()))));
         } else {
-            buffers.push(
-                Buffer.from(
-                    this.binaryCodec.encodeTopLevel(new BigIntValue(value.valueOf().shiftedBy(value.getScale()))),
-                ),
-            );
+            buffers.push(Buffer.from(this.binaryCodec.encodeTopLevel(rawValue)));
         }
         return Buffer.concat(buffers);
     }
diff --git a/src/smartcontracts/interaction.local.net.spec.ts b/src/smartcontracts/interaction.local.net.spec.ts
index e1b546da6..05b8a8106 100644
--- a/src/smartcontracts/interaction.local.net.spec.ts
+++ b/src/smartcontracts/interaction.local.net.spec.ts
@@ -232,7 +232,7 @@ describe("test smart contract interactor", function () {
             .withSender(alice.address)
             .withValue(0);
 
-        // addition();
+        // addition()
         let additionTransaction = additionInteraction
             .withSender(alice.address)
             .useThenIncrementNonceOf(alice.account)

From 6d972bc7ea5ccb197981dac07bce31148d3e7267 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 16 Sep 2024 10:39:47 +0300
Subject: [PATCH 268/338] bump version

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 11b387c15..5c83ae964 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.6.0",
+  "version": "13.6.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.6.0",
+      "version": "13.6.1",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index 6a29957f2..11211ca88 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.6.0",
+  "version": "13.6.1",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",

From 987afbc5a11f9620dfd2b93d5ea8abea7f48a8e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Fri, 20 Sep 2024 12:20:37 +0300
Subject: [PATCH 269/338] Adjust register cost for dynamic NFTs.

---
 package-lock.json                                           | 4 ++--
 package.json                                                | 2 +-
 .../tokenManagementTransactionIntentsFactory.spec.ts        | 6 +++---
 .../tokenManagementTransactionsFactory.ts                   | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5c83ae964..fa0de3def 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.6.1",
+  "version": "13.6.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.6.1",
+      "version": "13.6.2",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index 11211ca88..0e1ae4ce6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.6.1",
+  "version": "13.6.2",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",
diff --git a/src/transactionsFactories/tokenManagementTransactionIntentsFactory.spec.ts b/src/transactionsFactories/tokenManagementTransactionIntentsFactory.spec.ts
index 9d7ada3e8..f5c489903 100644
--- a/src/transactionsFactories/tokenManagementTransactionIntentsFactory.spec.ts
+++ b/src/transactionsFactories/tokenManagementTransactionIntentsFactory.spec.ts
@@ -1,9 +1,9 @@
 import { assert } from "chai";
+import { Address } from "../address";
 import { ESDT_CONTRACT_ADDRESS_HEX } from "../constants";
 import { loadTestWallets, TestWallet } from "../testutils";
 import { TokenManagementTransactionsFactory } from "./tokenManagementTransactionsFactory";
 import { TransactionsFactoryConfig } from "./transactionsFactoryConfig";
-import { Address } from "../address";
 
 describe("test token management transactions factory", () => {
     let frank: TestWallet, grace: TestWallet;
@@ -354,7 +354,7 @@ describe("test token management transactions factory", () => {
         assert.deepEqual(transaction.data, Buffer.from("registerDynamic@54657374@544553542d313233343536@464e47"));
         assert.equal(transaction.sender, grace.address.toString());
         assert.equal(transaction.receiver, Address.newFromHex(ESDT_CONTRACT_ADDRESS_HEX, config.addressHrp).toBech32());
-        assert.equal(transaction.value, 0n);
+        assert.equal(transaction.value, 50000000000000000n);
         assert.equal(transaction.gasLimit, 60131000n);
     });
 
@@ -372,7 +372,7 @@ describe("test token management transactions factory", () => {
         );
         assert.equal(transaction.sender, grace.address.toString());
         assert.equal(transaction.receiver, Address.newFromHex(ESDT_CONTRACT_ADDRESS_HEX, config.addressHrp).toBech32());
-        assert.equal(transaction.value, 0n);
+        assert.equal(transaction.value, 50000000000000000n);
         assert.equal(transaction.gasLimit, 60152000n);
     });
 });
diff --git a/src/transactionsFactories/tokenManagementTransactionsFactory.ts b/src/transactionsFactories/tokenManagementTransactionsFactory.ts
index eef02df80..b674313a5 100644
--- a/src/transactionsFactories/tokenManagementTransactionsFactory.ts
+++ b/src/transactionsFactories/tokenManagementTransactionsFactory.ts
@@ -856,6 +856,7 @@ export class TokenManagementTransactionsFactory {
             dataParts: dataParts,
             gasLimit: this.config.gasLimitRegisterDynamic,
             addDataMovementGas: true,
+            amount: this.config.issueCost,
         }).build();
     }
 
@@ -881,6 +882,7 @@ export class TokenManagementTransactionsFactory {
             dataParts: dataParts,
             gasLimit: this.config.gasLimitRegisterDynamic,
             addDataMovementGas: true,
+            amount: this.config.issueCost,
         }).build();
     }
 

From 846101ff3f8a60e42d40fa0ddd51bcfdab28bd16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Fri, 20 Sep 2024 13:55:47 +0300
Subject: [PATCH 270/338] Longer delays for localnet tests.

---
 .github/workflows/test-localnet.yml | 2 +-
 src/transaction.local.net.spec.ts   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-localnet.yml b/.github/workflows/test-localnet.yml
index 0bb7c4d7e..cdeb1f1a9 100644
--- a/.github/workflows/test-localnet.yml
+++ b/.github/workflows/test-localnet.yml
@@ -42,7 +42,7 @@ jobs:
           mkdir -p ~/localnet && cd ~/localnet
           mxpy localnet setup
           nohup mxpy localnet start > localnet.log 2>&1 & echo $! > localnet.pid
-          sleep 60 # Allow time for the testnet to fully start
+          sleep 90 # Allow time for the testnet to fully start
 
       # Step 6: Install Node.js and dependencies
       - name: Set up Node.js environment
diff --git a/src/transaction.local.net.spec.ts b/src/transaction.local.net.spec.ts
index 844091230..15082da7d 100644
--- a/src/transaction.local.net.spec.ts
+++ b/src/transaction.local.net.spec.ts
@@ -5,11 +5,11 @@ import { loadTestWallets, TestWallet } from "./testutils";
 import { createLocalnetProvider, INetworkProvider } from "./testutils/networkProviders";
 import { TokenTransfer } from "./tokens";
 import { Transaction } from "./transaction";
+import { TransactionComputer } from "./transactionComputer";
 import { TransactionPayload } from "./transactionPayload";
 import { TransactionWatcher } from "./transactionWatcher";
 import { TransactionsFactoryConfig } from "./transactionsFactories/transactionsFactoryConfig";
 import { TransferTransactionsFactory } from "./transactionsFactories/transferTransactionsFactory";
-import { TransactionComputer } from "./transactionComputer";
 
 describe("test transaction", function () {
     let alice: TestWallet, bob: TestWallet;
@@ -30,7 +30,7 @@ describe("test transaction", function () {
     }
 
     it("should send transactions and wait for completion", async function () {
-        this.timeout(70000);
+        this.timeout(80000);
 
         let provider = createLocalnetProvider();
         let watcher = createTransactionWatcher(provider);
@@ -76,7 +76,7 @@ describe("test transaction", function () {
     });
 
     it("should send transaction and wait for completion using the new proxy provider", async function () {
-        this.timeout(70000);
+        this.timeout(80000);
 
         let provider = createLocalnetProvider();
         let watcher = createTransactionWatcher(provider);
@@ -142,7 +142,7 @@ describe("test transaction", function () {
     });
 
     it("should create transaction using the TokenTransferFactory", async function () {
-        this.timeout(70000);
+        this.timeout(80000);
 
         const provider = createLocalnetProvider();
         const watcher = createTransactionWatcher(provider);

From 5a21feff12df6e40332b3049a3bbd5d6219743b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Fri, 20 Sep 2024 14:09:47 +0300
Subject: [PATCH 271/338] More time for localnet to start.

---
 .github/workflows/test-localnet.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-localnet.yml b/.github/workflows/test-localnet.yml
index cdeb1f1a9..1faa26891 100644
--- a/.github/workflows/test-localnet.yml
+++ b/.github/workflows/test-localnet.yml
@@ -42,7 +42,7 @@ jobs:
           mkdir -p ~/localnet && cd ~/localnet
           mxpy localnet setup
           nohup mxpy localnet start > localnet.log 2>&1 & echo $! > localnet.pid
-          sleep 90 # Allow time for the testnet to fully start
+          sleep 120 # Allow time for the testnet to fully start
 
       # Step 6: Install Node.js and dependencies
       - name: Set up Node.js environment

From 79ea2b3b6003e50bb5fb01cae2cc6bd4650cf801 Mon Sep 17 00:00:00 2001
From: Micha Vie <micha@vleap.io>
Date: Mon, 23 Sep 2024 09:37:22 +0200
Subject: [PATCH 272/338] fix address value to accept custom hrps

---
 src/smartcontracts/typesystem/address.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/smartcontracts/typesystem/address.ts b/src/smartcontracts/typesystem/address.ts
index 53391e952..ef8db6d02 100644
--- a/src/smartcontracts/typesystem/address.ts
+++ b/src/smartcontracts/typesystem/address.ts
@@ -23,7 +23,7 @@ export class AddressValue extends PrimitiveValue {
 
     constructor(value: IAddress) {
         super(new AddressType());
-        this.value = new Address(value.bech32());
+        this.value = Address.newFromBech32(value.bech32());
     }
 
     getClassName(): string {

From 62bb8c1413c1badc2d387b81f717ae851e36c16c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Mon, 23 Sep 2024 11:55:23 +0300
Subject: [PATCH 273/338] Bump version.

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fa0de3def..d041cb8f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.6.2",
+  "version": "13.6.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.6.2",
+      "version": "13.6.3",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index 0e1ae4ce6..0df0f4d38 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.6.2",
+  "version": "13.6.3",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",

From 13897cc366d80e7c9eec9cb5202badf918f3c2d4 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 30 Sep 2024 12:51:52 +0300
Subject: [PATCH 274/338] Move netowrk providers to src level

---
 {src-network-providers => src/networkProviders}/.npmignore        | 0
 {src-network-providers => src/networkProviders}/accounts.ts       | 0
 .../networkProviders}/apiNetworkProvider.ts                       | 0
 {src-network-providers => src/networkProviders}/config.ts         | 0
 {src-network-providers => src/networkProviders}/constants.ts      | 0
 .../networkProviders}/contractQueryRequest.ts                     | 0
 .../networkProviders}/contractQueryResponse.ts                    | 0
 .../networkProviders}/contractResults.ts                          | 0
 {src-network-providers => src/networkProviders}/errors.ts         | 0
 {src-network-providers => src/networkProviders}/index.ts          | 0
 {src-network-providers => src/networkProviders}/interface.ts      | 0
 {src-network-providers => src/networkProviders}/networkConfig.ts  | 0
 .../networkProviders}/networkGeneralStatistics.ts                 | 0
 .../networkProviders}/networkProviderConfig.ts                    | 0
 {src-network-providers => src/networkProviders}/networkStake.ts   | 0
 {src-network-providers => src/networkProviders}/networkStatus.ts  | 0
 {src-network-providers => src/networkProviders}/pairs.ts          | 0
 .../networkProviders}/primitives.spec.ts                          | 0
 {src-network-providers => src/networkProviders}/primitives.ts     | 0
 .../networkProviders}/providers.dev.net.spec.ts                   | 0
 .../networkProviders}/proxyNetworkProvider.ts                     | 0
 .../networkProviders}/serialization.spec.ts                       | 0
 .../networkProviders}/testscommon/dummyQuery.ts                   | 0
 .../networkProviders}/tokenDefinitions.ts                         | 0
 {src-network-providers => src/networkProviders}/tokens.ts         | 0
 .../networkProviders}/transactionEvents.ts                        | 0
 .../networkProviders}/transactionLogs.ts                          | 0
 .../networkProviders}/transactionReceipt.ts                       | 0
 .../networkProviders}/transactionStatus.ts                        | 0
 {src-network-providers => src/networkProviders}/transactions.ts   | 0
 {src-network-providers => src/networkProviders}/userAgent.ts      | 0
 31 files changed, 0 insertions(+), 0 deletions(-)
 rename {src-network-providers => src/networkProviders}/.npmignore (100%)
 rename {src-network-providers => src/networkProviders}/accounts.ts (100%)
 rename {src-network-providers => src/networkProviders}/apiNetworkProvider.ts (100%)
 rename {src-network-providers => src/networkProviders}/config.ts (100%)
 rename {src-network-providers => src/networkProviders}/constants.ts (100%)
 rename {src-network-providers => src/networkProviders}/contractQueryRequest.ts (100%)
 rename {src-network-providers => src/networkProviders}/contractQueryResponse.ts (100%)
 rename {src-network-providers => src/networkProviders}/contractResults.ts (100%)
 rename {src-network-providers => src/networkProviders}/errors.ts (100%)
 rename {src-network-providers => src/networkProviders}/index.ts (100%)
 rename {src-network-providers => src/networkProviders}/interface.ts (100%)
 rename {src-network-providers => src/networkProviders}/networkConfig.ts (100%)
 rename {src-network-providers => src/networkProviders}/networkGeneralStatistics.ts (100%)
 rename {src-network-providers => src/networkProviders}/networkProviderConfig.ts (100%)
 rename {src-network-providers => src/networkProviders}/networkStake.ts (100%)
 rename {src-network-providers => src/networkProviders}/networkStatus.ts (100%)
 rename {src-network-providers => src/networkProviders}/pairs.ts (100%)
 rename {src-network-providers => src/networkProviders}/primitives.spec.ts (100%)
 rename {src-network-providers => src/networkProviders}/primitives.ts (100%)
 rename {src-network-providers => src/networkProviders}/providers.dev.net.spec.ts (100%)
 rename {src-network-providers => src/networkProviders}/proxyNetworkProvider.ts (100%)
 rename {src-network-providers => src/networkProviders}/serialization.spec.ts (100%)
 rename {src-network-providers => src/networkProviders}/testscommon/dummyQuery.ts (100%)
 rename {src-network-providers => src/networkProviders}/tokenDefinitions.ts (100%)
 rename {src-network-providers => src/networkProviders}/tokens.ts (100%)
 rename {src-network-providers => src/networkProviders}/transactionEvents.ts (100%)
 rename {src-network-providers => src/networkProviders}/transactionLogs.ts (100%)
 rename {src-network-providers => src/networkProviders}/transactionReceipt.ts (100%)
 rename {src-network-providers => src/networkProviders}/transactionStatus.ts (100%)
 rename {src-network-providers => src/networkProviders}/transactions.ts (100%)
 rename {src-network-providers => src/networkProviders}/userAgent.ts (100%)

diff --git a/src-network-providers/.npmignore b/src/networkProviders/.npmignore
similarity index 100%
rename from src-network-providers/.npmignore
rename to src/networkProviders/.npmignore
diff --git a/src-network-providers/accounts.ts b/src/networkProviders/accounts.ts
similarity index 100%
rename from src-network-providers/accounts.ts
rename to src/networkProviders/accounts.ts
diff --git a/src-network-providers/apiNetworkProvider.ts b/src/networkProviders/apiNetworkProvider.ts
similarity index 100%
rename from src-network-providers/apiNetworkProvider.ts
rename to src/networkProviders/apiNetworkProvider.ts
diff --git a/src-network-providers/config.ts b/src/networkProviders/config.ts
similarity index 100%
rename from src-network-providers/config.ts
rename to src/networkProviders/config.ts
diff --git a/src-network-providers/constants.ts b/src/networkProviders/constants.ts
similarity index 100%
rename from src-network-providers/constants.ts
rename to src/networkProviders/constants.ts
diff --git a/src-network-providers/contractQueryRequest.ts b/src/networkProviders/contractQueryRequest.ts
similarity index 100%
rename from src-network-providers/contractQueryRequest.ts
rename to src/networkProviders/contractQueryRequest.ts
diff --git a/src-network-providers/contractQueryResponse.ts b/src/networkProviders/contractQueryResponse.ts
similarity index 100%
rename from src-network-providers/contractQueryResponse.ts
rename to src/networkProviders/contractQueryResponse.ts
diff --git a/src-network-providers/contractResults.ts b/src/networkProviders/contractResults.ts
similarity index 100%
rename from src-network-providers/contractResults.ts
rename to src/networkProviders/contractResults.ts
diff --git a/src-network-providers/errors.ts b/src/networkProviders/errors.ts
similarity index 100%
rename from src-network-providers/errors.ts
rename to src/networkProviders/errors.ts
diff --git a/src-network-providers/index.ts b/src/networkProviders/index.ts
similarity index 100%
rename from src-network-providers/index.ts
rename to src/networkProviders/index.ts
diff --git a/src-network-providers/interface.ts b/src/networkProviders/interface.ts
similarity index 100%
rename from src-network-providers/interface.ts
rename to src/networkProviders/interface.ts
diff --git a/src-network-providers/networkConfig.ts b/src/networkProviders/networkConfig.ts
similarity index 100%
rename from src-network-providers/networkConfig.ts
rename to src/networkProviders/networkConfig.ts
diff --git a/src-network-providers/networkGeneralStatistics.ts b/src/networkProviders/networkGeneralStatistics.ts
similarity index 100%
rename from src-network-providers/networkGeneralStatistics.ts
rename to src/networkProviders/networkGeneralStatistics.ts
diff --git a/src-network-providers/networkProviderConfig.ts b/src/networkProviders/networkProviderConfig.ts
similarity index 100%
rename from src-network-providers/networkProviderConfig.ts
rename to src/networkProviders/networkProviderConfig.ts
diff --git a/src-network-providers/networkStake.ts b/src/networkProviders/networkStake.ts
similarity index 100%
rename from src-network-providers/networkStake.ts
rename to src/networkProviders/networkStake.ts
diff --git a/src-network-providers/networkStatus.ts b/src/networkProviders/networkStatus.ts
similarity index 100%
rename from src-network-providers/networkStatus.ts
rename to src/networkProviders/networkStatus.ts
diff --git a/src-network-providers/pairs.ts b/src/networkProviders/pairs.ts
similarity index 100%
rename from src-network-providers/pairs.ts
rename to src/networkProviders/pairs.ts
diff --git a/src-network-providers/primitives.spec.ts b/src/networkProviders/primitives.spec.ts
similarity index 100%
rename from src-network-providers/primitives.spec.ts
rename to src/networkProviders/primitives.spec.ts
diff --git a/src-network-providers/primitives.ts b/src/networkProviders/primitives.ts
similarity index 100%
rename from src-network-providers/primitives.ts
rename to src/networkProviders/primitives.ts
diff --git a/src-network-providers/providers.dev.net.spec.ts b/src/networkProviders/providers.dev.net.spec.ts
similarity index 100%
rename from src-network-providers/providers.dev.net.spec.ts
rename to src/networkProviders/providers.dev.net.spec.ts
diff --git a/src-network-providers/proxyNetworkProvider.ts b/src/networkProviders/proxyNetworkProvider.ts
similarity index 100%
rename from src-network-providers/proxyNetworkProvider.ts
rename to src/networkProviders/proxyNetworkProvider.ts
diff --git a/src-network-providers/serialization.spec.ts b/src/networkProviders/serialization.spec.ts
similarity index 100%
rename from src-network-providers/serialization.spec.ts
rename to src/networkProviders/serialization.spec.ts
diff --git a/src-network-providers/testscommon/dummyQuery.ts b/src/networkProviders/testscommon/dummyQuery.ts
similarity index 100%
rename from src-network-providers/testscommon/dummyQuery.ts
rename to src/networkProviders/testscommon/dummyQuery.ts
diff --git a/src-network-providers/tokenDefinitions.ts b/src/networkProviders/tokenDefinitions.ts
similarity index 100%
rename from src-network-providers/tokenDefinitions.ts
rename to src/networkProviders/tokenDefinitions.ts
diff --git a/src-network-providers/tokens.ts b/src/networkProviders/tokens.ts
similarity index 100%
rename from src-network-providers/tokens.ts
rename to src/networkProviders/tokens.ts
diff --git a/src-network-providers/transactionEvents.ts b/src/networkProviders/transactionEvents.ts
similarity index 100%
rename from src-network-providers/transactionEvents.ts
rename to src/networkProviders/transactionEvents.ts
diff --git a/src-network-providers/transactionLogs.ts b/src/networkProviders/transactionLogs.ts
similarity index 100%
rename from src-network-providers/transactionLogs.ts
rename to src/networkProviders/transactionLogs.ts
diff --git a/src-network-providers/transactionReceipt.ts b/src/networkProviders/transactionReceipt.ts
similarity index 100%
rename from src-network-providers/transactionReceipt.ts
rename to src/networkProviders/transactionReceipt.ts
diff --git a/src-network-providers/transactionStatus.ts b/src/networkProviders/transactionStatus.ts
similarity index 100%
rename from src-network-providers/transactionStatus.ts
rename to src/networkProviders/transactionStatus.ts
diff --git a/src-network-providers/transactions.ts b/src/networkProviders/transactions.ts
similarity index 100%
rename from src-network-providers/transactions.ts
rename to src/networkProviders/transactions.ts
diff --git a/src-network-providers/userAgent.ts b/src/networkProviders/userAgent.ts
similarity index 100%
rename from src-network-providers/userAgent.ts
rename to src/networkProviders/userAgent.ts

From cc5bce99cf50f55c856b23ddfceac3f3fc57b25d Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 30 Sep 2024 15:56:51 +0300
Subject: [PATCH 275/338] Remove network providers package and update
 dependencies

---
 package-lock.json                             | 28 -------------------
 package.json                                  |  1 -
 src/converters/transactionsConverters.spec.ts |  6 ++--
 src/index.ts                                  |  1 +
 src/networkProviders/index.ts                 |  9 ++++--
 src/smartContractQueriesController.spec.ts    |  2 +-
 src/smartcontracts/interaction.spec.ts        |  2 +-
 src/smartcontracts/resultsParser.spec.ts      | 18 ++++++------
 src/smartcontracts/smartContract.spec.ts      |  2 +-
 src/testutils/mockNetworkProvider.ts          |  7 +----
 src/testutils/networkProviders.ts             |  2 +-
 src/transactionWatcher.spec.ts                |  2 +-
 ...tContractTransactionsOutcomeParser.spec.ts | 14 +++++-----
 .../transactionEventsParser.spec.ts           |  6 ++--
 14 files changed, 35 insertions(+), 65 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d041cb8f1..355a26d58 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,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",
@@ -161,21 +160,6 @@
         "node": ">=8.9.0"
       }
     },
-    "node_modules/@multiversx/sdk-network-providers": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/@multiversx/sdk-network-providers/-/sdk-network-providers-2.6.0.tgz",
-      "integrity": "sha512-fAj7Py3otll00iFunwcDwp7/i7NiHInLN4EhdEFVfKNY5Z+roGI6YwPy3i60l8JApGE6DzmBQ22nVFYv8NzrPA==",
-      "dev": true,
-      "dependencies": {
-        "bech32": "1.1.4",
-        "bignumber.js": "9.0.1",
-        "buffer": "6.0.3",
-        "json-bigint": "1.0.0"
-      },
-      "peerDependencies": {
-        "axios": "^1.7.4"
-      }
-    },
     "node_modules/@multiversx/sdk-transaction-decoder": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@multiversx/sdk-transaction-decoder/-/sdk-transaction-decoder-1.0.2.tgz",
@@ -5317,18 +5301,6 @@
       "integrity": "sha512-c0tIdQUnbBLSt6NYU+OpeGPYdL0+GV547HeHT8Xc0BKQ7Cj0v82QUoA2QRtWrR1G4MNZmLsIacZSsf6DrIS2Bw==",
       "dev": true
     },
-    "@multiversx/sdk-network-providers": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/@multiversx/sdk-network-providers/-/sdk-network-providers-2.6.0.tgz",
-      "integrity": "sha512-fAj7Py3otll00iFunwcDwp7/i7NiHInLN4EhdEFVfKNY5Z+roGI6YwPy3i60l8JApGE6DzmBQ22nVFYv8NzrPA==",
-      "dev": true,
-      "requires": {
-        "bech32": "1.1.4",
-        "bignumber.js": "9.0.1",
-        "buffer": "6.0.3",
-        "json-bigint": "1.0.0"
-      }
-    },
     "@multiversx/sdk-transaction-decoder": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@multiversx/sdk-transaction-decoder/-/sdk-transaction-decoder-1.0.2.tgz",
diff --git a/package.json b/package.json
index 0df0f4d38..6fa7815bf 100644
--- 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
index a61dd3bc8..12d26271b 100644
--- 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
index d244d0e0f..8ef8255b3 100644
--- 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/networkProviders/index.ts b/src/networkProviders/index.ts
index 804b15b66..16c7fccaa 100644
--- a/src/networkProviders/index.ts
+++ b/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/smartContractQueriesController.spec.ts b/src/smartContractQueriesController.spec.ts
index c65309833..07bc570d8 100644
--- 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
index 4777691cd..e88789a90 100644
--- 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
index 30757b908..c08bc885b 100644
--- 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
index 7fc958b29..bf5e2a132 100644
--- 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
index a8e0a1817..988d693f5 100644
--- 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
index 736a9bedb..3b27e3eda 100644
--- 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
index fbcfae2ec..dd223af6d 100644
--- 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
index 5bbcbdd52..e005f1b39 100644
--- 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
index 9ed01c91c..cddc8ea3d 100644
--- 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";

From 5352a6ddc70dc6ef0c533074e95b4a532a4d4e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 1 Oct 2024 11:50:15 +0300
Subject: [PATCH 276/338] Add mnemonicToEntropy and entropyToMnemonic.

---
 src-wallet/mnemonic.ts   | 20 ++++++++++++++++++--
 src-wallet/users.spec.ts | 20 ++++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src-wallet/mnemonic.ts b/src-wallet/mnemonic.ts
index ed5423b26..de6c992d7 100644
--- a/src-wallet/mnemonic.ts
+++ b/src-wallet/mnemonic.ts
@@ -1,4 +1,10 @@
-import { generateMnemonic, mnemonicToSeedSync, validateMnemonic } from "bip39";
+import {
+    entropyToMnemonic,
+    generateMnemonic,
+    mnemonicToEntropy,
+    mnemonicToSeedSync,
+    validateMnemonic,
+} from "bip39";
 import { derivePath } from "ed25519-hd-key";
 import { ErrWrongMnemonic } from "./errors";
 import { UserSecretKey } from "./userKeys";
@@ -14,7 +20,7 @@ export class Mnemonic {
     }
 
     static generate(): Mnemonic {
-        let text = generateMnemonic(MNEMONIC_STRENGTH);
+        const text = generateMnemonic(MNEMONIC_STRENGTH);
         return new Mnemonic(text);
     }
 
@@ -25,6 +31,11 @@ export class Mnemonic {
         return new Mnemonic(text);
     }
 
+    static fromEntropy(entropy: Uint8Array): Mnemonic {
+        const text = entropyToMnemonic(Buffer.from(entropy));
+        return new Mnemonic(text);
+    }
+
     public static assertTextIsValid(text: string) {
         let isValid = validateMnemonic(text);
 
@@ -45,6 +56,11 @@ export class Mnemonic {
         return this.text.split(" ");
     }
 
+    getEntropy(): Uint8Array {
+        const entropy = mnemonicToEntropy(this.text);
+        return Buffer.from(entropy, "hex");
+    }
+
     toString(): string {
         return this.text;
     }
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 41a1aa30e..84eb6ab98 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -26,6 +26,26 @@ describe("test user wallets", () => {
         assert.lengthOf(words, 24);
     });
 
+    it("should convert entropy to mnemonic and back", () => {
+        function testConversion(text: string, entropyHex: string) {
+            const entropyFromMnemonic = Mnemonic.fromString(text).getEntropy();
+            const mnemonicFromEntropy = Mnemonic.fromEntropy(Buffer.from(entropyHex, "hex"));
+
+            assert.equal(Buffer.from(entropyFromMnemonic).toString("hex"), entropyHex);
+            assert.equal(mnemonicFromEntropy.toString(), text);
+        }
+
+        testConversion(
+            "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about",
+            "00000000000000000000000000000000",
+        );
+
+        testConversion(
+            "moral volcano peasant pass circle pen over picture flat shop clap goat never lyrics gather prepare woman film husband gravity behind test tiger improve",
+            "8fbeb688d0529344e77d225898d4a73209510ad81d4ffceac9bfb30149bf387b",
+        );
+    });
+
     it("should derive keys", async () => {
         let mnemonic = Mnemonic.fromString(DummyMnemonic);
 

From a5e00175e9b10d296763f89e3b1f514468f20691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 1 Oct 2024 12:06:25 +0300
Subject: [PATCH 277/338] Handle some errors.

---
 src-wallet/errors.ts     | 11 ++++++++++-
 src-wallet/mnemonic.ts   |  8 ++++++--
 src-wallet/users.spec.ts |  8 ++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src-wallet/errors.ts b/src-wallet/errors.ts
index 19f1ac852..4c3ea2ecd 100644
--- a/src-wallet/errors.ts
+++ b/src-wallet/errors.ts
@@ -28,6 +28,15 @@ export class ErrWrongMnemonic extends Err {
     }
 }
 
+/**
+ * Signals a bad mnemonic entropy.
+ */
+export class ErrBadMnemonicEntropy extends Err {
+    public constructor(inner: Error) {
+        super("Bad mnemonic entropy", inner);
+    }
+}
+
 /**
  * Signals a bad PEM file.
  */
@@ -49,7 +58,7 @@ export class ErrSignerCannotSign extends Err {
 /**
  * Signals a bad address.
  */
- export class ErrBadAddress extends Err {
+export class ErrBadAddress extends Err {
     public constructor(value: string, inner?: Error) {
         super(`Bad address: ${value}`, inner);
     }
diff --git a/src-wallet/mnemonic.ts b/src-wallet/mnemonic.ts
index de6c992d7..cb1c81ec1 100644
--- a/src-wallet/mnemonic.ts
+++ b/src-wallet/mnemonic.ts
@@ -32,8 +32,12 @@ export class Mnemonic {
     }
 
     static fromEntropy(entropy: Uint8Array): Mnemonic {
-        const text = entropyToMnemonic(Buffer.from(entropy));
-        return new Mnemonic(text);
+        try {
+            const text = entropyToMnemonic(Buffer.from(entropy));
+            return new Mnemonic(text);
+        } catch (err: any) {
+            throw new ErrBadMnemonicEntropy(err);
+        }
     }
 
     public static assertTextIsValid(text: string) {
diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 84eb6ab98..864096ba4 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -44,6 +44,14 @@ describe("test user wallets", () => {
             "moral volcano peasant pass circle pen over picture flat shop clap goat never lyrics gather prepare woman film husband gravity behind test tiger improve",
             "8fbeb688d0529344e77d225898d4a73209510ad81d4ffceac9bfb30149bf387b",
         );
+
+        assert.throws(
+            () => {
+                Mnemonic.fromEntropy(Buffer.from("abba", "hex"));
+            },
+            ErrBadMnemonicEntropy,
+            `Bad mnemonic entropy`,
+        );
     });
 
     it("should derive keys", async () => {

From 2f74baa89b182fe280ae46dad8102bac756e1540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 1 Oct 2024 12:07:15 +0300
Subject: [PATCH 278/338] Fix import.

---
 src-wallet/mnemonic.ts | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src-wallet/mnemonic.ts b/src-wallet/mnemonic.ts
index cb1c81ec1..93b62ee3a 100644
--- a/src-wallet/mnemonic.ts
+++ b/src-wallet/mnemonic.ts
@@ -1,12 +1,6 @@
-import {
-    entropyToMnemonic,
-    generateMnemonic,
-    mnemonicToEntropy,
-    mnemonicToSeedSync,
-    validateMnemonic,
-} from "bip39";
+import { entropyToMnemonic, generateMnemonic, mnemonicToEntropy, mnemonicToSeedSync, validateMnemonic } from "bip39";
 import { derivePath } from "ed25519-hd-key";
-import { ErrWrongMnemonic } from "./errors";
+import { ErrBadMnemonicEntropy, ErrWrongMnemonic } from "./errors";
 import { UserSecretKey } from "./userKeys";
 
 const MNEMONIC_STRENGTH = 256;

From 4fb5e5c06c497eb42738478f9515c64733e96ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 1 Oct 2024 12:07:31 +0300
Subject: [PATCH 279/338] Fix imports.

---
 src-wallet/users.spec.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src-wallet/users.spec.ts b/src-wallet/users.spec.ts
index 864096ba4..dc6d8d4fc 100644
--- a/src-wallet/users.spec.ts
+++ b/src-wallet/users.spec.ts
@@ -1,10 +1,17 @@
 import { assert } from "chai";
 import { Randomness } from "./crypto";
-import { ErrInvariantFailed } from "./errors";
+import { ErrBadMnemonicEntropy, ErrInvariantFailed } from "./errors";
 import { Mnemonic } from "./mnemonic";
 import { TestMessage } from "./testutils/message";
 import { TestTransaction } from "./testutils/transaction";
-import { DummyMnemonic, DummyMnemonicOf12Words, DummyPassword, loadTestKeystore, loadTestWallet, TestWallet } from "./testutils/wallets";
+import {
+    DummyMnemonic,
+    DummyMnemonicOf12Words,
+    DummyPassword,
+    loadTestKeystore,
+    loadTestWallet,
+    TestWallet,
+} from "./testutils/wallets";
 import { UserSecretKey } from "./userKeys";
 import { UserSigner } from "./userSigner";
 import { UserVerifier } from "./userVerifier";

From 0b7d0b7bdbf4d290a75d83139d4f6987ab4e325c Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 2 Oct 2024 10:33:04 +0300
Subject: [PATCH 280/338] Remove unused code

---
 src/networkProviders/.npmignore                |  1 -
 src/networkProviders/testscommon/dummyQuery.ts | 18 ------------------
 2 files changed, 19 deletions(-)
 delete mode 100644 src/networkProviders/.npmignore
 delete mode 100644 src/networkProviders/testscommon/dummyQuery.ts

diff --git a/src/networkProviders/.npmignore b/src/networkProviders/.npmignore
deleted file mode 100644
index 4c56e2af7..000000000
--- a/src/networkProviders/.npmignore
+++ /dev/null
@@ -1 +0,0 @@
-src/testscommon/**
diff --git a/src/networkProviders/testscommon/dummyQuery.ts b/src/networkProviders/testscommon/dummyQuery.ts
deleted file mode 100644
index a0cdac9c0..000000000
--- a/src/networkProviders/testscommon/dummyQuery.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { IAddress, IContractQuery } from "../interface";
-import { Address } from "../primitives";
-
-export class MockQuery implements IContractQuery {
-    caller: IAddress = new Address("");
-    address: IAddress = new Address("");
-    func: string = "";
-    args: string[] = [];
-    value: string = "";
-
-    constructor(init?: Partial<MockQuery>) {
-        Object.assign(this, init);
-    }
-
-    getEncodedArguments(): string[] {
-        return this.args;
-    }
-}

From 34216601e769d6501cc44517be331a7961c9c7e2 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 2 Oct 2024 10:47:50 +0300
Subject: [PATCH 281/338] Bump version

---
 package-lock.json                             |   4 +-
 package.json                                  |   2 +-
 .../providers.dev.net.spec.ts                 | 217 +++++++++++-------
 src/testutils/dummyQuery.ts                   |  19 ++
 4 files changed, 158 insertions(+), 84 deletions(-)
 create mode 100644 src/testutils/dummyQuery.ts

diff --git a/package-lock.json b/package-lock.json
index 355a26d58..b4dd20f98 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.6.3",
+  "version": "13.7.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.6.3",
+      "version": "13.7.0",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index 6fa7815bf..e70e9df1b 100644
--- a/package.json
+++ b/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",
diff --git a/src/networkProviders/providers.dev.net.spec.ts b/src/networkProviders/providers.dev.net.spec.ts
index 8c603c436..354cc67ae 100644
--- a/src/networkProviders/providers.dev.net.spec.ts
+++ b/src/networkProviders/providers.dev.net.spec.ts
@@ -4,10 +4,10 @@ import { ApiNetworkProvider } from "./apiNetworkProvider";
 import { INetworkProvider, ITransactionNext } from "./interface";
 import { Address } from "./primitives";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
-import { MockQuery } from "./testscommon/dummyQuery";
 import { NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionEventData } from "./transactionEvents";
 import { TransactionOnNetwork } from "./transactions";
+import { MockQuery } from "../testutils/dummyQuery";
 
 describe("test network providers on devnet: Proxy and API", function () {
     let alice = new Address("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
@@ -15,8 +15,14 @@ describe("test network providers on devnet: Proxy and API", function () {
     let dan = new Address("erd1kyaqzaprcdnv4luvanah0gfxzzsnpaygsy6pytrexll2urtd05ts9vegu7");
     const MAX_NUMBER_OF_ITEMS_BY_DEFAULT = 20;
 
-    let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.multiversx.com", { timeout: 10000, clientName: 'test' });
-    let proxyProvider: INetworkProvider = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com", { timeout: 10000, clientName: 'test' });
+    let apiProvider: INetworkProvider = new ApiNetworkProvider("https://devnet-api.multiversx.com", {
+        timeout: 10000,
+        clientName: "test",
+    });
+    let proxyProvider: INetworkProvider = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com", {
+        timeout: 10000,
+        clientName: "test",
+    });
 
     it("should create providers without configuration", async function () {
         const apiProviderWithoutConfig = new ApiNetworkProvider("https://devnet-api.multiversx.com");
@@ -24,7 +30,7 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         const apiResponse = await apiProviderWithoutConfig.getNetworkConfig();
         const proxyResponse = await proxyProviderWithoutConfig.getNetworkConfig();
-        
+
         assert.equal(apiResponse.ChainID, "D");
         assert.equal(proxyResponse.ChainID, "D");
     });
@@ -37,33 +43,49 @@ describe("test network providers on devnet: Proxy and API", function () {
     });
 
     it("should add userAgent unknown for clientName when no clientName passed", async function () {
-        const expectedApiUserAgent = "multiversx-sdk/api/unknown"
-        const expectedProxyUserAgent = "multiversx-sdk/proxy/unknown"
+        const expectedApiUserAgent = "multiversx-sdk/api/unknown";
+        const expectedProxyUserAgent = "multiversx-sdk/proxy/unknown";
 
         let localApiProvider: any = new ApiNetworkProvider("https://devnet-api.multiversx.com", { timeout: 10000 });
-        let localProxyProvider: any = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com", { timeout: 10000 });
+        let localProxyProvider: any = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com", {
+            timeout: 10000,
+        });
 
         assert.equal(localApiProvider.config.headers.getUserAgent(), expectedApiUserAgent);
         assert.equal(localProxyProvider.config.headers.getUserAgent(), expectedProxyUserAgent);
     });
 
     it("should set userAgent with specified clientName ", async function () {
-        const expectedApiUserAgent = "multiversx-sdk/api/test"
-        const expectedProxyUserAgent = "multiversx-sdk/proxy/test"
+        const expectedApiUserAgent = "multiversx-sdk/api/test";
+        const expectedProxyUserAgent = "multiversx-sdk/proxy/test";
 
-        let localApiProvider: any = new ApiNetworkProvider("https://devnet-api.multiversx.com", { timeout: 10000, clientName: 'test' });
-        let localProxyProvider: any = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com", { timeout: 10000, clientName: 'test' });
+        let localApiProvider: any = new ApiNetworkProvider("https://devnet-api.multiversx.com", {
+            timeout: 10000,
+            clientName: "test",
+        });
+        let localProxyProvider: any = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com", {
+            timeout: 10000,
+            clientName: "test",
+        });
 
         assert.equal(localApiProvider.config.headers.getUserAgent(), expectedApiUserAgent);
         assert.equal(localProxyProvider.config.headers.getUserAgent(), expectedProxyUserAgent);
     });
 
     it("should keep the set userAgent and add the sdk to it", async function () {
-        const expectedApiUserAgent = "Client-info multiversx-sdk/api/test"
-        const expectedProxyUserAgent = "Client-info multiversx-sdk/proxy/test"
+        const expectedApiUserAgent = "Client-info multiversx-sdk/api/test";
+        const expectedProxyUserAgent = "Client-info multiversx-sdk/proxy/test";
 
-        let localApiProvider: any = new ApiNetworkProvider("https://devnet-api.multiversx.com", { timeout: 10000, headers: new AxiosHeaders({ "User-Agent": "Client-info" }), clientName: 'test' });
-        let localProxyProvider: any = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com", { timeout: 10000, headers: new AxiosHeaders({ "User-Agent": "Client-info" }), clientName: 'test' });
+        let localApiProvider: any = new ApiNetworkProvider("https://devnet-api.multiversx.com", {
+            timeout: 10000,
+            headers: new AxiosHeaders({ "User-Agent": "Client-info" }),
+            clientName: "test",
+        });
+        let localProxyProvider: any = new ProxyNetworkProvider("https://devnet-gateway.multiversx.com", {
+            timeout: 10000,
+            headers: new AxiosHeaders({ "User-Agent": "Client-info" }),
+            clientName: "test",
+        });
 
         assert.equal(localApiProvider.config.headers.getUserAgent(), expectedApiUserAgent);
         assert.equal(localProxyProvider.config.headers.getUserAgent(), expectedProxyUserAgent);
@@ -111,8 +133,14 @@ describe("test network providers on devnet: Proxy and API", function () {
         this.timeout(30000);
 
         for (const user of [carol, dan]) {
-            let apiResponse = (await apiProvider.getFungibleTokensOfAccount(user)).slice(0, MAX_NUMBER_OF_ITEMS_BY_DEFAULT);
-            let proxyResponse = (await proxyProvider.getFungibleTokensOfAccount(user)).slice(0, MAX_NUMBER_OF_ITEMS_BY_DEFAULT);
+            let apiResponse = (await apiProvider.getFungibleTokensOfAccount(user)).slice(
+                0,
+                MAX_NUMBER_OF_ITEMS_BY_DEFAULT,
+            );
+            let proxyResponse = (await proxyProvider.getFungibleTokensOfAccount(user)).slice(
+                0,
+                MAX_NUMBER_OF_ITEMS_BY_DEFAULT,
+            );
 
             for (let i = 0; i < apiResponse.length; i++) {
                 assert.equal(apiResponse[i].identifier, proxyResponse[i].identifier);
@@ -124,8 +152,14 @@ describe("test network providers on devnet: Proxy and API", function () {
     it("should have same response for getNonFungibleTokensOfAccount(), getNonFungibleTokenOfAccount", async function () {
         this.timeout(30000);
 
-        let apiResponse = (await apiProvider.getNonFungibleTokensOfAccount(dan)).slice(0, MAX_NUMBER_OF_ITEMS_BY_DEFAULT);
-        let proxyResponse = (await proxyProvider.getNonFungibleTokensOfAccount(dan)).slice(0, MAX_NUMBER_OF_ITEMS_BY_DEFAULT);
+        let apiResponse = (await apiProvider.getNonFungibleTokensOfAccount(dan)).slice(
+            0,
+            MAX_NUMBER_OF_ITEMS_BY_DEFAULT,
+        );
+        let proxyResponse = (await proxyProvider.getNonFungibleTokensOfAccount(dan)).slice(
+            0,
+            MAX_NUMBER_OF_ITEMS_BY_DEFAULT,
+        );
 
         assert.isTrue(apiResponse.length > 0, "For the sake of the test, there should be at least one item.");
         assert.equal(apiResponse.length, proxyResponse.length);
@@ -145,7 +179,10 @@ describe("test network providers on devnet: Proxy and API", function () {
     });
 
     // TODO: Strive to have as little differences as possible between Proxy and API.
-    function removeInconsistencyForNonFungibleTokenOfAccount(apiResponse: NonFungibleTokenOfAccountOnNetwork, proxyResponse: NonFungibleTokenOfAccountOnNetwork) {
+    function removeInconsistencyForNonFungibleTokenOfAccount(
+        apiResponse: NonFungibleTokenOfAccountOnNetwork,
+        proxyResponse: NonFungibleTokenOfAccountOnNetwork,
+    ) {
         // unset unconsistent fields
         apiResponse.type = "";
         proxyResponse.type = "";
@@ -162,47 +199,49 @@ describe("test network providers on devnet: Proxy and API", function () {
             {
                 toSendable: function () {
                     return {
-                        "nonce": 42,
-                        "value": "1",
-                        "receiver": "erd1testnlersh4z0wsv8kjx39me4rmnvjkwu8dsaea7ukdvvc9z396qykv7z7",
-                        "sender": "erd15x2panzqvfxul2lvstfrmdcl5t4frnsylfrhng8uunwdssxw4y9succ9sq",
-                        "gasPrice": 1000000000,
-                        "gasLimit": 50000,
-                        "chainID": "D",
-                        "version": 1,
-                        "signature": "c8eb539e486db7d703d8c70cab3b7679113f77c4685d8fcc94db027ceacc6b8605115034355386dffd7aa12e63dbefa03251a2f1b1d971f52250187298d12900"
-                    }
-                }
+                        nonce: 42,
+                        value: "1",
+                        receiver: "erd1testnlersh4z0wsv8kjx39me4rmnvjkwu8dsaea7ukdvvc9z396qykv7z7",
+                        sender: "erd15x2panzqvfxul2lvstfrmdcl5t4frnsylfrhng8uunwdssxw4y9succ9sq",
+                        gasPrice: 1000000000,
+                        gasLimit: 50000,
+                        chainID: "D",
+                        version: 1,
+                        signature:
+                            "c8eb539e486db7d703d8c70cab3b7679113f77c4685d8fcc94db027ceacc6b8605115034355386dffd7aa12e63dbefa03251a2f1b1d971f52250187298d12900",
+                    };
+                },
             },
             {
                 toSendable: function () {
                     return {
-                        "nonce": 43,
-                        "value": "1",
-                        "receiver": "erd1testnlersh4z0wsv8kjx39me4rmnvjkwu8dsaea7ukdvvc9z396qykv7z7",
-                        "sender": "erd15x2panzqvfxul2lvstfrmdcl5t4frnsylfrhng8uunwdssxw4y9succ9sq",
-                        "gasPrice": 1000000000,
-                        "gasLimit": 50000,
-                        "chainID": "D",
-                        "version": 1,
-                        "signature": "9c4c22d0ae1b5a10c39583a5ab9020b00b27aa69d4ac8ab4922620dbf0df4036ed890f9946d38a9d0c85d6ac485c0d9b2eac0005e752f249fd0ad863b0471d02"
-                    }
-                }
+                        nonce: 43,
+                        value: "1",
+                        receiver: "erd1testnlersh4z0wsv8kjx39me4rmnvjkwu8dsaea7ukdvvc9z396qykv7z7",
+                        sender: "erd15x2panzqvfxul2lvstfrmdcl5t4frnsylfrhng8uunwdssxw4y9succ9sq",
+                        gasPrice: 1000000000,
+                        gasLimit: 50000,
+                        chainID: "D",
+                        version: 1,
+                        signature:
+                            "9c4c22d0ae1b5a10c39583a5ab9020b00b27aa69d4ac8ab4922620dbf0df4036ed890f9946d38a9d0c85d6ac485c0d9b2eac0005e752f249fd0ad863b0471d02",
+                    };
+                },
             },
             {
                 toSendable: function () {
                     return {
-                        "nonce": 44
-                    }
-                }
-            }
+                        nonce: 44,
+                    };
+                },
+            },
         ];
 
         const expectedHashes = [
             "6e2fa63ea02937f00d7549f3e4eb9af241e4ac13027aa65a5300816163626c01",
             "37d7e84313a5baea2a61c6ab10bb29b52bc54f7ac9e3918a9faeb1e08f42081c",
-            null
-        ]
+            null,
+        ];
 
         assert.equal(await apiProvider.sendTransaction(txs[0]), expectedHashes[0]);
         assert.equal(await proxyProvider.sendTransaction(txs[1]), expectedHashes[1]);
@@ -216,7 +255,7 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         let hashes = [
             "08acf8cbd71306a56eb58f9593cb2e23f109c94e27acdd906c82a5c3a5f84d9d",
-            "410efb1db2ab86678b8dbc503beb695b5b7d52754fb0de86c09cbb433de5f6a8"
+            "410efb1db2ab86678b8dbc503beb695b5b7d52754fb0de86c09cbb433de5f6a8",
         ];
 
         for (const hash of hashes) {
@@ -233,9 +272,12 @@ describe("test network providers on devnet: Proxy and API", function () {
     });
 
     // TODO: Strive to have as little differences as possible between Proxy and API.
-    function ignoreKnownTransactionDifferencesBetweenProviders(apiResponse: TransactionOnNetwork, proxyResponse: TransactionOnNetwork) {
+    function ignoreKnownTransactionDifferencesBetweenProviders(
+        apiResponse: TransactionOnNetwork,
+        proxyResponse: TransactionOnNetwork,
+    ) {
         // Proxy and API exhibit differences in the "function" field, in case of move-balance transactions.
-        apiResponse.function = proxyResponse.function
+        apiResponse.function = proxyResponse.function;
 
         // Ignore fields which are not present on API response:
         proxyResponse.epoch = 0;
@@ -252,16 +294,22 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         assert.exists(apiResponse.logs);
         assert.exists(proxyResponse.logs);
-        assert.exists(apiResponse.logs.events)
-        assert.exists(proxyResponse.logs.events)
-        assert.equal(apiResponse.logs.events[0].topics[0].hex(), "414c4943452d353632376631")
-        assert.equal(apiResponse.logs.events[0].topics[1].hex(), "")
-        assert.equal(apiResponse.logs.events[0].topics[2].hex(), "01")
-        assert.equal(apiResponse.logs.events[0].topics[3].hex(), "0000000000000000050032e141d21536e2dfc3d64b9e7dd0c2c53f201dc469e1")
-        assert.equal(proxyResponse.logs.events[0].topics[0].hex(), "414c4943452d353632376631")
-        assert.equal(proxyResponse.logs.events[0].topics[1].hex(), "")
-        assert.equal(proxyResponse.logs.events[0].topics[2].hex(), "01")
-        assert.equal(proxyResponse.logs.events[0].topics[3].hex(), "0000000000000000050032e141d21536e2dfc3d64b9e7dd0c2c53f201dc469e1")
+        assert.exists(apiResponse.logs.events);
+        assert.exists(proxyResponse.logs.events);
+        assert.equal(apiResponse.logs.events[0].topics[0].hex(), "414c4943452d353632376631");
+        assert.equal(apiResponse.logs.events[0].topics[1].hex(), "");
+        assert.equal(apiResponse.logs.events[0].topics[2].hex(), "01");
+        assert.equal(
+            apiResponse.logs.events[0].topics[3].hex(),
+            "0000000000000000050032e141d21536e2dfc3d64b9e7dd0c2c53f201dc469e1",
+        );
+        assert.equal(proxyResponse.logs.events[0].topics[0].hex(), "414c4943452d353632376631");
+        assert.equal(proxyResponse.logs.events[0].topics[1].hex(), "");
+        assert.equal(proxyResponse.logs.events[0].topics[2].hex(), "01");
+        assert.equal(
+            proxyResponse.logs.events[0].topics[3].hex(),
+            "0000000000000000050032e141d21536e2dfc3d64b9e7dd0c2c53f201dc469e1",
+        );
     });
 
     it("should have same response for getTransactionStatus()", async function () {
@@ -269,7 +317,7 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         let hashes = [
             "08acf8cbd71306a56eb58f9593cb2e23f109c94e27acdd906c82a5c3a5f84d9d",
-            "410efb1db2ab86678b8dbc503beb695b5b7d52754fb0de86c09cbb433de5f6a8"
+            "410efb1db2ab86678b8dbc503beb695b5b7d52754fb0de86c09cbb433de5f6a8",
         ];
 
         for (const hash of hashes) {
@@ -293,7 +341,6 @@ describe("test network providers on devnet: Proxy and API", function () {
 
         assert.equal(apiResponse.identifier, identifier);
         assert.deepEqual(apiResponse, proxyResponse);
-
     });
 
     it("should have same response for getDefinitionOfTokenCollection()", async function () {
@@ -332,7 +379,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         // Query: get sum (of adder contract)
         let query = new MockQuery({
             address: new Address("erd1qqqqqqqqqqqqqpgqfzydqmdw7m2vazsp6u5p95yxz76t2p9rd8ss0zp9ts"),
-            func: "getSum"
+            func: "getSum",
         });
 
         let apiResponse = await apiProvider.queryContract(query);
@@ -349,8 +396,12 @@ describe("test network providers on devnet: Proxy and API", function () {
     it("should handle events 'data' and 'additionalData'", async function () {
         this.timeout(50000);
 
-        const apiResponse = await apiProvider.getTransaction("a419271407a2ec217739811805e3a751e30dbc72ae0777e3b4c825f036995184");
-        const proxyResponse = await proxyProvider.getTransaction("a419271407a2ec217739811805e3a751e30dbc72ae0777e3b4c825f036995184");
+        const apiResponse = await apiProvider.getTransaction(
+            "a419271407a2ec217739811805e3a751e30dbc72ae0777e3b4c825f036995184",
+        );
+        const proxyResponse = await proxyProvider.getTransaction(
+            "a419271407a2ec217739811805e3a751e30dbc72ae0777e3b4c825f036995184",
+        );
 
         assert.equal(apiResponse.logs.events[0].data, Buffer.from("test").toString());
         assert.equal(proxyResponse.logs.events[0].data, Buffer.from("test").toString());
@@ -368,18 +419,19 @@ describe("test network providers on devnet: Proxy and API", function () {
         const transaction = {
             toSendable: function () {
                 return {
-                    "nonce": 7,
-                    "value": "0",
-                    "receiver": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
-                    "sender": "erd1zztjf9fhwvuvquzsllknq4qcmffwad6n0hjtn5dyzytr5tgz7uas0mkgrq",
-                    "gasPrice": 1000000000,
-                    "gasLimit": 50000,
-                    "chainID": "D",
-                    "version": 2,
-                    "signature": "149f1d8296efcb9489c5b3142ae659aacfa3a7daef3645f1d3747a96dc9cee377070dd8b83b322997c15ba3c305ac18daaee0fd25760eba334b14a9272b34802"
-                }
-            }
-        }
+                    nonce: 7,
+                    value: "0",
+                    receiver: "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+                    sender: "erd1zztjf9fhwvuvquzsllknq4qcmffwad6n0hjtn5dyzytr5tgz7uas0mkgrq",
+                    gasPrice: 1000000000,
+                    gasLimit: 50000,
+                    chainID: "D",
+                    version: 2,
+                    signature:
+                        "149f1d8296efcb9489c5b3142ae659aacfa3a7daef3645f1d3747a96dc9cee377070dd8b83b322997c15ba3c305ac18daaee0fd25760eba334b14a9272b34802",
+                };
+            },
+        };
 
         const transactionNext: ITransactionNext = {
             nonce: BigInt(8),
@@ -391,13 +443,16 @@ describe("test network providers on devnet: Proxy and API", function () {
             gasLimit: BigInt(80000),
             chainID: "D",
             version: 2,
-            signature: Buffer.from("3fa42d97b4f85442850340a11411a3cbd63885e06ff3f84c7a75d0ef59c780f7a18aa4f331cf460300bc8bd99352aea10b7c3bc17e40287337ae9f9842470205", "hex"),
+            signature: Buffer.from(
+                "3fa42d97b4f85442850340a11411a3cbd63885e06ff3f84c7a75d0ef59c780f7a18aa4f331cf460300bc8bd99352aea10b7c3bc17e40287337ae9f9842470205",
+                "hex",
+            ),
             senderUsername: "",
             receiverUsername: "",
             guardian: "",
             guardianSignature: new Uint8Array(),
-            options: 0
-        }
+            options: 0,
+        };
 
         const apiLegacyTxHash = await apiProvider.sendTransaction(transaction);
         const apiTxNextHash = await apiProvider.sendTransaction(transactionNext);
diff --git a/src/testutils/dummyQuery.ts b/src/testutils/dummyQuery.ts
new file mode 100644
index 000000000..525eeaa0c
--- /dev/null
+++ b/src/testutils/dummyQuery.ts
@@ -0,0 +1,19 @@
+import { Address } from "../address";
+import { IAddress } from "../interface";
+import { IContractQuery } from "../networkProviders/interface";
+
+export class MockQuery implements IContractQuery {
+    caller: IAddress = new Address("");
+    address: IAddress = new Address("");
+    func: string = "";
+    args: string[] = [];
+    value: string = "";
+
+    constructor(init?: Partial<MockQuery>) {
+        Object.assign(this, init);
+    }
+
+    getEncodedArguments(): string[] {
+        return this.args;
+    }
+}

From 405d573f1fdec39a40bd78c69458d130d8c1acef Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 2 Oct 2024 13:12:39 +0300
Subject: [PATCH 282/338] Move axios to peer dependency

---
 package-lock.json | 38 +++++++++++++++++++-------------------
 package.json      |  4 ++--
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b4dd20f98..7821f4817 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,6 @@
         "@typescript-eslint/eslint-plugin": "5.44.0",
         "@typescript-eslint/parser": "5.44.0",
         "assert": "2.0.0",
-        "axios": "^1.7.4",
         "browserify": "17.0.0",
         "chai": "4.2.0",
         "eslint": "8.28.0",
@@ -37,6 +36,7 @@
         "typescript": "4.1.2"
       },
       "peerDependencies": {
+        "axios": "^1.7.4",
         "bignumber.js": "^9.0.1",
         "protobufjs": "^7.2.6"
       }
@@ -876,7 +876,7 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
+      "peer": true
     },
     "node_modules/available-typed-arrays": {
       "version": "1.0.5",
@@ -894,7 +894,7 @@
       "version": "1.7.4",
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
       "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
-      "dev": true,
+      "peer": true,
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -1425,7 +1425,7 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
+      "peer": true,
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -1645,7 +1645,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true,
+      "peer": true,
       "engines": {
         "node": ">=0.4.0"
       }
@@ -2403,13 +2403,13 @@
       "version": "1.15.6",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
       "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
-      "dev": true,
       "funding": [
         {
           "type": "individual",
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
+      "peer": true,
       "engines": {
         "node": ">=4.0"
       },
@@ -2432,7 +2432,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
       "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
+      "peer": true,
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -3442,7 +3442,7 @@
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
+      "peer": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -3451,7 +3451,7 @@
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
+      "peer": true,
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -4206,7 +4206,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "dev": true
+      "peer": true
     },
     "node_modules/public-encrypt": {
       "version": "4.0.3",
@@ -5842,7 +5842,7 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
+      "peer": true
     },
     "available-typed-arrays": {
       "version": "1.0.5",
@@ -5854,7 +5854,7 @@
       "version": "1.7.4",
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
       "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
-      "dev": true,
+      "peer": true,
       "requires": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -6309,7 +6309,7 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
+      "peer": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
@@ -6493,7 +6493,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true
+      "peer": true
     },
     "deps-sort": {
       "version": "2.0.1",
@@ -7072,7 +7072,7 @@
       "version": "1.15.6",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
       "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
-      "dev": true
+      "peer": true
     },
     "for-each": {
       "version": "0.3.3",
@@ -7087,7 +7087,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
       "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
+      "peer": true,
       "requires": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -7853,13 +7853,13 @@
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true
+      "peer": true
     },
     "mime-types": {
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
+      "peer": true,
       "requires": {
         "mime-db": "1.52.0"
       }
@@ -8422,7 +8422,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "dev": true
+      "peer": true
     },
     "public-encrypt": {
       "version": "4.0.3",
diff --git a/package.json b/package.json
index e70e9df1b..1fe34dd72 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,6 @@
     "@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",
@@ -65,6 +64,7 @@
   },
   "peerDependencies": {
     "bignumber.js": "^9.0.1",
-    "protobufjs": "^7.2.6"
+    "protobufjs": "^7.2.6",
+    "axios": "^1.7.4"
   }
 }

From ea54e789c3e461fe75c3980c51c946d4c9bc36b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Thu, 3 Oct 2024 09:51:57 +0300
Subject: [PATCH 283/338] Legacy ResultsParser: change access modifier of
 methods from private to protected.

---
 src/smartcontracts/resultsParser.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/smartcontracts/resultsParser.ts b/src/smartcontracts/resultsParser.ts
index 3b15bc5d3..a1bae4c46 100644
--- a/src/smartcontracts/resultsParser.ts
+++ b/src/smartcontracts/resultsParser.ts
@@ -196,7 +196,7 @@ export class ResultsParser {
         throw new ErrCannotParseContractResults(`transaction ${transaction.hash.toString()}`);
     }
 
-    private parseTransactionMetadata(transaction: ITransactionOnNetwork): TransactionMetadata {
+    protected parseTransactionMetadata(transaction: ITransactionOnNetwork): TransactionMetadata {
         return new TransactionDecoder().getTransactionMetadata({
             sender: transaction.sender.bech32(),
             receiver: transaction.receiver.bech32(),
@@ -205,7 +205,7 @@ export class ResultsParser {
         });
     }
 
-    private createBundleOnSimpleMoveBalance(transaction: ITransactionOnNetwork): UntypedOutcomeBundle | null {
+    protected createBundleOnSimpleMoveBalance(transaction: ITransactionOnNetwork): UntypedOutcomeBundle | null {
         let noResults = transaction.contractResults.items.length == 0;
         let noLogs = transaction.logs.events.length == 0;
 
@@ -220,7 +220,7 @@ export class ResultsParser {
         return null;
     }
 
-    private createBundleOnInvalidTransaction(transaction: ITransactionOnNetwork): UntypedOutcomeBundle | null {
+    protected createBundleOnInvalidTransaction(transaction: ITransactionOnNetwork): UntypedOutcomeBundle | null {
         if (transaction.status.isInvalid()) {
             if (transaction.receipt.data) {
                 return {
@@ -236,7 +236,7 @@ export class ResultsParser {
         return null;
     }
 
-    private createBundleOnEasilyFoundResultWithReturnData(results: IContractResults): UntypedOutcomeBundle | null {
+    protected createBundleOnEasilyFoundResultWithReturnData(results: IContractResults): UntypedOutcomeBundle | null {
         let resultItemWithReturnData = results.items.find(
             (item) => item.nonce.valueOf() != 0 && item.data.startsWith("@"),
         );
@@ -254,7 +254,7 @@ export class ResultsParser {
         };
     }
 
-    private createBundleOnSignalError(logs: ITransactionLogs): UntypedOutcomeBundle | null {
+    protected createBundleOnSignalError(logs: ITransactionLogs): UntypedOutcomeBundle | null {
         let eventSignalError = logs.findSingleOrNoneEvent(WellKnownEvents.OnSignalError);
         if (!eventSignalError) {
             return null;
@@ -271,7 +271,7 @@ export class ResultsParser {
         };
     }
 
-    private createBundleOnTooMuchGasWarning(logs: ITransactionLogs): UntypedOutcomeBundle | null {
+    protected createBundleOnTooMuchGasWarning(logs: ITransactionLogs): UntypedOutcomeBundle | null {
         let eventTooMuchGas = logs.findSingleOrNoneEvent(
             WellKnownEvents.OnWriteLog,
             (event) =>
@@ -294,7 +294,7 @@ export class ResultsParser {
         };
     }
 
-    private createBundleOnWriteLogWhereFirstTopicEqualsAddress(
+    protected createBundleOnWriteLogWhereFirstTopicEqualsAddress(
         logs: ITransactionLogs,
         address: IAddress,
     ): UntypedOutcomeBundle | null {
@@ -329,7 +329,7 @@ export class ResultsParser {
         return null;
     }
 
-    private createBundleWithFallbackHeuristics(
+    protected createBundleWithFallbackHeuristics(
         transaction: ITransactionOnNetwork,
         transactionMetadata: TransactionMetadata,
     ): UntypedOutcomeBundle | null {

From cfaed6ed4b92b1f5cee67756d7b543dcb29877d2 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 3 Oct 2024 15:32:00 +0300
Subject: [PATCH 284/338] Update folder structure

---
 package-lock.json                             | 222 ++++++++++++------
 package.json                                  |  14 +-
 {src-wallet => src/wallet}/assertions.ts      |   0
 {src-wallet => src/wallet}/config.ts          |   0
 .../wallet}/crypto/constants.ts               |   0
 .../wallet}/crypto/decryptor.ts               |   0
 .../wallet}/crypto/derivationParams.ts        |   0
 .../wallet}/crypto/encrypt.spec.ts            |   0
 .../wallet}/crypto/encryptedData.ts           |   0
 .../wallet}/crypto/encryptor.ts               |   0
 {src-wallet => src/wallet}/crypto/index.ts    |   0
 .../wallet}/crypto/pubkeyDecryptor.ts         |   0
 .../wallet}/crypto/pubkeyEncrypt.spec.ts      |   0
 .../wallet}/crypto/pubkeyEncryptor.ts         |   0
 .../wallet}/crypto/randomness.ts              |   0
 .../wallet}/crypto/x25519EncryptedData.ts     |   0
 {src-wallet => src/wallet}/errors.ts          |   0
 {src-wallet => src/wallet}/index.ts           |   0
 {src-wallet => src/wallet}/mnemonic.ts        |   0
 {src-wallet => src/wallet}/pem.spec.ts        |   0
 {src-wallet => src/wallet}/pem.ts             |   0
 {src-wallet => src/wallet}/signature.ts       |   0
 .../wallet}/testdata/alice.json               |   0
 {src-wallet => src/wallet}/testdata/alice.pem |   0
 {src-wallet => src/wallet}/testdata/bob.json  |   0
 {src-wallet => src/wallet}/testdata/bob.pem   |   0
 .../wallet}/testdata/carol.json               |   0
 {src-wallet => src/wallet}/testdata/carol.pem |   0
 .../wallet}/testdata/withDummyMnemonic.json   |   0
 .../wallet}/testdata/withDummySecretKey.json  |   0
 .../wallet}/testdata/withoutKind.json         |   0
 {src-wallet => src/wallet}/testutils/files.ts |   0
 .../wallet}/testutils/message.ts              |   0
 .../wallet}/testutils/transaction.ts          |   0
 .../wallet}/testutils/wallets.ts              |   0
 {src-wallet => src/wallet}/userAddress.ts     |   0
 {src-wallet => src/wallet}/userKeys.ts        |   0
 {src-wallet => src/wallet}/userSigner.ts      |   0
 {src-wallet => src/wallet}/userVerifier.ts    |   0
 {src-wallet => src/wallet}/userWallet.ts      |   0
 {src-wallet => src/wallet}/users.spec.ts      |   0
 .../wallet}/usersBenchmark.spec.ts            |   0
 {src-wallet => src/wallet}/validatorKeys.ts   |   0
 {src-wallet => src/wallet}/validatorSigner.ts |   0
 {src-wallet => src/wallet}/validators.spec.ts |   0
 45 files changed, 160 insertions(+), 76 deletions(-)
 rename {src-wallet => src/wallet}/assertions.ts (100%)
 rename {src-wallet => src/wallet}/config.ts (100%)
 rename {src-wallet => src/wallet}/crypto/constants.ts (100%)
 rename {src-wallet => src/wallet}/crypto/decryptor.ts (100%)
 rename {src-wallet => src/wallet}/crypto/derivationParams.ts (100%)
 rename {src-wallet => src/wallet}/crypto/encrypt.spec.ts (100%)
 rename {src-wallet => src/wallet}/crypto/encryptedData.ts (100%)
 rename {src-wallet => src/wallet}/crypto/encryptor.ts (100%)
 rename {src-wallet => src/wallet}/crypto/index.ts (100%)
 rename {src-wallet => src/wallet}/crypto/pubkeyDecryptor.ts (100%)
 rename {src-wallet => src/wallet}/crypto/pubkeyEncrypt.spec.ts (100%)
 rename {src-wallet => src/wallet}/crypto/pubkeyEncryptor.ts (100%)
 rename {src-wallet => src/wallet}/crypto/randomness.ts (100%)
 rename {src-wallet => src/wallet}/crypto/x25519EncryptedData.ts (100%)
 rename {src-wallet => src/wallet}/errors.ts (100%)
 rename {src-wallet => src/wallet}/index.ts (100%)
 rename {src-wallet => src/wallet}/mnemonic.ts (100%)
 rename {src-wallet => src/wallet}/pem.spec.ts (100%)
 rename {src-wallet => src/wallet}/pem.ts (100%)
 rename {src-wallet => src/wallet}/signature.ts (100%)
 rename {src-wallet => src/wallet}/testdata/alice.json (100%)
 rename {src-wallet => src/wallet}/testdata/alice.pem (100%)
 rename {src-wallet => src/wallet}/testdata/bob.json (100%)
 rename {src-wallet => src/wallet}/testdata/bob.pem (100%)
 rename {src-wallet => src/wallet}/testdata/carol.json (100%)
 rename {src-wallet => src/wallet}/testdata/carol.pem (100%)
 rename {src-wallet => src/wallet}/testdata/withDummyMnemonic.json (100%)
 rename {src-wallet => src/wallet}/testdata/withDummySecretKey.json (100%)
 rename {src-wallet => src/wallet}/testdata/withoutKind.json (100%)
 rename {src-wallet => src/wallet}/testutils/files.ts (100%)
 rename {src-wallet => src/wallet}/testutils/message.ts (100%)
 rename {src-wallet => src/wallet}/testutils/transaction.ts (100%)
 rename {src-wallet => src/wallet}/testutils/wallets.ts (100%)
 rename {src-wallet => src/wallet}/userAddress.ts (100%)
 rename {src-wallet => src/wallet}/userKeys.ts (100%)
 rename {src-wallet => src/wallet}/userSigner.ts (100%)
 rename {src-wallet => src/wallet}/userVerifier.ts (100%)
 rename {src-wallet => src/wallet}/userWallet.ts (100%)
 rename {src-wallet => src/wallet}/users.spec.ts (100%)
 rename {src-wallet => src/wallet}/usersBenchmark.spec.ts (100%)
 rename {src-wallet => src/wallet}/validatorKeys.ts (100%)
 rename {src-wallet => src/wallet}/validatorSigner.ts (100%)
 rename {src-wallet => src/wallet}/validators.spec.ts (100%)

diff --git a/package-lock.json b/package-lock.json
index 7821f4817..5aa4414f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,19 +9,31 @@
       "version": "13.7.0",
       "license": "MIT",
       "dependencies": {
+        "@multiversx/sdk-bls-wasm": "0.3.5",
         "@multiversx/sdk-transaction-decoder": "1.0.2",
+        "@noble/ed25519": "1.7.3",
+        "@noble/hashes": "1.3.0",
         "bech32": "1.1.4",
+        "bip39": "3.1.0",
         "blake2b": "2.1.3",
         "buffer": "6.0.3",
+        "ed25519-hd-key": "1.1.2",
+        "ed2curve": "0.3.0",
         "json-bigint": "1.0.0",
-        "keccak": "3.0.2"
+        "keccak": "3.0.2",
+        "scryptsy": "2.1.0",
+        "tweetnacl": "1.0.3",
+        "uuid": "8.3.2"
       },
       "devDependencies": {
         "@multiversx/sdk-wallet": "4.5.1",
         "@types/assert": "1.4.6",
         "@types/chai": "4.2.11",
+        "@types/ed2curve": "0.2.2",
         "@types/mocha": "9.1.0",
         "@types/node": "13.13.2",
+        "@types/scryptsy": "2.0.0",
+        "@types/uuid": "8.3.0",
         "@typescript-eslint/eslint-plugin": "5.44.0",
         "@typescript-eslint/parser": "5.44.0",
         "assert": "2.0.0",
@@ -155,7 +167,6 @@
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/@multiversx/sdk-bls-wasm/-/sdk-bls-wasm-0.3.5.tgz",
       "integrity": "sha512-c0tIdQUnbBLSt6NYU+OpeGPYdL0+GV547HeHT8Xc0BKQ7Cj0v82QUoA2QRtWrR1G4MNZmLsIacZSsf6DrIS2Bw==",
-      "dev": true,
       "engines": {
         "node": ">=8.9.0"
       }
@@ -193,6 +204,24 @@
         "uuid": "8.3.2"
       }
     },
+    "node_modules/@multiversx/sdk-wallet/node_modules/@types/node": {
+      "version": "11.11.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
+      "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==",
+      "dev": true
+    },
+    "node_modules/@multiversx/sdk-wallet/node_modules/bip39": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.2.tgz",
+      "integrity": "sha512-J4E1r2N0tUylTKt07ibXvhpT2c5pyAFgvuA5q1H9uDy6dEGpjV8jmymh3MTYJDLCNbIVClSB9FbND49I6N24MQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "11.11.6",
+        "create-hash": "^1.1.0",
+        "pbkdf2": "^3.0.9",
+        "randombytes": "^2.0.1"
+      }
+    },
     "node_modules/@multiversx/sdk-wallet/node_modules/keccak": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.1.tgz",
@@ -211,7 +240,6 @@
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/@noble/ed25519/-/ed25519-1.7.3.tgz",
       "integrity": "sha512-iR8GBkDt0Q3GyaVcIu7mSsVIqnFbkbRzGLWlvhwunacoLwt4J3swfKhfaM6rN6WY+TBGoYT1GtT1mIh2/jGbRQ==",
-      "dev": true,
       "funding": [
         {
           "type": "individual",
@@ -223,7 +251,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.0.tgz",
       "integrity": "sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg==",
-      "dev": true,
       "funding": [
         {
           "type": "individual",
@@ -342,6 +369,15 @@
       "integrity": "sha512-t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw==",
       "dev": true
     },
+    "node_modules/@types/ed2curve": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@types/ed2curve/-/ed2curve-0.2.2.tgz",
+      "integrity": "sha512-G1sTX5xo91ydevQPINbL2nfgVAj/s1ZiqZxC8OCWduwu+edoNGUm5JXtTkg9F3LsBZbRI46/0HES4CPUE2wc9g==",
+      "dev": true,
+      "dependencies": {
+        "tweetnacl": "^1.0.0"
+      }
+    },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -381,12 +417,27 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.2.tgz",
       "integrity": "sha512-LB2R1Oyhpg8gu4SON/mfforE525+Hi/M1ineICEDftqNVTyFg1aRIeGuTvXAoWHc4nbrFncWtJgMmoyRvuGh7A=="
     },
+    "node_modules/@types/scryptsy": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/scryptsy/-/scryptsy-2.0.0.tgz",
+      "integrity": "sha512-iDmneBKWSsmsR3SlGisOVnpCz7sB5Mqhv4I/pLg1DYq2zttWT65r+1gOVZtoxXiTsSf/JO8NhgyCKhx7cvGbaA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/semver": {
       "version": "7.5.6",
       "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz",
       "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==",
       "dev": true
     },
+    "node_modules/@types/uuid": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.0.tgz",
+      "integrity": "sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ==",
+      "dev": true
+    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "5.44.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.44.0.tgz",
@@ -949,23 +1000,13 @@
       }
     },
     "node_modules/bip39": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.2.tgz",
-      "integrity": "sha512-J4E1r2N0tUylTKt07ibXvhpT2c5pyAFgvuA5q1H9uDy6dEGpjV8jmymh3MTYJDLCNbIVClSB9FbND49I6N24MQ==",
-      "dev": true,
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.1.0.tgz",
+      "integrity": "sha512-c9kiwdk45Do5GL0vJMe7tS95VjCii65mYAH7DfWl3uW8AVzXKQVUm64i3hzVybBDMp9r7j9iNxR85+ul8MdN/A==",
       "dependencies": {
-        "@types/node": "11.11.6",
-        "create-hash": "^1.1.0",
-        "pbkdf2": "^3.0.9",
-        "randombytes": "^2.0.1"
+        "@noble/hashes": "^1.2.0"
       }
     },
-    "node_modules/bip39/node_modules/@types/node": {
-      "version": "11.11.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
-      "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==",
-      "dev": true
-    },
     "node_modules/blake2b": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/blake2b/-/blake2b-2.1.3.tgz",
@@ -1392,7 +1433,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
       "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
       "dependencies": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -1498,7 +1538,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
       "dependencies": {
         "cipher-base": "^1.0.1",
         "inherits": "^2.0.1",
@@ -1511,7 +1550,6 @@
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
       "dependencies": {
         "cipher-base": "^1.0.3",
         "create-hash": "^1.1.0",
@@ -1765,18 +1803,32 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/ed25519-hd-key/-/ed25519-hd-key-1.1.2.tgz",
       "integrity": "sha512-/0y9y6N7vM6Kj5ASr9J9wcMVDTtygxSOvYX+PJiMD7VcxCx2G03V5bLRl8Dug9EgkLFsLhGqBtQWQRcElEeWTA==",
-      "dev": true,
       "dependencies": {
         "bip39": "3.0.2",
         "create-hmac": "1.1.7",
         "tweetnacl": "1.0.3"
       }
     },
+    "node_modules/ed25519-hd-key/node_modules/@types/node": {
+      "version": "11.11.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
+      "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ=="
+    },
+    "node_modules/ed25519-hd-key/node_modules/bip39": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.2.tgz",
+      "integrity": "sha512-J4E1r2N0tUylTKt07ibXvhpT2c5pyAFgvuA5q1H9uDy6dEGpjV8jmymh3MTYJDLCNbIVClSB9FbND49I6N24MQ==",
+      "dependencies": {
+        "@types/node": "11.11.6",
+        "create-hash": "^1.1.0",
+        "pbkdf2": "^3.0.9",
+        "randombytes": "^2.0.1"
+      }
+    },
     "node_modules/ed2curve": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/ed2curve/-/ed2curve-0.3.0.tgz",
       "integrity": "sha512-8w2fmmq3hv9rCrcI7g9hms2pMunQr1JINfcjwR9tAyZqhtyaMN991lF/ZfHfr5tzZQ8c7y7aBgZbjfbd0fjFwQ==",
-      "dev": true,
       "dependencies": {
         "tweetnacl": "1.x.x"
       }
@@ -2646,7 +2698,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
       "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dev": true,
       "dependencies": {
         "inherits": "^2.0.4",
         "readable-stream": "^3.6.0",
@@ -2660,7 +2711,6 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
       "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -3384,7 +3434,6 @@
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
       "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
       "dependencies": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1",
@@ -3944,7 +3993,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
       "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
-      "dev": true,
       "dependencies": {
         "create-hash": "^1.1.2",
         "create-hmac": "^1.1.4",
@@ -4277,7 +4325,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
@@ -4428,7 +4475,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
       "dependencies": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1"
@@ -4485,8 +4531,7 @@
     "node_modules/scryptsy": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-2.1.0.tgz",
-      "integrity": "sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w==",
-      "dev": true
+      "integrity": "sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w=="
     },
     "node_modules/serialize-javascript": {
       "version": "6.0.0",
@@ -4501,7 +4546,6 @@
       "version": "2.4.11",
       "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
       "dependencies": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -4857,8 +4901,7 @@
     "node_modules/tweetnacl": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
-      "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==",
-      "dev": true
+      "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="
     },
     "node_modules/type-check": {
       "version": "0.4.0",
@@ -5017,7 +5060,6 @@
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -5298,8 +5340,7 @@
     "@multiversx/sdk-bls-wasm": {
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/@multiversx/sdk-bls-wasm/-/sdk-bls-wasm-0.3.5.tgz",
-      "integrity": "sha512-c0tIdQUnbBLSt6NYU+OpeGPYdL0+GV547HeHT8Xc0BKQ7Cj0v82QUoA2QRtWrR1G4MNZmLsIacZSsf6DrIS2Bw==",
-      "dev": true
+      "integrity": "sha512-c0tIdQUnbBLSt6NYU+OpeGPYdL0+GV547HeHT8Xc0BKQ7Cj0v82QUoA2QRtWrR1G4MNZmLsIacZSsf6DrIS2Bw=="
     },
     "@multiversx/sdk-transaction-decoder": {
       "version": "1.0.2",
@@ -5336,6 +5377,24 @@
         "uuid": "8.3.2"
       },
       "dependencies": {
+        "@types/node": {
+          "version": "11.11.6",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
+          "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==",
+          "dev": true
+        },
+        "bip39": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.2.tgz",
+          "integrity": "sha512-J4E1r2N0tUylTKt07ibXvhpT2c5pyAFgvuA5q1H9uDy6dEGpjV8jmymh3MTYJDLCNbIVClSB9FbND49I6N24MQ==",
+          "dev": true,
+          "requires": {
+            "@types/node": "11.11.6",
+            "create-hash": "^1.1.0",
+            "pbkdf2": "^3.0.9",
+            "randombytes": "^2.0.1"
+          }
+        },
         "keccak": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.1.tgz",
@@ -5351,14 +5410,12 @@
     "@noble/ed25519": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/@noble/ed25519/-/ed25519-1.7.3.tgz",
-      "integrity": "sha512-iR8GBkDt0Q3GyaVcIu7mSsVIqnFbkbRzGLWlvhwunacoLwt4J3swfKhfaM6rN6WY+TBGoYT1GtT1mIh2/jGbRQ==",
-      "dev": true
+      "integrity": "sha512-iR8GBkDt0Q3GyaVcIu7mSsVIqnFbkbRzGLWlvhwunacoLwt4J3swfKhfaM6rN6WY+TBGoYT1GtT1mIh2/jGbRQ=="
     },
     "@noble/hashes": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.0.tgz",
-      "integrity": "sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg==",
-      "dev": true
+      "integrity": "sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg=="
     },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
@@ -5462,6 +5519,15 @@
       "integrity": "sha512-t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw==",
       "dev": true
     },
+    "@types/ed2curve": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@types/ed2curve/-/ed2curve-0.2.2.tgz",
+      "integrity": "sha512-G1sTX5xo91ydevQPINbL2nfgVAj/s1ZiqZxC8OCWduwu+edoNGUm5JXtTkg9F3LsBZbRI46/0HES4CPUE2wc9g==",
+      "dev": true,
+      "requires": {
+        "tweetnacl": "^1.0.0"
+      }
+    },
     "@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -5501,12 +5567,27 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.2.tgz",
       "integrity": "sha512-LB2R1Oyhpg8gu4SON/mfforE525+Hi/M1ineICEDftqNVTyFg1aRIeGuTvXAoWHc4nbrFncWtJgMmoyRvuGh7A=="
     },
+    "@types/scryptsy": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/scryptsy/-/scryptsy-2.0.0.tgz",
+      "integrity": "sha512-iDmneBKWSsmsR3SlGisOVnpCz7sB5Mqhv4I/pLg1DYq2zttWT65r+1gOVZtoxXiTsSf/JO8NhgyCKhx7cvGbaA==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/semver": {
       "version": "7.5.6",
       "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz",
       "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==",
       "dev": true
     },
+    "@types/uuid": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.0.tgz",
+      "integrity": "sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ==",
+      "dev": true
+    },
     "@typescript-eslint/eslint-plugin": {
       "version": "5.44.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.44.0.tgz",
@@ -5889,23 +5970,11 @@
       "dev": true
     },
     "bip39": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.2.tgz",
-      "integrity": "sha512-J4E1r2N0tUylTKt07ibXvhpT2c5pyAFgvuA5q1H9uDy6dEGpjV8jmymh3MTYJDLCNbIVClSB9FbND49I6N24MQ==",
-      "dev": true,
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.1.0.tgz",
+      "integrity": "sha512-c9kiwdk45Do5GL0vJMe7tS95VjCii65mYAH7DfWl3uW8AVzXKQVUm64i3hzVybBDMp9r7j9iNxR85+ul8MdN/A==",
       "requires": {
-        "@types/node": "11.11.6",
-        "create-hash": "^1.1.0",
-        "pbkdf2": "^3.0.9",
-        "randombytes": "^2.0.1"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "11.11.6",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
-          "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==",
-          "dev": true
-        }
+        "@noble/hashes": "^1.2.0"
       }
     },
     "blake2b": {
@@ -6276,7 +6345,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
       "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
       "requires": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -6378,7 +6446,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
       "requires": {
         "cipher-base": "^1.0.1",
         "inherits": "^2.0.1",
@@ -6391,7 +6458,6 @@
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
       "requires": {
         "cipher-base": "^1.0.3",
         "create-hash": "^1.1.0",
@@ -6590,18 +6656,34 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/ed25519-hd-key/-/ed25519-hd-key-1.1.2.tgz",
       "integrity": "sha512-/0y9y6N7vM6Kj5ASr9J9wcMVDTtygxSOvYX+PJiMD7VcxCx2G03V5bLRl8Dug9EgkLFsLhGqBtQWQRcElEeWTA==",
-      "dev": true,
       "requires": {
         "bip39": "3.0.2",
         "create-hmac": "1.1.7",
         "tweetnacl": "1.0.3"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "11.11.6",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
+          "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ=="
+        },
+        "bip39": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.2.tgz",
+          "integrity": "sha512-J4E1r2N0tUylTKt07ibXvhpT2c5pyAFgvuA5q1H9uDy6dEGpjV8jmymh3MTYJDLCNbIVClSB9FbND49I6N24MQ==",
+          "requires": {
+            "@types/node": "11.11.6",
+            "create-hash": "^1.1.0",
+            "pbkdf2": "^3.0.9",
+            "randombytes": "^2.0.1"
+          }
+        }
       }
     },
     "ed2curve": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/ed2curve/-/ed2curve-0.3.0.tgz",
       "integrity": "sha512-8w2fmmq3hv9rCrcI7g9hms2pMunQr1JINfcjwR9tAyZqhtyaMN991lF/ZfHfr5tzZQ8c7y7aBgZbjfbd0fjFwQ==",
-      "dev": true,
       "requires": {
         "tweetnacl": "1.x.x"
       }
@@ -7243,7 +7325,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
       "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dev": true,
       "requires": {
         "inherits": "^2.0.4",
         "readable-stream": "^3.6.0",
@@ -7254,7 +7335,6 @@
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
           "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
           "requires": {
             "inherits": "^2.0.3",
             "string_decoder": "^1.1.1",
@@ -7802,7 +7882,6 @@
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
       "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
       "requires": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1",
@@ -8235,7 +8314,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
       "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
-      "dev": true,
       "requires": {
         "create-hash": "^1.1.2",
         "create-hmac": "^1.1.4",
@@ -8474,7 +8552,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
       "requires": {
         "safe-buffer": "^5.1.0"
       }
@@ -8596,7 +8673,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
       "requires": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1"
@@ -8625,8 +8701,7 @@
     "scryptsy": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-2.1.0.tgz",
-      "integrity": "sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w==",
-      "dev": true
+      "integrity": "sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w=="
     },
     "serialize-javascript": {
       "version": "6.0.0",
@@ -8641,7 +8716,6 @@
       "version": "2.4.11",
       "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
       "requires": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -8922,8 +8996,7 @@
     "tweetnacl": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
-      "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==",
-      "dev": true
+      "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="
     },
     "type-check": {
       "version": "0.4.0",
@@ -9051,8 +9124,7 @@
     "uuid": {
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
     },
     "vm-browserify": {
       "version": "1.1.2",
diff --git a/package.json b/package.json
index 1fe34dd72..061c1ab0a 100644
--- a/package.json
+++ b/package.json
@@ -37,18 +37,29 @@
   },
   "dependencies": {
     "@multiversx/sdk-transaction-decoder": "1.0.2",
+    "@multiversx/sdk-bls-wasm": "0.3.5",
     "json-bigint": "1.0.0",
     "bech32": "1.1.4",
+    "bip39": "3.1.0",
     "blake2b": "2.1.3",
     "buffer": "6.0.3",
-    "keccak": "3.0.2"
+    "ed25519-hd-key": "1.1.2",
+    "ed2curve": "0.3.0",
+    "keccak": "3.0.2",
+    "scryptsy": "2.1.0",
+    "tweetnacl": "1.0.3",
+    "@noble/ed25519": "1.7.3",
+    "@noble/hashes": "1.3.0",
+    "uuid": "8.3.2"
   },
   "devDependencies": {
     "@multiversx/sdk-wallet": "4.5.1",
     "@types/assert": "1.4.6",
     "@types/chai": "4.2.11",
+    "@types/ed2curve": "0.2.2",
     "@types/mocha": "9.1.0",
     "@types/node": "13.13.2",
+    "@types/scryptsy": "2.0.0",
     "assert": "2.0.0",
     "browserify": "17.0.0",
     "chai": "4.2.0",
@@ -58,6 +69,7 @@
     "typescript": "4.1.2",
     "@typescript-eslint/eslint-plugin": "5.44.0",
     "@typescript-eslint/parser": "5.44.0",
+    "@types/uuid": "8.3.0",
     "eslint": "8.28.0",
     "eslint-config-prettier": "9.1.0",
     "prettier": "3.2.4"
diff --git a/src-wallet/assertions.ts b/src/wallet/assertions.ts
similarity index 100%
rename from src-wallet/assertions.ts
rename to src/wallet/assertions.ts
diff --git a/src-wallet/config.ts b/src/wallet/config.ts
similarity index 100%
rename from src-wallet/config.ts
rename to src/wallet/config.ts
diff --git a/src-wallet/crypto/constants.ts b/src/wallet/crypto/constants.ts
similarity index 100%
rename from src-wallet/crypto/constants.ts
rename to src/wallet/crypto/constants.ts
diff --git a/src-wallet/crypto/decryptor.ts b/src/wallet/crypto/decryptor.ts
similarity index 100%
rename from src-wallet/crypto/decryptor.ts
rename to src/wallet/crypto/decryptor.ts
diff --git a/src-wallet/crypto/derivationParams.ts b/src/wallet/crypto/derivationParams.ts
similarity index 100%
rename from src-wallet/crypto/derivationParams.ts
rename to src/wallet/crypto/derivationParams.ts
diff --git a/src-wallet/crypto/encrypt.spec.ts b/src/wallet/crypto/encrypt.spec.ts
similarity index 100%
rename from src-wallet/crypto/encrypt.spec.ts
rename to src/wallet/crypto/encrypt.spec.ts
diff --git a/src-wallet/crypto/encryptedData.ts b/src/wallet/crypto/encryptedData.ts
similarity index 100%
rename from src-wallet/crypto/encryptedData.ts
rename to src/wallet/crypto/encryptedData.ts
diff --git a/src-wallet/crypto/encryptor.ts b/src/wallet/crypto/encryptor.ts
similarity index 100%
rename from src-wallet/crypto/encryptor.ts
rename to src/wallet/crypto/encryptor.ts
diff --git a/src-wallet/crypto/index.ts b/src/wallet/crypto/index.ts
similarity index 100%
rename from src-wallet/crypto/index.ts
rename to src/wallet/crypto/index.ts
diff --git a/src-wallet/crypto/pubkeyDecryptor.ts b/src/wallet/crypto/pubkeyDecryptor.ts
similarity index 100%
rename from src-wallet/crypto/pubkeyDecryptor.ts
rename to src/wallet/crypto/pubkeyDecryptor.ts
diff --git a/src-wallet/crypto/pubkeyEncrypt.spec.ts b/src/wallet/crypto/pubkeyEncrypt.spec.ts
similarity index 100%
rename from src-wallet/crypto/pubkeyEncrypt.spec.ts
rename to src/wallet/crypto/pubkeyEncrypt.spec.ts
diff --git a/src-wallet/crypto/pubkeyEncryptor.ts b/src/wallet/crypto/pubkeyEncryptor.ts
similarity index 100%
rename from src-wallet/crypto/pubkeyEncryptor.ts
rename to src/wallet/crypto/pubkeyEncryptor.ts
diff --git a/src-wallet/crypto/randomness.ts b/src/wallet/crypto/randomness.ts
similarity index 100%
rename from src-wallet/crypto/randomness.ts
rename to src/wallet/crypto/randomness.ts
diff --git a/src-wallet/crypto/x25519EncryptedData.ts b/src/wallet/crypto/x25519EncryptedData.ts
similarity index 100%
rename from src-wallet/crypto/x25519EncryptedData.ts
rename to src/wallet/crypto/x25519EncryptedData.ts
diff --git a/src-wallet/errors.ts b/src/wallet/errors.ts
similarity index 100%
rename from src-wallet/errors.ts
rename to src/wallet/errors.ts
diff --git a/src-wallet/index.ts b/src/wallet/index.ts
similarity index 100%
rename from src-wallet/index.ts
rename to src/wallet/index.ts
diff --git a/src-wallet/mnemonic.ts b/src/wallet/mnemonic.ts
similarity index 100%
rename from src-wallet/mnemonic.ts
rename to src/wallet/mnemonic.ts
diff --git a/src-wallet/pem.spec.ts b/src/wallet/pem.spec.ts
similarity index 100%
rename from src-wallet/pem.spec.ts
rename to src/wallet/pem.spec.ts
diff --git a/src-wallet/pem.ts b/src/wallet/pem.ts
similarity index 100%
rename from src-wallet/pem.ts
rename to src/wallet/pem.ts
diff --git a/src-wallet/signature.ts b/src/wallet/signature.ts
similarity index 100%
rename from src-wallet/signature.ts
rename to src/wallet/signature.ts
diff --git a/src-wallet/testdata/alice.json b/src/wallet/testdata/alice.json
similarity index 100%
rename from src-wallet/testdata/alice.json
rename to src/wallet/testdata/alice.json
diff --git a/src-wallet/testdata/alice.pem b/src/wallet/testdata/alice.pem
similarity index 100%
rename from src-wallet/testdata/alice.pem
rename to src/wallet/testdata/alice.pem
diff --git a/src-wallet/testdata/bob.json b/src/wallet/testdata/bob.json
similarity index 100%
rename from src-wallet/testdata/bob.json
rename to src/wallet/testdata/bob.json
diff --git a/src-wallet/testdata/bob.pem b/src/wallet/testdata/bob.pem
similarity index 100%
rename from src-wallet/testdata/bob.pem
rename to src/wallet/testdata/bob.pem
diff --git a/src-wallet/testdata/carol.json b/src/wallet/testdata/carol.json
similarity index 100%
rename from src-wallet/testdata/carol.json
rename to src/wallet/testdata/carol.json
diff --git a/src-wallet/testdata/carol.pem b/src/wallet/testdata/carol.pem
similarity index 100%
rename from src-wallet/testdata/carol.pem
rename to src/wallet/testdata/carol.pem
diff --git a/src-wallet/testdata/withDummyMnemonic.json b/src/wallet/testdata/withDummyMnemonic.json
similarity index 100%
rename from src-wallet/testdata/withDummyMnemonic.json
rename to src/wallet/testdata/withDummyMnemonic.json
diff --git a/src-wallet/testdata/withDummySecretKey.json b/src/wallet/testdata/withDummySecretKey.json
similarity index 100%
rename from src-wallet/testdata/withDummySecretKey.json
rename to src/wallet/testdata/withDummySecretKey.json
diff --git a/src-wallet/testdata/withoutKind.json b/src/wallet/testdata/withoutKind.json
similarity index 100%
rename from src-wallet/testdata/withoutKind.json
rename to src/wallet/testdata/withoutKind.json
diff --git a/src-wallet/testutils/files.ts b/src/wallet/testutils/files.ts
similarity index 100%
rename from src-wallet/testutils/files.ts
rename to src/wallet/testutils/files.ts
diff --git a/src-wallet/testutils/message.ts b/src/wallet/testutils/message.ts
similarity index 100%
rename from src-wallet/testutils/message.ts
rename to src/wallet/testutils/message.ts
diff --git a/src-wallet/testutils/transaction.ts b/src/wallet/testutils/transaction.ts
similarity index 100%
rename from src-wallet/testutils/transaction.ts
rename to src/wallet/testutils/transaction.ts
diff --git a/src-wallet/testutils/wallets.ts b/src/wallet/testutils/wallets.ts
similarity index 100%
rename from src-wallet/testutils/wallets.ts
rename to src/wallet/testutils/wallets.ts
diff --git a/src-wallet/userAddress.ts b/src/wallet/userAddress.ts
similarity index 100%
rename from src-wallet/userAddress.ts
rename to src/wallet/userAddress.ts
diff --git a/src-wallet/userKeys.ts b/src/wallet/userKeys.ts
similarity index 100%
rename from src-wallet/userKeys.ts
rename to src/wallet/userKeys.ts
diff --git a/src-wallet/userSigner.ts b/src/wallet/userSigner.ts
similarity index 100%
rename from src-wallet/userSigner.ts
rename to src/wallet/userSigner.ts
diff --git a/src-wallet/userVerifier.ts b/src/wallet/userVerifier.ts
similarity index 100%
rename from src-wallet/userVerifier.ts
rename to src/wallet/userVerifier.ts
diff --git a/src-wallet/userWallet.ts b/src/wallet/userWallet.ts
similarity index 100%
rename from src-wallet/userWallet.ts
rename to src/wallet/userWallet.ts
diff --git a/src-wallet/users.spec.ts b/src/wallet/users.spec.ts
similarity index 100%
rename from src-wallet/users.spec.ts
rename to src/wallet/users.spec.ts
diff --git a/src-wallet/usersBenchmark.spec.ts b/src/wallet/usersBenchmark.spec.ts
similarity index 100%
rename from src-wallet/usersBenchmark.spec.ts
rename to src/wallet/usersBenchmark.spec.ts
diff --git a/src-wallet/validatorKeys.ts b/src/wallet/validatorKeys.ts
similarity index 100%
rename from src-wallet/validatorKeys.ts
rename to src/wallet/validatorKeys.ts
diff --git a/src-wallet/validatorSigner.ts b/src/wallet/validatorSigner.ts
similarity index 100%
rename from src-wallet/validatorSigner.ts
rename to src/wallet/validatorSigner.ts
diff --git a/src-wallet/validators.spec.ts b/src/wallet/validators.spec.ts
similarity index 100%
rename from src-wallet/validators.spec.ts
rename to src/wallet/validators.spec.ts

From 09713c3239c55990440631d706c702e8ff235762 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Tue, 8 Oct 2024 10:48:49 +0300
Subject: [PATCH 285/338] remove sdk-wallet dependency and fix import

---
 package-lock.json                             | 109 ------------------
 package.json                                  |   1 -
 src/index.ts                                  |   1 +
 src/message.spec.ts                           |   2 +-
 src/testutils/wallets.ts                      |   2 +-
 src/transaction.spec.ts                       |   2 +-
 .../delegationTransactionsFactory.spec.ts     |   2 +-
 src/wallet/validatorKeys.ts                   |   6 +-
 8 files changed, 9 insertions(+), 116 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5aa4414f9..26f31f194 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,6 @@
         "uuid": "8.3.2"
       },
       "devDependencies": {
-        "@multiversx/sdk-wallet": "4.5.1",
         "@types/assert": "1.4.6",
         "@types/chai": "4.2.11",
         "@types/ed2curve": "0.2.2",
@@ -53,12 +52,6 @@
         "protobufjs": "^7.2.6"
       }
     },
-    "@multiversx/sdk-wallet:4.0.0-beta.3": {
-      "extraneous": true
-    },
-    "@multiversx/sdk-wallet@4.0.0-beta.3": {
-      "extraneous": true
-    },
     "node_modules/@aashutoshrathi/word-wrap": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
@@ -184,58 +177,6 @@
       "resolved": "https://registry.npmjs.org/bech32/-/bech32-2.0.0.tgz",
       "integrity": "sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg=="
     },
-    "node_modules/@multiversx/sdk-wallet": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/@multiversx/sdk-wallet/-/sdk-wallet-4.5.1.tgz",
-      "integrity": "sha512-rvaMUV6OxNj9gchOn7wSCPZcWc6hjs1nQuY6QwnaEcBfPsHtFemNNt+t3uxPZOrDhAwXqUgyy9WdltvOs8somg==",
-      "dev": true,
-      "dependencies": {
-        "@multiversx/sdk-bls-wasm": "0.3.5",
-        "@noble/ed25519": "1.7.3",
-        "@noble/hashes": "1.3.0",
-        "bech32": "1.1.4",
-        "bip39": "3.0.2",
-        "blake2b": "2.1.3",
-        "ed25519-hd-key": "1.1.2",
-        "ed2curve": "0.3.0",
-        "keccak": "3.0.1",
-        "scryptsy": "2.1.0",
-        "tweetnacl": "1.0.3",
-        "uuid": "8.3.2"
-      }
-    },
-    "node_modules/@multiversx/sdk-wallet/node_modules/@types/node": {
-      "version": "11.11.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
-      "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==",
-      "dev": true
-    },
-    "node_modules/@multiversx/sdk-wallet/node_modules/bip39": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.2.tgz",
-      "integrity": "sha512-J4E1r2N0tUylTKt07ibXvhpT2c5pyAFgvuA5q1H9uDy6dEGpjV8jmymh3MTYJDLCNbIVClSB9FbND49I6N24MQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "11.11.6",
-        "create-hash": "^1.1.0",
-        "pbkdf2": "^3.0.9",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "node_modules/@multiversx/sdk-wallet/node_modules/keccak": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.1.tgz",
-      "integrity": "sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "node-addon-api": "^2.0.0",
-        "node-gyp-build": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
     "node_modules/@noble/ed25519": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/@noble/ed25519/-/ed25519-1.7.3.tgz",
@@ -5357,56 +5298,6 @@
         }
       }
     },
-    "@multiversx/sdk-wallet": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/@multiversx/sdk-wallet/-/sdk-wallet-4.5.1.tgz",
-      "integrity": "sha512-rvaMUV6OxNj9gchOn7wSCPZcWc6hjs1nQuY6QwnaEcBfPsHtFemNNt+t3uxPZOrDhAwXqUgyy9WdltvOs8somg==",
-      "dev": true,
-      "requires": {
-        "@multiversx/sdk-bls-wasm": "0.3.5",
-        "@noble/ed25519": "1.7.3",
-        "@noble/hashes": "1.3.0",
-        "bech32": "1.1.4",
-        "bip39": "3.0.2",
-        "blake2b": "2.1.3",
-        "ed25519-hd-key": "1.1.2",
-        "ed2curve": "0.3.0",
-        "keccak": "3.0.1",
-        "scryptsy": "2.1.0",
-        "tweetnacl": "1.0.3",
-        "uuid": "8.3.2"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "11.11.6",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
-          "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==",
-          "dev": true
-        },
-        "bip39": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.2.tgz",
-          "integrity": "sha512-J4E1r2N0tUylTKt07ibXvhpT2c5pyAFgvuA5q1H9uDy6dEGpjV8jmymh3MTYJDLCNbIVClSB9FbND49I6N24MQ==",
-          "dev": true,
-          "requires": {
-            "@types/node": "11.11.6",
-            "create-hash": "^1.1.0",
-            "pbkdf2": "^3.0.9",
-            "randombytes": "^2.0.1"
-          }
-        },
-        "keccak": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.1.tgz",
-          "integrity": "sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA==",
-          "dev": true,
-          "requires": {
-            "node-addon-api": "^2.0.0",
-            "node-gyp-build": "^4.2.0"
-          }
-        }
-      }
-    },
     "@noble/ed25519": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/@noble/ed25519/-/ed25519-1.7.3.tgz",
diff --git a/package.json b/package.json
index 061c1ab0a..4a5358470 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,6 @@
     "uuid": "8.3.2"
   },
   "devDependencies": {
-    "@multiversx/sdk-wallet": "4.5.1",
     "@types/assert": "1.4.6",
     "@types/chai": "4.2.11",
     "@types/ed2curve": "0.2.2",
diff --git a/src/index.ts b/src/index.ts
index 8ef8255b3..08c8affee 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -34,3 +34,4 @@ export * from "./transactionsFactories";
 export * from "./transactionsOutcomeParsers";
 export * from "./utils";
 export * from "./networkProviders";
+export * from "./wallet";
diff --git a/src/message.spec.ts b/src/message.spec.ts
index b7c87c3c6..c7809d835 100644
--- a/src/message.spec.ts
+++ b/src/message.spec.ts
@@ -1,4 +1,4 @@
-import { UserVerifier } from "@multiversx/sdk-wallet";
+import { UserVerifier } from "./wallet";
 import { assert } from "chai";
 import { DEFAULT_MESSAGE_VERSION, SDK_JS_SIGNER, UNKNOWN_SIGNER } from "./constants";
 import { Message, MessageComputer } from "./message";
diff --git a/src/testutils/wallets.ts b/src/testutils/wallets.ts
index 1e67da63d..132d8c188 100644
--- a/src/testutils/wallets.ts
+++ b/src/testutils/wallets.ts
@@ -1,4 +1,4 @@
-import { UserSecretKey, UserSigner } from "@multiversx/sdk-wallet";
+import { UserSecretKey, UserSigner } from "./../wallet";
 import axios from "axios";
 import * as fs from "fs";
 import * as path from "path";
diff --git a/src/transaction.spec.ts b/src/transaction.spec.ts
index 6775fbb91..ecf98d5c0 100644
--- a/src/transaction.spec.ts
+++ b/src/transaction.spec.ts
@@ -1,4 +1,4 @@
-import { UserPublicKey, UserVerifier } from "@multiversx/sdk-wallet";
+import { UserPublicKey, UserVerifier } from "./wallet";
 import BigNumber from "bignumber.js";
 import { assert } from "chai";
 import { Address } from "./address";
diff --git a/src/transactionsFactories/delegationTransactionsFactory.spec.ts b/src/transactionsFactories/delegationTransactionsFactory.spec.ts
index 7d5591cc6..c7d72902f 100644
--- a/src/transactionsFactories/delegationTransactionsFactory.spec.ts
+++ b/src/transactionsFactories/delegationTransactionsFactory.spec.ts
@@ -1,4 +1,4 @@
-import { ValidatorPublicKey } from "@multiversx/sdk-wallet";
+import { ValidatorPublicKey } from "./../wallet";
 import { assert } from "chai";
 import { Address } from "../address";
 import { DELEGATION_MANAGER_SC_ADDRESS } from "../constants";
diff --git a/src/wallet/validatorKeys.ts b/src/wallet/validatorKeys.ts
index 3c3497622..7425e113d 100644
--- a/src/wallet/validatorKeys.ts
+++ b/src/wallet/validatorKeys.ts
@@ -2,7 +2,7 @@ import { guardLength } from "./assertions";
 import { ErrInvariantFailed } from "./errors";
 import { parseValidatorKey } from "./pem";
 
-const bls = require('@multiversx/sdk-bls-wasm');
+const bls = require("@multiversx/sdk-bls-wasm");
 
 export const VALIDATOR_SECRETKEY_LENGTH = 32;
 export const VALIDATOR_PUBKEY_LENGTH = 96;
@@ -22,7 +22,9 @@ export class BLS {
 
     static guardInitialized() {
         if (!BLS.isInitialized) {
-            throw new ErrInvariantFailed("BLS modules are not initalized. Make sure that 'await BLS.initIfNecessary()' is called correctly.");
+            throw new ErrInvariantFailed(
+                "BLS modules are not initalized. Make sure that 'await BLS.initIfNecessary()' is called correctly.",
+            );
         }
     }
 }

From 475b8a4e2ca9b27b2e77df0191ced9b515f57064 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 8 Oct 2024 13:49:10 +0300
Subject: [PATCH 286/338] In outcome parsers, handle both TransactionOnNetwork
 and TransactionOutcome.

---
 .github/workflows/build.yml                   |   3 +-
 package.json                                  |   7 +-
 src/converters/transactionsConverter.ts       |   8 +
 src/testutils/networkProviders.ts             |  21 ++-
 ...> tokenOperationsFactory.test.net.spec.ts} |   0
 .../delegationTransactionsOutcomeParser.ts    |  23 ++-
 ...tTransactionsOutcomeParser.dev.net.spec.ts |  40 +++++
 .../smartContractTransactionsOutcomeParser.ts |  94 ++++++++--
 ...okenManagementTransactionsOutcomeParser.ts | 163 ++++++++++++------
 9 files changed, 281 insertions(+), 78 deletions(-)
 rename src/tokenOperations/{tokenOperationsFactory.testnet.spec.ts => tokenOperationsFactory.test.net.spec.ts} (100%)
 create mode 100644 src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.dev.net.spec.ts

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 82323997d..5881ae129 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,4 +27,5 @@ jobs:
     - run: npm run lint
     - run: npm run compile
     - run: npm install esmify && npm run compile-browser
-    - run: npm test
+    - run: npm run tests-unit
+    - run: npm run tests-devnet
diff --git a/package.json b/package.json
index 1fe34dd72..94358aaaf 100644
--- a/package.json
+++ b/package.json
@@ -22,10 +22,11 @@
   ],
   "scripts": {
     "test": "npm run tests-unit",
-    "tests-unit": "mocha $(find . -name '*.spec.ts' ! -name '*.local.net.spec.*' ! -name '*.devnet.spec.*' ! -name '*.testnet.spec.*')",
+    "tests-unit": "mocha $(find . -name '*.spec.ts' ! -name '*.local.net.spec.*' ! -name '*.test.net.spec.*' ! -name '*.dev.net.spec.*' ! -name '*.main.net.spec.*')",
     "tests-localnet": "mocha $(find . -name '*.local.net.spec.ts')",
-    "tests-devnet": "mocha $(find . -name '*.devnet.spec.ts')",
-    "tests-testnet": "mocha $(find . -name '*.testnet.spec.ts')",
+    "tests-testnet": "mocha $(find . -name '*.test.net.spec.ts')",
+    "tests-devnet": "mocha $(find . -name '*.dev.net.spec.ts')",
+    "tests-mainnet": "mocha $(find . -name '*.main.net.spec.ts')",
     "compile-browser": "tsc -p tsconfig.json && browserify out/index.js -o out-browser/sdk-core.js --standalone multiversxSdkCore -p esmify",
     "compile": "tsc -p tsconfig.json",
     "compile-proto": "npx pbjs -t static-module -w default -o src/proto/compiled.js src/proto/transaction.proto",
diff --git a/src/converters/transactionsConverter.ts b/src/converters/transactionsConverter.ts
index c6001c5d6..d94cb11fa 100644
--- a/src/converters/transactionsConverter.ts
+++ b/src/converters/transactionsConverter.ts
@@ -79,6 +79,14 @@ export class TransactionsConverter {
         return Buffer.from(value || "", "hex");
     }
 
+    /**
+     * @deprecated Where {@link TransactionOutcome} was needed (throughout the SDK), pass the {@link ITransactionOnNetwork} object instead.
+     *
+     * Summarizes the outcome of a transaction on the network, and maps it to the "standard" resources (according to the sdk-specs).
+     *
+     * In the future, this converter function will become obsolete,
+     * as the impedance mismatch between the network components and the "core" components will be reduced.
+     */
     public transactionOnNetworkToOutcome(transactionOnNetwork: ITransactionOnNetwork): TransactionOutcome {
         // In the future, this will not be needed because the transaction, as returned from the API,
         // will hold the data corresponding to the direct smart contract call outcome (in case of smart contract calls).
diff --git a/src/testutils/networkProviders.ts b/src/testutils/networkProviders.ts
index 3b27e3eda..67ed2a4d1 100644
--- a/src/testutils/networkProviders.ts
+++ b/src/testutils/networkProviders.ts
@@ -1,4 +1,3 @@
-import { ApiNetworkProvider, ProxyNetworkProvider } from "../networkProviders";
 import { IAddress } from "../interface";
 import {
     IAccountOnNetwork,
@@ -7,6 +6,7 @@ import {
     ITransactionOnNetwork,
     ITransactionStatus,
 } from "../interfaceOfNetwork";
+import { ApiNetworkProvider, ProxyNetworkProvider } from "../networkProviders";
 import { Query } from "../smartcontracts/query";
 import { Transaction } from "../transaction";
 
@@ -15,7 +15,24 @@ export function createLocalnetProvider(): INetworkProvider {
 }
 
 export function createTestnetProvider(): INetworkProvider {
-    return new ApiNetworkProvider("https://testnet-api.multiversx.com", { timeout: 5000 });
+    return new ApiNetworkProvider("https://testnet-api.multiversx.com", {
+        timeout: 5000,
+        clientName: "mx-sdk-js-core/tests",
+    });
+}
+
+export function createDevnetProvider(): INetworkProvider {
+    return new ProxyNetworkProvider("https://devnet-gateway.multiversx.com", {
+        timeout: 5000,
+        clientName: "mx-sdk-js-core/tests",
+    });
+}
+
+export function createMainnetProvider(): INetworkProvider {
+    return new ProxyNetworkProvider("https://gateway.multiversx.com", {
+        timeout: 10000,
+        clientName: "mx-sdk-js-core/tests",
+    });
 }
 
 export interface INetworkProvider {
diff --git a/src/tokenOperations/tokenOperationsFactory.testnet.spec.ts b/src/tokenOperations/tokenOperationsFactory.test.net.spec.ts
similarity index 100%
rename from src/tokenOperations/tokenOperationsFactory.testnet.spec.ts
rename to src/tokenOperations/tokenOperationsFactory.test.net.spec.ts
diff --git a/src/transactionsOutcomeParsers/delegationTransactionsOutcomeParser.ts b/src/transactionsOutcomeParsers/delegationTransactionsOutcomeParser.ts
index 305949058..b7e9a0a03 100644
--- a/src/transactionsOutcomeParsers/delegationTransactionsOutcomeParser.ts
+++ b/src/transactionsOutcomeParsers/delegationTransactionsOutcomeParser.ts
@@ -1,18 +1,35 @@
 import { Address } from "../address";
+import { TransactionsConverter } from "../converters/transactionsConverter";
 import { ErrParseTransactionOutcome } from "../errors";
+import { ITransactionOnNetwork } from "../interfaceOfNetwork";
 import { TransactionEvent, TransactionOutcome, findEventsByIdentifier } from "./resources";
 
 export class DelegationTransactionsOutcomeParser {
     constructor() {}
 
-    parseCreateNewDelegationContract(transactionOutcome: TransactionOutcome): { contractAddress: string }[] {
-        this.ensureNoError(transactionOutcome.logs.events);
+    parseCreateNewDelegationContract(
+        transaction: TransactionOutcome | ITransactionOnNetwork,
+    ): { contractAddress: string }[] {
+        transaction = this.ensureTransactionOutcome(transaction);
 
-        const events = findEventsByIdentifier(transactionOutcome, "SCDeploy");
+        this.ensureNoError(transaction.logs.events);
+
+        const events = findEventsByIdentifier(transaction, "SCDeploy");
 
         return events.map((event) => ({ contractAddress: this.extractContractAddress(event) }));
     }
 
+    /**
+     * Temporary workaround, until "TransactionOnNetwork" completely replaces "TransactionOutcome".
+     */
+    private ensureTransactionOutcome(transaction: TransactionOutcome | ITransactionOnNetwork): TransactionOutcome {
+        if ("hash" in transaction) {
+            return new TransactionsConverter().transactionOnNetworkToOutcome(transaction);
+        }
+
+        return transaction;
+    }
+
     private ensureNoError(transactionEvents: TransactionEvent[]) {
         for (const event of transactionEvents) {
             if (event.identifier == "signalError") {
diff --git a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.dev.net.spec.ts b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.dev.net.spec.ts
new file mode 100644
index 000000000..6eb10aa4f
--- /dev/null
+++ b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.dev.net.spec.ts
@@ -0,0 +1,40 @@
+import { assert } from "chai";
+import { TransactionsConverter } from "../converters/transactionsConverter";
+import { createDevnetProvider } from "../testutils/networkProviders";
+import { SmartContractTransactionsOutcomeParser } from "./smartContractTransactionsOutcomeParser";
+
+describe("test smart contract transactions outcome parser on devnet", () => {
+    const networkProvider = createDevnetProvider();
+    const parser = new SmartContractTransactionsOutcomeParser();
+    const transactionsConverter = new TransactionsConverter();
+
+    it("should parse outcome of deploy transactions (1)", async () => {
+        const transactionHash = "5d2ff2af8eb3fe7f2acb7e29c0436854b4c6c44de02878b6afff582888024a55";
+        const transactionOnNetwork = await networkProvider.getTransaction(transactionHash);
+        const transactionOutcome = transactionsConverter.transactionOnNetworkToOutcome(transactionOnNetwork);
+        const parsedGivenTransactionOnNetwork = parser.parseDeploy({ transactionOnNetwork });
+        const parsedGivenTransactionOutcome = parser.parseDeploy({ transactionOutcome });
+
+        assert.deepEqual(parsedGivenTransactionOnNetwork, parsedGivenTransactionOutcome);
+        assert.equal(parsedGivenTransactionOnNetwork.returnCode, "ok");
+        assert.deepEqual(parsedGivenTransactionOnNetwork.contracts, [
+            {
+                address: "erd1qqqqqqqqqqqqqpgqpayq2es08gq8798xhnpr0kzgn7495qt5q6uqd7lpwf",
+                ownerAddress: "erd1tn62hjp72rznp8vq0lplva5csav6rccpqqdungpxtqz0g2hcq6uq9k4cc6",
+                codeHash: Buffer.from("c876625ec34a04445cfd99067777ebe488afdbc6899cd958f4c1d36107ca02d9", "hex"),
+            },
+        ]);
+    });
+
+    it("should parse outcome of deploy transactions (2)", async () => {
+        const transactionHash = "76683e926dad142fc9651afca208487f2a80d327fc87e5c876eec9d028196352";
+        const transactionOnNetwork = await networkProvider.getTransaction(transactionHash);
+        const transactionOutcome = transactionsConverter.transactionOnNetworkToOutcome(transactionOnNetwork);
+        const parsedGivenTransactionOnNetwork = parser.parseDeploy({ transactionOnNetwork });
+        const parsedGivenTransactionOutcome = parser.parseDeploy({ transactionOutcome });
+
+        assert.deepEqual(parsedGivenTransactionOnNetwork, parsedGivenTransactionOutcome);
+        assert.equal(parsedGivenTransactionOnNetwork.returnCode, "execution failed");
+        assert.lengthOf(parsedGivenTransactionOnNetwork.contracts, 0);
+    });
+});
diff --git a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.ts b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.ts
index 7c240504c..fe0777ef8 100644
--- a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.ts
+++ b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.ts
@@ -1,7 +1,14 @@
 import { Address } from "../address";
 import { Err } from "../errors";
+import { ITransactionOnNetwork } from "../interfaceOfNetwork";
 import { EndpointDefinition, ResultsParser, ReturnCode, Type, UntypedOutcomeBundle } from "../smartcontracts";
-import { TransactionEvent, TransactionOutcome, findEventsByIdentifier } from "./resources";
+import { TransactionOutcome, findEventsByIdentifier } from "./resources";
+
+enum Events {
+    SCDeploy = "SCDeploy",
+    SignalError = "signalError",
+    WriteLog = "writeLog",
+}
 
 interface IAbi {
     getEndpoint(name: string): EndpointDefinition;
@@ -28,15 +35,31 @@ export class SmartContractTransactionsOutcomeParser {
 
     constructor(options?: { abi?: IAbi; legacyResultsParser?: ILegacyResultsParser }) {
         this.abi = options?.abi;
-
-        // Prior v13, we've advertised that people can override the "ResultsParser" to alter it's behavior in case of exotic flows.
-        // Now, since the new "SmartContractTransactionsOutcomeParser" (still) depends on the legacy "ResultsParser",
-        // at least until "return data parts of direct outcome of contract call" are included on API & Proxy responses (on GET transaction),
-        // we have to allow the same level of customization (for exotic flows).
         this.legacyResultsParser = options?.legacyResultsParser || new ResultsParser();
     }
 
-    parseDeploy(options: { transactionOutcome: TransactionOutcome }): {
+    parseDeploy(
+        options: { transactionOutcome: TransactionOutcome } | { transactionOnNetwork: ITransactionOnNetwork },
+    ): {
+        returnCode: string;
+        returnMessage: string;
+        contracts: {
+            address: string;
+            ownerAddress: string;
+            codeHash: Uint8Array;
+        }[];
+    } {
+        if ("transactionOutcome" in options) {
+            return this.parseDeployGivenTransactionOutcome(options.transactionOutcome);
+        }
+
+        return this.parseDeployGivenTransactionOnNetwork(options.transactionOnNetwork);
+    }
+
+    /**
+     * Legacy approach.
+     */
+    protected parseDeployGivenTransactionOutcome(transactionOutcome: TransactionOutcome): {
         returnCode: string;
         returnMessage: string;
         contracts: {
@@ -45,8 +68,8 @@ export class SmartContractTransactionsOutcomeParser {
             codeHash: Uint8Array;
         }[];
     } {
-        const directCallOutcome = options.transactionOutcome.directSmartContractCallOutcome;
-        const events = findEventsByIdentifier(options.transactionOutcome, "SCDeploy");
+        const directCallOutcome = transactionOutcome.directSmartContractCallOutcome;
+        const events = findEventsByIdentifier(transactionOutcome, Events.SCDeploy);
         const contracts = events.map((event) => this.parseScDeployEvent(event));
 
         return {
@@ -56,7 +79,19 @@ export class SmartContractTransactionsOutcomeParser {
         };
     }
 
-    private parseScDeployEvent(event: TransactionEvent): {
+    protected parseDeployGivenTransactionOnNetwork(_transactionOnNetwork: ITransactionOnNetwork): {
+        returnCode: string;
+        returnMessage: string;
+        contracts: {
+            address: string;
+            ownerAddress: string;
+            codeHash: Uint8Array;
+        }[];
+    } {
+        throw new Error("Not implemented.");
+    }
+
+    private parseScDeployEvent(event: { topics: Uint8Array[] }): {
         address: string;
         ownerAddress: string;
         codeHash: Uint8Array;
@@ -76,12 +111,34 @@ export class SmartContractTransactionsOutcomeParser {
         };
     }
 
-    parseExecute(options: { transactionOutcome: TransactionOutcome; function?: string }): {
+    parseExecute(
+        options:
+            | { transactionOutcome: TransactionOutcome; function?: string }
+            | { transactionOnNetwork: ITransactionOnNetwork; function?: string },
+    ): {
         values: any[];
         returnCode: string;
         returnMessage: string;
     } {
-        const directCallOutcome = options.transactionOutcome.directSmartContractCallOutcome;
+        if ("transactionOutcome" in options) {
+            return this.parseExecuteGivenTransactionOutcome(options.transactionOutcome, options.function);
+        }
+
+        return this.parseExecuteGivenTransactionOnNetwork(options.transactionOnNetwork, options.function);
+    }
+
+    /**
+     * Legacy approach.
+     */
+    protected parseExecuteGivenTransactionOutcome(
+        transactionOutcome: TransactionOutcome,
+        functionName?: string,
+    ): {
+        values: any[];
+        returnCode: string;
+        returnMessage: string;
+    } {
+        const directCallOutcome = transactionOutcome.directSmartContractCallOutcome;
 
         if (!this.abi) {
             return {
@@ -91,7 +148,7 @@ export class SmartContractTransactionsOutcomeParser {
             };
         }
 
-        const functionName = options.function || directCallOutcome.function;
+        functionName = functionName || directCallOutcome.function;
 
         if (!functionName) {
             throw new Err(
@@ -115,4 +172,15 @@ export class SmartContractTransactionsOutcomeParser {
             returnMessage: legacyTypedBundle.returnMessage,
         };
     }
+
+    protected parseExecuteGivenTransactionOnNetwork(
+        _transactionOnNetwork: ITransactionOnNetwork,
+        _functionName?: string,
+    ): {
+        values: any[];
+        returnCode: string;
+        returnMessage: string;
+    } {
+        throw new Error("Not implemented.");
+    }
 }
diff --git a/src/transactionsOutcomeParsers/tokenManagementTransactionsOutcomeParser.ts b/src/transactionsOutcomeParsers/tokenManagementTransactionsOutcomeParser.ts
index 0702cba6c..fcf78d585 100644
--- a/src/transactionsOutcomeParsers/tokenManagementTransactionsOutcomeParser.ts
+++ b/src/transactionsOutcomeParsers/tokenManagementTransactionsOutcomeParser.ts
@@ -1,45 +1,57 @@
 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 {
     constructor() {}
 
-    parseIssueFungible(transactionOutcome: TransactionOutcome): { tokenIdentifier: string }[] {
-        this.ensureNoError(transactionOutcome.logs.events);
+    parseIssueFungible(transaction: TransactionOutcome | ITransactionOnNetwork): { tokenIdentifier: string }[] {
+        transaction = this.ensureTransactionOutcome(transaction);
 
-        const events = findEventsByIdentifier(transactionOutcome, "issue");
+        this.ensureNoError(transaction.logs.events);
+
+        const events = findEventsByIdentifier(transaction, "issue");
         return events.map((event) => ({ tokenIdentifier: this.extractTokenIdentifier(event) }));
     }
 
-    parseIssueNonFungible(transactionOutcome: TransactionOutcome): { tokenIdentifier: string }[] {
-        this.ensureNoError(transactionOutcome.logs.events);
+    parseIssueNonFungible(transaction: TransactionOutcome | ITransactionOnNetwork): { tokenIdentifier: string }[] {
+        transaction = this.ensureTransactionOutcome(transaction);
+
+        this.ensureNoError(transaction.logs.events);
 
-        const events = findEventsByIdentifier(transactionOutcome, "issueNonFungible");
+        const events = findEventsByIdentifier(transaction, "issueNonFungible");
         return events.map((event) => ({ tokenIdentifier: this.extractTokenIdentifier(event) }));
     }
 
-    parseIssueSemiFungible(transactionOutcome: TransactionOutcome): { tokenIdentifier: string }[] {
-        this.ensureNoError(transactionOutcome.logs.events);
+    parseIssueSemiFungible(transaction: TransactionOutcome | ITransactionOnNetwork): { tokenIdentifier: string }[] {
+        transaction = this.ensureTransactionOutcome(transaction);
+
+        this.ensureNoError(transaction.logs.events);
 
-        const events = findEventsByIdentifier(transactionOutcome, "issueSemiFungible");
+        const events = findEventsByIdentifier(transaction, "issueSemiFungible");
         return events.map((event) => ({ tokenIdentifier: this.extractTokenIdentifier(event) }));
     }
 
-    parseRegisterMetaEsdt(transactionOutcome: TransactionOutcome): { tokenIdentifier: string }[] {
-        this.ensureNoError(transactionOutcome.logs.events);
+    parseRegisterMetaEsdt(transaction: TransactionOutcome | ITransactionOnNetwork): { tokenIdentifier: string }[] {
+        transaction = this.ensureTransactionOutcome(transaction);
 
-        const events = findEventsByIdentifier(transactionOutcome, "registerMetaESDT");
+        this.ensureNoError(transaction.logs.events);
+
+        const events = findEventsByIdentifier(transaction, "registerMetaESDT");
         return events.map((event) => ({ tokenIdentifier: this.extractTokenIdentifier(event) }));
     }
 
     parseRegisterAndSetAllRoles(
-        transactionOutcome: TransactionOutcome,
+        transaction: TransactionOutcome | ITransactionOnNetwork,
     ): { tokenIdentifier: string; roles: string[] }[] {
-        this.ensureNoError(transactionOutcome.logs.events);
-        const registerEvents = findEventsByIdentifier(transactionOutcome, "registerAndSetAllRoles");
-        const setRoleEvents = findEventsByIdentifier(transactionOutcome, "ESDTSetRole");
+        transaction = this.ensureTransactionOutcome(transaction);
+
+        this.ensureNoError(transaction.logs.events);
+        const registerEvents = findEventsByIdentifier(transaction, "registerAndSetAllRoles");
+        const setRoleEvents = findEventsByIdentifier(transaction, "ESDTSetRole");
 
         if (registerEvents.length !== setRoleEvents.length) {
             throw new ErrParseTransactionOutcome(
@@ -55,22 +67,28 @@ export class TokenManagementTransactionsOutcomeParser {
         });
     }
 
-    parseSetBurnRoleGlobally(transactionOutcome: TransactionOutcome) {
-        this.ensureNoError(transactionOutcome.logs.events);
+    parseSetBurnRoleGlobally(transaction: TransactionOutcome | ITransactionOnNetwork) {
+        transaction = this.ensureTransactionOutcome(transaction);
+
+        this.ensureNoError(transaction.logs.events);
     }
 
-    parseUnsetBurnRoleGlobally(transactionOutcome: TransactionOutcome) {
-        this.ensureNoError(transactionOutcome.logs.events);
+    parseUnsetBurnRoleGlobally(transaction: TransactionOutcome | ITransactionOnNetwork) {
+        transaction = this.ensureTransactionOutcome(transaction);
+
+        this.ensureNoError(transaction.logs.events);
     }
 
-    parseSetSpecialRole(transactionOutcome: TransactionOutcome): {
+    parseSetSpecialRole(transaction: TransactionOutcome | ITransactionOnNetwork): {
         userAddress: string;
         tokenIdentifier: string;
         roles: string[];
     }[] {
-        this.ensureNoError(transactionOutcome.logs.events);
+        transaction = this.ensureTransactionOutcome(transaction);
+
+        this.ensureNoError(transaction.logs.events);
 
-        const events = findEventsByIdentifier(transactionOutcome, "ESDTSetRole");
+        const events = findEventsByIdentifier(transaction, "ESDTSetRole");
         return events.map((event) => this.getOutputForSetSpecialRoleEvent(event));
     }
 
@@ -87,14 +105,16 @@ export class TokenManagementTransactionsOutcomeParser {
         return { userAddress: userAddress, tokenIdentifier: tokenIdentifier, roles: roles };
     }
 
-    parseNftCreate(transactionOutcome: TransactionOutcome): {
+    parseNftCreate(transaction: TransactionOutcome | ITransactionOnNetwork): {
         tokenIdentifier: string;
         nonce: bigint;
         initialQuantity: bigint;
     }[] {
-        this.ensureNoError(transactionOutcome.logs.events);
+        transaction = this.ensureTransactionOutcome(transaction);
+
+        this.ensureNoError(transaction.logs.events);
 
-        const events = findEventsByIdentifier(transactionOutcome, "ESDTNFTCreate");
+        const events = findEventsByIdentifier(transaction, "ESDTNFTCreate");
         return events.map((event) => this.getOutputForNftCreateEvent(event));
     }
 
@@ -110,15 +130,17 @@ export class TokenManagementTransactionsOutcomeParser {
         return { tokenIdentifier: tokenIdentifier, nonce: nonce, initialQuantity: amount };
     }
 
-    parseLocalMint(transactionOutcome: TransactionOutcome): {
+    parseLocalMint(transaction: TransactionOutcome | ITransactionOnNetwork): {
         userAddress: string;
         tokenIdentifier: string;
         nonce: bigint;
         mintedSupply: bigint;
     }[] {
-        this.ensureNoError(transactionOutcome.logs.events);
+        transaction = this.ensureTransactionOutcome(transaction);
 
-        const events = findEventsByIdentifier(transactionOutcome, "ESDTLocalMint");
+        this.ensureNoError(transaction.logs.events);
+
+        const events = findEventsByIdentifier(transaction, "ESDTLocalMint");
         return events.map((event) => this.getOutputForLocalMintEvent(event));
     }
 
@@ -141,15 +163,17 @@ export class TokenManagementTransactionsOutcomeParser {
         };
     }
 
-    parseLocalBurn(transactionOutcome: TransactionOutcome): {
+    parseLocalBurn(transaction: TransactionOutcome | ITransactionOnNetwork): {
         userAddress: string;
         tokenIdentifier: string;
         nonce: bigint;
         burntSupply: bigint;
     }[] {
-        this.ensureNoError(transactionOutcome.logs.events);
+        transaction = this.ensureTransactionOutcome(transaction);
+
+        this.ensureNoError(transaction.logs.events);
 
-        const events = findEventsByIdentifier(transactionOutcome, "ESDTLocalBurn");
+        const events = findEventsByIdentifier(transaction, "ESDTLocalBurn");
         return events.map((event) => this.getOutputForLocalBurnEvent(event));
     }
 
@@ -172,29 +196,35 @@ export class TokenManagementTransactionsOutcomeParser {
         };
     }
 
-    parsePause(transactionOutcome: TransactionOutcome): { tokenIdentifier: string }[] {
-        this.ensureNoError(transactionOutcome.logs.events);
+    parsePause(transaction: TransactionOutcome | ITransactionOnNetwork): { tokenIdentifier: string }[] {
+        transaction = this.ensureTransactionOutcome(transaction);
+
+        this.ensureNoError(transaction.logs.events);
 
-        const events = findEventsByIdentifier(transactionOutcome, "ESDTPause");
+        const events = findEventsByIdentifier(transaction, "ESDTPause");
         return events.map((event) => ({ tokenIdentifier: this.extractTokenIdentifier(event) }));
     }
 
-    parseUnpause(transactionOutcome: TransactionOutcome): { tokenIdentifier: string }[] {
-        this.ensureNoError(transactionOutcome.logs.events);
+    parseUnpause(transaction: TransactionOutcome | ITransactionOnNetwork): { tokenIdentifier: string }[] {
+        transaction = this.ensureTransactionOutcome(transaction);
 
-        const events = findEventsByIdentifier(transactionOutcome, "ESDTUnPause");
+        this.ensureNoError(transaction.logs.events);
+
+        const events = findEventsByIdentifier(transaction, "ESDTUnPause");
         return events.map((event) => ({ tokenIdentifier: this.extractTokenIdentifier(event) }));
     }
 
-    parseFreeze(transactionOutcome: TransactionOutcome): {
+    parseFreeze(transaction: TransactionOutcome | ITransactionOnNetwork): {
         userAddress: string;
         tokenIdentifier: string;
         nonce: bigint;
         balance: bigint;
     }[] {
-        this.ensureNoError(transactionOutcome.logs.events);
+        transaction = this.ensureTransactionOutcome(transaction);
+
+        this.ensureNoError(transaction.logs.events);
 
-        const events = findEventsByIdentifier(transactionOutcome, "ESDTFreeze");
+        const events = findEventsByIdentifier(transaction, "ESDTFreeze");
         return events.map((event) => this.getOutputForFreezeEvent(event));
     }
 
@@ -217,15 +247,17 @@ export class TokenManagementTransactionsOutcomeParser {
         };
     }
 
-    parseUnfreeze(transactionOutcome: TransactionOutcome): {
+    parseUnfreeze(transaction: TransactionOutcome | ITransactionOnNetwork): {
         userAddress: string;
         tokenIdentifier: string;
         nonce: bigint;
         balance: bigint;
     }[] {
-        this.ensureNoError(transactionOutcome.logs.events);
+        transaction = this.ensureTransactionOutcome(transaction);
+
+        this.ensureNoError(transaction.logs.events);
 
-        const events = findEventsByIdentifier(transactionOutcome, "ESDTUnFreeze");
+        const events = findEventsByIdentifier(transaction, "ESDTUnFreeze");
         return events.map((event) => this.getOutputForUnfreezeEvent(event));
     }
 
@@ -248,15 +280,17 @@ export class TokenManagementTransactionsOutcomeParser {
         };
     }
 
-    parseWipe(transactionOutcome: TransactionOutcome): {
+    parseWipe(transaction: TransactionOutcome | ITransactionOnNetwork): {
         userAddress: string;
         tokenIdentifier: string;
         nonce: bigint;
         balance: bigint;
     }[] {
-        this.ensureNoError(transactionOutcome.logs.events);
+        transaction = this.ensureTransactionOutcome(transaction);
 
-        const events = findEventsByIdentifier(transactionOutcome, "ESDTWipe");
+        this.ensureNoError(transaction.logs.events);
+
+        const events = findEventsByIdentifier(transaction, "ESDTWipe");
         return events.map((event) => this.getOutputForWipeEvent(event));
     }
 
@@ -279,14 +313,16 @@ export class TokenManagementTransactionsOutcomeParser {
         };
     }
 
-    parseUpdateAttributes(transactionOutcome: TransactionOutcome): {
+    parseUpdateAttributes(transaction: TransactionOutcome | ITransactionOnNetwork): {
         tokenIdentifier: string;
         nonce: bigint;
         attributes: Uint8Array;
     }[] {
-        this.ensureNoError(transactionOutcome.logs.events);
+        transaction = this.ensureTransactionOutcome(transaction);
+
+        this.ensureNoError(transaction.logs.events);
 
-        const events = findEventsByIdentifier(transactionOutcome, "ESDTNFTUpdateAttributes");
+        const events = findEventsByIdentifier(transaction, "ESDTNFTUpdateAttributes");
         return events.map((event) => this.getOutputForUpdateAttributesEvent(event));
     }
 
@@ -306,14 +342,16 @@ export class TokenManagementTransactionsOutcomeParser {
         };
     }
 
-    parseAddQuantity(transactionOutcome: TransactionOutcome): {
+    parseAddQuantity(transaction: TransactionOutcome | ITransactionOnNetwork): {
         tokenIdentifier: string;
         nonce: bigint;
         addedQuantity: bigint;
     }[] {
-        this.ensureNoError(transactionOutcome.logs.events);
+        transaction = this.ensureTransactionOutcome(transaction);
+
+        this.ensureNoError(transaction.logs.events);
 
-        const events = findEventsByIdentifier(transactionOutcome, "ESDTNFTAddQuantity");
+        const events = findEventsByIdentifier(transaction, "ESDTNFTAddQuantity");
         return events.map((event) => this.getOutputForAddQuantityEvent(event));
     }
 
@@ -333,14 +371,16 @@ export class TokenManagementTransactionsOutcomeParser {
         };
     }
 
-    parseBurnQuantity(transactionOutcome: TransactionOutcome): {
+    parseBurnQuantity(transaction: TransactionOutcome | ITransactionOnNetwork): {
         tokenIdentifier: string;
         nonce: bigint;
         burntQuantity: bigint;
     }[] {
-        this.ensureNoError(transactionOutcome.logs.events);
+        transaction = this.ensureTransactionOutcome(transaction);
 
-        const events = findEventsByIdentifier(transactionOutcome, "ESDTNFTBurn");
+        this.ensureNoError(transaction.logs.events);
+
+        const events = findEventsByIdentifier(transaction, "ESDTNFTBurn");
         return events.map((event) => this.getOutputForBurnQuantityEvent(event));
     }
 
@@ -360,6 +400,17 @@ export class TokenManagementTransactionsOutcomeParser {
         };
     }
 
+    /**
+     * Temporary workaround, until "TransactionOnNetwork" completely replaces "TransactionOutcome".
+     */
+    private ensureTransactionOutcome(transaction: TransactionOutcome | ITransactionOnNetwork): TransactionOutcome {
+        if ("hash" in transaction) {
+            return new TransactionsConverter().transactionOnNetworkToOutcome(transaction);
+        }
+
+        return transaction;
+    }
+
     private ensureNoError(transactionEvents: TransactionEvent[]) {
         for (const event of transactionEvents) {
             if (event.identifier == "signalError") {

From 8983762e444298047b89f3a89aecbd3edcbafcd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 8 Oct 2024 13:56:24 +0300
Subject: [PATCH 287/338] Remove tests file, will be added in next PR.

---
 ...tTransactionsOutcomeParser.dev.net.spec.ts | 40 -------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.dev.net.spec.ts

diff --git a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.dev.net.spec.ts b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.dev.net.spec.ts
deleted file mode 100644
index 6eb10aa4f..000000000
--- a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.dev.net.spec.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { assert } from "chai";
-import { TransactionsConverter } from "../converters/transactionsConverter";
-import { createDevnetProvider } from "../testutils/networkProviders";
-import { SmartContractTransactionsOutcomeParser } from "./smartContractTransactionsOutcomeParser";
-
-describe("test smart contract transactions outcome parser on devnet", () => {
-    const networkProvider = createDevnetProvider();
-    const parser = new SmartContractTransactionsOutcomeParser();
-    const transactionsConverter = new TransactionsConverter();
-
-    it("should parse outcome of deploy transactions (1)", async () => {
-        const transactionHash = "5d2ff2af8eb3fe7f2acb7e29c0436854b4c6c44de02878b6afff582888024a55";
-        const transactionOnNetwork = await networkProvider.getTransaction(transactionHash);
-        const transactionOutcome = transactionsConverter.transactionOnNetworkToOutcome(transactionOnNetwork);
-        const parsedGivenTransactionOnNetwork = parser.parseDeploy({ transactionOnNetwork });
-        const parsedGivenTransactionOutcome = parser.parseDeploy({ transactionOutcome });
-
-        assert.deepEqual(parsedGivenTransactionOnNetwork, parsedGivenTransactionOutcome);
-        assert.equal(parsedGivenTransactionOnNetwork.returnCode, "ok");
-        assert.deepEqual(parsedGivenTransactionOnNetwork.contracts, [
-            {
-                address: "erd1qqqqqqqqqqqqqpgqpayq2es08gq8798xhnpr0kzgn7495qt5q6uqd7lpwf",
-                ownerAddress: "erd1tn62hjp72rznp8vq0lplva5csav6rccpqqdungpxtqz0g2hcq6uq9k4cc6",
-                codeHash: Buffer.from("c876625ec34a04445cfd99067777ebe488afdbc6899cd958f4c1d36107ca02d9", "hex"),
-            },
-        ]);
-    });
-
-    it("should parse outcome of deploy transactions (2)", async () => {
-        const transactionHash = "76683e926dad142fc9651afca208487f2a80d327fc87e5c876eec9d028196352";
-        const transactionOnNetwork = await networkProvider.getTransaction(transactionHash);
-        const transactionOutcome = transactionsConverter.transactionOnNetworkToOutcome(transactionOnNetwork);
-        const parsedGivenTransactionOnNetwork = parser.parseDeploy({ transactionOnNetwork });
-        const parsedGivenTransactionOutcome = parser.parseDeploy({ transactionOutcome });
-
-        assert.deepEqual(parsedGivenTransactionOnNetwork, parsedGivenTransactionOutcome);
-        assert.equal(parsedGivenTransactionOnNetwork.returnCode, "execution failed");
-        assert.lengthOf(parsedGivenTransactionOnNetwork.contracts, 0);
-    });
-});

From 3bfd41802cb8a311d0aea205d4ccd6b9dc7a388f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 8 Oct 2024 14:42:52 +0300
Subject: [PATCH 288/338] Recover return data of smart contract (new
 implementation).

---
 src/interfaceOfNetwork.ts                     |     1 +
 src/smartcontracts/resultsParser.spec.ts      |    62 +-
 src/smartcontracts/resultsParser.ts           |    23 +-
 src/testdata/README.md                        |   111 +
 src/testdata/transactions.mainnet.json        | 11510 ++++++++++++++++
 ...tTransactionsOutcomeParser.dev.net.spec.ts |   102 +
 ...TransactionsOutcomeParser.main.net.spec.ts |   136 +
 .../smartContractTransactionsOutcomeParser.ts |   220 +-
 8 files changed, 12098 insertions(+), 67 deletions(-)
 create mode 100644 src/testdata/README.md
 create mode 100644 src/testdata/transactions.mainnet.json
 create mode 100644 src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.dev.net.spec.ts
 create mode 100644 src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.main.net.spec.ts

diff --git a/src/interfaceOfNetwork.ts b/src/interfaceOfNetwork.ts
index 526744239..eaee206aa 100644
--- a/src/interfaceOfNetwork.ts
+++ b/src/interfaceOfNetwork.ts
@@ -53,6 +53,7 @@ export interface IContractResultItem {
     data: string;
     returnMessage: string;
     logs: ITransactionLogs;
+    previousHash?: string;
 }
 
 export interface IContractQueryResponse {
diff --git a/src/smartcontracts/resultsParser.spec.ts b/src/smartcontracts/resultsParser.spec.ts
index c08bc885b..c21234d1c 100644
--- a/src/smartcontracts/resultsParser.spec.ts
+++ b/src/smartcontracts/resultsParser.spec.ts
@@ -1,21 +1,17 @@
+import BigNumber from "bignumber.js";
+import { assert } from "chai";
+import { Address } from "../address";
+import { IAddress } from "../interface";
 import {
     ContractQueryResponse,
     ContractResultItem,
     ContractResults,
+    TransactionEventData,
     TransactionEventOnNetwork,
     TransactionEventTopic,
     TransactionLogsOnNetwork,
     TransactionOnNetwork,
-    TransactionEventData,
 } from "../networkProviders";
-import BigNumber from "bignumber.js";
-import { assert } from "chai";
-import * as fs from "fs";
-import path from "path";
-import { Address } from "../address";
-import { IAddress } from "../interface";
-import { ITransactionOnNetwork } from "../interfaceOfNetwork";
-import { LogLevel, Logger } from "../logger";
 import { loadAbiRegistry } from "../testutils";
 import { ArgSerializer } from "./argSerializer";
 import { ResultsParser } from "./resultsParser";
@@ -258,10 +254,7 @@ describe("test smart contract results parser", () => {
 
         let bundle = parser.parseUntypedOutcome(transaction);
         assert.deepEqual(bundle.returnCode, ReturnCode.Ok);
-        assert.equal(
-            bundle.returnMessage,
-            "@too much gas provided for processing: gas provided = 596384500, gas used = 733010",
-        );
+        assert.equal(bundle.returnMessage, "ok");
         assert.deepEqual(bundle.values, []);
     });
 
@@ -383,47 +376,4 @@ describe("test smart contract results parser", () => {
         assert.deepEqual(bundle.b, new BigNumber(43));
         assert.deepEqual(bundle.c, new BigNumber(44));
     });
-
-    // This test should be enabled manually and run against a set of sample transactions.
-    // 2022-04-03: test ran against ~1800 transactions sampled from devnet.
-    it.skip("should parse real-world contract outcomes", async () => {
-        let oldLogLevel = Logger.logLevel;
-        Logger.setLevel(LogLevel.Trace);
-
-        let folder = path.resolve(process.env["SAMPLES"] || "SAMPLES");
-        let samples = loadRealWorldSamples(folder);
-
-        for (const [transaction, _] of samples) {
-            console.log("Transaction:", transaction.hash.toString());
-
-            let bundle = parser.parseUntypedOutcome(transaction);
-
-            console.log("Return code:", bundle.returnCode.toString());
-            console.log("Return message:", bundle.returnMessage);
-            console.log("Num values:", bundle.values.length);
-            console.log("=".repeat(80));
-
-            assert.include(KnownReturnCodes, bundle.returnCode.valueOf());
-        }
-
-        Logger.setLevel(oldLogLevel);
-    });
-
-    function loadRealWorldSamples(folder: string): [ITransactionOnNetwork, string][] {
-        let transactionFiles = fs.readdirSync(folder);
-        let samples: [ITransactionOnNetwork, string][] = [];
-
-        for (const file of transactionFiles) {
-            let txHash = path.basename(file, ".json");
-            let filePath = path.resolve(folder, file);
-            let jsonContent: string = fs.readFileSync(filePath, { encoding: "utf8" });
-            let json = JSON.parse(jsonContent);
-            let payload = json["data"]["transaction"];
-            let transaction = TransactionOnNetwork.fromProxyHttpResponse(txHash, payload);
-
-            samples.push([transaction, jsonContent]);
-        }
-
-        return samples;
-    }
 });
diff --git a/src/smartcontracts/resultsParser.ts b/src/smartcontracts/resultsParser.ts
index a1bae4c46..4b4d71860 100644
--- a/src/smartcontracts/resultsParser.ts
+++ b/src/smartcontracts/resultsParser.ts
@@ -284,12 +284,10 @@ export class ResultsParser {
         }
 
         let { returnCode, returnDataParts } = this.sliceDataFieldInParts(eventTooMuchGas.data);
-        let lastTopic = eventTooMuchGas.getLastTopic();
-        let returnMessage = lastTopic?.toString() || returnCode.toString();
 
         return {
             returnCode: returnCode,
-            returnMessage: returnMessage,
+            returnMessage: returnCode.toString(),
             values: returnDataParts,
         };
     }
@@ -355,6 +353,25 @@ export class ResultsParser {
             }
         }
 
+        // Additional fallback heuristics (alter search constraints):
+        for (const resultItem of transaction.contractResults.items) {
+            let writeLogWithReturnData = resultItem.logs.findSingleOrNoneEvent(WellKnownEvents.OnWriteLog, (event) => {
+                const addressIsContract = event.address.bech32() == contractAddress.toBech32();
+                return addressIsContract;
+            });
+
+            if (writeLogWithReturnData) {
+                const { returnCode, returnDataParts } = this.sliceDataFieldInParts(writeLogWithReturnData.data);
+                const returnMessage = returnCode.toString();
+
+                return {
+                    returnCode: returnCode,
+                    returnMessage: returnMessage,
+                    values: returnDataParts,
+                };
+            }
+        }
+
         return null;
     }
 
diff --git a/src/testdata/README.md b/src/testdata/README.md
new file mode 100644
index 000000000..c714d3916
--- /dev/null
+++ b/src/testdata/README.md
@@ -0,0 +1,111 @@
+# Testdata
+
+## Files `transactions_N.mainnet.json`
+
+Transactions were sampled from the mainnet BigQuery dataset:
+
+```sql
+DECLARE
+  TIMESTAMP_START DATE DEFAULT '2024-09-01';
+DECLARE
+  TIMESTAMP_END DATE DEFAULT '2024-09-03';
+  -- Contract execute, with success
+  (
+  SELECT
+    `_id`,
+    'execute_success' `kind`
+  FROM
+    `multiversx-blockchain-etl.crypto_multiversx_mainnet_eu.transactions`
+  WHERE
+    DATE(`timestamp`) >= TIMESTAMP_START
+    AND DATE(`timestamp`) <= TIMESTAMP_END
+    AND `isScCall` = TRUE
+    AND ARRAY_LENGTH(`esdtValues`) = 0
+    AND `status` = 'success'
+    AND RAND() < 0.25
+  LIMIT
+    250 )
+UNION ALL
+  -- Contract execute, with error
+  (
+  SELECT
+    `_id`,
+    'execute_error' `kind`
+  FROM
+    `multiversx-blockchain-etl.crypto_multiversx_mainnet_eu.transactions`
+  WHERE
+    DATE(`timestamp`) >= TIMESTAMP_START
+    AND DATE(`timestamp`) <= TIMESTAMP_END
+    AND `isScCall` = TRUE
+    AND ARRAY_LENGTH(`esdtValues`) = 0
+    AND `status` = 'fail'
+    AND RAND() < 0.25
+  LIMIT
+    250 )
+UNION ALL
+  -- Contract transfer & execute, with success
+  (
+  SELECT
+    `_id`,
+    'transfer_execute_success' `kind`
+  FROM
+    `multiversx-blockchain-etl.crypto_multiversx_mainnet_eu.transactions`
+  WHERE
+    DATE(`timestamp`) >= TIMESTAMP_START
+    AND DATE(`timestamp`) <= TIMESTAMP_END
+    AND `isScCall` = TRUE
+    AND ARRAY_LENGTH(`esdtValues`) > 0
+    AND `status` = 'success'
+    AND RAND() < 0.25
+  LIMIT
+    250 )
+UNION ALL
+  -- Contract transfer & execute, with error
+  (
+  SELECT
+    `_id`,
+    'transfer_execute_error' `kind`
+  FROM
+    `multiversx-blockchain-etl.crypto_multiversx_mainnet_eu.transactions`
+  WHERE
+    DATE(`timestamp`) >= TIMESTAMP_START
+    AND DATE(`timestamp`) <= TIMESTAMP_END
+    AND `isScCall` = TRUE
+    AND ARRAY_LENGTH(`esdtValues`) > 0
+    AND `status` = 'fail'
+    AND RAND() < 0.25
+  LIMIT
+    250)
+UNION ALL
+  -- Relayed, with success
+  (
+  SELECT
+    `_id`,
+    'relayed_success' `kind`
+  FROM
+    `multiversx-blockchain-etl.crypto_multiversx_mainnet_eu.transactions`
+  WHERE
+    DATE(`timestamp`) >= TIMESTAMP_START
+    AND DATE(`timestamp`) <= TIMESTAMP_END
+    AND `isRelayed` = TRUE
+    AND `status` = 'success'
+    AND RAND() < 0.25
+  LIMIT
+    50)
+UNION ALL
+  -- Relayed, with failure
+  (
+  SELECT
+    `_id`,
+    'relayed_error' `kind`
+  FROM
+    `multiversx-blockchain-etl.crypto_multiversx_mainnet_eu.transactions`
+  WHERE
+    DATE(`timestamp`) >= TIMESTAMP_START
+    AND DATE(`timestamp`) <= TIMESTAMP_END
+    AND `isRelayed` = TRUE
+    AND `status` = 'fail'
+    AND RAND() < 0.25
+  LIMIT
+    50)
+```
diff --git a/src/testdata/transactions.mainnet.json b/src/testdata/transactions.mainnet.json
new file mode 100644
index 000000000..d9c324e4e
--- /dev/null
+++ b/src/testdata/transactions.mainnet.json
@@ -0,0 +1,11510 @@
+[
+    {
+        "hash": "5ccad2b5a95d0b74ec32f5fc9f8978ceb1b2d0fce4fb936ba6f50c384b6adbbe",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "b7bcdee4d2df0b59ce111ad31c9434dcd710b5fac62834f0a560e30d0f6c121d",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "e952ce801d2d0474ab3e8d488bcb4b4be7cd00c7127c993bcfe82dd5c4a2ae44",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "dda6e3d9b351f81978f97182c525eb0022ca1fb1f902e0c748ac847a65bfd1e3",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "1bee7f5224ac0f16b639bee88be9724b8cd1fc6f54b733dbc5d9dfc47ea77afa",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "8dc4453a333417ec4ecd4f4ca7832b8efd18058d0b9b2e5e364b51e7e5684ee9",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "8a4aa6072725f7d7a9e37a3e971204c39e5ea4d4e1a6c699856d0903ba26cdd3",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "2852edc27664b24e7fa3aed9bdad1ebb4838860ee02be6bdce9014443b3b244d",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "85908022aae1d915a05676c772d1ed5c25b4d310f3ee98903f42856582cc41fc",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "66db5ab89ccf7e73ada98c69c979f1f533c89ae929fc2b666d75097a27a0221e",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "1876dea546cf58ae7b6223fd51e215475191a586691d57f222754a6a9847642c",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "8222625f24273eb8f2aa0d751ac3aa10040f71fdb7b4f2bfdb8a7a10ef258def",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "f349af0924b762ae41d71a918ceba96b4736925437e40248ec569d6a494654aa",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "e6e68d07d2fa11b9d968e30d128ed85364b169ed6ad500ef7ed1f269dbc44d24",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "f36ce71ef2374bb79a3766bd4e5216666ee23443d619a09dd6586833bd5d2500",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "d8009977c564604462089922267c3feeb8b5994759e16fd9d8b1a8b11053b717",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "421edabd3d17e7e6100c0881129a6aa4258b8e50ffbffb08a50d741be25d7ffd",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "d95f492e99f4c87e355349dee2ed03f0f9089f4bc42c90a7a5b1e4e96c236d5e",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "2994b9d41461d9e69531126be1b31e4d13109d05858ba19a9444d79d02479d0d",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "7d804aebc33026e77ed243c89a4a8557b69991769e07985fe07535d4747351fc",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "27069fdfa81c724568d56527c8ce90c4637e26df9227a1463c8ac4de4deac27e",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "be9e050c351e3799826d7df39f3c2322fcd62cf748c78c91accc63b360bf759d",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "327a7571d06aab65e598e4f6bf12627a50121d5aee36d787255a689ab2553fbc",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "01e6ece6c6944234dd4daba1a5f305ca938ee95b07ecdc926aabe07d269d8874",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "895fb3848c3fd67c8d6833d1fd6fe026896aa091d2296e7f38bf108c380723c4",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "6b54f879d8bbfaa56a4381e7fb934e2214fd5b09d581268252612bd8a0a198a4",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "ccd2d86e515ab9ee8e213e49f50a3ff2142d736f1669bcfbd17eebadb02edc0f",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "3b23eb988e438baecf709cd0ed2a8bbf944f7f24d3e5542693cd3dcc9cfa6c27",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "823756ea813d7d8da01a263c7791398459f0fc954b5b4fd2b19fc12f8cda546b",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "dfe82a3e4870eefd5c5f9174539ebdf3847668aae4d56a8b4c6577c6ae6c7eda",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "786d37562ea7c75ecefc6d006651ba700405eda382ae68f0d15345b342ada647",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "377ebc87b837c34ac397358be3ab44fdd8d1f013ceadfda8dfca1d3a6833be95",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "7550855629b61c1f8299f4bd9add1c382a63dfdd71fa66c99d71c6ebc7f762aa",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "19ffc5ad0538480d4ae44e80a9f84aaed3835181da4732a3c4315c55ffc38c57",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "3091da9934afc22c3fc0998eb4cf54017e58a574acb0333095c86efcf843dc20",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "a4d6effc8d86df4834add82283cbb862037863bedabf6fb443bc4ba3ad912dbb",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "c1e96a041180cf3b56ba357856cb6e7c31e551e17fb44693d66d177f662ccebe",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "79fa9572ace90b58f8b91713b2b565d1c6dbf63d2fc018a7bf843bb464f9d789",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "0579365f030845e6e2fd5cdaa119488c1eeae9933def91c058be15cc2bbb78d2",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "ab211f6ad844f55e624bb21da5f5d1bcb79664c92feccb25c5cfd0bafa5894db",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "968560eba192e06591caaf2c7e9c3f7a7a80f1c890e9a80e886f3477150faddd",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "f827fc6ff7ef72210a94091f728e8b6dd65498fd4de59a2caab00bd2ab1f15a3",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "5e384449d9e91c16288a22edb61dcc28038bebd3356bfddae4b3c77052151ac7",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "a451b2ce0bc059f041179f349c6787d6bab88118166e5d3b7b00be26edaf977e",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "85a9aa117cc77e17c32dea058cf3474400dc5f885d8057022804666f9987e41d",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "b2079bb405ecac2a13be00b49bad0520f9af1c326450985de415fe96f5c12f7e",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "0e016460a656d8e79af5d771d9f50db72c3218afe9991f38fff29e62d2722490",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "709ff4c01562ba87080c5b0e31aade1ba6377c863a4f5c90a7999cf641e17a0f",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "dcb12b9ef74fed99ab64df357dfeb41951d40fa2e7bfe89c42dd320ac80756f8",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "c2f751f7e1cc324dbde61c26bf07b0ee307c82fb56af157f0290a863dae32d79",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "c5fb5387780860114702fc1eb09d4a3d01a992bffac42864be431402750b398e",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "2ec6b6b4d9e14e0381c998e59b6e82b9965d9aeb71fc7f0a2f5a1703e1aabdbe",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "61869bd85187ff81ab5459ca66571057415b449d6807a6a34a4fda0694fb59af",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "a3a2d0c8bf7066b55a1d0217d843af3200fd57dba01327cf492d5eeb3c0d5015",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "5b8f1687a363af85cc217919458c67a01275958c09e75e61f2a126aaec5a09bc",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "736ab5709a97e05c85c6d238dbaadc2b76ea5cf1fe81aa3d557135eb0533e2f5",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "90f74bac6aac332114289f58bfe4187e7a6a795673e4c98734c1d40c22bfe146",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "ed9750f814027e1124c0407dbd4c6184b6b966c56813a0e3e71b5afd8375a4f3",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "05d02ee4123bffab1617fa37d161f4f599379b78dcbb868c1d5d741a5b5d9c41",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "df355a84f0fef2820de20a8098ee319413b710cfaa87c035d2700c3994b2133f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c81f233c71d0b4a821b4b171b1cb870707985ebcf49235e1883b1a5a770ec686",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "66d2e456aeb5555bb73ac99ca49fb1c44cda1fdfe1e94e9c7e834cd841cdec27",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7946d09309a20aa13914e25c67f93467aa8f9d31eba8447d9b1271ac1ed7d41a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d879137dc12776f2a83c720679d40e9b16b2efbeef80e2eba64dcec99875e9fe",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e8504b0aec16a9709bb88ea7685115e603eef77eecab410d4f3ae9197ea3f0b0",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0298cd40356b04f972e83142daae17272319043a559c8a5e91b1c526488fa677",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0dcdb1186898cc292bd7e9931dd2053b9f7001ffb4c334ef90719de7881bbd0a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4cd8ebc2a540a70da6fdf6361db0ec0d99629ad5d228f5107a1d1693fd877397",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "1537a3655ede964220e98f20d9491db7ef8dca9c329e51b8512c912af4f9e329",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "59d90307f08674f86d7976f4e5b7cd8dd64d3f0a829224b82546ff4297a16d52",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f98dd1c9f50c88949d8f3a5eb3b301c4dd0ff096a938e09cbe709c10317dc7b7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8f5463d3a7742e0bd091a68e788bb021e0fd571c3290fd27db02ab23836f31df",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "eb09c718e216b735a82aaf66e7b1bac5388ba18a38e28dd9f9cbd23f2be6cbb8",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "97d7af39f5552e734c846317ff490eaf0fe8d3076a14f3616450ab383883ac42",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "71d630caefa5f3a8a6702a074f154de931fbd0f1168a617a67cb5a569eead774",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b6f919d9376c630ee566a14ea147c4de93abd53b1bad03ca094657fb78ba9b70",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9e1a98ff735ca9a4ff5899d04366a099a3100313a28a2524bb8210a71d82d059",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "489dacbed71679447924ddccb616bd147028685f6de9b66feb602127455c5073",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "050c26f02fa1fc5ba977259804afc1739805488d9a49e3c97469cc01758109b9",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "264a2db992f4950ef62712c25c41fca45a16bf178e1123cb173358fcb82d6a65",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d4a092aca9778199ce50beb17426a54671132a8bc080a4cb1b544d5b38671b8c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c2319e7f867c523a09ee3364f7c4ea682fe05881f8199ef329d3f1ae95a0d224",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "36e9b824a39ffa2a8071ba068693f44d5516bd40aaf76ad3fce515899e259925",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e7fd32ed847712e25a32255adb32aab172e96de2a48c2c5a36704b826e895544",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a7fb4b4c1402385b5a312b930c53477de5178dff1661e6a52ca62c286dc3219c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b84aa2c8b83591318633999748238e0c0067193b96d569defeb63254d6c058e1",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "99a4aa636ce915fc8e646ba7f5ec582278dd6017a0734278ca51db6fac145538",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "08052d156ddeefa4312ed3d35dd3062ed3a8521faeedcfbe834061871fa19e42",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f9b1544d282742555f6daae5886e16885241115d327ee8af6c6cba16e3af55a4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "871312e21580ad02f3447cbf8a19341572914144009edd54822983c482b53970",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f96eae1671492a291f3876128cdc4616833a985d0a9d6f3e08a2a561aa31dc58",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "fdeb014c94eb5fa68e33ea7a802bc8a7c771358a2193419bad7fa1ede382fd16",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "558b1817151cf11e64ee89f9158612339680dd17a01c22610dbf05367e2083f7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f992e1b9c35a4349a2edaf12b3055984a0fa05df9c153afe52c61b7a157fc5f8",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6100efb2212f8ef6e97d59b8deaeb697cb507705caf2f47e9ec736e2da79f447",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "577880cda0d0ae0ff2cf7ce4c14ef945e2a8d2c0752586ab002860c029800dfd",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "44117630865f6f2020ba6977740dd6b3950021350e7e2d27a0c9428cb1156667",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c6c47982db3e2fc67b7a08376b50478f50547b7a9cc391340eb431eac42e218d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0fb257ee30145a5108d4691121865024b33909eb4c3a5ce8fc35aed41b0048d4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b8bbf613060e33a7bfafdc46eba194245134943166ab61c2269509b78d94f4e1",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "aa7d589795f5cf700b02088b213d18d11b9e2b08b58d81a03de0c8c8da2e898b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c3bb799583f748b29a05fd8e4ba5164402790c2b4a54b0edc8139ad7e61f4100",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "dae0ea75692390df4fa719946b4e29b61716db645a7f2b14f58052b2212414dd",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "85e28df306f09b2f0f2107bb0d9bf75915770deeeb2feaeb5216087f49e2879e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "883d6de36abaaaf6fbc568c1228ddf83f59c2752bfc203871570a6db11a39df2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0054c8aed9ab0903f531fa8f57a9d0ed60e9bd96feff2bd1e5c7507b1082a986",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e5b9a2c933f14f75cb6068ce1e16fe8022373d51d60544adeac1dc5215f5d4a7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2e18cb508d180e382e9cf89db4b284586cdc4c6df1e0c1c0e8ba9879ca2e7592",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "1d82c617af5df1684918d29b004d8efc497e66eed03f8bb5ea68c4854e568ee8",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "25db8124e9ab999b11e3d181d6e6c3dea6a457ef1c95e54b311cbd17fabb22cf",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7bf6b69b8e49f219ceca45bba2584a89f357ed1478a935a08037a4fc30bc96ac",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "aa7809c8751a865b9218faa4def5ad602798f348fd2209748589d7dbd342ecdf",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e2aff82d1c25ce322f17a3544b186b1d3bc2fe4604d24c1286d37a3ea76467b9",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f9d8881677b9e287ff0b4c614500e6dcd757d46f19cd993687410f91b7159c8b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "97d7a3cc1a0e935cf1cb6205fbf850022d6c508f2a02b8312700ae6965c8967b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f310ab9e1abf9ff496d9fcbb0d74fffae6fe97343a32ef1faced427e93c5b4a2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "09e2111598e60c423eb773bf1f6f830449c663ee152bd27962f48cbb036d87eb",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e8bb0cd81a1207a983c2ae132ca522b80600754ffa3db0d68149519e672d1789",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "934919f3982800b536cac32ec9f4358f2ab3b96784cebab16de315c2956e8147",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2bc90cd54fcee644b7d9bbbceb5c0bd9337b3f1b7c40b3a335a2beb21c7efa32",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9d2b077e5e91122513de302cd9fc82c5e59acba35df805da93d64023091196d9",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "40e535f38bb641405c1d8a044ff7d8dcce55cb66285e19df34e895e609e330ee",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "efd86c0a5ac69f7d5f8d8ac4b12de573d78455ac24b190116ba27fc73a56400f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d03159f9f5dad1f33915643c0a9ea129b805276bb8647c10b12a29308a833f57",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "66d1b065ec9c11918b38ec0a3e1be13ab6313fe0ddb2c13e7b76b224f4751e45",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c6db408ed5b3d5498bc18185a72a780db3422dd579302ce3d759f9a642c1e169",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "55bf6b07dcf07dd13e88a5da72ce7d4c966870085a7a90bd3da8dc6ce0415596",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c20a9b6c8ca59a65f056fdcdeff95d6d3e6e9c1e8e26742c05ab45db64b3f3d4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7c0f5b11b6ffd60446b29408820a1acf05a2774a713a8e1a84f587656458608b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "89b9f4f810bf62ec68696e76ad800dbf1b656f5e06e0fd57cdc869458c0c07c7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a774fa9f0339996dce7b926ef6b99230925cd5d43c7764e6c55726ff4544fc1f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "30d08ae0e622b0ad8581ded0ef7accc761829942f5aa1388ed98f6dacb4634f7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "93a381a52651db2dca06d2375f372b43e39b35425705be1b07d4ec406849f7ae",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "75a776f2ce9b5bc06fa35883b5f7b215cb778fcd9bdaf9273edf356f7dea7832",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5e63e64c164f4994e0506a283f0f481fa169a58b42af231b6650f7a7f271bc35",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6322434de883c5f6a6148a99ef866aaa60741d386abc62c77d3441996fc6f6ce",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4243dc52bf975cc2c477de21949032dda8635df16c88929ca7492ea06bec4996",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3ecf0796ac753f4ae58dd6224537d3d4357aad0fd0e277681b6d75592cb0f53a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5594933ad3f50f3ab6cdd2a5f20cd7f01ce2f27d5dc323a33fd445be18f69308",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a3778ca41953ac4ce9cc0d7e391ecafdf4a3968aa9edda8800c33597d020e050",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6296b2ebe340bababe8a21548c0abb9bb0b440f6ad0a97cb7a01f25ffa146de4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "196528c1dc81c1cb38128b2dfea6701df5a2f755643ffae8a4f83ccc6963da75",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "beedc1ebb613b4a33fac570c66ffb0a48e5f1f48fd1c5e94d8f84312d86dd3b1",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "550bece89970c7d5bd7c197260e10dcb0bac2014d9958f9259f3ebbd10f48d9f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "88a472717fd1e550bec59cb2b58cf4bbdcf5cc0efe3c3207caded4b5f11974f2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "37b40959b10551597fdbc4656f6c3d948e6748fba4e8c1d4e9306fea7992ffaf",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c97ca0d0d2770bc076b7c02524464a0aac69d7f1e45063d5b99530faba117402",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "539605febc0acad1a987805e745150e58d20db782677f49a2d159ed30b0a0dc6",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "368582f02384ecd737fd993933ea428d267aa6d7f48947378c1d147f95321b3d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a20533a13e2a77be0f37335fd67c7c0b65339a94ba6ae6ec99797e91ab301204",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6c434acf2965909e6a2d2765875b88c381e7ae879b46a2027fd1ddc6b8ea40ff",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6dce78c1310b8957082a9818832b22f81e48bcf31e27d71860b319b57840125b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f7d541524c7d2cd746ed6ba0a35c27ac3fcfa7ca46504819e391cd677c284ad4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8cdfbf690a89183068e097cbb9d299c0e37bcfa7d86beec4e8c515e0bc7e2352",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ea3faf33db6ae940791d543141df4764cd842b18910006f33cf3d56293f1b738",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "525d3b777290f62e720dadb555e4f77de33110359b039f0faeab6e69b89bebdd",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c8a28615b7f3c26df372263f0fc636ff353097018cb78d51df08c9a2e6bb1f1a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "30f9d652834566e2e441e8d406aed60020508e5e31e33c2677eb169d1de6a044",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5d312838ba9e91031c786076d71624afdfcb4f454721212595658ca09b59af1a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "da41dff31fc227261477e7c545c15a28b131609ab0b48ee3a4a5a2a1e44562cf",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c685619229b34b288151de6c6e83b98300687c5f76f2dd3e0a922b452271a3cd",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "061460dcae19402e63b51d56190201b15e9da27d0f91673e74c7dfc9abea3dad",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0fc56543ed48ba54948f5e0e1ff27ea3e74fe807ecd8a8b8bd57829f39df5993",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3b55b2a242488d830cb5cb01efb8337bda79d6e680f2c5db9f03d0ac1803be19",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "14381f1759dd64398128c8b6bb625b8ea0d77c08143c6e2594331f5df030dd3b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d028d2fbb155efcd0e7533bc5a605c65c77aaffbf16154d280592ad97cb954c2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8e3f6e05f43ee2f0232708fcaa315e5d6cb45f191c7ccc6f53db7851342d461b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "938cec69c96bc4ef03b4d7bf206d0e39a060691a08ff1e496e1d0719d7e75934",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "96fb964e3b4249c89b3004a4fc9fbddd2e913e92b47ca3672804ec144668f25f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "79d46371c06bb02d1e72149a55fec471b8e0e214236f072c882d4dadb54a1bba",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "747243ef5886ef56d156e8a134605852b020fe7337259405daffaba1ca4d7009",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "988d6efa4d203fba24591542025f52c8c9cafdbd7bdbff57efed19b2d77746c8",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "368ccab5ab37af36d9e8b405b14894bf36c33d56a573e853e1028b913ebb09d9",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "44ca5b8a6bfe25477a0663f452711c70cd2a66729f359694ad06ed12312768ab",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e676063e93a0bfc16d0cde231e9b9228246139541e060fee92c7519071e1e0b5",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0b7cc1d85c2c8002e0f467cfb2251219d825d1605027d87deca5cb90bfb153e9",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c723402a7752b312721ba31c7ef79bb2d075f0686dde15aadb121475373133a8",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "cb8e4434d67de3d5e511057ac1607acaf1e101b55be88ee5747f684afb833b42",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9f0ae1b5d5701a823fb4f46492d2728a8542e863be3ded324c38caf8fdcc836f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0d94c1ee18a11c7d00407b212ad5b685f484e034fdba6fe4dd1439e4c3f49245",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6493e04efeceba3f865ab7986752d2a3678586cac80f6f220b5e8e24d4b899d8",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "04243c91e30e706b14f4256f8d603df65e21e38b7a7108887e9a02144f1a4160",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6ba733693fc546e457c9e7ee17a12f980f76e3454bbb4658c7bb711bde1d9922",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "14591144b949cb17ae7a2955a8629fe6cd95631c52b15ba6dc9cdf8cccfad546",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "94eecf7c26df6f96db76e3eafdd1b10efd9d8d75a2a53ac7ba869a72ce3cceb5",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "1d18dd7854d4b66dd121044b94d148880998468cfbe9c3597526b1eebf7e90b1",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "68783f007de1288f2a7d01ea93fc20b60d66f9c61acbdd912627d91622247b11",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "96e9e11bf3b5ff3199f7841750bc5bc2666e809f37409eb7fd24d8fd89c8f2b0",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2d0a9d2fc9f41e3030afbecf50225cd1002a2846ab2b3edbbde62623656f8656",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5c818db2a110384bc3fe7c8f02e4c6bd85104682a08085c88e8cdb148b61f64c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "73c43df4f93c60beb7b2152e3ccd2fbd3c801776b95642cee5eb00704065a4aa",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d3a11b79f07ff1fdacb2515e47bb1e1978c8838d9716cace1ceda6f708948043",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "02b5de381f24a3cedf3571793cf125be1f28b3ecf6952b6bcc9a3de26251bd1a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8043bca630df9806e675f3357967c5a66cbffaded2c42bbbcb27bdb327614d11",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5f4ac430090265af02d4abb9d609e37579f639db175eabb9e562035972af888f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b506abffe92dc1f82cefe0e839ee6f6e2977f0e7e174e2efe17e8b03d2f20a6a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e1bc61d443caca9aacb7a8fa73fc2baa7b9ee173cecf2772d91f2a4d1d15d62c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0d5920e66f95cf80ea649c7eb905595cd459b522e4a731a81f3778dcc625a5fc",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "49fb4683ed4d5697fc95c4d3eb6f73954b971a31f50dd62b67cfa8f65aaea3cf",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d9bfb8473202b21930ef78a750a2ecc2a556da07a07835d14d1edf916ada6ab5",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "dd00aa4b7cfe84e9bcd539a68029b8dabf72257234e84838077f7ec82be19eb3",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "623b9f4a60c9e165eb59d145aed491ada56d3bd0e7df84ed6060f5b0b89dd6be",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f7a244b39ee18f6c7049d1c5580cd6c0cc0cbdf00fa7d1cb16cad52c84a172bc",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "53667aa3bd11d3119796f0a72c83db0bec3c3e52c1cc58b15530bfe2caaa5c0a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "97cbe9954d3b5f1a785edd4c776f51742f7cab05b5d9dc396c67e35bb5f7100d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8ce3d7238216a55a8c22045e5bf7c6cca433ba36336fec50eafd09f547c43189",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "eaba5cc31802c73d7c6be17d7dcb3d36231e24d7268e078f40963dfa2693a7d7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "62f25df0decc99a8f27c8b7f0a9d409d44f0d4b79f671ffdb5edbcc16e9abc5b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b9ae7a58db5a1877dd13cb5518693d59626fd229b5f9fdadfd71d86df870f5b4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2fdb7ada51d3d0c19eec9acb3a41dc0855118a7364eb515f4c518c019b676226",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0d67eefba8e91cbc5e06965d440796e213d706d8e87d176c9f8e9b3e1a8ae84c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3cc38f9d15bad8d9bf3c7036d2c323e6a219ef8cf6ba246ea4600fa446306321",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "bde8f6ab6ddeeea13962e44662161450aca1303affe69d24c2c6ccd744fa3ec9",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "765525cbc346fbf5d5c8ffd208ebebbc7233f514b31f5a92cef0c860906e44fb",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e0a05eee524c06b45e36950193cbef87baab916d21062b8d6ef09dac0a89230d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6af63ae99528e63067b416b5d58c84541d51266663ef335cfb6a1646fc72e312",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c05a78eb16ffe377228ffd44dfd3aa5357baa7e02a9c54c1f2cc8629917c91e7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3406f088c81b4a108ad073bc981fb3846abc1a67f86f09923ce52bd2efd66ae4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a2e81319f8fda76f751626c79de31009e8174b84283b9bd44237d0b2ca7aea1a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2afca49a9033308ea789c04c5fae1876d78fda05d6a4b036406f47fd7bf17bc2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4caba37a7298ef3be05c50b670fa7ca896c96ba7eabaf6c57e23b67f0238841b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "48cb95f33d37ef4f3dd134ff2bd62203f084726085751a51f9557a2ae561f923",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "95860bba0ec07b3b41684ad631ede9fa1353d194cebcc49dbfbe06f9a0538263",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2bacfe1b9c24632c807a0f3e6059647e70f00540199ef4d83543784c0e3a35fc",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4f9ebfb705fe37a093f1a8686df72d8d9032f0afa0118ba068efa38d408d700e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "408073b6a16d8d2a72571469df944748e39be3c058f110b5ef1ee28d28857162",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6413d9789e4b98823708a99fe6b269a8c706618bbc22837940f8bfd800efde29",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "77c80df106655a90dda9bec4b5f4918d2a310b7d983c66a2ab107b9c58e13ce7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "bcb09c36cf86e208900a1726df7c98f337fc4a3e534d04ccaeaaa696f4c4916e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d1be37a7d3315c69cfb903ba95b4dffee6162ab6195c4c05302080f4f475fd45",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "729dbfd40643e7d08929923d84751f3decd5132e553eebfa04d9fb29bf3a1b48",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4103a2d1fe01f69150d9e8c0abbfab07beefee25bc86d28eee548a34eb624e34",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9e85f094d5e9cf0f942a79ff11f6b9c53dcb1372869341ffda4c83e8317f7290",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a095c3bdb3e9b997205aea240e3877accccfabf64a10950bb76eacacf9940808",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c2b4246147270cfb3c72e7828f5915b4408151dbf99a0b204e4434d2eac74b5f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "bb3689d1d7f1a09214d4d4cf471a60f2e790e1d4465ad7a4df9c16cf29eb6100",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c5c5579136fd0c32633606b8d8c3e7e67deff2c87ab396c92e3f4655ed585b93",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "974c89c2acdd83487cb617753d94c8f618d1225bf23f4c286b2cff7c58524809",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "deae8ff29c438c6d68e248b714fc17d11f50b636a489c3747047e2c0e6f30a9a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "cf5f407e72872f6bd848c2285cf0c5266339e81812eccf40502528e9180335b6",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e08a33439b03ed1aa88343136a954661d31cec461a5d845f7a5e15c3ded5914e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "47f7c85c5a9572bd14c918c29d642fa789f3dbebab37dc07398e205c1de0fa5b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "79af538b95c057731b89bbf9204a33eb7430fde7fb70b4c27f641b7995186b23",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "50d1753e62cca94c940f88ad5c5dc6c66d4036216e412550601dcbe7d93151eb",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6878d3e4530908ced27f26f8643e22137cf5c82c8cbf8abc11fd581f3f3818c5",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f7e6afd200d92c542fbef39871059889c34f060c18cd48b79aae4de0b606160c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "bd68695c26f53803af17a2cb00b2e73fdaef39f5241f3e85c5665112f1e75787",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c89471b2a53fcf0ebd0d2ee4e3c81e0cffafba180534d0de8a293f6beca3adfc",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6906015fc5e5dcfdf6250f5f77d7cd626553eca60b9bfd2fcf03938b961e5b25",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "28d18a078d16bba75ede62cfff05e9e219cddf9b9d7b04dc5b0e0cb2fadbbdca",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3df208610a9dab3c5e9a8ad5dcd9fc008e26cb3a8a8397e1b1ee875252a2a71c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "593c8833079fd0160ad8e4dda6db978f3beea999a7a6030226d1269750cf8927",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a935b1388466a8811748b80d8a8b7b1d4054b54ed8ce5722078d6c8ed99221c8",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7875f3b23b7a5686c4989e716288bac85d3b988230dfd18395c587325598211d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5e66a5528073a5f3235fb5a246725683e2ef4599bd87f4c79009a9b68a2a436c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0ad0557b15cf5573ecd90f4cd3dcc23af89e76d6c163d795c1d5792189b9967e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f6482ad6c4eb03ca159807482e5220c7f98d67b03b30ab28f528e5f1cd20a58d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9b7280002d8afea44e32c74904786e973f521f4d18977912ff2ed3895b761ce0",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4bff31fb3f2b1b7f91d09734ccd5a588a0d3c5361727e300063c2721adfff02e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "44473cd8f1789e08b5b177feb7ebb7d7a06966a80d8f70882b0cdc4bd53306f2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6dbec3bfc9b2d801be02f41d9101ab4ce815eb1ea6558ce8283313f7e6ce36e4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0d77421403bbe082760902a9c272a4719540d69b07991164678df54c6d901d68",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "fea7f63fd247d2c4e0a7a8ea023b7606ea95c4a077df1ed0570a417782ffffd7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "550e59f9b1e718005e63d67150daafae638a3b4c6f0cbdb8e98b90a73200636b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "bf4a62197da10b07224485a00261fd2d6f9e6f4ad32cb61d1530e2431ecfa1fb",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f49ea16a340ba21229a47496780bc8c0815a69f346f9a1baccb73b7dc128c904",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "36e69e006929a4cada9b789d2791f030d0729ffd2a6de73de34bdd75b7933b64",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6438ee8e0b24362008acbaf004ff71802239879b6896e2e3bb11eff64eaeeb37",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f2504b2bb2990af454d597559fae40c396a19cd17d0101eb71238419c11eb975",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "28141265f06092c76c7287e83bf3e087bb0288229677f06d448ab697046f66cd",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c8960c7cee84bf3f7596908011d797e5bafabe01c1102a6e7d3b9828ee172aa7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ab05c3e2aaed9c6346ac9a22bd84c17aafbf797551b3ef3174acbaf31d42d00e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f5f306d56b9c60f816ad83453a9be7918d7f6e19513f01dab2013a116ed2db23",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4ef525d72e9f772f019b322702dd242fd19eda0df09fc0df2309fb440f0ad0ed",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2832300bd79aecc88e01235f3b4e09407e03c6afbc585ca4ade6076357f0f424",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "243115cc8d9c7558bb735197f95eddcec73a8ccd0d042874349cb321aac64205",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "16f7a7744b15ee2fff7a015e72e7c53cb405b7b5cd9676cbc6b53d3ffa7318d2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "64fa55a0e4e27d04c862c1a6872f1c02c296f91ffbd14b4137c8ffb1e2f77d8b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6b83b6de7c32be624a9d0c32adf4b08ec589b230fcfd55d7cb590d67208817c5",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "07cbbebdcc8f6d8080c4188f1580a7d414444ebdf0010500e752765b6dabfd1f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d4e86b1b9a78640d62d7d0eac98806d5ed20649cdf419720cee5e7ed36fde36e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6b653f8fb3c9dbaae2d4988de43b040e271e0ba2ad855af3b9330b343d8364c4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "09b1ad4baec2295b6ed9dc719f179f126acbc1c19acb3a0ed7f33fafb1bc1b21",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "90094e69836a74f5aaf824b2efc9ef1673b550b4bed41b0f04ebcb0e0509f535",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "eef4c8a7ce68bc598f76ff3b7e615bfc15fbe3a1cbea3f1797d876a1c772f9fa",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "69cf2787dec9bfc20975a1b99ba86c6316cb9aa5e8732b7176f5a9e2c953d8d6",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6d8d2b478b4404206b8cf16c398ebee7e3a5b05bd1f455a3e7ea28311ce9ede0",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2c393c126f8a8b55e7c1d7f8b6923f1e0657500bcbcfa2d58f606f1e2c666f2a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "af9d7351a9522ced89ef5631b542541ff750ed6b3da6a63de4ddcc8550a755bd",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "fefae52039a8f5a9e937de170ed14468f450f6c417029e574ddf77f7ef05fdf7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e47db2615e10b4d8a90b02072e509442bd40bc6add83703bc3ce6e0b6a75a8d1",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b31c7d00d69bb60492e0b6e590592c5cdd520b563a4cc8e11d13947fbb0e78e2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9e2008259a97108eeb2027d585c62024a89ff9b11165bf12c3c472b54efca627",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a90953411221b47440e810f327be9c9f82c8f8a0607eead68e62aa5c6c5c01b5",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c080103c38169abb3113445c5ed2d412e1a695b1f0663d85fe5537f5d5e094ab",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9f79fd212bc5e5fa8a6a54c1a4f7fcc4ae043f33d34d27361671db6fec07abc4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b2a3e4b4266b89ff13b73e60a0037412c6354d10a8d81171327bfbbd34c76be2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "720426ee2983fd324233b4d4279c6dae46f562057071f6899269a1e48c6b171e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "96cfceb9539e23fc677d03d3c1239fe9cd3ea1e3cb789723ca182ef0931b48f6",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "be06dc045d68de6e307156c40ffa4fc196b57dcab1560e6169cb837eebcc3ae0",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f91bbe0502de7a5df14d8b22819564ef5c0a6a44dab29386463d8b3e9ba9ccac",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "16bb0e4216e8a1114a0feba4cccb7df71c729abde4ba0513789d6b380015b916",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e6fa9935437c2d99e46fe3b029b6e5899e1d00ec5ccb674e994a969cd0386aba",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b6a029dfe06f9c237aefb55d6276ed4eb0882a6e4a571a264f946e423f882c2e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "be4d6451176924dde97d765d4a98e70b68d72a06178cddfe747c32f64ef6f29d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7c4ad93888403def2d84396ec1aadaa6c0c1b99ba7ef4d711f5f357d351441e0",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e9af0a4af84ae0b0b3057f2b7a746ad15cf342e16662d3963d11e605c28014fb",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "25b67a33d9020e49843c4712f279eef4b90e5aa315c398ffea9881c33d8d468b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c5bc4b8dbd623be3f3e6d0e3ca72ee974d511da459c8c348aac6215f5d0db12a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "68658911227fc1c52dd0053a807a18890953f98da75150c8a223780b58a1cb5f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "364f197c04f42475b5ef2bd676ad1451bfa4772fba172f2efc1fd11c8dedf568",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5b0acb61a651a64865427b135d011aa8523795bc79dea3b607aab3c4a80f7d40",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "32bc4bc3de5e22b1d8428773c48dc0a23bd0dbe940c3b84c3601d1c739417d93",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c9e9522595c331f291a3ae36de82a1c7c09b269df7fa0f18e1e2a0c01f4eb064",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2c3a15c4d71acacad5d55d588642cc2d5c69fd01964fb00fa5d1bb3b484a6566",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "dc0e2551fb55a5d2ce05f76b7d1bebe487c0900d976b4251a4b49e447c5fcb30",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "95d6cc96ad9895d2166e39e6c4729e7a366291c3ff22fe0471fa26404f23431e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d7860c2566f56d8f983d86136071c258a493b25e3b3b2e089284e69d2075889d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e44e51f62042a2084c742afaa3238e696d3cdcd0d64c6daa931e613b17c6eba3",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "996a169c678cae218b590e541c44f4e7c101a403c2ff859ee27b7afe3548a667",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c6d7785024e7a4c51c581ab48cba303337f61845a69babaef4fcff5a641e9db4",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "05ec4b7a2ea19e44810d0ae946556906497c86388a1c92d2ba8dc72aa9a1a81c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a4d1602e235131564295459c9728a8fc94bef59395f9a7081d2e57e04c681ae5",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f50fdc607c1d10b1b48e31aa3ca94cd48b52ecc386033e2e975a9a5bbf95704b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0c06f9d558ba203975ff8e93813b504a211b229b15b1db927831a8a6b430d5cd",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "1109ab32565112a3a50b626430794a2f41addde7fc1930c41d90afbdc1463d3e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "7f53b6b80f5b95af3a20cb8ad3e1006cf871942a01a77f2c66eaaf5807712859",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "6f1818c3d5c9be5976622a0a3288e1e0940c04d7979236d0aa25ab98107c54cd",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f7f57c1a8eefb82fe727e3ef608163e9f34373379b63baad4bf48f010af51c1f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "465751f505380bf6b1ea87779bb4f895270e6ed199b31ba4d285c9e6984d8b76",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "64002aa624010aa71b46412ecec97239f678c367e1f065d511f28c5f1230773d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "eb30e1e2b36e397272ff32e58c73a3267990913b4329c31c08a83e3e6fdd5e52",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "23bbbecf10289988b399e6237b0fdf8fb56a7c688dd8246425a36386e0c5d397",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e0e1343ec7b587ca821ab10b21be86df396ead37f87d82c1924080fe536de5ee",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "8f94a6f16f99b6484578d9d71d1687d269bf39c65de41ab25013e8c93793b747",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "047a0615ef078e3652f959306dcf7d5d54bdc238417d4b480ddf35e36a92ec7f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a39d63a12bc3a59bde8c748e6831e30b601619d98eced42c1b6a254e60a57ca2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "cf742432345b55b401f2fad3e629f97b7d5055c94808c066dae68dd48939fadc",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5c527a209c1b8d092abdce2aec486132f5e9f779b3f7a5db20decf64e3352214",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "321c0e6d05b0cded89d1c00102d423e5c294ee78f31c303860e20aa246200e26",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "108ee39f9186c52360703dbe7f21f4af7a363415dc20fdf549665a9657c2de72",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "95c816075c1ce2e0561cf121fc847c12d70e026b4806c002e01bc5988c377cab",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5a04718cb5c266f71cb6653c0aeeb1f98a31b9a1b510ab938a137eb82652fa65",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2ea85583f036d4f9c97d63d355fa0c54a01604a3facc49ccfa8ed64d5dc77702",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5351f56e12d95ebab4b52a9a6588264596f6e49f33950acfeced70ed5b48eb51",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "60ba23002d2021d0cb43c67309c71130d6d08eedd2892f5b6219b8e4b1064ea1",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f371954aa0d2ebd436d5642a7ac3b471de575f3ca2be4986306db705183cf434",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "3c9c72a923132469cff0f2719839720f78be8fa9c0ccf90c5bf871318e880a2b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d2101e30351186903a2c7415762d6389f53e166bc6f423f70a67c7e2ffc73056",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "7d8bc27982e6b28e9e6e14dc48e926bf2ea393d45761b7bf909742886d100a74",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "6c785acdffe0f46a8a84875319a172c0491767fffc7b3c616f33e0665758ce71",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "1d1bbab21c5b73c5db1f10b92dbafb586f9ee46eb2432ed2b9599ba850706df1",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "187e59a99daebc694eb644d90c6cbfc3352df8236fd37448413a6e58e5e36883",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "43e2783b27e6b23f5a22d4accdc5b98e2328db56145a32afcc1a8bb7ca4bb1c2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "82621f96f5d7b888a772cba6d3853881f2b026da623e1fdd6c992090f5147081",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d8350e4693c1f756ba97f8f82f4a77fd3bfecda0a15d48ecd8eaf28fe860fd84",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "ec4c4c07b44c368c7b659a033bb2a1c7b46a8bb5346026b88539514368018c13",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "81da874cf96d158175600775a1e50ecfb42004e55098f233fd0f14d659861b5e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "cb3b3a3c22aff29d3ae9d3955c144770fd804cda06764ed867daac2d21c3bf2f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "ba580fabdd8e8c122cedade1f3e6beb47b8fa914b5fec312d0f0113cbe0cd05f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2bbfdb1d64eba529532c4f4ab1c12b6a29904c22da86f00072c195364aa44008",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f3ac00c690e6ee741c48e766dcd25b4b3d140c227f5b8f870dc079b89e141b45",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c509ad240503ba4160000297c5cfd8998918856e120a5c14dc2745c09fe15906",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "8d57d02866453741c4850699b4e5cf87a2a5936bfb297852685b4108bc8cff55",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "64ccd0c00b89097c82cb58aa6f2107278ea863bbf7b6a69ef867023dd4e94d4e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "07aabe74362bbe6d373fa7eec43b3dad7e4921ced349edff7e10c1f413305271",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f84f6e49bbd0e6a5aa5ea81d2d4a931bcd363b9152c15270695f821ea880d6f3",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "3e1d2eefd129f31ba5fcde85cb79a40c9a9b5f66266d36b8d46b257e10feebbc",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d7d6ad5d8c0c9dcc06c8f4d04abc1210f6e091eb11837a32a59da87996c49821",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "1b29fec5baa118050da93323f64cd9263e27fda7c29d3f89aaac9a101ea39a55",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d68e03bfc10b902e72a06e8ee002c8f31c3b3e09ae092b83f6ed5cd7dad545f8",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "80dfc384788de73980c73f3cde66edf8979ff91eb9025dbc6d8a6189dd93d390",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e036270a2c2c62d9f0858f64b68cb6855bcd41eaa790c124687a3aa615ae382e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "8afc10448ef5acd679668f228eb6673a5762009c180eb7f958030a0cfa39cd45",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "143f0a24004295895b108dce6b09ae6be14a592582c5f05131dac25b0d489f26",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "50c8b3e089307f5bffe49e51da704a02d085864b4e735f8471ffcd1918ce4eaa",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "85ffc7b6fcac6424061286f52d42606ef2c3ce17f04981bed13c28313759d88c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a6e99e0b9bd168d88b36c4e8ed22527f0b6ffcd5365526234e5f41587688ec9a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "ba8b1a9a0d97681bec688aa5c724dc51e06f722c7cd028c80299643ba9fe9681",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f54584db6c068a3511bf817d711283ecc3290309fd3f55371b18f381a021110f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "da0dab446b1667471e300981e7e059f61c4c290538d502691e730af2ac8136fc",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "77c6a7106c8769eea84e7989bc2166c4aa8826e62799534d7ed4944c0d009534",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "450bf9091e1ca7c60fe0cd613d81fd722e2e370ab41c90ba7f5b0572c5c50a34",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "52f0d8ec4d8500cf70480b9a3ea2acd5f70b79521f5d3866ed62b7c779ca21d2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e23e9f72e95fccd9d7b0464f7ef929d7c697e2d581f7214b619cdffe83c3ee8f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "37f6b8bc6edc418a2b690595ee8c47b0d699fb7bcb64a105b6177607cc54dc7c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "237d1bc1329afae7b28befaee809021b5da32f3f614f03451e2cf0e625b8bc69",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "16236f5213dd9957937ecf2c976c753faf1cc60f051d96408885e0406c57e54c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "94307facd8fd547b7eedba05f9e3590238ca4b1eb5cef732c9d353df69dafba4",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "faa28554b420f9567f09a9b55a87d8f4c23f0626def01421847c0a3edd106801",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b2a3d0684f58dfd12856ef9ff21ab76fb5de8ef2d76054ec7c70db55b0347214",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "7981d03b225aa410f514eb6ff7de8dfcf919db7f5ae6f307f876a210b26187c5",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "3f5313e613e5ce4c78b9d4bbe64e7e7512c82784512f613211fbcb07a924a1e6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ce08e0a8775e5d27ac6d2f260dd41704140591cebbd85fb1216457227887a0ea",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5e9e2e1e89dea15321e1d18949626ca5b37849bc476008a33fb3499b2eefe941",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "87c4f2f1c059dde3fcfefeaad185ff00e1bb2b849c0229b2b4451e45e3f3e32e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5bf2a0d9276221696e8e2ef77c4ca1c2baaa2e1e023d1cded34dc222863133ed",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "00b4cb5240969764754accb7f76bee838fa6133199fb951756215fcca6888175",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0879e4b000e31157049a430236d9e47079d8d58f61547643aa1324659dcc2dcf",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "cad31aaecdf7e86c6c0215f49b3745f2e70e7a2742ec54c53e3691fd680fa801",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ba2841b1a4fd3de4a34271c18e8d1b4d8037a8a1ebcbaaf9f07f91dd4cdc0c63",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2b7f6fcf5807dfacf8cc7778707125e3b13d6cdda5148b109fb26bc51d07612d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "21f922769ae663e6fe2a5ef1d4605ff6c412a34bcd3def0241130d1cdbb18031",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "01573b6a6b2b9334f6317730f87297725d7e486105e7f8dc78f709a27e4c36ff",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "12cdb26c35c9c651d0554d5fb8c170b0411806c8aaa7c714e34e9dc6730307fe",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "37b252d1433b54233725177c7d9d4ee087140765d7d25f9629e0c2f9c2549445",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2a5a4a6e3c12b02c5bdc510546ecf60ad974ec245f2d08fb4634a2efd79886fa",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8b465fee2d0bc449cd06217138b885b0fdba30f2d189e939e469e4cb6e093fa9",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0d376b12e4fcbcee69f8f342bdd472a814aaafc1bddfed4dece18c38c221b6a9",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "28da81ebbe8f0af35b64e9c3d888cb5bc180153ec30f8ede8abc173a7cc25f21",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "68aacdf4c01c86b6cd9ff5b009ccd9f5d5b069675a039ec4511de091178e7dfc",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "39f3d5b9e1c1256156d4512002adfb0fa071c4914d18a0f8f3d864aa0fdcc25a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4714a3c865edfb6c57a32af0174772ad74e80c8626dc91482d67cc3690463063",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "14c0225c8640e947515b72c302b51f3544e4dcaf494e68458eba427957da42a3",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "88885520d769f2c4f410943787b3f298cf776a8e8403108934dfc6eb27378636",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1596f0a92a0399354a04da54ab5470cf8e90875302b77da260af1585beb6b96e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "13ae20a3a2ce9fc65d53a6ceb319736c9ccfa15478c65bdc6c183d26697312cc",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "57f0d7fc8b5c4ebde3a9a14f1f87edcb02d5d09bad4a63295f6257f3afa43e38",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0ecb9dd069b1dee2a5ec26a4f310cda8143f0e11906ffe9f9dbe0dffb179a593",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4d057df4f2020a02a4f58b28d8d1a267bbaceea0c1838790516c69f8944dafe0",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5e064fb0dcd72349cdd77db77b14b83c9c3a2c27f807c2ecee6a801d85665f0a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "288e137f161fd1b9ebf73b27742288cd6d14dcb04a12361b2b2d47a5aa90539e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "451b80c81bc3c4328110b19e785d6c1cd172925280e0a54b2157a01cb8a445e9",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3a8503ee107207791125e78e480bc2ffb4db115d1503508d9a76e5a28ffb7b28",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "594aaa755b142d9416820cc6b1f03becd44322dd62ed75eb59a7a32c3175d300",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "84f5057bb7d1672909b8a08e2cab0689b76ff7b015438350366161ec9cee2216",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "beec3357cf83acfccfbf700dc558f9ae954520bb467f0ce63de11c6cea842e28",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "38ef3aafe29642cfb5894903ae7392b8a36afb939c4d5f27bedbf08358bfd3a2",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6f57cc2225a4b35bf2c0b775b3eca7296b3c82268d34504fc73ce3003cbdf15a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ab7c5ca8ddfa407209dcf060c9bd4869f38842a6a97ecea29b4d216290a550f6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "745d6dccf1b8fc690f7fcddf624ccad2cd8906828f87532f948885d5df2402b2",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7747bbede8fcc9d26171dd31b1902664f7969c17d24914790e16ec9b66fb0830",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "52c1d7f0ca46ec97a681a84dd4a8e599961884ebca360a86b208d19d32ca8bd5",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a322933b17f7b4da6a66b56ff2af10859d0a9db2e0c5c276c5ab8c2ebe587749",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8f8a73df1b02fcae889e9a1155a8bb9ff6725b87b027836e8220cc5385a01f32",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "81e35599333368cf5eb19f8bfbdb6eb862ec9ca35fa366e8d3a360791145d7ce",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "11072fd1958dde56ffb12230de2ffa24672f77e244b21ffebf2d02d7f94b2777",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4134e6825452ee0fe0a361c0c979212465767216e2d25402dd922c3421b895ea",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "79a60bedfa3ba8cb83ca2803dd36a8c39e5c5330179c8ef86ddd1724c42b719f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6ea679903a8ad88adfbdd5713db197a71b3fe88b899aad61ee5ec04fccfb6484",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8a18fd071504bf6fe8f03c913eca12bfdb01a0d7baacea958918af0024dc8c3b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f4e9533615a51b5d475c7669276da071f72227a5c6353b50dee8d48447ed42d2",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0249ac88277bab224e4ed5ba023720ff966673d24cdf8d27c60129bb51cc4478",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "713a0961b48c3b9a5bc38480428b5a380b93581eb0409f48295b28856d6b6767",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "49211172b2719cbfd82b5fd04e80da261e7cdfff9e2a66770a84ddae31d1124d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0d1d542348259bc15153741cdd88cacbf93fd55de2ff302fc63e4284e4dd34e5",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "440a5b908ca21ea279d73c15d9cf4ce0b33da24404c5945b4b808b55f0588f7b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ce3d51cba34a01cbe161719cf7dbe451b661a9a1d555c6b8dcbdf2d015d9348f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1396cb495d02edd209787c4b0346305026a335be930f10beb14aa456b426b6c4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a8837e6ae5d34b57ba02663d68a966bf9169a4aeedd984acf915e1b8e41c0b70",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c3c3b770964fc016e049e41bcf3fff0220646554800d444b5c9665da56585a4e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "edd505d65302b04ffacf7094ee9777f8a52570da7a100324855428bcc5e5727b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b88295e6960e463e83e095acf2be9ce183ec40d5ebd4f3f9578d6fea70c018e6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b8c9e7ea6758ad8a6ee6dee25f06cce628065663b46c764fb1cf17cd7a1a3595",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c640f8017f6fb0b59aa42727460de41346474ebbd229ea0e79e35b7fc1a681e6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7ced008107b441f3a64d94e5010de19c5f3707775e85440b690f0aa82659ca39",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "91c78e4c9563c61c6c60e1393fd7f235a49556493e4447f00678dd1438f27c22",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "234b1d9ad1b79b54603a745f8ebe253f0ed4ea677c6f67bca5fa55d38e5dcec4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7912040bff6a0bc40e8544a87d0b2ac4c9bc52947fc0951949ee5b6bb2c9f538",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "87ff68b61726c2f1cf40f71869dc9e6ecbefcab136ca27130e1f4972a9fcece4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f8d9a3cebfcb7c6d47a0f9ab77e20548b088d0ec2f151d92182423ca097715af",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "520790a1aa521aae44584c5e38d578b1d14011b9d025a5bece5e359bd1ad6941",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "518a446a909992d51c075d58d8126182d2ce66f7445017f0a73a174aa203b344",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "23f7382b0c716c4fd370ebf675ce15e97cd9c1fb8c0dcc6b3e3529e6cbc1daa9",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "fffe99bf4a30fecdea1dc9032f716d00eb0c2feadf66d58850446945dbe27a0d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "cf113161d5ac6b92d7f0a2cb1cd3a5e4a871e4cc71a6850cfeed0abe38260398",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b7ff8370664d9386d2042129f18438955e1bf97a41329b93821ca81115b768fe",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8323ec666a9ab9f1c17dbb2053d05cf2db0ca384934971d5c86654fbe25e513d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1fb5411505acc370b085aebff707ce18595ae69fa181974437149dec7f935e64",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6f79173ee0214de2f973f24b243cce177a7e3739b7c37b07a8903192f0a7e483",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "856e5351ba6cfd612765a5f2e31fe2a4a08821686c0ebc7ada2a77c79414feaa",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5f84b3f5f2b1a4ec79d957c579849079ca40e57563298e93e0b19ddd93cbf060",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f5543a67a94e17a193dff6300f36ade7a8c0f751925d0fcc9fc4471a9c447e8c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4f1cc43363cac79e72a0e0d0bed14604ce59d8aeae05316b80ba67658a449ef6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "692ea87cd29b39995f984efba1028bbe1fa31cfea0b9599349399739fdd8acbf",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ca1c46c63ea7f88ce711dd6fdcb85c7e5166d45c363fe5d944499f0af517b218",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "84d2e8cd9d20fe7d4c801bfa705cd5905733c0046277b47aa2b78c3f0d626148",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6e77bb464a71d266165667aa155577f7a1512cab2bd2a9575f269a6c04780d8d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ad7a05c62e85411d29a4fd7add3d7d56cf1c60a86135d5b9423e9f5f9c4b2522",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e51010c066309262d979236f63ee6df732e7b9c6e8c469e13fc4b02029da95cd",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "184e12a92de73f3f5615e8b11260dd425b0df8ecaf57628141522fd61e01ecfa",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "cbad9ec4de1e0e2496ed0517cc625914bd9d9373fb0f3e5da1ba7c070d9781d5",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9208b37cdecc695e1614cdf85fb6d508cb79f7f0ca256ebc50cfd6fef393092a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "699288b94ad996403933a9664911606e9684f85accdf7050bf04fd5a1fcee7cf",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5fe6d8afc11faa8e8281770fd9b32af5112939b319b40c31a3ff01016ea2d54c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "14d141867ac254da39ea33040b9be1c501e417ec342d04fdb07f6658861eef0d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7389ec25c42ce83515d04e7f9cfa3027b4da0224a9cf27a0cd03aa19e92eb3f9",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "920383954433e1cd591abf222cbf867e0bfd289195df4167e6f37661fadb6921",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f921d923ce1b9c5ecd070f647aac9314c636d2e06af47fed695b1f16319eb9b7",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "bd7061866312cd613ac6abcb78d02f9401d2e5ffed0962fbc9a123055d32cc51",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a22989df4d75b1d818635f57f78f54f9edf1f3326f12060ee5e50b2bd15f5889",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "037c3bea475f1db3ec8f15b8b9aa27caa5fe896dd95f5daa345b13bb22b958ff",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "853d43d9c8b6007b112e1b960da6a5a856661537a97a0e7027bb45bf57c3469e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "51285696ce6050a028d4301a9c0e384fbfd6c1fbe14cc1461298c360bf6d0d8b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ff1e97888638901a8a1e849a88710b5b9d1a5b54fa39a0f8b36a3dccf82cf84f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "11a3a6e7ec50ccc516260c7667e6790a864bfc552734dad8b16f671577fe06e6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a4b1b36289f1e46e374da85d120a46d92d308e457c5e6820dee7a342a5c297a3",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9b193c2aa3915e6632b43a4137435f9139173f9f59b610907272d99525a9b39b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "dd532a84d89c6919e9843feb510926e82f7082429e769a1a7b3a5b71ca0e924a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5e7f7cd1597f8c9a21640de3598dd7c5405186207fe2ded31d7a18d668996166",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8e176b24595e58f1da71a22e2caaa56c05b2eb0af0e9d983865128e32c1a6aee",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "96b77b96c90ad39e59089463bcd90538edcedb6f131d94f34cb0973956c03d87",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a2ae8f3b43d67ea854c80ff7f9377a1e5fd65a3179637a7c96161fa0daf57afd",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c99defed574a53fee6efe9cd552c42b136e8ff44e252a3dbeb4186f02f4751ee",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d8d71018ba5b3b76dce33dce48311cf0be49c920d34143fcadbb3e1a5133a0ea",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "267f3df5c59314c7d1338a342a5d7446f23a2976cbaba3cc557f03e68e179bd3",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3d0035be64dbe34c1e47e4c3654eaca23e3c8d296ebe665fdac119099e253464",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0aa9be4070bf52a7212428bff62534e04011ddf52478efc91974b7be0586849c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8826ae0775f6109c732f6b3c5cafb8809ad00202f500540be75a7e33a62a111e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ab49d8c98503ae63cd17e1ad1d9eab0c2458cf36c71dc22e06ba8391fae71066",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "225754f540d3e0535c35b5b6e5ac23054aca0ea905e06482734e7e532f5ad466",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1d559e179c5b52521b0d91355501a3d2c1b7c76f7a486eafae5644086db5de81",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9099b8858afa1b14bea1148529c73f56371fc862bd70546e9741a7b598503516",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4854ba83e3b8ec0f8d06d8efe6562b4cc387e401e1182056e21891aa775f6f9d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "67256be803dfc2dde6967902193d2cec908314a6f16572a1c9f5e4c3bdaf2ecd",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6084f142c5cf8b8f526d9a2badafeb5880acaa819d44bfe39ba3cb3800a403e0",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8c95106dff601d25c88695b0e07c1357119789b9cc8a26fb785160622d506c22",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d10c8ee0847b624c688fc8c564f0021fe249f49d4e1d849332b4a8734a66cbae",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "84eed5c9fdb94be2d49ce8da92b90c7316c177a81ce0c38cd3eece13095762cf",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "99753271d30ae21cb5187551549b61e9e37d9df0678564f36fb57669eba26f6a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1366cbf2dc7b3cda6f6b688655175f584bed412253efdf3e2d9f3bd20f06392c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2eacf6effb7eff3d7a4e28d8dba8d4122cd24b84ff1d0ee62628356d8acc4bb1",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0751b500ab6a7e9da4cd78c07744e752a6f47b02a734c2eb6aaf9c3def4ce0f9",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "da7929029dc1e031210a8a2034934038e8ee1dc30ff47ec2a02e4a61b0ad9b36",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "725886f6ee3c8d957b2b5a51b552fcd30df54f0c4c49ebfd21d3eec8e06e0da7",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ac6fecef971446770cc240320ad49c01c4c56641fcca9ef764469640d604c871",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9fbd9b98d7fd71264f853cc298312c8eee3273264bb1c3bd8aa84669a8ff6b17",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4967f3e6f54b3d3b5a716be60d9a091bf48b9da5357800896c6d1de970a85b59",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ded88d03a7d8681cc502d7f2a542e10ebb927d2427847bb92f6a2df6f618d8ba",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6bf0a734ecf2909155e55509d69f76474d42d950c4e1c2cf0d3b945e436b376f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7e9de591968679298f4dc4f76af03e0a0524f1a8ce391fdd517d02a520d9b462",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "80833b921d919728a9db59bd28817f2d6c7f0aa0e80f6fc50dc0d200a1be4ef2",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9661b6651a7431f62c845cd69492306b41ce7a0b51db8191a39f79f8da6af1b3",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "12827356113e7f55dfe8b7dc1889eb327b613142b697b7077153e86558db0aac",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "317647239147c14d26de9a35590a55ce9411e58707c2e99abb8d0dfe949ee25d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "12e02d9dd6d9f734e94088997aba59527a694c1ecdd147762559654aebb2a8d3",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9acaf44306bc81ab799e3f15cef131c6757164843a25912cd8f030f95eaffc45",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "fc0b99f0aba40cfce7ef72840e38efcb3d6c85fff0387497f2b459a5da422ad5",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8f52b44cb7ee2664fb099c9fad7e664c8666e07e838adf109020c180c92aab50",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6ac2b2cc5a344df7a76fbe5c2c33c348e791e830b0749af530ee5ea1578dbca7",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d0f119cd014f9c8f60b70191a3db1cda3f34c1706be62d2b56a643415848ea45",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "aee9a5999ca287ae979c920165830e4b7bac8f3dc563b82c3f855c93087c82fe",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "01f31420f861910c38222af742e289224cfd6fdebd9af99cbb791c7483aff7bf",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6f9b83f2d9c855e716afeed8b86d9999b571cc577b36d1ce4c03f4ee4f349bc4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f10e2f60cb185c8e896541b0eca888d17e28e570333b47283f6d74a54348404e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "22ba322e69b32ac79ff618e348d1ca03ab9891c7bfbdce427e538f0d8c0f9be6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ae904f40b2a329c5193a48ded1953a6227da85ac31e16894564c77617d4c20e7",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ded8ec07d50df7e8f882492c0525c65dc32cec8906db28f614da203894936cd1",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c049fe78cdd4c8eea49df720d22d0a2f90d9775493b577a04cd3252809583f98",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0b9217ad0ef6fc30be62d28cd0e0431f1ff5844472a5f102b9e8672f05d1db6b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "204f58fd4c7508869645a4ca7185fd9615f6d4b574051e1dd19b9e1c66e69d75",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7f95c6cfe61f84db903a73f18342973072afbf1eb3d73cef3fca451960397451",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "17c99ae757775f5b303d0c8ece38cfacef0a99aa49092a03edb3f5177a0232d4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "82f64ad681bfa11b0f6c4f34a3f2670901bd9290e4e635c0812c7faf2c033e51",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "998205d38ac6cf708cac963eaf06f9bef3280484137ad182e372c7be121a4200",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "fb62960425e6c94d6e74606748336aab84902fd1bb4789844e42571636c32f37",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0cc177a90b9702f97695ab1c95fe83ea7536a537219f577a30dd3df663222e43",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "962f7363ef217cb9e4876db5622fe47df7bfaf0f0045dd708ef0c00ef5d9a8ee",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1fc733164667c2e47beddf2ee0d93c4af955dbc7c56eb2255769546f0caacb1e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d2ec6076e60dc4fb1c1f63e331300dd94d409c37ece6280e8bac41e174653d31",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "509f40ec17323e45d2849ebc742b26547155d92c0ed8decc19cd4985c8d99298",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e412ac9d29dbcef26a3ddfb640ce52e609c54288e3cd08da829c90b2b37f0762",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "465bfc18410945e625e2425dcf4c306b75b0fea9ba940061d4b3f4dc2dd4b51f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6a947cc911f9a91a67740d28f8cbbe59d3829a857fd050e696ab92f22249ec37",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ead6c60c217812700caf907f07c072c2f2711184543be3737f1eeead57bf8f2e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9ea3d988bcff081942af4295866a7bc6c386b410db54f4478d44f2f29ec601fd",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "639563b1d7c0e4cdfc16f6a15ba3001289faac08867cd5391d64a85d0c293d26",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2c19e19cdddfd7118181d9f62537612bf2e0822baedfd20d63e858de6bda649e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "bcd8d72d8d00c86e023ee257c5eb5e904a809aa1319f2032c9648137531cf03f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9eabe94f1b4c043e6b028e23f1854574ecad9bf59f89e86cb7ba6d04a7ab9510",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "84b78423640ec193d4021c24a57e001dca5dc7674ed33b1e7e12a7bf1f47889f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "208bbb86cb672983fa9f81e3a29e38f77a5b2ab75064b179166799aa2378b127",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "08dec5ed46d198b7dbad8a5707126869950b09b84482a05a566ea4d4bcbd908e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "46314e4ccd6e4faad065f2a2a699914749925443970173fa8c4f5b682e55b9b4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6816b5345b332f8e5680f28b4bb81b201496ba16ccd21f964f75f0f8cd537dad",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "841d8832f1126f65a674e167f03496beb3d804ff29d5acac84ce525a5da9aaf3",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "09ca32ba6347d989a10a5f885b8142e05d4ea164c80675f3e25f68ddf5bb77ae",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f419daaa6488401c7816497c5aa7a8ef38f848dec3de9af3ff2ebff7c30ba505",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9cf980902a6fb3bc932358ff290785b0930bdaee045f42a9c7ef77671ca873aa",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "46b0c40248cbb1282dd9cd0c769fea0ddce180ccbf53be68a15cdd1dc1e4e305",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "15aa8ac789b6a75c21e7fd1a4e4f2b86bd8a5cee821e4819d995e1c8f6294998",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1bdc68fe8f5ce657179057140277a03504f2d78714575668ee633dc1a9673fe1",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ef15dfb8042f872fe11f04334c9308fe8d174d7d1ef4f9fdf93aac520bcdff85",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f1f8ca3a155959e70f84e92439aff8c016012ff8901ec5374b6505a4fc7135c7",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "927cd155b2eb13830d5bfb2d68326f63091374f0b605e576cff735faec671fef",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2031f4b91918c7e7105f3be661a7b574fffbb6c9ee3636542a418a2073b8e1a1",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5c4a11c51aa443a930a40f013a853decb8603f7734c671760d526a9fef1bc184",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d94b0b39654e6b917c9f3e95a2aebbd8c0312b7b302a1f325429c6944742bdf0",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "39538dd665aa1b2d26b0cb5b3ec6a1de5eb56a6694816d2e3ed82647b527fdcd",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "cdab9030af12f70a46e93991e5b6844b7475a8de73dce1936a12647eb8384018",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "44cf9af767a5a7d36affc9b8f2ca1cb7114e8d044900e03befabfc2fa7c68092",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4097c8f955059a052479a89f0152d7b0bec5c074fd531becefb658f9b6743da1",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a8e18073c7ec1f1383d1c9d3a7474fd8229bf1d868dacf23bcf2eae3dbfab4cc",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "58d0e7be0b6f3e3ac5bdf02ecbc7e87062f801b0ecee2aaba53b292b73efeeaa",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "fb5a8d0395f48f800a0182d88890ef44b959f583e3dc96499ba96992c4701053",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "102b2842e2935d64a1a9825748d108a8286df2ad5acbe2e22fb78c6ae540d80e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b7b28b1c9fe37e3d826cfae57f9a36caa1ca4687866e2e74d0ad7aed134ad28d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c930abd1a462b23c443f700aa6c904dd85fea3e01ecb7ffe9bb925b3480fabad",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4d2db893aa487c19afba95bf7d8986be59c32f60a05fedf85169fdef009323f7",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e801068d2d14e19c88bdd12e448750c625fe09ccbb4ce59babb0a7da870645df",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f9946092db4a197e6b2b82bec889774ba151739452df7203f53e19c91798a20c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8d2f192139ae71d61ef4951198d469b1f093899385551bc2cde0d581ef9b1fb8",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "85aa43da57e2fe1ca7a281a32c8e5f673f28cf59c5c44accf924f69cd4933f2d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "57cf594e2435981b07092612f9a310528fc21ed1030bc3acfd4a496de9a390cd",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9908776dee7aafa946f8080ef961ef2e7da89e6d971765c5f3191283db5c32e2",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b5a238e14f3709432f8feba3db1defaacfe1e986db2ced5184f24c7b1ef0ae60",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1b579c591a1eb65e16cecc8bce08779cfb221bb169abf6544a630aa6ed6ab90f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "bb617e4c753e19bfbb736e17cb0894a8ff1ad35d65eacd08e9d35e4a687b680e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6dde1388d2595f886cd3682a628d12ac6e958ad186464ca68f621c9bc06a244b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "fa037a8291e81cd741f3d3050dd0509fc84d6d2c25ca0288159b132dfe5d38a3",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "33d7de658a56eddb40a4b9768ad15daaee8c42226e5c8b267fcc07695da21e03",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2f9e39943937ee26f5a43f1d9256f4f829f02fa01e5f78402c873fcd6020dd19",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8d95a0b8545068db7da4b2361b6cf6bec7f7015d69b85a4a8a0eb28d4b5eaa69",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "fb7b5ba4489ebeab3099d0d168411c0f8d37e61c4518f96134e0972b5d08b81e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9f495a3c70f51bc2e353850e857d7b2d12b341b653b8c0d4be671fcd8998bcd0",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4bde8c35db8c55b1715d0f81113e4982e635bf64bea73eb5a5fd112338045e22",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a3783be8539c95a532db05c649edf42e13b9f6dce0d9a303d6961b318abd3756",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "02bc72feabca752a7fa96201fd25aba86b92b129b1b72c168725c7354f14e8d6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "231089fbe646d9e3d2c18dbd4a153aa73aa77e78e79638e4427d50fc9a121edf",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "da01b719b563f4f80c967fa44715f02b3b815696ca5f22d60012cb43b440b99b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3a126809e4c85a0f85a9d778ddcbee6f96f210313791dfebde13c71cb2889250",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "bc6d1410419a9acdaebff6c0c522dde50bdbf4c2d3452cd0ad4fc972543d7b98",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c5abaa50b377a2ddb58ec049f3864d3e66577adf1ea1f17687b0282ac1d4e6e1",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ca76e5c014d9fcb304790ed1e192bb12630dbcae53179697a0c19ba1d195a823",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e8ca115b2163376a0dc074e73013012cd026275f481fe8e1004c43222724aef1",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7612652776cea551f7755f2e11b042c945ecaa5a342cd81033a6751e11165cb7",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "43b9c772c2f944c830a4fd8ad07209a79b680786d81c2cd3af75041b1c28659d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a3a0f596436bd2872f1dc2302bf20d35c3b42dae8e448908933468e39cd1c298",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "14cf4daa1a44ade401b360bc615486b58e44e54300766bdfd8196e836f57714f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "fc9ebc881fa74aa7a1f3a88b0903e5d51057f4fa309958fb395bf9f0ecc55fdc",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e9b0c822bf142bea3b7b87415e7705f163437eb1a1f1560380b3a7357b1eb9a9",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "458c753639948cdeb72f0b445a06f724df30ca989e8f8eee74bf81d8addc691d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "df1cda7753276d601db680e6f47ace122c37d2ea2005eaa587f19701fb7dfb8e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "90919de1295673b194ee7be3ad5f7d3bb6077c4fa653fa7eb398ea6a74986ca3",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "125724d7413a6c2f4f603f2120575a385410258650ce7cf01a4f717c9b274682",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "11cac22cd3bf76b0c28737d4a97935e88f359b8ba140d99805f85e1abd44036f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "97d7760df5952e2e4b7464a60310b6c92f30144a2e0e2f4652f8511e98b63175",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c2e11f452513e00ecfc78aa935191f0ef9e853913230f1fc34413a059d461c74",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "60a0c91c48c595bc66ddf5478af3aff95ce7612deb15006648b39a358d83306d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "99be64d31da1919fa8538fd9ae1245a0c8a928c93077ef257b4690b057fb1f36",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0389574c3a2200dfebbecb2f3ca1f471f0d794088dc136aa49b82eae2e957c44",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2882764f68379a45fb37a3af84dafb0d2a5359d48518a975c28c260f7cd60094",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e771ff38c68ca1bc174de3407e7238e59bbccdb26a9ae9da442dda1576b1d80c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "7dab019cf1889e8b74a1290da91f6718b34b07023732cee95bc20735c4f58fb0",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "df06fb0ec6edd644f4ff7a4d521532e15a8dcb8579e0ac48c57db2ac7bbeb2aa",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "464eaff02d5c59b96024bc0313366ef8755f2a8b749394fbff696c6a768bad44",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0c6591569ab4d58e21eb32e88dd11f076e3b8f16705ceb5731e77c10c7285a17",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1847c5bcc2f897f088959cdd44c1fe9ed7f7b7f687f09734144a61f6a12b545a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c2faf8a694c50fa436fdad6df35b3e5b41161c1ac5924923aae74b6774c0f5b8",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "214309173c687c093b29c93dd26e06cf8203a38eaa40c8cb7cbe1d429a9ef861",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1e0c780d04acaea325e1700e244989816fe97f819b6d59c3ed1f4ccca0909005",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "497f3c0bc83f449934c5f6d27f3d6ffa5ca4052df73b96d950942cb4c9fc36ae",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "35e15668aabb562e92243c9195a69240339f2a90a39d4e0ff7916f02ee9325a4",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "86be010ab6922970832cace656aa90687ef24feaec8b8e2a432b9746a14ac3cb",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "363c37ecc86f758d33fe29f08d0feb04b5c194e40334d3f5e03231ae5c9ce94c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "75fe8f706d73a8db4cf7b5ea63c771f16f2c15b3f9c15f23291d472c0d9d5bad",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2a64caa54530ad14cfc5b7aa02c5c6bca7ad4389771cef315538c9ac68e02d83",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1615a2cdb634a8d5a43dd52054d7b491ed219047c3a58ce1256d27a981a9387b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "eb0b83aba35161521027fd525f1f60400a78af05de2f6561345f89b67dd26255",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4055548c87f5865ee06c540d8e85bee0205c31259b5a944ed899a335d0539d29",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "542f1f3c5ed5d47c894220cb2e45b3599c9e65b9f3b2414bafb13916913a9527",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "77e44a654c45e46d6b9491b2a1c18cef44be53f7ffaee39cd6d9de862ad38bfe",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d815e7bde4e1774886009692a1c2d92c25c8c9c2a7d6a711677fe11298313887",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f9500483fbc9b4520acdc9e1a7f36fa63746c475b2f4001d91296ee1c5b0ad72",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5a3e25777291543b2e437b1ac8ba9b667a42dd71936137239baf37edc9494647",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8c17f79b4a2a1b44476546f225536a1d77f18000e17ddbacb5fd015d33eaa45a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "05164157ff10aaefe941acb42ea08f27a88cd200925b052d33dcbdae086c18cd",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "48055f7974a3fa1c8c98551caa21ea1861a200964a772012b07e357ba406fd02",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b3111c3c794fa98cff161442068de2be88b600b1b68e9c75fb2a74b128c08b9a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1115321328dec39aebb3fbce1a6614a66d4a4449abc6e88bc1716571bbd3fb36",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "6ba2cd0213960b4be4982a7ce425a86e73f85827fc41c13415850ed4ae0a4e90",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4ab60d57a9bb93c9f8b246436107bb4de75d680c026cc5fc737e6cd6de4b4423",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "072efd29bc10b419be0c8ed7511ca2af822a07dd73845ee2c836c35e3468965a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "80940d21289ad350876a09dd5d16114a345f726b54fa327864a4d168ac1cd08a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "18c7637df2b6e82a770b19fb574a0220cb37fd2cb05069721306c5b573f3230c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a35d2cd2d22f32d0c70d616fc76c57e559f728e4c5bb70d62aef4cc3e54444dd",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "32c1353b386fec17716b368a7914f69e12b7859a5d861a3a5209eb3cc71a95fc",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "cc68284f250aa26ce06f000e771327d864a7fab2784043b522d83bb753e907ef",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "17d4a956ce5138249e3992912b554bd468cee4312b5dfe5016ab3b6305cbb80e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "3a80361b1f7bad7394b770831adb148a27e16fe325a7e5774db488aceb52cbba",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0be26632ec0d99deea4eadb246487c57a913beb7f780fa6938901cd8dd8f142c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "847f0055d46716582ec6682ec7756efe3f466c09715ce8d805ebdd3370e303ef",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1c3748728176ae920fe0f4d173163ab7312ca0c2ceb14aadd0984ce40ece30f7",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "01aef10a774f2e127b773ede4946639026c10394087eaf87f9394710151da4c2",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "7295a22c075b13f68c7b36a35c4f8d50adc49afd6c20dafcd5d7ab384d2c0a6f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4779e595def48c6aba1aa8f1af31dc36ee0dd4b36aa5fa68af72aa8dbb2db496",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ca67ad2c4254f0e1a2679c2a54f0be99df665d5f61acd16ed7f15a7af5cf414c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1cc3d28e300176b9ae019757ae7e90c8197308ed81432754a70af77526cbde44",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "84e0a1764e4d5ca0845939192925f8a6feb958271368788462f5a2ec24cf7e56",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b2b2cc8341a30ae750fbc00de6f282d8fb9bd670f2c1e29e3384781aa8cbfc8f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a42ded352e1639c1de9afdc3f7a1107a607c8fbb5059d05594719c437e4fc53a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1b3d07cd6dbe182703eee4c7af353b2af75a9d5aeac06d8a7737738120c9a255",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "729396ea0749d5611a5aaf93c9f9c9b44e6f39b896f0487fd19b87ef478217e0",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "145dfe6ca88e22c01950537dd2a64374d659d9d628a69ad346087a284602bf8e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d25593c277db2c1b43638ab403daf78c515b3d1bcc377fcb1238be47b93f3d2b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "11bc95c1e1567095393b3e823399d53f1607ed823f60e7972f45e31224d0a1ad",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0d911370b0d90a58c618b7f84dd8f168afe34e0b920de93d55af4976f6b965d0",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a325c9be14c9243efbe849dde4f8d46a14ca573a1546b5162763bb8ffe4e7551",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d3224e14c161d5f1b617441ec49c2937190da2a71fb24854d6df3345272ec9b8",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2dc8ff0f993a105cfd17395cf1fb48776f8ee5d81d335c9ceaafea7963c0934e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2c419e9088d4e5edebe05b9319a1352f948821446784b2db3f11535b244e6cbe",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "edaa73e055a5164198153ae79b509a280fc8c86ac63e299bb819cb5c16ea77a9",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "036945479cf593412a6926837e0a719c7650f0e9443f1c53285450bcbd0fedde",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "21ab4e2550108e996055c286e97aca73ddd70c1b7dd026716e1c725cfe142053",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "e1829f5ab0355761158d19772b420b144dcf4f887cae9fa78825f1b84c6985b3",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "29e6b96dff6065d867f81c755961f0fd5774593e59282f5eee5b69bc002aaf85",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "18a72662a657dd10805d618d38e4365414c3fde6a6f15ee10a76e0866b5577e9",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "34b73f9ddd19e5db4e99bdddbb57416f4c9463c0f1515959740e26ff45869f7b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8693f97dd7d435f5237a6b8f4acbf2077ef8da9029ed1ed6ead95d06412eb8e8",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "fc72fb486c4d853ad1e84002a5d724286e6737f94e78ece4b8263b907aa49237",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "e3aa8f86a391d143f3369433c2323886350cdcb9885c0595d4a3c9deab4699e0",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "e65404fa7485397be9f882458e2c252194a17699015dc1104f1bd6399760c126",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "a019f0e00f9ddbdd21667ee10effedd3071e32584bfb6e2021fe49c5a0308808",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "67063bba38d67622463c435c238f686bdf57cf1b67168784a54e9db2bb28ddf6",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "e147f2873881d375894abba391c9427bca8615bd6a55116f1c82f15c3b782632",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "f0c9c3b2a6b89feae2a1a6af30ae9b688523ff660a6813839e1c53a3fff32c97",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "e39fe0f204fc92070e780f0e4c148310ff174d9e4994e5a5f79ada5e2b7bb56f",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "a2765478d558d84eb6cb6bd70cef1f19fc6df8506f60654bc2f19d01f54fe3b3",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "230d6117f14b13f2a8123e0e9d71fa9650dd1860391640278e086cdd605404d3",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "a5c740fef53b5171d236502495967b22a0160034f64b286747f44b3a55b08d9a",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "58d6aa1c8380e8a7eeba87182a91349e7f73df14267baec7b99cce374667cf84",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "4d68d3565dc8c3b0273057a7ad7315489969765faea8cd850867ae9244c527d7",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "abf613ccf96f5d5be8eb397641ab14811920b2520a47bc69ced36c3c0b8e5422",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "1af100c24e7020f2de08e7b499e3d5dcf1780b5ae4ed99ef6ab0d1440fda8417",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "1f0195eb548d15103cac95f39a9eabfe262ed72d2be31acb0a0e0989751e8dac",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "0026fbcd73c8070055e0eaf4c60620ed72c0654f7176b1529b08c086c88562c8",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "f23223e81e710b06adc1f834c3d07d94f9b142282a11bbe52972a69bb068026d",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "987552808e62a9d425a31b1ca7219d33b1889810ad4d59f423e0d868d8df675b",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "6fe119e33bdb5bda974af41dc81eb27604e24d4153f9e73f0b570a89c5625608",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "ade508fa7c63ec8be23510b6413c72e259f65586e479bc48104aebe2e1a610f0",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "f23f3f3e0dee8227bf980c816694c8d540b99e02a15b72b814b5d175915985ee",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "809169382b86753192aa65ec05f9aa233e2870344f2c90ebcb8b389a9bf74063",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "05c42d10f315b72fc256a64901d16abe418e8734265b6fdc366085ae7173835b",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "67cfc6a788d0db4b4fa5e6cd54598903130e7359d80850c901f4f4829252fd3f",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "0aa05e872b2bd5b66573f5c4736e8ad6339ae0853ecb9b59365dccc49519b3f7",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "5efd39f70bb0b4f28c687d36789eb5394b0980c016c884cb2db2af0be957bfe8",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "4e81d2c973b9312c34fd1cd9accdd6971e8b4e47ee185c6a53112fd07bc97722",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "f4f716264c38c0a92d877a4048bf5920f391a12990a9bf0649299b16b35b38a6",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "0b5da1e8846036c1b675d99aa0ea22079a21f1376704d7289f136b2d221f2f9d",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "763bff18415369a67848c93baa4096df99ddbf40f6ba8d18cd42d195b572e979",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "49589905e79224d84e83ee1de9a5171ab6975abf560f332710524fbcb34be1ec",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "fd80a8ed81cbbb77190dd8f864b78fa58fcee2f9b1b1de7f588b7bec9955a82b",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "6478c206b6cb507773a5ba950b460d4e6e4e4a61e27b054e7a0842fabead77b0",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "77570e866090af0aad89e81a748e090790d68a8d54128f1b0fa8da6c23ebfd3e",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "e92e95a12fc66057ce13b7759d0a5a7fc9ba2d6e86a8ca2ed1b667c78b46cce4",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "cac6d26cc0c5d75e52c5bf44c431a3e0aac293812696735e968d8322f622c1a4",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "e820de636cbaea5bb83714f0640e897643b023591262dec79cb0682ef21f7983",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "f9a57fa485ab562c00ed7059b5a5cc9b80e8760c5ecf6419c288a11d545d5f93",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "9b8b88d7dda4b14bbe56529b4515cc33720e1acce37319574bb7794af8f1307a",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "48f4a68ae596917ef48fc15cf2ff5407922449918cd66356d2cd94686f84a2be",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "e1b311befa36d689dfdefa071013d6c6a4b7beadcc8d28c9dddeec472044f210",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "54f1cd16561adf8b948fddd790d2cbfe4bc92cb7092fa91ed2da4ca96f1b1f9a",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "eaca9a37acb2d1bab91f3e778a2abb50d845de93d55082e446abc63e19f553e4",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "d0af37fb8940fb8093e231dfd2262c974c024832dad16866991a72be6c05b5a8",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "810b125aa7122b96e55a82bac9393f8d0ed67afd6df5f69533469f84f6e4441b",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "dd7e3f14d0ee9ad409a44a461b069b67760f62a9fdb8088ec3c239de24b7fae5",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "9551ff32ae46243e7ca9911755a6141b6fef407a11a9fed4ad3a615158adc2ec",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "2553712a7b9588ee3ddce638b532c8ad1d4ea696be067baed62ff6b2bd10b543",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "e832eea5e2e113ee6d2bb52ca64dcc2c62388ba32ded73d7e9672a95dd7a292c",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "afa29b4e64f242c50aa1039995927daa440ada1f7add54e1e1374d4ffe27ab5a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f13eca4579906121bd1f42f9af156f8d6c1f3b298c0fe9c2741dd55bd6b50fc2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "304cb2910d0bc42e4e54f478e89889a3ae604fe801528273ba57d32e2c146234",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "82f22abd9f870267d93920453c98215e554f64b0d0c75079dffb7a2b500ba2ae",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "dc37c539aa41ceae817f7c94447af6a1f14bb1d13e89fc017b0b8079cbd18a5b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "186619587dcdb13d8e59c1be35feaf21172c48573d46c9476a3a0046db1ef416",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "88b79025ce5ef9e1819285ec7cac4474410d5d254b25a56659de73ecf214ade9",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "15735d390ac560399cc1955fa5f46e86da8cee5330c6ada4b5913b8a137380b2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "30c8fc8761fafa5ee56ecbbaf7237858cc1d9817f6fab91b4d7aac4b7b13d60a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b367de607022ff07edd59ac9b30e641612f0f847351864da5b5608fb90cbb94b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7bdc382b80fec6a27755a659972915c51b221adbc3f180ac8286eb751aded42f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "bec3ec3fc9ffe1ea6012472e5e72bb96019a94d8724ff7f1c697961aacd9d8c3",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "1e230e3d957d211b2ad6cdd0be3e851621a410785212be0911cf90ea48a3ce0b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8e273bf2fc937c1ee2a109c4152bcc03cd632a378e3013ba81c33b6a7be030bc",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6fea466831b9453dc933dcc069042cfb30b5f98d13133c92021e9c74a2319d02",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "407916af02376dfd8571f50f10a563a9695bfca9c280905079680e41c7c1d35a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "570139259e016ddedc2f2af2ec31ef144bc6bccdf21d673fda5f930813d09757",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4aeb9d3c0f6384ba7965cee7d755920cff076b74a9d182cc1c98814280e93787",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "aefc8131ba26be3ec9ff944ef553134975027ca9201a8b2558b51fbd584ab0fb",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "dcb675493227af7e8312e8db59dd0fef882116132feb70e4003f3451825ce2b3",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3df55b3110be43767f617657f6bf31a4774e39098f772f783f2ee57da899f025",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3dd9ccecf3a19bdd5d7fb1e0e7a5a6dc0cca6fe932eaed8fa296d738666cab46",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "85e690a45cba87bd62a1963789135efc539942d4af0d99e685ef3388bc917f8a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b72dc665dab6781de93542694ffb37fb30364b2b879aeb26ca2f95fb3cf1020a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7ae20145382a8d6df31a110b6818c0120a43d3f7ce6b3860c436740455e034b9",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "141eaa1edc46471e83fe0a8b19c1f48d2f1824b2015897e9c36423584b401457",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7479d7a75569d16eab319269e1fd10d58543606d00c131ca55e394d6cc4737e0",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "84c0586c551fbe82a6a5735d865821aa11ea4d4b8ab90a8c8737a72917b29ed5",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "fa47dcfa27822d363f4656f22c97c4177bbd9c33228c9ddb528e7b1167655e22",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4749575a8a2a46c8ccbf74baff77ff85537f05ff51831a1e2b374be00348e490",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c742033e774147d7e6e5165d8e862a006791ec68a1a5598f96947b59efb0509a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "487234b0e43b1e361d66803e13fc57d1a4773a4f5a9db55f3db89fdc5a1bbc37",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c4f756399df877f4e43e5a939b78ddf882e6744c40630c78bb3e2609fcbf7be2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8fed71b824c92f58e32aeaeef39136cfda940efa8dcb3d9d52503eb13261022a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4622adc78d0f8f15c519eb2814950a83d41065226b1595f7f73113f749203508",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c27647311a0031c05cc08d53f5388415691825cdf593f7b003d2527576883cd4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "69add25526e62a8f518cf837818aa521aa7052af46ef7195fdcb3b806a665c79",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5c23427ec6046ce79525c435b00bdd5c3f8d2e547000264332eded84213514d9",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b62111e2cb2beb2fea62538ccddb4da80186cf37e5998ec077d35f2a077081a5",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "80c4a359f2fe7a8dbf23b4c04f1035b757a76453cd8041aa9ed8f8027a1d30a1",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ee41498d67f73c8abe15a95a6d2dd6f363250535cc85e915cbca257d6c37784f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c8fd4e9edbbe4677c31eba222f3955d156719ce12732a811d6ef29107a71c4a5",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "98403bf1daa512099cd9106550a8b5a946b584fce33aa9f7184be9a745540fa8",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a90bdcb531c49872259f1927e096435adfbf41b239a02215c552e18d26c96d5d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2f3af71830d2097469325dd3109cb55c7a0bcb39a60c8c75257871a247f10aed",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "39ba5f7180d65f063403d9c7f47ecd5a356ba1f8217c657cf15c28e50e523edd",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6b7b4f83e6c99497c6a9dc4e313604bfd72eada23c705f889e22917c64ffbb8e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "825d25f2bc1ac0fbcbc10fb81d2daac4f21612ba0b106210f83945d031e49a67",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "75ddc3d419886b90b6eb34b4c4d76d6e9dbfcf4f04dc8e896061a66bad4a3261",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "61cab6cef1ff0c6b96f3ac660417ee4f83cba985e6a6473bce7b6dae66693c07",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "437458b82aa32ef9ddf7d28227740343e4566d9ca5560f398b3815a607aa4586",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "95fb8bbf220442d6ac05a6c76d36778bc0856fd30caaaeda848f73d6493d7df0",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "df8382f94aaad84d2d7cde8938e33e664900f1eaebd40c480e141f506c01d034",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2df7f0a541e19a4f42d53a3f1337be4f7eb493df1674728516cfd96be3d78f42",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "fb218d4fa05463abd7e43570a79a08e7717f88916befba19063b499d0084917d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c81b5d4bf27eda41fa63ce0d67fa7af0852e97a6ce8193e3ab8187a43e8967f1",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "296c4902cdaa7e283ae5e9dcb10addf8ff27bfef899f4af5f94fefcc49a12d1c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9d7db557e988185cc8dd64d8d0300ba4683b1e22605de3f676297ca8f136b71a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c170b379e783e7e44ff1a9188af3e4c079a6bc4933c28d600291c0fc39c912fb",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "172282bea32db61a51d56fc7dfba62190ce81be8038a1b03151f48b3e6e84ef4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "748b627fb59762fa4c21474a8b6728e0421d48d8908d302237eaba7610fc1c53",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ad19d0d3093d401bef62e845ab8b03b0472384e8282278136c76884c5cda6b8f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "07001cb143996a90806725f3687e9fa8f010d70998a488176db37a0649376984",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "53bcdacc7196049352f1405ca516e72bf9731aa04e41e09c040495b714b6f5b0",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7d6b331bb9f4b52f57bda19ee5e41f8e3cbb9cdb60c6ab061d7cdc6ddf67d2e7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "455bb22379ff7967798d279179ce5d19e803ad0d4144e0dd2f68690c96651177",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ae563492c8bc02bbebcd02351a1a96f5e9bb3fc471e5cd4cbed85ca5451e9b01",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "955a101267eb8e1f4066fa3ec101d4329311c2e062d9eb1dc1acd9413f622eea",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b0f17987cd21e4ac419e12e0b1797e56a4eb82e016b71608ab57993bb9daf31b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "11967382b5568d8a7af01a0c8f721d32d5c591342cb5b8e98096e7c4c0495858",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ac3c292c02059183bfba3552fd659468cd28ceb0da4de8c650bca6e798fe424e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9d39266989f694d284861918df639db8e6b10b4651bb38fd67444f81f6c71147",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "df017e65e4810f7e0ed05a98f754de084233b5e49e45ec28289134e1e9aab145",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b1c5753e2f658d02e4a6d09f31bf4203482f73a6810d7d8e532fd67d70ac7e2d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "bc45c97be73665a3a268c7561747cedfc7d8349cb19bbd74a113306e4ee73037",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e5565920175ac964c7f18b096299951effe2fb4f6a0c3c4172f8cf0f25c2ae8a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c121c680d17777facd60947215bf10753b74e71771e410b94d842293675fe1b9",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c17414ea761a83929c9d66474364295f563278458f865e8e677deca8f2565529",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "dc0d86f3eaa88e64f179d7f452d5174e1003f4b9639b3b359f2ff5fb24ad6788",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e6450a680db1102b2fcd7814cdf0b39107cd5637cad0a7d05697dc7e8cafe76d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2ea597d0628eaa1cca03097a1141cc8ebe6601c90c0b715886fb2b9de0d7c29c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "37680a62e1d5b9c68c1c7620ca2455731830f5570c6532acb8b33bb414b39339",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6d0939cef5dfd0d2584f5887ac45010322fcbaffdb7f92fa045712bfbf426db1",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "77b5451ea9959b33341e57d424981cf4c13b5786f31a57457b72885f4893c11b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5e9496622d28a6e13ffe1f444c4a960b501e5c79d1242a24a496211de61d643c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "aff1fbd29d3b4f87a4b88f6c14031c1d774f4bc703a4aec8dfa0bd5fd11a0109",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "87b9c25ee008456c239fe7620514093b6caf16686042ae655e51856fbf9ea8a2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "bb19350763bcd9b83b57355c988e4a14c1bcc6ec5743fbcb96b8c6e0b24ca447",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "793eef2d1d7b2f26992758c6846cb63e99b5220308f8e49478410829d1fe0985",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "125be7fa4169ab94f7b97f2575501bc930bb3d47759b13e3142d8c0ad9127c5e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "70f45dbbd5a322bbc1f577a077a356d80f00a3771895379be317d757c0a101ca",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d6a32ab7b545d9c52342382bb92d465dc65d6bccd99cbb240ec4ebbf2d8fea76",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "bd0596cdec747a1ed37cddb9bbe1e69224c4be81ce931fdacaaee3bc191c96bd",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "644e036382be944f0a64f602eb264ed74ccd5c0a5f5f9ad9fbad604fca90dcaa",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ed1280f0cea4d359535e4af274eb144a1fe27f364ea4b2a2da2c3a9307bc9541",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3d1bfb0e1d184a12c03c4acca217f780f6e9f94a6d97d37e6b33ab6bea0d2b94",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b0e5b1c02235dd29d44f38c63f318c55abc5522a2f337e7dd80880783f404225",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8b23c43cfb9d7d5bed3901f9a7b7607f1f1b2dd1b2a3d2e2bf88fa9e289adb73",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "95c7dc6093c12eada0c262f7ce0445d7913dc2fc3129a5048976a8d84626e051",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7d7337c92eecfab18477a70044373a53ba18778c0cdc396ac6fd535d5dc8cfb3",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4fe94181e3b71afaf323e9b3dacb38ae674e7d2bdc64d6739d06946ad3b95bf2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5b8e3035da5542e8293df37b405e9b88435a2bb493351db8a2fd7be5efff21e5",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ab1998020be593bc06985cda431fe98dee778d424de51f5fa5f4272d002e6749",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2c049d926d321d516ce2fc3d8fe119d9c14866b8c8dd36c144725b36ba388a91",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "90a634bc44c04131908128db4e2696a4876e25f4dd3f6990748d656e538eaff3",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "10d3bd1bfb52880852941e0b813fc51797695e90cae0e77795fe7f76d868dd33",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c91b4b6d3fdc60b75f02d86ae2fd830d194bd92cffde2e7838d8f9082064f8b8",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "17fa5372aace8b62973141646c4e17e391c59c63c43d1ca57388c06617aadf87",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f691d889472ec35e45a9ecb15c07996f539d30afa68551fa8ce649dd4e192116",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a3e5d2efa3fea3c56038e77009d4524a4fa1a62ed4eb4d64b9187c046613043e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9ac63193efffd8c856f1d49893e690b31ad5e0eda6c5b5816d1d48c8ca22435e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ef1dc7b1df7bc173e64f803ce1a0950e79396121bb59741beb287139513cd32e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "90c43ff94bfece21131fdbd473a0bc4937166480442fd46dc4ef64855323b0f4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "87cfef085488420d791b3ff9b5fb445af87b28306093d0e21afc0693b0627bee",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f681c3fef82f22b01ff085c4c4cb87ffa59ede891d05091fb38d1f0298523a3b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3a3b4f32b76b4abff0863f31901844c5b5bbcd008b8c047220776988b1a3e594",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "86f886846de01a34d95db3d8db2c0f11d875d8611df8206a7990455450839e58",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ffe144c59d64ad606b97163e86ae46f5ea73f5ff92c097c52249113f48547320",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5ae11eb075539e7e082475f6529542729e3577a8392669701619a943e476a044",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0fa43cb150354d676489eb2cdb0c2da432b1ae4f77bb97b9d029e93c997f2ca7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "1b67c46a5d3652b0631bcb9c44d0d61b58084ff896e285798c49fcf28f95312e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a10806b3b975644d7ad39f93c0348895e9f75525d51df49a0bb9d935c8bbf4d2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7b6d73f7411ff64d10ee6e573163d0d1d2f794808555aecf2987f3c0b6e9dd94",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6059fb13065259950724fdbbbd01b88acec79c6739a171d687c39a3cf762d405",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0fce4fc98f42e0751137395563143bb64b62dfc57893b705be4c35611dfed7d4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e6a25c6ce50ca9d36e9c71bdd9705b68e96e25a61fbd57cf042e44ab71363017",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "96a777e0760c2d9a557f8ff14ef562d59cc1ae1fbe5a1b72554c8ad658f76d27",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c76ecc812724f097d15a7c08b468f0f1cd4e89f0f6ef4b85d5326ace475358a2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a97c5ec5049ed629162e7b2946c8f77476f747d5db978fe86408070125c4b6bd",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "38ad61d299e68c77a52ac7b4104c1d95cc9f5989246732e628849ce4072c403c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c8deab216ae508a01f92f34b79f93df5d24922eb34b7339d2cdb927aab11aeda",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "fa12f3fd2c4696795d31364c2245a1279623cb26a84735446a8bea6775976b04",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "084e8695a3b30f31fdceb5655b9cace3c1d5c61db6ac63a1549e4a224c9cfbad",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7b58c4e89ba3dfad4879057737948b127d13e44b109301398b69e5c565c3a6b8",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "29a11438d13d4f2fcc104dfcafc730f56764641405beaf8a263dd3b33f9e6645",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0d9587d3bfa11bd54e7e323ebce8476f0a767f97b58b059fbe1760680d6c0ebf",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "10cee1d272509f304a0ec7b00722004076e1dcd5c90fddeaa9b7594be99a472c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ad33bbc595127828f1fb995cf43d749a1d6638e4337e1106c249b76800f3ade0",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "aa42a5a9b36cbc148719e2f474c8df970bbc96ffa3c2615b9a78ad27927f74a2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c14c3faeef4346c5adb8977c73807cfea13af5281f439a925e05115b7166a220",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d4e010f09124bd5da35a148569d2adf82a22e2bc8a00eb8650401c97110bf178",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a4d4140e59739af3827d6ddd9ca76b15b10b75a57b584117a127a442d59c47a3",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "480b6710f88331f204fec4377b751e4f657d75e9683bd69be4fe3bebbd5f6cef",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "734be56b54d9df8bb74a6cef6c7b61ff08b05b414618d68770e315809a0ea554",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "fee79b52cd29261c54e9ae99fc96f462cfdbe4466b4d4149219675e168bd9190",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "069f704f9e002ab1e179abde21cdecdcea462f226c8d93b75c3c53d1e76609e6",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f6327fe6774f6d44c9737f0aa39aca2fbd67b572dd5fa396217bd676d11d442a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "cae5ca1a3d74ecfd23766ebf6cf3a1feab31fd952a9f8efbb1067def26f2fb80",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4e0befe2b16795777582d9f23b8945a2bcf1fbb260f4a97b863bffc5cabe8929",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "1003e2120318eae1464b8fd7c1836efd1a363d829beaff884f8a6aabf34da177",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "32ba5f0a2e5d4967e0eea80e05754a16007f9bcf5c1d422cd96cc384879659f4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "1118a51e42f39e50bbd9ca0fcb494eca7fef99d418b40baacae4f62cf7624f7a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4da1478ea31b931df66fa869841ef76cddd66984d0315f913e6d4828d7614f89",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "dc68e815e493b44946ffacc9564192fd4a05adcb7604c88742adf974ff60c8fb",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "1d25f0ff2bbe6dcb4fb542cbca68af8d81187b19ea20008c894ca81137df830b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "24e895ac19d2f44820d6e880c34bba3320fb0ccaffe334f8bcb2c709edb51f4e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2101b9819eaf779361958af61b5f6f8d5285eb99f8248ec9c729f6e1d5810a71",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ffdeab1663b99539d6cbf0a3ce76b3077c27da7ccb7fe330e9c2440e2e75b6f2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8e9041c7066a1fb5ac3156e6adb523f410e330290c1f3969b53682c470424be4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6a54955d285418c61c1713751bdf5a76244ce3d0d075f5a95b82af0a2889b109",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4fc3a5f99c5f89b448f67c8b862d30a72bb2c43f8fea1791531d439fd7093ef9",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "127799f8a5d9420ce94aff9701cc1b335b900c1ac491868b0b8302d31f44b7ea",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "cc877d83f44b693ec4f16929a3ef39b64254663e7c8d3d3c1bbea2ddedb0ff00",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c08c3ca0cf2b7406dcb71c5c2305d19bcdaed34e946478c0dbb10050efb38c5e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2db289ae91cff778a0380604003fd1de594190d2b838008b830c3ffc8228554e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "968a6c4c6eb129be594d111df4afa821acd0f1e34e438bb96256f4791380b0fb",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5c7c5ed9716aea8dcb5dea9068ce6300e8aec59da849553649c03a9bf6a54679",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b7636b0d3fd4d181ffdeff1e4eb3dee60b1264695d361dbe54c535a8e4010e37",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6c2d2d58ffb1ddef75d7059ccc5da5644c43abc01031cb56802d8f30785db1b7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d77622cda28f39a7352d2ab799554e8108c20c18636edbd04f1d022fb91a6bea",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0d189b97a7a98747a660d3be1756b0be27326fd6badfd55b1bc94216785fcf6b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8a176e096c309b32281a62969631b7d2ad460b99ee96056827d5bacc2b68f050",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9c0d7fb15dcf287ee0695259dac7fe5f4e42ee94cb49151944aabfa90eb2ac74",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a88c3005447818cdc7428a98c42ca51e3c4e524db107344a2c9e8aa2f8233d0c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a6a795a69592446056d07d40aa53646eae6108038a65aab99816ac7643913097",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "fad3f52e851b9b50b5482c16fb4d7bc18963144c3b89a8241dca4db349f3789d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "116084fce944794f07866169201101688abe1011a053fb1a477e7165f02905cb",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e60379a6205622e448a259646b46658a5367bc28939b56415209c90a9b557b94",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "37f9f0d351b0508d6094e8b5b935ad35bf96bbb802a6d252b5bfdb3c1ec17d5e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "95d92ce1563303baeecb405190e28f032a366094ee63f545d279d47b7bdbb243",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3142212f48e093588468d5c8d6b03f2d679f394671d245bd69121d821d15de58",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "68dfb693be58e0eb545987b0fb30cf53cc61d9e4e8830675fe6946ac3468d15a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8dca01debb925969a2f5ba3db8d429d2d96e49a07cd57ed8ecbbe3565245d45d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0adcf3b94fcdc0b0d5ce03635f525446519191d7d8fe9d89d7afc5b0f6ae35ae",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6b2e48975369bbca7629759ab1417a1975a5efeb89fac44b04c7ac132e37461f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "362ad9fa03d045298611d4c1bba03a2ce952ab3fe14d507b4074a8f6265b6f1b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8c5c56f2b409c5f4ddcd1dd65495e3cd424564832b74c7ae7680df95fae0ace4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9d9526dc5e254122f7e7a81a0679a7ac637f3df85759b1f209e4da3ea80a5aa9",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c021c3faacf18b24e6953a0b4b4d65cd1e416d4254413c6d999821026c1adbe0",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "cce6dbcaf604e9029c0b0f2273831e1545c3cdb6dcf773e869100b16de1f4754",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "53e5e447d3d280ec9f3b92e48d1ed66c16f544fe41f55723c85b9b5f57885a5a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0037eafb93670f1f7afa9d1463b0f93b58955297e40e0633c70b82f0098fcb5a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "61a012746700111c9d0686015d3146b36f865542583be70890939daf305be3a1",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6e2341a97035cbb2c4ddfe937e71f537d5561e473dc9850761b78f69125f2d85",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6f67b34ab6adc411032b2f3e303b27b068f197d571006d517d862e3ab02401b7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "37b685d0dc489a9312ad87f81309df5c4fc822e1aaeba933d1b06f609ee20b63",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ba672dcc47cb81d641a55107ebc6bac80c576702d70149e727216e077f3165a7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "18786a7f8c2cbaad512c49c95691e72f33ca16837f44b720041a495d0af00c5c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "dc1397647b059462066259db535dfcd1d70671ebb3854aa088dffa16b884decc",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d59654438526cfaa630e28c8c0765a9eab6f4347436f092f72f2e276378d86f5",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "218ed9eb73e39a6c1718331d2d1a5feac781d8b7e169c39936bc539085b37f12",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3ae4ffa0af72dd200d999d459f3ea33a98263c8dbe4226f81dd30d4ae88cea14",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ca8f2c0331be82aff61a73567762324a9d1d5f7a9726ce448cb4c618428a0505",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "16e5ab3b06c1dffbcee256751f5a0e09bc9eb20d0594a71966385a0d7254aa2e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ae013ff00fd10540b4d5ca3c7d445c84b549dd3adb811ab35684b5ba4abe6724",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6aba5598a2bf010c0d16a09a3a4957e156f676623580d11dbe1b869b9688a8e6",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "eb43c2993a005f270e089c8ee7f247e093677bfca56060a757d2c34421992d7a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a63163a1ea09c52f3bdeaeab437dd24eef7ca3301c4fde5e16fa23435c0d3b7c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9551849a34af5275ba3e88d5b90548914ecec6fd7f02c0a0318c8da07e636592",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2d93e49b643dd28fb5c4f4b49e2daef84a54d45e7063de680f82a3122657e7ca",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "dba657c7885a727ee7b878764c5447296381f98bd4b64b4a00079b11844fecd3",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "470e2b87786c04cae3502a4e7a5070ed39c46e68d6f554ddfe1f9ae15fac0f9f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5d22cd6352511c4b17f539e4f4b2b1397445467f66702937b1ff561360f9e0b2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6c861081cbdd8230c6c6a1e858cf57b984680e0a380046a61dc8e47777b183eb",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5f044ec6069832331a0bf08b6d20572a6ebc65dd2b6a55760c32eccf7a60c93c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6bbb2c533b4acd4a7c22a1438f8dfee57dc67502e044f7c1210ee788e3e3b9eb",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ff29253c715049a89a0a33d68306e7bf0be47f566035b0ff1c87f81b1c2bedac",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "40f99b2a18dad3da6194c9b0f39798762d98feccb877de7a206f11e105705a58",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f4064ae3a8f0b018ebcedf0a5df1ab361de1138e92ad4db572f573ec14d5bad8",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d49144bc0f1b964000486a1f482d2569caa1a0a6b40347926b5ea30b4d69dc78",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "607a3460bff406e94a70670d9858895e84348e7e4308bcec93df06904bbeff35",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ddd6453c309922ad9e54b015ff0c2ef90a2d57e10e7275d49b0fa0865c9078f9",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b009e4c010b0c54f0f8b3cf4723a8db5fe1769781e941ab7f34d26ecc71986b1",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a10ef8ea28650954286f5d4df6a564393b1abf5fa4d3fcd962bb679b5b01a61d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "04b94d1b0c5947878cf51a56517dac9ba681bde3ac62c60c1bf8c75812a25d8b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0251885a39ef55e72ff872f188b0272a5db4aebbd7f5c78342847faac808c9d6",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "fb0bda5809d50cb9aea0cf56409a1d4c7afb67f91254c2acc2a66f1bd97f4519",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "58410c45403118051fb4c991a8b45cad34e2bd6f75f70a018cf7ec3a002d0745",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3fde10e2366fee4c47b0673fac7a45185a83303abda8c2403a17ab1004c96e2a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3ee7be994cfdc3ff0e535a69e8bc77e1ad50ac1235a5656b92885d713cfd128e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f98502104d9f3b36a09084d8ca1915fbf01e9de13e625536e5d83318440cb9d4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "35addf220ae683500d958f56d5691b0c02d996b11ea443198cdfaeb96170ce13",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d570d7e8ffd32c99f01a5d03615aed4fe770b3698b1c6015dd7a30bde2468de3",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "47b0151e5f54b1ea48861a045e34eae3d672bf901c65e7ec486004306ba792d3",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "1e892bc41229f014554659bbd55ad1b95c2235cff3ab8fea23aa054aab820c8d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0f698b3be05123146472921ee80cf033cd08147c38eebeee8d4d47ef6080c8bf",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "319ac4481f0b03d45651920a8a32343c365c086a9f29f520c38829ea14258bd9",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "bbbc39b5ad66059db15a8d1d42828ccd9af0ced4b006c5fc4fa40ef65eb82fad",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c96e29a9fec94aaa9a41aa66a803221d7b7d58e8c4519c819f96a4b8d213f8be",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "62384d45867c3f6f1bf44354bb578224fdbee7d0294365e3e1be4fd7e5886ff4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "136eabe9e7b952bd266f41e7e8f6852295900f2611c0cea2956feb5f1b96a86c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4297591108e67705850f8748319d45818ce196f418429cd977e3e86237790b59",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "fcaa7e3ce96c72483b60d9f18a85fd6d014100054b4ad7133808f126648fb9c2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "21b9cde2a605da17df33b4d85bef27640ee8a5ee70b0b3b6550ccba5c916b5b4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e5f081b4e101f4e951946cb1efb01c0625c1366eecc28ae290054e583989b2ae",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "af1f0df364ad7e02bf0be79b230e2e4af698708764cf80b8813e990155c0b5f0",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a77fb15cd5f3dbf864b82bb32be245def675461e19b5020707c9501d327b1cb7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f29024f7b3a8dcb5ec481e913fc17ffa9fffb1a98aecd4bb40358b1f41790026",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "88ecd846125815772a814daa840cba0c406d730b06fd0c5682600aa47aa99bf5",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "488249db7d4b9502f4f7378d834ea1f9304f3183deb9cc086f4c1feeae87a7a5",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a3df0a654b6d5df8dea1be35489cfec948a6d271ceadd4d5b2555be0c6bb6260",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c82aa637a78c2f95618b8288385c5d58aa5d5b1944236f65543254e3e40ccba9",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5b146e05952df48b1ce091211462095e40822c52525b03125de1c82c0399fb7b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9711b43beb163f5c2a72ff14390069cf990dafa01418088b4e3f8cc77a3894e7",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7cb1a42a1fa98d3402ca66d7d1634d2543f821b890b60177f63ccbab20d29fc2",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "fecd7ea205e1d24b804f33146d1c07d07530203c88b24e2b03597163a3229f22",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "90dc88159733d504ceea6b0c1f89ee69a18a4fb7b304d74d28b911e5bcae2ba2",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0c0c5cd7731561a7db12d8c0f1170016adf38e270b70fc0e90d90eff97f0fabf",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "fc29e6cddae316b406d25b94d98894bb0997021d96b98ec66104f286e3cce18e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "de1b2b3e85b3613d97e31ec816cd2a1b5565730b22a46b2f5fc0859cd2e1e5e9",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "233514cbf89cb12bcbc8f00bffed422919fefe4642ecdd538161f8cbbfd9b837",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "45b6fbcf667355ce979739a0e8a6c7819965a27f3a37492f024abe47ce882905",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d7110c06326c177720abdcfe9806d068fcfe08e98252dceb992bc5e644e7bd87",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3a1dfa70d148712f2f9777207a2fed15b091a1a14c251240afffc1358800373a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7893635cbf4752f151583bc98bcd55be92a657995984ab68924daaebd9c1c056",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "28b50c306177a39a586e21bcf6b30a79e697c4055c3f52d17c8f0f29478beade",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a64edcf9c6a5a8beeabc52ae3864621c0aee6fcf6490842a3de592d65a749e15",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6393b00adececf791af6eef9f6b7ff2cb799f8bab5873856790b832e1632de32",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f4cd96e0437edd8bab248dc0ccb6e52719147ceb8bfc9133120d369fb0f1e207",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5980dbc737674f53488c1ea3fc69a2d0fafb9f538bde4fbe22d093e08b68b709",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "64ec3e7cdad04a5c1218c0ba91eedcdb33a48a89209a88f2c82b34f6aaf456af",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "bb03b5e760e4c9462f23b5d3a246f3734e299be7f7505152c8ae75673aa7bcf2",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6bb2d1264a126cc83b2a076eeff65137639ad670cf8f69053c56f79a17c5fd17",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ca58863c4907659081192b21fe40bffc36ecfef9977d6ac2d243250ba097fb8d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7f020f40ba432f9c6e54d6da981afd1acb60baf44a712c74ff2721b47a0cd8fa",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6682a5fd46fc13b39474d08adff8ff516cae4c3aebda9e9aa8ef608fe56d69c0",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "385f47f5ea0d272d6afecead05e4c4003208a1755d560d61ee6fe862ec6f2188",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f4f07126c4720e331dff16c478649409c3bf680967cb1ce0e1c6f83b5bc2eb22",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "cef883925df023ec911bac7d5cedd97afc19870db7a889bad6d5f83e83653ae2",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ca7a2a1cec441e0bd83f76cb009ba23c0290c3252cad793be7cff956dd36d8f5",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "aa0b4482baa0380058eddd8892274a417a20c543456174991815ea9a59bd6a1f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0ca283d62cd3eb71516706dd95bd0d9a1f226a42a1d59a830ae303e16e3b50da",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "06dbeab6354e73a7859a6f73bf983b669667be311998d3f4836e5ba27180c4e5",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "986a8fcdd67938781ed4ed404448c526e4b4445bfa7b63b6e216fd61141eda36",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e927227594395460d644c1011ee362afba80d83c0df8ec8a380d4c8f3222647b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6ff16b239528e5ae3233572421c406b79997d6a773ed8e41e21a0b50d6f74781",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e84fcf503b1901a6a7f06e138c7751d3ee49369c2726cd173a1b8da9638d5376",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3fbcc4cfda5f2ff207bb00bd94725cd79ee97fa56001c32355423380aee20000",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "db8849ddeeede6019f6cb7282362919de04a534ed588a432d0ad5600026e3703",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ead468a7bb0cde011573f9f1bb6aa86edd6e6ea1cffd64d6142fd61b73efc633",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a3bb26121171553b02879b44b17aeec45094d547feacc30597a16cec30b9fd57",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a5c7aa753c270317b8f1f462a3241abeade7c7413ea2a8bfc05d6fe37fd025f8",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "670345ba68116b3a0aaa055e0a2d0eb6c48cb176c7bd0f6939646cb8f60ea290",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3482ec0836d84222fa87aba204ec1f2548164a68230fbcabe0eeb20a18a1ff78",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d7598a6105f3898107cbea2aa08226c2810fa956c960620d43fecfe6941a1def",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7ddd26e7a7947f32a2d2d466572b7b7cd1cf40bf17197cf47c299fb18582e3e4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1bb45742f4bdbf0bac2fe881d49cb28bc28cc0f72e50c13e653853d9a3395c2e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "959a9ae71a35ec804abe04f5f97f3587b9a53669feffc433b478ea73ce592603",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "35d3bf921d075584991eb37e55a81466d5f692f74d0578c683cfcb163a0e3f37",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9178d7923c8cb87892f89389c8469122f1ae972e72a589fa88692483fd2394f3",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c63e28813984cd102ddb8aa4d1265a1f4009ef41078892bfa319a94ff903bfbf",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "90d700b2cd677789106c049914e3108509c89c954f4b06b229df14fa5d46cc7b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8b12eb1788599c27d6df191784d451ac0684f000c9044911db919e074aae4dee",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "fae942cffa1014454286002c35da0f2f36a85def34e83b20daec096d0e0b5e10",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a6a25706ce5248f0f29cf55efeaa9cd31edfd1d41446aca56a0e016a2416c098",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3d9118ab7ee49ea0249d609725fd1db167fe6795adfa3343c0c9dc035e305c80",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "55e575236c875b26748fd95e2791c0f23d21b4f890efe92fe2dcfa138f68145e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5f3923d4aaa328aa461d1b238f2c29f2bb14735c1d2bfd71af79ce13e0c7a709",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5c5eccc73c564c839ffc44adc8f52eb3874bc1cc32d2948632b9a0a1e2977161",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c30ed856fe07e3007e47b33e9cf93e4224e63183de916244acb359f69b8b6277",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4a407d3c371a96f12b351b4ee5da9e8f0372241508ae34547d049916bf1a1315",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e3b7d5177c4a76af5d9a1c419f64d4f46c88b6bb811633521ee1b7dd049e9b6e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "01395f8614577785da045d6603cb8343fa6f9e2652a1dca90a9abfd7a438dddc",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "aa2f2123ea18dc5867f4c6ce4ae723856f90a3425958b866dd68a96466901a97",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "045436b5c9d8df9653bbe64df966aa2755197c4d972ee1045d3ba5c7cff4777d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "bd1f17f803d8bce55bc1e92feb35630c5d0899fbe4fe284bcad050631ef46074",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "64ff48b003b65a589794964ec4c2da309f9a135d35e8a2019a369647ad3b194e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "aaf4039e000b13d1ecc7d8aed2353db8ba5b7c451c288dc80fc13b054a71bbd5",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a17a2852353e3e8418abac93105c6d8d03a304d185d4b02aa50d2c3e188b8a5b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "79fe2fc865c7ea090089ba0c819759ab7968226cedc8dff71a7f4c8619f9f547",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2b685220e8029309d94b26fe6a18745b143658447f86af4749f1d1ed7013d26c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7e08152288f0d549333c084900469419b5569bd7eb21f4caf248d703100a40b1",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "aab3e8b129c87dc6eb6468a216fd1f4fdf953598177f30025b61a586fa636e5f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e9a2ed9e3d6e626047251b3afe77c470b50584b7e143e0226de8d4fcb9c9eb00",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "94265b21961ece23db86a99ecedf3702f476c61371acf31de265c0154b09774e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "718994cd6d9fc09769ee31c39e34538c69b5bcee30b0026286c422eeef33acd5",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9fd08ebf530a741dfb010fcbfd0c669d3b9a1860e76a7aa9c9b5156a907b19ac",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "52bb02e6c4b6cafea0c59c3e28ecdbd0e4e4b799fbdcc10332d43ca4147edd50",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9ca91b601c5f1d8d7bae01f4fef558a6afab32d4425570139c8656235926b1d8",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "18d89ef0155aade7eeff3f6a04e81e34eb88f1e6499b36b94f6eb55644be33cd",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ba918170a6cb2378b22993431f013a84dc2f6b1d9e6dd45ba8e36442f72b9b3d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ea7983edfedbde8a817b37176a99804b97e9254018629900a6c93f6535f0f91d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "90eec64a0938801c57974f51281f67dcd752e9a8ad03eda76c03848d54ea8992",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8ff4d53f2afea4678f23b2308913750a9c076a4391d2e95d73c44e070bdf09db",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6f19bb774243d1139499167a35860028595f9120725e3d8b0da089320aded3d4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "33fef6b9101cf8885f8bdfb13de29bd70aa593bf783d90774bf0e6f978a03166",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2480bb613500bc75ed9fb65d4e15f0d9aede6c83f3caf3537b5e5d7204689f98",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "22c3f1e26f0f9d9b15329243c8f7d48e1c7549a92b09484eea57dca732d79324",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8552f42bbe8df9cde9d96920b082ad2acdbd9eb6edb931361400ba70632ffa5f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "058f0edcaa4b769c984df119310b7d49f69fd6e1ea7f50de834785664366925d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "96efd34dd3b39cc4afa6537b25bdec68342495807ceb461c45358ef2a3ea6f51",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6251b5be9d60dce8938fb1107d6663d8eef9e5a3e3c3688f53469331079cf06b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "91f8ffe69a19d7525288274b7670fe9d1714219a5bc472b5ab7b308a354d7c5e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2ebe76ead8ab64191d90284012fb2b0256435c5c43e7b5b40cf0269ec571344e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8789447cc88fab183cf79ca0d30618f91664a0cce35e7eae4f42541217a908a4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "86c884a8df60ed810e21f1c1826f6fbfaf850f4ae038697456d589ca7a98a931",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b757f0be048b94e66c70b5ea1365e8164d468689d3a1cbdf8942ab8fd605b59f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d0b858f7ddef6f1178ec2f4b32f8bf651c9346ed5fe9ee93d684b6e12eb44fda",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "958fd8b7d71bb76c575fd1f31b11700b02806467fdf33329e398a4b7c7ab3273",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ff88d9a4a2e634325e78758a490553103e277e0ea49d497bea1c8202da6d70ba",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1f00f4d543607dd73575808f841b14ea12aafaa9c17cdfd8b7dfd64b01701859",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "efdf956a4da61e16130d1df9ad08fec29bdbd18e1bf72e49b3b97578d5fb9bc9",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4ca07b23a57a2f03b0cb48beaae9f93135df91592fc4a71119ed74415af9c6f6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c135b5296128b97c3c09e825debf776c8122b67c4563cfa6785260970a25c0d5",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "026240eef3378be5f8b18f26890d6e03266037a57698eda8da1362017c942bea",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d4d46326e91c96b83f5f46e3ea1120e74e5b38c046fd9078aa7fe987d9f811a1",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f2387255db48f696c66ba2689d4892c7f772424d4ca79b00b7c97750b97ec87c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ae3645192fd0533a073175ac8ed4580cc36e5401dcd1922a9de8a10254626426",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "38937f7bf7a69ff760d085dc9b2618983a2614d55bac39d81750e41cd552484c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "fc0f440fe0fcffd3467dc9075f2c8c91fdeb8fc8d7426bd21fde169ffa76e3e3",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "88f02f011e65ec7a3908d2f01ab07316a3c25a23b0133896652d75c9f3ba8804",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "405c97266df25ce3716ce6113f02f002b9f1e9937b6452332db4dd161156469f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b5652fdb0fdd19595ab60d0a7ecc03e843928b989104e567f6da1f6b9b757260",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7fd820db59e20979e1acbef514c7f76aef961f633e7cb329d0ebce3821d85c55",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "68e2f9248f7296b4ef96381fc584f0dd5385891533b38bb96fc759c46f384932",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ab412894d3aa0ef53d578ca4f6829e52de4df3fc5069b89c4e0108bb35c14270",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ac3f163951797161a96786829d9cd025f00c90d035095c7742fb64b9434398ec",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "511a745b0a7d57e01c78a43e90393b65e64847a83c5e52e3ea317eca9e587d59",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b580daefb1a494b69176b8744c645527c631ae0cab0cddec8d0a5fd8429d95c4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b1ee0f588c14f6fcaa04bf1a07d956d481fd417cb6b3850636f48537e3a572be",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6e51d3cb99dc893b48290541c064137ddeca0f8f6ca031e009cbe14246317197",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6d5d98a8c5971bee2dde7b54d9eb0306a016d40622d5d3066a1e52fdded7b577",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9708980683cc9d4d462b5b9c9865cda261bc68cc9ae6584a76c3d97383160220",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "cf40331b8e88013133ce2b8400d7ae20204dcaa955c65d77d3df5caecd05139e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "71eb3f1c17fb4f315d066352cf7b0a4e7b14b85dbeadeb17ae5a8040b2f52991",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "39be34fffd261e97b5ff16085723b4cadefebe3e53a34687496d9e31973c88ef",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9f44f3dad01c6baff40aa4ef4a11f814e96f51059290b2710a1c846ac8cc5eef",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2a5e4c5845259673aba5d1b68745d092d47e8ab8c3475b1843129f24669c4523",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3f9a7fb22147e3973b94545790ec3d03b708a127d9ac6bbde8a2219038aa26c3",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "45f6f44d683dc4836b465a837289e0e03daadc659657f6d43a9ed849816b320e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e0b517731baf3599ce34990a98b6cbb4de0d6f2aa87f5464ab8d1ad08d5a444c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "49cf4125cd7f542f5da6e427b65f4055bf258a4222b53f4fd5b8c9d35d43cc85",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c07f18953f2f969a13a5960a980a478de38375fd37ba121b8e392a6231251361",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3cc2dc3054a830703b17a82923ed7944132c333d95fa0ed75454fb2386775370",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "910d42d09c35cae7f80724abb1ba7bf44428cf5449c5670060742d7883f77ad3",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ef9e277012dc073d3cae3f138fe4e6e59305c7432e129ed6542b1aa939ea4ba6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "aaee792148138d79cf6b9c8674e83cd1a4d8ae62efaac000d9b0817aafe9cae4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6893aa54dd2e3708dc6d78b38508e35259f820d8260994e4d8cdf2ddeba94666",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "97f3aa712f84f5aaa9a5fe25cffa2ce13a603a4d456e045834498e962578fda0",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "90d5cd485cc6a300f28b91a54966df2f81023837dfe21acf724dbc35f9f3219a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6abfb3d2c135e366b5569cf2f218efa2840c4faa28e172cc3e818aea3f21d9a7",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b6467958f8f0b4f7bbf13fae0364b4909e29a764ace7bce4219637039acab744",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f2789201264134b88d0473d6871ddd5ae93b532a5bfc0e304f80d81e439bf1f4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9c3bc33857fb8693bdf1aaa11dfde34598407071ddd22a4ed6a07896f5200f51",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2a551a3a3a391fb11dd73bc4457b3ad24325a394723007f5fce7056b2bc7e88c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b0a8eca8907d1056f79bad72f7ae65872bf32008cfe5081751d5df4c4de53a2d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "067b45d381e67c27f6c6b5c63f8d35ec2662612401bbff01a06c949b432ac4d8",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c3087230fcaef017b462a9b0922853f09fea93a42498c3f9dbc212785afdb7d1",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9985ccb90a66e1c7d31bc2ea5abc60873ee49badd679755ab7093fef44775725",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2ee302d643b86bbad21e684523391c3f38a76795e13ff188d9906e15aa7af1d5",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5c5bff02cc9a8173b3da4a8ed7470007022f95707e02ad65da6a2277ea273295",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "bf0202be83b7016799e09b992542ea683e40fbb2c671ad966f7efe75250a1b61",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b771517a16c98630e4684218186b7f539f8aea3543b7b5e73f91c68f47363047",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5c0317aae887b4bf241e3a8f73c0a46c1bd5914ad35b8ecd774ba16bb561718e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "661fb50109685054f6824e6a60461bce66aa5f5055fc5910fa800c9f43798ba8",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0bf07ab590fdd890b107f469836e3a6f9faf81b2753cce8e53dffb8d57d683f4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "be11d245644d1cf2806f6e6d9c5e9d5412a73e0c48d4d6413b2f1c130614acc5",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "bb40033f807bfcb1bd70e5b01b6a5f44a1c119095dbc56255807d61acf1e9faf",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "01d105fd147697ce23aab2c9d50c3d6ab4b054ea4a71a35c89d1fffabeef9674",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ba6473afeba86956113579b1a2eb891520a6e44b13f2dd840f76e0fa4f26e2f6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ab264e5aabddd3ffce2db7cda1a8f3d07b13a872d6aae7eefd0b9c10bbd3da00",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "743eeddde0bdd5676823e23b4ad0541c5d1b33af7aa2c2cc1c4bad1cc120a1fa",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a8bb481e6b9d34676f2f14f4c59ee8cfdd38646fbe522a2747b70fe6df136b95",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6341433eea0c69bde4f730d182b774d4b8ad1cb334f4284d4532a632c2363809",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e6f51ac6e6dadc0674e394bc6dbf590b1e879a7cfee9e42873833d97df72b3fb",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "44f7ac0b5fc96d5078d033d955723229696fb4009c9cecb854e679cff63ed55b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "802a3b55a2439ba9efe262c0bc31c43df3d26a22a1c20b0089971fd8235455ea",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ed7ee82eb323fede26ee1d9503c714fc50ba2a617b6c0fb37fb983ec67f9f4ab",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e6e5f9715f13edb3af9e5accf3b2daf137dc345383674c144acc31ce6883dea8",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f9b1edd57ce065eca69b38486d4868ba423aa3332ceabfb9c943418b001032bb",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b5d5b6827db204d0ca11ed3e25a06c7fd17b3bf1b64df21afdb2b2b96d6e0b01",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "760ca5b441510620338831923bcf2b242cef5dbd256fdb29f6dba44cad2f2675",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "69689198a435c3137aa783e3dfc6aae6f18d3d3f8dd7203b49f510caff4a6886",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "69ec0bca0c3037726a12ab780339f88957e348df3e9b92a6cdf216df52637dd8",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "44c929e132318feecc79f6ea15609516eb1538710a378f8e10041d2549aff0a0",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a0c21f28b35e218e10e30a7d2a382f9cd9921ac76d3d1fcbf9e6b98f341a2ae3",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2cccce1004721360964de7638fbece121bce7f7d81e87905cc8830f9795866b7",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "cb23f8b5255824b8eaf03ac13f6034ab37643787392158e64be123f9eb33863c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "950f71a7471a2faed0f3e57600679bfd3e0ca74ff45f4d0881e3f7425f93d1cb",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f00192bc9590bc6fb25d85c9685babe3f609b5c7bd918085ed73bc65537de6f9",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "be9df22c6ebfaa952e607d6b1ba0daaf284aa41b18b81909b8f699d3163c4329",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "cf2020d23ae00ac131e2aa8e49fa4f49c5f0087138607d735017251afeebb74a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6d91c4ee77c673b09f1a8fab159f97a2c3998e388a66426abf57d5c89a78d8ea",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "000d41710d4a0e1366b2ae11e86e26e4d67ae292c34aace6e9ce956e2b65bd39",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c86ca41ef37117786ce454b433ecedbb37197463606b8b32c50e62cc3841709d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9976c3bf693ecf76357a185308f24534d4bce69ea037677a8eb40cd1855ada5c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "221abaab36e896902f06551184088ca3a3bff9b11e4c7302f941773e870eb7dc",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "766a659db087e135897bb7e6684209f9f6278a6324dcfddab9aba385bced45cb",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c131e3c171a6593da044279108c8663a3c5184de85d6cad72db31e378801dc73",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7a5dee65e5bead7c967378b41127da8a4a1f87b2b75461b52869a3c66cab2c1a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8f04e30fa97fc3e509fe9dc9e47049e5de186c2d05c2eafcb07417dfdfbfa3e5",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "35188ec1fd69a52ba80ccc58549c5f2e325aa49ccaba228a03a2b5121c331cf3",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d129416da0d5d7c81721d7fced7831d696c67edac9cb96224fcffc63b30668cb",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b88315cfe3ee22c3c06ab1542964dc883631916eeeaac9171aa4642a76af0118",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4a4002faaddcb3ad2d4705a90677cbdb5062badd56f56f090614441178e0a333",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d6d24f03a129dc564bfd10b7b8f3b63d826d61f1a2ecfc817532446942828eb0",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5b9bb9d346af504b2b1009972832d288ee397fd1125e3c19d346db914d24b538",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "dab289fb534fc3f5cc20b3419f3baa940ce0d70c145634ff60f20bb533df242d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7e91e39651be568701ee3271a9d8bda26336d098df3e9b10877262bd6b467538",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "271868afbbfce36b39ca108843119354c80ef38bc1fc9f490d703f94b7b26a95",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8e5172fd7ea4bc8015d63c216926026bb26daf0f22a9f1dce1681ae95e2c0caa",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d1dcef6d862ff7daedc71ed2ec675be2a13c3c0f3c17a5a412d40f6d3bbcc15a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "faf69718dd53dbc2173e5ad26264d6c75d24c12da62262377b92aa105d00e87f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ceea98858734e8f7f84d6e7aa7102dbc0b0a6b12ba7b87146b7fcbcb18107f48",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0498d255598d3f008de0ebac1187cf9fec14e93732fa9295fd4365a5c964e0de",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "190668fdfb7330444eae23fa57f8a3ff249fe0969b294519035e09372631b70d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "06ef386d6ab174b9316e89602c9f4f2b1d191af18036da62e9de37dd7a0b85ba",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0fd44cc86b9e03c59dcded7edc756ab110bda122e7eba26f30b47076a6d1ed35",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "807c99ccabd76718e793fa67b92a0c59b29525f2c4a9ade302454e2a57be2144",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d84fe05bf13a0291f8f160a9953020216cf1609b7757e8ae2b67f74aea94dda4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "afa9417ad0afb8d580b08a1b5099a25aebcee86ab3522df5fb15b9ae0a6cdf70",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e242e73e6bbf6601058ced7a451ba6b0aa4f0e95638dc5d0660bd50662320fe4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "df56c7636b3be1197b11f696627cc99c51a47c8fec76ef6a09b4adcf65d48c4a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1b9099be1fbf3653a8a2fadf334c263ee17aff2934ad89fd0870776a201b2d8b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9767d0ee961673394ff05619f2dfaccdeb236b0a2454396d98c969d462371ec4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3523fb9e52c5b84e7f183184f31a091538d4d8c8ec5c7214b21e02f28ee04b5e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "56537625edd114e24ae383842633052003c2c4de0e34f6b40a9e067e51ac8d44",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a80522559fff04872f2e2549374812374165502f0bd55c24c4b8c572a71c3076",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7afa119943502a1b145d1b3786ce1d9a9115af9b4710cf73129145155bd16755",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "eeb61cc8b44f82565a855bda98365604d3f05854969a5b4b5a39a0ca597e180a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8ea4d1f4690a58a1b18d52eab0ebf761e2ee13a0dd1eb3b3741167ba08fee1d5",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ed0be54c4106a3a75951e01eb120e19e6418411c8ffde2045f6828bd699bb212",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e215ff1dd269b7cdf1a30ed3f934e7776fe11b173e0b6d0401ac93c80a8a66a6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "52bab72dbbad6ee184e634ba862f3cb287245ca1a15e1f8184d8f465901ea421",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8fa79ba0301693f25132af0d472db101f0cd355706576b4df3edc0142f6a7bc3",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5e2fb2a3487e0c9040240b0e7897948603e1048ca9a4db56c8400339984fcc01",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5db6d4d931976de724bc1ef5a19a2b07db56c444a9d6624e3e925300738f0c7d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8b26dade9e8e672c40032e17ccf59f18e42300cff0506c21898204e31b0e6da9",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0895b58db52b3a6d053e53a44917d67de9acefd30e7dd48ea898ebc199529b4d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "75908a7cb3b1878465fbfa835df5650279db6e4ecd9d31a0dc4b74b0d59b8ec0",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8625fd25d3efa607cacf9ca5b2a4dd5f2e75afc0f38e1580d0c5fff726951fab",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "dc2bb896e883f140788307217324c9a819f879e0b1b391e901fd6f3320f6bc4d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d7c1519c321aefb0ae760c4ef661d1ec37803d50dee5a00d8814d0302c9a457d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "65a4672f173b2b81b835bdd7b1ba160730e03233983f04562de846603c3dd382",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7718c33bf9324ddf758e80b117400eaed13b8e970f0865f6387491e9c27f20a6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "21316825360d04bf72494a83dd53646453d660d4713d95fd5290e71a98be0a12",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9a38879467eb249a4003b6eadd9ef379dfd3a4cbecb7646e8938b3d766a8c912",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e30b401eca28d6bbb03d9bec41686059755fef54122082c03e6fc7f9d2b21907",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "04a0786b7b56dd5c2a387c16ca7fa9671b14942b68fcb43cea3dd8f88525571b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7710de836128cb20c65cf5050c20b36e99a2c5c9432a8769d8bbb54dee41d4d2",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "149c96113e5e0f37a9962342bfbe91d838e5be818a51da7629a358dc3bd8c94f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c5c1d6a0e9e581a4fe0ac71a1060debba068de1cab3bd01ebbdbf2ea21b52f85",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f21124957a1ebbb046667bfc0bd08a229ebc47e8d70ac83169c3855fb2af06ea",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7a120f1a20569db4266478e036d93b3bb1c851ff732a93aacb1155b97960dc31",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "fcd8f87d70b9e090e5e83daed84ee899d955d4cda7644efe8d81e2a7cbdcebd2",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3f94886c463f246cb23799fedaa405821252b17a82c2635dcbea181469a3ab18",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9ca5b87fb8439bd5edbac0b1d80a78092b9fc3355e2b6b2f922bd9a824eeb908",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f284576ee00cfe7311d5775ffe8655469f09b334977ac90a297daa253765baa4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e753d42897d7c698e469bb3b1cc127c61c065d41744a8ba489d2f8123c81255d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "01da4b54e94296e411f0618393e33f917aafc86209c57236f97a4c073fe35d67",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "594d50402a5a9b023c8caaa4515c2feb435f66946ad9a52bb9385b4d139764ef",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "177176fcea8ea370687914f61fe40c06c1685a9db6ed5fe705c79711b13435fa",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "5bc8f3cdc8afb830d93ec6d1c0b218dc45925247dcb7fbdcfe4eab7ace410ebb",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "ec82a5610b816b9af5eab17bc735456dafc6301cc9a594b7270f4d25d1c0185f",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "49481d82403dc57e369032e913085b5404b92e4315e71a169fff09377843d70b",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "a668adff12551e9333e92885d27bbd87260e1c37876b6f6fe6bff0136b7e3099",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "17f474733ef9f8669f6c404bd9231e4f0c60a66874354ce913c95dbee95309cd",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "07ed7e82fb9246a2a5dce205b2a196d5ae2416bfe7d5efd55aee389f6a9d2e6e",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "fffeb20fc894418491157fd0d686d4d93693f4296d97ff18b40df7cf7cc7278d",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "b78fcc53c31f13e4eba8630ea79dd7a4e29bcec2bc957a7706bfe3edbcb54386",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "8e0643dfba8111efc5a558f16815598814109ecf5990e9d411f5fc0d303381b0",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "d203c9af8b496b9b6c3e8ec7c354a4797a1b09b61c03c0900b5b78ea1a58a0ed",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "231a52889ba4f35dc0da7193fbd8fd60ed24f0e02f51a845b9900d2de7ec6037",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "7e96e79610a959e6d9bc7f96020c02ecc5cbf814b3e66522106e5b2fa3ddabf7",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "2abe8b101287e559ef0cf110385b040da24228c276935cceb941003e76eda0fd",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "a24c0690795db0bec07de54b0550ad839309fbb6f848ce625ea960307db4e688",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "9fe23777d62dbe1c7239cb4d1c604a42f5ab556dd02b23ac2a733444c82115ce",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "a8c65c9fb2de37e87befd18a91fad19c58ec6312e1a7e2213e471b0a52160b9b",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "494b20b716236042bca009dfeeafc340f7792d4bbfad3023901de329733a823c",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "b9f6f68ef852bfaa741905dd85d7335622485cc6542a0c3af5a32afdebe41154",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "eee785ce0a793e4f05c8b9071f38e6e2a137643f8586d98e8d7dee7623cdcef3",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "4f50b4d356745a6534a63bed9acf15238ed291a89a979910140d35c545b73d75",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "e91e4640cecb86f0a77d7568b72640a29185ed4d99e925dc291f74339d77d661",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "fe1aaefaab26ba9b9df8e6b16de8b0b54f8c51a7603d6ce492fd0318c79468fd",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "0d0044498045f2279c84de64ea3b7b16831340c14c832ff2aedde1cce1c0f66a",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "eb2e2503bdf945a99097fd1e2cdc820cf092ffd9d0493e43966442eff43eb681",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "2a06d64db1e767471429fe2df72e2a4f28c4880d5e8bcf47009e393f50691b25",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "34dc68aa82ce64e7b7485529e85df13e642e8cc75500ff12b1d1c5c54adb93c9",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "685e36f9d5da363e653eb7513edb4c3dab79d9f63ef8f8e1697f3aafac2265c1",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "3f51414b076be62c9c1ac2745ba18ee91a5d113e4da81404e0a86bef28c294d1",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "59fbcaa3f62c6785d04e9e630c8addae6ac6361aad0652698ab392764d0572c9",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "5fde3bd3c253195c1a4f0179106ef36bb423cd621e1429235e0b809d0245af5f",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "fa290fb7784d5a564a6e5fbea3a7cd935a41b7d99768587ee5b517e8139c5fe8",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "4f86a59dcd2c994b0c007916910a124e81ce820405917cb6186eee9230193f48",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "e489352a48ccc196ef933b19f7096fe95283ab777ae00db09e36909a9fe549dc",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "904928b693dc3750071fbbb51881c6068a75e2869fdf440e432279060b720e42",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "15a30e3d69b06c4d8c04a18783859c0016d621aaed46467befea344cc1d73759",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "a86c960fcb51e72a3abbc93d088d92d6f06843c21fd75d07e2b9e25dc9ea3dc3",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "e0e25a51fdddba951e015c3674726f0f3a0a4ca3ae419c5d9a5101e5cdd48ecf",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "a1a50692da1c951f8e04fb4464a2e9a5de36993061975c8e1527dbcb39c0a5e3",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "fb974f799d66cc5e06e4c9407a55ccf2cfcd9f6d9f85d2a780338426cb3deebc",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "2716c7d7d8a2e84291e5079da0b843d4efa688ab24fc55eee604d17b69c12c66",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "decb06a828c56baec63315e3c14224310cb77d975b2cb3515ccacf6dc93c80e0",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "23e52140112f294d40523071baef64090966c4990f7685b68b250eebe63f418f",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "ba2500c6a18d8acbc672b3f164933e1cb1042a5a9480a89a0f69e8f2b22c95b2",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "73baaaebb044ad79c188bef3fb307d5dacf061e583c813ca188e529fd83a5f34",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "e199735f5dffa06113e706b81ba60dcd232132681856c3c55d9b661265a47a24",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a7806f527c753930709451735ace13d33a6ae8dea6ab3cd35607997d220cb6a6",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5ba19842696abb440bc65372100ec8412d943ad52a7047781946535271e9bec8",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1300565ac341d0d6b1864d6530eb95f2084c693f3a9a3b81155c7c579ac28c79",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "432418c5c169b3fc00e3b970e4ed0f7e9dcea97f5785934bac0daff0aed405ed",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4f33cd583a568ba8641fb6e3ecba33fee35df544eebe6fad4547925a1ea56d0d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "7d12e48a0bb3f95bc79aa61c2a768e3ea48f5aaecd22256d3d5d00d32e7d8ad7",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4d3875c86f4a1c767964766a980ea58797b612667a07b86b375f24845b477d12",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "9974784f5240e32cf45052f54559323acf51e2e682fec8048c08bcd2e751b94f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "41ce18715ce6e01b688db86ca0c26a906562c3b6193947f1989cebd002116209",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "92d5dd891cf676ff75a919c0e216fbf7b54696459d7ad2199ec659efc520842a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "838b5a1482ff3bfd18f6010f9340d86eb619bc662cf2e6d9155ff37c9696ca5b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4dcfe210a10bdda0015ddb61462fb2fca6ba49640f426cf8ba9dd51695114a79",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "555e015b6abde8a0c3ec5d627e98f08fb1cfc1ef25973d354a2d701e7d8853ca",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "6cfb5ec647dccc73a1e65744491f070d2a051c575949ecbfe6d262a272ec46b6",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5fa1f3c6adff1f258c2dacf5559c72ee2bd11a065891abe9f9e8dedfdcd53bc6",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8cc835136222b1eecda7bb18372ae40c7bc8aa0ace702ea23d295fc9a39cfb75",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "bae1030571bc9bf99409fb3bf6d6ede6a892cf6d51d66d89af1b042741411ad4",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "6da45162d8bbc38c46c15938b0e6816178facf2ceb4ed9a794d581286dda746c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0d1efe38a87451ab1d323d6a81cbb120d508a072ef8f9227db529ad03ae1b82c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "e588057a0dc601848c33a58526eec1208bea081f415827ae87aa8b623f2dbc26",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f8c24c3ed2fc865b6a47b7c5bd0c3e92b5ac4103f41b1f4494285dc37698e411",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ce63d0e11a8fbc61dbca2f61a701abf7b50b9d7c451c6580af443c3b55d6fb66",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "cd1911170ef69b6d68beea92fba854e0bb293f1768e3369924daad417e2c5a92",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "245801a0e76b4dee6e455e5d04c79646d776ce1cf7922c28c96faa00391b2f9e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "6c27647dedd879c6d3411bfc893c5dcd92a4b650eabdcbf243380d7face42733",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "731df0d9f1722ec61ecfb1ab1e8b178071434372b5d632b22680706882b1505f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "7240b2f6379138b285f23da9528fe6fb5b31f23f403e49dd7c5c393f7316a401",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8fe13352cdc3f2b2b99090a215c17da923289706868448433c2b7449b7283af4",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "7e227c71709885496e1c8c65f578ba50ed73fea19837023dd3ce5cf3b04a7074",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ae605452722ec43c0184fdaaaba63640c09c18606c78c55182d4d739df0049ac",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "27272da00b5b121b3da50a31b4f3337ff8fb9d6186b418149ff93c5679c74318",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "db1bce4bdeb3325121188812e3f40569a70af24799cd59c8a062047c2d25d848",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5b28c1e180b6203aa34c7a1c52c470bc6f9926de24dad49a4768a11bf021c4d0",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b8725acea8cd32ce57c0a44d0a4bff3a2f9c4fe33eb5f5d25a01c60c22ca1660",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4578b2c23f5a4a0dd9d747bbf02a65d1f087108de8ef8e6b9e67427c5607615c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "bf8a7d6657251185759d7b9496ac2e6a5ace5fc0fe48090c842654182cf9b12b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "241e35f7ce76eb1f4915208a3981be659c4ccd01ecf655b90a93a8620a44e509",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f440fbff5159bb35538467d57c5fd55a32778f73c79d2cd7d98b39515d6ca77f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8ced64566375d387193371db4a820cd72ff77897cba974de610c6488e7510e35",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "9857c8b1d86a04f5cbb2314562af9156b8adb58e1c20c29cb399528c35dda4de",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "e24905990e739366d08dafbbcb28d6492f70ad7072f27df2ef9bfd380e66f194",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "aec5865d9d56077d355fdf2ced37db63b93d4cbff0335ebc16146ef6e2769a62",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0de5299d4400b220924b2acbf1f563e79416cc2956790d97c540599adcb3de15",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b7a57096e29006060f31063fc5b4ed1e5bd1ad6489d45bb83f1562f20ad93569",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "df2f1e501003977b05e752b12e45f29b9405e96dc70826d1a487fbfb7e277eb9",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "04fe980c0c5199e0500d2e38a274db61a7ccc01246dc76de812f1ab0ec22341c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "106794236b282aaa9be098e7f77c5fa03706ec34f311a2d66ad9b249798eefe4",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b1597212830e12bdbb4cb982e4dad16f8edcd486d2daf6b74f3c7070da7d4b92",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "29006653d2b3667285f9f025a2e36186b42bc43bf8f4b584876cd6e583fbfeed",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "bde71fb5bcb6053fb06075751349458eb66e19c3c1125a46f2eb0924be75007c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "17510fb3145e06854f623b6d1581393b9d346da5312bb0e9591611ffbdda924b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0199f4fca008e8809d371fd4ebc80695320e0318ffdd5a65c5dddfba8fb27d7b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8f79063f170079a47bd42d4142ecd68199323ce9add6573281e3edaff45853d9",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "7646d573d14caff4f00162b527a67647d394091b9cf29e2f93eeba3b5e9fa83e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "e5078bc60efaa10d28b9a334925198d8d84452d6b882e066895dade2def53b79",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "00ff560926c5ee3f8988fe5438f032f3c3e15da640fccb76209561c6e813b940",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f8a5eb2783872fec4a4ee7d55fac9dea7c68e0ec76d6e9a1b78a3ffd49d20b84",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a6c45391b16cb66d6a1c7529823ddd5918f2b501c853ca174c94846847ebf087",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "cb25439b4fc70c8050db72bf97b318f7390d1d1c06d861fbe61475dcab400c19",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "cbfa422b498daefcc364ad607120683910c809cb4f6b9831f6d3394af31f5e04",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "deb8de1f238cc7325d38b3c4d35197884be85bbe453cce5bdb1600360cf721ce",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "84a0e5952122e172db0204ada29af2f08213d0adac3f0ccbaa838cfb8913021e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a16ee2f63a9c0e96a02ae53cd509e546c149c006b8c706df77f331a374f8b313",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "7db0639594b2d80d420e1a07a669ae0503da88ab911852b3d00fc0330ff247c8",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b545d4be56003bd85729b68eaff21f1ebe164b5baf16345d55224eff5f892f45",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "16eb57904761126ecc7ffd93472467dac5f9349244da9cd1cf546435e7811687",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a4c75be9679fc491ea19b227e5c8036c87fbb355c422b9978f9d831887f8b64e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "7737783c398c6e9e00fca7012b9ebfee52bad9efad8e239830a18124293fcdd5",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1dd0fa287039c22ebd89b9d25f70734449c1d2c538afead8f28ff739148e6c7c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "89cbd23307845f386e39f2570bd02ad5edb532109308fc210f2c169966aedadf",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d4ddef4144dc76f10511f5bc6162b848b86883ef5c833eaba91287e0a184d349",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f5a4d2d86fbc77d27d309d5275db6b2ebe619136240cd5435ec81f01d591230e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "22ae7310fa9b26f39c438a6744a613fddf9e0bf2a74061712cdcfa1598ac9c15",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "12b84a7907edf002c4dc7a47ae4110b55a7d1712dc0b5af77a3052fc7173877d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c9f42ee8568da6659e34dc6c7f4c45f5e4f3d40b00c2f61e29cbdfd48b71eb17",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "eb23df3f07a02c9bd5f9c75f86bc46673a5c2ea25b2e0e2d2471b476733e4536",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "31d72e60b0caca1985af7a018d4981b169761a6061b2c9968b6c42139f0aac35",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8ec0f6d160608ae1cb9b9125f33a570f892aecf3496edbd4727c381775e16cda",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "897897d8b320cdd320c4141962f326a735278039e0a2408f76b334879c8d9b7b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "34ac3b53b14a4c329a25f161135d40bd33c85d80e0d3437b021f407a80aebbbb",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "3f6660da305bff514807a5aa42c9e962e32bdda26c246004d15d579548c45c3f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "81bca924638b6dcd85bd9ee29da0500438a0fa8587dba42b51490ca8aa844154",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "10fd8eedd1f129e12c493f13e738ca0ef477bc0a8e83c81442199bac6c40bbdb",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "6f9d41cc61b47287737418b747261a9c44fdf12bcd3401632ed2cbe786c0da01",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "29a96f55aeb15deeb51542d68caac6d2945a8353243ae92de46237290f7373a5",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "68b05dfc84252490b2a66cd6fefe792462a93cc1055dc471d9330ae57f67480c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "109eaaf35ec5d7617ee68fb871a32b68f00afc5f72911aba9fe000a4eb4a68a7",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "db22ec307721d755b9a1d8fb1a7057bab4a4ff7752271634833266073144a33d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "bc5717c7948ff5c1e5825f9873747a98ab97b06e0d486e12f15aef367a9dc541",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "6e8562f8d8b253d01525501b6d18b2d00eff719da761b83a24ad273fcfa88196",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c29bc214cb8b6c72151e2103cd1ea831d355b16103639c62632b7429b046d7b3",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a45a9642e60d3875921537a42e367ad3bec852e9b92e9cd9918bcaa694f85ae6",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "eb81d736d14f12b26f3b65278128acff3fe2aee50a5b80bc8a9a69a7bb8d03ac",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c257b1e47ce85903ef9e362f268ae79eabbdf62903ac0e22a2c2183bad1b3cf4",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "7c97319901b53ebc6b69d44e8acb529967d59b5f253b5cb577c2827041d852a9",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "7d3f7330f0d362c94a2e41cab50e1d077fe514a481ccbde2ac156e900cf34280",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "3d68eeded9220c4d6f5894df1e56e4d2ee80241985a57b35cdaf76eb68a87dc9",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5cfa274f3e15fb52d78d12f4ddfb0b9cfd2f4d875ab40e8800bad75f318f60ff",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "9ac0592bfe75cab312dc23745d853572cb7b71cc1f9c63341bf4539181c3b66e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "9a4e4d4d1c4c751db1cc0804ebda5e3171240ad955cc1817b47432460c5d0d43",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ae06a7f467b6581997b8c5e232f10856a24641bbd6935d9460d707fb835f11c2",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "eea2234b62e83c5a67339b24d5eb757307d57db39f9e9b8fe14b3cab69898bd4",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a3e0b9c22a6c565bd78536ef6ed6d0f249c6c72a10accd6a17ce97677bf8a5b8",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "34695a5f96ea8c614c71de98ac00cc6cf15ab389d2cc715808eadc589f4e1afd",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "7afbb38086ec156fc23aa544f5f9dbfdf8180975a805174b79e418e096ab83f2",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "dc1e2cb75077088c9799793e7dadc6b4b29a98df74a8ca929ee3f1204c499541",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "721f4cd726d3d90f12dd228400531f14d8f2e06fbde891762376cb3dfde54517",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "541dce9545f414096f31771419179e2cd689f133da8564b59804ad9dc7214a65",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "be69dc1f7dd2b8c6082a01c5b1d3f72e28b9a24344a218e7bdb0f49fe75c7e48",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ecf9e2a0715a7dae2158b04afa8468aae2639678dbefb3866d33c49b76dc82a6",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "973c2b92b42cc42cbe74f12b8b5e70b4cce5daa421aa513253c1593a05fda709",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "276c1a427ac168adaba175bcc72f05049a34269c50480fa529ee7daa52ee5b76",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d0b2598232994b36be9eb6d92fba17514ba13bfcbdb095094e5b6d7ad4cfc4c0",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1196260ea79e491ad1c1f56c05f5993d6c6c7ac7a3e00ed984a0516adfd7d7af",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "415d80fbb1267091c2e57e990b7cfc75fe16afff83a68235caf8f5b4590aafbe",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "aee311773b2173180ee1161d02a7f52b7f5968e09b7cfa178ef4a7235a938771",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "381e10f3d6ae251cdeba7f5c046289e8ca30923d341108650b56d94337016d09",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "84f510c1c6fc6bb5e135418d8a127fc61808fadc25d8c1c644beba357294abe9",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5044ed8c1f9a182ee15adc46d22a2f7fe3e8654398cc399df0b355644f6bc9a0",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "64a25d27c7bd6bbad7e4bc90ce9115a2f345def6eec5f4e0f125a7ca66124d76",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ffcc8ea89d03e678b89b9d5e7c8fbab7f1d56feafb28a64672a680304076722a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "17a5e9d5a9a490ce309c0d28405688e9708e0f76812f772acca7ec937e6e03f9",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c629cbcf3cacd0fe0fea4f6664f6307865135f1aa8ec7f85b9b3d91f73718b7b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b6d7c5859f0f3520da671fb0cd2480009fe5648ab235eb6ec4afc339a994d192",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "e370111c0e9ab78fa91823ff7c8bc0fc7825de5e746a3b38c6604b5fb9f9c48a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "97246b534e81824bce3ea5a1e3443e63cb0b394549659555a7ac99b7608ccb07",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8607da423094929f04eae7697a2eae5120ebe6db3660e0a473bd1d21049674df",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8e79ca1e888b97a8d202d31f38c54894ac6e46a740f81f7fedee66630345d20a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "fdf8f0fb21715b176ebba0119c554bf8073f717d0c79b8662e3e8cce95ce1396",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0600aec6199d5c4001572d58833866fc2176df27989fceca68395127b58bb2b9",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5c9332673076fbb2f6db892f382c693da402383b1cab3e2fae3500e684ec8479",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c92da43ffea60c40dc53948eac626433382fe6cd50a84e025537bc5db35e2b91",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "cccbdbbdd1a67df4a99689c5a65c7dafdfc65f7b409490cfe6960e77a40c6379",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c51fdfdd0ef1c097d55e16bf7f0b44ac5df454173eccbb92ab0be256e6747418",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f81b7e89f22236fc9bd5c816b85588c19584e221f3dd33ff8be81c316e6271f7",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "74b12e362f6d8f8ceed150ff7698b3f92ae67d324f70a7ae4bf32185c2ba7814",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2941ab564f85b455faba95d6dcecc1c1f6acb0f2ff2145fc8f9a5903cdadfadc",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a94fd2db8876087172a811be3c9108559effb60e8932f16d8f355cd34baae9d7",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "e6619e7f5ec69e71d25ddbb5f32467abc0113290e1420bd8575a0e2e55aa41e7",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a3a07daf21160d57b18a47455913c57db86510cb4039bc07ca3489c0a5e88153",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2060591f7e1584545d9beeede4ca3d3ddfeb0ee65a2d929a197cb311fbd7e63e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "eb19860eb59a18bf398c6428ed3c33a1297c40189ae4c60a85a8f30f9772671a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "cbb95bbe13baeab570d263719957c70b0c221e78a8796ab488ad7f7412462a67",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f511cf45a906afdca1832ff2f015fe3867de48a59c69dda996782cebb4becc4c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "21f9f758ca1a283a16b16831f18e021b47f5052046e42d463e88e4c622fcd313",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "606bb0003a152e523fa2351121a22065ef86ecf57691d66e9a566bc6a047fbed",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1cadda0e63dc60c3564c2f2b2a6048c19445d3f694f818ebb487da92c19c39b0",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1c992069b466072845bf8e4a496a569bae2e9af6be7076d52e988cb906fe5ba5",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d5e08c6e0c7a8afa10045b22875620f4cef21fada3a9d0440c26477359f04bdc",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4a4d437740f619107ee19910b22a8b10cbe527277bedabdf6ef42f86d3b277a8",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2a4204059b5f033237ef0fe42e28f9688da70c6cb5b7a0679f28327f18c3738d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8695faebc6e51a3dd901f1c8eb647b9489834fad75b98e762a7f4e75965eb237",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "86893de1dfad0b0630e3f4bc56b1164aa8c347a254bc73b22c6bcc50ffca7ac1",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d1aaf5168e82db3f2a12acdef601f2d5a0793c7f4305144dc9f671b4cfdce2a7",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b029a613302fff4f39527bdb3bf24ccb71292132d2901cc25def2464f562a44f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c90039390dcb55761c03519e900780bf05ffb55895a73f8e6eff758a8966b34b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ec71c6f90047136ca69fb828e969ad9b5094c5c1f324897730cbf9ad480da230",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "34345ab81e15a06032309d513022c0e49bf20c658e11d93638e765b653ed8d79",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4e830b2460780c49857e68118f10aa9e10c27b60725088b2767c22e09e9f51ac",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "700e7421b9a77cfffe421f9c3f8cdafcaa3d22d9f664cbafe795361b5135f0d5",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "6857fbf00b4ff667040358bf8b3cf475741f57b147a261b9aafdb09973ad8252",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ce7cf4aa5986f068a699b6ab40f2ac1a43f8b605bebb9fa2fe3090e6624ed6ff",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8874cd5e55157aded270fd65effb27d958eeb6ff8391561632fe408b9ed36fb2",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "45b63d62035b6f5fa02c252418ee147b56158710291ed5f26e0eecd5390394c6",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b6a1bdd2c8cdc21bebc2330c307f76df4804ce9e54edf4fd94eb47c95588f48f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "90eccd8f73650ee194b29d86962ec4dc189b408e417d8eea257f11a05fb6bc8d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "16e82152f0facfc74f77f4f625f1e8bb4e2502901eb8e0cced7f7d644dd6396e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "9a9ce52e32ed88e1c27d9dc5446d13cbe3d1f5a07b2217ca717c0db1a375f0e8",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "7c3c3e6cc4ead987f71e93dc2143e30bc01fe1e98bd8acb7c7882be240e4c5b5",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "98cfdf2ae9d183423f3b1c00dc2a1fa88c7c5cd6c431d9806c52b0b9e838b019",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b2d36145d7ff27aa64745c006e7878b81212b9dd543fad292f25e3015d12b9a8",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a2f592cbadd6c67bc86cd6aeb4b3b7afcf94a817e369f61211174ce18571a882",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d553e1c004274870eb0b923521c831e5bcceded5798008b809bb5ff496ef2fc3",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ac5bd4962fbb0c1d2ce35bab1a0af72891dd0faa118ba354cc2ecdfbc87dadcd",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ac1f0222feef034e329bf8fcd8aa21685da2a110b0761c42385244867cbd4372",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "dac70de7975425745459b31e112f890ed9ee88a00f84ac55b87637cc2b4b5fcd",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "9ec071367b73540f3ed1676efcaa9561709a387973d94e1d4ed9ee117b09ddea",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d5a84868f928838be609cda8ddfa1cec82d4f603b0d3c46760433d83c72dc8b3",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "18cedbb72058662b67ab69fb096bfdee3cf057e0ef48a0c4fb0d0f5aae331695",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ec3ea525685e3741b6b305916f251d7efa0e879cfe7b0aa7aaaefb8e086cc5eb",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "59d21ef4f37be1a594a3386d03c18927f21769eddda94e9f05bae938f0dbddcb",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "bdd617c867a47cd8cc7db687c2931849be985a98c9aacd71f3e323da74dfc267",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f1f2c44d287178ee59a990d4eaf8d97b72c045c0888d87bae548fa375a3ced7a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "820b8fc7ae164ca23c748d08a4718c1fbcc6e53fb6b04e3ead344fc47c621bfd",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ffe9ddac12cca748b3f9ba651e554b104cc7d41ac9a40605d568a7f472f09afe",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "dd9bec9b552ece721a1c60821a604886632a41e540f11d0020d2552e94f45e0b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "81d323542f96f6cbfcfce8f8c46c7b02e2393b8222373611d2235091d7cbb88f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "261a54bfa5d2b148c9121ddc110ba1bd66964fb38965bd4bfd842a659c37c204",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a3aeac4f289571045080ceb9d152a166019efee95550f6e864a637d34d574459",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "9c1578c17455a8b284b561e9897009d8a5d2cdad8121f3e931a3e5ed8ca19b8e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "3d5a3014de1939afe34fb5cb25d55364884f1b2247e685c45458ff1433d1e9f2",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1f45a9de622e226c59c4c19b31ea2ee565e387908fe5cf7f89cea062fd28ea91",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "39d4dea54692d9de2aa0c4a547a765af348f0b398b048667db0c227c27de581b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b6585cee1a7ae457cdab1aae06fc691af42afae7d8a2b5c71d705fd5ca1b76fb",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5d0722e97b16b26e8c8e7ec0f5946b2c96aef1f2bf1e4c93215d92a3fdfce4de",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "84584fb71f64d53f7a6bcb5a3c708d7156c72d867043c1e231a5492cca2449fd",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "3acba4e2b1c08abba33c24c33e998490b5c74376c03f9ea6dbe1f449f274a146",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "157775e10857faa93156bf013ab04cff388b9f3c2cc4c6ffb2e883106f4cb692",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "04693d72af80fa98d84a0da373e28c173f445f8d1ba52c41948d5df5c2360a55",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "e5b60a483b76eb42cb4180af5acb68b822d42ec6a1a0bc315ec4d5fc1499ccf3",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "45bcfc1a42178be99e97eebf70b3420516b4b68e819613fa6ee885fe75fff667",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "09143a397efd10b1dbe5c12f2bc6945d048f533a9625b4173bb74affa0b45a7e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4e26b1d07c369f5a7af0af6896a8fed373b8fa0e5b9bb65f732853c7c4e2d87a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1188c2ebe3ba87bb27212ec045dec4775371be957ac89a4cb45693aa31de961c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ea5ae210510c2adbb1d4f28aaf38677b0fbcfbf42d8b2adaa29d2b9d84b07886",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "aa776bc2847aa91bd9a506a8603e2ed5ff98174454df0663f850e3639a22f215",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "89af2bb41d651cef038f53d7f6f23e200bce97f5a8341983893fe7c45e1ea51d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "7256b86337d3f4f9c101d5a399e123cbb7a240fc2c2af81f0a7304fd4ba0437a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "289049196ac2a93a7051f21be6439360d97aedc79c8f112f6e1426e1b160486e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f4536a54a40fc01d4678b3668f820156588a2f8ebe46d9d9669790d90d3daac7",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "362aec5668fc06d98669040e21d2b619cc248c3c9c4ef101599ac9239894a31b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0850e1045049fcbc27ddcd46dc632ce820c45fb8b9220e1324c2fc1a04b59f76",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5414b2932eda4a66407230f81f992666eb5052cfec1796c9aaac7722551ceffb",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "e17b8db59492823c12de6e366c9a2aa3273a596c83603c1c4b28a1e062a3cf6b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c3f2a77b53a13aee059bf331db9280c15ad50754ed71021de734ff941dce694d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d9ba7d29ae8361f1983d17ece7ef4911de4228b363b3d4d6089ea4a2562925c1",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4aa1f8d2ced943fe30f3bbbddedc013c4a7f95246214c5f2c20445e073c2d1c0",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4acad513deb8f3c804904b3b44baff13fb11e8af06a95358b84e04d3a2704b30",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c42eb7146b8d1cf5ebd4cc0572cca26f8e6ac52d02f1d6b6a6149eaaed51dd9c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d6ae265e22f5c5a67cdaae26b66aafa47079342222cb71fcf4d678a9da9da4ef",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "445ac3e538ad910e422487d51784cd90822f871b90b3a4e605970dc9308c4d32",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8b3bf8bb304c59bde4bab723e8d7a0d20f13e3311f4b957342fdc08c9f44c835",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2a573c6e61f125991c2b108507012dd2b645063049e115beda49809dacc017f0",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8d58ab4e026681e317c24a5867b04e89b15c308ab293bd2e0d0b10b7f183629d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "bbc2c0e098956669c7fd84fd19ff748243e3ee309a106d447fa9a5f2226838e7",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "62f92c24d132fd817421a52e498c107e8ffb3b3d1a4f152cf3bef4ba6956e2f8",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c2b37bb746d1dcad210c9d3f5989debc0966e4c84cce7e9a46d709a65221c0f7",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "58b16be44a29e3e62e3ff9dae28d4ebe5923b7900898e75db08eee16932c69df",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "6ab8686abec70d678a1c68db689871f46200fd896953587fe02a098cb5e23a37",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1cc8851e92d74e9810c47c9a96c1c0483f8ff7f83a43b2e2e775e7fe858b1c9a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "6b809a7b928a94b71155137f6164042a9d414f9425a25fa0de9c9ac5f02d484b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f4e8b1bbba3e9cdbfb51874b6c34958ffa2d7fdcdb7336bba1dbcad7f3162124",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "9cd847b7b020a043fe36da221e2621bd3223df9cb2bdc99177d3d22d8f9b4b8a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8b7fe2ffc53d8c8280753e8fd6056f00d0653d9b5f4064557f1a282328e10737",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b4984b91e4f61d10c20fd49da7d094ba0bc7bac3461dcccee41708dd094df7e3",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "209d9d747b035bda2bf593ff986240b2ae83826877a32b44f7154511528ee667",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "e29f0c791066d0aaceecf55a4f36b482d1f15df995b58be3a76e51b0553c4158",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "56009aa7d54a53ffdf239c6e642855dbd7c0c2f500aae1e923078905c84b6b3e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4952eda6518a9d1a2c8a2b29f29a5b907941115bb402413cdae6608b7123ab52",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2691f4b0f1aa2c97f527d047d4143b98ef9ab47bd0a9543ba743e6f56b4bd3e0",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "24627f377a635014290b6bbf2f1c0a30a58d26d3aac9cfa32e5486e3689c68f1",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f00ff506cfca97e6620b48a22a21da06935aa9365faf2c1db944dc815aa12162",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "02331102902c4dfb66e7f31e7c486a1ef38e58c4c044f8dd0fefbef64995fa27",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "91e10eed554968ead2da10655ea983f785f328530c02f809f161805af8dcbfcc",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "34d2c68d038e8972199c3e1d7e8783690abcebb74968a1e75b1ae2bb364349ee",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a79faa7cb2834f03293837f5787856ca1b5e76a0c8b9867934713d08845e74ee",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "9d0980d149f175b7cfb62ed02ad20fc1a9dd981f5ed09495abde9f140c47ea57",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "bf6a37473b0239f05fccb275074b347dae65358fbf96f0db586821f4ab1bc1cd",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b5438e3a4858ba1379a9cbb76e0a6455ff1602dc4f87d90d0d6905717339272e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "62af8e62e1cf97bc6e84d9781b90404b72ba72a68ec8950f9a3d2d3638367b60",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "7ebb3df4902ae4409ac5e3b69e95c326beed244b4ec225ab67db96104f102d82",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b8171f13e36e7204f532143b020f1b971d4901e8711bef8b92c37ada991a8e99",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "65f7b2f1d37f1500d08f5d40ce317d1eef7adcb72d7c40f1420286a31b2dfc61",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e1f1d2bec2d19715d06e6adba9812a4bc91a988c3afa8f6297a065b993f44b90",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d37f9afb23da7daf9b3df0fdb64e319a365d34a5356e6d67df62bfb106256b0f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "acc67e3cbeed8c40f21232cea1bb49b5bf73d15209bc9174f73a946654380a36",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "710988bb1e225f486638e02ded6a1ad4eb32e8e316748bcbdcdbfc6faafe3138",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a008a3f7ee0987602f21ad195bde56905c2083f0c8631884148a67b39efb1412",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b386c146e1283e0bf68f970528fd3ebd819f3156eb4807470323283c28a10320",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "4a03f0dd9aff71acf2512f4da2518ce5762dae9ab6b96cba05e03fae197a7b02",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0cb4e7f5726bf0ebdca77b446ae9809f8ed67e26d42cc259e9599724f6fc2306",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2dc2509b637cdef3e4f8264ce6bc4b18c54b2f42c6d3d9f8ae135b5a96db6e65",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "493ae29df11970e476f66a435d160c5db4a3b6eab09f1aa7a74dd1baa5926f6b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f9fdb96ab54fc6299979c92bb3adc3007256ced9cb6d3becc8bce68a652a0e71",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2f8ea631672fa749ea7b6bd3fa8b3019106262cc007573981401f3543ecd8674",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "8a85919ed97c0beca0e000b331af75655b5f239bfeab31bef09dd8ce37cd1530",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "eb432797dde9f068c6b95682dd84e740bfd095865cb1ca5079a963f52f3586e4",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "cbdc6b5cef6faa756a74a246cbcf1b7b1107f58a9fd28c24aca501d1d2ade437",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "4c913beb9e0946af124abcd8c886a16ef7ba9e54df0da5ec11f1099f06c9bdc5",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "8359199049b89edb82276c450a850983bd3ab464027b20ba0e1dea60beed10aa",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2cb4ce6d736d7ad6e33fee0282732e954b3dd5020f5e19294d69b51df8c1dfb1",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "4822dc62e14facd8068dd80cdb39e222add95511344736b5aecdbd2f791e32e8",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "fa0e1b4f799e079fb7cee6aee8e691e2db01bbe54dc8a3a224618e96ba168d24",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2984ae7250094be414cde907987fd0d9d415dd9f287f54558f0a720f80875050",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "157348b6629dfa581faeae5e51ce7eeac12ca1e9b3a688fb71af5039620cc513",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "30259b78b73d42b342033d9ee0d369008ec49ba9aaad85418b6e1cc1353797c6",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "8ff3de7064157efecd0e951918ed3d04896dbb6d0594feb072ab3799a87028c3",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2cc6da86d01a65e923f8ab72ae81303578fb9ddd723899cdd874a5767fb9422c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "9b4cb383bbbf12566e0285e78ffc791cc21218064b581f760819ae209ef7c326",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a80237fe194872c2174762b6e9a0a67fcad2676441f606975b93d081413a4334",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "136b0b74ef864bda02cdf05f0b6eefec4ac9933a301eaa8d8cd0af196d2d0ab8",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "9792cce9062113c1bd7118771080d6f2a8c1ddebb54cc8b7624402fc5c9230c3",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "de5e34c1418527392a8ffe9adbe0d3d2906c3564dbc23917867f6b6cb64765c2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e196b33522c0d54684c3dc3e27029422ee7959fe46494950fbc21632697502d2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "6942e159c0687a1f3fe94b184c4e1db0140dd1d772a8d51d6360e706ed0251b0",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e46a0bb083d76a80275b12fed0d1f664d3572f1fd0ffa0cf96d9f99761a221e7",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5f28f7554f431f3c70ef5c7b6f22f5500678e519c1940c5904f95bda8a8c7bbd",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c32ab790255c1a0d9849d26c12b99a5dece9589ff2a39bfef51614db0c245644",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "6903df1044de194c2eeb6d900a877229133f495db1a3dd7543838ca4e2fcd736",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "047233603524a533aa8a7ae51b8210d1ef80808e073c3364473b20c1eadd92a3",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "961f72fd3b968a48106f0085f33ea1495f603a6dc3f599d0d94ffb4e7dde7433",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "8e38b1a2b7281688a18dafe222f0acdd319194da0dfb3b8b4f45b7bbce578bc4",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5513e11a454e95167903a82c3f0025840a2d12f6c62b1503dd52731380e7e922",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "ef5dc0a9b5ecbc472c7085983666fd9d9d8185a3a3c80aec3507a2720b2540bd",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c4a37ac988c92096fde558679912606660cb855b55e26473fc185297247b570c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "1dff49ecb0b8b51def56635c7182050d13b49b89f270ecb6859cd23e4c55ea22",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "ab245795376ea0599eb2ddf81296e2462df9909f7179e594f554bfd145779527",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d1150bcb3a6690892c8f2450aeb1e8cc3e630d7d8e1702a3a76e4aab781c1db0",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "289f6fd3ca4614926682b5901a752356e281fd9c0e21ca0636810beb23b1aaf9",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "54cafb59aa0a469f251efa9f900dcec564acb89778d547354cdddadf5b03c76a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "523d3aec02d3f84e7ef23b3445471c9a830b5f0bf32f770d7aac49b8e8e729ba",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "86953782ac0b1e6446b1e5160cbd6b1854b5ac6892a084e425583cc3fa092aed",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "da6affd3278a89b1d9882240b7a2b7dfa388a9201fe1de6a6856719373f01b4d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "bb91cd69926fe694336a281d63d5fd1dc14d7f7d3a97cca5684c30f4f6fa949a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "4a540b860f0ba21f8e09cdbd4fcf5286934d7193b7dd783edd13ca6c375aeabb",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d6b6e89aa665b708635249f8a92bd2b2d4c9e8e06111e86f90008670f2b059c2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "970292106236a258c914ee4f38b8be55513108cd654a909b8c08ba14d6a7dcda",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "90e893ae0f5912cca597b9f7386aa07eb62235857eeb173da50d5beb97ac2093",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "1a96dd004c2e614a929b18b14fd1c0977759c444f3262f2c0d67a1840398d217",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0af33be1ff802267000209fb574c91e7d71f8f256351657114dedf1b100b855b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2cad4d436def13048b13bffc7f29629eab7c4e76d59ac160975366ef3be907ee",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "377fcb5287051b929e9dac808907f2e1d923243b1d204ab4f06457d716a3693a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c9b7d74cc80697b29c58e39e46486b5ab198b3431610bf95828af4a003fef776",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e2def5292442e1225ccf8e7e9b9bc2103040f442ac1c305c5aca72651fa3dca5",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "48fe8dff5c0bd31e4915cd0b5ee1e07a8677222df1c3df4429c811703b31acd6",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5390a758049cf1c9cf942704369b76b8285a723c2451c28979858017b90069d4",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "233769ecaf9b1a3796a360ec94939c432d6ab805573e7e1feb414a5dd0614678",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c35dd410e7e0a5e56328632f851dac0b341912a5a790c05079893e0e91a3054e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "687cb1800210ef1ae6832b68a5e39f13f9a0dec761fd4fcd43057fb52d52638b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a7ce2406abc5ba7703d3fb22ebd3c1d29d6419a63924ecf7f2ffac67a3a8f204",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "75477d97d13ae639670029fc579113abeb56be5bdad8fd839aa34e543ac26a37",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "ed97e8c92797f5686de4407a56b1895eb607cef9c9c82776223f07b7bdaca049",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "3203e3bd725ec7d3cee2edbb1de03f8f5fe2f8ebc1e8681823095afaefda59fe",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e6c2f6e7b89b8d725ae77d2408371d78bdd3c6f9cf16cf9f259427403e2b5a71",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e47e479cc5317f02b6ff8cd2dde436b08efb51a818d9c71abef322695ab6af20",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "6fd603daa41a0f0129b8f5ed4c6b2533aaad25c95fad84ddc5ebc0092d9bd431",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c1fbf35a4f9c5d308531258bfb4ba152062ffe74061fa03ed83d957574b93f7e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "954a94440c6c3abf281fbdbcb4323cdd905d6f52416038436b331f4dfef6fa3e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d534006d60a5be78e0d1d98c34f5acdd8252704de8a1d1a3568a0898c943cb82",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "7bf5b0c0cf8001c727bfa2b1961ef6429ff10bc9f3f6f98b6f5cca7c18f3a1d6",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "186c46020318334ce80c15e888ea7990503bde55222ec0545aa3697d003a4fee",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "9be2fee3c01450ebc524c274454a50f5318de3a164eec4bc1ba51d2a97b92bf8",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "aed29419b43e12913b97e05939480edf9db6bbcdf658e28e0adb6bec7cc1abf7",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "13751814bf5f7e01983b4a2482bbb5d68b48ce41fd4e49879e2cf0115c8c6cb9",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "51cce4ee7c7201b4282de9f077b6093ec437bb040f91a7c3360df2b083bd1b4e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c5fd84a3c00ff513285bdf6c533edc5a4de4ab6f45e2acffab1c5c3c4cc2442b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0a459beb62c96120f1342ee2bac15bc317e4bcfce731e2388af39febc46d9ec8",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "7d0e94f575fe564897dda57822b510ca02bfa2e0360c1c29629141b69bba903d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d3a376d3c615b8c4bf7d290205705e457c5ed8cc8abdddd98ac3aebeaf4b914a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "731f271888281a394363626c5821686f8472fdc3b755e9750a7f31e524d41269",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "260c34f333106185feedd0336bb85b71743882ba60d65828f0fbe20d8dc01b8e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d9960ce308bacf434223bd59c535fd82bb9561418ab15e94c2eb06d649ee3e86",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a6d353ff036fd238a00f236447ff4f6622e15ea41ca62490048f9859803ffa79",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "65be249976aa0ea42dd2f0aeff290683d98f001761905ec39fa4ae4453b7ca9b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a64685dfcf563b003994cb552d79d32313928b4e989d72590c06e9c1cb0bdd54",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "9febf40b011594968191436fe1a62172f93fd9e1ce91c3658a19eda08f12a622",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f3e1595d674d9be8c8de8b42b8ad5147cad98c82034dfbbd22a50d1723309d10",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b064edb39a98275614c04ba297a578c248dbb7b281b58147eb98cc7e3ec7e551",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "7608a4b2f705751c7530d71cea65485e7cb2b937b3015596cf5c35ce6ddf9650",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "3ec25b136ece99a956b6e58e645d9d63af0d4d73106a695508584a278a508346",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "3b6ed41332df0876d1a6a91f0431c8efa9438364156fe8c7ff1977ada305ca68",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5946c534bf646859fe9e4868354e4410664371af0702354cd9783a6dd7987d32",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "38745c8a9aad4d36b7a5fde6b67641b4dcb815a0b306413bd4598a980e74fda7",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "defb50ff05a973d7a7ed94f34b1bf3e378f707cabbf668d9927e551370595016",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "518927beef7d4632cb7bb8050bd0f573f10d6a7881ab76ab0a0c0d52dd3dc73e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "1416dc4d4a3f0cfa7091ccd4af159215f60882005f3199e017d451012d7acd9a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "9d8dd87b2773cc471d356f4c79faab34be65f0e0395a8938fc1a85f448ee4aa9",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "45c93e1e4dd0341f46b8bda7b24acbb4688f1d3efad5dae0fe3572a53797a9c8",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5edf2295877e7513954b78792f290ff456bf5e564657d1c191ec89f86beaae03",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "93a333ef38ec71ffc8fca2fdac974e619eb5266e76b6b0f74595157832ad7206",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e6f61bd50dd645d7b2266f428ba4771b5dafaf0d47a1fa577e78ee6f25cee25a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f62d5a64ac5f120e3d032415c46a893b7d1dfc143c0ff2ccf2c6f9e779fa3980",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a7416ce86583ba749614e300712442002cf6e7e9a20314af19d3e828b472b2e0",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "6d1f5ee187f9af3d279b1658356f3f643af00483d83f65dff5c6ef79299bc6fa",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5f8d7dad42dd0624de213d0155984f8ff708628b0d2aa624ae1a055a44a391f0",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "9ca1ea9485d51f8fa2c256fa34737205b35c99e2f8146b94f5f600896f0fa2f6",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2f6f1c6e462c4709d91a442e8e3ec20e2ebf180d15650bae65c354ed394db6ef",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "361325595ed1db38195fd9f960884b6fc3341f127a3ee35d81861b81845c0592",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b3f309bd36304836f318e1953c7e582d08865d90df59c301332e2d889d0cf503",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d1fae9325e5c24a266dfd81708381e78413aad7d2aab598401c11624f9cb303d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a4763f5c2b526bdde6ad40e5e0720cc1249be73d058e9ea2f258f353c6480ec4",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "cdafbe209780944eb8976efd25635dbe8f2cdd53ee201994742bf41addd2ebb0",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "6eb17c0df5eb7fa64c352db33992ab4e855a39123c85f764569ad5e2bc296429",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5a37938fc2d47b18fe5509f447735b9b924ed9bfc8aea38da8feec358571590f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "1f32e7689f0eeff7d2c9308dd413d593afd0aaa02af58d6270f33bbb8f742eae",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "299d2bbc1c9c984324eed7e214f7ac3031a1841b16e51fd13a5625e728aee37d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "bed593fb45564a953de11c6fc071e014b11c84b2032bebc72f7268a7f2dfbcc0",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "ff31687d657b2d6846e5d97d32555d2be37d7a300b3862b789841bcf49907534",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e9732abf79c4785d9f7fc57a2c53a369767a9b988a4a0a775f32e97a3a29130d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "1a8faf8c2432e8db8237a124aab5b7645183334f19a23688ed36f3a0c4845bee",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2c4287f3fb2623924ad7221eb01ce77f637598746514f4f6b4de403c84e19c0e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "acedef5ba78526c1014dec2e29304161e26e6f4b8b2b731de0f2e8d3e778c209",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "3b44a6d84f2d59a89fc945acda0d2d10eab4bd474bc90d4ec8af5b54e06d976d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "ec710ccf6b4e2f2935ef863d524debd049b90eb1e95440cbdbad2d04a74a8391",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "85de5fa5aeb8bdeb8ec99e9390c26f0239146f0e9e88c285fa5951550c7a9b6f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "ae9e4f3beb0b736a0775abd4027f2e4b553fd01b7e6721ff08b742428d0df6d0",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a555a8c303b34103c2819191b259aef80cf6cbda3c1c889a08930dd3e2b91b65",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "621358b11692ec4dba23b23a5202755a12bdd7447d3071498490ddae44ca14a2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "6ec3ebc0575b524946dcf0453c6b55ac2959eaca25ecf850efcf1178beee28d1",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "912288bdf2fbf96036d9287b227a11d598519dd8cf0f9ff34ecc1d305608e945",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b7b1b9d308b197283508588e93c3bb44b67fda4c9aaf3c60a97028e566d37c6c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5f548027afeacad4f99c9ca8a91787f4a90ec8aa4b3c2c3dc32202f4c7f1f8b8",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "da7bb76c3b41c697a8e8117c3966d13612cd684fdfbe8478754ca08467391409",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "580d341c2edd43714fe2c84dfaa7b7000087c99412f356f787cdd1f028c60f14",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "3d516e90c8bc0f0422040a0cd2b0d3e6e6fc0a2cbd4c6770ffc6a83b65bc86e1",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "9eed47e9ab35e99cb2769356d56cdeafd3ca9008493315036fa8180b16b50451",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "26d5185c2d7c3a56950d1e60f9b5363845c6c37745167f520ab72ae20057a07d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2c999cee62f1b29e445a5e4dcbecb70e8df910287ebc497971872ff9e540904f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "4d9a8e1d77049284b907d5ce910be57cfce1feb92539cf47260f6cec5c7050c4",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "9cd1760e9518f1010cfd41bc98c3768336f6bdf9d0912a4ea94db90fe83fc61c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "21c3b033879999ad209204b0aa1f312627cd5cf7fc85e289e06c442218400006",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "17bbab1e11d7fb253ed67b2678827e77d5d084f932fc0d66b72b51ad1f2201fc",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "298b5eb9f20850952f4a607051f7192f12d848bc54e0eb02ad12532bea856722",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "004dc5747e9b14b8d5b93b0d0c98f0bf3754a4663604792b970235abba9298a9",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f6caabc98eddd1348adafb6ebe716696d03ea5c173483690e5c37a326357fd87",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "7fe6f4f02deb6184d9e54e62ff3475fdf46d85203c30a624dcfabf72925d6f17",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "4e95fc6b44c84d094f92c00a3095867592875ef86e509e3f19dde10b903363a4",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "564c4e012b371e045086b225f04d999969107cf5cb8716d45de946e113def182",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "cf31c882e3efd41290baea7d3a7dc93bc40d44d06de52d951efa4e0d6b7cc5f2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f085f5f8425c4f1629e18b8eec662442a435a355b8194659ca0468bdb476254f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "cc7cb9cb6a4a7349f5a18b1090944a5bcb2a23840d87d6cd7721153338abedd0",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "da42de3715b9ce69421235f1e9d9895d84ff1cfe2ae03419d5f9abb136d901d3",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "66655f817ad8d6c950c3f45faf760b028156e748c8c6142743ed0f4735820f4a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c62e458c4af1769abe362392999a44f2a1ca37b3d9f2a667d6c709b0992b6ebb",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a6478c3b965b74d4ba543610f8a83cf6cb6c34299836489e9fb1a2bb89112149",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "378f2bdd75a9577bbb19dc3b9d8935e9821ab6c9cfbc00f0ffa5832cb254ef92",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "33b7da8c1dd8a9210fd957858fc615879e4a42cdedca3bf0d9f565ce4a6b0809",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a1cbaa2cb459ac30707c209654b5c86ac3ca111747fd22aee6008ff5116bb1aa",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e5c7b686dad01ad836b9ebbf53dff1ae9d7d3eea752f1ce8ff647737d41841f0",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "798ea9a929ce42622571dc5b8c78c325396d1d5137de635fe1af612a84d993a1",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "304c0ebf61c5e4da58df9c083cbdaa736b4edb6d65459db092dbdac20212b08b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "70ee47f35257930d9431809dc19823e20928d95c08f9a51d671197ffe14fddfb",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2ffb996618a2a4fe737866b6dfa67039bc4f6724e7c937dfd19cc9e89bb5badc",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "bf1cfbbfa09def4ac1129cfbed9a6b74a5cf33fec0143d38f5c453019fe1a6f5",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "8b597214145f423c1e41533ccbc528b63e9c673d56bc8d4360d73008cdfe3aef",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "4fb5c2d47d05b994b622f7b2a8688c429b7b7c04f42fcebb45a0ae7ba7caa2ae",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "611123a8b6c82354402c0952ebbc39d4829c27c699b34cd6dad9eb9a5fd8be64",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "ec6a393dd75f9d4fc3b2a90afe2dd4d185ec10a0cdaa31586a147f335abc3c9f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "17072bff50d0b3ec69525c700eab9f41807eb29871185593cedc6cf37eefbc80",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b1c5e1a0fdfd41ded4835d2b10d3659bde0a1a4c1f4b64c4ad92c228d6e38edd",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b97bbdcf4a56bd1274c11f4544ab551bacb0c5cf9ef08f5f917156490ef43914",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "7aa5478068b0c473750e9f13bce1e66ab0435e4a8cd55b4c6d678c48abc08397",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5db642f69832ac0daa454d28ad90c31778a1b79ebb1e2228548f47d65078b61c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "8d2a74d1bb47cae86e9a0a9252208d9e09bbefd479248e9eff811a1c02bbc077",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "ddf0b3b8b21cba80aaa3198bf8e2659ff3981a963ed44097ecd805363b416afd",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "60c50ebe26c4839d09982aef4e8512a80d0663d68040a36d4e74fd97df2424a7",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f46f252529c3fb9e2e95950bfebd5dafb499470a8257832fcf0d84b91c42efc2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "1de425fa976087a00396397919136690d3df67b3ed5cfc682668c13da8249c41",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b370d2ac93e186d6246c0b07b0b0d8add1aed38c4adc838e6f86bccf0d82e947",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "8243524ff80bfa02ccbd4b6f8a38a0e5c1ce35ebbb614f165fd124e6536b2247",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "211089f27196763126b0eecbcaa27e6f683efa0568d3a7462e6965102ed58635",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "91d862a6c1979a7acde1fe9aa15b84bb7ff2bb283c50eb53495f1ddd229a02f0",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "68bc856063cc1219feda235e568455dd08cf24df9adee7e970e027e60432f61a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "dbecca74a4d912a1a41af37d8d21f5c97032195c820eeea186038e972028da43",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2f27ef1a179e27e28ea30bce62e3affab425d09502a55334d291364ff5f59338",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "9802899b469bbdc5d205d40188e5f2393f201c946ebdd117d08c76f609d38a79",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5ceb065bb64a17aa00414eda758a79ec7c34c366ebd70c2a01697ff7546c4fe7",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5a5c9ecdeddff57ac29214360c6a4619d57cabc7d642e869b384384fdcb47a9c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "4c384df917bdc1b668df048bfcce9e799256677cdaae8f4702dde37c517c551b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "22f1a60c97f65f41596309ed2cb025147dce0e08cb2a5cf925378e1ab65272f3",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "102aa05c9be8937ac5e48fa6db48c66836531d364a2895f3dbaf4fd502416fc5",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "bc02c9e0420e2d7b80c40253ddeeebcf1608a5cbd047e1717d988b227f122667",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b0ff97e992f59dcb15f03e65d539af79354cb74a23061c58ca0f982ff930a4b5",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e0d0c8a55dcf08998ad230c23ecc581a1777ad60f7e33c7d378a95936362c2f9",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "848e5b2e6f9f9eaff4a1e3477b63a78e856510bb4843c286efd92dab8ee7b4c3",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2774cad9b69fc9afa70d928d8a4b325e77419653342f1cee06126c1cc427d393",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a91d2ee431a7ef6cb51742c02b9ed89a987609e85d1e928e89eb6b8d4e96aa3b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d0bff3ee603e4081e1fe94ec1f42e1ae893040db09eee2af703b8f549b2c7370",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b884f04aefcf95d97915d074543ea65eafc27928406cd5e22d1bf759b9628471",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "879f7ef2dd5bab902c63e84064cf078d4d4bc6f79867f99952cf6ae6a8681898",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "1a779fab9a0167181816e6f797a301904090b517eb78c3420c857dc37b8cfc84",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c9c42c51468b0626e8230074638c4a69fa2f332a210f9f5e1342848a51f4a6cd",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "3e220e7829b4220c1518bae57e89bb4cb3910a2997b0ae5cf2b43ab2ed6ab846",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "088509d08fccb04392333c2ada4d8f56f30e35252395c292a2226bb028777931",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "8b77f088b8a1082b6d2130e2565ed65924e557b6da08e32fd9611bb81003a9c6",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "26e2784750b7e50893f5d5a46d3f1eab9132ae081e8fe097b896a65e6858d632",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e4b286a1c1f38ed21f0f073e1b2e902a45780cb30e2fed3b953422dd63e982b9",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "007e32c6256ebcf2b0736bf61fe82ec14b1a55b81fed304223d8cb8ffb4a6c9c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "209ce6cba27c4ab60fc392c318d1cb58f2da6ab677ed066857cc2d8648a7f4db",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e1bd6154c2db92d97e8efe8e7954acaeab917ef361ac2cec6f813fcada414799",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "7cd81eda70b34e54b41dce79c1a7320c4a129e31281c6d7e5d0db070ed656b0e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "4a369e9b551669212077b46caa83ed6e369eeb6db8d9ab6275d4bb4833df0f2e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2519e44ab13a53593b10a0782889fe270a6f3a6985e387e21321ae43d8330547",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f206fd88b7e95e6c3df06671d8dc5ee848349ee392f3b8efd61d46269c04095e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0ece71bf1b55094daa73c2e16411da5a0627090cf57a6af0f04041273dd7c0a2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2745734967b2398467739e2e9f5e14d70b09cfb562c0019ba87dd55a6d6df8cc",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0bdf44ab808dafac0f6b0a2672db12508fd9ad5d7510f055da370d715fe18d2c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "44d388406337d81856aa8786711e76215c90c4a6e4a2bfc25df28288d6a5068a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "cf67c3dcc04c88559a03adcccf5e0340eaf73f5e97a46d2848d9b7a54ba7bbb1",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f038e6882a463f326d7762b5cf29a67a1d20137a9b9337a94a7c92812bd7237a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5de1f901c7d927c9864b2558386427efd35299fdda98c295d40948792bcdf9d9",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2aa0dda50085180850a9d6ff8a02b74741824d924877b3cdc84b43b258e87faf",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5979d0c1b480f94a699b0cf3e1ff3006c86d5159a925e9fa047a72083b7c9cb5",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0b6b282a552de3f41079d75b2b65fe04b8ded1042bfb5783a54ac79c9aa46556",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b88a3e58ecc4513d0204620f8f5d3052a6ba5c3b0ec2c610fd87a66198373e9f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "186bebc82c3b124e8cd429342da77c17ee9e402df6572e9a69882abfc8511ba5",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "77b023fb3dd14b70e9167d2ccd72425daa2c1913b5600fe2011099c97d46bea2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d86ac2d071a34f828eb86799d1b31ae1c9f630c59c33b2f0c0cd632111bd3ff2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "475f0f62362493a19e30da4a3f3d239c5ad45aec33c7036039daa61a04c6e3e1",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a84ed4795cd27384238023a839a12beadbdb0c95de391685725e4ad3e3075929",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "bc16d78f86abed62220a44a45f27c7aea3835403c10d67d5f5849571666fe26d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d39ff653491f5006651bf8bc49ee58253d0581a14ce6692f4357936c7f076ee1",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "6923dbde99abbe39e2b772f026f53d69a9f4e10c87ae54a4beb20bd7725c926a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "9299302891390190518756c36e31a7c855e3f6d0446da24c31c96636d9534009",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "25497522ee2bd1cae9a1c129f53f72b22e198c0e923b9dbf82c63f62d863fa85",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "47e2d49140527febf743f879a5b8914e4168f3dd34a5cd03f34b6e5f5088560a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5b56b48992e67e52ae0ed5eab5b4383e54ce818d8a990d00f6c5cd9f93255565",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "cf8f934b442fa1b9ea809e5d8639ace625c16615a2ec8839bab7483023e7687d",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "932baaece613c5be32813e2ff6b04da0f21b67e3386398454747eb64aa0d6c51",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "830d45ad8b48a3cab84a676f3d13250e8a928532dabd61464e9da7fbeaad54ec",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "65af16f3130617c0568b7b120554b7e12619b1012bcc64f8c9bc3861625120aa",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "0275497dc183428f25fb61b8539991278d9e531a8f9a3e3e2879890ada4e54e0",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "4614747e597ac48636565066904a04ee0ab8eded7196d7f4210add2601545e1e",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "f4a15fbe726ac1c9061c71c3f2630d2cf1354211446baee5bf6905184a088511",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "3b66dcf0b6f922a666d961c9c2df465260291b174269fb7e7510f7befa95c24e",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "72500bb6e8b388f006e0b12178f1db93b53314238aa0e5f3090c04a82023cd3f",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "46ed0b9f4be4c5d81e962054cbf52847c353793ed084a6e2285378ba13af5f94",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "366864b03d63eddec7c9461f53aa4deaa3ce8d7f14317af571a5765099e16f93",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "104bb60336c0672853d5a19ec3ad1777613833282a0bc9eced9d833f17670791",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "885d3a103e4219bc972969016e42efb9e9cfa9e5ab5399a7d9a438005902beea",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "141b28e4f64dd2f8445e48288d3ffa0d9b317f075c71d467842126ce57b6d7b2",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "3b64bfad76cc47d7711b88cf8b119c1af721919878c4b2b5651e4dbb99825f16",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "16913a2dc9fa77d0c6ccafc3a7583e9161078c58a228a2e7a895d9ad1554fa28",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "7f0abffd18496292c7eaed14018b62269dfc2d14a77dc0914e7270097724cc30",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "272e535c70e5d22a98ff8df17abdd4cda8cd5f4090ff28efe4cdfb110934a0f2",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "bd14766d52c5b5138f3bbe86ee298bb66d2501c3429bb986509d8dfc5d4c1fc3",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "b21fe5407554294c7306ec47798c571d4366a03850f09cc8058e8eb403f725ca",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "5c338f6c39364e9c9bd2d1a7b155aa6ec017c7d21f541c7abc86cf33735ad98a",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "01ccecd437e731947b1fd235458d374853da115150c2d6339d77f6f3ac2467b9",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "2ae2432710aa4c289fb7649e82197b60fe55e8cc348f97903c4ee5ef07d0f8ba",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "941ef0fe0940dd5e3bb9a7b378dee9793d8e9a5e839460eed26bf418857a5e2d",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "49cef7570a51e6017b6343f5e1fa5784c92444b9177058c42b58cffe2a7ab88d",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "89a0d16e22d3e1a1b17d05350577596b35ecd3b480016d2c9418bde2a5ab4101",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "2ab1b33ca63aee64e78d13e5a7498107b136b397ffec84200c2d28ce96a3d54e",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "f5014ee0e780ebd35c5a7f90365c8518939911071a8e148ebf02eedc40b90bb7",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "e4c0793b03a93748c7f81a79f3de3094b707fe0ce49d78d11faa2dcbc10e3781",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "aa76c5bf5a72206ec818471b77bc42ae3a72cd54f73b98970b0361570c0747b7",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "c5c51dbe8ca78aa42f39e4fd3941db23259d4cc1c75ae290d305565a7ce3006d",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "d2a3702695ed4a83d0ca60994c7226750f77663b7aa4771dac611ba1dc9f5084",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "e7b973f0245ce7d1f62aa7c83962d0d2129048962bf2b57e81bf52371656f6f2",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "dafef1be36853378d6c067b6394e4aa6f458e9309cb5f0ad723b795a1b8656ce",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "6a1ba5f6c8c88823fdfcd9ab9295917c1b161d3354dc7b1153a5825091d6ca0a",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "5db1a32f06696a86b1abc8c7fd9f513693aad5896933ea93faa188954e4fcd2c",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "15834ab5682fa54101e94a8615fa8172ae1c3f14524e6a327647a68f01ec46da",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "ef3525d1f92da0936504266654b1378cff6ecf331f551fb7205ba16e1ca9340f",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "3c8e16f8bd623b940bbde0f08055e2d01b76eb1447582674233ac4559e3cbcd5",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "960872f4c68faf5be019aa1f973246158aa0637f76319c9b297f57f8004f0cc0",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "0d3b8396c9f68a59f45b6fa3a32cc595dd37dadf3461d9acc24d9762bda64bf8",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "97bb022d794282be1c98c8cc78d19883023b9bf75c7e140e6f31df5bce9e9068",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "41250e35dcef601c7a31ac3fe880eeea1589746baa610f1e6f8da26254966332",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "a17f1ecaa3033e1d91fa2f8642887d5c7d4fceb9876453d92fcc905ab10915c1",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "372fd74991e5f09c3aeb724e8bf2963fde81f4048ac38d525fc649c810572cc7",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "d549628eaaa9b22e8516ce819602ce9dd7295b3b12bc419c2707b597e5be8bec",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "2bf855eb147faa30cf1e501da80af2829bf32d4775c48de7fee365b08a4c76f3",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "2851a64f97401b76211c687bba76b539c331fcb8d3ff3bfd5411791ed330b6d7",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "3f5333d802601b10d5567203c629341e17bc87727d6cf57e0506ebc532f81b70",
+        "kind": "relayed_success"
+    },
+    {
+        "hash": "7c139b1da1bfd0776bfc73158eb2083f5dc89187590f1701db89210e2f6982be",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b7a70fe4ee207f01c0ac13458c7377da71c13f065bf944f2d95ea832561c10bd",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "cf04bbe11bf44f03be25a01dd574e243e560c5cebe7f2418fb5ad626d6ba767f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "03f0b5b53e1ef5ef212928eb9a5e83b97f64254a62adee067a8c439ddde20fcd",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "bfe45b34b29bd911a05d55ea58cf919a91b34f10318c0d2bfd4a7f50df86fc53",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4a4fb60f766305c398fca44f50b63eb95a7606fd172f0b3844b331a8a0008d1c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b50889e334c69b4b2c85eb067ee0f96a24308e0333ae677c7a343f1a3c849775",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "98f4005fccfa7380f49b846413c80b78d2246d179a62afdae5ae6749fd545646",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "81284bc4ae84e69823f71897da0b71677a1a6112b19105d7182de7fd75f624b0",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "00f5d03703ccc37e1873ea18ec3bf0cb46840dd854a6cee9a6af795df6fd6cd7",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "78caa86d8e3d47bbc6c228ae0d49a1c276fc153c51326ec7ddc974913d8bae38",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "6284a701095ff12cbaf59d3756590d1784ec3a4dcf32c814b6c0ec58b7c90f4c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f85c6ec11bf660318278248addab6228b11641d06ab4fa4c22b5d650716db47a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2bc660a9b28d81045391426d8cbc7a436ca257f9834d2adc630e68e7362b2c4c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4482034f2491a8dcd47a992969f6e87a84d97de5a2547e2f87c63f4ccc794340",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d7d909a3db2eb17b0eda7cfd462612bbf3294ee493e5eeb118a756394c3503f7",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a4edd2d072c6d0531e33c10e56e032dba172abfc168a5f232ab6ea71bf32ff99",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c52f6b03471bd6858ad484b0edf22d006797934e908d5188f0f727c01738cf16",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "93a618d10563e1eecaa7f3f9e40a81967a80745dc95e763129b293e8ba7734d3",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "7d403b35a3e2520c208ced77f8dec978e541197bac2c12416c3bb29f11313eb4",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ac007aea6d9458dd85db096103e251d76402b7be4203ed7a20389da9b86afd95",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "55c5574a7d4989ae4e8d293106f0eeebe1f96ff736f99ee0fd87569dd3ebc2b5",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "22544866fe78d81ed53c898cd5f3af0ba807c824a2b7314e8457d933cd6d846e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2dbaf86fb711e920b1452498c0eedbd59eff25174a2ac7fd1c1b1e1a84c0b4d6",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "092d3eff6ca730d180886921f2393dd170fd44dc8cd0ba6203af664c93df6354",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "560951af904fb0779f19b9ac6058201dd253579222f4c03cc1a0ac50cb1b7568",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2c4715787d744c3dffa6cd1b9988d92c209644064af4ad9c7796c011c44f0e45",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ad6ee6fce42b0d231caf3754d5891394e6bc28ca1ee6f310426cd0ff39de1dc9",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "807378015edba61b3e3f239d44822072d4ee5b34d21490c294106b4662942887",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0c57be0e61002dea89cc8bd7c9a533521f19370edde34f2d0c97e4c006de51fa",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1fa9c74847abe3a65e41cf589528c9e8800e5b3ac07ab2193ab82c522f339584",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f4a9ff0f4ca36694fb840476b99743a3d978baac688ec04adafe85b185436a8e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "177ed1477d0126b0f3445673e12116ce4ab5d4c0f3d1400778f1941b320e8865",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2bba138516b1af9a6e9ec0e3f61d02f3f3014ad203911bd7c3cbb0179fe1a400",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "337764b0d49af4229a633b316302af27f9661a25b61fb460c7ae94492783596c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a7e469cfe3588acb10968f04a27542c4e5096a1f4cf1534ef4f982127943fbc2",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b649c7ac4158d9fc5d3901ec390fa6c0e0b0359f6bf1357fb2e97a39965ba1d8",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "6f9181e78777d8f37fd41ff32f2fa525ea32f0ddb567039dd256987df018064c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "fcf10fbae51edb51037bf8ffb04a2dc7d0d9ecf67c85095f79ed0c46eac922d4",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b951dc6e3cf9477f210585d8de2fec89a71ee110d5e81f30da0c5a20082254d2",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "93f4e23c17e7cf5a916c4e125443558c67a5ff8f42c85870716a133231f87c71",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d9ac5e5d342f8d49bbed01e6bba184eeac02011168ca79d13b635f9d42cf1bbf",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "debe4af855384580cf2297d1f2c2a504b668afd4b62b6d512e4c3c6e0d8ac842",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8bbf5c19cc2923fc1a9e27bb35f284f9c1ecb73d1c7b355a598f55e5285d60d6",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4dab6d7ea56872ec41dd211bf8d432516beadbe82b510ef912af4fc91a63657d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b45277ca50cfbeee162542763cd1a67f19b0836bf4f7e56751c7e9b700e8ee20",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b22f878903128d5f057641c930c013a89b972a577c8a1fff7a4d1834fa6a9a72",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8b3e7b51c63eea2e2b8a0194bbf1731387f50b20c7e5ecf5c316a9d635443dec",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "17c9fa44b76a3cf6f2841720e2ee6ede73a772ea31616c9951569b273dceb172",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ffe039ecfe3c424a11a2e2134405752cc8a6692065ed828e882de0af9a0ed117",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5548bacf85bd373700f855e66816535485411594deca8bab174e6ab5ec447af1",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "57280d425e2151d3135792cb58282eb2ab27718832412b681bd7624e5862886e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "960470fe55e796b357ff679c532612be7091d9e563bf769db523b818a3828f11",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "e5f76318d1213157a97879d72f56ebdc5b5926ffe6d9a7c88cef06178c5525ad",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1172ea424b26b94ffeffb3c089d27d2a011fd2fd021359c456bca65746150de7",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8a8941b687cfae5843a1e9d437ed8d200bbc04249788985bd34e300e0f5fc811",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5314d49e6d3472804a79e632f4adc2311a61a9f7c70ac2165997f9b0ddeff3aa",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1ada50c36429b34d46c83193ea8215121a1f149a1b6289984a23dff0a38f051b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "fdab2b6ee33feb793fb9bd22cc6298ab5428826dd011a3500db56effdd0809e2",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "248f451807677734fa9e2899de7b25f8033f57ebbe5e8eacc54be00301c403ce",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c7c193cf0a79f2537fcc9a90ed8c29652c283345236a5a76d7b03e32ccd64115",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "06cc5111ed6bef61f769d9c07ab7d60a8c7589132eae1e679651105f57db34b7",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "9a5c97baa979d1c38adb3669b48b49a173a666b896dbebe1804af1c2a63f6ff5",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a2b4cffc693685759f4972b1eda87495877541065b55c8aa5df970b7ffbc3b15",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "14e012a4a6727e6f8b42813b60983fa19d0096ace2d10ea1689b4fe9c500c2d3",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0077383488f23b386182ffdb5f344a6e0e26b9aaa7b725085b7e9601a0e6499e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a37cb6e0ed79fa114a7ff8abdeff72c425550cefd8f25673db6d4bb2901f5ee7",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "de456297df9eed381c0bb5d6eb2b8f7ba0a9d0ce006a10cce46debaf6ae0ef7a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "3518e2cd6b7ae3711cb118af5a12498a72f6a4249316e4c7a72c7ee1668915cd",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5928d134d04b25520708be6574080ee56bdeb93eb63123d8bc7b14c0598e1cf2",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "334bf1eb2855faba2622cfc4076027408d46c221f9c5cc098bffeb1ca2725f50",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d3b24ad71940607b7b34da90d910abc054516480dbfb39226a629e81ab0b98bc",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "9ddd2359a9d76509cda1c85965372e3cd03c839dbb166c7825f833798b0da204",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b44ae09f74b72f3bf379707a5ae361c9197fdfe0ccb97b61912f1e5136bbadba",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "40b1ce35fc0f1def62c14931d05cb220b29b3a500c355801e349011aa8841c96",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "98585d5cced3c8d3536e84fe839714fa21faebd1d125d5dfe3c9700fd91e5b20",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5d907b715e56ec6e12d281b0968bce4e67ea1c5989c0f12b256462a1c699895c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "e53b0fe1c169b45bc01fcd8c8bf1430173ffe1bf96709c523979f327ff263c40",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "bc585f09315b8fb8a9fecb455757990a537e897585db9e1cd14f005d551f13c8",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4118f7a71958d8a5a46c0ac856cbcb081a29005d9236b6651429a74e279962f8",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "3f613fab92cca386c05b424605974ce6685c6a147e322899ef68865ce87d671d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "dcde222340ff545bfb7358a7ec1ac1ee479bb720ba9bcd994b442a15db5fa48c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c51ae7b16fd2c1907db2444bb909eda951b78464070c778a7e89b20d1012b5fa",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "39970aee39776c18eb9619110e4bae5bc9c50d901d5b6cc7274c470a61858d37",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "6b5b6f86bc9fc0b66001a7d6e46ba2f967f0b3f50bd650c5e8b13988ff254fa1",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "9c40a763226dfff48e2e3885e6684b838a899a1e671316c58c66d7025e852415",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "13895ca1fa9ab2b8286d1bf17bc1a3dd2796f866e033c32ab8e9b8ffef66da3a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "6bd79bf8c0e91fd6e58e2c37b0f083f54d8b2e30556245e0e63a0f04c6e5e9f3",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5aeaae1ed1224e8541a7f0d2632d283d857447fc78eeb2ddb2fe3b1d9dd692c6",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ea1db9afa6d8b4d515e06b588ddb803fea54dcfda2647b559a86f27280d76cf7",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ca716a663b85f9ccef5a261ea15e051460061222ab3adb59e93bd0c971502c96",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0b7f7a62e40a6c8cfb080a23c441d4b3f46689e5a18f6bff16322049cab6f15d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "48522e6c18a191c49ec014efb08265424ca6c12b9fe2b79fd0f006f414b726b8",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "23c94d7f27dbb90ac55cd86fd769c4cdbba3e82097d6a5567686e3870ce58c1f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c5aa580c3ba411385c01ee4673cbdc42956f7812020f436b21271087fe53c374",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a2fb7a614e1cd96361e3d13cc4387a0116a6087209f7d818a7b5861c30dd747d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "65fb642310c83943ed83363324a802c460286b33263dfd2f6ed3e7ef191c1253",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0834de989c0354b21abd9de85fc341f1ae136fb8182a61031eb7ef36a2d37ca8",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "549262d0257617a0e78d1fae3b8b3c6e41fc0fd833d82ec74ec959c797ec4ef1",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "6fd9dd82d186bae62cd9e4afff7d7597644607a8dc3086d95198398aca0ab605",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0d4f968618646d863341042175f0913d7f91e2601e2691484323d422d2555394",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "717f8dcdf261ccd395ec9f4accefdf7e1c7e7648d824a1447ad94279efbed537",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a79c67cacfcab7fb936c394f583366e6188e076f2727296399284cbec2b54bdc",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2defe97dd76e5da389db9b9ed63c5d86ab84d180ed0695f6446095fd14575f38",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "21f8cf276036aa6e49f54da1647ffcc71199b8df95780cae0ea972f31f0dec4d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0df34a893403023c8f5db68de92d0a80b1fafb397fc24831d55ff06e7c4c4839",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "e8264fe06854275b0284ff3741fd44e54590eb8c4f297cd5dc3dc8550a21cc3d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2369cda83e0474d0fd2d5c2a2becfd282f3bf9e2beecefbb0b9f8c158ff866d5",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d373195b4add24505bda023b1d787fb68a6eaa718619e386b1900ea93a74c9df",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "181ee75f22cd7b39983070771c0c5a8c64f78002d2947a47dc9beb0e9cdf7d55",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "387be97e9874b7e1a5ce84dd58163214dda16fe18a42b9418db51e6f0709ea6e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2948360f67501920e9162f962c7b2c166314a6a1c971975fc18749e15450c395",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "08142717ad761d82a922a55843b4658720877de55f8d0d6df098f36ca9e6cfad",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b6a7e5fbfd015f28f48d42c8e90b60346a4b2f27892acde6d29d0c2e635c43da",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "53386ea46af9d521c61d0364b1aa1d388a836725669c30905e4035e2ae910314",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5f89c9e40703b4735854c913dd5de99f5c898b0a53109b19d401dc24d1759a83",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "928b5c29a237a1b05c8d8978d7e1cc88331c3576df076284fbda9dbf299fca94",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ab313ee14aa5c6266f2dd49e7294818397c99928225f58955fc4a2791a56c396",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c30d8965e31a078ae5cd7c1d0a7213cc51dd3bbf3b8bf2f341ccff2267969d0f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8eec59e7a1ee92fc61a474575f4117ce6668bec9344f59a0b90c960f9c5099f5",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8db3c586c7d00dd4fb98c59313355a1c4e8e5dfe70fb076a6d3deb4e038cbdc1",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "e7ed817aa49ed94e3c572b4b37098a460eae4a07bc374961b5337bf0a55833fa",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "05715c2b29cef78ac54f1897972c9cd780ea25f2ba941955c872a22120d9ce49",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5e3f5b6dc93180448cca56dcb95869f8d9c88c23f5c60bd2d3327323de9f5480",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "eaeeffb167095dcaa5ff0a1287835951c17a4a95922b5a60aab39fcfc593fa08",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c1915e7755f070beeb02ceb2e52d909330a9455a87e367fcc98511798a906847",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4ec62236d37e4f546d908f6467a71be8004ed9c5990727072dc795ddfbbc0bfe",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "42ace5a672d208dcc07ef73558dc7fa6d436b571bfd795835d2141cbc601ab4b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "50fc7997847145fb54a13c7083384bb81b99a9c5b5211f9486a9e88b119df4b8",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a61e1d5cf37a4db4cb5c84cbf36fd6f45c0e15d5cf94c4f68d7469959bbee84b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1438fee8fa499c8110748c4cd03bf43f50bbfd7eae18725b019228a208fe7184",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "e32ca1c07997a593663ac824627cc2e27f668ec1b6c1babd756a6931d8884b52",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0b9aab1556995f846215e444b882c4f122ff30ee96ff3e994bae8dd37db93e34",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "526f9db74b15c832a5b9088f13810aa0dbbdf0a2c81b257420cbfa93b651f743",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4ce8cd009766e4e283680714a8673e20cef88efe82acfd45a33e1e4503e88be9",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "da51a57a794d3fadd15b04bbf29ccc5e82a1b7c7785469ede0a971ead967e40c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "aee888ce7f0f21fda9b64955d959ad05f9cef23bfbcc72f3105c04a8b00ba9e4",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c5ae6cb56e18c4b1da7614c41f7a6c60afb9d820a64a62b3eeee02558ba4d336",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8337a9e167a726f468babd5d03013e1668a9b46c346b9a8f48d918d285b4e2e0",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d57f26875f8b2954c433ce9a1e0f32392e950007441cf8c460604bcb7e5fd664",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "01d6e35285c97fa71cf97000fc2129c80f4eaccf4c992b49f1babef7e23e3e6c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "bd74589dc94f23108a59cc3849f1f4a101f3963d8339760beacaf7cec23c3a53",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "e22cf66a1c0174b435ff1133b8818dfade5e7225bfe13f7d8ed684445ea61802",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "9f734def3629bd07f51b5dfcd7761c36b3fc3d01fc6902f1d839916521a6db4e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d5aa13ccda6071695726053acfb956578813fcd4797641eea2ae6765c3a37b19",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "42a621c64a45e4886f0d7b3250b0fed095c5d23d69466b1e59e6c8beb9ca23bd",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "19642a4048ba848ca2339efdeb43fda9ad30bbcd15e920b190d5d6e1a02ebdba",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "36e282b8a8632a6ba5dd6dd6a616a34195e8cb5637cf0577fce83f4386fa8f91",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "4002b30a9ac3a593f41aef68868b0df6d297f2eb7e29e8e96f3182b6bd438f81",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d4cdc1fceb648a3ff9bfa456218abfe0950b4fd6cefcc346581cfb0cdee73aa9",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "39dbbdd03c0a31e285450d50001561ed61b7c8e647c94d0a59f9b9a0ca1d0635",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f2440dac98b14f602013056599aca5bd8da4123843bb198d4d9d89f482dc9bb2",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "bbd182f4b620917aa1d8c2d7ef03e7574a4f92e7a7ce9d14e5a568e65055027a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "611a72d874b17d5cd41f92f61f40549e6463e0eed2f3b1e31aba49c6fca3ea8e",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "ebcac7cf482e07512f3c62ac8bf1d0d38858996823c28f11739c3f787946d43b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "63f03f4bac736428cd14b24a4a8a7d1d7af533872e0bb7f3c5e1b8ae04439483",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5607e6870ed0aee9b472f50e02d09f93b25352663d650cbcc989bd2275ce1d89",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5448a5a1b16e8c73a63b27bfde88810f11438c49f2353579745e981d36508014",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c2d1639821549e16ce7fed67516228af221aa4a4fd292537969c2b5bf541b57c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "901b0f9a613de9e245fcbd96092eedc6e974d9f82eec4c6c1f010e29082d0d41",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1724c437da3125f5e375e9e19420bed15ad8f70e14712d53760f0bde70df1d34",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "548397c8439375a7fa9768e1bcf6c96087c873ab6fb8d913806d883a2c0f60bd",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "690d3425c2c8a9aba1e3782bdb89d4033fc0e27cab216c46f6a59a9c84de6c71",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a2646857f2766e293367bae4231c35a0ddce293ae36c9434e1851d16d2af492a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2386f5685cad48e414f8a109524ea560597a1f06c19765f3caed2bf8ae83bd5b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d376ce529ad413470141c369d9ade3ec6a9c773bcd4cb984d3eddf03b20bfcfc",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "346b9a513511d752e3c76ca549131ea857de4ada2f7908c0083de529aaa32e85",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "111bd202fe7bd05caaafae0f7f79d2bdfb8d67976823af226f4453ac4c61eea2",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "15e46838bd867bf7809e7e425c8f3beee5f75e2981c088afa74c8f3f2205a46f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "bb8cf27afea029b58dbdd28b733a961b8c404ee0914f2517c8b4349aa2e80f53",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0635c9d179d9d256f632a3ecd7c38a5b0021c0bd55bd61864e2b0a03038fd5eb",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a159186a65511f06e32ed60ecf2b246e6cdc6c020cefb1cd0c926860a844557f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b9e05f9f61831d2e5e46f6b4ca5ac51c7616792c36fcf30c9fcf3b98a4df21f4",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "237b281e2ffcc2919c5e34468998e5c51f8d64062650aba2d101aac8630aa015",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "337eec82f1a363eaec2f4b5775dacbc1ae56270b8c73bb53ae7a25543fb051aa",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "7ea4454cd7b21fd24c1de7409220127b7b0af816d9d9d842daecb77c0293d154",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "6f5e6948c7cdfdb1d73bd157f62ffaa61cfa14829d1c186bdf74670c7119891f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c21c3b0acc97bbebeadd9b147713e7696bdefc6136823285754b5797262155c2",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "242b73a67751e1a0cadd5765539f9147bfd46ccd2e14e35e67a0997e653b4f4d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f189eda08a6ace7c98a8d305f6aec1864ff05c09f738a8aeecbd6a90f35d55c3",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d7a41d980144581c92379fb23f18b9a14ae2fce179ab176c8658d841354e2963",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "557e99150ca929cfc03791efcb8ab682c1efc4fd7e2bfd4826d54085778711f4",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d14ba38d730b04af25426a44d5c963954b5ac2f5c86fe445d25432e5026f53dc",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "cdc07581de1c910c3b99ea0aa4171a4c97831ff1ff58c1b1564e5532752d7141",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "830fb04d94902725c4b3b25b2209d20a6080a3507d8514c50b67f4fcc2713739",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8fb64217ee33de4317edf55af76b5a0840bb4d0251a56c4eeec99ea8db2ef95d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "3f64a000e27f5ee31c5643139f9d80539a7ef7cc88e652c546bfb949df9d4949",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "834fdcda6f7745f3992dc18d7531e840e5f3efb6183047ab89c8da07bc25d7ff",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "14742dbc129842230480560704a846d1bb5967229c7fb81fb8d7628e9508eb35",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "fab7cead06c2887af7e3d42855cc1c8f5801b239de3c16cb1013f29926ece111",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "47806753023f87c70c97b28c3f5984877db125cec8d02e53493bfb943df92818",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "011957d69771d5b66427c666c438450ce01e36f2f93f1f0611e375b05929e9a6",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "67b9b4b754fd7ea72aff07fbe15f5215896187a8e532c494c0af648cb8dc3932",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a42ba8083654f55884daa38afd70c024d6fa46c387ad34045225721ee82d1cfa",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d04035afa860ead10930ecfcc2b7589aa41132b32ac2cc596a5fad7662fd9043",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5c220ecb23aa9d151315de919c72720f15fde69b5ae3779d886cf0170e534688",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "05e29ac552a2e1a13e84f56495d86c7b3d17cdce12441ff94e14181744c57739",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "78fad424876bc82a378d8cf34a7add1a24dd55436bd5e43b6f7a283ac8a6d913",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "87d859080dcdb40624ffc9ba7a0506ae4986802ee784508e29591fdcf894b147",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0668f3912876995825852f917a44c61d2aa19250324fe350dab46e2f49edd98b",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "68c906d321c0bf102b3879a00ad290d4f82ffdc5b50c8c8c959777544ead00a1",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c3e7d0e06dbbc7eacb84ae84281ca73f8b723184ff7fdec22219fde790c80c65",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "072d9bb81f6c68c9e87456fa0761246a1f7442b31e50b48a3c157bddbc68a020",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "3f55bb4449e910edbf65d717621eb49b2042fefa2dbf74472cdd09c43c2c3108",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "33e1e3c638dc7bc2801f93c57cc795a00f894e71e38795bb9b2893c10e04ebc1",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "937f81d40db7d2cbde8c56a58a588c7bb47f8f88383c461d53c640045f660001",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c49872772f2d30d0a7522a7dd32000e5c9805c0793da5c219601f365b9f44c5c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "983b3dc07e096c11513da7e447f55c86b729a96a0906f2836535b4fcc9725d62",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "9bd3f3794b42f7f82078e523f6106831d1bbe4b3f80329b84640f69107e230d2",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "bddeb6aa29ea0b33149aadba16558f2ac16b116362e9ffa210a96e86f7a82e63",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "6feaef22bdce8150b132c8ecfb09ab863b27394cbd5efc3106032528c1d5577f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2e35f4e3d0fe3e3ded447feea19e5258e36be2e4007ddfcbb95d880abc202356",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "3300f20f2d38658dc31e144a46e81c3d8c26b658ecaf37de052f06fd87be8869",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "5a8a1aae01e86bb048ff0f64b0ef8d5db2d230ad9ec295370ca04f2889356fe5",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8ef659797948371d222f0529e7ad1c5e058c8d647edd12153233fe3681f26979",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0d27986ef7ba2336c5a58c457605474eeaa548bd0fe38477e81b50b511608741",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b0feeb0d90e884b7d0c5d653be57d7741c982b0e0c6df815847511ce62bd3f6a",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f0ebd52fed839f494d2c615b24ba1454336048fd93fdfd6682e0a2214ab8e3c0",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "6c8a2682413f80e575499d4821e808ddf4e23c8d4f7939125ef4795837620385",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "bd79bf6d4bcaf70b5ab53d6bf4b019487e0e9c67f5b983e29d5ff7ed8d9336b0",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "8c8e0fca43b661c2f79d05bf6d68899f451157d08ba58348b7d23e11d058ea34",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "e3f70d2f3580cb779d5690ee4075c28c0dccd31461a4ef09321804b30d86b2a6",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "832a4c30e7a65912e61ab8e1e97bf17cbad42f0f3da5aac5b31be4aa8b57298f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "044655a39f69a137b83e55ccaac7af1ee355e150084f439a0644cdff56d09f4d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2515a98447eabd245b513d708d143e657156981bf627fe9475a80f25ec363511",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "229e864d65db9818d5df8254b7a7f91859364441b683f5b04ba43c9a3b2d3b67",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "96c352860256995c35b147b5f24ac0b6bc00f6f1fe26880a716e65a6c73925d7",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f64b53a4fdbf1b5fb94b713e23781708643c05d52d31a8be272c168202cff2b9",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "747a4ab528c40fe8889bf2713e077f39d3b7f3b4f4a517fc6e720c16c5148d21",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "0f4f03715120f792f775365d7cc6980ed1497b0274e4c2d6b228ca9eb4bc5c3d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c7ca065940bf6677e909642e3cc0a098aaa51d2bec749931bcb3f783669ceee4",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "b3ae5a1f4920255322782f8cb49f0d77b7632e1dcbaf1e6f9e83f10ffca6644d",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "69a2a835b35c23ae8fe497ea85c21049e8af626a0135bf5c5f321fd3019f4944",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "dd6e02dffac7aad1780d4b2a7e39628053d1c2b7f4652fb38d389290dbfa71fb",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "a4707812175113cfe58ea4b97d1c2c58d38fcfd3f26693b07a6f225dadc81abe",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "22f8f774325322dfd91acbd987a086f313437409cbb9ed5c5e9aed3af9f89c31",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "06d1101cc1444c79d39fb53eab40764d2dff5cb1e073daba15a275006484c053",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "77a4b5bfdd045e4e16836bf460f8e5eb36748b3cb65426720d1ff451ecbfb0db",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "807b2818f73ca71a9848c529cd0e84272424abce073427df24af4aea71ce4301",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f6a1d336565c7a4ef9d9ef1393f4a64585a602958ad61ba0816118ca1973cd23",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2ca486621ce98c4d1e723e7157dcde63dee34db6c41f66d924cf9fe0e222810f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "c088c3d564f246415cd850820552813672137d5314baec91610538cab4f3708c",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "6640e74c57f0452886565e09fa3b8ba7868d8b888c864c913fa296dcc92ac015",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "60b475a2480a33c696ac802412c4dcbb735a5b658a890c7037891aa2b5dedd8f",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "7b77090eb8b70dc67cadf06706ad1252a9e4da95e4e38b90e0e3fe92ce9488f9",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "1b9a9bb6ea73a715c943e477982dd698904ba93a75240c6f705c0f530a53de62",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "87aee3be9ed9d6bb87d4d153fb0b0b1ac84499b30a503ce099f0e74219796579",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f5eb83a49ba5cd55c49b8c5effe6a749f3bb795748934e178c74a6bead1bd222",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "2fc1aac8ad48c92ebccf147c70302562242a031f8689502a9509f1d6f119f296",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "d9da60ea44b3a14730a7d79a4b85c3d114acce4efc24fed743832a9f0f1e65cd",
+        "kind": "transfer_execute_error"
+    },
+    {
+        "hash": "f51a3362a01f94c2b3e976cc9667c3a68800bdc9bb5dc641b47273ce45079c52",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "df5d195ada6922aee05a7dd5ec27d553d507a9d79e55241953876868b51c57e2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ae5f0ebfa89afbaca1280805ed4fcef4ff209b13160abb8603eb0a78bb1e7da8",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5a564df5119ed5de369cb89024c1ae8f0ac8f618e3124da19f2367576f185284",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5a0ae85285a9182f647403a93546b266bbac7bcb076eeafaf39295147e230bcd",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b208e301cff8fbc1458c80582d97e4652d4c07f47efb4eae5c89108cebead1b3",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "312f201f85988ed6572344cbefa2e3e1b53fd840399056e88c42c2d3663d565e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7c0f6e2e7ae8bd9ab686b0819fe9ea3895334406db65f6d806f4dc3098bf14ad",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5136bdd25578ad6a7eaf679d50d7e3363ada85698532b21e8c48fa24fd7e13d3",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6ffcd2232ffe2baca86f3d84f83584e46c66ea1985e09b80fa02ed2e5a37aefb",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2ee6c86b06259125271a8a3ba92beadee031f2478f328d694dd7f42b93b53fac",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5ff5b1150adc3807397bd7f5dc61a801753aaeee57e9878154a29be22dac5700",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ebcedc97a81c79197af257ebad46fd4c6018e5fd5c64487463c62006bc499741",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b9476cb7746094c197ab3a02c48171b4899632ab0d582ac9c257048c0abd05ed",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "56ef5c0d9f38f9a93d59d65fe7cc255840c6173e6bfe0cadc107ecd56863ce73",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c2f5da62abc98d4a92af32829c277a0a942dd94cf6d1dd794b9f78803211f0e8",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ed1d3df0715475d7ea78dcd91635a7dd669f1917800f8d84285671c00b8fd9ab",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b4cf2df38520e861bab98bc86a75ea383e50554f4e99558df6ffed4b05028545",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "561af5b619fc439805fe6009ce3badc9937a85662b93d2777ae24d1659f5aa0e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4dc14668621d39dd073eed5db06dfe10472f23d8bf5700b81358deb062e17a0b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4090c5f307e9fa1ff45cc4f6b19295f57ee4905560203971444c696cb8b03a9e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "223381ab010f3be74dfcda2af181e177e2cbed934ca1846b7814f70760719407",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f36d24d967b79bd5c844d82a781f0b3f1245a377a94e1a8c4a32959d7c68acc4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "1fc5cb62378db1243dd192e4fcd99407efb4e36f6b64f81aa4959bb411737110",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9029b93ad87a45db15688e6ff9fa547724649212309bcf9784782c1ba41eef04",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0c1c01de5c8b31950d2c9ed784a5b287d4efb3866a91e71a632b5151ffad9660",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c6563a1aeca87a7600f7c9c5d14da0e5eb8c5127ec488af0157ba23982f5aa20",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ef0508bd473e32f02bef9cc1b99e5895046683ff42e8fc77b2372ec514d11bb5",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6db91c29fffb95a4bd81927c823a81fd3d09c57658d26eb8f33da2541517ba5d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b2d63090d3615e971e835e4874123dcdfe699e809634a6bac7dac2232fcae115",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2922522390bea4c9f31c90c2754f3a6d0d870de25f1d1c04e7231889d35a04ce",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3e8b72fc1b7f722c4bb2f41311651452c50b8e0940e06ed87331e126a86b4a1f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8f6e7c13fcb826f12a0836b897ee4bed8a6eb18d66d48d80dba84cef71023c0a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "eb2968188203451092186dc64177df9fb3e0285b1e10d7d9465debf1a3102e75",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "02ce5b3a0f38e0c4f279144f1225e338439a7b0789df34c4b0f2d40392f0a1a7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3d7c37f9172e38b63b256deafe7b55306cecd1fd95b3cd16b942c9b0938461ae",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3029c4422237da47f28c73ffdde7a139733f204ed0579546ebbbee850e9b5941",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9bda939bfcc7f90f1589da8a0c17709aa89d38bb78c52a546e10b7466980c8f4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "183a896c5b63221701ec9de34d9eb8e0d318315252ab3e32ef7d131a5055d59c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8031466a958f7a670abd9979e4e53893daca0c3245f53ce6dbd5541ca0369c38",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c1bda326c10ad30b0a836366ca45ff12a70f996dbad500a0918ef57001069141",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "443e70fbf6ed0b23b1250fea98c5194e036134cd9c511556317fbaee47895387",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a211130740b2a35321bf692cdc387831d636e05567ca69a4713fd2bca6098562",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d710e4db927a8aa36ab666c456842216fa50c4d2cf5e38c90cb64f5c7afe1a75",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "1eccf8d9f3eb6d0988cb3d027a828f2d3d71d3c3632a08a92abb34975953b5e0",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6db7c3df13a357e234f1ade685d806628ed224c6748daad7a5d0987467039622",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3caf9c18fa918ffc8d58a599ff8a970e29d7b1fa4845800e808b5ebe0284a102",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "142b1ea7f35afdeb0e7fae38e34dcf82e066b7ea0b3a67b65f89065c83164c43",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5318069b45cded622e352af71781cf593e159c60e68c70887e542512b5effcce",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "90d1ce511e23145cd3d7a273884b4f3f04f7b7449a6abdca56c39ac3ca64cd8f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3d1400776cb61bee691e0ae0e52b654f39dc3b0ddda381e49e1a5d3c2fa1cde2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "851f727184079e8df78051461f3626d881468ddc2a5674467313873db1090b2e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "24e43c6bd9bd91d9ba6c2b9b8517052b22bbfc6e493a2f5da9d2bd808e2b663b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "60580ccb7da03e9bf42337880509b742e274b4bf3a210a0114c1d9e280b37003",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "eba2faaf42145a0d21d9c55ddd7f86c193d3c8aecf1048ddd88f43a5bbac7dd5",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "92285778a6d1824cd6edf8cc873ba5217cb0e9ed1d9fd657c3bbba78c92886e3",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ed2485e665556e23752ae1af22ce39aed4c0179abf8d2f8911f06dadf904d131",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0fa31768994bf7e552071899133b9d97541d0163bef4774e584d990a732f5059",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "383a1eff65fcf474061b334587edffc6a8384ee217844233704c790a70ce400f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3f62222c4bf5d29a1a2838a6b0d8d4358509667de4b17f8a3323577d69c43dc1",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f5cf8686bbd01e2f7c1932c81e4b38bc9577ff94080abbf784e8e0ad7d5b805c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "66ba1a2accc640c785a342e53610f199795283bead27f48db90aea172981e7db",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a5d00985e073a3555f58c2fc8aa8ec4b422165c947ad5961834941784192c8d5",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "03c987b0ec3df318a354eb391bba80618ba106d8f4cb858ef7226a9b4e170eb9",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f0f3009862e902b8f6ce4db3de21dbb9af83cd6ad0828518a7689d02445e1d70",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "edfa004b812d76a5b13123b02e01642cc5221639a4b4637c8b8faca916340a5c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "614b1fb5e9d714f1ee4bf5a4593dd6af07cecbfb775cf6426bb220e43104c98e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "6e9ae2d58b6bbf8748beb687a7de622f549a9430dccdda9860f8f6f093c1316a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f5f65d100fe9e09847319d10db05450a17600527c8f5dc38de42c12053209e75",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "78822fc96fc6eff34d2916fc63bd60f9f43e285983d307c27681e688184c7f3a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8a61b9539a694ab6d3a97fee08144778071427f68b24c2742ef10b73b58b255d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "71375a210f957d12b023e2ba431f3e10bbc990d64e91e9ab8cd4ea0d8e822dc4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5d915ebf29c079b84d6a406bf099c50608a0edc6f520f6f185984a49be9e656f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "22594c7185d653a620a3246664d331fce2d0ea124176d02b31bbc10da404571b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ca83500a16e94343cce16f454626dc1f292205ba8fec04845707fd72bd4a6c9c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ad077407ac53f1d83463d662deb12bd09a6c5262860ac1db47630861cb891239",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "eb1554cc3f87c48d8f71e935b919df55a591c50539e8be57e7f9ca991ece2be0",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d6f8543e457af5b80fa0fae42cf6f49cd50b1df2d14948196e1c2ccfba618d3a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "89955489f08300a1aef1bd820c46a1827145d1411e7591dffe1b1670621d077e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "370267acbf6d05afd42908c1de3e9ba0be6a61b6713c16cb46a82c52a9e59e26",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5b4891bb15d30206da98ac85ce2c5672dd85a317ac6b1f63e46f2f576ebcb5ec",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4afd81023d9bf5367ae11ace56286fe3ac1100d36455f4c4123f3e28bacde120",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0487bc9555948e2ee33b4018b33108443ef811cf9d82115f1766b4bc9718c664",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ac06ac122ef7d518534bdab6a2abb74af509a40735fa95038c789a3cba9d1064",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9fd15ea4a4c009e3dca2a2b918f12844e7efcb9bf8c824fc439c2c846d0f0806",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "862ab4eb810f1e278521fc4ecfe9f6267b713f17fee19a3f159e837063db314a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a9f8bebbb9a8f271919fb6792edc1260f7f83aeefc6e1a62f4ef8cb0e894b85a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "fefda9ae8911938ffbdc93c610f4db8eb9d4a2be1db7ff79cdc299a8361dd158",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4c8cbd9a006a0f1d1d1dcc9f0d20734cc2ac2c6c398453e2e4c68086b243db2f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "76ef4a2fe0d7fb550aefcaadc8f2356f74ab2ebc6e264f136fa646a6cc21638d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b77dd06e3f426e9d10b3053b2e35502cbaf1fcf84b617ee906598607e1cc0ec3",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "52c1855504a257da4348847cae96b079e901de92a4a1a2139adc9202ec70ec36",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "48278a2bf171c35e58b422c433dfdeb8c6bc896dbf51ba29e8d7f5bb1db710b4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "209e68fbd94423135e0e1464e6968dd860fe4b1a23db23548b0ff34b05032804",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "77c379ddcc59c5bd4ba50f0f3351f8e34597e3d067481843e10e977a26e87e2b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9a5b8a46a2bcc217b97998daf3bfd1201ccc31ea2aa5a80166307abadcbf51b1",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "69d70e40ea74dce57b41a86817cf0713536dc0f4af067e5d6d619d109eb42731",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "67ec7b0f7a1e15a40cc189d79a72660f08550883ab544f063a516555b3631d5b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "982fef35d1cc7df4054564bae87f832d5491b15b51459498f510c92b47a33347",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "266abbebe8f21ec90b69df2bdbd17ed5271651ac5b4358dac7ced1ccea337417",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0a6a1a6af97691d19294ce8b70ffe95c6e7a66eb1f41eab77cb65df0c01d88a0",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4a396c8341521b37f9dd4e656e601ff53da90cccd25919d5395272b6b998c35f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "344329916e280499fd1703f139de26c2e1e91091aaeee3d4d0b13af7eb167423",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "73532c820d8785aaf35acb454cfd404c6cd6b522f9b7676f6e27918dfeb6b97c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3f8cad8f9b493e3ca26108da23804164c7e56c842b0d8a1ab3c109614ceda45b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b61a5ca595eee2c7b579b251af97db4477f13196696dbc8bbd88cde32bbe2610",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7a2c6bc43fa69aba57057a93e8f3ce2ede0739c030e8f46f2d75eddfed680457",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d911c72f73b06d240e1115f0f41df787119632547828ca5a0d084877642e6750",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d10dc081fd6efcccfa5733a7b0357667c105e26bb643eda2fe100ed5c601e09a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e5b2e7f733f709b3f0b7dee3531c54d93f342290219df0dd11b1f68da53ffc4e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "fc43d360efa5225a34b8e0ad021e3dd5505db9ae877200125c65e14d4984ce59",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "987d4c081b0f6c59f6af550a23b9345fb0a16d8ac815ad0dcf49660d0f0ed93b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "37b90b0ff943bda6b21155e2b8bd14569a91993aff3acad3bd9756e2ef82d607",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ff83bf05f14bd75c0e68fb28c81c26a34da2eca29c2d2ad3bb0fd5920ce109af",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2a195fe7d0df5ceed8de6af16abd76c555b6325d45289e8cb2d86faec7bc4a8f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b6bdf01fbb8b8f3f0597c61b29027c7d0c1afa21fda68ef461d30ace6239e26c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "aa56f40b46d0102de915f2cd585a9b09e407dae2555a7b4fb6710e0e5e631c23",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "87875f000557534d55eefbcb92b5a764afaaaf9e2cce03d38068a73f448155d7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "66fe45abc44747f1ea131ba6e7b53109bbf01e9c5096e7d9bd98aaa095277586",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "48b175c17cd359bb03fe21d4c115de4031bb0e9b9d12c3c568b1fbd753985735",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e6d61fabebd29c9c2d504186a520d241e48ce713b80eb61e92020d3ddf95fcb4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "59bfa47f8e267a7c9b947fc8db8f18af79031bf7003490db68c32f5a05d844c3",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "86a5ee174050ede9b2252a63894b0b84131859f7493aa1dd759beade3326059a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "55e05156eaac4f665f9a480b174fddc6197128af1b3b8c00ddc295837c6628b2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "782ae359cab3e6fe6b4e588b36232d281df62d9be0d4f0ec3a93919bb4958c7f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "195a3b6778d0cf237906a14efe929ef531c6d98af69f0af907c1e2b2b8956fb9",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "eeb549374f598e39808ba7f906ce39c076ce98b3df06db89dbe3a447b07a386c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "dea502404ba0f6b4acf04d6236d30e004662e5f6b66bcca8a9542abd66b92f77",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "1969fc94a5c3e6aab0e475299c3685968b17397641c588173039a1eb4e193fbe",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "717fa9b4aca70b9b077a8046adcf5ab1b0bd546cd56074822e98573d9c5a0395",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "16892d1ca7d2122e710a3c691399dbd5debec33cb48c012d5391c1f5b3a5909b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0caa8afd916d452a2b426e4a6f9c56d14549dc474f8b9a38951d8275baaafd89",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "aeb059dc660dbc569f2cf01c6fb16acbcaecb403869a6c8a81f2fd9eda570e34",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b131a8e5235df61d76d69117588374735dcd11d04ce931ee4d0791c289d018c1",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "1c2ccba614226a460a0bcfbdff54a3f593df4a01a9a9a6bbd79f5d74b46b7e2d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7f7b617ca11dcdbb8d6e8a1cedc26f048864bc596d764d3811352070e163a1c3",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "1bec291d368dbfb48e0c44c8b553fbfcd91c5f2350545218a5757d029c0f0bbc",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "894fbda7848f9e25aa505aaedcf837eb3f986508789fb848f5f2a58ffb3b04ab",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "63830fac0cde2be9c9143d9cd72f21ed276fdcd9918787709be9ecabca5823ff",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "1956d1d37f10beb32ff4af308733f0c523036000f4026e18b84742f6f8cdb595",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2043951aa93516cbe1a564256e079489fb4471a0f383f87db029a7ce2f3f87bc",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f69aca9dbeadfd23f8c4e82a606b38f8369a4411935293222b678cc4ad1cc955",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "cab3601be8c7501fa7de29ed7d8a8aeb085dd781d531eda2c6dd3b7edc207e12",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b3a66a2c7d9eef22b3eb00885b25970b1d1ecee17e5a39e2fa3e33b254cf23dd",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "595671e7e1f1d06fb515b125a33e3d730e0801fb63cde5bd4a860dd61994e974",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "20e69d3f639bc5f9b459166bfcb0a750a4abf3ade4c43fc3538d1f48bdcc5db7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7eb86ca532f73875dcdbfa03c72fd628b638141e9c0117d894b15b16668b7fe8",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "253e62409b24d6cae2d315bcad7dded79fa219e78580e28584916d6df1276b36",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9e9221206607ccb977964b937a110cf32a46d521b407f23536010c49905682bc",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ad4ae9a09343229edce64fd0ea430f5c7bf750f21fa1d3c6d523a8bb3a8e3c52",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7fe8a87fc295fe36748d9ccb9ff13510a7805b166a7fe6376b83f30011275c46",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "1824b2e8f5ff7a913ff7f06acbc595096cac615a52babc1309934500cec7d265",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ca3eb85e2d07e793b5d46446c7502eacf1d5996b045978b8526b75684c241c7a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "59308ca3062859322de930c92fb8a46c35c5999839f655155e8fe44d74d23b84",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "365bd3de882c50ea4c7f445efd14ba43a5ee2629a22bfcf633a51cb233bc1f39",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a4c7079eb98d762b7fb521b4e4f0fa5db59d71efb6568e82c3268bb4daad5025",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "433c9159042bf9d9d6bd27d3137d6c48eec05f6e07373a5f31cc62e4a49c59d5",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e4f2f678fb3a84712ecc1615215f47f3e5206502e619a2868cb68a9c25d60a29",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "235b2b65d4f476d99b0d6191cb5ea20e9a8058b932e2d8ab30597ea292d1618f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4ff60b18894fe240b45fa9dc043fb06e1a88b8c8f761c5efc024b995c7ceb789",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "376a80e0d24254cb4f731381d0b5d5a9f252e3dd01fe7c74e1490dd9e13db5ef",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "da0ddb4e10720876038015d14b6514efa6f0d8297231d55db959ef1b27918bb1",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "01b6f00e5107f9b4c54b2d68eda2cdd2d1be39adbf03af8ecc8e8f68f3c607cf",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a9568da392edc49ca2676cf426f0d7b3de1bae66c87b3c82f9177fffac17058c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "89326bbc771ee4bbd9a359a870346df67c3ca3d22a981d10c15cbaadc97e5a39",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a50fcae4be05a175eb54959aa42c7324c20f0e5aeaf88fdeb4eb57685cb09e73",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "bf76a997587d48b491984f3c06b9dba8056f489d8782bdf437c0e05150ddd799",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ad46443d3209d3a27b62d88285f3c334d5ec9a22b1e467831c2e35482d2c5880",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7a836bc9e65f5afcb1054f895d1abb89481158428bb1e19f3f533a73c8696dbd",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e7d4a38fd94c82161afa3028f607538745c6866b7f73e8c88b5a87677994f96d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f270024c2b677f29aa112660116c7669b2fd2663624edb1099aad0c73e1b624c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "fa0379fb60371fe8a0e5c4d4b9b8a100ce3e834622fcb6575188bcab6f89625d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2119f19ae9427a790d01a217e3cd55f5234872d42d133c3d5ec25b16c456830d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "24caee35f18f3534f068fedae70782b8132441490ba5c36796d3d195a5f23c30",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9bc946a09df901ef9664f4929855e23b87bf420edaf5d13dbc4b1671b880c75a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3b261612de3eaeb7315a4313b5085235c736582b52e976de1f7c012357169603",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "9272425a057efee37a6cbfed383405e4966b92a432bd255a69580a115da889d2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ec68871e569179c2f0d523ba4b5c83fa88f05de4360d5134493e6bb4eb5974ba",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a365cb0a4b223113eed502a77f1512fbcf7cdfeb61631b31faa01cba5ea6c8ea",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8817d88b85d4bba0b8cfc927704587124b412989feb3193484c3242570a4f00d",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "13fda3a3e678feed9f26bddcb641f7a40eb6fe3ad7763b026d4835f052533f4f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0578477427e088b8f6cd5b24916d4fcf624e743daaac50a5640ab55a8bb3b638",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "cf1919624c9b93e2baf3e51580167e37e03dde4f9dbddfbfb4b4096264818455",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "531d32c6cb31d58955d1bb8100e549f040b20b7e34ce0bca5419dbffc6f60d35",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "63854c46d12d3ba71d92e5062b8d9bd19da5d61276a853e19de1cf93baf786d4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "70cb6872cec49c40290f4354d4c681177e205777569eac8c55f2d0cee760083f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8734afee3c518a4e993b5c27fd0b0cb34c6f58ae973e45e6b80d5d924daba092",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3f1c245a2afc0a1400a92c27c63129af2249cab58c98a881bdc2fce360f43eb2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d5969d57069456fda4bb03a025dcfbc7714091db90b3fdd57a128c6f268ef062",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8ab665dabe3db269657f19d49edb2565bc93288208d913f49d02dbc08dcd3eba",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3c8605de609da07dfae8d3d072882eecb4941690e942219c672fa62abc5cd73f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "84062e9e9075ef8f584383453c141e730831a5a10f815422a83a4a333c673029",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "407e001c2c7ae4d38bc8377cb20f59cc32eb747bee0d277cf997b70ff382a2ba",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "fa50a5eb4fb770b5a526760503a903f5bf5fc1c1d63407ac66d81d20f3d07af6",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ada193c741400d8039af43e033ed394659abd17da0dd9c6c96271fe57a191d11",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "26cc3303c902f62f7dbf2185584cdaacd5cec9fec5416306cdce21778fb536b6",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b0bf8f37644128f2cf8a54842125e73aedf83d366de1dc42b916174b46ceeef6",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "caa54ac3862ef40b047fd73b675b539bc390bc8e9bd2313991e4f9b6a6aa33e3",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "cfec17b67e248d9c554023dd6710e84125d938e7b05f69031344fd5f352712f9",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "202deeaca74d9fa1d2bd3456d7b9d3d5fb3582ec64209109d2d953aa05fc9aaa",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "24945b9c8133df249f07c185b6b3e3f194400e11b1f9d29581d5316a21da42f0",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a40c27058f98e869c6eb50fd6222910514f539cdd24d53d45e6b5fc0e9c62cec",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e853eabcd29a159a68b3873d883c38fe92beef6cb38134ec9a4e54e615357f5c",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e83a4296841b7f6cc26c0fbd8af28493d19178203bc3b91b4efbe06f9db5dbba",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "2c3526d8c074c77af07e0b0e3da79a8bdd7794ebb78f18b4e6c8d8e165564d65",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f265bfd44b95d673b33e4f7b34c4f35b83aa1b679a5a7e8c00882d87a1e87916",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "dd14ec88c1767cecec9047148daa3ffc5970ceaed338bf592ac436f9db9b9419",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "a90bd0715a66d6ac83915ffbd9196c70b1def675995fcd386ce2597710ec6ad4",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "69d7e6eaf9f1d5ac18ff59a2ef0ccbe1f4c1c6c83027cc4b52c2374087eb93c1",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8f04085eb08ae64bb17d25aec0e51ac22b25b8ae06d6b208aa875d4d8cf4ef9e",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "c574d609f6df48c654c7f40073a3131cc5111d4192072c438e85bb8b4c7d2439",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4ce68229d24145bedbfbd53a8f52c602c0eaa3b824eee00f6dedbc186e478119",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "35120a1ed5f4989207f75ae6536ada627b905afa46c8518d8d397ada6e8e6431",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "ccac7f9fe72faba6f45a9c4673ad92f227299a830b717e1cd2e69e6c513bbcf3",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "d53ea47b923a470d2d81bf038ace429df7c3e64ac399d634041874e27ee61b91",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4a6bacc1a4227241c6fe24a4f449809249b726b647cbe626821f7cec415b1b15",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e04e000f3f634dd08c128ef0b7e1accc0a5e1181fc1a85bf57988a403850a415",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3c2a0066551b6e2a5ba1b689ef08a9067d255d675d4e4897d61351ba5284e0a7",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "705d241e9c9c3122901b06a9a57df9b36e8f8d092631b931951965df27ddc047",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "448972cb66c260529023316ee97fb95f8c3c124a1316ec83704bed465f390720",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "fd0a48a5a24da2c1c29652f21d89e0808c1332dd9d3cceaa072985da0bc8d283",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4a372653dff0d775aa998ce693b69fefbeb11834fffa984bc1a14976cf34760a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "872c66d38dd8322c55ead91fd8651cdd759ddc27a7880ccb032210b4b904acaf",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "30249b939ce82f2e0aa4d797ed3f5113a3be57eb0ee64daf1e354baf86cd34df",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "fa6dfda23d809e18e2452d3e978a6377edcf6c225ca7bdb075307c04076e0ced",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4e95a8f7373fc3d7388ba69b2cfed50b1b38b8a5879b9fe644cc72e0427ccde8",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "955548dc49dc4efb6f317a2ccd93ed06caee41bc11fe383a6d6202bba3d741db",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "7044f0777ae8546f443bf6e37d9fdefcb488f265d1ed3985a2f3eebb6bc209a5",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "0bd4eb59ec10408f79f9b92b57f21952bc428e477ea431b93bfb57e2d2e52d21",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "1b69ad73f2be7d1de635430e87cd54c8d2d9db6d3926c18eb833e6389c2d934b",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "e6b51fc24e7d57f1d0998994a0e9b6a6a918d66967b0bec929482fbcc37a0e42",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4aaeffb317022784168d72408c298ae5572924e129465d269d88e349325c2402",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "518ee2389987a182f98e96b8d4e17dd80829e06a170272ad2f79a551b40a1d33",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "99772e9551d82ab068cf14158d2fb92494ae133cfb8360dac179822a34834450",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "3da8ccf979a006f6c4a9d31c58b4140e2455dc786ea33c2e9de0e03fe582828f",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "46c0cc4b0476932c50190ff1c4570a71f3af0fff77fbd83acf9b64101247c367",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "fbe792aed214d89d988f51b769729209f55a0365794e6d4303d85e95f5b46050",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "aeb4445990fe90dc94451a47603e4d127b7a3276de3fd613af504857927fd31a",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "636c643d57ceba5cd4249f4d670ec849bab5aed870b74ca02858a530022f9fb9",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "b0767863b48a07517eb3212222abb64bc86ec531170778e75b507a404ccd72d2",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "98a4868436430a7f281d78d9b7126b5a5f8b326e721a1cf93b947f347a695ae8",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "76b6051fa68384c3359665a05e03fa051a0155ab9f7bab94373a3e23d9743666",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "8bb000a0a875121dbccd652565fa5fe1139860d9c6b343c3a9cfc047aa2fa430",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "5ba568fa068a97b19d089f22e45635902695c00fd717258580e71a83ba03b3f8",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "50a2106f5b7f107cfdd1be365a9ff9b9951d61091f4d2a806c210107b379e5a0",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "92d3f22ebfed18feec9bb54c8ffc7ae258eae133becd5f421e6f05d145391e36",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "cb66a8c38e91fc9fcfd811e987fc2ae31379de5321e11cfa9cdb77f036634b67",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "4480566a5396251437262e7b79edec3218c3b480b957fb4ac090a4b3d9dc7d19",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "63655681a5256e1548f9d49582a42198dabde81e58ac9ca8febe34c8905b0b01",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "875962d55654e23de6d6f0b16b5ab14b5e92e9368cff4abbbaaff9914fc97adf",
+        "kind": "transfer_execute_success"
+    },
+    {
+        "hash": "f36190da315425f1cb15c90c7882a351e3a4da522814a9091cf1b7c683e5d52e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f02c967c92c6fe4b051ba20726819a045d649e10bb5e7fa4cb83a46ac8efad2f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f898230055e71069dec147d8be5ebded5aa120b4f9c06fab088dd4d827862643",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "06d34e19d07bcbd3a0ef7cd94be50efd68a62710ffd69f0040b86957fadb202e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b87e43b706cf2fe4960c6c754eace481bdb6988c96b51f3efa8d8ebb167cb683",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5b0fbced32f0af3a1b9a32e9ded96198ecde102840aa4ca2243e24dc9b9758e2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "51d49507882a583b68e8f557bbfc70549e9267e1e1f7421684e76fbb1dbbaf15",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "83202b1f151e8a7eb5c4e63cb52f00a7c5d8bcc9d1ced072adea4e0c0f67a605",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "08c6c251c8cb668242172b77b9784ca95ecd8c9ca6db7c1b7a84a00ee61fc632",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "626c06ad0629ec752f1b05107f2eced52a55910c63edde334556345049d729fd",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "945c65e08b83f3870d4854da4c86f938501c5bd783abf736519a15ca84c9dea9",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "21c55ade52e43d23294d4c5874977a10a5aa13ae5b8e21d09a43c8ae7de76b85",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "689c6ace9666e33d1791fae357a2b19b199fc7211d1d5307e784fd7227654372",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "7ff1ae359a7bd0d357d3259fd37d7396d52847aa2486d95808bfee2a37d8ddfa",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "3a0fccb802cf0b9508fc3bdef373685eae8db078b713b3859c375619b49314ab",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "04f1c969c2be1a4820c459b1956bc1273697094e35f52659643c04122c0cdf8d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "370451414b4868c111d64ea1209d8afb3d0660be1b69b096e1809c1141d8bb2c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "28c86585b61cacfbc41e2774386b05004e3b387e5bd5bb91bf2a072e54684bd3",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "43852358f1e21aa800ce35ea00e41edfa83481ab4aa47a90dfe993a1b484b3f1",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "034e97ecc8088dac827d73f5f7dfc8faef54e20bd29bd592528335d28fc88cbd",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0a074db830cbf7d7a68bab54d50d1e60d36bba250f9121ef9d5ee1bc0a8ecf59",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "1e2777c895810a3ecea15f4d713f61ba5d5500f62d3c563148d50c4d04653842",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "cf4bd70751505d749aaf331108655035efa1964ef699bcb29105b489c60369de",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0cf6cea8e948eea23c29dbaeb79e852df5a0c750def4d7d4589ab9faff5785ba",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e9c6496ad54ac0a3d8648820f002cfd2d9427cdba30ea787e9cbf01abc2234da",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a2245bf15fbf9188814d178cdc86c29a2e99c81b2368af9f6e8977f50be7fa7b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e364c5f960a3d73eee333b39bce57f8358c49ed715a4cefd0c27017ea46b8c95",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "ee17320005e2217156ed07e52a43d909a4b6d202efb82842c917a7f65e0eb3ca",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c8bb825916db716e472310cadc3983be18332d445cd9dcea4abfe3ee73f601d0",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b9004ba721a73242f8bc6268981da184ae390072beed7fda74a6de963f996322",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c7c18bf9ea8a926414e9a7135d7ae6cb31e835a1ebc719e7b3bc485a0fc4c21b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "94d81c6b471b3e9a232de3051fbd951db79e535283197f3524a8993a3c4ae384",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "ed2292d2a751601f0bc73686966b9cabbfe461f0f5f912d98fb973e0643f9ebe",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "6c9b32bb1adff13d384c3ee43f06c34a15a4a9b3791c92927fa8bafd3758e4be",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a4d5b5c8dec0257b7d4bb90bb93d4c2ec12b204d28672f76c5265a7faa6e08d3",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "cd42bda9255b6ec02a1e442b4676fcf57c28754036e32e760d4b3bac70b1a9ca",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d101fe73fd3f2785d46191b1ffaef656b97ae9d71e524abcda04d0784bc99719",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0b59142a8c6cc1362e74f91ec53139908d68325d6f0d137f1f6a0f0d55e8bd9c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2888c44fa427aef1d8dacaf80f39cd7e74b5384f38e690d23d6a5702684085d8",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e7a513e83a9c4827dbb920034a4b9bf16c45c9ec0c185446d8e62610f60781e5",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "32c458c0b032b97e23b3c783e22dd0f7a90b4318026417e5c33f31d5983a7a20",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "086d2237b9ffd71e37bba9bec822935dd1c301a4d3022b299a65c5e4ed1ab088",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "19aa4d01a9ee13ce69043279176808ef7ad49a14c578d03f8b4de5197831788f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b27c1aab4315971b0f3273f8dccc23d998d8345d6b0c06694c650b0a43b26b29",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "798f6ce71cba391221ef632f31db7ce91931532132b83292542a44a658543829",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "1db86ba4aaa5b3bab21d35733166836ff1b1ad4007c7c473f7d3fa3bd7be2b8e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5417afbcfa5771c822d1d7fe3ba19047f11dae2ac1e48e7cae67d1da9fe41a5a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "3639a7c45221f035f42f34e9aa55a813b84616d6b10b80d5ff68d59ee7d558db",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e9902c73b1ac9340b5e6025013d840753f73393b5f678db58929d828c7034903",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "9f03e1e76f2257b4f199a1ed39be0dd859e7e870b591ff396a474d02b9422ca1",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "8bd21d6554c4c95282d32e12f0427717a349f3d0fe4e9bdf0570200682ae4971",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "1ba5b4744b71767810b3c7887efdcbd3d3a45b4a7ca3818b87f635127b77f64d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c55516109aa1f58043483d57cf94d41a3bd7062dc625c4de572e84cef0e250ed",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "4a11556c84125f5f4adc23d683d54e6deac656ab6f576089aa8436a52be275ff",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "6894a16d42b73311b1a8eb8d91c5e1ccf1eb32be7702741247227881b08fd598",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "55a6b4ffdb98c21cba10c21a100b9703118ac8bfce2c0d404cf711cba6592d1e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "091f6fb19afd97cec476e845ace0d515a8fb26c806387821cfca01652c3dc085",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "469f0f24a80bbf7769cff83d0431b6d140f4502f24df7d1efc147b8175272018",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f263dcafe964418e6ef75ef6b3f75959c842810f19728b8608d49183a90cdfd7",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "bf54cf384f446c1bb49a93ee55b04359bf28e5d028829d1ba518fb3d51893206",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d9b9ebe2ffc7767a9d5ac6c143c6598208d43581fef3d90609a2b7f9e7e0531b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a3b65179dadc8cfaa991479a8a4b032e83ba3473e759b18e914c628320423559",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "6995c5cb168970710fdaad21e9b8f455ba4a214d63f6d93f17d755063c5929ac",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "396666d87aa5e63ea1d2e8450501cc6927defccb0b3eaa5d5b2b8b4b3fee3202",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "62e3f14ef8974939a6f69691d36bb1e2697ac09b4986d0a8c0a17d8fa74d8f45",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2abfa70b9ceac81fba61aeba7cd9b03dec9711ec882852aef373625886eaab78",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "66875a9d6559c65366e30e1fbaf85a1274d59d456534176799856a217d48c889",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e27c31989a3b460f2e19b4a0f58d4180476d00d9a84cb2654e66da4fae139272",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b1bc70f4052386a3b783f0fe3d7b5dfadd00b08bbca7012e3182c790f0bde9ca",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "56e4ad5e75a7975e097a18f4b5676044618fb4cb4abaeb9fc7b034db6e439d3b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0aa154f1f61e9bbbf247439fb81936b01bca5e80f255969fe1fc505ab1a847d9",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f268404be1f8b0fb851b810ff9e89aa4dc275eb451f8c0383698987f10e44218",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c3bdb0d22f1336b4ebe2d9b509f843266c730f0c94a5c7f3d3eeb429a99560fc",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0fef12dff078c3d5c4b1f7793d3ce43249861ff0a2f9565c570f1ccafc6e45b0",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "70438d344cdbd5a9688b38016eb6c1664f2748be0abe887f8dceb7412c6c354c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "dc1804979ef7c1ab7a6021910ef28f751a75299244975d186bec0fa3cb18c25e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "999ebcc072d4b5d34e1d8fa3c841ce08a14bb8297a9728d7986f0490561fc552",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "389225e2dea4bf42bc20460e24707f9964f95796a1e2ac949e5d1787520c7282",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "19a0cc2591685ad5a398229b8a405cce309e76dbfac92a2e5706e1f68e4e2495",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d4b15ba24cfa0eca7be9f48c00c7cd0ef02ebc60b5f1d4acfd0c3682ea2ff231",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0fbbc25d7fd1b2ebcf1e66e85afed1114a3767e96e1509ae9b53ce0dfb90b26b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "95a1e35266e7ec1cd85e919fd25b2aa716440cf16c50aba2926c1363665b6341",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2ef694de887030e2ab8167ab566f3515d54a365cfa68e076e0e637b7f69ee688",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "cae0303bb5b73fe34df2a3252e7483bb13766fba09ad03e09d67eabe05ea2a6e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "bdae787acf18c87515cc14013033500be4d781d29c71a4b9072695fc0c57a831",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "46caf13d5aae5bb0eb6fe32f4a801e23090725e6afe8d173f0a4ea5b8913cea5",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a95281405a274eda5a724ce917130e52cc58416028212f82881f2e76f3e03e4e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c011c5888086a432335250def85646b85469d93c77bd621bdf9159c182ea465a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "64a08bc64f025907b98aba9e4eaeb998c28f15990f3707d9ec097d6079fc515b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f19662a73a71cada09c1adfd07cbb211cb0a69c686462ab0eb2935abb9c70b5f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0f5f8154f1f6a72dedfe05e0424442b99139c1bfb1c8534e25e675f7a6a0d00d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d9eff48e1ec24549c214408504e10519de9282d43fdb93d64311563380c105a7",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "160ca3d3846b66e5611388b5ad41ebb0d3d61b0c94042f58cc17f970867f59b3",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5c6b0bb830e2f05ac73b1771ed47ea56591fc04a8698ceb7cb5faa5c439ee1ba",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "20bc30fc73a43a9d569d5a99c7c4d0b84ed055c5ac6e8d2af893b5e1fe3769b2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c482bdfa730f4a0a2a2bb6358467532a453c382991f034fb0f1173d4c15591bc",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "078c5a780b884d3397e9d2abd2e3fcb6c50538996263b148624506ab54b6213b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "654aa84a6596c8d93bccc354fe8a1ce0ef1db3170a48f1dc513ce00e5bc88a36",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "7def7983777417b34efeea7c202def7bca16408f77d1002f242b1ed5a8cae43e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c7240d81d400d8a9d823e26b1f9d93c3251200e13f1e63cdfba000478dfe36e2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c4b330da247b41c12cf0a2cde568ebea3d98b45a2cd1cc61dc6d558649b50db0",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5a337a7bc8b499c13d4ca9163c7e5865bc31872a3a6ed6ca688fe15a35577c18",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d1b46e8ad3af4b20d1ef6d078f6e89a5d13d2e1af09e4b765798f935591d7137",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c780f04fb6df3b50dc0eff3320c37165ec57aa7cfca4de7f4923ceed36bf0408",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "4d71d8949ab39601283e10274b72dc424d43e509d33935c375a94a9e3f098d5a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "59d78df91769137ae71e9db13f10ed0cf8ccc3cfb622cce1d89f74007cc1bd4c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b6b56b75d2b6f4eff0ff58be5291c726fcfc3d0c9427a9ed746bbf94884386c2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "3307bfc8a797901f7d0bcd258cbb9b0cf8e3ff912eab66609f3a3b55dcc27c3d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0f825bd58a331542fd3fe75b5edef66a3dae93780efc599c94b9def733cd92b3",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "675baf18ed7e175f6fbf94d326a99f73bab128bf063b87dbeb686ea95038031a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "4d959090d90bfb1eb91962752552e18c832e25bdfe50844d4e3b589a0260f6f4",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "23547300993a916db2497ab2326aefc44b02b091c4cedceee667ad86882ff634",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "946377de081184a2d3bee164f3202647e0b3f238b6e4ddf192aaba0868ba4e1a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "00c93455daf39876bcd385e1b0a58c1fb8ef0ab25be020d47bbce280de90cfa8",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "3908976b87c6c4e892dc8676550419e208ace18cbd3d8725e750ca7ae5d43244",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "53a7ac026e39ebf7a32fb262fefea838b4d5e7f73fe8ca4638400474d53430f1",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "de4b8ceb43faf637ac17d72038d29bef9b055a243dc53d9102e82cbe91c7a5f2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e5c808700f84a84e864db9abb1c8ea78b30814839b60671c6fc1d5c0a4782668",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "49777eed509e50b59467a77cd9044c2ed770eb68499a454dd26170e5cd9344a9",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "fccd83aaeb96b54b3579095bb579e59d5c747f2df4131e7925295bdcbf2f212d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "036d8b86ee50cb7b4f0fa4a9c34e711966c0c4cca7e42d3babb713bdd567613c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "67f5d04a943a67aafc74b7dc071aeb3b0837aeb50d18e48ba36f2e9bd8971c4c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d8ea7863b88427d66ca45110fa74634df643630b39abc034031c0bb77106f284",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0ee3ac77fffc1ee6ceee4323743fa70892d7447208dd5a67df50858b41f4272a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b24d14569f9f1730f1040a41cab3c373827ae8ece9bbb6d3dceddc696cb35f31",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5fd2505c02dadd74d5b1ed23ffedfee9ab45d045bd6e8cb52abf2697d62443c7",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c478c339ff1e63bf01ed171bcb290a24b36b24fb4e23eb71d15805010a93cc3d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "83d18d10f67e65641d0867ceac4227e40bf635846da3b9d58fa961efdde1f307",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "60d1692a4e9907b4936ebedf11703df3ef49e69f308bf30de187c594d5dd1197",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5d4a049e53d891638a1330c024b068605e4c1d56b0b75c9b403df665afe2937c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "260c0fcca5d752a62192b34cec4aea0f276b8d28dd02807758ddeafd079a02ff",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "8f9dbcb19cb84b6a238ff9dec7abf76b1c33ea2bdbd1402b4c0b6fe315ff0c5c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "91eede53206af982a9bce1c480b9415255cd9e732090e2d9ed216664ef3f6ee4",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "4c4134b9f5746a3fd84da7e559ae1ed7367d5883970368bc28475813789250b1",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "40c5fbc669b814c98a305c68c89011a657d0100e3f0faabb13f1199414c9bbbe",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "8be64b11b6dfbc04b04d3c44c490b809828e3c0f93b4e7117c773c68c4f668c5",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "054c56b41802c07cf1ec516c9839fea005202115929f949d787cdfe1e6d6d639",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0e6dbf4d96e2f04a24b66d47c8e50a3edc02c98c03f43fc20f29a475c6f5b095",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "cc84eb1f9cab1a602aae75a5892c45df4c13c363943090da11d3f909a8478253",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "13dee71855177dd0ff5da71892e6b59de7537148cee0c0af10a27b9cbca8afc7",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b41b0e8335afc15b06418a2227ca7f62aa6db2af7693edfdfd8c5e170c264bf5",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "05372ca38cb1859844dd9ff34fd287b1a1406807812c074727d9e8d2aecc849a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0b6e103e8ee21533d001a8cd20df7a2f75d389b4d7bfa4c1d128a726f96ec2a6",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e984067e01e9e28a89b51af92e0761b162de79f7d4f3e4694cb4cfb450586e51",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "bbdf1921647896e6fc2044d9f826fca3062a03ab0e21ea6c7f08709ca9739d3e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0daad94e38b55ee6238fad611337312a16f9c688e4492414195a961aebf09a8e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "ce5b4a9331fa53f108d9fd439ed6b41502aa780a9ac464369224d83436d40843",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "1543f347583f18d2267d080680ab6dcb3494b38fa9de6c64568eb0ec31dddedb",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "9f6d450923e539bcffecc5044e9a7032815290f7e1708de3e34dd0217fc5e974",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "3816fa7621b7574e8cd05e01057e1f14290589354a7196540fc981523cf2e8cc",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c025df1c818035275ddcf3d53fc757d8072d16ba9d268582746e9851ae7e4891",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "724cfe998d1925f350552c261a01cf1f06854dec11222f5763987b55f40cb838",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "3871f507308c13bfc62a663c880555c983f1141dee59e4e0b8d7f5e2a4b4b0ea",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "69ae18718434009c7d903756fca8f3e68482a0dd3d35c3e4fc1c713e4a4ff639",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "07de23387cc4ca94f2c269bdef0cca549ffb14498a798cc5c457562b316bb838",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a90dde65d0855e30a373b2caec32ffb7433dbc2f46f6f3ad952c26f238d68c35",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "590e0ae91be8bbf4cea87fbe719c4a8ababb5440389a469a9cf1312e21033455",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2a451c25c89a9c4783da3ab141c7a2c64fa4147a28bc8106987ea2e306bed26f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "6388d179dccf4412b96cc45c858cd2e0342310a804320856b6ccbacb2eabb3e7",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "820b8c03de9d797dc47ab27be0e1b40cc23e06fff3a6f0db6ee05364c0bbc6f2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "cba2908ce6c64be54efd686f5da25814c329f1f5ed0a0dcae349143112332b4d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "1bbb846dfe23751fc09bd1aede19de6c174a3420e033ddafe89287fee2f9f5be",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "8d0f18f388243b928c6e56eb4ca068032aa2b620dd530f42f6142c4c415c8ecb",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d255339dd954acf78ff57edbd4986b71fb67898a193573989e31fe5f24b0a7e9",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d6c689d5c6652909f5a780dbdb6b3b62f372891ab052019b887b500033ff4d82",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "7b01aa05b659f4853b400f1e235e4e286910a8c4bc38d8c85f25a9fb40f30b42",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "ef600b94978099faeceea9e6d6b403bed8e7a990125a39407b7f63f5ae77d488",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e76a4604746c1476dcb2369d9b076cabfe0f9a0eaaa5900deb03693e6abf24bb",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "945ccc641e777edbd1dd1a9bcb2fa3145b65409f7d01a865e87413d8db3b0eae",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b5e46875d3205f3d99752c7fbec3fe5fbb7a0f21c16cbe6dbe5c8ce7579d5718",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c30130adc0323c5a0b4a305e37b16e4d84761c7d1d706a1d30b5004266ab717d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "41444b193e877fbc01a0a1a82583d5be9cb5be35a08de4e5e8d8801e39917e29",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c7ac7942800eb7830cb6a0ff7110c6db828879cda37f58836872755c2a85581f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a8526a7b4c36dc68c852a4b9e5ae7de4a8f1a113d7244ec70f9781a4fc908312",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "7202c4f00ce70ce1d18e74b10274f42c50944bee022fda3efb215dea95d5571a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "63835d65610f69ac2e1c2f0b022e4725abcc9152413b1e6692f726cfb8293f34",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "8756ddf51d460f0a1fb484b8840b6cab3fde99e9f24525cdcc8df9f05d1bc0fe",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "ad895037d57def1c7bebd3100e98a73623f00349c147e73cedf95b66831bf6eb",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d1277ebe5b0c96fcbaccd8e9bfcb45ee9624996c13db91b1a15e93bdc078c870",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "8533541d4e4c99ed311b5fdb235cb80f8324173d5d01e642f1ef5a7bcfe0d2b9",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a67ecbfdf90e64349dfbf14ce665a47634f9ff5ae3a17a6be34053a246c6bb6b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "58d847b2cefd9a46c476185c1027d97f2362251b5f7e8d3f899ad7456e973dba",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e9b806dfd06f8ab55f7ccc48e733118e1bbfdc7a24eb3ec17bbcce0d8ab6a95b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "418e6e93ca6cacfd2f1df0b4ace055bc5c4a52a437277a2ccd0873531e216983",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "255fdc73ede50cd9df839f27fc0d30244eb60c7868e3277654da3e50037f11e9",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "daf3fe7d91fd22254f5fc76b70ea98389e8bb524fc7d908511de7c073301e7f7",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "47f2cad3b4f15b3a4df8afa15ca50da389a187d4a8d2d39b6a4ec2a531158bd8",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5f8ebc1149aaad044dfca4c11be60febde1b625d4e5d8539221abca0d84d1242",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0adbd419f24ad8edcb4d9abe8bf68f5d69b8b02054ce3ea3ff5d1d64d38ec624",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0dda89aba769b2957855057ca1dbe6905645f8b42d257ef604297b161e4791c6",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "578cf695df2aabeb4a92e28a501779b58f1559cc4bb27f639fe2c03da61ce0c0",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "3f22cf58c99337ba2e86b0770fc7119f9c5acdfee9154b048c9b8f26cc8a30ee",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "15d8d4010c18ca31e6fd84ab77389d85b0d7acaf64bb1dff15d4df6408c79b9d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d4a7e227770f8942add6863d2a643b419f287ddecc3ac1e11bc6b70e8e3cbc6b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e31512457dfbc88eddf8fe09b1a69663358d330baa56c6215cdee5d4854ad8c4",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "82484f818903fabfd2f9d8b6d89a5fd4c45e180a04c4efcbd364958a11799e7c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2f36a1a5f8ba96c2f8ee9ec17935bad939f9037baceea07c06e1300215633945",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "cc1e30897e595dc42f430b422892536e6ccea9227089eabbd45ce8479987921b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2974511a06291671eb8509c141f065e4de807bcf87dd9bf739d0043a0d484a8e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "90cc5be03cec9ffafa92dccbd7591e94810b9c1a7e017d1dcb5ad086628856c1",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "2effeac97fd4c81cd397ba38a3dadc34a6d642d2e8707fac14985bc000685143",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "16c8af6eff8eb5593cef4d28052966f274fc88d5cb4da4fd6992ff3722de68b6",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e9e154362376018f460311f63d027c7590016440bccd4118633dab6a815b1ec2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f93b30c157adba19fd0307c50fcd239b6b0e7337eb9e8191bab2a881279c6cfe",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e51f8baf2b5ff6dfed325c8bba7206d3e6515d51f495ccee629d7390f4b03b1b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "6595da49aad2b428293f7e09e1e1ca0c7cc2cb3295409c3b51c9b1c552cef72e",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0699dc90c1b91be92ee6fabe516cc740bdac542b526556f703df24296a6cbb21",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0c02cd8b744d38492173ed6255d1102c36a6ae47ff2b0e645fc7425efcd47841",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a59399d116de5f383b65e358ea64711f4e225ca213ef38550797d5c6d5a2c76d",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c3aa624a54a909a2b22e397a864628cd4dc8d0728802e9fc654055dcacacd98b",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "222908e95c75aaa782ff3ae379da8a9b504ca8a936859649842abc584d852579",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "bf4f0edb0df2b5077e9e154af4f28ba9d8d61a6142f203670546969f54b0ad2f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "a45300be51b311ef862423dc882666e74306137b117308a15f4af7461be8e32c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "af4b7c643fa6debedf99566664a5dc0e43f69d3adc37cef067ec73281be9d77a",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "4fd42081f9fe6d455a03d65eac4d4e1d7598dd2513380d96c5319710fb93b600",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "af555c317d10ad669c8f8e4e05b901e4adc916c63c90ac628a705c74a5570f69",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0d6e89726d17811dcad1ef4fa1deb64f71e9e16c5aa45847389adc9c8afbb4e4",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c3705c2783a8ffc8b1c5aff138f65521a2007fe93faa1a6538628efe9da586c0",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "020f089347939a097a4bd27c673e3967c1164138dfaf51d86e7082d175030b62",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "5b21cc1bdf44d15ad290edace46ea314f4092e9071bdd46ac85dbb3bb55b6e94",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0e60f1df40ae925cb00d660b4d0926325f2381076827928ccea1c16fc21e02f2",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "40eb3bd53dd4c90316550f87c36cce38e935fb553381727bf2fd13ae606cfb60",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "41ada59d3718601b938ab29e70216cf95aab6db15dbc410a5a30158aa6347530",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "0705f9246c2207cb4d79b0e6a73c0a9fb0194ad57ce53a5da443a68b22c069ba",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e1a7e8f9c3a0850a4c55ff19990620146764c2c4e76d5a167086c97ecaca378f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "9cb11e07890f332d4853aaa8165ef9a531a3756e35030ec076d7a9c8e6b235b5",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "201bce06e19e88644dfcabbf9aadcc8fcb7910573c878465c05591c13464c741",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "999dcced8baa4f04242643faaf0f1576de4b7b21cedbbd213d5a588f3d568516",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "661b317a780835778bc959eac74a976ff3adbf008473c74bc9e0207de317a812",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "bf628fb7245057789363a8363077717f1c64dc7839c38441e223376d1f3c2d32",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "b841c0bc85372861cc7142ce64ed9eaeb4a3600b85486bb6f0c9494be2bfe4e5",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "9ee2a006fa2a563ca7a2bceec19ccbbf1b29c19448a7f5846d051a1de41e0ee9",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "f7db33e9dc41cf96d57f68e62d58a5c4035ce1de861f5c78d6c1ded2e027a671",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "84c7823be9e84f8543d47b57fd544acdadbe9363f3c83dccec759db448adca57",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "4f478dbc1dfdbc51748dfe43c12afb1a552e6fc5507690fa28b93391be1f25b8",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "e944ae041257f585dbf976600f9fe198036802c6514b1da501c31adbf279328c",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "975233ca4787bb8d42420250d97114e5878434977578bd97d979c9b4b4ff8712",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "3844e23ab9aa1752fbf2ad27f86d46e4e8317b7de41e00f30e18e0668d31c607",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "93b796e778bca39ba22c2ececf69da93195a5b61b441b5fb0b751f677d98f8d1",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "11b9f58d51c888c2fa66f4ae83b07d2af22f634e94fdaa4510e08c75e457a0c1",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "01492c4947c66da9aacac1577186cd826061b60a8675b3bb42c981998dfa7894",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "86b885b072c815352fcb061410f41c711f7bfc3f9810e94f72c7cab6624bdfb8",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "9f6bfda975c0c7378fdedfc27d142b0bf80a9a93a94d10503c6ab0ca6373cf2f",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "16c3effc5f8abe72e61a7921ed4f78cc5118c8565859a900de01e5daba69ec03",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "538c5aae2d6f53fdd044f12c98517517e0e4f8fea3eabd9799ed29c9d4ddb714",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "1121581c0f2823f5455773b2e3a95ce464675f90531442dde81215eb16d42d32",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "d17e2771089f26f468424e1109d1894e40d3462ae356534a5cc5e1567b1f0863",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "c67007a4196741aab93bd6636ca263ca6ad818839a157a70013eb8de7b0d6dba",
+        "kind": "execute_error"
+    },
+    {
+        "hash": "df05f5b2d64adf552b2ced4cc96d1e6849fe6f33ed1591041ba56acf4bef1b48",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c2ecf12affc4bc76b9f22b53dfac99e2cd95396db58fa5121644ba242268651d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "360e1c7d00eec1a50f4351e88b42c9d0a852588138df92c98ecb347ef296344d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "706159d767032bf836a22b5131cace0324f145a9ee284f054c21da2d2a25f203",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0a234553ab2280d23bb547424dda88fbf5a4c55f4cea2dd03569bf75b61f5986",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8ec432a909a887283d859c8c89dbce192c5ddfcd82134651c54c028ab185a932",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a870f3112fa9a8395ccbd00c60a798e9f07b7b27c76a50d3b02e3945ee881ce0",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "27d3f78db23abe412b5dd1d1acef10b895713bec735e3d6ebdf6fcc51733099c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9b60eed6de2972287577e83e5d72c2a411fb434544050dc5b5fc8f90e5553282",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "edc85dc0b70d4ec31241c554ef5ce5b6a9662bb54897220f3e608696452ed44f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "42180269e0d6264399838a3f4921be3fd6a01c78accca73a4055a85a196fd4f8",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "364c27c954bb021001cd5030a1cedcd599813648c22e6aa52a14e883f35d7dbe",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7a24596e5a0c0bc0efb8409a3332d1694f8965b21da208e30ddc582569c4605b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7e9c2f54e00aae887172feaa06449d1d660f0a509d12da4377b87febe74b9e5e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6e4cf787b8de5067c7fc455e89c5097406c3949424fcc0eca7be718e091827ea",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "594d3b61b8eb89bc08cc6473fbc6f14c841564011da3c4bc0c5b629230335de0",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1cd28dd097ded397b5ef9b6c1fdc8c6fda70d982388e059fefef027286fd6fb8",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d7d405a7342c4b69acfdf23f047be3fde247929a8f07c046dc93ab5155c7e1ae",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ed06417c60950bc79c225ca42684f11df68a6731ba70d2dac196abcd19f0d54e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1c0e7138bd664a5e3d2d7b43d79f6889e83aa2e0f06ed2f4846901cb3f07cbb4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "61825310d540c16aeacd189d1daec058f415d928a1f1200ec1e976d275854606",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b111336d5cb85625e1814a6d3c45416afbda29732779188d3514482a433dce0e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "374ae8291a78acf906465627e8ddb87217fbbdcbefbb88c7af96ca22d883fd01",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "205aaa423528ddbf5da746d6f3aeb3b2b6d76551528c70574387720a76ffc2c5",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5d5f709b83fcb72554bd65b778902f3efcf6e784f471c3997cb21db4935425a4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "85de0d2c5e6470f28deef21fda4d58846ad737d1f036dd224eb58520d8b8d86a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2281440b1ead62eacc014e9b65c581cc5bd725e48bc767e1184afe28565f2a9a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "94d12a1eaa9e90e59a0c783a3fc54d7eca782e6fb290b65c4031fccbbd791f91",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "26f9d72cb295ef99564c3fd9ca7bc0c68ccb42b913573ec737bf4528bdd04b70",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6959963dbe87358dfd626df4491dc20c6a530ff751f1a4e33088005b7a9b8113",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "41b5a4d57dadc163589a9d9d337ada891b82a1990b88b5d91392b1363a12e0bf",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "92cd54ce7a32576fa0b3c2b2f434b303ecd5ab5d9f165d4c14ccc5bdf9ca5a33",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "812d87b0a0f8b0b5e4a238c93bdc092483462a2fe026b2f619dbeea763c1f3cb",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "62bd26dad6dcd1f6819c71526dcc002f820b6d6809d0b688acfc28e5caa7a7e7",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2d8dced5f40343678d1dab342d9d731f7a5a5f7df4b9ec5c3e8b7202885c0b15",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e9a9bcdbd0e3f2edfd1c7fc4ca340de87a53eb9f65ca5032b281c7d8c52665b6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "25b2bc58dc803a372a5944683a2316130606f8963fddd0c36d07f7c5304b531b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b30bf6bdb41aa6b914276f86ede06c114e10ea874a6113819abfe5bd11c803b8",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6afbe78ffad9709116a3c13b866f9ac1abf2c1fb63becfac61508fe944edbf2a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3db15eee449a6b75e3a6d0a067e28e6f9dade8af61deee56cdfeadd83fecbb61",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c2e56f7dfd4a0cffbc2acc8644c3addaf84930827a2c7ab5e4d51750470fd04c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4080aaa1d077cee69736171bad4fb330f30a5add4e4cf43719a574cdbb79ad54",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ad18f41dff7343f0d4c040107e68302246c96347bd98ca2b6242523b5707ba5a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "65a4681c196fdb0a81618cf8d8ae0641eb728a35899230b28a7875ee5af7364a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8481b9987c68dd2f65383330726fe25af7cb894cd038897e55764b624892338a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "87ca54604ef50e981212399cc83b24437e827f116435c09e8e661451fee6f0c6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4cf1f3abc348c26fbd96d15295d5fad9157ffa905003f58dd9fe7d2128bd2c15",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9d7031736f887bbd8f4aa959be59248fa199562cad42ef4f5ab40f5ecac26c40",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "499c80016698de1d66b02384c7bb830c64d2b5f0195fbd43303122541d33624d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "31e045caeab51cff766e9d8121f84070be18edd13e90c944106520ad306b94cc",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "693ff7fb69efd5a6c757c3eb3474f3fdb34c693d0196f5a90a6c7755febc9d40",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "15066c6efbf3e736693a19be8602d865711230b5ce345bca87044c4637b0e896",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2f9302a04aab8e163c80e8384338db91282be36fb69496578a1ae3e2be821375",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4fc6162f7fc7ab33945abae1ab35b963e0ec42aa17a571b88161bee0272966da",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "73f97df9ca521c3b5e33c0eef3a42b4a505d83d6f95bdb4490ee48b473deb54d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2a5b691fbd502dbc6f464662ec5c6e85e11d7c17f2e4d7b6903b727a54b5f755",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "21b49da95473b9eee8475f2248881e42bdba61eccd1542c4a224d71e71f6c100",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "de2295442a923d4eac54645565c8888e7547a8d75419c485cc8090c1a378f179",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "81b79bf2c5ac00239e538b690cc859dc1b30d44c9e973615bfdb917b4b941b92",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "88c4310be85184a7ff92e77a85a2ec572eec3f89cd2e0e94a633fd5c4281ebd1",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f36a2856354e3f5b1a0d53c0a90febc4d834ea3f9c42823c00703150dfcb7d07",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "457c9bccf7a469ba3ac12c44ae6f2db19bace39aef2cbf488a6d86870ce18a81",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a44d892ba39984cf7bb1d4e7377e5319c3f3d96ee84767ad64efebaadf0108a4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3369d0756e8f664de73fc294594ed28687bdbd6e1f5a5ef4bc8d6241a4ff6864",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e7b67eaacd91beab8ea5321cf34e0cacb386ff71377253980d62863d0f62714a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5adf85873e15aebfd1e20949ce465154f228e0aed62278aa7cd69502c6c4cdcf",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2288e05c9df53577df01cf89f31b221bd6665352ad2c9f18c2af66caac69819c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d11b1afe4ff0695e43fa4fc51e815f5dcba2ec6c37cf12c44e09eea031498f5c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2c9ec1066510a0c2faa8101e88d3ffcdf90a01630262f202bc546e45fee034ad",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5c9fdfdeadb58a1631ea6911811011de62730400ea06aa89ebd23b5414728944",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7dbcbb198c58ada892e7046749227447ee0289f6acbbc74f2b9ff85d455dbe16",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "13e8e0752b96abf4bd1add3bcd9fd0b89e6d2fe99b0d5f1914b2ee66b81e363c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8073a2f1fd4bf0c0c0ce0d2655a2289fae4ba53866754dfb4e983397c5cf484c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0bcec673ab2ba90899e288a932120436158448325fb395315e4a75f7332a7337",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8ab459321d3a89e9e2bd0024a385873a7084a4834f1c61a23b87025f9ca7021c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4fab1a539f1a5ef1a414f0720d30571a115478e0d2d55d7bc03ee3b5e13fa524",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e898110254e82d5cef61c4670ae01e1fb5e99158c2da43d83c8c42550cb84b26",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "04649c059699e238afa1c5e6067149a211520dcbd756faf6dc9a1c9fd1eb7d9f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "095499040a44daf1691cd7c2b825d423c154fd6286e0130d8688b48d9fc23b93",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ce7a7e464265dd9f27cba0dfa4b76e04e8c6c6f9135b87425cedab244a4b61d9",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7bc788aa7bacd1a90db7a0d73846a9f913c51a4302dfb2283ff547e1744c33b6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "91a36beadc46adbdf2ad936c0505c9c6b7f80b153d7047945be18dc30ce2baf5",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1f43d4c66a74b8b45e0101787ea222cb5f55e3a717a795df3ba191e207d05fe7",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5d1d3bd5f3a6227514afd936d4b5c183643e033d7e44408d77ff7ab7f3b67ab7",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "17c19878986d10810abf36dd66f4dbbf45a448bb8b79c3aa4ca940769056063d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1ffd7e1b03cea649054b5cf87ed0eaab26e67f43070fd336f40de702332768b9",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0cccf65f432e81b5e5661ac20d55193035fd967feb56c75371ff3a3dc7342699",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "31a898505869c454e02a74757027e272d6a78d36ef0ac145243da9332abcdb45",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "564705d7a68226cbfd673aa0e405947b186c6e9dd63e1febc325247fb0d9ae44",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1d3430c826526f2039d1b2713a026a3c744bd8798bc99a00843d0cef076a221e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1d4bc3b67a8cd3a98f8bcad61d43e7594f199ce24202adf2772406949667c963",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b32a34df553cab7dc53258e8ccc5a9de80ddb70798b856869cced8945b9970ca",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "47646e316f0921c059e653530e0b0f2b16393408e32cdee177a04e7e67029b77",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e6bb28603850430eab3c3374a5669760cc2beca60aa47329655f198adbecbd8f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "511dcc34751c5a77e3fcfcceafa7bbd1a2987aea9c80275547b498df4d191519",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "16c8e35894f150e77062157f21a8a59841ca568e7d7eee119a9e4aea935050ed",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "9b3fc383028dfe8e7aea15177c390e9e6271f728c926ccd59d276aa73a31ee29",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "30b8c7d22bafb98ccb18a887d8db306708779c2e50514aa9ff8ab10ef7bde4d2",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8b36a0544f327e661ceaab5bd67f6a0e50b2963193056c657a06a32cc1b4d0b1",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4945e3163500fe0e07fdd6ca13737e59b5e5ec7a79828a243dc6516b7ef54b5b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0ce28aca02381c518b0689073d0941fadd7319b2c28a1bd5f3ff24be5cc3950d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5d0a2d10853d81dd32d4e1d9961b04ad23f900031519eedde152b6a204c41311",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3c930bc5829e278ad62af484ab61840dadd16897a73b6a0fb530491cf2ffbb89",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ee8a0325b5cd8514971e1ec538efb13edd5c429a3fff4ac0efac5dd887f58e67",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4581c4d92d9276647ca370a1c3e050ce1bdedb7cabb87f713cadcb206356ab47",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b7afcbf345acf717341223e7910e30af90ed25be643d1407aba1be5e17f2736f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "36039bfbc97ae9c2cc7da8e2b547a7664761f1403dc4fc2c2560e50f49ed5c5b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "006cd26b543f2cf28c21141861b23a0bbfdc59b86ef280e4760fc957331866f1",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "044a03f7564aa59e6698cba636207df2a0431dca7c2be38bb9f89182c8a7a8c4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ab02b362b639a403d204af10df9772e022b884c1a87a22e52a1cb25be0ca7694",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d499c65f320d5eb866c0e170aab97640b6c7137599d337497cfa835cd0690b53",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a941a95f8e8dbe2ae5e8bc654be778d871dceae0143b3f598bbbf780185fce9f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b4d1531e2e2a881bc01dab795e81d69fbf09963cdc309c9a64774b1234795d64",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "141ef8f6b3eb6a3568917304a7da9aa0651738a0180e1eeb517690f89f3fb101",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0bd43cf36031100a25589496c832cfc8f97fd1058295f99f7dae4c2fe06a9578",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "ae2cfe022d49e74e999cb09f0fc21326ae374419f5eef2be4101e852afba2942",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0f635385443a3b8e063f1e3c6ab0e022b98408291c641907e1f08f45483841ee",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "312c2e9769cfde2b2d87e649db62dd0838a3259e276d22b7e0627613d684a286",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2e79d801f82ff552ab9b907f4be18a79c3a631fb20cd21e96efbd7df61ce9d33",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "31f857deb336177870d348f988ca9ce08443f6676f9c12bf70804cb3e8ffbc1a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2c77d5694dae4693d48373e44a1b54069801c74fbecc1a92e1c772dac65ae192",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "bd97b0b021cd43e3f3b17b46c7bbc91941922576d6a0035c56f485f8dca673a0",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "71ef247248beb54e052d470a67cf0466f915659645fa0b88ffc883bc6cc7d348",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a9893551d99634e82c6b292aa3ea1d296f3ecbe3e46dbd6a040baad43bc79ea1",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "dab652178d7ce38eeb27f9597ef9196f00ddb1e6f589c1a1b88b1c62526065a4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7c4cb7403f20d45d8b696110b406691c57d03cd4380340b38d19c7c6f3842bba",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8ce35601a5863b6dc9d57e8b11ecfd776181392208d752e0ab9ec4dd57d8d5ba",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "14c74f2fac56db3241fb9a83ea45828ca0b437c6ca7962896111a7e309bfefa6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6f8cfbbbfb3fd1b0d060c5825f804bb5daaf0dc06407fc2fec82e24666fd79af",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3bc9485dd306dfa916b85e24fa8d654237afe1db49296412681c2cfabfe08451",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "05973e08f327b7dc89dcea8f3bf8c8f0f62d89cc4d9dcbff6f9411d9b875ccd8",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3cd5fb2a9a1b9c712eb5d6a2360258c7b0d2ae1a7d854e5bd77e24ea286d74cd",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "44b87f2434c2710d16fa39d33bbe1b85acb24c148b3c3ed98e2b433b954e7e70",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1f646da048ae6feb8fd103c1abc690928a5fc6cb55b9ec153254e0171ad924ec",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "042130ba29710fa5f7a333474ab5a1c002a04623dc1b48a0d7a676a30f9c0ab2",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0411d97571bd190f42a8e4805ea69d0de86d45a61e4b4616116b1510125d5678",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4d763596acfc877e1ad180d6dc5cf8ec3e48339008f7c635b2cefe55f48788f6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0ae8b8dad22b8d248d77760b76e4ff37827fface6421e4e3a53c8839e5919f50",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c7767113bbaf453a1a272332abe65d898820ba8ebf539bdda914107f303c436a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2e7854b1df1f1e972423019fe5e8f2b70b401e0d1282950cfa78417c80affeba",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8200938770bb99ddd23710942e9e6298ca30a1a0db02587434f8a6937cf5297a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "65c917f8b6ee4b4430c9009d326fe0f3561b4607ccbd104cc79e20328060bf18",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "be16803ba89cdb4ab372078e6b9892a5d942bf84a006a12108d7e210baa5df3d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "122a1eee22c2930ba6a176869dfb29ca09c17bac6569580f75b0c6f0035840ac",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d8c6934579d3ebc0ab6521a8e6b23cf25d22a3fa86298d23f060c47eb44dcaaa",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "06a3232385608d1ca2217c617edc25ad98ed8da029e08a2bde74b9ab2e013a05",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "57968f93a5669fae3546792110927ce057653f669e3a333dcab86082199d0bf5",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d64a3c31beaffa5cc94a8d0eca83caead8b36dd5deb869525d5c04e89992ccd5",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "20bfd6dd51cdd509b4c978a38eb985f436852f26a8948f34872fa652b4cb78b9",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3e7dbc0f9430094cdda31b399106a681b8c5a70211228320bcee7b82b29af61e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3f5d52eaaea8e98cb664dc6a1b523de2bb7334ff46ee8a63e20ba437219f4b6d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5375ed93e914ae544084f9306bbf2dd33dee6d6162fc45e77258312240c0b232",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1374fcbe819a22f4d187e791adc03449cd6bfe9468c15275ca8d16e3aae231e7",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7817759ff3a311ec0ed176b6f2d83c8d49b06fd6e4f90d5fe8a702bcf5b06376",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "150abbcb2f06cb0f61fc36e588f5b24dc7e73d4b90f2dc51c9671176f92a3105",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6acab56e0e887b80282ae49517d505e8c55c1b8f8bfcbd1d788873544f8758a6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "17199a9e41eadab8f755625641e854dc1d52baf58507df7f9e02d56d647d9cff",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "707a31e2ce8a6a492e75997a2a092f5a86afef55213790c5db1df07dde97ef7f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "88beb29a24c1268a56e493374e1a75c6f3efac8ed9e32835c79ca3cc42c6cf05",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "311136c571c630e7691e3fb5cebbd66f420e21964c57d9bc0b051f4f19708056",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "178ec642fe4418e1ffe49d9f4898dcf997429ccdcf958cc9ecdb4809f653fd75",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "72af75f8b94304e2af9f133f652c7c76a21a3b08393c2ee685a184a79ea2b9ec",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e80a1554016db879646d90a2166d5232741457429826395733d985a8592e0476",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "86008d7f91d825cfa8defda7a26f0b750b82f206efe09cdf71a254c3dd9fb301",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "028adeb8010324c5d773c0cf085682ad8f352f292693fd42c8e72b44bbb68bf7",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "79f380621bcf36c312a387bea5a7c02b3e5ee094bf1faded8f0546401b9da886",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2067de3889f967b2d72a102badbc1cb90ef782a833d7cc4890c90d1798239f4c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7c62752513bb037292be4afb99fbd445a3498ee98d568df1b3cf70b1c359f0b0",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5f1947e35371d294d564e1d6b8ddb37583dbdc6365c2758969f936274869ada1",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8119539adf588533324bf05104d31198589d2a7571a790d5d99834fcfd427886",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "48fece32c2ad9b42cdab4badd9b987ada56b04d445123bdb35af7394bc620cd8",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5a05d641134878bcbb64c7733e487951d2d6cc1a122ed544b12514aa46256e93",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "acb4fe768721b45afae597d3567ba672136579932045e055f292b7538d273ebc",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0181847db8e15cea97c95ca64299846fe69d8a93a45228dd9365a072adaad07a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "298c46fc834a91005db5409b6a503507aca5704f05cee44fa4eb6f83efd721ec",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3658c5d3e92f10fbf21689ec8bf000802b21f198d5e4a08b55f9a0a2b2d4f10f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "027fe7415281aba9ccdbd04ef11402a919f0880e9c261464ced226432b807719",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "04660402ad6fb8ae0fef8da63955783534ffba85c0d5dc3797d4da54b43e0254",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6158fc2a139db736872154e9233c15cca01a5eef1479ab2e8b2b8e6c7e46f79d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1bf938aa71cd76d61daa96ae107001f84e7dd9fe549f1198bf5bee19ba70e36f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "340ab210d02d3f720886831de915b5298a1322adc53baf64220cdbd2501055c9",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e7d92d548433f054e5de65acc4ca5c3b8874066da918c9d4a15156dcbb9e50bd",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1d3d2a22cc50f1b75ad3826ed57383bfbf8b847ef4f976cdfcac097379a30fa1",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b86db53f4e02a2922846d332162dc7512b4012b845a00c4b1eceb7091bd111a3",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "02824bf7722a32ff5a7cd611d599a11522cd6bff6d4f0ed500b1f304d6d12124",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "74d6a8d554f431ad0978b0703fc19949d4d128798e7b6e62525bbb58f0fecd28",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4a8e3854bded5a120af22a366996f926e7ab54e9f0779c6e6c007da7571c857b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "204fa454d9792bbf6490cb24fdc34d1c7c1dcedaf8bfd9924d75c686cb1ee7e4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "699de01db2874f09cba061b68153851f506814bfc8d1e5c641e2af79da89e9b4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "4964d52e4e78305411744e836aa54fb3a2e117e20cb1229ba8b23dbacde67404",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6073714712df3e528abedc76ccdfc4d60b6b2d50ab47e7b782338dd59816b439",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "68c97bc446ac9e52e078cdfe9164abfbb83a3ce66a8a02dbb998dee6bfa3e8b3",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c5c11f18a6f59375d20b588edc480bafb60cc20de983c877268cf00e49e22541",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "618958bf107a4900b7d284f90c218650236ed69cbc4366e96c96a665639be36f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "8864eee44b8b0c1e025f785a5451a9a9161987b38c0efd05ebd7082f42b812cf",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0efe7a00fe85df7da66d14ffef1875b483bb0acf60843c808f3e670fe6adcc68",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5c99bceaa089038e88dd94a4d71306f2aec60570bd2131cea7cba85d1a67de05",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "675f4f931f73a116123d1df0d6dc7f913efaea33127a7bb270feaa7b390e218d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "674921d892dde7ce4980f64a8fa0acd9a1cc7b5d7243228c8604b3810017e6b7",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0790b5461ccd479a5291f876feb7e1be66309f9505bfdb7a2b286bd4142ef0bb",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "24638a0b371b71c64ac81023ed37b55eed5e5e4dfff06aa09e7c8541c4704c7c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "11d3584e02ddf0c16cf5bf0730779d09759cae3eca4ec2646e5de3699d7d8247",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3f2f5f77aadc625fe093ce6cebb8e0e4e7656fbea098a27809105bb10ccadfa2",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2252e810d77eceb04997c2637d1b2701fb189cd7509efceab3a5ae003616f159",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "166dce54fb312b6ff03ec1e4f46c3d86aad44df029b0c1d425fb5ed0e879e88a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1013420107316c6977e3a19a21cf3a3bc4c1e37b53edc716ba373273bfc2301c",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2528a22633376342624910b7541932dd52882215467dd30047f8ea05523c4abd",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6eadd6fb6f9ba84646ec6791d1b384f4e45913d459bdbe5129836ac62f67fa1f",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3cfc1402997663039a018880ed7041a34a81e68bf200ae34c9a7acc0f16fb229",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f74a200dd10a475935c8010a2af82903f65100bf5c7085e664d4d948cb1d0f08",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "2b9ec9aab5bb97c08d03db36e68778d3be9b93edb19d1ec317ee7fa48d85d12d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "010e1c091eeb2e92be596c2c5e26895855881677256d825cd61212841eb22f64",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "d0ca86cfe077be2abb8807dc2437d3b2e45a5219489609faa12fec3e7d676eb1",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a62891995c290168d01da63d75ba023d2c158c5bd4dbc945dd9982c68dda2ac5",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6e83a22cd4183a9c6d6c96c54509dd64314c372413feb8e57dbe0a7353b2b079",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "b3cdc3bd4ab8b77739177dbd217aeba2c57acfbb204a436b5aca645069304641",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "3a24d82b914fcdd4c99f97a3edf37c804fb7ce3d3b1901108b872e7f4fb594b8",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "41e4a8116d00ce65ce2d08192ff73c6f80caa4d44dbb26ba55fa679d60c51b45",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0cfede7b9655e7588be8e0515d1f9b890c58ecb35537c78961c15520983f2ad9",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "540eaf12ab2e2738a6b83f44dabe5903e4a1cca546a6038b748e506d976d62b9",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "255f5e3a5cb82f25d5e39db02b0396d678b6f0add0dd460da12e2e49f9f24cdb",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "7ae83c16941362543846f6c5bcc738fc5030af88dad9833f5b204faf0932737a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "457f1b8c4a575ff884a38de7d11c03279ed37fee70952a009c73934b8fc4232e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e1cd93a32a0f8814e320d6c8d60c50114716b9d7629af96f6f52a51d41af3f40",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1f85271d44ac6395db92ef94970b636d4f412e11dc62525f3b302659bdd40a70",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1fb0110eb854ea6a718dfcce3c2c74a82fd7078c3c9fb46ad8882ceb8bdab702",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "5bdc9adddb4709ea9cbad03e895e43ad2909b9ee0a56e9109d4745f435e2e7c8",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "6bc4166318467463195c33a8a996eb9c9d1452f2b585decb46c2e5d2c31e384a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "e527d0241a008bb0c9f33584a49793303692b8a495a5af3ee4958629577ad9a4",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c5777dd92d8de2fb834d00ebe39d45a164f38db6f203a88fd4a64d276abc41cc",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "681ee8547e5ea3ec5935982e23d75c31c36e60c0d25315aca8984d67d0406c07",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "165b4f5166718c87925b323d3f812dd8c7fc6277e5121ee29d3b8f99a8457c10",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "11ee3d11357f74fdb7609473bb32fcb21a5bab188e258b746bc7689e95f6d28b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "969add538e5ce720f19b03dfc02117c34644a4c8801147fceb93329b7bf15274",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "456cd106dbc08ca27280f0de438efb4e9996f7220fe7533d2f7212af67f26383",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "73ed525888f134fb953229bdfc560510420c4b71ff18e00c72d07878810b46dc",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a2cc80bed90d6dce461820ebcd934de7589837861910eb360aa7c96d2901d81d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "fcb553b64b0c73c3f5b22dd831fde94f20496ab219da0fae2be3a72069b15980",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "37c6a426621b95be18e1e894f659bbd10a15e2dba32471a884e67a3f3edb33ed",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "bcf180c6400006ae1c71c46c1ff3344d9221480c811c5fd06765a7e2d58403bb",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "845aca234915e60dfcb3a089b7408c0961e19ceb17547e7b0d8a96a8696ad8b1",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "1394bd571c0843bc7d472696eaa76f093046cd7b5a6a876afadb15d10f97bec6",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "c14cff5371f95a893edc7c318c0e78811485960714730284545c32aa826bc317",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "f4b1f6fa145b3975e93c90ada85128400c21c16aa5be462a7b5b7f29b63e199e",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "373ebe64588bc0c1ec641986a206222d40edfc385902ee9181627b6b3ce1e89a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "12e3b1af35d0ae533ce39c898a31f4b01c0ef3e52356aa5c05ee9371df21975a",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "099e46ee694a6410caed34a8b4a1a2f0bc5a3696c08d354f1c48a27d8c81ea23",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "a3e8e0c8c3a0a29f660ec65106dd63831db8e117fdbb5164daad7969a5606e3d",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "0bbfcd354a4ac1145ab77e6e3b42651852fea4b50bd6134697faf33be4eee08b",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "fc6bffbe05b92d760293cdffa9f920788fbdd4266753c1cf35859421a50512fd",
+        "kind": "execute_success"
+    },
+    {
+        "hash": "41845acd2d829a5006c09fda1547e1544ef8a200a595e6646c58b747772a0fc3",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "d0bc9eac018f0b04982a1531949c7c76dfb469bc546185e28f2d5bea217fff5f",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "2f9a1a3dc200f0f3a58e16a304c5ab42a87c17f471b40c6f323ed55bcd30d377",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "5d89bc3c5c009c060b5d1b58ad51323eb7d67f7d8e3072267d9d07f284baf7fa",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "447e8a2b733ad1879038dbbf0099215e0e7c7a53c793700a43d5236ef14440f8",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "2b593cbc897f05c24d016adccf38e9ea28611f38a6bc3e2d56f560cfa4163ce3",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "4c1b4982c1f0da08f9a6dcf21a4b2008554cb550f343ee8961084247f2b1a3bf",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "2c7a0afeba8476f4353a37ab1bb943c04019b8a3908727d19d9d124f16db57fc",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "d1d93b0ae1e03aef5e0e0dc54a626e5e7a2126c54ff2ead5cbdd8a0de991c1e4",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "1a6fdb15a626d41d9fbb8ab233c8a713867460e38b09f9f8502cd9eb4e6968ab",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "b0103928c3787f9e8f68fa5d2f450f2d2f557c5f4e7ae6f435d8d2a14171fd81",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "6948b41f72524b5a53ed0364c438307ca9911d362d8c5cb92a0c1fd47f14279a",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "1010e5f6c2bb0f58e547c22b7e95a13b15214d9937536b95011759c255677062",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "0a497462e74b94e1cd7e584561c7bad6c65fade8cd299fc346289c4a56f9ac9e",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "684eeac92a0dafc8811da0409efe3c5956c8c9e9d16d10ce7699ac4ee43ee2b6",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "d6d6e4c14303113749db9bb34595612249858f793410fbb5c6b73bb063e5c599",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "1b682f8d6e8e854a9da1f74f48b97f1fdae36e763a72837e7a21f6e37791e5f0",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "226b5643cf9e0860679a425c0ae61a098718ce85afde7a4d2ab30945da4d6202",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "147507ae23dbd8610b48b4a27bf63e7761255f5611f1aaf35e0cda07e998ba89",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "959d63d9698bf836dbdf7824ad3053ff284b5956230142ee26793aaf533f71bd",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "6598b8e0dfbea3862c5098c50e4b89200d416eb70d4cabdec59394d54a2c31da",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "dccc737552cd986eb881f7bcbfc557fcb88e72b6739ab1172ca235acf2c8ef98",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "b709e543126d1cd60e29f7ba9b3d922e3550bbe2086a7c98b85ffb1b9e6a44da",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "b9239bf5ebc3e28735b23ec7305c90d3283369803a75bd7fb80d0621f8cf04f6",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "083bc32e6dd4664e3cebdd1224011632a7c24fc51e823e8b82eaef1005402009",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "3dcb992781b6ae7323de9581165aadc4d3f5c63d55ea3560d2f02c86cb818df5",
+        "kind": "relayed_error"
+    },
+    {
+        "hash": "a7c20ed14474fad25b3a2c089fae2a45a5c5d11b1ea7574de32542571b46440a",
+        "kind": "relayed_error"
+    }
+]
diff --git a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.dev.net.spec.ts b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.dev.net.spec.ts
new file mode 100644
index 000000000..977d2dfbc
--- /dev/null
+++ b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.dev.net.spec.ts
@@ -0,0 +1,102 @@
+import { assert } from "chai";
+import { TransactionsConverter } from "../converters/transactionsConverter";
+import { createDevnetProvider } from "../testutils/networkProviders";
+import { SmartContractTransactionsOutcomeParser } from "./smartContractTransactionsOutcomeParser";
+
+describe("test smart contract transactions outcome parser on devnet", () => {
+    const networkProvider = createDevnetProvider();
+    const parser = new SmartContractTransactionsOutcomeParser();
+    const transactionsConverter = new TransactionsConverter();
+
+    it("should parse outcome of deploy transactions (1)", async () => {
+        const transactionHash = "5d2ff2af8eb3fe7f2acb7e29c0436854b4c6c44de02878b6afff582888024a55";
+        const transactionOnNetwork = await networkProvider.getTransaction(transactionHash);
+        const transactionOutcome = transactionsConverter.transactionOnNetworkToOutcome(transactionOnNetwork);
+        const parsedGivenTransactionOnNetwork = parser.parseDeploy({ transactionOnNetwork });
+        const parsedGivenTransactionOutcome = parser.parseDeploy({ transactionOutcome });
+
+        assert.deepEqual(parsedGivenTransactionOnNetwork, parsedGivenTransactionOutcome);
+        assert.equal(parsedGivenTransactionOnNetwork.returnCode, "ok");
+        assert.deepEqual(parsedGivenTransactionOnNetwork.contracts, [
+            {
+                address: "erd1qqqqqqqqqqqqqpgqpayq2es08gq8798xhnpr0kzgn7495qt5q6uqd7lpwf",
+                ownerAddress: "erd1tn62hjp72rznp8vq0lplva5csav6rccpqqdungpxtqz0g2hcq6uq9k4cc6",
+                codeHash: Buffer.from("c876625ec34a04445cfd99067777ebe488afdbc6899cd958f4c1d36107ca02d9", "hex"),
+            },
+        ]);
+    });
+
+    it("should parse outcome of deploy transactions (2)", async () => {
+        const transactionHash = "76683e926dad142fc9651afca208487f2a80d327fc87e5c876eec9d028196352";
+        const transactionOnNetwork = await networkProvider.getTransaction(transactionHash);
+        const transactionOutcome = transactionsConverter.transactionOnNetworkToOutcome(transactionOnNetwork);
+        const parsedGivenTransactionOnNetwork = parser.parseDeploy({ transactionOnNetwork });
+        const parsedGivenTransactionOutcome = parser.parseDeploy({ transactionOutcome });
+
+        assert.deepEqual(parsedGivenTransactionOnNetwork, parsedGivenTransactionOutcome);
+        assert.equal(parsedGivenTransactionOnNetwork.returnCode, "execution failed");
+        assert.lengthOf(parsedGivenTransactionOnNetwork.contracts, 0);
+    });
+
+    it("should parse outcome of relayed V3 inner transactions (1)", async () => {
+        const transactionHash = "c798e8c03d93aa4e3425f63fe020572304305e2017b1053c9f4e56f2c46bafd7";
+        const transactionOnNetwork = await networkProvider.getTransaction(transactionHash);
+        const outcomes = transactionsConverter.transactionOnNetworkToOutcomesOfInnerTransactions(transactionOnNetwork);
+
+        const parsed = parser.parseExecute({ transactionOutcome: outcomes[0] });
+        assert.deepEqual(parsed.values, [Buffer.from([1])]);
+        assert.equal(parsed.returnCode, "ok");
+        assert.equal(parsed.returnMessage, "ok");
+    });
+
+    // Will work upon the fix on Node's side (so that SCRs have as "originalTxHash" the inner transaction itself).
+    it.skip("should parse outcome of relayed V3 inner transactions (2)", async () => {
+        const transactionHash = "eaf80014f1b413191ac6a04a81c3751c5563aff246021f4f7c4ba9723fa3b536";
+        const transactionOnNetwork = await networkProvider.getTransaction(transactionHash);
+        const outcomes = transactionsConverter.transactionOnNetworkToOutcomesOfInnerTransactions(transactionOnNetwork);
+
+        let parsed = parser.parseExecute({ transactionOutcome: outcomes[0] });
+        assert.deepEqual(parsed.values, [Buffer.from([42]), Buffer.from([43]), Buffer.from([44])]);
+        assert.equal(parsed.returnCode, "ok");
+        assert.equal(parsed.returnMessage, "ok");
+
+        parsed = parser.parseExecute({ transactionOutcome: outcomes[1] });
+        assert.deepEqual(parsed.values, []);
+        assert.equal(parsed.returnCode, "");
+        assert.equal(parsed.returnMessage, "");
+    });
+
+    it("should parse outcome of relayed V3 inner transactions (3)", async () => {
+        const transactionHash = "d241307c92c66cfe8ce723656d8b2c47a4a4f9e457eec305155debba6c92ca1b";
+        const transactionOnNetwork = await networkProvider.getTransaction(transactionHash);
+        const outcomes = transactionsConverter.transactionOnNetworkToOutcomesOfInnerTransactions(transactionOnNetwork);
+
+        let parsed = parser.parseExecute({ transactionOutcome: outcomes[0] });
+        assert.deepEqual(parsed.values, [Buffer.from([42]), Buffer.from([43]), Buffer.from([44])]);
+        assert.equal(parsed.returnCode, "ok");
+        assert.equal(parsed.returnMessage, "ok");
+
+        // Signal error is not recoverable (for the moment).
+        parsed = parser.parseExecute({ transactionOutcome: outcomes[1] });
+        assert.deepEqual(parsed.values, []);
+        assert.equal(parsed.returnCode, "");
+        assert.equal(parsed.returnMessage, "");
+    });
+
+    it("should parse outcome of relayed V3 inner transactions (4)", async () => {
+        const transactionHash = "4bb3bc0f069fe4cf6a19750db026cca0968b224a59a2bfe6eee834c19d73cb80";
+        const transactionOnNetwork = await networkProvider.getTransaction(transactionHash);
+        const outcomes = transactionsConverter.transactionOnNetworkToOutcomesOfInnerTransactions(transactionOnNetwork);
+
+        let parsed = parser.parseExecute({ transactionOutcome: outcomes[0] });
+        assert.deepEqual(parsed.values, [Buffer.from([42]), Buffer.from([43]), Buffer.from([44])]);
+        assert.equal(parsed.returnCode, "ok");
+        assert.equal(parsed.returnMessage, "ok");
+
+        // Signal error is not recoverable (for the moment).
+        parsed = parser.parseExecute({ transactionOutcome: outcomes[1] });
+        assert.deepEqual(parsed.values, [Buffer.from([42]), Buffer.from([43]), Buffer.from([44])]);
+        assert.equal(parsed.returnCode, "ok");
+        assert.equal(parsed.returnMessage, "ok");
+    });
+});
diff --git a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.main.net.spec.ts b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.main.net.spec.ts
new file mode 100644
index 000000000..dbe83452b
--- /dev/null
+++ b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.main.net.spec.ts
@@ -0,0 +1,136 @@
+import { assert } from "chai";
+import { promises } from "fs";
+import { TransactionsConverter } from "../converters/transactionsConverter";
+import { createMainnetProvider } from "../testutils/networkProviders";
+import { SmartContractTransactionsOutcomeParser } from "./smartContractTransactionsOutcomeParser";
+
+describe("test smart contract transactions outcome parser on mainnet", () => {
+    const networkProvider = createMainnetProvider();
+    const parser = new SmartContractTransactionsOutcomeParser();
+    const converter = new TransactionsConverter();
+
+    it("should parse (execute_success)", async function () {
+        this.timeout(3600000);
+
+        const records = await loadRecords("execute_success");
+
+        for (let i = 0; i < records.length; i++) {
+            const { hash } = records[i];
+            console.log(i, hash);
+
+            const transactionOnNetwork = await networkProvider.getTransaction(hash);
+            const transactionOutcome = converter.transactionOnNetworkToOutcome(transactionOnNetwork);
+            const parsedOutcomeGivenTransactionOutcome = parser.parseExecute({ transactionOutcome });
+            const parsedOutcomeGivenTransactionOnNetwork = parser.parseExecute({ transactionOnNetwork });
+
+            assert.deepEqual(parsedOutcomeGivenTransactionOutcome, parsedOutcomeGivenTransactionOnNetwork);
+            assert.equal(parsedOutcomeGivenTransactionOnNetwork.returnCode, "ok");
+            assert.equal(parsedOutcomeGivenTransactionOnNetwork.returnMessage, "ok");
+        }
+    });
+
+    it("should parse (execute_error)", async function () {
+        this.timeout(3600000);
+
+        const records = await loadRecords("execute_error");
+
+        for (let i = 0; i < records.length; i++) {
+            const { hash } = records[i];
+            console.log(i, hash);
+
+            const transactionOnNetwork = await networkProvider.getTransaction(hash);
+            const transactionOutcome = converter.transactionOnNetworkToOutcome(transactionOnNetwork);
+            const parsedOutcomeGivenTransactionOutcome = parser.parseExecute({ transactionOutcome });
+            const parsedOutcomeGivenTransactionOnNetwork = parser.parseExecute({ transactionOnNetwork });
+
+            assert.deepEqual(parsedOutcomeGivenTransactionOutcome, parsedOutcomeGivenTransactionOnNetwork);
+            assert.isTrue(parsedOutcomeGivenTransactionOnNetwork.returnCode.length > 0);
+            assert.isTrue(parsedOutcomeGivenTransactionOnNetwork.returnMessage.length > 0);
+            assert.lengthOf(parsedOutcomeGivenTransactionOnNetwork.values, 0);
+        }
+    });
+
+    it("should parse (transfer_execute_success)", async function () {
+        this.timeout(3600000);
+
+        const records = await loadRecords("transfer_execute_success");
+
+        for (let i = 0; i < records.length; i++) {
+            const { hash } = records[i];
+            console.log(i, hash);
+
+            const transactionOnNetwork = await networkProvider.getTransaction(hash);
+            const transactionOutcome = converter.transactionOnNetworkToOutcome(transactionOnNetwork);
+            const parsedOutcomeGivenTransactionOutcome = parser.parseExecute({ transactionOutcome });
+            const parsedOutcomeGivenTransactionOnNetwork = parser.parseExecute({ transactionOnNetwork });
+
+            assert.deepEqual(parsedOutcomeGivenTransactionOutcome, parsedOutcomeGivenTransactionOnNetwork);
+            assert.equal(parsedOutcomeGivenTransactionOnNetwork.returnCode, "ok");
+            assert.equal(parsedOutcomeGivenTransactionOnNetwork.returnMessage, "ok");
+        }
+    });
+
+    it("should parse (transfer_execute_error)", async function () {
+        this.timeout(3600000);
+
+        const records = await loadRecords("transfer_execute_error");
+
+        for (let i = 0; i < records.length; i++) {
+            const { hash } = records[i];
+            console.log(i, hash);
+
+            const transactionOnNetwork = await networkProvider.getTransaction(hash);
+            const transactionOutcome = converter.transactionOnNetworkToOutcome(transactionOnNetwork);
+            const parsedOutcomeGivenTransactionOutcome = parser.parseExecute({ transactionOutcome });
+            const parsedOutcomeGivenTransactionOnNetwork = parser.parseExecute({ transactionOnNetwork });
+
+            assert.deepEqual(parsedOutcomeGivenTransactionOutcome, parsedOutcomeGivenTransactionOnNetwork);
+            assert.isTrue(parsedOutcomeGivenTransactionOnNetwork.returnCode.length > 0);
+            assert.isTrue(parsedOutcomeGivenTransactionOnNetwork.returnMessage.length > 0);
+            assert.lengthOf(parsedOutcomeGivenTransactionOnNetwork.values, 0);
+        }
+    });
+
+    it("should parse (relayed_success)", async function () {
+        this.timeout(3600000);
+
+        const records = await loadRecords("relayed_success");
+
+        for (let i = 0; i < records.length; i++) {
+            const { hash } = records[i];
+            console.log(i, hash);
+
+            const transactionOnNetwork = await networkProvider.getTransaction(hash);
+            const parsedOutcomeGivenTransactionOnNetwork = parser.parseExecute({ transactionOnNetwork });
+
+            assert.equal(parsedOutcomeGivenTransactionOnNetwork.returnCode, "ok");
+            assert.equal(parsedOutcomeGivenTransactionOnNetwork.returnMessage, "ok");
+        }
+    });
+
+    it("should parse (relayed_error)", async function () {
+        this.timeout(3600000);
+
+        const records = await loadRecords("relayed_error");
+
+        for (let i = 0; i < records.length; i++) {
+            const { hash } = records[i];
+            console.log(i, hash);
+
+            const transactionOnNetwork = await networkProvider.getTransaction(hash);
+            const parsedOutcomeGivenTransactionOnNetwork = parser.parseExecute({ transactionOnNetwork });
+
+            assert.isTrue(parsedOutcomeGivenTransactionOnNetwork.returnCode.length > 0);
+            assert.isTrue(parsedOutcomeGivenTransactionOnNetwork.returnMessage.length > 0);
+            assert.lengthOf(parsedOutcomeGivenTransactionOnNetwork.values, 0);
+        }
+    });
+
+    async function loadRecords(kind: string): Promise<any[]> {
+        const path = "src/testdata/transactions.mainnet.json";
+        const content: string = await promises.readFile(path, { encoding: "utf8" });
+        const records = JSON.parse(content);
+        const recordsFiltered = records.filter((record: any) => record.kind == kind);
+        return recordsFiltered;
+    }
+});
diff --git a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.ts b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.ts
index fe0777ef8..9f57b4782 100644
--- a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.ts
+++ b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.ts
@@ -1,8 +1,16 @@
 import { Address } from "../address";
+import { ARGUMENTS_SEPARATOR } from "../constants";
 import { Err } from "../errors";
-import { ITransactionOnNetwork } from "../interfaceOfNetwork";
-import { EndpointDefinition, ResultsParser, ReturnCode, Type, UntypedOutcomeBundle } from "../smartcontracts";
-import { TransactionOutcome, findEventsByIdentifier } from "./resources";
+import { IContractResultItem, ITransactionEvent, ITransactionOnNetwork } from "../interfaceOfNetwork";
+import {
+    ArgSerializer,
+    EndpointDefinition,
+    ResultsParser,
+    ReturnCode,
+    Type,
+    UntypedOutcomeBundle,
+} from "../smartcontracts";
+import { SmartContractCallOutcome, TransactionOutcome, findEventsByIdentifier } from "./resources";
 
 enum Events {
     SCDeploy = "SCDeploy",
@@ -79,7 +87,7 @@ export class SmartContractTransactionsOutcomeParser {
         };
     }
 
-    protected parseDeployGivenTransactionOnNetwork(_transactionOnNetwork: ITransactionOnNetwork): {
+    protected parseDeployGivenTransactionOnNetwork(transactionOnNetwork: ITransactionOnNetwork): {
         returnCode: string;
         returnMessage: string;
         contracts: {
@@ -88,7 +96,23 @@ export class SmartContractTransactionsOutcomeParser {
             codeHash: Uint8Array;
         }[];
     } {
-        throw new Error("Not implemented.");
+        const directCallOutcome = this.findDirectSmartContractCallOutcome(transactionOnNetwork);
+
+        const events = transactionOnNetwork.logs.events
+            .concat(transactionOnNetwork.contractResults.items.flatMap((result) => result.logs.events))
+            .filter((event) => event.identifier === Events.SCDeploy);
+
+        const contracts = events.map((event) =>
+            this.parseScDeployEvent({
+                topics: event.topics.map((topic) => Buffer.from(topic.hex(), "hex")),
+            }),
+        );
+
+        return {
+            returnCode: directCallOutcome.returnCode,
+            returnMessage: directCallOutcome.returnMessage,
+            contracts: contracts,
+        };
     }
 
     private parseScDeployEvent(event: { topics: Uint8Array[] }): {
@@ -174,13 +198,193 @@ export class SmartContractTransactionsOutcomeParser {
     }
 
     protected parseExecuteGivenTransactionOnNetwork(
-        _transactionOnNetwork: ITransactionOnNetwork,
-        _functionName?: string,
+        transactionOnNetwork: ITransactionOnNetwork,
+        functionName?: string,
     ): {
         values: any[];
         returnCode: string;
         returnMessage: string;
     } {
-        throw new Error("Not implemented.");
+        const directCallOutcome = this.findDirectSmartContractCallOutcome(transactionOnNetwork);
+
+        if (!this.abi) {
+            return {
+                values: directCallOutcome.returnDataParts,
+                returnCode: directCallOutcome.returnCode,
+                returnMessage: directCallOutcome.returnMessage,
+            };
+        }
+
+        functionName = functionName || directCallOutcome.function;
+
+        if (!functionName) {
+            throw new Err(
+                `Function name is not available in the transaction, thus endpoint definition (ABI) cannot be picked (for parsing). Maybe provide the "function" parameter explicitly?`,
+            );
+        }
+
+        const argsSerializer = new ArgSerializer();
+        const endpoint = this.abi.getEndpoint(functionName);
+        const buffers = directCallOutcome.returnDataParts.map((part) => Buffer.from(part));
+        const values = argsSerializer.buffersToValues(buffers, endpoint.output);
+
+        return {
+            returnCode: directCallOutcome.returnCode,
+            returnMessage: directCallOutcome.returnMessage,
+            values: values,
+        };
+    }
+
+    protected findDirectSmartContractCallOutcome(
+        transactionOnNetwork: ITransactionOnNetwork,
+    ): SmartContractCallOutcome {
+        let outcome = this.findDirectSmartContractCallOutcomeWithinSmartContractResults(transactionOnNetwork);
+        if (outcome) {
+            return outcome;
+        }
+
+        outcome = this.findDirectSmartContractCallOutcomeIfError(transactionOnNetwork);
+        if (outcome) {
+            return outcome;
+        }
+
+        outcome = this.findDirectSmartContractCallOutcomeWithinWriteLogEvents(transactionOnNetwork);
+        if (outcome) {
+            return outcome;
+        }
+
+        return new SmartContractCallOutcome({
+            function: transactionOnNetwork.function,
+            returnCode: "",
+            returnMessage: "",
+            returnDataParts: [],
+        });
+    }
+
+    protected findDirectSmartContractCallOutcomeWithinSmartContractResults(
+        transactionOnNetwork: ITransactionOnNetwork,
+    ): SmartContractCallOutcome | null {
+        const argSerializer = new ArgSerializer();
+        const eligibleResults: IContractResultItem[] = [];
+
+        for (const result of transactionOnNetwork.contractResults.items) {
+            const matchesCriteriaOnData = result.data.startsWith(ARGUMENTS_SEPARATOR);
+            const matchesCriteriaOnReceiver = result.receiver.bech32() === transactionOnNetwork.sender.bech32();
+            const matchesCriteriaOnPreviousHash = result.previousHash === transactionOnNetwork.hash;
+
+            const matchesCriteria = matchesCriteriaOnData && matchesCriteriaOnReceiver && matchesCriteriaOnPreviousHash;
+            if (matchesCriteria) {
+                eligibleResults.push(result);
+            }
+        }
+
+        if (eligibleResults.length === 0) {
+            return null;
+        }
+
+        if (eligibleResults.length > 1) {
+            throw new Error(
+                `More than one smart contract result (holding the return data) found for transaction: ${transactionOnNetwork.hash}`,
+            );
+        }
+
+        const [result] = eligibleResults;
+        const [_ignored, returnCode, ...returnDataParts] = argSerializer.stringToBuffers(result.data);
+
+        return new SmartContractCallOutcome({
+            function: transactionOnNetwork.function,
+            returnCode: returnCode?.toString(),
+            returnMessage: result.returnMessage || returnCode?.toString(),
+            returnDataParts: returnDataParts,
+        });
+    }
+
+    protected findDirectSmartContractCallOutcomeIfError(
+        transactionOnNetwork: ITransactionOnNetwork,
+    ): SmartContractCallOutcome | null {
+        const argSerializer = new ArgSerializer();
+        const eventIdentifier = Events.SignalError;
+        const eligibleEvents: ITransactionEvent[] = [];
+
+        // First, look in "logs":
+        eligibleEvents.push(
+            ...transactionOnNetwork.logs.events.filter((event) => event.identifier === eventIdentifier),
+        );
+
+        // Then, look in "logs" of "contractResults":
+        for (const result of transactionOnNetwork.contractResults.items) {
+            if (result.previousHash != transactionOnNetwork.hash) {
+                continue;
+            }
+
+            eligibleEvents.push(...result.logs.events.filter((event) => event.identifier === eventIdentifier));
+        }
+
+        if (eligibleEvents.length === 0) {
+            return null;
+        }
+
+        if (eligibleEvents.length > 1) {
+            throw new Error(
+                `More than one "${eventIdentifier}" event found for transaction: ${transactionOnNetwork.hash}`,
+            );
+        }
+
+        const [event] = eligibleEvents;
+        const data = event.dataPayload?.valueOf().toString() || "";
+        const lastTopic = event.getLastTopic()?.toString();
+        const parts = argSerializer.stringToBuffers(data);
+        // Assumption: the last part is the return code.
+        const returnCode = parts[parts.length - 1];
+
+        return new SmartContractCallOutcome({
+            function: transactionOnNetwork.function,
+            returnCode: returnCode?.toString() || eventIdentifier,
+            returnMessage: lastTopic || returnCode?.toString() || eventIdentifier,
+            returnDataParts: [],
+        });
+    }
+
+    protected findDirectSmartContractCallOutcomeWithinWriteLogEvents(
+        transactionOnNetwork: ITransactionOnNetwork,
+    ): SmartContractCallOutcome | null {
+        const argSerializer = new ArgSerializer();
+        const eventIdentifier = Events.WriteLog;
+        const eligibleEvents: ITransactionEvent[] = [];
+
+        // First, look in "logs":
+        eligibleEvents.push(
+            ...transactionOnNetwork.logs.events.filter((event) => event.identifier === eventIdentifier),
+        );
+
+        // Then, look in "logs" of "contractResults":
+        for (const result of transactionOnNetwork.contractResults.items) {
+            if (result.previousHash != transactionOnNetwork.hash) {
+                continue;
+            }
+
+            eligibleEvents.push(...result.logs.events.filter((event) => event.identifier === eventIdentifier));
+        }
+
+        if (eligibleEvents.length === 0) {
+            return null;
+        }
+
+        if (eligibleEvents.length > 1) {
+            throw new Error(
+                `More than one "${eventIdentifier}" event found for transaction: ${transactionOnNetwork.hash}`,
+            );
+        }
+
+        const [event] = eligibleEvents;
+        const data = event.dataPayload?.valueOf().toString() || "";
+        const [_ignored, returnCode, ...returnDataParts] = argSerializer.stringToBuffers(data);
+
+        return new SmartContractCallOutcome({
+            function: transactionOnNetwork.function,
+            returnCode: returnCode?.toString(),
+            returnMessage: returnCode?.toString(),
+            returnDataParts: returnDataParts,
+        });
     }
 }

From d13f4c65ae7a938843ea8f1338728cce24fd7912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 8 Oct 2024 14:45:03 +0300
Subject: [PATCH 289/338] Bump version.

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7821f4817..6c2d1a491 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.7.0",
+  "version": "13.8.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.7.0",
+      "version": "13.8.0",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index 94358aaaf..a7e6e8b26 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.7.0",
+  "version": "13.8.0",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",

From 0ac07f1a00488327f7a9508d15eb09f48313b9b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 8 Oct 2024 14:48:28 +0300
Subject: [PATCH 290/338] Fix after self-review.

---
 src/testdata/README.md                        |  2 +-
 ...tTransactionsOutcomeParser.dev.net.spec.ts | 62 -------------------
 2 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/src/testdata/README.md b/src/testdata/README.md
index c714d3916..99bce0e0c 100644
--- a/src/testdata/README.md
+++ b/src/testdata/README.md
@@ -1,6 +1,6 @@
 # Testdata
 
-## Files `transactions_N.mainnet.json`
+## Files `transactions.mainnet.json`
 
 Transactions were sampled from the mainnet BigQuery dataset:
 
diff --git a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.dev.net.spec.ts b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.dev.net.spec.ts
index 977d2dfbc..6eb10aa4f 100644
--- a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.dev.net.spec.ts
+++ b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.dev.net.spec.ts
@@ -37,66 +37,4 @@ describe("test smart contract transactions outcome parser on devnet", () => {
         assert.equal(parsedGivenTransactionOnNetwork.returnCode, "execution failed");
         assert.lengthOf(parsedGivenTransactionOnNetwork.contracts, 0);
     });
-
-    it("should parse outcome of relayed V3 inner transactions (1)", async () => {
-        const transactionHash = "c798e8c03d93aa4e3425f63fe020572304305e2017b1053c9f4e56f2c46bafd7";
-        const transactionOnNetwork = await networkProvider.getTransaction(transactionHash);
-        const outcomes = transactionsConverter.transactionOnNetworkToOutcomesOfInnerTransactions(transactionOnNetwork);
-
-        const parsed = parser.parseExecute({ transactionOutcome: outcomes[0] });
-        assert.deepEqual(parsed.values, [Buffer.from([1])]);
-        assert.equal(parsed.returnCode, "ok");
-        assert.equal(parsed.returnMessage, "ok");
-    });
-
-    // Will work upon the fix on Node's side (so that SCRs have as "originalTxHash" the inner transaction itself).
-    it.skip("should parse outcome of relayed V3 inner transactions (2)", async () => {
-        const transactionHash = "eaf80014f1b413191ac6a04a81c3751c5563aff246021f4f7c4ba9723fa3b536";
-        const transactionOnNetwork = await networkProvider.getTransaction(transactionHash);
-        const outcomes = transactionsConverter.transactionOnNetworkToOutcomesOfInnerTransactions(transactionOnNetwork);
-
-        let parsed = parser.parseExecute({ transactionOutcome: outcomes[0] });
-        assert.deepEqual(parsed.values, [Buffer.from([42]), Buffer.from([43]), Buffer.from([44])]);
-        assert.equal(parsed.returnCode, "ok");
-        assert.equal(parsed.returnMessage, "ok");
-
-        parsed = parser.parseExecute({ transactionOutcome: outcomes[1] });
-        assert.deepEqual(parsed.values, []);
-        assert.equal(parsed.returnCode, "");
-        assert.equal(parsed.returnMessage, "");
-    });
-
-    it("should parse outcome of relayed V3 inner transactions (3)", async () => {
-        const transactionHash = "d241307c92c66cfe8ce723656d8b2c47a4a4f9e457eec305155debba6c92ca1b";
-        const transactionOnNetwork = await networkProvider.getTransaction(transactionHash);
-        const outcomes = transactionsConverter.transactionOnNetworkToOutcomesOfInnerTransactions(transactionOnNetwork);
-
-        let parsed = parser.parseExecute({ transactionOutcome: outcomes[0] });
-        assert.deepEqual(parsed.values, [Buffer.from([42]), Buffer.from([43]), Buffer.from([44])]);
-        assert.equal(parsed.returnCode, "ok");
-        assert.equal(parsed.returnMessage, "ok");
-
-        // Signal error is not recoverable (for the moment).
-        parsed = parser.parseExecute({ transactionOutcome: outcomes[1] });
-        assert.deepEqual(parsed.values, []);
-        assert.equal(parsed.returnCode, "");
-        assert.equal(parsed.returnMessage, "");
-    });
-
-    it("should parse outcome of relayed V3 inner transactions (4)", async () => {
-        const transactionHash = "4bb3bc0f069fe4cf6a19750db026cca0968b224a59a2bfe6eee834c19d73cb80";
-        const transactionOnNetwork = await networkProvider.getTransaction(transactionHash);
-        const outcomes = transactionsConverter.transactionOnNetworkToOutcomesOfInnerTransactions(transactionOnNetwork);
-
-        let parsed = parser.parseExecute({ transactionOutcome: outcomes[0] });
-        assert.deepEqual(parsed.values, [Buffer.from([42]), Buffer.from([43]), Buffer.from([44])]);
-        assert.equal(parsed.returnCode, "ok");
-        assert.equal(parsed.returnMessage, "ok");
-
-        // Signal error is not recoverable (for the moment).
-        parsed = parser.parseExecute({ transactionOutcome: outcomes[1] });
-        assert.deepEqual(parsed.values, [Buffer.from([42]), Buffer.from([43]), Buffer.from([44])]);
-        assert.equal(parsed.returnCode, "ok");
-        assert.equal(parsed.returnMessage, "ok");
-    });
 });

From 928092e32ca5f41177cc785ddc2e99234403b364 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 10 Oct 2024 11:55:02 +0300
Subject: [PATCH 291/338] Refactor testutils, remove duplicated files

---
 .vscode/settings.json                         |   5 +-
 .../testwallets/alice.json                    |   0
 .../testwallets/alice.pem                     |   0
 .../testwallets/bob.json                      |   0
 .../testwallets/bob.pem                       |   0
 .../testwallets/carol.json                    |   0
 .../testwallets/carol.pem                     |   0
 .../testwallets/dan.json                      |   0
 .../testwallets/dan.pem                       |   0
 .../testwallets/eve.json                      |   0
 .../testwallets/eve.pem                       |   0
 .../testwallets/frank.json                    |   0
 .../testwallets/frank.pem                     |   0
 .../testwallets/grace.json                    |   0
 .../testwallets/grace.pem                     |   0
 .../testwallets/heidi.json                    |   0
 .../testwallets/heidi.pem                     |   0
 .../testwallets/ivan.json                     |   0
 .../testwallets/ivan.pem                      |   0
 .../testwallets/judy.json                     |   0
 .../testwallets/judy.pem                      |   0
 .../testwallets/mallory.json                  |   0
 .../testwallets/mallory.pem                   |   0
 .../testwallets/mike.json                     |   0
 .../testwallets/mike.pem                      |   0
 .../testwallets/mnemonic.txt                  |   0
 .../testwallets/password.txt                  |   0
 .../testwallets}/withDummyMnemonic.json       |   0
 .../testwallets}/withDummySecretKey.json      |   0
 .../testwallets}/withoutKind.json             |   0
 src/{wallet => }/testutils/files.ts           |   0
 src/{wallet => }/testutils/message.ts         |   0
 src/{wallet => }/testutils/transaction.ts     |   0
 src/testutils/wallets.ts                      |  14 +-
 src/wallet/config.ts                          |  15 --
 src/wallet/crypto/pubkeyEncrypt.spec.ts       |  24 +-
 src/wallet/pem.spec.ts                        |  13 +-
 src/wallet/testdata/alice.json                |  23 --
 src/wallet/testdata/alice.pem                 |   5 -
 src/wallet/testdata/bob.json                  |  23 --
 src/wallet/testdata/bob.pem                   |   5 -
 src/wallet/testdata/carol.json                |  23 --
 src/wallet/testdata/carol.pem                 |   5 -
 src/wallet/testutils/wallets.ts               |  46 ----
 src/wallet/userAddress.ts                     |  96 -------
 src/wallet/userKeys.ts                        |   6 +-
 src/wallet/userSigner.ts                      |   8 +-
 src/wallet/users.spec.ts                      | 252 +++++++++++++-----
 48 files changed, 230 insertions(+), 333 deletions(-)
 rename src/{testutils => testdata}/testwallets/alice.json (100%)
 rename src/{testutils => testdata}/testwallets/alice.pem (100%)
 rename src/{testutils => testdata}/testwallets/bob.json (100%)
 rename src/{testutils => testdata}/testwallets/bob.pem (100%)
 rename src/{testutils => testdata}/testwallets/carol.json (100%)
 rename src/{testutils => testdata}/testwallets/carol.pem (100%)
 rename src/{testutils => testdata}/testwallets/dan.json (100%)
 rename src/{testutils => testdata}/testwallets/dan.pem (100%)
 rename src/{testutils => testdata}/testwallets/eve.json (100%)
 rename src/{testutils => testdata}/testwallets/eve.pem (100%)
 rename src/{testutils => testdata}/testwallets/frank.json (100%)
 rename src/{testutils => testdata}/testwallets/frank.pem (100%)
 rename src/{testutils => testdata}/testwallets/grace.json (100%)
 rename src/{testutils => testdata}/testwallets/grace.pem (100%)
 rename src/{testutils => testdata}/testwallets/heidi.json (100%)
 rename src/{testutils => testdata}/testwallets/heidi.pem (100%)
 rename src/{testutils => testdata}/testwallets/ivan.json (100%)
 rename src/{testutils => testdata}/testwallets/ivan.pem (100%)
 rename src/{testutils => testdata}/testwallets/judy.json (100%)
 rename src/{testutils => testdata}/testwallets/judy.pem (100%)
 rename src/{testutils => testdata}/testwallets/mallory.json (100%)
 rename src/{testutils => testdata}/testwallets/mallory.pem (100%)
 rename src/{testutils => testdata}/testwallets/mike.json (100%)
 rename src/{testutils => testdata}/testwallets/mike.pem (100%)
 rename src/{testutils => testdata}/testwallets/mnemonic.txt (100%)
 rename src/{testutils => testdata}/testwallets/password.txt (100%)
 rename src/{wallet/testdata => testdata/testwallets}/withDummyMnemonic.json (100%)
 rename src/{wallet/testdata => testdata/testwallets}/withDummySecretKey.json (100%)
 rename src/{wallet/testdata => testdata/testwallets}/withoutKind.json (100%)
 rename src/{wallet => }/testutils/files.ts (100%)
 rename src/{wallet => }/testutils/message.ts (100%)
 rename src/{wallet => }/testutils/transaction.ts (100%)
 delete mode 100644 src/wallet/config.ts
 delete mode 100644 src/wallet/testdata/alice.json
 delete mode 100644 src/wallet/testdata/alice.pem
 delete mode 100644 src/wallet/testdata/bob.json
 delete mode 100644 src/wallet/testdata/bob.pem
 delete mode 100644 src/wallet/testdata/carol.json
 delete mode 100644 src/wallet/testdata/carol.pem
 delete mode 100644 src/wallet/testutils/wallets.ts
 delete mode 100644 src/wallet/userAddress.ts

diff --git a/.vscode/settings.json b/.vscode/settings.json
index e5c7eee47..9a9afd464 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,5 +6,8 @@
     },
     "[typescript]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
-    }
+    },
+    "editor.codeActionsOnSave": {
+        "source.organizeImports": "explicit"
+      },
 }
diff --git a/src/testutils/testwallets/alice.json b/src/testdata/testwallets/alice.json
similarity index 100%
rename from src/testutils/testwallets/alice.json
rename to src/testdata/testwallets/alice.json
diff --git a/src/testutils/testwallets/alice.pem b/src/testdata/testwallets/alice.pem
similarity index 100%
rename from src/testutils/testwallets/alice.pem
rename to src/testdata/testwallets/alice.pem
diff --git a/src/testutils/testwallets/bob.json b/src/testdata/testwallets/bob.json
similarity index 100%
rename from src/testutils/testwallets/bob.json
rename to src/testdata/testwallets/bob.json
diff --git a/src/testutils/testwallets/bob.pem b/src/testdata/testwallets/bob.pem
similarity index 100%
rename from src/testutils/testwallets/bob.pem
rename to src/testdata/testwallets/bob.pem
diff --git a/src/testutils/testwallets/carol.json b/src/testdata/testwallets/carol.json
similarity index 100%
rename from src/testutils/testwallets/carol.json
rename to src/testdata/testwallets/carol.json
diff --git a/src/testutils/testwallets/carol.pem b/src/testdata/testwallets/carol.pem
similarity index 100%
rename from src/testutils/testwallets/carol.pem
rename to src/testdata/testwallets/carol.pem
diff --git a/src/testutils/testwallets/dan.json b/src/testdata/testwallets/dan.json
similarity index 100%
rename from src/testutils/testwallets/dan.json
rename to src/testdata/testwallets/dan.json
diff --git a/src/testutils/testwallets/dan.pem b/src/testdata/testwallets/dan.pem
similarity index 100%
rename from src/testutils/testwallets/dan.pem
rename to src/testdata/testwallets/dan.pem
diff --git a/src/testutils/testwallets/eve.json b/src/testdata/testwallets/eve.json
similarity index 100%
rename from src/testutils/testwallets/eve.json
rename to src/testdata/testwallets/eve.json
diff --git a/src/testutils/testwallets/eve.pem b/src/testdata/testwallets/eve.pem
similarity index 100%
rename from src/testutils/testwallets/eve.pem
rename to src/testdata/testwallets/eve.pem
diff --git a/src/testutils/testwallets/frank.json b/src/testdata/testwallets/frank.json
similarity index 100%
rename from src/testutils/testwallets/frank.json
rename to src/testdata/testwallets/frank.json
diff --git a/src/testutils/testwallets/frank.pem b/src/testdata/testwallets/frank.pem
similarity index 100%
rename from src/testutils/testwallets/frank.pem
rename to src/testdata/testwallets/frank.pem
diff --git a/src/testutils/testwallets/grace.json b/src/testdata/testwallets/grace.json
similarity index 100%
rename from src/testutils/testwallets/grace.json
rename to src/testdata/testwallets/grace.json
diff --git a/src/testutils/testwallets/grace.pem b/src/testdata/testwallets/grace.pem
similarity index 100%
rename from src/testutils/testwallets/grace.pem
rename to src/testdata/testwallets/grace.pem
diff --git a/src/testutils/testwallets/heidi.json b/src/testdata/testwallets/heidi.json
similarity index 100%
rename from src/testutils/testwallets/heidi.json
rename to src/testdata/testwallets/heidi.json
diff --git a/src/testutils/testwallets/heidi.pem b/src/testdata/testwallets/heidi.pem
similarity index 100%
rename from src/testutils/testwallets/heidi.pem
rename to src/testdata/testwallets/heidi.pem
diff --git a/src/testutils/testwallets/ivan.json b/src/testdata/testwallets/ivan.json
similarity index 100%
rename from src/testutils/testwallets/ivan.json
rename to src/testdata/testwallets/ivan.json
diff --git a/src/testutils/testwallets/ivan.pem b/src/testdata/testwallets/ivan.pem
similarity index 100%
rename from src/testutils/testwallets/ivan.pem
rename to src/testdata/testwallets/ivan.pem
diff --git a/src/testutils/testwallets/judy.json b/src/testdata/testwallets/judy.json
similarity index 100%
rename from src/testutils/testwallets/judy.json
rename to src/testdata/testwallets/judy.json
diff --git a/src/testutils/testwallets/judy.pem b/src/testdata/testwallets/judy.pem
similarity index 100%
rename from src/testutils/testwallets/judy.pem
rename to src/testdata/testwallets/judy.pem
diff --git a/src/testutils/testwallets/mallory.json b/src/testdata/testwallets/mallory.json
similarity index 100%
rename from src/testutils/testwallets/mallory.json
rename to src/testdata/testwallets/mallory.json
diff --git a/src/testutils/testwallets/mallory.pem b/src/testdata/testwallets/mallory.pem
similarity index 100%
rename from src/testutils/testwallets/mallory.pem
rename to src/testdata/testwallets/mallory.pem
diff --git a/src/testutils/testwallets/mike.json b/src/testdata/testwallets/mike.json
similarity index 100%
rename from src/testutils/testwallets/mike.json
rename to src/testdata/testwallets/mike.json
diff --git a/src/testutils/testwallets/mike.pem b/src/testdata/testwallets/mike.pem
similarity index 100%
rename from src/testutils/testwallets/mike.pem
rename to src/testdata/testwallets/mike.pem
diff --git a/src/testutils/testwallets/mnemonic.txt b/src/testdata/testwallets/mnemonic.txt
similarity index 100%
rename from src/testutils/testwallets/mnemonic.txt
rename to src/testdata/testwallets/mnemonic.txt
diff --git a/src/testutils/testwallets/password.txt b/src/testdata/testwallets/password.txt
similarity index 100%
rename from src/testutils/testwallets/password.txt
rename to src/testdata/testwallets/password.txt
diff --git a/src/wallet/testdata/withDummyMnemonic.json b/src/testdata/testwallets/withDummyMnemonic.json
similarity index 100%
rename from src/wallet/testdata/withDummyMnemonic.json
rename to src/testdata/testwallets/withDummyMnemonic.json
diff --git a/src/wallet/testdata/withDummySecretKey.json b/src/testdata/testwallets/withDummySecretKey.json
similarity index 100%
rename from src/wallet/testdata/withDummySecretKey.json
rename to src/testdata/testwallets/withDummySecretKey.json
diff --git a/src/wallet/testdata/withoutKind.json b/src/testdata/testwallets/withoutKind.json
similarity index 100%
rename from src/wallet/testdata/withoutKind.json
rename to src/testdata/testwallets/withoutKind.json
diff --git a/src/wallet/testutils/files.ts b/src/testutils/files.ts
similarity index 100%
rename from src/wallet/testutils/files.ts
rename to src/testutils/files.ts
diff --git a/src/wallet/testutils/message.ts b/src/testutils/message.ts
similarity index 100%
rename from src/wallet/testutils/message.ts
rename to src/testutils/message.ts
diff --git a/src/wallet/testutils/transaction.ts b/src/testutils/transaction.ts
similarity index 100%
rename from src/wallet/testutils/transaction.ts
rename to src/testutils/transaction.ts
diff --git a/src/testutils/wallets.ts b/src/testutils/wallets.ts
index 132d8c188..9c5add288 100644
--- a/src/testutils/wallets.ts
+++ b/src/testutils/wallets.ts
@@ -1,4 +1,3 @@
-import { UserSecretKey, UserSigner } from "./../wallet";
 import axios from "axios";
 import * as fs from "fs";
 import * as path from "path";
@@ -6,8 +5,12 @@ import { Account } from "../account";
 import { Address } from "../address";
 import { IAddress } from "../interface";
 import { IAccountOnNetwork } from "../interfaceOfNetwork";
+import { UserSecretKey, UserSigner } from "./../wallet";
+import { readTestFile } from "./files";
 import { isOnBrowserTests } from "./utils";
 
+export const DummyMnemonicOf12Words = "matter trumpet twenty parade fame north lift sail valve salon foster cinnamon";
+
 interface IAccountFetcher {
     getAccount(address: IAddress): Promise<IAccountOnNetwork>;
 }
@@ -45,6 +48,13 @@ export async function loadTestWallets(): Promise<Record<string, TestWallet>> {
     return walletMap;
 }
 
+export async function loadTestKeystore(file: string): Promise<any> {
+    const testdataPath = path.resolve(__dirname, "..", "testdata/testwallets");
+    const keystorePath = path.resolve(testdataPath, file);
+    const json = await readTestFile(keystorePath);
+    return JSON.parse(json);
+}
+
 export async function loadMnemonic(): Promise<string> {
     return await readTestWalletFileContents("mnemonic.txt");
 }
@@ -62,7 +72,7 @@ export async function loadTestWallet(name: string): Promise<TestWallet> {
 }
 
 async function readTestWalletFileContents(name: string): Promise<string> {
-    let filePath = path.join("src", "testutils", "testwallets", name);
+    let filePath = path.join("src", "testdata", "testwallets", name);
 
     if (isOnBrowserTests()) {
         return await downloadTextFile(filePath);
diff --git a/src/wallet/config.ts b/src/wallet/config.ts
deleted file mode 100644
index cf60ce5a4..000000000
--- a/src/wallet/config.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Global configuration of the library.
- *
- * Generally speaking, this configuration should only be altered on exotic use cases;
- * it can be seen as a collection of constants (or, to be more precise, rarely changed variables) that are used throughout the library.
- *
- * Never alter the configuration within a library!
- * Only alter the configuration (if needed) within an (end) application that uses this library.
- */
-export class LibraryConfig {
-    /**
-     * The human-readable-part of the bech32 addresses.
-     */
-    public static DefaultAddressHrp: string = "erd";
-}
diff --git a/src/wallet/crypto/pubkeyEncrypt.spec.ts b/src/wallet/crypto/pubkeyEncrypt.spec.ts
index 291ca391e..804a35f5b 100644
--- a/src/wallet/crypto/pubkeyEncrypt.spec.ts
+++ b/src/wallet/crypto/pubkeyEncrypt.spec.ts
@@ -1,8 +1,8 @@
 import { assert } from "chai";
-import { loadTestWallet, TestWallet } from "../testutils/wallets";
-import { PubkeyEncryptor } from "./pubkeyEncryptor";
+import { loadTestWallet, TestWallet } from "../../testutils/wallets";
 import { UserPublicKey, UserSecretKey } from "../userKeys";
 import { PubkeyDecryptor } from "./pubkeyDecryptor";
+import { PubkeyEncryptor } from "./pubkeyEncryptor";
 import { X25519EncryptedData } from "./x25519EncryptedData";
 
 describe("test address", () => {
@@ -15,21 +15,31 @@ describe("test address", () => {
         bob = await loadTestWallet("bob");
         carol = await loadTestWallet("carol");
 
-        encryptedDataOfAliceForBob = PubkeyEncryptor.encrypt(sensitiveData, new UserPublicKey(bob.address.pubkey()), new UserSecretKey(alice.secretKey));
+        encryptedDataOfAliceForBob = PubkeyEncryptor.encrypt(
+            sensitiveData,
+            new UserPublicKey(bob.address.pubkey()),
+            new UserSecretKey(alice.secretKey),
+        );
     });
 
-    it("encrypts/decrypts",  () => {
+    it("encrypts/decrypts", () => {
         const decryptedData = PubkeyDecryptor.decrypt(encryptedDataOfAliceForBob, new UserSecretKey(bob.secretKey));
-        assert.equal(sensitiveData.toString('hex'), decryptedData.toString('hex'));
+        assert.equal(sensitiveData.toString("hex"), decryptedData.toString("hex"));
     });
 
     it("fails for different originator", () => {
         encryptedDataOfAliceForBob.identities.originatorPubKey = carol.address.hex();
-        assert.throws(() => PubkeyDecryptor.decrypt(encryptedDataOfAliceForBob, new UserSecretKey(bob.secretKey)), "Invalid authentication for encrypted message originator");
+        assert.throws(
+            () => PubkeyDecryptor.decrypt(encryptedDataOfAliceForBob, new UserSecretKey(bob.secretKey)),
+            "Invalid authentication for encrypted message originator",
+        );
     });
 
     it("fails for different DH public key", () => {
         encryptedDataOfAliceForBob.identities.ephemeralPubKey = carol.address.hex();
-        assert.throws(() => PubkeyDecryptor.decrypt(encryptedDataOfAliceForBob, new UserSecretKey(bob.secretKey)), "Invalid authentication for encrypted message originator");
+        assert.throws(
+            () => PubkeyDecryptor.decrypt(encryptedDataOfAliceForBob, new UserSecretKey(bob.secretKey)),
+            "Invalid authentication for encrypted message originator",
+        );
     });
 });
diff --git a/src/wallet/pem.spec.ts b/src/wallet/pem.spec.ts
index 4861b230b..538a99cfc 100644
--- a/src/wallet/pem.spec.ts
+++ b/src/wallet/pem.spec.ts
@@ -1,9 +1,9 @@
+import { Buffer } from "buffer";
 import { assert } from "chai";
+import { loadTestWallet, TestWallet } from "./../testutils/wallets";
+import { ErrBadPEM } from "./errors";
 import { parse, parseUserKey, parseValidatorKey } from "./pem";
-import { Buffer } from "buffer";
 import { BLS } from "./validatorKeys";
-import { ErrBadPEM } from "./errors";
-import { loadTestWallet, TestWallet } from "./testutils/wallets";
 
 describe("test PEMs", () => {
     let alice: TestWallet, bob: TestWallet, carol: TestWallet;
@@ -32,7 +32,10 @@ MWU0YzE3YTRjZDc3NDI0Nw==
         let validatorKey = parseValidatorKey(pem);
 
         assert.equal(validatorKey.hex(), "7cff99bd671502db7d15bc8abc0c9a804fb925406fbdd50f1e4c17a4cd774247");
-        assert.equal(validatorKey.generatePublicKey().hex(), "e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208");
+        assert.equal(
+            validatorKey.generatePublicKey().hex(),
+            "e7beaa95b3877f47348df4dd1cb578a4f7cabf7a20bfeefe5cdd263878ff132b765e04fef6f40c93512b666c47ed7719b8902f6c922c04247989b7137e837cc81a62e54712471c97a2ddab75aa9c2f58f813ed4c0fa722bde0ab718bff382208",
+        );
     });
 
     it("should parse multi-key PEM files", () => {
@@ -44,7 +47,7 @@ MWU0YzE3YTRjZDc3NDI0Nw==
         let expected = [
             Buffer.concat([alice.secretKey, alice.address.pubkey()]),
             Buffer.concat([bob.secretKey, bob.address.pubkey()]),
-            Buffer.concat([carol.secretKey, carol.address.pubkey()])
+            Buffer.concat([carol.secretKey, carol.address.pubkey()]),
         ];
 
         let trivialContent = `-----BEGIN PRIVATE KEY for alice
diff --git a/src/wallet/testdata/alice.json b/src/wallet/testdata/alice.json
deleted file mode 100644
index 18c4ea1e9..000000000
--- a/src/wallet/testdata/alice.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "version": 4,
-    "kind": "secretKey",
-    "id": "0dc10c02-b59b-4bac-9710-6b2cfa4284ba",
-    "address": "0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1",
-    "bech32": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
-    "crypto": {
-        "ciphertext": "4c41ef6fdfd52c39b1585a875eb3c86d30a315642d0e35bb8205b6372c1882f135441099b11ff76345a6f3a930b5665aaf9f7325a32c8ccd60081c797aa2d538",
-        "cipherparams": {
-            "iv": "033182afaa1ebaafcde9ccc68a5eac31"
-        },
-        "cipher": "aes-128-ctr",
-        "kdf": "scrypt",
-        "kdfparams": {
-            "dklen": 32,
-            "salt": "4903bd0e7880baa04fc4f886518ac5c672cdc745a6bd13dcec2b6c12e9bffe8d",
-            "n": 4096,
-            "r": 8,
-            "p": 1
-        },
-        "mac": "5b4a6f14ab74ba7ca23db6847e28447f0e6a7724ba9664cf425df707a84f5a8b"
-    }
-}
diff --git a/src/wallet/testdata/alice.pem b/src/wallet/testdata/alice.pem
deleted file mode 100644
index d27bb68b4..000000000
--- a/src/wallet/testdata/alice.pem
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY for erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th-----
-NDEzZjQyNTc1ZjdmMjZmYWQzMzE3YTc3ODc3MTIxMmZkYjgwMjQ1ODUwOTgxZTQ4
-YjU4YTRmMjVlMzQ0ZThmOTAxMzk0NzJlZmY2ODg2NzcxYTk4MmYzMDgzZGE1ZDQy
-MWYyNGMyOTE4MWU2Mzg4ODIyOGRjODFjYTYwZDY5ZTE=
------END PRIVATE KEY for erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th-----
\ No newline at end of file
diff --git a/src/wallet/testdata/bob.json b/src/wallet/testdata/bob.json
deleted file mode 100644
index 9efb41109..000000000
--- a/src/wallet/testdata/bob.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "version": 4,
-    "kind": "secretKey",
-    "id": "85fdc8a7-7119-479d-b7fb-ab4413ed038d",
-    "address": "8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8",
-    "bech32": "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
-    "crypto": {
-        "ciphertext": "c2664a31350aaf6a00525560db75c254d0aea65dc466441356c1dd59253cceb9e83eb05730ef3f42a11573c9a0e33dd952d488f00535b35357bb41d127b1eb82",
-        "cipherparams": {
-            "iv": "18378411e31f6c4e99f1435d9ab82831"
-        },
-        "cipher": "aes-128-ctr",
-        "kdf": "scrypt",
-        "kdfparams": {
-            "dklen": 32,
-            "salt": "18304455ac2dbe2a2018bda162bd03ef95b81622e99d8275c34a6d5e6932a68b",
-            "n": 4096,
-            "r": 8,
-            "p": 1
-        },
-        "mac": "23756172195ac483fa29025dc331bc7aa2c139533922a8dc08642eb0a677541f"
-    }
-}
diff --git a/src/wallet/testdata/bob.pem b/src/wallet/testdata/bob.pem
deleted file mode 100644
index 00b5bc4ef..000000000
--- a/src/wallet/testdata/bob.pem
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY for erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx-----
-YjhjYTZmODIwM2ZiNGI1NDVhOGU4M2M1Mzg0ZGEwMzNjNDE1ZGIxNTViNTNmYjVi
-OGViYTdmZjVhMDM5ZDYzOTgwNDlkNjM5ZTVhNjk4MGQxY2QyMzkyYWJjY2U0MTAy
-OWNkYTc0YTE1NjM1MjNhMjAyZjA5NjQxY2MyNjE4Zjg=
------END PRIVATE KEY for erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx-----
\ No newline at end of file
diff --git a/src/wallet/testdata/carol.json b/src/wallet/testdata/carol.json
deleted file mode 100644
index 1014a8230..000000000
--- a/src/wallet/testdata/carol.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "version": 4,
-    "kind": "secretKey",
-    "id": "65894f35-d142-41d2-9335-6ad02e0ed0be",
-    "address": "b2a11555ce521e4944e09ab17549d85b487dcd26c84b5017a39e31a3670889ba",
-    "bech32": "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8",
-    "crypto": {
-        "ciphertext": "bdfb984a1e7c7460f0a289749609730cdc99d7ce85b59305417c2c0f007b2a6aaa7203dd94dbf27315bced39b0b281769fbc70b01e6e57f89ae2f2a9e9100007",
-        "cipherparams": {
-            "iv": "258ed2b4dc506b4dc9d274b0449b0eb0"
-        },
-        "cipher": "aes-128-ctr",
-        "kdf": "scrypt",
-        "kdfparams": {
-            "dklen": 32,
-            "salt": "4f2f5530ce28dc0210962589b908f52714f75c8fb79ff18bdd0024c43c7a220b",
-            "n": 4096,
-            "r": 8,
-            "p": 1
-        },
-        "mac": "f8de52e2627024eaa33f2ee5eadcd3d3815e10dd274ea966dc083d000cc8b258"
-    }
-}
diff --git a/src/wallet/testdata/carol.pem b/src/wallet/testdata/carol.pem
deleted file mode 100644
index 5551c9c0e..000000000
--- a/src/wallet/testdata/carol.pem
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY for erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8-----
-ZTI1M2E1NzFjYTE1M2RjMmFlZTg0NTgxOWY3NGJjYzk3NzNiMDU4NmVkZWFkMTVh
-OTRjYjcyMzVhNTAyNzQzNmIyYTExNTU1Y2U1MjFlNDk0NGUwOWFiMTc1NDlkODVi
-NDg3ZGNkMjZjODRiNTAxN2EzOWUzMWEzNjcwODg5YmE=
------END PRIVATE KEY for erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8-----
\ No newline at end of file
diff --git a/src/wallet/testutils/wallets.ts b/src/wallet/testutils/wallets.ts
deleted file mode 100644
index 1ce1af3e5..000000000
--- a/src/wallet/testutils/wallets.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import * as path from "path";
-import { UserAddress } from "../userAddress";
-import { UserSecretKey } from "../userKeys";
-import { readTestFile } from "./files";
-
-export const DummyPassword = "password";
-export const DummyMnemonic = "moral volcano peasant pass circle pen over picture flat shop clap goat never lyrics gather prepare woman film husband gravity behind test tiger improve";
-export const DummyMnemonicOf12Words = "matter trumpet twenty parade fame north lift sail valve salon foster cinnamon";
-
-export async function loadTestWallet(name: string): Promise<TestWallet> {
-    const keystore = await loadTestKeystore(`${name}.json`)
-    const pemText = await loadTestPemFile(`${name}.pem`)
-    const pemKey = UserSecretKey.fromPem(pemText);
-    const address = new UserAddress(Buffer.from(keystore.address, "hex"));
-
-    return new TestWallet(address, pemKey.hex(), keystore, pemText);
-}
-
-export async function loadTestKeystore(file: string): Promise<any> {
-    const testdataPath = path.resolve(__dirname, "..", "testdata");
-    const keystorePath = path.resolve(testdataPath, file);
-    const json = await readTestFile(keystorePath);
-    return JSON.parse(json);
-}
-
-export async function loadTestPemFile(file: string): Promise<string> {
-    const testdataPath = path.resolve(__dirname, "..", "testdata");
-    const pemFilePath = path.resolve(testdataPath, file);
-    return await readTestFile(pemFilePath);
-}
-
-export class TestWallet {
-    readonly address: UserAddress;
-    readonly secretKeyHex: string;
-    readonly secretKey: Buffer;
-    readonly keyFileObject: any;
-    readonly pemFileText: any;
-
-    constructor(address: UserAddress, secretKeyHex: string, keyFileObject: any, pemFileText: any) {
-        this.address = address;
-        this.secretKeyHex = secretKeyHex;
-        this.secretKey = Buffer.from(secretKeyHex, "hex");
-        this.keyFileObject = keyFileObject;
-        this.pemFileText = pemFileText;
-    }
-}
diff --git a/src/wallet/userAddress.ts b/src/wallet/userAddress.ts
deleted file mode 100644
index b7a885cf8..000000000
--- a/src/wallet/userAddress.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import * as bech32 from "bech32";
-import { LibraryConfig } from "./config";
-import { ErrBadAddress } from "./errors";
-
-/**
- * @internal
- * For internal use only.
- */
-export class UserAddress {
-    private readonly buffer: Buffer;
-    private readonly hrp: string;
-
-    public constructor(buffer: Buffer, hrp?: string) {
-        this.buffer = buffer;
-        this.hrp = hrp || LibraryConfig.DefaultAddressHrp;
-    }
-
-    static newFromBech32(value: string): UserAddress {
-        const { hrp, pubkey } = decodeFromBech32({ value, allowCustomHrp: true });
-        return new UserAddress(pubkey, hrp);
-    }
-
-    /**
-     * @internal
-     * @deprecated
-     */
-    static fromBech32(value: string): UserAddress {
-        // On this legacy flow, we do not accept addresses with custom hrp (in order to avoid behavioral breaking changes).
-        const { hrp, pubkey } = decodeFromBech32({ value, allowCustomHrp: false });
-        return new UserAddress(pubkey, hrp);
-    }
-
-    /**
-     * Returns the hex representation of the address (pubkey)
-     */
-    hex(): string {
-        return this.buffer.toString("hex");
-    }
-
-    /**
-     * Returns the bech32 representation of the address
-     */
-    bech32(): string {
-        const words = bech32.toWords(this.pubkey());
-        const address = bech32.encode(this.hrp, words);
-        return address;
-    }
-
-    /**
-     * Returns the pubkey as raw bytes (buffer)
-     */
-    pubkey(): Buffer {
-        return this.buffer;
-    }
-    
-    /**
-     * Returns the bech32 representation of the address
-     */
-    toString(): string {
-        return this.bech32();
-    }
-
-    /**
-     * Converts the address to a pretty, plain JavaScript object.
-     */
-    toJSON(): object {
-        return {
-            bech32: this.bech32(),
-            pubkey: this.hex()
-        };
-    }
-}
-
-function decodeFromBech32(options: { value: string; allowCustomHrp: boolean }): { hrp: string; pubkey: Buffer } {
-    const value = options.value;
-    const allowCustomHrp = options.allowCustomHrp;
-
-    let hrp: string;
-    let pubkey: Buffer;
-
-    try {
-        const decoded = bech32.decode(value);
-
-        hrp = decoded.prefix;
-        pubkey = Buffer.from(bech32.fromWords(decoded.words));
-    } catch (err: any) {
-        throw new ErrBadAddress(value, err);
-    }
-
-    // Workaround, in order to avoid behavioral breaking changes on legacy flows.
-    if (!allowCustomHrp && hrp != LibraryConfig.DefaultAddressHrp) {
-        throw new ErrBadAddress(value);
-    }
-
-    return { hrp, pubkey };
-}
diff --git a/src/wallet/userKeys.ts b/src/wallet/userKeys.ts
index 6acb76f00..eaee0e10a 100644
--- a/src/wallet/userKeys.ts
+++ b/src/wallet/userKeys.ts
@@ -1,8 +1,8 @@
 import * as ed from "@noble/ed25519";
 import { sha512 } from "@noble/hashes/sha512";
+import { Address } from "../address";
 import { guardLength } from "./assertions";
 import { parseUserKey } from "./pem";
-import { UserAddress } from "./userAddress";
 
 export const USER_SEED_LENGTH = 32;
 export const USER_PUBKEY_LENGTH = 32;
@@ -73,8 +73,8 @@ export class UserPublicKey {
         return this.buffer.toString("hex");
     }
 
-    toAddress(hrp?: string): UserAddress {
-        return new UserAddress(this.buffer, hrp);
+    toAddress(hrp?: string): Address {
+        return new Address(this.buffer, hrp);
     }
 
     valueOf(): Buffer {
diff --git a/src/wallet/userSigner.ts b/src/wallet/userSigner.ts
index b78d5048d..37f05e302 100644
--- a/src/wallet/userSigner.ts
+++ b/src/wallet/userSigner.ts
@@ -1,5 +1,5 @@
+import { Address } from "../address";
 import { ErrSignerCannotSign } from "./errors";
-import { UserAddress } from "./userAddress";
 import { UserSecretKey } from "./userKeys";
 import { UserWallet } from "./userWallet";
 
@@ -9,7 +9,7 @@ interface IUserSecretKey {
 }
 
 interface IUserPublicKey {
-    toAddress(hrp?: string): { bech32(): string; };
+    toAddress(hrp?: string): { bech32(): string };
 }
 
 /**
@@ -44,8 +44,8 @@ export class UserSigner {
     /**
      * Gets the address of the signer.
      */
-    getAddress(hrp?: string): UserAddress {
+    getAddress(hrp?: string): Address {
         const bech32 = this.secretKey.generatePublicKey().toAddress(hrp).bech32();
-        return UserAddress.newFromBech32(bech32);
+        return Address.newFromBech32(bech32);
     }
 }
diff --git a/src/wallet/users.spec.ts b/src/wallet/users.spec.ts
index dc6d8d4fc..815c0000e 100644
--- a/src/wallet/users.spec.ts
+++ b/src/wallet/users.spec.ts
@@ -1,25 +1,26 @@
 import { assert } from "chai";
-import { Randomness } from "./crypto";
-import { ErrBadMnemonicEntropy, ErrInvariantFailed } from "./errors";
-import { Mnemonic } from "./mnemonic";
-import { TestMessage } from "./testutils/message";
-import { TestTransaction } from "./testutils/transaction";
+import { TestMessage } from "./../testutils/message";
+import { TestTransaction } from "./../testutils/transaction";
 import {
-    DummyMnemonic,
     DummyMnemonicOf12Words,
-    DummyPassword,
+    loadMnemonic,
+    loadPassword,
     loadTestKeystore,
     loadTestWallet,
     TestWallet,
-} from "./testutils/wallets";
+} from "./../testutils/wallets";
+import { Randomness } from "./crypto";
+import { ErrBadMnemonicEntropy, ErrInvariantFailed } from "./errors";
+import { Mnemonic } from "./mnemonic";
 import { UserSecretKey } from "./userKeys";
 import { UserSigner } from "./userSigner";
 import { UserVerifier } from "./userVerifier";
 import { UserWallet } from "./userWallet";
 
-describe("test user wallets", () => {
+describe("test user wallets", async () => {
     let alice: TestWallet, bob: TestWallet, carol: TestWallet;
-    let password: string = DummyPassword;
+    let password: string = await loadPassword();
+    const dummyMnemonic = await loadMnemonic();
 
     before(async function () {
         alice = await loadTestWallet("alice");
@@ -62,7 +63,7 @@ describe("test user wallets", () => {
     });
 
     it("should derive keys", async () => {
-        let mnemonic = Mnemonic.fromString(DummyMnemonic);
+        let mnemonic = Mnemonic.fromString(dummyMnemonic);
 
         assert.equal(mnemonic.deriveKey(0).hex(), alice.secretKeyHex);
         assert.equal(mnemonic.deriveKey(1).hex(), bob.secretKeyHex);
@@ -72,13 +73,31 @@ describe("test user wallets", () => {
     it("should derive keys (12 words)", async () => {
         const mnemonic = Mnemonic.fromString(DummyMnemonicOf12Words);
 
-        assert.equal(mnemonic.deriveKey(0).generatePublicKey().toAddress().bech32(), "erd1l8g9dk3gz035gkjhwegsjkqzdu3augrwhcfxrnucnyyrpc2220pqg4g7na");
-        assert.equal(mnemonic.deriveKey(1).generatePublicKey().toAddress().bech32(), "erd1fmhwg84rldg0xzngf53m0y607wvefvamh07n2mkypedx27lcqnts4zs09p");
-        assert.equal(mnemonic.deriveKey(2).generatePublicKey().toAddress().bech32(), "erd1tyuyemt4xz2yjvc7rxxp8kyfmk2n3h8gv3aavzd9ru4v2vhrkcksptewtj");
+        assert.equal(
+            mnemonic.deriveKey(0).generatePublicKey().toAddress().bech32(),
+            "erd1l8g9dk3gz035gkjhwegsjkqzdu3augrwhcfxrnucnyyrpc2220pqg4g7na",
+        );
+        assert.equal(
+            mnemonic.deriveKey(1).generatePublicKey().toAddress().bech32(),
+            "erd1fmhwg84rldg0xzngf53m0y607wvefvamh07n2mkypedx27lcqnts4zs09p",
+        );
+        assert.equal(
+            mnemonic.deriveKey(2).generatePublicKey().toAddress().bech32(),
+            "erd1tyuyemt4xz2yjvc7rxxp8kyfmk2n3h8gv3aavzd9ru4v2vhrkcksptewtj",
+        );
 
-        assert.equal(mnemonic.deriveKey(0).generatePublicKey().toAddress("test").bech32(), "test1l8g9dk3gz035gkjhwegsjkqzdu3augrwhcfxrnucnyyrpc2220pqc6tnnf");
-        assert.equal(mnemonic.deriveKey(1).generatePublicKey().toAddress("xerd").bech32(), "xerd1fmhwg84rldg0xzngf53m0y607wvefvamh07n2mkypedx27lcqntsj4adj4");
-        assert.equal(mnemonic.deriveKey(2).generatePublicKey().toAddress("yerd").bech32(), "yerd1tyuyemt4xz2yjvc7rxxp8kyfmk2n3h8gv3aavzd9ru4v2vhrkcksn8p0n5");
+        assert.equal(
+            mnemonic.deriveKey(0).generatePublicKey().toAddress("test").bech32(),
+            "test1l8g9dk3gz035gkjhwegsjkqzdu3augrwhcfxrnucnyyrpc2220pqc6tnnf",
+        );
+        assert.equal(
+            mnemonic.deriveKey(1).generatePublicKey().toAddress("xerd").bech32(),
+            "xerd1fmhwg84rldg0xzngf53m0y607wvefvamh07n2mkypedx27lcqntsj4adj4",
+        );
+        assert.equal(
+            mnemonic.deriveKey(2).generatePublicKey().toAddress("yerd").bech32(),
+            "yerd1tyuyemt4xz2yjvc7rxxp8kyfmk2n3h8gv3aavzd9ru4v2vhrkcksn8p0n5",
+        );
     });
 
     it("should create secret key", () => {
@@ -150,8 +169,8 @@ describe("test user wallets", () => {
             randomness: new Randomness({
                 id: alice.keyFileObject.id,
                 iv: Buffer.from(alice.keyFileObject.crypto.cipherparams.iv, "hex"),
-                salt: Buffer.from(alice.keyFileObject.crypto.kdfparams.salt, "hex")
-            })
+                salt: Buffer.from(alice.keyFileObject.crypto.kdfparams.salt, "hex"),
+            }),
         });
 
         bobKeyFile = UserWallet.fromSecretKey({
@@ -160,8 +179,8 @@ describe("test user wallets", () => {
             randomness: new Randomness({
                 id: bob.keyFileObject.id,
                 iv: Buffer.from(bob.keyFileObject.crypto.cipherparams.iv, "hex"),
-                salt: Buffer.from(bob.keyFileObject.crypto.kdfparams.salt, "hex")
-            })
+                salt: Buffer.from(bob.keyFileObject.crypto.kdfparams.salt, "hex"),
+            }),
         });
 
         carolKeyFile = UserWallet.fromSecretKey({
@@ -170,8 +189,8 @@ describe("test user wallets", () => {
             randomness: new Randomness({
                 id: carol.keyFileObject.id,
                 iv: Buffer.from(carol.keyFileObject.crypto.cipherparams.iv, "hex"),
-                salt: Buffer.from(carol.keyFileObject.crypto.kdfparams.salt, "hex")
-            })
+                salt: Buffer.from(carol.keyFileObject.crypto.kdfparams.salt, "hex"),
+            }),
         });
 
         assert.deepEqual(aliceKeyFile.toJSON(), alice.keyFileObject);
@@ -183,13 +202,16 @@ describe("test user wallets", () => {
         const keyFileObject = await loadTestKeystore("withoutKind.json");
         const secretKey = UserWallet.decryptSecretKey(keyFileObject, password);
 
-        assert.equal(secretKey.generatePublicKey().toAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
+        assert.equal(
+            secretKey.generatePublicKey().toAddress().bech32(),
+            "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+        );
     });
 
     it("should create and load keystore files (with mnemonics)", async function () {
         this.timeout(10000);
 
-        const wallet = UserWallet.fromMnemonic({ mnemonic: DummyMnemonic, password: password });
+        const wallet = UserWallet.fromMnemonic({ mnemonic: dummyMnemonic, password: password });
         const json = wallet.toJSON();
 
         assert.equal(json.version, 4);
@@ -199,7 +221,7 @@ describe("test user wallets", () => {
         const mnemonic = UserWallet.decryptMnemonic(json, password);
         const mnemonicText = mnemonic.toString();
 
-        assert.equal(mnemonicText, DummyMnemonic);
+        assert.equal(mnemonicText, dummyMnemonic);
         assert.equal(mnemonic.deriveKey(0).generatePublicKey().toAddress().bech32(), alice.address.bech32());
         assert.equal(mnemonic.deriveKey(1).generatePublicKey().toAddress().bech32(), bob.address.bech32());
         assert.equal(mnemonic.deriveKey(2).generatePublicKey().toAddress().bech32(), carol.address.bech32());
@@ -207,13 +229,13 @@ describe("test user wallets", () => {
         // With provided randomness, in order to reproduce our test wallets
         const expectedDummyWallet = await loadTestKeystore("withDummyMnemonic.json");
         const dummyWallet = UserWallet.fromMnemonic({
-            mnemonic: DummyMnemonic,
+            mnemonic: dummyMnemonic,
             password: password,
             randomness: new Randomness({
                 id: "5b448dbc-5c72-4d83-8038-938b1f8dff19",
                 iv: Buffer.from("2da5620906634972d9a623bc249d63d4", "hex"),
-                salt: Buffer.from("aa9e0ba6b188703071a582c10e5331f2756279feb0e2768f1ba0fd38ec77f035", "hex")
-            })
+                salt: Buffer.from("aa9e0ba6b188703071a582c10e5331f2756279feb0e2768f1ba0fd38ec77f035", "hex"),
+            }),
         });
 
         assert.deepEqual(dummyWallet.toJSON(), expectedDummyWallet);
@@ -223,26 +245,47 @@ describe("test user wallets", () => {
         const keyFileObject = await loadTestKeystore("withoutKind.json");
         const secretKey = UserWallet.decrypt(keyFileObject, password);
 
-        assert.equal(secretKey.generatePublicKey().toAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
+        assert.equal(
+            secretKey.generatePublicKey().toAddress().bech32(),
+            "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+        );
     });
 
     it("should throw when calling loadSecretKey with unecessary address index", async function () {
         const keyFileObject = await loadTestKeystore("alice.json");
 
-        assert.throws(() => UserWallet.decrypt(keyFileObject, password, 42), "addressIndex must not be provided when kind == 'secretKey'");
+        assert.throws(
+            () => UserWallet.decrypt(keyFileObject, password, 42),
+            "addressIndex must not be provided when kind == 'secretKey'",
+        );
     });
 
     it("should loadSecretKey with mnemonic", async function () {
         const keyFileObject = await loadTestKeystore("withDummyMnemonic.json");
 
-        assert.equal(UserWallet.decrypt(keyFileObject, password, 0).generatePublicKey().toAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
-        assert.equal(UserWallet.decrypt(keyFileObject, password, 1).generatePublicKey().toAddress().bech32(), "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx");
-        assert.equal(UserWallet.decrypt(keyFileObject, password, 2).generatePublicKey().toAddress().bech32(), "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
+        assert.equal(
+            UserWallet.decrypt(keyFileObject, password, 0).generatePublicKey().toAddress().bech32(),
+            "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+        );
+        assert.equal(
+            UserWallet.decrypt(keyFileObject, password, 1).generatePublicKey().toAddress().bech32(),
+            "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+        );
+        assert.equal(
+            UserWallet.decrypt(keyFileObject, password, 2).generatePublicKey().toAddress().bech32(),
+            "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8",
+        );
     });
 
     it("should sign transactions", async () => {
-        let signer = new UserSigner(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
-        let verifier = new UserVerifier(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf").generatePublicKey());
+        let signer = new UserSigner(
+            UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"),
+        );
+        let verifier = new UserVerifier(
+            UserSecretKey.fromString(
+                "1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf",
+            ).generatePublicKey(),
+        );
 
         // With data field
         let transaction = new TestTransaction({
@@ -259,10 +302,16 @@ describe("test user wallets", () => {
         let signature = await signer.sign(serialized);
 
         assert.deepEqual(await signer.sign(serialized), await signer.sign(Uint8Array.from(serialized)));
-        assert.equal(serialized.toString(), `{"nonce":0,"value":"0","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1}`);
-        assert.equal(signature.toString("hex"), "a3b61a2fe461f3393c42e6cb0477a6b52ffd92168f10c111f6aa8d0a310ee0c314fae0670f8313f1ad992933ac637c61a8ff20cc20b6a8b2260a4af1a120a70d");
+        assert.equal(
+            serialized.toString(),
+            `{"nonce":0,"value":"0","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1}`,
+        );
+        assert.equal(
+            signature.toString("hex"),
+            "a3b61a2fe461f3393c42e6cb0477a6b52ffd92168f10c111f6aa8d0a310ee0c314fae0670f8313f1ad992933ac637c61a8ff20cc20b6a8b2260a4af1a120a70d",
+        );
         assert.isTrue(verifier.verify(serialized, signature));
-        
+
         // Without data field
         transaction = new TestTransaction({
             nonce: 8,
@@ -270,21 +319,33 @@ describe("test user wallets", () => {
             receiver: "erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r",
             gasPrice: 1000000000,
             gasLimit: 50000,
-            chainID: "1"
+            chainID: "1",
         });
 
         serialized = transaction.serializeForSigning();
         signature = await signer.sign(serialized);
 
         assert.deepEqual(await signer.sign(serialized), await signer.sign(Uint8Array.from(serialized)));
-        assert.equal(serialized.toString(), `{"nonce":8,"value":"10000000000000000000","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","version":1}`);
-        assert.equal(signature.toString("hex"), "f136c901d37349a7da8cfe3ab5ec8ef333b0bc351517c0e9bef9eb9704aed3077bf222769cade5ff29dffe5f42e4f0c5e0b068bdba90cd2cb41da51fd45d5a03");
+        assert.equal(
+            serialized.toString(),
+            `{"nonce":8,"value":"10000000000000000000","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","version":1}`,
+        );
+        assert.equal(
+            signature.toString("hex"),
+            "f136c901d37349a7da8cfe3ab5ec8ef333b0bc351517c0e9bef9eb9704aed3077bf222769cade5ff29dffe5f42e4f0c5e0b068bdba90cd2cb41da51fd45d5a03",
+        );
     });
 
     it("guardian should sign transactions from PEM", async () => {
         // bob is the guardian
-        let signer = new UserSigner(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
-        let verifier = new UserVerifier(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf").generatePublicKey());
+        let signer = new UserSigner(
+            UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"),
+        );
+        let verifier = new UserVerifier(
+            UserSecretKey.fromString(
+                "1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf",
+            ).generatePublicKey(),
+        );
         let guardianSigner = new UserSigner(UserSecretKey.fromPem(bob.pemFileText));
 
         // With data field
@@ -299,16 +360,25 @@ describe("test user wallets", () => {
             chainID: "1",
             guardian: "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
             options: 2,
-            version: 2
+            version: 2,
         });
 
         let serialized = transaction.serializeForSigning();
         let signature = await signer.sign(serialized);
         let guardianSignature = await guardianSigner.sign(serialized);
 
-        assert.equal(serialized.toString(), `{"nonce":0,"value":"0","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","guardian":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","options":2,"version":2}`);
-        assert.equal(signature.toString("hex"), "00b867ae749616954711ef227c0a3f5c6556246f26dbde12ad929a099094065341a0fae7c5ced98e6bdd100ce922c975667444ea859dce9597b46e63cade2a03");
-        assert.equal(guardianSignature.toString("hex"), "1326e44941ef7bfbad3edf346e72abe23704ee32b4b6a6a6a9b793bd7c62b6d4a69d3c6ea2dddf7eabc8df8fe291cd24822409ab9194b6a0f3bbbf1c59b0a10f");
+        assert.equal(
+            serialized.toString(),
+            `{"nonce":0,"value":"0","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","guardian":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","options":2,"version":2}`,
+        );
+        assert.equal(
+            signature.toString("hex"),
+            "00b867ae749616954711ef227c0a3f5c6556246f26dbde12ad929a099094065341a0fae7c5ced98e6bdd100ce922c975667444ea859dce9597b46e63cade2a03",
+        );
+        assert.equal(
+            guardianSignature.toString("hex"),
+            "1326e44941ef7bfbad3edf346e72abe23704ee32b4b6a6a6a9b793bd7c62b6d4a69d3c6ea2dddf7eabc8df8fe291cd24822409ab9194b6a0f3bbbf1c59b0a10f",
+        );
         assert.isTrue(verifier.verify(serialized, signature));
 
         // Without data field
@@ -329,9 +399,18 @@ describe("test user wallets", () => {
         signature = await signer.sign(serialized);
         guardianSignature = await guardianSigner.sign(serialized);
 
-        assert.equal(serialized.toString(), `{"nonce":8,"value":"10000000000000000000","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","guardian":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","options":2,"version":2}`);
-        assert.equal(signature.toString("hex"), "49a63fa0e3cfb81a2b6d926c741328fb270ea4f58fa32585fe8aa3cde191245e5a13c5c059d5576f4c05fc24d2534a2124ff79c98d067ce8412c806779066b03");
-        assert.equal(guardianSignature.toString("hex"), "4c25a54381bf66576d05f32659d30672b5b0bfbfb6b6aee52290d28cfbc87860637f095f83663a1893d12d0d5a27b2ab3325829ff1f1215b81a7ced8ee5d7203");
+        assert.equal(
+            serialized.toString(),
+            `{"nonce":8,"value":"10000000000000000000","receiver":"erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r","sender":"erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz","guardian":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","options":2,"version":2}`,
+        );
+        assert.equal(
+            signature.toString("hex"),
+            "49a63fa0e3cfb81a2b6d926c741328fb270ea4f58fa32585fe8aa3cde191245e5a13c5c059d5576f4c05fc24d2534a2124ff79c98d067ce8412c806779066b03",
+        );
+        assert.equal(
+            guardianSignature.toString("hex"),
+            "4c25a54381bf66576d05f32659d30672b5b0bfbfb6b6aee52290d28cfbc87860637f095f83663a1893d12d0d5a27b2ab3325829ff1f1215b81a7ced8ee5d7203",
+        );
         assert.isTrue(verifier.verify(serialized, signature));
     });
 
@@ -345,23 +424,32 @@ describe("test user wallets", () => {
             gasPrice: 1000000000,
             gasLimit: 50000,
             data: "foo",
-            chainID: "1"
+            chainID: "1",
         });
 
         const serialized = transaction.serializeForSigning();
         const signature = await signer.sign(serialized);
 
         assert.deepEqual(await signer.sign(serialized), await signer.sign(Uint8Array.from(serialized)));
-        assert.equal(signature.toString("hex"), "ba4fa95fea1402e4876abf1d5a510615aab374ee48bb76f5230798a7d3f2fcae6ba91ba56c6d62e6e7003ce531ff02f219cb7218dd00dd2ca650ba747f19640a");
+        assert.equal(
+            signature.toString("hex"),
+            "ba4fa95fea1402e4876abf1d5a510615aab374ee48bb76f5230798a7d3f2fcae6ba91ba56c6d62e6e7003ce531ff02f219cb7218dd00dd2ca650ba747f19640a",
+        );
     });
 
     it("signs a general message", async function () {
-        let signer = new UserSigner(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"));
-        let verifier = new UserVerifier(UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf").generatePublicKey());
+        let signer = new UserSigner(
+            UserSecretKey.fromString("1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf"),
+        );
+        let verifier = new UserVerifier(
+            UserSecretKey.fromString(
+                "1a927e2af5306a9bb2ea777f73e06ecc0ac9aaa72fb4ea3fecf659451394cccf",
+            ).generatePublicKey(),
+        );
 
         const message = new TestMessage({
             foo: "hello",
-            bar: "world"
+            bar: "world",
         });
 
         const data = message.serializeForSigning();
@@ -379,27 +467,51 @@ describe("test user wallets", () => {
         const keyFileObjectWithMnemonic = await loadTestKeystore("withDummyMnemonic.json");
         const keyFileObjectWithSecretKey = await loadTestKeystore("withDummySecretKey.json");
 
-        assert.equal(UserSigner.fromWallet(keyFileObjectWithoutKind, password).getAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
-        assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password).getAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
-        assert.equal(UserSigner.fromWallet(keyFileObjectWithSecretKey, password).getAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
-        assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 0).getAddress().bech32(), "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
-        assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 1).getAddress().bech32(), "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx");
-        assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 2).getAddress().bech32(), "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8");
+        assert.equal(
+            UserSigner.fromWallet(keyFileObjectWithoutKind, password).getAddress().bech32(),
+            "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+        );
+        assert.equal(
+            UserSigner.fromWallet(keyFileObjectWithMnemonic, password).getAddress().bech32(),
+            "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+        );
+        assert.equal(
+            UserSigner.fromWallet(keyFileObjectWithSecretKey, password).getAddress().bech32(),
+            "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+        );
+        assert.equal(
+            UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 0).getAddress().bech32(),
+            "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+        );
+        assert.equal(
+            UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 1).getAddress().bech32(),
+            "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+        );
+        assert.equal(
+            UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 2).getAddress().bech32(),
+            "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8",
+        );
 
-        assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 0).getAddress("test").bech32(), "test1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ss5hqhtr");
-        assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 1).getAddress("xerd").bech32(), "xerd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruq9thc9j");
-        assert.equal(UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 2).getAddress("yerd").bech32(), "yerd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaqgh23pp");
+        assert.equal(
+            UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 0).getAddress("test").bech32(),
+            "test1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ss5hqhtr",
+        );
+        assert.equal(
+            UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 1).getAddress("xerd").bech32(),
+            "xerd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruq9thc9j",
+        );
+        assert.equal(
+            UserSigner.fromWallet(keyFileObjectWithMnemonic, password, 2).getAddress("yerd").bech32(),
+            "yerd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaqgh23pp",
+        );
     });
 
     it("should throw error when decrypting secret key with keystore-mnemonic file", async function () {
-        const userWallet = UserWallet.fromMnemonic({
-            mnemonic: DummyMnemonic,
-            password: ``
-        });
+        const userWallet = UserWallet.fromMnemonic({ mnemonic: dummyMnemonic, password: `` });
         const keystoreMnemonic = userWallet.toJSON();
 
         assert.throws(() => {
-            UserWallet.decryptSecretKey(keystoreMnemonic, ``)
+            UserWallet.decryptSecretKey(keystoreMnemonic, ``);
         }, `Expected keystore kind to be secretKey, but it was mnemonic.`);
     });
 });

From e944d9fad69aa6b94624f99e0bb8bf3c84aa72bd Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 10 Oct 2024 12:44:05 +0300
Subject: [PATCH 292/338] Remove unused signature class

---
 src/signature.ts        |  2 +-
 src/wallet/signature.ts | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 src/wallet/signature.ts

diff --git a/src/signature.ts b/src/signature.ts
index 95fe99778..a0b872f65 100644
--- a/src/signature.ts
+++ b/src/signature.ts
@@ -8,7 +8,7 @@ const SIGNATURE_LENGTH = 64;
 export class Signature {
     private valueHex: string = "";
 
-    constructor(value?: string | Buffer) {
+    constructor(value?: string | Buffer | Uint8Array) {
         if (!value) {
             return;
         }
diff --git a/src/wallet/signature.ts b/src/wallet/signature.ts
deleted file mode 100644
index a99620ed3..000000000
--- a/src/wallet/signature.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Signature, as an immutable object.
- */
-export class Signature {
-    private readonly buffer: Buffer;
-
-    constructor(buffer: Buffer | Uint8Array) {
-        this.buffer = Buffer.from(buffer);
-    }
-
-    hex() {
-        return this.buffer.toString("hex");
-    }
-}

From 4a35ef66ceee5c2c1e27f7f0f3ee503ce465daec Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 10 Oct 2024 15:32:36 +0300
Subject: [PATCH 293/338] Merge error files

---
 .vscode/settings.json                        |  1 +
 src/errors.ts                                | 64 +++++++++++++++++++
 src/networkProviders/apiNetworkProvider.ts   | 31 +++++++---
 src/networkProviders/errors.ts               | 39 ------------
 src/networkProviders/index.ts                |  4 +-
 src/networkProviders/proxyNetworkProvider.ts | 52 +++++++++++-----
 src/networkProviders/transactionLogs.ts      | 18 ++++--
 src/wallet/assertions.ts                     |  2 +-
 src/wallet/crypto/decryptor.ts               | 36 +++++------
 src/wallet/errors.ts                         | 65 --------------------
 src/wallet/mnemonic.ts                       |  2 +-
 src/wallet/pem.spec.ts                       |  2 +-
 src/wallet/pem.ts                            | 15 +++--
 src/wallet/userSigner.ts                     |  2 +-
 src/wallet/userWallet.ts                     | 43 ++++++++-----
 src/wallet/users.spec.ts                     |  2 +-
 src/wallet/validatorKeys.ts                  |  2 +-
 src/wallet/validatorSigner.ts                |  2 +-
 18 files changed, 198 insertions(+), 184 deletions(-)
 delete mode 100644 src/networkProviders/errors.ts
 delete mode 100644 src/wallet/errors.ts

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9a9afd464..37681e68f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -10,4 +10,5 @@
     "editor.codeActionsOnSave": {
         "source.organizeImports": "explicit"
       },
+    "prettier.printWidth": 120
 }
diff --git a/src/errors.ts b/src/errors.ts
index 2bb4ff22a..e09ab86e0 100644
--- a/src/errors.ts
+++ b/src/errors.ts
@@ -384,3 +384,67 @@ export class ErrSmartContractQuery extends Err {
         this.returnCode = returnCode;
     }
 }
+
+/**
+ * Signals a wrong mnemonic format.
+ */
+export class ErrWrongMnemonic extends Err {
+    public constructor() {
+        super("Wrong mnemonic format");
+    }
+}
+
+/**
+ * Signals a bad mnemonic entropy.
+ */
+export class ErrBadMnemonicEntropy extends Err {
+    public constructor(inner: Error) {
+        super("Bad mnemonic entropy", inner);
+    }
+}
+
+/**
+ * Signals a bad PEM file.
+ */
+export class ErrBadPEM extends Err {
+    public constructor(message?: string) {
+        super(message ? `Bad PEM: ${message}` : `Bad PEM`);
+    }
+}
+
+/**
+ * Signals an error related to signing a message (a transaction).
+ */
+export class ErrSignerCannotSign extends Err {
+    public constructor(inner: Error) {
+        super(`Cannot sign`, inner);
+    }
+}
+
+/**
+ * Signals a bad address.
+ */
+export class ErrBadAddress extends Err {
+    public constructor(value: string, inner?: Error) {
+        super(`Bad address: ${value}`, inner);
+    }
+}
+
+/**
+ * Signals an error that happened during a request against the Network.
+ */
+export class ErrNetworkProvider extends Err {
+    public constructor(url: string, error: string, inner?: Error) {
+        let message = `Request error on url [${url}]: [${error}]`;
+        super(message, inner);
+    }
+}
+
+/**
+ * Signals a generic error in the context of querying Smart Contracts.
+ */
+export class ErrContractQuery extends Err {
+    public constructor(originalError: Error) {
+        super(originalError.message.replace("executeQuery:", ""));
+    }
+}
diff --git a/src/networkProviders/apiNetworkProvider.ts b/src/networkProviders/apiNetworkProvider.ts
index 3d6bc5565..709cb1cfe 100644
--- a/src/networkProviders/apiNetworkProvider.ts
+++ b/src/networkProviders/apiNetworkProvider.ts
@@ -1,10 +1,10 @@
 import axios from "axios";
+import { ErrContractQuery, ErrNetworkProvider } from "../errors";
 import { AccountOnNetwork, GuardianData } from "./accounts";
 import { defaultAxiosConfig, defaultPagination } from "./config";
 import { BaseUserAgent } from "./constants";
 import { ContractQueryRequest } from "./contractQueryRequest";
 import { ContractQueryResponse } from "./contractQueryResponse";
-import { ErrContractQuery, ErrNetworkProvider } from "./errors";
 import { IAddress, IContractQuery, INetworkProvider, IPagination, ITransaction, ITransactionNext } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkGeneralStatistics } from "./networkGeneralStatistics";
@@ -25,7 +25,7 @@ export class ApiNetworkProvider implements INetworkProvider {
     private url: string;
     private config: NetworkProviderConfig;
     private backingProxyNetworkProvider;
-    private userAgentPrefix = `${BaseUserAgent}/api`
+    private userAgentPrefix = `${BaseUserAgent}/api`;
 
     constructor(url: string, config?: NetworkProviderConfig) {
         this.url = url;
@@ -71,37 +71,50 @@ export class ApiNetworkProvider implements INetworkProvider {
         return await this.backingProxyNetworkProvider.getGuardianData(address);
     }
 
-    async getFungibleTokensOfAccount(address: IAddress, pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]> {
+    async getFungibleTokensOfAccount(
+        address: IAddress,
+        pagination?: IPagination,
+    ): Promise<FungibleTokenOfAccountOnNetwork[]> {
         pagination = pagination || defaultPagination;
 
         let url = `accounts/${address.bech32()}/tokens?${this.buildPaginationParams(pagination)}`;
         let response: any[] = await this.doGetGeneric(url);
-        let tokens = response.map(item => FungibleTokenOfAccountOnNetwork.fromHttpResponse(item));
+        let tokens = response.map((item) => FungibleTokenOfAccountOnNetwork.fromHttpResponse(item));
 
         // TODO: Fix sorting
         tokens.sort((a, b) => a.identifier.localeCompare(b.identifier));
         return tokens;
     }
 
-    async getNonFungibleTokensOfAccount(address: IAddress, pagination?: IPagination): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
+    async getNonFungibleTokensOfAccount(
+        address: IAddress,
+        pagination?: IPagination,
+    ): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
         pagination = pagination || defaultPagination;
 
         let url = `accounts/${address.bech32()}/nfts?${this.buildPaginationParams(pagination)}`;
         let response: any[] = await this.doGetGeneric(url);
-        let tokens = response.map(item => NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(item));
+        let tokens = response.map((item) => NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(item));
 
         // TODO: Fix sorting
         tokens.sort((a, b) => a.identifier.localeCompare(b.identifier));
         return tokens;
     }
 
-    async getFungibleTokenOfAccount(address: IAddress, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork> {
+    async getFungibleTokenOfAccount(
+        address: IAddress,
+        tokenIdentifier: string,
+    ): Promise<FungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`accounts/${address.bech32()}/tokens/${tokenIdentifier}`);
         let tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response);
         return tokenData;
     }
 
-    async getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork> {
+    async getNonFungibleTokenOfAccount(
+        address: IAddress,
+        collection: string,
+        nonce: number,
+    ): Promise<NonFungibleTokenOfAccountOnNetwork> {
         let nonceAsHex = new Nonce(nonce).hex();
         let response = await this.doGetGeneric(`accounts/${address.bech32()}/nfts/${collection}-${nonceAsHex}`);
         let tokenData = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response);
@@ -116,7 +129,7 @@ export class ApiNetworkProvider implements INetworkProvider {
 
         let response: any[] = await this.doGetGeneric(url);
 
-        return response.map(item => PairOnNetwork.fromApiHttpResponse(item));
+        return response.map((item) => PairOnNetwork.fromApiHttpResponse(item));
     }
 
     async getTransaction(txHash: string): Promise<TransactionOnNetwork> {
diff --git a/src/networkProviders/errors.ts b/src/networkProviders/errors.ts
deleted file mode 100644
index 6b297bfd1..000000000
--- a/src/networkProviders/errors.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * The base class for exceptions (errors).
- */
-export class Err extends Error {
-    inner: Error | undefined = undefined;
-
-    public constructor(message: string, inner?: Error) {
-        super(message);
-        this.inner = inner;
-    }
-}
-
-/**
- * Signals an unexpected condition.
- */
-export class ErrUnexpectedCondition extends Err {
-    public constructor(message: string) {
-        super(`Unexpected condition: [${message}]`);
-    }
-}
-
-/**
- * Signals an error that happened during a request against the Network.
- */
-export class ErrNetworkProvider extends Err {
-    public constructor(url: string, error: string, inner?: Error) {
-        let message = `Request error on url [${url}]: [${error}]`;
-        super(message, inner);
-    }
-}
-
-/**
- * Signals a generic error in the context of querying Smart Contracts.
- */
-export class ErrContractQuery extends Err {
-    public constructor(originalError: Error) {
-        super(originalError.message.replace("executeQuery:", ""));
-    }
-}
diff --git a/src/networkProviders/index.ts b/src/networkProviders/index.ts
index 16c7fccaa..99c22853f 100644
--- a/src/networkProviders/index.ts
+++ b/src/networkProviders/index.ts
@@ -5,14 +5,14 @@ export { AccountOnNetwork } from "./accounts";
 export { ContractQueryResponse } from "./contractQueryResponse";
 export { ContractResultItem, ContractResults } from "./contractResults";
 export {
-    TransactionEvent as TransactionEventOnNetwork,
     TransactionEventData,
+    TransactionEvent as TransactionEventOnNetwork,
     TransactionEventTopic,
 } from "./transactionEvents";
 export { TransactionLogs as TransactionLogsOnNetwork } from "./transactionLogs";
 export { TransactionReceipt } from "./transactionReceipt";
-export { TransactionStatus } from "./transactionStatus";
 export { TransactionOnNetwork } from "./transactions";
+export { TransactionStatus } from "./transactionStatus";
 
 export { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 export { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
diff --git a/src/networkProviders/proxyNetworkProvider.ts b/src/networkProviders/proxyNetworkProvider.ts
index c58e4bf15..5d06b5173 100644
--- a/src/networkProviders/proxyNetworkProvider.ts
+++ b/src/networkProviders/proxyNetworkProvider.ts
@@ -1,13 +1,14 @@
 import axios from "axios";
+import { ErrContractQuery, ErrNetworkProvider } from "../errors";
 import { AccountOnNetwork, GuardianData } from "./accounts";
 import { defaultAxiosConfig } from "./config";
-import { EsdtContractAddress, BaseUserAgent } from "./constants";
+import { BaseUserAgent, EsdtContractAddress } from "./constants";
 import { ContractQueryRequest } from "./contractQueryRequest";
 import { ContractQueryResponse } from "./contractQueryResponse";
-import { ErrContractQuery, ErrNetworkProvider } from "./errors";
 import { IAddress, IContractQuery, INetworkProvider, IPagination, ITransaction, ITransactionNext } from "./interface";
 import { NetworkConfig } from "./networkConfig";
 import { NetworkGeneralStatistics } from "./networkGeneralStatistics";
+import { NetworkProviderConfig } from "./networkProviderConfig";
 import { NetworkStake } from "./networkStake";
 import { NetworkStatus } from "./networkStatus";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
@@ -15,13 +16,12 @@ import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } f
 import { TransactionOnNetwork, prepareTransactionForBroadcasting } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 import { extendUserAgent } from "./userAgent";
-import { NetworkProviderConfig } from "./networkProviderConfig";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ProxyNetworkProvider implements INetworkProvider {
     private url: string;
     private config: NetworkProviderConfig;
-    private userAgentPrefix = `${BaseUserAgent}/proxy`
+    private userAgentPrefix = `${BaseUserAgent}/proxy`;
 
     constructor(url: string, config?: NetworkProviderConfig) {
         this.url = url;
@@ -65,40 +65,57 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return accountGuardian;
     }
 
-    async getFungibleTokensOfAccount(address: IAddress, _pagination?: IPagination): Promise<FungibleTokenOfAccountOnNetwork[]> {
+    async getFungibleTokensOfAccount(
+        address: IAddress,
+        _pagination?: IPagination,
+    ): Promise<FungibleTokenOfAccountOnNetwork[]> {
         let url = `address/${address.bech32()}/esdt`;
         let response = await this.doGetGeneric(url);
         let responseItems: any[] = Object.values(response.esdts);
         // Skip NFTs / SFTs.
-        let responseItemsFiltered = responseItems.filter(item => !item.nonce);
-        let tokens = responseItemsFiltered.map(item => FungibleTokenOfAccountOnNetwork.fromHttpResponse(item));
+        let responseItemsFiltered = responseItems.filter((item) => !item.nonce);
+        let tokens = responseItemsFiltered.map((item) => FungibleTokenOfAccountOnNetwork.fromHttpResponse(item));
 
         // TODO: Fix sorting
         tokens.sort((a, b) => a.identifier.localeCompare(b.identifier));
         return tokens;
     }
 
-    async getNonFungibleTokensOfAccount(address: IAddress, _pagination?: IPagination): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
+    async getNonFungibleTokensOfAccount(
+        address: IAddress,
+        _pagination?: IPagination,
+    ): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
         let url = `address/${address.bech32()}/esdt`;
         let response = await this.doGetGeneric(url);
         let responseItems: any[] = Object.values(response.esdts);
         // Skip fungible tokens.
-        let responseItemsFiltered = responseItems.filter(item => item.nonce >= 0);
-        let tokens = responseItemsFiltered.map(item => NonFungibleTokenOfAccountOnNetwork.fromProxyHttpResponse(item));
+        let responseItemsFiltered = responseItems.filter((item) => item.nonce >= 0);
+        let tokens = responseItemsFiltered.map((item) =>
+            NonFungibleTokenOfAccountOnNetwork.fromProxyHttpResponse(item),
+        );
 
         // TODO: Fix sorting
         tokens.sort((a, b) => a.identifier.localeCompare(b.identifier));
         return tokens;
     }
 
-    async getFungibleTokenOfAccount(address: IAddress, tokenIdentifier: string): Promise<FungibleTokenOfAccountOnNetwork> {
+    async getFungibleTokenOfAccount(
+        address: IAddress,
+        tokenIdentifier: string,
+    ): Promise<FungibleTokenOfAccountOnNetwork> {
         let response = await this.doGetGeneric(`address/${address.bech32()}/esdt/${tokenIdentifier}`);
         let tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response.tokenData);
         return tokenData;
     }
 
-    async getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork> {
-        let response = await this.doGetGeneric(`address/${address.bech32()}/nft/${collection}/nonce/${nonce.valueOf()}`);
+    async getNonFungibleTokenOfAccount(
+        address: IAddress,
+        collection: string,
+        nonce: number,
+    ): Promise<NonFungibleTokenOfAccountOnNetwork> {
+        let response = await this.doGetGeneric(
+            `address/${address.bech32()}/nft/${collection}/nonce/${nonce.valueOf()}`,
+        );
         let tokenData = NonFungibleTokenOfAccountOnNetwork.fromProxyHttpResponseByNonce(response.tokenData);
         return tokenData;
     }
@@ -133,7 +150,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     async sendTransactions(txs: (ITransaction | ITransactionNext)[]): Promise<string[]> {
-        const data = (txs).map((tx) => prepareTransactionForBroadcasting(tx));
+        const data = txs.map((tx) => prepareTransactionForBroadcasting(tx));
 
         const response = await this.doPostGeneric("transaction/send-multiple", data);
         const hashes = Array(txs.length).fill(null);
@@ -163,7 +180,10 @@ export class ProxyNetworkProvider implements INetworkProvider {
 
     async getDefinitionOfFungibleToken(tokenIdentifier: string): Promise<DefinitionOfFungibleTokenOnNetwork> {
         let properties = await this.getTokenProperties(tokenIdentifier);
-        let definition = DefinitionOfFungibleTokenOnNetwork.fromResponseOfGetTokenProperties(tokenIdentifier, properties);
+        let definition = DefinitionOfFungibleTokenOnNetwork.fromResponseOfGetTokenProperties(
+            tokenIdentifier,
+            properties,
+        );
         return definition;
     }
 
@@ -173,7 +193,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
         let queryResponse = await this.queryContract({
             address: EsdtContractAddress,
             func: "getTokenProperties",
-            getEncodedArguments: () => [encodedIdentifier]
+            getEncodedArguments: () => [encodedIdentifier],
         });
 
         let properties = queryResponse.getReturnDataParts();
diff --git a/src/networkProviders/transactionLogs.ts b/src/networkProviders/transactionLogs.ts
index 9e7a6ef18..36f5d021d 100644
--- a/src/networkProviders/transactionLogs.ts
+++ b/src/networkProviders/transactionLogs.ts
@@ -1,4 +1,4 @@
-import { ErrUnexpectedCondition } from "./errors";
+import { ErrUnexpectedCondition } from "./../errors";
 import { IAddress } from "./interface";
 import { Address } from "./primitives";
 import { TransactionEvent } from "./transactionEvents";
@@ -15,11 +15,14 @@ export class TransactionLogs {
         let result = new TransactionLogs();
         result.address = new Address(logs.address);
         result.events = (logs.events || []).map((event: any) => TransactionEvent.fromHttpResponse(event));
-        
+
         return result;
     }
 
-    findSingleOrNoneEvent(identifier: string, predicate?: (event: TransactionEvent) => boolean): TransactionEvent | undefined {
+    findSingleOrNoneEvent(
+        identifier: string,
+        predicate?: (event: TransactionEvent) => boolean,
+    ): TransactionEvent | undefined {
         let events = this.findEvents(identifier, predicate);
 
         if (events.length > 1) {
@@ -29,15 +32,18 @@ export class TransactionLogs {
         return events[0];
     }
 
-    findFirstOrNoneEvent(identifier: string, predicate?: (event: TransactionEvent) => boolean): TransactionEvent | undefined {
+    findFirstOrNoneEvent(
+        identifier: string,
+        predicate?: (event: TransactionEvent) => boolean,
+    ): TransactionEvent | undefined {
         return this.findEvents(identifier, predicate)[0];
     }
 
     findEvents(identifier: string, predicate?: (event: TransactionEvent) => boolean): TransactionEvent[] {
-        let events = this.events.filter(event => event.identifier == identifier);
+        let events = this.events.filter((event) => event.identifier == identifier);
 
         if (predicate) {
-            events = events.filter(event => predicate(event));
+            events = events.filter((event) => predicate(event));
         }
 
         return events;
diff --git a/src/wallet/assertions.ts b/src/wallet/assertions.ts
index 80602639c..09ac481d2 100644
--- a/src/wallet/assertions.ts
+++ b/src/wallet/assertions.ts
@@ -1,4 +1,4 @@
-import { ErrInvariantFailed } from "./errors";
+import { ErrInvariantFailed } from "../errors";
 
 export function guardLength(withLength: { length?: number }, expectedLength: number) {
     let actualLength = withLength.length || 0;
diff --git a/src/wallet/crypto/decryptor.ts b/src/wallet/crypto/decryptor.ts
index 0a42be1b0..388b9fd63 100644
--- a/src/wallet/crypto/decryptor.ts
+++ b/src/wallet/crypto/decryptor.ts
@@ -1,27 +1,27 @@
 import crypto from "crypto";
-import { EncryptedData } from "./encryptedData";
+import { Err } from "../../errors";
 import { DigestAlgorithm } from "./constants";
-import { Err } from "../errors";
+import { EncryptedData } from "./encryptedData";
 
 export class Decryptor {
-  static decrypt(data: EncryptedData, password: string): Buffer {
-    const kdfparams = data.kdfparams;
-    const salt = Buffer.from(data.salt, "hex");
-    const iv = Buffer.from(data.iv, "hex");
-    const ciphertext = Buffer.from(data.ciphertext, "hex");
-    const derivedKey = kdfparams.generateDerivedKey(Buffer.from(password), salt);
-    const derivedKeyFirstHalf = derivedKey.slice(0, 16);
-    const derivedKeySecondHalf = derivedKey.slice(16, 32);
+    static decrypt(data: EncryptedData, password: string): Buffer {
+        const kdfparams = data.kdfparams;
+        const salt = Buffer.from(data.salt, "hex");
+        const iv = Buffer.from(data.iv, "hex");
+        const ciphertext = Buffer.from(data.ciphertext, "hex");
+        const derivedKey = kdfparams.generateDerivedKey(Buffer.from(password), salt);
+        const derivedKeyFirstHalf = derivedKey.slice(0, 16);
+        const derivedKeySecondHalf = derivedKey.slice(16, 32);
 
-    const computedMAC = crypto.createHmac(DigestAlgorithm, derivedKeySecondHalf).update(ciphertext).digest();
-    const actualMAC = data.mac;
+        const computedMAC = crypto.createHmac(DigestAlgorithm, derivedKeySecondHalf).update(ciphertext).digest();
+        const actualMAC = data.mac;
 
-    if (computedMAC.toString("hex") !== actualMAC) {
-      throw new Err("MAC mismatch, possibly wrong password");
-    }
+        if (computedMAC.toString("hex") !== actualMAC) {
+            throw new Err("MAC mismatch, possibly wrong password");
+        }
 
-    const decipher = crypto.createDecipheriv(data.cipher, derivedKeyFirstHalf, iv);
+        const decipher = crypto.createDecipheriv(data.cipher, derivedKeyFirstHalf, iv);
 
-    return Buffer.concat([decipher.update(ciphertext), decipher.final()]);
-  }
+        return Buffer.concat([decipher.update(ciphertext), decipher.final()]);
+    }
 }
diff --git a/src/wallet/errors.ts b/src/wallet/errors.ts
deleted file mode 100644
index 4c3ea2ecd..000000000
--- a/src/wallet/errors.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * The base class for exceptions (errors).
- */
-export class Err extends Error {
-    inner: Error | undefined = undefined;
-
-    public constructor(message: string, inner?: Error) {
-        super(message);
-        this.inner = inner;
-    }
-}
-
-/**
- * Signals that an invariant failed.
- */
-export class ErrInvariantFailed extends Err {
-    public constructor(message: string) {
-        super(`"Invariant failed: ${message}`);
-    }
-}
-
-/**
- * Signals a wrong mnemonic format.
- */
-export class ErrWrongMnemonic extends Err {
-    public constructor() {
-        super("Wrong mnemonic format");
-    }
-}
-
-/**
- * Signals a bad mnemonic entropy.
- */
-export class ErrBadMnemonicEntropy extends Err {
-    public constructor(inner: Error) {
-        super("Bad mnemonic entropy", inner);
-    }
-}
-
-/**
- * Signals a bad PEM file.
- */
-export class ErrBadPEM extends Err {
-    public constructor(message?: string) {
-        super(message ? `Bad PEM: ${message}` : `Bad PEM`);
-    }
-}
-
-/**
- * Signals an error related to signing a message (a transaction).
- */
-export class ErrSignerCannotSign extends Err {
-    public constructor(inner: Error) {
-        super(`Cannot sign`, inner);
-    }
-}
-
-/**
- * Signals a bad address.
- */
-export class ErrBadAddress extends Err {
-    public constructor(value: string, inner?: Error) {
-        super(`Bad address: ${value}`, inner);
-    }
-}
diff --git a/src/wallet/mnemonic.ts b/src/wallet/mnemonic.ts
index 93b62ee3a..8e4b2baa5 100644
--- a/src/wallet/mnemonic.ts
+++ b/src/wallet/mnemonic.ts
@@ -1,6 +1,6 @@
 import { entropyToMnemonic, generateMnemonic, mnemonicToEntropy, mnemonicToSeedSync, validateMnemonic } from "bip39";
 import { derivePath } from "ed25519-hd-key";
-import { ErrBadMnemonicEntropy, ErrWrongMnemonic } from "./errors";
+import { ErrBadMnemonicEntropy, ErrWrongMnemonic } from "../errors";
 import { UserSecretKey } from "./userKeys";
 
 const MNEMONIC_STRENGTH = 256;
diff --git a/src/wallet/pem.spec.ts b/src/wallet/pem.spec.ts
index 538a99cfc..73eda6b96 100644
--- a/src/wallet/pem.spec.ts
+++ b/src/wallet/pem.spec.ts
@@ -1,7 +1,7 @@
 import { Buffer } from "buffer";
 import { assert } from "chai";
+import { ErrBadPEM } from "../errors";
 import { loadTestWallet, TestWallet } from "./../testutils/wallets";
-import { ErrBadPEM } from "./errors";
 import { parse, parseUserKey, parseValidatorKey } from "./pem";
 import { BLS } from "./validatorKeys";
 
diff --git a/src/wallet/pem.ts b/src/wallet/pem.ts
index f9add5494..47a839a1f 100644
--- a/src/wallet/pem.ts
+++ b/src/wallet/pem.ts
@@ -1,6 +1,6 @@
-import { ErrBadPEM } from "./errors";
-import { UserSecretKey, USER_PUBKEY_LENGTH, USER_SEED_LENGTH } from "./userKeys";
-import { ValidatorSecretKey, VALIDATOR_SECRETKEY_LENGTH } from "./validatorKeys";
+import { ErrBadPEM } from "../errors";
+import { USER_PUBKEY_LENGTH, USER_SEED_LENGTH, UserSecretKey } from "./userKeys";
+import { VALIDATOR_SECRETKEY_LENGTH, ValidatorSecretKey } from "./validatorKeys";
 
 export function parseUserKey(text: string, index: number = 0): UserSecretKey {
     let keys = parseUserKeys(text);
@@ -10,7 +10,7 @@ export function parseUserKey(text: string, index: number = 0): UserSecretKey {
 export function parseUserKeys(text: string): UserSecretKey[] {
     // The user PEM files encode both the seed and the pubkey in their payloads.
     let buffers = parse(text, USER_SEED_LENGTH + USER_PUBKEY_LENGTH);
-    return buffers.map(buffer => new UserSecretKey(buffer.slice(0, USER_SEED_LENGTH)));
+    return buffers.map((buffer) => new UserSecretKey(buffer.slice(0, USER_SEED_LENGTH)));
 }
 
 export function parseValidatorKey(text: string, index: number = 0): ValidatorSecretKey {
@@ -20,12 +20,15 @@ export function parseValidatorKey(text: string, index: number = 0): ValidatorSec
 
 export function parseValidatorKeys(text: string): ValidatorSecretKey[] {
     let buffers = parse(text, VALIDATOR_SECRETKEY_LENGTH);
-    return buffers.map(buffer => new ValidatorSecretKey(buffer));
+    return buffers.map((buffer) => new ValidatorSecretKey(buffer));
 }
 
 export function parse(text: string, expectedLength: number): Buffer[] {
     // Split by newlines, trim whitespace, then discard remaining empty lines.
-    let lines = text.split(/\r?\n/).map(line => line.trim()).filter(line => line.length > 0);
+    let lines = text
+        .split(/\r?\n/)
+        .map((line) => line.trim())
+        .filter((line) => line.length > 0);
     let buffers: Buffer[] = [];
     let linesAccumulator: string[] = [];
 
diff --git a/src/wallet/userSigner.ts b/src/wallet/userSigner.ts
index 37f05e302..acc8f6f09 100644
--- a/src/wallet/userSigner.ts
+++ b/src/wallet/userSigner.ts
@@ -1,5 +1,5 @@
 import { Address } from "../address";
-import { ErrSignerCannotSign } from "./errors";
+import { ErrSignerCannotSign } from "../errors";
 import { UserSecretKey } from "./userKeys";
 import { UserWallet } from "./userWallet";
 
diff --git a/src/wallet/userWallet.ts b/src/wallet/userWallet.ts
index 8c7ff833b..743f4ac69 100644
--- a/src/wallet/userWallet.ts
+++ b/src/wallet/userWallet.ts
@@ -1,6 +1,6 @@
+import { Err } from "../errors";
 import { CipherAlgorithm, Decryptor, EncryptedData, Encryptor, KeyDerivationFunction, Randomness } from "./crypto";
 import { ScryptKeyDerivationParams } from "./crypto/derivationParams";
-import { Err } from "./errors";
 import { Mnemonic } from "./mnemonic";
 import { UserPublicKey, UserSecretKey } from "./userKeys";
 
@@ -12,7 +12,7 @@ interface IRandomness {
 
 export enum UserWalletKind {
     SecretKey = "secretKey",
-    Mnemonic = "mnemonic"
+    Mnemonic = "mnemonic",
 }
 
 export class UserWallet {
@@ -20,7 +20,11 @@ export class UserWallet {
     private readonly encryptedData: EncryptedData;
     private readonly publicKeyWhenKindIsSecretKey?: UserPublicKey;
 
-    private constructor({ kind, encryptedData, publicKeyWhenKindIsSecretKey }: {
+    private constructor({
+        kind,
+        encryptedData,
+        publicKeyWhenKindIsSecretKey,
+    }: {
         kind: UserWalletKind;
         encryptedData: EncryptedData;
         publicKeyWhenKindIsSecretKey?: UserPublicKey;
@@ -30,7 +34,11 @@ export class UserWallet {
         this.publicKeyWhenKindIsSecretKey = publicKeyWhenKindIsSecretKey;
     }
 
-    static fromSecretKey({ secretKey, password, randomness }: {
+    static fromSecretKey({
+        secretKey,
+        password,
+        randomness,
+    }: {
         secretKey: UserSecretKey;
         password: string;
         randomness?: IRandomness;
@@ -44,11 +52,15 @@ export class UserWallet {
         return new UserWallet({
             kind: UserWalletKind.SecretKey,
             encryptedData,
-            publicKeyWhenKindIsSecretKey: publicKey
+            publicKeyWhenKindIsSecretKey: publicKey,
         });
     }
 
-    static fromMnemonic({ mnemonic, password, randomness }: {
+    static fromMnemonic({
+        mnemonic,
+        password,
+        randomness,
+    }: {
         mnemonic: string;
         password: string;
         randomness?: IRandomness;
@@ -61,7 +73,7 @@ export class UserWallet {
 
         return new UserWallet({
             kind: UserWalletKind.Mnemonic,
-            encryptedData
+            encryptedData,
         });
     }
 
@@ -86,18 +98,18 @@ export class UserWallet {
 
     /**
      * Copied from: https://github.com/multiversx/mx-deprecated-core-js/blob/v1.28.0/src/account.js#L42
-     * Notes: adjustements (code refactoring, no change in logic), in terms of: 
+     * Notes: adjustements (code refactoring, no change in logic), in terms of:
      *  - typing (since this is the TypeScript version)
      *  - error handling (in line with sdk-core's error system)
      *  - references to crypto functions
      *  - references to object members
-     * 
+     *
      * From an encrypted keyfile, given the password, loads the secret key and the public key.
      */
     static decryptSecretKey(keyFileObject: any, password: string): UserSecretKey {
         // Here, we check the "kind" field only for files that have it. Older keystore files (holding only secret keys) do not have this field.
         const kind = keyFileObject.kind;
-        if (kind && kind !== UserWalletKind.SecretKey){
+        if (kind && kind !== UserWalletKind.SecretKey) {
             throw new Err(`Expected keystore kind to be ${UserWalletKind.SecretKey}, but it was ${kind}.`);
         }
 
@@ -120,7 +132,7 @@ export class UserWallet {
 
         const encryptedData = UserWallet.edFromJSON(keyFileObject);
         const data = Decryptor.decrypt(encryptedData, password);
-        const mnemonic = Mnemonic.fromString(data.toString())
+        const mnemonic = Mnemonic.fromString(data.toString());
         return mnemonic;
     }
 
@@ -136,7 +148,7 @@ export class UserWallet {
                 keyfileObject.crypto.kdfparams.n,
                 keyfileObject.crypto.kdfparams.r,
                 keyfileObject.crypto.kdfparams.p,
-                keyfileObject.crypto.kdfparams.dklen
+                keyfileObject.crypto.kdfparams.dklen,
             ),
             salt: keyfileObject.crypto.kdfparams.salt,
             mac: keyfileObject.crypto.mac,
@@ -167,7 +179,7 @@ export class UserWallet {
             id: this.encryptedData.id,
             address: this.publicKeyWhenKindIsSecretKey.hex(),
             bech32: this.publicKeyWhenKindIsSecretKey.toAddress(addressHrp).toString(),
-            crypto: cryptoSection
+            crypto: cryptoSection,
         };
 
         return envelope;
@@ -184,7 +196,7 @@ export class UserWallet {
                 salt: this.encryptedData.salt,
                 n: this.encryptedData.kdfparams.n,
                 r: this.encryptedData.kdfparams.r,
-                p: this.encryptedData.kdfparams.p
+                p: this.encryptedData.kdfparams.p,
             },
             mac: this.encryptedData.mac,
         };
@@ -199,8 +211,7 @@ export class UserWallet {
             version: this.encryptedData.version,
             id: this.encryptedData.id,
             kind: this.kind,
-            crypto: cryptoSection
+            crypto: cryptoSection,
         };
     }
 }
-
diff --git a/src/wallet/users.spec.ts b/src/wallet/users.spec.ts
index 815c0000e..976f4ef85 100644
--- a/src/wallet/users.spec.ts
+++ b/src/wallet/users.spec.ts
@@ -1,4 +1,5 @@
 import { assert } from "chai";
+import { ErrBadMnemonicEntropy, ErrInvariantFailed } from "../errors";
 import { TestMessage } from "./../testutils/message";
 import { TestTransaction } from "./../testutils/transaction";
 import {
@@ -10,7 +11,6 @@ import {
     TestWallet,
 } from "./../testutils/wallets";
 import { Randomness } from "./crypto";
-import { ErrBadMnemonicEntropy, ErrInvariantFailed } from "./errors";
 import { Mnemonic } from "./mnemonic";
 import { UserSecretKey } from "./userKeys";
 import { UserSigner } from "./userSigner";
diff --git a/src/wallet/validatorKeys.ts b/src/wallet/validatorKeys.ts
index 7425e113d..d91bc315a 100644
--- a/src/wallet/validatorKeys.ts
+++ b/src/wallet/validatorKeys.ts
@@ -1,5 +1,5 @@
+import { ErrInvariantFailed } from "../errors";
 import { guardLength } from "./assertions";
-import { ErrInvariantFailed } from "./errors";
 import { parseValidatorKey } from "./pem";
 
 const bls = require("@multiversx/sdk-bls-wasm");
diff --git a/src/wallet/validatorSigner.ts b/src/wallet/validatorSigner.ts
index 8c0c028f8..161c2dad1 100644
--- a/src/wallet/validatorSigner.ts
+++ b/src/wallet/validatorSigner.ts
@@ -1,4 +1,4 @@
-import { ErrSignerCannotSign } from "./errors";
+import { ErrSignerCannotSign } from "../errors";
 import { BLS, ValidatorSecretKey } from "./validatorKeys";
 
 /**

From 78bcbb4e7f7687208c6dcdbaa80d8dde0441f15e Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 10 Oct 2024 16:03:15 +0300
Subject: [PATCH 294/338] Add handle for Uint8Array on signature

---
 src/signature.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/signature.ts b/src/signature.ts
index a0b872f65..e9ab00f24 100644
--- a/src/signature.ts
+++ b/src/signature.ts
@@ -15,8 +15,9 @@ export class Signature {
         if (typeof value === "string") {
             return Signature.fromHex(value);
         }
-        if (value instanceof Buffer) {
-            return Signature.fromBuffer(value);
+
+        if (ArrayBuffer.isView(value)) {
+            return Signature.fromBuffer(Buffer.from(value));
         }
     }
 

From 23dbb8661b7bfab8c9124102e8b55df8817ca6f5 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 10 Oct 2024 16:28:29 +0300
Subject: [PATCH 295/338] Change let to const

---
 src/errors.ts                                |  8 +-
 src/networkProviders/apiNetworkProvider.ts   | 78 +++++++++---------
 src/networkProviders/proxyNetworkProvider.ts | 87 ++++++++++----------
 src/wallet/pem.ts                            | 18 ++--
 4 files changed, 97 insertions(+), 94 deletions(-)

diff --git a/src/errors.ts b/src/errors.ts
index e09ab86e0..a0a47f0ab 100644
--- a/src/errors.ts
+++ b/src/errors.ts
@@ -13,7 +13,7 @@ export class Err extends Error {
      * Returns a pretty, friendly summary for the error or for the chain of errros (if appropriate).
      */
     summary(): any[] {
-        let result = [];
+        const result = [];
 
         result.push({ name: this.name, message: this.message });
 
@@ -77,7 +77,7 @@ export class ErrUnexpectedCondition extends Err {
  */
 export class ErrAddressCannotCreate extends Err {
     public constructor(input: any, inner?: Error) {
-        let message = `Cannot create address from: ${input}`;
+        const message = `Cannot create address from: ${input}`;
         super(message, inner);
     }
 }
@@ -141,7 +141,7 @@ export class ErrTransactionOptionsInvalid extends Err {
  */
 export class ErrSignatureCannotCreate extends Err {
     public constructor(input: any, inner?: Error) {
-        let message = `Cannot create signature from: ${input}`;
+        const message = `Cannot create signature from: ${input}`;
         super(message, inner);
     }
 }
@@ -435,7 +435,7 @@ export class ErrBadAddress extends Err {
  */
 export class ErrNetworkProvider extends Err {
     public constructor(url: string, error: string, inner?: Error) {
-        let message = `Request error on url [${url}]: [${error}]`;
+        const message = `Request error on url [${url}]: [${error}]`;
         super(message, inner);
     }
 }
diff --git a/src/networkProviders/apiNetworkProvider.ts b/src/networkProviders/apiNetworkProvider.ts
index 709cb1cfe..0b777c35c 100644
--- a/src/networkProviders/apiNetworkProvider.ts
+++ b/src/networkProviders/apiNetworkProvider.ts
@@ -29,7 +29,7 @@ export class ApiNetworkProvider implements INetworkProvider {
 
     constructor(url: string, config?: NetworkProviderConfig) {
         this.url = url;
-        let proxyConfig = this.getProxyConfig(config);
+        const proxyConfig = this.getProxyConfig(config);
         this.config = { ...defaultAxiosConfig, ...config };
         this.backingProxyNetworkProvider = new ProxyNetworkProvider(url, proxyConfig);
         extendUserAgent(this.userAgentPrefix, this.config);
@@ -50,20 +50,20 @@ export class ApiNetworkProvider implements INetworkProvider {
     }
 
     async getNetworkStakeStatistics(): Promise<NetworkStake> {
-        let response = await this.doGetGeneric("stake");
-        let networkStake = NetworkStake.fromHttpResponse(response);
+        const response = await this.doGetGeneric("stake");
+        const networkStake = NetworkStake.fromHttpResponse(response);
         return networkStake;
     }
 
     async getNetworkGeneralStatistics(): Promise<NetworkGeneralStatistics> {
-        let response = await this.doGetGeneric("stats");
-        let stats = NetworkGeneralStatistics.fromHttpResponse(response);
+        const response = await this.doGetGeneric("stats");
+        const stats = NetworkGeneralStatistics.fromHttpResponse(response);
         return stats;
     }
 
     async getAccount(address: IAddress): Promise<AccountOnNetwork> {
-        let response = await this.doGetGeneric(`accounts/${address.bech32()}`);
-        let account = AccountOnNetwork.fromHttpResponse(response);
+        const response = await this.doGetGeneric(`accounts/${address.bech32()}`);
+        const account = AccountOnNetwork.fromHttpResponse(response);
         return account;
     }
 
@@ -77,9 +77,9 @@ export class ApiNetworkProvider implements INetworkProvider {
     ): Promise<FungibleTokenOfAccountOnNetwork[]> {
         pagination = pagination || defaultPagination;
 
-        let url = `accounts/${address.bech32()}/tokens?${this.buildPaginationParams(pagination)}`;
-        let response: any[] = await this.doGetGeneric(url);
-        let tokens = response.map((item) => FungibleTokenOfAccountOnNetwork.fromHttpResponse(item));
+        const url = `accounts/${address.bech32()}/tokens?${this.buildPaginationParams(pagination)}`;
+        const response: any[] = await this.doGetGeneric(url);
+        const tokens = response.map((item) => FungibleTokenOfAccountOnNetwork.fromHttpResponse(item));
 
         // TODO: Fix sorting
         tokens.sort((a, b) => a.identifier.localeCompare(b.identifier));
@@ -92,9 +92,9 @@ export class ApiNetworkProvider implements INetworkProvider {
     ): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
         pagination = pagination || defaultPagination;
 
-        let url = `accounts/${address.bech32()}/nfts?${this.buildPaginationParams(pagination)}`;
-        let response: any[] = await this.doGetGeneric(url);
-        let tokens = response.map((item) => NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(item));
+        const url = `accounts/${address.bech32()}/nfts?${this.buildPaginationParams(pagination)}`;
+        const response: any[] = await this.doGetGeneric(url);
+        const tokens = response.map((item) => NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(item));
 
         // TODO: Fix sorting
         tokens.sort((a, b) => a.identifier.localeCompare(b.identifier));
@@ -105,8 +105,8 @@ export class ApiNetworkProvider implements INetworkProvider {
         address: IAddress,
         tokenIdentifier: string,
     ): Promise<FungibleTokenOfAccountOnNetwork> {
-        let response = await this.doGetGeneric(`accounts/${address.bech32()}/tokens/${tokenIdentifier}`);
-        let tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response);
+        const response = await this.doGetGeneric(`accounts/${address.bech32()}/tokens/${tokenIdentifier}`);
+        const tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response);
         return tokenData;
     }
 
@@ -115,9 +115,9 @@ export class ApiNetworkProvider implements INetworkProvider {
         collection: string,
         nonce: number,
     ): Promise<NonFungibleTokenOfAccountOnNetwork> {
-        let nonceAsHex = new Nonce(nonce).hex();
-        let response = await this.doGetGeneric(`accounts/${address.bech32()}/nfts/${collection}-${nonceAsHex}`);
-        let tokenData = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response);
+        const nonceAsHex = new Nonce(nonce).hex();
+        const response = await this.doGetGeneric(`accounts/${address.bech32()}/nfts/${collection}-${nonceAsHex}`);
+        const tokenData = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response);
         return tokenData;
     }
 
@@ -127,20 +127,20 @@ export class ApiNetworkProvider implements INetworkProvider {
             url = `${url}?from=${pagination.from}&size=${pagination.size}`;
         }
 
-        let response: any[] = await this.doGetGeneric(url);
+        const response: any[] = await this.doGetGeneric(url);
 
         return response.map((item) => PairOnNetwork.fromApiHttpResponse(item));
     }
 
     async getTransaction(txHash: string): Promise<TransactionOnNetwork> {
-        let response = await this.doGetGeneric(`transactions/${txHash}`);
-        let transaction = TransactionOnNetwork.fromApiHttpResponse(txHash, response);
+        const response = await this.doGetGeneric(`transactions/${txHash}`);
+        const transaction = TransactionOnNetwork.fromApiHttpResponse(txHash, response);
         return transaction;
     }
 
     async getTransactionStatus(txHash: string): Promise<TransactionStatus> {
-        let response = await this.doGetGeneric(`transactions/${txHash}?fields=status`);
-        let status = new TransactionStatus(response.status);
+        const response = await this.doGetGeneric(`transactions/${txHash}?fields=status`);
+        const status = new TransactionStatus(response.status);
         return status;
     }
 
@@ -160,8 +160,8 @@ export class ApiNetworkProvider implements INetworkProvider {
 
     async queryContract(query: IContractQuery): Promise<ContractQueryResponse> {
         try {
-            let request = new ContractQueryRequest(query).toHttpRequest();
-            let response = await this.doPostGeneric("query", request);
+            const request = new ContractQueryRequest(query).toHttpRequest();
+            const response = await this.doPostGeneric("query", request);
             return ContractQueryResponse.fromHttpResponse(response);
         } catch (error: any) {
             throw new ErrContractQuery(error);
@@ -169,31 +169,31 @@ export class ApiNetworkProvider implements INetworkProvider {
     }
 
     async getDefinitionOfFungibleToken(tokenIdentifier: string): Promise<DefinitionOfFungibleTokenOnNetwork> {
-        let response = await this.doGetGeneric(`tokens/${tokenIdentifier}`);
-        let definition = DefinitionOfFungibleTokenOnNetwork.fromApiHttpResponse(response);
+        const response = await this.doGetGeneric(`tokens/${tokenIdentifier}`);
+        const definition = DefinitionOfFungibleTokenOnNetwork.fromApiHttpResponse(response);
         return definition;
     }
 
     async getDefinitionOfTokenCollection(collection: string): Promise<DefinitionOfTokenCollectionOnNetwork> {
-        let response = await this.doGetGeneric(`collections/${collection}`);
-        let definition = DefinitionOfTokenCollectionOnNetwork.fromApiHttpResponse(response);
+        const response = await this.doGetGeneric(`collections/${collection}`);
+        const definition = DefinitionOfTokenCollectionOnNetwork.fromApiHttpResponse(response);
         return definition;
     }
 
     async getNonFungibleToken(collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork> {
-        let nonceAsHex = new Nonce(nonce).hex();
-        let response = await this.doGetGeneric(`nfts/${collection}-${nonceAsHex}`);
-        let token = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response);
+        const nonceAsHex = new Nonce(nonce).hex();
+        const response = await this.doGetGeneric(`nfts/${collection}-${nonceAsHex}`);
+        const token = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response);
         return token;
     }
 
     async doGetGeneric(resourceUrl: string): Promise<any> {
-        let response = await this.doGet(resourceUrl);
+        const response = await this.doGet(resourceUrl);
         return response;
     }
 
     async doPostGeneric(resourceUrl: string, payload: any): Promise<any> {
-        let response = await this.doPost(resourceUrl, payload);
+        const response = await this.doPost(resourceUrl, payload);
         return response;
     }
 
@@ -202,10 +202,10 @@ export class ApiNetworkProvider implements INetworkProvider {
     }
 
     private async doGet(resourceUrl: string): Promise<any> {
-        let url = `${this.url}/${resourceUrl}`;
+        const url = `${this.url}/${resourceUrl}`;
 
         try {
-            let response = await axios.get(url, this.config);
+            const response = await axios.get(url, this.config);
             return response.data;
         } catch (error) {
             this.handleApiError(error, resourceUrl);
@@ -213,17 +213,17 @@ export class ApiNetworkProvider implements INetworkProvider {
     }
 
     private async doPost(resourceUrl: string, payload: any): Promise<any> {
-        let url = `${this.url}/${resourceUrl}`;
+        const url = `${this.url}/${resourceUrl}`;
 
         try {
-            let response = await axios.post(url, payload, {
+            const response = await axios.post(url, payload, {
                 ...this.config,
                 headers: {
                     "Content-Type": "application/json",
                     ...this.config.headers,
                 },
             });
-            let responsePayload = response.data;
+            const responsePayload = response.data;
             return responsePayload;
         } catch (error) {
             this.handleApiError(error, resourceUrl);
diff --git a/src/networkProviders/proxyNetworkProvider.ts b/src/networkProviders/proxyNetworkProvider.ts
index 5d06b5173..4a70cf14b 100644
--- a/src/networkProviders/proxyNetworkProvider.ts
+++ b/src/networkProviders/proxyNetworkProvider.ts
@@ -30,14 +30,14 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     async getNetworkConfig(): Promise<NetworkConfig> {
-        let response = await this.doGetGeneric("network/config");
-        let networkConfig = NetworkConfig.fromHttpResponse(response.config);
+        const response = await this.doGetGeneric("network/config");
+        const networkConfig = NetworkConfig.fromHttpResponse(response.config);
         return networkConfig;
     }
 
     async getNetworkStatus(): Promise<NetworkStatus> {
-        let response = await this.doGetGeneric("network/status/4294967295");
-        let networkStatus = NetworkStatus.fromHttpResponse(response.status);
+        const response = await this.doGetGeneric("network/status/4294967295");
+        const networkStatus = NetworkStatus.fromHttpResponse(response.status);
         return networkStatus;
     }
 
@@ -54,8 +54,8 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     async getAccount(address: IAddress): Promise<AccountOnNetwork> {
-        let response = await this.doGetGeneric(`address/${address.bech32()}`);
-        let account = AccountOnNetwork.fromHttpResponse(response.account);
+        const response = await this.doGetGeneric(`address/${address.bech32()}`);
+        const account = AccountOnNetwork.fromHttpResponse(response.account);
         return account;
     }
 
@@ -69,12 +69,12 @@ export class ProxyNetworkProvider implements INetworkProvider {
         address: IAddress,
         _pagination?: IPagination,
     ): Promise<FungibleTokenOfAccountOnNetwork[]> {
-        let url = `address/${address.bech32()}/esdt`;
-        let response = await this.doGetGeneric(url);
-        let responseItems: any[] = Object.values(response.esdts);
+        const url = `address/${address.bech32()}/esdt`;
+        const response = await this.doGetGeneric(url);
+        const responseItems: any[] = Object.values(response.esdts);
         // Skip NFTs / SFTs.
-        let responseItemsFiltered = responseItems.filter((item) => !item.nonce);
-        let tokens = responseItemsFiltered.map((item) => FungibleTokenOfAccountOnNetwork.fromHttpResponse(item));
+        const responseItemsFiltered = responseItems.filter((item) => !item.nonce);
+        const tokens = responseItemsFiltered.map((item) => FungibleTokenOfAccountOnNetwork.fromHttpResponse(item));
 
         // TODO: Fix sorting
         tokens.sort((a, b) => a.identifier.localeCompare(b.identifier));
@@ -85,12 +85,12 @@ export class ProxyNetworkProvider implements INetworkProvider {
         address: IAddress,
         _pagination?: IPagination,
     ): Promise<NonFungibleTokenOfAccountOnNetwork[]> {
-        let url = `address/${address.bech32()}/esdt`;
-        let response = await this.doGetGeneric(url);
-        let responseItems: any[] = Object.values(response.esdts);
+        const url = `address/${address.bech32()}/esdt`;
+        const response = await this.doGetGeneric(url);
+        const responseItems: any[] = Object.values(response.esdts);
         // Skip fungible tokens.
-        let responseItemsFiltered = responseItems.filter((item) => item.nonce >= 0);
-        let tokens = responseItemsFiltered.map((item) =>
+        const responseItemsFiltered = responseItems.filter((item) => item.nonce >= 0);
+        const tokens = responseItemsFiltered.map((item) =>
             NonFungibleTokenOfAccountOnNetwork.fromProxyHttpResponse(item),
         );
 
@@ -103,8 +103,8 @@ export class ProxyNetworkProvider implements INetworkProvider {
         address: IAddress,
         tokenIdentifier: string,
     ): Promise<FungibleTokenOfAccountOnNetwork> {
-        let response = await this.doGetGeneric(`address/${address.bech32()}/esdt/${tokenIdentifier}`);
-        let tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response.tokenData);
+        const response = await this.doGetGeneric(`address/${address.bech32()}/esdt/${tokenIdentifier}`);
+        const tokenData = FungibleTokenOfAccountOnNetwork.fromHttpResponse(response.tokenData);
         return tokenData;
     }
 
@@ -113,10 +113,10 @@ export class ProxyNetworkProvider implements INetworkProvider {
         collection: string,
         nonce: number,
     ): Promise<NonFungibleTokenOfAccountOnNetwork> {
-        let response = await this.doGetGeneric(
+        const response = await this.doGetGeneric(
             `address/${address.bech32()}/nft/${collection}/nonce/${nonce.valueOf()}`,
         );
-        let tokenData = NonFungibleTokenOfAccountOnNetwork.fromProxyHttpResponseByNonce(response.tokenData);
+        const tokenData = NonFungibleTokenOfAccountOnNetwork.fromProxyHttpResponseByNonce(response.tokenData);
         return tokenData;
     }
 
@@ -127,8 +127,8 @@ export class ProxyNetworkProvider implements INetworkProvider {
             processStatusPromise = this.getTransactionStatus(txHash);
         }
 
-        let url = this.buildUrlWithQueryParameters(`transaction/${txHash}`, { withResults: "true" });
-        let response = await this.doGetGeneric(url);
+        const url = this.buildUrlWithQueryParameters(`transaction/${txHash}`, { withResults: "true" });
+        const response = await this.doGetGeneric(url);
 
         if (processStatusPromise) {
             const processStatus = await processStatusPromise;
@@ -138,8 +138,8 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     async getTransactionStatus(txHash: string): Promise<TransactionStatus> {
-        let response = await this.doGetGeneric(`transaction/${txHash}/process-status`);
-        let status = new TransactionStatus(response.status);
+        const response = await this.doGetGeneric(`transaction/${txHash}/process-status`);
+        const status = new TransactionStatus(response.status);
         return status;
     }
 
@@ -170,8 +170,8 @@ export class ProxyNetworkProvider implements INetworkProvider {
 
     async queryContract(query: IContractQuery): Promise<ContractQueryResponse> {
         try {
-            let request = new ContractQueryRequest(query).toHttpRequest();
-            let response = await this.doPostGeneric("vm-values/query", request);
+            const request = new ContractQueryRequest(query).toHttpRequest();
+            const response = await this.doPostGeneric("vm-values/query", request);
             return ContractQueryResponse.fromHttpResponse(response.data);
         } catch (error: any) {
             throw new ErrContractQuery(error);
@@ -179,8 +179,8 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     async getDefinitionOfFungibleToken(tokenIdentifier: string): Promise<DefinitionOfFungibleTokenOnNetwork> {
-        let properties = await this.getTokenProperties(tokenIdentifier);
-        let definition = DefinitionOfFungibleTokenOnNetwork.fromResponseOfGetTokenProperties(
+        const properties = await this.getTokenProperties(tokenIdentifier);
+        const definition = DefinitionOfFungibleTokenOnNetwork.fromResponseOfGetTokenProperties(
             tokenIdentifier,
             properties,
         );
@@ -188,21 +188,24 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     private async getTokenProperties(identifier: string): Promise<Buffer[]> {
-        let encodedIdentifier = Buffer.from(identifier).toString("hex");
+        const encodedIdentifier = Buffer.from(identifier).toString("hex");
 
-        let queryResponse = await this.queryContract({
+        const queryResponse = await this.queryContract({
             address: EsdtContractAddress,
             func: "getTokenProperties",
             getEncodedArguments: () => [encodedIdentifier],
         });
 
-        let properties = queryResponse.getReturnDataParts();
+        const properties = queryResponse.getReturnDataParts();
         return properties;
     }
 
     async getDefinitionOfTokenCollection(collection: string): Promise<DefinitionOfTokenCollectionOnNetwork> {
-        let properties = await this.getTokenProperties(collection);
-        let definition = DefinitionOfTokenCollectionOnNetwork.fromResponseOfGetTokenProperties(collection, properties);
+        const properties = await this.getTokenProperties(collection);
+        const definition = DefinitionOfTokenCollectionOnNetwork.fromResponseOfGetTokenProperties(
+            collection,
+            properties,
+        );
         return definition;
     }
 
@@ -211,21 +214,21 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     async doGetGeneric(resourceUrl: string): Promise<any> {
-        let response = await this.doGet(resourceUrl);
+        const response = await this.doGet(resourceUrl);
         return response;
     }
 
     async doPostGeneric(resourceUrl: string, payload: any): Promise<any> {
-        let response = await this.doPost(resourceUrl, payload);
+        const response = await this.doPost(resourceUrl, payload);
         return response;
     }
 
     private async doGet(resourceUrl: string): Promise<any> {
-        let url = `${this.url}/${resourceUrl}`;
+        const url = `${this.url}/${resourceUrl}`;
 
         try {
-            let response = await axios.get(url, this.config);
-            let payload = response.data.data;
+            const response = await axios.get(url, this.config);
+            const payload = response.data.data;
             return payload;
         } catch (error) {
             this.handleApiError(error, resourceUrl);
@@ -233,17 +236,17 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     private async doPost(resourceUrl: string, payload: any): Promise<any> {
-        let url = `${this.url}/${resourceUrl}`;
+        const url = `${this.url}/${resourceUrl}`;
 
         try {
-            let response = await axios.post(url, payload, {
+            const response = await axios.post(url, payload, {
                 ...this.config,
                 headers: {
                     "Content-Type": "application/json",
                     ...this.config.headers,
                 },
             });
-            let responsePayload = response.data.data;
+            const responsePayload = response.data.data;
             return responsePayload;
         } catch (error) {
             this.handleApiError(error, resourceUrl);
@@ -251,7 +254,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     private buildUrlWithQueryParameters(endpoint: string, params: Record<string, string>): string {
-        let searchParams = new URLSearchParams();
+        const searchParams = new URLSearchParams();
 
         for (let [key, value] of Object.entries(params)) {
             if (value) {
diff --git a/src/wallet/pem.ts b/src/wallet/pem.ts
index 47a839a1f..b60119699 100644
--- a/src/wallet/pem.ts
+++ b/src/wallet/pem.ts
@@ -3,42 +3,42 @@ import { USER_PUBKEY_LENGTH, USER_SEED_LENGTH, UserSecretKey } from "./userKeys"
 import { VALIDATOR_SECRETKEY_LENGTH, ValidatorSecretKey } from "./validatorKeys";
 
 export function parseUserKey(text: string, index: number = 0): UserSecretKey {
-    let keys = parseUserKeys(text);
+    const keys = parseUserKeys(text);
     return keys[index];
 }
 
 export function parseUserKeys(text: string): UserSecretKey[] {
     // The user PEM files encode both the seed and the pubkey in their payloads.
-    let buffers = parse(text, USER_SEED_LENGTH + USER_PUBKEY_LENGTH);
+    const buffers = parse(text, USER_SEED_LENGTH + USER_PUBKEY_LENGTH);
     return buffers.map((buffer) => new UserSecretKey(buffer.slice(0, USER_SEED_LENGTH)));
 }
 
 export function parseValidatorKey(text: string, index: number = 0): ValidatorSecretKey {
-    let keys = parseValidatorKeys(text);
+    const keys = parseValidatorKeys(text);
     return keys[index];
 }
 
 export function parseValidatorKeys(text: string): ValidatorSecretKey[] {
-    let buffers = parse(text, VALIDATOR_SECRETKEY_LENGTH);
+    const buffers = parse(text, VALIDATOR_SECRETKEY_LENGTH);
     return buffers.map((buffer) => new ValidatorSecretKey(buffer));
 }
 
 export function parse(text: string, expectedLength: number): Buffer[] {
     // Split by newlines, trim whitespace, then discard remaining empty lines.
-    let lines = text
+    const lines = text
         .split(/\r?\n/)
         .map((line) => line.trim())
         .filter((line) => line.length > 0);
-    let buffers: Buffer[] = [];
+    const buffers: Buffer[] = [];
     let linesAccumulator: string[] = [];
 
     for (const line of lines) {
         if (line.startsWith("-----BEGIN")) {
             linesAccumulator = [];
         } else if (line.startsWith("-----END")) {
-            let asBase64 = linesAccumulator.join("");
-            let asHex = Buffer.from(asBase64, "base64").toString();
-            let asBytes = Buffer.from(asHex, "hex");
+            const asBase64 = linesAccumulator.join("");
+            const asHex = Buffer.from(asBase64, "base64").toString();
+            const asBytes = Buffer.from(asHex, "hex");
 
             if (asBytes.length != expectedLength) {
                 throw new ErrBadPEM(`incorrect key length: expected ${expectedLength}, found ${asBytes.length}`);

From e0c7db1159bb58019e9fea47cc7a7b432c4a7198 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 10 Oct 2024 16:32:31 +0300
Subject: [PATCH 296/338] Remove primitives file

---
 src/networkProviders/accounts.ts              |  6 +-
 src/networkProviders/apiNetworkProvider.ts    |  6 +-
 src/networkProviders/constants.ts             |  6 +-
 src/networkProviders/contractResults.ts       | 10 +--
 src/networkProviders/pairs.ts                 |  6 +-
 src/networkProviders/primitives.spec.ts       | 17 -----
 src/networkProviders/primitives.ts            | 66 -------------------
 .../providers.dev.net.spec.ts                 |  4 +-
 src/networkProviders/tokenDefinitions.ts      | 19 +++---
 src/networkProviders/tokens.ts                |  7 +-
 src/networkProviders/transactionEvents.ts     | 18 ++---
 src/networkProviders/transactionLogs.ts       |  4 +-
 src/networkProviders/transactionReceipt.ts    | 12 ++--
 src/networkProviders/transactions.ts          | 33 ++++++----
 src/testutils/dummyQuery.ts                   |  4 +-
 src/tokenTransferBuilders.ts                  |  4 +-
 16 files changed, 77 insertions(+), 145 deletions(-)
 delete mode 100644 src/networkProviders/primitives.spec.ts
 delete mode 100644 src/networkProviders/primitives.ts

diff --git a/src/networkProviders/accounts.ts b/src/networkProviders/accounts.ts
index 7c2a29dc0..cee89aea6 100644
--- a/src/networkProviders/accounts.ts
+++ b/src/networkProviders/accounts.ts
@@ -1,12 +1,12 @@
 import BigNumber from "bignumber.js";
+import { Address } from "../address";
 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("");
+    address: IAddress = Address.empty();
     nonce: number = 0;
     balance: BigNumber = new BigNumber(0);
     code: string = "";
@@ -65,7 +65,7 @@ export class GuardianData {
 
 class Guardian {
     activationEpoch: number = 0;
-    address: IAddress = new Address("");
+    address: IAddress = Address.empty();
     serviceUID: string = "";
 
     static fromHttpResponse(responsePart: any): Guardian {
diff --git a/src/networkProviders/apiNetworkProvider.ts b/src/networkProviders/apiNetworkProvider.ts
index 0b777c35c..985a4b50e 100644
--- a/src/networkProviders/apiNetworkProvider.ts
+++ b/src/networkProviders/apiNetworkProvider.ts
@@ -1,5 +1,6 @@
 import axios from "axios";
 import { ErrContractQuery, ErrNetworkProvider } from "../errors";
+import { numberToPaddedHex } from "../utils.codec";
 import { AccountOnNetwork, GuardianData } from "./accounts";
 import { defaultAxiosConfig, defaultPagination } from "./config";
 import { BaseUserAgent } from "./constants";
@@ -12,7 +13,6 @@ import { NetworkProviderConfig } from "./networkProviderConfig";
 import { NetworkStake } from "./networkStake";
 import { NetworkStatus } from "./networkStatus";
 import { PairOnNetwork } from "./pairs";
-import { Nonce } from "./primitives";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
@@ -115,7 +115,7 @@ export class ApiNetworkProvider implements INetworkProvider {
         collection: string,
         nonce: number,
     ): Promise<NonFungibleTokenOfAccountOnNetwork> {
-        const nonceAsHex = new Nonce(nonce).hex();
+        const nonceAsHex = numberToPaddedHex(nonce);
         const response = await this.doGetGeneric(`accounts/${address.bech32()}/nfts/${collection}-${nonceAsHex}`);
         const tokenData = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response);
         return tokenData;
@@ -181,7 +181,7 @@ export class ApiNetworkProvider implements INetworkProvider {
     }
 
     async getNonFungibleToken(collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork> {
-        const nonceAsHex = new Nonce(nonce).hex();
+        const nonceAsHex = numberToPaddedHex(nonce);
         const response = await this.doGetGeneric(`nfts/${collection}-${nonceAsHex}`);
         const token = NonFungibleTokenOfAccountOnNetwork.fromApiHttpResponse(response);
         return token;
diff --git a/src/networkProviders/constants.ts b/src/networkProviders/constants.ts
index ea134f203..d85d175b4 100644
--- a/src/networkProviders/constants.ts
+++ b/src/networkProviders/constants.ts
@@ -1,7 +1,7 @@
 import BigNumber from "bignumber.js";
-import { Address } from "./primitives";
+import { Address } from "../address";
 
 export const MaxUint64AsBigNumber = new BigNumber("18446744073709551615");
 export const EsdtContractAddress = new Address("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u");
-export const BaseUserAgent = "multiversx-sdk"
-export const UnknownClientName = "unknown"
+export const BaseUserAgent = "multiversx-sdk";
+export const UnknownClientName = "unknown";
diff --git a/src/networkProviders/contractResults.ts b/src/networkProviders/contractResults.ts
index 37046fb0d..a7f2a3674 100644
--- a/src/networkProviders/contractResults.ts
+++ b/src/networkProviders/contractResults.ts
@@ -1,6 +1,6 @@
+import { Address } from "../address";
 import { IAddress } from "./interface";
 import { TransactionLogs } from "./transactionLogs";
-import { Address } from "./primitives";
 
 export class ContractResults {
     readonly items: ContractResultItem[];
@@ -14,12 +14,12 @@ export class ContractResults {
     }
 
     static fromProxyHttpResponse(results: any[]): ContractResults {
-        let items = results.map(item => ContractResultItem.fromProxyHttpResponse(item));
+        let items = results.map((item) => ContractResultItem.fromProxyHttpResponse(item));
         return new ContractResults(items);
     }
 
     static fromApiHttpResponse(results: any[]): ContractResults {
-        let items = results.map(item => ContractResultItem.fromApiHttpResponse(item));
+        let items = results.map((item) => ContractResultItem.fromApiHttpResponse(item));
         return new ContractResults(items);
     }
 }
@@ -28,8 +28,8 @@ export class ContractResultItem {
     hash: string = "";
     nonce: number = 0;
     value: string = "";
-    receiver: IAddress = new Address("");
-    sender: IAddress = new Address("");
+    receiver: IAddress = Address.empty();
+    sender: IAddress = Address.empty();
     data: string = "";
     previousHash: string = "";
     originalHash: string = "";
diff --git a/src/networkProviders/pairs.ts b/src/networkProviders/pairs.ts
index 723c25b7b..31a92bf12 100644
--- a/src/networkProviders/pairs.ts
+++ b/src/networkProviders/pairs.ts
@@ -1,9 +1,9 @@
-import {Address} from "./primitives";
-import {IAddress} from "./interface";
 import BigNumber from "bignumber.js";
+import { Address } from "../address";
+import { IAddress } from "./interface";
 
 export class PairOnNetwork {
-    address: IAddress = new Address("");
+    address: IAddress = Address.empty();
     id: string = "";
     symbol: string = "";
     name: string = "";
diff --git a/src/networkProviders/primitives.spec.ts b/src/networkProviders/primitives.spec.ts
deleted file mode 100644
index 202a9dfee..000000000
--- a/src/networkProviders/primitives.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { assert } from "chai";
-import { Address } from "./primitives";
-
-describe("test primitives", function () {
-    it("should create address from bech32 and from pubkey", async function () {
-        let aliceBech32 = "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th";
-        let bobBech32 = "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx";
-        let alicePubkey = Buffer.from("0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1", "hex");
-        let bobPubkey = Buffer.from("8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8", "hex");
-
-        assert.equal(new Address(aliceBech32).bech32(), Address.fromPubkey(alicePubkey).bech32());
-        assert.equal(new Address(bobBech32).bech32(), Address.fromPubkey(bobPubkey).bech32());
-        assert.equal(new Address(aliceBech32).toString(), aliceBech32);
-        assert.equal(new Address(bobBech32).toString(), bobBech32);
-    });
-});
-
diff --git a/src/networkProviders/primitives.ts b/src/networkProviders/primitives.ts
deleted file mode 100644
index ed50b4efa..000000000
--- a/src/networkProviders/primitives.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import * as bech32 from "bech32";
-import { IAddress } from "./interface";
-
-/**
- * The human-readable-part of the bech32 addresses.
- */
-const HRP = "erd";
-
-export class Address implements IAddress {
-    private readonly value: string;
-
-    constructor(value: string) {
-        this.value = value;
-    }
-
-    static fromPubkey(pubkey: Buffer): IAddress {
-        let words = bech32.toWords(pubkey);
-        let address = bech32.encode(HRP, words);
-        return new Address(address);
-    }
-
-    bech32(): string {
-        return this.value;
-    }
-
-    toString() {
-        return this.bech32();
-    }
-}
-
-export class Nonce {
-    private readonly value: number;
-
-    constructor(value: number) {
-        this.value = value;
-    }
-
-    valueOf(): number {
-        return this.value;
-    }
-
-    hex(): string {
-        return numberToPaddedHex(this.value);
-    }
-}
-
-export function numberToPaddedHex(value: number) {
-    let hex = value.toString(16);
-    return zeroPadStringIfOddLength(hex);
-}
-
-export function isPaddedHex(input: string) {
-    input = input || "";
-    let decodedThenEncoded = Buffer.from(input, "hex").toString("hex");
-    return input.toUpperCase() == decodedThenEncoded.toUpperCase();
-}
-
-export function zeroPadStringIfOddLength(input: string): string {
-    input = input || "";
-
-    if (input.length % 2 == 1) {
-        return "0" + input;
-    }
-
-    return input;
-}
diff --git a/src/networkProviders/providers.dev.net.spec.ts b/src/networkProviders/providers.dev.net.spec.ts
index 354cc67ae..d08e5b4f7 100644
--- a/src/networkProviders/providers.dev.net.spec.ts
+++ b/src/networkProviders/providers.dev.net.spec.ts
@@ -1,13 +1,13 @@
 import { AxiosHeaders } from "axios";
 import { assert } from "chai";
+import { Address } from "../address";
+import { MockQuery } from "../testutils/dummyQuery";
 import { ApiNetworkProvider } from "./apiNetworkProvider";
 import { INetworkProvider, ITransactionNext } from "./interface";
-import { Address } from "./primitives";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionEventData } from "./transactionEvents";
 import { TransactionOnNetwork } from "./transactions";
-import { MockQuery } from "../testutils/dummyQuery";
 
 describe("test network providers on devnet: Proxy and API", function () {
     let alice = new Address("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
diff --git a/src/networkProviders/tokenDefinitions.ts b/src/networkProviders/tokenDefinitions.ts
index 63bfa523d..fbaccf2ac 100644
--- a/src/networkProviders/tokenDefinitions.ts
+++ b/src/networkProviders/tokenDefinitions.ts
@@ -1,12 +1,12 @@
 import BigNumber from "bignumber.js";
+import { Address } from "../address";
 import { IAddress } from "./interface";
-import { Address } from "./primitives";
 
 export class DefinitionOfFungibleTokenOnNetwork {
     identifier: string = "";
     name: string = "";
     ticker: string = "";
-    owner: IAddress = new Address("");
+    owner: IAddress = Address.empty();
     decimals: number = 0;
     supply: BigNumber = new BigNumber(0);
     isPaused: boolean = false;
@@ -55,7 +55,7 @@ export class DefinitionOfFungibleTokenOnNetwork {
         result.identifier = identifier;
         result.name = tokenName.toString();
         result.ticker = identifier;
-        result.owner = Address.fromPubkey(owner);
+        result.owner = new Address(owner);
         result.decimals = properties.NumDecimals.toNumber();
         result.supply = new BigNumber(supply.toString()).shiftedBy(-result.decimals);
         result.isPaused = properties.IsPaused;
@@ -76,7 +76,7 @@ export class DefinitionOfTokenCollectionOnNetwork {
     type: string = "";
     name: string = "";
     ticker: string = "";
-    owner: IAddress = new Address("");
+    owner: IAddress = Address.empty();
     decimals: number = 0;
     canPause: boolean = false;
     canFreeze: boolean = false;
@@ -120,7 +120,7 @@ export class DefinitionOfTokenCollectionOnNetwork {
         result.type = tokenType.toString();
         result.name = tokenName.toString();
         result.ticker = collection;
-        result.owner = Address.fromPubkey(owner);
+        result.owner = new Address(owner);
         result.decimals = properties.NumDecimals.toNumber() ?? 0;
         result.canPause = properties.CanPause || false;
         result.canFreeze = properties.CanFreeze || false;
@@ -150,8 +150,11 @@ function parseTokenProperties(propertiesBuffers: Buffer[]): Record<string, any>
 // This only handles booleans and numbers.
 function parseValueOfTokenProperty(value: string): any {
     switch (value) {
-        case "true": return true;
-        case "false": return false;
-        default: return new BigNumber(value);
+        case "true":
+            return true;
+        case "false":
+            return false;
+        default:
+            return new BigNumber(value);
     }
 }
diff --git a/src/networkProviders/tokens.ts b/src/networkProviders/tokens.ts
index 855d2428e..1c838f070 100644
--- a/src/networkProviders/tokens.ts
+++ b/src/networkProviders/tokens.ts
@@ -1,5 +1,6 @@
 import { BigNumber } from "bignumber.js";
-import { Address, Nonce } from "./primitives";
+import { Address } from "../address";
+import { numberToPaddedHex } from "../utils.codec";
 import { IAddress } from "./interface";
 
 export class FungibleTokenOfAccountOnNetwork {
@@ -26,7 +27,7 @@ export class NonFungibleTokenOfAccountOnNetwork {
     nonce: number = 0;
     type: string = "";
     name: string = "";
-    creator: IAddress = new Address("");
+    creator: IAddress = Address.empty();
     supply: BigNumber = new BigNumber(0);
     decimals: number = 0;
     royalties: BigNumber = new BigNumber(0);
@@ -49,7 +50,7 @@ export class NonFungibleTokenOfAccountOnNetwork {
 
     static fromProxyHttpResponseByNonce(payload: any): NonFungibleTokenOfAccountOnNetwork {
         let result = NonFungibleTokenOfAccountOnNetwork.fromHttpResponse(payload);
-        let nonceAsHex = new Nonce(result.nonce).hex();
+        let nonceAsHex = numberToPaddedHex(result.nonce);
 
         result.identifier = `${payload.tokenIdentifier}-${nonceAsHex}`;
         result.collection = payload.tokenIdentifier || "";
diff --git a/src/networkProviders/transactionEvents.ts b/src/networkProviders/transactionEvents.ts
index b37d47abc..ab11c5892 100644
--- a/src/networkProviders/transactionEvents.ts
+++ b/src/networkProviders/transactionEvents.ts
@@ -1,8 +1,8 @@
+import { Address } from "../address";
 import { IAddress } from "./interface";
-import { Address } from "./primitives";
 
 export class TransactionEvent {
-    address: IAddress = new Address("");
+    address: IAddress = Address.empty();
     identifier: string = "";
     topics: TransactionEventTopic[] = [];
 
@@ -18,16 +18,16 @@ export class TransactionEvent {
     }
 
     static fromHttpResponse(responsePart: {
-        address: string,
-        identifier: string,
-        topics: string[],
-        data: string,
-        additionalData?: string[]
+        address: string;
+        identifier: string;
+        topics: string[];
+        data: string;
+        additionalData?: string[];
     }): TransactionEvent {
         let result = new TransactionEvent();
         result.address = new Address(responsePart.address);
         result.identifier = responsePart.identifier || "";
-        result.topics = (responsePart.topics || []).map(topic => new TransactionEventTopic(topic));
+        result.topics = (responsePart.topics || []).map((topic) => new TransactionEventTopic(topic));
 
         result.dataPayload = TransactionEventData.fromBase64(responsePart.data);
         result.additionalData = (responsePart.additionalData || []).map(TransactionEventData.fromBase64);
@@ -37,7 +37,7 @@ export class TransactionEvent {
     }
 
     findFirstOrNoneTopic(predicate: (topic: TransactionEventTopic) => boolean): TransactionEventTopic | undefined {
-        return this.topics.filter(topic => predicate(topic))[0];
+        return this.topics.filter((topic) => predicate(topic))[0];
     }
 
     getLastTopic(): TransactionEventTopic {
diff --git a/src/networkProviders/transactionLogs.ts b/src/networkProviders/transactionLogs.ts
index 36f5d021d..36c10690d 100644
--- a/src/networkProviders/transactionLogs.ts
+++ b/src/networkProviders/transactionLogs.ts
@@ -1,10 +1,10 @@
+import { Address } from "../address";
 import { ErrUnexpectedCondition } from "./../errors";
 import { IAddress } from "./interface";
-import { Address } from "./primitives";
 import { TransactionEvent } from "./transactionEvents";
 
 export class TransactionLogs {
-    address: IAddress = new Address("");
+    address: IAddress = Address.empty();
     events: TransactionEvent[] = [];
 
     constructor(init?: Partial<TransactionLogs>) {
diff --git a/src/networkProviders/transactionReceipt.ts b/src/networkProviders/transactionReceipt.ts
index 07e72fb56..49d14d62e 100644
--- a/src/networkProviders/transactionReceipt.ts
+++ b/src/networkProviders/transactionReceipt.ts
@@ -1,17 +1,17 @@
+import { Address } from "../address";
 import { IAddress } from "./interface";
-import { Address } from "./primitives";
 
 export class TransactionReceipt {
     value: string = "";
-    sender: IAddress = new Address("");
+    sender: IAddress = Address.empty();
     data: string = "";
     hash: string = "";
 
     static fromHttpResponse(response: {
-        value: string,
-        sender: string,
-        data: string,
-        txHash: string
+        value: string;
+        sender: string;
+        data: string;
+        txHash: string;
     }): TransactionReceipt {
         let receipt = new TransactionReceipt();
 
diff --git a/src/networkProviders/transactions.ts b/src/networkProviders/transactions.ts
index beaecc0a8..232691315 100644
--- a/src/networkProviders/transactions.ts
+++ b/src/networkProviders/transactions.ts
@@ -1,12 +1,12 @@
-import { TransactionStatus } from "./transactionStatus";
+import { Address } from "../address";
 import { ContractResults } from "./contractResults";
-import { Address } from "./primitives";
 import { IAddress, ITransaction, ITransactionNext } from "./interface";
 import { TransactionLogs } from "./transactionLogs";
 import { TransactionReceipt } from "./transactionReceipt";
+import { TransactionStatus } from "./transactionStatus";
 
 export function prepareTransactionForBroadcasting(transaction: ITransaction | ITransactionNext): any {
-    if ("toSendable" in transaction){
+    if ("toSendable" in transaction) {
         return transaction.toSendable();
     }
 
@@ -15,8 +15,12 @@ export function prepareTransactionForBroadcasting(transaction: ITransaction | IT
         value: transaction.value.toString(),
         receiver: transaction.receiver,
         sender: transaction.sender,
-        senderUsername: transaction.senderUsername ? Buffer.from(transaction.senderUsername).toString("base64") : undefined,
-        receiverUsername: transaction.receiverUsername ? Buffer.from(transaction.receiverUsername).toString("base64") : undefined,
+        senderUsername: transaction.senderUsername
+            ? Buffer.from(transaction.senderUsername).toString("base64")
+            : undefined,
+        receiverUsername: transaction.receiverUsername
+            ? Buffer.from(transaction.receiverUsername).toString("base64")
+            : undefined,
         gasPrice: Number(transaction.gasPrice),
         gasLimit: Number(transaction.gasLimit),
         data: transaction.data.length === 0 ? undefined : Buffer.from(transaction.data).toString("base64"),
@@ -25,8 +29,11 @@ export function prepareTransactionForBroadcasting(transaction: ITransaction | IT
         options: transaction.options,
         guardian: transaction.guardian || undefined,
         signature: Buffer.from(transaction.signature).toString("hex"),
-        guardianSignature: transaction.guardianSignature.length === 0 ? undefined : Buffer.from(transaction.guardianSignature).toString("hex"),
-    }
+        guardianSignature:
+            transaction.guardianSignature.length === 0
+                ? undefined
+                : Buffer.from(transaction.guardianSignature).toString("hex"),
+    };
 }
 
 export class TransactionOnNetwork {
@@ -37,8 +44,8 @@ export class TransactionOnNetwork {
     round: number = 0;
     epoch: number = 0;
     value: string = "";
-    receiver: IAddress = new Address("");
-    sender: IAddress = new Address("");
+    receiver: IAddress = Address.empty();
+    sender: IAddress = Address.empty();
     gasLimit: number = 0;
     gasPrice: number = 0;
     function: string = "";
@@ -59,13 +66,17 @@ export class TransactionOnNetwork {
         Object.assign(this, init);
     }
 
-    static fromProxyHttpResponse(txHash: string, response: any, processStatus?: TransactionStatus | undefined): TransactionOnNetwork {
+    static fromProxyHttpResponse(
+        txHash: string,
+        response: any,
+        processStatus?: TransactionStatus | undefined,
+    ): TransactionOnNetwork {
         let result = TransactionOnNetwork.fromHttpResponse(txHash, response);
         result.contractResults = ContractResults.fromProxyHttpResponse(response.smartContractResults || []);
 
         if (processStatus) {
             result.status = processStatus;
-            result.isCompleted = result.status.isSuccessful() || result.status.isFailed()
+            result.isCompleted = result.status.isSuccessful() || result.status.isFailed();
         }
 
         return result;
diff --git a/src/testutils/dummyQuery.ts b/src/testutils/dummyQuery.ts
index 525eeaa0c..076369df3 100644
--- a/src/testutils/dummyQuery.ts
+++ b/src/testutils/dummyQuery.ts
@@ -3,8 +3,8 @@ import { IAddress } from "../interface";
 import { IContractQuery } from "../networkProviders/interface";
 
 export class MockQuery implements IContractQuery {
-    caller: IAddress = new Address("");
-    address: IAddress = new Address("");
+    caller: IAddress = Address.empty();
+    address: IAddress = Address.empty();
     func: string = "";
     args: string[] = [];
     value: string = "";
diff --git a/src/tokenTransferBuilders.ts b/src/tokenTransferBuilders.ts
index 7760ca7d9..a557ca363 100644
--- a/src/tokenTransferBuilders.ts
+++ b/src/tokenTransferBuilders.ts
@@ -35,7 +35,7 @@ export class ESDTTransferPayloadBuilder {
  */
 export class ESDTNFTTransferPayloadBuilder {
     payment: ITokenTransfer = TokenTransfer.nonFungible("", 0);
-    destination: IAddress = new Address("");
+    destination: IAddress = Address.empty();
 
     setPayment(payment: ITokenTransfer): ESDTNFTTransferPayloadBuilder {
         this.payment = payment;
@@ -70,7 +70,7 @@ export class ESDTNFTTransferPayloadBuilder {
  */
 export class MultiESDTNFTTransferPayloadBuilder {
     payments: ITokenTransfer[] = [];
-    destination: IAddress = new Address("");
+    destination: IAddress = Address.empty();
 
     setPayments(payments: ITokenTransfer[]): MultiESDTNFTTransferPayloadBuilder {
         this.payments = payments;

From 996a8e5d4e3b01aa909bae1482625dc33ec8118a Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 14 Oct 2024 14:38:16 +0300
Subject: [PATCH 297/338] Make axios and bls optional

---
 package-lock.json           | 46 ++++++++++++++++++++-----------------
 package.json                |  8 ++++---
 src/wallet/validatorKeys.ts |  1 +
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 26f31f194..1d439e3cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,6 @@
       "version": "13.7.0",
       "license": "MIT",
       "dependencies": {
-        "@multiversx/sdk-bls-wasm": "0.3.5",
         "@multiversx/sdk-transaction-decoder": "1.0.2",
         "@noble/ed25519": "1.7.3",
         "@noble/hashes": "1.3.0",
@@ -46,8 +45,11 @@
         "ts-node": "9.1.1",
         "typescript": "4.1.2"
       },
+      "optionalDependencies": {
+        "@multiversx/sdk-bls-wasm": "0.3.5",
+        "axios": "^1.7.4"
+      },
       "peerDependencies": {
-        "axios": "^1.7.4",
         "bignumber.js": "^9.0.1",
         "protobufjs": "^7.2.6"
       }
@@ -160,6 +162,7 @@
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/@multiversx/sdk-bls-wasm/-/sdk-bls-wasm-0.3.5.tgz",
       "integrity": "sha512-c0tIdQUnbBLSt6NYU+OpeGPYdL0+GV547HeHT8Xc0BKQ7Cj0v82QUoA2QRtWrR1G4MNZmLsIacZSsf6DrIS2Bw==",
+      "optional": true,
       "engines": {
         "node": ">=8.9.0"
       }
@@ -868,7 +871,7 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "peer": true
+      "optional": true
     },
     "node_modules/available-typed-arrays": {
       "version": "1.0.5",
@@ -886,7 +889,7 @@
       "version": "1.7.4",
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
       "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
-      "peer": true,
+      "optional": true,
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -1406,7 +1409,7 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "peer": true,
+      "optional": true,
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -1624,7 +1627,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "peer": true,
+      "optional": true,
       "engines": {
         "node": ">=0.4.0"
       }
@@ -2402,7 +2405,7 @@
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
-      "peer": true,
+      "optional": true,
       "engines": {
         "node": ">=4.0"
       },
@@ -2425,7 +2428,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
       "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "peer": true,
+      "optional": true,
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -3432,7 +3435,7 @@
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "peer": true,
+      "optional": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -3441,7 +3444,7 @@
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "peer": true,
+      "optional": true,
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -4195,7 +4198,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "peer": true
+      "optional": true
     },
     "node_modules/public-encrypt": {
       "version": "4.0.3",
@@ -5281,7 +5284,8 @@
     "@multiversx/sdk-bls-wasm": {
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/@multiversx/sdk-bls-wasm/-/sdk-bls-wasm-0.3.5.tgz",
-      "integrity": "sha512-c0tIdQUnbBLSt6NYU+OpeGPYdL0+GV547HeHT8Xc0BKQ7Cj0v82QUoA2QRtWrR1G4MNZmLsIacZSsf6DrIS2Bw=="
+      "integrity": "sha512-c0tIdQUnbBLSt6NYU+OpeGPYdL0+GV547HeHT8Xc0BKQ7Cj0v82QUoA2QRtWrR1G4MNZmLsIacZSsf6DrIS2Bw==",
+      "optional": true
     },
     "@multiversx/sdk-transaction-decoder": {
       "version": "1.0.2",
@@ -5814,7 +5818,7 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "peer": true
+      "optional": true
     },
     "available-typed-arrays": {
       "version": "1.0.5",
@@ -5826,7 +5830,7 @@
       "version": "1.7.4",
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
       "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
-      "peer": true,
+      "optional": true,
       "requires": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -6268,7 +6272,7 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "peer": true,
+      "optional": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
@@ -6450,7 +6454,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "peer": true
+      "optional": true
     },
     "deps-sort": {
       "version": "2.0.1",
@@ -7045,7 +7049,7 @@
       "version": "1.15.6",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
       "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
-      "peer": true
+      "optional": true
     },
     "for-each": {
       "version": "0.3.3",
@@ -7060,7 +7064,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
       "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "peer": true,
+      "optional": true,
       "requires": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -7823,13 +7827,13 @@
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "peer": true
+      "optional": true
     },
     "mime-types": {
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "peer": true,
+      "optional": true,
       "requires": {
         "mime-db": "1.52.0"
       }
@@ -8391,7 +8395,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "peer": true
+      "optional": true
     },
     "public-encrypt": {
       "version": "4.0.3",
diff --git a/package.json b/package.json
index 4a5358470..0ea7fe47a 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,6 @@
   },
   "dependencies": {
     "@multiversx/sdk-transaction-decoder": "1.0.2",
-    "@multiversx/sdk-bls-wasm": "0.3.5",
     "json-bigint": "1.0.0",
     "bech32": "1.1.4",
     "bip39": "3.1.0",
@@ -75,7 +74,10 @@
   },
   "peerDependencies": {
     "bignumber.js": "^9.0.1",
-    "protobufjs": "^7.2.6",
-    "axios": "^1.7.4"
+    "protobufjs": "^7.2.6"
+  },
+  "optionalDependencies": {
+    "axios": "^1.7.4",
+    "@multiversx/sdk-bls-wasm": "0.3.5"
   }
 }
diff --git a/src/wallet/validatorKeys.ts b/src/wallet/validatorKeys.ts
index d91bc315a..3a7928fad 100644
--- a/src/wallet/validatorKeys.ts
+++ b/src/wallet/validatorKeys.ts
@@ -2,6 +2,7 @@ import { ErrInvariantFailed } from "../errors";
 import { guardLength } from "./assertions";
 import { parseValidatorKey } from "./pem";
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const bls = require("@multiversx/sdk-bls-wasm");
 
 export const VALIDATOR_SECRETKEY_LENGTH = 32;

From 6f260e4054a09c8fdd67b032815a540da31059af Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 14 Oct 2024 16:11:13 +0300
Subject: [PATCH 298/338] Add axios and bls handling in case not install

---
 README.md                                    | 18 ++++++++++++++++++
 src/networkProviders/apiNetworkProvider.ts   |  9 ++++++---
 src/networkProviders/proxyNetworkProvider.ts |  8 +++++---
 src/testutils/utils.ts                       | 16 +++++++++-------
 src/testutils/wallets.ts                     |  5 +++--
 src/utils.ts                                 | 10 ++++++++++
 src/wallet/validatorKeys.ts                  | 20 ++++++++++++++------
 7 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index d27116ece..a0212ab04 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,24 @@ npm install --global browserify
 npm install esmify --no-save
 ```
 
+## Optional Dependencies
+
+### axios
+
+This package can make HTTP requests using `axios`, but it is not bundled by default. If you plan to use the API network provider or Proxy network provider, make sure to install `axios`:
+
+```bash
+npm install axios
+```
+
+### @multiversx/sdk-bls-wasm
+
+This package requires `@multiversx/sdk-bls-wasm` for BLS (Boneh-Lynn-Shacham) cryptographic functions, but it is not bundled by default. If you plan to use BLS functionality, make sure to install this optional dependency:
+
+```bash
+npm install @multiversx/sdk-bls-wasm
+```
+
 ### Building the library
 
 In order to compile the library, run the following:
diff --git a/src/networkProviders/apiNetworkProvider.ts b/src/networkProviders/apiNetworkProvider.ts
index 985a4b50e..eae0bc976 100644
--- a/src/networkProviders/apiNetworkProvider.ts
+++ b/src/networkProviders/apiNetworkProvider.ts
@@ -1,5 +1,5 @@
-import axios from "axios";
 import { ErrContractQuery, ErrNetworkProvider } from "../errors";
+import { getAxios } from "../utils";
 import { numberToPaddedHex } from "../utils.codec";
 import { AccountOnNetwork, GuardianData } from "./accounts";
 import { defaultAxiosConfig, defaultPagination } from "./config";
@@ -202,10 +202,12 @@ export class ApiNetworkProvider implements INetworkProvider {
     }
 
     private async doGet(resourceUrl: string): Promise<any> {
+        let axios = await getAxios();
+
         const url = `${this.url}/${resourceUrl}`;
 
         try {
-            const response = await axios.get(url, this.config);
+            const response = await axios.default.get(url, this.config);
             return response.data;
         } catch (error) {
             this.handleApiError(error, resourceUrl);
@@ -213,10 +215,11 @@ export class ApiNetworkProvider implements INetworkProvider {
     }
 
     private async doPost(resourceUrl: string, payload: any): Promise<any> {
+        let axios = await getAxios();
         const url = `${this.url}/${resourceUrl}`;
 
         try {
-            const response = await axios.post(url, payload, {
+            const response = await axios.default.post(url, payload, {
                 ...this.config,
                 headers: {
                     "Content-Type": "application/json",
diff --git a/src/networkProviders/proxyNetworkProvider.ts b/src/networkProviders/proxyNetworkProvider.ts
index 4a70cf14b..4fd933841 100644
--- a/src/networkProviders/proxyNetworkProvider.ts
+++ b/src/networkProviders/proxyNetworkProvider.ts
@@ -1,5 +1,5 @@
-import axios from "axios";
 import { ErrContractQuery, ErrNetworkProvider } from "../errors";
+import { getAxios } from "../utils";
 import { AccountOnNetwork, GuardianData } from "./accounts";
 import { defaultAxiosConfig } from "./config";
 import { BaseUserAgent, EsdtContractAddress } from "./constants";
@@ -224,10 +224,11 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     private async doGet(resourceUrl: string): Promise<any> {
+        const axios = await getAxios();
         const url = `${this.url}/${resourceUrl}`;
 
         try {
-            const response = await axios.get(url, this.config);
+            const response = await axios.default.get(url, this.config);
             const payload = response.data.data;
             return payload;
         } catch (error) {
@@ -236,10 +237,11 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     private async doPost(resourceUrl: string, payload: any): Promise<any> {
+        const axios = await getAxios();
         const url = `${this.url}/${resourceUrl}`;
 
         try {
-            const response = await axios.post(url, payload, {
+            const response = await axios.default.post(url, payload, {
                 ...this.config,
                 headers: {
                     "Content-Type": "application/json",
diff --git a/src/testutils/utils.ts b/src/testutils/utils.ts
index 76ef1b9f8..349e82f3b 100644
--- a/src/testutils/utils.ts
+++ b/src/testutils/utils.ts
@@ -1,14 +1,14 @@
-import { PathLike } from "fs";
+import BigNumber from "bignumber.js";
 import * as fs from "fs";
-import { SmartContract } from "../smartcontracts/smartContract";
+import { PathLike } from "fs";
+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 { IChainID, IGasLimit } from "../interface";
+import { getAxios } from "../utils";
 import { TestWallet } from "./wallets";
-import axios, { AxiosResponse } from "axios";
-import BigNumber from "bignumber.js";
 
 export async function prepareDeployment(obj: {
     deployer: TestWallet;
@@ -41,7 +41,8 @@ export async function prepareDeployment(obj: {
 
 export async function loadContractCode(path: PathLike): Promise<Code> {
     if (isOnBrowserTests()) {
-        let response: AxiosResponse<ArrayBuffer> = await axios.get(path.toString(), {
+        const axios = await getAxios();
+        let response: any = await axios.default.get(path.toString(), {
             responseType: "arraybuffer",
             transformResponse: [],
             headers: {
@@ -60,7 +61,8 @@ export async function loadContractCode(path: PathLike): Promise<Code> {
 
 export async function loadAbiRegistry(path: PathLike): Promise<AbiRegistry> {
     if (isOnBrowserTests()) {
-        let response: AxiosResponse = await axios.get(path.toString());
+        const axios = await getAxios();
+        let response: any = await axios.default.get(path.toString());
         return AbiRegistry.create(response.data);
     }
 
diff --git a/src/testutils/wallets.ts b/src/testutils/wallets.ts
index 9c5add288..e332cec0c 100644
--- a/src/testutils/wallets.ts
+++ b/src/testutils/wallets.ts
@@ -1,10 +1,10 @@
-import axios from "axios";
 import * as fs from "fs";
 import * as path from "path";
 import { Account } from "../account";
 import { Address } from "../address";
 import { IAddress } from "../interface";
 import { IAccountOnNetwork } from "../interfaceOfNetwork";
+import { getAxios } from "../utils";
 import { UserSecretKey, UserSigner } from "./../wallet";
 import { readTestFile } from "./files";
 import { isOnBrowserTests } from "./utils";
@@ -82,7 +82,8 @@ async function readTestWalletFileContents(name: string): Promise<string> {
 }
 
 async function downloadTextFile(url: string) {
-    let response = await axios.get(url, { responseType: "text", transformResponse: [] });
+    const axios = await getAxios();
+    let response = await axios.default.get(url, { responseType: "text", transformResponse: [] });
     let text = response.data.toString();
     return text;
 }
diff --git a/src/utils.ts b/src/utils.ts
index dd72af659..9cc935224 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -56,3 +56,13 @@ export function isEmpty(value: { isEmpty?: () => boolean; length?: number }): bo
 
     return value.length === 0;
 }
+
+export async function getAxios() {
+    let axios;
+    try {
+        axios = require("axios");
+        return axios;
+    } catch (error) {
+        throw new Error("axios is required but not installed. Please install axios to make network requests.");
+    }
+}
diff --git a/src/wallet/validatorKeys.ts b/src/wallet/validatorKeys.ts
index 3a7928fad..4b2b856f7 100644
--- a/src/wallet/validatorKeys.ts
+++ b/src/wallet/validatorKeys.ts
@@ -2,21 +2,29 @@ import { ErrInvariantFailed } from "../errors";
 import { guardLength } from "./assertions";
 import { parseValidatorKey } from "./pem";
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const bls = require("@multiversx/sdk-bls-wasm");
-
 export const VALIDATOR_SECRETKEY_LENGTH = 32;
 export const VALIDATOR_PUBKEY_LENGTH = 96;
 
 export class BLS {
     private static isInitialized: boolean = false;
+    public static bls: any;
+
+    private static loadBLSModule() {
+        if (!BLS.bls) {
+            try {
+                BLS.bls = require("@multiversx/sdk-bls-wasm");
+            } catch (error) {
+                throw new Error("BLS module is required but not installed. Please install '@multiversx/sdk-bls-wasm'.");
+            }
+        }
+    }
 
     static async initIfNecessary() {
         if (BLS.isInitialized) {
             return;
         }
-
-        await bls.init(bls.BLS12_381);
+        BLS.loadBLSModule();
+        await BLS.bls.init(BLS.bls.BLS12_381);
 
         BLS.isInitialized = true;
     }
@@ -38,7 +46,7 @@ export class ValidatorSecretKey {
         BLS.guardInitialized();
         guardLength(buffer, VALIDATOR_SECRETKEY_LENGTH);
 
-        this.secretKey = new bls.SecretKey();
+        this.secretKey = new BLS.bls.SecretKey();
         this.secretKey.setLittleEndian(Uint8Array.from(buffer));
         this.publicKey = this.secretKey.getPublicKey();
     }

From 21bec1345a71df8fd22d03f206f7f75363a08e49 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 14 Oct 2024 17:12:21 +0300
Subject: [PATCH 299/338] Add title to abi endpoint

---
 src/smartcontracts/typesystem/abiRegistry.spec.ts | 8 ++++++++
 src/smartcontracts/typesystem/abiRegistry.ts      | 2 +-
 src/smartcontracts/typesystem/endpoint.ts         | 7 ++++++-
 src/testdata/lottery-esdt.abi.json                | 1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/smartcontracts/typesystem/abiRegistry.spec.ts b/src/smartcontracts/typesystem/abiRegistry.spec.ts
index e7b43117d..4832690f4 100644
--- a/src/smartcontracts/typesystem/abiRegistry.spec.ts
+++ b/src/smartcontracts/typesystem/abiRegistry.spec.ts
@@ -203,4 +203,12 @@ describe("test abi registry", () => {
         assert.deepEqual(enumType.variants[1].name, "interrupted");
         assert.deepEqual(enumType.variants[1].discriminant, 1);
     });
+
+    it("should load abi with title for endpoint", async () => {
+        const registry = await loadAbiRegistry("src/testdata/lottery-esdt.abi.json");
+
+        const endpoint = registry.getEndpoint("createLotteryPool");
+
+        assert.equal(endpoint.title, "Create lottery pool");
+    });
 });
diff --git a/src/smartcontracts/typesystem/abiRegistry.ts b/src/smartcontracts/typesystem/abiRegistry.ts
index 25162de22..538c7d148 100644
--- a/src/smartcontracts/typesystem/abiRegistry.ts
+++ b/src/smartcontracts/typesystem/abiRegistry.ts
@@ -214,7 +214,7 @@ function mapEndpoint(endpoint: EndpointDefinition, mapper: TypeMapper): Endpoint
         (e) => new EndpointParameterDefinition(e.name, e.description, mapper.mapType(e.type)),
     );
 
-    return new EndpointDefinition(endpoint.name, newInput, newOutput, endpoint.modifiers);
+    return new EndpointDefinition(endpoint.name, newInput, newOutput, endpoint.modifiers, endpoint.title);
 }
 
 function mapEvent(event: EventDefinition, mapper: TypeMapper): EventDefinition {
diff --git a/src/smartcontracts/typesystem/endpoint.ts b/src/smartcontracts/typesystem/endpoint.ts
index 9868b72dd..90f5de39c 100644
--- a/src/smartcontracts/typesystem/endpoint.ts
+++ b/src/smartcontracts/typesystem/endpoint.ts
@@ -6,6 +6,7 @@ const DescriptionPlaceholder = "N / A";
 
 export class EndpointDefinition {
     readonly name: string;
+    readonly title: string;
     readonly input: EndpointParameterDefinition[] = [];
     readonly output: EndpointParameterDefinition[] = [];
     readonly modifiers: EndpointModifiers;
@@ -15,8 +16,10 @@ export class EndpointDefinition {
         input: EndpointParameterDefinition[],
         output: EndpointParameterDefinition[],
         modifiers: EndpointModifiers,
+        title?: string,
     ) {
         this.name = name;
+        this.title = title || "";
         this.input = input || [];
         this.output = output || [];
         this.modifiers = modifiers;
@@ -28,6 +31,7 @@ export class EndpointDefinition {
 
     static fromJSON(json: {
         name: string;
+        title?: string;
         onlyOwner?: boolean;
         mutability: string;
         payableInTokens: string[];
@@ -36,6 +40,7 @@ export class EndpointDefinition {
     }): EndpointDefinition {
         json.name = json.name == null ? NamePlaceholder : json.name;
         json.onlyOwner = json.onlyOwner || false;
+        json.title = json.title || "";
         json.payableInTokens = json.payableInTokens || [];
         json.inputs = json.inputs || [];
         json.outputs = json.outputs || [];
@@ -44,7 +49,7 @@ export class EndpointDefinition {
         let output = json.outputs.map((param) => EndpointParameterDefinition.fromJSON(param));
         let modifiers = new EndpointModifiers(json.mutability, json.payableInTokens, json.onlyOwner);
 
-        return new EndpointDefinition(json.name, input, output, modifiers);
+        return new EndpointDefinition(json.name, input, output, modifiers, json.title);
     }
 }
 
diff --git a/src/testdata/lottery-esdt.abi.json b/src/testdata/lottery-esdt.abi.json
index a9fa48c5e..53be0bbed 100644
--- a/src/testdata/lottery-esdt.abi.json
+++ b/src/testdata/lottery-esdt.abi.json
@@ -68,6 +68,7 @@
         },
         {
             "name": "createLotteryPool",
+            "title": "Create lottery pool",
             "mutability": "mutable",
             "inputs": [
                 {

From adc447a4d950c2b3ca47274558e89cc99e2769a8 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 14 Oct 2024 17:51:40 +0300
Subject: [PATCH 300/338] Bump version

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6c2d1a491..7a3ce04fb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.8.0",
+  "version": "13.9.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.8.0",
+      "version": "13.9.0",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index a7e6e8b26..985a883c0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.8.0",
+  "version": "13.9.0",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",

From df8d1adcf3ee3957ff98c341bf7f1b583b2567a2 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Tue, 15 Oct 2024 12:09:59 +0300
Subject: [PATCH 301/338] Update readme and move axios to constructor

---
 README.md                                    | 4 ++--
 src/networkProviders/apiNetworkProvider.ts   | 9 ++++-----
 src/networkProviders/proxyNetworkProvider.ts | 8 ++++----
 src/utils.ts                                 | 6 ++----
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index a0212ab04..3ed95086c 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ npm install esmify --no-save
 
 ### axios
 
-This package can make HTTP requests using `axios`, but it is not bundled by default. If you plan to use the API network provider or Proxy network provider, make sure to install `axios`:
+This package can make HTTP requests using `axios`, which is not bundled by default. If you plan to use the API network provider or Proxy network provider, make sure to install `axios`:
 
 ```bash
 npm install axios
@@ -44,7 +44,7 @@ npm install axios
 
 ### @multiversx/sdk-bls-wasm
 
-This package requires `@multiversx/sdk-bls-wasm` for BLS (Boneh-Lynn-Shacham) cryptographic functions, but it is not bundled by default. If you plan to use BLS functionality, make sure to install this optional dependency:
+This package requires `@multiversx/sdk-bls-wasm` for BLS (Boneh-Lynn-Shacham) cryptographic functions, which is not bundled by default. If you plan to use BLS functionality, make sure to install this optional dependency:
 
 ```bash
 npm install @multiversx/sdk-bls-wasm
diff --git a/src/networkProviders/apiNetworkProvider.ts b/src/networkProviders/apiNetworkProvider.ts
index eae0bc976..177f3ab3d 100644
--- a/src/networkProviders/apiNetworkProvider.ts
+++ b/src/networkProviders/apiNetworkProvider.ts
@@ -26,12 +26,14 @@ export class ApiNetworkProvider implements INetworkProvider {
     private config: NetworkProviderConfig;
     private backingProxyNetworkProvider;
     private userAgentPrefix = `${BaseUserAgent}/api`;
+    private axios: any;
 
     constructor(url: string, config?: NetworkProviderConfig) {
         this.url = url;
         const proxyConfig = this.getProxyConfig(config);
         this.config = { ...defaultAxiosConfig, ...config };
         this.backingProxyNetworkProvider = new ProxyNetworkProvider(url, proxyConfig);
+        this.axios = getAxios();
         extendUserAgent(this.userAgentPrefix, this.config);
     }
 
@@ -202,12 +204,10 @@ export class ApiNetworkProvider implements INetworkProvider {
     }
 
     private async doGet(resourceUrl: string): Promise<any> {
-        let axios = await getAxios();
-
         const url = `${this.url}/${resourceUrl}`;
 
         try {
-            const response = await axios.default.get(url, this.config);
+            const response = await this.axios.default.get(url, this.config);
             return response.data;
         } catch (error) {
             this.handleApiError(error, resourceUrl);
@@ -215,11 +215,10 @@ export class ApiNetworkProvider implements INetworkProvider {
     }
 
     private async doPost(resourceUrl: string, payload: any): Promise<any> {
-        let axios = await getAxios();
         const url = `${this.url}/${resourceUrl}`;
 
         try {
-            const response = await axios.default.post(url, payload, {
+            const response = await this.axios.default.post(url, payload, {
                 ...this.config,
                 headers: {
                     "Content-Type": "application/json",
diff --git a/src/networkProviders/proxyNetworkProvider.ts b/src/networkProviders/proxyNetworkProvider.ts
index 4fd933841..e62327ea4 100644
--- a/src/networkProviders/proxyNetworkProvider.ts
+++ b/src/networkProviders/proxyNetworkProvider.ts
@@ -22,10 +22,12 @@ export class ProxyNetworkProvider implements INetworkProvider {
     private url: string;
     private config: NetworkProviderConfig;
     private userAgentPrefix = `${BaseUserAgent}/proxy`;
+    private axios: any;
 
     constructor(url: string, config?: NetworkProviderConfig) {
         this.url = url;
         this.config = { ...defaultAxiosConfig, ...config };
+        this.axios = getAxios();
         extendUserAgent(this.userAgentPrefix, this.config);
     }
 
@@ -224,11 +226,10 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     private async doGet(resourceUrl: string): Promise<any> {
-        const axios = await getAxios();
         const url = `${this.url}/${resourceUrl}`;
 
         try {
-            const response = await axios.default.get(url, this.config);
+            const response = await this.axios.default.get(url, this.config);
             const payload = response.data.data;
             return payload;
         } catch (error) {
@@ -237,11 +238,10 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     private async doPost(resourceUrl: string, payload: any): Promise<any> {
-        const axios = await getAxios();
         const url = `${this.url}/${resourceUrl}`;
 
         try {
-            const response = await axios.default.post(url, payload, {
+            const response = await this.axios.default.post(url, payload, {
                 ...this.config,
                 headers: {
                     "Content-Type": "application/json",
diff --git a/src/utils.ts b/src/utils.ts
index 9cc935224..c80c7c6df 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -57,11 +57,9 @@ export function isEmpty(value: { isEmpty?: () => boolean; length?: number }): bo
     return value.length === 0;
 }
 
-export async function getAxios() {
-    let axios;
+export function getAxios() {
     try {
-        axios = require("axios");
-        return axios;
+        return require("axios");
     } catch (error) {
         throw new Error("axios is required but not installed. Please install axios to make network requests.");
     }

From ea9ccbcab8b6d8fb49910b0b538ede90fb3d34d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 15 Oct 2024 13:00:11 +0300
Subject: [PATCH 302/338] Additional tests.

---
 src/testdata/README.md                        | 33 ++++++--
 src/testdata/transactions.mainnet.json        | 80 +++++++++++++++++++
 ...TransactionsOutcomeParser.main.net.spec.ts | 24 ++++++
 3 files changed, 131 insertions(+), 6 deletions(-)

diff --git a/src/testdata/README.md b/src/testdata/README.md
index 99bce0e0c..841b24e37 100644
--- a/src/testdata/README.md
+++ b/src/testdata/README.md
@@ -12,7 +12,7 @@ DECLARE
   -- Contract execute, with success
   (
   SELECT
-    `_id`,
+    `_id` `hash`,
     'execute_success' `kind`
   FROM
     `multiversx-blockchain-etl.crypto_multiversx_mainnet_eu.transactions`
@@ -29,7 +29,7 @@ UNION ALL
   -- Contract execute, with error
   (
   SELECT
-    `_id`,
+    `_id` `hash`,
     'execute_error' `kind`
   FROM
     `multiversx-blockchain-etl.crypto_multiversx_mainnet_eu.transactions`
@@ -46,7 +46,7 @@ UNION ALL
   -- Contract transfer & execute, with success
   (
   SELECT
-    `_id`,
+    `_id` `hash`,
     'transfer_execute_success' `kind`
   FROM
     `multiversx-blockchain-etl.crypto_multiversx_mainnet_eu.transactions`
@@ -63,7 +63,7 @@ UNION ALL
   -- Contract transfer & execute, with error
   (
   SELECT
-    `_id`,
+    `_id` `hash`,
     'transfer_execute_error' `kind`
   FROM
     `multiversx-blockchain-etl.crypto_multiversx_mainnet_eu.transactions`
@@ -80,7 +80,7 @@ UNION ALL
   -- Relayed, with success
   (
   SELECT
-    `_id`,
+    `_id` `hash`,
     'relayed_success' `kind`
   FROM
     `multiversx-blockchain-etl.crypto_multiversx_mainnet_eu.transactions`
@@ -96,7 +96,7 @@ UNION ALL
   -- Relayed, with failure
   (
   SELECT
-    `_id`,
+    `_id` `hash`,
     'relayed_error' `kind`
   FROM
     `multiversx-blockchain-etl.crypto_multiversx_mainnet_eu.transactions`
@@ -108,4 +108,25 @@ UNION ALL
     AND RAND() < 0.25
   LIMIT
     50)
+UNION ALL
+  -- MultiESDTNFTTransfer, with too much gas
+  (
+  SELECT
+    `_id` `hash`,
+    'multi_transfer_too_much_gas' `kind`
+  FROM 
+    `multiversx-blockchain-etl.crypto_multiversx_mainnet_eu.transactions`
+  WHERE
+    DATE(`timestamp`) >= TIMESTAMP_START
+    AND DATE(`timestamp`) <= TIMESTAMP_END
+    AND `operation` = 'MultiESDTNFTTransfer'
+    AND `function` IS NULL
+    AND `isRelayed` IS NULL
+    AND `status` = 'success'
+    AND `gasLimit` = `gasUsed`
+    AND ARRAY_LENGTH(`tokens`) = 1
+    AND `receiversShardIDs`[0] != `senderShard`
+    AND RAND() < 0.25
+  LIMIT
+    20)
 ```
diff --git a/src/testdata/transactions.mainnet.json b/src/testdata/transactions.mainnet.json
index d9c324e4e..0be4e0b94 100644
--- a/src/testdata/transactions.mainnet.json
+++ b/src/testdata/transactions.mainnet.json
@@ -11506,5 +11506,85 @@
     {
         "hash": "a7c20ed14474fad25b3a2c089fae2a45a5c5d11b1ea7574de32542571b46440a",
         "kind": "relayed_error"
+    },
+    {
+        "hash": "6e0414891686baf7a21c27c24b09e16fe9c3bce040b1bb504a40f4ddf506f402",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "3206004a1366581669210845baa1eca90336534e391f81bd01dfe998da4cec40",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "c8c164f1597410abc8eae16b660e8d446423b2566d5a8b7617430e0bced0257d",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "bb9fb4ca0494ab060aa9ccaf4f24438d0ba2d09127178b97725df3dfa470c264",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "f7df0d7180c70b74706ec54a77c56bef02f86dffe5ac2367816b5537559a1aff",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "251c7805dd1004ce6f33a2932e237cc2cc41c945683100cd1c23f5de9bccd058",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "104187750797f102e3cd223f5a7e3f05bf31ce22606eef9c75318178eb8c6713",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "c4511ee6580b3460b0a80dad8514c0998fb006c7e5896831f307211360654c31",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "4c4327edcc77e4d8f3de27ecb37cdd898620a6aa46077d7c75b3b637c2d07a60",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "f3873ef6f68eab202b775a3b1bec603ceea138031819f290249ad4fbfbb24871",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "0209629e347c84714eeb50cb6561b5053e55cc504062eaf70cbfcac5e14f27b5",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "9f381f611328b20cce90d18eff81a7532451b858711892ef0e3c29f80d6dceff",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "22edc571dd43166a30c0af4182d69c2a628b2543c09724042b6680c0042e0a9e",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "8b3b99a33b1b47377fe2c699244c8c137716a1ca8e8cca7f1c48b32a77f0751e",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "53dfadaea88e58da21f698f10a1949cc51c4a2cc88a061474ff1f43c2190c752",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "080d3a888c140a1664da1f0df59e716da84e377d91e50af45cfd65695c28fcca",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "72736705d7cc350ba9ad9c6bd811e744a7c09ce948e2a3982475bc4adcc609a5",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "dc534504eb937a0aaac4189ad774dcb1cad32f72b35f31f77370997dc2e1c17c",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "122b1bfe8cd22e853708c130be8b8226dfd53380a4e3bd0a56faa8eb66bbe0f6",
+        "kind": "multi_transfer_too_much_gas"
+    },
+    {
+        "hash": "a794915071d0924922546fabc67202a06e9d56fb64cda21fa8a235826ae2e3cd",
+        "kind": "multi_transfer_too_much_gas"
     }
 ]
diff --git a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.main.net.spec.ts b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.main.net.spec.ts
index dbe83452b..d8054aa9c 100644
--- a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.main.net.spec.ts
+++ b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.main.net.spec.ts
@@ -126,6 +126,30 @@ describe("test smart contract transactions outcome parser on mainnet", () => {
         }
     });
 
+    it("should parse (multi_transfer_too_much_gas)", async function () {
+        this.timeout(3600000);
+
+        const records = await loadRecords("multi_transfer_too_much_gas");
+
+        for (let i = 0; i < records.length; i++) {
+            const { hash } = records[i];
+            console.log(i, hash);
+
+            const transactionOnNetwork = await networkProvider.getTransaction(hash);
+            const transactionOutcome = converter.transactionOnNetworkToOutcome(transactionOnNetwork);
+            const parsedOutcomeGivenTransactionOutcome = parser.parseExecute({ transactionOutcome });
+            const parsedOutcomeGivenTransactionOnNetwork = parser.parseExecute({ transactionOnNetwork });
+
+            assert.deepEqual(parsedOutcomeGivenTransactionOutcome, parsedOutcomeGivenTransactionOnNetwork);
+            assert.isTrue(parsedOutcomeGivenTransactionOnNetwork.returnCode.length > 0);
+            assert.isTrue(parsedOutcomeGivenTransactionOnNetwork.returnMessage.length > 0);
+            assert.lengthOf(parsedOutcomeGivenTransactionOnNetwork.values, 0);
+
+            assert.equal(parsedOutcomeGivenTransactionOnNetwork.returnCode, "ok");
+            assert.equal(parsedOutcomeGivenTransactionOnNetwork.returnMessage, "ok");
+        }
+    });
+
     async function loadRecords(kind: string): Promise<any[]> {
         const path = "src/testdata/transactions.mainnet.json";
         const content: string = await promises.readFile(path, { encoding: "utf8" });

From 6e77bcb45cbcbad5e9b8a2d94a34c2d51282cf59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 15 Oct 2024 13:02:23 +0300
Subject: [PATCH 303/338] Simplify tests.

---
 .../smartContractTransactionsOutcomeParser.main.net.spec.ts  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.main.net.spec.ts b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.main.net.spec.ts
index d8054aa9c..00ee27737 100644
--- a/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.main.net.spec.ts
+++ b/src/transactionsOutcomeParsers/smartContractTransactionsOutcomeParser.main.net.spec.ts
@@ -141,12 +141,9 @@ describe("test smart contract transactions outcome parser on mainnet", () => {
             const parsedOutcomeGivenTransactionOnNetwork = parser.parseExecute({ transactionOnNetwork });
 
             assert.deepEqual(parsedOutcomeGivenTransactionOutcome, parsedOutcomeGivenTransactionOnNetwork);
-            assert.isTrue(parsedOutcomeGivenTransactionOnNetwork.returnCode.length > 0);
-            assert.isTrue(parsedOutcomeGivenTransactionOnNetwork.returnMessage.length > 0);
-            assert.lengthOf(parsedOutcomeGivenTransactionOnNetwork.values, 0);
-
             assert.equal(parsedOutcomeGivenTransactionOnNetwork.returnCode, "ok");
             assert.equal(parsedOutcomeGivenTransactionOnNetwork.returnMessage, "ok");
+            assert.lengthOf(parsedOutcomeGivenTransactionOnNetwork.values, 0);
         }
     });
 

From 2ac6d1d9feabc59e49b7b04289cd8c5a879fc068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Tue, 15 Oct 2024 14:33:08 +0300
Subject: [PATCH 304/338] Add localnet configuration (for the CI).

---
 .github/workflows/test-localnet.yml |  4 +--
 .npmignore                          |  1 +
 localnet.toml                       | 41 +++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 localnet.toml

diff --git a/.github/workflows/test-localnet.yml b/.github/workflows/test-localnet.yml
index 1faa26891..61cdae4c0 100644
--- a/.github/workflows/test-localnet.yml
+++ b/.github/workflows/test-localnet.yml
@@ -40,8 +40,8 @@ jobs:
         run: |
           # Start the local testnet with mxpy
           mkdir -p ~/localnet && cd ~/localnet
-          mxpy localnet setup
-          nohup mxpy localnet start > localnet.log 2>&1 & echo $! > localnet.pid
+          mxpy localnet setup --configfile=${GITHUB_WORKSPACE}/localnet.toml
+          nohup mxpy localnet start --configfile=${GITHUB_WORKSPACE}/localnet.toml > localnet.log 2>&1 & echo $! > localnet.pid
           sleep 120 # Allow time for the testnet to fully start
 
       # Step 6: Install Node.js and dependencies
diff --git a/.npmignore b/.npmignore
index 565b2be53..f40235d51 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,2 +1,3 @@
 src/testdata/**
 src/testutils/**
+localnet.toml
diff --git a/localnet.toml b/localnet.toml
new file mode 100644
index 000000000..27b777910
--- /dev/null
+++ b/localnet.toml
@@ -0,0 +1,41 @@
+[general]
+log_level = "*:DEBUG"
+genesis_delay_seconds = 10
+rounds_per_epoch = 50
+round_duration_milliseconds = 6000
+
+[metashard]
+consensus_size = 1
+num_observers = 0
+num_validators = 1
+
+[shards]
+num_shards = 3
+consensus_size = 1
+num_observers_per_shard = 0
+num_validators_per_shard = 1
+
+[networking]
+host = "127.0.0.1"
+port_seednode = 9999
+port_seednode_rest_api = 10000
+p2p_id_seednode = "16Uiu2HAkx4QqgXXDdHdUWbLu5kxhd3Uo2hqB2FfCxmxH5Sd7bZFk"
+port_proxy = 7950
+port_first_observer = 21100
+port_first_observer_rest_api = 10100
+port_first_validator = 21500
+port_first_validator_rest_api = 10200
+
+[software.mx_chain_go]
+resolution = "remote"
+archive_url = "https://github.com/multiversx/mx-chain-go/archive/refs/heads/master.zip"
+archive_download_folder = "~/multiversx-sdk/localnet_software_remote/downloaded/mx-chain-go"
+archive_extraction_folder = "~/multiversx-sdk/localnet_software_remote/extracted/mx-chain-go"
+local_path = "~/multiversx-sdk/localnet_software_local/mx-chain-go"
+
+[software.mx_chain_proxy_go]
+resolution = "remote"
+archive_url = "https://github.com/multiversx/mx-chain-proxy-go/archive/refs/heads/master.zip"
+archive_download_folder = "~/multiversx-sdk/localnet_software_remote/downloaded/mx-chain-proxy-go"
+archive_extraction_folder = "~/multiversx-sdk/localnet_software_remote/extracted/mx-chain-proxy-go"
+local_path = "~/multiversx-sdk/localnet_software_local/mx-chain-proxy-go"

From 1c9e32618e9e441271c1d03286bc44d994543970 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Tue, 15 Oct 2024 15:09:30 +0300
Subject: [PATCH 305/338] Mark ITransactionNext as deprecated

---
 src/networkProviders/interface.ts             | 45 +++++++++----------
 .../providers.dev.net.spec.ts                 |  2 +
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/networkProviders/interface.ts b/src/networkProviders/interface.ts
index 144f05834..501ab4a59 100644
--- a/src/networkProviders/interface.ts
+++ b/src/networkProviders/interface.ts
@@ -1,3 +1,4 @@
+import { ITransaction as ITransactionAsInSpecs } from "../interface";
 import { AccountOnNetwork } from "./accounts";
 import { ContractQueryResponse } from "./contractQueryResponse";
 import { NetworkConfig } from "./networkConfig";
@@ -46,7 +47,10 @@ export interface INetworkProvider {
     /**
      * Fetches data about the non-fungible tokens held by account.
      */
-    getNonFungibleTokensOfAccount(address: IAddress, pagination?: IPagination): Promise<NonFungibleTokenOfAccountOnNetwork[]>;
+    getNonFungibleTokensOfAccount(
+        address: IAddress,
+        pagination?: IPagination,
+    ): Promise<NonFungibleTokenOfAccountOnNetwork[]>;
 
     /**
      * Fetches data about a specific fungible token held by an account.
@@ -56,7 +60,11 @@ export interface INetworkProvider {
     /**
      * Fetches data about a specific non-fungible token (instance) held by an account.
      */
-    getNonFungibleTokenOfAccount(address: IAddress, collection: string, nonce: number): Promise<NonFungibleTokenOfAccountOnNetwork>;
+    getNonFungibleTokenOfAccount(
+        address: IAddress,
+        collection: string,
+        nonce: number,
+    ): Promise<NonFungibleTokenOfAccountOnNetwork>;
 
     /**
      * Fetches the state of a transaction.
@@ -80,7 +88,7 @@ export interface INetworkProvider {
 
     /**
      * Simulates the processing of an already-signed transaction.
-     * 
+     *
      */
     simulateTransaction(tx: ITransaction): Promise<any>;
 
@@ -118,8 +126,8 @@ export interface INetworkProvider {
 export interface IContractQuery {
     address: IAddress;
     caller?: IAddress;
-    func: { toString(): string; };
-    value?: { toString(): string; };
+    func: { toString(): string };
+    value?: { toString(): string };
     getEncodedArguments(): string[];
 }
 
@@ -132,22 +140,11 @@ export interface ITransaction {
     toSendable(): any;
 }
 
-export interface IAddress { bech32(): string; }
-
-export interface ITransactionNext {
-    sender: string;
-    receiver: string;
-    gasLimit: bigint;
-    chainID: string;
-    nonce: bigint;
-    value: bigint;
-    senderUsername: string;
-    receiverUsername: string;
-    gasPrice: bigint;
-    data: Uint8Array;
-    version: number;
-    options: number;
-    guardian: string;
-    signature: Uint8Array;
-    guardianSignature: Uint8Array;
-  }
+export interface IAddress {
+    bech32(): string;
+}
+
+/**
+ * @deprecated This will be remove with the next release (replaced by the `ITransaction` interface from "src/interface.ts").
+ */
+export type ITransactionNext = ITransactionAsInSpecs;
diff --git a/src/networkProviders/providers.dev.net.spec.ts b/src/networkProviders/providers.dev.net.spec.ts
index d08e5b4f7..b95994cb8 100644
--- a/src/networkProviders/providers.dev.net.spec.ts
+++ b/src/networkProviders/providers.dev.net.spec.ts
@@ -452,6 +452,8 @@ describe("test network providers on devnet: Proxy and API", function () {
             guardian: "",
             guardianSignature: new Uint8Array(),
             options: 0,
+            relayer: "",
+            innerTransactions: [],
         };
 
         const apiLegacyTxHash = await apiProvider.sendTransaction(transaction);

From 6ceb8be859d06cb3bc296682a7e19df125782f44 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Tue, 15 Oct 2024 15:36:44 +0300
Subject: [PATCH 306/338] Fix typo

---
 src/networkProviders/interface.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/networkProviders/interface.ts b/src/networkProviders/interface.ts
index 501ab4a59..eb73db286 100644
--- a/src/networkProviders/interface.ts
+++ b/src/networkProviders/interface.ts
@@ -145,6 +145,6 @@ export interface IAddress {
 }
 
 /**
- * @deprecated This will be remove with the next release (replaced by the `ITransaction` interface from "src/interface.ts").
+ * @deprecated This will be removed with the next release (replaced by the `ITransaction` interface from "src/interface.ts").
  */
 export type ITransactionNext = ITransactionAsInSpecs;

From e519e5ef32fa6e4838af235adffe5b6d87ee51d9 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Tue, 15 Oct 2024 16:02:18 +0300
Subject: [PATCH 307/338] Bump version

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3e392af4e..86b115dcf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.9.0",
+  "version": "13.10.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.9.0",
+      "version": "13.10.0",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index fb05d43ce..ec8e434f4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.9.0",
+  "version": "13.10.0",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",

From d44485a5f14792f15c3d2f625bdd56f4e60ce60b Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Tue, 15 Oct 2024 16:15:02 +0300
Subject: [PATCH 308/338] fix version bump for alpha release

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 86b115dcf..af4bb675e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.10.0",
+  "version": "13.10.0-alpha.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.10.0",
+      "version": "13.10.0-alpha.0",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index ec8e434f4..6561ba53a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.10.0",
+  "version": "13.10.0-alpha.0",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",

From bb10ad7249187724ba281421cf39f292056ce436 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 16 Oct 2024 14:26:21 +0300
Subject: [PATCH 309/338] Update version for alpha release

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index af4bb675e..86b115dcf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.10.0-alpha.0",
+  "version": "13.10.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.10.0-alpha.0",
+      "version": "13.10.0",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index 6561ba53a..ec8e434f4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.10.0-alpha.0",
+  "version": "13.10.0",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",

From f12245c27c4daee5d082477ceac1f3c56ceb3795 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 21 Oct 2024 12:38:51 +0300
Subject: [PATCH 310/338] Remove relay v3 code

---
 src/converters/transactionsConverter.ts       |  8 --
 src/converters/transactionsConverters.spec.ts | 79 -------------------
 src/interface.ts                              |  4 -
 src/proto/compiled.js                         | 77 ------------------
 src/proto/serializer.spec.ts                  | 39 ---------
 src/proto/serializer.ts                       |  6 --
 src/proto/transaction.proto                   |  2 -
 src/transaction.ts                            | 15 ----
 src/transactionComputer.ts                    |  4 -
 .../relayedTransactionsFactory.spec.ts        | 65 ---------------
 .../relayedTransactionsFactory.ts             | 30 -------
 11 files changed, 329 deletions(-)

diff --git a/src/converters/transactionsConverter.ts b/src/converters/transactionsConverter.ts
index d94cb11fa..966ec86e4 100644
--- a/src/converters/transactionsConverter.ts
+++ b/src/converters/transactionsConverter.ts
@@ -28,10 +28,6 @@ export class TransactionsConverter {
             guardian: transaction.guardian ? transaction.guardian : undefined,
             signature: this.toHexOrUndefined(transaction.signature),
             guardianSignature: this.toHexOrUndefined(transaction.guardianSignature),
-            relayer: transaction.relayer ? transaction.relayer : undefined,
-            innerTransactions: transaction.innerTransactions.length
-                ? transaction.innerTransactions.map((tx) => this.transactionToPlainObject(tx))
-                : undefined,
         };
 
         return plainObject;
@@ -62,10 +58,6 @@ export class TransactionsConverter {
             options: Number(object.options),
             signature: this.bufferFromHex(object.signature),
             guardianSignature: this.bufferFromHex(object.guardianSignature),
-            relayer: object.relayer,
-            innerTransactions: object.innerTransactions
-                ? object.innerTransactions.map((tx) => this.plainObjectToTransaction(tx))
-                : undefined,
         });
 
         return transaction;
diff --git a/src/converters/transactionsConverters.spec.ts b/src/converters/transactionsConverters.spec.ts
index 12d26271b..e491ab57a 100644
--- a/src/converters/transactionsConverters.spec.ts
+++ b/src/converters/transactionsConverters.spec.ts
@@ -59,85 +59,6 @@ describe("test transactions converter", async () => {
             guardian: undefined,
             signature: undefined,
             guardianSignature: undefined,
-            relayer: undefined,
-            innerTransactions: undefined,
-        });
-    });
-
-    it("converts relayedV3 transaction to plain object and back", () => {
-        const converter = new TransactionsConverter();
-
-        const innerTx = new Transaction({
-            nonce: 90,
-            value: BigInt("123456789000000000000000000000"),
-            sender: "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
-            receiver: "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
-            senderUsername: "alice",
-            receiverUsername: "bob",
-            gasPrice: 1000000000,
-            gasLimit: 80000,
-            data: Buffer.from("hello"),
-            chainID: "localnet",
-            version: 2,
-            relayer: "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8",
-        });
-
-        const relayedTx = new Transaction({
-            nonce: 77,
-            value: BigInt("0"),
-            sender: "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8",
-            receiver: "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8",
-            gasPrice: 1000000000,
-            gasLimit: 50000,
-            chainID: "localnet",
-            version: 2,
-            innerTransactions: [innerTx],
-        });
-
-        const plainObject = converter.transactionToPlainObject(relayedTx);
-        const restoredTransaction = converter.plainObjectToTransaction(plainObject);
-
-        assert.deepEqual(plainObject, relayedTx.toPlainObject());
-        assert.deepEqual(restoredTransaction, Transaction.fromPlainObject(plainObject));
-        assert.deepEqual(restoredTransaction, relayedTx);
-        assert.deepEqual(plainObject, {
-            nonce: 77,
-            value: "0",
-            sender: "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8",
-            receiver: "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8",
-            senderUsername: undefined,
-            receiverUsername: undefined,
-            gasPrice: 1000000000,
-            gasLimit: 50000,
-            data: undefined,
-            chainID: "localnet",
-            version: 2,
-            options: undefined,
-            guardian: undefined,
-            signature: undefined,
-            guardianSignature: undefined,
-            relayer: undefined,
-            innerTransactions: [
-                {
-                    nonce: 90,
-                    value: "123456789000000000000000000000",
-                    sender: "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
-                    receiver: "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
-                    senderUsername: "YWxpY2U=",
-                    receiverUsername: "Ym9i",
-                    gasPrice: 1000000000,
-                    gasLimit: 80000,
-                    data: "aGVsbG8=",
-                    chainID: "localnet",
-                    version: 2,
-                    options: undefined,
-                    guardian: undefined,
-                    signature: undefined,
-                    guardianSignature: undefined,
-                    relayer: "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8",
-                    innerTransactions: undefined,
-                },
-            ],
         });
     });
 
diff --git a/src/interface.ts b/src/interface.ts
index 1a1bc6324..97c86a54f 100644
--- a/src/interface.ts
+++ b/src/interface.ts
@@ -24,8 +24,6 @@ export interface IPlainTransactionObject {
     options?: number;
     signature?: string;
     guardianSignature?: string;
-    relayer?: string;
-    innerTransactions?: IPlainTransactionObject[];
 }
 
 export interface ISignature {
@@ -106,6 +104,4 @@ export interface ITransaction {
     guardian: string;
     signature: Uint8Array;
     guardianSignature: Uint8Array;
-    relayer: string;
-    innerTransactions: ITransaction[];
 }
diff --git a/src/proto/compiled.js b/src/proto/compiled.js
index 2d02a2512..feed796f9 100644
--- a/src/proto/compiled.js
+++ b/src/proto/compiled.js
@@ -46,8 +46,6 @@
              * @property {number|null} [Options] Transaction Options
              * @property {Uint8Array|null} [GuardianAddr] Transaction GuardianAddr
              * @property {Uint8Array|null} [GuardianSignature] Transaction GuardianSignature
-             * @property {Uint8Array|null} [Relayer] Transaction Relayer
-             * @property {Array.<proto.ITransaction>|null} [InnerTransactions] Transaction InnerTransactions
              */
     
             /**
@@ -59,7 +57,6 @@
              * @param {proto.ITransaction=} [properties] Properties to set
              */
             function Transaction(properties) {
-                this.InnerTransactions = [];
                 if (properties)
                     for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
                         if (properties[keys[i]] != null)
@@ -186,22 +183,6 @@
              */
             Transaction.prototype.GuardianSignature = $util.newBuffer([]);
     
-            /**
-             * Transaction Relayer.
-             * @member {Uint8Array} Relayer
-             * @memberof proto.Transaction
-             * @instance
-             */
-            Transaction.prototype.Relayer = $util.newBuffer([]);
-    
-            /**
-             * Transaction InnerTransactions.
-             * @member {Array.<proto.ITransaction>} InnerTransactions
-             * @memberof proto.Transaction
-             * @instance
-             */
-            Transaction.prototype.InnerTransactions = $util.emptyArray;
-    
             /**
              * Creates a new Transaction instance using the specified properties.
              * @function create
@@ -256,11 +237,6 @@
                     writer.uint32(/* id 14, wireType 2 =*/114).bytes(message.GuardianAddr);
                 if (message.GuardianSignature != null && Object.hasOwnProperty.call(message, "GuardianSignature"))
                     writer.uint32(/* id 15, wireType 2 =*/122).bytes(message.GuardianSignature);
-                if (message.Relayer != null && Object.hasOwnProperty.call(message, "Relayer"))
-                    writer.uint32(/* id 16, wireType 2 =*/130).bytes(message.Relayer);
-                if (message.InnerTransactions != null && message.InnerTransactions.length)
-                    for (var i = 0; i < message.InnerTransactions.length; ++i)
-                        $root.proto.Transaction.encode(message.InnerTransactions[i], writer.uint32(/* id 17, wireType 2 =*/138).fork()).ldelim();
                 return writer;
             };
     
@@ -355,16 +331,6 @@
                             message.GuardianSignature = reader.bytes();
                             break;
                         }
-                    case 16: {
-                            message.Relayer = reader.bytes();
-                            break;
-                        }
-                    case 17: {
-                            if (!(message.InnerTransactions && message.InnerTransactions.length))
-                                message.InnerTransactions = [];
-                            message.InnerTransactions.push($root.proto.Transaction.decode(reader, reader.uint32()));
-                            break;
-                        }
                     default:
                         reader.skipType(tag & 7);
                         break;
@@ -445,18 +411,6 @@
                 if (message.GuardianSignature != null && message.hasOwnProperty("GuardianSignature"))
                     if (!(message.GuardianSignature && typeof message.GuardianSignature.length === "number" || $util.isString(message.GuardianSignature)))
                         return "GuardianSignature: buffer expected";
-                if (message.Relayer != null && message.hasOwnProperty("Relayer"))
-                    if (!(message.Relayer && typeof message.Relayer.length === "number" || $util.isString(message.Relayer)))
-                        return "Relayer: buffer expected";
-                if (message.InnerTransactions != null && message.hasOwnProperty("InnerTransactions")) {
-                    if (!Array.isArray(message.InnerTransactions))
-                        return "InnerTransactions: array expected";
-                    for (var i = 0; i < message.InnerTransactions.length; ++i) {
-                        var error = $root.proto.Transaction.verify(message.InnerTransactions[i]);
-                        if (error)
-                            return "InnerTransactions." + error;
-                    }
-                }
                 return null;
             };
     
@@ -553,21 +507,6 @@
                         $util.base64.decode(object.GuardianSignature, message.GuardianSignature = $util.newBuffer($util.base64.length(object.GuardianSignature)), 0);
                     else if (object.GuardianSignature.length >= 0)
                         message.GuardianSignature = object.GuardianSignature;
-                if (object.Relayer != null)
-                    if (typeof object.Relayer === "string")
-                        $util.base64.decode(object.Relayer, message.Relayer = $util.newBuffer($util.base64.length(object.Relayer)), 0);
-                    else if (object.Relayer.length >= 0)
-                        message.Relayer = object.Relayer;
-                if (object.InnerTransactions) {
-                    if (!Array.isArray(object.InnerTransactions))
-                        throw TypeError(".proto.Transaction.InnerTransactions: array expected");
-                    message.InnerTransactions = [];
-                    for (var i = 0; i < object.InnerTransactions.length; ++i) {
-                        if (typeof object.InnerTransactions[i] !== "object")
-                            throw TypeError(".proto.Transaction.InnerTransactions: object expected");
-                        message.InnerTransactions[i] = $root.proto.Transaction.fromObject(object.InnerTransactions[i]);
-                    }
-                }
                 return message;
             };
     
@@ -584,8 +523,6 @@
                 if (!options)
                     options = {};
                 var object = {};
-                if (options.arrays || options.defaults)
-                    object.InnerTransactions = [];
                 if (options.defaults) {
                     if ($util.Long) {
                         var long = new $util.Long(0, 0, true);
@@ -674,13 +611,6 @@
                         if (options.bytes !== Array)
                             object.GuardianSignature = $util.newBuffer(object.GuardianSignature);
                     }
-                    if (options.bytes === String)
-                        object.Relayer = "";
-                    else {
-                        object.Relayer = [];
-                        if (options.bytes !== Array)
-                            object.Relayer = $util.newBuffer(object.Relayer);
-                    }
                 }
                 if (message.Nonce != null && message.hasOwnProperty("Nonce"))
                     if (typeof message.Nonce === "number")
@@ -721,13 +651,6 @@
                     object.GuardianAddr = options.bytes === String ? $util.base64.encode(message.GuardianAddr, 0, message.GuardianAddr.length) : options.bytes === Array ? Array.prototype.slice.call(message.GuardianAddr) : message.GuardianAddr;
                 if (message.GuardianSignature != null && message.hasOwnProperty("GuardianSignature"))
                     object.GuardianSignature = options.bytes === String ? $util.base64.encode(message.GuardianSignature, 0, message.GuardianSignature.length) : options.bytes === Array ? Array.prototype.slice.call(message.GuardianSignature) : message.GuardianSignature;
-                if (message.Relayer != null && message.hasOwnProperty("Relayer"))
-                    object.Relayer = options.bytes === String ? $util.base64.encode(message.Relayer, 0, message.Relayer.length) : options.bytes === Array ? Array.prototype.slice.call(message.Relayer) : message.Relayer;
-                if (message.InnerTransactions && message.InnerTransactions.length) {
-                    object.InnerTransactions = [];
-                    for (var j = 0; j < message.InnerTransactions.length; ++j)
-                        object.InnerTransactions[j] = $root.proto.Transaction.toObject(message.InnerTransactions[j], options);
-                }
                 return object;
             };
     
diff --git a/src/proto/serializer.spec.ts b/src/proto/serializer.spec.ts
index 53ecfbb68..97a88b5ca 100644
--- a/src/proto/serializer.spec.ts
+++ b/src/proto/serializer.spec.ts
@@ -7,7 +7,6 @@ import { TokenTransfer } from "../tokens";
 import { Transaction } from "../transaction";
 import { TransactionPayload } from "../transactionPayload";
 import { ProtoSerializer } from "./serializer";
-import { TransactionComputer } from "../transactionComputer";
 
 describe("serialize transactions", () => {
     let wallets: Record<string, TestWallet>;
@@ -146,42 +145,4 @@ describe("serialize transactions", () => {
             "08cc011209000de0b6b3a76400001a200139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e12205616c6963652a20b2a11555ce521e4944e09ab17549d85b487dcd26c84b5017a39e31a3670889ba32056361726f6c388094ebdc0340d086035201545802624051e6cd78fb3ab4b53ff7ad6864df27cb4a56d70603332869d47a5cf6ea977c30e696103e41e8dddf2582996ad335229fdf4acb726564dbc1a0bc9e705b511f06",
         );
     });
-
-    it("serialize with inner transactions", async () => {
-        const innerTransaction = new Transaction({
-            nonce: 204,
-            value: "1000000000000000000",
-            sender: Address.fromBech32("erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8"),
-            receiver: Address.fromBech32("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"),
-            senderUsername: "carol",
-            receiverUsername: "alice",
-            gasLimit: 50000,
-            chainID: "T",
-        });
-
-        const signer = wallets.carol.signer;
-        const txComputer = new TransactionComputer();
-        innerTransaction.signature = await signer.sign(txComputer.computeBytesForSigning(innerTransaction));
-
-        const relayedTransaction = new Transaction({
-            nonce: 204,
-            value: "1000000000000000000",
-            sender: Address.fromBech32("erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8"),
-            receiver: Address.fromBech32("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"),
-            senderUsername: "carol",
-            receiverUsername: "alice",
-            gasLimit: 50000,
-            chainID: "T",
-            relayer: wallets["carol"].address.toBech32(),
-            innerTransactions: [innerTransaction],
-        });
-
-        relayedTransaction.signature = await signer.sign(txComputer.computeBytesForSigning(relayedTransaction));
-
-        const serializedTransaction = serializer.serializeTransaction(relayedTransaction);
-        assert.equal(
-            serializedTransaction.toString("hex"),
-            "08cc011209000de0b6b3a76400001a200139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e12205616c6963652a20b2a11555ce521e4944e09ab17549d85b487dcd26c84b5017a39e31a3670889ba32056361726f6c388094ebdc0340d0860352015458026240901a6a974d6ab36546e7881c6e0364ec4c61a891aa70e5eb60f818d6c92a39cfa0beac6fab73f503853cfe8fe6149b4be207ddb93788f8450d75a07fa8759d06820120b2a11555ce521e4944e09ab17549d85b487dcd26c84b5017a39e31a3670889ba8a01b10108cc011209000de0b6b3a76400001a200139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e12205616c6963652a20b2a11555ce521e4944e09ab17549d85b487dcd26c84b5017a39e31a3670889ba32056361726f6c388094ebdc0340d086035201545802624051e6cd78fb3ab4b53ff7ad6864df27cb4a56d70603332869d47a5cf6ea977c30e696103e41e8dddf2582996ad335229fdf4acb726564dbc1a0bc9e705b511f06",
-        );
-    });
 });
diff --git a/src/proto/serializer.ts b/src/proto/serializer.ts
index 2fff28ff1..2f46ee425 100644
--- a/src/proto/serializer.ts
+++ b/src/proto/serializer.ts
@@ -60,12 +60,6 @@ export class ProtoSerializer {
             protoTransaction.GuardianSignature = transaction.guardianSignature;
         }
 
-        if (transaction.relayer) {
-            protoTransaction.Relayer = new Address(transaction.relayer).getPublicKey();
-        }
-
-        protoTransaction.InnerTransactions = transaction.innerTransactions.map((tx) => this.convertToProtoMessage(tx));
-
         return protoTransaction;
     }
 
diff --git a/src/proto/transaction.proto b/src/proto/transaction.proto
index 90f4feecd..b3b7dfd1f 100644
--- a/src/proto/transaction.proto
+++ b/src/proto/transaction.proto
@@ -25,6 +25,4 @@ message Transaction {
 	uint32   Options                       = 13;
 	bytes    GuardianAddr                  = 14;
 	bytes    GuardianSignature             = 15;
-	bytes    Relayer                       = 16;
-	repeated Transaction InnerTransactions = 17;
 }
diff --git a/src/transaction.ts b/src/transaction.ts
index a602cca17..a8fad0a9d 100644
--- a/src/transaction.ts
+++ b/src/transaction.ts
@@ -102,16 +102,6 @@ export class Transaction {
      */
     public guardianSignature: Uint8Array;
 
-    /**
-     * The relayer in case it is a relayedV3 Transaction.
-     */
-    public relayer: string;
-
-    /**
-     * The inner transactions in case it is a relayedV3 Transaction.
-     */
-    public innerTransactions: ITransaction[];
-
     /**
      * Creates a new Transaction object.
      */
@@ -131,8 +121,6 @@ export class Transaction {
         guardian?: IAddress | string;
         signature?: Uint8Array;
         guardianSignature?: Uint8Array;
-        relayer?: string;
-        innerTransactions?: ITransaction[];
     }) {
         this.nonce = BigInt(options.nonce?.valueOf() || 0n);
         // We still rely on "bigNumber" for value, because client code might be passing a BigNumber object as a legacy "ITransactionValue",
@@ -152,9 +140,6 @@ export class Transaction {
 
         this.signature = options.signature || Buffer.from([]);
         this.guardianSignature = options.guardianSignature || Buffer.from([]);
-
-        this.relayer = options.relayer || "";
-        this.innerTransactions = options.innerTransactions || [];
     }
 
     private addressAsBech32(address: IAddress | string): string {
diff --git a/src/transactionComputer.ts b/src/transactionComputer.ts
index 1a835b04a..da365e7b2 100644
--- a/src/transactionComputer.ts
+++ b/src/transactionComputer.ts
@@ -122,10 +122,6 @@ export class TransactionComputer {
         obj.version = transaction.version;
         obj.options = transaction.options ? transaction.options : undefined;
         obj.guardian = transaction.guardian ? transaction.guardian : undefined;
-        obj.relayer = transaction.relayer ? transaction.relayer : undefined;
-        obj.innerTransactions = transaction.innerTransactions.length
-            ? transaction.innerTransactions.map((tx) => this.toPlainObject(tx, true))
-            : undefined;
 
         return obj;
     }
diff --git a/src/transactionsFactories/relayedTransactionsFactory.spec.ts b/src/transactionsFactories/relayedTransactionsFactory.spec.ts
index f45fac443..6c61d331a 100644
--- a/src/transactionsFactories/relayedTransactionsFactory.spec.ts
+++ b/src/transactionsFactories/relayedTransactionsFactory.spec.ts
@@ -275,69 +275,4 @@ describe("test relayed transactions factory", function () {
             "relayedTxV2@000000000000000000010000000000000000000000000000000000000002ffff@0f@676574436f6e7472616374436f6e666967@fc3ed87a51ee659f937c1a1ed11c1ae677e99629fae9cc289461f033e6514d1a8cfad1144ae9c1b70f28554d196bd6ba1604240c1c1dc19c959e96c1c3b62d0c",
         );
     });
-
-    it("should create relayed v3 transaction", async function () {
-        let innerTransaction = new Transaction({
-            sender: bob.address.toBech32(),
-            receiver: bob.address.toBech32(),
-            gasLimit: 50000n,
-            chainID: config.chainID,
-            nonce: 0n,
-            version: 2,
-            relayer: alice.address.toBech32(),
-        });
-
-        const serializedInnerTransaction = transactionComputer.computeBytesForSigning(innerTransaction);
-        innerTransaction.signature = await bob.signer.sign(serializedInnerTransaction);
-
-        const relayedTransaction = factory.createRelayedV3Transaction({
-            relayerAddress: alice.address,
-            innerTransactions: [innerTransaction],
-        });
-
-        const serializedRelayedTransaction = transactionComputer.computeBytesForSigning(relayedTransaction);
-        relayedTransaction.signature = await alice.signer.sign(serializedRelayedTransaction);
-
-        assert.equal(
-            Buffer.from(relayedTransaction.signature).toString("hex"),
-            "88b9bce6fe62a641fca593f95c12ad09032a44b34c9e5cf16d070f0563b1695bf9d452a9df52bce3373fd5e10ed96c3d65cd189f5873e3a3184a89f4980c9e0c",
-        );
-        assert.equal(relayedTransaction.gasLimit, 100000n);
-    });
-
-    it("should fail to create relayed v3 transaction", async function () {
-        assert.throws(() => {
-            factory.createRelayedV3Transaction({
-                relayerAddress: alice.address,
-                innerTransactions: [],
-            });
-        }, "No inner transctions provided");
-
-        const innerTransaction = new Transaction({
-            sender: bob.address.toBech32(),
-            receiver: bob.address.toBech32(),
-            gasLimit: 50000n,
-            chainID: config.chainID,
-            nonce: 0n,
-            version: 2,
-            relayer: carol.address.toBech32(),
-        });
-
-        assert.throws(() => {
-            factory.createRelayedV3Transaction({
-                relayerAddress: alice.address,
-                innerTransactions: [innerTransaction],
-            });
-        }, "Inner transaction is not signed");
-
-        const serializedInnerTransaction = transactionComputer.computeBytesForSigning(innerTransaction);
-        innerTransaction.signature = await bob.signer.sign(serializedInnerTransaction);
-
-        assert.throws(() => {
-            factory.createRelayedV3Transaction({
-                relayerAddress: alice.address,
-                innerTransactions: [innerTransaction],
-            });
-        }, "The inner transaction has an incorrect relayer address");
-    });
 });
diff --git a/src/transactionsFactories/relayedTransactionsFactory.ts b/src/transactionsFactories/relayedTransactionsFactory.ts
index 7464fc259..b69741025 100644
--- a/src/transactionsFactories/relayedTransactionsFactory.ts
+++ b/src/transactionsFactories/relayedTransactionsFactory.ts
@@ -84,36 +84,6 @@ export class RelayedTransactionsFactory {
         });
     }
 
-    createRelayedV3Transaction(options: { relayerAddress: IAddress; innerTransactions: ITransaction[] }): Transaction {
-        if (!options.innerTransactions.length) {
-            throw new ErrInvalidInnerTransaction("No inner transctions provided");
-        }
-
-        let innerTransactionsGasLimit = 0n;
-        for (const innerTx of options.innerTransactions) {
-            if (!innerTx.signature.length) {
-                throw new ErrInvalidInnerTransaction("Inner transaction is not signed");
-            }
-
-            if (innerTx.relayer !== options.relayerAddress.bech32()) {
-                throw new ErrInvalidInnerTransaction("The inner transaction has an incorrect relayer address");
-            }
-
-            innerTransactionsGasLimit += innerTx.gasLimit;
-        }
-
-        const moveBalanceGas = this.config.minGasLimit * BigInt(options.innerTransactions.length);
-        const gasLimit = moveBalanceGas + innerTransactionsGasLimit;
-
-        return new Transaction({
-            sender: options.relayerAddress.bech32(),
-            receiver: options.relayerAddress.bech32(),
-            chainID: this.config.chainID,
-            gasLimit: gasLimit,
-            innerTransactions: options.innerTransactions,
-        });
-    }
-
     private prepareInnerTransactionForRelayedV1(innerTransaction: ITransaction): string {
         const txObject = {
             nonce: innerTransaction.nonce,

From 3ce39e15141df1da445cdd86437d329845ff18be Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 21 Oct 2024 12:59:51 +0300
Subject: [PATCH 311/338] Bump version

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7a3ce04fb..12309342d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.9.0",
+  "version": "13.11.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.9.0",
+      "version": "13.11.0",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index 985a883c0..041873e0d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.9.0",
+  "version": "13.11.0",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",

From 47145abfed3968235f7aef663c8305067d4c6c24 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 21 Oct 2024 15:16:17 +0300
Subject: [PATCH 312/338] Make bip39 optional

---
 README.md              |  8 ++++++++
 package-lock.json      | 10 ++++++----
 package.json           |  6 +++---
 src/wallet/mnemonic.ts | 29 +++++++++++++++++++++++------
 4 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 3ed95086c..fbb658797 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,14 @@ This package requires `@multiversx/sdk-bls-wasm` for BLS (Boneh-Lynn-Shacham) cr
 npm install @multiversx/sdk-bls-wasm
 ```
 
+### bip39
+
+This package provides mnemonic and seed generation functionality using `bip39`, but it is not bundled by default. If you plan to use mnemonic-related features, make sure to install this optional dependency:
+
+```bash
+npm install bip39
+```
+
 ### Building the library
 
 In order to compile the library, run the following:
diff --git a/package-lock.json b/package-lock.json
index 86b115dcf..97c9d84a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,19 +1,18 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.10.0",
+  "version": "13.11.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.10.0",
+      "version": "13.11.0",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
         "@noble/ed25519": "1.7.3",
         "@noble/hashes": "1.3.0",
         "bech32": "1.1.4",
-        "bip39": "3.1.0",
         "blake2b": "2.1.3",
         "buffer": "6.0.3",
         "ed25519-hd-key": "1.1.2",
@@ -47,7 +46,8 @@
       },
       "optionalDependencies": {
         "@multiversx/sdk-bls-wasm": "0.3.5",
-        "axios": "^1.7.4"
+        "axios": "^1.7.4",
+        "bip39": "3.1.0"
       },
       "peerDependencies": {
         "bignumber.js": "^9.0.1",
@@ -947,6 +947,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.1.0.tgz",
       "integrity": "sha512-c9kiwdk45Do5GL0vJMe7tS95VjCii65mYAH7DfWl3uW8AVzXKQVUm64i3hzVybBDMp9r7j9iNxR85+ul8MdN/A==",
+      "optional": true,
       "dependencies": {
         "@noble/hashes": "^1.2.0"
       }
@@ -5868,6 +5869,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.1.0.tgz",
       "integrity": "sha512-c9kiwdk45Do5GL0vJMe7tS95VjCii65mYAH7DfWl3uW8AVzXKQVUm64i3hzVybBDMp9r7j9iNxR85+ul8MdN/A==",
+      "optional": true,
       "requires": {
         "@noble/hashes": "^1.2.0"
       }
diff --git a/package.json b/package.json
index ec8e434f4..d64a6d55e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.10.0",
+  "version": "13.11.0",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",
@@ -40,7 +40,6 @@
     "@multiversx/sdk-transaction-decoder": "1.0.2",
     "json-bigint": "1.0.0",
     "bech32": "1.1.4",
-    "bip39": "3.1.0",
     "blake2b": "2.1.3",
     "buffer": "6.0.3",
     "ed25519-hd-key": "1.1.2",
@@ -79,6 +78,7 @@
   },
   "optionalDependencies": {
     "axios": "^1.7.4",
-    "@multiversx/sdk-bls-wasm": "0.3.5"
+    "@multiversx/sdk-bls-wasm": "0.3.5",
+    "bip39": "3.1.0"
   }
 }
diff --git a/src/wallet/mnemonic.ts b/src/wallet/mnemonic.ts
index 8e4b2baa5..7d2024814 100644
--- a/src/wallet/mnemonic.ts
+++ b/src/wallet/mnemonic.ts
@@ -1,4 +1,3 @@
-import { entropyToMnemonic, generateMnemonic, mnemonicToEntropy, mnemonicToSeedSync, validateMnemonic } from "bip39";
 import { derivePath } from "ed25519-hd-key";
 import { ErrBadMnemonicEntropy, ErrWrongMnemonic } from "../errors";
 import { UserSecretKey } from "./userKeys";
@@ -6,6 +5,18 @@ import { UserSecretKey } from "./userKeys";
 const MNEMONIC_STRENGTH = 256;
 const BIP44_DERIVATION_PREFIX = "m/44'/508'/0'/0'";
 
+let bip39: any;
+
+function loadBip39() {
+    if (!bip39) {
+        try {
+            bip39 = require("bip39");
+        } catch (error) {
+            throw new Error("bip39 is required but not installed. Please install 'bip39' to use mnemonic features.");
+        }
+    }
+}
+
 export class Mnemonic {
     private readonly text: string;
 
@@ -14,11 +25,13 @@ export class Mnemonic {
     }
 
     static generate(): Mnemonic {
-        const text = generateMnemonic(MNEMONIC_STRENGTH);
+        loadBip39(); // Load bip39 when needed
+        const text = bip39.generateMnemonic(MNEMONIC_STRENGTH);
         return new Mnemonic(text);
     }
 
     static fromString(text: string) {
+        loadBip39(); // Load bip39 when needed
         text = text.trim();
 
         Mnemonic.assertTextIsValid(text);
@@ -26,8 +39,9 @@ export class Mnemonic {
     }
 
     static fromEntropy(entropy: Uint8Array): Mnemonic {
+        loadBip39(); // Load bip39 when needed
         try {
-            const text = entropyToMnemonic(Buffer.from(entropy));
+            const text = bip39.entropyToMnemonic(Buffer.from(entropy));
             return new Mnemonic(text);
         } catch (err: any) {
             throw new ErrBadMnemonicEntropy(err);
@@ -35,7 +49,8 @@ export class Mnemonic {
     }
 
     public static assertTextIsValid(text: string) {
-        let isValid = validateMnemonic(text);
+        loadBip39(); // Load bip39 when needed
+        let isValid = bip39.validateMnemonic(text);
 
         if (!isValid) {
             throw new ErrWrongMnemonic();
@@ -43,7 +58,8 @@ export class Mnemonic {
     }
 
     deriveKey(addressIndex: number = 0, password: string = ""): UserSecretKey {
-        let seed = mnemonicToSeedSync(this.text, password);
+        loadBip39(); // Load bip39 when needed
+        let seed = bip39.mnemonicToSeedSync(this.text, password);
         let derivationPath = `${BIP44_DERIVATION_PREFIX}/${addressIndex}'`;
         let derivationResult = derivePath(derivationPath, seed.toString("hex"));
         let key = derivationResult.key;
@@ -55,7 +71,8 @@ export class Mnemonic {
     }
 
     getEntropy(): Uint8Array {
-        const entropy = mnemonicToEntropy(this.text);
+        loadBip39(); // Load bip39 when needed
+        const entropy = bip39.mnemonicToEntropy(this.text);
         return Buffer.from(entropy, "hex");
     }
 

From 9393d4f61926c56ead6991a4104ec98c10e69609 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 21 Oct 2024 15:16:50 +0300
Subject: [PATCH 313/338] Bump version

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 97c9d84a5..c5cb620bb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.11.0",
+  "version": "13.12.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.11.0",
+      "version": "13.12.0",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index d64a6d55e..72bc3ceaf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.11.0",
+  "version": "13.12.0",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",

From f920ae61249a4288c3a292753783dc72822fdf33 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 21 Oct 2024 15:30:42 +0300
Subject: [PATCH 314/338] Remove redundant comment

---
 src/wallet/mnemonic.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/wallet/mnemonic.ts b/src/wallet/mnemonic.ts
index 7d2024814..77c397b4c 100644
--- a/src/wallet/mnemonic.ts
+++ b/src/wallet/mnemonic.ts
@@ -7,6 +7,7 @@ const BIP44_DERIVATION_PREFIX = "m/44'/508'/0'/0'";
 
 let bip39: any;
 
+// Load bip39 when needed
 function loadBip39() {
     if (!bip39) {
         try {
@@ -25,13 +26,13 @@ export class Mnemonic {
     }
 
     static generate(): Mnemonic {
-        loadBip39(); // Load bip39 when needed
+        loadBip39();
         const text = bip39.generateMnemonic(MNEMONIC_STRENGTH);
         return new Mnemonic(text);
     }
 
     static fromString(text: string) {
-        loadBip39(); // Load bip39 when needed
+        loadBip39();
         text = text.trim();
 
         Mnemonic.assertTextIsValid(text);
@@ -39,7 +40,7 @@ export class Mnemonic {
     }
 
     static fromEntropy(entropy: Uint8Array): Mnemonic {
-        loadBip39(); // Load bip39 when needed
+        loadBip39();
         try {
             const text = bip39.entropyToMnemonic(Buffer.from(entropy));
             return new Mnemonic(text);
@@ -49,7 +50,7 @@ export class Mnemonic {
     }
 
     public static assertTextIsValid(text: string) {
-        loadBip39(); // Load bip39 when needed
+        loadBip39();
         let isValid = bip39.validateMnemonic(text);
 
         if (!isValid) {
@@ -58,7 +59,7 @@ export class Mnemonic {
     }
 
     deriveKey(addressIndex: number = 0, password: string = ""): UserSecretKey {
-        loadBip39(); // Load bip39 when needed
+        loadBip39();
         let seed = bip39.mnemonicToSeedSync(this.text, password);
         let derivationPath = `${BIP44_DERIVATION_PREFIX}/${addressIndex}'`;
         let derivationResult = derivePath(derivationPath, seed.toString("hex"));
@@ -71,7 +72,7 @@ export class Mnemonic {
     }
 
     getEntropy(): Uint8Array {
-        loadBip39(); // Load bip39 when needed
+        loadBip39();
         const entropy = bip39.mnemonicToEntropy(this.text);
         return Buffer.from(entropy, "hex");
     }

From ced12ce99c79bf66db85ab1da089646c8beaa7bb Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 21 Oct 2024 16:21:34 +0300
Subject: [PATCH 315/338] Remove inner transaction and relayer field

---
 src/networkProviders/providers.dev.net.spec.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/networkProviders/providers.dev.net.spec.ts b/src/networkProviders/providers.dev.net.spec.ts
index b95994cb8..d08e5b4f7 100644
--- a/src/networkProviders/providers.dev.net.spec.ts
+++ b/src/networkProviders/providers.dev.net.spec.ts
@@ -452,8 +452,6 @@ describe("test network providers on devnet: Proxy and API", function () {
             guardian: "",
             guardianSignature: new Uint8Array(),
             options: 0,
-            relayer: "",
-            innerTransactions: [],
         };
 
         const apiLegacyTxHash = await apiProvider.sendTransaction(transaction);

From 17fe9af9eceb167061ef23125f04c89f7a0eca4b Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 28 Oct 2024 14:53:20 +0200
Subject: [PATCH 316/338] Bump version and update export

---
 package-lock.json   | 4 ++--
 package.json        | 2 +-
 src/wallet/index.ts | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c5cb620bb..3fe6713c9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.12.0",
+  "version": "13.13.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.12.0",
+      "version": "13.13.0",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index 72bc3ceaf..a68e5f55e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.12.0",
+  "version": "13.13.0",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",
diff --git a/src/wallet/index.ts b/src/wallet/index.ts
index af9ecec6a..7207e0c14 100644
--- a/src/wallet/index.ts
+++ b/src/wallet/index.ts
@@ -1,3 +1,4 @@
+export * from "./crypto";
 export * from "./mnemonic";
 export * from "./pem";
 export * from "./userKeys";

From 0f82f378ecdf18c7ed3df6599fab0c1686cf2b46 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 28 Oct 2024 14:54:27 +0200
Subject: [PATCH 317/338] Update versions

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3fe6713c9..23228e33b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1779,9 +1779,9 @@
       }
     },
     "node_modules/elliptic": {
-      "version": "6.5.7",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz",
-      "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.0.tgz",
+      "integrity": "sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==",
       "dev": true,
       "dependencies": {
         "bn.js": "^4.11.9",
@@ -6586,9 +6586,9 @@
       }
     },
     "elliptic": {
-      "version": "6.5.7",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz",
-      "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.0.tgz",
+      "integrity": "sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==",
       "dev": true,
       "requires": {
         "bn.js": "^4.11.9",

From 1613d0b525ffc5d49e0d726a213c4ca02512d33d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 30 Oct 2024 14:53:41 +0200
Subject: [PATCH 318/338] Fix decoding of code metadata.

---
 package-lock.json                        | 4 ++--
 package.json                             | 2 +-
 src/smartcontracts/codeMetadata.ts       | 7 ++++---
 src/smartcontracts/codec/codemetadata.ts | 8 +++-----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 23228e33b..96c747938 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.13.0",
+  "version": "13.13.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.13.0",
+      "version": "13.13.1",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index a68e5f55e..0bc0b4cbb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.13.0",
+  "version": "13.13.1",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",
diff --git a/src/smartcontracts/codeMetadata.ts b/src/smartcontracts/codeMetadata.ts
index 9d2fa2bc2..7efff036a 100644
--- a/src/smartcontracts/codeMetadata.ts
+++ b/src/smartcontracts/codeMetadata.ts
@@ -1,3 +1,5 @@
+export const CodeMetadataLength = 2;
+
 /**
  * The metadata of a Smart Contract, as an abstraction.
  */
@@ -6,7 +8,6 @@ export class CodeMetadata {
     public readable: boolean;
     public payable: boolean;
     public payableBySc: boolean;
-    private static readonly codeMetadataLength = 2;
 
     static ByteZero = {
         Upgradeable: 1,
@@ -48,8 +49,8 @@ export class CodeMetadata {
      * Creates a metadata object from a buffer.
      */
     static fromBuffer(buffer: Buffer): CodeMetadata {
-        if (buffer.length < this.codeMetadataLength) {
-            throw new Error("Buffer is too short.");
+        if (buffer.length != CodeMetadataLength) {
+            throw new Error(`code metadata buffer has length ${buffer.length}, expected ${CodeMetadataLength}`);
         }
 
         const byteZero = buffer[0];
diff --git a/src/smartcontracts/codec/codemetadata.ts b/src/smartcontracts/codec/codemetadata.ts
index a631502d9..e5502ad8e 100644
--- a/src/smartcontracts/codec/codemetadata.ts
+++ b/src/smartcontracts/codec/codemetadata.ts
@@ -1,16 +1,14 @@
-import { CodeMetadata } from "../codeMetadata";
+import { CodeMetadata, CodeMetadataLength } from "../codeMetadata";
 import { CodeMetadataValue } from "../typesystem/codeMetadata";
 
 export class CodeMetadataCodec {
     decodeNested(buffer: Buffer): [CodeMetadataValue, number] {
-        const codeMetadata = CodeMetadata.fromBuffer(buffer);
-
-        return [new CodeMetadataValue(codeMetadata), length];
+        const codeMetadata = CodeMetadata.fromBuffer(buffer.slice(0, CodeMetadataLength));
+        return [new CodeMetadataValue(codeMetadata), CodeMetadataLength];
     }
 
     decodeTopLevel(buffer: Buffer): CodeMetadataValue {
         const codeMetadata = CodeMetadata.fromBuffer(buffer);
-
         return new CodeMetadataValue(codeMetadata);
     }
 

From ee6dd3a9eab4672e74ef2c98c3125e0b96a841f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= <andrei.bancioiu@gmail.com>
Date: Wed, 30 Oct 2024 14:57:06 +0200
Subject: [PATCH 319/338] Fix error message.

---
 src/smartcontracts/codeMetadata.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/smartcontracts/codeMetadata.spec.ts b/src/smartcontracts/codeMetadata.spec.ts
index 7b0eab88c..7d184c4eb 100644
--- a/src/smartcontracts/codeMetadata.spec.ts
+++ b/src/smartcontracts/codeMetadata.spec.ts
@@ -63,7 +63,7 @@ describe("CodeMetadata Class Tests", function () {
                 CodeMetadata.fromBuffer(buffer);
             },
             Error,
-            "Buffer is too short.",
+            "code metadata buffer has length 1, expected 2",
         );
     });
 

From 7e472da95dd4837400cbb643f6c7f7989569944f Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 4 Nov 2024 22:33:50 +0200
Subject: [PATCH 320/338] Simplify Network Provider, withResults default true

---
 src/networkProviders/proxyNetworkProvider.ts | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/networkProviders/proxyNetworkProvider.ts b/src/networkProviders/proxyNetworkProvider.ts
index e62327ea4..3762f0b79 100644
--- a/src/networkProviders/proxyNetworkProvider.ts
+++ b/src/networkProviders/proxyNetworkProvider.ts
@@ -122,21 +122,10 @@ export class ProxyNetworkProvider implements INetworkProvider {
         return tokenData;
     }
 
-    async getTransaction(txHash: string, withProcessStatus?: boolean): Promise<TransactionOnNetwork> {
-        let processStatusPromise: Promise<TransactionStatus> | undefined;
-
-        if (withProcessStatus === true) {
-            processStatusPromise = this.getTransactionStatus(txHash);
-        }
-
+    async getTransaction(txHash: string, _?: boolean): Promise<TransactionOnNetwork> {
         const url = this.buildUrlWithQueryParameters(`transaction/${txHash}`, { withResults: "true" });
-        const response = await this.doGetGeneric(url);
-
-        if (processStatusPromise) {
-            const processStatus = await processStatusPromise;
-            return TransactionOnNetwork.fromProxyHttpResponse(txHash, response.transaction, processStatus);
-        }
-        return TransactionOnNetwork.fromProxyHttpResponse(txHash, response.transaction);
+        const [data, status] = await Promise.all([this.doGetGeneric(url), this.getTransactionStatus(txHash)]);
+        return TransactionOnNetwork.fromProxyHttpResponse(txHash, data.transaction, status);
     }
 
     async getTransactionStatus(txHash: string): Promise<TransactionStatus> {

From 451f816752b435a46cb7330c73a46861dd6d2455 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 4 Nov 2024 23:26:56 +0200
Subject: [PATCH 321/338] Fix Esdt transfer for egld

---
 .../transferTransactionsFactory.spec.ts       | 21 +++++++
 .../transferTransactionsFactory.ts            | 63 ++++++++++++++-----
 2 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/src/transactionsFactories/transferTransactionsFactory.spec.ts b/src/transactionsFactories/transferTransactionsFactory.spec.ts
index 1296be14f..96b55bff3 100644
--- a/src/transactionsFactories/transferTransactionsFactory.spec.ts
+++ b/src/transactionsFactories/transferTransactionsFactory.spec.ts
@@ -1,5 +1,6 @@
 import { assert } from "chai";
 import { Address } from "../address";
+import { EGLD_IDENTIFIER_FOR_MULTI_ESDTNFT_TRANSFER } from "../constants";
 import { ErrBadUsage } from "../errors";
 import { Token, TokenTransfer } from "../tokens";
 import { TransactionsFactoryConfig } from "./transactionsFactoryConfig";
@@ -205,4 +206,24 @@ describe("test transfer transactions factory", function () {
             "MultiESDTNFTTransfer@8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8@03@4e46542d313233343536@0a@01@544553542d393837363534@01@01@45474c442d303030303030@@0de0b6b3a7640000",
         );
     });
+
+    it("should create multi transfer for egld", async () => {
+        const firstNft = new Token({ identifier: EGLD_IDENTIFIER_FOR_MULTI_ESDTNFT_TRANSFER });
+        const firstTransfer = new TokenTransfer({ token: firstNft, amount: 1000000000000000000n });
+
+        const transaction = transferFactory.createTransactionForESDTTokenTransfer({
+            sender: alice,
+            receiver: bob,
+            tokenTransfers: [firstTransfer],
+        });
+
+        assert.equal(transaction.sender, alice.toBech32());
+        assert.equal(transaction.receiver, alice.toBech32());
+        assert.equal(transaction.value.valueOf(), 0n);
+        assert.equal(transaction.gasLimit.valueOf(), 1_243_500n);
+        assert.deepEqual(
+            transaction.data.toString(),
+            "MultiESDTNFTTransfer@8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8@01@45474c442d303030303030@@0de0b6b3a7640000",
+        );
+    });
 });
diff --git a/src/transactionsFactories/transferTransactionsFactory.ts b/src/transactionsFactories/transferTransactionsFactory.ts
index 834fa6dd8..84dcf2a63 100644
--- a/src/transactionsFactories/transferTransactionsFactory.ts
+++ b/src/transactionsFactories/transferTransactionsFactory.ts
@@ -1,3 +1,4 @@
+import { EGLD_IDENTIFIER_FOR_MULTI_ESDTNFT_TRANSFER } from "../constants";
 import { Err, ErrBadUsage } from "../errors";
 import {
     IAddress,
@@ -125,15 +126,11 @@ export class TransferTransactionsFactory {
             return this.createSingleESDTTransferTransaction(options);
         }
 
-        const dataParts = this.tokenTransfersDataBuilder!.buildDataPartsForMultiESDTNFTTransfer(
-            options.receiver,
+        const { dataParts, extraGasForTransfer } = this.buildMultiESDTNFTTransferData(
             options.tokenTransfers,
+            options.receiver,
         );
 
-        const extraGasForTransfer =
-            this.config!.gasLimitMultiESDTNFTTransfer * BigInt(numberOfTransfers) +
-            BigInt(ADDITIONAL_GAS_FOR_ESDT_NFT_TRANSFER);
-
         return new TransactionBuilder({
             config: this.config!,
             sender: options.sender,
@@ -366,19 +363,9 @@ export class TransferTransactionsFactory {
     }): Transaction {
         this.ensureConfigIsDefined();
 
-        let dataParts: string[] = [];
         const transfer = options.tokenTransfers[0];
-        let extraGasForTransfer = 0n;
-        let receiver = options.receiver;
 
-        if (this.tokenComputer!.isFungible(transfer.token)) {
-            dataParts = this.tokenTransfersDataBuilder!.buildDataPartsForESDTTransfer(transfer);
-            extraGasForTransfer = this.config!.gasLimitESDTTransfer + BigInt(ADDITIONAL_GAS_FOR_ESDT_TRANSFER);
-        } else {
-            dataParts = this.tokenTransfersDataBuilder!.buildDataPartsForSingleESDTNFTTransfer(transfer, receiver);
-            extraGasForTransfer = this.config!.gasLimitESDTNFTTransfer + BigInt(ADDITIONAL_GAS_FOR_ESDT_NFT_TRANSFER);
-            receiver = options.sender;
-        }
+        const { dataParts, extraGasForTransfer, receiver } = this.buildTransferData(transfer, options);
 
         return new TransactionBuilder({
             config: this.config!,
@@ -390,6 +377,48 @@ export class TransferTransactionsFactory {
         }).build();
     }
 
+    private buildTransferData(transfer: TokenTransfer, options: { sender: IAddress; receiver: IAddress }) {
+        let dataParts: string[] = [];
+        let extraGasForTransfer: bigint;
+        let receiver = options.receiver;
+
+        if (this.tokenComputer!.isFungible(transfer.token)) {
+            if (transfer.token.identifier === EGLD_IDENTIFIER_FOR_MULTI_ESDTNFT_TRANSFER) {
+                ({ dataParts, extraGasForTransfer } = this.buildMultiESDTNFTTransferData([transfer], receiver));
+                receiver = options.sender;
+            } else {
+                ({ dataParts, extraGasForTransfer } = this.buildESDTTransferData(transfer));
+            }
+        } else {
+            ({ dataParts, extraGasForTransfer } = this.buildSingleESDTNFTTransferData(transfer, receiver));
+            receiver = options.sender; // Override receiver for non-fungible tokens
+        }
+        return { dataParts, extraGasForTransfer, receiver };
+    }
+
+    private buildMultiESDTNFTTransferData(transfer: TokenTransfer[], receiver: IAddress) {
+        return {
+            dataParts: this.tokenTransfersDataBuilder!.buildDataPartsForMultiESDTNFTTransfer(receiver, transfer),
+            extraGasForTransfer:
+                this.config!.gasLimitMultiESDTNFTTransfer * BigInt(transfer.length) +
+                BigInt(ADDITIONAL_GAS_FOR_ESDT_NFT_TRANSFER),
+        };
+    }
+
+    private buildESDTTransferData(transfer: TokenTransfer) {
+        return {
+            dataParts: this.tokenTransfersDataBuilder!.buildDataPartsForESDTTransfer(transfer),
+            extraGasForTransfer: this.config!.gasLimitESDTTransfer + BigInt(ADDITIONAL_GAS_FOR_ESDT_TRANSFER),
+        };
+    }
+
+    private buildSingleESDTNFTTransferData(transfer: TokenTransfer, receiver: IAddress) {
+        return {
+            dataParts: this.tokenTransfersDataBuilder!.buildDataPartsForSingleESDTNFTTransfer(transfer, receiver),
+            extraGasForTransfer: this.config!.gasLimitESDTNFTTransfer + BigInt(ADDITIONAL_GAS_FOR_ESDT_NFT_TRANSFER),
+        };
+    }
+
     private computeGasForMoveBalance(config: IConfig, data: Uint8Array): bigint {
         return config.minGasLimit + config.gasLimitPerByte * BigInt(data.length);
     }

From 27a83bdbc27c76f6878e2d5717cd34c8cdec26b4 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 7 Nov 2024 15:50:33 +0200
Subject: [PATCH 322/338] Add handling for esdt prefix

---
 src/tokens.ts                                 | 31 +++++--
 .../transferTransactionsFactory.spec.ts       | 90 +++++++++++++++++++
 2 files changed, 116 insertions(+), 5 deletions(-)

diff --git a/src/tokens.ts b/src/tokens.ts
index 62b22a04e..1fe5ad593 100644
--- a/src/tokens.ts
+++ b/src/tokens.ts
@@ -1,6 +1,6 @@
 import BigNumber from "bignumber.js";
-import { ErrInvalidArgument, ErrInvalidTokenIdentifier } from "./errors";
 import { EGLD_IDENTIFIER_FOR_MULTI_ESDTNFT_TRANSFER } from "./constants";
+import { ErrInvalidArgument, ErrInvalidTokenIdentifier } from "./errors";
 
 // Legacy constants:
 const EGLDTokenIdentifier = "EGLD";
@@ -249,19 +249,31 @@ export class TokenComputer {
 
     extractIdentifierFromExtendedIdentifier(identifier: string): string {
         const parts = identifier.split("-");
+        const { prefix, ticker, randomnes } = this.splitIdentifierIntoComponent(parts);
 
         this.checkIfExtendedIdentifierWasProvided(parts);
-        this.ensureTokenTickerValidity(parts[0]);
-        this.checkLengthOfRandomSequence(parts[1]);
-
+        this.ensureTokenTickerValidity(ticker);
+        this.checkLengthOfRandomSequence(randomnes);
+        if (parts.length === 3) {
+            this.checkLengthOfPrefix(prefix);
+            return prefix + "-" + ticker + "-" + randomnes;
+        }
         return parts[0] + "-" + parts[1];
     }
 
+    splitIdentifierIntoComponent(parts: string[]): { prefix: any; ticker: any; randomnes: any } {
+        if (parts.length === 3) {
+            return { prefix: parts[0], ticker: parts[1], randomnes: parts[2] };
+        }
+
+        return { prefix: null, ticker: parts[0], randomnes: parts[1] };
+    }
+
     private checkIfExtendedIdentifierWasProvided(tokenParts: string[]): void {
         //  this is for the identifiers of fungible tokens
         const MIN_EXTENDED_IDENTIFIER_LENGTH_IF_SPLITTED = 2;
         //  this is for the identifiers of nft, sft and meta-esdt
-        const MAX_EXTENDED_IDENTIFIER_LENGTH_IF_SPLITTED = 3;
+        const MAX_EXTENDED_IDENTIFIER_LENGTH_IF_SPLITTED = 5;
 
         if (
             tokenParts.length < MIN_EXTENDED_IDENTIFIER_LENGTH_IF_SPLITTED ||
@@ -281,6 +293,15 @@ export class TokenComputer {
         }
     }
 
+    private checkLengthOfPrefix(prefix: string): void {
+        const TOKEN_PREFIX_LENGTH = 4;
+        if (prefix && prefix.length > TOKEN_PREFIX_LENGTH) {
+            throw new ErrInvalidTokenIdentifier(
+                "The identifier is not valid. The prefix does not have the right length",
+            );
+        }
+    }
+
     private ensureTokenTickerValidity(ticker: string) {
         const MIN_TICKER_LENGTH = 3;
         const MAX_TICKER_LENGTH = 10;
diff --git a/src/transactionsFactories/transferTransactionsFactory.spec.ts b/src/transactionsFactories/transferTransactionsFactory.spec.ts
index 96b55bff3..f3b5ad025 100644
--- a/src/transactionsFactories/transferTransactionsFactory.spec.ts
+++ b/src/transactionsFactories/transferTransactionsFactory.spec.ts
@@ -97,6 +97,41 @@ describe("test transfer transactions factory", function () {
         );
     });
 
+    it("should create 'Transaction' for nft transfer with prefix", async () => {
+        const nft = new Token({ identifier: "t0-NFT-123456", nonce: 10n });
+        const transfer = new TokenTransfer({ token: nft, amount: 1n });
+
+        const transaction = transferFactory.createTransactionForESDTTokenTransfer({
+            sender: alice,
+            receiver: bob,
+            tokenTransfers: [transfer],
+        });
+
+        assert.equal(transaction.sender, alice.toBech32());
+        assert.equal(transaction.receiver, alice.toBech32());
+        assert.equal(transaction.value.valueOf(), 0n);
+        assert.equal(transaction.gasLimit.valueOf(), 1219500n);
+        assert.deepEqual(
+            transaction.data.toString(),
+            "ESDTNFTTransfer@74302d4e46542d313233343536@0a@01@8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8",
+        );
+    });
+
+    it("should fail if prefix longer than expected", async () => {
+        const nft = new Token({ identifier: "prefix-NFT-123456", nonce: 10n });
+        const transfer = new TokenTransfer({ token: nft, amount: 1n });
+
+        assert.throw(
+            () =>
+                transferFactory.createTransactionForESDTTokenTransfer({
+                    sender: alice,
+                    receiver: bob,
+                    tokenTransfers: [transfer],
+                }),
+            "The identifier is not valid. The prefix does not have the right length",
+        );
+    });
+
     it("should create 'Transaction' for multiple nft transfers", async () => {
         const firstNft = new Token({ identifier: "NFT-123456", nonce: 10n });
         const firstTransfer = new TokenTransfer({ token: firstNft, amount: 1n });
@@ -128,6 +163,37 @@ describe("test transfer transactions factory", function () {
         assert.deepEqual(transaction, secondTransaction);
     });
 
+    it("should create 'Transaction' for multiple nft transfers with prefix", async () => {
+        const firstNft = new Token({ identifier: "t0-NFT-123456", nonce: 10n });
+        const firstTransfer = new TokenTransfer({ token: firstNft, amount: 1n });
+
+        const secondNft = new Token({ identifier: "t0-TEST-987654", nonce: 1n });
+        const secondTransfer = new TokenTransfer({ token: secondNft, amount: 1n });
+
+        const transaction = transferFactory.createTransactionForESDTTokenTransfer({
+            sender: alice,
+            receiver: bob,
+            tokenTransfers: [firstTransfer, secondTransfer],
+        });
+
+        assert.equal(transaction.sender, alice.toBech32());
+        assert.equal(transaction.receiver, alice.toBech32());
+        assert.equal(transaction.value.valueOf(), 0n);
+        assert.equal(transaction.gasLimit.valueOf(), 1484000n);
+        assert.deepEqual(
+            transaction.data.toString(),
+            "MultiESDTNFTTransfer@8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8@02@74302d4e46542d313233343536@0a@01@74302d544553542d393837363534@01@01",
+        );
+
+        const secondTransaction = transferFactory.createTransactionForTransfer({
+            sender: alice,
+            receiver: bob,
+            tokenTransfers: [firstTransfer, secondTransfer],
+        });
+
+        assert.deepEqual(transaction, secondTransaction);
+    });
+
     it("should fail to create transaction for token transfers", async () => {
         assert.throws(() => {
             const nft = new Token({ identifier: "NFT-123456", nonce: 10n });
@@ -207,6 +273,30 @@ describe("test transfer transactions factory", function () {
         );
     });
 
+    it("should create transaction for token transfers with prefix", async () => {
+        const firstNft = new Token({ identifier: "t0-NFT-123456", nonce: 10n });
+        const firstTransfer = new TokenTransfer({ token: firstNft, amount: 1n });
+
+        const secondNft = new Token({ identifier: "t0-TEST-987654", nonce: 1n });
+        const secondTransfer = new TokenTransfer({ token: secondNft, amount: 1n });
+
+        const transaction = transferFactory.createTransactionForTransfer({
+            sender: alice,
+            receiver: bob,
+            nativeAmount: 1000000000000000000n,
+            tokenTransfers: [firstTransfer, secondTransfer],
+        });
+
+        assert.equal(transaction.sender, alice.toBech32());
+        assert.equal(transaction.receiver, alice.toBech32());
+        assert.equal(transaction.value.valueOf(), 0n);
+        assert.equal(transaction.gasLimit.valueOf(), 1745500n);
+        assert.deepEqual(
+            transaction.data.toString(),
+            "MultiESDTNFTTransfer@8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8@03@74302d4e46542d313233343536@0a@01@74302d544553542d393837363534@01@01@45474c442d303030303030@@0de0b6b3a7640000",
+        );
+    });
+
     it("should create multi transfer for egld", async () => {
         const firstNft = new Token({ identifier: EGLD_IDENTIFIER_FOR_MULTI_ESDTNFT_TRANSFER });
         const firstTransfer = new TokenTransfer({ token: firstNft, amount: 1000000000000000000n });

From 038b4a0a3a91756e9dd38641c75399c4bfe2394d Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 7 Nov 2024 15:53:46 +0200
Subject: [PATCH 323/338] Bump version

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 96c747938..7a4489a3d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.13.1",
+  "version": "13.14.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.13.1",
+      "version": "13.14.0",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index 0bc0b4cbb..7782f9dea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.13.1",
+  "version": "13.14.0",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",

From a5644866f19808bd9dc881b459d362e485fe99ce Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 7 Nov 2024 16:49:29 +0200
Subject: [PATCH 324/338] Fix split extended identifier

---
 src/tokens.spec.ts                               | 16 ++++++++++++++++
 src/tokens.ts                                    | 10 +++++-----
 .../transferTransactionsFactory.spec.ts          | 15 ---------------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/tokens.spec.ts b/src/tokens.spec.ts
index 9a415815b..5c229cd75 100644
--- a/src/tokens.spec.ts
+++ b/src/tokens.spec.ts
@@ -27,10 +27,26 @@ describe("test tokens and token computer", async () => {
         let identifier = tokenComputer.extractIdentifierFromExtendedIdentifier(extendedIdentifier);
         assert.equal(identifier, "TEST-123456");
 
+        const extendedIdentifierWithPrefix = "t0-TEST-123456-0a";
+        identifier = tokenComputer.extractIdentifierFromExtendedIdentifier(extendedIdentifierWithPrefix);
+        assert.equal(identifier, "t0-TEST-123456");
+
+        const extendedIdentifierWithPrefixWithoutNonce = "t0-TEST-123456";
+        identifier = tokenComputer.extractIdentifierFromExtendedIdentifier(extendedIdentifierWithPrefixWithoutNonce);
+        assert.equal(identifier, "t0-TEST-123456");
+
         const fungibleTokenIdentifier = "FNG-123456";
         identifier = tokenComputer.extractIdentifierFromExtendedIdentifier(fungibleTokenIdentifier);
         assert.equal(identifier, "FNG-123456");
     });
+
+    it("should fail if prefix longer than expected", async () => {
+        const nftIdentifier = "prefix-TEST-123456";
+        assert.throw(
+            () => tokenComputer.extractIdentifierFromExtendedIdentifier(nftIdentifier),
+            "The identifier is not valid. The prefix does not have the right length",
+        );
+    });
 });
 
 describe("test token transfer (legacy)", () => {
diff --git a/src/tokens.ts b/src/tokens.ts
index 1fe5ad593..5cdc1354c 100644
--- a/src/tokens.ts
+++ b/src/tokens.ts
@@ -254,15 +254,15 @@ export class TokenComputer {
         this.checkIfExtendedIdentifierWasProvided(parts);
         this.ensureTokenTickerValidity(ticker);
         this.checkLengthOfRandomSequence(randomnes);
-        if (parts.length === 3) {
+        if (prefix) {
             this.checkLengthOfPrefix(prefix);
             return prefix + "-" + ticker + "-" + randomnes;
         }
-        return parts[0] + "-" + parts[1];
+        return ticker + "-" + randomnes;
     }
 
     splitIdentifierIntoComponent(parts: string[]): { prefix: any; ticker: any; randomnes: any } {
-        if (parts.length === 3) {
+        if (parts.length >= 3 && parts[2].length === 6) {
             return { prefix: parts[0], ticker: parts[1], randomnes: parts[2] };
         }
 
@@ -273,7 +273,7 @@ export class TokenComputer {
         //  this is for the identifiers of fungible tokens
         const MIN_EXTENDED_IDENTIFIER_LENGTH_IF_SPLITTED = 2;
         //  this is for the identifiers of nft, sft and meta-esdt
-        const MAX_EXTENDED_IDENTIFIER_LENGTH_IF_SPLITTED = 5;
+        const MAX_EXTENDED_IDENTIFIER_LENGTH_IF_SPLITTED = 4;
 
         if (
             tokenParts.length < MIN_EXTENDED_IDENTIFIER_LENGTH_IF_SPLITTED ||
@@ -295,7 +295,7 @@ export class TokenComputer {
 
     private checkLengthOfPrefix(prefix: string): void {
         const TOKEN_PREFIX_LENGTH = 4;
-        if (prefix && prefix.length > TOKEN_PREFIX_LENGTH) {
+        if (prefix.length > TOKEN_PREFIX_LENGTH) {
             throw new ErrInvalidTokenIdentifier(
                 "The identifier is not valid. The prefix does not have the right length",
             );
diff --git a/src/transactionsFactories/transferTransactionsFactory.spec.ts b/src/transactionsFactories/transferTransactionsFactory.spec.ts
index f3b5ad025..6a7581c3e 100644
--- a/src/transactionsFactories/transferTransactionsFactory.spec.ts
+++ b/src/transactionsFactories/transferTransactionsFactory.spec.ts
@@ -117,21 +117,6 @@ describe("test transfer transactions factory", function () {
         );
     });
 
-    it("should fail if prefix longer than expected", async () => {
-        const nft = new Token({ identifier: "prefix-NFT-123456", nonce: 10n });
-        const transfer = new TokenTransfer({ token: nft, amount: 1n });
-
-        assert.throw(
-            () =>
-                transferFactory.createTransactionForESDTTokenTransfer({
-                    sender: alice,
-                    receiver: bob,
-                    tokenTransfers: [transfer],
-                }),
-            "The identifier is not valid. The prefix does not have the right length",
-        );
-    });
-
     it("should create 'Transaction' for multiple nft transfers", async () => {
         const firstNft = new Token({ identifier: "NFT-123456", nonce: 10n });
         const firstTransfer = new TokenTransfer({ token: firstNft, amount: 1n });

From e3ab881cd117686741eb5f456257eb750361956a Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 7 Nov 2024 17:13:06 +0200
Subject: [PATCH 325/338] Fix typo, extract constants

---
 src/tokens.ts | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/tokens.ts b/src/tokens.ts
index 5cdc1354c..78d16e48a 100644
--- a/src/tokens.ts
+++ b/src/tokens.ts
@@ -226,6 +226,7 @@ export class TokenTransfer {
 }
 
 export class TokenComputer {
+    TOKEN_RANDOM_SEQUENCE_LENGTH = 6;
     constructor() {}
 
     isFungible(token: Token): boolean {
@@ -249,24 +250,25 @@ export class TokenComputer {
 
     extractIdentifierFromExtendedIdentifier(identifier: string): string {
         const parts = identifier.split("-");
-        const { prefix, ticker, randomnes } = this.splitIdentifierIntoComponent(parts);
+        const { prefix, ticker, randomSequence } = this.splitIdentifierIntoComponents(parts);
 
         this.checkIfExtendedIdentifierWasProvided(parts);
         this.ensureTokenTickerValidity(ticker);
-        this.checkLengthOfRandomSequence(randomnes);
+        this.checkLengthOfRandomSequence(randomSequence);
         if (prefix) {
             this.checkLengthOfPrefix(prefix);
-            return prefix + "-" + ticker + "-" + randomnes;
+            return prefix + "-" + ticker + "-" + randomSequence;
         }
-        return ticker + "-" + randomnes;
+        return ticker + "-" + randomSequence;
     }
 
-    splitIdentifierIntoComponent(parts: string[]): { prefix: any; ticker: any; randomnes: any } {
-        if (parts.length >= 3 && parts[2].length === 6) {
-            return { prefix: parts[0], ticker: parts[1], randomnes: parts[2] };
+    private splitIdentifierIntoComponents(identifier: string): { prefix: any; ticker: any; randomSequence: any } {
+        const parts = identifier.split("-");
+        if (parts.length >= 3 && parts[2].length === this.TOKEN_RANDOM_SEQUENCE_LENGTH) {
+            return { prefix: parts[0], ticker: parts[1], randomSequence: parts[2] };
         }
 
-        return { prefix: null, ticker: parts[0], randomnes: parts[1] };
+        return { prefix: null, ticker: parts[0], randomSequence: parts[1] };
     }
 
     private checkIfExtendedIdentifierWasProvided(tokenParts: string[]): void {
@@ -284,9 +286,7 @@ export class TokenComputer {
     }
 
     private checkLengthOfRandomSequence(randomSequence: string): void {
-        const TOKEN_RANDOM_SEQUENCE_LENGTH = 6;
-
-        if (randomSequence.length !== TOKEN_RANDOM_SEQUENCE_LENGTH) {
+        if (randomSequence.length !== this.TOKEN_RANDOM_SEQUENCE_LENGTH) {
             throw new ErrInvalidTokenIdentifier(
                 "The identifier is not valid. The random sequence does not have the right length",
             );
@@ -294,8 +294,9 @@ export class TokenComputer {
     }
 
     private checkLengthOfPrefix(prefix: string): void {
-        const TOKEN_PREFIX_LENGTH = 4;
-        if (prefix.length > TOKEN_PREFIX_LENGTH) {
+        const MAX_TOKEN_PREFIX_LENGTH = 4;
+        const MIN_TOKEN_PREFIX_LENGTH = 1;
+        if (prefix.length < MIN_TOKEN_PREFIX_LENGTH || prefix.length > MAX_TOKEN_PREFIX_LENGTH) {
             throw new ErrInvalidTokenIdentifier(
                 "The identifier is not valid. The prefix does not have the right length",
             );

From 3c58ca9a3f3287f1fcd91f98d2fb5f36c4dbac26 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Fri, 8 Nov 2024 13:50:43 +0200
Subject: [PATCH 326/338] Fix check for prefix

---
 src/tokens.spec.ts |  8 ++++++++
 src/tokens.ts      | 36 ++++++++++++++++++++++--------------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/tokens.spec.ts b/src/tokens.spec.ts
index 5c229cd75..e9a29ef54 100644
--- a/src/tokens.spec.ts
+++ b/src/tokens.spec.ts
@@ -17,9 +17,17 @@ describe("test tokens and token computer", async () => {
         let nonce = tokenComputer.extractNonceFromExtendedIdentifier(extendedIdentifier);
         assert.equal(nonce, 10);
 
+        const extendedIdentifierWithPrefix = "test-TEST-123456-0a";
+        nonce = tokenComputer.extractNonceFromExtendedIdentifier(extendedIdentifierWithPrefix);
+        assert.equal(nonce, 10);
+
         const fungibleTokenIdentifier = "FNG-123456";
         nonce = tokenComputer.extractNonceFromExtendedIdentifier(fungibleTokenIdentifier);
         assert.equal(nonce, 0);
+
+        const fungibleTokenIdentifierWithPrefix = "fun-FNG-123456";
+        nonce = tokenComputer.extractNonceFromExtendedIdentifier(fungibleTokenIdentifierWithPrefix);
+        assert.equal(nonce, 0);
     });
 
     it("should extract identifier from extended identifier", async () => {
diff --git a/src/tokens.ts b/src/tokens.ts
index 78d16e48a..484b627c2 100644
--- a/src/tokens.ts
+++ b/src/tokens.ts
@@ -236,25 +236,24 @@ export class TokenComputer {
     extractNonceFromExtendedIdentifier(identifier: string): number {
         const parts = identifier.split("-");
 
-        this.checkIfExtendedIdentifierWasProvided(parts);
-        this.checkLengthOfRandomSequence(parts[1]);
+        const { prefix, ticker, randomSequence } = this.splitIdentifierIntoComponents(identifier);
+        this.validateExtendedIdentifier(prefix, randomSequence, ticker, parts);
 
-        // in case the identifier of a fungible token is provided
-        if (parts.length == 2) {
+        // If identifier is for a fungible token (2 parts), return 0
+        if (parts.length === 2 || (prefix && parts.length === 3)) {
             return 0;
         }
 
-        const hexNonce = Buffer.from(parts[2], "hex");
-        return decodeUnsignedNumber(hexNonce);
+        // Otherwise, decode the last part as an unsigned number
+        const hecNonce = parts[parts.length - 1];
+        return decodeUnsignedNumber(Buffer.from(hecNonce, "hex"));
     }
 
     extractIdentifierFromExtendedIdentifier(identifier: string): string {
         const parts = identifier.split("-");
-        const { prefix, ticker, randomSequence } = this.splitIdentifierIntoComponents(parts);
+        const { prefix, ticker, randomSequence } = this.splitIdentifierIntoComponents(identifier);
 
-        this.checkIfExtendedIdentifierWasProvided(parts);
-        this.ensureTokenTickerValidity(ticker);
-        this.checkLengthOfRandomSequence(randomSequence);
+        this.validateExtendedIdentifier(prefix, randomSequence, ticker, parts);
         if (prefix) {
             this.checkLengthOfPrefix(prefix);
             return prefix + "-" + ticker + "-" + randomSequence;
@@ -262,20 +261,25 @@ export class TokenComputer {
         return ticker + "-" + randomSequence;
     }
 
+    private validateExtendedIdentifier(prefix: string, randomSequence: string, ticker: string, parts: string[]): void {
+        this.checkIfExtendedIdentifierWasProvided(prefix, parts);
+        this.ensureTokenTickerValidity(ticker);
+        this.checkLengthOfRandomSequence(randomSequence);
+    }
+
     private splitIdentifierIntoComponents(identifier: string): { prefix: any; ticker: any; randomSequence: any } {
         const parts = identifier.split("-");
-        if (parts.length >= 3 && parts[2].length === this.TOKEN_RANDOM_SEQUENCE_LENGTH) {
+        if (this.isLowercaseAlphanumeric(parts[0]))
             return { prefix: parts[0], ticker: parts[1], randomSequence: parts[2] };
-        }
 
         return { prefix: null, ticker: parts[0], randomSequence: parts[1] };
     }
 
-    private checkIfExtendedIdentifierWasProvided(tokenParts: string[]): void {
+    private checkIfExtendedIdentifierWasProvided(prefix: string, tokenParts: string[]): void {
         //  this is for the identifiers of fungible tokens
         const MIN_EXTENDED_IDENTIFIER_LENGTH_IF_SPLITTED = 2;
         //  this is for the identifiers of nft, sft and meta-esdt
-        const MAX_EXTENDED_IDENTIFIER_LENGTH_IF_SPLITTED = 4;
+        const MAX_EXTENDED_IDENTIFIER_LENGTH_IF_SPLITTED = prefix ? 4 : 3;
 
         if (
             tokenParts.length < MIN_EXTENDED_IDENTIFIER_LENGTH_IF_SPLITTED ||
@@ -285,6 +289,10 @@ export class TokenComputer {
         }
     }
 
+    private isLowercaseAlphanumeric(str: string): boolean {
+        return /^[a-z0-9]+$/.test(str);
+    }
+
     private checkLengthOfRandomSequence(randomSequence: string): void {
         if (randomSequence.length !== this.TOKEN_RANDOM_SEQUENCE_LENGTH) {
             throw new ErrInvalidTokenIdentifier(

From 55ed40466621e58d2342fff0e2fac400f111c0e6 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Fri, 8 Nov 2024 13:54:32 +0200
Subject: [PATCH 327/338] fix comment

---
 src/tokens.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tokens.ts b/src/tokens.ts
index 484b627c2..feb00a37d 100644
--- a/src/tokens.ts
+++ b/src/tokens.ts
@@ -239,7 +239,7 @@ export class TokenComputer {
         const { prefix, ticker, randomSequence } = this.splitIdentifierIntoComponents(identifier);
         this.validateExtendedIdentifier(prefix, randomSequence, ticker, parts);
 
-        // If identifier is for a fungible token (2 parts), return 0
+        // If identifier is for a fungible token (2 parts or 3 with prefix), return 0
         if (parts.length === 2 || (prefix && parts.length === 3)) {
             return 0;
         }

From 6623ad1a15bcb81ad39a170145df03697f467344 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Fri, 8 Nov 2024 14:22:03 +0200
Subject: [PATCH 328/338] Move identifier split to upper function

---
 src/tokens.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/tokens.ts b/src/tokens.ts
index feb00a37d..e18ba1cdc 100644
--- a/src/tokens.ts
+++ b/src/tokens.ts
@@ -236,7 +236,7 @@ export class TokenComputer {
     extractNonceFromExtendedIdentifier(identifier: string): number {
         const parts = identifier.split("-");
 
-        const { prefix, ticker, randomSequence } = this.splitIdentifierIntoComponents(identifier);
+        const { prefix, ticker, randomSequence } = this.splitIdentifierIntoComponents(parts);
         this.validateExtendedIdentifier(prefix, randomSequence, ticker, parts);
 
         // If identifier is for a fungible token (2 parts or 3 with prefix), return 0
@@ -251,7 +251,7 @@ export class TokenComputer {
 
     extractIdentifierFromExtendedIdentifier(identifier: string): string {
         const parts = identifier.split("-");
-        const { prefix, ticker, randomSequence } = this.splitIdentifierIntoComponents(identifier);
+        const { prefix, ticker, randomSequence } = this.splitIdentifierIntoComponents(parts);
 
         this.validateExtendedIdentifier(prefix, randomSequence, ticker, parts);
         if (prefix) {
@@ -267,10 +267,10 @@ export class TokenComputer {
         this.checkLengthOfRandomSequence(randomSequence);
     }
 
-    private splitIdentifierIntoComponents(identifier: string): { prefix: any; ticker: any; randomSequence: any } {
-        const parts = identifier.split("-");
-        if (this.isLowercaseAlphanumeric(parts[0]))
+    private splitIdentifierIntoComponents(parts: string[]): { prefix: any; ticker: any; randomSequence: any } {
+        if (this.isLowercaseAlphanumeric(parts[0])) {
             return { prefix: parts[0], ticker: parts[1], randomSequence: parts[2] };
+        }
 
         return { prefix: null, ticker: parts[0], randomSequence: parts[1] };
     }

From 59d91af18ad415d3e0ca560ef7f7d6237bf35d9e Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Fri, 8 Nov 2024 14:30:17 +0200
Subject: [PATCH 329/338] Fix typo

---
 src/tokens.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tokens.ts b/src/tokens.ts
index e18ba1cdc..26784f403 100644
--- a/src/tokens.ts
+++ b/src/tokens.ts
@@ -245,8 +245,8 @@ export class TokenComputer {
         }
 
         // Otherwise, decode the last part as an unsigned number
-        const hecNonce = parts[parts.length - 1];
-        return decodeUnsignedNumber(Buffer.from(hecNonce, "hex"));
+        const hexNonce = parts[parts.length - 1];
+        return decodeUnsignedNumber(Buffer.from(hexNonce, "hex"));
     }
 
     extractIdentifierFromExtendedIdentifier(identifier: string): string {

From fd98399dc697b59d81ef9fb818a534ab21099d5f Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Fri, 8 Nov 2024 14:31:58 +0200
Subject: [PATCH 330/338] Code review follow up

---
 src/tokens.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/tokens.ts b/src/tokens.ts
index 26784f403..e448e255d 100644
--- a/src/tokens.ts
+++ b/src/tokens.ts
@@ -261,7 +261,12 @@ export class TokenComputer {
         return ticker + "-" + randomSequence;
     }
 
-    private validateExtendedIdentifier(prefix: string, randomSequence: string, ticker: string, parts: string[]): void {
+    private validateExtendedIdentifier(
+        prefix: string | null,
+        ticker: string,
+        randomSequence: string,
+        parts: string[],
+    ): void {
         this.checkIfExtendedIdentifierWasProvided(prefix, parts);
         this.ensureTokenTickerValidity(ticker);
         this.checkLengthOfRandomSequence(randomSequence);
@@ -275,7 +280,7 @@ export class TokenComputer {
         return { prefix: null, ticker: parts[0], randomSequence: parts[1] };
     }
 
-    private checkIfExtendedIdentifierWasProvided(prefix: string, tokenParts: string[]): void {
+    private checkIfExtendedIdentifierWasProvided(prefix: string | null, tokenParts: string[]): void {
         //  this is for the identifiers of fungible tokens
         const MIN_EXTENDED_IDENTIFIER_LENGTH_IF_SPLITTED = 2;
         //  this is for the identifiers of nft, sft and meta-esdt

From e87ae2bd564707311d6130c48ad0efb23224e106 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Fri, 8 Nov 2024 14:35:12 +0200
Subject: [PATCH 331/338] fix tests

---
 src/tokens.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tokens.ts b/src/tokens.ts
index e448e255d..b01c5edfc 100644
--- a/src/tokens.ts
+++ b/src/tokens.ts
@@ -237,7 +237,7 @@ export class TokenComputer {
         const parts = identifier.split("-");
 
         const { prefix, ticker, randomSequence } = this.splitIdentifierIntoComponents(parts);
-        this.validateExtendedIdentifier(prefix, randomSequence, ticker, parts);
+        this.validateExtendedIdentifier(prefix, ticker, randomSequence, parts);
 
         // If identifier is for a fungible token (2 parts or 3 with prefix), return 0
         if (parts.length === 2 || (prefix && parts.length === 3)) {
@@ -253,7 +253,7 @@ export class TokenComputer {
         const parts = identifier.split("-");
         const { prefix, ticker, randomSequence } = this.splitIdentifierIntoComponents(parts);
 
-        this.validateExtendedIdentifier(prefix, randomSequence, ticker, parts);
+        this.validateExtendedIdentifier(prefix, ticker, randomSequence, parts);
         if (prefix) {
             this.checkLengthOfPrefix(prefix);
             return prefix + "-" + ticker + "-" + randomSequence;

From 4b20d75ae8d7910aa2621bf387689117269c8cb3 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 11 Nov 2024 11:08:01 +0200
Subject: [PATCH 332/338] Set userAgent only on network and update message

---
 src/networkProviders/apiNetworkProvider.ts   |  6 ++++--
 src/networkProviders/proxyNetworkProvider.ts |  6 ++++--
 src/networkProviders/userAgent.ts            | 20 ++++++++++++++------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/networkProviders/apiNetworkProvider.ts b/src/networkProviders/apiNetworkProvider.ts
index 177f3ab3d..b0e092c3b 100644
--- a/src/networkProviders/apiNetworkProvider.ts
+++ b/src/networkProviders/apiNetworkProvider.ts
@@ -18,7 +18,7 @@ import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwor
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork, prepareTransactionForBroadcasting } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
-import { extendUserAgent } from "./userAgent";
+import { extendUserAgent, isBackend } from "./userAgent";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ApiNetworkProvider implements INetworkProvider {
@@ -34,7 +34,9 @@ export class ApiNetworkProvider implements INetworkProvider {
         this.config = { ...defaultAxiosConfig, ...config };
         this.backingProxyNetworkProvider = new ProxyNetworkProvider(url, proxyConfig);
         this.axios = getAxios();
-        extendUserAgent(this.userAgentPrefix, this.config);
+        if (isBackend()) {
+            extendUserAgent(this.userAgentPrefix, this.config);
+        }
     }
 
     private getProxyConfig(config: NetworkProviderConfig | undefined) {
diff --git a/src/networkProviders/proxyNetworkProvider.ts b/src/networkProviders/proxyNetworkProvider.ts
index 3762f0b79..505ca9080 100644
--- a/src/networkProviders/proxyNetworkProvider.ts
+++ b/src/networkProviders/proxyNetworkProvider.ts
@@ -15,7 +15,7 @@ import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwor
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork, prepareTransactionForBroadcasting } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
-import { extendUserAgent } from "./userAgent";
+import { extendUserAgent, isBackend } from "./userAgent";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ProxyNetworkProvider implements INetworkProvider {
@@ -28,7 +28,9 @@ export class ProxyNetworkProvider implements INetworkProvider {
         this.url = url;
         this.config = { ...defaultAxiosConfig, ...config };
         this.axios = getAxios();
-        extendUserAgent(this.userAgentPrefix, this.config);
+        if (isBackend()) {
+            extendUserAgent(this.userAgentPrefix, this.config);
+        }
     }
 
     async getNetworkConfig(): Promise<NetworkConfig> {
diff --git a/src/networkProviders/userAgent.ts b/src/networkProviders/userAgent.ts
index e102f114b..41b6a55be 100644
--- a/src/networkProviders/userAgent.ts
+++ b/src/networkProviders/userAgent.ts
@@ -1,19 +1,27 @@
 import { AxiosHeaders } from "axios";
-import { NetworkProviderConfig } from "./networkProviderConfig";
 import { UnknownClientName } from "./constants";
+import { NetworkProviderConfig } from "./networkProviderConfig";
 
 export function extendUserAgent(userAgentPrefix: string, config: NetworkProviderConfig) {
     if (!config.headers) {
-        config.headers = new AxiosHeaders({})
-    };
+        config.headers = new AxiosHeaders({});
+    }
     if (!config.clientName) {
-        console.log("Can you please provide the client name of the application that uses the SDK? It will be used for metrics.")
+        console.log(
+            "We recommend providing the `clientName` when instantiating a NetworkProvider (e.g. ProxyNetworkProvider, ApiNetworkProvider). This information will be used for metrics collection and improving our services.",
+        );
     }
     const headers = AxiosHeaders.from(config.headers as AxiosHeaders).normalize(true);
     const resolvedClientName = config.clientName || UnknownClientName;
 
-    const currentUserAgent = headers.hasUserAgent() ? headers.getUserAgent() : '';
-    const newUserAgent = currentUserAgent ? `${currentUserAgent} ${userAgentPrefix}/${resolvedClientName}` : `${userAgentPrefix}/${resolvedClientName}`;
+    const currentUserAgent = headers.hasUserAgent() ? headers.getUserAgent() : "";
+    const newUserAgent = currentUserAgent
+        ? `${currentUserAgent} ${userAgentPrefix}/${resolvedClientName}`
+        : `${userAgentPrefix}/${resolvedClientName}`;
 
     headers.setUserAgent(newUserAgent, true);
 }
+
+export function isBackend(): boolean {
+    return typeof window === "undefined";
+}

From 28eed72aa2a332b18802c8925112cd747fe13270 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 11 Nov 2024 11:08:35 +0200
Subject: [PATCH 333/338] Bump version

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7a4489a3d..c2db39f55 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.14.0",
+  "version": "13.14.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.14.0",
+      "version": "13.14.1",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index 7782f9dea..07643a155 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.14.0",
+  "version": "13.14.1",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",

From 3c99fb70380497343c960870407af2103acc38b2 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 11 Nov 2024 12:03:02 +0200
Subject: [PATCH 334/338] Bump version

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c2db39f55..ccfde9548 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.14.1",
+  "version": "13.14.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.14.1",
+      "version": "13.14.2",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index 07643a155..681ff7353 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.14.1",
+  "version": "13.14.2",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",

From 3b4235677c7f6f9e0d520f0e140b0b15f46855b4 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Mon, 11 Nov 2024 12:10:57 +0200
Subject: [PATCH 335/338] Extract if in function

---
 src/networkProviders/apiNetworkProvider.ts   |  6 ++----
 src/networkProviders/proxyNetworkProvider.ts |  6 ++----
 src/networkProviders/userAgent.ts            | 10 ++++++++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/networkProviders/apiNetworkProvider.ts b/src/networkProviders/apiNetworkProvider.ts
index b0e092c3b..bf9cf6858 100644
--- a/src/networkProviders/apiNetworkProvider.ts
+++ b/src/networkProviders/apiNetworkProvider.ts
@@ -18,7 +18,7 @@ import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwor
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork, prepareTransactionForBroadcasting } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
-import { extendUserAgent, isBackend } from "./userAgent";
+import { extendUserAgentIfBackend } from "./userAgent";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ApiNetworkProvider implements INetworkProvider {
@@ -34,9 +34,7 @@ export class ApiNetworkProvider implements INetworkProvider {
         this.config = { ...defaultAxiosConfig, ...config };
         this.backingProxyNetworkProvider = new ProxyNetworkProvider(url, proxyConfig);
         this.axios = getAxios();
-        if (isBackend()) {
-            extendUserAgent(this.userAgentPrefix, this.config);
-        }
+        extendUserAgentIfBackend(this.userAgentPrefix, this.config);
     }
 
     private getProxyConfig(config: NetworkProviderConfig | undefined) {
diff --git a/src/networkProviders/proxyNetworkProvider.ts b/src/networkProviders/proxyNetworkProvider.ts
index 505ca9080..5b2059752 100644
--- a/src/networkProviders/proxyNetworkProvider.ts
+++ b/src/networkProviders/proxyNetworkProvider.ts
@@ -15,7 +15,7 @@ import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwor
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
 import { TransactionOnNetwork, prepareTransactionForBroadcasting } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
-import { extendUserAgent, isBackend } from "./userAgent";
+import { extendUserAgentIfBackend } from "./userAgent";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
 export class ProxyNetworkProvider implements INetworkProvider {
@@ -28,9 +28,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
         this.url = url;
         this.config = { ...defaultAxiosConfig, ...config };
         this.axios = getAxios();
-        if (isBackend()) {
-            extendUserAgent(this.userAgentPrefix, this.config);
-        }
+        extendUserAgentIfBackend(this.userAgentPrefix, this.config);
     }
 
     async getNetworkConfig(): Promise<NetworkConfig> {
diff --git a/src/networkProviders/userAgent.ts b/src/networkProviders/userAgent.ts
index 41b6a55be..bea3d1cbf 100644
--- a/src/networkProviders/userAgent.ts
+++ b/src/networkProviders/userAgent.ts
@@ -2,7 +2,13 @@ import { AxiosHeaders } from "axios";
 import { UnknownClientName } from "./constants";
 import { NetworkProviderConfig } from "./networkProviderConfig";
 
-export function extendUserAgent(userAgentPrefix: string, config: NetworkProviderConfig) {
+export function extendUserAgentIfBackend(userAgentPrefix: string, config: NetworkProviderConfig) {
+    if (isBackend()) {
+        extendUserAgent(userAgentPrefix, config);
+    }
+}
+
+function extendUserAgent(userAgentPrefix: string, config: NetworkProviderConfig) {
     if (!config.headers) {
         config.headers = new AxiosHeaders({});
     }
@@ -22,6 +28,6 @@ export function extendUserAgent(userAgentPrefix: string, config: NetworkProvider
     headers.setUserAgent(newUserAgent, true);
 }
 
-export function isBackend(): boolean {
+function isBackend(): boolean {
     return typeof window === "undefined";
 }

From 19a25a33fc948448ae6c9271787bb00fe35cce63 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Tue, 12 Nov 2024 13:00:31 +0200
Subject: [PATCH 336/338] Add explicit enums implementation

---
 src/smartcontracts/codec/binary.spec.ts       | 62 ++++++++++------
 src/smartcontracts/codec/binary.ts            | 41 ++++++----
 src/smartcontracts/codec/explicit-enum.ts     | 33 +++++++++
 src/smartcontracts/nativeSerializer.spec.ts   | 57 ++++++++++++++
 src/smartcontracts/nativeSerializer.ts        | 18 +++++
 .../typesystem/abiRegistry.spec.ts            |  6 +-
 src/smartcontracts/typesystem/abiRegistry.ts  | 13 +++-
 .../typesystem/explicit-enum.ts               | 74 +++++++++++++++++++
 src/smartcontracts/typesystem/index.ts        |  5 +-
 src/smartcontracts/typesystem/matchers.ts     | 24 ++++--
 src/smartcontracts/typesystem/typeMapper.ts   | 12 +++
 src/testdata/basic-features.abi.json          | 17 +++++
 12 files changed, 308 insertions(+), 54 deletions(-)
 create mode 100644 src/smartcontracts/codec/explicit-enum.ts
 create mode 100644 src/smartcontracts/typesystem/explicit-enum.ts

diff --git a/src/smartcontracts/codec/binary.spec.ts b/src/smartcontracts/codec/binary.spec.ts
index 33df7e6c1..8e6f92eca 100644
--- a/src/smartcontracts/codec/binary.spec.ts
+++ b/src/smartcontracts/codec/binary.spec.ts
@@ -1,54 +1,55 @@
-import * as errors from "../../errors";
+import BigNumber from "bignumber.js";
 import { assert } from "chai";
-import { BinaryCodec, BinaryCodecConstraints } from "./binary";
+import { Address } from "../../address";
+import * as errors from "../../errors";
 import {
     AddressType,
     AddressValue,
+    ArrayVec,
+    ArrayVecType,
     BigIntType,
+    BigIntValue,
     BigUIntType,
     BigUIntValue,
     BooleanType,
     BooleanValue,
+    EnumType,
+    EnumValue,
+    EnumVariantDefinition,
+    Field,
     I16Type,
+    I16Value,
     I32Type,
+    I32Value,
     I64Type,
+    I64Value,
     I8Type,
+    I8Value,
+    List,
+    ListType,
     NumericalType,
     NumericalValue,
+    StringType,
+    StringValue,
     Struct,
-    Field,
     StructType,
+    TokenIdentifierType,
+    TokenIdentifierValue,
     TypedValue,
     U16Type,
+    U16Value,
     U32Type,
     U32Value,
     U64Type,
     U64Value,
     U8Type,
     U8Value,
-    List,
-    ListType,
-    EnumType,
-    EnumVariantDefinition,
-    EnumValue,
-    ArrayVec,
-    ArrayVecType,
-    U16Value,
-    TokenIdentifierType,
-    TokenIdentifierValue,
-    StringValue,
-    StringType,
-    BigIntValue,
-    I64Value,
-    I32Value,
-    I16Value,
-    I8Value,
 } from "../typesystem";
-import { isMsbOne } from "./utils";
-import { Address } from "../../address";
 import { BytesType, BytesValue } from "../typesystem/bytes";
-import BigNumber from "bignumber.js";
+import { ExplicitEnumType, ExplicitEnumValue, ExplicitEnumVariantDefinition } from "../typesystem/explicit-enum";
 import { FieldDefinition } from "../typesystem/fields";
+import { BinaryCodec, BinaryCodecConstraints } from "./binary";
+import { isMsbOne } from "./utils";
 
 describe("test binary codec (basic)", () => {
     let codec = new BinaryCodec();
@@ -175,6 +176,21 @@ describe("test binary codec (basic)", () => {
         ]);
         assert.deepEqual(codec.decodeTopLevel<StringValue>(Buffer.from(payload), new StringType()), stringValue);
     });
+
+    it("should create explicit-enums, encode and decode", async () => {
+        let length = [0x00, 0x00, 0x00, 0x04];
+        let payload = [0x74, 0x65, 0x73, 0x74];
+        let enumType = new ExplicitEnumType("Colour", [new ExplicitEnumVariantDefinition("test")]);
+        let enumValue = ExplicitEnumValue.fromName(enumType, "test");
+
+        assert.deepEqual(codec.encodeNested(enumValue), Buffer.from([...length, ...payload]));
+        assert.deepEqual(codec.encodeTopLevel(enumValue), Buffer.from(payload));
+        assert.deepEqual(codec.decodeNested<ExplicitEnumValue>(Buffer.from([...length, ...payload]), enumType), [
+            enumValue,
+            8,
+        ]);
+        assert.deepEqual(codec.decodeTopLevel<ExplicitEnumValue>(Buffer.from(payload), enumType), enumValue);
+    });
 });
 
 describe("test binary codec (advanced)", () => {
diff --git a/src/smartcontracts/codec/binary.ts b/src/smartcontracts/codec/binary.ts
index 0c5bbdb26..bd6be3ad3 100644
--- a/src/smartcontracts/codec/binary.ts
+++ b/src/smartcontracts/codec/binary.ts
@@ -1,8 +1,17 @@
 import * as errors from "../../errors";
+import { guardTrue } from "../../utils";
 import {
-    Type,
+    ArrayVec,
+    ArrayVecType,
     EnumType,
+    EnumValue,
+    ExplicitEnumType,
+    ExplicitEnumValue,
     List,
+    ManagedDecimalSignedType,
+    ManagedDecimalSignedValue,
+    ManagedDecimalType,
+    ManagedDecimalValue,
     onTypedValueSelect,
     onTypeSelect,
     OptionValue,
@@ -10,27 +19,21 @@ import {
     PrimitiveValue,
     Struct,
     StructType,
-    TypedValue,
-    EnumValue,
-    TupleType,
     Tuple,
-    ArrayVecType,
-    ArrayVec,
-    ManagedDecimalType,
-    ManagedDecimalValue,
-    ManagedDecimalSignedType,
-    ManagedDecimalSignedValue,
+    TupleType,
+    Type,
+    TypedValue,
 } from "../typesystem";
-import { guardTrue } from "../../utils";
+import { ArrayVecBinaryCodec } from "./arrayVec";
+import { EnumBinaryCodec } from "./enum";
+import { ExplicitEnumBinaryCodec } from "./explicit-enum";
+import { ListBinaryCodec } from "./list";
+import { ManagedDecimalCodec } from "./managedDecimal";
+import { ManagedDecimalSignedCodec } from "./managedDecimalSigned";
 import { OptionValueBinaryCodec } from "./option";
 import { PrimitiveBinaryCodec } from "./primitive";
-import { ListBinaryCodec } from "./list";
 import { StructBinaryCodec } from "./struct";
-import { EnumBinaryCodec } from "./enum";
 import { TupleBinaryCodec } from "./tuple";
-import { ArrayVecBinaryCodec } from "./arrayVec";
-import { ManagedDecimalCodec } from "./managedDecimal";
-import { ManagedDecimalSignedCodec } from "./managedDecimalSigned";
 
 export class BinaryCodec {
     readonly constraints: BinaryCodecConstraints;
@@ -41,6 +44,7 @@ export class BinaryCodec {
     private readonly structCodec: StructBinaryCodec;
     private readonly tupleCodec: TupleBinaryCodec;
     private readonly enumCodec: EnumBinaryCodec;
+    private readonly explicitEnumCodec: ExplicitEnumBinaryCodec;
     private readonly managedDecimalCodec: ManagedDecimalCodec;
     private readonly managedDecimalSignedCodec: ManagedDecimalSignedCodec;
 
@@ -53,6 +57,7 @@ export class BinaryCodec {
         this.structCodec = new StructBinaryCodec(this);
         this.tupleCodec = new TupleBinaryCodec(this);
         this.enumCodec = new EnumBinaryCodec(this);
+        this.explicitEnumCodec = new ExplicitEnumBinaryCodec();
         this.managedDecimalCodec = new ManagedDecimalCodec(this);
         this.managedDecimalSignedCodec = new ManagedDecimalSignedCodec(this);
     }
@@ -68,6 +73,7 @@ export class BinaryCodec {
             onStruct: () => this.structCodec.decodeTopLevel(buffer, <StructType>type),
             onTuple: () => this.tupleCodec.decodeTopLevel(buffer, <TupleType>type),
             onEnum: () => this.enumCodec.decodeTopLevel(buffer, <EnumType>type),
+            onExplicitEnum: () => this.explicitEnumCodec.decodeTopLevel(buffer, <ExplicitEnumType>type),
             onManagedDecimal: () => this.managedDecimalCodec.decodeTopLevel(buffer, <ManagedDecimalType>type),
             onManagedDecimalSigned: () =>
                 this.managedDecimalSignedCodec.decodeTopLevel(buffer, <ManagedDecimalSignedType>type),
@@ -87,6 +93,7 @@ export class BinaryCodec {
             onStruct: () => this.structCodec.decodeNested(buffer, <StructType>type),
             onTuple: () => this.tupleCodec.decodeNested(buffer, <TupleType>type),
             onEnum: () => this.enumCodec.decodeNested(buffer, <EnumType>type),
+            onExplicitEnum: () => this.explicitEnumCodec.decodeNested(buffer, <ExplicitEnumType>type),
             onManagedDecimal: () => this.managedDecimalCodec.decodeNested(buffer, <ManagedDecimalType>type),
             onManagedDecimalSigned: () =>
                 this.managedDecimalSignedCodec.decodeNested(buffer, <ManagedDecimalSignedType>type),
@@ -106,6 +113,7 @@ export class BinaryCodec {
             onStruct: () => this.structCodec.encodeNested(<Struct>typedValue),
             onTuple: () => this.tupleCodec.encodeNested(<Tuple>typedValue),
             onEnum: () => this.enumCodec.encodeNested(<EnumValue>typedValue),
+            onExplicitEnum: () => this.explicitEnumCodec.encodeNested(<ExplicitEnumValue>typedValue),
             onManagedDecimal: () => this.managedDecimalCodec.encodeNested(<ManagedDecimalValue>typedValue),
             onManagedDecimalSigned: () =>
                 this.managedDecimalSignedCodec.encodeNested(<ManagedDecimalSignedValue>typedValue),
@@ -123,6 +131,7 @@ export class BinaryCodec {
             onStruct: () => this.structCodec.encodeTopLevel(<Struct>typedValue),
             onTuple: () => this.tupleCodec.encodeTopLevel(<Tuple>typedValue),
             onEnum: () => this.enumCodec.encodeTopLevel(<EnumValue>typedValue),
+            onExplicitEnum: () => this.explicitEnumCodec.encodeTopLevel(<ExplicitEnumValue>typedValue),
             onManagedDecimal: () => this.managedDecimalCodec.encodeTopLevel(<ManagedDecimalValue>typedValue),
             onManagedDecimalSigned: () =>
                 this.managedDecimalSignedCodec.encodeTopLevel(<ManagedDecimalSignedValue>typedValue),
diff --git a/src/smartcontracts/codec/explicit-enum.ts b/src/smartcontracts/codec/explicit-enum.ts
new file mode 100644
index 000000000..a88eef81c
--- /dev/null
+++ b/src/smartcontracts/codec/explicit-enum.ts
@@ -0,0 +1,33 @@
+import { StringValue } from "../typesystem";
+import { ExplicitEnumType, ExplicitEnumValue, ExplicitEnumVariantDefinition } from "../typesystem/explicit-enum";
+import { StringBinaryCodec } from "./string";
+
+export class ExplicitEnumBinaryCodec {
+    private readonly stringCodec: StringBinaryCodec;
+
+    constructor() {
+        this.stringCodec = new StringBinaryCodec();
+    }
+
+    decodeTopLevel(buffer: Buffer, type: ExplicitEnumType): ExplicitEnumValue {
+        const stringValue = this.stringCodec.decodeTopLevel(buffer);
+        return new ExplicitEnumValue(type, new ExplicitEnumVariantDefinition(stringValue.valueOf()));
+    }
+
+    decodeNested(buffer: Buffer, type: ExplicitEnumType): [ExplicitEnumValue, number] {
+        const [value, length] = this.stringCodec.decodeNested(buffer);
+        const enumValue = new ExplicitEnumValue(type, new ExplicitEnumVariantDefinition(value.valueOf()));
+
+        return [enumValue, length];
+    }
+
+    encodeNested(enumValue: ExplicitEnumValue): Buffer {
+        const buffer = this.stringCodec.encodeNested(new StringValue(enumValue.valueOf().name));
+        return buffer;
+    }
+
+    encodeTopLevel(enumValue: ExplicitEnumValue): Buffer {
+        const buffer = this.stringCodec.encodeTopLevel(new StringValue(enumValue.valueOf().name));
+        return buffer;
+    }
+}
diff --git a/src/smartcontracts/nativeSerializer.spec.ts b/src/smartcontracts/nativeSerializer.spec.ts
index 70411eec6..f34ed2caf 100644
--- a/src/smartcontracts/nativeSerializer.spec.ts
+++ b/src/smartcontracts/nativeSerializer.spec.ts
@@ -557,6 +557,19 @@ describe("test native serializer", () => {
                         },
                     ],
                 },
+                OperationCompletionStatus: {
+                    type: "explicit-enum",
+                    variants: [
+                        {
+                            docs: ["indicates that operation was completed"],
+                            name: "completed",
+                        },
+                        {
+                            docs: ["indicates that operation was interrupted prematurely, due to low gas"],
+                            name: "interrupted",
+                        },
+                    ],
+                },
             },
         });
 
@@ -590,6 +603,50 @@ describe("test native serializer", () => {
         assert.deepEqual(typedValues[3].valueOf(), { name: "Else", fields: [new BigNumber(42), new BigNumber(43)] });
     });
 
+    it("should perform type inference (explicit-enums)", async () => {
+        const abiRegistry = AbiRegistry.create({
+            endpoints: [
+                {
+                    name: "foo",
+                    inputs: [
+                        {
+                            type: "OperationCompletionStatus",
+                        },
+                    ],
+                    outputs: [],
+                },
+            ],
+            types: {
+                OperationCompletionStatus: {
+                    type: "explicit-enum",
+                    variants: [
+                        {
+                            docs: ["indicates that operation was completed"],
+                            name: "completed",
+                        },
+                        {
+                            docs: ["indicates that operation was interrupted prematurely, due to low gas"],
+                            name: "interrupted",
+                        },
+                    ],
+                },
+            },
+        });
+
+        const endpoint = abiRegistry.getEndpoint("foo");
+        const enumType = abiRegistry.getExplicitEnum("OperationCompletionStatus");
+
+        // Simple enum by name
+        const p1 = "completed";
+        // Enum with a single field
+
+        const typedValues = NativeSerializer.nativeToTypedValues([p1], endpoint);
+
+        console.log(typedValues[0].valueOf());
+        assert.deepEqual(typedValues[0].getType(), enumType);
+        assert.deepEqual(typedValues[0].valueOf(), { name: "completed" });
+    });
+
     it("should getArgumentsCardinality", async () => {
         const abi = AbiRegistry.create({
             endpoints: [
diff --git a/src/smartcontracts/nativeSerializer.ts b/src/smartcontracts/nativeSerializer.ts
index 59e8c4925..e1c10c610 100644
--- a/src/smartcontracts/nativeSerializer.ts
+++ b/src/smartcontracts/nativeSerializer.ts
@@ -22,6 +22,8 @@ import {
     EndpointParameterDefinition,
     EnumType,
     EnumValue,
+    ExplicitEnumType,
+    ExplicitEnumValue,
     Field,
     I16Type,
     I16Value,
@@ -203,6 +205,9 @@ export namespace NativeSerializer {
         if (type instanceof EnumType) {
             return toEnumValue(value, type, errorContext);
         }
+        if (type instanceof ExplicitEnumType) {
+            return toExplicitEnumValue(value, type, errorContext);
+        }
         if (type instanceof ManagedDecimalType) {
             return toManagedDecimal(value, type, errorContext);
         }
@@ -337,6 +342,19 @@ export namespace NativeSerializer {
         errorContext.throwError(`(function: toEnumValue) unsupported native type ${typeof native}`);
     }
 
+    function toExplicitEnumValue(native: any, type: ExplicitEnumType, errorContext: ArgumentErrorContext): TypedValue {
+        if (typeof native === "string") {
+            return ExplicitEnumValue.fromName(type, native);
+        }
+        if (typeof native === "object") {
+            errorContext.guardHasField(native, "name");
+            const variant = type.getVariantByName(native.name);
+
+            return new ExplicitEnumValue(type, variant);
+        }
+        errorContext.throwError(`(function: toExplicitEnumValue) unsupported native type ${typeof native}`);
+    }
+
     function toManagedDecimal(native: any, type: ManagedDecimalType, errorContext: ArgumentErrorContext): TypedValue {
         if (typeof native === "object") {
             return new ManagedDecimalValue(native[0], native[1], type.isVariable());
diff --git a/src/smartcontracts/typesystem/abiRegistry.spec.ts b/src/smartcontracts/typesystem/abiRegistry.spec.ts
index 4832690f4..216cddba2 100644
--- a/src/smartcontracts/typesystem/abiRegistry.spec.ts
+++ b/src/smartcontracts/typesystem/abiRegistry.spec.ts
@@ -193,15 +193,13 @@ describe("test abi registry", () => {
     });
 
     it("should load ABI explicit-enum", async () => {
-        const registry = await loadAbiRegistry("src/testdata/explicit-enum.abi.json");
+        const registry = await loadAbiRegistry("src/testdata/basic-features.abi.json");
 
-        const enumType = registry.getEnum("OperationCompletionStatus");
+        const enumType = registry.getExplicitEnum("OperationCompletionStatus");
 
         assert.deepEqual(enumType.variants[0].name, "completed");
-        assert.deepEqual(enumType.variants[0].discriminant, 0);
 
         assert.deepEqual(enumType.variants[1].name, "interrupted");
-        assert.deepEqual(enumType.variants[1].discriminant, 1);
     });
 
     it("should load abi with title for endpoint", async () => {
diff --git a/src/smartcontracts/typesystem/abiRegistry.ts b/src/smartcontracts/typesystem/abiRegistry.ts
index 538c7d148..60a6c46ff 100644
--- a/src/smartcontracts/typesystem/abiRegistry.ts
+++ b/src/smartcontracts/typesystem/abiRegistry.ts
@@ -3,6 +3,7 @@ import { guardValueIsSetWithMessage } from "../../utils";
 import { EndpointDefinition, EndpointParameterDefinition } from "./endpoint";
 import { EnumType } from "./enum";
 import { EventDefinition, EventTopicDefinition } from "./event";
+import { ExplicitEnumType } from "./explicit-enum";
 import { StructType } from "./struct";
 import { TypeMapper } from "./typeMapper";
 import { CustomType } from "./types";
@@ -63,8 +64,12 @@ export class AbiRegistry {
 
             if (typeDefinition.type == "struct") {
                 customTypes.push(StructType.fromJSON({ name: customTypeName, fields: typeDefinition.fields }));
-            } else if (typeDefinition.type == "enum" || typeDefinition.type == "explicit-enum") {
+            } else if (typeDefinition.type == "enum") {
                 customTypes.push(EnumType.fromJSON({ name: customTypeName, variants: typeDefinition.variants }));
+            } else if (typeDefinition.type == "explicit-enum") {
+                customTypes.push(
+                    ExplicitEnumType.fromJSON({ name: customTypeName, variants: typeDefinition.variants }),
+                );
             } else {
                 throw new errors.ErrTypingSystem(`Cannot handle custom type: ${customTypeName}`);
             }
@@ -107,6 +112,12 @@ export class AbiRegistry {
         return <EnumType>result!;
     }
 
+    getExplicitEnum(name: string): ExplicitEnumType {
+        const result = this.customTypes.find((e) => e.getName() == name && e.hasExactClass(ExplicitEnumType.ClassName));
+        guardValueIsSetWithMessage(`enum [${name}] not found`, result);
+        return <ExplicitEnumType>result!;
+    }
+
     getEnums(names: string[]): EnumType[] {
         return names.map((name) => this.getEnum(name));
     }
diff --git a/src/smartcontracts/typesystem/explicit-enum.ts b/src/smartcontracts/typesystem/explicit-enum.ts
new file mode 100644
index 000000000..264e18fa1
--- /dev/null
+++ b/src/smartcontracts/typesystem/explicit-enum.ts
@@ -0,0 +1,74 @@
+import { guardValueIsSet } from "../../utils";
+import { CustomType, TypedValue } from "./types";
+
+export class ExplicitEnumType extends CustomType {
+    static ClassName = "ExplicitEnumType";
+    readonly variants: ExplicitEnumVariantDefinition[] = [];
+
+    constructor(name: string, variants: ExplicitEnumVariantDefinition[]) {
+        super(name);
+        this.variants = variants;
+    }
+
+    getClassName(): string {
+        return ExplicitEnumType.ClassName;
+    }
+
+    static fromJSON(json: { name: string; variants: any[] }): ExplicitEnumType {
+        const variants = json.variants.map((variant) => ExplicitEnumVariantDefinition.fromJSON(variant));
+        return new ExplicitEnumType(json.name, variants);
+    }
+
+    getVariantByName(name: string): ExplicitEnumVariantDefinition {
+        let result = this.variants.find((e) => e.name == name);
+        guardValueIsSet(`variant by name (${name})`, result);
+        return result!;
+    }
+}
+
+export class ExplicitEnumVariantDefinition {
+    readonly name: string;
+
+    constructor(name: string) {
+        this.name = name;
+    }
+
+    static fromJSON(json: { name: string }): ExplicitEnumVariantDefinition {
+        return new ExplicitEnumVariantDefinition(json.name);
+    }
+}
+
+export class ExplicitEnumValue extends TypedValue {
+    static ClassName = "ExplicitEnumValue";
+    readonly name: string;
+
+    constructor(type: ExplicitEnumType, variant: ExplicitEnumVariantDefinition) {
+        super(type);
+        this.name = variant.name;
+    }
+
+    getClassName(): string {
+        return ExplicitEnumValue.ClassName;
+    }
+
+    /**
+     * Utility (named constructor) to create a simple (i.e. without fields) enum value.
+     */
+    static fromName(type: ExplicitEnumType, name: string): ExplicitEnumValue {
+        let variant = type.getVariantByName(name);
+
+        return new ExplicitEnumValue(type, variant);
+    }
+
+    equals(other: ExplicitEnumValue): boolean {
+        if (!this.getType().equals(other.getType())) {
+            return false;
+        }
+
+        return this.name == other.name;
+    }
+
+    valueOf() {
+        return { name: this.name };
+    }
+}
diff --git a/src/smartcontracts/typesystem/index.ts b/src/smartcontracts/typesystem/index.ts
index 7f5dd2da7..936c40328 100644
--- a/src/smartcontracts/typesystem/index.ts
+++ b/src/smartcontracts/typesystem/index.ts
@@ -12,11 +12,14 @@ export * from "./codeMetadata";
 export * from "./composite";
 export * from "./endpoint";
 export * from "./enum";
+export * from "./explicit-enum";
 export * from "./factory";
 export * from "./fields";
 export * from "./generic";
 export * from "./genericArray";
 export * from "./h256";
+export * from "./managedDecimal";
+export * from "./managedDecimalSigned";
 export * from "./matchers";
 export * from "./nothing";
 export * from "./numerical";
@@ -28,5 +31,3 @@ export * from "./typeExpressionParser";
 export * from "./typeMapper";
 export * from "./types";
 export * from "./variadic";
-export * from "./managedDecimal";
-export * from "./managedDecimalSigned";
diff --git a/src/smartcontracts/typesystem/matchers.ts b/src/smartcontracts/typesystem/matchers.ts
index 7a901d75f..a877a9660 100644
--- a/src/smartcontracts/typesystem/matchers.ts
+++ b/src/smartcontracts/typesystem/matchers.ts
@@ -4,19 +4,19 @@ import { BooleanType, BooleanValue } from "./boolean";
 import { BytesType, BytesValue } from "./bytes";
 import { CodeMetadataType, CodeMetadataValue } from "./codeMetadata";
 import { EnumType, EnumValue } from "./enum";
-import { OptionType, OptionValue, List, ListType } from "./generic";
+import { ExplicitEnumType, ExplicitEnumValue } from "./explicit-enum";
+import { List, ListType, OptionType, OptionValue } from "./generic";
+import { ArrayVec, ArrayVecType } from "./genericArray";
 import { H256Type, H256Value } from "./h256";
-import { NumericalType, NumericalValue } from "./numerical";
+import { ManagedDecimalType, ManagedDecimalValue } from "./managedDecimal";
+import { ManagedDecimalSignedType, ManagedDecimalSignedValue } from "./managedDecimalSigned";
 import { NothingType, NothingValue } from "./nothing";
+import { NumericalType, NumericalValue } from "./numerical";
+import { StringType, StringValue } from "./string";
 import { Struct, StructType } from "./struct";
 import { TokenIdentifierType, TokenIdentifierValue } from "./tokenIdentifier";
 import { Tuple, TupleType } from "./tuple";
-import { Type, PrimitiveType, PrimitiveValue } from "./types";
-import { ArrayVec, ArrayVecType } from "./genericArray";
-import { TypedValue } from "./types";
-import { StringType, StringValue } from "./string";
-import { ManagedDecimalType, ManagedDecimalValue } from "./managedDecimal";
-import { ManagedDecimalSignedType, ManagedDecimalSignedValue } from "./managedDecimalSigned";
+import { PrimitiveType, PrimitiveValue, Type, TypedValue } from "./types";
 
 // TODO: Extend functionality or rename wrt. restricted / reduced functionality (not all types are handled: composite, variadic).
 export function onTypeSelect<TResult>(
@@ -29,6 +29,7 @@ export function onTypeSelect<TResult>(
         onStruct: () => TResult;
         onTuple: () => TResult;
         onEnum: () => TResult;
+        onExplicitEnum: () => TResult;
         onManagedDecimal: () => TResult;
         onManagedDecimalSigned: () => TResult;
         onOther?: () => TResult;
@@ -55,6 +56,9 @@ export function onTypeSelect<TResult>(
     if (type.hasExactClass(EnumType.ClassName)) {
         return selectors.onEnum();
     }
+    if (type.hasExactClass(ExplicitEnumType.ClassName)) {
+        return selectors.onExplicitEnum();
+    }
 
     if (type.hasExactClass(ManagedDecimalType.ClassName)) {
         return selectors.onManagedDecimal();
@@ -81,6 +85,7 @@ export function onTypedValueSelect<TResult>(
         onStruct: () => TResult;
         onTuple: () => TResult;
         onEnum: () => TResult;
+        onExplicitEnum: () => TResult;
         onManagedDecimal: () => TResult;
         onManagedDecimalSigned: () => TResult;
         onOther?: () => TResult;
@@ -107,6 +112,9 @@ export function onTypedValueSelect<TResult>(
     if (value.hasExactClass(EnumValue.ClassName)) {
         return selectors.onEnum();
     }
+    if (value.hasExactClass(ExplicitEnumValue.ClassName)) {
+        return selectors.onExplicitEnum();
+    }
     if (value.hasExactClass(ManagedDecimalValue.ClassName)) {
         return selectors.onManagedDecimal();
     }
diff --git a/src/smartcontracts/typesystem/typeMapper.ts b/src/smartcontracts/typesystem/typeMapper.ts
index e8ca9a4db..8eebdf5f8 100644
--- a/src/smartcontracts/typesystem/typeMapper.ts
+++ b/src/smartcontracts/typesystem/typeMapper.ts
@@ -6,6 +6,7 @@ import { BytesType } from "./bytes";
 import { CodeMetadataType } from "./codeMetadata";
 import { CompositeType } from "./composite";
 import { EnumType, EnumVariantDefinition } from "./enum";
+import { ExplicitEnumType, ExplicitEnumVariantDefinition } from "./explicit-enum";
 import { FieldDefinition } from "./fields";
 import { ListType, OptionType } from "./generic";
 import { ArrayVecType } from "./genericArray";
@@ -160,6 +161,11 @@ export class TypeMapper {
             return this.mapEnumType(<EnumType>type);
         }
 
+        if (type.hasExactClass(ExplicitEnumType.ClassName)) {
+            // This will call mapType() recursively, for all the explicit enum variant fields.
+            return this.mapExplicitEnumType(<ExplicitEnumType>type);
+        }
+
         if (type.hasExactClass(StructType.ClassName)) {
             // This will call mapType() recursively, for all the struct's fields.
             return this.mapStructType(<StructType>type);
@@ -204,6 +210,12 @@ export class TypeMapper {
         return mappedEnum;
     }
 
+    private mapExplicitEnumType(type: ExplicitEnumType): ExplicitEnumType {
+        let variants = type.variants.map((variant) => new ExplicitEnumVariantDefinition(variant.name));
+        let mappedEnum = new ExplicitEnumType(type.getName(), variants);
+        return mappedEnum;
+    }
+
     private mappedFields(definitions: FieldDefinition[]): FieldDefinition[] {
         return definitions.map(
             (definition) => new FieldDefinition(definition.name, definition.description, this.mapType(definition.type)),
diff --git a/src/testdata/basic-features.abi.json b/src/testdata/basic-features.abi.json
index f30c55001..733da10f4 100644
--- a/src/testdata/basic-features.abi.json
+++ b/src/testdata/basic-features.abi.json
@@ -6038,6 +6038,23 @@
                 "Helper type to explore encode/decode errors."
             ]
         },
+        "OperationCompletionStatus": {
+            "type": "explicit-enum",
+            "variants": [
+                {
+                    "docs": [
+                        "indicates that operation was completed"
+                    ],
+                    "name": "completed"
+                },
+                {
+                    "docs": [
+                        "indicates that operation was interrupted prematurely, due to low gas"
+                    ],
+                    "name": "interrupted"
+                }
+            ]
+        },
         "EsdtTokenPayment": {
             "type": "struct",
             "fields": [

From cf0de4051e72866b643ed3f2480dae2d531d6993 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Tue, 12 Nov 2024 13:21:50 +0200
Subject: [PATCH 337/338] Remove console logs and add explicit enums tests

---
 src/smartcontracts/nativeSerializer.spec.ts   | 10 +++------
 .../typesystem/explicit-enum.spec.ts          | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 src/smartcontracts/typesystem/explicit-enum.spec.ts

diff --git a/src/smartcontracts/nativeSerializer.spec.ts b/src/smartcontracts/nativeSerializer.spec.ts
index f34ed2caf..060ee3a8d 100644
--- a/src/smartcontracts/nativeSerializer.spec.ts
+++ b/src/smartcontracts/nativeSerializer.spec.ts
@@ -635,16 +635,12 @@ describe("test native serializer", () => {
 
         const endpoint = abiRegistry.getEndpoint("foo");
         const enumType = abiRegistry.getExplicitEnum("OperationCompletionStatus");
+        const enumString = "completed";
 
-        // Simple enum by name
-        const p1 = "completed";
-        // Enum with a single field
-
-        const typedValues = NativeSerializer.nativeToTypedValues([p1], endpoint);
+        const typedValues = NativeSerializer.nativeToTypedValues([enumString], endpoint);
 
-        console.log(typedValues[0].valueOf());
         assert.deepEqual(typedValues[0].getType(), enumType);
-        assert.deepEqual(typedValues[0].valueOf(), { name: "completed" });
+        assert.deepEqual(typedValues[0].valueOf(), { name: enumString });
     });
 
     it("should getArgumentsCardinality", async () => {
diff --git a/src/smartcontracts/typesystem/explicit-enum.spec.ts b/src/smartcontracts/typesystem/explicit-enum.spec.ts
new file mode 100644
index 000000000..8c726aecc
--- /dev/null
+++ b/src/smartcontracts/typesystem/explicit-enum.spec.ts
@@ -0,0 +1,22 @@
+import { assert } from "chai";
+import { ExplicitEnumType, ExplicitEnumValue, ExplicitEnumVariantDefinition } from "./explicit-enum";
+
+describe("test explicit-enums", () => {
+    it("should get valueOf()", () => {
+        // Define variants
+        let greenVariant = new ExplicitEnumVariantDefinition("Green");
+
+        let orangeVariant = new ExplicitEnumVariantDefinition("Orange");
+
+        let yellowVariant = new ExplicitEnumVariantDefinition("Yellow");
+
+        // Define enum type
+        let explicitEnumType = new ExplicitEnumType("Colour", [greenVariant, orangeVariant, yellowVariant]);
+
+        // Create enum values
+        let green = new ExplicitEnumValue(explicitEnumType, greenVariant);
+
+        // Test valueOf()
+        assert.deepEqual(green.valueOf(), { name: "Green" });
+    });
+});

From 9a6bd369cc662243936b0e0a75dbae5a6b002c0b Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Tue, 12 Nov 2024 13:22:42 +0200
Subject: [PATCH 338/338] Bump version

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ccfde9548..8d9c32d73 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.14.2",
+  "version": "13.15.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@multiversx/sdk-core",
-      "version": "13.14.2",
+      "version": "13.15.0",
       "license": "MIT",
       "dependencies": {
         "@multiversx/sdk-transaction-decoder": "1.0.2",
diff --git a/package.json b/package.json
index 681ff7353..abe0b1d31 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.14.2",
+  "version": "13.15.0",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",