Merge pull request #1 from RemarkableTools/dev

axenteoctavian · web-flow · commit 7e5066812c27 · 2023-01-18T14:52:10.000+02:00
Dev to main
diff --git a/.gitignore b/.gitignore
@@ -364,5 +364,4 @@ FodyWeavers.xsd
 
 # other
 desktop.ini
-/Console Testing
 TestResults
diff --git a/Mx.NET.SDK.sln b/Mx.NET.SDK.sln
@@ -21,8 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MS Testing", "tests\MS Test
 		{B139BD44-BE9E-4836-B900-EA4DB00A1BD1} = {B139BD44-BE9E-4836-B900-EA4DB00A1BD1}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Console Testing", "tests\Console Testing\Console Testing.csproj", "{AE223371-8ABB-4CAA-A7BE-72CC0D4BBC9B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mx.NET.SDK.Core", "src\Mx.NET.SDK.Core\Mx.NET.SDK.Core.csproj", "{DD5C9C0D-E6A7-4327-84F1-9B5021B7F5A2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mx.NET.SDK.Wallet", "src\Mx.NET.SDK.Wallet\Mx.NET.SDK.Wallet.csproj", "{2FEB9B6A-04A7-4840-8770-BB01B02E41D8}"
@@ -41,10 +39,6 @@ Global
 		{149FA3CD-11A5-4402-A923-4F8B87F894A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{149FA3CD-11A5-4402-A923-4F8B87F894A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{149FA3CD-11A5-4402-A923-4F8B87F894A6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE223371-8ABB-4CAA-A7BE-72CC0D4BBC9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE223371-8ABB-4CAA-A7BE-72CC0D4BBC9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE223371-8ABB-4CAA-A7BE-72CC0D4BBC9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE223371-8ABB-4CAA-A7BE-72CC0D4BBC9B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DD5C9C0D-E6A7-4327-84F1-9B5021B7F5A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DD5C9C0D-E6A7-4327-84F1-9B5021B7F5A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DD5C9C0D-E6A7-4327-84F1-9B5021B7F5A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -60,7 +54,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{B139BD44-BE9E-4836-B900-EA4DB00A1BD1} = {D56A890E-8033-4A93-87CF-586BA916BC07}
 		{149FA3CD-11A5-4402-A923-4F8B87F894A6} = {DF07F928-D972-4F69-9E8C-E6EA16C25BF3}
-		{AE223371-8ABB-4CAA-A7BE-72CC0D4BBC9B} = {DF07F928-D972-4F69-9E8C-E6EA16C25BF3}
 		{DD5C9C0D-E6A7-4327-84F1-9B5021B7F5A2} = {D56A890E-8033-4A93-87CF-586BA916BC07}
 		{2FEB9B6A-04A7-4840-8770-BB01B02E41D8} = {D56A890E-8033-4A93-87CF-586BA916BC07}
 	EndGlobalSection
diff --git a/src/Mx.NET.SDK/Domain/TransactionRequest.cs b/src/Mx.NET.SDK/Domain/TransactionRequest.cs
@@ -28,6 +28,7 @@ public class TransactionRequest
         public Address Receiver { get; private set; }
         public GasLimit GasLimit { get; private set; }
         public string Data { get; private set; }
+        public int? Options { get; private set; }
 
         private TransactionRequest(Account account, NetworkConfig networkConfig)
         {
@@ -111,6 +112,11 @@ public void SetGasLimit(GasLimit gasLimit)
             GasLimit = gasLimit;
         }
 
+        public void SetOptions(int value)
+        {
+            Options = value;
+        }
+
         public ESDTAmount GetEstimatedFee()
         {
             if (GasLimit is null)
diff --git a/src/Mx.NET.SDK/Mx.NET.SDK.csproj b/src/Mx.NET.SDK/Mx.NET.SDK.csproj
@@ -11,7 +11,7 @@
     <RepositoryUrl>https://github.com/RemarkableTools/Mx.NET.SDK</RepositoryUrl>
     <RepositoryType>GitHub</RepositoryType>
     <Company>Remarkable Tools</Company>
-    <Version>1.0.0</Version>
+    <Version>1.0.1</Version>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Title>RemarkableTools.Mx</Title>
     <PackageReadmeFile>README.md</PackageReadmeFile>
diff --git a/src/Mx.NET.SDK/Provider/Dtos/API/Transactions/TransactionRequestDto.cs b/src/Mx.NET.SDK/Provider/Dtos/API/Transactions/TransactionRequestDto.cs
@@ -18,6 +18,7 @@ public class TransactionRequestDto
         public string Data { get; set; }
         public string ChainID { get; set; }
         public int Version { get; set; }
+        public int? Options { get; set; }
         public string Signature { get; set; }
     }
 }
diff --git a/tests/Console Testing/Console Testing.csproj b/tests/Console Testing/Console Testing.csproj
diff --git a/tests/Console Testing/Program.cs b/tests/Console Testing/Program.cs

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public class TransactionRequest`
`28`	`28`	`public Address Receiver { get; private set; }`
`29`	`29`	`public GasLimit GasLimit { get; private set; }`
`30`	`30`	`public string Data { get; private set; }`
	`31`	`+ public int? Options { get; private set; }`
`31`	`32`
`32`	`33`	`private TransactionRequest(Account account, NetworkConfig networkConfig)`
`33`	`34`	`{`
`@@ -111,6 +112,11 @@ public void SetGasLimit(GasLimit gasLimit)`
`111`	`112`	`GasLimit = gasLimit;`
`112`	`113`	`}`
`113`	`114`
	`115`	`+ public void SetOptions(int value)`
	`116`	`+ {`
	`117`	`+ Options = value;`
	`118`	`+ }`
	`119`	`+`
`114`	`120`	`public ESDTAmount GetEstimatedFee()`
`115`	`121`	`{`
`116`	`122`	`if (GasLimit is null)`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ public class TransactionRequestDto`
`18`	`18`	`public string Data { get; set; }`
`19`	`19`	`public string ChainID { get; set; }`
`20`	`20`	`public int Version { get; set; }`
	`21`	`+ public int? Options { get; set; }`
`21`	`22`	`public string Signature { get; set; }`
`22`	`23`	`}`
`23`	`24`	`}`