Skip to content

Commit

Permalink
Merge pull request #305 from mvs-org/nova
Browse files Browse the repository at this point in the history
Nova branch finished and all merged into master
  • Loading branch information
codrush authored Jun 22, 2018
2 parents 83da65f + 2804a5d commit fa68f26
Show file tree
Hide file tree
Showing 400 changed files with 6,608 additions and 6,508 deletions.
2 changes: 1 addition & 1 deletion include/metaverse/bitcoin.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#define MVS_BITCOIN_HPP

/**
* API Users: Include only this header. Direct use of other headers is fragile
* API Users: Include only this header. Direct use of other headers is fragile
* and unsupported as header organization is subject to change.
*
* Maintainers: Do not include this header internal to this library.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ namespace chain {
class BC_API blockchain_asset
{
public:
typedef std::vector<blockchain_asset> list;
blockchain_asset();
blockchain_asset(uint32_t version, const output_point& tx_point,
uint64_t height, const asset_detail& asset);
typedef std::vector<blockchain_asset> list;
blockchain_asset();
blockchain_asset(uint32_t version, const output_point& tx_point,
uint64_t height, const asset_detail& asset);
static blockchain_asset factory_from_data(const data_chunk& data);
static blockchain_asset factory_from_data(std::istream& stream);
static blockchain_asset factory_from_data(reader& source);
Expand All @@ -58,20 +58,20 @@ class BC_API blockchain_asset
bool is_valid() const;
void reset();
uint64_t serialized_size() const;
const uint32_t& get_version() const;
void set_version(const uint32_t& version_);
const output_point& get_tx_point() const;
void set_tx_point(const output_point& tx_point_);
const uint64_t& get_height() const;
void set_height(const uint64_t& height_);
const asset_detail& get_asset() const;
void set_asset(const asset_detail& asset_);
const uint32_t& get_version() const;
void set_version(const uint32_t& version_);
const output_point& get_tx_point() const;
void set_tx_point(const output_point& tx_point_);
const uint64_t& get_height() const;
void set_height(const uint64_t& height_);
const asset_detail& get_asset() const;
void set_asset(const asset_detail& asset_);

private:
private:
uint32_t version_;
output_point tx_point_;
uint64_t height_;
asset_detail asset_;
uint64_t height_;
asset_detail asset_;
};

} // namespace chain
Expand Down
32 changes: 16 additions & 16 deletions include/metaverse/bitcoin/chain/attachment/did/blockchain_did.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ class BC_API blockchain_did
address_current,
address_history
};
typedef std::vector<blockchain_did> list;
blockchain_did();
blockchain_did( uint32_t version, const output_point& tx_point,
uint64_t height, uint32_t status, const did_detail& did);
typedef std::vector<blockchain_did> list;
blockchain_did();
blockchain_did( uint32_t version, const output_point& tx_point,
uint64_t height, uint32_t status, const did_detail& did);
static blockchain_did factory_from_data(const data_chunk& data);
static blockchain_did factory_from_data(std::istream& stream);
static blockchain_did factory_from_data(reader& source);
Expand All @@ -64,23 +64,23 @@ class BC_API blockchain_did
bool is_valid() const;
void reset();
uint64_t serialized_size() const;
const uint32_t& get_version() const;
void set_version(const uint32_t& version_);
const output_point& get_tx_point() const;
void set_tx_point(const output_point& tx_point_);
const uint64_t& get_height() const;
void set_height(const uint64_t& height_);
const did_detail& get_did() const;
void set_did(const did_detail& did_);
const uint32_t& get_version() const;
void set_version(const uint32_t& version_);
const output_point& get_tx_point() const;
void set_tx_point(const output_point& tx_point_);
const uint64_t& get_height() const;
void set_height(const uint64_t& height_);
const did_detail& get_did() const;
void set_did(const did_detail& did_);
void set_status(const uint32_t & status);
const uint32_t& get_status() const;
const uint32_t& get_status() const;
std::string get_status_string() const;
private:
uint32_t version_;
output_point tx_point_;
uint64_t height_;
uint32_t status_;
did_detail did_;
uint64_t height_;
uint32_t status_;
did_detail did_;
};

} // namespace chain
Expand Down
28 changes: 14 additions & 14 deletions include/metaverse/bitcoin/chain/attachment/did/did.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ namespace chain {
class BC_API did
{
public:
enum class did_status : uint32_t
{
did_none,
did_locked,
did_transferable,
};
enum class did_status : uint32_t
{
did_none,
did_locked,
did_transferable,
};

did();
did(uint32_t status, const did_detail& detail);
did();
did(uint32_t status, const did_detail& detail);
static did factory_from_data(const data_chunk& data);
static did factory_from_data(std::istream& stream);
static did factory_from_data(reader& source);
Expand All @@ -65,15 +65,15 @@ class BC_API did
void to_data(std::ostream& stream) const;
void to_data(writer& sink) const;
std::string to_string() const;
bool is_valid_type() const;
bool is_valid_type() const;
bool is_valid() const;
void reset();
uint64_t serialized_size() const;
uint32_t get_status() const;
void set_status(uint32_t status);
void set_data(const did_detail& detail);
const did_detail& get_data() const;
uint32_t get_status() const;
void set_status(uint32_t status);
void set_data(const did_detail& detail);
const did_detail& get_data() const;

private:
uint32_t status;
did_detail data;
Expand Down
12 changes: 6 additions & 6 deletions include/metaverse/bitcoin/chain/attachment/etp/etp.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@

namespace libbitcoin {
namespace chain {

BC_CONSTEXPR size_t ETP_FIX_SIZE = 8;

class BC_API etp
{
public:
etp();
etp(uint64_t value);
etp();
etp(uint64_t value);
static etp factory_from_data(const data_chunk& data);
static etp factory_from_data(std::istream& stream);
static etp factory_from_data(reader& source);
Expand All @@ -53,9 +53,9 @@ class BC_API etp
bool is_valid() const;
void reset();
uint64_t serialized_size() const;
uint64_t get_value() const;
void set_value(uint64_t value);
uint64_t get_value() const;
void set_value(uint64_t value);

private:
uint64_t value;
};
Expand Down
12 changes: 6 additions & 6 deletions include/metaverse/bitcoin/chain/attachment/etp/etp_award.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@

namespace libbitcoin {
namespace chain {

BC_CONSTEXPR size_t ETP_AWARD_FIX_SIZE = 8;

class BC_API etp_award
{
public:
etp_award();
etp_award(uint64_t height);
etp_award();
etp_award(uint64_t height);
static etp_award factory_from_data(const data_chunk& data);
static etp_award factory_from_data(std::istream& stream);
static etp_award factory_from_data(reader& source);
Expand All @@ -53,9 +53,9 @@ class BC_API etp_award
bool is_valid() const;
void reset();
uint64_t serialized_size() const;
uint64_t get_height() const;
void set_height(uint64_t height);
uint64_t get_height() const;
void set_height(uint64_t height);

private:
uint64_t height;
};
Expand Down
12 changes: 6 additions & 6 deletions include/metaverse/bitcoin/chain/attachment/message/message.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@

namespace libbitcoin {
namespace chain {

BC_CONSTEXPR size_t BLOCKCHAIN_MESSAGE_FIX_SIZE = 256;
class BC_API blockchain_message
{
public:
//BC_CONSTEXPR static size_t blockchain_message_FIX_SIZE = 64;

blockchain_message();
blockchain_message(std::string content);
blockchain_message();
blockchain_message(std::string content);
static blockchain_message factory_from_data(const data_chunk& data);
static blockchain_message factory_from_data(std::istream& stream);
static blockchain_message factory_from_data(reader& source);
Expand All @@ -54,9 +54,9 @@ class BC_API blockchain_message
bool is_valid() const;
void reset();
uint64_t serialized_size() const;
const std::string& get_content() const;
void set_content(const std::string& content);
const std::string& get_content() const;
void set_content(const std::string& content);

private:
std::string content_;
};
Expand Down
Loading

0 comments on commit fa68f26

Please sign in to comment.