adjust to 40960

plugin/dapp/paracross/executor/minerCustom.go

@@ -6,11 +6,12 @@ package executor
 
 import (
 	"fmt"
-	"github.com/33cn/chain33/types"
-	pt "github.com/33cn/plugin/plugin/dapp/paracross/types"
 	"math"
 	"strconv"
 	"strings"
+
+	"github.com/33cn/chain33/types"
+	pt "github.com/33cn/plugin/plugin/dapp/paracross/types"
 )
 
 const (
@@ -59,7 +60,7 @@ func getCustomReward(cfg *types.Chain33Config, height int64) (int64, int64, int6
 
 func getNHeight(n uint32) int64 {
 	v := 1 << n
-	return 4096 * (int64(v) - 1)
+	return 40960 * (int64(v) - 1)
 }
 
 //高度 4096*(2^n -1)+1 开始减半， n=1:1~4096, n=2:4096+1~12288

plugin/dapp/paracross/executor/minerCustom_test.go

@@ -6,24 +6,25 @@ package executor
 
 import (
 	"fmt"
-	"github.com/bmizerany/assert"
 	"testing"
 
+	"github.com/bmizerany/assert"
+
 	_ "github.com/33cn/plugin/plugin/crypto/bls"
 )
 
 func TestGetNHeight(t *testing.T) {
 	h := getNHeight(1)
-	assert.Equal(t, int64(4096), h)
+	assert.Equal(t, int64(40960), h)
 
 	h = getNHeight(2)
-	assert.Equal(t, int64(12288), h)
+	assert.Equal(t, int64(122880), h)
 
 	h = getNHeight(6)
-	assert.Equal(t, int64(258048), h)
+	assert.Equal(t, int64(2580480), h)
 
 	h = getNHeight(7)
-	assert.Equal(t, int64(520192), h)
+	assert.Equal(t, int64(5201920), h)
 
 }
 
@@ -31,16 +32,16 @@ func TestGetN(t *testing.T) {
 	n := getCurrentN(1)
 	assert.Equal(t, uint32(7), n)
 
-	n = getCurrentN(262144)
+	n = getCurrentN(2621440)
 	assert.Equal(t, uint32(7), n)
 
-	n = getCurrentN(262145)
+	n = getCurrentN(2621441)
 	assert.Equal(t, uint32(8), n)
 
-	n = getCurrentN(3932160)
+	n = getCurrentN(39321600)
 	assert.Equal(t, uint32(10), n)
 
-	n = getCurrentN(3932161)
+	n = getCurrentN(39321601)
 	assert.Equal(t, uint32(11), n)
 }
 

plugin/dapp/paracross/types/paracross.pb.go

@@ -6,12 +6,13 @@ package types
 import (
 	context "context"
 	fmt "fmt"
+	math "math"
+
 	types "github.com/33cn/chain33/types"
 	proto "github.com/golang/protobuf/proto"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
-	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.