Merge pull request #494 from immutable/fix/send-tx-confirmation-hash

nattb8 · web-flow · commit 299d717bbff2 · 2025-06-19T18:30:01.000+12:00
[ID-3789] fix: send transaction with confirmation hash, e2e tests
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -57,7 +57,7 @@ jobs:
           VALIDATE_ALL_CODEBASE: true
           DEFAULT_BRANCH: main
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FILTER_REGEX_EXCLUDE: (.*src/Packages/Passport/Runtime/ThirdParty/.*|.*src/Packages/Passport/Runtime/Resources/.*|.*Plugins/.*|.*src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/.*|.*src/Packages/Orderbook|.*src/Packages/ZkEvmApi/.*|.*sample|.*src/Packages/Passport/WebGLTemplates~|.*.github/workflows)
+          FILTER_REGEX_EXCLUDE: (.*src/Packages/Passport/Runtime/ThirdParty/.*|.*src/Packages/Passport/Runtime/Resources/.*|.*Plugins/.*|.*src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/.*|.*src/Packages/Orderbook|.*src/Packages/ZkEvmApi/.*|.*sample|.*src/Packages/Passport/WebGLTemplates~|.*.github/workflows|.*src/Packages/Passport/Samples~)
           VALIDATE_MARKDOWN: false
           VALIDATE_GITLEAKS: false
           VALIDATE_JSCPD: false
diff --git a/.gitignore b/.gitignore
@@ -107,4 +107,6 @@ sample/Assets/Vuplex*
 
 __pycache__/
 *.pyc
-.pytest_cache/
+.pytest_cache/
+
+xcuserdata/
diff --git a/sample/Assets/Scripts/Passport/AuthenticatedSceneManager.cs b/sample/Assets/Scripts/Passport/AuthenticatedSceneManager.cs
@@ -62,4 +62,4 @@ public static void NavigateToUnauthenticatedScene()
     {
         UnityEngine.SceneManagement.SceneManager.LoadScene("UnauthenticatedScene");
     }
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/ClearStorageAndCache/ClearStorageAndCacheScript.cs b/sample/Assets/Scripts/Passport/ClearStorageAndCache/ClearStorageAndCacheScript.cs
@@ -38,4 +38,4 @@ private void ShowOutput(string message)
             }
         }
     }
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/GetUserInfo/GetUserInfoScript.cs b/sample/Assets/Scripts/Passport/GetUserInfo/GetUserInfoScript.cs
@@ -146,4 +146,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/ImxConnect/ImxConnectScript.cs b/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;
         }
     }
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/ImxGetAddress/ImxGetAddressScript.cs b/sample/Assets/Scripts/Passport/ImxGetAddress/ImxGetAddressScript.cs
@@ -51,4 +51,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/ImxIsRegisteredOffchain/ImxIsRegisteredOffchainScript.cs b/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");
diff --git a/sample/Assets/Scripts/Passport/ImxNftTransfer/ImxNftTransferScript.cs b/sample/Assets/Scripts/Passport/ImxNftTransfer/ImxNftTransferScript.cs
@@ -105,4 +105,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/ImxRegister/ImxRegisterScript.cs b/sample/Assets/Scripts/Passport/ImxRegister/ImxRegisterScript.cs
@@ -58,4 +58,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/Login/LoginScript.cs b/sample/Assets/Scripts/Passport/Login/LoginScript.cs
@@ -72,4 +72,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/Logout/LogoutScript.cs b/sample/Assets/Scripts/Passport/Logout/LogoutScript.cs
@@ -39,4 +39,4 @@ private async UniTaskVoid LogoutAsync()
             Debug.LogError($"Failed to logout: {ex.Message}");
         }
     }
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/Other/AuthenticatedSceneNavigation.cs b/sample/Assets/Scripts/Passport/Other/AuthenticatedSceneNavigation.cs
@@ -46,4 +46,4 @@ public void ShowLinkWallet()
     }
 
     // Add more navigation methods as needed for other features
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/Other/SetCallTimeout/SetCallTimeoutScript.cs b/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}");
         }
     }
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/Reconnect/ReconnectScript.cs b/sample/Assets/Scripts/Passport/Reconnect/ReconnectScript.cs
@@ -64,4 +64,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/Relogin/ReloginScript.cs b/sample/Assets/Scripts/Passport/Relogin/ReloginScript.cs
@@ -54,4 +54,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/SampleAppManager.cs b/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; }
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/UnauthenticatedSceneManager.cs b/sample/Assets/Scripts/Passport/UnauthenticatedSceneManager.cs
@@ -31,4 +31,4 @@ void Awake()
     {
         OnImxConnected = () => { UnityEngine.SceneManagement.SceneManager.LoadScene("AuthenticatedScene"); };
     }
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmConnect/ZkEvmConnectScript.cs b/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;
         }
     }
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmGetBalance/ZkEvmGetBalanceScript.cs b/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmGetBalance/ZkEvmGetBalanceScript.cs
@@ -52,4 +52,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmGetTransactionReceipt/ZkEvmGetTransactionReceiptScript.cs b/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmGetTransactionReceipt/ZkEvmGetTransactionReceiptScript.cs
@@ -65,4 +65,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmSendTransaction/ZkEvmSendTransactionScript.cs b/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}");
         }
     }
