Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest PRs into 1.4.0.7 #1116

Draft
wants to merge 45 commits into
base: release/1.4.0.7
Choose a base branch
from

Conversation

quantumagi
Copy link
Contributor

@quantumagi quantumagi commented Jan 30, 2023

This will probably remain a draft PR, for reference only, or it would be re-based before being merged.

zeptin and others added 29 commits January 30, 2023 21:24
* Resolve various code warnings

* Revert inadvertent commit

(cherry picked from commit 8335edc)
* Refactor RecoverStoreTip

* Fix BlockStoreTests

(cherry picked from commit 174a4b5)
* Add "minblksdownload" command-line option

* Update tests

(cherry picked from commit 5a61925)
…lls repo (stratisproject#936)

* Forego unused transactions and unnecessary commits in polls repo

* Initialize CurrentTip at genesis
* [IBD/Rewind] Optimize commitment height rule

* Use SkipValidation

* Revert constructor

(cherry picked from commit d293c7e)
* Resolve TODO - Make ConsensusOptions non-mutable

* Update xml documentation

* Do the same for PoAConsensusOptions

* Make new property protected
(cherry picked from commit 78c5311)
* Add hex version of getblockheader

* Fix test

(cherry picked from commit 1bce97b)
…project#985)

* Add GetBlocks and CommonBlock APIs for chain synchronisation

* Fix typo

* Change method

* Add tests

(cherry picked from commit 4b497d9)
* Refactor MinerSettings

* Fix tests

(cherry picked from commit bd4664a)
* Refactor ApiSettings

* Add comment

* Fix comment

* Fix test

* Fix tests

* Simplify

(cherry picked from commit 4d308a9)
* Remove ScriptDestinationReader

* Fix tests

* Refactor

* Add xml comment

* Fix

* Add serviceLifetime argument

* Require explicit lifetime

* Simplify

* Uncomment code

* Match replacement behavior of other Replace methods

* Refactor

(cherry picked from commit 20e9c3f)
* Fix merge

* Optimize PubKey ToHex, GetHashCode and Equals

(cherry picked from commit 91420ac)
* [IBD/Rewind] Optimize P2PKHNotContractRule

* Use SkipValidation

(cherry picked from commit a40119e)
…roject#1016)

* Coin view to catch-up if off-chain or below chain tip

* Changes based on feedback

* Fix missing argument

(cherry picked from commit 6fc76e1)
* Merge CoinDb implementations

* Reduce changes

* Update db variable name

* Update db variable name

* Add comments to SeekToLast
* Combine ChainStore implementations

* Update tests
* Combine KeyValueStore implementations

* Update tests

(cherry picked from commit 857eb53)
* Remove redundant CoinDb code

* Fix RocksDb.IsValid

* Update test

* Remove whitespace

(cherry picked from commit ae5499e)
* Combine KeyValueStore implementations

* Update tests

* Combine BlockRepository implementations

* RocksDb fix

* Update tests

* Remove unused method

(cherry picked from commit 5a62c21)
(cherry picked from commit ebcebc9)
)

* Combine ProvenBlockHeaderRepository implementations

* Remove unused code

(cherry picked from commit 0545d5e)
* Resolve separate DBreeze CoinDb implementation

* Add tables

* Changes based on feedback

(cherry picked from commit 020228a)
@quantumagi
Copy link
Contributor Author

quantumagi commented Jan 30, 2023

Current progress:

rem Start with 1.4.0.7
git reset --hard upstream/release/1.4.0.7

