Merge pull request #79 from iulianpascalau/remove-contracts-reference-and-code

Added query contract error treated as paused

Author: iulianpascalau

services/crypto-payment/process/contractQueryHandler.go

@@ -17,6 +17,7 @@ const (
 	keyCreditsPerEgld = "creditsPerEgld"
 
 	contractNotFoundStatus = "contract not found"
+	returnCodeOk           = "ok"
 )
 
 type contractQueryHandler struct {
@@ -63,14 +64,20 @@ func (cqh *contractQueryHandler) IsContractPaused(ctx context.Context) (bool, er
 		CallerAddr: cqh.contractBech32Address, // Caller can be the contract itself for views usually, or random
 	})
 	if err != nil {
-		return false, err
+		return true, err
 	}
 
 	if res.Data == nil || res.Data.ReturnCode == contractNotFoundStatus {
 		// malformed response or the contract was not found, signal that the contract is paused
 		return true, nil
 	}
 
+	// If the return code is not "ok", something went wrong (e.g. function not found, execution failed).
+	// We should treat this as the contract being paused/unavailable for safety.
+	if res.Data.ReturnCode != returnCodeOk {
+		return true, nil
+	}
+
 	if len(res.Data.ReturnData) == 0 || len(res.Data.ReturnData[0]) == 0 {
 		isPaused = false
 	} else {

services/crypto-payment/process/contractQueryHandler_test.go

@@ -58,7 +58,7 @@ func TestContractQueryHandler_IsContractPaused(t *testing.T) {
 
 		handler, _ := NewContractQueryHandler(proxy, "erd1test", &testsCommon.CacherStub{})
 		paused, err := handler.IsContractPaused(context.Background())
-		require.False(t, paused)
+		require.True(t, paused)
 		require.Equal(t, expectedErr, err)
 	})
 
@@ -74,6 +74,7 @@ func TestContractQueryHandler_IsContractPaused(t *testing.T) {
 		handler, _ := NewContractQueryHandler(proxy, "erd1test", &testsCommon.CacherStub{})
 		paused, err := handler.IsContractPaused(context.Background())
 		require.NoError(t, err)
+		// Data nil -> Paused
 		require.True(t, paused)
 	})
 
@@ -83,7 +84,7 @@ func TestContractQueryHandler_IsContractPaused(t *testing.T) {
 		proxy := &testsCommon.BlockchainDataProviderStub{
 			ExecuteVMQueryHandler: func(ctx context.Context, vmRequest *data.VmValueRequest) (*data.VmValuesResponseData, error) {
 				return &data.VmValuesResponseData{
-					Data: &vm.VMOutputApi{ReturnData: nil},
+					Data: &vm.VMOutputApi{ReturnData: nil, ReturnCode: "ok"},
 				}, nil
 			},
 		}
@@ -100,7 +101,7 @@ func TestContractQueryHandler_IsContractPaused(t *testing.T) {
 		proxy := &testsCommon.BlockchainDataProviderStub{
 			ExecuteVMQueryHandler: func(ctx context.Context, vmRequest *data.VmValueRequest) (*data.VmValuesResponseData, error) {
 				return &data.VmValuesResponseData{
-					Data: &vm.VMOutputApi{ReturnData: make([][]byte, 0)},
+					Data: &vm.VMOutputApi{ReturnData: make([][]byte, 0), ReturnCode: "ok"},
 				}, nil
 			},
 		}
@@ -117,7 +118,7 @@ func TestContractQueryHandler_IsContractPaused(t *testing.T) {
 		proxy := &testsCommon.BlockchainDataProviderStub{
 			ExecuteVMQueryHandler: func(ctx context.Context, vmRequest *data.VmValueRequest) (*data.VmValuesResponseData, error) {
 				return &data.VmValuesResponseData{
-					Data: &vm.VMOutputApi{ReturnData: [][]byte{{}}},
+					Data: &vm.VMOutputApi{ReturnData: [][]byte{{}}, ReturnCode: "ok"},
 				}, nil
 			},
 		}
@@ -147,13 +148,33 @@ func TestContractQueryHandler_IsContractPaused(t *testing.T) {
 		require.True(t, paused)
 	})
 
+	t.Run("execution failed", func(t *testing.T) {
+		t.Parallel()
+
+		proxy := &testsCommon.BlockchainDataProviderStub{
+			ExecuteVMQueryHandler: func(ctx context.Context, vmRequest *data.VmValueRequest) (*data.VmValuesResponseData, error) {
+				return &data.VmValuesResponseData{
+					Data: &vm.VMOutputApi{
+						ReturnCode: "execution failed",
+						ReturnData: nil,
+					},
+				}, nil
+			},
+		}
+
+		handler, _ := NewContractQueryHandler(proxy, "erd1test", &testsCommon.CacherStub{})
+		paused, err := handler.IsContractPaused(context.Background())
+		require.NoError(t, err)
+		require.True(t, paused)
+	})
+
 	t.Run("paused", func(t *testing.T) {
 		t.Parallel()
 
 		proxy := &testsCommon.BlockchainDataProviderStub{
 			ExecuteVMQueryHandler: func(ctx context.Context, vmRequest *data.VmValueRequest) (*data.VmValuesResponseData, error) {
 				return &data.VmValuesResponseData{
-					Data: &vm.VMOutputApi{ReturnData: [][]byte{{1}}},
+					Data: &vm.VMOutputApi{ReturnData: [][]byte{{1}}, ReturnCode: "ok"},
 				}, nil
 			},
 		}
@@ -170,7 +191,7 @@ func TestContractQueryHandler_IsContractPaused(t *testing.T) {
 		proxy := &testsCommon.BlockchainDataProviderStub{
 			ExecuteVMQueryHandler: func(ctx context.Context, vmRequest *data.VmValueRequest) (*data.VmValuesResponseData, error) {
 				return &data.VmValuesResponseData{
-					Data: &vm.VMOutputApi{ReturnData: [][]byte{{0}}},
+					Data: &vm.VMOutputApi{ReturnData: [][]byte{{0}}, ReturnCode: "ok"},
 				}, nil
 			},
 		}
@@ -189,7 +210,7 @@ func TestContractQueryHandler_IsContractPaused(t *testing.T) {
 			ExecuteVMQueryHandler: func(ctx context.Context, vmRequest *data.VmValueRequest) (*data.VmValuesResponseData, error) {
 				calls++
 				return &data.VmValuesResponseData{
-					Data: &vm.VMOutputApi{ReturnData: [][]byte{{1}}},
+					Data: &vm.VMOutputApi{ReturnData: [][]byte{{1}}, ReturnCode: "ok"},
 				}, nil
 			},
 		}