Skip to content

Commit

Permalink
Publish 1.0 (#305)
Browse files Browse the repository at this point in the history
* public test

* modify core param

* modify proto version

* remove delegated

* modify timestamp
  • Loading branch information
cchanm authored and shangqd committed Nov 29, 2019
1 parent f417b98 commit 327cfe5
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions src/bigbang/core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ void CCoreProtocol::GetGenesisBlock(CBlock& block)

block.nVersion = 1;
block.nType = CBlock::BLOCK_GENESIS;
block.nTimeStamp = 1515745156;
block.nTimeStamp = 1575043200;
block.hashPrev = 0;

CTransaction& tx = block.txMint;
Expand All @@ -146,11 +146,11 @@ void CCoreProtocol::GetGenesisBlock(CBlock& block)
tx.nAmount = BBCP_TOKEN_INIT * COIN; // initial number of token

CProfile profile;
profile.strName = "BigBang Network";
profile.strSymbol = "BIG";
profile.strName = "BigBang Core";
profile.strSymbol = "BBC";
profile.destOwner = destOwner;
profile.nAmount = tx.nAmount;
profile.nMintReward = 20 * COIN;
profile.nMintReward = BBCP_REWARD_TOKEN[0] * COIN;
profile.nMinTxFee = MIN_TX_FEE;
profile.nHalveCycle = 0;
profile.SetFlag(true, false, false);
Expand Down Expand Up @@ -759,7 +759,7 @@ void CTestNetCoreProtocol::GetGenesisBlock(CBlock& block)

block.nVersion = 1;
block.nType = CBlock::BLOCK_GENESIS;
block.nTimeStamp = (ptime(date(2019, 11, 19), time_duration(14 - 8, 0, 0)) - ptime(date(1970, 1, 1))).total_seconds();
block.nTimeStamp = 1575043200;
block.hashPrev = 0;

CTransaction& tx = block.txMint;
Expand All @@ -769,11 +769,11 @@ void CTestNetCoreProtocol::GetGenesisBlock(CBlock& block)
tx.nAmount = BBCP_TOKEN_INIT * COIN; // initial number of token

CProfile profile;
profile.strName = "BigBang Test Network";
profile.strSymbol = "BigTest";
profile.strName = "BigBang Core Test";
profile.strSymbol = "BBCTest";
profile.destOwner = destOwner;
profile.nAmount = tx.nAmount;
profile.nMintReward = 20 * COIN;
profile.nMintReward = BBCP_REWARD_TOKEN[0] * COIN;
profile.nMinTxFee = MIN_TX_FEE;
profile.nHalveCycle = 0;
profile.SetFlag(true, false, false);
Expand Down
2 changes: 1 addition & 1 deletion src/bigbang/network.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ bool CNetwork::HandleInitialize()
return false;
}

Configure(NetworkConfig()->nMagicNum, PROTO_VERSION, network::NODE_NETWORK | network::NODE_DELEGATED,
Configure(NetworkConfig()->nMagicNum, PROTO_VERSION, network::NODE_NETWORK /*| network::NODE_DELEGATED*/,
FormatSubVersion(), !NetworkConfig()->vConnectTo.empty(), pCoreProtocol->GetGenesisBlockHash());

CPeerNetConfig config;
Expand Down
10 changes: 5 additions & 5 deletions src/bigbang/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

#define VERSION_NAME "Bigbang"

#define VERSION_MAJOR 0
#define VERSION_MINOR 9
#define VERSION_REVISION 2
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_REVISION 0

std::string FormatVersion(int nVersion);

Expand All @@ -23,8 +23,8 @@ static const int VERSION = 10000 * VERSION_MAJOR
+ 1 * VERSION_REVISION;
static const std::string VERSION_STR = FormatVersion(VERSION);

static const int PROTO_VERSION = 100;
static const int MIN_PROTO_VERSION = 100;
static const int PROTO_VERSION = 10000;
static const int MIN_PROTO_VERSION = 10000;

const char* GetGitVersion();

Expand Down
4 changes: 2 additions & 2 deletions src/xengine/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

namespace xengine
{
#define VERSION_MAJOR 0
#define VERSION_MINOR 10
#define VERSION_MAJOR 1
#define VERSION_MINOR 0

#define _TOSTR(s) #s
#define _VERSTR(major, minor) \
Expand Down

0 comments on commit 327cfe5

Please sign in to comment.