diff --git a/sample/Assets/Scenes/Passport/AuthenticatedScene.unity b/sample/Assets/Scenes/Passport/AuthenticatedScene.unity index 35e0666e1..fb635d768 100644 --- a/sample/Assets/Scenes/Passport/AuthenticatedScene.unity +++ b/sample/Assets/Scenes/Passport/AuthenticatedScene.unity @@ -1371,7 +1371,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 033bac63c98e94dbd8324bca7d37ed2b, type: 3} m_Name: m_EditorClassIdentifier: - connectButton: {fileID: 1144767401} output: {fileID: 1253661940} --- !u!4 &144103476 Transform: @@ -2881,7 +2880,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cf838bde5a84143489a17922798f3b75, type: 3} m_Name: m_EditorClassIdentifier: - Output: {fileID: 1253661940} + output: {fileID: 1253661940} --- !u!1 &723321857 GameObject: m_ObjectHideFlags: 0 diff --git a/sample/Assets/Scenes/Passport/ZkEvm/ZkEvmGetBalance.unity b/sample/Assets/Scenes/Passport/ZkEvm/ZkEvmGetBalance.unity index ed03411cb..b06e73b57 100644 --- a/sample/Assets/Scenes/Passport/ZkEvm/ZkEvmGetBalance.unity +++ b/sample/Assets/Scenes/Passport/ZkEvm/ZkEvmGetBalance.unity @@ -557,7 +557,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 66309839} m_HandleRect: {fileID: 66309838} m_Direction: 0 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -739,8 +739,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 777.1642, y: 0} - m_SizeDelta: {x: 1554.3284, y: 0} + m_AnchoredPosition: {x: 1129.8157, y: 0} + m_SizeDelta: {x: 2259.6313, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &410008536 MonoBehaviour: @@ -911,8 +911,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cb441184afcbc4e45899def1397f5344, type: 3} m_Name: m_EditorClassIdentifier: - Output: {fileID: 1253661940} - AddressInput: {fileID: 885231615} + output: {fileID: 1253661940} + addressInput: {fileID: 885231615} --- !u!4 &722408343 Transform: m_ObjectHideFlags: 0 @@ -926,7 +926,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &740387918 GameObject: @@ -1098,8 +1098,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 777.1642, y: 0} - m_SizeDelta: {x: 1554.3284, y: 0} + m_AnchoredPosition: {x: 1129.8157, y: 0} + m_SizeDelta: {x: 2259.6313, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &783923066 MonoBehaviour: @@ -1241,7 +1241,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1741513413} m_Direction: 2 m_Value: 1 - m_Size: 0.99999994 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -1898,37 +1898,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &1192763471 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1192763473} - m_Layer: 0 - m_Name: Script - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1192763473 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1192763471} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 326.73624, y: 181.70598, z: -2.506466} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1227009912 GameObject: m_ObjectHideFlags: 0 @@ -2154,7 +2123,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1406556646 GameObject: diff --git a/sample/Assets/Scenes/Passport/ZkEvm/ZkEvmGetTransactionReceipt.unity b/sample/Assets/Scenes/Passport/ZkEvm/ZkEvmGetTransactionReceipt.unity index 6161ccb63..2a3d017a3 100644 --- a/sample/Assets/Scenes/Passport/ZkEvm/ZkEvmGetTransactionReceipt.unity +++ b/sample/Assets/Scenes/Passport/ZkEvm/ZkEvmGetTransactionReceipt.unity @@ -477,7 +477,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 66309839} m_HandleRect: {fileID: 66309838} m_Direction: 0 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -808,8 +808,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 777.1642, y: 0} - m_SizeDelta: {x: 1554.3284, y: 0} + m_AnchoredPosition: {x: 1129.8157, y: 0} + m_SizeDelta: {x: 2259.6313, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &406311237 MonoBehaviour: @@ -1166,7 +1166,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1741513413} m_Direction: 2 m_Value: 1 - m_Size: 0.99999994 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -1583,8 +1583,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 777.1642, y: 0} - m_SizeDelta: {x: 1554.3284, y: 0} + m_AnchoredPosition: {x: 1129.8157, y: 0} + m_SizeDelta: {x: 2259.6313, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1181031973 MonoBehaviour: @@ -1643,37 +1643,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1181031971} m_CullTransparentMesh: 1 ---- !u!1 &1192763471 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1192763473} - m_Layer: 0 - m_Name: Script - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1192763473 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1192763471} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 326.73624, y: 181.70598, z: -2.506466} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1227009912 GameObject: m_ObjectHideFlags: 0 @@ -1899,7 +1868,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1388709694 GameObject: @@ -2339,8 +2308,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ccbdee1b426834819a32324e69db839a, type: 3} m_Name: m_EditorClassIdentifier: - Output: {fileID: 1253661940} - TransactionHash: {fileID: 1686346287} + output: {fileID: 1253661940} + transactionHashInputField: {fileID: 1686346287} --- !u!4 &1736670976 Transform: m_ObjectHideFlags: 0 @@ -2354,7 +2323,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1741513412 GameObject: diff --git a/sample/Assets/Scenes/Passport/ZkEvm/ZkEvmSendTransaction.unity b/sample/Assets/Scenes/Passport/ZkEvm/ZkEvmSendTransaction.unity index f282a20d9..7d5cbccec 100644 --- a/sample/Assets/Scenes/Passport/ZkEvm/ZkEvmSendTransaction.unity +++ b/sample/Assets/Scenes/Passport/ZkEvm/ZkEvmSendTransaction.unity @@ -573,7 +573,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 66309839} m_HandleRect: {fileID: 66309838} m_Direction: 0 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -646,12 +646,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: df089afb650a44d838a50ef6b7a4ee4c, type: 3} m_Name: m_EditorClassIdentifier: - Output: {fileID: 1253661940} - ConfirmToggle: {fileID: 1782090444} - GetTransactionReceiptToggle: {fileID: 1873101809} - ToInputField: {fileID: 649013321} - ValueInputField: {fileID: 1901422923} - DataInputField: {fileID: 1391622483} + output: {fileID: 1253661940} + confirmToggle: {fileID: 1782090444} + getTransactionReceiptToggle: {fileID: 1873101809} + toInputField: {fileID: 649013321} + valueInputField: {fileID: 1901422923} + dataInputField: {fileID: 1391622483} --- !u!4 &197751537 Transform: m_ObjectHideFlags: 0 @@ -665,7 +665,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &262428469 GameObject: @@ -1339,7 +1339,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1741513413} m_Direction: 2 m_Value: 1 - m_Size: 0.99999994 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -1418,7 +1418,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 431.03214, y: 0} + m_AnchoredPosition: {x: 427.62323, y: 0} m_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &885137217 @@ -2050,37 +2050,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1121543899} m_CullTransparentMesh: 1 ---- !u!1 &1192763471 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1192763473} - m_Layer: 0 - m_Name: Script - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1192763473 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1192763471} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 326.73624, y: 181.70598, z: -2.506466} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1216631573 GameObject: m_ObjectHideFlags: 0 @@ -2463,7 +2432,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1343113121 GameObject: @@ -3437,8 +3406,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 777.1642, y: 0} - m_SizeDelta: {x: 1554.3284, y: 0} + m_AnchoredPosition: {x: 1129.8157, y: 0} + m_SizeDelta: {x: 2259.6313, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1833965463 MonoBehaviour: @@ -4372,8 +4341,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 777.1642, y: 0} - m_SizeDelta: {x: 1554.3284, y: 0} + m_AnchoredPosition: {x: 1129.8157, y: 0} + m_SizeDelta: {x: 2259.6313, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2131064088 MonoBehaviour: diff --git a/sample/Assets/Scenes/Passport/ZkEvm/ZkEvmSignTypedData.unity b/sample/Assets/Scenes/Passport/ZkEvm/ZkEvmSignTypedData.unity index d237566ea..d597a29b0 100644 --- a/sample/Assets/Scenes/Passport/ZkEvm/ZkEvmSignTypedData.unity +++ b/sample/Assets/Scenes/Passport/ZkEvm/ZkEvmSignTypedData.unity @@ -477,7 +477,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 66309839} m_HandleRect: {fileID: 66309838} m_Direction: 0 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -808,8 +808,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 777.1642, y: 0} - m_SizeDelta: {x: 1554.3284, y: 0} + m_AnchoredPosition: {x: 1129.8157, y: 0} + m_SizeDelta: {x: 2259.6313, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &406311237 MonoBehaviour: @@ -987,8 +987,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 777.1642, y: 0} - m_SizeDelta: {x: 1554.3284, y: 0} + m_AnchoredPosition: {x: 1129.8157, y: 0} + m_SizeDelta: {x: 2259.6313, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &546010066 MonoBehaviour: @@ -1207,8 +1207,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ea89e103c18194c85bd8ab8d3002a1e2, type: 3} m_Name: m_EditorClassIdentifier: - Output: {fileID: 1253661940} - Payload: {fileID: 1686346287} + output: {fileID: 1253661940} + payloadInputField: {fileID: 1686346287} --- !u!4 &816479037 Transform: m_ObjectHideFlags: 0 @@ -1222,7 +1222,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &872295794 GameObject: @@ -1308,7 +1308,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1741513413} m_Direction: 2 m_Value: 1 - m_Size: 0.99999994 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -1687,37 +1687,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1086281026} m_CullTransparentMesh: 1 ---- !u!1 &1192763471 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1192763473} - m_Layer: 0 - m_Name: Script - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1192763473 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1192763471} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 326.73624, y: 181.70598, z: -2.506466} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1227009912 GameObject: m_ObjectHideFlags: 0 @@ -1943,7 +1912,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1388709694 GameObject: diff --git a/sample/Assets/Scripts/Passport/PassportInitialisation/PassportInitialisationScript.cs b/sample/Assets/Scripts/Passport/PassportInitialisation/PassportInitialisationScript.cs index a6663ec68..cd22015ae 100644 --- a/sample/Assets/Scripts/Passport/PassportInitialisation/PassportInitialisationScript.cs +++ b/sample/Assets/Scripts/Passport/PassportInitialisation/PassportInitialisationScript.cs @@ -43,7 +43,7 @@ private async void InitialisePassport() try { // Set the log level for the SDK - Passport.LogLevel = LogLevel.Info; + Passport.LogLevel = LogLevel.Debug; // Don't redact token values from logs Passport.RedactTokensInLogs = false; diff --git a/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmConnect/ZkEvmConnectScript.cs b/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmConnect/ZkEvmConnectScript.cs index 0326b80ee..2ea466770 100644 --- a/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmConnect/ZkEvmConnectScript.cs +++ b/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmConnect/ZkEvmConnectScript.cs @@ -1,21 +1,15 @@ +#nullable enable + using UnityEngine; using UnityEngine.UI; -using Cysharp.Threading.Tasks; namespace Immutable.Passport.Sample.PassportFeatures { public class ZkEvmConnectScript : MonoBehaviour { - [Header("zkEVM Connect UI")] - public Button connectButton; - public Text output; - - public void ConnectZkEvm() - { - ConnectZkEvmAsync(); - } + [SerializeField] public Text? output; - private async UniTaskVoid ConnectZkEvmAsync() + public async void ConnectZkEvm() { if (Passport.Instance == null) { diff --git a/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmGetBalance/ZkEvmGetBalanceScript.cs b/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmGetBalance/ZkEvmGetBalanceScript.cs index 3a5603c8f..25496b8bb 100644 --- a/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmGetBalance/ZkEvmGetBalanceScript.cs +++ b/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmGetBalance/ZkEvmGetBalanceScript.cs @@ -1,3 +1,5 @@ +#nullable enable + using System.Globalization; using System.Numerics; using UnityEngine; @@ -8,15 +10,10 @@ public class ZkEvmGetBalanceScript : MonoBehaviour { - [SerializeField] private Text Output; - [SerializeField] private InputField AddressInput; + [SerializeField] private Text? output; + [SerializeField] private InputField? addressInput; - public void GetBalance() - { - GetBalanceAsync(); - } - - private async UniTaskVoid GetBalanceAsync() + public async void GetBalance() { if (SampleAppManager.PassportInstance == null) { @@ -26,7 +23,14 @@ private async UniTaskVoid GetBalanceAsync() ShowOutput("Getting account balance..."); try { - string balanceHex = await SampleAppManager.PassportInstance.ZkEvmGetBalance(AddressInput.text); + var address = addressInput?.text; + if (address == null) + { + ShowOutput("No address"); + return; + } + + var balanceHex = await SampleAppManager.PassportInstance.ZkEvmGetBalance(address); var balanceDec = BigInteger.Parse(balanceHex.Replace("0x", ""), NumberStyles.HexNumber); if (balanceDec < 0) { @@ -47,9 +51,8 @@ public void Cancel() private void ShowOutput(string message) { - if (Output != null) - { - Output.text = message; - } + if (output != null) + output.text = message; + Debug.Log($"[ZkEvmGetBalanceScript] {message}"); } } \ No newline at end of file diff --git a/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmGetTransactionReceipt/ZkEvmGetTransactionReceiptScript.cs b/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmGetTransactionReceipt/ZkEvmGetTransactionReceiptScript.cs index 4bf648c52..755a085a9 100644 --- a/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmGetTransactionReceipt/ZkEvmGetTransactionReceiptScript.cs +++ b/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmGetTransactionReceipt/ZkEvmGetTransactionReceiptScript.cs @@ -1,21 +1,16 @@ +#nullable enable + using UnityEngine; using UnityEngine.UI; using UnityEngine.SceneManagement; -using Cysharp.Threading.Tasks; using Immutable.Passport; -using Immutable.Passport.Model; public class ZkEvmGetTransactionReceiptScript : MonoBehaviour { - [SerializeField] private Text Output; - [SerializeField] private InputField TransactionHash; - - public void GetZkEvmTransactionReceipt() - { - GetZkEvmTransactionReceiptAsync(); - } + [SerializeField] private Text? output; + [SerializeField] private InputField? transactionHashInputField; - private async UniTaskVoid GetZkEvmTransactionReceiptAsync() + public async void GetZkEvmTransactionReceipt() { if (Passport.Instance == null) { @@ -25,9 +20,16 @@ private async UniTaskVoid GetZkEvmTransactionReceiptAsync() ShowOutput("Getting transaction receipt..."); try { + var transactionHash = transactionHashInputField?.text; + if (transactionHash == null) + { + ShowOutput("No transaction hash"); + return; + } + await Passport.Instance.ConnectEvm(); - TransactionReceiptResponse response = await Passport.Instance.ZkEvmGetTransactionReceipt(TransactionHash.text); - string status = $"Status: {GetTransactionStatusString(response.status)}"; + var response = await Passport.Instance.ZkEvmGetTransactionReceipt(transactionHash); + var status = $"Status: {GetTransactionStatusString(response?.status)}"; ShowOutput(status); } catch (System.Exception ex) @@ -36,7 +38,7 @@ private async UniTaskVoid GetZkEvmTransactionReceiptAsync() } } - private string GetTransactionStatusString(string status) + private static string GetTransactionStatusString(string? status) { switch (status) { @@ -60,9 +62,8 @@ public void Cancel() private void ShowOutput(string message) { - if (Output != null) - { - Output.text = message; - } + if (output != null) + output.text = message; + Debug.Log($"[ZkEvmGetTransactionReceiptScript] {message}"); } } \ No newline at end of file diff --git a/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmRequestAccounts/ZkEvmRequestAccountsScript.cs b/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmRequestAccounts/ZkEvmRequestAccountsScript.cs index 37d5bda26..183fdf295 100644 --- a/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmRequestAccounts/ZkEvmRequestAccountsScript.cs +++ b/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmRequestAccounts/ZkEvmRequestAccountsScript.cs @@ -1,18 +1,13 @@ +#nullable enable + using UnityEngine; using UnityEngine.UI; -using Cysharp.Threading.Tasks; -using System.Collections.Generic; public class ZkEvmRequestAccountsScript : MonoBehaviour { - [SerializeField] private Text Output; - - public void RequestAccounts() - { - RequestAccountsAsync(); - } + [SerializeField] private Text? output; - private async UniTaskVoid RequestAccountsAsync() + public async void RequestAccounts() { if (SampleAppManager.PassportInstance == null) { @@ -23,7 +18,7 @@ private async UniTaskVoid RequestAccountsAsync() ShowOutput("Requesting wallet accounts..."); try { - List accounts = await SampleAppManager.PassportInstance.ZkEvmRequestAccounts(); + var accounts = await SampleAppManager.PassportInstance.ZkEvmRequestAccounts(); ShowOutput(accounts.Count > 0 ? string.Join(", ", accounts) : "No accounts found."); } catch (System.Exception ex) @@ -34,8 +29,8 @@ private async UniTaskVoid RequestAccountsAsync() private void ShowOutput(string message) { - if (Output != null) - Output.text = message; + if (output != null) + output.text = message; Debug.Log($"[ZkEvmRequestAccountsScript] {message}"); } } diff --git a/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmSendTransaction/ZkEvmSendTransactionScript.cs b/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmSendTransaction/ZkEvmSendTransactionScript.cs index 30683a1b4..af0313fcf 100644 --- a/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmSendTransaction/ZkEvmSendTransactionScript.cs +++ b/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmSendTransaction/ZkEvmSendTransactionScript.cs @@ -1,4 +1,7 @@ +#nullable enable + using System; +using System.Diagnostics.CodeAnalysis; using System.Threading; using UnityEngine; using UnityEngine.UI; @@ -8,12 +11,12 @@ public class ZkEvmSendTransactionScript : MonoBehaviour { - [SerializeField] private Text Output; - [SerializeField] private Toggle ConfirmToggle; - [SerializeField] private Toggle GetTransactionReceiptToggle; - [SerializeField] private InputField ToInputField; - [SerializeField] private InputField ValueInputField; - [SerializeField] private InputField DataInputField; + [SerializeField] private Text? output; + [SerializeField] private Toggle? confirmToggle; + [SerializeField] private Toggle? getTransactionReceiptToggle; + [SerializeField] private InputField? toInputField; + [SerializeField] private InputField? valueInputField; + [SerializeField] private InputField? dataInputField; void Start() { @@ -24,21 +27,16 @@ void Start() } // Make sure UI elements are initialised - if (ConfirmToggle != null && GetTransactionReceiptToggle != null) + if (confirmToggle != null && getTransactionReceiptToggle != null) { - ConfirmToggle.onValueChanged.AddListener(delegate + confirmToggle.onValueChanged.AddListener(delegate { - GetTransactionReceiptToggle.gameObject.SetActive(!ConfirmToggle.isOn); + getTransactionReceiptToggle.gameObject.SetActive(!confirmToggle.isOn); }); } } - public void SendTransaction() - { - SendTransactionAsync(); - } - - private async UniTaskVoid SendTransactionAsync() + public async void SendTransaction() { if (SampleAppManager.PassportInstance == null) { @@ -59,31 +57,36 @@ private async UniTaskVoid SendTransactionAsync() ShowOutput("Sending transaction..."); try { - TransactionRequest request = new TransactionRequest + var request = new TransactionRequest { - to = ToInputField != null ? ToInputField.text : "", - value = ValueInputField != null ? ValueInputField.text : "", - data = DataInputField != null ? DataInputField.text : "" + to = toInputField != null ? toInputField.text : "", + value = valueInputField != null ? valueInputField.text : "", + data = dataInputField != null ? dataInputField.text : "" }; - if (ConfirmToggle != null && ConfirmToggle.isOn) + if (confirmToggle != null && confirmToggle.isOn) { - TransactionReceiptResponse response = await SampleAppManager.PassportInstance.ZkEvmSendTransactionWithConfirmation(request); - ShowOutput($"Transaction hash: {response.hash}\nStatus: {GetTransactionStatusString(response.status)}"); + var response = await SampleAppManager.PassportInstance.ZkEvmSendTransactionWithConfirmation(request); + ShowOutput($"Transaction hash: {response?.hash}\nStatus: {GetTransactionStatusString(response?.status)}"); } else { - string transactionHash = await SampleAppManager.PassportInstance.ZkEvmSendTransaction(request); + var transactionHash = await SampleAppManager.PassportInstance.ZkEvmSendTransaction(request); - if (GetTransactionReceiptToggle != null && GetTransactionReceiptToggle.isOn) + if (transactionHash == null) { - string? status = await PollStatus(transactionHash); - ShowOutput($"Transaction hash: {transactionHash}\nStatus: {GetTransactionStatusString(status)}"); + ShowOutput("No transaction hash"); + return; } - else + + if (getTransactionReceiptToggle != null && getTransactionReceiptToggle.isOn) { - ShowOutput($"Transaction hash: {transactionHash}"); + var status = await PollStatus(transactionHash); + ShowOutput($"Transaction hash: {transactionHash}\nStatus: {GetTransactionStatusString(status)}"); + return; } + + ShowOutput($"Transaction hash: {transactionHash}"); } } catch (Exception ex) @@ -92,15 +95,15 @@ private async UniTaskVoid SendTransactionAsync() } } - static async UniTask PollStatus(string transactionHash) + private static async UniTask PollStatus(string transactionHash) { var cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(10)); try { while (!cancellationTokenSource.Token.IsCancellationRequested) { - TransactionReceiptResponse response = await SampleAppManager.PassportInstance.ZkEvmGetTransactionReceipt(transactionHash); - if (response.status == null) + var response = await SampleAppManager.PassportInstance.ZkEvmGetTransactionReceipt(transactionHash); + if (response?.status == null) { await UniTask.Delay(delayTimeSpan: TimeSpan.FromSeconds(1), cancellationToken: cancellationTokenSource.Token); } @@ -116,7 +119,7 @@ private async UniTaskVoid SendTransactionAsync() return null; } - private string GetTransactionStatusString(string? status) + private static string GetTransactionStatusString(string? status) { switch (status) { @@ -140,13 +143,8 @@ public void Cancel() private void ShowOutput(string message) { - if (Output != null) - { - Output.text = message; - } - else - { - Debug.Log($"ZkEvmSendTransactionScript: {message}"); - } + if (output != null) + output.text = message; + Debug.Log($"[ZkEvmSendTransactionScript] {message}"); } } \ No newline at end of file diff --git a/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmSignTypedData/ZkEvmSignTypedDataScript.cs b/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmSignTypedData/ZkEvmSignTypedDataScript.cs index 7c3108f24..df8f2625e 100644 --- a/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmSignTypedData/ZkEvmSignTypedDataScript.cs +++ b/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmSignTypedData/ZkEvmSignTypedDataScript.cs @@ -1,21 +1,16 @@ +#nullable enable + using UnityEngine; using UnityEngine.UI; using UnityEngine.SceneManagement; -using Cysharp.Threading.Tasks; using Immutable.Passport; -using Immutable.Passport.Model; public class ZkEvmSignTypedDataScript : MonoBehaviour { - [SerializeField] private Text Output; - [SerializeField] private InputField Payload; - - public void SignTypedData() - { - SignTypedDataAsync(); - } + [SerializeField] private Text? output; + [SerializeField] private InputField? payloadInputField; - private async UniTaskVoid SignTypedDataAsync() + public async void SignTypedData() { if (Passport.Instance == null) { @@ -25,9 +20,16 @@ private async UniTaskVoid SignTypedDataAsync() ShowOutput("Signing payload..."); try { + var payload = payloadInputField?.text; + if (payload == null) + { + ShowOutput("No payload"); + return; + } + await Passport.Instance.ConnectEvm(); - string signature = await Passport.Instance.ZkEvmSignTypedDataV4(Payload.text); - ShowOutput(signature); + var signature = await Passport.Instance.ZkEvmSignTypedDataV4(payload); + ShowOutput(signature ?? "No signature"); } catch (System.Exception ex) { @@ -42,9 +44,8 @@ public void Cancel() private void ShowOutput(string message) { - if (Output != null) - { - Output.text = message; - } + if (output != null) + output.text = message; + Debug.Log($"[ZkEvmSignTypedDataScript] {message}"); } } \ No newline at end of file