fix some bugs

core/blockchain.go

@@ -1203,7 +1203,7 @@ func (bc *BlockChain) insertChain(chain types.Blocks, local bool) (int, []interf
 		}
 
 		for _, tx := range block.Transactions() {
-			err := stx.Verify(tx.GetZZSTX())
+			err := stx.Verify(tx.GetZZSTX(), &state.GetZState().State0)
 			if err != nil {
 				return i, events, coalescedLogs, err
 			}

core/tx_pool.go

@@ -425,7 +425,7 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error {
 		return ErrGasLimit
 	}
 
-	err := stx.Verify(tx.GetZZSTX())
+	err := stx.Verify(tx.GetZZSTX(), &pool.currentState.GetZState().State0)
 	if err != nil {
 		return ErrVerifyError
 	}

zero/txs/txs.go

@@ -19,6 +19,8 @@ package txs
 import (
 	"errors"
 
+	"github.com/sero-cash/go-sero/zero/txs/zstate"
+
 	"github.com/sero-cash/go-czero-import/cpt"
 
 	"github.com/sero-cash/go-czero-import/keys"
@@ -160,11 +162,10 @@ func CheckInt(i *utils.I256) bool {
 	return CheckUint(&abs)
 }
 
-func Verify(s *stx.T) (e error) {
-	st1 := state1.CurrentState1()
-	return Verify_state1(s, st1)
+func Verify(s *stx.T, state *zstate.State0) (e error) {
+	return Verify_state1(s, state)
 }
-func Verify_state1(s *stx.T, state *state1.State1) (e error) {
+func Verify_state1(s *stx.T, state *zstate.State0) (e error) {
 	balance_desc := cpt.BalanceDesc{}
 
 	hash_z := s.ToHash_for_o()
@@ -192,12 +193,12 @@ func Verify_state1(s *stx.T, state *state1.State1) (e error) {
 	}
 
 	for _, in_o := range s.Desc_O.Ins {
-		if ok := state.State0.HasIn(&in_o.Root); ok {
+		if ok := state.HasIn(&in_o.Root); ok {
 			e = errors.New("txs.verify in already in nils")
 			return
 		} else {
 		}
-		if src, err := state.State0.GetOut(&in_o.Root); e == nil {
+		if src, err := state.GetOut(&in_o.Root); e == nil {
 			if src.IsO() {
 				if keys.VerifyPKr(&hash_z, &in_o.Sign, &src.Out_O.Addr) {
 					{
@@ -245,13 +246,18 @@ func Verify_state1(s *stx.T, state *state1.State1) (e error) {
 		}
 	}
 
+	if state.Cur.Index == int64(44) {
+		i := 0
+		i++
+	}
+
 	for _, in_z := range s.Desc_Z.Ins {
-		if ok := state.State0.HasIn(&in_z.Nil); ok {
+		if ok := state.HasIn(&in_z.Nil); ok {
 			e = errors.New("txs.verify in already in nils")
 			return
 		} else {
 		}
-		if out, err := state.State0.GetOut(&in_z.Anchor); err != nil {
+		if out, err := state.GetOut(&in_z.Anchor); err != nil {
 			e = err
 			return
 		} else {

zero/txs/txs_test.go

@@ -149,7 +149,7 @@ func (self *user) Gen(seed *keys.Uint256, t *tx.T) (s stx.T, e error) {
 }
 
 func (self *user) Verify(t *stx.T) (e error) {
-	return Verify_state1(t, g_blocks.st1)
+	return Verify_state1(t, g_blocks.st1.State0)
 }
 
 func (self *user) Logout() (ret uint64) {

zero/txs/zstate/state1/main.go

@@ -39,6 +39,9 @@ func CurrentState1() *State1 {
 
 func Run(bc BlockChain) {
 	go run(bc)
+	for current_state1 != nil {
+		time.Sleep(time.Second * 1)
+	}
 }
 
 func parse_block_chain(bc BlockChain, last_cmd_count int) (current_cm_count int, e error) {