certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Deduct fee from fee payer's account balance

This commit is contained in:
Matt Bell 2018-03-15 17:37:16 +01:00 committed by Ethan Buchman
parent 45f8ccbe90
commit 1b16f0c684
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
x/auth/ante.go
View File

@ -26,6 +26,12 @@ func NewAnteHandler(accountMapper sdk.AccountMapper) sdk.AnteHandler {
// TODO: can tx just implement message? // TODO: can tx just implement message?
msg := tx.GetMsg() msg := tx.GetMsg()
// TODO: will this always be a stdtx? should that be used in the function signature?
stdTx, ok := tx.(sdk.StdTx)
if !ok {
return ctx, sdk.ErrInternal("tx must be sdk.StdTx").Result(), true
}
// Assert that number of signatures is correct. // Assert that number of signatures is correct.
var signerAddrs = msg.GetSigners() var signerAddrs = msg.GetSigners()
if len(sigs) != len(signerAddrs) { if len(sigs) != len(signerAddrs) {
@ -47,7 +53,8 @@ func NewAnteHandler(accountMapper sdk.AccountMapper) sdk.AnteHandler {
isFeePayer := i == 0 // first sig pays the fees isFeePayer := i == 0 // first sig pays the fees
signerAddr, sig := signerAddrs[i], sigs[i] signerAddr, sig := signerAddrs[i], sigs[i]
signerAcc, res := processSig(ctx, accountMapper, signerAddr, sig, signBytes, isFeePayer) signerAcc, res := processSig(ctx, accountMapper, signerAddr, sig,
signBytes, isFeePayer, stdTx.Fee.Amount)
if !res.IsOK() { if !res.IsOK() {
return ctx, res, true return ctx, res, true
} }
@ -65,7 +72,7 @@ func NewAnteHandler(accountMapper sdk.AccountMapper) sdk.AnteHandler {
// deduct fee from fee payer. // deduct fee from fee payer.
func processSig(ctx sdk.Context, am sdk.AccountMapper, func processSig(ctx sdk.Context, am sdk.AccountMapper,
addr sdk.Address, sig sdk.StdSignature, signBytes []byte, addr sdk.Address, sig sdk.StdSignature, signBytes []byte,
isFeePayer bool) (acc sdk.Account, res sdk.Result) { isFeePayer bool, feeAmount sdk.Coins) (acc sdk.Account, res sdk.Result) {
// Get the account // Get the account
acc = am.GetAccount(ctx, addr) acc = am.GetAccount(ctx, addr)
@ -106,8 +113,16 @@ func processSig(ctx sdk.Context, am sdk.AccountMapper,
return nil, sdk.ErrUnauthorized("signature verification failed").Result() return nil, sdk.ErrUnauthorized("signature verification failed").Result()
} }
// If this is the fee payer, deduct the fee.
if isFeePayer { if isFeePayer {
// TODO: pay fees coins := acc.GetCoins()
newCoins := coins.Minus(feeAmount)
if !newCoins.IsNotNegative() {
errMsg := fmt.Sprintf("%s < %s", coins, feeAmount)
return nil, sdk.ErrInsufficientFunds(errMsg).Result()
}
acc.SetCoins(newCoins)
} }
// Save the account. // Save the account.