realio staking fork and proto rebuild

realiotech · Nov 23, 2022 · 772ff6f · 772ff6f
1 parent 8339276
commit 772ff6f
Show file tree

Hide file tree

Showing 103 changed files with 1,196 additions and 970 deletions.
diff --git a/client/grpc/tmservice/query.pb.go b/client/grpc/tmservice/query.pb.go
diff --git a/client/grpc/tmservice/types.pb.go b/client/grpc/tmservice/types.pb.go
diff --git a/crypto/hd/hd.pb.go b/crypto/hd/hd.pb.go
diff --git a/crypto/keyring/record.pb.go b/crypto/keyring/record.pb.go
diff --git a/crypto/keys/ed25519/keys.pb.go b/crypto/keys/ed25519/keys.pb.go
diff --git a/crypto/keys/multisig/keys.pb.go b/crypto/keys/multisig/keys.pb.go
diff --git a/crypto/keys/secp256k1/keys.pb.go b/crypto/keys/secp256k1/keys.pb.go
diff --git a/crypto/keys/secp256r1/keys.pb.go b/crypto/keys/secp256r1/keys.pb.go
diff --git a/crypto/types/multisig.pb.go b/crypto/types/multisig.pb.go
diff --git a/go.mod b/go.mod
@@ -18,6 +18,7 @@ require (
 	github.com/cosmos/cosmos-proto v1.0.0-alpha7
 	github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1
 	github.com/cosmos/go-bip39 v1.0.0
+	github.com/cosmos/gogoproto v1.4.2
 	github.com/cosmos/iavl v0.19.4
 	github.com/cosmos/ledger-cosmos-go v0.11.1
 	github.com/gogo/gateway v1.1.0

diff --git a/go.sum b/go.sum
@@ -235,6 +235,8 @@ github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1/go.mod h1:JUMM2MxF9wuwzRWZJjb8BjXs
 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
 github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
 github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
+github.com/cosmos/gogoproto v1.4.2 h1:UeGRcmFW41l0G0MiefWhkPEVEwvu78SZsHBvI78dAYw=
+github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU=
 github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y=
 github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw=
 github.com/cosmos/iavl v0.19.4 h1:t82sN+Y0WeqxDLJRSpNd8YFX5URIrT+p8n6oJbJ2Dok=

diff --git a/proto/buf.lock b/proto/buf.lock
@@ -8,8 +8,8 @@ deps:
   - remote: buf.build
     owner: cosmos
     repository: gogo-proto
-    commit: bee5511075b7499da6178d9e4aaa628b
+    commit: 34d970b699f84aa382f3c29773a60836
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: 8d7204855ec14631a499bd7393ce1970
+    commit: 5abafbf55b5c4c07ad5fb06d2599560f
diff --git a/proto/buf.yaml b/proto/buf.yaml
@@ -4,7 +4,7 @@
 # This module represents the "proto" root found in
 # the previous configuration.
 version: v1
-name: buf.build/cosmos/cosmos-sdk
+name: buf.build/realiotech/cosmos-sdk
 deps:
   - buf.build/cosmos/cosmos-proto
   - buf.build/cosmos/gogo-proto

diff --git a/proto/cosmos/staking/v1beta1/staking.proto b/proto/cosmos/staking/v1beta1/staking.proto
@@ -124,6 +124,8 @@ message Validator {
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.nullable)   = false
   ];
+  // bond_denom defines the bondable coin denomination.
+  string bond_denom = 12;
 }
 
 // BondStatus is the status of a validator.
@@ -229,17 +231,11 @@ message UnbondingDelegationEntry {
   // completion_time is the unix time for unbonding completion.
   google.protobuf.Timestamp completion_time = 2 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
   // initial_balance defines the tokens initially scheduled to receive at completion.
-  string initial_balance = 3 [
-    (cosmos_proto.scalar)  = "cosmos.Int",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
-    (gogoproto.nullable)   = false
-  ];
+  cosmos.base.v1beta1.Coin initial_balance = 3
+      [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.nullable) = false];
   // balance defines the tokens to receive at completion.
-  string balance = 4 [
-    (cosmos_proto.scalar)  = "cosmos.Int",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
-    (gogoproto.nullable)   = false
-  ];
+  cosmos.base.v1beta1.Coin balance = 4
+      [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.nullable) = false];
 }
 
 // RedelegationEntry defines a redelegation object with relevant metadata.
@@ -252,11 +248,8 @@ message RedelegationEntry {
   // completion_time defines the unix time for redelegation completion.
   google.protobuf.Timestamp completion_time = 2 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
   // initial_balance defines the initial balance when redelegation started.
-  string initial_balance = 3 [
-    (cosmos_proto.scalar)  = "cosmos.Int",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
-    (gogoproto.nullable)   = false
-  ];
+  cosmos.base.v1beta1.Coin initial_balance = 3
+      [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.nullable) = false];
   // shares_dst is the amount of destination-validator shares created by redelegation.
   string shares_dst = 4 [
     (cosmos_proto.scalar)  = "cosmos.Dec",

diff --git a/simapp/test_helpers.go b/simapp/test_helpers.go
@@ -134,9 +134,10 @@ func Setup(t *testing.T, isCheckTx bool) *SimApp {
 	// generate genesis account
 	senderPrivKey := secp256k1.GenPrivKey()
 	acc := authtypes.NewBaseAccount(senderPrivKey.PubKey().Address().Bytes(), senderPrivKey.PubKey(), 0, 0)
+	amount, _ := sdk.NewIntFromString("100000000000000000000000000")
 	balance := banktypes.Balance{
 		Address: acc.GetAddress().String(),
-		Coins:   sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100000000000000))),
+		Coins:   sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, amount)),
 	}
 
 	app := SetupWithGenesisValSet(t, valSet, []authtypes.GenesisAccount{acc}, balance)
@@ -175,6 +176,7 @@ func genesisStateWithValSet(t *testing.T,
 			UnbondingTime:     time.Unix(0, 0).UTC(),
 			Commission:        stakingtypes.NewCommission(sdk.ZeroDec(), sdk.ZeroDec(), sdk.ZeroDec()),
 			MinSelfDelegation: sdk.ZeroInt(),
+			BondDenom:         sdk.DefaultBondDenom,
 		}
 		validators = append(validators, validator)
 		delegations = append(delegations, stakingtypes.NewDelegation(genAccs[0].GetAddress(), val.Address.Bytes(), sdk.OneDec()))

diff --git a/snapshots/types/snapshot.pb.go b/snapshots/types/snapshot.pb.go
diff --git a/store/types/commit_info.pb.go b/store/types/commit_info.pb.go
diff --git a/types/abci.pb.go b/types/abci.pb.go
diff --git a/types/coin.pb.go b/types/coin.pb.go
diff --git a/types/kv/kv.pb.go b/types/kv/kv.pb.go
diff --git a/types/tx/tx.pb.go b/types/tx/tx.pb.go
diff --git a/x/auth/migrations/v043/store.go b/x/auth/migrations/v043/store.go
@@ -209,7 +209,7 @@ func getDelegatorUnbondingDelegationsSum(ctx sdk.Context, address, bondDenom str
 	res := sdk.NewCoins()
 	for _, i := range balance.UnbondingResponses {
 		for _, r := range i.Entries {
-			res = res.Add(sdk.NewCoin(bondDenom, r.Balance))
+			res = res.Add(sdk.NewCoin(bondDenom, r.Balance.Amount))
 		}
 	}