From 0d3393112f61da63693c46a23836c4d0f36b5a8a Mon Sep 17 00:00:00 2001 From: simlecode <69969590+simlecode@users.noreply.github.com> Date: Wed, 1 Mar 2023 10:41:00 +0800 Subject: [PATCH 1/3] chore: update to lotus v1.20.0 & make compatible-all --- venus-devtool/go.mod | 2 +- venus-devtool/go.sum | 4 ++-- venus-shared/compatible-checks/api-checksum.txt | 1 + venus-shared/compatible-checks/api-diff.txt | 1 - venus-shared/compatible-checks/api-perm.txt | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/venus-devtool/go.mod b/venus-devtool/go.mod index dbc82f7690..778e18c5f5 100644 --- a/venus-devtool/go.mod +++ b/venus-devtool/go.mod @@ -9,7 +9,7 @@ require ( github.com/filecoin-project/go-fil-markets v1.25.2 github.com/filecoin-project/go-jsonrpc v0.2.1 github.com/filecoin-project/go-state-types v0.10.0 - github.com/filecoin-project/lotus v1.20.0-rc2 + github.com/filecoin-project/lotus v1.20.0 github.com/filecoin-project/venus v0.0.0-00010101000000-000000000000 github.com/google/uuid v1.3.0 github.com/ipfs/go-cid v0.3.2 diff --git a/venus-devtool/go.sum b/venus-devtool/go.sum index 9a287d6e89..df17c871bc 100644 --- a/venus-devtool/go.sum +++ b/venus-devtool/go.sum @@ -338,8 +338,8 @@ github.com/filecoin-project/go-statemachine v1.0.2 h1:421SSWBk8GIoCoWYYTE/d+qCWc github.com/filecoin-project/go-statestore v0.2.0 h1:cRRO0aPLrxKQCZ2UOQbzFGn4WDNdofHZoGPjfNaAo5Q= github.com/filecoin-project/go-statestore v0.2.0/go.mod h1:8sjBYbS35HwPzct7iT4lIXjLlYyPor80aU7t7a/Kspo= github.com/filecoin-project/index-provider v0.9.1 h1:Jnh9dviIHvQxZ2baNoYu3n8z6F9O62ksnVlyREgPyyM= -github.com/filecoin-project/lotus v1.20.0-rc2 h1:0oFPzq/SqsuimAKLmXyiONwiKW3joKHoX8pjqh3kPpY= -github.com/filecoin-project/lotus v1.20.0-rc2/go.mod h1:LwDjcMt5GMH31DH61eEeB7KraRaux23vmnP35NPyCFg= +github.com/filecoin-project/lotus v1.20.0 h1:Jm08hHbqjXFieNluVQL/SXWrqXnW2RP6b9bxKJ/GQig= +github.com/filecoin-project/lotus v1.20.0/go.mod h1:dprpVaiQezI8Jl4tWcPNIYGGAAo31feZlGAOk8D7bJU= github.com/filecoin-project/pubsub v1.0.0 h1:ZTmT27U07e54qV1mMiQo4HDr0buo8I1LDHBYLXlsNXM= github.com/filecoin-project/pubsub v1.0.0/go.mod h1:GkpB33CcUtUNrLPhJgfdy4FDx4OMNR9k+46DHx/Lqrg= github.com/filecoin-project/specs-actors v0.9.13/go.mod h1:TS1AW/7LbG+615j4NsjMK1qlpAwaFsG9w0V2tg2gSao= diff --git a/venus-shared/compatible-checks/api-checksum.txt b/venus-shared/compatible-checks/api-checksum.txt index 2bc0992b8c..3f1b82f610 100644 --- a/venus-shared/compatible-checks/api-checksum.txt +++ b/venus-shared/compatible-checks/api-checksum.txt @@ -317,6 +317,7 @@ api.FullNode: EthSubscribe: In=2, Out=2, CheckSum=f63e0b205164d628bc8022b6d5a496f5 EthUninstallFilter: In=2, Out=2, CheckSum=eaa6a477ffaae115413457bbdb11e339 EthUnsubscribe: In=2, Out=2, CheckSum=eaa6a477ffaae115413457bbdb11e339 + FilecoinAddressToEthAddress: In=2, Out=2, CheckSum=13a0b5ce8f82604e17803a00c4086c4c GasEstimateFeeCap: In=4, Out=2, CheckSum=0fcac02de1d21c9ac6e10696a6499eba GasEstimateGasLimit: In=3, Out=2, CheckSum=4d1bd57eef0ee90d4c2e89f097d0604d GasEstimateGasPremium: In=5, Out=2, CheckSum=550724ed37e2fdaa64e55147e82214b1 diff --git a/venus-shared/compatible-checks/api-diff.txt b/venus-shared/compatible-checks/api-diff.txt index c5099520b1..a090b67bda 100644 --- a/venus-shared/compatible-checks/api-diff.txt +++ b/venus-shared/compatible-checks/api-diff.txt @@ -165,7 +165,6 @@ github.com/filecoin-project/venus/venus-shared/api/chain/v1.FullNode <> github.c + Concurrent - CreateBackup - Discover - + FilecoinAddressToEthAddress + GasBatchEstimateMessageGas > GasEstimateMessageGas {[func(context.Context, *types.Message, *types.MessageSendSpec, types.TipSetKey) (*types.Message, error) <> func(context.Context, *types.Message, *api.MessageSendSpec, types.TipSetKey) (*types.Message, error)] base=func in type: #2 input; nested={[*types.MessageSendSpec <> *api.MessageSendSpec] base=pointed type; nested={[types.MessageSendSpec <> api.MessageSendSpec] base=struct field; nested={[types.MessageSendSpec <> api.MessageSendSpec] base=exported fields count: 3 != 2; nested=nil}}}} + GetActor diff --git a/venus-shared/compatible-checks/api-perm.txt b/venus-shared/compatible-checks/api-perm.txt index f004ff113b..1abfaa8248 100644 --- a/venus-shared/compatible-checks/api-perm.txt +++ b/venus-shared/compatible-checks/api-perm.txt @@ -67,7 +67,6 @@ v1: github.com/filecoin-project/venus/venus-shared/api/chain/v1 <> github.com/fi - IMinerState.StateMinerSectorSize - IMinerState.StateMinerWorkerAddress - EthSubscriber.EthSubscription - - IETH.FilecoinAddressToEthAddress - IMessagePool.GasBatchEstimateMessageGas - IMessagePool.MpoolDeleteByAdress - IMessagePool.MpoolPublishByAddr From 8d4a4821ba6adb3dd2616baad8c790d19ca54eae Mon Sep 17 00:00:00 2001 From: simlecode <69969590+simlecode@users.noreply.github.com> Date: Wed, 1 Mar 2023 10:47:02 +0800 Subject: [PATCH 2/3] chore: set mainnet upgrade epoch --- fixtures/networks/mainnet.go | 2 +- pkg/migration/migrate.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fixtures/networks/mainnet.go b/fixtures/networks/mainnet.go index d038fe2dbe..a02c03b2ae 100644 --- a/fixtures/networks/mainnet.go +++ b/fixtures/networks/mainnet.go @@ -70,7 +70,7 @@ func Mainnet() *NetworkConf { UpgradeOhSnapHeight: 1594680, // 2022-03-01T15:00:00Z UpgradeSkyrHeight: 1960320, // 2022-07-06T14:00:00Z UpgradeSharkHeight: 2383680, // 2022-11-30T14:00:00Z - UpgradeHyggeHeight: 99999999999999, + UpgradeHyggeHeight: 2683348, // 2023-03-14T15:14:00Z }, DrandSchedule: map[abi.ChainEpoch]config.DrandEnum{0: 5, 51000: 1}, AddressNetwork: address.Mainnet, diff --git a/pkg/migration/migrate.go b/pkg/migration/migrate.go index 141d75ac89..9e8be5ba4f 100644 --- a/pkg/migration/migrate.go +++ b/pkg/migration/migrate.go @@ -381,7 +381,7 @@ func Version11Upgrade(repoPath string) (err error) { switch cfg.NetworkParams.NetworkType { case types.NetworkMainnet: - cfg.NetworkParams.ForkUpgradeParam.UpgradeHyggeHeight = 99999999999999 + cfg.NetworkParams.ForkUpgradeParam.UpgradeHyggeHeight = 2683348 cfg.NetworkParams.Eip155ChainID = 314 case types.Network2k: cfg.NetworkParams.GenesisNetworkVersion = network.Version17 @@ -393,7 +393,7 @@ func Version11Upgrade(repoPath string) (err error) { cfg.NetworkParams.GenesisNetworkVersion = network.Version17 cfg.NetworkParams.ForkUpgradeParam.UpgradeHyggeHeight = 30 case types.NetworkInterop: - cfg.NetworkParams.ForkUpgradeParam.UpgradeHyggeHeight = 99999999999999 + cfg.NetworkParams.ForkUpgradeParam.UpgradeHyggeHeight = 2683348 case types.NetworkButterfly: cfg.NetworkParams.ForkUpgradeParam.UpgradeHyggeHeight = 600 cfg.NetworkParams.Eip155ChainID = 3141592 From 607ed5a4f19bab3cbc49bb0ab6c1618fa04ef0f9 Mon Sep 17 00:00:00 2001 From: simlecode <69969590+simlecode@users.noreply.github.com> Date: Thu, 2 Mar 2023 09:46:44 +0800 Subject: [PATCH 3/3] chore: bump version to v1.10.0 --- CHANGELOG.md | 6 ++++++ go.mod | 4 ++-- go.sum | 8 ++++---- main.go | 1 + pkg/constants/version.go | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01b27d9af7..2d31115868 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # venus changelog +## v1.10.0 + +* 把实际的 vmTracing 传递给 VM [[#5757](https://github.com/filecoin-project/venus/pull/5757)] +* 增加接口 FilecoinAddressToEthAddress [[#5772]](https://github.com/filecoin-project/venus/pull/5772) +* 重构 market 接口 updatedealstatus [[#5778](https://github.com/filecoin-project/venus/pull/5778)] + ## v1.10.0-rc4 * 修复保存 MessageReceipt 失败问题 [[#5743](https://github.com/filecoin-project/venus/pull/5743)] diff --git a/go.mod b/go.mod index 9c5de4a00c..cee36bdf9c 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/filecoin-project/specs-actors/v8 v8.0.1 github.com/filecoin-project/specs-storage v0.4.1 github.com/filecoin-project/test-vectors/schema v0.0.5 - github.com/filecoin-project/venus-auth v1.10.0-rc2 + github.com/filecoin-project/venus-auth v1.10.0 github.com/fxamacker/cbor/v2 v2.4.0 github.com/go-errors/errors v1.0.1 github.com/go-kit/kit v0.12.0 @@ -317,6 +317,6 @@ require ( replace ( github.com/filecoin-project/filecoin-ffi => ./extern/filecoin-ffi - github.com/filecoin-project/go-jsonrpc => github.com/ipfs-force-community/go-jsonrpc v0.1.7-0.20230220074347-8db78dbc20d4 + github.com/filecoin-project/go-jsonrpc => github.com/ipfs-force-community/go-jsonrpc v0.1.7 github.com/filecoin-project/test-vectors => ./extern/test-vectors ) diff --git a/go.sum b/go.sum index 42acdb9d70..7da4eb1008 100644 --- a/go.sum +++ b/go.sum @@ -380,8 +380,8 @@ github.com/filecoin-project/specs-storage v0.4.1/go.mod h1:Z2eK6uMwAOSLjek6+sy0j github.com/filecoin-project/storetheindex v0.4.30-0.20221114113647-683091f8e893 h1:6GCuzxLVHBzlz7y+FkbHh6n0UyoEGWqDwJKQPJoz7bE= github.com/filecoin-project/test-vectors/schema v0.0.5 h1:w3zHQhzM4pYxJDl21avXjOKBLF8egrvwUwjpT8TquDg= github.com/filecoin-project/test-vectors/schema v0.0.5/go.mod h1:iQ9QXLpYWL3m7warwvK1JC/pTri8mnfEmKygNDqqY6E= -github.com/filecoin-project/venus-auth v1.10.0-rc2 h1:mC2kRcUmXaL2nPky8iiogFjrygMTUXGXHjvEV9msPgk= -github.com/filecoin-project/venus-auth v1.10.0-rc2/go.mod h1:bJT0owiiQfQq7u8QBpIf22JHNRZdsx9rAr4wMEsg+ds= +github.com/filecoin-project/venus-auth v1.10.0 h1:0V5R36HIvLKRFJQjKkW0tjYazgHkDW/gmjwuEtKL1SA= +github.com/filecoin-project/venus-auth v1.10.0/go.mod h1:MoirCIFdK8FNIFXpBbgF4xhRsjGi4KHHfW1EF6iAwZ8= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/noise v1.0.0 h1:DlTHqmzmvcEiKj+4RYo/imoswx/4r6iBlCMfVtrMXpQ= github.com/flynn/noise v1.0.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= @@ -672,8 +672,8 @@ github.com/influxdata/influxdb-client-go/v2 v2.2.2/go.mod h1:fa/d1lAdUHxuc1jedx3 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 h1:W9WBk7wlPfJLvMCdtV4zPulc4uCPrlywQOmbFOhgQNU= github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= -github.com/ipfs-force-community/go-jsonrpc v0.1.7-0.20230220074347-8db78dbc20d4 h1:iu/3irYevdNpdc0B/gRi1vuS3+lRn+6Ro9G0FeBiAfE= -github.com/ipfs-force-community/go-jsonrpc v0.1.7-0.20230220074347-8db78dbc20d4/go.mod h1:jBSvPTl8V1N7gSTuCR4bis8wnQnIjHbRPpROol6iQKM= +github.com/ipfs-force-community/go-jsonrpc v0.1.7 h1:e0ZTapGFhDY54j0QpRYN54Q3FHawUBQAM1KvXOzZtYY= +github.com/ipfs-force-community/go-jsonrpc v0.1.7/go.mod h1:jBSvPTl8V1N7gSTuCR4bis8wnQnIjHbRPpROol6iQKM= github.com/ipfs-force-community/metrics v1.0.1-0.20211022060227-11142a08b729 h1:elS3KmzAMVrcZpmP2RMEjs9Zlwh6LfhJTfYQdj4TREs= github.com/ipfs-force-community/metrics v1.0.1-0.20211022060227-11142a08b729/go.mod h1:mn40SioMuKtjmRumHFy/fJ26Pn028XuDjUJE9dorjyw= github.com/ipfs/bbloom v0.0.1/go.mod h1:oqo8CVWsJFMOZqTglBG4wydCE4IQA/G2/SEofB0rjUI= diff --git a/main.go b/main.go index e549e29fde..4bf46db5e7 100644 --- a/main.go +++ b/main.go @@ -15,6 +15,7 @@ func main() { lvl := os.Getenv("GO_FILECOIN_LOG_LEVEL") if lvl == "" { logging.SetAllLoggers(logging.LevelInfo) + _ = logging.SetLogLevel("statemanager", "info") _ = logging.SetLogLevel("beacon", "error") _ = logging.SetLogLevel("peer-tracker", "error") _ = logging.SetLogLevel("dht", "error") diff --git a/pkg/constants/version.go b/pkg/constants/version.go index 3028359034..0169ecb2c0 100644 --- a/pkg/constants/version.go +++ b/pkg/constants/version.go @@ -5,7 +5,7 @@ import ( ) // BuildVersion is the local build version, set by build system -const BuildVersion = "1.10.0-rc4" +const BuildVersion = "1.10.0" var CurrentCommit string