CovenantSQL · leventeliu · Mar 28, 2019 · Mar 28, 2019 · Mar 28, 2019 · Mar 28, 2019
diff --git a/blockproducer/metastate.go b/blockproducer/metastate.go
@@ -900,7 +900,8 @@ func (s *metaState) updateBilling(tx *types.UpdateBilling) (err error) {
 		err = errors.Wrap(ErrDatabaseNotFound, "update billing failed")
 		return
 	}
-	if tx.Range.From >= tx.Range.To || newProfile.LastUpdatedHeight != tx.Range.From {
+
+	if tx.Version > 0 && (tx.Range.From >= tx.Range.To || newProfile.LastUpdatedHeight != tx.Range.From) {
 		err = errors.Wrapf(ErrInvalidRange,
 			"update billing within range %d:(%d, %d]",
 			newProfile.LastUpdatedHeight, tx.Range.From, tx.Range.To)

diff --git a/blockproducer/metastate_test.go b/blockproducer/metastate_test.go
@@ -1169,6 +1169,7 @@ func TestMetaState(t *testing.T) {
 							To:   10,
 						},
 					})
+					ub.Version = int32(ub.HSPDefaultVersion())
 					nonce, err = ms.nextNonce(addr2)
 					So(err, ShouldBeNil)
 					ub.Nonce = nonce
@@ -1352,6 +1353,7 @@ func TestMetaState(t *testing.T) {
 							},
 						},
 					}
+					ub1.Version = int32(ub1.HSPDefaultVersion())
 					err = ub1.Sign(privKey1)
 					So(err, ShouldBeNil)
 					err = ms.apply(ub1)
@@ -1442,6 +1444,7 @@ func TestMetaState(t *testing.T) {
 							},
 						},
 					}
+					ub2.Version = int32(ub2.HSPDefaultVersion())
 					err = ub2.Sign(privKey2)
 					So(err, ShouldBeNil)
 					err = ms.apply(ub2)
@@ -1493,6 +1496,7 @@ func TestMetaState(t *testing.T) {
 							},
 						},
 					}
+					ub3.Version = int32(ub3.HSPDefaultVersion())
 					err = ub3.Sign(privKey2)
 					So(err, ShouldBeNil)
 					err = ms.apply(ub3)

diff --git a/cmd/cql-minerd/integration_test.go b/cmd/cql-minerd/integration_test.go
@@ -735,7 +735,7 @@ func benchDB(b *testing.B, db *sql.DB, createDB bool) {
 	})
 
 	routineCount := runtime.NumGoroutine()
-	if routineCount > 100 {
+	if routineCount > 150 {
 		b.Errorf("go routine count: %d", routineCount)
 	} else {
 		log.Infof("go routine count: %d", routineCount)
@@ -777,7 +777,7 @@ func benchDB(b *testing.B, db *sql.DB, createDB bool) {
 	})
 
 	routineCount = runtime.NumGoroutine()
-	if routineCount > 100 {
+	if routineCount > 150 {
 		b.Errorf("go routine count: %d", routineCount)
 	} else {
 		log.Infof("go routine count: %d", routineCount)

diff --git a/sqlchain/chain.go b/sqlchain/chain.go
@@ -1059,6 +1059,7 @@ func (c *Chain) billing(h int32, node *blockNode) (ub *types.UpdateBilling, err
 	ub = types.NewUpdateBilling(&types.UpdateBillingHeader{
 		Users: make([]*types.UserCost, len(usersMap)),
 	})
+	ub.Version = int32(ub.HSPDefaultVersion())
 
 	i = 0
 	j = 0

diff --git a/types/updatebilling.go b/types/updatebilling.go
@@ -50,6 +50,7 @@ type UpdateBillingHeader struct {
 	Nonce    pi.AccountNonce
 	Users    []*UserCost
 	Range    Range
+	Version  int32 `hsp:"v,version"`
 }
 
 // UpdateBilling defines the UpdateBilling transaction.

diff --git a/types/updatebilling_gen.go b/types/updatebilling_gen.go
diff --git a/types/updatebilling_updatebillingheader_9ef447_gen.go b/types/updatebilling_updatebillingheader_9ef447_gen.go
diff --git a/types/updatebilling_updatebillingheader_9ef447_gen_test.go b/types/updatebilling_updatebillingheader_9ef447_gen_test.go
diff --git a/types/updatebilling_updatebillingheader_oldver_gen.go b/types/updatebilling_updatebillingheader_oldver_gen.go
diff --git a/types/updatebilling_updatebillingheader_oldver_gen_test.go b/types/updatebilling_updatebillingheader_oldver_gen_test.go
-Original file line number
+Diff line change
@@ Expand Up @@
     	ub = types.NewUpdateBilling(&types.UpdateBillingHeader{
     		Users: make([]*types.UserCost, len(usersMap)),
     	})
+    	ub.Version = int32(ub.HSPDefaultVersion())
     	i = 0
     	j = 0
@@ Expand Down @@