Issue_191

MoralisWeb3 · Oct 7, 2022 · de9ff9f · de9ff9f
1 parent 4fcf456
commit de9ff9f
Show file tree

Hide file tree

Showing 26 changed files with 303 additions and 112 deletions.
diff --git a/.vs/MoralisDotNetSdk/DesignTimeBuild/.dtbcache.v2 b/.vs/MoralisDotNetSdk/DesignTimeBuild/.dtbcache.v2
diff --git a/.vs/MoralisDotNetSdk/v17/.futdcache.v1 b/.vs/MoralisDotNetSdk/v17/.futdcache.v1
diff --git a/Moralis.StreamsApi.Integrated.Tests/StreamsTests.cs b/Moralis.StreamsApi.Integrated.Tests/StreamsTests.cs
@@ -1,5 +1,4 @@
-using Moralis.Abi;
-using Moralis.StreamsApi.Interfaces;
+using Moralis.StreamsApi.Interfaces;
 using Moralis.StreamsApi.Models;
 
 namespace Moralis.StreamsApi.Integrated.Tests
@@ -97,18 +96,25 @@ private async Task<string> BindStream(IStreamsApiClient streamsApi)
 
             try
             {
+                List<AbiItem> functionAbis = new List<AbiItem>();
+                functionAbis.Add(AbiTools.FunctionAbiFromJson("grantRole", GetAbiJson()));
+
                 StreamBindingDto dto = new StreamBindingDto()
                 {
-                    Address = "0x35ba4825204dcE15C7147eA89b31178a00750f81",
-                    ChainIds = new List<string>(new string[] { "0x1" }),
-                    IncludeNativeTxs = true,
-                    Abi = AbiTools.FunctionAbiFromJson("grantRole", GetAbiJson()),
+                    WebHookUrl = "https://davesmoralisazurefunctions.azurewebsites.net/api/RawStreamsHandler?code=BT-PQKI8vc4hA_EieKWuKgVq_GSLgo9y2cqWD6K0g_jOAzFu46pOTA==",
                     Description = "Bob wuz ere",
-                    TokenAddress = "0x62441037E626D6EdeC892838a06DF3C9D43ED482",
-                    Topic = "grantRole",
-                    Type = "contract",
                     Tag = "my first stream",
-                    WebHookUrl = "https://davesmoralisazurefunctions.azurewebsites.net/api/RawStreamsHandler?code=BT-PQKI8vc4hA_EieKWuKgVq_GSLgo9y2cqWD6K0g_jOAzFu46pOTA=="
+                    Topic = new List<string>( new string[]{ "grantRole" }),
+                    //Address = "0x35ba4825204dcE15C7147eA89b31178a00750f81",
+                    AllAddresses = true,
+                    IncludeNativeTxs = true,
+                    IncludeContractLogs = true,
+                    IncludeInternalTxs = true,
+                    Abi = functionAbis,
+                    //ChainIds = new List<string>(new string[] { "0x1" }),
+                    //TokenAddress = "0x62441037E626D6EdeC892838a06DF3C9D43ED482",
+                    //Type = "contract",
+
                 };
 
                 StreamBindingDto resp = await streamsApi.StreamsEndpoint.BindStream(dto);
@@ -187,19 +193,34 @@ private async Task<bool> UpdateStream(IStreamsApiClient streamsApi, string strea
 
             try
             {
+                List<AbiItem> functionAbis = new List<AbiItem>();
+                functionAbis.Add(AbiTools.FunctionAbiFromJson("grantRole", GetAbiJson()));
+
                 StreamBindingDto dto = new StreamBindingDto()
                 {
-                    Address = "0x35ba4825204dcE15C7147eA89b31178a00750f81",
-                    ChainIds = new List<string>(new string[] { "0x1" }),
-                    IncludeNativeTxs = true,
-                    Abi = AbiTools.FunctionAbiFromJson("grantRole", GetAbiJson()),
-                    Description = "OOP",
-                    TokenAddress = "0x62441037E626D6EdeC892838a06DF3C9D43ED482",
-                    Topic = "grantRole",
-                    Type = "contract",
-                    Tag = "my first stream",
                     WebHookUrl = "https://davesmoralisazurefunctions.azurewebsites.net/api/RawStreamsHandler?code=BT-PQKI8vc4hA_EieKWuKgVq_GSLgo9y2cqWD6K0g_jOAzFu46pOTA==",
-                    StreamId = streamId
+                    Description = "Bob wuz ere",
+                    Tag = "oop",
+                    Topic = new List<string>(new string[] { "grantRole" }),
+                    //Address = "0x35ba4825204dcE15C7147eA89b31178a00750f81",
+                    AllAddresses = true,
+                    IncludeNativeTxs = true,
+                    IncludeContractLogs = true,
+                    IncludeInternalTxs = true,
+                    Abi = functionAbis,
+                    ChainIds = new List<string>(new string[] { "0x1" })
+
+                    //Address = "0x35ba4825204dcE15C7147eA89b31178a00750f81",
+                    //ChainIds = new List<string>(new string[] { "0x1" }),
+                    //IncludeNativeTxs = true,
+                    //Abi = AbiTools.FunctionAbiFromJson("grantRole", GetAbiJson()),
+                    //Description = "OOP",
+                    //TokenAddress = "0x62441037E626D6EdeC892838a06DF3C9D43ED482",
+                    //Topic = "grantRole",
+                    //Type = "contract",
+                    //Tag = "my first stream",
+                    //WebHookUrl = "https://davesmoralisazurefunctions.azurewebsites.net/api/RawStreamsHandler?code=BT-PQKI8vc4hA_EieKWuKgVq_GSLgo9y2cqWD6K0g_jOAzFu46pOTA==",
+                    //StreamId = streamId
                 };
 
                 StreamBindingDto resp = await streamsApi.StreamsEndpoint.UpdateStream(dto);

diff --git a/MoralisDotNet/Moralis.StreamsApi/AbiTools.cs b/MoralisDotNet/Moralis.StreamsApi/AbiTools.cs
@@ -0,0 +1,35 @@
+using Moralis.StreamsApi.Models;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Moralis.StreamsApi
+{
+    public class AbiTools
+    {
+        public static List<AbiItem> JsonToStreamsAbi(string json)
+        {
+            List<AbiItem> abi = JsonConvert.DeserializeObject<List<AbiItem>>(json);
+
+            return abi;
+        }
+
+        public static AbiItem FunctionAbiFromJson(string functionaName, string json)
+        {
+            AbiItem func = null;
+            List<AbiItem> abi = JsonToStreamsAbi(json);
+
+            foreach (AbiItem item in abi)
+            {
+                if (!String.IsNullOrEmpty(item.Name) && functionaName.ToLower().Equals(item.Name.ToLower()))
+                {
+                    func = item;
+                    break;
+                }
+            }
+
+            return func;
+        }
+    }
+}
diff --git a/MoralisDotNet/Moralis.StreamsApi/Api/StreamsApi.cs b/MoralisDotNet/Moralis.StreamsApi/Api/StreamsApi.cs
@@ -388,7 +388,7 @@ public async Task<AddressResponse> AddAddressToStream(string streamId, StreamsAd
 		/// <param name="streamId"></param>
 		/// <param name="address"></param>
 		/// <returns>AddressResponse</returns>
-		public async Task<AddressResponse> RemoveAddressFromStream(string streamId, StreamsAddressRequest address)
+		public async Task<DeleteAddressResponse> RemoveAddressFromStream(string streamId, StreamsAddressRequest address)
 		{
 			// Verify stream Id is set.
 			if (string.IsNullOrEmpty(streamId)) throw new ApiException(400, "Missing required parameter 'streamId' when calling RemoveAddressFromStream");
@@ -412,7 +412,7 @@ public async Task<AddressResponse> RemoveAddressFromStream(string streamId, Stre
 			{
 				List<Parameter> headers = ApiClient.ResponHeadersToParameterList(response.Headers);
 
-				AddressResponse resp = (AddressResponse)ApiClient.Deserialize(data, typeof(AddressResponse), headers);
+				DeleteAddressResponse resp = (DeleteAddressResponse)ApiClient.Deserialize(data, typeof(DeleteAddressResponse), headers);
 				return resp;
 			}
 			else

diff --git a/MoralisDotNet/Moralis.StreamsApi/Interfaces/IStreamsApi.cs b/MoralisDotNet/Moralis.StreamsApi/Interfaces/IStreamsApi.cs
@@ -74,7 +74,7 @@ public interface IStreamsApi
 		/// <param name="streamId"></param>
 		/// <param name="address"></param>
 		/// <returns>AddressResponse</returns>
-		public Task<AddressResponse> RemoveAddressFromStream(string streamId, StreamsAddressRequest address);
+		public Task<DeleteAddressResponse> RemoveAddressFromStream(string streamId, StreamsAddressRequest address);
 
 	}
 

diff --git a/MoralisDotNet/Moralis.StreamsApi/Models/AbiExtensions.cs b/MoralisDotNet/Moralis.StreamsApi/Models/AbiExtensions.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Moralis.Moralis.StreamsApi.Models
+{
+    public static class AbiExtensions
+    {
+    }
+}
diff --git a/MoralisDotNet/Moralis.StreamsApi/Models/AbiItem.cs b/MoralisDotNet/Moralis.StreamsApi/Models/AbiItem.cs
@@ -9,13 +9,6 @@ namespace Moralis.StreamsApi.Models
 {
     public class AbiItem
     {
-        [DataMember(Name = "stateMutability", EmitDefaultValue = false)]
-        [JsonProperty(PropertyName = "stateMutability")]
-        private string _stateMutability = StateMutabilityTypes.Pure.ToString();
-
-        [DataMember(Name = "type", EmitDefaultValue = false)]
-        [JsonProperty(PropertyName = "type")]
-        private string _abiType = AbiItemTypes.Event.ToString();
 
         [DataMember(Name = "anonymous", EmitDefaultValue = false)]
         [JsonProperty(PropertyName = "anonymous")]
@@ -29,6 +22,10 @@ public class AbiItem
         [JsonProperty(PropertyName = "inputs")]
         public List<AbiInput> Inputs { get; set; }
 
+        [DataMember(Name = "name", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "name")]
+        public string Name { get; set; }
+
         [DataMember(Name = "outputs", EmitDefaultValue = false)]
         [JsonProperty(PropertyName = "outputs")]
         public List<AbiOutput> Outputs { get; set; }
@@ -37,6 +34,18 @@ public class AbiItem
         [JsonProperty(PropertyName = "payable")]
         public bool Payable { get; set; }
 
+        [DataMember(Name = "stateMutability", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "stateMutability")]
+        private string _stateMutability = StateMutabilityTypes.Pure.ToString();
+
+        [DataMember(Name = "type", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "type")]
+        private string _abiType = AbiItemTypes.Event.ToString();
+
+        [DataMember(Name = "gas", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "gas")]
+        public BigInteger Gas { get; set; }
+
         [JsonIgnore]
         public StateMutabilityTypes StateMutability
         {
@@ -50,9 +59,5 @@ public AbiItemTypes Type
             get { return _abiType.ToAbiItemTypes(); }
             set { _abiType = value.ToString(); }
         }
-
-        [DataMember(Name = "gas", EmitDefaultValue = false)]
-        [JsonProperty(PropertyName = "gas")]
-        public BigInteger Gas { get; set; }
     }
 }
diff --git a/MoralisDotNet/Moralis.StreamsApi/Models/AddressResponse.cs b/MoralisDotNet/Moralis.StreamsApi/Models/AddressResponse.cs
@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.Numerics;
 using System.Runtime.Serialization;
 using System.Text;
 
@@ -11,18 +12,20 @@ namespace Moralis.StreamsApi.Models
     /// </summary>
     public class AddressResponse
     {
-        /// <summary>
-        /// The id of the stream the address was added to
-        /// </summary>
-        [DataMember(Name = "streamId", EmitDefaultValue = false)]
-        [JsonProperty(PropertyName = "streamId")]
-        public string StreamId { get; set; }
 
         /// <summary>
         /// The address added to the stream
         /// </summary>
-        [DataMember(Name = "address", EmitDefaultValue = false)]
-        [JsonProperty(PropertyName = "address")]
-        public string Address { get; set; } 
+        [DataMember(Name = "result", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "result")]
+        public List<Addresses> Result { get; set; }
+
+        [DataMember(Name = "cursor", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "cursor")]
+        public string Cursor { get; set; }
+
+        [DataMember(Name = "total", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "total")]
+        public BigInteger Total { get; set; }
     }
 }
diff --git a/MoralisDotNet/Moralis.StreamsApi/Models/Addresses.cs b/MoralisDotNet/Moralis.StreamsApi/Models/Addresses.cs
@@ -0,0 +1,22 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using System.Text;
+
+namespace Moralis.StreamsApi.Models
+{
+    public class Addresses
+    {
+        /// <summary>
+        /// The address added to the stream
+        /// </summary>
+        [DataMember(Name = "address", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "address")]
+        public string Address { get; set; }
+
+        [DataMember(Name = "id", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "id", NullValueHandling = NullValueHandling.Ignore)]
+        public string Id { get; set; }
+    }
+}
diff --git a/MoralisDotNet/Moralis.StreamsApi/Models/AdvancedOptions.cs b/MoralisDotNet/Moralis.StreamsApi/Models/AdvancedOptions.cs
@@ -0,0 +1,21 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Moralis.StreamsApi.Models
+{
+    public class AdvancedOptions
+    {
+        [DataMember(Name = "topic0", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "topic0")]
+        public string Topic0 { get; set; }
+
+        [DataMember(Name = "filter", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "filter")]
+        public Dictionary<string, object> Filter { get; set; }
+
+        [DataMember(Name = "includeNativeTxs", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "includeNativeTxs")]
+        public bool IncludeNativeTxs { get; set; }
+    }
+}
diff --git a/MoralisDotNet/Moralis.StreamsApi/Models/DeleteAddressResponse.cs b/MoralisDotNet/Moralis.StreamsApi/Models/DeleteAddressResponse.cs
@@ -0,0 +1,19 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using System.Text;
+
+namespace Moralis.StreamsApi.Models
+{
+    public class DeleteAddressResponse
+    {
+        [DataMember(Name = "address", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "address")]
+        public string Address { get; set; }
+
+        [DataMember(Name = "streamId", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "streamId", NullValueHandling = NullValueHandling.Ignore)]
+        public string StreamId { get; set; }
+    }
+}
diff --git a/MoralisDotNet/Moralis.StreamsApi/Models/Erc20Approval.cs b/MoralisDotNet/Moralis.StreamsApi/Models/Erc20Approval.cs
@@ -12,9 +12,9 @@ public class Erc20Approval
         [JsonProperty(PropertyName = "transactionHash")]
         public string TransactionHash { get; set; }
 
-        [DataMember(Name = "tokenAddress", EmitDefaultValue = false)]
-        [JsonProperty(PropertyName = "tokenAddress")]
-        public string TokenAddress { get; set; }
+        [DataMember(Name = "contract", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "contract")]
+        public string Contract { get; set; }
 
         [DataMember(Name = "logIndex", EmitDefaultValue = false)]
         [JsonProperty(PropertyName = "logIndex")]

diff --git a/MoralisDotNet/Moralis.StreamsApi/Models/Erc20Transfer.cs b/MoralisDotNet/Moralis.StreamsApi/Models/Erc20Transfer.cs
@@ -12,9 +12,9 @@ public class Erc20Transfer
         [JsonProperty(PropertyName = "transactionHash")]
         public string TransactionHash { get; set; }
 
-        [DataMember(Name = "tokenAddress", EmitDefaultValue = false)]
-        [JsonProperty(PropertyName = "tokenAddress")]
-        public string TokenAddress { get; set; }
+        [DataMember(Name = "contract", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "contract")]
+        public string Contract { get; set; }
 
         [DataMember(Name = "logIndex", EmitDefaultValue = false)]
         [JsonProperty(PropertyName = "logIndex")]
@@ -32,10 +32,6 @@ public class Erc20Transfer
         [JsonProperty(PropertyName = "to")]
         public string To { get; set; }
 
-        [DataMember(Name = "amount", EmitDefaultValue = false)]
-        [JsonProperty(PropertyName = "amount")]
-        public string Amount { get; set; }
-
         [DataMember(Name = "value", EmitDefaultValue = false)]
         [JsonProperty(PropertyName = "value")]
         public string Value { get; set; }

diff --git a/MoralisDotNet/Moralis.StreamsApi/Models/HistoryResponse.cs b/MoralisDotNet/Moralis.StreamsApi/Models/HistoryResponse.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using Moralis.Unit;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
@@ -14,6 +15,10 @@ public class HistoryResponse
 
         [DataMember(Name = "cursor", EmitDefaultValue = false)]
         [JsonProperty(PropertyName = "cursor")]
-        public string Cursor { get; set;}
+        public string Cursor { get; set; }
+
+        [DataMember(Name = "total", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "total")]
+        public BigDecimal Total { get; set; }
     }
 }
diff --git a/MoralisDotNet/Moralis.StreamsApi/Models/InternalTransaction.cs b/MoralisDotNet/Moralis.StreamsApi/Models/InternalTransaction.cs
@@ -24,8 +24,17 @@ public class InternalTransaction
         [JsonProperty(PropertyName = "transactionHash")]
         public string TransactionHash { get; set; }
 
-        [DataMember(Name = "id", EmitDefaultValue = false)]
-        [JsonProperty(PropertyName = "id")]
+        [DataMember(Name = "gas", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "gas")]
         public string Gas { get; set; }
+
+        [DataMember(Name = "streamId", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "streamId")]
+        public string StreamId { get; set; }
+
+        [DataMember(Name = "tag", EmitDefaultValue = false)]
+        [JsonProperty(PropertyName = "tag")]
+        public string Tag { get; set; }
+
     }
 }