Skip to content
This repository has been archived by the owner on Aug 16, 2021. It is now read-only.

Update the azure branch to Release/3.0.2.0 #3380

Merged
merged 260 commits into from
Mar 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
260 commits
Select commit Hold shift + click to select a range
bee9b50
Change to tag counter chain transaction with sessionId
May 10, 2018
185f2e6
Moved Payload into feature
May 14, 2018
ed481b9
Added address validation to CrossChainTransactionMonitor
May 15, 2018
7f2861e
Refactoring
May 19, 2018
d2d9b87
Changed op_return to byte[] on counter chain
May 19, 2018
81016f3
Removed Add for CounterChainTransactionId
May 19, 2018
096ed64
Refactored SessionManager into two session managers, one for each chain.
May 20, 2018
2f4d2e3
Added new Session managers
May 20, 2018
352e46c
Added new session managers to the feature services.
May 20, 2018
08580a0
Updated monitor to use new session manager.
May 20, 2018
c088a5a
Removed PartialTransactionSessionManager from Monitor
May 20, 2018
a0bed44
Removed old session manager from feature
May 20, 2018
78d8cc8
Removed old session manager from Behavior
May 20, 2018
6ba1a57
updated behavior
May 20, 2018
b19fb10
session updated in feature
May 20, 2018
2aab6b9
Removed PartialTransactionSessionManager
May 20, 2018
bf44f97
Added file PartialTransactionSession.cs
May 20, 2018
4805857
Refactoring MonitorChainSessionManager
May 20, 2018
3109301
Refactored BuildAndBroadcastSession into MonitorChainSession
May 21, 2018
0393616
Refactor MonitorChainSession
May 21, 2018
dde23e9
Refactored controller
May 21, 2018
13e4f2a
Refactoring of RunSessionAsyc
May 21, 2018
714dad2
refactor of sessions
May 21, 2018
e375f9f
added checking for ProcessChainSession
May 21, 2018
b23e59b
Rollback latest changes
May 21, 2018
3e3b615
Added shutdown check before trying to broadcast a transaction.
May 21, 2018
22c46a5
Added shutdown check before trying to broadcast a transaction.
May 21, 2018
13953ea
refactored RunSessionAsync
May 21, 2018
514b05f
refactored RunSessionAsync
May 21, 2018
d275b1d
refactored RunSessionAsync
May 22, 2018
a59dc96
refactored RunSessionAsync
May 22, 2018
404bf54
Removed hard coded federation M and N values.
May 23, 2018
162f8d5
Refactor VerifySession method in CounterChainSessionManager.
May 23, 2018
d86c7f3
Refactor VerifySession method in CounterChainSessionManager.
May 23, 2018
2f96172
Removed hardcoded multisig wallet name and move to config and Federat…
May 29, 2018
090dc1c
Added comments to the CounterChainSessionManager.
May 31, 2018
e136f99
Added comments to several files.
May 31, 2018
c351b85
Attempt to merge Enigma and EnigmaChain
Jun 5, 2018
fd8f51c
Updated the solution with the latest Stratis.Bitcoin nuget packages
Jun 5, 2018
b573a09
Removed the custom encryption algos
bokobza Jun 8, 2018
1ff3a45
Remove custom env mockup helpers (#5)
monsieurleberre Jun 11, 2018
8a8bffe
Jeremy's PR 14 reproduced with pr5 changes in (#15)
monsieurleberre Jun 11, 2018
c416d9c
Remove some tests (#17)
bokobza Jun 12, 2018
dae4f32
tidied up references (#18)
bokobza Jun 12, 2018
45d9b25
Gateway deamons and GatewaySettings changes (#20)
monsieurleberre Jun 12, 2018
15d0847
Nuget update (#21)
bokobza Jun 12, 2018
eff4423
Networkz (#22)
bokobza Jun 13, 2018
4cb9cd5
Update GPW with mnemonic and HD multisig capability (#7)
zeptin Jun 13, 2018
0c41a24
Add nodes (#23)
bokobza Jun 13, 2018
1f5645d
added import-key endpoint (#24)
bokobza Jun 13, 2018
22fb97a
Multisig wallet (#26)
bokobza Jun 15, 2018
c6481b6
wallet check before save (#28)
bokobza Jun 15, 2018
8a71554
Wallet check (#29)
bokobza Jun 15, 2018
e45eeaa
now creating the wallet file when the node is started the first time,…
bokobza Jun 15, 2018
c4ab211
Remove FederationFolder logic and use FederationGatewaySettings inste…
monsieurleberre Jun 16, 2018
ac07cf5
Fix error in boss card passing and block delay checks (#32)
zeptin Jun 16, 2018
4d0085c
Added signing of outputs with the private key (#33)
bokobza Jun 17, 2018
5c0fb98
Logging additions (#34)
bokobza Jun 17, 2018
fb455c5
Use correct representation of pubkey (#35)
zeptin Jun 17, 2018
a9f7ca8
Moved the FederatedPeg project into the FederationGateway project (#36)
bokobza Jun 17, 2018
2882c87
WalletReference and AddCoins (#37)
bokobza Jun 17, 2018
c9659c4
fixed the build (#38)
bokobza Jun 17, 2018
97ebc9e
Federation objects (#39)
bokobza Jun 17, 2018
97207f7
added GetFull Transaction method (#40)
bokobza Jun 17, 2018
64c0ab6
MemberName in the logs (#41)
bokobza Jun 18, 2018
e302672
Upgrade 1.1.11 to 1.1.12 (#42)
monsieurleberre Jun 18, 2018
29195aa
Added default constructor for payload. (#43)
carlton355 Jun 18, 2018
1181147
first suggestion for AddPartial fix (#45)
monsieurleberre Jun 18, 2018
5a08594
Partial list (#46)
bokobza Jun 19, 2018
273971b
updated nuget packages (#48)
bokobza Jun 19, 2018
2ca6042
Small fixes (#49)
bokobza Jun 19, 2018
ce89da3
check if a Peer is in the federation before registering or sending me…
monsieurleberre Jun 19, 2018
3b5242a
Remove hardcoded password and add API call to supply password after n…
zeptin Jun 19, 2018
5faef6a
Partial transaction for federation members only (#52)
monsieurleberre Jun 20, 2018
504c5a2
Added propogation of final destination transactionId back to the moni…
carlton355 Jun 20, 2018
e9a294b
handle exceptions in cross-chain calls (#57)
bokobza Jun 20, 2018
b218d78
Deposit (#58)
bokobza Jun 21, 2018
3295f5a
Minining on Sidechain members (#60)
bokobza Jun 21, 2018
b2f348a
Improvements (#61)
bokobza Jun 22, 2018
e3abfc9
Removed some files (#62)
bokobza Jun 22, 2018
9d98814
Added minimum transfer amount constraint. (#63)
carlton355 Jun 22, 2018
d81a1c9
CounterChainTransactionId propogation. Completed and Tested version.…
carlton355 Jun 22, 2018
21c9af6
Ensure all nodes get the CounterChainTransactionId (#66)
carlton355 Jun 23, 2018
fe5b954
first cut, try to remove dependency of bosscard on transaction hash (…
monsieurleberre Jun 26, 2018
f399755
Sessions (#70)
bokobza Jun 26, 2018
6e72154
Few minor cleanups, hopefully an easy PR (#71)
monsieurleberre Sep 17, 2018
f0a8200
upgrade to dotnetcore 2.1, tests as libraries (#98)
monsieurleberre Sep 21, 2018
3a6583f
Upgrade to fullnode 1.2.1 beta (#110)
monsieurleberre Sep 26, 2018
acef79c
make sure all projects are in full debug mode, needed for code covera…
monsieurleberre Oct 9, 2018
0e23a5f
OpReturnDataReader (#140)
monsieurleberre Oct 14, 2018
d25c342
minor refactor, do not accept two op_returns, test for it (#141)
monsieurleberre Oct 29, 2018
74647c3
introduce interface for settings and make them readonly (#142)
monsieurleberre Oct 29, 2018
fcf125a
introducing deposit class (#143)
monsieurleberre Oct 30, 2018
c6d3f9f
upgrades libraries (#144)
monsieurleberre Oct 30, 2018
49aeba5
only extract deposits from blocks that have matured (#147)
monsieurleberre Nov 2, 2018
cd0b92f
my bad, I didn't change all the types to use the interface :/ (#149)
monsieurleberre Nov 5, 2018
c0986f2
Add Apex NetworkSelector (#148)
quantumagi Nov 6, 2018
4117957
use rest to post new matured blocks because it is easier to understan…
monsieurleberre Nov 6, 2018
4e1a9de
Leader ordering and change. (#150)
ferdeen Nov 7, 2018
102a0dd
Add code analysis rule-set to each project. (#153)
ferdeen Nov 7, 2018
97a9a90
Removed string parameter from constructor. (#154)
ferdeen Nov 8, 2018
c123144
Deterministic creation of target transactions (#155)
quantumagi Nov 8, 2018
869b258
introducing withdrawals (from multisig to target addresses) (#152)
monsieurleberre Nov 8, 2018
5cd41e3
Rename restMaturedBlockSenderTests.cs to RestMaturedBlockSenderTests.…
monsieurleberre Nov 8, 2018
c31d1da
Template transaction database (#118)
zeptin Nov 9, 2018
20126d2
Cross chain transfers statuses suggestion (#159)
monsieurleberre Nov 9, 2018
b15c825
Cross Chain Transfer Store (#161)
quantumagi Nov 12, 2018
517a20e
Move ExtractDepositsFromBlock into IDepositExtractor and Resync matur…
ferdeen Nov 12, 2018
0f0e080
we can't use services.AddHttpClient from Microsoft.Extensions.Http as…
monsieurleberre Nov 12, 2018
15660b2
fix the serialisation of the hash, add test (#164)
monsieurleberre Nov 12, 2018
3991441
Test for RestBlockTipSender(). (#162)
ferdeen Nov 12, 2018
f2bf39a
Adds the SynchronizeAsync method and a test case (#165)
quantumagi Nov 13, 2018
cbfc504
Add test case (#166)
quantumagi Nov 14, 2018
2541261
Fix readme try better coverage (#169)
monsieurleberre Nov 14, 2018
0ec9d15
Add sanity check to sync between store and wallet (#167)
quantumagi Nov 14, 2018
ebbbe44
Withdrawal extractor tests (#168)
monsieurleberre Nov 14, 2018
2376d15
Just cosmetics (#170)
monsieurleberre Nov 14, 2018
98b64d0
Add StoringDepositWhenWalletBalanceSufficientSucceeds test and refact…
quantumagi Nov 15, 2018
cbd6b1a
Events persister (#171)
monsieurleberre Nov 15, 2018
6532e61
Event persist withdrawals (#175)
monsieurleberre Nov 15, 2018
1792b94
Refactor store to chase wallet tip (#176)
quantumagi Nov 16, 2018
c02c3f6
Event persist withdrawals (#177)
monsieurleberre Nov 16, 2018
cf94ac3
remove some code from alpha version (#179)
monsieurleberre Nov 16, 2018
f1e90d2
Finialize CrossChainStore initial test cases and refactoring (#180)
quantumagi Nov 20, 2018
bafeb9a
upgrade stratis packages to 1.2.4 and FluentAssertions to 5.5.3 (#181)
monsieurleberre Nov 20, 2018
3427ece
Add `Suspended` status to store (#185)
quantumagi Nov 21, 2018
391dccb
Implement PartialTransactionRequester (#186)
quantumagi Nov 22, 2018
8d5effe
Adding a POA federated peg network (#182)
monsieurleberre Nov 22, 2018
b8cbab1
add a "test" to run the different tools from within VisualStudio (#187)
monsieurleberre Nov 22, 2018
f5680f4
Signed multisig transaction broadcaster. (#183)
ferdeen Nov 22, 2018
6175326
change the prefixes (#192)
monsieurleberre Nov 26, 2018
8465638
Fix deposit to store feeding mechanism (#188)
quantumagi Nov 27, 2018
fd90dcd
Stratis packages upgrade 1.2.4 to 1.2.5 (#193)
monsieurleberre Nov 27, 2018
83c947e
maybe just to share some tool for now (#194)
monsieurleberre Nov 28, 2018
a5a385e
BlockObverver.OnNextCore must not try to extract deposits from the la…
quantumagi Nov 28, 2018
764dd83
Address ChainedHeader.Block being null sometimes (#198)
quantumagi Nov 29, 2018
3d6bc83
Add POA key file generation to script builder (#197)
monsieurleberre Nov 30, 2018
a4a997d
Add locks and check that the federated wallet manager dealt with any …
quantumagi Dec 3, 2018
2e88e2f
Allow minimum deposit confirmations to be changed from config param (…
monsieurleberre Dec 3, 2018
5a3ed0a
Fix deposit extractor (#212)
quantumagi Dec 4, 2018
158d5e3
remove obsolete method (#215)
monsieurleberre Dec 5, 2018
b603e51
better block definition (#218)
monsieurleberre Dec 6, 2018
523dda7
Fix testing issues (#213)
quantumagi Dec 6, 2018
d4fdb9b
add SmartContractPoABlockHeader (#220)
monsieurleberre Dec 6, 2018
64f1d7f
Setup of FederatedPegTest (#221)
bokobza Dec 7, 2018
4fab2ed
Added checks to the members' script (#226)
bokobza Dec 10, 2018
1410570
Improve stability and fault tolerance (#225)
quantumagi Dec 10, 2018
7612522
reward should only go to multisig at premine height (#229)
monsieurleberre Dec 10, 2018
7a47a2c
Fix daemons (#228)
bokobza Dec 10, 2018
c3be5e8
Fix some SC dependencies (#231)
bokobza Dec 10, 2018
4ce2df9
Fix the block definition for SmartContracts (#232)
bokobza Dec 10, 2018
38f6e67
Fix the Build index (#233)
bokobza Dec 11, 2018
e203607
Int test fed node setup and leader test (#230)
ferdeen Dec 11, 2018
83dd982
upgrade fullnode from 1.2.6 to 1.2.7 (#236)
monsieurleberre Dec 11, 2018
2c08ad8
upgrade to release version of FullNode (#238)
monsieurleberre Dec 11, 2018
0132bcc
Add default collection if federationips param is not set (#240)
rowandh Dec 12, 2018
dc00580
Integration tests that include SC (#235)
codingupastorm Dec 12, 2018
2c3cdf6
Running non-stop (#241)
quantumagi Dec 12, 2018
b122641
Setup main and side chain nodes with config (#243)
ferdeen Dec 12, 2018
5955cf7
Configured Fody (#245)
noescape00 Dec 12, 2018
225ee6a
Make console message less verbose and more useful/understandable (#252)
quantumagi Dec 13, 2018
c7c822f
Fixing codestyle issues (#253)
noescape00 Dec 13, 2018
1b4aa0c
fix codestyle violations part 2 (#256)
noescape00 Dec 13, 2018
88ad0fe
package upgrade to 3.0.0.0 to 3.0.0.1 (#257)
monsieurleberre Dec 13, 2018
45b650a
fix methods in opreturn reader (#261)
noescape00 Dec 13, 2018
ff5ae7a
Comments and minor improvements (#264)
noescape00 Dec 13, 2018
41fc4ea
Wallet cancellation not to throw (#262)
dangershony Dec 13, 2018
65e4c30
No tracing for ConcreteConverter.ReadJson (#267)
bokobza Dec 13, 2018
ab7c2a7
Add remove-transactions endpoint (#271)
zeptin Dec 14, 2018
fbae117
Fix sidechain node in tests, differentiate between different node typ…
codingupastorm Dec 14, 2018
50fdace
improved the dump of NodeStore information (#275)
MithrilMan Dec 14, 2018
1fa18f5
RestClient for FederationGatewayController - code architecture improv…
noescape00 Dec 14, 2018
5615eab
Model deserialization bugfix (#280)
noescape00 Dec 14, 2018
82e2818
Trace transfer flow (#278)
dangershony Dec 16, 2018
6b7c397
Upgrade stratis nuget packages (#292)
bokobza Dec 16, 2018
f8ba308
Fix broadcaster to check existence on tid vs depid (#296)
quantumagi Dec 17, 2018
354738f
Add GetInfo API endpoint (#291)
bokobza Dec 17, 2018
bcf35f3
Display recent withdrawal information to console (#294)
quantumagi Dec 17, 2018
4d85d41
Fix store startup to process transaction in sorted order (#295)
quantumagi Dec 17, 2018
b51533d
Added polly (#301)
noescape00 Dec 17, 2018
c0cc46c
Prevent duplicate block requests (#302)
quantumagi Dec 17, 2018
213c0fd
Logging and codestyle (#304)
noescape00 Dec 17, 2018
a79434b
fix the logs and add a test for it (#306)
monsieurleberre Dec 17, 2018
52a2ac8
Codestyle & removed trace entry exit logs (#307)
noescape00 Dec 17, 2018
11c7cf4
Refactoring (#308)
noescape00 Dec 17, 2018
91681db
NuGet update and Dbreeze serialization fix (#309)
codingupastorm Dec 18, 2018
cb5c53a
Fix a few small issues (#312)
quantumagi Dec 18, 2018
0335902
Make tests currently running against FedPeg network run against Strat…
quantumagi Dec 18, 2018
b187052
big warning on inactive federation wallets (#319)
monsieurleberre Dec 18, 2018
f6cc62a
Add Signature Counts to Console (#317)
quantumagi Dec 18, 2018
edc0a6f
enable passphrase when deriving extended key in multisig wallet (#322)
monsieurleberre Dec 18, 2018
4986107
Refactore how we get matured blocks (#318)
noescape00 Dec 18, 2018
2417bfe
Bug fix for MaturedBlocksProvider (#321)
noescape00 Dec 18, 2018
856aa48
Remove unused method from FederationWalletManager (#326)
quantumagi Dec 19, 2018
db88c76
SC nuget update (#330)
bokobza Dec 19, 2018
b147c2e
Fix for: Polly prevents node syncing when counter chain API isn't ava…
noescape00 Dec 19, 2018
46d77f8
Add caching to MaturedBlocksProvider (#334)
quantumagi Dec 20, 2018
ec91e41
Make sure that the minimum fee is respected (#332)
bokobza Dec 20, 2018
600e2d1
Removed unused UpdateWhenChainDownloaded method (#336)
quantumagi Dec 20, 2018
1ae2ff2
Update sc nugets (#338)
rowandh Dec 20, 2018
13b97a0
Fix signature count (#335)
quantumagi Dec 20, 2018
c65eaad
NuGet fix (#341)
codingupastorm Dec 20, 2018
d863a00
Cache results of IsFederationActive (961ms) (#327)
quantumagi Dec 20, 2018
8182b55
Removed cache from MaturedBlocksProvider and reduced batch side, adde…
noescape00 Dec 20, 2018
fe380b2
FedPegMain definition (#343)
bokobza Dec 20, 2018
2616719
small fix for 323 (#347)
monsieurleberre Dec 21, 2018
3545d67
Clean up warning and associated code-style (#351)
quantumagi Dec 21, 2018
bf3f9cf
Change Xunit Retry reference (#352)
monsieurleberre Dec 21, 2018
21d5c92
Remove WithdrawalHistoryProvider (#353)
quantumagi Dec 21, 2018
25ee13c
Revert "Remove WithdrawalHistoryProvider" (#354)
bokobza Dec 21, 2018
c77cf62
updated to SBFN 3.0.0.4 beta (#355)
bokobza Dec 21, 2018
fd186ad
Mnemonic is optional (#356)
quantumagi Dec 21, 2018
a88a957
Cirrus parameters (#359)
bokobza Dec 23, 2018
b6d69e4
NuGet version updates (#360)
codingupastorm Dec 23, 2018
fd12a0a
Add federation IPs as seeds (#364)
zeptin Dec 27, 2018
b40046c
tests for FederationWalletController (#357)
noescape00 Jan 7, 2019
c814cdc
Revert "tests for FederationWalletController" (#367)
monsieurleberre Jan 7, 2019
e7eabce
Cleanup: unused code & interfaces (#358)
noescape00 Jan 14, 2019
78e9a26
now it builds (#370)
monsieurleberre Jan 15, 2019
55697ba
Fixed carriage return problems on non-windows machines (#372)
justintopham Jan 25, 2019
2d69139
Merge branch 'master' of C:\Users\jorda\source\repos\FederatedSidechains
codingupastorm Feb 24, 2019
9522e36
Updates to work in new solution
codingupastorm Feb 24, 2019
7e68767
bump release to v3.0.1.0 (#3281)
bokobza Feb 26, 2019
c042844
Create new beta version 3020-beta (#3284)
bokobza Feb 26, 2019
92454c8
Extend cold staking on testnet (#3282)
dangershony Feb 26, 2019
36797dc
Update PosMinting.cs (#3285)
Feb 27, 2019
dab09cf
[FS] Skip tests with flag that can be turned off (#3288)
codingupastorm Feb 27, 2019
6f6d696
[FS] Remove unused code (#3289)
codingupastorm Feb 27, 2019
5b38a94
Merge bug-fixes from release/3.0.1.0 (#3290)
Feb 27, 2019
059aced
Fix test (#3291)
fassadlr Feb 27, 2019
a13508b
Merge remote-tracking branch 'stratis/master' into sidechains-history
bokobza Feb 28, 2019
6e17115
Added posNoRetargeting to sidechains networks
bokobza Feb 28, 2019
0eb3c99
Add versions to "deploymentflags" api (#3294)
quantumagi Feb 28, 2019
ff9ca2d
[FS] Move transaction building to own file (#3292)
codingupastorm Mar 1, 2019
b191986
[Wallet] Added actual spendable amount to the balance call (#3300)
bokobza Mar 1, 2019
fa168f0
Add readydata to more integration tests (#3299)
fassadlr Mar 1, 2019
d859b3b
Merge pull request #3287 from stratisproject/sidechains-history
bokobza Mar 1, 2019
4a35600
Fix Ensure_Peer_CanDiscover_Address_From_ConnectedPeers_And_Connect_T…
fassadlr Mar 1, 2019
1dba1e7
[SC] Upgrade to Stratis.SmartContracts 1.2.1 (#3262)
rowandh Mar 4, 2019
ba6d20b
Bump version after the sidechain commit (#3304)
dangershony Mar 4, 2019
4326d2f
Handle Int64 config keys (#3305)
zeptin Mar 4, 2019
28b50a2
Update assumevalid hashes for various networks (#3310)
Mar 4, 2019
320ac3e
Modified ArchiveFileName so that NLog will archive log files into the…
Mar 4, 2019
dccc662
Fixed peer that were stuck (#3296)
MithrilMan Mar 4, 2019
f32a7ef
Fix archive file null
dangershony Mar 4, 2019
a223fcf
[FS] Update FederationGatewayFeature to run in new FN (#3317)
codingupastorm Mar 5, 2019
b9c7b3a
Merge pull request #3316 from dangershony/fix-log-file-bug
bokobza Mar 5, 2019
c7a3b23
Only load wallet if it has not already been loaded
rowandh Mar 6, 2019
34893ad
Update doc
rowandh Mar 6, 2019
342d612
Remove the beta from the release
dangershony Mar 13, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/NBitcoin.Tests/NetworkTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public void BitcoinMainnetIsInitializedCorrectly()
Assert.Equal(Utils.UnixTimeToDateTime(1510704000), this.networkMain.Consensus.BIP9Deployments[BitcoinBIP9Deployments.Segwit].Timeout);
Assert.Equal(0, this.networkMain.Consensus.CoinType);
Assert.False(this.networkMain.Consensus.IsProofOfStake);
Assert.Equal(new uint256("0x000000000000000000174f783cc20c1415f90c4d17c9a5bcd06ba67207c9bc80"), this.networkMain.Consensus.DefaultAssumeValid);
Assert.Equal(new uint256("0x0000000000000000000f1c54590ee18d15ec70e68c8cd4cfbadb1b4f11697eee"), this.networkMain.Consensus.DefaultAssumeValid);
Assert.Equal(100, this.networkMain.Consensus.CoinbaseMaturity);
Assert.Equal(0, this.networkMain.Consensus.PremineReward);
Assert.Equal(0, this.networkMain.Consensus.PremineHeight);
Expand Down Expand Up @@ -225,7 +225,7 @@ public void BitcoinTestnetIsInitializedCorrectly()
Assert.Equal(Utils.UnixTimeToDateTime(1493596800), network.Consensus.BIP9Deployments[BitcoinBIP9Deployments.Segwit].Timeout);
Assert.Equal(1, network.Consensus.CoinType);
Assert.False(network.Consensus.IsProofOfStake);
Assert.Equal(new uint256("0x000000000000015682a21fc3b1e5420435678cba99cace2b07fe69b668467651"), network.Consensus.DefaultAssumeValid);
Assert.Equal(new uint256("0x0000000000000037a8cd3e06cd5edbfe9dd1dbcc5dacab279376ef7cfc2b4c75"), network.Consensus.DefaultAssumeValid);
Assert.Equal(100, network.Consensus.CoinbaseMaturity);
Assert.Equal(0, network.Consensus.PremineReward);
Assert.Equal(0, network.Consensus.PremineHeight);
Expand Down Expand Up @@ -383,7 +383,7 @@ public void StratisMainIsInitializedCorrectly()
Assert.Equal(105, network.Consensus.CoinType);
Assert.Equal(new BigInteger(uint256.Parse("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").ToBytes(false)), network.Consensus.ProofOfStakeLimit);
Assert.Equal(new BigInteger(uint256.Parse("000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffff").ToBytes(false)), network.Consensus.ProofOfStakeLimitV2);
Assert.Equal(new uint256("0x55a8205ae4bbf18f4d238c43f43005bd66e0b1f679b39e2c5c62cf6903693a5e"), network.Consensus.DefaultAssumeValid);
Assert.Equal(new uint256("0x50497017e7bb256df205fcbc2caccbe5b516cb33491e1a11737a3bfe83959b9f"), network.Consensus.DefaultAssumeValid);
Assert.Equal(50, network.Consensus.CoinbaseMaturity);
Assert.Equal(Money.Coins(98000000), network.Consensus.PremineReward);
Assert.Equal(2, network.Consensus.PremineHeight);
Expand Down Expand Up @@ -460,7 +460,7 @@ public void StratisTestnetIsInitializedCorrectly()
Assert.Equal(105, network.Consensus.CoinType);
Assert.Equal(new BigInteger(uint256.Parse("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").ToBytes(false)), network.Consensus.ProofOfStakeLimit);
Assert.Equal(new BigInteger(uint256.Parse("000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffff").ToBytes(false)), network.Consensus.ProofOfStakeLimitV2);
Assert.Equal(new uint256("0x98fa6ef0bca5b431f15fd79dc6f879dc45b83ed4b1bbe933a383ef438321958e"), network.Consensus.DefaultAssumeValid);
Assert.Equal(new uint256("0xc9a15c9dd87c6219b273f93442b87fdaf9eebb4f3059d8ed8239c41a4ab3e730"), network.Consensus.DefaultAssumeValid);
Assert.Equal(10, network.Consensus.CoinbaseMaturity);
Assert.Equal(Money.Coins(98000000), network.Consensus.PremineReward);
Assert.Equal(2, network.Consensus.PremineHeight);
Expand Down
2 changes: 1 addition & 1 deletion src/NBitcoin/NBitcoin.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<PropertyGroup>
<Version>4.0.0.73</Version>
<Version>4.0.0.74</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<OutputType>Library</OutputType>
<PackageId>Stratis.Bitcoin.Api</PackageId>
<RuntimeFrameworkVersion>2.1.1</RuntimeFrameworkVersion>
<Version>3.0.0.4-beta</Version>
<Version>3.0.2.0</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<ApplicationIcon />
<OutputTypeEx>library</OutputTypeEx>
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>3.0.0.4-beta</Version>
<Version>3.0.2.0</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
</PropertyGroup>
<ItemGroup>
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.1.14-beta</Version>
<Version>3.0.2.0</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
</PropertyGroup>

Expand Down
8 changes: 7 additions & 1 deletion src/Stratis.Bitcoin.Features.Consensus/StakeValidator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,13 @@ public Target GetNextTargetRequired(IStakeChain stakeChain, ChainedHeader chaine
}

// This is used in tests to allow quickly mining blocks.
if (consensus.PosNoRetargeting)
if (!proofOfStake && consensus.PowNoRetargeting)
{
this.logger.LogTrace("(-)[NO_POW_RETARGET]:'{0}'", lastPowPosBlock.Header.Bits);
return lastPowPosBlock.Header.Bits;
}

if (proofOfStake && consensus.PosNoRetargeting)
{
this.logger.LogTrace("(-)[NO_POS_RETARGET]:'{0}'", lastPowPosBlock.Header.Bits);
return lastPowPosBlock.Header.Bits;
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>3.0.0.4-beta</Version>
<Version>3.0.2.0</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
</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>3.0.0.4-beta</Version>
<Version>3.0.2.0</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
</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>3.0.0.4-beta</Version>
<Version>3.0.2.0</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
</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>3.0.0.4-beta</Version>
<Version>3.0.2.0</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<ApplicationIcon />
<OutputTypeEx>library</OutputTypeEx>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.Miner/Staking/PosMinting.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public enum CurrentState
/// but high enough to compensate for tasks' overhead.</remarks>
private const int UtxoStakeDescriptionsPerCoinstakeWorker = 25;

/// <summary>Consumes manager class.</summary>
/// <summary>Consensus manager class.</summary>
private readonly IConsensusManager consensusManager;

/// <summary>Thread safe access to the best chain of block headers (that the node is aware of) from genesis.</summary>
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>3.0.0.4-beta</Version>
<Version>3.0.2.0</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
</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>3.0.0.4-beta</Version>
<Version>3.0.2.0</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
</PropertyGroup>
<ItemGroup>
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>3.0.0.4-beta</Version>
<Version>3.0.2.0</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Product />
</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>3.0.0.4-beta</Version>
<Version>3.0.2.0</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
</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>3.0.0.4-beta</Version>
<Version>3.0.2.0</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
</PropertyGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using Stratis.SmartContracts.CLR;
using Stratis.SmartContracts.CLR.Serialization;
using Stratis.SmartContracts.Networks;
using Stratis.SmartContracts.RuntimeObserver;
using Xunit;

namespace Stratis.Bitcoin.Features.SmartContracts.Tests.Consensus.Rules
Expand Down Expand Up @@ -72,7 +73,7 @@ public async Task SmartContractFormatRule_SuccessAsync()

var totalSuppliedSatoshis = gasBudgetSatoshis + relayFeeSatoshis;

var contractTxData = new ContractTxData(1, (ulong)gasPriceSatoshis, (Stratis.SmartContracts.RuntimeObserver.Gas)gasLimit, 0, "TestMethod");
var contractTxData = new ContractTxData(1, (ulong)gasPriceSatoshis, (Gas)gasLimit, 0, "TestMethod");
var serialized = this.callDataSerializer.Serialize(contractTxData);

Transaction funding = new Transaction
Expand Down Expand Up @@ -119,7 +120,7 @@ public async Task SmartContractFormatRule_MultipleOutputs_SuccessAsync()

var totalSuppliedSatoshis = gasBudgetSatoshis + relayFeeSatoshis;

var contractTxData = new ContractTxData(1, (ulong)gasPriceSatoshis, (Stratis.SmartContracts.RuntimeObserver.Gas)gasLimit, 0, "TestMethod");
var contractTxData = new ContractTxData(1, (ulong)gasPriceSatoshis, (Gas)gasLimit, 0, "TestMethod");
var serialized = this.callDataSerializer.Serialize(contractTxData);

Transaction funding = new Transaction
Expand Down Expand Up @@ -170,7 +171,7 @@ public async Task SmartContractFormatRule_FailureAsync()

var higherGasLimit = gasLimit + 10000;

var contractTxData = new ContractTxData(1, (ulong)gasPriceSatoshis, (Stratis.SmartContracts.RuntimeObserver.Gas)higherGasLimit, 0, "TestMethod");
var contractTxData = new ContractTxData(1, (ulong)gasPriceSatoshis, (Gas)higherGasLimit, 0, "TestMethod");
var serialized = this.callDataSerializer.Serialize(contractTxData);

Transaction funding = new Transaction
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
using Stratis.SmartContracts.CLR;
using Stratis.SmartContracts.CLR.Serialization;
using Stratis.SmartContracts.Networks;
using Stratis.SmartContracts.RuntimeObserver;
using Xunit;

namespace Stratis.Bitcoin.Features.SmartContracts.Tests.Controllers
Expand Down Expand Up @@ -49,7 +50,7 @@ public void GetHistoryWithValidModelWithoutTransactionSpendingDetailsReturnsWall
{
ulong gasPrice = SmartContractMempoolValidator.MinGasPrice;
int vmVersion = 1;
var gasLimit = (Stratis.SmartContracts.RuntimeObserver.Gas)(SmartContractFormatLogic.GasLimitMaximum / 2);
var gasLimit = (Gas)(SmartContractFormatLogic.GasLimitMaximum / 2);
var contractTxData = new ContractTxData(vmVersion, gasPrice, gasLimit, new byte[]{0, 1, 2, 3});
var callDataSerializer = new CallDataSerializer(new ContractPrimitiveSerializer(new SmartContractsRegTest()));
var contractCreateScript = new Script(callDataSerializer.Serialize(contractTxData));
Expand Down Expand Up @@ -94,7 +95,7 @@ public void GetHistoryWithValidModelWithoutTransactionSpendingDetailsReturnsWall
this.receiptRepository.Setup(x => x.Retrieve(It.IsAny<uint256>()))
.Returns(new Receipt(null, 0, new Log[0], null, null, null, uint160.Zero, true, null, null));
this.callDataSerializer.Setup(x => x.Deserialize(It.IsAny<byte[]>()))
.Returns(Result.Ok(new ContractTxData(0, 0, (Stratis.SmartContracts.RuntimeObserver.Gas) 0, new uint160(0), null, null)));
.Returns(Result.Ok(new ContractTxData(0, 0, (Gas) 0, new uint160(0), null, null)));

var controller = new SmartContractWalletController(
this.broadcasterManager.Object,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="Stratis.SmartContracts" Version="1.1.0" />
<PackageReference Include="Stratis.SmartContracts" Version="1.2.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

<ItemGroup>
<PackageReference Include="CSharpFunctionalExtensions" Version="1.10.0" />
<PackageReference Include="Stratis.SmartContracts" Version="1.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using Stratis.SmartContracts.CLR.Serialization;
using Stratis.SmartContracts.Core;
using Stratis.SmartContracts.Core.ContractSigning;
using Stratis.SmartContracts.RuntimeObserver;

namespace Stratis.Bitcoin.Features.SmartContracts.Wallet
{
Expand Down Expand Up @@ -63,7 +64,7 @@ public BuildCallContractTransactionResponse BuildCallTx(BuildCallContractTransac
try
{
object[] methodParameters = this.methodParameterStringSerializer.Deserialize(request.Parameters);
txData = new ContractTxData(ReflectionVirtualMachine.VmVersion, (Stratis.SmartContracts.RuntimeObserver.Gas)request.GasPrice, (Stratis.SmartContracts.RuntimeObserver.Gas)request.GasLimit, addressNumeric, request.MethodName, methodParameters);
txData = new ContractTxData(ReflectionVirtualMachine.VmVersion, (Gas)request.GasPrice, (Gas)request.GasLimit, addressNumeric, request.MethodName, methodParameters);
}
catch (MethodParameterStringSerializerException exception)
{
Expand All @@ -72,7 +73,7 @@ public BuildCallContractTransactionResponse BuildCallTx(BuildCallContractTransac
}
else
{
txData = new ContractTxData(ReflectionVirtualMachine.VmVersion, (Stratis.SmartContracts.RuntimeObserver.Gas)request.GasPrice, (Stratis.SmartContracts.RuntimeObserver.Gas)request.GasLimit, addressNumeric, request.MethodName);
txData = new ContractTxData(ReflectionVirtualMachine.VmVersion, (Gas)request.GasPrice, (Gas)request.GasLimit, addressNumeric, request.MethodName);
}

HdAddress senderAddress = null;
Expand Down Expand Up @@ -124,7 +125,7 @@ public BuildCreateContractTransactionResponse BuildCreateTx(BuildCreateContractT
try
{
object[] methodParameters = this.methodParameterStringSerializer.Deserialize(request.Parameters);
txData = new ContractTxData(ReflectionVirtualMachine.VmVersion, (Stratis.SmartContracts.RuntimeObserver.Gas)request.GasPrice, (Stratis.SmartContracts.RuntimeObserver.Gas)request.GasLimit, request.ContractCode.HexToByteArray(), methodParameters);
txData = new ContractTxData(ReflectionVirtualMachine.VmVersion, (Gas)request.GasPrice, (Gas)request.GasLimit, request.ContractCode.HexToByteArray(), methodParameters);
}
catch (MethodParameterStringSerializerException exception)
{
Expand All @@ -133,7 +134,7 @@ public BuildCreateContractTransactionResponse BuildCreateTx(BuildCreateContractT
}
else
{
txData = new ContractTxData(ReflectionVirtualMachine.VmVersion, (Stratis.SmartContracts.RuntimeObserver.Gas)request.GasPrice, (Stratis.SmartContracts.RuntimeObserver.Gas)request.GasLimit, request.ContractCode.HexToByteArray());
txData = new ContractTxData(ReflectionVirtualMachine.VmVersion, (Gas)request.GasPrice, (Gas)request.GasLimit, request.ContractCode.HexToByteArray());
}

HdAddress senderAddress = null;
Expand Down Expand Up @@ -205,10 +206,10 @@ public ContractTxData BuildLocalCallTxData(LocalCallContractRequest request)
{
object[] methodParameters = this.methodParameterStringSerializer.Deserialize(request.Parameters);

return new ContractTxData(ReflectionVirtualMachine.VmVersion, (Stratis.SmartContracts.RuntimeObserver.Gas)request.GasPrice, (Stratis.SmartContracts.RuntimeObserver.Gas)request.GasLimit, contractAddress, request.MethodName, methodParameters);
return new ContractTxData(ReflectionVirtualMachine.VmVersion, (Gas)request.GasPrice, (Gas)request.GasLimit, contractAddress, request.MethodName, methodParameters);
}

return new ContractTxData(ReflectionVirtualMachine.VmVersion, (Stratis.SmartContracts.RuntimeObserver.Gas)request.GasPrice, (Stratis.SmartContracts.RuntimeObserver.Gas)request.GasLimit, contractAddress, request.MethodName);
return new ContractTxData(ReflectionVirtualMachine.VmVersion, (Gas)request.GasPrice, (Gas)request.GasLimit, contractAddress, request.MethodName);
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public IActionResult GetHistory(string walletName, string address)

// Represents a sublist of transactions associated with receive addresses + a sublist of already spent transactions associated with change addresses.
// In effect, we filter out 'change' transactions that are not spent, as we don't want to show these in the history.
List<FlatHistory> history = items.Where(t => !t.Address.IsChangeAddress() || (t.Address.IsChangeAddress() && !t.Transaction.IsSpendable())).ToList();
List<FlatHistory> history = items.Where(t => !t.Address.IsChangeAddress() || (t.Address.IsChangeAddress() && t.Transaction.IsSpent())).ToList();

foreach (FlatHistory item in history)
{
Expand Down
Loading