added state changes to convertor.

data/hyperOutportBlocks/hyperOutportBlock.proto

@@ -28,6 +28,7 @@ message MetaOutportBlock {
   repeated uint64              SignersIndexes         = 8;
   uint64                       HighestFinalBlockNonce = 9;
   bytes                        HighestFinalBlockHash  = 10;
+  map <string, StateChanges>   StateChanges           = 11;
 }
 
 message ShardOutportBlock {
@@ -54,6 +55,7 @@ message ShardOutportBlockV2 {
   repeated uint64              SignersIndexes         = 8;
   uint64                       HighestFinalBlockNonce = 9;
   bytes                        HighestFinalBlockHash  = 10;
+  map <string, StateChanges>   StateChanges           = 11;
 }
 
 message TransactionPoolV2 {
@@ -511,3 +513,23 @@ message Receipt {
 message BigInt {
   bytes bytes = 1;
 }
+
+message StateChanges {
+  repeated StateChange StateChanges = 1;
+}
+
+message StateChange {
+  string Type = 1;
+  int32 Index = 2;
+  bytes TxHash = 3;
+  bytes MainTrieKey = 4;
+  bytes MainTrieVal = 5;
+  string Operation = 6;
+  repeated DataTrieChange DataTrieChanges = 7;
+}
+
+message DataTrieChange {
+  string Type = 1;
+  bytes Key = 2;
+  bytes Val = 3;
+}

go.mod

@@ -3,9 +3,9 @@ module github.com/multiversx/mx-chain-ws-connector-firehose-go
 go 1.20
 
 require (
-	github.com/gogo/protobuf v1.3.2
+	github.com/golang/protobuf v1.5.4
 	github.com/multiversx/mx-chain-communication-go v1.0.12
-	github.com/multiversx/mx-chain-core-go v1.2.19
+	github.com/multiversx/mx-chain-core-go v1.2.23-0.20240918093335-b9e28fbed67c
 	github.com/multiversx/mx-chain-logger-go v1.0.14
 	github.com/multiversx/mx-chain-storage-go v1.0.15
 	github.com/stretchr/testify v1.8.4
@@ -18,7 +18,7 @@ require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/denisbrodbeck/machineid v1.0.1 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect

go.sum

@@ -51,8 +51,8 @@ github.com/multiversx/concurrent-map v0.1.4 h1:hdnbM8VE4b0KYJaGY5yJS2aNIW9TFFsUY
 github.com/multiversx/concurrent-map v0.1.4/go.mod h1:8cWFRJDOrWHOTNSqgYCUvwT7c7eFQ4U2vKMOp4A/9+o=
 github.com/multiversx/mx-chain-communication-go v1.0.12 h1:67WOaf87gpwouydD1AAOHw5LMGZh7NfITrp/KqFY3Tw=
 github.com/multiversx/mx-chain-communication-go v1.0.12/go.mod h1:+oaUowpq+SqrEmAsMPGwhz44g7L81loWb6AiNQU9Ms4=
-github.com/multiversx/mx-chain-core-go v1.2.19 h1:2BaVHkB0tro3cjs5ay2pmLup1loCV0e1p9jV5QW0xqc=
-github.com/multiversx/mx-chain-core-go v1.2.19/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE=
+github.com/multiversx/mx-chain-core-go v1.2.23-0.20240918093335-b9e28fbed67c h1:wPqkaTaiSnMXXGmnqJNtn+xMZUoJEAw16QgtrlUGSgk=
+github.com/multiversx/mx-chain-core-go v1.2.23-0.20240918093335-b9e28fbed67c/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE=
 github.com/multiversx/mx-chain-crypto-go v1.2.9 h1:OEfF2kOQrtzUl273Z3DEcshjlTVUfPpJMd0R0SvTrlU=
 github.com/multiversx/mx-chain-crypto-go v1.2.9/go.mod h1:fkaWKp1rbQN9wPKya5jeoRyC+c/SyN/NfggreyeBw+8=
 github.com/multiversx/mx-chain-logger-go v1.0.14 h1:PRMpAvXE7Nec2d//QNmbYfKVHMomOKmcN4UXurQWX9o=

process/outportBlockConverter.go

@@ -11,6 +11,7 @@ import (
 	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/multiversx/mx-chain-core-go/data/outport"
 	"github.com/multiversx/mx-chain-core-go/data/receipt"
+	"github.com/multiversx/mx-chain-core-go/data/stateChange"
 	"github.com/multiversx/mx-chain-core-go/marshal"
 
 	"github.com/multiversx/mx-chain-ws-connector-firehose-go/data/hyperOutportBlocks"
@@ -63,6 +64,7 @@ func (o *outportBlockConverter) HandleShardOutportBlockV2(outportBlock *outport.
 	}
 	handleHeaderGasConsumption(outportBlock.HeaderGasConsumption, shardOutportBlock)
 	handleAlteredAccounts(outportBlock.AlteredAccounts, shardOutportBlock)
+	handleStateChanges(outportBlock.StateChanges, shardOutportBlock)
 
 	shardOutportBlock.NotarizedHeadersHashes = outportBlock.NotarizedHeadersHashes
 	shardOutportBlock.NumberOfShards = outportBlock.NumberOfShards
@@ -384,6 +386,44 @@ func handleHeaderGasConsumption(consumption *outport.HeaderGasConsumption, shard
 	}
 }
 
+func handleStateChanges(stateChanges map[string]*stateChange.StateChanges, shardOutportBlock *hyperOutportBlocks.ShardOutportBlockV2) {
+	if stateChanges == nil {
+		return
+	}
+
+	shardStateChanges := make(map[string]*hyperOutportBlocks.StateChanges, len(stateChanges))
+	for key, scs := range stateChanges {
+		ss := make([]*hyperOutportBlocks.StateChange, len(scs.StateChanges))
+
+		for i, sc := range scs.StateChanges {
+			dtc := make([]*hyperOutportBlocks.DataTrieChange, len(sc.DataTrieChanges))
+
+			for j, dataTrieChange := range sc.DataTrieChanges {
+				dtc[j] = &hyperOutportBlocks.DataTrieChange{
+					Type: dataTrieChange.Type,
+					Key:  dataTrieChange.Key,
+					Val:  dataTrieChange.Val,
+				}
+			}
+
+			ss[i] = &hyperOutportBlocks.StateChange{
+				Type:            sc.Type,
+				Index:           sc.Index,
+				TxHash:          sc.TxHash,
+				MainTrieKey:     sc.MainTrieKey,
+				MainTrieVal:     sc.MainTrieVal,
+				Operation:       sc.Operation,
+				DataTrieChanges: dtc,
+			}
+		}
+
+		s := &hyperOutportBlocks.StateChanges{StateChanges: ss}
+		shardStateChanges[key] = s
+	}
+
+	shardOutportBlock.StateChanges = shardStateChanges
+}
+
 // HandleShardOutportBlock will convert an outport.OutportBlock to data.ShardOutportBlock.
 func (o *outportBlockConverter) HandleShardOutportBlock(outportBlock *outport.OutportBlock) (*hyperOutportBlocks.ShardOutportBlock, error) {
 	headerType := outportBlock.BlockData.HeaderType

process/outportBlockConverter_test.go

@@ -34,6 +34,7 @@ type fieldsGetterV1 interface {
 type fieldsGetterV2 interface {
 	fieldsGetter
 	GetTransactionPool() *data.TransactionPoolV2
+	GetStateChanges() map[string]*data.StateChanges
 }
 
 type blockDataGetter interface {
@@ -51,9 +52,10 @@ type blockDataGetter interface {
 }
 
 const (
-	outportBlockHeaderV1JSONPath  = "../testscommon/testdata/outportBlockHeaderV1.json"
-	outportBlockHeaderV2JSONPath  = "../testscommon/testdata/outportBlockHeaderV2.json"
-	outportBlockMetaBlockJSONPath = "../testscommon/testdata/outportBlockMetaBlock.json"
+	outportBlockHeaderV1JSONPath                  = "../testscommon/testdata/outportBlockHeaderV1.json"
+	outportBlockHeaderV2JSONPath                  = "../testscommon/testdata/outportBlockHeaderV2.json"
+	outportBlockMetaBlockJSONPath                 = "../testscommon/testdata/outportBlockMetaBlock.json"
+	outportBlockMetaBlockWithStateChangesJSONPath = "../testscommon/testdata/stateChanges.json"
 )
 
 func TestOutportBlockConverter(t *testing.T) {
@@ -125,6 +127,39 @@ func TestOutportBlockConverter_HandleShardOutportBlockV2(t *testing.T) {
 	checkBlockData(t, ob.BlockData, shardOutportBlock.BlockData)
 }
 
+func TestStateChanges(t *testing.T) {
+	t.Parallel()
+
+	jsonBytes, err := os.ReadFile(outportBlockMetaBlockWithStateChangesJSONPath)
+	require.NoError(t, err, "failed to read test data")
+
+	ob := &outport.OutportBlock{}
+	err = json.Unmarshal(jsonBytes, ob)
+	require.NoError(t, err, "failed to unmarshal test block")
+
+	converter, err := process.NewOutportBlockConverter(gogoProtoMarshaller, protoMarshaller)
+	require.Nil(t, err)
+	metaOutportBlock, err := converter.HandleMetaOutportBlock(ob)
+	require.NoError(t, err, "failed to marshal to standard outport")
+
+	for hash, stateChanges := range ob.StateChanges {
+		for i, sc := range stateChanges.StateChanges {
+			require.Equal(t, sc.Type, metaOutportBlock.StateChanges[hash].StateChanges[i].Type, "type is not the same")
+			require.Equal(t, sc.Index, metaOutportBlock.StateChanges[hash].StateChanges[i].Index, "index is not the same")
+			require.Equal(t, sc.TxHash, metaOutportBlock.StateChanges[hash].StateChanges[i].TxHash, "hash is not the same")
+			require.Equal(t, sc.MainTrieKey, metaOutportBlock.StateChanges[hash].StateChanges[i].MainTrieKey, "main trie key is not the same")
+			require.Equal(t, sc.MainTrieVal, metaOutportBlock.StateChanges[hash].StateChanges[i].MainTrieVal, "main trie val is not the same")
+			require.Equal(t, sc.Operation, metaOutportBlock.StateChanges[hash].StateChanges[i].Operation, "operation is not the same")
+
+			for j, dtc := range sc.DataTrieChanges {
+				require.Equal(t, dtc.Type, metaOutportBlock.StateChanges[hash].StateChanges[i].DataTrieChanges[j].Type, "data trie change type is not the same")
+				require.Equal(t, dtc.Key, metaOutportBlock.StateChanges[hash].StateChanges[i].DataTrieChanges[j].Key, "data trie change key is not the same")
+				require.Equal(t, dtc.Val, metaOutportBlock.StateChanges[hash].StateChanges[i].DataTrieChanges[j].Val, "data trie val is not the same")
+			}
+		}
+	}
+}
+
 func TestHeaderConverter(t *testing.T) {
 	t.Parallel()