add IsContract() in state.V

contract/contract.go

@@ -93,7 +93,7 @@ func Execute(execCtx context.Context, bs *state.BlockState, cdb ChainAccessor, t
 
 	// check validity of tx
 	var valid bool
-	if valid, err = validateTxType(txType, txAmount, len(txPayload), bi.ForkVersion, receiver.IsDeploy(), len(receiver.State().CodeHash) > 0); valid != true {
+	if valid, err = validateTxType(txType, txAmount, len(txPayload), bi.ForkVersion, receiver.IsDeploy(), receiver.IsContract()); valid != true {
 		return
 	}
 
@@ -259,7 +259,7 @@ func preloadWorker() {
 		}
 
 		// when deploy and call in same block and not deployed yet
-		if receiver.IsNew() || len(receiver.State().CodeHash) == 0 {
+		if receiver.IsNew() || !receiver.IsContract() {
 			// do not preload an executor for a contract that is not deployed yet
 			replyCh <- &preloadReply{tx, nil, nil}
 			continue
@@ -379,7 +379,7 @@ func useGas(version int32) bool {
 
 func checkRedeploy(sender, receiver *state.V, contractState *state.ContractState) error {
 	// check if the contract exists
-	if len(receiver.State().CodeHash) == 0 || receiver.IsNew() {
+	if !receiver.IsContract() || receiver.IsNew() {
 		receiverAddr := types.EncodeAddress(receiver.ID())
 		ctrLgr.Warn().Str("error", "not found contract").Str("contract", receiverAddr).Msg("redeploy")
 		return newVmError(fmt.Errorf("not found contract %s", receiverAddr))

state/statedb.go

@@ -224,6 +224,10 @@ func (v *V) IsNew() bool {
 	return v.newOne
 }
 
+func (v *V) IsContract() bool {
+	return len(v.State().CodeHash) > 0
+}
+
 func (v *V) IsDeploy() bool {
 	return v.deploy&deployFlag != 0
 }