Merge remote-tracking branch 'elastos/master' into feature_v0.9.9

docs/release-notes/release-notes-0.9.8.2.md

@@ -0,0 +1,44 @@
+Elastos.ELA version 0.9.8.2 is now available from:
+
+  <https://download.elastos.io/elastos-ela/elastos-ela-v0.9.8.2/>
+
+This is a new major version release.
+
+Please report bugs using the issue tracker at GitHub:
+
+  <https://github.com/elastos/Elastos.ELA/issues>
+
+How to Upgrade
+==============
+
+If you are running version release_v0.9.8 and before, you should shut it down
+and wait until it has completely closed, then just copy over `ela`(on Linux) 
+and obtain the sponsors file to place it in the working directory.
+
+However, as usual, config, keystore and chaindata files are compatible.
+
+Compatibility
+==============
+
+Elastos.ELA is supported and extensively tested on operating systems
+using the Linux kernel. It is not recommended to use Elastos.ELA on
+unsupported systems.
+
+Elastos.ELA should also work on most other Unix-like systems but is not
+as frequently tested on them.
+
+As previously-supported CPU platforms, this release's pre-compiled
+distribution provides binaries for the x86_64 platform.
+
+Notable changes
+===============
+
+An issue related to reorganize has been fixed.
+
+0.9.8.2 change log
+=================
+
+### Bug Fixes
+
+* record last dpos rewards by history ([cf2aef4](https://github.com/elastos/Elastos.ELA/commit/cf2aef49048810b2f60b18264582069c91e30aec))
+* more than 720 blocks can reorganize under pow ([798658d](https://github.com/elastos/Elastos.ELA/commit/798658d4599347d348d77766f79f3f51826a0ca4))

test/unit/txvalidator_test.go

@@ -7632,7 +7632,9 @@ func (s *txValidatorTestSuite) TestArbitersAccumulateReward() {
 	if err != nil {
 		fmt.Println("err", err)
 	}
-
+	ownerAddr, _ := getProgramHash(ownerPubKeyStr)
+	ownerAddr[0] = byte(contract.PrefixDPoSV2)
+	ownerStakeAddr, _ := ownerAddr.ToAddress()
 	type fields struct {
 		State                      *state.State
 		ChainParams                *config.Configuration
@@ -7760,10 +7762,7 @@ func (s *txValidatorTestSuite) TestArbitersAccumulateReward() {
 			//CurrentCRCArbitersMap
 			a.AccumulateReward(tt.args.block, tt.args.confirm)
 			a.History.Commit(tt.args.block.Height)
-			addr, _ := common.Uint168FromAddress("SYWG3rnjyfU6PKu1yjSqDLMHaxvn8d8nDn")
-			addr[0] = byte(contract.PrefixDPoSV2)
-			stakeAddr, _ := addr.ToAddress()
-			if a.State.DPoSV2RewardInfo[stakeAddr] != 102 {
+			if a.State.DPoSV2RewardInfo[ownerStakeAddr] != 102 {
 				t.Errorf("DPoSV2RewardInfo() addr %v, want %v, but %v",
 					"SYWG3rnjyfU6PKu1yjSqDLMHaxvn8d8nDn", 102, a.State.DPoSV2RewardInfo)
 			}