Merge pull request #1300 from Bytom/dev

Dev

diff --git a/consensus/general.go b/consensus/general.go
index 3c5453d..b7b0efa 100644 (file)
--- a/consensus/general.go
+++ b/consensus/general.go
@@ -115,6 +115,8 @@ var MainNetParams = Params{
                {40000, bc.NewHash([32]byte{0x7f, 0xe2, 0xde, 0x11, 0x21, 0xf3, 0xa9, 0xa0, 0xee, 0x60, 0x8d, 0x7d, 0x4b, 0xea, 0xcc, 0x33, 0xfe, 0x41, 0x25, 0xdc, 0x2f, 0x26, 0xc2, 0xf2, 0x9c, 0x07, 0x17, 0xf9, 0xe4, 0x4f, 0x9d, 0x46})},
                {50000, bc.NewHash([32]byte{0x5e, 0xfb, 0xdf, 0xf5, 0x35, 0x38, 0xa6, 0x0b, 0x75, 0x32, 0x02, 0x61, 0x83, 0x54, 0x34, 0xff, 0x3e, 0x82, 0x2e, 0xf8, 0x64, 0xae, 0x2d, 0xc7, 0x6c, 0x9d, 0x5e, 0xbd, 0xa3, 0xd4, 0x50, 0xcf})},
                {62000, bc.NewHash([32]byte{0xd7, 0x39, 0x8f, 0x23, 0x57, 0xf9, 0x4c, 0xa0, 0x28, 0xa7, 0x00, 0x2b, 0x53, 0x9e, 0x51, 0x2d, 0x3e, 0xca, 0xc9, 0x22, 0x59, 0xfc, 0xd0, 0x3f, 0x67, 0x1a, 0x0a, 0xb1, 0x02, 0xbf, 0x2b, 0x03})},
+               {72000, bc.NewHash([32]byte{0x66, 0x02, 0x31, 0x19, 0xf1, 0x60, 0x35, 0x61, 0xa4, 0xf1, 0x38, 0x04, 0xcc, 0xe4, 0x59, 0x8f, 0x55, 0x39, 0xba, 0x22, 0xf2, 0x6d, 0x90, 0xbf, 0xc1, 0x87, 0xef, 0x98, 0xcc, 0x70, 0x4d, 0x94})},
+               {83700, bc.NewHash([32]byte{0x7f, 0x26, 0xc9, 0x11, 0xe8, 0x46, 0xd0, 0x6e, 0x36, 0xbb, 0xac, 0xce, 0x99, 0xa2, 0x19, 0x89, 0x3f, 0xf7, 0x84, 0x2a, 0xcb, 0x44, 0x7f, 0xbb, 0x0e, 0x3b, 0xa3, 0x68, 0xd6, 0x2b, 0xe8, 0x0d})},
        },
 }
 
@@ -123,9 +125,8 @@ var TestNetParams = Params{
        Name:            "test",
        Bech32HRPSegwit: "tm",
        Checkpoints: []Checkpoint{
-               {1000, bc.NewHash([32]byte{0x28, 0x29, 0xc9, 0xe2, 0x19, 0x0f, 0xfe, 0xb6, 0xf2, 0x73, 0xde, 0x1a, 0xe8, 0x1f, 0xa6, 0xbc, 0x15, 0xaa, 0x08, 0xa9, 0xb8, 0x4c, 0x43, 0x25, 0x9a, 0xa0, 0x24, 0x8a, 0xd8, 0x55, 0x73, 0xca})},
-               {1500, bc.NewHash([32]byte{0xc2, 0x94, 0x02, 0xd1, 0x6c, 0xa8, 0x18, 0xc4, 0x95, 0x67, 0x48, 0xb8, 0xa8, 0x42, 0xa2, 0x69, 0x8e, 0xdd, 0xb2, 0xa9, 0xb6, 0xd9, 0x30, 0xf4, 0x12, 0xdb, 0x0f, 0x1e, 0x58, 0xc9, 0x69, 0x3b})},
                {10303, bc.NewHash([32]byte{0x3e, 0x94, 0x5d, 0x35, 0x70, 0x30, 0xd4, 0x3b, 0x3d, 0xe3, 0xdd, 0x80, 0x67, 0x29, 0x9a, 0x5e, 0x09, 0xf9, 0xfb, 0x2b, 0xad, 0x5f, 0x92, 0xc8, 0x69, 0xd1, 0x42, 0x39, 0x74, 0x9a, 0xd1, 0x1c})},
+               {40000, bc.NewHash([32]byte{0x6b, 0x13, 0x9a, 0x5b, 0x76, 0x77, 0x9b, 0xd4, 0x1c, 0xec, 0x53, 0x68, 0x44, 0xbf, 0xf4, 0x48, 0x94, 0x3d, 0x16, 0xe3, 0x9b, 0x2e, 0xe8, 0xa1, 0x0f, 0xa0, 0xbc, 0x7d, 0x2b, 0x17, 0x55, 0xfc})},
        },
 }
 

diff --git a/docs/release-notes/release-notes-1.0.2.md b/docs/release-notes/release-notes-1.0.2.md
index 553107f..8e6db22 100644 (file)
--- a/docs/release-notes/release-notes-1.0.2.md
+++ b/docs/release-notes/release-notes-1.0.2.md
@@ -10,7 +10,7 @@ Please report bugs using the issue tracker at github:
 How to Upgrade
 ===============
 
-If you are running an older version, shut it down. Wait until it has completely, then run the new version Bytom.
+If you are running an older version, shut it down. Wait until it has quited completely, and then run the new version Bytom.
 You can operate according to the user manual.[(Bytom User Manual)](URL 'https://bytom.io/wp-content/themes/freddo/images/wallet/BytomUsermanualV1.0_en.pdf')
 
 

