sei-protocol · LCyson · Mar 15, 2023 · Mar 16, 2023 · Mar 16, 2023 · Mar 16, 2023
diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go
@@ -149,10 +149,10 @@ func (app *Application) handleTx(tx []byte) *types.ExecTxResult {
 		{
 			Type: "app",
 			Attributes: []types.EventAttribute{
-				{Key: "creator", Value: "Cosmoshi Netowoko", Index: true},
-				{Key: "key", Value: key, Index: true},
-				{Key: "index_key", Value: "index is working", Index: true},
-				{Key: "noindex_key", Value: "index is working", Index: false},
+				{Key: []byte("creator"), Value: []byte("Cosmoshi Netowoko"), Index: true},
+				{Key: []byte("key"), Value: []byte(key), Index: true},
+				{Key: []byte("index_key"), Value: []byte("index is working"), Index: true},
+				{Key: []byte("noindex_key"), Value: []byte("index is working"), Index: false},
 			},
 		},
 	}

diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go
diff --git a/internal/eventbus/event_bus.go b/internal/eventbus/event_bus.go
@@ -72,8 +72,8 @@ func (b *EventBus) Publish(eventValue string, eventData types.EventData) error {
 		Type: tokens[0],
 		Attributes: []abci.EventAttribute{
 			{
-				Key:   tokens[1],
-				Value: eventValue,
+				Key:   []byte(tokens[1]),
+				Value: []byte(eventValue),
 			},
 		},
 	}
@@ -137,8 +137,8 @@ func (b *EventBus) PublishEventTx(data types.EventDataTx) error {
 		Type: tokens[0],
 		Attributes: []abci.EventAttribute{
 			{
-				Key:   tokens[1],
-				Value: fmt.Sprintf("%X", types.Tx(data.Tx).Hash()),
+				Key:   []byte(tokens[1]),
+				Value: []byte(fmt.Sprintf("%X", types.Tx(data.Tx).Hash())),
 			},
 		},
 	})
@@ -148,8 +148,8 @@ func (b *EventBus) PublishEventTx(data types.EventDataTx) error {
 		Type: tokens[0],
 		Attributes: []abci.EventAttribute{
 			{
-				Key:   tokens[1],
-				Value: fmt.Sprintf("%d", data.Height),
+				Key:   []byte(tokens[1]),
+				Value: []byte(fmt.Sprintf("%d", data.Height)),
 			},
 		},
 	})

