Storage/AA api key support (#92)

Author: 0xFirekeeper

Assets/Thirdweb/Core/Scripts/AccountAbstraction/Core/BundlerClient.cs

@@ -48,7 +48,12 @@ private static async Task<RpcResponseMessage> BundlerRequest(string url, string
 
                 var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, url);
                 httpRequestMessage.Content = new StringContent(requestMessageJson, System.Text.Encoding.UTF8, "application/json");
-                httpRequestMessage.Headers.Add("x-api-key", apiKey);
+                if (new Uri(url).Host.EndsWith(".thirdweb.com"))
+                {
+                    httpRequestMessage.Headers.Add("x-client-id", ThirdwebManager.Instance.SDK.session.Options.clientId);
+                    if (!Utils.IsWebGLBuild())
+                        httpRequestMessage.Headers.Add("x-bundle-id", Utils.GetBundleId());
+                }
 
                 var httpResponse = await client.SendAsync(httpRequestMessage);
 

Assets/Thirdweb/Core/Scripts/AccountAbstraction/Core/SmartWallet.cs

@@ -46,7 +46,6 @@ public SmartWallet(Web3 personalWeb3, ThirdwebSDK.SmartWalletConfig config)
             Config = new ThirdwebSDK.SmartWalletConfig()
             {
                 factoryAddress = config.factoryAddress,
-                thirdwebApiKey = config.thirdwebApiKey,
                 gasless = config.gasless,
                 bundlerUrl = string.IsNullOrEmpty(config.bundlerUrl) ? $"https://{ThirdwebManager.Instance.SDK.session.CurrentChainData.chainName}.bundler.thirdweb.com" : config.bundlerUrl,
                 paymasterUrl = string.IsNullOrEmpty(config.paymasterUrl) ? $"https://{ThirdwebManager.Instance.SDK.session.CurrentChainData.chainName}.bundler.thirdweb.com" : config.paymasterUrl,
@@ -123,6 +122,8 @@ internal async Task<RpcResponseMessage> Request(RpcRequestMessage requestMessage
 
         private async Task<RpcResponseMessage> CreateUserOpAndSend(RpcRequestMessage requestMessage)
         {
+            string apiKey = ThirdwebManager.Instance.SDK.session.Options.clientId;
+
             // Deserialize the transaction input from the request message
 
             var paramList = JsonConvert.DeserializeObject<List<object>>(JsonConvert.SerializeObject(requestMessage.RawParameters));
@@ -165,7 +166,7 @@ private async Task<RpcResponseMessage> CreateUserOpAndSend(RpcRequestMessage req
 
             // Update paymaster data if any
 
-            partialUserOp.PaymasterAndData = await GetPaymasterAndData(requestMessage.Id, partialUserOpHexified);
+            partialUserOp.PaymasterAndData = await GetPaymasterAndData(requestMessage.Id, partialUserOpHexified, apiKey);
 
             // Hash, sign and encode the user operation
 
@@ -176,15 +177,15 @@ private async Task<RpcResponseMessage> CreateUserOpAndSend(RpcRequestMessage req
 
             Debug.Log("Valid UserOp: " + JsonConvert.SerializeObject(partialUserOp));
             Debug.Log("Valid Encoded UserOp: " + JsonConvert.SerializeObject(partialUserOpHexified));
-            var userOpHash = await BundlerClient.EthSendUserOperation(Config.bundlerUrl, Config.thirdwebApiKey, requestMessage.Id, partialUserOpHexified, Config.entryPointAddress);
+            var userOpHash = await BundlerClient.EthSendUserOperation(Config.bundlerUrl, apiKey, requestMessage.Id, partialUserOpHexified, Config.entryPointAddress);
             Debug.Log("UserOp Hash: " + userOpHash);
 
             // Wait for the transaction to be mined
 
             string txHash = null;
             while (txHash == null && Application.isPlaying)
             {
-                var getUserOpResponse = await BundlerClient.EthGetUserOperationByHash(Config.bundlerUrl, Config.thirdwebApiKey, requestMessage.Id, userOpHash);
+                var getUserOpResponse = await BundlerClient.EthGetUserOperationByHash(Config.bundlerUrl, apiKey, requestMessage.Id, userOpHash);
                 txHash = getUserOpResponse?.transactionHash;
                 await new WaitForSecondsRealtime(5f);
             }
@@ -215,10 +216,10 @@ private async Task<BigInteger> GetNonce()
             return nonce.ReturnValue1;
         }
 
-        private async Task<byte[]> GetPaymasterAndData(object requestId, UserOperationHexified userOp)
+        private async Task<byte[]> GetPaymasterAndData(object requestId, UserOperationHexified userOp, string apiKey)
         {
             return Config.gasless
-                ? (await BundlerClient.PMSponsorUserOperation(Config.paymasterUrl, Config.thirdwebApiKey, requestId, userOp, Config.entryPointAddress)).paymasterAndData.HexStringToByteArray()
+                ? (await BundlerClient.PMSponsorUserOperation(Config.paymasterUrl, apiKey, requestId, userOp, Config.entryPointAddress)).paymasterAndData.HexStringToByteArray()
                 : new byte[] { };
         }
     }

Assets/Thirdweb/Core/Scripts/Storage.cs

@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace Thirdweb
+{
+    public interface IStorageDownloader
+    {
+        Task<T> DownloadText<T>(string textURI);
+        Task<Sprite> DownloadImage(string imageURI);
+    }
+}

Assets/Thirdweb/Core/Scripts/Storage.meta

@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+
+namespace Thirdweb
+{
+    public interface IStorageUploader
+    {
+        Task<IPFSUploadResult> UploadText(string text);
+        Task<IPFSUploadResult> UploadFromPath(string path);
+    }
+}

Assets/Thirdweb/Core/Scripts/Storage/IStorageDownloader.cs

@@ -0,0 +1,55 @@
+using UnityEngine;
+using System.Threading.Tasks;
+
+namespace Thirdweb
+{
+    public class Storage
+    {
+        public string IPFSGateway { get; private set; }
+        public string ClientId { get; private set; }
+
+        private IStorageUploader uploader;
+        private IStorageDownloader downloader;
+
+        private const string FALLBACK_IPFS_GATEWAY = "https://cloudflare-ipfs.com/ipfs/";
+
+        public Storage(ThirdwebSDK.StorageOptions? storageOptions, string clientId = null)
+        {
+            this.ClientId = clientId;
+
+            string thirdwebIpfsGateway = $"https://{ClientId}.ipfscdn.io/ipfs/";
+            if (storageOptions == null)
+            {
+                this.IPFSGateway = ClientId != null ? thirdwebIpfsGateway : FALLBACK_IPFS_GATEWAY;
+                this.uploader = new StorageUploader();
+                this.downloader = new StorageDownloader();
+            }
+            else
+            {
+                this.IPFSGateway = string.IsNullOrEmpty(storageOptions?.ipfsGatewayUrl) ? (ClientId != null ? thirdwebIpfsGateway : FALLBACK_IPFS_GATEWAY) : storageOptions?.ipfsGatewayUrl;
+                this.uploader = storageOptions.Value.uploaderOverride ?? new StorageUploader();
+                this.downloader = storageOptions.Value.downloaderOverride ?? new StorageDownloader();
+            }
+        }
+
+        public async Task<IPFSUploadResult> UploadText(string text)
+        {
+            return await uploader.UploadText(text);
+        }
+
+        public async Task<IPFSUploadResult> UploadFromPath(string path)
+        {
+            return await uploader.UploadFromPath(path);
+        }
+
+        public async Task<T> DownloadText<T>(string textURI)
+        {
+            return await downloader.DownloadText<T>(textURI);
+        }
+
+        public async Task<Sprite> DownloadImage(string imageURI)
+        {
+            return await downloader.DownloadImage(imageURI);
+        }
+    }
+}