v1.2: fix: multiple named tuple result from contract

docs/reference/config.md

@@ -666,7 +666,7 @@ nav_order: 2
 |address|The IP address on which the metrics HTTP API should listen|`int`|`127.0.0.1`
 |enabled|Enables the metrics API|`boolean`|`true`
 |path|The path from which to serve the Prometheus metrics|`string`|`/metrics`
-|port|The port on which the metrics HTTP API should listen|`int`|`6000`
+|port|The port on which the metrics HTTP API should listen|`int`|`7000`
 |publicURL|The fully qualified public URL for the metrics API. This is used for building URLs in HTTP responses and in OpenAPI Spec generation|URL `string`|`<nil>`
 |readTimeout|The maximum time to wait when reading from an HTTP connection|[`time.Duration`](https://pkg.go.dev/time#Duration)|`15s`
 |shutdownTimeout|The maximum amount of time to wait for any open HTTP requests to finish before shutting down the HTTP server|[`time.Duration`](https://pkg.go.dev/time#Duration)|`10s`

internal/apiserver/server.go

@@ -66,7 +66,7 @@ type apiServer struct {
 func InitConfig() {
 	httpserver.InitHTTPConfig(apiConfig, 5000)
 	httpserver.InitHTTPConfig(spiConfig, 5001)
-	httpserver.InitHTTPConfig(metricsConfig, 6000)
+	httpserver.InitHTTPConfig(metricsConfig, 7000)
 	httpserver.InitCORSConfig(corsConfig)
 	initMetricsConfig(metricsConfig)
 }

internal/blockchain/ethereum/ethereum.go

@@ -742,11 +742,12 @@ func (e *Ethereum) QueryContract(ctx context.Context, location *fftypes.JSONAny,
 	if err != nil || !res.IsSuccess() {
 		return nil, err
 	}
-	output := &queryOutput{}
-	if err = json.Unmarshal(res.Body(), output); err != nil {
+
+	var output interface{}
+	if err = json.Unmarshal(res.Body(), &output); err != nil {
 		return nil, err
 	}
-	return output, nil
+	return output, nil // note UNLIKE fabric this is just `output`, not `output.Result` - but either way the top level of what we return to the end user, is whatever the Connector sent us
 }
 
 func (e *Ethereum) NormalizeContractLocation(ctx context.Context, location *fftypes.JSONAny) (result *fftypes.JSONAny, err error) {
@@ -924,6 +925,8 @@ func (e *Ethereum) queryNetworkVersion(ctx context.Context, address string) (ver
 		}
 		return 0, err
 	}
+
+	// Leave as queryOutput as it only has one value
 	output := &queryOutput{}
 	if err = json.Unmarshal(res.Body(), output); err != nil {
 		return 0, err

internal/blockchain/ethereum/ethereum_test.go

@@ -2582,6 +2582,101 @@ func TestQueryContractOK(t *testing.T) {
 	assert.Equal(t, `{"output":"3"}`, string(j))
 }
 
+func TestQueryContractMultipleUnnamedOutputOK(t *testing.T) {
+	e, cancel := newTestEthereum()
+	defer cancel()
+	httpmock.ActivateNonDefault(e.client.GetClient())
+	defer httpmock.DeactivateAndReset()
+	location := &Location{
+		Address: "0x12345",
+	}
+	method := testFFIMethod()
+	errors := testFFIErrors()
+	params := map[string]interface{}{}
+	options := map[string]interface{}{
+		"customOption": "customValue",
+	}
+
+	outputStruct := struct {
+		Test  string `json:"test"`
+		Value int    `json:"value"`
+	}{
+		Test:  "myvalue",
+		Value: 3,
+	}
+
+	output := map[string]interface{}{
+		"output":   "foo",
+		"output1":  outputStruct,
+		"anything": 3,
+	}
+
+	locationBytes, err := json.Marshal(location)
+	assert.NoError(t, err)
+	httpmock.RegisterResponder("POST", `http://localhost:12345/`,
+		func(req *http.Request) (*http.Response, error) {
+			var body map[string]interface{}
+			json.NewDecoder(req.Body).Decode(&body)
+			headers := body["headers"].(map[string]interface{})
+			assert.Equal(t, "Query", headers["type"])
+			assert.Equal(t, "customValue", body["customOption"].(string))
+			assert.Equal(t, "0x12345", body["to"].(string))
+			return httpmock.NewJsonResponderOrPanic(200, output)(req)
+		})
+	result, err := e.QueryContract(context.Background(), fftypes.JSONAnyPtrBytes(locationBytes), method, params, errors, options)
+	assert.NoError(t, err)
+	j, err := json.Marshal(result)
+	assert.NoError(t, err)
+	assert.Equal(t, `{"anything":3,"output":"foo","output1":{"test":"myvalue","value":3}}`, string(j))
+}
+
+func TestQueryContractNamedOutputOK(t *testing.T) {
+	e, cancel := newTestEthereum()
+	defer cancel()
+	httpmock.ActivateNonDefault(e.client.GetClient())
+	defer httpmock.DeactivateAndReset()
+	location := &Location{
+		Address: "0x12345",
+	}
+	method := testFFIMethod()
+	errors := testFFIErrors()
+	params := map[string]interface{}{}
+	options := map[string]interface{}{
+		"customOption": "customValue",
+	}
+
+	outputStruct := struct {
+		Test  string `json:"test"`
+		Value int    `json:"value"`
+	}{
+		Test:  "myvalue",
+		Value: 3,
+	}
+
+	output := map[string]interface{}{
+		"mynamedparam":  "foo",
+		"mynamedstruct": outputStruct,
+	}
+
+	locationBytes, err := json.Marshal(location)
+	assert.NoError(t, err)
+	httpmock.RegisterResponder("POST", `http://localhost:12345/`,
+		func(req *http.Request) (*http.Response, error) {
+			var body map[string]interface{}
+			json.NewDecoder(req.Body).Decode(&body)
+			headers := body["headers"].(map[string]interface{})
+			assert.Equal(t, "Query", headers["type"])
+			assert.Equal(t, "customValue", body["customOption"].(string))
+			assert.Equal(t, "0x12345", body["to"].(string))
+			return httpmock.NewJsonResponderOrPanic(200, output)(req)
+		})
+	result, err := e.QueryContract(context.Background(), fftypes.JSONAnyPtrBytes(locationBytes), method, params, errors, options)
+	assert.NoError(t, err)
+	j, err := json.Marshal(result)
+	assert.NoError(t, err)
+	assert.Equal(t, `{"mynamedparam":"foo","mynamedstruct":{"test":"myvalue","value":3}}`, string(j))
+}
+
 func TestQueryContractInvalidOption(t *testing.T) {
 	e, cancel := newTestEthereum()
 	defer cancel()