Release v0.5.2-alpha-1.

Conflux-Chain · Jun 4, 2020 · 6dce082 · 6dce082
1 parent a260005
commit 6dce082
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "conflux"
-version = "0.6.0"
+version = "0.5.2-alpha-1"
 edition = "2018"
 build = "build.rs"
 

diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "client"
-version = "0.6.0"
+version = "0.5.2-alpha-1"
 edition = "2018"
 
 [dependencies]

diff --git a/client/src/lib.rs b/client/src/lib.rs
@@ -27,4 +27,4 @@ mod tests;
 
 /// Used in Genesis author to indicate testnet version
 /// Increase by one for every test net reset
-const TESTNET_VERSION: &str = "0000000000000000000000000000000000000020";
+const TESTNET_VERSION: &str = "1000000000000000000000000000000000000052";
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -3,7 +3,7 @@ description = "Conflux core library"
 homepage = "http://www.conflux-chain.org"
 license = "GPL-3.0"
 name = "cfxcore"
-version = "0.6.0"
+version = "0.5.2-alpha-1"
 edition = "2018"
 
 [dependencies]

diff --git a/run/default.toml b/run/default.toml
@@ -3,7 +3,7 @@
 # A node is identified by cfxnode://NODEID@PUBLICIP:PORT
 # By default, no bootnodes are provided. What's provided here is a list of nodes that Conflux Team maintains across the world.
 
-bootnodes="cfxnode://7ffff7f14f8f73fa93a95309803bbc93c762c48bc873a823ac40500471ce2e3ff5b5af36c5c7f0bef47cec4e284c40ec976620b6941ec927b00891abc0646a65@47.93.241.217:32323,cfxnode://47bd00bed8e39e51fc94edca067cf7a0d23c67689841a5e9437e51f430c98e463b6caf0d8bed2576393620efabee2a531902938759d92ee289a4d8ae8277d254@39.107.127.68:32323,cfxnode://bde628101fa224422b484ff7cdc4483aa4185c98cdf74ff11b20c0cbe5075dae8dbb2edb0a60f22d94f78003df4b2f08f942c7b1d4b78404a083e46ee5d78aee@123.56.97.171:32323,cfxnode://207129bba501e6a0aa8be66421dfc9984ff08d9d2d14f24c4db651b3e90ef77d5315ab4f49ef7a62208d9596c87248b6e7bf25886e36e2a79a0ae72275149397@139.224.68.249:32323,cfxnode://7d7e433ed0b1ce6c9618b841ec11526348bc2750cd600f4fa3640d8139c230bfadb4178c92f34b507a95826e0c05b42594bab7d4bc4f581194bab91ab7a71584@139.224.196.246:32323,cfxnode://ad9c50afc450522894faeb14522cf668d21c97e46e64d4f39c0639319cbae38f1827c350d2eb69dbc06bad6c056ddbc3d63a10c9cf0a5a16d8391aace7a048b2@139.224.196.40:32323,cfxnode://72d0736cc9fffc21306f097b8ce5099f62d72ec05bd94ceff5bd6ec6783801f2f7ad17a16f57499243925ed9633654081d3b4cb95bab7474144e92ffe39c9cc4@34.216.73.138:32323,cfxnode://4eb526348481292722188664543d3dc80a5f2a35b578b2d72d54293ccc400fa87efb69e728dc56ef924be708ec8b33fa3648eca2a81e9e95f44cd0b3252fea77@34.201.56.239:32323,cfxnode://5ec498fd7c8ff5389024f6a6e80ed75539c89dda8e655cae48c8ae883590acb940d856a601e7f788d5a2cf417eb5dee0fa9ae6c0a2ac8e6d8253cb7ac986a651@18.163.111.230:32323,cfxnode://9a3b64f2652fe73d573fa7bd877f4f02f96fbc4e2287731b59d0350f80a4a2437f43cd067096b0b3afd6e14a5af5929c9719afe42fd42c1143deea9942fc6d38@13.229.52.100:32323,cfxnode://9991bd3f5d0e614a3fcc8640fdfcbefbc0e95de7fa68baff4cb95f8614fa162b080a497bca5037196920bf68ed2554605f29b38ba2390b4bc8de91dac91eab34@35.177.114.1:32323,cfxnode://ce6c447f1e6f8e43e07f9ee8d5b49180663ad934f7fffa0db654e69522a234628f966fc8ea0285c4357285885f188804ae09b5303a6c8e627149c2a41d5156a3@13.115.14.171:32323,cfxnode://448839f2900f4a22ce611bd66a4fc93f8fa02a4b185679ba89078c0bf9c6c9328d3df77c4c8451fca12f2a8daab53b8f38762c14d6f24ba6897a9ddd79988474@18.228.10.237:32323,cfxnode://54e1d46b03527d79986e3c884e6ef6cec09cfc548f7ad20d8f0c996396cbe04bead6f689822eae2ab78b08e2be360371679d94f41fc75645ae166c557c3cd7e4@15.185.81.4:32323,cfxnode://b98efb859fd2c9d88f9c5f7bf0da8a554a277e79122517ba7adf4f4bee8f5d99950c4f794aeb67b170f26faacaf0a5f4e953270c070c24a56de8e7939c578fef@47.90.22.19:32323,cfxnode://dc79bc70833e797ba41eff5bda67c0484abca4918ef38289b5f96acd3daa890eadc85d46fc71f250a8ac51b0c4ab70b3812b1ed3c8f10a9e996b6663be34f1f1@47.88.79.174:32323,cfxnode://bd173908d52a2a991aae86c3bc0453b7019c44233c5f2ed6241fc8e5a43689abf812266e8bb581470a5cb55fceeae1e4c8020baa61b8f2b2371a259fccb5b544@52.175.52.111:32323,cfxnode://012d0f7e59f62220e2a90e458cf0d65e5690d09dad59ce05f03f5878a7142bef9f412decdbefa7716e8331e94d68f05c2ce943db4ffa5440e496f2130d3feb50@23.96.108.96:32323,cfxnode://4d2730a33e1e06f02606343c19c60ec28d191004f558085ed01ad752d2a45c54e88c99908dc932b69ee433ae2f74753b32dbb3ac89024f593c645579a763560b@20.43.79.41:32323,cfxnode://7e2e4918d3aff819afdb8782c13544ea63193d82d9529dfbab3efb101754b322fc161c771a784e1b0420da8f78dbb127fbac24d1d626b634b462542ad8953bd7@52.231.28.50:32323,cfxnode://f94343e4c806b2968c5e4bf4cbc49736d04af03fab4b797bc11aea2af2cb23d706d1d9c5dfae430a2df1d7fe6a6a988aff43c50898dc087161e51fa69d603997@13.69.186.42:32323,cfxnode://8c460046bbc9f534d79344024a444910525b832eb7b268c0cd11b26c57a6b40290f5f64c9431d47af4763bb950173b172780a4894f8aa45a90db08780ec3d179@40.127.0.99:32323,cfxnode://8949669b26e015acd6c3e1ba5f87e2a7242a8611eec224428d5553005e45b4c6b2e352721be6334a445340441c8d6f8dfeab20472fbb0ce9733c293f0c1c781c@13.67.73.51:32323,cfxnode://cadd4aabb35be7edbd1c8e60131c90eb9cec502a3565234190b7922922007838caf6556fb32e3e53fd98510f789a505b68db4c95899d6b29e206c7ad3f87b106@137.135.25.219:32323"
+bootnodes="cfxnode://604deed272ec2a6f75538f0852e9cd71c616b35655ea8331b5987b3cc682097da76b9c8d2e90601d818acfac54f15af08a6389af245d4149d7d7f4a952bebfb3@39.97.223.148:32323,cfxnode://77bd8823c286e6b159432607d309983eac76830ecdd2bb2b6be7bf3b8e90bbae92f980dd7c8a6c284670679090d3ebf8e43ef91755cdf2eb6caa76532400be4c@182.92.92.126:32323,cfxnode://6582f6e20cfb975ff0b1fe6cb1d97f1e85c0502d44de441f43b032d7c8b986ebbd6a52f228ca55639b49742505bcf3f541551b2485d248e041d9ff1389bb016d@59.110.70.5:32323,cfxnode://24caea3455cf5ff9bbc532c6c6ca39b7edd0ecbbf29725dccdd36b5be629f1b0967391fdd99e81f9e35eb48a85602b2cff7c4c6893b7a906cc6b832c09ae9f33@101.201.127.86:32323,cfxnode://d2d4d2421da4b3b7314b83da06a2ed803965968ebc1614ac41eec5391a136d681a1433dbb56d067ad7e6cab682f35454a87a96e65a3b7eac867eea36b5d8535b@123.57.45.90:32323,cfxnode://ba297dc48bbba48e48c2f01dd0478d3a128b49ba4eccc65d0b800677bb8cc8a72eda57395f5a4b54269ec93189127efbd8ed235836db505f00b0e4558c1c6d97@39.97.208.206:32323,cfxnode://31f9397cfe1bbbecd5667dd13a5b6629201d5bdb9709813c8ad45e21a7ff767f17eb296ee635bb6c1265293bc4ad864db4ca229ad415d31e39121bf2a52405f9@13.229.52.100:32323,cfxnode://a7052f8b9d263549f737334b3cfe4d073fbedf69a21f25754a49a5cd7e83eb998eac1b223e55ae37779c1537bdd429719d0da45637d2d65dbaa917ad2c7085f2@20.43.79.41:32323,cfxnode://869ad83c0f6d8d9f571f62e444dd9a00bb5291e05b65b2d3920db912cdaaa9f283e72a5638ec71aadeeb37f53cdf40fb041214a80d7a6748f6ba96ec62b2909f@137.135.25.219:32323"
 
 # Some preset develepment configurations.
 # It should not be set in production environment.
