Merge pull request #445 from multiversx/feat/next

Merge feat/next into main (v13.1.0)
multiversx · Apr 18, 2024 · b877bbe · b877bbe
2 parents cb4fd81 + 1c53e6e
commit b877bbe
Show file tree

Hide file tree

Showing 31 changed files with 1,449 additions and 507 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "13.0.1",
+  "version": "13.1.0",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "main": "out/index.js",
   "types": "out/index.d.js",

diff --git a/src/globals.ts b/src/globals.ts
@@ -1,3 +1,3 @@
-if ( !global.Buffer ) {
-  global.Buffer = require('buffer').Buffer;
+if (!global.Buffer) {
+    global.Buffer = require("buffer").Buffer;
 }
diff --git a/src/relayedTransactionV1Builder.ts b/src/relayedTransactionV1Builder.ts
@@ -64,7 +64,7 @@ export class RelayedTransactionV1Builder {
      * (optional) Sets the version of the relayed transaction
      *
      * @param relayedTxVersion
-    */
+     */
     setRelayedTransactionVersion(relayedTxVersion: TransactionVersion): RelayedTransactionV1Builder {
         this.relayedTransactionVersion = relayedTxVersion;
         return this;
@@ -74,7 +74,7 @@ export class RelayedTransactionV1Builder {
      * (optional) Sets the options of the relayed transaction
      *
      * @param relayedTxOptions
-    */
+     */
     setRelayedTransactionOptions(relayedTxOptions: TransactionOptions): RelayedTransactionV1Builder {
         this.relayedTransactionOptions = relayedTxOptions;
         return this;
@@ -97,15 +97,23 @@ export class RelayedTransactionV1Builder {
      * @return Transaction
      */
     build(): Transaction {
-        if (!this.innerTransaction || !this.netConfig || !this.relayerAddress || !this.innerTransaction.getSignature()) {
+        if (
+            !this.innerTransaction ||
+            !this.netConfig ||
+            !this.relayerAddress ||
+            !this.innerTransaction.getSignature()
+        ) {
             throw new ErrInvalidRelayedV1BuilderArguments();
         }
 
         const serializedTransaction = this.prepareInnerTransaction();
         const data = `relayedTx@${Buffer.from(serializedTransaction).toString("hex")}`;
         const payload = new TransactionPayload(data);
 
-        const gasLimit = this.netConfig.MinGasLimit + this.netConfig.GasPerDataByte * payload.length() + this.innerTransaction.getGasLimit().valueOf();
+        const gasLimit =
+            this.netConfig.MinGasLimit +
+            this.netConfig.GasPerDataByte * payload.length() +
+            this.innerTransaction.getGasLimit().valueOf();
         let relayedTransaction = new Transaction({
             nonce: this.relayerNonce,
             sender: this.relayerAddress,
@@ -132,21 +140,32 @@ export class RelayedTransactionV1Builder {
         }
 
         const txObject = {
-            "nonce": this.innerTransaction.getNonce().valueOf(),
-            "sender": new Address(this.innerTransaction.getSender().bech32()).pubkey().toString("base64"),
-            "receiver": new Address(this.innerTransaction.getReceiver().bech32()).pubkey().toString("base64"),
-            "value": BigInt(this.innerTransaction.getValue().toString()),
-            "gasPrice": this.innerTransaction.getGasPrice().valueOf(),
-            "gasLimit": this.innerTransaction.getGasLimit().valueOf(),
-            "data": this.innerTransaction.getData().valueOf().toString("base64"),
-            "signature": this.innerTransaction.getSignature().toString("base64"),
-            "chainID": Buffer.from(this.innerTransaction.getChainID().valueOf()).toString("base64"),
-            "version": this.innerTransaction.getVersion().valueOf(),
-            "options": this.innerTransaction.getOptions().valueOf() == 0 ? undefined : this.innerTransaction.getOptions().valueOf(),
-            "guardian": this.innerTransaction.getGuardian().bech32() ? new Address(this.innerTransaction.getGuardian().bech32()).pubkey().toString("base64") : undefined,
-            "guardianSignature": this.innerTransaction.getGuardianSignature().toString("hex") ? this.innerTransaction.getGuardianSignature().toString("base64") : undefined,
-            "sndUserName": this.innerTransaction.getSenderUsername() ? Buffer.from(this.innerTransaction.getSenderUsername()).toString("base64") : undefined,
-            "rcvUserName": this.innerTransaction.getReceiverUsername() ? Buffer.from(this.innerTransaction.getReceiverUsername()).toString("base64") : undefined,
+            nonce: this.innerTransaction.getNonce().valueOf(),
+            sender: new Address(this.innerTransaction.getSender().bech32()).pubkey().toString("base64"),
+            receiver: new Address(this.innerTransaction.getReceiver().bech32()).pubkey().toString("base64"),
+            value: BigInt(this.innerTransaction.getValue().toString()),
+            gasPrice: this.innerTransaction.getGasPrice().valueOf(),
+            gasLimit: this.innerTransaction.getGasLimit().valueOf(),
+            data: this.innerTransaction.getData().valueOf().toString("base64"),
+            signature: this.innerTransaction.getSignature().toString("base64"),
+            chainID: Buffer.from(this.innerTransaction.getChainID().valueOf()).toString("base64"),
+            version: this.innerTransaction.getVersion().valueOf(),
+            options:
+                this.innerTransaction.getOptions().valueOf() == 0
+                    ? undefined
+                    : this.innerTransaction.getOptions().valueOf(),
+            guardian: this.innerTransaction.getGuardian().bech32()
+                ? new Address(this.innerTransaction.getGuardian().bech32()).pubkey().toString("base64")
+                : undefined,
+            guardianSignature: this.innerTransaction.getGuardianSignature().toString("hex")
+                ? this.innerTransaction.getGuardianSignature().toString("base64")
+                : undefined,
+            sndUserName: this.innerTransaction.getSenderUsername()
+                ? Buffer.from(this.innerTransaction.getSenderUsername()).toString("base64")
+                : undefined,
+            rcvUserName: this.innerTransaction.getReceiverUsername()
+                ? Buffer.from(this.innerTransaction.getReceiverUsername()).toString("base64")
+                : undefined,
         };
 
         return JSONbig.stringify(txObject);

diff --git a/src/relayedTransactionV2Builder.ts b/src/relayedTransactionV2Builder.ts
@@ -76,7 +76,13 @@ export class RelayedTransactionV2Builder {
      * @return Transaction
      */
     build(): Transaction {
-        if (!this.innerTransaction || !this.innerTransactionGasLimit || !this.relayerAddress || !this.netConfig || !this.innerTransaction.getSignature()) {
+        if (
+            !this.innerTransaction ||
+            !this.innerTransactionGasLimit ||
+            !this.relayerAddress ||
+            !this.netConfig ||
+            !this.innerTransaction.getSignature()
+        ) {
             throw new ErrInvalidRelayedV2BuilderArguments();
         }
         if (this.innerTransaction.getGasLimit() != 0) {
@@ -87,7 +93,7 @@ export class RelayedTransactionV2Builder {
             new AddressValue(this.innerTransaction.getReceiver()),
             new U64Value(this.innerTransaction.getNonce().valueOf()),
             new BytesValue(this.innerTransaction.getData().valueOf()),
-            new BytesValue(this.innerTransaction.getSignature())
+            new BytesValue(this.innerTransaction.getSignature()),
         ]);
 
         const data = `relayedTxV2@${argumentsString}`;
@@ -98,11 +104,13 @@ export class RelayedTransactionV2Builder {
             receiver: this.innerTransaction.getSender(),
             value: 0,
             gasLimit:
-                this.innerTransactionGasLimit.valueOf() + this.netConfig.MinGasLimit + this.netConfig.GasPerDataByte * payload.length(),
+                this.innerTransactionGasLimit.valueOf() +
+                this.netConfig.MinGasLimit +
+                this.netConfig.GasPerDataByte * payload.length(),
             data: payload,
             chainID: this.netConfig.ChainID,
             version: this.innerTransaction.getVersion(),
-            options: this.innerTransaction.getOptions()
+            options: this.innerTransaction.getOptions(),
         });
 
         if (this.relayerNonce) {

diff --git a/src/smartcontracts/codeMetadata.ts b/src/smartcontracts/codeMetadata.ts
@@ -11,13 +11,13 @@ export class CodeMetadata {
     static ByteZero = {
         Upgradeable: 1,
         Reserved2: 2,
-        Readable: 4
+        Readable: 4,
     };
 
     static ByteOne = {
         Reserved1: 1,
         Payable: 2,
-        PayableBySc: 4
+        PayableBySc: 4,
     };
 
     /**
@@ -28,11 +28,16 @@ export class CodeMetadata {
      * @param payable Whether the contract is payable
      * @param payableBySc Whether the contract is payable by other smart contracts
      */
-    constructor(upgradeable: boolean = true, readable: boolean = false, payable: boolean = false, payableBySc: boolean = false) {
+    constructor(
+        upgradeable: boolean = true,
+        readable: boolean = false,
+        payable: boolean = false,
+        payableBySc: boolean = false,
+    ) {
         this.upgradeable = upgradeable;
         this.readable = readable;
         this.payable = payable;
-        this.payableBySc = payableBySc
+        this.payableBySc = payableBySc;
     }
 
     static fromBytes(bytes: Uint8Array): CodeMetadata {
@@ -44,7 +49,7 @@ export class CodeMetadata {
      */
     static fromBuffer(buffer: Buffer): CodeMetadata {
         if (buffer.length < this.codeMetadataLength) {
-            throw new Error('Buffer is too short.');
+            throw new Error("Buffer is too short.");
         }
 
         const byteZero = buffer[0];
@@ -124,14 +129,16 @@ export class CodeMetadata {
             upgradeable: this.upgradeable,
             readable: this.readable,
             payable: this.payable,
-            payableBySc: this.payableBySc
+            payableBySc: this.payableBySc,
         };
     }
 
     equals(other: CodeMetadata): boolean {
-        return this.upgradeable == other.upgradeable &&
+        return (
+            this.upgradeable == other.upgradeable &&
             this.readable == other.readable &&
             this.payable == other.payable &&
-            this.payableBySc == other.payableBySc;
+            this.payableBySc == other.payableBySc
+        );
     }
 }