From 60c13af8bb06680f9add3e00a97a7c41428de2e0 Mon Sep 17 00:00:00 2001
From: Jason Elie Bou Kheir <5115126+jasonboukheir@users.noreply.github.com>
Date: Sun, 5 Jun 2022 16:47:31 -0700
Subject: [PATCH] feat(walletconnect): add wallet connect support to
 UnityEditor (#143)

Add a new `WalletConnectAccount` and `WalletConnectAccountAsset` to manage WalletConnect accounts in the editor.

BREAKING CHANGE: `AlgorandWalletConnectSession` flow has been changed to reflect new `JsonRpcClient`.
- `StartConnection` renamed to `Connect`
- `Disconnect` renamed to `DisconnectWallet`
- `WaitForConnectionApproval` renamed to `WaitForWalletApproval`
- `SavedSession` renamed to `SessionData`
---
 .../CareBoo.AlgoSdk.Editor/AddressDrawer.cs   |   2 +-
 Editor/CareBoo.AlgoSdk.Editor/Base32Drawer.cs |   6 +-
 Editor/CareBoo.AlgoSdk.Editor/Base64Drawer.cs |   2 +-
 .../CareBoo.AlgoSdk.Editor/BytesTextDrawer.cs |  24 +-
 .../FixedStringDrawer.cs                      |   4 +-
 Editor/CareBoo.AlgoSdk.Editor/HexDrawer.cs    |  25 ++
 .../CareBoo.AlgoSdk.Editor/HexDrawer.cs.meta  |   2 +-
 .../CareBoo.AlgoSdk.Editor/MnemonicDrawer.cs  |   2 +-
 .../PrivateKeyDrawer.cs                       |   2 +-
 .../CareBoo.AlgoSdk.Editor/SerializedBytes.cs |  81 +++-
 .../CareBoo.AlgoSdk.WalletConnect.Editor.meta |   3 +-
 ...areBoo.AlgoSdk.WalletConnect.Editor.asmdef |  21 +
 ...o.AlgoSdk.WalletConnect.Editor.asmdef.meta |   7 +
 .../UI.meta                                   |   8 +
 .../UI/WalletConnectAccountEditorWindow.uxml  |  25 ++
 ...WalletConnectAccountEditorWindow.uxml.meta |  10 +
 .../WalletConnectAccountDrawer.cs             |  22 ++
 .../WalletConnectAccountDrawer.cs.meta        |  11 +
 .../WalletConnectEditorWindow.cs              | 165 ++++++++
 .../WalletConnectEditorWindow.cs.meta         |  15 +
 .../JsonReader/JsonReader.String.cs           |   2 +-
 Runtime/CareBoo.AlgoSdk.LowLevel/ByteArray.cs |   2 +-
 .../MessagePackReader.String.cs               |   2 +-
 .../MessagePackWriter.String.cs               |   2 +-
 .../AlgorandWalletConnectSession.cs           | 358 +++++-------------
 .../JsonRpcRequest.Formatters.gen.cs          |   2 +-
 .../IWalletConnectAccount.cs                  |  63 +++
 .../IWalletConnectAccount.cs.meta             |  11 +
 .../IWalletConnectSession.cs                  |   7 +-
 .../CareBoo.AlgoSdk.WalletConnect/JsonRpc.cs  |   2 +-
 .../JsonRpcClient.cs                          | 195 ++++++++++
 .../JsonRpcClient.cs.meta                     |  11 +
 .../Models/JsonRpcRequest.cs                  |   4 +-
 .../Models/NetworkMessage.cs                  |   2 +-
 .../{SavedSession.cs => SessionData.cs}       |  22 +-
 ...vedSession.cs.meta => SessionData.cs.meta} |   0
 .../Models/WalletConnectRpc.cs                |   2 +
 .../SessionStatus.cs                          |  10 +
 .../SessionStatus.cs.meta                     |  11 +
 .../WalletConnectAccount.cs                   | 151 ++++++++
 .../WalletConnectAccount.cs.meta              |  11 +
 .../WalletConnectAccountAsset.cs              |  67 ++++
 .../WalletConnectAccountAsset.cs.meta         |  11 +
 .../WalletConnectSessionEvents.cs             |  13 +
 .../WalletConnectSessionEvents.cs.meta        |  11 +
 .../WebSocketExtensions.cs                    |  24 +-
 Runtime/CareBoo.AlgoSdk/Accounts/Account.cs   |   2 +-
 Runtime/CareBoo.AlgoSdk/Accounts/Address.cs   |   4 +-
 Runtime/CareBoo.AlgoSdk/Accounts/Logic.cs     |  19 +-
 .../CareBoo.AlgoSdk/Accounts/PrivateKey.cs    |   4 +-
 .../Formatters/AlgoApiObjectFormatter.cs      |  12 +-
 .../Formatters/AlgoApiSerializer.cs           |  14 +-
 .../Formatters/ByteArrayFormatter.cs          |  10 +-
 .../Formatters/FixedBytesFormatter.cs         |   6 +-
 .../Formatters/Primitives/StringFormatter.cs  |   8 +-
 .../Formatters/StateDeltaFormatter.cs         |   2 +-
 .../Services/Algod/AlgodClient.cs             |   2 +-
 .../Services/Algod/AlgodClientAsset.cs        |  10 +
 .../Services/Algod/AlgodClientAsset.cs.meta   |  11 +
 .../Services/Indexer/IndexerClientAsset.cs    |  10 +
 .../Indexer/IndexerClientAsset.cs.meta        |  11 +
 .../Services/Kmd/KmdAccount.cs                |  16 +-
 .../Services/Kmd/KmdClientAsset.cs            |  10 +
 .../Services/Kmd/KmdClientAsset.cs.meta       |  11 +
 .../Services/Networking/AlgoApiRequest.cs     |   4 +-
 .../SmartContracts/Abi/Contract.cs            |   2 +-
 .../SmartContracts/Abi/MethodCallBuilder.cs   |   8 +-
 .../SmartContracts/Abi/MethodSelector.cs      |   2 +-
 .../SmartContracts/Abi/Values/Array.cs        |   2 +-
 .../SmartContracts/Abi/Values/Tuple.cs        |   8 +-
 .../SmartContracts/AppIndex.cs                |   4 +-
 .../SmartContracts/CompiledTeal.cs            |   2 +-
 .../Transactions/Atomic/AtomicTxn.Building.cs |   4 +-
 .../Transactions/Atomic/AtomicTxn.Signing.cs  |   2 +-
 .../Transactions/Atomic/TxnIndices.cs         |   6 +
 .../Transactions/ITransaction.cs              |   6 +-
 .../Transactions/Signature/LogicSig.cs        |   3 +-
 .../Transactions/Signature/Multisig.cs        |  24 +-
 .../Transactions/TransactionGroup.cs          |   4 +-
 Runtime/CareBoo.AlgoSdk/Util/Hex.cs           |   5 +
 .../WalletConnect/WalletConnectManager.cs     |  17 +-
 .../Ed25519Test.cs                            |   4 +-
 .../JsonReaderTest.cs                         |   2 +-
 .../NativeArrayUtilTest.cs                    |   2 +-
 .../Abi/Types/TupleTest.cs                    |   4 +-
 .../Abi/Types/UfixedNxMTest.cs                |   6 +-
 .../Abi/Types/UintNTest.cs                    |   8 +-
 .../CareBoo.AlgoSdk.Tests/BlockTest.cs        |   2 +-
 .../PendingTransactionTest.cs                 |   2 +-
 .../Transaction/Atomic/TxnIndicesTest.cs      |  10 +
 .../Assets/TestSerialization/.gitignore       |   1 +
 .../Assets/TestSerialization/TestComponent.cs |   7 -
 .../TestSerialization/TestSerialization.unity |   3 -
 .../ProjectSettings/ProjectVersion.txt        |   4 +-
 94 files changed, 1324 insertions(+), 429 deletions(-)
 create mode 100644 Editor/CareBoo.AlgoSdk.Editor/HexDrawer.cs
 rename Unity.AlgoSdk.Package/Assets/TestSerialization/TestComponent.cs.meta => Editor/CareBoo.AlgoSdk.Editor/HexDrawer.cs.meta (83%)
 rename Unity.AlgoSdk.Package/Assets/TestSerialization/TestSerialization.unity.meta => Editor/CareBoo.AlgoSdk.WalletConnect.Editor.meta (67%)
 create mode 100644 Editor/CareBoo.AlgoSdk.WalletConnect.Editor/CareBoo.AlgoSdk.WalletConnect.Editor.asmdef
 create mode 100644 Editor/CareBoo.AlgoSdk.WalletConnect.Editor/CareBoo.AlgoSdk.WalletConnect.Editor.asmdef.meta
 create mode 100644 Editor/CareBoo.AlgoSdk.WalletConnect.Editor/UI.meta
 create mode 100644 Editor/CareBoo.AlgoSdk.WalletConnect.Editor/UI/WalletConnectAccountEditorWindow.uxml
 create mode 100644 Editor/CareBoo.AlgoSdk.WalletConnect.Editor/UI/WalletConnectAccountEditorWindow.uxml.meta
 create mode 100644 Editor/CareBoo.AlgoSdk.WalletConnect.Editor/WalletConnectAccountDrawer.cs
 create mode 100644 Editor/CareBoo.AlgoSdk.WalletConnect.Editor/WalletConnectAccountDrawer.cs.meta
 create mode 100644 Editor/CareBoo.AlgoSdk.WalletConnect.Editor/WalletConnectEditorWindow.cs
 create mode 100644 Editor/CareBoo.AlgoSdk.WalletConnect.Editor/WalletConnectEditorWindow.cs.meta
 create mode 100644 Runtime/CareBoo.AlgoSdk.WalletConnect/IWalletConnectAccount.cs
 create mode 100644 Runtime/CareBoo.AlgoSdk.WalletConnect/IWalletConnectAccount.cs.meta
 create mode 100644 Runtime/CareBoo.AlgoSdk.WalletConnect/JsonRpcClient.cs
 create mode 100644 Runtime/CareBoo.AlgoSdk.WalletConnect/JsonRpcClient.cs.meta
 rename Runtime/CareBoo.AlgoSdk.WalletConnect/Models/{SavedSession.cs => SessionData.cs} (71%)
 rename Runtime/CareBoo.AlgoSdk.WalletConnect/Models/{SavedSession.cs.meta => SessionData.cs.meta} (100%)
 create mode 100644 Runtime/CareBoo.AlgoSdk.WalletConnect/SessionStatus.cs
 create mode 100644 Runtime/CareBoo.AlgoSdk.WalletConnect/SessionStatus.cs.meta
 create mode 100644 Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectAccount.cs
 create mode 100644 Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectAccount.cs.meta
 create mode 100644 Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectAccountAsset.cs
 create mode 100644 Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectAccountAsset.cs.meta
 create mode 100644 Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectSessionEvents.cs
 create mode 100644 Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectSessionEvents.cs.meta
 create mode 100644 Runtime/CareBoo.AlgoSdk/Services/Algod/AlgodClientAsset.cs
 create mode 100644 Runtime/CareBoo.AlgoSdk/Services/Algod/AlgodClientAsset.cs.meta
 create mode 100644 Runtime/CareBoo.AlgoSdk/Services/Indexer/IndexerClientAsset.cs
 create mode 100644 Runtime/CareBoo.AlgoSdk/Services/Indexer/IndexerClientAsset.cs.meta
 create mode 100644 Runtime/CareBoo.AlgoSdk/Services/Kmd/KmdClientAsset.cs
 create mode 100644 Runtime/CareBoo.AlgoSdk/Services/Kmd/KmdClientAsset.cs.meta
 create mode 100644 Unity.AlgoSdk.Package/Assets/TestSerialization/.gitignore
 delete mode 100644 Unity.AlgoSdk.Package/Assets/TestSerialization/TestComponent.cs
 delete mode 100644 Unity.AlgoSdk.Package/Assets/TestSerialization/TestSerialization.unity

