DAD-Chain
diff --git a/‎http/base/common/common.go‎
Lines changed: 1 addition & 1 deletion b/‎http/base/common/common.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎smartcontract/service/wasmvm/wasm_service.go‎
Lines changed: 12 additions & 4 deletions b/‎smartcontract/service/wasmvm/wasm_service.go‎
Lines changed: 12 additions & 4 deletions
@@ -449,7 +449,7 @@ func NewNeovmInvokeTransaction(gasPrice, gasLimit uint64, contractAddress common
 	if err != nil {
 		return nil, err
 	}
-	return NewWasmSmartContractTransaction(gasPrice, gasLimit, invokeCode)
+	return NewSmartContractTransaction(gasPrice, gasLimit, invokeCode)
 }
 
 func NewWasmVMInvokeTransaction(gasPrice, gasLimit uint64, contractAddress common.Address, params []interface{}) (*types.MutableTransaction, error) {
 
@@ -61,8 +61,9 @@ var (
 	CONTRACT_METHOD_NAME = "invoke"
 
 	//max memory size of wasm vm
-	WASM_MEM_LIMITATION uint64 = 10 * 1024 * 1024
-	VM_STEP_LIMIT              = 40000000
+	WASM_MEM_LIMITATION  uint64 = 10 * 1024 * 1024
+	VM_STEP_LIMIT               = 40000000
+	WASM_CALLSTACK_LIMIT        = 1024
 
 	CodeCache *lru.ARCCache
 )
@@ -86,7 +87,7 @@ func (this *WasmVmService) Invoke() (interface{}, error) {
 		return nil, err
 	}
 
-	code, err := this.Store.GetContractState(contract.Address)
+	code, err := this.CacheDB.GetContract(contract.Address)
 	if err != nil {
 		return nil, err
 	}
@@ -103,7 +104,7 @@ func (this *WasmVmService) Invoke() (interface{}, error) {
 	}
 
 	if compiled == nil {
-		compiled, err := ReadWasmModule(code, false)
+		compiled, err = ReadWasmModule(code, false)
 		if err != nil {
 			return nil, err
 		}
@@ -121,6 +122,7 @@ func (this *WasmVmService) Invoke() (interface{}, error) {
 	}
 	vm.RecoverPanic = true
 	vm.AvaliableGas = &exec.Gas{GasLimit: this.GasLimit, GasPrice: this.GasPrice}
+	vm.CallStackDepth = uint32(WASM_CALLSTACK_LIMIT)
 
 	entryName := CONTRACT_METHOD_NAME
 
@@ -148,6 +150,12 @@ func (this *WasmVmService) Invoke() (interface{}, error) {
 	this.vm = vm
 
 	_, err = vm.ExecCode(index)
+
+	//here sub the sc.Gas.
+	if !this.ContextRef.CheckUseGas(this.GasLimit - vm.AvaliableGas.GasLimit) {
+		return nil, ERR_GAS_INSUFFICIENT
+	}
+
 	if err != nil {
 		return nil, errors.NewErr("[Call]ExecCode error!" + err.Error())
 	}
Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ func NewNeovmInvokeTransaction(gasPrice, gasLimit uint64, contractAddress common`
`449`	`449`	`if err != nil {`
`450`	`450`	`return nil, err`
`451`	`451`	`}`
`452`		`- return NewWasmSmartContractTransaction(gasPrice, gasLimit, invokeCode)`
	`452`	`+ return NewSmartContractTransaction(gasPrice, gasLimit, invokeCode)`
`453`	`453`	`}`
`454`	`454`
`455`	`455`	`func NewWasmVMInvokeTransaction(gasPrice, gasLimit uint64, contractAddress common.Address, params []interface{}) (*types.MutableTransaction, error) {`