Fix: decoding event from members

Author: aopoltorzhicky

pkg/abi/data.go

@@ -77,33 +77,29 @@ type FunctionItem struct {
 type EventItem struct {
 	Type
 
-	Data   []Type `json:"data"`
-	Keys   []Type `json:"keys"`
-	Inputs []Type `json:"inputs"`
+	Members []Type `json:"members,omitempty"`
+	Data    []Type `json:"data"`
+	Keys    []Type `json:"keys"`
+	Inputs  []Type `json:"inputs"`
 }
 
-type members struct {
-	Members []Type `json:"members"`
+type Members struct {
 }
 
 func (item *EventItem) UnmarshalJSON(data []byte) error {
 	type buf EventItem
 	if err := json.Unmarshal(data, (*buf)(item)); err != nil {
 		return err
 	}
-	if item.Data == nil && item.Keys == nil {
-		var m members
-		if err := json.Unmarshal(data, &m); err != nil {
-			return err
-		}
+	if item.Kind == StructType {
 		item.Data = make([]Type, 0)
 		item.Keys = make([]Type, 0)
-		for i := range m.Members {
-			switch m.Members[i].Kind {
+		for i := range item.Members {
+			switch item.Members[i].Kind {
 			case "data":
-				item.Data = append(item.Data, m.Members[i])
+				item.Data = append(item.Data, item.Members[i])
 			case "keys":
-				item.Keys = append(item.Keys, m.Members[i])
+				item.Keys = append(item.Keys, item.Members[i])
 			}
 		}
 	}

pkg/abi/data_test.go

@@ -43,6 +43,21 @@ func TestEventItem_UnmarshalJSON(t *testing.T) {
 					Type: "event",
 					Kind: "struct",
 				},
+				Members: []Type{
+					{
+						Kind: "data",
+						Name: "from",
+						Type: "core::starknet::contract_address::ContractAddress",
+					}, {
+						Kind: "data",
+						Name: "to",
+						Type: "core::starknet::contract_address::ContractAddress",
+					}, {
+						Kind: "data",
+						Name: "value",
+						Type: "core::integer::u256",
+					},
+				},
 				Data: []Type{
 					{
 						Kind: "data",

pkg/abi/decode.go

@@ -112,9 +112,15 @@ func DecodeEventData(data []string, typ EventItem, structs map[string]*StructIte
 		tail   = data
 		err    error
 
-		eventData = append(typ.Keys, typ.Data...)
+		eventData []Type
 	)
 
+	if len(typ.Members) > 0 {
+		eventData = typ.Members
+	} else {
+		eventData = append(typ.Keys, typ.Data...)
+	}
+
 	for i := range eventData {
 		tail, err = decodeItem(tail, eventData[i], structs, enums, result)
 		if err != nil {

pkg/abi/decode_test.go

@@ -1070,3 +1070,94 @@ func TestDecodeFunctionCallData(t *testing.T) {
 		})
 	}
 }
+
+func TestDecodeEventData(t *testing.T) {
+	type args struct {
+		data    []string
+		typ     EventItem
+		structs map[string]*StructItem
+		enums   map[string]*EnumItem
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    map[string]any
+		wantErr bool
+	}{
+		{
+			name: "test 1",
+			args: args{
+				data: []string{
+					"0x2a",
+					"0x1a62446e05ee60540d94b2e731ed037a1798065f9b8e719e293180b493b91f7",
+				},
+				typ: EventItem{
+					Type: Type{
+						Name: "hello::HelloStarknet::BalanceIncreased",
+						Type: "event",
+						Kind: "struct",
+					},
+					Members: []Type{
+						{
+							Name: "amount",
+							Type: "core::felt252",
+							Kind: "data",
+						}, {
+							Name: "by",
+							Type: "core::starknet::contract_address::ContractAddress",
+							Kind: "key",
+						},
+					},
+					Data: []Type{
+						{
+							Name: "amount",
+							Type: "core::felt252",
+							Kind: "data",
+						},
+					},
+					Keys: []Type{
+						{
+							Name: "by",
+							Type: "core::starknet::contract_address::ContractAddress",
+							Kind: "key",
+						},
+					},
+				},
+				structs: map[string]*StructItem{
+					"hello::HelloStarknet::BalanceIncreased": {
+						Members: []Member{
+							{
+								Type: Type{
+									Name: "amount",
+									Type: "core::felt252",
+									Kind: "data",
+								},
+							}, {
+								Type: Type{
+									Name: "by",
+									Type: "core::starknet::contract_address::ContractAddress",
+									Kind: "key",
+								},
+							},
+						},
+					},
+				},
+				enums: map[string]*EnumItem{},
+			},
+			want: map[string]any{
+				"amount": "0x2a",
+				"by":     "0x1a62446e05ee60540d94b2e731ed037a1798065f9b8e719e293180b493b91f7",
+			},
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := DecodeEventData(tt.args.data, tt.args.typ, tt.args.structs, tt.args.enums)
+			require.Equal(t, tt.wantErr, err != nil)
+			if !tt.wantErr {
+				require.Equal(t, tt.want, got)
+			}
+		})
+	}
+}