fix: send transaction with confirmation hash, e2e tests

Author: nattb8

.gitignore

@@ -107,4 +107,6 @@ sample/Assets/Vuplex*
 
 __pycache__/
 *.pyc
-.pytest_cache/
+.pytest_cache/
+
+xcuserdata/

sample/Assets/Scripts/Passport/AuthenticatedSceneManager.cs

@@ -62,4 +62,4 @@ public static void NavigateToUnauthenticatedScene()
     {
         UnityEngine.SceneManagement.SceneManager.LoadScene("UnauthenticatedScene");
     }
-} 
+}

sample/Assets/Scripts/Passport/ClearStorageAndCache/ClearStorageAndCacheScript.cs

@@ -38,4 +38,4 @@ private void ShowOutput(string message)
             }
         }
     }
-} 
+}

sample/Assets/Scripts/Passport/GetUserInfo/GetUserInfoScript.cs

@@ -146,4 +146,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}

sample/Assets/Scripts/Passport/ImxConnect/ImxConnectScript.cs

@@ -28,7 +28,7 @@ private async UniTaskVoid ConnectImxAsync()
         try
         {
             await Passport.Instance.ConnectImx();
-            
+
             SampleAppManager.IsConnectedToImx = true;
             ShowOutput("Connected to IMX"); // Show success early
 
@@ -37,14 +37,14 @@ private async UniTaskVoid ConnectImxAsync()
             if (unauthSceneManager != null)
             {
                 unauthSceneManager.OnImxConnected?.Invoke();
-                return; 
+                return;
             }
 
             var authSceneManager = FindObjectOfType<AuthenticatedSceneManager>();
             if (authSceneManager != null)
             {
                 authSceneManager.UpdateImxButtonStates();
-                authSceneManager.OnImxConnected?.Invoke(); 
+                authSceneManager.OnImxConnected?.Invoke();
                 return;
             }
         }
@@ -61,4 +61,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}

sample/Assets/Scripts/Passport/ImxGetAddress/ImxGetAddressScript.cs

@@ -51,4 +51,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}

sample/Assets/Scripts/Passport/ImxIsRegisteredOffchain/ImxIsRegisteredOffchainScript.cs

@@ -35,7 +35,7 @@ private async UniTaskVoid CheckIsRegisteredOffchainAsync()
             try
             {
                 bool isRegistered = await SampleAppManager.PassportInstance.IsRegisteredOffchain();
-                
+
                 if (isRegistered)
                 {
                     ShowOutput("Registered");

sample/Assets/Scripts/Passport/ImxNftTransfer/ImxNftTransferScript.cs

@@ -105,4 +105,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}

sample/Assets/Scripts/Passport/ImxRegister/ImxRegisterScript.cs

@@ -58,4 +58,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}

sample/Assets/Scripts/Passport/Login/LoginScript.cs

@@ -72,4 +72,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}

sample/Assets/Scripts/Passport/Logout/LogoutScript.cs

@@ -39,4 +39,4 @@ private async UniTaskVoid LogoutAsync()
             Debug.LogError($"Failed to logout: {ex.Message}");
         }
     }
-} 
+}

sample/Assets/Scripts/Passport/Other/AuthenticatedSceneNavigation.cs

@@ -46,4 +46,4 @@ public void ShowLinkWallet()
     }
 
     // Add more navigation methods as needed for other features
-} 
+}

sample/Assets/Scripts/Passport/Other/SetCallTimeout/SetCallTimeoutScript.cs

@@ -46,4 +46,4 @@ private void ShowOutput(string message)
             Debug.LogWarning($"[SetCallTimeoutScript] Output Text is not assigned. Message: {message}");
         }
     }
-} 
+}

sample/Assets/Scripts/Passport/Reconnect/ReconnectScript.cs

@@ -64,4 +64,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}

sample/Assets/Scripts/Passport/Relogin/ReloginScript.cs

@@ -54,4 +54,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}

sample/Assets/Scripts/Passport/SampleAppManager.cs

@@ -19,4 +19,4 @@ public static class SampleAppManager
     /// Holds the Passport instance for IMX operations.
     /// </summary>
     public static Immutable.Passport.Passport PassportInstance { get; set; }
-} 
+}

sample/Assets/Scripts/Passport/UnauthenticatedSceneManager.cs

@@ -31,4 +31,4 @@ void Awake()
     {
         OnImxConnected = () => { UnityEngine.SceneManagement.SceneManager.LoadScene("AuthenticatedScene"); };
     }
-} 
+}

sample/Assets/Scripts/Passport/ZkEvm/ZkEvmConnect/ZkEvmConnectScript.cs

@@ -31,7 +31,7 @@ private async UniTaskVoid ConnectZkEvmAsync()
             try
             {
                 await Passport.Instance.ConnectEvm();
-                
+
                 // Add these lines to update connection state and refresh UI
                 SampleAppManager.IsConnectedToZkEvm = true;
                 var sceneManager = FindObjectOfType<AuthenticatedSceneManager>();
@@ -44,7 +44,7 @@ private async UniTaskVoid ConnectZkEvmAsync()
                 {
                     Debug.LogWarning("Could not find AuthenticatedSceneManager to update button states");
                 }
-                
+
                 ShowOutput("Connected to EVM");
             }
             catch (System.Exception ex)
@@ -60,4 +60,4 @@ private void ShowOutput(string message)
                 output.text = message;
         }
     }
-} 
+}

sample/Assets/Scripts/Passport/ZkEvm/ZkEvmGetBalance/ZkEvmGetBalanceScript.cs

@@ -52,4 +52,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}

sample/Assets/Scripts/Passport/ZkEvm/ZkEvmGetTransactionReceipt/ZkEvmGetTransactionReceiptScript.cs

@@ -65,4 +65,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}

sample/Assets/Scripts/Passport/ZkEvm/ZkEvmSendTransaction/ZkEvmSendTransactionScript.cs

@@ -23,7 +23,7 @@ void Start()
             ShowOutput("Passport instance is null");
             return;
         }
-        
+
         // Make sure UI elements are initialised
         if (ConfirmToggle != null && GetTransactionReceiptToggle != null)
         {
@@ -66,16 +66,16 @@ private async UniTaskVoid SendTransactionAsync()
                 value = ValueInputField != null ? ValueInputField.text : "",
                 data = DataInputField != null ? DataInputField.text : ""
             };
-            
+
             if (ConfirmToggle != null && ConfirmToggle.isOn)
             {
                 TransactionReceiptResponse response = await SampleAppManager.PassportInstance.ZkEvmSendTransactionWithConfirmation(request);
-                ShowOutput($"Transaction hash: {response.transactionHash}\nStatus: {GetTransactionStatusString(response.status)}");
+                ShowOutput($"Transaction hash: {response.hash}\nStatus: {GetTransactionStatusString(response.status)}");
             }
             else
             {
                 string transactionHash = await SampleAppManager.PassportInstance.ZkEvmSendTransaction(request);
-                
+
                 if (GetTransactionReceiptToggle != null && GetTransactionReceiptToggle.isOn)
                 {
                     string? status = await PollStatus(transactionHash);
@@ -150,4 +150,4 @@ private void ShowOutput(string message)
             Debug.Log($"ZkEvmSendTransactionScript: {message}");
         }
     }
-} 
+}

sample/Assets/Scripts/Passport/ZkEvm/ZkEvmSignTypedData/ZkEvmSignTypedDataScript.cs

@@ -47,4 +47,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}

sample/Tests/test/test.py

@@ -93,6 +93,7 @@ def test_2_imx_functions(self):
 
         # Connect to IMX
         self.altdriver.find_object(By.NAME, "ConnectBtn").tap()
+        time.sleep(5)
         text = output.get_text()
         print(f"ConnectBtn output: {text}")
         self.assertEqual("Connected to IMX", text)

sample/Tests/test/test_android.py

@@ -142,6 +142,7 @@ def test_6_pkce_relogin(self):
 
         # Click Connect to IMX button
         self.altdriver.find_object(By.NAME, "ConnectBtn").tap()
+        time.sleep(5)
         self.assertEqual("Connected to IMX", output.get_text())
 
         self.altdriver.stop()

