From 27a67237bbe0058a5b31229039f90171b00045da Mon Sep 17 00:00:00 2001 From: simlecode <69969590+simlecode@users.noreply.github.com> Date: Fri, 22 Jul 2022 13:12:24 +0800 Subject: [PATCH] fix: revert #5106 --- venus-shared/api/messager/method.md | 22 ++++++++++++++++++---- venus-shared/types/messager/address.go | 2 +- venus-shared/types/messager/spec.go | 4 +++- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/venus-shared/api/messager/method.md b/venus-shared/api/messager/method.md index f1f226fc76..8ed031d126 100644 --- a/venus-shared/api/messager/method.md +++ b/venus-shared/api/messager/method.md @@ -145,6 +145,7 @@ Inputs: "expireEpoch": 10101, "gasOverEstimation": 12.3, "maxFee": "0", + "maxFeeCap": "0", "gasOverPremium": 12.3 } ] @@ -181,6 +182,7 @@ Inputs: "expireEpoch": 10101, "gasOverEstimation": 12.3, "maxFee": "0", + "maxFeeCap": "0", "gasOverPremium": 12.3 } ] @@ -211,7 +213,7 @@ Response: "state": 1, "gasOverEstimation": 12.3, "maxFee": "0", - "gasFeeCap": "0", + "maxFeeCap": "0", "gasOverPremium": 12.3, "isDeleted": 123, "createAt": "0001-01-01T00:00:00Z", @@ -275,6 +277,7 @@ Response: "expireEpoch": 10101, "gasOverEstimation": 12.3, "maxFee": "0", + "maxFeeCap": "0", "gasOverPremium": 12.3 }, "WalletName": "test", @@ -342,6 +345,7 @@ Response: "expireEpoch": 10101, "gasOverEstimation": 12.3, "maxFee": "0", + "maxFeeCap": "0", "gasOverPremium": 12.3 }, "WalletName": "test", @@ -407,6 +411,7 @@ Response: "expireEpoch": 10101, "gasOverEstimation": 12.3, "maxFee": "0", + "maxFeeCap": "0", "gasOverPremium": 12.3 }, "WalletName": "test", @@ -474,6 +479,7 @@ Response: "expireEpoch": 10101, "gasOverEstimation": 12.3, "maxFee": "0", + "maxFeeCap": "0", "gasOverPremium": 12.3 }, "WalletName": "test", @@ -520,7 +526,7 @@ Response: "id": 42, "gasOverEstimation": 12.3, "maxFee": "0", - "gasFeeCap": "0", + "maxFeeCap": "0", "gasOverPremium": 12.3, "selMsgNum": 42 } @@ -587,7 +593,7 @@ Response: "state": 1, "gasOverEstimation": 12.3, "maxFee": "0", - "gasFeeCap": "0", + "maxFeeCap": "0", "gasOverPremium": 12.3, "isDeleted": 123, "createAt": "0001-01-01T00:00:00Z", @@ -653,6 +659,7 @@ Response: "expireEpoch": 10101, "gasOverEstimation": 12.3, "maxFee": "0", + "maxFeeCap": "0", "gasOverPremium": 12.3 }, "WalletName": "test", @@ -715,6 +722,7 @@ Response: "expireEpoch": 10101, "gasOverEstimation": 12.3, "maxFee": "0", + "maxFeeCap": "0", "gasOverPremium": 12.3 }, "WalletName": "test", @@ -777,6 +785,7 @@ Response: "expireEpoch": 10101, "gasOverEstimation": 12.3, "maxFee": "0", + "maxFeeCap": "0", "gasOverPremium": 12.3 }, "WalletName": "test", @@ -844,6 +853,7 @@ Response: "expireEpoch": 10101, "gasOverEstimation": 12.3, "maxFee": "0", + "maxFeeCap": "0", "gasOverPremium": 12.3 }, "WalletName": "test", @@ -915,6 +925,7 @@ Response: "expireEpoch": 10101, "gasOverEstimation": 12.3, "maxFee": "0", + "maxFeeCap": "0", "gasOverPremium": 12.3 }, "WalletName": "test", @@ -987,6 +998,7 @@ Inputs: "expireEpoch": 10101, "gasOverEstimation": 12.3, "maxFee": "0", + "maxFeeCap": "0", "gasOverPremium": 12.3 } ] @@ -1022,6 +1034,7 @@ Inputs: "expireEpoch": 10101, "gasOverEstimation": 12.3, "maxFee": "0", + "maxFeeCap": "0", "gasOverPremium": 12.3 } ] @@ -1202,7 +1215,7 @@ Inputs: "id": 42, "gasOverEstimation": 12.3, "maxFee": "0", - "gasFeeCap": "0", + "maxFeeCap": "0", "gasOverPremium": 12.3, "selMsgNum": 42 } @@ -1320,6 +1333,7 @@ Response: "expireEpoch": 10101, "gasOverEstimation": 12.3, "maxFee": "0", + "maxFeeCap": "0", "gasOverPremium": 12.3 }, "WalletName": "test", diff --git a/venus-shared/types/messager/address.go b/venus-shared/types/messager/address.go index 42270313ba..29910e246f 100644 --- a/venus-shared/types/messager/address.go +++ b/venus-shared/types/messager/address.go @@ -50,7 +50,7 @@ type Address struct { State AddressState `json:"state"` GasOverEstimation float64 `json:"gasOverEstimation"` MaxFee big.Int `json:"maxFee,omitempty"` - GasFeeCap big.Int `json:"gasFeeCap"` + MaxFeeCap big.Int `json:"maxFeeCap"` GasOverPremium float64 `json:"gasOverPremium"` IsDeleted int `json:"isDeleted"` // 是否删除 1:是 -1:否 diff --git a/venus-shared/types/messager/spec.go b/venus-shared/types/messager/spec.go index fa855ac756..f970d87708 100644 --- a/venus-shared/types/messager/spec.go +++ b/venus-shared/types/messager/spec.go @@ -9,6 +9,7 @@ type SendSpec struct { ExpireEpoch abi.ChainEpoch `json:"expireEpoch"` GasOverEstimation float64 `json:"gasOverEstimation"` MaxFee big.Int `json:"maxFee,omitempty"` + MaxFeeCap big.Int `json:"maxFeeCap"` GasOverPremium float64 `json:"gasOverPremium"` } @@ -17,7 +18,7 @@ type SharedSpec struct { GasOverEstimation float64 `json:"gasOverEstimation"` MaxFee big.Int `json:"maxFee,omitempty"` - GasFeeCap big.Int `json:"gasFeeCap"` + MaxFeeCap big.Int `json:"maxFeeCap"` GasOverPremium float64 `json:"gasOverPremium"` SelMsgNum uint64 `json:"selMsgNum"` @@ -31,6 +32,7 @@ func (ss *SharedSpec) GetSendSpec() *SendSpec { return &SendSpec{ GasOverEstimation: ss.GasOverEstimation, MaxFee: ss.MaxFee, + MaxFeeCap: ss.MaxFeeCap, GasOverPremium: ss.GasOverPremium, } }