Update Zenon SDK to version 0.6.4 (#6)

KingGorrin · web-flow · commit 4371152eb8a7 · 2023-09-17T15:45:28.000+02:00
diff --git a/src/ZenonCli/Commands/Bridge.Admin.cs b/src/ZenonCli/Commands/Bridge.Admin.cs
@@ -136,16 +136,16 @@ protected override async Task ProcessAsync()
                     WriteInfo("Setting token pair ...");
 
                     var setTokenPair = ZnnClient.Embedded.Bridge.SetTokenPair(
-                        NetworkClass!.Value,
-                        ChainId!.Value,
+                        (uint)NetworkClass!.Value,
+                        (uint)ChainId!.Value,
                         tokenStandard,
                         TokenAddress,
                         Bridgeable!.Value,
                         Redeemable!.Value,
                         Owned!.Value,
                         minAmount,
                         feePercentage,
-                        RedeemDelay!.Value,
+                        (ulong)RedeemDelay!.Value,
                         Metadata);
                     await ZnnClient.Send(setTokenPair);
 
@@ -177,7 +177,7 @@ protected override async Task ProcessAsync()
                     WriteInfo("Removing token pair ...");
 
                     var removeTokenPair = ZnnClient.Embedded.Bridge
-                        .RemoveTokenPair(NetworkClass!.Value, ChainId!.Value, tokenStandard, TokenAddress);
+                        .RemoveTokenPair((uint)NetworkClass!.Value, (uint)ChainId!.Value, tokenStandard, TokenAddress);
                     await ZnnClient.Send(removeTokenPair);
 
                     WriteInfo("Done");
@@ -191,7 +191,7 @@ public class Revoke : KeyStoreAndConnectionCommand
                 public string? TransactionHash { get; set; }
 
                 [Value(1, MetaName = "logIndex", Required = true, HelpText = "The log index in the block of the transaction that locked/burned the funds")]
-                public int? LogIndex { get; set; }
+                public long? LogIndex { get; set; }
 
                 protected override async Task ProcessAsync()
                 {
@@ -202,7 +202,7 @@ protected override async Task ProcessAsync()
                     WriteInfo("Revoking unwrap request ...");
 
                     var revokeUnwrapRequest =
-                        ZnnClient.Embedded.Bridge.RevokeUnwrapRequest(transactionHash, LogIndex!.Value);
+                        ZnnClient.Embedded.Bridge.RevokeUnwrapRequest(transactionHash, (uint)LogIndex!.Value);
                     await ZnnClient.Send(revokeUnwrapRequest);
 
                     WriteInfo("Done");
@@ -362,10 +362,10 @@ protected override async Task ProcessAsync()
                     await AssertBridgeAdminAsync();
 
                     WriteInfo("Setting orchestrator information...");
-                    await ZnnClient.Send(ZnnClient.Embedded.Bridge.SetOrchestratorInfo(WindowSize!.Value,
-                        KeyGenThreshold!.Value,
-                        ConfirmationsToFinality!.Value,
-                        EstimatedMomentumTime!.Value));
+                    await ZnnClient.Send(ZnnClient.Embedded.Bridge.SetOrchestratorInfo((ulong)WindowSize!.Value,
+                        (uint)KeyGenThreshold!.Value,
+                        (uint)ConfirmationsToFinality!.Value,
+                        (uint)EstimatedMomentumTime!.Value));
                     WriteInfo("Done");
                 }
             }
@@ -425,7 +425,7 @@ protected override async Task ProcessAsync()
 
                     WriteInfo("Setting bridge network...");
                     await ZnnClient.Send(ZnnClient.Embedded.Bridge.SetNetwork(
-                        networkClass, chainId, name, contractAddress, Metadata));
+                        (uint)networkClass, (uint)chainId, name, contractAddress, Metadata));
                     WriteInfo("Done");
                 }
             }
@@ -460,7 +460,7 @@ protected override async Task ProcessAsync()
 
 
                     WriteInfo("Removing bridge network...");
-                    await ZnnClient.Send(ZnnClient.Embedded.Bridge.RemoveNetwork(networkClass, chainId));
+                    await ZnnClient.Send(ZnnClient.Embedded.Bridge.RemoveNetwork((uint)networkClass, (uint)chainId));
                     WriteInfo("Done");
                 }
             }
