Merge branch 'main' into cre-1320

Author: mchain0

pkg/types/llo/types.go

@@ -272,7 +272,7 @@ type ChannelDefinition struct {
 	// It is set by the LLO channel definitions cache.
 	// The source is the id of the role that added the channel definition (i.e. the channel adder)
 	// 1 is always the ChannelConfigStore owner, greater values are adders.
-	Source uint32 `json:"-"`
+	Source uint32 `json:"source"`
 	// Tombstone indicates if the channel definition is an owner tombstone that
 	// should be removed from the current channel definitions cache.
 	Tombstone bool `json:"tombstone"`

pkg/types/llo/types_test.go

@@ -18,7 +18,8 @@ func Test_ChannelDefinitions_Serialization(t *testing.T) {
 	  {"streamId": 2, "aggregator": "mode"}
     ],
     "opts": null,
-    "tombstone": false
+    "tombstone": false,
+	"source": 1
   },
   "1": {
     "reportFormat": "evm_premium_legacy",
@@ -33,7 +34,8 @@ func Test_ChannelDefinitions_Serialization(t *testing.T) {
       "feedId": "0x0003aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
       "baseUSDFee": "0.1"
     },
-    "tombstone": false
+    "tombstone": false,
+	"source": 2
   }
 }`
 	var channelDefinitions ChannelDefinitions
@@ -160,11 +162,13 @@ func Test_ChannelDefinitions_Value(t *testing.T) {
 				ReportFormat: ReportFormatJSON,
 				Streams:      []Stream{{1, AggregatorMedian}, {2, AggregatorMode}},
 				Opts:         nil,
+				Source:       1,
 			},
 			1: {
 				ReportFormat: ReportFormatEVMPremiumLegacy,
 				Streams:      []Stream{{1, AggregatorMedian}, {2, AggregatorMedian}, {3, AggregatorQuote}},
 				Opts:         []byte(`{"baseUSDFee":"0.1","expirationWindow":86400,"feedId":"0x0003aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","multiplier":"1000000000000000000"}`),
+				Source:       2,
 			},
 		}
 		v, err := c.Value()
@@ -177,7 +181,8 @@ func Test_ChannelDefinitions_Value(t *testing.T) {
       {"streamId": 2, "aggregator": "mode"}
     ],
     "opts": null,
-    "tombstone": false
+    "tombstone": false,
+	"source": 1
   },
   "1": {
     "reportFormat": "evm_premium_legacy",
@@ -192,7 +197,8 @@ func Test_ChannelDefinitions_Value(t *testing.T) {
       "feedId": "0x0003aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
       "multiplier": "1000000000000000000"
     },
-    "tombstone": false
+    "tombstone": false,
+	"source": 2
   }
 }`
 		assert.JSONEq(t, expectedJSON, string(v.([]byte)))