mirror of
				https://github.com/0glabs/0g-chain.git
				synced 2025-10-31 21:47:27 +00:00 
			
		
		
		
	Cosmos v0.46 upgrade follow ups (#1522)
* ensure RewardIndexes.Mul method is called in test * remove deprecated line breaks, add new v0.46 keys cmd * register kava msg types on authz ModuleCdc
This commit is contained in:
		
							parent
							
								
									bdf7a4d2a0
								
							
						
					
					
						commit
						5b3162c563
					
				| @ -61,11 +61,10 @@ The pass backend requires GnuPG: https://gnupg.org/ | ||||
| 		keys.ImportKeyCommand(), | ||||
| 		keys.ListKeysCmd(), | ||||
| 		keys.ShowKeysCmd(), | ||||
| 		flags.LineBreak, | ||||
| 		keys.DeleteKeyCommand(), | ||||
| 		keys.RenameKeyCommand(), | ||||
| 		keys.ParseKeyStringCommand(), | ||||
| 		keys.MigrateCommand(), | ||||
| 		flags.LineBreak, | ||||
| 		ethclient.UnsafeExportEthKeyCommand(), | ||||
| 		ethclient.UnsafeImportKeyCommand(), | ||||
| 	) | ||||
|  | ||||
| @ -3,10 +3,10 @@ package types | ||||
| import ( | ||||
| 	"github.com/cosmos/cosmos-sdk/codec" | ||||
| 	"github.com/cosmos/cosmos-sdk/codec/types" | ||||
| 
 | ||||
| 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" | ||||
| 	sdk "github.com/cosmos/cosmos-sdk/types" | ||||
| 	"github.com/cosmos/cosmos-sdk/types/msgservice" | ||||
| 	authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" | ||||
| ) | ||||
| 
 | ||||
| // RegisterLegacyAminoCodec registers all the necessary types and interfaces for the
 | ||||