rem Added two RPC methods for listing transactions (#941)
git cherry-pick -x --allow-empty d846b7eba11faf788445921b9b0c8c6ccf52a0c6
rem Resolve various code warnings (#950)
git cherry-pick -x --allow-empty 8335edc13225017cb8a0a1ce42c92a11439c8b1c
rem [IBD/Rewind] Refactor RecoverStoreTip (#943)
git cherry-pick -x --allow-empty 174a4b57c0774523c5d3fa505025cf7560eb04b0
rem Add "minblksdownload" command-line option (#954)
git cherry-pick -x --allow-empty 5a61925e0dbceeb4b12c36244d375e5eeb0a113a
rem [IBD/Rewind] Forego unused transactions and unnecessary commits in polls repo (#936)
git cherry-pick -x --allow-empty 1ec9a71338a7196ffc94386da4a4fb808615c8f9

Fix.


rem [IBD/Rewind] Optimize commitment height rule (#931)
git cherry-pick -x --allow-empty d293c7e8aac1e106c414912c6d5aec2b2fe4ea00
rem [TODO] Make ConsensusOptions non-mutable (#885)
git cherry-pick -x --allow-empty 93d959cc714cbcc583c459f0cde3288fea12496f

Fix.

rem Fix merge (#967)
git cherry-pick -x --allow-empty 78c5311347b9f5aa26e554b576571e86df10f8ef
rem [API] Add hex version of getblockheader (#983)
git cherry-pick -x --allow-empty 1bce97ba56939052215a05d8628261f20c26823b
rem Add BaseSettings class (#991)
git cherry-pick -x --allow-empty d99b00eb29fbfe1e2a5066a9a778c8417f25d157
rem Add GetBlocks and CommonBlock APIs for chain synchronisation (#985)
git cherry-pick -x --allow-empty 4b497d9eade96b7837639b7b14a50e276f91d195
rem Refactor MinerSettings (#992)
git cherry-pick -x --allow-empty bd4664ad7804632a6556c1cce73ae340020570a0
rem Refactor ApiSettings (#993)
git cherry-pick -x --allow-empty 4d308a9923ec49100eb5f12dfeb14ed6ae48916c
rem Make BatchBlocksFrom re-usable (#1010)
git cherry-pick -x --allow-empty 5226cfe41d9b0c555a14fa703d65100ed3858088
rem Bump NBitcoin version (#1012)
rem git cherry-pick -x --allow-empty 54d8536a104865ece2cefd8b7e7d42a3f00c0290
rem Remove ScriptDestinationReader (#1011)
git cherry-pick -x --allow-empty 20e9c3ff6bc3293428bc63b2d9096d0c566b4c07
rem Optimise tx hash caclulation (#1015)
git cherry-pick -x --allow-empty 957963141b9b94798b4976aada94dc07dae2fc55
rem Move CachedCoinView initialization from PowConsensusRuleEngine (#1014)
git cherry-pick -x --allow-empty a12399aa15de8edb72a90981ad3c690df7348286
rem Optimize PubKey ToHex, GetHashCode and Equals (#968)
git cherry-pick -x --allow-empty 91420ac20a57d6c05efe9c08008f37ed0bb0aeeb
rem [IBD/Rewind] Optimize P2PKHNotContractRule (#930)
git cherry-pick -x --allow-empty a40119ea424252739ad6f4551e64e703a9a2169a
rem Enable coin view to "catch up" if forked or below chain tip (#1016)
git cherry-pick -x --allow-empty 6fc76e1a45706bcfd69634e0d5e6b696b7f844f4
rem Merge CoinDb implementations (#1017)
git cherry-pick -x --allow-empty 69d48e77cf9cab31bb31117331b860edae9ddc77

Fix

rem Optimise ReceiptSearcher (#1022)
rem git cherry-pick -x --allow-empty 9bd909fd39d5b7dc880ba76593fae3fec3d9af14

rem Combine ChainStore implementations (#1025)
git cherry-pick -x --allow-empty 350c5fa5b4135f54e04358580f97d322b2fc22c8

Fix

rem Combine KeyValueStore implementations (#1029)
git cherry-pick -x --allow-empty 857eb537de1de6d04f8e4aa1bb9f8582fb93f9d2
rem Remove redundant CoinDb code (#1021)
git cherry-pick -x --allow-empty ae5499ef3c35788bad214a0f54d7fe17972b5681
rem Combine BlockRepository implementations (#1030)
git cherry-pick -x --allow-empty 5a62c21a1ffdcb23ad2534a799395f43bc71e67e
rem Fix MinerPairStarts test case (#1034)
git cherry-pick -x --allow-empty c32deea799d2bef560fe14b0525f1361c451f12c
rem Merge pull request #1035 from quantumagi/bumpversions1400
rem git cherry-pick -x --allow-empty 2b6a7ca89daca271210c429a2c2b0209d9f9b171
rem Fix CI errors (#1043)
git cherry-pick -x --allow-empty ebcebc939e23eb3ba80dd1e727ef4d45e93d1199
rem Combine ProvenBlockHeaderRepository implementations (#1041)
git cherry-pick -x --allow-empty 0545d5e184d898bfb1bb2ce223b8b43d0629f639
rem Resolve separate DBreeze CoinDb implementation (#1036)
git cherry-pick -x --allow-empty 020228a159b276802efb74b21ebe8b34c808f3fa
rem Merge pull request #1052 from zeptin/receiptsearch-20220910
git cherry-pick -x --allow-empty e3e922b5f568cd5b4231da19cfb91b62e687d9bf

Error: "No -m option". This PR (1052) has to be merged next.

rem Fix attempt to use NFTTransferIndexer with Strax (#1068)
git cherry-pick -x --allow-empty ccbdb00cce25bafe2bf6184c758fdc220293e201
rem Add "verboseaddressesbalances" with POST API (#1069)
git cherry-pick -x --allow-empty c0224d272a9470d9530d338f44aa9b9bf048fe4a
rem Remove unused checkpoints from CachedCoinView constructor (#1071)
git cherry-pick -x --allow-empty a0f638cff513bba44df4c8d7b395769dca526022
rem Pass ChainIndexer argument via CachedCoinView constructor (#1072)
git cherry-pick -x --allow-empty cdcc14c54094277392f8a910b509c04db116bd0f
rem Bump version to 1.5.0.0 (#1077)
git cherry-pick -x --allow-empty 81f5ac64be61289529457502255731cacf37ba1d
rem Fix GetBlockData (#1079)
git cherry-pick -x --allow-empty 17d45204b824dd9c367fbad5556e6557b7043061
rem Fix endianness of delete on rewind table (#1080)
git cherry-pick -x --allow-empty 81d3ad74ad6bcaf90d9a5fa5e3e42c40a85c6d6c
rem Fix EnableAutoKickAsync (#1082)
git cherry-pick -x --allow-empty a569e0bc159d5a81a8e368247a968af4ea471919
rem Fix TestDBreezeSerialization test case (#1081)
git cherry-pick -x --allow-empty 632cdbdb0b3cfe38297322bae8a2d5cc2107167a
rem Optimise GetLastBalanceDecreaseTransaction (#1085)
git cherry-pick -x --allow-empty e6a4cae0750248715fadbf83c44fbbdecbe3389c
rem Refactor WhitelistedHashesRepository (#1090)
git cherry-pick -x --allow-empty 0fa7bfce636461481307a8ecf0183d7af1b26429
rem Update BTC checkpoints (#1096)
git cherry-pick -x --allow-empty 6b60494518038c89e4efb5c86bc21e93d31f4019
rem Add -blockmintxfee setting (#1097)
git cherry-pick -x --allow-empty bdc9f2db52f51036635fc4c09a99c8b9921edb4e

quantumagi and others added 14 commits January 31, 2023 16:54
…ject#1072)

* Pass ChainIndexer argument via CachedCoinView constructor

* Add this

* Add missing locks

* Refactor

(cherry picked from commit cdcc14c)
* Fix endianness of delete on rewind table

* Fix duplicate call

* Fix consistency

* Update mock

(cherry picked from commit 81d3ad7)
* Fix EnableAutoKickAsync

* Improve comment formatting

(cherry picked from commit a569e0b)
* Optimise GeLastBalanceDecreaseTransaction

* Fix indentation
* Refactor WhitelistedHashesRepository

* Add missing bits

* Fix constructor

* Fix

* Enforce poll application in height and id order

* Make UnProcessBlock deterministic
* Update BTC checkpoints

* Fix invalid appsettings field

* Remove unused solution folder

* Fix tests

* Fix test

* Amend non-critical test

(cherry picked from commit 6b60494)
* Add dumpprivkey RPC command

* Revert superfluous change

* Add additional sanity test

* Fix test

* Add -blockmintxfee setting

* Fix settings property usage

(cherry picked from commit bdc9f2d)
@quantumagi
Copy link
Contributor Author

image

@quantumagi
Copy link
Contributor Author

quantumagi commented Jan 31, 2023

image

Catching up starting from 4247934

@quantumagi
Copy link
Contributor Author

quantumagi commented Jan 31, 2023

image

Caught up to current tip.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants