Skip to content

Commit

Permalink
Update to 1.0.7.2 (#430)
Browse files Browse the repository at this point in the history
* Update NBitcoin.csproj (#391)

* Pass along height information for OP_FEDERATION (#379)

* Pass along height information for OP_FEDERATION

* Add defaults

* Add defaults

* Filter Transaction History by Transaction Id (#393)

* Update WalletService.cs

* Add Filter

* Fix Test

* Perform check for cold staking txs

* Add mainnet check points (#400)

* Add MainNet check points

* Fix Tests

* Change gas limit upper bound to 250,000 (#399)

* Add UInt256, serialization methods and CLR updates (#365)

* Add UInt256 serialization methods

* Refactor

* Use UInt256 in InternalExecutor

* Undo unrelated change

* Update TestMessage

* Revert type updates to InternalExecutor

* Update Serializer and PersistentState

* Update package versions

* Update SC packages to version 1.4.0-alpha

* Add serializers and enums

* Add primitive serializer

* Update StandardToken.cs

* Revert change

* Update integration tests

* Use switch/case in Serialize/Deserialize

* Update package versions and remove workaround

* Ensure the right Stratis.SmartContracts.Standards is used by contracts

* Changes based on feedback

* Fix primitive deserialize

* Update standards dll name

* Fix legacy standards dll path

* Don't upgrade standards package of node

* Don't upgrade StandardToken of node

* Don't upgrade standards package of node

* Add Standards forwards compatibility

* Add test case for futuristic contracts

* Fix Token_Standards_Test

* Update RPC_GetReceipt_Returns_Value test

* Cleanup non-required changes

* Validate standards assembly

* Disable automatic downloads

* Add LegacyStandardsDLLs

* Update test

* Bump package versions for Core and Networks

* Bump observer version

* Update package versions

* Refactor

* Revert gitignore

* Revert unnecessary changes

* Revert unnecessary changes

* Update Stratis.SmartContracts.xxx to 2.0.0.0

* Update package version for Stratis.SmartContracts.Tests.Common

* Add TestNet checkpoints (#402)

* Update StraxTest.cs

* Add testnet checkpoints

* Fix Tests

* Update Nuget Scripts and Collateral/FederatedPeg versions

* Bump Version (#403)

* Update some test projects PackageIds and versions

* Update PushNuget.ps1

* Update MaxStandardSigOpsCost and CCTS Max Partials Txs (#404)

* Update Stratis.SmartContracts.CLR.Validation's allowed primitive types (#405)

* Update validator's primitives

* Bump package version

* Bump Stratis.SmartContracts.Core and Stratis.SmartContracts.CLR versions (#406)

* Update validator's primitives

* Bump package version

* Bump Stratis.SmartContracts.Core and Stratis.SmartContracts.CLR versions

* Bump Stratis.Bicoin.Features.SmartContracts as well

* Bump Stratis.SmartContracts.Networks

* Update PushSCNuget.ps1

* Fix Finality Bug (#407)

* Fix Finalized Bug

* Fix Build

* Trigger CI

* Fix Tests

* Comments

* Console Cleanup (#408)

* Suppress bench logs

* Done

* Update NodeStats.cs

* Fix Test

* Bump version prior to fixing NuGet dependencies for  Stratis.SmartContracts.Tests.Common (#409)

* Rocks DB (#401)

* WIP

* Fix DB connections

* Update CirrusD

* Add RocksDbNative

* Update Stratis.CirrusD.csproj

* Add Snappy

* Fix BlockStoreQueue

* Add switch to program.cs

* Fix Logger

* Cleanup Console Logs

* Add RocksDbChainStore

* Update BlockPuller.cs

* Implement RocksDb KeyValueStore

* Add dbtype switch to StraxD

* NodeStats changes

* KeyValue fix

* Fix Build

* Voting / Wallet Log

* Update ConnectionManager.cs

* Hide bench stats

* Update VersionProvider.cs

* Self Review

* Fix Test

* Update ConnectionManager.cs

* Fix Locks in StakeDB

* Create RocksDbProvenBlockHeaderRepository

* Update RocksDbProvenBlockHeaderRepository.cs

* Add network type to console

* Fix Test

* Update NodeStats.cs

* Add datafolder to nodestats

* Fix Merge

* Revert

* Revert launchsettings

* Add ColdStaking to PushNuGet script (#410)

* Add ColdStaking to PushNuGet script

* Bump Stratis.Bitcoin.IntegrationTests.Common to 1.0.7

* Bump Stratis.Core.Tests.Common to 1.0.7

* Update to Stratis.RocksDb (#415)

* Prevent changing published packages w/o bumping local version (#411)

* Prevent changing package code of published version - must bump version

* Update comments

* Small refactor

* Ensure Release folder exists

* Check version changes related to project references

* Bump versions

* Refactor

* Refactor

* Fix wallet feature vesion

* Update RocksDb dylibs (#417)

* Update to Stratis.RocksDb

* Update to version 0.0.9.1

* Update RocksDb Nugets

* Update Rocksdb (#418)

* Revert "Dont fetch/process deposits until the CCTS has cleared its suspended transfers (#367)"

This reverts commit 334b4f0.

* Update Nuget

* Update CirrusMain.cs (#422)

* Consolidate outstanding console changes for the MS/Miner (#423)

* update RocksDb Nuget (#424)

* Update Stratis.Bitcoin Assembly info to version 1.0.7.2

* Fix Seeder (#425)

* Fix AddressIndexer Console (#426)

* Update ConnectionManager.cs (#427)

* Fix merge conflicts

Co-authored-by: Francois de la Rouviere <fassadlr@gmail.com>
Co-authored-by: quantumagi <someguy.fromafrica@gmail.com>
  • Loading branch information
3 people authored Feb 16, 2021
1 parent dbb5b55 commit 7629d70
Show file tree
Hide file tree
Showing 30 changed files with 254 additions and 47 deletions.
6 changes: 3 additions & 3 deletions src/NBitcoin/NBitcoin.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Company>NStratis</Company>
Expand All @@ -7,7 +7,7 @@
</PropertyGroup>

<PropertyGroup>
<Version>4.0.0.79</Version>
<Version>4.0.0.80</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -56,4 +56,4 @@
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<AssemblyName>Stratis.Bitcoin.Features.Api</AssemblyName>
<OutputType>Library</OutputType>
<PackageId>Stratis.Features.Api</PackageId>
<Version>1.0.7.0</Version>
<Version>1.0.7.2</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<ApplicationIcon />
<OutputTypeEx>library</OutputTypeEx>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ private void SaveAll()

private void AddInlineStats(StringBuilder benchLog)
{
benchLog.AppendLine("AddressIndexer.Height: ".PadRight(LoggingConfiguration.ColumnLength + 1) + this.IndexerTip.Height.ToString().PadRight(9) +
benchLog.AppendLine("AddressIndexer Height".PadRight(LoggingConfiguration.ColumnLength) + $": {this.IndexerTip.Height}".PadRight(9) +
"AddressCache%: " + this.addressIndexRepository.GetLoadPercentage().ToString().PadRight(8) +
"OutPointCache%: " + this.outpointsRepository.GetLoadPercentage().ToString().PadRight(8) +
$"Ms/block: {Math.Round(this.averageTimePerBlock.Average, 2)}");
Expand Down Expand Up @@ -673,7 +673,7 @@ public LastBalanceDecreaseTransactionModel GetLastBalanceDecreaseTransaction(str
// Height 0 is used as a placeholder height for compacted address balance records, so ignore them if they are the only record.
if (lastBalanceHeight == 0)
return null;

ChainedHeader header = this.chainIndexer.GetHeader(lastBalanceHeight);

if (header == null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<Version>1.0.7.0</Version>
<Version>1.0.7.2</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Authors>Stratis Group Ltd.</Authors>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<Version>1.0.7.0</Version>
<Version>1.0.7.2</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Authors>Stratis Group Ltd.</Authors>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<Version>1.0.7.0</Version>
<Version>1.0.7.2</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Authors>Stratis Group Ltd.</Authors>
</PropertyGroup>
Expand All @@ -28,7 +28,7 @@
<PackageReference Include="LevelDB.Standard" Version="2.1.6.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.1" />
<PackageReference Include="Microsoft.FASTER" Version="2020.2.1.1" />
<PackageReference Include="RocksDB" Version="6.15.4.15287" />
<PackageReference Include="Stratis.RocksDB" Version="0.0.9.4-alpha" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<Version>1.0.7.0</Version>
<Version>1.0.7.2</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<OutputTypeEx>library</OutputTypeEx>
<Authors>Stratis Group Ltd.</Authors>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>Stratis Bitcoin Features Miner</Description>
Expand All @@ -14,7 +14,7 @@
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<Version>1.0.7.0</Version>
<Version>1.0.7.2</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Authors>Stratis Group Ltd.</Authors>
</PropertyGroup>
Expand Down Expand Up @@ -47,4 +47,4 @@
<DocumentationFile></DocumentationFile>
</PropertyGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<Version>1.0.7.0</Version>
<Version>1.0.7.2</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Authors>Stratis Group Ltd.</Authors>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<Version>1.0.6.4</Version>
<Version>1.0.7.2</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Product />
</PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/Stratis.Bitcoin.Features.PoA/PoAMiner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Microsoft.Extensions.Logging;
using NBitcoin;
using Stratis.Bitcoin.AsyncWork;
using Stratis.Bitcoin.Configuration.Logging;
using Stratis.Bitcoin.Connection;
using Stratis.Bitcoin.Consensus;
using Stratis.Bitcoin.Consensus.Validators;
Expand Down Expand Up @@ -400,8 +401,7 @@ private void AddVotingData(BlockTemplate blockTemplate)
[NoTrace]
private void AddComponentStats(StringBuilder log)
{
log.AppendLine();
log.AppendLine("======PoA Miner======");
log.AppendLine(">> Miner");

if (this.ibdState.IsInitialBlockDownload())
{
Expand Down Expand Up @@ -461,8 +461,8 @@ private void AddComponentStats(StringBuilder log)

log.Append("...");
log.AppendLine();
log.AppendLine($"Block producers hits : {hitCount} of {maxDepth}({(((float)hitCount / (float)maxDepth)).ToString("P2")})");
log.AppendLine($"Block producers idle time : {TimeSpan.FromSeconds(this.network.ConsensusOptions.TargetSpacingSeconds * (maxDepth - hitCount)).ToString(@"hh\:mm\:ss")}");
log.AppendLine($"Miner hits".PadRight(LoggingConfiguration.ColumnLength) + $": {hitCount} of {maxDepth}({(((float)hitCount / (float)maxDepth)).ToString("P2")})");
log.AppendLine($"Miner idle time".PadRight(LoggingConfiguration.ColumnLength) + $": { TimeSpan.FromSeconds(this.network.ConsensusOptions.TargetSpacingSeconds * (maxDepth - hitCount)).ToString(@"hh\:mm\:ss")}");
log.AppendLine();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<Version>1.0.7.0</Version>
<Version>1.0.7.2</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Authors>Stratis Group Ltd.</Authors>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<Version>1.0.7.0</Version>
<Version>1.0.7.2</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Authors>Stratis Group Ltd.</Authors>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>1.0.7.1</Version>
<Version>1.0.7.2</Version>
<Authors>Stratis Group Ltd.</Authors>
<PackageId>Stratis.Features.SmartContracts</PackageId>
<Product>Stratis.Features.SmartContracts</Product>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<Version>1.0.7.0</Version>
<Version>1.0.7.2</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Authors>Stratis Group Ltd.</Authors>
</PropertyGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/Stratis.Bitcoin.Features.Wallet/WalletFeature.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ private void AddInlineStats(StringBuilder log)
log.AppendLine("Wallet Height".PadRight(LoggingConfiguration.ColumnLength) + $": {this.walletManager.WalletTipHeight}".PadRight(10) + $"(Hash: {this.walletManager.WalletTipHash})");
else
log.AppendLine("Wallet Height".PadRight(LoggingConfiguration.ColumnLength) + ": No Wallet");

log.AppendLine();
}

private void AddComponentStats(StringBuilder log)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<Version>1.0.7</Version>
<Version>1.0.7.2</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Product />
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<AssemblyVersion>1.0.7.0</AssemblyVersion>
<FileVersion>1.0.7.0</FileVersion>
<Version>1.0.7.0</Version>
<Version>1.0.7.2</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Authors>Stratis Group Ltd.</Authors>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<Version>1.0.7</Version>
<Version>1.0.7.2</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
</PropertyGroup>

Expand Down
Loading

0 comments on commit 7629d70

Please sign in to comment.