Merge branch 'master' into feat/fatman13/issue-template

filecoin-project · Jul 13, 2022 · 9abd13a · 9abd13a
2 parents f9be227 + 52c7ad2
commit 9abd13a
Show file tree

Hide file tree

Showing 13 changed files with 96 additions and 49 deletions.
diff --git a/pkg/messagepool/gas.go b/pkg/messagepool/gas.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"math"
+	stdbig "math/big"
 	"math/rand"
 	"sort"
 
@@ -312,6 +313,7 @@ func (mp *MessagePool) GasEstimateMessageGas(ctx context.Context, estimateMessag
 	if estimateMessage == nil || estimateMessage.Msg == nil {
 		return nil, fmt.Errorf("estimate message is nil")
 	}
+	log.Debugf("call GasEstimateMessageGas %v, send spec: %v", estimateMessage.Msg, estimateMessage.Spec)
 	if estimateMessage.Msg.GasLimit == 0 {
 		gasLimit, err := mp.GasEstimateGasLimit(ctx, estimateMessage.Msg, types.TipSetKey{})
 		if err != nil {
@@ -321,7 +323,6 @@ func (mp *MessagePool) GasEstimateMessageGas(ctx context.Context, estimateMessag
 		if estimateMessage.Spec != nil && estimateMessage.Spec.GasOverEstimation > 0 {
 			gasLimitOverestimation = estimateMessage.Spec.GasOverEstimation
 		}
-		log.Debugf("call GasEstimateMessageGas %v, spec: %v, config gasLimitOverestimation: %v", estimateMessage.Msg, estimateMessage.Spec, mp.GetConfig().GasLimitOverestimation)
 		estimateMessage.Msg.GasLimit = int64(float64(gasLimit) * gasLimitOverestimation)
 	}
 
@@ -330,6 +331,12 @@ func (mp *MessagePool) GasEstimateMessageGas(ctx context.Context, estimateMessag
 		if err != nil {
 			return nil, fmt.Errorf("estimating gas price: %w", err)
 		}
+		if estimateMessage.Spec != nil && estimateMessage.Spec.GasOverPremium > 0 {
+			olgGasPremium := gasPremium
+			newGasPremium, _ := new(stdbig.Float).Mul(new(stdbig.Float).SetInt(stdbig.NewInt(gasPremium.Int64())), stdbig.NewFloat(estimateMessage.Spec.GasOverPremium)).Int(nil)
+			gasPremium = big.NewFromGo(newGasPremium)
+			log.Debugf("call GasEstimateMessageGas old premium %v, new premium %v, premium ration %f", olgGasPremium, newGasPremium, estimateMessage.Spec.GasOverPremium)
+		}
 		estimateMessage.Msg.GasPremium = gasPremium
 	}
 
@@ -398,6 +405,12 @@ func (mp *MessagePool) GasBatchEstimateMessageGas(ctx context.Context, estimateM
 				})
 				continue
 			}
+			if estimateMessage.Spec != nil && estimateMessage.Spec.GasOverPremium > 0 {
+				olgGasPremium := gasPremium
+				newGasPremium, _ := new(stdbig.Float).Mul(new(stdbig.Float).SetInt(stdbig.NewInt(gasPremium.Int64())), stdbig.NewFloat(estimateMessage.Spec.GasOverPremium)).Int(nil)
+				gasPremium = big.NewFromGo(newGasPremium)
+				log.Debugf("call GasBatchEstimateMessageGas old premium %v, new premium %v, premium ration %f", olgGasPremium, newGasPremium, estimateMessage.Spec.GasOverPremium)
+			}
 			estimateMsg.GasPremium = gasPremium
 		}
 

diff --git a/venus-shared/api/chain/v0/method.md b/venus-shared/api/chain/v0/method.md
@@ -1662,7 +1662,8 @@ Inputs:
       },
       "Spec": {
         "MaxFee": "0",
-        "GasOverEstimation": 12.3
+        "GasOverEstimation": 12.3,
+        "GasOverPremium": 12.3
       }
     }
   ],
