Merge pull request #137 from ElrondNetwork/new-vmcommon-fixes

return error for empty code
multiversx · Jun 25, 2020 · 8d37d04 · 8d37d04
2 parents e1eff4e + e3af342
commit 8d37d04
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/arwen/contexts/blockchain.go b/arwen/contexts/blockchain.go
@@ -119,10 +119,18 @@ func (context *blockchainContext) GetCodeHash(addr []byte) ([]byte, error) {
 
 func (context *blockchainContext) GetCode(address []byte) ([]byte, error) {
 	account, err := context.blockChainHook.GetUserAccount(address)
-	if err != nil || arwen.IfNil(account) {
+	if arwen.IfNil(account) {
+		return nil, arwen.ErrInvalidAccount
+	}
+	if err != nil {
 		return nil, err
 	}
 
+	code := account.GetCode()
+	if len(code) == 0 {
+		return nil, arwen.ErrContractNotFound
+	}
+
 	return account.GetCode(), nil
 }
 

diff --git a/arwen/errors.go b/arwen/errors.go
@@ -78,3 +78,5 @@ var ErrShiftNegative = errors.New("bitwise shift operations only allowed on posi
 var ErrAsyncContextDoesNotExist = errors.New("async context was not created yet")
 
 var ErrAsync = errors.New("invalid gas percentage provided for async call")
+
+var ErrInvalidAccount = errors.New("account does not exist")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -78,3 +78,5 @@ var ErrShiftNegative = errors.New("bitwise shift operations only allowed on posi
		var ErrAsyncContextDoesNotExist = errors.New("async context was not created yet")

		var ErrAsync = errors.New("invalid gas percentage provided for async call")

		var ErrInvalidAccount = errors.New("account does not exist")