Include admins in Wallet.GetAllActiveSigners

Author: 0xFirekeeper

Assets/Tests/SmartWalletTests.cs

@@ -95,6 +95,24 @@ public IEnumerator CreateSessionKey_WithValidSignerCheck_Success()
             }
         }
         Assert.IsTrue(exists);
+
+        // Also check if admin is in here
+        exists = false;
+        var adminTask = ThirdwebManager.Instance.SDK.Wallet.GetSignerAddress();
+        yield return new WaitUntil(() => adminTask.IsCompleted);
+        Assert.IsTrue(adminTask.IsCompletedSuccessfully);
+        Assert.IsNotNull(adminTask.Result);
+        var admin = adminTask.Result;
+        foreach (var signer in getAllActiveSignersTask.Result)
+        {
+            if (signer.signer == admin)
+            {
+                exists = true;
+                Assert.IsTrue(signer.isAdmin);
+                break;
+            }
+        }
+        Assert.IsTrue(exists);
     }
 
     [UnityTest]

Assets/Thirdweb/Core/Scripts/Wallet.cs

@@ -816,12 +816,33 @@ public async Task<List<SignerWithPermissions>> GetAllActiveSigners()
                     throw new UnityException("This functionality is only available for SmartWallets.");
 
                 string address = await GetAddress();
-                var raw = await TransactionManager.ThirdwebRead<Contracts.Account.ContractDefinition.GetAllActiveSignersFunction, Contracts.Account.ContractDefinition.GetAllActiveSignersOutputDTO>(
+
+                var rawSigners = await TransactionManager.ThirdwebRead<
+                    Contracts.Account.ContractDefinition.GetAllActiveSignersFunction,
+                    Contracts.Account.ContractDefinition.GetAllActiveSignersOutputDTO
+                >(address, new Contracts.Account.ContractDefinition.GetAllActiveSignersFunction());
+                var allSigners = rawSigners.Signers;
+
+                var rawAdmins = await TransactionManager.ThirdwebRead<Contracts.Account.ContractDefinition.GetAllAdminsFunction, Contracts.Account.ContractDefinition.GetAllAdminsOutputDTO>(
                     address,
-                    new Contracts.Account.ContractDefinition.GetAllActiveSignersFunction()
+                    new Contracts.Account.ContractDefinition.GetAllAdminsFunction()
                 );
+                foreach (var admin in rawAdmins.ReturnValue1)
+                {
+                    allSigners.Add(
+                        new Contracts.Account.ContractDefinition.SignerPermissions()
+                        {
+                            Signer = admin,
+                            ApprovedTargets = new List<string>() { Utils.AddressZero },
+                            NativeTokenLimitPerTransaction = BigInteger.Zero,
+                            StartTimestamp = 0,
+                            EndTimestamp = Utils.GetUnixTimeStampIn10Years()
+                        }
+                    );
+                }
+
                 var signers = new List<SignerWithPermissions>();
-                foreach (var rawSigner in raw.Signers)
+                foreach (var rawSigner in allSigners)
                 {
                     bool? isAdmin;
                     try