diff --git a/internal/eventbus/event_bus_test.go b/internal/eventbus/event_bus_test.go
@@ -30,7 +30,7 @@ func TestEventBusPublishEventTx(t *testing.T) {
 	result := abci.ExecTxResult{
 		Data: []byte("bar"),
 		Events: []abci.Event{
-			{Type: "testType", Attributes: []abci.EventAttribute{{Key: "baz", Value: "1"}}},
+			{Type: "testType", Attributes: []abci.EventAttribute{{Key:[]byte( "baz"), Value: []byte("1")}}},
 		},
 	}
 
@@ -86,8 +86,8 @@ func TestEventBusPublishEventNewBlock(t *testing.T) {
 	resultFinalizeBlock := abci.ResponseFinalizeBlock{
 		Events: []abci.Event{
 			{Type: "testType", Attributes: []abci.EventAttribute{
-				{Key: "baz", Value: "1"},
-				{Key: "foz", Value: "2"},
+				{Key: []byte("baz"), Value: []byte("1")},
+				{Key: []byte("foz"), Value: []byte("2")},
 			}},
 		},
 	}
@@ -140,25 +140,25 @@ func TestEventBusPublishEventTxDuplicateKeys(t *testing.T) {
 			{
 				Type: "transfer",
 				Attributes: []abci.EventAttribute{
-					{Key: "sender", Value: "foo"},
-					{Key: "recipient", Value: "bar"},
-					{Key: "amount", Value: "5"},
+					{Key: []byte("sender"), Value: []byte("foo")},
+					{Key: []byte("recipient"), Value: []byte("bar")},
+					{Key: []byte("amount"), Value: []byte("5")},
 				},
 			},
 			{
 				Type: "transfer",
 				Attributes: []abci.EventAttribute{
-					{Key: "sender", Value: "baz"},
-					{Key: "recipient", Value: "cat"},
-					{Key: "amount", Value: "13"},
+					{Key: []byte("sender"), Value: []byte("baz")},
+					{Key: []byte("recipient"), Value: []byte("cat")},
+					{Key: []byte("amount"), Value: []byte("13")},
 				},
 			},
 			{
 				Type: "withdraw.rewards",
 				Attributes: []abci.EventAttribute{
-					{Key: "address", Value: "bar"},
-					{Key: "source", Value: "iceman"},
-					{Key: "amount", Value: "33"},
+					{Key: []byte("address"), Value: []byte("bar")},
+					{Key: []byte("source"), Value: []byte("iceman")},
+					{Key: []byte("amount"), Value: []byte("33")},
 				},
 			},
 		},
@@ -255,8 +255,8 @@ func TestEventBusPublishEventNewBlockHeader(t *testing.T) {
 	resultFinalizeBlock := abci.ResponseFinalizeBlock{
 		Events: []abci.Event{
 			{Type: "testType", Attributes: []abci.EventAttribute{
-				{Key: "baz", Value: "1"},
-				{Key: "foz", Value: "2"},
+				{Key: []byte("baz"), Value: []byte("1")},
+				{Key: []byte("foz"), Value: []byte("2")},
 			}},
 		},
 	}

diff --git a/internal/eventlog/item.go b/internal/eventlog/item.go
@@ -52,7 +52,7 @@ func makeEvents(etype string, data types.EventData) []abci.Event {
 	base := []abci.Event{{
 		Type: tmTypeTag,
 		Attributes: []abci.EventAttribute{{
-			Key: tmTypeKey, Value: etype,
+			Key: []byte(tmTypeKey), Value: []byte(etype),
 		}},
 	}}
 	if evt, ok := data.(ABCIEventer); ok {
@@ -69,8 +69,8 @@ func FindType(events []abci.Event) (string, bool) {
 			continue
 		}
 		for _, attr := range evt.Attributes {
-			if attr.Key == tmTypeKey {
-				return attr.Value, true
+			if string(attr.Key) == tmTypeKey {
+				return string(attr.Value), true
 			}
 		}
 	}

diff --git a/internal/pubsub/example_test.go b/internal/pubsub/example_test.go
@@ -26,7 +26,7 @@ func TestExample(t *testing.T) {
 	events := []abci.Event{
 		{
 			Type:       "abci.account",
-			Attributes: []abci.EventAttribute{{Key: "name", Value: "John"}},
+			Attributes: []abci.EventAttribute{{Key: []byte("name"), Value: []byte("John")}},
 		},
 	}
 	require.NoError(t, s.PublishWithEvents(pubstring("Tombstone"), events))

diff --git a/internal/pubsub/pubsub_test.go b/internal/pubsub/pubsub_test.go
@@ -173,7 +173,7 @@ func TestDifferentClients(t *testing.T) {
 
 	events := []abci.Event{{
 		Type:       "tm.events",
-		Attributes: []abci.EventAttribute{{Key: "type", Value: "NewBlock"}},
+		Attributes: []abci.EventAttribute{{Key: []byte("type"), Value: []byte("NewBlock")}},
 	}}
 
 	require.NoError(t, s.PublishWithEvents(pubstring("Iceman"), events))
@@ -187,11 +187,11 @@ func TestDifferentClients(t *testing.T) {
 	events = []abci.Event{
 		{
 			Type:       "tm.events",
-			Attributes: []abci.EventAttribute{{Key: "type", Value: "NewBlock"}},
+			Attributes: []abci.EventAttribute{{Key: []byte("type"), Value: []byte("NewBlock")}},
 		},
 		{
 			Type:       "abci.account",
-			Attributes: []abci.EventAttribute{{Key: "name", Value: "Igor"}},
+			Attributes: []abci.EventAttribute{{Key: []byte("name"), Value: []byte("Igor")}},
 		},
 	}
 
@@ -207,7 +207,7 @@ func TestDifferentClients(t *testing.T) {
 
 	events = []abci.Event{{
 		Type:       "tm.events",
-		Attributes: []abci.EventAttribute{{Key: "type", Value: "NewRoundStep"}},
+		Attributes: []abci.EventAttribute{{Key: []byte("type"), Value: []byte("NewRoundStep")}},
 	}}
 
 	require.NoError(t, s.PublishWithEvents(pubstring("Valeria Richards"), events))
@@ -244,17 +244,17 @@ func TestSubscribeDuplicateKeys(t *testing.T) {
 				{
 					Type: "transfer",
 					Attributes: []abci.EventAttribute{
-						{Key: "sender", Value: "foo"},
-						{Key: "sender", Value: "bar"},
-						{Key: "sender", Value: "baz"},
+						{Key: []byte("sender"), Value: []byte("foo")},
+						{Key: []byte("sender"), Value: []byte("bar")},
+						{Key: []byte("sender"), Value: []byte("baz")},
 					},
 				},
 				{
 					Type: "withdraw",
 					Attributes: []abci.EventAttribute{
-						{Key: "rewards", Value: "1"},
-						{Key: "rewards", Value: "17"},
-						{Key: "rewards", Value: "22"},
+						{Key: []byte("rewards"), Value: []byte("1")},
+						{Key: []byte("rewards"), Value: []byte("17")},
+						{Key: []byte("rewards"), Value: []byte("22")},
 					},
 				},
 			}
@@ -280,7 +280,7 @@ func TestClientSubscribesTwice(t *testing.T) {
 	q := query.MustCompile(`tm.events.type='NewBlock'`)
 	events := []abci.Event{{
 		Type:       "tm.events",
-		Attributes: []abci.EventAttribute{{Key: "type", Value: "NewBlock"}},
+		Attributes: []abci.EventAttribute{{Key: []byte("type"), Value: []byte("NewBlock")}},
 	}}
 
 	sub1 := newTestSub(t).must(s.SubscribeWithArgs(ctx, pubsub.SubscribeArgs{

diff --git a/internal/pubsub/query/bench_test.go b/internal/pubsub/query/bench_test.go
@@ -13,21 +13,21 @@ var testEvents = []types.Event{
 	{
 		Type: "tm.events",
 		Attributes: []types.EventAttribute{{
-			Key:   "index",
-			Value: "25",
+			Key:   []byte("index"),
+			Value: []byte("25"),
 		}, {
-			Key:   "type",
-			Value: "NewBlock",
+			Key:   []byte("type"),
+			Value: []byte("NewBlock"),
 		}},
 	},
 	{
 		Type: "abci.account",
 		Attributes: []types.EventAttribute{{
-			Key:   "name",
-			Value: "Anya",
+			Key:   []byte("name"),
+			Value: []byte("Anya"),
 		}, {
-			Key:   "name",
-			Value: "Igor",
+			Key:   []byte("name"),
+			Value: []byte("Igor"),
 		}},
 	},
 }

diff --git a/internal/pubsub/query/query.go b/internal/pubsub/query/query.go
@@ -116,9 +116,9 @@ func (c condition) findAttr(event types.Event) ([]string, bool) {
 	}
 	var vals []string
 	for _, attr := range event.Attributes {
-		fullName := event.Type + "." + attr.Key
+		fullName := event.Type + "." + string(attr.Key)
 		if fullName == c.tag {
-			vals = append(vals, attr.Value)
+			vals = append(vals, string(attr.Value))
 		}
 	}
 	return vals, false

diff --git a/internal/pubsub/query/query_test.go b/internal/pubsub/query/query_test.go
@@ -24,35 +24,35 @@ var apiEvents = []types.Event{
 	{
 		Type: "tm",
 		Attributes: []types.EventAttribute{
-			{Key: "event", Value: "Tx"},
-			{Key: "hash", Value: "XYZ"},
-			{Key: "height", Value: "5"},
+			{Key: []byte("event"), Value: []byte("Tx")},
+			{Key: []byte("hash"), Value: []byte("XYZ")},
+			{Key: []byte("height"), Value: []byte("5")},
 		},
 	},
 	{
 		Type: "rewards.withdraw",
 		Attributes: []types.EventAttribute{
-			{Key: "address", Value: "AddrA"},
-			{Key: "source", Value: "SrcX"},
-			{Key: "amount", Value: "100"},
-			{Key: "balance", Value: "1500"},
+			{Key: []byte("address"), Value: []byte("AddrA")},
+			{Key: []byte("source"), Value: []byte("SrcX")},
+			{Key: []byte("amount"), Value: []byte("100")},
+			{Key: []byte("balance"), Value: []byte("1500")},
 		},
 	},
 	{
 		Type: "rewards.withdraw",
 		Attributes: []types.EventAttribute{
-			{Key: "address", Value: "AddrB"},
-			{Key: "source", Value: "SrcY"},
-			{Key: "amount", Value: "45"},
-			{Key: "balance", Value: "999"},
+			{Key: []byte("address"), Value: []byte("AddrB")},
+			{Key: []byte("source"), Value: []byte("SrcY")},
+			{Key: []byte("amount"), Value: []byte("45")},
+			{Key: []byte("balance"), Value: []byte("999")},
 		},
 	},
 	{
 		Type: "transfer",
 		Attributes: []types.EventAttribute{
-			{Key: "sender", Value: "AddrC"},
-			{Key: "recipient", Value: "AddrD"},
-			{Key: "amount", Value: "160"},
+			{Key: []byte("sender"), Value: []byte("AddrC")},
+			{Key: []byte("recipient"), Value: []byte("AddrD")},
+			{Key: []byte("amount"), Value: []byte("160")},
 		},
 	},
 }
@@ -242,8 +242,8 @@ func newTestEvent(s string) types.Event {
 	for _, kv := range parts[1:] {
 		key, val := splitKV(kv)
 		event.Attributes = append(event.Attributes, types.EventAttribute{
-			Key:   key,
-			Value: val,
+			Key:   []byte(key),
+			Value: []byte(val),
 		})
 	}
 	return event

diff --git a/internal/state/indexer/block/kv/kv.go b/internal/state/indexer/block/kv/kv.go
@@ -463,13 +463,13 @@ func (idx *BlockerIndexer) indexEvents(batch dbm.Batch, events []abci.Event, typ
 			}
 
 			// index iff the event specified index:true and it's not a reserved event
-			compositeKey := fmt.Sprintf("%s.%s", event.Type, attr.Key)
+			compositeKey := fmt.Sprintf("%s.%s", event.Type, string(attr.Key))
 			if compositeKey == types.BlockHeightKey {
 				return fmt.Errorf("event type and attribute key \"%s\" is reserved; please use a different key", compositeKey)
 			}
 
 			if attr.GetIndex() {
-				key, err := eventKey(compositeKey, typ, attr.Value, height)
+				key, err := eventKey(compositeKey, typ, string(attr.Value), height)
 				if err != nil {
 					return fmt.Errorf("failed to create block index key: %w", err)
 				}

diff --git a/internal/state/indexer/block/kv/kv_test.go b/internal/state/indexer/block/kv/kv_test.go
@@ -26,8 +26,8 @@ func TestBlockIndexer(t *testing.T) {
 					Type: "finalize_event1",
 					Attributes: []abci.EventAttribute{
 						{
-							Key:   "proposer",
-							Value: "FCAA001",
+							Key:   []byte("proposer"),
+							Value: []byte("FCAA001"),
 							Index: true,
 						},
 					},
@@ -36,8 +36,8 @@ func TestBlockIndexer(t *testing.T) {
 					Type: "finalize_event2",
 					Attributes: []abci.EventAttribute{
 						{
-							Key:   "foo",
-							Value: "100",
+							Key:   []byte("foo"),
+							Value: []byte("100"),
 							Index: true,
 						},
 					},
@@ -59,8 +59,8 @@ func TestBlockIndexer(t *testing.T) {
 						Type: "finalize_event1",
 						Attributes: []abci.EventAttribute{
 							{
-								Key:   "proposer",
-								Value: "FCAA001",
+								Key:   []byte("proposer"),
+								Value: []byte("FCAA001"),
 								Index: true,
 							},
 						},
@@ -69,8 +69,8 @@ func TestBlockIndexer(t *testing.T) {
 						Type: "finalize_event2",
 						Attributes: []abci.EventAttribute{
 							{
-								Key:   "foo",
-								Value: fmt.Sprintf("%d", i),
+								Key:   []byte("foo"),
+								Value: []byte(fmt.Sprintf("%d", i)),
 								Index: index,
 							},
 						},