prod config for mov (#524)

* prod config for mov

* add release not

Co-authored-by: paladz <453256728@qq.com>

diff --git a/config/toml.go b/config/toml.go
index 83091b5..bbbf98f 100644 (file)
--- a/config/toml.go
+++ b/config/toml.go
@@ -32,7 +32,7 @@ var mainNetConfigTmpl = `chain_id = "mainnet"
 laddr = "tcp://0.0.0.0:56656"
 seeds = "47.103.79.68:56656,47.103.13.86:56656,47.102.193.119:56656,47.103.17.22:56656"
 [cross_chain]
-asset_whitelist = ""
+asset_whitelist = "184e1cc4ee4845023888810a79eed7a42c02c544cf2c61ceac05e176d575bd46,78de44ffa1bce37b757c9eae8925b5f199dc4621b412ef0f3f46168865284a93"
 `
 
 var testNetConfigTmpl = `chain_id = "testnet"

diff --git a/consensus/general.go b/consensus/general.go
index 799185e..7a358d0 100644 (file)
--- a/consensus/general.go
+++ b/consensus/general.go
@@ -158,7 +158,7 @@ var MainNetParams = Params{
                {BeginBlock: 1, EndBlock: 63072000, Subsidy: 9512938},
        },
        SoftForkPoint:  map[uint64]uint64{SoftFork001: 10461600},
-       MovStartHeight: 43354800,
+       MovStartHeight: 42884800,
        MovRewardPrograms: []MovRewardProgram{
                {
                        BeginBlock: 1,

diff --git a/docs/release-notes/release-notes-1.1.0.md b/docs/release-notes/release-notes-1.1.0.md
new file mode 100644 (file)
index 0000000..8479f56
--- /dev/null
+++ b/docs/release-notes/release-notes-1.1.0.md
@@ -0,0 +1,41 @@
+Vapor version 1.1.0 is now available from:
+
+  https://github.com/Bytom/vapor/releases/tag/v1.1.0
+
+
+Please report bugs using the issue tracker at github:
+
+  https://github.com/Bytom/vapor/issues
+
+
+
+1.1.0 changelog
+================
+__Vapor Node__
+
++ `PR #518`
+    - Support Mov on-chain asset exchange protocol.
+    - Support cross chain for the open federation asset.
++ `PR #517`
+    - Prevent network timeout issues for fast network sync in the latency environment.
++ `PR #496`
+    - Add rollback function to handle the edge fork case.
+
+
+Credits
+--------
+
+Thanks to everyone who directly contributed to this release:
+
+- Colt-Z
+- HAOYUatHZ
+- ipqhjjybj
+- langyu
+- Paladz
+- shenao78
+- shengling2008
+- oysheng
+- zcc0721
+- ZhitingLin
+
+And everyone who helped test.
\ No newline at end of file