diff --git a/venus-devtool/go.mod b/venus-devtool/go.mod index 8f4466aedd..63832cf359 100644 --- a/venus-devtool/go.mod +++ b/venus-devtool/go.mod @@ -9,8 +9,9 @@ require ( github.com/filecoin-project/go-fil-markets v1.28.3 github.com/filecoin-project/go-jsonrpc v0.3.1 github.com/filecoin-project/go-state-types v0.13.0-rc.2 - github.com/filecoin-project/lotus v1.25.3-0.20240227185223-01ec166e3a9e + github.com/filecoin-project/lotus v1.26.0-rc1 github.com/filecoin-project/venus v0.0.0-00010101000000-000000000000 + github.com/golang/mock v1.6.0 github.com/google/uuid v1.3.0 github.com/ipfs/go-block-format v0.1.2 github.com/ipfs/go-cid v0.4.1 @@ -92,7 +93,6 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/glog v1.1.1 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gopacket v1.1.19 // indirect diff --git a/venus-devtool/go.sum b/venus-devtool/go.sum index 5906b7686c..47fb39129c 100644 --- a/venus-devtool/go.sum +++ b/venus-devtool/go.sum @@ -264,8 +264,8 @@ github.com/filecoin-project/go-statestore v0.2.0 h1:cRRO0aPLrxKQCZ2UOQbzFGn4WDNd github.com/filecoin-project/go-statestore v0.2.0/go.mod h1:8sjBYbS35HwPzct7iT4lIXjLlYyPor80aU7t7a/Kspo= github.com/filecoin-project/kubo-api-client v0.0.1 h1:IR1b+sm+VYxSRvbgECVv9SbhIgygcXcSoN1Q7xsHDXg= github.com/filecoin-project/kubo-api-client v0.0.1/go.mod h1:c36PPMIVOkKfHDwDG5U05gUlPRY9wNuh/BePwo0e+6Y= -github.com/filecoin-project/lotus v1.25.3-0.20240227185223-01ec166e3a9e h1:P/dO3xDWRGOmmYSy4Baogg7Bd3m9O+69sIFym1JWCVA= -github.com/filecoin-project/lotus v1.25.3-0.20240227185223-01ec166e3a9e/go.mod h1:8TFqfu2kdzTjT/+e/o6SYBOxvGAQOMwX7UNu4BZDUTU= +github.com/filecoin-project/lotus v1.26.0-rc1 h1:GpqEmM3J+BX9ZvNF/KTdrvNMWPZs6vKFR6l5kAHpUwk= +github.com/filecoin-project/lotus v1.26.0-rc1/go.mod h1:6FC17T8tgqFKiTGXNAuy4HdsHcksuk0HyjWDF8my+aA= 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/api/chain/v1/proxy_gen.go b/venus-shared/api/chain/v1/proxy_gen.go index d0fae0970e..1f9b96ede5 100644 --- a/venus-shared/api/chain/v1/proxy_gen.go +++ b/venus-shared/api/chain/v1/proxy_gen.go @@ -448,26 +448,11 @@ func (s *IChainInfoStruct) VerifyEntry(p0, p1 *types.BeaconEntry, p2 abi.ChainEp return s.Internal.VerifyEntry(p0, p1, p2) } -type IActorEventStruct struct { - Internal struct { - GetActorEvents func(ctx context.Context, filter *types.ActorEventFilter) ([]*types.ActorEvent, error) `perm:"read"` - SubscribeActorEvents func(ctx context.Context, filter *types.ActorEventFilter) (<-chan *types.ActorEvent, error) `perm:"read"` - } -} - -func (s *IActorEventStruct) GetActorEvents(p0 context.Context, p1 *types.ActorEventFilter) ([]*types.ActorEvent, error) { - return s.Internal.GetActorEvents(p0, p1) -} -func (s *IActorEventStruct) SubscribeActorEvents(p0 context.Context, p1 *types.ActorEventFilter) (<-chan *types.ActorEvent, error) { - return s.Internal.SubscribeActorEvents(p0, p1) -} - type IChainStruct struct { IAccountStruct IActorStruct IMinerStateStruct IChainInfoStruct - IActorEventStruct } type IMarketStruct struct { @@ -1063,6 +1048,20 @@ type FullETHStruct struct { IETHEventStruct } +type IActorEventStruct struct { + Internal struct { + GetActorEvents func(ctx context.Context, filter *types.ActorEventFilter) ([]*types.ActorEvent, error) `perm:"read"` + SubscribeActorEvents func(ctx context.Context, filter *types.ActorEventFilter) (<-chan *types.ActorEvent, error) `perm:"read"` + } +} + +func (s *IActorEventStruct) GetActorEvents(p0 context.Context, p1 *types.ActorEventFilter) ([]*types.ActorEvent, error) { + return s.Internal.GetActorEvents(p0, p1) +} +func (s *IActorEventStruct) SubscribeActorEvents(p0 context.Context, p1 *types.ActorEventFilter) (<-chan *types.ActorEvent, error) { + return s.Internal.SubscribeActorEvents(p0, p1) +} + type FullNodeStruct struct { IBlockStoreStruct IChainStruct @@ -1075,4 +1074,5 @@ type FullNodeStruct struct { IWalletStruct ICommonStruct FullETHStruct + IActorEventStruct } diff --git a/venus-shared/compatible-checks/api-checksum.txt b/venus-shared/compatible-checks/api-checksum.txt index 809dc09beb..1261ae0c68 100644 --- a/venus-shared/compatible-checks/api-checksum.txt +++ b/venus-shared/compatible-checks/api-checksum.txt @@ -331,6 +331,7 @@ api.FullNode: GasEstimateGasLimit: In=3, Out=2, CheckSum=4d1bd57eef0ee90d4c2e89f097d0604d GasEstimateGasPremium: In=5, Out=2, CheckSum=550724ed37e2fdaa64e55147e82214b1 GasEstimateMessageGas: In=4, Out=2, CheckSum=6ff6179b579feed33897d96429504624 + GetActorEvents: In=2, Out=2, CheckSum=e0c47876fd090c7125f3610b99e0dd27 ID: In=1, Out=2, CheckSum=1635810444d2b13b381cbefece853ba7 LogAlerts: In=1, Out=2, CheckSum=c9262fa7c93e891ec80868e0b83a2222 LogList: In=1, Out=2, CheckSum=c6d763b6ec7190283b7c648e735725c0 @@ -488,6 +489,7 @@ api.FullNode: StateVerifiedRegistryRootKey: In=2, Out=2, CheckSum=5ad3a497ee24e321c780a69b8d2f0936 StateVerifierStatus: In=3, Out=2, CheckSum=e33ae4cd2315832f2d6f2aa74b68c34e StateWaitMsg: In=5, Out=2, CheckSum=561c18d1417310b5cd35cfffb0b75a00 + SubscribeActorEvents: In=2, Out=2, CheckSum=af75eb1b19217696987fdf472121561c SyncCheckBad: In=2, Out=2, CheckSum=ba06470da0ca1d6cc2f9ada7f0288a6c SyncCheckpoint: In=2, Out=1, CheckSum=cdfe593ac791e823186abb77bfad49a0 SyncIncomingBlocks: In=1, Out=2, CheckSum=f6ad051ba2ce73511f74f9c08032acc3