Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Packages/Marketplace/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.immutable.marketplace",
"version": "1.33.2",
"version": "1.34.0",
"description": "Marketplace package for the Immutable SDK for Unity",
"displayName": "Immutable Marketplace",
"author": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ public class SdkVersionInfoHelpers
{
public static string GetSdkVersionInfo()
{
return "1.33.2";
return "1.34.0";
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ public static void NavigateToUnauthenticatedScene()
{
UnityEngine.SceneManagement.SceneManager.LoadScene("UnauthenticatedScene");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ private void ShowOutput(string message)
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,4 @@ private void ShowOutput(string message)
Output.text = message;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ private async UniTaskVoid ConnectImxAsync()
try
{
await Passport.Instance.ConnectImx();

SampleAppManager.IsConnectedToImx = true;
ShowOutput("Connected to IMX"); // Show success early

Expand All @@ -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;
}
}
Expand All @@ -61,4 +61,4 @@ private void ShowOutput(string message)
Output.text = message;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ private void ShowOutput(string message)
Output.text = message;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ private async UniTaskVoid CheckIsRegisteredOffchainAsync()
try
{
bool isRegistered = await SampleAppManager.PassportInstance.IsRegisteredOffchain();

if (isRegistered)
{
ShowOutput("Registered");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,4 @@ private void ShowOutput(string message)
Output.text = message;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ private void ShowOutput(string message)
Output.text = message;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ private void ShowOutput(string message)
Output.text = message;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ private async UniTaskVoid LogoutAsync()
Debug.LogError($"Failed to logout: {ex.Message}");
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ public void ShowLinkWallet()
}

// Add more navigation methods as needed for other features
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ private void ShowOutput(string message)
Debug.LogWarning($"[SetCallTimeoutScript] Output Text is not assigned. Message: {message}");
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ private void ShowOutput(string message)
Output.text = message;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ private void ShowOutput(string message)
Output.text = message;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ public static class SampleAppManager
/// Holds the Passport instance for IMX operations.
/// </summary>
public static Immutable.Passport.Passport PassportInstance { get; set; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ void Awake()
{
OnImxConnected = () => { UnityEngine.SceneManagement.SceneManager.LoadScene("AuthenticatedScene"); };
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
Expand All @@ -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)
Expand All @@ -60,4 +60,4 @@ private void ShowOutput(string message)
output.text = message;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ private void ShowOutput(string message)
Output.text = message;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ private void ShowOutput(string message)
Output.text = message;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ void Start()
ShowOutput("Passport instance is null");
return;
}

// Make sure UI elements are initialised
if (ConfirmToggle != null && GetTransactionReceiptToggle != null)
{
Expand Down Expand Up @@ -66,7 +66,7 @@ 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);
Expand All @@ -75,7 +75,7 @@ private async UniTaskVoid SendTransactionAsync()
else
{
string transactionHash = await SampleAppManager.PassportInstance.ZkEvmSendTransaction(request);

if (GetTransactionReceiptToggle != null && GetTransactionReceiptToggle.isOn)
{
string? status = await PollStatus(transactionHash);
Expand Down Expand Up @@ -150,4 +150,4 @@ private void ShowOutput(string message)
Debug.Log($"ZkEvmSendTransactionScript: {message}");
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ private void ShowOutput(string message)
Output.text = message;
}
}
}
}
2 changes: 1 addition & 1 deletion src/Packages/Passport/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.immutable.passport",
"version": "1.33.2",
"version": "1.34.0",
"description": "The Immutable SDK for Unity helps you integrate your game with Immutable Passport.\n\nFor a complete working example, please visit https://github.com/immutable/unity-immutable-sdk/tree/main/sample.",
"displayName": "Immutable Passport",
"author": {
Expand Down