sample/Tests/test/test_mac.py

@@ -185,6 +185,7 @@ def test_6_device_code_relogin(self):
 
         # Click Connect to IMX button
         self.altdriver.find_object(By.NAME, "ConnectBtn").tap()
+        time.sleep(5)
         self.assertEqual("Connected to IMX", output.get_text())
 
         self.altdriver.stop()

sample/Tests/test/test_windows.py

@@ -128,6 +128,7 @@ def test_6_relogin(self):
 
         # Click Connect to IMX button
         self.get_altdriver().find_object(By.NAME, "ConnectBtn").tap()
+        time.sleep(5)
         self.assertEqual("Connected to IMX", output.get_text())
 
     def test_7_reconnect_device_code_connect_imx(self):

sample/Tests/test/test_windows_helpers.py

@@ -57,11 +57,29 @@ def login(use_pkce: bool):
     # Get all window handles
     all_windows = driver.window_handles
 
-    print("Find the new window")
-    new_window = [window for window in all_windows if window != driver.current_window_handle][0]
+    print(f"Found {len(all_windows)} new windows to check: {all_windows}")
+
+    # Find the window with email input
+    target_window = None
+    for window in all_windows:
+        try:
+            print(f"Checking window: {window}")
+            driver.switch_to.window(window)
+            driver.find_element(By.ID, ':r1:')
+            target_window = window
+            print(f"Found email input in window: {window}")
+            break
+        except:
+            print(f"Email input not found in window: {window}, trying next...")
+            continue
+
+    if not target_window:
+        print("Could not find email input field in any window!")
+        driver.quit()
+        return
 
-    print("Switch to the new window")
-    driver.switch_to.window(new_window)
+    print("Switch to the target window")
+    driver.switch_to.window(target_window)
 
     wait = WebDriverWait(driver, 60)
 
@@ -133,8 +151,9 @@ def bring_sample_app_to_foreground():
 
     command = [
         "powershell.exe",
-        "-Command",
-        f"Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope Process; & '{powershell_script_path}' -appName '{product_name}'"
+        "-ExecutionPolicy", "Bypass",
+        "-File", powershell_script_path,
+        "-appName", product_name
     ]
 
     subprocess.run(command, check=True)

src/Packages/Passport/Runtime/Scripts/Private/Model/Response/TransactionReceiptResponse.cs

@@ -34,7 +34,7 @@ public class TransactionReceiptResponse
 
         public string to;
 
-        public string transactionHash;
+        public string hash;
 
         public string transactionIndex;
 

src/Packages/Passport/Runtime/Scripts/Private/PassportImpl.cs

@@ -753,8 +753,8 @@ public async UniTask<string> ZkEvmSendTransaction(TransactionRequest request)
 
         public async UniTask<TransactionReceiptResponse> ZkEvmSendTransactionWithConfirmation(TransactionRequest request)
         {
-            string json = SerialiseTransactionRequest(request);
-            string callResponse = await communicationsManager.Call(PassportFunction.ZK_EVM.SEND_TRANSACTION_WITH_CONFIRMATION, json);
+            var json = SerialiseTransactionRequest(request);
+            var callResponse = await communicationsManager.Call(PassportFunction.ZK_EVM.SEND_TRANSACTION_WITH_CONFIRMATION, json);
             return callResponse.OptDeserializeObject<TransactionReceiptResponse>();
         }
 

src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ZkEvm/ZkEvmSendTransaction/ZkEvmSendTransactionScript.cs

@@ -70,7 +70,7 @@ private async UniTaskVoid SendTransactionAsync()
             if (ConfirmToggle != null && ConfirmToggle.isOn)
             {
                 TransactionReceiptResponse response = await SampleAppManager.PassportInstance.ZkEvmSendTransactionWithConfirmation(request);
-                ShowOutput($"Transaction hash: {response.transactionHash}\nStatus: {GetTransactionStatusString(response.status)}");
+                ShowOutput($"Transaction hash: {response.hash}\nStatus: {GetTransactionStatusString(response.status)}");
             }
             else
             {