@@ -499,7 +499,7 @@ protected override async Task ProcessAsync()
                     JsonConvert.DeserializeObject(Metadata!);
 
                     WriteInfo("Setting bridge network metadata...");
-                    await ZnnClient.Send(ZnnClient.Embedded.Bridge.SetNetworkMetadata(networkClass, chainId, Metadata!));
+                    await ZnnClient.Send(ZnnClient.Embedded.Bridge.SetNetworkMetadata((uint)networkClass, (uint)chainId, Metadata!));
                     WriteInfo("Done");
                 }
             }
@@ -515,7 +515,7 @@ protected override async Task ProcessAsync()
                     await AssertBridgeAdminAsync();
 
                     WriteInfo("Setting bridge redeem delay...");
-                    await ZnnClient.Send(ZnnClient.Embedded.Bridge.SetRedeemDelay(RedeemDelay!.Value));
+                    await ZnnClient.Send(ZnnClient.Embedded.Bridge.SetRedeemDelay((ulong)RedeemDelay!.Value));
                     WriteInfo("Done");
                 }
             }
diff --git a/src/ZenonCli/Commands/Bridge.Network.cs b/src/ZenonCli/Commands/Bridge.Network.cs
@@ -44,8 +44,8 @@ protected override async Task ProcessAsync()
                     }
 
                     var network = await ZnnClient.Embedded.Bridge.GetNetworkInfo(
-                        this.NetworkClass!.Value,
-                        this.ChainId!.Value);
+                        (uint)this.NetworkClass!.Value,
+                        (uint)this.ChainId!.Value);
 
                     if (network.NetworkClass == 0 || network.ChainId == 0)
                     {
diff --git a/src/ZenonCli/Commands/Bridge.Unwrap.cs b/src/ZenonCli/Commands/Bridge.Unwrap.cs
@@ -14,15 +14,15 @@ public class Redeem : KeyStoreAndConnectionCommand
                 public string? Hash { get; set; }
 
                 [Value(1, MetaName = "logIndex", Required = true, HelpText = "The log index")]
-                public int? LogIndex { get; set; }
+                public long? LogIndex { get; set; }
 
                 protected override async Task ProcessAsync()
                 {
                     var address = ZnnClient.DefaultKeyPair.Address;
                     var transactionHash = ParseHash(Hash);
 
                     var request = await ZnnClient.Embedded.Bridge
-                        .GetUnwrapTokenRequestByHashAndLog(transactionHash, LogIndex!.Value);
+                        .GetUnwrapTokenRequestByHashAndLog(transactionHash, (uint)LogIndex!.Value);
 
                     if (request.Redeemed == 0 && request.Revoked == 0)
                     {
@@ -190,14 +190,14 @@ public class Get : ConnectionCommand
                 public string? Hash { get; set; }
 
                 [Value(1, MetaName = "logIndex", Required = true, HelpText = "The log index")]
-                public int? LogIndex { get; set; }
+                public long? LogIndex { get; set; }
 
                 protected override async Task ProcessAsync()
                 {
                     var transactionHash = ParseHash(Hash);
 
                     var request = await ZnnClient.Embedded.Bridge
-                        .GetUnwrapTokenRequestByHashAndLog(transactionHash, LogIndex!.Value);
+                        .GetUnwrapTokenRequestByHashAndLog(transactionHash, (uint)LogIndex!.Value);
 
                     await WriteAsync(request);
                 }
diff --git a/src/ZenonCli/Commands/Bridge.Wrap.cs b/src/ZenonCli/Commands/Bridge.Wrap.cs
@@ -41,7 +41,7 @@ protected override async Task ProcessAsync()
                     await AssertBalanceAsync(address, tokenStandard, amount);
 
                     var info =
-                        await ZnnClient.Embedded.Bridge.GetNetworkInfo(this.NetworkClass!.Value, this.ChainId!.Value);
+                        await ZnnClient.Embedded.Bridge.GetNetworkInfo((uint)this.NetworkClass!.Value, (uint)this.ChainId!.Value);
 
                     if (info.NetworkClass == 0 || info.ChainId == 0)
                     {
@@ -65,7 +65,7 @@ protected override async Task ProcessAsync()
 
                     WriteInfo("Wrapping token ...");
                     var wrapToken = ZnnClient.Embedded.Bridge
-                        .WrapToken(NetworkClass!.Value, ChainId!.Value, ToAddress, amount, tokenStandard);
+                        .WrapToken((uint)NetworkClass!.Value, (uint)ChainId!.Value, ToAddress, amount, tokenStandard);
                     await ZnnClient.Send(wrapToken);
                     WriteInfo("Done");
                 }
@@ -110,7 +110,7 @@ protected override async Task ProcessAsync()
                     {
                         list = await ZnnClient.Embedded.Bridge
                             .GetAllWrapTokenRequestsByToAddressNetworkClassAndChainId(
-                                Address, NetworkClass!.Value, ChainId!.Value);
+                                Address, (uint)NetworkClass!.Value, (uint)ChainId!.Value);
                     }
                     else
                     {
diff --git a/src/ZenonCli/Commands/CommandBase.cs b/src/ZenonCli/Commands/CommandBase.cs
@@ -126,7 +126,7 @@ protected async Task ConnectAsync(IConnectionOptions options)
             {
                 if (!String.Equals(options.Chain, "auto", StringComparison.OrdinalIgnoreCase))
                 {
-                    ZnnClient.ChainIdentifier = int.Parse(options.Chain);
+                    ZnnClient.ChainIdentifier = ulong.Parse(options.Chain);
                 }
                 else
                 {
diff --git a/src/ZenonCli/Commands/Htlc.cs b/src/ZenonCli/Commands/Htlc.cs
@@ -137,7 +137,7 @@ protected override async Task ProcessAsync()
 
                 long expirationTime = this.ExpirationTime * 60 * 60; // convert to seconds
                 Momentum currentFrontierMomentum = await ZnnClient.Ledger.GetFrontierMomentum();
-                long currentTime = currentFrontierMomentum.Timestamp;
+                long currentTime = (long)currentFrontierMomentum.Timestamp;
                 expirationTime += currentTime;
 
                 if (this.HashLock != null)
diff --git a/src/ZenonCli/Commands/Orchestrator.cs b/src/ZenonCli/Commands/Orchestrator.cs
@@ -116,7 +116,7 @@ public class UnwrapToken : KeyStoreAndConnectionCommand
             public string? TransactionHash { get; set; }
 
             [Value(3, MetaName = "logIndex", Required = true, HelpText = "The log index in the block of the transaction that locked/burned the funds on the source network; together with txHash it creates a unique identifier for a transaction")]
-            public int? LogIndex { get; set; }
+            public long? LogIndex { get; set; }
 
             [Value(4, MetaName = "address", Required = true, HelpText = "The destination NoM address")]
             public string? Address { get; set; }
diff --git a/src/ZenonCli/Commands/Plasma.cs b/src/ZenonCli/Commands/Plasma.cs
@@ -27,7 +27,7 @@ protected override async Task ProcessAsync()
 
                 var address = ZnnClient.DefaultKeyPair.Address;
                 var fusionEntryList = await ZnnClient.Embedded.Plasma.GetEntriesByAddress(address,
-                        this.PageIndex.Value, this.PageSize.Value);
+                        (uint)this.PageIndex.Value, (uint)this.PageSize.Value);
 
                 if (fusionEntryList.Count > 0)
                 {
@@ -131,7 +131,7 @@ protected override async Task ProcessAsync()
                     }
                     pageIndex++;
                     fusions = await ZnnClient.Embedded.Plasma
-                        .GetEntriesByAddress(address, pageIndex: pageIndex);
+                        .GetEntriesByAddress(address, (uint)pageIndex);
                 }
 
                 if (!found)
diff --git a/src/ZenonCli/Commands/Spork.cs b/src/ZenonCli/Commands/Spork.cs
@@ -25,7 +25,7 @@ protected override async Task ProcessAsync()
                 AssertPageRange(PageIndex.Value, PageSize.Value);
 
                 var result = await ZnnClient.Embedded.Spork
-                    .GetAll(PageIndex.Value, PageSize.Value);
+                    .GetAll((uint)PageIndex.Value, (uint)PageSize.Value);
 
                 if (result == null || result.Count == 0)
                 {
diff --git a/src/ZenonCli/Commands/Stake.cs b/src/ZenonCli/Commands/Stake.cs
@@ -29,7 +29,7 @@ protected override async Task ProcessAsync()
                 AssertPageRange(PageIndex.Value, PageSize.Value);
 
                 var stakeList = await ZnnClient.Embedded.Stake.GetEntriesByAddress(
-                    address, PageIndex.Value, PageSize.Value);
+                    address, (uint)PageIndex.Value, (uint)PageSize.Value);
 
                 if (stakeList.Count > 0)
                 {
@@ -117,7 +117,7 @@ protected override async Task ProcessAsync()
                 bool one = false;
                 bool gotError = false;
 
-                var entries = await ZnnClient.Embedded.Stake.GetEntriesByAddress(address, pageIndex);
+                var entries = await ZnnClient.Embedded.Stake.GetEntriesByAddress(address, (uint)pageIndex);
 
                 while (entries.List.Length != 0)
                 {
@@ -134,7 +134,7 @@ protected override async Task ProcessAsync()
                         }
                     }
                     pageIndex++;
-                    entries = await ZnnClient.Embedded.Stake.GetEntriesByAddress(address, pageIndex);
+                    entries = await ZnnClient.Embedded.Stake.GetEntriesByAddress(address, (uint)pageIndex);
                 }
 
                 if (gotError)
diff --git a/src/ZenonCli/Commands/Stats.cs b/src/ZenonCli/Commands/Stats.cs
@@ -22,7 +22,7 @@ protected override async Task ProcessAsync()
                 WriteInfo($"numGoroutine: {osInfo.numGoroutine}");
             }
 
-            private string FormatMemory(long size)
+            private string FormatMemory(ulong size)
             {
                 var sizeUnits = new string[] { "B", "kB", "MB", "GB", "TB" };
 
diff --git a/src/ZenonCli/Commands/Token.cs b/src/ZenonCli/Commands/Token.cs
@@ -26,7 +26,7 @@ protected override async Task ProcessAsync()
 
                 AssertPageRange(PageIndex.Value, PageSize.Value);
 
-                var tokenList = await ZnnClient.Embedded.Token.GetAll(PageIndex.Value, PageSize.Value);
+                var tokenList = await ZnnClient.Embedded.Token.GetAll((uint)PageIndex.Value, (uint)PageSize.Value);
 
                 foreach (var token in tokenList.List)
                 {
diff --git a/src/ZenonCli/ZenonCli.csproj b/src/ZenonCli/ZenonCli.csproj
@@ -23,7 +23,7 @@
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="Cryptography.ECDSA.Secp256k1" Version="1.1.3" />
-    <PackageReference Include="Zenon.Sdk" Version="0.6.1" />
+    <PackageReference Include="Zenon.Sdk" Version="0.6.4" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,8 @@ protected override async Task ProcessAsync()`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`var network = await ZnnClient.Embedded.Bridge.GetNetworkInfo(`
`47`		`- this.NetworkClass!.Value,`
`48`		`- this.ChainId!.Value);`
	`47`	`+ (uint)this.NetworkClass!.Value,`
	`48`	`+ (uint)this.ChainId!.Value);`
`49`	`49`
`50`	`50`	`if (network.NetworkClass == 0 \|\| network.ChainId == 0)`
`51`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ protected override async Task ProcessAsync()`
`41`	`41`	`await AssertBalanceAsync(address, tokenStandard, amount);`
`42`	`42`
`43`	`43`	`var info =`
`44`		`- await ZnnClient.Embedded.Bridge.GetNetworkInfo(this.NetworkClass!.Value, this.ChainId!.Value);`
	`44`	`+ await ZnnClient.Embedded.Bridge.GetNetworkInfo((uint)this.NetworkClass!.Value, (uint)this.ChainId!.Value);`
`45`	`45`
`46`	`46`	`if (info.NetworkClass == 0 \|\| info.ChainId == 0)`
`47`	`47`	`{`
`@@ -65,7 +65,7 @@ protected override async Task ProcessAsync()`
`65`	`65`
`66`	`66`	`WriteInfo("Wrapping token ...");`
`67`	`67`	`var wrapToken = ZnnClient.Embedded.Bridge`
`68`		`- .WrapToken(NetworkClass!.Value, ChainId!.Value, ToAddress, amount, tokenStandard);`
	`68`	`+ .WrapToken((uint)NetworkClass!.Value, (uint)ChainId!.Value, ToAddress, amount, tokenStandard);`
`69`	`69`	`await ZnnClient.Send(wrapToken);`
`70`	`70`	`WriteInfo("Done");`
`71`	`71`	`}`
`@@ -110,7 +110,7 @@ protected override async Task ProcessAsync()`
`110`	`110`	`{`
`111`	`111`	`list = await ZnnClient.Embedded.Bridge`
`112`	`112`	`.GetAllWrapTokenRequestsByToAddressNetworkClassAndChainId(`
`113`		`- Address, NetworkClass!.Value, ChainId!.Value);`
	`113`	`+ Address, (uint)NetworkClass!.Value, (uint)ChainId!.Value);`
`114`	`114`	`}`
`115`	`115`	`else`
`116`	`116`	`{`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ protected async Task ConnectAsync(IConnectionOptions options)`
`126`	`126`	`{`
`127`	`127`	`if (!String.Equals(options.Chain, "auto", StringComparison.OrdinalIgnoreCase))`
`128`	`128`	`{`
`129`		`- ZnnClient.ChainIdentifier = int.Parse(options.Chain);`
	`129`	`+ ZnnClient.ChainIdentifier = ulong.Parse(options.Chain);`
`130`	`130`	`}`
`131`	`131`	`else`
`132`	`132`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ protected override async Task ProcessAsync()`
`27`	`27`
`28`	`28`	`var address = ZnnClient.DefaultKeyPair.Address;`
`29`	`29`	`var fusionEntryList = await ZnnClient.Embedded.Plasma.GetEntriesByAddress(address,`
`30`		`- this.PageIndex.Value, this.PageSize.Value);`
	`30`	`+ (uint)this.PageIndex.Value, (uint)this.PageSize.Value);`
`31`	`31`
`32`	`32`	`if (fusionEntryList.Count > 0)`
`33`	`33`	`{`
`@@ -131,7 +131,7 @@ protected override async Task ProcessAsync()`
`131`	`131`	`}`
`132`	`132`	`pageIndex++;`
`133`	`133`	`fusions = await ZnnClient.Embedded.Plasma`
`134`		`- .GetEntriesByAddress(address, pageIndex: pageIndex);`
	`134`	`+ .GetEntriesByAddress(address, (uint)pageIndex);`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`if (!found)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ protected override async Task ProcessAsync()`
`25`	`25`	`AssertPageRange(PageIndex.Value, PageSize.Value);`
`26`	`26`
`27`	`27`	`var result = await ZnnClient.Embedded.Spork`
`28`		`- .GetAll(PageIndex.Value, PageSize.Value);`
	`28`	`+ .GetAll((uint)PageIndex.Value, (uint)PageSize.Value);`
`29`	`29`
`30`	`30`	`if (result == null \|\| result.Count == 0)`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ protected override async Task ProcessAsync()`
`29`	`29`	`AssertPageRange(PageIndex.Value, PageSize.Value);`
`30`	`30`
`31`	`31`	`var stakeList = await ZnnClient.Embedded.Stake.GetEntriesByAddress(`
`32`		`- address, PageIndex.Value, PageSize.Value);`
	`32`	`+ address, (uint)PageIndex.Value, (uint)PageSize.Value);`
`33`	`33`
`34`	`34`	`if (stakeList.Count > 0)`
`35`	`35`	`{`
`@@ -117,7 +117,7 @@ protected override async Task ProcessAsync()`
`117`	`117`	`bool one = false;`
`118`	`118`	`bool gotError = false;`
`119`	`119`
`120`		`- var entries = await ZnnClient.Embedded.Stake.GetEntriesByAddress(address, pageIndex);`
	`120`	`+ var entries = await ZnnClient.Embedded.Stake.GetEntriesByAddress(address, (uint)pageIndex);`
`121`	`121`
`122`	`122`	`while (entries.List.Length != 0)`
`123`	`123`	`{`
`@@ -134,7 +134,7 @@ protected override async Task ProcessAsync()`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`	`pageIndex++;`
`137`		`- entries = await ZnnClient.Embedded.Stake.GetEntriesByAddress(address, pageIndex);`
	`137`	`+ entries = await ZnnClient.Embedded.Stake.GetEntriesByAddress(address, (uint)pageIndex);`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`if (gotError)`