diff --git a/libraries/chain/hardfork.d/SON3.hf b/libraries/chain/hardfork.d/SON3.hf index 36347c09..bce5eb31 100644 --- a/libraries/chain/hardfork.d/SON3.hf +++ b/libraries/chain/hardfork.d/SON3.hf @@ -1,7 +1,7 @@ #ifndef HARDFORK_SON3_TIME #ifdef BUILD_PEERPLAYS_TESTNET -#define HARDFORK_SON3_TIME (fc::time_point_sec::from_iso_string("2022-05-31T00:00:00")) +#define HARDFORK_SON3_TIME (fc::time_point_sec::from_iso_string("2022-04-01T00:00:00")) #else -#define HARDFORK_SON3_TIME (fc::time_point_sec::from_iso_string("2022-05-31T00:00:00")) +#define HARDFORK_SON3_TIME (fc::time_point_sec::from_iso_string("2022-04-01T00:00:00")) #endif #endif diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp index 407686e5..e011a6d6 100644 --- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp +++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp @@ -579,13 +579,14 @@ void bitcoin_rpc_client::importmulti(const std::vector &address_or std::string argument_1 = "["; for (const auto ¶m : address_or_script_array) { argument_1 += "{\"scriptPubKey\": "; - if (param.type == multi_type::address) + if (param.type == multi_type::address) { argument_1 += "{\"address\": \"" + param.address_or_script + "\"}"; - else if (param.type == multi_type::script) + } else if (param.type == multi_type::script) { argument_1 += "\"" + param.address_or_script + "\""; - else + } else { FC_THROW("Invalid multi_type."); - argument_1 += ", \"label\": \"" + param.label + "\", \"timestamp\": " + std::to_string(HARDFORK_SON_TIME.sec_since_epoch()) + "}"; + } + argument_1 += ", \"label\": \"" + param.label + "\", \"timestamp\": " + std::to_string(fc::time_point_sec::from_iso_string("2022-01-01T00:00:00").sec_since_epoch()) + "}"; //! Note /* Creation time of the key expressed in UNIX epoch time, @@ -595,8 +596,9 @@ void bitcoin_rpc_client::importmulti(const std::vector &address_or 0 can be specified to scan the entire blockchain. Blocks up to 2 hours before the earliest key creation time of all keys being imported by the importmulti call will be scanned.*/ - if (¶m != &address_or_script_array.back()) + if (¶m != &address_or_script_array.back()) { argument_1 += ", "; + } } argument_1 += "]";