parametrize genesis block #988

toxeus · 2018-07-11T08:34:57Z

The libbitcoin-build script didn't change anything so I'm assuming that I didn't break the VS build. I'm fixing the other repos now.

evoskuil · 2018-07-11T08:48:20Z

The build script only updates build artifacts. It cannot verify the compile or test execution - that's up to the automated build platforms. So you could have broken a VS or other platform build, but at least the project files are correct.

toxeus · 2018-07-11T08:51:31Z

My understanding was that the project files are the Makefiles of the VS universe. If Makefiles are outdated then the build can break. But of course it can break for other reasons too 😉

evoskuil · 2018-07-11T08:52:39Z

Right, so the script only ensures that the project and make files are generated for current sources and metadata, you can still break the VS build.

evoskuil · 2018-07-11T08:55:16Z

src/settings.cpp

+    {
+        case config::settings::mainnet:
+        {
+            encoded_genesis_block =


The settings pattern uses serializable classes to read settings to produce the corresponding object. I think the proper generalization here is actually a chain::block.

This would make the chain::block::genesis() function obsolete. I'll remove it then.

It makes it redundant, but that’s fine. It can accept only the standard config enumeration and construct the well known instances, as it does now, and those can be used to simplify the standard settings init. Or that can be done in reverse, which I think is better since the values remain with the standard settings initializer.

evoskuil · 2018-07-11T08:56:17Z

include/bitcoin/bitcoin/settings.hpp

@@ -48,6 +51,8 @@ class BC_API settings

    // The target number of blocks for 2 weeks of work (2016 blocks).
    size_t retargeting_interval;
+
+    std::string encoded_genesis_block;


chain::block genesis_block

coveralls · 2018-07-11T09:44:03Z

Coverage decreased (-0.005%) to 81.424% when pulling 9b200ba on toxeus:master into 2e1e679 on libbitcoin:master.

evoskuil · 2018-07-11T18:58:30Z

src/chain/block.cpp

@@ -200,7 +140,7 @@ bool block::operator!=(const block& other) const
 //-----------------------------------------------------------------------------

 // static
-block block::factory(const data_chunk& data, const settings& settings,
+block block::factory(const data_chunk& data, const bc::settings& settings,


Why all of the bc:: namespace qualifications, where is the conflict?

It conflicts with bc::config::settings.

evoskuil · 2018-07-11T18:59:38Z

examples/main.cpp

@@ -45,7 +45,8 @@ int bc::main(int argc, char* argv[])
 #endif

    // Extracting Satoshi's words from genesis block.
-    const auto block = bc::chain::block::genesis_mainnet(bc::settings());
+    const auto block =
+        bc::settings(bc::config::settings::mainnet).genesis_block;


Style is to generally break the line, not move it to another line (as this is not an option if the line is just as bit longer, so cannot be done consistently).

const auto block = bc::settings(bc::config::settings::mainnet) .genesis_block;

evoskuil · 2018-07-11T19:03:48Z

include/bitcoin/bitcoin/settings.hpp

@@ -31,6 +34,9 @@ class BC_API settings
 {
 public:
    settings();
+    settings(config::settings context);
+
+    void genesis(const std::string& encoded_genesis_block);


Should be private.

This will go away as you suggested below.

evoskuil · 2018-07-11T19:09:12Z

src/settings.cpp

 {
 }

+settings::settings(config::settings context)


The use of text deserialization internal to the settings instance is inconsistent. Setting and command line deserialization is implemented in bc::config classes, often encapsulating the primitive. Additionally, use of genesis(text) below is unnecessary. There is no reason to construct the object from a text string. The text stream is broken up into (sort of) logical values for readability. But this is much more clearly and safely accomplished using the chain::block constructor as it is intended. Comparing the result to a well-known text stream and block hash result is the job of two text cases.

I have removed the genesis() helper method. I will add the deserialization class in bc::config in an upcoming PR to prevent this one from growing too much.

toxeus

Thanks for the input. Will continue tomorrow.

toxeus · 2018-07-11T22:01:21Z

src/chain/block.cpp

@@ -200,7 +140,7 @@ bool block::operator!=(const block& other) const
 //-----------------------------------------------------------------------------

 // static
-block block::factory(const data_chunk& data, const settings& settings,
+block block::factory(const data_chunk& data, const bc::settings& settings,


It conflicts with bc::config::settings.

toxeus · 2018-07-11T22:02:31Z

src/settings.cpp

 {
 }

+settings::settings(config::settings context)


toxeus · 2018-07-11T22:03:43Z

examples/main.cpp

@@ -45,7 +45,8 @@ int bc::main(int argc, char* argv[])
 #endif

    // Extracting Satoshi's words from genesis block.
-    const auto block = bc::chain::block::genesis_mainnet(bc::settings());
+    const auto block =
+        bc::settings(bc::config::settings::mainnet).genesis_block;


toxeus · 2018-07-11T22:05:24Z

include/bitcoin/bitcoin/settings.hpp

@@ -31,6 +34,9 @@ class BC_API settings
 {
 public:
    settings();
+    settings(config::settings context);
+
+    void genesis(const std::string& encoded_genesis_block);


This will go away as you suggested below.

evoskuil · 2018-07-17T18:37:16Z

see: #997

toxeus requested a review from evoskuil July 11, 2018 08:34

evoskuil requested changes Jul 11, 2018

View reviewed changes

toxeus force-pushed the master branch from aa53556 to 83321e6 Compare July 11, 2018 12:47

evoskuil reviewed Jul 11, 2018

View reviewed changes

toxeus commented Jul 11, 2018

View reviewed changes

toxeus force-pushed the master branch 2 times, most recently from 9b200ba to 716142e Compare July 17, 2018 15:36

toxeus and others added 3 commits July 17, 2018 17:36

parametrize genesis block

716142e

parametrize genesis block

75a69d6

Fix merge conflict on rebase.

a8e518b

evoskuil mentioned this pull request Jul 17, 2018

parametrize genesis block #997

Merged

evoskuil closed this Jul 17, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

parametrize genesis block #988

parametrize genesis block #988

toxeus commented Jul 11, 2018

evoskuil commented Jul 11, 2018

toxeus commented Jul 11, 2018

evoskuil commented Jul 11, 2018 •

edited

Loading

evoskuil Jul 11, 2018

toxeus Jul 11, 2018

evoskuil Jul 11, 2018 •

edited

Loading

evoskuil Jul 11, 2018 •

edited

Loading

coveralls commented Jul 11, 2018 •

edited

Loading

evoskuil Jul 11, 2018

toxeus Jul 11, 2018

evoskuil Jul 11, 2018

toxeus Jul 11, 2018

evoskuil Jul 11, 2018

toxeus Jul 11, 2018

evoskuil Jul 11, 2018

toxeus Jul 11, 2018

toxeus Jul 12, 2018

toxeus left a comment

toxeus Jul 11, 2018

toxeus Jul 11, 2018

toxeus Jul 11, 2018

toxeus Jul 11, 2018

evoskuil commented Jul 17, 2018

parametrize genesis block #988

parametrize genesis block #988

Conversation

toxeus commented Jul 11, 2018

evoskuil commented Jul 11, 2018

toxeus commented Jul 11, 2018

evoskuil commented Jul 11, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

evoskuil Jul 11, 2018 • edited Loading

Choose a reason for hiding this comment

evoskuil Jul 11, 2018 • edited Loading

Choose a reason for hiding this comment

coveralls commented Jul 11, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

toxeus left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

evoskuil commented Jul 17, 2018

evoskuil commented Jul 11, 2018 •

edited

Loading

evoskuil Jul 11, 2018 •

edited

Loading

evoskuil Jul 11, 2018 •

edited

Loading

coveralls commented Jul 11, 2018 •

edited

Loading