-} 
+}
diff --git a/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmSignTypedData/ZkEvmSignTypedDataScript.cs b/sample/Assets/Scripts/Passport/ZkEvm/ZkEvmSignTypedData/ZkEvmSignTypedDataScript.cs
@@ -47,4 +47,4 @@ private void ShowOutput(string message)
             Output.text = message;
         }
     }
-} 
+}
diff --git a/sample/Tests/test/test.py b/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)
diff --git a/sample/Tests/test/test_android.py b/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()
diff --git a/sample/Tests/test/test_mac.py b/sample/Tests/test/test_mac.py
diff --git a/sample/Tests/test/test_windows.py b/sample/Tests/test/test_windows.py
diff --git a/sample/Tests/test/test_windows_helpers.py b/sample/Tests/test/test_windows_helpers.py
diff --git a/src/Packages/Passport/Runtime/Scripts/Private/Model/Response/TransactionReceiptResponse.cs b/src/Packages/Passport/Runtime/Scripts/Private/Model/Response/TransactionReceiptResponse.cs
diff --git a/src/Packages/Passport/Runtime/Scripts/Private/PassportImpl.cs b/src/Packages/Passport/Runtime/Scripts/Private/PassportImpl.cs
diff --git a/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ZkEvm/ZkEvmSendTransaction/ZkEvmSendTransactionScript.cs b/src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/Passport/ZkEvm/ZkEvmSendTransaction/ZkEvmSendTransactionScript.cs

Original file line number	Diff line number	Diff line change
`@@ -62,4 +62,4 @@ public static void NavigateToUnauthenticatedScene()`
`62`	`62`	`{`
`63`	`63`	`UnityEngine.SceneManagement.SceneManager.LoadScene("UnauthenticatedScene");`
`64`	`64`	`}`
`65`		`-}`
	`65`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,4 @@ private void ShowOutput(string message)`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`}`
`41`		`-}`
	`41`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -146,4 +146,4 @@ private void ShowOutput(string message)`
`146`	`146`	`Output.text = message;`
`147`	`147`	`}`
`148`	`148`	`}`
`149`		`-}`
	`149`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ private async UniTaskVoid ConnectImxAsync()`
`28`	`28`	`try`
`29`	`29`	`{`
`30`	`30`	`await Passport.Instance.ConnectImx();`
`31`		`-`
	`31`	`+`
`32`	`32`	`SampleAppManager.IsConnectedToImx = true;`
`33`	`33`	`ShowOutput("Connected to IMX"); // Show success early`
`34`	`34`
`@@ -37,14 +37,14 @@ private async UniTaskVoid ConnectImxAsync()`
`37`	`37`	`if (unauthSceneManager != null)`
`38`	`38`	`{`
`39`	`39`	`unauthSceneManager.OnImxConnected?.Invoke();`
`40`		`- return;`
	`40`	`+ return;`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`var authSceneManager = FindObjectOfType<AuthenticatedSceneManager>();`
`44`	`44`	`if (authSceneManager != null)`
`45`	`45`	`{`
`46`	`46`	`authSceneManager.UpdateImxButtonStates();`
`47`		`- authSceneManager.OnImxConnected?.Invoke();`
	`47`	`+ authSceneManager.OnImxConnected?.Invoke();`
`48`	`48`	`return;`
`49`	`49`	`}`
`50`	`50`	`}`
`@@ -61,4 +61,4 @@ private void ShowOutput(string message)`
`61`	`61`	`Output.text = message;`
`62`	`62`	`}`
`63`	`63`	`}`
`64`		`-}`
	`64`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -51,4 +51,4 @@ private void ShowOutput(string message)`
`51`	`51`	`Output.text = message;`
`52`	`52`	`}`
`53`	`53`	`}`
`54`		`-}`
	`54`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ private async UniTaskVoid CheckIsRegisteredOffchainAsync()`
`35`	`35`	`try`
`36`	`36`	`{`
`37`	`37`	`bool isRegistered = await SampleAppManager.PassportInstance.IsRegisteredOffchain();`
`38`		`-`
	`38`	`+`
`39`	`39`	`if (isRegistered)`
`40`	`40`	`{`
`41`	`41`	`ShowOutput("Registered");`
Original file line number	Diff line number	Diff line change
`@@ -105,4 +105,4 @@ private void ShowOutput(string message)`
`105`	`105`	`Output.text = message;`
`106`	`106`	`}`
`107`	`107`	`}`
`108`		`-}`
	`108`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -58,4 +58,4 @@ private void ShowOutput(string message)`
`58`	`58`	`Output.text = message;`
`59`	`59`	`}`
`60`	`60`	`}`
`61`		`-}`
	`61`	`+}`