diff --git a/docs/release-notes/release-notes-1.0.3.md b/docs/release-notes/release-notes-1.0.3.md
index 1336bd6..29ad879 100644 (file)
--- a/docs/release-notes/release-notes-1.0.3.md
+++ b/docs/release-notes/release-notes-1.0.3.md
@@ -10,7 +10,7 @@ Please report bugs using the issue tracker at github:
 How to Upgrade
 ===============
 
-If you are running an older version, shut it down. Wait until it has completely, then run the new version Bytom.
+If you are running an older version, shut it down. Wait until it has quited completely, and then run the new version Bytom.
 You can operate according to the user manual.[(Bytom User Manual)](https://bytom.io/wp-content/themes/freddo/images/wallet/BytomUsermanualV1.0_en.pdf)
 
 

diff --git a/docs/release-notes/release-notes-1.0.4.md b/docs/release-notes/release-notes-1.0.4.md
index 554f07f..99e258a 100644 (file)
--- a/docs/release-notes/release-notes-1.0.4.md
+++ b/docs/release-notes/release-notes-1.0.4.md
@@ -10,7 +10,7 @@ Please report bugs using the issue tracker at github:
 How to Upgrade
 ===============
 
-If you are running an older version, shut it down. Wait until it has completely, then run the new version Bytom.
+If you are running an older version, shut it down. Wait until it has quited completely, and then run the new version Bytom.
 You can operate according to the user manual.[(Bytom User Manual)](https://bytom.io/wp-content/themes/freddo/images/wallet/BytomUsermanualV1.0_en.pdf)
 
 

diff --git a/docs/release-notes/release-notes-1.0.5.md b/docs/release-notes/release-notes-1.0.5.md
new file mode 100644 (file)
index 0000000..b307342
--- /dev/null
+++ b/docs/release-notes/release-notes-1.0.5.md
@@ -0,0 +1,79 @@
+Bytom version 1.0.5 is now available from:
+
+  https://github.com/Bytom/bytom/releases/tag/v1.0.5
+
+
+Please report bugs using the issue tracker at github:
+
+  https://github.com/Bytom/bytom/issues
+
+How to Upgrade
+===============
+
+If you are running an older version, shut it down. Wait until it has quited completely, and then run the new version Bytom.
+You can operate according to the user manual.[(Bytom User Manual)](https://bytom.io/wp-content/themes/freddo/images/wallet/BytomUsermanualV1.0_en.pdf)
+
+
+1.0.5 changelog
+================
+__Bytom Node__
+
++ `PR #1196`
+    - Remove the old p2p TCP peer exchange module.
++ `PR #1204`
+    - Add paging to the three APIs: list-unspent-outputs,list-transactions, and list-addresses.
++ `PR #1208`
+    - Add sync completion status broadcasting.
++ `PR #1218`
+    - Fix the Unmarshal bug at getting an external asset.
++ `PR #1233`
+    - Add check-key-password API.
++ `PR #1219`
+    - Add get-coinbase-arbitrary, set-coinbase-arbitrary APIs.
++ `PR #1232`
+    - Fix multi-sign process only being signed once if signed by the same password.
++ `PR #1228`
+    - Upgrade txpool to prevent dropping orphan transaction.
++ `PR #1241`
+    - Add function to delete expired orphan block.
++ `PR #1253`
+    - Add support to filter by alias for list-accounts API.
++ `PR #1245`
+    - API create-asset supports user custom smart contract.
++ `PR #1258`
+    - Add node upgrade notification mechanism.
++ `PR #1264`
+    - Improve the mining pool new block updating timing.
++ `PR #1262`
+    - Add spv support for full node，which mainly includes filtering address and sending Merkle block.
+
+__Bytom Dashboard__
+
+- Add Chinese translation to equity contract.
+- Fix password will be frozen for 5 mins when the password is wrong.
+- Add transaction details before signing an advanced transaction.
+- Add version tag and version update notification.
+
+__Equity Contract frontend__
+
+- Add contract template of RevealPreimage support for entering any character
+- Asset selection box support BTM，expect when locking value
+
+Credits
+--------
+
+Thanks to everyone who directly contributed to this release:
+
+- Colt-Z
+- HAOYUatHZ
+- langyu
+- oysheng
+- Paladz
+- shanhuhai5739
+- shenao78
+- successli
+- yahtoo
+- zcc0721
+- ZhitingLin
+
+And everyone who helped test.

diff --git a/version/version_test.go b/version/version_test.go
index 195dbfe..d05f011 100644 (file)
--- a/version/version_test.go
+++ b/version/version_test.go
@@ -1,10 +1,7 @@
 package version
 
 import (
-       "fmt"
-       "math/rand"
        "testing"
-       "time"
 
        gover "github.com/hashicorp/go-version"
 )
@@ -16,17 +13,13 @@ func TestRevisionLen(t *testing.T) {
 }
 
 func TestCompare(t *testing.T) {
-       rand.Seed(time.Now().UnixNano())
-       i := rand.Uint64()
-       rev := fmt.Sprintf("%16x", i)[:revisionLen]
-
        v1, err := gover.NewVersion(Version)
        if err != nil {
-               t.Error("Version 1 format error.")
+               t.Fatal("Version 1 format error.")
        }
-       v2, err := gover.NewVersion(Version + "+" + rev)
+       v2, err := gover.NewVersion(Version + "+f873dfca")
        if err != nil {
-               t.Error("Version 2 format error.")
+               t.Fatal("Version 2 format error.")
        }
        if v1.GreaterThan(v2) || v1.GreaterThan(v2) {
                t.Error("Version comparison error.")