@@ -1824,7 +1825,8 @@ Inputs:
   },
   {
     "MaxFee": "0",
-    "GasOverEstimation": 12.3
+    "GasOverEstimation": 12.3,
+    "GasOverPremium": 12.3
   },
   [
     {
@@ -1929,7 +1931,8 @@ Inputs:
   ],
   {
     "MaxFee": "0",
-    "GasOverEstimation": 12.3
+    "GasOverEstimation": 12.3,
+    "GasOverPremium": 12.3
   }
 ]
 ```
@@ -2240,7 +2243,8 @@ Inputs:
   },
   {
     "MaxFee": "0",
-    "GasOverEstimation": 12.3
+    "GasOverEstimation": 12.3,
+    "GasOverPremium": 12.3
   }
 ]
 ```

diff --git a/venus-shared/api/chain/v1/method.md b/venus-shared/api/chain/v1/method.md
@@ -1707,7 +1707,8 @@ Inputs:
       },
       "Spec": {
         "MaxFee": "0",
-        "GasOverEstimation": 12.3
+        "GasOverEstimation": 12.3,
+        "GasOverPremium": 12.3
       }
     }
   ],
@@ -1869,7 +1870,8 @@ Inputs:
   },
   {
     "MaxFee": "0",
-    "GasOverEstimation": 12.3
+    "GasOverEstimation": 12.3,
+    "GasOverPremium": 12.3
   },
   [
     {
@@ -1974,7 +1976,8 @@ Inputs:
   ],
   {
     "MaxFee": "0",
-    "GasOverEstimation": 12.3
+    "GasOverEstimation": 12.3,
+    "GasOverPremium": 12.3
   }
 ]
 ```
@@ -2416,7 +2419,8 @@ Inputs:
   },
   {
     "MaxFee": "0",
-    "GasOverEstimation": 12.3
+    "GasOverEstimation": 12.3,
+    "GasOverPremium": 12.3
   }
 ]
 ```

diff --git a/venus-shared/api/market/client/method.md b/venus-shared/api/market/client/method.md
@@ -1195,7 +1195,8 @@ Inputs:
   },
   {
     "MaxFee": "0",
-    "GasOverEstimation": 12.3
+    "GasOverEstimation": 12.3,
+    "GasOverPremium": 12.3
   }
 ]
 ```

diff --git a/venus-shared/api/market/method.md b/venus-shared/api/market/method.md
@@ -1556,7 +1556,8 @@ Inputs:
   },
   {
     "MaxFee": "0",
-    "GasOverEstimation": 12.3
+    "GasOverEstimation": 12.3,
+    "GasOverPremium": 12.3
   }
 ]
 ```