diff --git a/Editor/CareBoo.AlgoSdk.Editor/AddressDrawer.cs b/Editor/CareBoo.AlgoSdk.Editor/AddressDrawer.cs
index 8e5e7d92e..0511766c8 100644
--- a/Editor/CareBoo.AlgoSdk.Editor/AddressDrawer.cs
+++ b/Editor/CareBoo.AlgoSdk.Editor/AddressDrawer.cs
@@ -3,7 +3,7 @@
 namespace AlgoSdk.Editor
 {
     [CustomPropertyDrawer(typeof(Address))]
-    public class AddressDrawer : BytesTextDrawer<Address>
+    public class AddressDrawer : FixedBytesTextDrawer<Address>
     {
         protected override Address GetByteArray(string s)
         {
diff --git a/Editor/CareBoo.AlgoSdk.Editor/Base32Drawer.cs b/Editor/CareBoo.AlgoSdk.Editor/Base32Drawer.cs
index b07a452d6..11f608ae0 100644
--- a/Editor/CareBoo.AlgoSdk.Editor/Base32Drawer.cs
+++ b/Editor/CareBoo.AlgoSdk.Editor/Base32Drawer.cs
@@ -1,12 +1,12 @@
 using System.Collections.Generic;
-using UnityEditor;
 using System.Linq;
 using Unity.Collections;
+using UnityEditor;
 
 namespace AlgoSdk.Editor
 {
     [CustomPropertyDrawer(typeof(TransactionId))]
-    public class Base32Drawer : BytesTextDrawer
+    public class Base32Drawer : FixedBytesTextDrawer
     {
         protected override List<byte> GetBytes(string s)
         {
@@ -15,7 +15,7 @@ protected override List<byte> GetBytes(string s)
 
         protected override string GetString(List<byte> bytes)
         {
-            var t = new NativeText(Base32Encoding.ToString(bytes.ToArray()), Allocator.Temp);
+            var t = new NativeText(Base32Encoding.ToString(bytes.ToArray()), Allocator.Persistent);
             try
             {
                 Base32Encoding.TrimPadding(ref t);
diff --git a/Editor/CareBoo.AlgoSdk.Editor/Base64Drawer.cs b/Editor/CareBoo.AlgoSdk.Editor/Base64Drawer.cs
index 94181a83e..c9340e326 100644
--- a/Editor/CareBoo.AlgoSdk.Editor/Base64Drawer.cs
+++ b/Editor/CareBoo.AlgoSdk.Editor/Base64Drawer.cs
@@ -11,7 +11,7 @@ namespace AlgoSdk.Editor
     [CustomPropertyDrawer(typeof(Sig))]
     [CustomPropertyDrawer(typeof(TealBytes))]
     [CustomPropertyDrawer(typeof(VrfPubKey))]
-    public class Base64Drawer : BytesTextDrawer
+    public class Base64Drawer : FixedBytesTextDrawer
     {
         protected override List<byte> GetBytes(string s)
         {
diff --git a/Editor/CareBoo.AlgoSdk.Editor/BytesTextDrawer.cs b/Editor/CareBoo.AlgoSdk.Editor/BytesTextDrawer.cs
index af1c70248..b20cb222f 100644
--- a/Editor/CareBoo.AlgoSdk.Editor/BytesTextDrawer.cs
+++ b/Editor/CareBoo.AlgoSdk.Editor/BytesTextDrawer.cs
@@ -6,12 +6,12 @@
 
 namespace AlgoSdk.Editor
 {
-    public abstract class BytesTextDrawer<T> : BytesTextDrawer
-        where T : struct, IByteArray
+    public abstract class BytesTextDrawer<TResult> : BytesTextDrawer
+        where TResult : struct, IByteArray
     {
         protected override string GetString(List<byte> bytes)
         {
-            T t = default;
+            TResult t = default;
             for (var i = 0; i < bytes.Count; i++)
                 t[i] = bytes[i];
             return GetString(t);
@@ -26,8 +26,14 @@ protected override List<byte> GetBytes(string s)
             return bytes;
         }
 
-        protected abstract string GetString(T bytes);
-        protected abstract T GetByteArray(string s);
+        protected abstract string GetString(TResult bytes);
+        protected abstract TResult GetByteArray(string s);
+    }
+
+    public abstract class FixedBytesTextDrawer<TResult> : BytesTextDrawer<TResult>
+        where TResult : struct, IByteArray
+    {
+        protected override SerializedBytes GetSerializedBytes(SerializedProperty property) => new SerializedFixedBytes(property);
     }
 
     public abstract class BytesTextDrawer : PropertyDrawer
@@ -35,7 +41,7 @@ public abstract class BytesTextDrawer : PropertyDrawer
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
             position = EditorGUI.PrefixLabel(position, label);
-            var byteProperties = new SerializedBytes(property);
+            var byteProperties = GetSerializedBytes(property);
             var text = GetString(byteProperties.GetBytes());
             text = EditorGUI.DelayedTextField(position, text);
             try
@@ -50,5 +56,11 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
 
         protected abstract string GetString(List<byte> bytes);
         protected abstract List<byte> GetBytes(string s);
+        protected abstract SerializedBytes GetSerializedBytes(SerializedProperty property);
+    }
+
+    public abstract class FixedBytesTextDrawer : BytesTextDrawer
+    {
+        protected override SerializedBytes GetSerializedBytes(SerializedProperty property) => new SerializedFixedBytes(property);
     }
 }
diff --git a/Editor/CareBoo.AlgoSdk.Editor/FixedStringDrawer.cs b/Editor/CareBoo.AlgoSdk.Editor/FixedStringDrawer.cs
index 8cf3818f7..ef21a45f1 100644
--- a/Editor/CareBoo.AlgoSdk.Editor/FixedStringDrawer.cs
+++ b/Editor/CareBoo.AlgoSdk.Editor/FixedStringDrawer.cs
@@ -16,10 +16,10 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
         {
             position = EditorGUI.PrefixLabel(position, label);
             var lengthProperty = property.FindPropertyRelative("utf8LengthInBytes");
-            var byteProperties = new SerializedBytes(property);
+            var byteProperties = new SerializedFixedBytes(property);
             var bytes = byteProperties.GetBytes();
             var length = math.min(lengthProperty.intValue, bytes.Count);
-            var text = new NativeText(length, Allocator.Temp);
+            var text = new NativeText(length, Allocator.Persistent);
             try
             {
                 text.Length = length;
diff --git a/Editor/CareBoo.AlgoSdk.Editor/HexDrawer.cs b/Editor/CareBoo.AlgoSdk.Editor/HexDrawer.cs
new file mode 100644
index 000000000..237b28930
--- /dev/null
+++ b/Editor/CareBoo.AlgoSdk.Editor/HexDrawer.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+
+namespace AlgoSdk.Editor
+{
+    [CustomPropertyDrawer(typeof(Hex))]
+    public class HexDrawer : BytesTextDrawer
+    {
+        protected override List<byte> GetBytes(string s)
+        {
+            return Hex.FromString(s).Data.ToList();
+        }
+
+        protected override SerializedBytes GetSerializedBytes(SerializedProperty property)
+        {
+            return new SerializedVariableBytes(property, "data");
+        }
+
+        protected override string GetString(List<byte> bytes)
+        {
+            return new Hex(bytes.ToArray()).ToString();
+        }
+    }
+}
diff --git a/Unity.AlgoSdk.Package/Assets/TestSerialization/TestComponent.cs.meta b/Editor/CareBoo.AlgoSdk.Editor/HexDrawer.cs.meta
similarity index 83%
rename from Unity.AlgoSdk.Package/Assets/TestSerialization/TestComponent.cs.meta
rename to Editor/CareBoo.AlgoSdk.Editor/HexDrawer.cs.meta
index 5e271b83f..c5c83a648 100644
--- a/Unity.AlgoSdk.Package/Assets/TestSerialization/TestComponent.cs.meta
+++ b/Editor/CareBoo.AlgoSdk.Editor/HexDrawer.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ba55c9d4b4eef4da081b6404c508a0ad
+guid: eb5315d3c4e054595933c71aba4e4091
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Editor/CareBoo.AlgoSdk.Editor/MnemonicDrawer.cs b/Editor/CareBoo.AlgoSdk.Editor/MnemonicDrawer.cs
index 4306967dc..adc2e6c54 100644
--- a/Editor/CareBoo.AlgoSdk.Editor/MnemonicDrawer.cs
+++ b/Editor/CareBoo.AlgoSdk.Editor/MnemonicDrawer.cs
@@ -5,7 +5,7 @@
 namespace AlgoSdk.Editor
 {
     [CustomPropertyDrawer(typeof(Mnemonic))]
-    public class MnemonicDrawer : BytesTextDrawer
+    public class MnemonicDrawer : FixedBytesTextDrawer
     {
         protected unsafe override List<byte> GetBytes(string s)
         {
diff --git a/Editor/CareBoo.AlgoSdk.Editor/PrivateKeyDrawer.cs b/Editor/CareBoo.AlgoSdk.Editor/PrivateKeyDrawer.cs
index f0ffcb55e..ba65d1804 100644
--- a/Editor/CareBoo.AlgoSdk.Editor/PrivateKeyDrawer.cs
+++ b/Editor/CareBoo.AlgoSdk.Editor/PrivateKeyDrawer.cs
@@ -3,7 +3,7 @@
 namespace AlgoSdk.Editor
 {
     [CustomPropertyDrawer(typeof(PrivateKey))]
-    public class PrivateKeyDrawer : BytesTextDrawer<PrivateKey>
+    public class PrivateKeyDrawer : FixedBytesTextDrawer<PrivateKey>
     {
         protected override PrivateKey GetByteArray(string s)
         {
diff --git a/Editor/CareBoo.AlgoSdk.Editor/SerializedBytes.cs b/Editor/CareBoo.AlgoSdk.Editor/SerializedBytes.cs
index 47b20d4e4..26cbbe533 100644
--- a/Editor/CareBoo.AlgoSdk.Editor/SerializedBytes.cs
+++ b/Editor/CareBoo.AlgoSdk.Editor/SerializedBytes.cs
@@ -1,14 +1,14 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Text.RegularExpressions;
 using UnityEditor;
 
 namespace AlgoSdk.Editor
 {
-    public class SerializedBytes
+    public abstract class SerializedBytes
     {
-        static readonly Regex byteRegex = new Regex(@"byte\d\d\d\d", RegexOptions.Compiled);
-        SerializedObject serializedObject;
-        string rootPath;
+        protected SerializedObject serializedObject;
+        protected string rootPath;
 
         public SerializedBytes(SerializedProperty root)
         {
@@ -16,23 +16,70 @@ public SerializedBytes(SerializedProperty root)
             rootPath = root.propertyPath;
         }
 
-        public List<byte> GetBytes()
+        public SerializedProperty Property => serializedObject.FindProperty(rootPath);
+
+        public abstract IEnumerable<SerializedProperty> ByteProperties { get; }
+
+        public List<byte> GetBytes() => ByteProperties
+            .Select(prop => (byte)prop.intValue)
+            .ToList()
+            ;
+
+        public abstract void SetBytes(List<byte> bytes);
+    }
+
+    public class SerializedFixedBytes : SerializedBytes
+    {
+        static readonly Regex byteRegex = new Regex(@"byte\d\d\d\d", RegexOptions.Compiled);
+
+        public SerializedFixedBytes(SerializedProperty root) : base(root) { }
+
+        public override IEnumerable<SerializedProperty> ByteProperties
+        {
+            get
+            {
+                foreach (SerializedProperty child in Property)
+                {
+                    if (byteRegex.IsMatch(child.name) && child.propertyType == SerializedPropertyType.Integer)
+                    {
+                        yield return child;
+                    }
+                }
+            }
+        }
+
+        public override void SetBytes(List<byte> bytes)
+        {
+            var props = ByteProperties.ToList();
+            for (var i = 0; i < bytes.Count; i++)
+                props[i].intValue = bytes[i];
+        }
+    }
+
+    public class SerializedVariableBytes : SerializedBytes
+    {
+        readonly string byteArrayName;
+        public SerializedVariableBytes(SerializedProperty root, string byteArrayName) : base(root)
+        {
+            this.byteArrayName = byteArrayName;
+        }
+
+        public override IEnumerable<SerializedProperty> ByteProperties
         {
-            var bytes = new List<byte>();
-            var root = serializedObject.FindProperty(rootPath);
-            foreach (SerializedProperty child in root)
-                if (byteRegex.IsMatch(child.name) && child.propertyType == SerializedPropertyType.Integer)
-                    bytes.Add((byte)child.intValue);
-            return bytes;
+            get
+            {
+                var arrayProp = Property.FindPropertyRelative(byteArrayName);
+                for (var i = 0; i < arrayProp.arraySize; i++)
+                    yield return arrayProp.GetArrayElementAtIndex(i);
+            }
         }
 
-        public void SetBytes(List<byte> bytes)
+        public override void SetBytes(List<byte> bytes)
         {
-            var i = 0;
-            var root = serializedObject.FindProperty(rootPath);
-            foreach (SerializedProperty child in root)
-                if (byteRegex.IsMatch(child.name) && child.propertyType == SerializedPropertyType.Integer)
-                    child.intValue = (int)bytes[i++];
+            var arrayProp = Property.FindPropertyRelative(byteArrayName);
+            arrayProp.arraySize = bytes.Count;
+            for (var i = 0; i < bytes.Count; i++)
+                arrayProp.GetArrayElementAtIndex(i).intValue = bytes[i];
         }
     }
 }
diff --git a/Unity.AlgoSdk.Package/Assets/TestSerialization/TestSerialization.unity.meta b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor.meta
similarity index 67%
rename from Unity.AlgoSdk.Package/Assets/TestSerialization/TestSerialization.unity.meta
rename to Editor/CareBoo.AlgoSdk.WalletConnect.Editor.meta
index bbff70946..9f53f29cf 100644
--- a/Unity.AlgoSdk.Package/Assets/TestSerialization/TestSerialization.unity.meta
+++ b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor.meta
@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: 84aa58409b6b740d9b2f65f910018c2e
+guid: f4b2b711185e74209b4d30b0caca5133
+folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 
diff --git a/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/CareBoo.AlgoSdk.WalletConnect.Editor.asmdef b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/CareBoo.AlgoSdk.WalletConnect.Editor.asmdef
new file mode 100644
index 000000000..9543da4db
--- /dev/null
+++ b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/CareBoo.AlgoSdk.WalletConnect.Editor.asmdef
@@ -0,0 +1,21 @@
+{
+    "name": "CareBoo.AlgoSdk.WalletConnect.Editor",
+    "rootNamespace": "AlgoSdk.WalletConnect.Editor",
+    "references": [
+        "GUID:45ab5c0c2cb4a0e4ba897b731349c490",
+        "GUID:f0420f662311c4331b69b2075b5ab52a",
+        "GUID:7d7102a6f2a084a30ad9e7734dd7ec17",
+        "GUID:f51ebe6a0ceec4240a699833d6309b23"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/CareBoo.AlgoSdk.WalletConnect.Editor.asmdef.meta b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/CareBoo.AlgoSdk.WalletConnect.Editor.asmdef.meta
new file mode 100644
index 000000000..88c79a515
--- /dev/null
+++ b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/CareBoo.AlgoSdk.WalletConnect.Editor.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0cc0e8ad771124641bddf43c6a05faa2
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/UI.meta b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/UI.meta
new file mode 100644
index 000000000..d7f5e082a
--- /dev/null
+++ b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/UI.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f8609310926b2483b8a2247db378ae52
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/UI/WalletConnectAccountEditorWindow.uxml b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/UI/WalletConnectAccountEditorWindow.uxml
new file mode 100644
index 000000000..a48eac8fc
--- /dev/null
+++ b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/UI/WalletConnectAccountEditorWindow.uxml
@@ -0,0 +1,25 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="True">
+    <ui:Label text="Connect Account via WalletConnect" display-tooltip-when-elided="true" name="Title" style="-unity-text-align: upper-center; padding-bottom: 10px; padding-top: 5px; font-size: 14px;" />
+    <ui:VisualElement name="AssetReferenceContent" style="margin-top: 5px; margin-bottom: 5px;">
+        <uie:ObjectField label="Account Asset" allow-scene-objects="true" binding-path="asset" type="AlgoSdk.WalletConnect.WalletConnectAccountAsset, CareBoo.AlgoSdk.WalletConnect" focusable="true" name="AssetField" style="display: flex; visibility: visible;" />
+        <ui:TextField picking-mode="Ignore" label="Connection Status" value="filler text" text="No Connection" name="StatusField" readonly="true" binding-path="statusText" />
+    </ui:VisualElement>
+    <ui:VisualElement name="ConnectedContent" style="align-items: center; display: flex; visibility: visible; margin-top: 5px; margin-bottom: 5px;">
+        <ui:Button text="Connect New Wallet" display-tooltip-when-elided="true" name="ConnectNewWalletButton" />
+    </ui:VisualElement>
+    <ui:VisualElement name="ConfigureSessionContent" style="visibility: visible; display: flex; margin-top: 5px; margin-bottom: 5px;">
+        <ui:TextField picking-mode="Ignore" label="WalletConnect Bridge URL" value="filler text" text="https://bridge.walletconnect.org" name="BridgeUrlField" binding-path="account.sessionData.bridgeUrl" is-delayed="true" readonly="false" style="justify-content: flex-start;">
+            <ui:Button display-tooltip-when-elided="true" name="RandomizeButton" tooltip="Get a random, WalletConnect bridge url." />
+        </ui:TextField>
+        <uie:PropertyField name="DappMetaField" binding-path="account.sessionData.dappMeta" label="Dapp Information" />
+        <ui:VisualElement name="ButtonContent" style="align-items: center; margin-top: 5px; margin-bottom: 5px;">
+            <ui:Button text="Connect" display-tooltip-when-elided="true" name="StartSessionButton" />
+        </ui:VisualElement>
+    </ui:VisualElement>
+    <ui:VisualElement name="RequestingHandshakeContent" style="display: flex; margin-top: 5px; margin-bottom: 5px;">
+        <ui:VisualElement name="QrCodeContent" />
+        <ui:VisualElement name="HandshakeStatusContent" style="align-items: center; justify-content: center; flex-direction: column;">
+            <ui:Button text="Cancel" display-tooltip-when-elided="true" name="CancelHandshakeButton" style="max-width: 50%; flex-grow: 0;" />
+        </ui:VisualElement>
+    </ui:VisualElement>
+</ui:UXML>
diff --git a/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/UI/WalletConnectAccountEditorWindow.uxml.meta b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/UI/WalletConnectAccountEditorWindow.uxml.meta
new file mode 100644
index 000000000..fa3396bc6
--- /dev/null
+++ b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/UI/WalletConnectAccountEditorWindow.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 73f35da47f1fe4af792dc2d393579a74
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/WalletConnectAccountDrawer.cs b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/WalletConnectAccountDrawer.cs
new file mode 100644
index 000000000..3ad619c60
--- /dev/null
+++ b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/WalletConnectAccountDrawer.cs
@@ -0,0 +1,22 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace AlgoSdk.WalletConnect.Editor
+{
+    [CustomEditor(typeof(WalletConnectAccountAsset))]
+    public class WalletConnectAssetEditor : UnityEditor.Editor
+    {
+        public override void OnInspectorGUI()
+        {
+            base.OnInspectorGUI();
+
+            EditorGUILayout.Space();
+
+            if (GUILayout.Button("Connect Account")
+                && AssetDatabase.TryGetGUIDAndLocalFileIdentifier<Object>(serializedObject.targetObject, out var assetGuid, out var _))
+            {
+                WalletConnectEditorWindow.Show(assetGuid);
+            }
+        }
+    }
+}
diff --git a/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/WalletConnectAccountDrawer.cs.meta b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/WalletConnectAccountDrawer.cs.meta
new file mode 100644
index 000000000..6a073f1fe
--- /dev/null
+++ b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/WalletConnectAccountDrawer.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1c17537eada164c7e90986c6fba70c65
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/WalletConnectEditorWindow.cs b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/WalletConnectEditorWindow.cs
new file mode 100644
index 000000000..12e8bcc31
--- /dev/null
+++ b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/WalletConnectEditorWindow.cs
@@ -0,0 +1,165 @@
+using System;
+using Cysharp.Threading.Tasks;
+using UnityEditor;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace AlgoSdk.WalletConnect.Editor
+{
+    public class WalletConnectEditorWindow : EditorWindow
+    {
+        [SerializeField]
+        WalletConnectAccountAsset asset;
+
+        [SerializeField]
+        VisualTreeAsset visualTree;
+
+        [SerializeField]
+        string statusText;
+
+        VisualElement configureSessionContent;
+        VisualElement connectedContent;
+        VisualElement requestingHandshakeContent;
+
+        Image qrCodeImage;
+        Button startSessionButton;
+
+        public static void Show(string assetGuid)
+        {
+            var window = GetWindow<WalletConnectEditorWindow>("Connect to wallet");
+            var assetPath = AssetDatabase.GUIDToAssetPath(assetGuid);
+            window.asset = AssetDatabase.LoadAssetAtPath<WalletConnectAccountAsset>(assetPath);
+        }
+
+        void CreateGUI()
+        {
+            var gui = visualTree.CloneTree();
+
+            connectedContent = gui.Query<VisualElement>("ConnectedContent").First();
+            configureSessionContent = gui.Query<VisualElement>("ConfigureSessionContent").First();
+            requestingHandshakeContent = gui.Query<VisualElement>("RequestingHandshakeContent").First();
+
+            var statusTextField = gui.Query<TextField>("StatusField").First();
+
+            var assetField = gui.Query<ObjectField>("AssetField").First();
+            assetField.RegisterValueChangedCallback((evt) =>
+            {
+                configureSessionContent.Unbind();
+                if (asset)
+                {
+                    configureSessionContent.Bind(new SerializedObject(asset));
+                }
+            });
+
+            startSessionButton = configureSessionContent.Query<Button>("StartSessionButton").First();
+            startSessionButton.clicked += StartSession;
+
+            var randomizeBridgeUrlButton = configureSessionContent.Query<Button>("RandomizeButton").First();
+            randomizeBridgeUrlButton.clicked += SetRandomBridgeUrl;
+            randomizeBridgeUrlButton.Add(new Image
+            {
+                image = EditorGUIUtility.IconContent("Refresh").image
+            });
+
+            var connectNewWalletButton = connectedContent.Query<Button>("ConnectNewWalletButton").First();
+            connectNewWalletButton.clicked += ResetWalletConnection;
+
+            var cancelHandshakeButton = requestingHandshakeContent.Query<Button>("CancelHandshakeButton").First();
+            cancelHandshakeButton.clicked += ResetWalletConnection;
+
+            qrCodeImage = new Image();
+            requestingHandshakeContent
+                .Query<VisualElement>("QrCodeContent")
+                .First()
+                .Add(qrCodeImage)
+                ;
+
+            var serializedObject = new SerializedObject(this);
+            gui.Bind(serializedObject);
+
+            rootVisualElement.Add(gui);
+        }
+
+        void Update()
+        {
+            var status = asset ? asset.ConnectionStatus : default;
+            statusText = ObjectNames.NicifyVariableName(status.ToString());
+
+            configureSessionContent.visible = asset && status <= SessionStatus.NoWalletConnected;
+            requestingHandshakeContent.visible = asset && status == SessionStatus.RequestingWalletConnection;
+            connectedContent.visible = asset && status == SessionStatus.WalletConnected;
+        }
+
+        void OnDestroy()
+        {
+            if (asset)
+                asset.EndSession();
+        }
+
+        void StartSession()
+        {
+            StartSessionAsync().Forget();
+        }
+
+        async UniTaskVoid StartSessionAsync()
+        {
+            startSessionButton.SetEnabled(false);
+            await UniTask.SwitchToThreadPool();
+            try
+            {
+                await asset.BeginSession();
+            }
+            finally
+            {
+                await UniTask.SwitchToMainThread();
+                startSessionButton.SetEnabled(true);
+            }
+            switch (asset.ConnectionStatus)
+            {
+                case SessionStatus.NoWalletConnected:
+                case SessionStatus.RequestingWalletConnection:
+                    RequestConnection();
+                    break;
+            }
+        }
+
+        void RequestConnection()
+        {
+            RequestConnectionAsync().Forget();
+        }
+
+        async UniTaskVoid RequestConnectionAsync()
+        {
+            try
+            {
+                var handshakeUrl = asset.RequestWalletConnection();
+                qrCodeImage.image = handshakeUrl.ToQrCodeTexture();
+                await UniTask.SwitchToTaskPool();
+                await asset.WaitForWalletApproval();
+                await UniTask.SwitchToMainThread();
+                qrCodeImage.image = null;
+            }
+            catch (OperationCanceledException)
+            {
+            }
+        }
+
+        void ResetWalletConnection()
+        {
+            if (!asset)
+                return;
+
+            asset.EndSession();
+            asset.ResetSessionData();
+        }
+
+        void SetRandomBridgeUrl()
+        {
+            if (!asset)
+                return;
+
+            asset.BridgeUrl = DefaultBridge.GetRandomBridgeUrl();
+        }
+    }
+}
diff --git a/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/WalletConnectEditorWindow.cs.meta b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/WalletConnectEditorWindow.cs.meta
new file mode 100644
index 000000000..e69aa3350
--- /dev/null
+++ b/Editor/CareBoo.AlgoSdk.WalletConnect.Editor/WalletConnectEditorWindow.cs.meta
@@ -0,0 +1,15 @@
+fileFormatVersion: 2
+guid: f657a10c8122c4d8a832bf072c7f9117
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences:
+  - m_ViewDataDictionary: {instanceID: 0}
+  - asset: {instanceID: 0}
+  - qrCodeTexture: {instanceID: 0}
+  - visualTree: {fileID: 9197481963319205126, guid: 73f35da47f1fe4af792dc2d393579a74, type: 3}
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Runtime/CareBoo.AlgoSdk.Json/JsonReader/JsonReader.String.cs b/Runtime/CareBoo.AlgoSdk.Json/JsonReader/JsonReader.String.cs
index 68cf9e8d5..61ee240d9 100644
--- a/Runtime/CareBoo.AlgoSdk.Json/JsonReader/JsonReader.String.cs
+++ b/Runtime/CareBoo.AlgoSdk.Json/JsonReader/JsonReader.String.cs
@@ -6,7 +6,7 @@ namespace AlgoSdk.Json
     {
         public JsonReadError ReadString(out string value)
         {
-            var text = new NativeText(Allocator.Temp);
+            var text = new NativeText(Allocator.Persistent);
             try
             {
                 var result = ReadString(ref text);
diff --git a/Runtime/CareBoo.AlgoSdk.LowLevel/ByteArray.cs b/Runtime/CareBoo.AlgoSdk.LowLevel/ByteArray.cs
index 2f41aa69f..c0ca1abf1 100644
--- a/Runtime/CareBoo.AlgoSdk.LowLevel/ByteArray.cs
+++ b/Runtime/CareBoo.AlgoSdk.LowLevel/ByteArray.cs
@@ -171,7 +171,7 @@ public static TByteArray FromBase64<TByteArray>(string b64)
         public static NativeArray<byte> ToNativeArray<TByteArray>(this TByteArray bytes, Allocator allocator)
             where TByteArray : struct, IArray<byte>
         {
-            var arr = new NativeArray<byte>(bytes.Length, Allocator.Temp);
+            var arr = new NativeArray<byte>(bytes.Length, Allocator.Persistent);
             try
             {
                 for (var i = 0; i < arr.Length; i++)
diff --git a/Runtime/CareBoo.AlgoSdk.MessagePack/MessagePackReader/MessagePackReader.String.cs b/Runtime/CareBoo.AlgoSdk.MessagePack/MessagePackReader/MessagePackReader.String.cs
index d018ef8f0..a3d9f06bb 100644
--- a/Runtime/CareBoo.AlgoSdk.MessagePack/MessagePackReader/MessagePackReader.String.cs
+++ b/Runtime/CareBoo.AlgoSdk.MessagePack/MessagePackReader/MessagePackReader.String.cs
@@ -6,7 +6,7 @@ namespace AlgoSdk.MessagePack
     {
         public void ReadString(out string s)
         {
-            var text = new NativeText(Allocator.Temp);
+            var text = new NativeText(Allocator.Persistent);
             try
             {
                 ReadString(ref text);
diff --git a/Runtime/CareBoo.AlgoSdk.MessagePack/MessagePackWriter/MessagePackWriter.String.cs b/Runtime/CareBoo.AlgoSdk.MessagePack/MessagePackWriter/MessagePackWriter.String.cs
index ae2cb322f..473eb22ba 100644
--- a/Runtime/CareBoo.AlgoSdk.MessagePack/MessagePackWriter/MessagePackWriter.String.cs
+++ b/Runtime/CareBoo.AlgoSdk.MessagePack/MessagePackWriter/MessagePackWriter.String.cs
@@ -29,7 +29,7 @@ public void WriteStringHeader(int length)
 
         public void WriteString(string s)
         {
-            using var text = new NativeText(s, Allocator.Temp);
+            using var text = new NativeText(s, Allocator.Persistent);
             WriteString(text);
         }
 
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/AlgorandWalletConnectSession.cs b/Runtime/CareBoo.AlgoSdk.WalletConnect/AlgorandWalletConnectSession.cs
index 829b28542..7ee7ab72b 100644
--- a/Runtime/CareBoo.AlgoSdk.WalletConnect/AlgorandWalletConnectSession.cs
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/AlgorandWalletConnectSession.cs
@@ -1,79 +1,66 @@
 using System;
-using System.Text;
 using System.Threading;
-using AlgoSdk.Json;
-using AlgoSdk.LowLevel;
-using AlgoSdk.WebSocket;
 using Cysharp.Threading.Tasks;
-using Unity.Collections;
-using UnityEngine;
-using UnityEngine.Events;
 
 namespace AlgoSdk.WalletConnect
 {
-    public class AlgorandWalletConnectSession : IActiveWalletConnectSession<AlgorandWalletConnectSession>
+    public class AlgorandWalletConnectSession
+        : IActiveWalletConnectSession<AlgorandWalletConnectSession>
     {
-        const string SessionUpdateMethod = "wc_sessionUpdate";
+        SessionData sessionData;
 
-        /// <inheritdoc />
-        public UnityEvent<AlgorandWalletConnectSession> OnSessionConnect { get; private set; } = new UnityEvent<AlgorandWalletConnectSession>();
+        JsonRpcClient rpc;
+
+        UniTask<JsonRpcResponse> listeningForApproval;
 
         /// <inheritdoc />
-        public UnityEvent<string> OnSessionDisconnect { get; private set; } = new UnityEvent<string>();
+        public event Action<AlgorandWalletConnectSession> OnSessionConnect;
 
         /// <inheritdoc />
-        public UnityEvent<WalletConnectSessionData> OnSessionUpdate { get; private set; } = new UnityEvent<WalletConnectSessionData>();
+        public event Action<string> OnSessionDisconnect;
 
-        /// <summary>
-        /// Occurs when this session received a JsonRpcResponse from a request that was made.
-        /// </summary>
-        public UnityEvent<JsonRpcResponse> OnResponseReceived { get; private set; } = new UnityEvent<JsonRpcResponse>();
+        /// <inheritdoc />
+        public event Action<WalletConnectSessionData> OnSessionUpdate;
 
         /// <inheritdoc />
-        public Address[] Accounts => session.Accounts;
+        public Address[] Accounts => sessionData.Accounts;
 
         /// <inheritdoc />
         public string Version => "1";
 
-        public Status ConnectionStatus { get; private set; }
+        public SessionStatus ConnectionStatus { get; private set; }
 
         /// <inheritdoc />
-        public int ChainId => session.ChainId;
+        public int ChainId => sessionData.ChainId;
 
         /// <inheritdoc />
-        public ulong HandshakeId => session.HandshakeId;
+        public ulong HandshakeId => sessionData.HandshakeId;
 
         /// <inheritdoc />
-        public int NetworkId => session.NetworkId;
+        public int NetworkId => sessionData.NetworkId;
 
         /// <inheritdoc />
-        public string PeerId => session.PeerId;
+        public string PeerId => sessionData.PeerId;
 
         /// <inheritdoc />
-        public string ClientId => session.ClientId;
+        public string ClientId => sessionData.ClientId;
 
         /// <inheritdoc />
-        public string BridgeUrl => session.BridgeUrl;
+        public string BridgeUrl => sessionData.BridgeUrl;
 
         /// <inheritdoc />
-        public Hex Key => session.Key;
+        public Hex Key => sessionData.Key;
 
         /// <inheritdoc />
-        public ClientMeta DappMeta => session.DappMeta;
+        public ClientMeta DappMeta => sessionData.DappMeta;
 
         /// <inheritdoc />
-        public ClientMeta WalletMeta => session.WalletMeta;
+        public ClientMeta WalletMeta => sessionData.WalletMeta;
 
         /// <summary>
         /// The current handshake topic if this session is handshaking.
         /// </summary>
-        public string HandshakeTopic { get; set; }
-
-        IWebSocketClient webSocketClient;
-
-        SavedSession session;
-
-        CancellationTokenSource pollCancellationTokenSource;
+        public string HandshakeTopic { get; protected set; }
 
         /// <summary>
         /// Create a new session.
@@ -82,71 +69,91 @@ public class AlgorandWalletConnectSession : IActiveWalletConnectSession<Algorand
         /// <param name="bridgeUrl">An optional WalletConnect bridgeurl. e.g. https://bridge.walletconnect.org</param>
         public AlgorandWalletConnectSession(ClientMeta clientMeta, string bridgeUrl = null)
         {
-            session = InitSession(
+            sessionData = SessionData.InitSession(
                 clientMeta,
                 bridgeUrl
             );
-            webSocketClient = WebSocketClientFactory.Create(session.BridgeUrl.Replace("http", "ws"));
-            ConnectionStatus = Status.NoConnection;
+            rpc = new JsonRpcClient(sessionData.BridgeUrl.Replace("http", "ws"), sessionData.Key);
         }
 
         /// <summary>
         /// Continue an existing session.
         /// </summary>
         /// <param name="savedSession">A previously existing session.</param>
-        public AlgorandWalletConnectSession(SavedSession savedSession)
+        public AlgorandWalletConnectSession(SessionData savedSession)
         {
-            session = savedSession;
-            webSocketClient = WebSocketClientFactory.Create(session.BridgeUrl.Replace("http", "ws"));
-            if (!string.IsNullOrEmpty(PeerId))
-            {
-                ConnectionStatus = Status.Connected;
-                pollCancellationTokenSource = new CancellationTokenSource();
-                PollWebSocketEvents(pollCancellationTokenSource.Token).Forget();
-            }
-            else if (HandshakeId != default)
-            {
-                ConnectionStatus = Status.RequestingConnection;
-            }
-            else
-            {
-                ConnectionStatus = Status.NoConnection;
-            }
+            sessionData = savedSession;
+            rpc = new JsonRpcClient(sessionData.BridgeUrl.Replace("http", "ws"), sessionData.Key);
         }
 
         public void Dispose()
         {
-            TryCancelPolling();
-            if (webSocketClient.ReadyState == WebSocketSharp.WebSocketState.Open)
-                webSocketClient.Close(reason: "session being disposed");
-
-            if (webSocketClient != null)
-                webSocketClient = null;
+            rpc?.Dispose();
+            rpc = null;
         }
 
         /// <summary>
         /// Save the current session's state.
         /// </summary>
-        /// <returns>A <see cref="SavedSession"/> that can be used for continuing an existing session later.</returns>
-        public SavedSession Save()
+        /// <returns>A <see cref="SessionData"/> that can be used for continuing an existing session later.</returns>
+        public SessionData Save()
         {
-            return session;
+            return sessionData;
         }
 
         /// <summary>
-        /// Begin the handshake process for a new WalletConnect session.
+        /// Connect to WalletConnect Bridge and begin listening for messages.
         /// </summary>
-        /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> for cancelling this request early.</param>
-        /// <returns>A WalletConnect Standard URI format (EIP-1328) used for handshaking.</returns>
-        public async UniTask<HandshakeUrl> StartConnection(CancellationToken cancellationToken = default)
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public async UniTask Connect(CancellationToken cancellationToken = default)
         {
-            if (ConnectionStatus != Status.NoConnection)
+            if (ConnectionStatus != SessionStatus.None)
                 throw new InvalidOperationException($"Session connection status is {ConnectionStatus}");
 
-            await ConnectToBridgeServer(cancellationToken);
-            SubscribeToMessages();
-            RequestHandshake();
-            ConnectionStatus = Status.RequestingConnection;
+            rpc.OnSocketClosed += HandleSocketClosed;
+            rpc.OnRequestReceived += HandleJsonRpcRequestReceived;
+            await rpc.Connect(ClientId, cancellationToken);
+            if (!string.IsNullOrEmpty(PeerId))
+            {
+                ConnectionStatus = SessionStatus.WalletConnected;
+                OnSessionConnect?.Invoke(this);
+            }
+            else if (HandshakeId != default)
+            {
+                ConnectionStatus = SessionStatus.RequestingWalletConnection;
+                listeningForApproval = rpc.ListenForResponse(HandshakeId);
+            }
+            else
+            {
+                ConnectionStatus = SessionStatus.NoWalletConnected;
+            }
+        }
+
+        /// <summary>
+        /// Start the handshake process for a new WalletConnect session.
+        /// </summary>
+        /// <returns>A WalletConnect Standard URI format (EIP-1328) used for handshaking.</returns>
+        public HandshakeUrl RequestWalletConnection()
+        {
+            switch (ConnectionStatus)
+            {
+                case SessionStatus.NoWalletConnected:
+                    sessionData.HandshakeId = WalletConnectRpc.GetRandomId();
+                    HandshakeTopic = Guid.NewGuid().ToString();
+                    var request = WalletConnectRpc.SessionRequest(
+                        peerId: ClientId,
+                        peerMeta: DappMeta,
+                        id: HandshakeId
+                    );
+                    listeningForApproval = rpc.Send(request, HandshakeTopic);
+                    ConnectionStatus = SessionStatus.RequestingWalletConnection;
+                    break;
+                case SessionStatus.RequestingWalletConnection:
+                    break;
+                default:
+                    throw new InvalidOperationException($"Session connection status is {ConnectionStatus}");
+            }
             return new HandshakeUrl(HandshakeTopic, Version, BridgeUrl, Key);
         }
 
@@ -156,33 +163,29 @@ public async UniTask<HandshakeUrl> StartConnection(CancellationToken cancellatio
         /// <param name="cancellationToken">
         /// An optional <see cref="CancellationToken"/> that can be used for things like timeouts.
         /// </param>
-        public async UniTask WaitForConnectionApproval(CancellationToken cancellationToken = default)
+        public async UniTask WaitForWalletApproval(CancellationToken cancellationToken = default)
         {
-            if (ConnectionStatus != Status.RequestingConnection)
+            if (ConnectionStatus != SessionStatus.RequestingWalletConnection)
                 throw new InvalidOperationException($"Session connection status is {ConnectionStatus}");
 
-            var handshakeResponse = await PollUntilResponse(HandshakeId, cancellationToken);
+            var handshakeResponse = await listeningForApproval;
             var sessionData = AlgoApiSerializer.DeserializeJson<WalletConnectSessionData>(handshakeResponse.Result.Json);
             UpdateSession(sessionData);
             HandshakeTopic = null;
-            pollCancellationTokenSource = new CancellationTokenSource();
-            PollWebSocketEvents(pollCancellationTokenSource.Token).Forget();
-            ConnectionStatus = Status.Connected;
-            OnSessionConnect.Invoke(this);
+            ConnectionStatus = SessionStatus.WalletConnected;
+            OnSessionConnect?.Invoke(this);
         }
 
         /// <summary>
-        /// Disconnect from a <see cref="Status.Connected"/> or <see cref="Status.RequestingConnection"/> session.
+        /// Disconnect from a <see cref="SessionStatus.WalletConnected"/> or <see cref="SessionStatus.RequestingWalletConnection"/> session.
         /// </summary>
         /// <param name="reason">An optional reason to inform the web socket client.</param>
-        public void Disconnect(string reason = default)
+        public void DisconnectWallet(string reason = default)
         {
-            TryCancelPolling();
-            if (webSocketClient.ReadyState == WebSocketSharp.WebSocketState.Open)
-                webSocketClient.Close(reason: reason);
-            ConnectionStatus = Status.NoConnection;
-
-            session = InitSession(session.DappMeta, session.BridgeUrl);
+            rpc.Disconnect(reason);
+            ConnectionStatus = SessionStatus.None;
+            sessionData = SessionData.InitSession(sessionData.DappMeta, sessionData.BridgeUrl);
+            OnSessionDisconnect?.Invoke(reason);
         }
 
         /// <summary>
@@ -216,167 +219,34 @@ public void Disconnect(string reason = default)
             CancellationToken cancellationToken = default
             )
         {
-            if (ConnectionStatus == Status.NoConnection)
+            if (ConnectionStatus != SessionStatus.WalletConnected)
                 throw new InvalidOperationException($"Session connection status is {ConnectionStatus}");
 
             if (ChainId != WalletConnectRpc.Algorand.ChainId)
                 throw new InvalidOperationException($"Wallet does not have Algorand as the active chain.");
 
             var request = WalletConnectRpc.Algorand.SignTransactions(transactions, options);
-            var listeningForResponse = ListenForResponse(request, cancellationToken);
-            var msg = NetworkMessage.PublishToTopicEncrypted(request, Key, PeerId);
-            webSocketClient.Send(msg);
-            var response = await listeningForResponse;
-            if (response.IsError) return (SignTxnsError)response.Error;
+            var response = await rpc.Send(request, PeerId, cancellationToken);
+            if (response.IsError)
+                return (SignTxnsError)response.Error;
             return AlgoApiSerializer.DeserializeJson<byte[][]>(response.Result.Json);
         }
 
-        static SavedSession InitSession(ClientMeta dappMeta, string bridgeUrl)
-        {
-            return new SavedSession
-            {
-                ClientId = Guid.NewGuid().ToString(),
-                BridgeUrl = string.IsNullOrEmpty(bridgeUrl) ? DefaultBridge.GetRandomBridgeUrl() : bridgeUrl,
-                Key = GenKey(),
-                DappMeta = dappMeta
-            };
-        }
-
-        static Hex GenKey()
-        {
-            using var secret = new NativeByteArray(32, Allocator.Temp);
-            Crypto.Random.Randomize(secret);
-            return secret.ToArray();
-        }
-
-        async UniTask ConnectToBridgeServer(CancellationToken cancellationToken = default)
+        void HandleSocketClosed(string reason)
         {
-            webSocketClient.Connect();
-            await webSocketClient.PollUntilOpen(cancellationToken);
-        }
-
-        void SubscribeToMessages()
-        {
-            var msg = NetworkMessage.SubscribeToTopic(ClientId);
-            webSocketClient.Send(msg);
-        }
-
-        async UniTaskVoid PollWebSocketEvents(CancellationToken cancellationToken)
-        {
-            try
-            {
-                while (true)
-                {
-                    var responseOrRequest = await PollUntilJsonRpcEvent(cancellationToken);
-                    HandleResponseOrRequest(responseOrRequest);
-                }
-            }
-            catch (Exception ex) when (!(ex is OperationCanceledException))
-            {
-                Debug.LogWarning(ex);
-            }
-        }
-
-        void RequestHandshake()
-        {
-            if (HandshakeId == default)
-                session.HandshakeId = WalletConnectRpc.GetRandomId();
-            if (string.IsNullOrEmpty(HandshakeTopic))
-                HandshakeTopic = Guid.NewGuid().ToString();
-            var request = WalletConnectRpc.SessionRequest(
-                peerId: ClientId,
-                peerMeta: DappMeta,
-                id: HandshakeId
-            );
-            var msg = NetworkMessage.PublishToTopicEncrypted(request, Key, HandshakeTopic);
-            webSocketClient.Send(msg);
-        }
-
-        async UniTask<JsonRpcResponse> PollUntilResponse(ulong id, CancellationToken cancellationToken = default)
-        {
-            while (true)
-            {
-                var responseOrRequest = await PollUntilJsonRpcEvent(cancellationToken);
-                if (responseOrRequest.TryGetValue1(out var response) && response.Id == id)
-                {
-                    return response;
-                }
-            }
-        }
-
-        async UniTask<Either<JsonRpcResponse, JsonRpcRequest>> PollUntilJsonRpcEvent(CancellationToken cancellationToken = default)
-        {
-            while (true)
-            {
-                var payloadEvent = await webSocketClient.PollUntilPayload(cancellationToken);
-                try
-                {
-                    return payloadEvent.ReadJsonRpcPayload(Key);
-                }
-                catch (Exception e) when (e is JsonReadException || e is SerializationException || e is AggregateException)
-                {
-                    var s = Encoding.UTF8.GetString(payloadEvent.Payload);
-                    Debug.LogWarning($"Did not recognize payload: {s}\n{e}");
-                }
-            }
-        }
-
-        async UniTask<JsonRpcResponse> ListenForResponse<TRequest>(TRequest request, CancellationToken cancellationToken = default)
-            where TRequest : IJsonRpcRequest
-        {
-            JsonRpcResponse matchingResponse = default;
-            var receivedResponse = false;
-            string disconnected = null;
-            void onResponse(JsonRpcResponse response)
-            {
-                if (response.Id != request.Id) return;
-                receivedResponse = true;
-                matchingResponse = response;
-            }
-            void onDisconnect(string reason)
-            {
-                disconnected = reason;
-            }
-            OnResponseReceived.AddListener(onResponse);
-            OnSessionDisconnect.AddListener(onDisconnect);
-
-            try
-            {
-                await UniTask.WaitUntil(() => receivedResponse || disconnected != null, cancellationToken: cancellationToken);
-            }
-            finally
-            {
-                OnResponseReceived.RemoveListener(onResponse);
-                OnSessionDisconnect.RemoveListener(onDisconnect);
-            }
-
-            if (disconnected != null)
-                throw new Exception($"Server disconnected before request could be finished with reason: {disconnected}");
-            return matchingResponse;
-        }
-
-        void HandleResponseOrRequest(Either<JsonRpcResponse, JsonRpcRequest> eitherResponseOrRequest)
-        {
-            if (eitherResponseOrRequest.TryGetValue1(out var response))
-            {
-                OnResponseReceived.Invoke(response);
-            }
-            else if (eitherResponseOrRequest.TryGetValue2(out var request))
-            {
-                HandleJsonRpcRequestReceived(request);
-            }
+            OnSessionDisconnect?.Invoke(reason);
         }
 
         void HandleJsonRpcRequestReceived(JsonRpcRequest request)
         {
             switch (request.Method)
             {
-                case SessionUpdateMethod:
+                case WalletConnectRpc.SessionUpdateMethod:
                     if (request.Params == null || request.Params.Length != 1)
-                        throw new NotSupportedException($"The JsonRpcRequest method \"{SessionUpdateMethod}\" only supports params of length 1.");
+                        throw new NotSupportedException($"The JsonRpcRequest method \"{WalletConnectRpc.SessionUpdateMethod}\" only supports params of length 1.");
                     var sessonUpdate = AlgoApiSerializer.DeserializeJson<WalletConnectSessionData>(request.Params[0].Json);
                     UpdateSession(sessonUpdate);
-                    OnSessionUpdate.Invoke(sessonUpdate);
+                    OnSessionUpdate?.Invoke(sessonUpdate);
                     break;
                 default:
                     throw new NotSupportedException($"The JsonRpcRequest method \"{request.Method}\" is not supported");
@@ -387,32 +257,14 @@ void UpdateSession(WalletConnectSessionData sessionData)
         {
             if (!sessionData.IsApproved)
             {
-                Disconnect("Session no longer approved.");
+                DisconnectWallet("Session no longer approved.");
                 return;
             }
 
-            session.PeerId = sessionData.PeerId;
-            session.WalletMeta = sessionData.PeerMeta;
-            session.ChainId = sessionData.ChainId;
-            session.Accounts = sessionData.Accounts;
-        }
-
-        bool TryCancelPolling()
-        {
-            if (pollCancellationTokenSource == null)
-                return false;
-            pollCancellationTokenSource.Cancel();
-            pollCancellationTokenSource.Dispose();
-            pollCancellationTokenSource = null;
-            return true;
-        }
-
-        public enum Status
-        {
-            Unknown,
-            NoConnection,
-            RequestingConnection,
-            Connected
+            this.sessionData.PeerId = sessionData.PeerId;
+            this.sessionData.WalletMeta = sessionData.PeerMeta;
+            this.sessionData.ChainId = sessionData.ChainId;
+            this.sessionData.Accounts = sessionData.Accounts;
         }
     }
 }
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/Formatters.gen/JsonRpcRequest.Formatters.gen.cs b/Runtime/CareBoo.AlgoSdk.WalletConnect/Formatters.gen/JsonRpcRequest.Formatters.gen.cs
index 5e96591d4..30d31db8a 100644
--- a/Runtime/CareBoo.AlgoSdk.WalletConnect/Formatters.gen/JsonRpcRequest.Formatters.gen.cs
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/Formatters.gen/JsonRpcRequest.Formatters.gen.cs
@@ -19,7 +19,7 @@ public partial struct JsonRpcRequest
         
         private static bool @__generated__InitializeAlgoApiFormatters()
         {
-            AlgoSdk.AlgoApiFormatterLookup.Add<AlgoSdk.WalletConnect.JsonRpcRequest>(new AlgoSdk.AlgoApiObjectFormatter<AlgoSdk.WalletConnect.JsonRpcRequest>(true).Assign("id", (AlgoSdk.WalletConnect.JsonRpcRequest x) => x.Id, (ref AlgoSdk.WalletConnect.JsonRpcRequest x, System.UInt64 value) => x.Id = value).Assign("jsonrpc", (AlgoSdk.WalletConnect.JsonRpcRequest x) => x.JsonRpc, (ref AlgoSdk.WalletConnect.JsonRpcRequest x, System.String value) => x.JsonRpc = value, AlgoSdk.StringComparer.Instance).Assign("method", (AlgoSdk.WalletConnect.JsonRpcRequest x) => x.Method, (ref AlgoSdk.WalletConnect.JsonRpcRequest x, System.String value) => x.Method = value, AlgoSdk.StringComparer.Instance).Assign("params", (AlgoSdk.WalletConnect.JsonRpcRequest x) => x.Params, (ref AlgoSdk.WalletConnect.JsonRpcRequest x, AlgoSdk.AlgoApiObject[] value) => x.Params = value, AlgoSdk.ArrayComparer<AlgoSdk.AlgoApiObject>.Instance));
+            AlgoSdk.AlgoApiFormatterLookup.Add<AlgoSdk.WalletConnect.JsonRpcRequest>(new AlgoSdk.AlgoApiObjectFormatter<AlgoSdk.WalletConnect.JsonRpcRequest>(true).Assign("id", (AlgoSdk.WalletConnect.JsonRpcRequest x) => x.Id, (ref AlgoSdk.WalletConnect.JsonRpcRequest x, AlgoSdk.Optional<System.UInt64> value) => x.Id = value).Assign("jsonrpc", (AlgoSdk.WalletConnect.JsonRpcRequest x) => x.JsonRpc, (ref AlgoSdk.WalletConnect.JsonRpcRequest x, System.String value) => x.JsonRpc = value, AlgoSdk.StringComparer.Instance).Assign("method", (AlgoSdk.WalletConnect.JsonRpcRequest x) => x.Method, (ref AlgoSdk.WalletConnect.JsonRpcRequest x, System.String value) => x.Method = value, AlgoSdk.StringComparer.Instance).Assign("params", (AlgoSdk.WalletConnect.JsonRpcRequest x) => x.Params, (ref AlgoSdk.WalletConnect.JsonRpcRequest x, AlgoSdk.AlgoApiObject[] value) => x.Params = value, AlgoSdk.ArrayComparer<AlgoSdk.AlgoApiObject>.Instance));
             return true;
         }
     }
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/IWalletConnectAccount.cs b/Runtime/CareBoo.AlgoSdk.WalletConnect/IWalletConnectAccount.cs
new file mode 100644
index 000000000..7a0d7ac8a
--- /dev/null
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/IWalletConnectAccount.cs
@@ -0,0 +1,63 @@
+using Cysharp.Threading.Tasks;
+
+namespace AlgoSdk.WalletConnect
+{
+    public interface IWalletConnectAccount
+        : IAsyncSigner
+        , IAccount
+    {
+        /// <summary>
+		/// The status of the current wallet connected.
+		/// </summary>
+        SessionStatus ConnectionStatus { get; }
+
+        /// <summary>
+		/// Stored data regarding the session.
+		/// </summary>
+        SessionData SessionData { get; }
+
+        /// <summary>
+		/// The WalletConnect bridge url to connect to.
+		/// </summary>
+        string BridgeUrl { get; set; }
+
+        /// <summary>
+		/// The client information provided in this Dapp.
+		/// </summary>
+        ClientMeta DappMeta { get; set; }
+
+        /// <summary>
+		/// Start the WalletConnect session.
+		/// </summary>
+        UniTask BeginSession();
+
+        /// <summary>
+		/// End the current WalletConnect session, closing the websocket.
+		/// </summary>
+        /// <remarks>
+        /// Does not forget the wallet connection, and it can be resumed using <see cref="BeginSession" />.
+		/// </remarks>
+        void EndSession();
+
+        /// <summary>
+		/// Re-initializes session data, keeping the BridgeUrl and the DappMeta, but regenerating other fields.
+		/// </summary>
+        void ResetSessionData();
+
+        /// <summary>
+		/// Requests a handshake to connect to a new Wallet.
+		/// </summary>
+        HandshakeUrl RequestWalletConnection();
+
+        /// <summary>
+		/// Wait for the handshake to be approved.
+		/// </summary>
+        UniTask WaitForWalletApproval();
+
+        /// <summary>
+		/// Disconnect and forget the wallet connection. If you want to close the session without
+        /// forgetting the wallet, use <see cref="EndSession"/>.
+		/// </summary>
+        void DisconnectWallet(string reason = default);
+    }
+}
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/IWalletConnectAccount.cs.meta b/Runtime/CareBoo.AlgoSdk.WalletConnect/IWalletConnectAccount.cs.meta
new file mode 100644
index 000000000..af2e67d6d
--- /dev/null
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/IWalletConnectAccount.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 50988ee760adb4cf9b3d6b999084294c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/IWalletConnectSession.cs b/Runtime/CareBoo.AlgoSdk.WalletConnect/IWalletConnectSession.cs
index 7a84c65fb..81392b0fd 100644
--- a/Runtime/CareBoo.AlgoSdk.WalletConnect/IWalletConnectSession.cs
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/IWalletConnectSession.cs
@@ -1,5 +1,4 @@
 using System;
-using UnityEngine.Events;
 
 namespace AlgoSdk.WalletConnect
 {
@@ -9,17 +8,17 @@ public interface IActiveWalletConnectSession<TSession> : IWalletConnectSessionDa
         /// <summary>
         /// Occurs when handshake succeeds and wallet is connected.
         /// </summary>
-        UnityEvent<TSession> OnSessionConnect { get; }
+        event Action<TSession> OnSessionConnect;
 
         /// <summary>
         /// Occurs when wallet no longer approves connection.
         /// </summary>
-        UnityEvent<string> OnSessionDisconnect { get; }
+        event Action<string> OnSessionDisconnect;
 
         /// <summary>
         /// Occurs when wallet updates addresses or metadata information.
         /// </summary>
-        UnityEvent<WalletConnectSessionData> OnSessionUpdate { get; }
+        event Action<WalletConnectSessionData> OnSessionUpdate;
     }
 
     public interface IWalletConnectSessionData
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/JsonRpc.cs b/Runtime/CareBoo.AlgoSdk.WalletConnect/JsonRpc.cs
index dc4686f30..5d629120f 100644
--- a/Runtime/CareBoo.AlgoSdk.WalletConnect/JsonRpc.cs
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/JsonRpc.cs
@@ -9,7 +9,7 @@ public static class JsonRpc
         public static NetworkMessage ToNetworkMessage<T>(this T request, Hex encryptionKey, string topic)
             where T : IJsonRpcRequest
         {
-            using var requestJson = AlgoApiSerializer.SerializeJson(request, Allocator.Temp);
+            using var requestJson = AlgoApiSerializer.SerializeJson(request, Allocator.Persistent);
             var payloadData = requestJson.AsArray().ToArray();
             var encryptedPayload = AesCipher.EncryptWithKey(encryptionKey, payloadData);
             return NetworkMessage.PublishToTopic(encryptedPayload, topic);
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/JsonRpcClient.cs b/Runtime/CareBoo.AlgoSdk.WalletConnect/JsonRpcClient.cs
new file mode 100644
index 000000000..ef3f82515
--- /dev/null
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/JsonRpcClient.cs
@@ -0,0 +1,195 @@
+using System;
+using System.Threading;
+using AlgoSdk.WebSocket;
+using Cysharp.Threading.Tasks;
+using UnityEngine;
+using static AlgoSdk.WebSocket.WebSocketEvent;
+
+namespace AlgoSdk.WalletConnect
+{
+    /// <summary>
+    /// Wrapper class around <see cref="IWebSocketClient"/> for making and receiving Json RPC messages.
+    /// </summary>
+    public class JsonRpcClient
+        : IDisposable
+    {
+        IWebSocketClient webSocketClient;
+
+        Hex key;
+
+        CancellationTokenSource connectionCancellation;
+
+        public event Action<JsonRpcRequest> OnRequestReceived;
+
+        public event Action<JsonRpcResponse> OnResponseReceived;
+
+        public event Action<string> OnSocketClosed;
+
+        /// <summary>
+        /// Start a client for handling JsonRpcEvents via websockets
+        /// </summary>
+        /// <param name="url">url to connect to the websocket server</param>
+        /// <param name="key">The key to use to encrypt and decrypt payloads</param>
+        public JsonRpcClient(string url, Hex key)
+        {
+            webSocketClient = WebSocketClientFactory.Create(url);
+            this.key = key;
+        }
+
+        /// <summary>
+        /// Connect to the Json RPC Server and begin listening for messages.
+        /// </summary>
+        /// <param name="clientId">The websocket topic to connect to.</param>
+        /// <param name="timeout">An optional timeout to cancel the connection early.</param>
+        /// <param name="cancellationToken">An optional cancellation to stop the connection early.</param>
+        public async UniTask Connect(
+            string clientId,
+            CancellationToken cancellationToken = default
+            )
+        {
+            webSocketClient.Connect();
+            await webSocketClient.PollUntilOpen(cancellationToken);
+            var msg = NetworkMessage.SubscribeToTopic(clientId);
+            webSocketClient.Send(msg);
+            connectionCancellation = new CancellationTokenSource();
+            PollJsonRpcMessages(connectionCancellation.Token).Forget();
+        }
+
+        /// <summary>
+        /// Disconnect from a currently connected Json RPC server.
+        /// </summary>
+        public void Disconnect(string reason = default)
+        {
+            CheckConnected();
+
+            connectionCancellation?.Cancel();
+            connectionCancellation = null;
+
+            webSocketClient.Close(reason: reason);
+        }
+
+        /// <summary>
+        /// Send a Json RPC Request to the server and listen for a response.
+        /// </summary>
+        /// <param name="request">The JsonRpcRequest to send.</param>
+        /// <param name="peerId">The peer to receive the request.</param>
+        /// <param name="cancellationToken">An optional cancellationToken to stop listening for a response.</param>
+        /// <typeparam name="TJsonRpcRequest">The type of the request.</typeparam>
+        /// <returns>A response from this request.</returns>
+        public async UniTask<JsonRpcResponse> Send<TJsonRpcRequest>(
+            TJsonRpcRequest request,
+            string peerId,
+            CancellationToken cancellationToken = default
+            )
+            where TJsonRpcRequest : IJsonRpcRequest
+        {
+            SendAndForget(request, peerId);
+            return await ListenForResponse(request.Id, cancellationToken);
+        }
+
+        /// <summary>
+        /// Send a Json RPC Request to the server without listening for a response.
+        /// </summary>
+        /// <param name="request">The JsonRpcRequest to send.</param>
+        /// <param name="peerId">The peer to receive the request.</param>
+        /// <typeparam name="TJsonRpcRequest">The type of the request.</typeparam>
+        public void SendAndForget<TJsonRpcRequest>(
+            TJsonRpcRequest request,
+            string peerId
+            )
+            where TJsonRpcRequest : IJsonRpcRequest
+        {
+            CheckConnected();
+
+            var msg = NetworkMessage.PublishToTopicEncrypted(request, key, peerId);
+            webSocketClient.Send(msg);
+        }
+
+        /// <summary>
+        /// Listen for a response given an id.
+        /// </summary>
+        /// <param name="id">The id of the expected response.</param>
+        /// <param name="cancellationToken">An optional cancellation token for cancelling early.</param>
+        /// <returns>A Response matching the given is</returns>
+        public async UniTask<JsonRpcResponse> ListenForResponse(
+            ulong id,
+            CancellationToken cancellationToken = default
+            )
+        {
+            var cancellation = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, connectionCancellation.Token);
+            Optional<JsonRpcResponse> matchingResponse = default;
+            void onResponseReceived(JsonRpcResponse response)
+            {
+                if (response.Id != id)
+                    return;
+
+                matchingResponse = response;
+                OnResponseReceived -= onResponseReceived;
+            }
+            OnResponseReceived += onResponseReceived;
+            while (!matchingResponse.HasValue)
+                await UniTask.Yield(cancellation.Token);
+
+            return matchingResponse;
+        }
+
+        public void Dispose()
+        {
+            connectionCancellation?.Cancel();
+            connectionCancellation = null;
+
+            if (webSocketClient != null && webSocketClient.ReadyState == WebSocketSharp.WebSocketState.Open)
+            {
+                webSocketClient.Close(reason: "session being disposed");
+            }
+
+            webSocketClient = null;
+        }
+
+        void CheckConnected()
+        {
+            if (webSocketClient == null || webSocketClient.ReadyState != WebSocketSharp.WebSocketState.Open)
+                throw new InvalidOperationException($"{nameof(JsonRpcClient)} is not yet connected");
+        }
+
+        async UniTaskVoid PollJsonRpcMessages(CancellationToken cancellationToken)
+        {
+            try
+            {
+                while (true)
+                {
+                    var evt = await webSocketClient.PollUntilEvent(cancellationToken);
+                    switch (evt.Type)
+                    {
+                        case WebSocketEventType.Payload:
+                            try
+                            {
+                                var responseOrRequest = evt.ReadJsonRpcPayload(key);
+                                if (responseOrRequest.TryGetValue1(out var response) && OnResponseReceived != null)
+                                    OnResponseReceived(response);
+                                else if (responseOrRequest.TryGetValue2(out var request) && OnRequestReceived != null)
+                                    OnRequestReceived(request);
+                            }
+                            catch (AggregateException ex)
+                            {
+                                foreach (var inner in ex.InnerExceptions)
+                                    Debug.LogWarning(inner.ToString());
+                                throw;
+                            }
+                            break;
+                        case WebSocketEventType.Error:
+                            Debug.LogWarning(evt.Error);
+                            break;
+                        case WebSocketEventType.Close:
+                            if (OnSocketClosed != null)
+                                OnSocketClosed(evt.Reason);
+                            return;
+                    }
+                }
+            }
+            catch (OperationCanceledException)
+            {
+            }
+        }
+    }
+}
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/JsonRpcClient.cs.meta b/Runtime/CareBoo.AlgoSdk.WalletConnect/JsonRpcClient.cs.meta
new file mode 100644
index 000000000..72634e5b6
--- /dev/null
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/JsonRpcClient.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7856e69ad1d3d44869af778f9ae1d0a6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/JsonRpcRequest.cs b/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/JsonRpcRequest.cs
index 1d793945d..34ccc1d93 100644
--- a/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/JsonRpcRequest.cs
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/JsonRpcRequest.cs
@@ -15,7 +15,7 @@ public interface IJsonRpcRequest
         /// <summary>
         /// The id of this request. Used to keep track of the correct response.
         /// </summary>
-        ulong Id { get; set; }
+        Optional<ulong> Id { get; set; }
 
         /// <summary>
         /// The JsonRpc version of this request.
@@ -35,7 +35,7 @@ public partial struct JsonRpcRequest
     {
         /// <inheritdoc />
         [AlgoApiField("id")]
-        public ulong Id { get; set; }
+        public Optional<ulong> Id { get; set; }
 
         /// <inheritdoc />
         [AlgoApiField("jsonrpc")]
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/NetworkMessage.cs b/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/NetworkMessage.cs
index 0090978ed..71b5ced1f 100644
--- a/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/NetworkMessage.cs
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/NetworkMessage.cs
@@ -51,7 +51,7 @@ public static NetworkMessage PublishToTopic<T>(T payload, string topic)
 
         public static NetworkMessage PublishToTopicEncrypted<T>(T payload, Hex encryptionKey, string topic)
         {
-            using var payloadJson = AlgoApiSerializer.SerializeJson(payload, Allocator.Temp);
+            using var payloadJson = AlgoApiSerializer.SerializeJson(payload, Allocator.Persistent);
             var encryptedPayload = AesCipher.EncryptWithKey(encryptionKey, payloadJson.ToByteArray());
             return PublishToTopic(encryptedPayload, topic);
         }
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/SavedSession.cs b/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/SessionData.cs
similarity index 71%
rename from Runtime/CareBoo.AlgoSdk.WalletConnect/Models/SavedSession.cs
rename to Runtime/CareBoo.AlgoSdk.WalletConnect/Models/SessionData.cs
index a86b8f2c2..629b55b79 100644
--- a/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/SavedSession.cs
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/SessionData.cs
@@ -1,10 +1,12 @@
 using System;
+using AlgoSdk.LowLevel;
+using Unity.Collections;
 using UnityEngine;
 
 namespace AlgoSdk.WalletConnect
 {
     [Serializable]
-    public struct SavedSession : IWalletConnectSessionData
+    public struct SessionData : IWalletConnectSessionData
     {
         [SerializeField]
         string clientId;
@@ -95,5 +97,23 @@ public ClientMeta WalletMeta
             get => walletMeta;
             set => walletMeta = value;
         }
+
+        public static SessionData InitSession(ClientMeta dappMeta, string bridgeUrl)
+        {
+            return new SessionData
+            {
+                ClientId = Guid.NewGuid().ToString(),
+                BridgeUrl = string.IsNullOrEmpty(bridgeUrl) ? DefaultBridge.GetRandomBridgeUrl() : bridgeUrl,
+                Key = GenKey(),
+                DappMeta = dappMeta
+            };
+        }
+
+        static Hex GenKey()
+        {
+            using var secret = new NativeByteArray(32, Allocator.Persistent);
+            Crypto.Random.Randomize(secret);
+            return secret.ToArray();
+        }
     }
 }
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/SavedSession.cs.meta b/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/SessionData.cs.meta
similarity index 100%
rename from Runtime/CareBoo.AlgoSdk.WalletConnect/Models/SavedSession.cs.meta
rename to Runtime/CareBoo.AlgoSdk.WalletConnect/Models/SessionData.cs.meta
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/WalletConnectRpc.cs b/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/WalletConnectRpc.cs
index 1e17bc7b2..f34e78419 100644
--- a/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/WalletConnectRpc.cs
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/WalletConnectRpc.cs
@@ -6,6 +6,8 @@ public static class WalletConnectRpc
     {
         const string jsonRpcVersion = "2.0";
 
+        public const string SessionUpdateMethod = "wc_sessionUpdate";
+
         /// <summary>
         /// Utility function for building a <see cref="JsonRpcRequest"/> used to start a new WalletConnect session.
         /// </summary>
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/SessionStatus.cs b/Runtime/CareBoo.AlgoSdk.WalletConnect/SessionStatus.cs
new file mode 100644
index 000000000..6f7ea63ef
--- /dev/null
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/SessionStatus.cs
@@ -0,0 +1,10 @@
+namespace AlgoSdk.WalletConnect
+{
+    public enum SessionStatus
+    {
+        None,
+        NoWalletConnected,
+        RequestingWalletConnection,
+        WalletConnected
+    }
+}
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/SessionStatus.cs.meta b/Runtime/CareBoo.AlgoSdk.WalletConnect/SessionStatus.cs.meta
new file mode 100644
index 000000000..2063c0355
--- /dev/null
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/SessionStatus.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 52a9fb8bdc44045d48863cffe5340940
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectAccount.cs b/Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectAccount.cs
new file mode 100644
index 000000000..79076e88b
--- /dev/null
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectAccount.cs
@@ -0,0 +1,151 @@
+using System;
+using System.Threading;
+using Cysharp.Threading.Tasks;
+using UnityEngine;
+
+namespace AlgoSdk.WalletConnect
+{
+    [Serializable]
+    public class WalletConnectAccount
+        : IWalletConnectAccount
+    {
+        [SerializeField]
+        SessionData sessionData;
+
+        AlgorandWalletConnectSession session;
+
+        CancellationTokenSource sessionCancellation;
+
+        public WalletConnectAccount(SessionData sessionData)
+        {
+            this.sessionData = sessionData;
+            session = null;
+            sessionCancellation = null;
+        }
+
+        /// <inheritdoc />
+        public Address Address => sessionData.Accounts?[0] ?? Address.Empty;
+
+        /// <inheritdoc />
+        public SessionStatus ConnectionStatus => session?.ConnectionStatus ?? default;
+
+        /// <inheritdoc />
+        public SessionData SessionData => sessionData;
+
+        /// <inheritdoc />
+        public string BridgeUrl
+        {
+            get => sessionData.BridgeUrl;
+            set => sessionData.BridgeUrl = value;
+        }
+
+        /// <inheritdoc />
+        public ClientMeta DappMeta
+        {
+            get => sessionData.DappMeta;
+            set => sessionData.DappMeta = value;
+        }
+
+        /// <inheritdoc />
+        public async UniTask BeginSession()
+        {
+            session = new AlgorandWalletConnectSession(SessionData);
+            sessionCancellation = new CancellationTokenSource();
+            await session.Connect(sessionCancellation.Token);
+            sessionData = session.Save();
+        }
+
+        /// <inheritdoc />
+        public void EndSession()
+        {
+            if (sessionCancellation != null)
+            {
+                sessionCancellation.Cancel();
+                sessionCancellation = null;
+            }
+            if (session == null)
+            {
+                return;
+            }
+            sessionData = session.Save();
+            session.Dispose();
+            session = null;
+        }
+
+        /// <inheritdoc />
+        public void ResetSessionData()
+        {
+            sessionData = SessionData.InitSession(sessionData.DappMeta, sessionData.BridgeUrl);
+        }
+
+        /// <inheritdoc />
+        public HandshakeUrl RequestWalletConnection()
+        {
+            CheckSession();
+            var handshake = session.RequestWalletConnection();
+            sessionData = session.Save();
+            return handshake;
+        }
+
+        /// <inheritdoc />
+        public async UniTask WaitForWalletApproval()
+        {
+            CheckSession();
+            await session.WaitForWalletApproval(sessionCancellation.Token);
+            sessionData = session.Save();
+        }
+
+        /// <inheritdoc />
+        public void DisconnectWallet(string reason = default)
+        {
+            CheckSession();
+            session.DisconnectWallet(reason);
+        }
+
+        /// <inheritdoc />
+        public async UniTask<SignedTxn<T>[]> SignTxnsAsync<T>(
+            T[] txns,
+            TxnIndices txnsToSign,
+            CancellationToken cancellationToken = default
+            )
+            where T : ITransaction, IEquatable<T>
+        {
+            CheckSession();
+
+            var cancellation = CancellationTokenSource.CreateLinkedTokenSource(sessionCancellation.Token, cancellationToken);
+
+            if (txns == null)
+                throw new ArgumentNullException(nameof(txns));
+
+            if (txns.Length == 0 || txns.Length > 16)
+                throw new ArgumentException("Must have 1-16 transactions", nameof(txns));
+
+            var walletTxns = new WalletTransaction[txns.Length];
+            for (var i = 0; i < txns.Length; i++)
+            {
+                var signers = txnsToSign.ContainsIndex(i)
+                    ? new[] { Address }
+                    : new Address[0];
+                walletTxns[i] = WalletTransaction.New(
+                    txns[i],
+                    signers: signers
+                );
+            }
+
+            var (error, signed) = await session.SignTransactions(walletTxns, cancellationToken: cancellation.Token);
+            if (error)
+                throw new Exception(error.ToString());
+
+            var result = new SignedTxn<T>[signed.Length];
+            for (var i = 0; i < signed.Length; i++)
+                result[i] = AlgoApiSerializer.DeserializeMessagePack<SignedTxn<T>>(signed[i]);
+            return result;
+        }
+
+        void CheckSession()
+        {
+            if (session == null)
+                throw new NullReferenceException("Session has not been initialized! Please call " + nameof(BeginSession) + " first.");
+        }
+    }
+}
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectAccount.cs.meta b/Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectAccount.cs.meta
new file mode 100644
index 000000000..4a100c4e7
--- /dev/null
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectAccount.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0c1426aa02cb1462cb7f3b001c526cd7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectAccountAsset.cs b/Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectAccountAsset.cs
new file mode 100644
index 000000000..0ebe01e32
--- /dev/null
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectAccountAsset.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Threading;
+using Cysharp.Threading.Tasks;
+using UnityEngine;
+
+namespace AlgoSdk.WalletConnect
+{
+    [CreateAssetMenu(fileName = "NewWalletConnectAccount", menuName = "AlgoSdk/Accounts/WalletConnectAccount")]
+    public class WalletConnectAccountAsset
+        : ScriptableObject
+        , IWalletConnectAccount
+    {
+        [SerializeField]
+        WalletConnectAccount account;
+
+        /// <inheritdoc />
+        public Address Address => account.Address;
+
+        /// <inheritdoc />
+        public SessionData SessionData => account.SessionData;
+
+        /// <inheritdoc />
+        public string BridgeUrl
+        {
+            get => account.BridgeUrl;
+            set => account.BridgeUrl = value;
+        }
+
+        /// <inheritdoc />
+        public ClientMeta DappMeta
+        {
+            get => account.DappMeta;
+            set => account.DappMeta = value;
+        }
+
+        /// <inheritdoc />
+        public SessionStatus ConnectionStatus => account.ConnectionStatus;
+
+        /// <inheritdoc />
+        public UniTask BeginSession() => account.BeginSession();
+
+        /// <inheritdoc />
+        public void EndSession() => account.EndSession();
+
+        /// <inheritdoc />
+        public void ResetSessionData() => account.ResetSessionData();
+
+        /// <inheritdoc />
+        public HandshakeUrl RequestWalletConnection() => account.RequestWalletConnection();
+
+        /// <inheritdoc />
+        public UniTask WaitForWalletApproval() => account.WaitForWalletApproval();
+
+        /// <inheritdoc />
+        public void DisconnectWallet(string reason = default) => account.DisconnectWallet(reason);
+
+        /// <inheritdoc />
+        public UniTask<SignedTxn<T>[]> SignTxnsAsync<T>(
+            T[] txns, TxnIndices txnsToSign,
+            CancellationToken cancellationToken = default
+            )
+            where T : ITransaction, IEquatable<T>
+        {
+            return account.SignTxnsAsync(txns, txnsToSign, cancellationToken);
+        }
+    }
+}
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectAccountAsset.cs.meta b/Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectAccountAsset.cs.meta
new file mode 100644
index 000000000..ee509617a
--- /dev/null
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectAccountAsset.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 445184a5e2d2c4c65af8662851370711
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectSessionEvents.cs b/Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectSessionEvents.cs
new file mode 100644
index 000000000..bf52bc3c6
--- /dev/null
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectSessionEvents.cs
@@ -0,0 +1,13 @@
+using System;
+using UnityEngine.Events;
+
+namespace AlgoSdk.WalletConnect
+{
+    [Serializable]
+    public class WalletConnectSessionEvents
+    {
+        public UnityEvent<AlgorandWalletConnectSession> OnSessionConnect = new UnityEvent<AlgorandWalletConnectSession>();
+        public UnityEvent<string> OnSessionDisconnect = new UnityEvent<string>();
+        public UnityEvent<WalletConnectSessionData> OnSessionUpdate = new UnityEvent<WalletConnectSessionData>();
+    }
+}
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectSessionEvents.cs.meta b/Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectSessionEvents.cs.meta
new file mode 100644
index 000000000..4021cccf0
--- /dev/null
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/WalletConnectSessionEvents.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e3cb3ff8e023b406faf9987593db7642
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/WebSocketExtensions.cs b/Runtime/CareBoo.AlgoSdk.WalletConnect/WebSocketExtensions.cs
index c0d4c7841..d404589dd 100644
--- a/Runtime/CareBoo.AlgoSdk.WalletConnect/WebSocketExtensions.cs
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/WebSocketExtensions.cs
@@ -12,7 +12,7 @@ public static class WebSocketExtensions
     {
         public static void Send(this IWebSocketClient client, NetworkMessage networkMessage)
         {
-            using var networkMessageData = AlgoApiSerializer.SerializeJson(networkMessage, Allocator.Temp);
+            using var networkMessageData = AlgoApiSerializer.SerializeJson(networkMessage, Allocator.Persistent);
             var networkMessageArraySegment = new ArraySegment<byte>(networkMessageData.AsArray().ToArray());
             client.Send(networkMessageArraySegment);
         }
@@ -27,25 +27,33 @@ public static void Send(this IWebSocketClient client, NetworkMessage networkMess
             CancellationToken cancellationToken = default
             ) => client.PollUntilEvent(WebSocketEventType.Payload, cancellationToken);
 
-        static async UniTask<WebSocketEvent> PollUntilEvent(
+        public static async UniTask<WebSocketEvent> PollUntilEvent(
             this IWebSocketClient client,
             WebSocketEventType expectedEventType,
             CancellationToken cancellationToken = default
             )
         {
-            var evt = client.Poll();
-            while (evt.Type == WebSocketEventType.Nothing)
-            {
-                await UniTask.Yield(cancellationToken);
-                evt = client.Poll();
-            }
+            var evt = await client.PollUntilEvent(cancellationToken);
             if (evt.Type == WebSocketEventType.Error)
                 throw new Exception($"Got error web socket event: {evt.Error}");
             if (evt.Type == WebSocketEventType.Close)
                 throw new Exception($"Got web socket closed event with reason: {evt.Reason}");
             if (evt.Type != expectedEventType)
                 throw new InvalidOperationException($"Got unexpected event type {evt.Type}");
+            return evt;
+        }
 
+        public static async UniTask<WebSocketEvent> PollUntilEvent(
+            this IWebSocketClient client,
+            CancellationToken cancellationToken = default
+            )
+        {
+            WebSocketEvent evt = client.Poll();
+            while (evt.Type == WebSocketEventType.Nothing)
+            {
+                await UniTask.Yield(cancellationToken);
+                evt = client.Poll();
+            }
             return evt;
         }
     }
diff --git a/Runtime/CareBoo.AlgoSdk/Accounts/Account.cs b/Runtime/CareBoo.AlgoSdk/Accounts/Account.cs
index e93cc188b..5aa619567 100644
--- a/Runtime/CareBoo.AlgoSdk/Accounts/Account.cs
+++ b/Runtime/CareBoo.AlgoSdk/Accounts/Account.cs
@@ -74,7 +74,7 @@ public void Deconstruct(out PrivateKey privateKey, out Address address)
         public SignedTxn<T> SignTxn<T>(T txn) where T : ITransaction, IEquatable<T>
         {
             using var kp = privateKey.ToKeyPair();
-            using var msg = txn.ToSignatureMessage(Allocator.Temp);
+            using var msg = txn.ToSignatureMessage(Allocator.Persistent);
             var sig = kp.SecretKey.Sign(msg);
             return new SignedTxn<T> { Txn = txn, Sig = sig };
         }
diff --git a/Runtime/CareBoo.AlgoSdk/Accounts/Address.cs b/Runtime/CareBoo.AlgoSdk/Accounts/Address.cs
index 975fa57a6..c8d3f10b4 100644
--- a/Runtime/CareBoo.AlgoSdk/Accounts/Address.cs
+++ b/Runtime/CareBoo.AlgoSdk/Accounts/Address.cs
@@ -43,7 +43,7 @@ public FixedString128Bytes ToFixedString()
         {
             var result = new FixedString128Bytes();
             var checksum = ComputeCheckSum(publicKey);
-            var bytes = new NativeByteArray(SizeBytes + CheckSum.SizeBytes, Allocator.Temp);
+            var bytes = new NativeByteArray(SizeBytes + CheckSum.SizeBytes, Allocator.Persistent);
             try
             {
                 bytes.CopyFrom(this, 0);
@@ -75,7 +75,7 @@ public static Address FromString<TString>(TString s)
                 return Address.Empty;
             Address address = default;
             CheckSum checksum = default;
-            var bytes = new NativeByteArray(SizeBytes + CheckSum.SizeBytes, Allocator.Temp);
+            var bytes = new NativeByteArray(SizeBytes + CheckSum.SizeBytes, Allocator.Persistent);
             try
             {
                 Base32Encoding.ToBytes(s, ref bytes);
diff --git a/Runtime/CareBoo.AlgoSdk/Accounts/Logic.cs b/Runtime/CareBoo.AlgoSdk/Accounts/Logic.cs
index 42e34ae44..f0494371f 100644
--- a/Runtime/CareBoo.AlgoSdk/Accounts/Logic.cs
+++ b/Runtime/CareBoo.AlgoSdk/Accounts/Logic.cs
@@ -18,7 +18,7 @@ public static class Logic
         /// <returns>An <see cref="Address"/> for a program.</returns>
         public static Address GetAddress(CompiledTeal program)
         {
-            using var bytes = GetSignBytes(program, Allocator.Temp);
+            using var bytes = GetSignBytes(program, Allocator.Persistent);
             return Sha512.Hash256Truncated(bytes);
         }
 
@@ -31,17 +31,10 @@ public static Address GetAddress(CompiledTeal program)
         public static NativeByteArray GetSignBytes(CompiledTeal program, Allocator allocator)
         {
             var bytes = new NativeByteArray(SigningPrefix.Length + program.Bytes.Length, allocator);
-            try
-            {
-                for (var i = 0; i < SigningPrefix.Length; i++)
-                    bytes[i] = SigningPrefix[i];
-                for (var i = SigningPrefix.Length; i < bytes.Length; i++)
-                    bytes[i] = program.Bytes[i - SigningPrefix.Length];
-            }
-            finally
-            {
-                bytes.Dispose();
-            }
+            for (var i = 0; i < SigningPrefix.Length; i++)
+                bytes[i] = SigningPrefix[i];
+            for (var i = SigningPrefix.Length; i < bytes.Length; i++)
+                bytes[i] = program.Bytes[i - SigningPrefix.Length];
             return bytes;
         }
 
@@ -53,7 +46,7 @@ public static NativeByteArray GetSignBytes(CompiledTeal program, Allocator alloc
         /// <returns><see cref="Sig"/></returns>
         public static Sig Sign(CompiledTeal program, SecretKeyHandle secretKey)
         {
-            using var programSignBytes = Logic.GetSignBytes(program, Allocator.Temp);
+            using var programSignBytes = Logic.GetSignBytes(program, Allocator.Persistent);
             return secretKey.Sign(programSignBytes);
         }
 
diff --git a/Runtime/CareBoo.AlgoSdk/Accounts/PrivateKey.cs b/Runtime/CareBoo.AlgoSdk/Accounts/PrivateKey.cs
index a15bc6082..c993518bf 100644
--- a/Runtime/CareBoo.AlgoSdk/Accounts/PrivateKey.cs
+++ b/Runtime/CareBoo.AlgoSdk/Accounts/PrivateKey.cs
@@ -39,12 +39,12 @@ public Sig Sign<T>(T msg)
 
         public Mnemonic ToMnemonic()
         {
-            using var bit11Array = this.ToBitArray(Allocator.Temp, bitsPerElement: 11);
+            using var bit11Array = this.ToBitArray(Allocator.Persistent, bitsPerElement: 11);
             var result = new Mnemonic();
             for (var i = 0; i < Mnemonic.ChecksumIndex; i++)
                 result[i] = (Mnemonic.Word)(bit11Array[i]);
             var checksum256 = Sha512.Hash256Truncated(this);
-            using var checksum11Bit = checksum256.ToBitArray(Allocator.Temp, bitsPerElement: 11, maxArraySize: 1);
+            using var checksum11Bit = checksum256.ToBitArray(Allocator.Persistent, bitsPerElement: 11, maxArraySize: 1);
             result[Mnemonic.ChecksumIndex] = (Mnemonic.Word)(checksum11Bit[0]);
             return result;
         }
diff --git a/Runtime/CareBoo.AlgoSdk/Formatters/AlgoApiObjectFormatter.cs b/Runtime/CareBoo.AlgoSdk/Formatters/AlgoApiObjectFormatter.cs
index a50874881..5280b0626 100644
--- a/Runtime/CareBoo.AlgoSdk/Formatters/AlgoApiObjectFormatter.cs
+++ b/Runtime/CareBoo.AlgoSdk/Formatters/AlgoApiObjectFormatter.cs
@@ -111,7 +111,7 @@ public T Deserialize(ref MessagePackReader reader)
 
         public void Serialize(ref JsonWriter writer, T value)
         {
-            using var fieldsToSerialize = fieldMap.GetFieldsToSerialize(value, Allocator.Temp);
+            using var fieldsToSerialize = fieldMap.GetFieldsToSerialize(value, Allocator.Persistent);
             writer.BeginObject();
             for (var i = 0; i < fieldsToSerialize.Length; i++)
             {
@@ -126,7 +126,7 @@ public void Serialize(ref JsonWriter writer, T value)
 
         public void Serialize(ref MessagePackWriter writer, T value)
         {
-            using var fieldsToSerialize = fieldMap.GetFieldsToSerialize(value, Allocator.Temp);
+            using var fieldsToSerialize = fieldMap.GetFieldsToSerialize(value, Allocator.Persistent);
             writer.WriteMapHeader(fieldsToSerialize.Length);
             for (var i = 0; i < fieldsToSerialize.Length; i++)
             {
@@ -141,7 +141,7 @@ public class AlgoApiObjectFormatter : IAlgoApiFormatter<AlgoApiObject>
     {
         public AlgoApiObject Deserialize(ref JsonReader reader)
         {
-            var json = new NativeText(Allocator.Temp);
+            var json = new NativeText(Allocator.Persistent);
             try
             {
                 reader.ReadRaw(ref json).ThrowIfError(reader);
@@ -155,7 +155,7 @@ public AlgoApiObject Deserialize(ref JsonReader reader)
 
         public AlgoApiObject Deserialize(ref MessagePackReader reader)
         {
-            var msgPack = new NativeList<byte>(Allocator.Temp);
+            var msgPack = new NativeList<byte>(Allocator.Persistent);
             try
             {
                 reader.ReadRaw(msgPack);
@@ -171,7 +171,7 @@ public void Serialize(ref JsonWriter writer, AlgoApiObject value)
         {
             if (!value.IsJson || value.Json == null)
                 throw new ArgumentException("cannot serialize non-json to json...", nameof(value));
-            using var json = new NativeArray<byte>(value.Json, Allocator.Temp);
+            using var json = new NativeArray<byte>(value.Json, Allocator.Persistent);
             writer.WriteRaw(json);
         }
 
@@ -179,7 +179,7 @@ public void Serialize(ref MessagePackWriter writer, AlgoApiObject value)
         {
             if (!value.IsMessagePack || value.MessagePack == null)
                 throw new ArgumentException("cannot serialize non-msgpack to msgpack...", nameof(value));
-            using var msgPack = new NativeArray<byte>(value.MessagePack, Allocator.Temp);
+            using var msgPack = new NativeArray<byte>(value.MessagePack, Allocator.Persistent);
             writer.WriteRaw(msgPack);
         }
     }
diff --git a/Runtime/CareBoo.AlgoSdk/Formatters/AlgoApiSerializer.cs b/Runtime/CareBoo.AlgoSdk/Formatters/AlgoApiSerializer.cs
index 0327c2f0f..8976db762 100644
--- a/Runtime/CareBoo.AlgoSdk/Formatters/AlgoApiSerializer.cs
+++ b/Runtime/CareBoo.AlgoSdk/Formatters/AlgoApiSerializer.cs
@@ -22,7 +22,7 @@ public static T Deserialize<T>(byte[] bytes, ContentType contentType)
         {
             if (bytes == null)
                 return default;
-            using var nativeBytes = new NativeArray<byte>(bytes, Allocator.Temp);
+            using var nativeBytes = new NativeArray<byte>(bytes, Allocator.Persistent);
             return Deserialize<T>(nativeBytes, contentType);
         }
 
@@ -52,7 +52,7 @@ public static T Deserialize<T>(NativeArray<byte> bytes, ContentType contentType)
         /// <returns>The data deserialized as T</returns>
         public static T DeserializeJson<T>(NativeArray<byte> bytes)
         {
-            var text = new NativeText(bytes.Length, Allocator.Temp);
+            var text = new NativeText(bytes.Length, Allocator.Persistent);
             try
             {
                 unsafe
@@ -76,7 +76,7 @@ public static T DeserializeJson<T>(NativeArray<byte> bytes)
         /// <returns>The data deserialized as T</returns>
         public static T DeserializeJson<T>(byte[] bytes)
         {
-            using var nativeByteArray = new NativeArray<byte>(bytes, Allocator.Temp);
+            using var nativeByteArray = new NativeArray<byte>(bytes, Allocator.Persistent);
             return DeserializeJson<T>(nativeByteArray);
         }
 
@@ -100,7 +100,7 @@ public static T DeserializeJson<T>(NativeText text)
         /// <returns>The data deserialized as T</returns>
         public static T DeserializeJson<T>(string text)
         {
-            using var nativeText = new NativeText(text, Allocator.Temp);
+            using var nativeText = new NativeText(text, Allocator.Persistent);
             return DeserializeJson<T>(nativeText);
         }
 
@@ -124,7 +124,7 @@ public static T DeserializeMessagePack<T>(NativeArray<byte> bytes)
         /// <returns>The data deserialized as T</returns>        
         public static T DeserializeMessagePack<T>(byte[] bytes)
         {
-            using var nativeBytes = new NativeArray<byte>(bytes, Allocator.Temp);
+            using var nativeBytes = new NativeArray<byte>(bytes, Allocator.Persistent);
             return DeserializeMessagePack<T>(nativeBytes);
         }
 
@@ -151,7 +151,7 @@ public static NativeList<byte> SerializeMessagePack<T>(T obj, Allocator allocato
         /// <returns>The message pack message as an array of bytes</returns>
         public static byte[] SerializeMessagePack<T>(T obj)
         {
-            using var listBytes = SerializeMessagePack<T>(obj, Allocator.Temp);
+            using var listBytes = SerializeMessagePack<T>(obj, Allocator.Persistent);
             return listBytes.ToArray();
         }
 
@@ -178,7 +178,7 @@ public static NativeText SerializeJson<T>(T obj, Allocator allocator)
         /// <returns>json text as a string</returns>
         public static string SerializeJson<T>(T obj)
         {
-            using var text = SerializeJson<T>(obj, Allocator.Temp);
+            using var text = SerializeJson<T>(obj, Allocator.Persistent);
             return text.ToString();
         }
     }
diff --git a/Runtime/CareBoo.AlgoSdk/Formatters/ByteArrayFormatter.cs b/Runtime/CareBoo.AlgoSdk/Formatters/ByteArrayFormatter.cs
index e6e026027..b46f18177 100644
--- a/Runtime/CareBoo.AlgoSdk/Formatters/ByteArrayFormatter.cs
+++ b/Runtime/CareBoo.AlgoSdk/Formatters/ByteArrayFormatter.cs
@@ -15,7 +15,7 @@ public byte[] Deserialize(ref JsonReader reader)
             if (reader.Peek() == JsonToken.ArrayBegin)
                 return ArrayFormatter<byte>.Instance.Deserialize(ref reader);
 
-            var b64 = new NativeText(Allocator.Temp);
+            var b64 = new NativeText(Allocator.Persistent);
             try
             {
                 reader.ReadString(ref b64).ThrowIfError(reader);
@@ -38,7 +38,7 @@ public byte[] Deserialize(ref MessagePackReader reader)
         public void Serialize(ref JsonWriter writer, byte[] value)
         {
             var s = System.Convert.ToBase64String(value);
-            using var t = new NativeText(s, Allocator.Temp);
+            using var t = new NativeText(s, Allocator.Persistent);
             writer.WriteString(t);
         }
 
@@ -56,7 +56,7 @@ public class ByteArrayFormatter<TByteArray>
 
         public TByteArray Deserialize(ref JsonReader reader)
         {
-            var text = new NativeText(Allocator.Temp);
+            var text = new NativeText(Allocator.Persistent);
             try
             {
                 reader.ReadString(ref text)
@@ -95,7 +95,7 @@ public TByteArray Deserialize(ref MessagePackReader reader)
             }
             else
             {
-                var text = new NativeText(Allocator.Temp);
+                var text = new NativeText(Allocator.Persistent);
                 try
                 {
                     reader.ReadString(ref text);
@@ -111,7 +111,7 @@ public TByteArray Deserialize(ref MessagePackReader reader)
 
         public void Serialize(ref JsonWriter writer, TByteArray value)
         {
-            var text = new NativeText(Allocator.Temp);
+            var text = new NativeText(Allocator.Persistent);
             try
             {
                 value.CopyToBase64(ref text);
diff --git a/Runtime/CareBoo.AlgoSdk/Formatters/FixedBytesFormatter.cs b/Runtime/CareBoo.AlgoSdk/Formatters/FixedBytesFormatter.cs
index 1e6311701..a2374a16c 100644
--- a/Runtime/CareBoo.AlgoSdk/Formatters/FixedBytesFormatter.cs
+++ b/Runtime/CareBoo.AlgoSdk/Formatters/FixedBytesFormatter.cs
@@ -11,7 +11,7 @@ public class FixedBytesFormatter<T> : IAlgoApiFormatter<T>
     {
         public T Deserialize(ref JsonReader reader)
         {
-            var text = new NativeText(Allocator.Temp);
+            var text = new NativeText(Allocator.Persistent);
             try
             {
                 reader.ReadString(ref text)
@@ -39,7 +39,7 @@ public T Deserialize(ref MessagePackReader reader)
         public void Serialize(ref JsonWriter writer, T value)
         {
             FixedBytesArray<T> bytes = value;
-            var text = new NativeText(Allocator.Temp);
+            var text = new NativeText(Allocator.Persistent);
             try
             {
                 bytes.CopyToBase64(ref text);
@@ -53,7 +53,7 @@ public void Serialize(ref JsonWriter writer, T value)
 
         public void Serialize(ref MessagePackWriter writer, T value)
         {
-            var arr = new NativeArray<byte>(value.Length, Allocator.Temp);
+            var arr = new NativeArray<byte>(value.Length, Allocator.Persistent);
             try
             {
                 for (var i = 0; i < value.Length; i++)
diff --git a/Runtime/CareBoo.AlgoSdk/Formatters/Primitives/StringFormatter.cs b/Runtime/CareBoo.AlgoSdk/Formatters/Primitives/StringFormatter.cs
index 5f8bbccfa..c892c8e19 100644
--- a/Runtime/CareBoo.AlgoSdk/Formatters/Primitives/StringFormatter.cs
+++ b/Runtime/CareBoo.AlgoSdk/Formatters/Primitives/StringFormatter.cs
@@ -8,7 +8,7 @@ public class StringFormatter : IAlgoApiFormatter<string>
     {
         public string Deserialize(ref JsonReader reader)
         {
-            var text = new NativeText(Allocator.Temp);
+            var text = new NativeText(Allocator.Persistent);
             try
             {
                 reader.ReadString(ref text);
@@ -22,7 +22,7 @@ public string Deserialize(ref JsonReader reader)
 
         public string Deserialize(ref MessagePackReader reader)
         {
-            var text = new NativeText(Allocator.Temp);
+            var text = new NativeText(Allocator.Persistent);
             try
             {
                 reader.ReadString(ref text);
@@ -36,13 +36,13 @@ public string Deserialize(ref MessagePackReader reader)
 
         public void Serialize(ref JsonWriter writer, string value)
         {
-            using var text = new NativeText(value, Allocator.Temp);
+            using var text = new NativeText(value, Allocator.Persistent);
             writer.WriteString(text);
         }
 
         public void Serialize(ref MessagePackWriter writer, string value)
         {
-            using var text = new NativeText(value, Allocator.Temp);
+            using var text = new NativeText(value, Allocator.Persistent);
             writer.WriteString(text);
         }
     }
diff --git a/Runtime/CareBoo.AlgoSdk/Formatters/StateDeltaFormatter.cs b/Runtime/CareBoo.AlgoSdk/Formatters/StateDeltaFormatter.cs
index ed494a509..60ca2cb0f 100644
--- a/Runtime/CareBoo.AlgoSdk/Formatters/StateDeltaFormatter.cs
+++ b/Runtime/CareBoo.AlgoSdk/Formatters/StateDeltaFormatter.cs
@@ -13,7 +13,7 @@ public StateDelta Deserialize(ref JsonReader reader)
             if (!reader.TryRead(JsonToken.ObjectBegin))
                 JsonReadError.IncorrectType.ThrowIfError(reader);
 
-            using var map = new NativeList<ValueDeltaKeyValue>(64, Allocator.Temp);
+            using var map = new NativeList<ValueDeltaKeyValue>(64, Allocator.Persistent);
             while (reader.Peek() != JsonToken.ObjectEnd && reader.Peek() != JsonToken.None)
             {
                 FixedString64Bytes key = default;
diff --git a/Runtime/CareBoo.AlgoSdk/Services/Algod/AlgodClient.cs b/Runtime/CareBoo.AlgoSdk/Services/Algod/AlgodClient.cs
index 13ac16644..25e94d332 100644
--- a/Runtime/CareBoo.AlgoSdk/Services/Algod/AlgodClient.cs
+++ b/Runtime/CareBoo.AlgoSdk/Services/Algod/AlgodClient.cs
@@ -178,7 +178,7 @@ public AlgoApiRequest.Sent<PostTransactionsResponse> SendTransaction(byte[] txn)
             using var bytes = new NativeList<byte>(Allocator.Persistent);
             for (var i = 0; i < txns.Length; i++)
             {
-                using var data = AlgoApiSerializer.SerializeMessagePack(txns[i], Allocator.Temp);
+                using var data = AlgoApiSerializer.SerializeMessagePack(txns[i], Allocator.Persistent);
                 bytes.AddRange(data);
             }
             return SendTransactions(bytes.AsArray().AsReadOnly());
diff --git a/Runtime/CareBoo.AlgoSdk/Services/Algod/AlgodClientAsset.cs b/Runtime/CareBoo.AlgoSdk/Services/Algod/AlgodClientAsset.cs
new file mode 100644
index 000000000..7331023b8
--- /dev/null
+++ b/Runtime/CareBoo.AlgoSdk/Services/Algod/AlgodClientAsset.cs
@@ -0,0 +1,10 @@
+using UnityEngine;
+
+namespace AlgoSdk
+{
+    [CreateAssetMenu(fileName = "NewAlgodClient", menuName = "AlgoSdk/Clients/AlgodClient")]
+    public class AlgodClientAsset : ScriptableObject
+    {
+        public AlgodClient Client;
+    }
+}
diff --git a/Runtime/CareBoo.AlgoSdk/Services/Algod/AlgodClientAsset.cs.meta b/Runtime/CareBoo.AlgoSdk/Services/Algod/AlgodClientAsset.cs.meta
new file mode 100644
index 000000000..bdda79cd8
--- /dev/null
+++ b/Runtime/CareBoo.AlgoSdk/Services/Algod/AlgodClientAsset.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1b18fa56602714cbf9292caea3984246
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Runtime/CareBoo.AlgoSdk/Services/Indexer/IndexerClientAsset.cs b/Runtime/CareBoo.AlgoSdk/Services/Indexer/IndexerClientAsset.cs
new file mode 100644
index 000000000..a4e7349ea
--- /dev/null
+++ b/Runtime/CareBoo.AlgoSdk/Services/Indexer/IndexerClientAsset.cs
@@ -0,0 +1,10 @@
+using UnityEngine;
+
+namespace AlgoSdk
+{
+    [CreateAssetMenu(fileName = "NewIndexerClient", menuName = "AlgoSdk/Clients/IndexerClient")]
+    public class IndexerClientAsset : ScriptableObject
+    {
+        public IndexerClient Client;
+    }
+}
diff --git a/Runtime/CareBoo.AlgoSdk/Services/Indexer/IndexerClientAsset.cs.meta b/Runtime/CareBoo.AlgoSdk/Services/Indexer/IndexerClientAsset.cs.meta
new file mode 100644
index 000000000..d382383de
--- /dev/null
+++ b/Runtime/CareBoo.AlgoSdk/Services/Indexer/IndexerClientAsset.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7fa97739f9d6d4a56a330a94dae40ffa
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Runtime/CareBoo.AlgoSdk/Services/Kmd/KmdAccount.cs b/Runtime/CareBoo.AlgoSdk/Services/Kmd/KmdAccount.cs
index 8b81ccf8c..2a155290e 100644
--- a/Runtime/CareBoo.AlgoSdk/Services/Kmd/KmdAccount.cs
+++ b/Runtime/CareBoo.AlgoSdk/Services/Kmd/KmdAccount.cs
@@ -7,14 +7,22 @@
 
 namespace AlgoSdk
 {
+    [Serializable]
     public struct KmdAccount
         : IAccount
         , IAsyncSigner
     {
-        readonly KmdClient client;
-        readonly FixedString128Bytes walletId;
-        readonly FixedString128Bytes walletPassword;
-        readonly Address address;
+        [SerializeField]
+        KmdClient client;
+
+        [SerializeField]
+        FixedString128Bytes walletId;
+
+        [SerializeField]
+        FixedString128Bytes walletPassword;
+
+        [SerializeField]
+        Address address;
 
         FixedString128Bytes walletHandleToken;
 
diff --git a/Runtime/CareBoo.AlgoSdk/Services/Kmd/KmdClientAsset.cs b/Runtime/CareBoo.AlgoSdk/Services/Kmd/KmdClientAsset.cs
new file mode 100644
index 000000000..da9d69102
--- /dev/null
+++ b/Runtime/CareBoo.AlgoSdk/Services/Kmd/KmdClientAsset.cs
@@ -0,0 +1,10 @@
+using UnityEngine;
+
+namespace AlgoSdk
+{
+    [CreateAssetMenu(fileName = "NewKmdClient", menuName = "AlgoSdk/Clients/KmdClient")]
+    public class KmdClientAsset : ScriptableObject
+    {
+        public KmdClient Client;
+    }
+}
diff --git a/Runtime/CareBoo.AlgoSdk/Services/Kmd/KmdClientAsset.cs.meta b/Runtime/CareBoo.AlgoSdk/Services/Kmd/KmdClientAsset.cs.meta
new file mode 100644
index 000000000..cf9ecfbd1
--- /dev/null
+++ b/Runtime/CareBoo.AlgoSdk/Services/Kmd/KmdClientAsset.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a003ad2a98db74ce29d6895be97fcc6a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Runtime/CareBoo.AlgoSdk/Services/Networking/AlgoApiRequest.cs b/Runtime/CareBoo.AlgoSdk/Services/Networking/AlgoApiRequest.cs
index 8200aea66..d3002a341 100644
--- a/Runtime/CareBoo.AlgoSdk/Services/Networking/AlgoApiRequest.cs
+++ b/Runtime/CareBoo.AlgoSdk/Services/Networking/AlgoApiRequest.cs
@@ -101,7 +101,7 @@ public SentWithProgress<TProgress> Send<TProgress>(TProgress progress, Cancellat
         /// <returns>this request with body and header set</returns>
         public AlgoApiRequest SetJsonBody<TBody>(TBody value)
         {
-            using var json = AlgoApiSerializer.SerializeJson(value, Allocator.Temp);
+            using var json = AlgoApiSerializer.SerializeJson(value, Allocator.Persistent);
             return SetJsonBody(json);
         }
 
@@ -129,7 +129,7 @@ public AlgoApiRequest SetJsonBody<TBody>(TBody value)
         /// <returns>this request with body and header set</returns>
         public AlgoApiRequest SetMessagePackBody<TBody>(TBody value)
         {
-            using var msgpack = AlgoApiSerializer.SerializeMessagePack(value, Allocator.Temp);
+            using var msgpack = AlgoApiSerializer.SerializeMessagePack(value, Allocator.Persistent);
             return SetMessagePackBody(msgpack.AsArray().AsReadOnly());
         }
 
diff --git a/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/Contract.cs b/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/Contract.cs
index b22d1da40..c94e26fe7 100644
--- a/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/Contract.cs
+++ b/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/Contract.cs
@@ -125,7 +125,7 @@ public Deployments Deserialize(ref JsonReader reader)
                 {
                     if (!reader.TryRead(JsonToken.ObjectBegin))
                         JsonReadError.IncorrectType.ThrowIfError(reader);
-                    using var deployments = new NativeList<Deployment>(Allocator.Temp);
+                    using var deployments = new NativeList<Deployment>(Allocator.Persistent);
                     while (reader.Peek() != JsonToken.ObjectEnd
                         && reader.Peek() != JsonToken.None)
                     {
diff --git a/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/MethodCallBuilder.cs b/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/MethodCallBuilder.cs
index a52e2ff72..bcb4f269b 100644
--- a/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/MethodCallBuilder.cs
+++ b/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/MethodCallBuilder.cs
@@ -93,8 +93,8 @@ public void ValidateTxnArgs<TTxns>(TTxns prevTxns)
         /// <exception cref="System.ArgumentException">Not enough arguments given to call this method.</exception>
         public AppCallTxn BuildTxn()
         {
-            using var appArguments = new NativeListOfList<byte>(Allocator.Temp);
-            using var references = new AbiReferences(sender, applicationId, Allocator.Temp);
+            using var appArguments = new NativeListOfList<byte>(Allocator.Persistent);
+            using var references = new AbiReferences(sender, applicationId, Allocator.Persistent);
 
             appArguments.AddArray(methodSelector);
             var args = this.argValues;
@@ -108,13 +108,13 @@ public AppCallTxn BuildTxn()
                 {
                     using var remainingBytes = Tuple
                         .Of(args)
-                        .Encode(appArgTypes.Slice(i), references, Allocator.Temp);
+                        .Encode(appArgTypes.Slice(i), references, Allocator.Persistent);
                     appArguments.Add(remainingBytes.Bytes);
                 }
                 else
                 {
                     var type = appArgTypes[i];
-                    using var bytes = args.EncodeCurrent(type, references, Allocator.Temp);
+                    using var bytes = args.EncodeCurrent(type, references, Allocator.Persistent);
                     appArguments.Add(bytes);
                 }
             }
diff --git a/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/MethodSelector.cs b/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/MethodSelector.cs
index 8536ae3c7..9b7673bdb 100644
--- a/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/MethodSelector.cs
+++ b/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/MethodSelector.cs
@@ -19,7 +19,7 @@ public struct MethodSelector
 
         public MethodSelector(Method method)
         {
-            using var signature = method.GetSignature(Allocator.Temp);
+            using var signature = method.GetSignature(Allocator.Persistent);
             var hash = Sha512.Hash256Truncated(signature.AsArray().AsReadOnly());
             unsafe
             {
diff --git a/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/Values/Array.cs b/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/Values/Array.cs
index a7beb4826..6df177d6e 100644
--- a/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/Values/Array.cs
+++ b/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/Values/Array.cs
@@ -41,7 +41,7 @@ public EncodedAbiArg Encode(IAbiType type, AbiReferences references, Allocator a
 
             var result = new EncodedAbiArg(allocator);
             using var k = new UInt16((ushort)value.Length)
-                .Encode(AbiType.UIntN(16), references, Allocator.Temp);
+                .Encode(AbiType.UIntN(16), references, Allocator.Persistent);
             result.Bytes.AddRange(k.Bytes);
             result.Bytes.AddRange(tupleEncoding.Bytes);
             tupleEncoding.Dispose();
diff --git a/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/Values/Tuple.cs b/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/Values/Tuple.cs
index 742a993fd..a2f8250d1 100644
--- a/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/Values/Tuple.cs
+++ b/Runtime/CareBoo.AlgoSdk/SmartContracts/Abi/Values/Tuple.cs
@@ -51,7 +51,7 @@ public int Length(IAbiType type)
         public EncodedAbiArg Encode<U>(U types, AbiReferences references, Allocator allocator)
             where U : IReadOnlyList<IAbiType>
         {
-            using var encoder = new Encoder<U>(args, types, references, Allocator.Temp);
+            using var encoder = new Encoder<U>(args, types, references, Allocator.Persistent);
             return encoder.Encode(allocator);
         }
 
@@ -152,7 +152,7 @@ void EncodeStaticHead(int t)
                 else
                 {
                     boolShift = 0;
-                    using var bytes = args.EncodeCurrent(types[t], references, Allocator.Temp);
+                    using var bytes = args.EncodeCurrent(types[t], references, Allocator.Persistent);
                     headBytes.AddRange(bytes.Bytes);
                 }
             }
@@ -178,7 +178,7 @@ void EncodeBoolHead(int t)
                 boolShift %= 8;
                 if (boolShift == 0)
                     headBytes.Add(0);
-                using var encoded = args.EncodeCurrent(types[t], references, Allocator.Temp);
+                using var encoded = args.EncodeCurrent(types[t], references, Allocator.Persistent);
                 headBytes[headBytes.Length - 1] |= (byte)(encoded[0] >> boolShift);
                 boolShift++;
             }
@@ -197,7 +197,7 @@ void EncodeStaticTail(int t)
 
             void EncodeDynamicTail(int t)
             {
-                using var bytes = args.EncodeCurrent(types[t], references, Allocator.Temp);
+                using var bytes = args.EncodeCurrent(types[t], references, Allocator.Persistent);
                 tailBytes.AddRange(bytes.Bytes);
             }
         }
diff --git a/Runtime/CareBoo.AlgoSdk/SmartContracts/AppIndex.cs b/Runtime/CareBoo.AlgoSdk/SmartContracts/AppIndex.cs
index da4eaf75b..ee468b578 100644
--- a/Runtime/CareBoo.AlgoSdk/SmartContracts/AppIndex.cs
+++ b/Runtime/CareBoo.AlgoSdk/SmartContracts/AppIndex.cs
@@ -51,8 +51,8 @@ public bool Equals(ulong other)
 
         public Address GetAppAddress()
         {
-            using var appIndexBytes = index.ToBytesBigEndian(Allocator.Temp);
-            var data = new NativeByteArray(HashPrefix.Length + appIndexBytes.Length, Allocator.Temp);
+            using var appIndexBytes = index.ToBytesBigEndian(Allocator.Persistent);
+            var data = new NativeByteArray(HashPrefix.Length + appIndexBytes.Length, Allocator.Persistent);
             try
             {
                 data.CopyFrom(HashPrefix, 0);
diff --git a/Runtime/CareBoo.AlgoSdk/SmartContracts/CompiledTeal.cs b/Runtime/CareBoo.AlgoSdk/SmartContracts/CompiledTeal.cs
index 24697452d..8d217f65b 100644
--- a/Runtime/CareBoo.AlgoSdk/SmartContracts/CompiledTeal.cs
+++ b/Runtime/CareBoo.AlgoSdk/SmartContracts/CompiledTeal.cs
@@ -64,7 +64,7 @@ public bool Equals(byte[] other)
 
         public static implicit operator CompiledTeal(string x)
         {
-            using var text = new NativeText(x, Allocator.Temp);
+            using var text = new NativeText(x, Allocator.Persistent);
             return text.ToByteArray();
         }
 
diff --git a/Runtime/CareBoo.AlgoSdk/Transactions/Atomic/AtomicTxn.Building.cs b/Runtime/CareBoo.AlgoSdk/Transactions/Atomic/AtomicTxn.Building.cs
index e3e1c9f68..a4e2e38f5 100644
--- a/Runtime/CareBoo.AlgoSdk/Transactions/Atomic/AtomicTxn.Building.cs
+++ b/Runtime/CareBoo.AlgoSdk/Transactions/Atomic/AtomicTxn.Building.cs
@@ -97,7 +97,7 @@ public Building AddTxn<T>(T txn)
                     method,
                     in methodArgs,
                     onComplete,
-                    Allocator.Temp
+                    Allocator.Persistent
                 );
                 methodCallBuilder.ValidateTxnArgs(Txns);
                 var txn = methodCallBuilder.BuildTxn();
@@ -114,7 +114,7 @@ public Building AddTxn<T>(T txn)
             /// </returns>
             public Signing Build()
             {
-                var writer = new MessagePackWriter(Allocator.Temp);
+                var writer = new MessagePackWriter(Allocator.Persistent);
                 try
                 {
                     for (var i = 0; i < IdPrefix.Length; i++)
diff --git a/Runtime/CareBoo.AlgoSdk/Transactions/Atomic/AtomicTxn.Signing.cs b/Runtime/CareBoo.AlgoSdk/Transactions/Atomic/AtomicTxn.Signing.cs
index 22610ef52..94e607476 100644
--- a/Runtime/CareBoo.AlgoSdk/Transactions/Atomic/AtomicTxn.Signing.cs
+++ b/Runtime/CareBoo.AlgoSdk/Transactions/Atomic/AtomicTxn.Signing.cs
@@ -48,7 +48,7 @@ public Signing(Transaction[] txns)
             /// <returns>Msgpack encoding of the transaction group.</returns>
             public byte[] FinishSigning()
             {
-                using var signed = FinishSigning(Allocator.Temp);
+                using var signed = FinishSigning(Allocator.Persistent);
                 return signed.ToArray();
             }
 
diff --git a/Runtime/CareBoo.AlgoSdk/Transactions/Atomic/TxnIndices.cs b/Runtime/CareBoo.AlgoSdk/Transactions/Atomic/TxnIndices.cs
index 00bce4442..f9061b176 100644
--- a/Runtime/CareBoo.AlgoSdk/Transactions/Atomic/TxnIndices.cs
+++ b/Runtime/CareBoo.AlgoSdk/Transactions/Atomic/TxnIndices.cs
@@ -45,6 +45,12 @@ public int Count()
             return count;
         }
 
+        public bool ContainsIndex(int index)
+        {
+            var flag = (TxnFlags)(1 << index);
+            return (flag & indices) > 0;
+        }
+
         public static implicit operator TxnIndices(TxnFlags flags)
         {
             return new TxnIndices { indices = flags };
diff --git a/Runtime/CareBoo.AlgoSdk/Transactions/ITransaction.cs b/Runtime/CareBoo.AlgoSdk/Transactions/ITransaction.cs
index d16f4b27e..be5e12573 100644
--- a/Runtime/CareBoo.AlgoSdk/Transactions/ITransaction.cs
+++ b/Runtime/CareBoo.AlgoSdk/Transactions/ITransaction.cs
@@ -26,7 +26,7 @@ public static class TransactionExtensions
         public static byte[] ToSignatureMessage<T>(this T txn)
             where T : ITransaction
         {
-            using var messageForSigning = txn.ToSignatureMessage(Allocator.Temp);
+            using var messageForSigning = txn.ToSignatureMessage(Allocator.Persistent);
             return messageForSigning.ToArray();
         }
 
@@ -41,7 +41,7 @@ Allocator allocator
             )
             where T : ITransaction
         {
-            using var data = AlgoApiSerializer.SerializeMessagePack(txn, Allocator.Temp);
+            using var data = AlgoApiSerializer.SerializeMessagePack(txn, Allocator.Persistent);
             var result = new NativeByteArray(Transaction.SignaturePrefix.Length + data.Length, allocator);
             for (var i = 0; i < Transaction.SignaturePrefix.Length; i++)
                 result[i] = Transaction.SignaturePrefix[i];
@@ -79,7 +79,7 @@ public static int EstimateBlockSizeBytes<T>(this T txn)
         public static TransactionId GetId<T>(this T txn)
             where T : ITransaction
         {
-            using var txnData = txn.ToSignatureMessage(Allocator.Temp);
+            using var txnData = txn.ToSignatureMessage(Allocator.Persistent);
             return Sha512.Hash256Truncated(txnData);
         }
     }
diff --git a/Runtime/CareBoo.AlgoSdk/Transactions/Signature/LogicSig.cs b/Runtime/CareBoo.AlgoSdk/Transactions/Signature/LogicSig.cs
index 9f27d87dd..65847292c 100644
--- a/Runtime/CareBoo.AlgoSdk/Transactions/Signature/LogicSig.cs
+++ b/Runtime/CareBoo.AlgoSdk/Transactions/Signature/LogicSig.cs
@@ -2,7 +2,6 @@
 using AlgoSdk.Crypto;
 using AlgoSdk.LowLevel;
 using Unity.Collections;
-using static AlgoSdk.Crypto.Ed25519;
 
 namespace AlgoSdk
 {
@@ -39,7 +38,7 @@ public bool Equals(LogicSig other)
         /// <returns><c>true</c> if this <see cref="LogicSig"/> can sign for the sender.</returns>
         public bool IsValid(Address sender)
         {
-            using var programByteArray = Logic.GetSignBytes(Program, Allocator.Temp);
+            using var programByteArray = Logic.GetSignBytes(Program, Allocator.Persistent);
             return (!Sig.Equals(default) && Sig.Verify(programByteArray, sender))
                 || (!Multisig.Equals(default) && Multisig.Verify(programByteArray))
                 || VerifyProgram(programByteArray, sender)
diff --git a/Runtime/CareBoo.AlgoSdk/Transactions/Signature/Multisig.cs b/Runtime/CareBoo.AlgoSdk/Transactions/Signature/Multisig.cs
index 281b45f66..0632ff6f5 100644
--- a/Runtime/CareBoo.AlgoSdk/Transactions/Signature/Multisig.cs
+++ b/Runtime/CareBoo.AlgoSdk/Transactions/Signature/Multisig.cs
@@ -97,20 +97,24 @@ public Address GetAddress()
             if (Subsigs == null)
                 return result;
 
-            using (var listBytes = new NativeList<byte>(Allocator.Temp))
+            using var listBytes = new NativeList<byte>(Allocator.Persistent);
+            unsafe
             {
-                using var addrPrefix = new NativeArray<byte>(AddressPrefix, Allocator.Temp);
-                listBytes.AddRange(addrPrefix);
-                listBytes.Add(Version);
-                listBytes.Add(Threshold);
-                for (var i = 0; i < Subsigs.Length; i++)
+                fixed (void* a = AddressPrefix)
+                    listBytes.AddRange(a, AddressPrefix.Length);
+            }
+            listBytes.Add(Version);
+            listBytes.Add(Threshold);
+            for (var i = 0; i < Subsigs.Length; i++)
+            {
+                var pubKey = Subsigs[i].PublicKey;
+                unsafe
                 {
-                    using var subsigPk = Subsigs[i].PublicKey.ToNativeArray(Allocator.Temp);
-                    listBytes.AddRange(subsigPk);
+                    listBytes.AddRange(pubKey.GetUnsafePtr(), pubKey.Length);
                 }
-                var bytes = new NativeByteArray(listBytes.AsArray());
-                Sha512.Hash256Truncated(bytes).CopyTo(ref result);
             }
+            var bytes = new NativeByteArray(listBytes.AsArray());
+            Sha512.Hash256Truncated(bytes).CopyTo(ref result);
             return result;
         }
 
diff --git a/Runtime/CareBoo.AlgoSdk/Transactions/TransactionGroup.cs b/Runtime/CareBoo.AlgoSdk/Transactions/TransactionGroup.cs
index e9af4e4b0..07101443b 100644
--- a/Runtime/CareBoo.AlgoSdk/Transactions/TransactionGroup.cs
+++ b/Runtime/CareBoo.AlgoSdk/Transactions/TransactionGroup.cs
@@ -81,8 +81,8 @@ public bool Equals(TransactionGroup other)
         /// <returns>A <see cref="TransactionId"/></returns>
         public TransactionId GetId()
         {
-            using var msgpack = AlgoApiSerializer.SerializeMessagePack(this, Allocator.Temp);
-            var data = new NativeByteArray(IdPrefix.Length + msgpack.Length, Allocator.Temp);
+            using var msgpack = AlgoApiSerializer.SerializeMessagePack(this, Allocator.Persistent);
+            var data = new NativeByteArray(IdPrefix.Length + msgpack.Length, Allocator.Persistent);
             try
             {
                 data.CopyFrom(IdPrefix, 0);
diff --git a/Runtime/CareBoo.AlgoSdk/Util/Hex.cs b/Runtime/CareBoo.AlgoSdk/Util/Hex.cs
index 0c02eee71..5ba86942b 100644
--- a/Runtime/CareBoo.AlgoSdk/Util/Hex.cs
+++ b/Runtime/CareBoo.AlgoSdk/Util/Hex.cs
@@ -13,6 +13,11 @@ public partial struct Hex : IEquatable<Hex>
 
         public byte[] Data => data;
 
+        public Hex(byte[] data)
+        {
+            this.data = data;
+        }
+
         public override string ToString()
         {
             if (data == null)
diff --git a/Samples~/WalletConnect/WalletConnectManager.cs b/Samples~/WalletConnect/WalletConnectManager.cs
index 97b8c1ded..c2b41c6da 100644
--- a/Samples~/WalletConnect/WalletConnectManager.cs
+++ b/Samples~/WalletConnect/WalletConnectManager.cs
@@ -44,10 +44,10 @@ void OnGUI()
         GUI.skin.textField.alignment = TextAnchor.MiddleCenter;
         GUILayout.BeginArea(new Rect(0, 0, Screen.width, Screen.height), new GUIStyle(GUI.skin.box) { normal = new GUIStyleState() { background = GUI.skin.button.normal.background } });
         GUILayout.FlexibleSpace();
-        var status = session?.ConnectionStatus ?? AlgorandWalletConnectSession.Status.Unknown;
+        var status = session?.ConnectionStatus ?? SessionStatus.None;
         GUILayout.Label($"WalletConnect Connection Status: {status}");
         GUILayout.Space(20);
-        if (status == AlgorandWalletConnectSession.Status.RequestingConnection)
+        if (status == SessionStatus.RequestingWalletConnection)
         {
             var supportedWallets = WalletRegistry.SupportedWalletsForCurrentPlatform;
             if (shouldLaunchApp && supportedWallets.Length > 0)
@@ -78,7 +78,7 @@ void OnGUI()
             }
         }
 
-        if (status == AlgorandWalletConnectSession.Status.Connected)
+        if (status == SessionStatus.WalletConnected)
         {
             GUILayout.Label($"Connected Account: {session.Accounts[0]}");
             GUILayout.Space(5);
@@ -105,9 +105,10 @@ void OnGUI()
     async UniTaskVoid StartWalletConnect()
     {
         session = new AlgorandWalletConnectSession(DappMeta, BridgeUrl);
-        handshake = await session.StartConnection();
+        await session.Connect();
+        handshake = session.RequestWalletConnection();
         qrCode = handshake.ToQrCodeTexture();
-        await session.WaitForConnectionApproval();
+        await session.WaitForWalletApproval();
         Debug.Log($"accounts:\n{AlgoApiSerializer.SerializeJson(session.Accounts)}");
     }
 
@@ -115,8 +116,8 @@ async UniTaskVoid PollForBalance()
     {
         while (true)
         {
-            var status = session?.ConnectionStatus ?? AlgorandWalletConnectSession.Status.Unknown;
-            if (status == AlgorandWalletConnectSession.Status.Connected)
+            var status = session?.ConnectionStatus ?? SessionStatus.None;
+            if (status == SessionStatus.WalletConnected)
             {
                 var (err, response) = await indexer.LookupAccountByID(session.Accounts[0]);
                 if (err) Debug.LogError(err);
@@ -164,7 +165,7 @@ async UniTaskVoid TestTransaction()
             return;
         }
         txnStatus = TransactionStatus.AwaitingConfirmation;
-        using (var signedTxnData = new NativeArray<byte>(signedTxns[0], Allocator.Temp))
+        using (var signedTxnData = new NativeArray<byte>(signedTxns[0], Allocator.Persistent))
         {
             var signedTxn = AlgoApiSerializer.DeserializeMessagePack<SignedTxn>(signedTxnData);
             Debug.Log($"Got signed transactions:\n{AlgoApiSerializer.SerializeJson(signedTxns)}");
diff --git a/Tests/Runtime/CareBoo.AlgoSdk.Crypto.Tests/Ed25519Test.cs b/Tests/Runtime/CareBoo.AlgoSdk.Crypto.Tests/Ed25519Test.cs
index 97f41609c..872f8be4e 100644
--- a/Tests/Runtime/CareBoo.AlgoSdk.Crypto.Tests/Ed25519Test.cs
+++ b/Tests/Runtime/CareBoo.AlgoSdk.Crypto.Tests/Ed25519Test.cs
@@ -25,7 +25,7 @@ NativeByteArray GetMessageBytes(string msg, Allocator allocator)
     [Test]
     public void GenerateKeyPairGivesValidKeys()
     {
-        using var msg = GetMessageBytes(Message, Allocator.Temp);
+        using var msg = GetMessageBytes(Message, Allocator.Persistent);
         foreach (var (seedStr, expectedPk, expectedSig) in ValidResults)
         {
             var seed = ByteArray.FromBase64<Seed>(seedStr);
@@ -40,7 +40,7 @@ public void GenerateKeyPairGivesValidKeys()
     [Test]
     public void SigningMessageThenVerifyingReturnsTrue()
     {
-        using var msg = GetMessageBytes($"some_random_message{UnityEngine.Random.Range(0, int.MaxValue)}", Allocator.Temp);
+        using var msg = GetMessageBytes($"some_random_message{UnityEngine.Random.Range(0, int.MaxValue)}", Allocator.Persistent);
         var seed = AlgoSdk.Crypto.Random.Bytes<Seed>();
         using var kp = seed.ToKeyPair();
         var sig = kp.SecretKey.Sign(msg);
diff --git a/Tests/Runtime/CareBoo.AlgoSdk.Json.Tests/JsonReaderTest.cs b/Tests/Runtime/CareBoo.AlgoSdk.Json.Tests/JsonReaderTest.cs
index 919f8ac90..9a27a5d7c 100644
--- a/Tests/Runtime/CareBoo.AlgoSdk.Json.Tests/JsonReaderTest.cs
+++ b/Tests/Runtime/CareBoo.AlgoSdk.Json.Tests/JsonReaderTest.cs
@@ -22,7 +22,7 @@ public void ValidJsonShouldBeParsedWithoutErrs()
     {
         using var jsonText = new NativeText(
             validJson,
-            Allocator.Temp);
+            Allocator.Persistent);
         var reader = new JsonReader(jsonText);
         Assert.AreEqual(JsonToken.ObjectBegin, reader.Read());
         Assert.AreEqual(JsonToken.String, reader.Peek());
diff --git a/Tests/Runtime/CareBoo.AlgoSdk.LowLevel.Tests/NativeArrayUtilTest.cs b/Tests/Runtime/CareBoo.AlgoSdk.LowLevel.Tests/NativeArrayUtilTest.cs
index 8ebaa5706..875d37ec9 100644
--- a/Tests/Runtime/CareBoo.AlgoSdk.LowLevel.Tests/NativeArrayUtilTest.cs
+++ b/Tests/Runtime/CareBoo.AlgoSdk.LowLevel.Tests/NativeArrayUtilTest.cs
@@ -10,7 +10,7 @@ public void ConcatAllShouldReturnArrayWithConcattedBytes()
     {
         var input = RandomBytes();
         var expected = input.SelectMany(b => b).ToArray();
-        using var actualNative = NativeArrayUtil.ConcatAll(input, Allocator.Temp);
+        using var actualNative = NativeArrayUtil.ConcatAll(input, Allocator.Persistent);
         var actual = actualNative.ToArray();
         Assert.True(expected.SequenceEqual(actual));
     }
diff --git a/Tests/Runtime/CareBoo.AlgoSdk.Tests/Abi/Types/TupleTest.cs b/Tests/Runtime/CareBoo.AlgoSdk.Tests/Abi/Types/TupleTest.cs
index f2f0904f9..17b276e8b 100644
--- a/Tests/Runtime/CareBoo.AlgoSdk.Tests/Abi/Types/TupleTest.cs
+++ b/Tests/Runtime/CareBoo.AlgoSdk.Tests/Abi/Types/TupleTest.cs
@@ -9,7 +9,7 @@ public class TupleTest
     [Test]
     public void EncodeShouldPackUpTo8BitsIntoASingleByte()
     {
-        using var references = new AbiReferences(Allocator.Temp);
+        using var references = new AbiReferences(Allocator.Persistent);
         var expected = new byte[] { 0xff, 0x00 };
         var bools = Args.Add(Boolean.True)
             .Add(Boolean.True)
@@ -24,7 +24,7 @@ public void EncodeShouldPackUpTo8BitsIntoASingleByte()
         var tuple = Tuple.Of(bools);
         var typeStr = string.Join(",", Enumerable.Range(0, 9).Select(_ => "bool"));
         typeStr = $"({typeStr})";
-        using var actual = tuple.Encode(AbiType.Parse(typeStr), references, Allocator.Temp);
+        using var actual = tuple.Encode(AbiType.Parse(typeStr), references, Allocator.Persistent);
 
         Assert.AreEqual(expected.Length, actual.Length);
 
diff --git a/Tests/Runtime/CareBoo.AlgoSdk.Tests/Abi/Types/UfixedNxMTest.cs b/Tests/Runtime/CareBoo.AlgoSdk.Tests/Abi/Types/UfixedNxMTest.cs
index ef4b4f975..2374ca4c4 100644
--- a/Tests/Runtime/CareBoo.AlgoSdk.Tests/Abi/Types/UfixedNxMTest.cs
+++ b/Tests/Runtime/CareBoo.AlgoSdk.Tests/Abi/Types/UfixedNxMTest.cs
@@ -10,11 +10,11 @@ public void ChangingPrecisionToAndFromValueShouldPreserveValue()
     {
         var value = new UIntN(300);
         byte precision = 2;
-        using var references = new AbiReferences(Allocator.Temp);
+        using var references = new AbiReferences(Allocator.Persistent);
         var expected = new UFixedNxM(value, precision);
         var actual = expected.As(AbiType.UFixedNxM(16, 1));
-        var expectedEncoded = expected.Encode(AbiType.UFixedNxM(16, 2), references, Allocator.Temp);
-        var actualEncoded = actual.Encode(AbiType.UFixedNxM(16, 2), references, Allocator.Temp);
+        var expectedEncoded = expected.Encode(AbiType.UFixedNxM(16, 2), references, Allocator.Persistent);
+        var actualEncoded = actual.Encode(AbiType.UFixedNxM(16, 2), references, Allocator.Persistent);
 
         Assert.AreEqual(expectedEncoded.Length, actualEncoded.Length);
         for (var i = 0; i < expectedEncoded.Length; i++)
diff --git a/Tests/Runtime/CareBoo.AlgoSdk.Tests/Abi/Types/UintNTest.cs b/Tests/Runtime/CareBoo.AlgoSdk.Tests/Abi/Types/UintNTest.cs
index 04097617e..9f47b7162 100644
--- a/Tests/Runtime/CareBoo.AlgoSdk.Tests/Abi/Types/UintNTest.cs
+++ b/Tests/Runtime/CareBoo.AlgoSdk.Tests/Abi/Types/UintNTest.cs
@@ -1,4 +1,4 @@
-using AlgoSdk;
+using AlgoSdk;
 using AlgoSdk.Abi;
 using NUnit.Framework;
 using Unity.Collections;
@@ -10,9 +10,9 @@ public class UintNTest
     public void Uint64EncodingShouldEqualUintNOf64Encoding()
     {
         ulong value = 123456;
-        using var references = new AbiReferences(Allocator.Temp);
-        using var expected = new UIntN(value).Encode(AbiType.UIntN(64), references, Allocator.Temp);
-        using var actual = new UInt64(value).Encode(AbiType.UIntN(64), references, Allocator.Temp);
+        using var references = new AbiReferences(Allocator.Persistent);
+        using var expected = new UIntN(value).Encode(AbiType.UIntN(64), references, Allocator.Persistent);
+        using var actual = new UInt64(value).Encode(AbiType.UIntN(64), references, Allocator.Persistent);
 
         Assert.AreEqual(expected.Length, actual.Length);
         for (var i = 0; i < expected.Length; i++)
diff --git a/Tests/Runtime/CareBoo.AlgoSdk.Tests/BlockTest.cs b/Tests/Runtime/CareBoo.AlgoSdk.Tests/BlockTest.cs
index 1f9b38cd5..6b9975717 100644
--- a/Tests/Runtime/CareBoo.AlgoSdk.Tests/BlockTest.cs
+++ b/Tests/Runtime/CareBoo.AlgoSdk.Tests/BlockTest.cs
@@ -14,7 +14,7 @@ public class BlockTest
     [Test, TestMustExpectAllLogs]
     public void DeserializingBlockFromMessagePackShouldThrowNoLogs([ValueSource(nameof(blockMsgPackCases))] string blockMsgPackBase64)
     {
-        using var bytes = new NativeArray<byte>(System.Convert.FromBase64String(blockMsgPackBase64), Allocator.Temp);
+        using var bytes = new NativeArray<byte>(System.Convert.FromBase64String(blockMsgPackBase64), Allocator.Persistent);
         AlgoApiSerializer.DeserializeMessagePack<BlockResponse>(bytes);
     }
 
diff --git a/Tests/Runtime/CareBoo.AlgoSdk.Tests/PendingTransactionTest.cs b/Tests/Runtime/CareBoo.AlgoSdk.Tests/PendingTransactionTest.cs
index d828b20c0..8c62cbc20 100644
--- a/Tests/Runtime/CareBoo.AlgoSdk.Tests/PendingTransactionTest.cs
+++ b/Tests/Runtime/CareBoo.AlgoSdk.Tests/PendingTransactionTest.cs
@@ -16,7 +16,7 @@ public class PendingTransactionTest
         [ValueSource(nameof(msgPackCases))] string msgPackBase64
     )
     {
-        using var bytes = new NativeArray<byte>(System.Convert.FromBase64String(msgPackBase64), Allocator.Temp);
+        using var bytes = new NativeArray<byte>(System.Convert.FromBase64String(msgPackBase64), Allocator.Persistent);
         AlgoApiSerializer.DeserializeMessagePack<PendingTransactionResponse>(bytes);
     }
 }
diff --git a/Tests/Runtime/CareBoo.AlgoSdk.Tests/Transaction/Atomic/TxnIndicesTest.cs b/Tests/Runtime/CareBoo.AlgoSdk.Tests/Transaction/Atomic/TxnIndicesTest.cs
index 3653db5f5..945c6e3d5 100644
--- a/Tests/Runtime/CareBoo.AlgoSdk.Tests/Transaction/Atomic/TxnIndicesTest.cs
+++ b/Tests/Runtime/CareBoo.AlgoSdk.Tests/Transaction/Atomic/TxnIndicesTest.cs
@@ -45,4 +45,14 @@ public void EnumeratorShouldEnumerateThroughGivenIndicesInOrder()
         }
         Assert.AreEqual(indices.Length, i);
     }
+
+    [Test]
+    [TestCase(1, true)]
+    [TestCase(2, false)]
+    public void ContainsIndexShouldReturnIfIndexInIndices(int index, bool expected)
+    {
+        var indices = TxnIndices.Select(1, 3, 4, 5, 6, 7, 9);
+        var actual = indices.ContainsIndex(index);
+        Assert.AreEqual(expected, actual);
+    }
 }
diff --git a/Unity.AlgoSdk.Package/Assets/TestSerialization/.gitignore b/Unity.AlgoSdk.Package/Assets/TestSerialization/.gitignore
new file mode 100644
index 000000000..72e8ffc0d
--- /dev/null
+++ b/Unity.AlgoSdk.Package/Assets/TestSerialization/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/Unity.AlgoSdk.Package/Assets/TestSerialization/TestComponent.cs b/Unity.AlgoSdk.Package/Assets/TestSerialization/TestComponent.cs
deleted file mode 100644
index d1add32b1..000000000
--- a/Unity.AlgoSdk.Package/Assets/TestSerialization/TestComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using AlgoSdk.Abi;
-using UnityEngine;
-
-public class TestComponent : MonoBehaviour
-{
-    public Method methodAbi;
-}
diff --git a/Unity.AlgoSdk.Package/Assets/TestSerialization/TestSerialization.unity b/Unity.AlgoSdk.Package/Assets/TestSerialization/TestSerialization.unity
deleted file mode 100644
index 788e09ccd..000000000
--- a/Unity.AlgoSdk.Package/Assets/TestSerialization/TestSerialization.unity
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:314e17bc4de419f4e309466b51a9a18ae9d20752cdef5a24cb9a1ec103221b30
-size 10120
diff --git a/Unity.AlgoSdk.Package/ProjectSettings/ProjectVersion.txt b/Unity.AlgoSdk.Package/ProjectSettings/ProjectVersion.txt
index fbb7c0b09..501a25e53 100755
--- a/Unity.AlgoSdk.Package/ProjectSettings/ProjectVersion.txt
+++ b/Unity.AlgoSdk.Package/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.3f1
-m_EditorVersionWithRevision: 2021.3.3f1 (af2e63e8f9bd)
+m_EditorVersion: 2021.3.4f1
+m_EditorVersionWithRevision: 2021.3.4f1 (cb45f9cae8b7)