Merge pull request #217 from multiversx/update-rc-v1.6.0-rc-v1.5.0-20…

…23.04.21 Update rc v1.6.0 rc v1.5.0 2023.04.21
multiversx · Apr 24, 2023 · dd452cb · dd452cb
2 parents a908431 + 4b10235
commit dd452cb
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 6 deletions.
diff --git a/data/transaction.go b/data/transaction.go
@@ -44,6 +44,8 @@ type Transaction struct {
 	Function             string        `json:"function,omitempty"`
 	IsRelayed            bool          `json:"isRelayed,omitempty"`
 	Version              uint32        `json:"version,omitempty"`
+	GuardianAddress      string        `json:"guardian,omitempty"`
+	GuardianSignature    string        `json:"guardianSignature,omitempty"`
 	SmartContractResults []*ScResult   `json:"-"`
 	Hash                 string        `json:"-"`
 	BlockHash            string        `json:"-"`

diff --git a/go.mod b/go.mod
@@ -5,9 +5,9 @@ go 1.17
 require (
 	github.com/elastic/go-elasticsearch/v7 v7.12.0
 	github.com/gorilla/websocket v1.5.0
-	github.com/multiversx/mx-chain-core-go v1.2.0
+	github.com/multiversx/mx-chain-core-go v1.2.1
 	github.com/multiversx/mx-chain-logger-go v1.0.11
-	github.com/multiversx/mx-chain-vm-common-go v1.4.0
+	github.com/multiversx/mx-chain-vm-common-go v1.4.1
 	github.com/stretchr/testify v1.7.0
 	github.com/tidwall/gjson v1.14.0
 	github.com/urfave/cli v1.22.10

diff --git a/go.sum b/go.sum
@@ -70,12 +70,12 @@ github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/multiversx/mx-chain-core-go v1.1.30/go.mod h1:8gGEQv6BWuuJwhd25qqhCOZbBSv9mk+hLeKvinSaSMk=
-github.com/multiversx/mx-chain-core-go v1.2.0 h1:K539hKZKcHjBiFQpowFbA3BUd95Fe5+FLC+rKBOFZF0=
-github.com/multiversx/mx-chain-core-go v1.2.0/go.mod h1:8gGEQv6BWuuJwhd25qqhCOZbBSv9mk+hLeKvinSaSMk=
+github.com/multiversx/mx-chain-core-go v1.2.1 h1:kmDfK7Znl3S0IJlDEE4sFuBOmA2rZkBudxlGhI1bvQc=
+github.com/multiversx/mx-chain-core-go v1.2.1/go.mod h1:8gGEQv6BWuuJwhd25qqhCOZbBSv9mk+hLeKvinSaSMk=
 github.com/multiversx/mx-chain-logger-go v1.0.11 h1:DFsHa+sc5fKwhDR50I8uBM99RTDTEW68ESyr5ALRDwE=
 github.com/multiversx/mx-chain-logger-go v1.0.11/go.mod h1:1srDkP0DQucWQ+rYfaq0BX2qLnULsUdRPADpYUTM6dA=
-github.com/multiversx/mx-chain-vm-common-go v1.4.0 h1:0i0cJZJOXGzqYzwtKFHSr2yGmnFAdizOuISK8HgsnYo=
-github.com/multiversx/mx-chain-vm-common-go v1.4.0/go.mod h1:odBJC92ANA8zLtPh/wwajUUGJOaS88F5QYGf0t8Wgzw=
+github.com/multiversx/mx-chain-vm-common-go v1.4.1 h1:HHZF9zU4WsMbfLrCarx3ESM95caWUrPBleGHKdsbzgc=
+github.com/multiversx/mx-chain-vm-common-go v1.4.1/go.mod h1:K6yCdro8VohzYI6GwjGzTO+fJiPgO5coo2sgQb+zA24=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

diff --git a/process/elasticproc/transactions/transactionDBBuilder.go b/process/elasticproc/transactions/transactionDBBuilder.go
@@ -79,6 +79,10 @@ func (dtb *dbTransactionBuilder) prepareTransaction(
 	if areESDTValuesOK(res.ESDTValues) {
 		esdtValues = res.ESDTValues
 	}
+	guardianAddress := ""
+	if len(tx.GuardianAddr) > 0 {
+		guardianAddress = dtb.addressPubkeyConverter.SilentEncode(tx.GuardianAddr, log)
+	}
 
 	return &data.Transaction{
 		Hash:              hex.EncodeToString(txHash),
@@ -113,6 +117,8 @@ func (dtb *dbTransactionBuilder) prepareTransaction(
 		ReceiversShardIDs: res.ReceiversShardID,
 		IsRelayed:         res.IsRelayed,
 		Version:           tx.Version,
+		GuardianAddress:   guardianAddress,
+		GuardianSignature: hex.EncodeToString(tx.GuardianSignature),
 	}
 }
 

diff --git a/templates/noKibana/operations.go b/templates/noKibana/operations.go
@@ -162,6 +162,13 @@ var Operations = Object{
 			"version": Object{
 				"type": "long",
 			},
+			"guardian": Object{
+				"type": "keyword",
+			},
+			"guardianSignature": Object{
+				"index": "false",
+				"type":  "keyword",
+			},
 		},
 	},
 }
diff --git a/templates/noKibana/transactions.go b/templates/noKibana/transactions.go
@@ -128,6 +128,13 @@ var Transactions = Object{
 			"version": Object{
 				"type": "long",
 			},
+			"guardian": Object{
+				"type": "keyword",
+			},
+			"guardianSignature": Object{
+				"index": "false",
+				"type":  "keyword",
+			},
 		},
 	},
 }
diff --git a/templates/withKibana/operations.go b/templates/withKibana/operations.go
@@ -162,6 +162,13 @@ var Operations = Object{
 			"version": Object{
 				"type": "long",
 			},
+			"guardian": Object{
+				"type": "keyword",
+			},
+			"guardianSignature": Object{
+				"index": "false",
+				"type":  "keyword",
+			},
 		},
 	},
 }
diff --git a/templates/withKibana/transactions.go b/templates/withKibana/transactions.go
@@ -129,6 +129,13 @@ var Transactions = Object{
 			"version": Object{
 				"type": "long",
 			},
+			"guardian": Object{
+				"type": "keyword",
+			},
+			"guardianSignature": Object{
+				"index": "false",
+				"type":  "keyword",
+			},
 		},
 	},
 }