1185 add generalized dynamic abi types generator

prophet/handlers/pricepred/PricePredictor.sol → prophet/handlers/pricepred/PricePredictorTypes.sol

@@ -2,10 +2,10 @@
 pragma solidity >=0.8.25 <0.9.0;
 
 /**
- * @title PricePredictor
+ * @title PricePredictorTypes
  * @notice Solidity contract that declares the structs for input/output.
  */
-contract PricePredictor {
+contract PricePredictorTypes {
     struct InputData {
         uint256 date;
         string[] tokens;

prophet/handlers/pricepred/pricepred.go

@@ -8,6 +8,8 @@ import (
 	"net/http"
 	"net/url"
 	"time"
+
+	"github.com/warden-protocol/wardenprotocol/prophet/handlers/pricepred/generated"
 )
 
 // PricePredictorSolidity is a handler for the price prediction AI model,
@@ -109,12 +111,12 @@ func (s PricePredictorSolidity) Execute(ctx context.Context, input []byte) ([]by
 	return encodedRes, nil
 }
 
-func decodeInput(inputData []byte) (PricePredictorInputData, error) {
+func decodeInput(inputData []byte) (generated.PricePredictorTypesInputData, error) {
 	var in struct {
-		InputData PricePredictorInputData
+		InputData generated.PricePredictorTypesInputData
 	}
 
-	abi, err := PricePredictorMetaData.GetAbi()
+	abi, err := generated.PricePredictorTypesMetaData.GetAbi()
 	if err != nil {
 		return in.InputData, fmt.Errorf("failed to get ABI: %w", err)
 	}
@@ -140,8 +142,8 @@ func decodeInput(inputData []byte) (PricePredictorInputData, error) {
 	return in.InputData, nil
 }
 
-func encodeOutput(outputData PricePredictorOutputData) ([]byte, error) {
-	abi, err := PricePredictorMetaData.GetAbi()
+func encodeOutput(outputData generated.PricePredictorTypesOutputData) ([]byte, error) {
+	abi, err := generated.PricePredictorTypesMetaData.GetAbi()
 	if err != nil {
 		return nil, fmt.Errorf("failed to get ABI: %w", err)
 	}
@@ -159,7 +161,7 @@ func encodeOutput(outputData PricePredictorOutputData) ([]byte, error) {
 	return packed, nil
 }
 
-func buildOutputData(inputData PricePredictorInputData, req PredictRequest, res PredictResponse, backtestingRes *BacktestingResponse) (PricePredictorOutputData, error) {
+func buildOutputData(inputData generated.PricePredictorTypesInputData, req PredictRequest, res PredictResponse, backtestingRes *BacktestingResponse) (generated.PricePredictorTypesOutputData, error) {
 	decimals := big.NewFloat(1e16)
 
 	tokenPreds := make([]*big.Int, len(req.SolverInput.Tokens))
@@ -227,13 +229,13 @@ func buildOutputData(inputData PricePredictorInputData, req PredictRequest, res
 				case P100:
 					metrics[i][j] = float64ToBigInt(tokenMetrics.Metrics.P100, decimals)
 				default:
-					return PricePredictorOutputData{}, fmt.Errorf("invalid requested metric: %d", m)
+					return generated.PricePredictorTypesOutputData{}, fmt.Errorf("invalid requested metric: %d", m)
 				}
 			}
 		}
 	}
 
-	return PricePredictorOutputData{
+	return generated.PricePredictorTypesOutputData{
 		Predictions: tokenPreds,
 		Metrics:     metrics,
 	}, nil

prophet/handlers/pricepred/pricepred_test.go

@@ -7,18 +7,19 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	"github.com/warden-protocol/wardenprotocol/prophet/handlers/pricepred/generated"
 )
 
 func TestDecodeInput(t *testing.T) {
 	cases := []struct {
 		name     string
 		input    string
-		expected PricePredictorInputData
+		expected generated.PricePredictorTypesInputData
 	}{
 		{
 			name:  "single element list",
 			input: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZ5unngAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB2JpdGNvaW4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZ0ZXRoZXIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHdW5pc3dhcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABY=",
-			expected: PricePredictorInputData{
+			expected: generated.PricePredictorTypesInputData{
 				Date:              big.NewInt(1738254238),
 				Tokens:            []string{"bitcoin", "tether", "uniswap"},
 				Metrics:           []*big.Int{big.NewInt(0), big.NewInt(22)},
@@ -46,15 +47,15 @@ func TestDecodeInput(t *testing.T) {
 func TestBuildOutput(t *testing.T) {
 	cases := []struct {
 		name           string
-		inputData      PricePredictorInputData
+		inputData      generated.PricePredictorTypesInputData
 		req            PredictRequest
 		res            PredictResponse
 		backtestingRes *BacktestingResponse
-		expected       PricePredictorOutputData
+		expected       generated.PricePredictorTypesOutputData
 	}{
 		{
 			name: "with backtesting",
-			inputData: PricePredictorInputData{
+			inputData: generated.PricePredictorTypesInputData{
 				Metrics: []*big.Int{
 					big.NewInt(int64(Count)),
 					big.NewInt(int64(P75)),
@@ -99,7 +100,7 @@ func TestBuildOutput(t *testing.T) {
 					},
 				},
 			},
-			expected: PricePredictorOutputData{
+			expected: generated.PricePredictorTypesOutputData{
 				Predictions: []*big.Int{
 					float64ToBigInt(17.435131034851075, big.NewFloat(1e16)),
 					float64ToBigInt(1.000115715622902, big.NewFloat(1e16)),
@@ -133,7 +134,7 @@ func TestAllMetricNamesCovered(t *testing.T) {
 	bmType := reflect.TypeOf(BacktestingMetrics{})
 	n := bmType.NumField()
 	for i := range n {
-		inputData := PricePredictorInputData{Metrics: []*big.Int{big.NewInt(int64(i))}}
+		inputData := generated.PricePredictorTypesInputData{Metrics: []*big.Int{big.NewInt(int64(i))}}
 
 		req := PredictRequest{
 			SolverInput: RequestSolverInput{

prophet/handlers/stoicquote/generated/StoicQuoteTypes.sol

@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-3.0
+// Code generated - DO NOT EDIT.
+// This file is a generated and any manual changes will be lost.
+pragma solidity >=0.8.25 <0.9.0;
+
+/**
+ * @title StoicQuoteTypes
+ * @notice Solidity contract that declares structs derived from JSON.
+ */
+contract StoicQuoteTypes {
+
+struct Data {
+    string author;
+    string quote;
+}
+
+struct StoicQuote {
+    Data data;
+}
+
+function useAllTypes(StoicQuote memory _stoicquote) external {
+    // This function doesn't do anything but ensures the top-level struct is referenced.
+}
+}