refactor(core): move amino registrar and drop legacy package (backport #21531) (#21561)

Co-authored-by: Julien Robert <julien@rbrt.fr>
This commit is contained in:
mergify[bot]
2024-09-05 13:04:00 +00:00
committed by GitHub
co-authored by Julien Robert
parent a6f0b642d8
commit 68ec945293
104 changed files with 306 additions and 346 deletions
+13 -14
View File
@@ -3,7 +3,7 @@ package codec
import (
"github.com/cometbft/cometbft/crypto/sr25519"
"cosmossdk.io/core/legacy"
"cosmossdk.io/core/registry"
bls12_381 "github.com/cosmos/cosmos-sdk/crypto/keys/bls12_381"
"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
@@ -14,24 +14,23 @@ import (
// RegisterCrypto registers all crypto dependency types with the provided Amino
// codec.
func RegisterCrypto(cdc legacy.Amino) {
cdc.RegisterInterface((*cryptotypes.PubKey)(nil), nil)
cdc.RegisterConcrete(sr25519.PubKey{},
func RegisterCrypto(registrar registry.AminoRegistrar) {
registrar.RegisterInterface((*cryptotypes.PubKey)(nil), nil)
registrar.RegisterConcrete(sr25519.PubKey{},
sr25519.PubKeyName)
cdc.RegisterConcrete(&ed25519.PubKey{},
registrar.RegisterConcrete(&ed25519.PubKey{},
ed25519.PubKeyName)
cdc.RegisterConcrete(&secp256k1.PubKey{},
registrar.RegisterConcrete(&secp256k1.PubKey{},
secp256k1.PubKeyName)
cdc.RegisterConcrete(&bls12_381.PubKey{}, bls12_381.PubKeyName)
cdc.RegisterConcrete(&kmultisig.LegacyAminoPubKey{},
registrar.RegisterConcrete(&bls12_381.PubKey{}, bls12_381.PubKeyName)
registrar.RegisterConcrete(&kmultisig.LegacyAminoPubKey{},
kmultisig.PubKeyAminoRoute)
cdc.RegisterInterface((*cryptotypes.PrivKey)(nil), nil)
cdc.RegisterConcrete(sr25519.PrivKey{},
registrar.RegisterInterface((*cryptotypes.PrivKey)(nil), nil)
registrar.RegisterConcrete(sr25519.PrivKey{},
sr25519.PrivKeyName)
cdc.RegisterConcrete(&ed25519.PrivKey{},
registrar.RegisterConcrete(&ed25519.PrivKey{},
ed25519.PrivKeyName)
cdc.RegisterConcrete(&secp256k1.PrivKey{},
registrar.RegisterConcrete(&secp256k1.PrivKey{},
secp256k1.PrivKeyName)
cdc.RegisterConcrete(&bls12_381.PrivKey{}, bls12_381.PrivKeyName)
registrar.RegisterConcrete(&bls12_381.PrivKey{}, bls12_381.PrivKeyName)
}