Merge pull request #7 from phantasma-io/dev

Merge Update

Author: TeknoPT

CHANGELOG.md

@@ -1,3 +1,8 @@
+[v.1.0.12]
+
+- Updating the package version.
+- Fix issue when getting the Leaderboard.
+
 [v.1.0.10]
 
 - Updating the package version.

Runtime/Phantasma/Plugins/Phantasma.Business/VM/DebugInfo.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Newtonsoft.Json;
 using Phantasma.Core.Utils;
 
 namespace Phantasma.Business.VM

Runtime/Phantasma/Plugins/Phantasma.Core/Domain/Leaderboard.cs

@@ -1,20 +1,41 @@
 using System.Numerics;
+using LunarLabs.Parser;
 using Phantasma.Core.Cryptography;
 
 namespace Phantasma.Core.Domain
 {
     public struct LeaderboardRow
     {
         public Address address;
-        public BigInteger score;
+        public BigInteger value;
+
+        public static LeaderboardRow FromNode(DataNode node)
+        {
+            var row = new LeaderboardRow();
+            row.address = Address.FromText(node.GetString("address"));
+            row.value = BigInteger.Parse(node.GetString("value"));
+            return row;
+        }
     }
 
     public struct Leaderboard
     {
         public string name;
-        public Address owner;
-        public BigInteger size;
-        public BigInteger round;
+        public LeaderboardRow[] rows;
+        
+        public static Leaderboard FromNode(DataNode node)
+        {
+            var leaderboard = new Leaderboard();
+            leaderboard.name = node.GetString("name");
+            var rows = node.GetNode("rows");
+            var list = new System.Collections.Generic.List<LeaderboardRow>();
+            foreach (var row in rows.Children)
+            {
+                list.Add(LeaderboardRow.FromNode(row));
+            }
+            leaderboard.rows = list.ToArray();
+            return leaderboard;
+        }
     }
 
 }

Runtime/Phantasma/Scripts/Example/ExampleLogin.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using Phantasma.SDK;
 using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
@@ -28,5 +29,4 @@ private void Login_OnLoginEvent(string msg, bool error)
             Debug.Log(msg);
         }
     }
-
 }

Runtime/Phantasma/Scripts/PhantasmaAPI.cs

@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Globalization;
 using System.Text;
-using Newtonsoft.Json;
 using Phantasma.Core.Cryptography;
 using Phantasma.Core.Domain;
 using Phantasma.Core.Numerics;
@@ -350,8 +349,9 @@ public IEnumerator GetContracts(Action<Contract> callback, Action<EPHANTASMA_SDK
         /// <returns></returns>
         public IEnumerator GetLeaderboard(string name, Action<Leaderboard> callback, Action<EPHANTASMA_SDK_ERROR_TYPE, string> errorHandlingCallback = null)
         {
-            yield return WebClient.RPCRequestJSON(Host, "getLeaderboard", WebClient.NoTimeout, errorHandlingCallback, (node) => {
-                var result = JsonUtility.FromJson<Leaderboard>(node);
+            yield return WebClient.RPCRequest(Host, "getLeaderboard", WebClient.NoTimeout, errorHandlingCallback, (node) =>
+            {
+                var result = Leaderboard.FromNode(node);
                 callback(result);
             }, name);
         }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.phantasma.phantasmalinkclient",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "displayName": "Phantasma Unity SDK",
   "description": "Phantasma Unity SDK, use to connect to the Phantasma Blockchain",
   "unity": "2020.3",