Merge branch 'feat/migrate-set-market-enabled-to-msdserver' of github…

….com:NibiruChain/nibiru into feat/migrate-set-market-enabled-to-msdserver

.github/workflows/simulation-tests.yml

@@ -8,10 +8,6 @@ on:
   schedule:
     # once per day
     - cron: "0 0 * * *"
-  pull_request:
-    branches:
-      # every pull request to default branch
-      - main
 
 jobs:
   test-sim-nondeterminism:

CHANGELOG.md

@@ -66,6 +66,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * [#1573](https://github.com/NibiruChain/nibiru/pull/1573) - feat(perp): Close markets and compute settlement price
 * [#1705](https://github.com/NibiruChain/nibiru/pull/1705) - feat(perp): Add oracle pair to market object
 * [#1718](https://github.com/NibiruChain/nibiru/pull/1718) - fix: fees does not require additional funds
+* [#1755](https://github.com/NibiruChain/nibiru/pull/1755) - feat(oracle): Add more events on validator's performance
 
 ### Non-breaking/Compatible Improvements
 
@@ -79,8 +80,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * [#1723](https://github.com/NibiruChain/nibiru/pull/1723) - ci(e2e-wasm.yml): rm unused workflow
 * [#1728](https://github.com/NibiruChain/nibiru/pull/1728) - test(devgas-cli): CLI tests for devgas txs
 * [#1735](https://github.com/NibiruChain/nibiru/pull/1735) - test(sim): fix simulation tests
+* [#1754](https://github.com/NibiruChain/nibiru/pull/1754) - refactor(decode-base64): clean code improvements and fn docs
 
 ### Dependencies
+- Bump `github.com/prometheus/client_golang` from 1.17.0 to 1.18.0 ([#1750](https://github.com/NibiruChain/nibiru/pull/1750))
+- Bump `google.golang.org/protobuf` from 1.31.0 to 1.32.0 ([#1756](https://github.com/NibiruChain/nibiru/pull/1756))
 
 * Bump `google.golang.org/grpc` from 1.59.0 to 1.60.0 ([#1720](https://github.com/NibiruChain/nibiru/pull/1720))
 * Bump `golang.org/x/crypto` from 0.15.0 to 0.17.0 ([#1724](https://github.com/NibiruChain/nibiru/pull/1724))

cmd/nibid/cmd/decode_base64.go

@@ -15,18 +15,39 @@ import (
 	wasmvm "github.com/CosmWasm/wasmvm/types"
 )
 
-// YieldStargateMsgs parses the JSON and sends wasmvm.StargateMsg objects to a channel
-func YieldStargateMsgs(jsonBz []byte) ([]wasmvm.StargateMsg, error) {
+// YieldStargateMsgs takes a byte slice of JSON data and converts it into a slice
+// of wasmvm.StargateMsg objects. This function is essential for processing
+// JSON-formatted messages that contain base64-encoded protobuf messages.
+//
+// Args:
+//   - jsonBz []byte: A byte slice containing the JSON data to be parsed.
+//
+// Returns:
+//   - sgMsgs []wasmvm.StargateMsg: A slice of wasmvm.StargateMsg objects parsed
+//     from the provided JSON data.
+//   - err error: An error object, which is nil if the operation is successful.
+func YieldStargateMsgs(jsonBz []byte) (sgMsgs []wasmvm.StargateMsg, err error) {
 	var data interface{}
 	if err := json.Unmarshal(jsonBz, &data); err != nil {
-		return nil, err
+		return sgMsgs, err
 	}
 
-	var msgs []wasmvm.StargateMsg
-	parseStargateMsgs(data, &msgs)
-	return msgs, nil
+	parseStargateMsgs(data, &sgMsgs)
+	return sgMsgs, nil
 }
 
+// parseStargateMsgs is a recursive function used by YieldStargateMsgs to
+// traverse the JSON data, filter for any protobuf.Any messages in the
+// "WasmVM.StargateMsg" format and decode them from base64 back to human-readable
+// form as JSON objects.
+//
+// Args:
+//   - jsonData any: JSON data to parse. According to the JSON specification,
+//     possible value types are:
+//     Null, Bool, Number(f64), String, Array, or Object(Map<String, Value>)
+//   - msgs *[]wasmvm.StargateMsg: Mutable reference to a slice of protobuf
+//     messages. These are potentially altered in place if the value is an
+//     encoded base 64 string.
 func parseStargateMsgs(jsonData any, msgs *[]wasmvm.StargateMsg) {
 	switch v := jsonData.(type) {
 	case map[string]interface{}:
@@ -48,33 +69,51 @@ func parseStargateMsgs(jsonData any, msgs *[]wasmvm.StargateMsg) {
 	}
 }
 
+// StargateMsgDecoded is a struct designed to hold a decoded version of a
+// "wasmvm.StargateMsg".
 type StargateMsgDecoded struct {
 	TypeURL string `json:"type_url"`
 	Value   string `json:"value"`
 }
 
+// DecodeBase64StargateMsgs decodes a series of base64-encoded
+// wasmvm.StargateMsg objects from the provided JSON byte slice (jsonBz).
+// This function is vital for extracting and interpreting the contents of these
+// protobuf messages.
+//
+// Args:
+//   - jsonBz []byte: JSON data containing potential base64-encoded messages.
+//   - clientCtx client.Context: Context for the `nibid` CLI.
+//
+// Returns:
+//   - newSgMsgs []StargateMsgDecoded: The decoded stargate messages.
+//   - err error: An error object, which is nil if the operation is successful.
 func DecodeBase64StargateMsgs(
-	jsonBz []byte, context client.Context,
+	jsonBz []byte, clientCtx client.Context,
 ) (newSgMsgs []StargateMsgDecoded, err error) {
-	codec := context.Codec
+	codec := clientCtx.Codec
 
 	var data interface{}
 	if err := json.Unmarshal(jsonBz, &data); err != nil {
-		return []StargateMsgDecoded{}, err
+		return newSgMsgs, fmt.Errorf(
+			"failed to decode stargate msgs due to invalid JSON: %w", err)
 	}
 
 	sgMsgs, err := YieldStargateMsgs(jsonBz)
 	if err != nil {
-		return
+		return newSgMsgs, err
 	}
 	for _, sgMsg := range sgMsgs {
 		valueStr := string(sgMsg.Value)
-		value := strings.Replace(string(sgMsg.Value), `\"`, `"`, -1)
-		value = strings.Replace(value, `"{`, `{`, -1)
-		value = strings.Replace(value, `}"`, `}`, -1)
+		replacer := strings.NewReplacer(
+			`\"`, `"`, // old, new
+			`"{`, `{`,
+			`}"`, `}`,
+		)
+		value := replacer.Replace(string(sgMsg.Value))
 
 		if _, err := base64.StdEncoding.DecodeString(valueStr); err == nil {
-			protoMsg, err := context.InterfaceRegistry.Resolve(sgMsg.TypeURL)
+			protoMsg, err := clientCtx.InterfaceRegistry.Resolve(sgMsg.TypeURL)
 			if err != nil {
 				return newSgMsgs, err
 			}
@@ -92,9 +131,13 @@ func DecodeBase64StargateMsgs(
 				return newSgMsgs, err
 			}
 
-			newSgMsgs = append(newSgMsgs, StargateMsgDecoded{sgMsg.TypeURL, string(outBytes)})
+			newSgMsgs = append(newSgMsgs,
+				StargateMsgDecoded{sgMsg.TypeURL, string(outBytes)},
+			)
 		} else if _, err := json.Marshal(value); err == nil {
-			newSgMsgs = append(newSgMsgs, StargateMsgDecoded{sgMsg.TypeURL, string(sgMsg.Value)})
+			newSgMsgs = append(newSgMsgs,
+				StargateMsgDecoded{sgMsg.TypeURL, string(sgMsg.Value)},
+			)
 		} else {
 			return newSgMsgs, fmt.Errorf(
 				"parse error: encountered wasmvm.StargateMsg with unexpected format: %s", sgMsg)
@@ -103,7 +146,9 @@ func DecodeBase64StargateMsgs(
 	return newSgMsgs, nil
 }
 
-// DecodeBase64Cmd creates a cobra command for base64 decoding.
+// DecodeBase64Cmd creates a Cobra command used to decode base64-encoded protobuf
+// messages from a JSON input. This function enables users to input arbitrary
+// JSON strings and parse the contents of base-64 encoded protobuf.Any messages.
 func DecodeBase64Cmd(defaultNodeHome string) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "base64-decode",
@@ -114,8 +159,9 @@ The input should be a JSON object with 'type_url' and 'value' fields.`,
 			clientCtx := client.GetClientContextFromCmd(cmd)
 
 			outMessage, err := DecodeBase64StargateMsgs([]byte(args[0]), clientCtx)
-			fmt.Println(outMessage)
-
+			if err == nil {
+				fmt.Println(outMessage)
+			}
 			return err
 		},
 	}

go.mod

@@ -26,7 +26,7 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1
 	github.com/holiman/uint256 v1.2.4
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.17.0
+	github.com/prometheus/client_golang v1.18.0
 	github.com/rakyll/statik v0.1.7
 	github.com/spf13/cast v1.6.0
 	github.com/spf13/cobra v1.8.0
@@ -35,7 +35,7 @@ require (
 	github.com/stretchr/testify v1.8.4
 	google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17
 	google.golang.org/grpc v1.60.0
-	google.golang.org/protobuf v1.31.0
+	google.golang.org/protobuf v1.32.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
@@ -135,7 +135,7 @@ require (
 	github.com/manifoldco/promptui v0.9.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
 	github.com/minio/highwayhash v1.0.2 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -146,9 +146,9 @@ require (
 	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
 	github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
-	github.com/prometheus/procfs v0.11.1 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.45.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/rs/cors v1.8.3 // indirect

go.sum

@@ -919,8 +919,8 @@ github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m
 github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
-github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
+github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM=
 github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94=
@@ -1044,16 +1044,16 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn
 github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
 github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
-github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
+github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
+github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 h1:v7DLqVdK4VrYkVD5diGdl4sxJurKJEMnODWRJlxV9oM=
-github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
+github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
+github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
 github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
@@ -1062,16 +1062,16 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2
 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
-github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
-github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
+github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM=
+github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI=
-github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY=
+github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
+github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ=
 github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc=
@@ -1878,8 +1878,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
+google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

proto/nibiru/oracle/v1/event.proto

@@ -53,3 +53,25 @@ message EventAggregatePrevote {
   // transaction messages on behalf of the voting validator.
   string feeder = 2;
 }
+
+
+message EventValidatorPerformance{
+  // Validator is the Bech32 address to which the vote will be credited.
+  string validator = 1;
+
+  // Tendermint consensus voting power
+  int64 voting_power = 2;
+
+  // RewardWeight: Weight of rewards the validator should receive in units of
+  // consensus power.
+  int64 reward_weight = 3;
+
+  // Number of valid votes for which the validator will be rewarded
+  int64 win_count     = 4;
+
+  // Number of abstained votes for which there will be no reward or punishment
+  int64 abstain_count = 5;
+
+  // Number of invalid/punishable votes
+  int64 miss_count    = 6;
+}