Merge pull request #3552 from filecoin-project/fix/fee-cap-premium

Fix GasPremium capping logic
filecoin-project · Sep 4, 2020 · d8a790a · d8a790a
2 parents a081dc7 + 2080126
commit d8a790a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/api/types.go b/api/types.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	datatransfer "github.com/filecoin-project/go-data-transfer"
+	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/specs-actors/actors/abi"
-	"github.com/filecoin-project/specs-actors/actors/abi/big"
 	"github.com/filecoin-project/specs-actors/actors/builtin/miner"
 	"github.com/ipfs/go-cid"
 
@@ -96,7 +96,8 @@ type MessageSendSpec struct {
 }
 
 var DefaultMessageSendSpec = MessageSendSpec{
-	MaxFee: big.Zero(),
+	// MaxFee of 0.1FIL
+	MaxFee: abi.NewTokenAmount(int64(build.FilecoinPrecision) / 10),
 }
 
 func (ms *MessageSendSpec) Get() MessageSendSpec {

diff --git a/cli/paych_test.go b/cli/paych_test.go
@@ -127,7 +127,7 @@ func TestPaymentChannelStatus(t *testing.T) {
 	go func() {
 		// creator: paych get <creator> <receiver> <amount>
 		cmd = []string{creatorAddr.String(), receiverAddr.String(), fmt.Sprintf("%d", channelAmt)}
-		create <- creatorCLI.runCmd(paychGetCmd, cmd)
+		create <- creatorCLI.runCmd(paychAddFundsCmd, cmd)
 	}()
 
 	// Wait for the output to stop being "Channel does not exist"
@@ -347,7 +347,7 @@ func TestPaymentChannelVoucherCreateShortfall(t *testing.T) {
 	// creator: paych get <creator> <receiver> <amount>
 	channelAmt := 100
 	cmd := []string{creatorAddr.String(), receiverAddr.String(), fmt.Sprintf("%d", channelAmt)}
-	chstr := creatorCLI.runCmd(paychGetCmd, cmd)
+	chstr := creatorCLI.runCmd(paychAddFundsCmd, cmd)
 
 	chAddr, err := address.NewFromString(chstr)
 	require.NoError(t, err)

diff --git a/node/impl/full/gas.go b/node/impl/full/gas.go
@@ -217,16 +217,11 @@ func capGasFee(msg *types.Message, maxFee abi.TokenAmount) {
 
 	gl := types.NewInt(uint64(msg.GasLimit))
 	totalFee := types.BigMul(msg.GasFeeCap, gl)
-	minerFee := types.BigMul(msg.GasPremium, gl)
 
 	if totalFee.LessThanEqual(maxFee) {
 		return
 	}
 
-	// scale chain/miner fee down proportionally to fit in our budget
-	// TODO: there are probably smarter things we can do here to optimize
-	//  message inclusion latency
-
 	msg.GasFeeCap = big.Div(maxFee, gl)
-	msg.GasPremium = big.Div(big.Div(big.Mul(minerFee, maxFee), totalFee), gl)
+	msg.GasPremium = big.Min(msg.GasFeeCap, msg.GasPremium) // cap premium at FeeCap
 }