Merge pull request #242 from ElrondNetwork/v10-into-main

Merge v10 into main

Author: andreibancioiu

.github/workflows/erdjs-publish-alpha-beta.yml renamed to .github/workflows/erdjs-publish-not-main.yml

@@ -1,4 +1,4 @@
-name: Publish erdjs (alpha / beta)
+name: Publish erdjs (not main)
 
 on:
   workflow_dispatch:
@@ -9,6 +9,7 @@ on:
         options: 
         - alpha
         - beta
+        - previous
 
 permissions:
   contents: write

CHANGELOG.md

@@ -4,8 +4,11 @@ All notable changes will be documented in this file.
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 
+## 11.1.1
+ - [Fix `CompositeValue.valueOf()`](https://github.com/ElrondNetwork/elrond-sdk-erdjs/pull/241)
+
 ## 11.1.0
-- [Add builder for relayed v1 transactions](https://github.com/ElrondNetwork/elrond-sdk-erdjs/pull/235)
+ - [Add builder for relayed v1 transactions](https://github.com/ElrondNetwork/elrond-sdk-erdjs/pull/235)
 
 ## 11.0.1
  - [Fix construction of AbiRegistry](https://github.com/ElrondNetwork/elrond-sdk-erdjs/pull/234)

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@elrondnetwork/erdjs",
-  "version": "11.1.0",
+  "version": "11.1.1",
   "description": "Smart Contracts interaction framework",
   "main": "out/index.js",
   "types": "out/index.d.js",

package.json

@@ -0,0 +1,54 @@
+import { assert } from "chai";
+import { ArgSerializer } from "../argSerializer";
+import { BytesType, BytesValue } from "./bytes";
+import { CompositeType, CompositeValue } from "./composite";
+import { EndpointParameterDefinition } from "./endpoint";
+import { U32Type, U32Value } from "./numerical";
+
+
+describe("test composite", () => {
+    const serializer = new ArgSerializer();
+
+    it("should get valueOf()", () => {
+        const compositeType = new CompositeType(new U32Type(), new BytesType());
+        const compositeValue = new CompositeValue(compositeType, [new U32Value(7), BytesValue.fromUTF8("hello")]);
+
+        const values = compositeValue.valueOf();
+        assert.lengthOf(values, 2);
+        assert.equal(7, values[0]);
+        assert.equal("hello", values[1]);
+    });
+
+    it("should get valueOf() upon decoding", () => {
+        const compositeType = new CompositeType(new U32Type(), new BytesType());
+        const endpointDefinition = new EndpointParameterDefinition("", "", compositeType)
+
+        const [compositeValue] = serializer.stringToValues("2a@abba", [endpointDefinition]);
+        const values = compositeValue.valueOf();
+        assert.lengthOf(values, 2);
+        assert.equal(42, values[0]);
+        assert.deepEqual(Buffer.from([0xab, 0xba]), values[1]);
+    });
+
+    it("should get valueOf(), when items are missing", () => {
+        const compositeType = new CompositeType(new U32Type(), new BytesType());
+        const items: any = [null, null];
+        const compositeValue = new CompositeValue(compositeType, items);
+
+        const values = compositeValue.valueOf();
+        assert.lengthOf(values, 2);
+        assert.isUndefined(values[0]);
+        assert.isUndefined(values[1]);
+    });
+
+    it("should get valueOf() upon decoding, when items are missing", () => {
+        const compositeType = new CompositeType(new U32Type(), new BytesType());
+        const endpointDefinition = new EndpointParameterDefinition("", "", compositeType)
+
+        const [compositeValue] = serializer.stringToValues("", [endpointDefinition]);
+        const values = compositeValue.valueOf();
+        assert.lengthOf(values, 2);
+        assert.equal(0, values[0]);
+        assert.isUndefined(values[1]);
+    });
+});

src/smartcontracts/typesystem/composite.spec.ts

@@ -42,7 +42,7 @@ export class CompositeValue extends TypedValue {
     }
 
     valueOf(): any[] {
-        return this.items.map(item => item.valueOf());
+        return this.items.map(item => item?.valueOf());
     }
 
     equals(other: CompositeValue): boolean {