diff --git a/venus-shared/api/messager/api.go b/venus-shared/api/messager/api.go
@@ -35,17 +35,17 @@ type IMessager interface {
 	MarkBadMessage(ctx context.Context, id string) error                                                                                                       //perm:admin
 	RecoverFailedMsg(ctx context.Context, addr address.Address) ([]string, error)                                                                              //perm:admin
 
-	GetAddress(ctx context.Context, addr address.Address) (*types.Address, error)                                      //perm:admin
-	HasAddress(ctx context.Context, addr address.Address) (bool, error)                                                //perm:read
-	WalletHas(ctx context.Context, addr address.Address) (bool, error)                                                 //perm:read
-	ListAddress(ctx context.Context) ([]*types.Address, error)                                                         //perm:admin
-	UpdateNonce(ctx context.Context, addr address.Address, nonce uint64) error                                         //perm:admin
-	DeleteAddress(ctx context.Context, addr address.Address) error                                                     //perm:admin
-	ForbiddenAddress(ctx context.Context, addr address.Address) error                                                  //perm:admin
-	ActiveAddress(ctx context.Context, addr address.Address) error                                                     //perm:admin
-	SetSelectMsgNum(ctx context.Context, addr address.Address, num uint64) error                                       //perm:admin
-	SetFeeParams(ctx context.Context, addr address.Address, gasOverEstimation float64, maxFee, maxFeeCap string) error //perm:admin
-	ClearUnFillMessage(ctx context.Context, addr address.Address) (int, error)                                         //perm:admin
+	GetAddress(ctx context.Context, addr address.Address) (*types.Address, error)                                                      //perm:admin
+	HasAddress(ctx context.Context, addr address.Address) (bool, error)                                                                //perm:read
+	WalletHas(ctx context.Context, addr address.Address) (bool, error)                                                                 //perm:read
+	ListAddress(ctx context.Context) ([]*types.Address, error)                                                                         //perm:admin
+	UpdateNonce(ctx context.Context, addr address.Address, nonce uint64) error                                                         //perm:admin
+	DeleteAddress(ctx context.Context, addr address.Address) error                                                                     //perm:admin
+	ForbiddenAddress(ctx context.Context, addr address.Address) error                                                                  //perm:admin
+	ActiveAddress(ctx context.Context, addr address.Address) error                                                                     //perm:admin
+	SetSelectMsgNum(ctx context.Context, addr address.Address, num uint64) error                                                       //perm:admin
+	SetFeeParams(ctx context.Context, addr address.Address, gasOverEstimation, gasOverPremium float64, maxFee, maxFeeCap string) error //perm:admin
+	ClearUnFillMessage(ctx context.Context, addr address.Address) (int, error)                                                         //perm:admin
 
 	GetSharedParams(ctx context.Context) (*types.SharedSpec, error)      //perm:admin
 	SetSharedParams(ctx context.Context, params *types.SharedSpec) error //perm:admin

diff --git a/venus-shared/api/messager/method.md b/venus-shared/api/messager/method.md
@@ -145,7 +145,8 @@ Inputs:
     "expireEpoch": 10101,
     "gasOverEstimation": 12.3,
     "maxFee": "0",
-    "maxFeeCap": "0"
+    "maxFeeCap": "0",
+    "gasOverPremium": 12.3
   }
 ]
 ```
@@ -181,7 +182,8 @@ Inputs:
     "expireEpoch": 10101,
     "gasOverEstimation": 12.3,
     "maxFee": "0",
-    "maxFeeCap": "0"
+    "maxFeeCap": "0",
+    "gasOverPremium": 12.3
   }
 ]
 ```
@@ -212,6 +214,7 @@ Response:
   "gasOverEstimation": 12.3,
   "maxFee": "0",
   "maxFeeCap": "0",
+  "gasOverPremium": 12.3,
   "isDeleted": 123,
   "createAt": "0001-01-01T00:00:00Z",
   "updateAt": "0001-01-01T00:00:00Z"
@@ -274,7 +277,8 @@ Response:
     "expireEpoch": 10101,
     "gasOverEstimation": 12.3,
     "maxFee": "0",
-    "maxFeeCap": "0"
+    "maxFeeCap": "0",
+    "gasOverPremium": 12.3
   },
   "WalletName": "test",
   "FromUser": "test",
@@ -341,7 +345,8 @@ Response:
     "expireEpoch": 10101,
     "gasOverEstimation": 12.3,
     "maxFee": "0",
-    "maxFeeCap": "0"
+    "maxFeeCap": "0",
+    "gasOverPremium": 12.3
   },
   "WalletName": "test",
   "FromUser": "test",
@@ -406,7 +411,8 @@ Response:
     "expireEpoch": 10101,
     "gasOverEstimation": 12.3,
     "maxFee": "0",
-    "maxFeeCap": "0"
+    "maxFeeCap": "0",
+    "gasOverPremium": 12.3
   },
   "WalletName": "test",
   "FromUser": "test",
@@ -473,7 +479,8 @@ Response:
     "expireEpoch": 10101,
     "gasOverEstimation": 12.3,
     "maxFee": "0",
