2020-09-22 07:35:18 -07:00
|
|
|
package legacytx
|
2020-05-21 14:29:34 -07:00
|
|
|
|
|
|
|
import (
|
2020-07-24 15:24:57 -07:00
|
|
|
"fmt"
|
|
|
|
|
2020-06-01 05:46:03 -07:00
|
|
|
"github.com/cosmos/cosmos-sdk/client"
|
2020-05-21 14:29:34 -07:00
|
|
|
"github.com/cosmos/cosmos-sdk/codec"
|
|
|
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
2020-09-22 07:35:18 -07:00
|
|
|
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
|
2021-10-04 03:57:08 -07:00
|
|
|
"github.com/cosmos/cosmos-sdk/types/tx"
|
2020-06-16 12:57:37 -07:00
|
|
|
"github.com/cosmos/cosmos-sdk/types/tx/signing"
|
|
|
|
authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
|
2020-05-21 14:29:34 -07:00
|
|
|
)
|
|
|
|
|
2020-06-16 12:57:37 -07:00
|
|
|
// StdTxBuilder wraps StdTx to implement to the context.TxBuilder interface.
|
|
|
|
// Note that this type just exists for backwards compatibility with amino StdTx
|
|
|
|
// and will not work for protobuf transactions.
|
2020-05-21 14:29:34 -07:00
|
|
|
type StdTxBuilder struct {
|
|
|
|
StdTx
|
2020-08-10 12:41:21 -07:00
|
|
|
cdc *codec.LegacyAmino
|
2020-05-21 14:29:34 -07:00
|
|
|
}
|
|
|
|
|
2020-09-22 07:35:18 -07:00
|
|
|
// ensure interface implementation
|
2020-06-01 05:46:03 -07:00
|
|
|
var _ client.TxBuilder = &StdTxBuilder{}
|
2020-05-21 14:29:34 -07:00
|
|
|
|
|
|
|
// GetTx implements TxBuilder.GetTx
|
2020-08-07 16:32:22 -07:00
|
|
|
func (s *StdTxBuilder) GetTx() authsigning.Tx {
|
2020-05-21 14:29:34 -07:00
|
|
|
return s.StdTx
|
|
|
|
}
|
|
|
|
|
|
|
|
// SetMsgs implements TxBuilder.SetMsgs
|
|
|
|
func (s *StdTxBuilder) SetMsgs(msgs ...sdk.Msg) error {
|
2021-04-30 04:00:47 -07:00
|
|
|
s.Msgs = msgs
|
2020-05-21 14:29:34 -07:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2020-07-29 08:52:22 -07:00
|
|
|
// SetSignatures implements TxBuilder.SetSignatures.
|
2020-06-16 12:57:37 -07:00
|
|
|
func (s *StdTxBuilder) SetSignatures(signatures ...signing.SignatureV2) error {
|
2020-05-21 14:29:34 -07:00
|
|
|
sigs := make([]StdSignature, len(signatures))
|
2020-09-22 07:35:18 -07:00
|
|
|
var err error
|
2020-05-21 14:29:34 -07:00
|
|
|
for i, sig := range signatures {
|
2020-09-22 07:35:18 -07:00
|
|
|
sigs[i], err = SignatureV2ToStdSignature(s.cdc, sig)
|
2020-07-29 15:33:42 -07:00
|
|
|
if err != nil {
|
|
|
|
return err
|
2020-05-21 14:29:34 -07:00
|
|
|
}
|
|
|
|
}
|
2020-07-22 08:02:36 -07:00
|
|
|
|
2020-05-21 14:29:34 -07:00
|
|
|
s.Signatures = sigs
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2020-06-16 12:57:37 -07:00
|
|
|
func (s *StdTxBuilder) SetFeeAmount(amount sdk.Coins) {
|
|
|
|
s.StdTx.Fee.Amount = amount
|
2020-05-21 14:29:34 -07:00
|
|
|
}
|
|
|
|
|
2020-06-16 12:57:37 -07:00
|
|
|
func (s *StdTxBuilder) SetGasLimit(limit uint64) {
|
|
|
|
s.StdTx.Fee.Gas = limit
|
2020-05-21 14:29:34 -07:00
|
|
|
}
|
|
|
|
|
2021-10-04 03:57:08 -07:00
|
|
|
func (s *StdTxBuilder) SetTip(tip *tx.Tip) {
|
|
|
|
panic("StdTxBuilder does not support tips")
|
|
|
|
}
|
|
|
|
|
2020-05-21 14:29:34 -07:00
|
|
|
// SetMemo implements TxBuilder.SetMemo
|
|
|
|
func (s *StdTxBuilder) SetMemo(memo string) {
|
|
|
|
s.Memo = memo
|
|
|
|
}
|
|
|
|
|
2020-08-07 16:32:22 -07:00
|
|
|
// SetTimeoutHeight sets the transaction's height timeout.
|
|
|
|
func (s *StdTxBuilder) SetTimeoutHeight(height uint64) {
|
|
|
|
s.TimeoutHeight = height
|
|
|
|
}
|
|
|
|
|
Add fee grant module (#8061)
* Add docs
* Add BasicFeeAllowance implementation
* Add expiration structs and complete basic fee
* Add delegation messages, add validation logic
* Add keeper and helper structs
* Add alias and handler to top level
* Add delegation module
* Add basic querier
* Add types tests
* Add types tests
* More internal test coverage
* Solid internal test coverage
* Expose Querier to top level module
* Add FeeAccount to auth/types, like StdTx, SignDoc
* Fix all tests in x/auth
* All tests pass
* Appease the Golang Linter
* Add fee-account command line flag
* Start on DelegatedDeductFeeDecorator
* Cleanup the Decorator
* Wire up delegation module in simapp
* add basic test for decorator (no delegation)
* Table tests for deduct fees
* Table tests over all conditions of delegated fee decorator
* Build full ante handler stack and test it
* Start genesis
* Implement Genesis
* Rename package delegation to subkeys
* Clarify antes test cases, handle empty account w/o fees
* Allow paying delegated fees with no account
* Pull mempool into delegated ante, for control on StdFee
* Use custom DelegatedTx, DelegatedFee for subkeys
* Revert all changes to x/auth.StdTx
* Appease scopelint
* Register DelegatedTx with codec
* Address PR comments
* Remove unnecessary DelegatedMempoolFeeDecorator
* Cleaned up errors in querier
* Clean up message sign bytes
* Minor PR comments
* Replace GetAllFees... with Iterator variants
* PrepareForExport adjusts grant expiration height
* Panic on de/serialization error in keeper
* Move custom ante handler chain to tests, update docs
* More cleanup
* More doc cleanup
* Renamed subkeys module to fee_grant
* Rename subkeys/delegation to fee grant in all strings
* Modify Msg and Keeper methods to use Grant not Delegate
* Add PeriodicFeeAllowance
* Update aliases
* Cover all accept cases for PeriodicFeeAllowance
* Et tu scopelint?
* Update docs as requested
* Remove error return from GetFeeGrant
* Code cleanup as requested by PR
* Updated all errors to use new sdk/errors package
* Use test suite for keeper tests
* Clean up alias.go file
* Define expected interfaces in exported, rather than importing from account
* Remove dependency on auth/ante
* Improve godoc, Logger
* Cleaned up ExpiresAt
* Improve error reporting with UseGrantedFee
* Enforce period limit subset of basic limit
* Add events
* Rename fee_grant to feegrant
* Ensure KeeperTestSuite actually runs
* Move types/tx to types
* Update alias file, include ante
* I do need nolint in alias.go
* Properly emit events in the handler. Use cosmos-sdk in amino types
* Update godoc
* Linting...
* Update errors
* Update pkg doc and fix ante-handler order
* Merge PR #5782: Migrate x/feegrant to proto
* fix errors
* proto changes
* proto changes
* fix errors
* fix errors
* genesis state changed to proto
* fix keeper tests
* fix test
* fixed tests
* fix tests
* updated expected keepers
* updated ante tests
* lint
* deleted alias.go
* tx updated to proto tx
* remove explicit signmode
* tests
* Added `cli/query.go`
* Added tx.go in cli
* updated `module.go`
* resolve errors in tx.go
* Add fee payer gentx func
* updated tx
* fixed error
* WIP: cli tests
* fix query error
* fix tests
* Unused types and funcs
* fix tests
* rename helper func to create tx
* remove unused
* update tx cfg
* fix cli tests
* added simulations
* Add `decoder.go`
* fix build fail
* added init genesis code
* update tx.go
* fixed LGTM alert
* modified cli
* remove gogoproto extensions
* change acc address type to string
* lint
* fix simulations
* Add gen simulations
* remove legacy querier
* remove legacy code
* add grpc queries tests
* fix simulations
* update module.go
* lint
* register feegrant NewSimulationManager
* fix sims
* fix sims
* add genesis test
* add periodic grant
* updated cmd
* changed times
* updated flags
* removed days as period clock
* added condition for period and exp
* add periodic fee cli tests
* udpated tests
* fix lint
* fix tests
* fix sims
* renaming to `fee_grant`
* review changes
* fix test
* add condition for duplicate grants
* fix tests
* add `genTxWithFeeGranter` in tests
* fix simulation
* one of changes & test fixes
* fix test
* fix lint
* changed package name `feegrant` to `fee_grant`
* review comments
* review changes
* review change
* review changes
* added fee-account in flags
* address review changes
* read fee granter from cli
* updated create account with mnemonic
* Address review comments
* move `simapp/ante` file to `feegrant/ante`
* update keeper logic to create account
* update docs
* fix tests
* update `serviceMsgClientConn` from `msgservice`
* review changes
* add test case for using more fees than allowed
* eliminate panic checks from keeper
* fix lint
* change store keys string to bytes
* fix tests
* review changes
* review changes
* udpate docs
* make spend limit optional
* fix tests
* fix tests
* review changes
* add norace tag
* proto-docs
* add docs
Co-authored-by: Ethan Frey <ethanfrey@users.noreply.github.com>
Co-authored-by: Alexander Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Aleksandr Bezobchuk <aleks.bezobchuk@gmail.com>
Co-authored-by: SaReN <sahithnarahari@gmail.com>
Co-authored-by: aleem1413 <aleem@vitwit.com>
Co-authored-by: MD Aleem <72057206+aleem1314@users.noreply.github.com>
Co-authored-by: Anil Kumar Kammari <anil@vitwit.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2021-01-29 11:54:51 -08:00
|
|
|
// SetFeeGranter does nothing for stdtx
|
|
|
|
func (s *StdTxBuilder) SetFeeGranter(_ sdk.AccAddress) {}
|
|
|
|
|
feat: Add AuxTxBuilder (#10455)
<!--
The default pull request template is for types feat, fix, or refactor.
For other templates, add one of the following parameters to the url:
- template=docs.md
- template=other.md
-->
## Description
Closes: #10443
For creating an intermediary/auxiliary tx (e.g. by the tipper in tipped transactions), using the existing `client.TxBuilder` is awkward. We propose a new client-side builder for this purpose.
API Usage (e.g. how the tipper would programmtically use this):
```go
// Note: there's no need to use clientCtx.TxConfig anymore!
bldr := clienttx.NewAuxTxBuilder()
err := bldr.SetMsgs(msgs...)
bldr.SetAddress("cosmos1...")
bldr.SetMemo(...)
bldr.SetTip(...)
bldr.SetPubKey(...)
err := bldr.SetSignMode(...) // DIRECT_AUX or AMINO, or else error
// ... other setters are available
// Get the bytes to sign.
signBz, err := bldr.GetSignBytes()
// Sign the bz using your favorite method.
sig, err := privKey.sign(signBz)
// Set the signature
bldr.SetSig(sig)
// Get the final auxSignerData to be sent to the fee payer
auxSignerData, err:= bldr.GetAuxSignerData()
```
auxSignerData is a protobuf message, whose JSON reprensentation looks like:
```json
{
"address": "cosmos1...",
"mode": "SIGN_MODE_{DIRECT_AUX,LEGACY_AMINO_JSON}",
"sign_doc": {
"body_bytes": "{base64 bytes}",
"public_key": {
"@type": "cosmos.sepc256k1.PubKey",
"key": "{base64 bytes}"
},
"chain_id": "...",
"account_number": 24,
"sequence": 42,
"tip": {
"amount": [{ "denom": "uregen", "amount": 1000 }],
"tipper": "cosmos1..."
}
},
"sig": "{base64 bytes}"
}
```
Then the fee payer would use the TxBuilder to construct the final TX, with a new helper method: `AddAuxSignerData`:
```go
// get auxSignerData from AuxTxBuilder
auxSignerData := ...
txBuilder := txConfig.NewTxBuilder()
err := txBuilder.AddAuxSignerData(auxSignerData)
// Set fee payer data
txBuilder.SetFee()
txBuilder.SetGasLimit()
txBuilder.SetFeePayer()
sigs, err := txBuilder.GetSignaturesV2()
auxSig := sigs[0] // the aux signer's signature
// Set all signer infos (1st round of calling SetSignatures)
txBuilder.SetSignatures(
auxSig, // The aux SignatureV2
signing.SignatureV2{...}, // The feePayer's SignatureV2
)
// Sign
signBz, err = encCfg.TxConfig.SignModeHandler().GetSignBytes(...)
feepayerSig, err := feepayerPriv.Sign(signBz)
// Set all signatures (2nd round of calling SetSignatures)
txBuilder.SetSignatures(
auxSig, // The aux SignatureV2
signing.SignatureV2{feepayerSig, ...}, // The feePayer's SignatureV2
)
```
---
### Author Checklist
*All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.*
I have...
- [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] added `!` to the type prefix if API or client breaking change
- [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting))
- [ ] provided a link to the relevant issue or specification
- [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules)
- [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing)
- [ ] added a changelog entry to `CHANGELOG.md`
- [ ] included comments for [documenting Go code](https://blog.golang.org/godoc)
- [ ] updated the relevant documentation or specification
- [ ] reviewed "Files changed" and left comments if necessary
- [ ] confirmed all CI checks have passed
### Reviewers Checklist
*All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.*
I have...
- [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] confirmed `!` in the type prefix if API or client breaking change
- [ ] confirmed all author checklist items have been addressed
- [ ] reviewed state machine logic
- [ ] reviewed API design and naming
- [ ] reviewed documentation is accurate
- [ ] reviewed tests and test coverage
- [ ] manually tested (if applicable)
2021-11-11 03:25:13 -08:00
|
|
|
// SetFeePayer does nothing for stdtx
|
|
|
|
func (s *StdTxBuilder) SetFeePayer(_ sdk.AccAddress) {}
|
|
|
|
|
|
|
|
// AddAuxSignerData returns an error for StdTxBuilder.
|
|
|
|
func (s *StdTxBuilder) AddAuxSignerData(_ tx.AuxSignerData) error {
|
|
|
|
return sdkerrors.ErrLogic.Wrap("cannot use AuxSignerData with StdTxBuilder")
|
|
|
|
}
|
|
|
|
|
2020-07-20 05:30:12 -07:00
|
|
|
// StdTxConfig is a context.TxConfig for StdTx
|
|
|
|
type StdTxConfig struct {
|
2020-08-10 12:41:21 -07:00
|
|
|
Cdc *codec.LegacyAmino
|
2020-05-21 14:29:34 -07:00
|
|
|
}
|
|
|
|
|
2020-07-20 05:30:12 -07:00
|
|
|
var _ client.TxConfig = StdTxConfig{}
|
2020-05-21 14:29:34 -07:00
|
|
|
|
2020-07-20 05:30:12 -07:00
|
|
|
// NewTxBuilder implements TxConfig.NewTxBuilder
|
|
|
|
func (s StdTxConfig) NewTxBuilder() client.TxBuilder {
|
2020-06-16 12:57:37 -07:00
|
|
|
return &StdTxBuilder{
|
|
|
|
StdTx: StdTx{},
|
|
|
|
cdc: s.Cdc,
|
|
|
|
}
|
2020-05-21 14:29:34 -07:00
|
|
|
}
|
|
|
|
|
2020-07-24 15:24:57 -07:00
|
|
|
// WrapTxBuilder returns a StdTxBuilder from provided transaction
|
|
|
|
func (s StdTxConfig) WrapTxBuilder(newTx sdk.Tx) (client.TxBuilder, error) {
|
|
|
|
stdTx, ok := newTx.(StdTx)
|
|
|
|
if !ok {
|
2020-09-22 07:35:18 -07:00
|
|
|
return nil, fmt.Errorf("wrong type, expected %T, got %T", stdTx, newTx)
|
2020-07-24 15:24:57 -07:00
|
|
|
}
|
|
|
|
return &StdTxBuilder{StdTx: stdTx, cdc: s.Cdc}, nil
|
|
|
|
}
|
|
|
|
|
2020-07-20 05:30:12 -07:00
|
|
|
// MarshalTx implements TxConfig.MarshalTx
|
|
|
|
func (s StdTxConfig) TxEncoder() sdk.TxEncoder {
|
2020-06-18 13:29:41 -07:00
|
|
|
return DefaultTxEncoder(s.Cdc)
|
|
|
|
}
|
|
|
|
|
2020-07-20 05:30:12 -07:00
|
|
|
func (s StdTxConfig) TxDecoder() sdk.TxDecoder {
|
2021-04-29 03:46:22 -07:00
|
|
|
return mkDecoder(s.Cdc.Unmarshal)
|
2020-06-18 13:29:41 -07:00
|
|
|
}
|
|
|
|
|
2020-07-20 05:30:12 -07:00
|
|
|
func (s StdTxConfig) TxJSONEncoder() sdk.TxEncoder {
|
2020-06-18 13:29:41 -07:00
|
|
|
return func(tx sdk.Tx) ([]byte, error) {
|
|
|
|
return s.Cdc.MarshalJSON(tx)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-07-20 05:30:12 -07:00
|
|
|
func (s StdTxConfig) TxJSONDecoder() sdk.TxDecoder {
|
2020-09-22 07:35:18 -07:00
|
|
|
return mkDecoder(s.Cdc.UnmarshalJSON)
|
2020-05-21 14:29:34 -07:00
|
|
|
}
|
|
|
|
|
2020-07-29 15:33:42 -07:00
|
|
|
func (s StdTxConfig) MarshalSignatureJSON(sigs []signing.SignatureV2) ([]byte, error) {
|
|
|
|
stdSigs := make([]StdSignature, len(sigs))
|
|
|
|
for i, sig := range sigs {
|
|
|
|
stdSig, err := SignatureV2ToStdSignature(s.Cdc, sig)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
stdSigs[i] = stdSig
|
|
|
|
}
|
|
|
|
return s.Cdc.MarshalJSON(stdSigs)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (s StdTxConfig) UnmarshalSignatureJSON(bz []byte) ([]signing.SignatureV2, error) {
|
|
|
|
var stdSigs []StdSignature
|
|
|
|
err := s.Cdc.UnmarshalJSON(bz, &stdSigs)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
sigs := make([]signing.SignatureV2, len(stdSigs))
|
|
|
|
for i, stdSig := range stdSigs {
|
|
|
|
sig, err := StdSignatureToSignatureV2(s.Cdc, stdSig)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
sigs[i] = sig
|
|
|
|
}
|
|
|
|
|
|
|
|
return sigs, nil
|
|
|
|
}
|
|
|
|
|
2020-07-20 05:30:12 -07:00
|
|
|
func (s StdTxConfig) SignModeHandler() authsigning.SignModeHandler {
|
2020-08-03 12:47:25 -07:00
|
|
|
return stdTxSignModeHandler{}
|
2020-05-21 14:29:34 -07:00
|
|
|
}
|
2020-09-22 07:35:18 -07:00
|
|
|
|
|
|
|
// SignatureV2ToStdSignature converts a SignatureV2 to a StdSignature
|
|
|
|
// [Deprecated]
|
|
|
|
func SignatureV2ToStdSignature(cdc *codec.LegacyAmino, sig signing.SignatureV2) (StdSignature, error) {
|
|
|
|
var (
|
|
|
|
sigBz []byte
|
|
|
|
err error
|
|
|
|
)
|
|
|
|
|
|
|
|
if sig.Data != nil {
|
|
|
|
sigBz, err = SignatureDataToAminoSignature(cdc, sig.Data)
|
|
|
|
if err != nil {
|
|
|
|
return StdSignature{}, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return StdSignature{
|
|
|
|
PubKey: sig.PubKey,
|
|
|
|
Signature: sigBz,
|
|
|
|
}, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Unmarshaler is a generic type for Unmarshal functions
|
|
|
|
type Unmarshaler func(bytes []byte, ptr interface{}) error
|
|
|
|
|
|
|
|
func mkDecoder(unmarshaler Unmarshaler) sdk.TxDecoder {
|
|
|
|
return func(txBytes []byte) (sdk.Tx, error) {
|
|
|
|
if len(txBytes) == 0 {
|
|
|
|
return nil, sdkerrors.Wrap(sdkerrors.ErrTxDecode, "tx bytes are empty")
|
|
|
|
}
|
|
|
|
var tx = StdTx{}
|
|
|
|
// StdTx.Msg is an interface. The concrete types
|
|
|
|
// are registered by MakeTxCodec
|
|
|
|
err := unmarshaler(txBytes, &tx)
|
|
|
|
if err != nil {
|
|
|
|
return nil, sdkerrors.Wrap(sdkerrors.ErrTxDecode, err.Error())
|
|
|
|
}
|
|
|
|
return tx, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// DefaultTxEncoder logic for standard transaction encoding
|
|
|
|
func DefaultTxEncoder(cdc *codec.LegacyAmino) sdk.TxEncoder {
|
|
|
|
return func(tx sdk.Tx) ([]byte, error) {
|
2021-04-29 03:46:22 -07:00
|
|
|
return cdc.Marshal(tx)
|
2020-09-22 07:35:18 -07:00
|
|
|
}
|
|
|
|
}
|