@@ -409,7 +409,7 @@ jsonrpc_local_http_port=12539
 # max_trans_count_received_in_catch_up = 60_000
 
 # The chain_id of conflux network
-# 0 for testnet
+# 1 for testnet
 # commentting out for not verify chain_id
 #
-chain_id = 0
+chain_id = 1
diff --git a/tests/conflux/config.py b/tests/conflux/config.py
@@ -12,7 +12,7 @@
     GENESIS_STATE_ROOT=decode_hex("0xa296d6b5871ce3d8ec9ab06eec1fe837cf04de536f0e533acd4d35c94cf9be6c"),
     GENESIS_RECEIPTS_ROOT=trie.EMPTY_EPOCH_RECEIPT_ROOT_BY_NUMBER_OF_BLOCKS[0],
     GENESIS_LOGS_BLOOM_HASH=decode_hex("0xd397b3b043d87fcd6fad1291ff0bfd16401c274896d8c63a923727f077b8e0b5"), # KECCAK_EMPTY_BLOOM    ~ keccak(b'\0' * 256)
-    GENESIS_AUTHOR=decode_hex("0x1000000000000000000000000000000000000020"),
+    GENESIS_AUTHOR=decode_hex("0x1000000000000000000000000000000000000052"),
     GENESIS_GAS_LIMIT=30_000_000,
     MAX_BLOCK_SIZE_IN_BYTES=200 * 1024,
 )