-    "maxFeeCap": "0"
+    "maxFeeCap": "0",
+    "gasOverPremium": 12.3
   },
   "WalletName": "test",
   "FromUser": "test",
@@ -520,6 +527,7 @@ Response:
   "gasOverEstimation": 12.3,
   "maxFee": "0",
   "maxFeeCap": "0",
+  "gasOverPremium": 12.3,
   "selMsgNum": 42
 }
 ```
@@ -586,6 +594,7 @@ Response:
     "gasOverEstimation": 12.3,
     "maxFee": "0",
     "maxFeeCap": "0",
+    "gasOverPremium": 12.3,
     "isDeleted": 123,
     "createAt": "0001-01-01T00:00:00Z",
     "updateAt": "0001-01-01T00:00:00Z"
@@ -650,7 +659,8 @@ Response:
       "expireEpoch": 10101,
       "gasOverEstimation": 12.3,
       "maxFee": "0",
-      "maxFeeCap": "0"
+      "maxFeeCap": "0",
+      "gasOverPremium": 12.3
     },
     "WalletName": "test",
     "FromUser": "test",
@@ -712,7 +722,8 @@ Response:
       "expireEpoch": 10101,
       "gasOverEstimation": 12.3,
       "maxFee": "0",
-      "maxFeeCap": "0"
+      "maxFeeCap": "0",
+      "gasOverPremium": 12.3
     },
     "WalletName": "test",
     "FromUser": "test",
@@ -774,7 +785,8 @@ Response:
       "expireEpoch": 10101,
       "gasOverEstimation": 12.3,
       "maxFee": "0",
-      "maxFeeCap": "0"
+      "maxFeeCap": "0",
+      "gasOverPremium": 12.3
     },
     "WalletName": "test",
     "FromUser": "test",
@@ -841,7 +853,8 @@ Response:
       "expireEpoch": 10101,
       "gasOverEstimation": 12.3,
       "maxFee": "0",
-      "maxFeeCap": "0"
+      "maxFeeCap": "0",
+      "gasOverPremium": 12.3
     },
     "WalletName": "test",
     "FromUser": "test",
@@ -912,7 +925,8 @@ Response:
       "expireEpoch": 10101,
       "gasOverEstimation": 12.3,
       "maxFee": "0",
-      "maxFeeCap": "0"
+      "maxFeeCap": "0",
+      "gasOverPremium": 12.3
     },
     "WalletName": "test",
     "FromUser": "test",
@@ -984,7 +998,8 @@ Inputs:
     "expireEpoch": 10101,
     "gasOverEstimation": 12.3,
     "maxFee": "0",
-    "maxFeeCap": "0"
+    "maxFeeCap": "0",
+    "gasOverPremium": 12.3
   }
 ]
 ```
@@ -1019,7 +1034,8 @@ Inputs:
     "expireEpoch": 10101,
     "gasOverEstimation": 12.3,
     "maxFee": "0",
-    "maxFeeCap": "0"
+    "maxFeeCap": "0",
+    "gasOverPremium": 12.3
   }
 ]
 ```
@@ -1147,6 +1163,7 @@ Inputs:
 [
   "f01234",
   12.3,
+  12.3,
   "string value",
   "string value"
 ]
@@ -1196,6 +1213,7 @@ Inputs:
     "gasOverEstimation": 12.3,
     "maxFee": "0",
     "maxFeeCap": "0",
+    "gasOverPremium": 12.3,
     "selMsgNum": 42
   }
 ]
@@ -1312,7 +1330,8 @@ Response:
     "expireEpoch": 10101,
     "gasOverEstimation": 12.3,
     "maxFee": "0",
-    "maxFeeCap": "0"
+    "maxFeeCap": "0",
+    "gasOverPremium": 12.3
   },
   "WalletName": "test",
   "FromUser": "test",

diff --git a/venus-shared/api/messager/mock/mock_imessager.go b/venus-shared/api/messager/mock/mock_imessager.go