Chore/merge v1.10.0

CHANGELOG.md

@@ -1,5 +1,32 @@
 # venus changelog
 
+## v1.10.1
+
+* 修复 evm 命令部署合约失败 [[#5785](https://github.com/filecoin-project/venus/pull/5785)]
+* 修复无法获取扇区的开始和过期时间 [[#5792](https://github.com/filecoin-project/venus/pull/5792)]
+* market 增加 miner 管理接口 [[#5794](https://github.com/filecoin-project/venus/pull/5794)]
+* 增加 StateCompute 接口 [[#5795](https://github.com/filecoin-project/venus/pull/5795)]
+* 优化调用 newEthBlockFromFilecoinTipSet 函数的耗时 [[#5798](https://github.com/filecoin-project/venus/pull/5798)]
+
+## 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)]
+
+## v1.10.0-rc3
+
+* 调整 force 网络的 Hygge 升级高度
+* 增加 bootstrap peers flag
+* 增加 RPC接口：EthAddressToFilecoinAddress
+* 升级 go-libipfs 版本到 v0.4.1
+* 修复 EthGetTransactionCount 接口返回不正确的 nonce
+* 调整预迁移开始高度和结束高度
+
 ## v1.10.0-rc1
 
 这是 venus v1.10.0 版本（**强制性**）的第一个候选版本，此版本将提供 Hygge 网络升级，并引入 Filecoin 网络版本18。

app/submodule/chain/chaininfo_api.go

@@ -483,19 +483,6 @@ func (cia *chainInfoAPI) StateVerifierStatus(ctx context.Context, addr address.A
 	return &dcap, nil
 }
 
-// MessageWait invokes the callback when a message with the given cid appears on chain.
-// It will find the message in both the case that it is already on chain and
-// the case that it appears in a newly mined block. An error is returned if one is
-// encountered or if the context is canceled. Otherwise, it waits forever for the message
-// to appear on chain.
-func (cia *chainInfoAPI) MessageWait(ctx context.Context, msgCid cid.Cid, confidence, lookback abi.ChainEpoch) (*types.ChainMessage, error) {
-	chainMsg, err := cia.chain.MessageStore.LoadMessage(ctx, msgCid)
-	if err != nil {
-		return nil, err
-	}
-	return cia.chain.Waiter.Wait(ctx, chainMsg, uint64(confidence), lookback, true)
-}
-
 // StateSearchMsg searches for a message in the chain, and returns its receipt and the tipset where it was executed
 func (cia *chainInfoAPI) StateSearchMsg(ctx context.Context, from types.TipSetKey, mCid cid.Cid, lookbackLimit abi.ChainEpoch, allowReplaced bool) (*types.MsgLookup, error) {
 	chainMsg, err := cia.chain.MessageStore.LoadMessage(ctx, mCid)
@@ -514,7 +501,7 @@ func (cia *chainInfoAPI) StateSearchMsg(ctx context.Context, from types.TipSetKe
 
 	if found {
 		return &types.MsgLookup{
-			Message: mCid,
+			Message: msgResult.Message.Cid(),
 			Receipt: *msgResult.Receipt,
 			TipSet:  msgResult.TS.Key(),
 			Height:  msgResult.TS.Height(),
@@ -579,7 +566,7 @@ func (cia *chainInfoAPI) StateWaitMsg(ctx context.Context, mCid cid.Cid, confide
 		}
 
 		return &types.MsgLookup{
-			Message:   mCid,
+			Message:   msgResult.Message.Cid(),
 			Receipt:   *msgResult.Receipt,
 			ReturnDec: returndec,
 			TipSet:    msgResult.TS.Key(),
@@ -786,7 +773,7 @@ func (cia *chainInfoAPI) StateCall(ctx context.Context, msg *types.Message, tsk
 		}
 	}
 
-	return res, nil
+	return res, err
 }
 
 // StateReplay replays a given message, assuming it was included in a block in the specified tipset.
@@ -882,3 +869,19 @@ func (cia *chainInfoAPI) ChainGetEvents(ctx context.Context, root cid.Cid) ([]ty
 
 	return ret, err
 }
+
+func (cia *chainInfoAPI) StateCompute(ctx context.Context, height abi.ChainEpoch, msgs []*types.Message, tsk types.TipSetKey) (*types.ComputeStateOutput, error) {
+	ts, err := cia.ChainGetTipSet(ctx, tsk)
+	if err != nil {
+		return nil, fmt.Errorf("loading tipset %s: %w", tsk, err)
+	}
+	st, t, err := statemanger.ComputeState(ctx, cia.chain.Stmgr, height, msgs, ts)
+	if err != nil {
+		return nil, err
+	}
+
+	return &types.ComputeStateOutput{
+		Root:  st,
+		Trace: t,
+	}, nil
+}

app/submodule/eth/dummy.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/ipfs/go-cid"
 
+	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-jsonrpc"
 	v1 "github.com/filecoin-project/venus/venus-shared/api/chain/v1"
 	"github.com/filecoin-project/venus/venus-shared/types"
@@ -31,6 +32,14 @@ func (e *ethAPIDummy) EthAccounts(ctx context.Context) ([]types.EthAddress, erro
 	return nil, ErrModuleDisabled
 }
 
+func (e *ethAPIDummy) EthAddressToFilecoinAddress(ctx context.Context, ethAddress types.EthAddress) (address.Address, error) {
+	return address.Undef, ErrModuleDisabled
+}
+
+func (e *ethAPIDummy) FilecoinAddressToEthAddress(ctx context.Context, filecoinAddress address.Address) (types.EthAddress, error) {
+	return types.EthAddress{}, ErrModuleDisabled
+}
+
 func (e *ethAPIDummy) EthGetBlockTransactionCountByNumber(ctx context.Context, blkNum types.EthUint64) (types.EthUint64, error) {
 	return 0, ErrModuleDisabled
 }