f59df68a97
* Update genutil collect and gentx to use TxGenerator * Remove print statement * Use Tx in genutil DeliverGenTxs * Use Tx in genutil genesis_state * Use Tx in ValidateGenesis * Use amino txJSONDecoder and txBinaryEncoder in genutil InitGenesis * Use TxConfig in place of TxGenerator * Add gentx tests * Remove commented line * Test fixes * Apply suggestions from code review Co-authored-by: Alexander Bezobchuk <alexanderbez@users.noreply.github.com> * Fixes * Fixes * Fixes * Fixes * Remove unneeded test case (doesn't apply to proto marshaling) * linting * Refactor to use new TxEncodingConfig interface in genutil module * Replace golang/protobuf with gogo/protobuf package * Use TxEncodingConfig in InitTestnet * Remove old amino.go file * Use TxJSONDecoder in genutil ValidateGenesis * Add parameter to ValidateGenesis to resolve the tx JSON decoder issue * Address review feedback Co-authored-by: Jack Zampolin <jack.zampolin@gmail.com> Co-authored-by: Aaron Craelius <aaronc@users.noreply.github.com> Co-authored-by: Aaron Craelius <aaron@regen.network> Co-authored-by: Alexander Bezobchuk <alexanderbez@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
42 lines
1011 B
Go
42 lines
1011 B
Go
package tx
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/gogo/protobuf/proto"
|
|
|
|
"github.com/cosmos/cosmos-sdk/codec"
|
|
"github.com/cosmos/cosmos-sdk/types"
|
|
txtypes "github.com/cosmos/cosmos-sdk/types/tx"
|
|
)
|
|
|
|
// DefaultTxEncoder returns a default protobuf TxEncoder using the provided Marshaler
|
|
func DefaultTxEncoder() types.TxEncoder {
|
|
return func(tx types.Tx) ([]byte, error) {
|
|
wrapper, ok := tx.(*builder)
|
|
if !ok {
|
|
return nil, fmt.Errorf("expected %T, got %T", &builder{}, tx)
|
|
}
|
|
|
|
raw := &txtypes.TxRaw{
|
|
BodyBytes: wrapper.GetBodyBytes(),
|
|
AuthInfoBytes: wrapper.GetAuthInfoBytes(),
|
|
Signatures: wrapper.tx.Signatures,
|
|
}
|
|
|
|
return proto.Marshal(raw)
|
|
}
|
|
}
|
|
|
|
// DefaultTxEncoder returns a default protobuf JSON TxEncoder using the provided Marshaler
|
|
func DefaultJSONTxEncoder() types.TxEncoder {
|
|
return func(tx types.Tx) ([]byte, error) {
|
|
wrapper, ok := tx.(*builder)
|
|
if !ok {
|
|
return nil, fmt.Errorf("expected %T, got %T", &builder{}, tx)
|
|
}
|
|
|
|
return codec.ProtoMarshalJSON(wrapper.tx)
|
|
}
|
|
}
|