Updated JSON serializtion params in Typescript side;

trilitech · Nov 24, 2023 · 54f58a8 · 54f58a8
1 parent 09d5a23
commit 54f58a8
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 24 deletions.
diff --git a/Runtime/View/AuthenticationManager.cs b/Runtime/View/AuthenticationManager.cs
@@ -30,10 +30,10 @@ void Start()
             Tezos.Wallet.EventManager.AccountDisconnected += OnAccountDisconnected;
         }
 
-        void OnHandshakeReceived(HandshakeData handshake_data)
+        void OnHandshakeReceived(HandshakeData handshakeData)
         {
             EnableUI(isAuthenticated: false);
-            qrCodeView.SetQrCode(handshake_data.PairingData);
+            qrCodeView.SetQrCode(handshakeData);
         }
 
         void OnAccountConnected(AccountInfo account_info)

diff --git a/Runtime/View/QRCodeView.cs b/Runtime/View/QRCodeView.cs
@@ -1,3 +1,4 @@
+using TezosSDK.Beacon;
 using UnityEngine;
 using UnityEngine.UI;
 using ZXing;
@@ -18,9 +19,9 @@ void Start()
             _texture.filterMode = FilterMode.Point;
         }
 
-        public void SetQrCode(string handshake)
+        public void SetQrCode(HandshakeData handshakeData)
         {
-            var uri = "tezos://?type=tzip10&data=" + handshake;
+            var uri = "tezos://?type=tzip10&data=" + handshakeData.PairingData;
             EncodeTextToQrCode(uri);
         }
 

diff --git a/WebGLFrontend/output/StreamingAssets/webgl-frontend.js b/WebGLFrontend/output/StreamingAssets/webgl-frontend.js
diff --git a/WebGLFrontend/src/WalletProviders/BaseWallet.ts b/WebGLFrontend/src/WalletProviders/BaseWallet.ts
@@ -81,14 +81,35 @@ class BaseWallet implements AbstractWallet {
     localStorage.setItem("iconUrl", this.iconUrl);
   }
 
-  private CallUnityMethod(value: any) {
+  private CallUnityMethod(eventData: UnityEvent) {
+    const resultEventData = {
+      EventType: eventData.eventType,
+      Data: JSON.stringify(this.CapitalizeKeys(eventData.data)),
+    };
+
     window.unityInstance.SendMessage(
-      "UnityBeacon",
+      "WalletEventManager",
       "HandleEvent",
-      typeof value === "string" ? value : JSON.stringify(value)
+      JSON.stringify(resultEventData)
     );
   }
 
+  private CapitalizeKeys(obj: any): any {
+    if (Array.isArray(obj)) {
+      return obj.map((o) => this.CapitalizeKeys(o));
+    } else if (typeof obj === "object" && obj !== null) {
+      return Object.entries(obj).reduce(
+        (r, [k, v]) => ({
+          ...r,
+          [`${k.charAt(0).toUpperCase()}${k.slice(1)}`]: this.CapitalizeKeys(v),
+        }),
+        {}
+      );
+    } else {
+      return obj;
+    }
+  }
+
   GetHexPayloadString(
     signingType: SigningType,
     plainTextPayload: string

diff --git a/WebGLFrontend/src/WalletProviders/Types.ts b/WebGLFrontend/src/WalletProviders/Types.ts
@@ -36,7 +36,6 @@ interface AbstractWallet {
   CallUnityOnAccountConnected(accountInfo: AccountInfo): void;
   CallUnityOnAccountDisconnected(accountInfo: AccountInfo): void;
   CallUnityOnPayloadSigned(result: SignResult): void;
-
   CallUnityOnContractCallCompleted(result: OperationResult): void;
   CallUnityOnAccountFailedToConnect(error: Error): void;
   CallUnityOnContractCallFailed(error: Error): void;

diff --git a/WebGLFrontend/src/index.ts b/WebGLFrontend/src/index.ts
@@ -1,11 +1,15 @@
-import {BaseFileUploaderType, BaseUploaderConfig, IpfsUploaderConfig, IpfsUploaderType,} from "./FileUploaders/Types";
-import {Wallet, WalletType} from "./WalletProviders/Types";
-
 import Base64Uploader from "./FileUploaders/Base64Uploader";
-import IpfsUploader from "./FileUploaders/IpfsUploader";
 import BeaconWallet from "./WalletProviders/Beacon";
+import IpfsUploader from "./FileUploaders/IpfsUploader";
 import KukaiWallet from "./WalletProviders/Kukai";
-import {AccountInfo, DAppClient} from "@airgap/beacon-sdk";
+import { AccountInfo, DAppClient } from "@airgap/beacon-sdk";
+import { Wallet, WalletType } from "./WalletProviders/Types";
+import {
+  BaseFileUploaderType,
+  BaseUploaderConfig,
+  IpfsUploaderConfig,
+  IpfsUploaderType,
+} from "./FileUploaders/Types";
 
 let kukaiWallet: KukaiWallet;
 let beaconWallet: BeaconWallet;
@@ -22,9 +26,10 @@ function InitWalletProvider(
     if (!kukaiWallet) kukaiWallet = new KukaiWallet(appName, appUrl, iconUrl);
     window.WalletProvider = kukaiWallet;
   }
-  
+
   if (walletType === WalletType.beacon) {
-    if (!beaconWallet) beaconWallet = new BeaconWallet(appName, appUrl, iconUrl);
+    if (!beaconWallet)
+      beaconWallet = new BeaconWallet(appName, appUrl, iconUrl);
     window.WalletProvider = beaconWallet;
   }
 
@@ -60,19 +65,27 @@ async function UnityReadyEvent() {
 
   if (beaconActiveAccount) {
     InitWalletProvider(
-        beaconActiveAccount.network.type,
-        beaconActiveAccount.network.rpcUrl,
-        WalletType.beacon,
-        dappName,
-        dappUrl,
-        iconUrl);
+      beaconActiveAccount.network.type,
+      beaconActiveAccount.network.rpcUrl,
+      WalletType.beacon,
+      dappName,
+      dappUrl,
+      iconUrl
+    );
 
     window.WalletProvider.client = dAppClient;
     window.WalletProvider.ConnectAccount();
   } else {
-    const networkName = localStorage.getItem("networkName")
+    const networkName = localStorage.getItem("networkName");
     if (networkName) {
-      InitWalletProvider(networkName, "", WalletType.kukai, dappName, dappUrl, iconUrl);
+      InitWalletProvider(
+        networkName,
+        "",
+        WalletType.kukai,
+        dappName,
+        dappUrl,
+        iconUrl
+      );
       window.WalletProvider.ConnectAccount();
     }
   }