Merge pull request #621 from vitelabs/release_v2.12.0

Release v2.12.0

common/upgrade/upgrade_init.go

@@ -108,7 +108,7 @@ func NewMainnetUpgradeBox() *upgradeBox {
 		},
 		{
 			Name:    "Version11",
-			Height:  EndlessHeight,
+			Height:  101320000,
 			Version: 11,
 		},
 		{

common/upgrade/upgrade_test.go

@@ -70,7 +70,7 @@ func TestMainnetUpgradeBox(t *testing.T) {
 		},
 		{
 			IsVersion11Upgrade,
-			EndlessHeight,
+			101320000,
 		},
 		{
 			IsVersionXUpgrade,
@@ -80,7 +80,7 @@ func TestMainnetUpgradeBox(t *testing.T) {
 	for _, ele := range cases {
 		testUpgradePoint(t, ele.fc, ele.sHeight)
 	}
-	assert.Equal(t, GetLatestPoint().Version, uint32(10))
+	assert.Equal(t, (int)(GetLatestPoint().Version), 11)
 }
 
 func TestLatestUpgradeBox(t *testing.T) {

rpcapi/api/ledger_v2.go

@@ -473,6 +473,9 @@ func GetLogs(c chain.Chain, rangeMap map[string]*Range, topics [][]types.Hash, p
 		if endHeight == 0 || endHeight > acc.Height {
 			endHeight = acc.Height
 		}
+		if startHeight > endHeight {
+			continue
+		}
 		for {
 			offset, count, finish := getHeightPage(startHeight, endHeight, 100)
 			if count == 0 {

version/buildversion

@@ -1 +1 @@
-v2.11.3
+v2.12.0

version/buildversion.go

@@ -1,3 +1,3 @@
 package version
-const VITE_COMMIT_VERSION = "af5b3bf85a76212304872b6c60381df5b50e6532"
-const VITE_BUILD_VERSION = "v2.11.3"
+const VITE_COMMIT_VERSION = "7aa7e8570af0df4b46e1dc06db930e64606e904e"
+const VITE_BUILD_VERSION = "v2.12.0"