| @ -58,4 +58,8 @@ var ( | ||||
| func init() { | ||||
| 	RegisterLegacyAminoCodec(amino) | ||||
| 	cryptocodec.RegisterCrypto(amino) | ||||
| 
 | ||||
| 	// Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be
 | ||||
| 	// used to properly serialize MsgGrant and MsgExec instances
 | ||||
| 	RegisterLegacyAminoCodec(authzcodec.Amino) | ||||
| } | ||||
|  | ||||
| @ -6,6 +6,7 @@ import ( | ||||
| 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" | ||||
| 	sdk "github.com/cosmos/cosmos-sdk/types" | ||||
| 	"github.com/cosmos/cosmos-sdk/types/msgservice" | ||||
| 	authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" | ||||
| ) | ||||
| 
 | ||||
| // RegisterLegacyAminoCodec registers all the necessary types and interfaces for the
 | ||||
| @ -41,4 +42,8 @@ var ( | ||||
| func init() { | ||||
| 	RegisterLegacyAminoCodec(amino) | ||||
| 	cryptocodec.RegisterCrypto(amino) | ||||
| 
 | ||||
| 	// Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be
 | ||||
| 	// used to properly serialize MsgGrant and MsgExec instances
 | ||||
| 	RegisterLegacyAminoCodec(authzcodec.Amino) | ||||
| } | ||||
|  | ||||
| @ -3,10 +3,10 @@ package types | ||||
| import ( | ||||
| 	"github.com/cosmos/cosmos-sdk/codec" | ||||
| 	"github.com/cosmos/cosmos-sdk/codec/types" | ||||
| 
 | ||||
| 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" | ||||
| 	sdk "github.com/cosmos/cosmos-sdk/types" | ||||
| 	"github.com/cosmos/cosmos-sdk/types/msgservice" | ||||
| 	authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" | ||||
| ) | ||||
| 
 | ||||
| // RegisterLegacyAminoCodec registers all the necessary types and interfaces for the
 | ||||
| @ -41,4 +41,8 @@ var ( | ||||
| func init() { | ||||
| 	RegisterLegacyAminoCodec(amino) | ||||
| 	cryptocodec.RegisterCrypto(amino) | ||||
| 
 | ||||
| 	// Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be
 | ||||
| 	// used to properly serialize MsgGrant and MsgExec instances
 | ||||
| 	RegisterLegacyAminoCodec(authzcodec.Amino) | ||||
| } | ||||
|  | ||||
| @ -7,6 +7,7 @@ import ( | ||||
| 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" | ||||
| 	sdk "github.com/cosmos/cosmos-sdk/types" | ||||
| 	"github.com/cosmos/cosmos-sdk/types/msgservice" | ||||
| 	authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" | ||||
| 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" | ||||
| 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" | ||||
| 	proposaltypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal" | ||||
| @ -31,6 +32,10 @@ func init() { | ||||
| 	cryptocodec.RegisterCrypto(amino) | ||||
| 	// amino is not sealed so that other modules can register their own pubproposal and/or permission types.
 | ||||
| 
 | ||||
| 	// Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be
 | ||||
| 	// used to properly serialize MsgGrant and MsgExec instances
 | ||||
| 	RegisterLegacyAminoCodec(authzcodec.Amino) | ||||
| 
 | ||||
| 	// CommitteeChange/Delete proposals along with Permission types are
 | ||||
| 	// registered on gov's ModuleCdc
 | ||||
| 	RegisterLegacyAminoCodec(govv1beta1.ModuleCdc.LegacyAmino) | ||||
| @ -42,6 +47,7 @@ func init() { | ||||
| 	RegisterProposalTypeCodec(govv1beta1.TextProposal{}, "cosmos-sdk/TextProposal") | ||||
| 	RegisterProposalTypeCodec(upgradetypes.SoftwareUpgradeProposal{}, "cosmos-sdk/SoftwareUpgradeProposal") | ||||
| 	RegisterProposalTypeCodec(upgradetypes.CancelSoftwareUpgradeProposal{}, "cosmos-sdk/CancelSoftwareUpgradeProposal") | ||||
| 
 | ||||
| } | ||||
| 
 | ||||
| // RegisterLegacyAminoCodec registers all the necessary types and interfaces for the module.
 | ||||
|  | ||||
| @ -3,12 +3,11 @@ package types | ||||
| import ( | ||||
| 	"github.com/cosmos/cosmos-sdk/codec" | ||||
| 	"github.com/cosmos/cosmos-sdk/codec/types" | ||||
| 	"github.com/cosmos/cosmos-sdk/types/msgservice" | ||||
| 
 | ||||
| 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" | ||||
| 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" | ||||
| 
 | ||||
| 	sdk "github.com/cosmos/cosmos-sdk/types" | ||||
| 	"github.com/cosmos/cosmos-sdk/types/msgservice" | ||||
| 	authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" | ||||
| 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" | ||||
| ) | ||||
| 
 | ||||
| // RegisterLegacyAminoCodec registers all the necessary types and interfaces for the module.
 | ||||
| @ -40,4 +39,8 @@ var ( | ||||
| func init() { | ||||
| 	RegisterLegacyAminoCodec(amino) | ||||
| 	cryptocodec.RegisterCrypto(amino) | ||||
| 
 | ||||
| 	// Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be
 | ||||
| 	// used to properly serialize MsgGrant and MsgExec instances
 | ||||
| 	RegisterLegacyAminoCodec(authzcodec.Amino) | ||||
| } | ||||
|  | ||||
| @ -3,10 +3,10 @@ package types | ||||
| import ( | ||||
| 	"github.com/cosmos/cosmos-sdk/codec" | ||||
| 	"github.com/cosmos/cosmos-sdk/codec/types" | ||||
| 	"github.com/cosmos/cosmos-sdk/types/msgservice" | ||||
| 
 | ||||
| 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" | ||||
| 	sdk "github.com/cosmos/cosmos-sdk/types" | ||||
| 	"github.com/cosmos/cosmos-sdk/types/msgservice" | ||||
| 	authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" | ||||
| 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" | ||||
| ) | ||||
| 
 | ||||
| @ -43,4 +43,8 @@ var ( | ||||
| func init() { | ||||
| 	RegisterLegacyAminoCodec(amino) | ||||
| 	cryptocodec.RegisterCrypto(amino) | ||||
| 
 | ||||
| 	// Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be
 | ||||
| 	// used to properly serialize MsgGrant and MsgExec instances
 | ||||
| 	RegisterLegacyAminoCodec(authzcodec.Amino) | ||||
| } | ||||
|  | ||||
| @ -6,6 +6,7 @@ import ( | ||||
| 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" | ||||
| 	sdk "github.com/cosmos/cosmos-sdk/types" | ||||
| 	"github.com/cosmos/cosmos-sdk/types/msgservice" | ||||
| 	authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" | ||||
| ) | ||||
| 
 | ||||
| // RegisterLegacyAminoCodec registers the necessary evmutil interfaces and concrete types
 | ||||
| @ -33,4 +34,8 @@ func init() { | ||||
| 	RegisterLegacyAminoCodec(amino) | ||||
| 	cryptocodec.RegisterCrypto(amino) | ||||
| 	amino.Seal() | ||||
| 
 | ||||
| 	// Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be
 | ||||
| 	// used to properly serialize MsgGrant and MsgExec instances
 | ||||
| 	RegisterLegacyAminoCodec(authzcodec.Amino) | ||||
| } | ||||
|  | ||||
| @ -3,10 +3,10 @@ package types | ||||
| import ( | ||||
| 	"github.com/cosmos/cosmos-sdk/codec" | ||||
| 	"github.com/cosmos/cosmos-sdk/codec/types" | ||||
| 
 | ||||
| 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" | ||||
| 	sdk "github.com/cosmos/cosmos-sdk/types" | ||||
| 	"github.com/cosmos/cosmos-sdk/types/msgservice" | ||||
| 	authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" | ||||
| ) | ||||
| 
 | ||||
| func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { | ||||
| @ -37,4 +37,8 @@ var ( | ||||
| func init() { | ||||
| 	RegisterLegacyAminoCodec(amino) | ||||
| 	cryptocodec.RegisterCrypto(amino) | ||||
| 
 | ||||
| 	// Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be
 | ||||
| 	// used to properly serialize MsgGrant and MsgExec instances
 | ||||
| 	RegisterLegacyAminoCodec(authzcodec.Amino) | ||||
| } | ||||
|  | ||||
| @ -5,6 +5,7 @@ import ( | ||||
| 	"testing" | ||||
| 
 | ||||
| 	sdk "github.com/cosmos/cosmos-sdk/types" | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| 	"github.com/stretchr/testify/require" | ||||
| 	"github.com/tendermint/tendermint/crypto" | ||||
| ) | ||||
| @ -334,13 +335,21 @@ func TestRewardIndexes(t *testing.T) { | ||||
| 
 | ||||
| 		for _, tc := range testcases { | ||||
| 			t.Run(tc.name, func(t *testing.T) { | ||||
| 				// require.Equal() fails with zero values abs: <nil> and abs: {}
 | ||||
| 				actual := tc.rewardIndexes.Mul(tc.multiplier) | ||||
| 
 | ||||
| 				for i := range tc.rewardIndexes { | ||||
| 					require.True(t, | ||||
| 						tc.expected[i].RewardFactor. | ||||
| 							Equal(tc.rewardIndexes[i].RewardFactor.Mul(tc.multiplier)), | ||||
| 					) | ||||
| 				if len(tc.expected) == 0 { | ||||
| 					require.Equal(t, actual, tc.expected) | ||||
| 				} else { | ||||
| 					require.Len(t, actual, len(tc.expected)) | ||||
| 					for i := range tc.expected { | ||||
| 						assert.Equal(t, | ||||
| 							actual[i].CollateralType, | ||||
| 							tc.expected[i].CollateralType, | ||||
| 						) | ||||
| 						assert.True(t, | ||||
| 							actual[i].RewardFactor.Equal(tc.expected[i].RewardFactor), | ||||
| 						) | ||||
| 					} | ||||
| 				} | ||||
| 			}) | ||||
| 		} | ||||
|  | ||||
| @ -3,10 +3,10 @@ package types | ||||
| import ( | ||||
| 	"github.com/cosmos/cosmos-sdk/codec" | ||||
| 	"github.com/cosmos/cosmos-sdk/codec/types" | ||||
| 
 | ||||
| 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" | ||||
| 	sdk "github.com/cosmos/cosmos-sdk/types" | ||||
| 	"github.com/cosmos/cosmos-sdk/types/msgservice" | ||||
| 	authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" | ||||
| ) | ||||
| 
 | ||||
| // RegisterLegacyAminoCodec registers all the necessary types and interfaces for the
 | ||||
| @ -42,4 +42,8 @@ var ( | ||||
| func init() { | ||||
| 	RegisterLegacyAminoCodec(amino) | ||||
| 	cryptocodec.RegisterCrypto(amino) | ||||
| 
 | ||||
| 	// Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be
 | ||||
| 	// used to properly serialize MsgGrant and MsgExec instances
 | ||||
| 	RegisterLegacyAminoCodec(authzcodec.Amino) | ||||
| } | ||||
|  | ||||
| @ -3,10 +3,10 @@ package types | ||||
| import ( | ||||
| 	"github.com/cosmos/cosmos-sdk/codec" | ||||
| 	"github.com/cosmos/cosmos-sdk/codec/types" | ||||
| 
 | ||||
| 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" | ||||
| 	sdk "github.com/cosmos/cosmos-sdk/types" | ||||
| 	"github.com/cosmos/cosmos-sdk/types/msgservice" | ||||
| 	authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" | ||||
| ) | ||||
| 
 | ||||
| var ( | ||||
| @ -39,4 +39,8 @@ func RegisterInterfaces(registry types.InterfaceRegistry) { | ||||
| func init() { | ||||
| 	RegisterLegacyAminoCodec(amino) | ||||
| 	cryptocodec.RegisterCrypto(amino) | ||||
| 
 | ||||
| 	// Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be
 | ||||
| 	// used to properly serialize MsgGrant and MsgExec instances
 | ||||
| 	RegisterLegacyAminoCodec(authzcodec.Amino) | ||||
| } | ||||
|  | ||||
| @ -4,6 +4,7 @@ import ( | ||||
| 	"github.com/cosmos/cosmos-sdk/codec" | ||||
| 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types" | ||||
| 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" | ||||
| 	authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" | ||||
| 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" | ||||
| ) | ||||
| 
 | ||||
| @ -29,4 +30,8 @@ func init() { | ||||
| 	RegisterLegacyAminoCodec(amino) | ||||
| 	cryptocodec.RegisterCrypto(amino) | ||||
| 	amino.Seal() | ||||
| 
 | ||||
| 	// Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be
 | ||||
| 	// used to properly serialize MsgGrant and MsgExec instances
 | ||||
| 	RegisterLegacyAminoCodec(authzcodec.Amino) | ||||
| } | ||||
|  | ||||
| @ -3,11 +3,10 @@ package types | ||||
| import ( | ||||
| 	"github.com/cosmos/cosmos-sdk/codec" | ||||
| 	"github.com/cosmos/cosmos-sdk/codec/types" | ||||
| 	"github.com/cosmos/cosmos-sdk/types/msgservice" | ||||
| 
 | ||||
| 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" | ||||
| 
 | ||||
| 	sdk "github.com/cosmos/cosmos-sdk/types" | ||||
| 	"github.com/cosmos/cosmos-sdk/types/msgservice" | ||||
| 	authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" | ||||
| ) | ||||
| 
 | ||||
| // RegisterLegacyAminoCodec registers all the necessary types and interfaces for the module.
 | ||||
| @ -35,4 +34,8 @@ var ( | ||||
| func init() { | ||||
| 	RegisterLegacyAminoCodec(amino) | ||||
| 	cryptocodec.RegisterCrypto(amino) | ||||
| 
 | ||||
| 	// Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be
 | ||||
| 	// used to properly serialize MsgGrant and MsgExec instances
 | ||||
| 	RegisterLegacyAminoCodec(authzcodec.Amino) | ||||
| } | ||||
|  | ||||
| @ -3,11 +3,10 @@ package types | ||||
| import ( | ||||
| 	"github.com/cosmos/cosmos-sdk/codec" | ||||
| 	"github.com/cosmos/cosmos-sdk/codec/types" | ||||
| 
 | ||||
| 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" | ||||
| 
 | ||||
| 	sdk "github.com/cosmos/cosmos-sdk/types" | ||||
| 	"github.com/cosmos/cosmos-sdk/types/msgservice" | ||||
| 	authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" | ||||
| ) | ||||
| 
 | ||||
| // RegisterLegacyAminoCodec registers all the necessary types and interfaces for the
 | ||||
| @ -32,4 +31,8 @@ var ( | ||||
| func init() { | ||||
| 	RegisterLegacyAminoCodec(amino) | ||||
| 	cryptocodec.RegisterCrypto(amino) | ||||
| 
 | ||||
| 	// Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be
 | ||||
| 	// used to properly serialize MsgGrant and MsgExec instances
 | ||||
| 	RegisterLegacyAminoCodec(authzcodec.Amino) | ||||
| } | ||||
|  | ||||
| @ -3,10 +3,10 @@ package types | ||||
| import ( | ||||
| 	"github.com/cosmos/cosmos-sdk/codec" | ||||
| 	"github.com/cosmos/cosmos-sdk/codec/types" | ||||
| 
 | ||||
| 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" | ||||
| 	sdk "github.com/cosmos/cosmos-sdk/types" | ||||
| 	"github.com/cosmos/cosmos-sdk/types/msgservice" | ||||
| 	authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" | ||||
| ) | ||||
| 
 | ||||
| // RegisterLegacyAminoCodec registers all the necessary types and interfaces for the module.
 | ||||
| @ -39,4 +39,8 @@ var ( | ||||
| func init() { | ||||
| 	RegisterLegacyAminoCodec(amino) | ||||
| 	cryptocodec.RegisterCrypto(amino) | ||||
| 
 | ||||
| 	// Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be
 | ||||
| 	// used to properly serialize MsgGrant and MsgExec instances
 | ||||
| 	RegisterLegacyAminoCodec(authzcodec.Amino) | ||||
| } | ||||
|  | ||||
| @ -3,11 +3,10 @@ package types | ||||
| import ( | ||||
| 	"github.com/cosmos/cosmos-sdk/codec" | ||||
| 	"github.com/cosmos/cosmos-sdk/codec/types" | ||||
| 
 | ||||
| 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" | ||||
| 
 | ||||
| 	sdk "github.com/cosmos/cosmos-sdk/types" | ||||
| 	"github.com/cosmos/cosmos-sdk/types/msgservice" | ||||
| 	authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" | ||||
| ) | ||||
| 
 | ||||
| // RegisterLegacyAminoCodec registers all the necessary types and interfaces for the
 | ||||
| @ -34,4 +33,8 @@ var ( | ||||
| func init() { | ||||
| 	RegisterLegacyAminoCodec(amino) | ||||
| 	cryptocodec.RegisterCrypto(amino) | ||||
| 
 | ||||
| 	// Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be
 | ||||
| 	// used to properly serialize MsgGrant and MsgExec instances
 | ||||
| 	RegisterLegacyAminoCodec(authzcodec.Amino) | ||||
| } | ||||
|  | ||||
| @ -3,10 +3,10 @@ package types | ||||
| import ( | ||||
| 	"github.com/cosmos/cosmos-sdk/codec" | ||||
| 	"github.com/cosmos/cosmos-sdk/codec/types" | ||||
| 
 | ||||
| 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" | ||||
| 	sdk "github.com/cosmos/cosmos-sdk/types" | ||||
| 	"github.com/cosmos/cosmos-sdk/types/msgservice" | ||||
| 	authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" | ||||
| ) | ||||
| 
 | ||||
| // RegisterLegacyAminoCodec registers all the necessary types and interfaces for the
 | ||||
| @ -40,4 +40,8 @@ var ( | ||||
| func init() { | ||||
| 	RegisterLegacyAminoCodec(amino) | ||||
| 	cryptocodec.RegisterCrypto(amino) | ||||
| 
 | ||||
| 	// Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be
 | ||||
| 	// used to properly serialize MsgGrant and MsgExec instances
 | ||||
| 	RegisterLegacyAminoCodec(authzcodec.Amino) | ||||
| } | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Ruaridh
						Ruaridh