@@ -12,6 +12,7 @@ import (
1212 "github.com/filecoin-project/go-f3/gpbft"
1313 "github.com/filecoin-project/go-state-types/abi"
1414
15+ "github.com/filecoin-project/lotus/chain"
1516 "github.com/filecoin-project/lotus/chain/actors/builtin/miner"
1617 "github.com/filecoin-project/lotus/chain/actors/builtin/power"
1718 "github.com/filecoin-project/lotus/chain/stmgr"
@@ -20,52 +21,56 @@ import (
2021 "github.com/filecoin-project/lotus/chain/vm"
2122)
2223
24+ var (
25+ _ ec.Backend = (* ecWrapper )(nil )
26+ _ ec.TipSet = (* f3TipSet )(nil )
27+
28+ emptyBeacon = make ([]byte , 32 )
29+ )
30+
2331type ecWrapper struct {
2432 ChainStore * store.ChainStore
33+ Syncer * chain.Syncer
2534 StateManager * stmgr.StateManager
2635}
2736
28- var _ ec.TipSet = (* f3TipSet )(nil )
29-
30- type f3TipSet types.TipSet
31-
32- func (ts * f3TipSet ) cast () * types.TipSet {
33- return (* types .TipSet )(ts )
37+ type f3TipSet struct {
38+ * types.TipSet
3439}
3540
36- func (ts * f3TipSet ) String () string {
37- return ts .cast ().String ()
38- }
41+ func (ts * f3TipSet ) String () string { return ts . TipSet . String () }
42+ func ( ts * f3TipSet ) Key () gpbft. TipSetKey { return ts .TipSet . Key ().Bytes () }
43+ func ( ts * f3TipSet ) Epoch () int64 { return int64 ( ts . TipSet . Height ()) }
3944
40- func (ts * f3TipSet ) Key () gpbft.TipSetKey {
41- return ts .cast ().Key ().Bytes ()
45+ func (ts * f3TipSet ) FirstBlockHeader () * types.BlockHeader {
46+ if ts .TipSet == nil || len (ts .TipSet .Blocks ()) == 0 {
47+ return nil
48+ }
49+ return ts .TipSet .Blocks ()[0 ]
4250}
4351
4452func (ts * f3TipSet ) Beacon () []byte {
45- entries := ts .cast ().Blocks ()[0 ].BeaconEntries
46- if len (entries ) == 0 {
47- // This should never happen in practice, but set beacon to a non-nil
48- // 32byte slice to force the message builder to generate a
49- // ticket. Otherwise, messages that require ticket, i.e. CONVERGE will fail
50- // validation due to the absence of ticket. This is a convoluted way of doing it.
51- return make ([]byte , 32 )
52- }
53- return entries [len (entries )- 1 ].Data
54- }
55-
56- func (ts * f3TipSet ) Epoch () int64 {
57- return int64 (ts .cast ().Height ())
53+ switch header := ts .FirstBlockHeader (); {
54+ case header == nil , len (header .BeaconEntries ) == 0 :
55+ // This should never happen in practice, but set beacon to a non-nil 32byte slice
56+ // to force the message builder to generate a ticket. Otherwise, messages that
57+ // require ticket, i.e. CONVERGE will fail validation due to the absence of
58+ // ticket. This is a convoluted way of doing it.
59+
60+ // TODO: investigate if this is still necessary, or how message builder can be
61+ // adapted to behave correctly regardless of beacon value, e.g. fail fast
62+ // instead of building CONVERGE with empty beacon.
63+ return emptyBeacon
64+ default :
65+ return header .BeaconEntries [len (header .BeaconEntries )- 1 ].Data
66+ }
5867}
5968
6069func (ts * f3TipSet ) Timestamp () time.Time {
61- return time .Unix (int64 (ts .cast ().Blocks ()[0 ].Timestamp ), 0 )
62- }
63-
64- func wrapTS (ts * types.TipSet ) ec.TipSet {
65- if ts == nil {
66- return nil
70+ if header := ts .FirstBlockHeader (); header != nil {
71+ return time .Unix (int64 (header .Timestamp ), 0 )
6772 }
68- return ( * f3TipSet )( ts )
73+ return time. Time {}
6974}
7075
7176// GetTipsetByEpoch should return a tipset before the one requested if the requested
@@ -75,57 +80,38 @@ func (ec *ecWrapper) GetTipsetByEpoch(ctx context.Context, epoch int64) (ec.TipS
7580 if err != nil {
7681 return nil , xerrors .Errorf ("getting tipset by height: %w" , err )
7782 }
78- return wrapTS ( ts ) , nil
83+ return & f3TipSet { TipSet : ts } , nil
7984}
8085
8186func (ec * ecWrapper ) GetTipset (ctx context.Context , tsk gpbft.TipSetKey ) (ec.TipSet , error ) {
82- tskLotus , err := types .TipSetKeyFromBytes (tsk )
83- if err != nil {
84- return nil , xerrors .Errorf ("decoding tsk: %w" , err )
85- }
86-
87- ts , err := ec .ChainStore .GetTipSetFromKey (ctx , tskLotus )
87+ ts , err := ec .getTipSetFromF3TSK (ctx , tsk )
8888 if err != nil {
8989 return nil , xerrors .Errorf ("getting tipset by key: %w" , err )
9090 }
9191
92- return wrapTS ( ts ) , nil
92+ return & f3TipSet { TipSet : ts } , nil
9393}
9494
95- func (ec * ecWrapper ) GetHead (_ context.Context ) (ec.TipSet , error ) {
96- return wrapTS ( ec .ChainStore .GetHeaviestTipSet ()) , nil
95+ func (ec * ecWrapper ) GetHead (context.Context ) (ec.TipSet , error ) {
96+ return & f3TipSet { TipSet : ec .ChainStore .GetHeaviestTipSet ()} , nil
9797}
9898
9999func (ec * ecWrapper ) GetParent (ctx context.Context , tsF3 ec.TipSet ) (ec.TipSet , error ) {
100- var ts * types.TipSet
101- if tsW , ok := tsF3 .(* f3TipSet ); ok {
102- ts = tsW .cast ()
103- } else {
104- // There are only two implementations of ec.TipSet: f3TipSet, and one in fake EC
105- // backend.
106- //
107- // TODO: Revisit the type check here and remove as needed once testing
108- // is over and fake EC backend goes away.
109- tskLotus , err := types .TipSetKeyFromBytes (tsF3 .Key ())
110- if err != nil {
111- return nil , xerrors .Errorf ("decoding tsk: %w" , err )
112- }
113- ts , err = ec .ChainStore .GetTipSetFromKey (ctx , tskLotus )
114- if err != nil {
115- return nil , xerrors .Errorf ("getting tipset by key for get parent: %w" , err )
116- }
100+ ts , err := ec .toLotusTipSet (ctx , tsF3 )
101+ if err != nil {
102+ return nil , err
117103 }
118104 parentTs , err := ec .ChainStore .GetTipSetFromKey (ctx , ts .Parents ())
119105 if err != nil {
120106 return nil , xerrors .Errorf ("getting parent tipset: %w" , err )
121107 }
122- return wrapTS ( parentTs ) , nil
108+ return & f3TipSet { TipSet : parentTs } , nil
123109}
124110
125111func (ec * ecWrapper ) GetPowerTable (ctx context.Context , tskF3 gpbft.TipSetKey ) (gpbft.PowerEntries , error ) {
126- tsk , err := types . TipSetKeyFromBytes (tskF3 )
112+ tsk , err := toLotusTipSetKey (tskF3 )
127113 if err != nil {
128- return nil , xerrors . Errorf ( "decoding tsk: %w" , err )
114+ return nil , err
129115 }
130116 return ec .getPowerTableLotusTSK (ctx , tsk )
131117}
@@ -208,7 +194,7 @@ func (ec *ecWrapper) getPowerTableLotusTSK(ctx context.Context, tsk types.TipSet
208194 if waddr .Protocol () != address .BLS {
209195 return xerrors .Errorf ("wrong type of worker address" )
210196 }
211- pe .PubKey = gpbft . PubKey ( waddr .Payload () )
197+ pe .PubKey = waddr .Payload ()
212198 powerEntries = append (powerEntries , pe )
213199 return nil
214200 })
@@ -219,3 +205,44 @@ func (ec *ecWrapper) getPowerTableLotusTSK(ctx context.Context, tsk types.TipSet
219205 sort .Sort (powerEntries )
220206 return powerEntries , nil
221207}
208+
209+ func (ec * ecWrapper ) Finalize (ctx context.Context , key gpbft.TipSetKey ) error {
210+ tsk , err := toLotusTipSetKey (key )
211+ if err != nil {
212+ return err
213+ }
214+ if err = ec .Syncer .SyncCheckpoint (ctx , tsk ); err != nil {
215+ return xerrors .Errorf ("checkpointing finalized tipset: %w" , err )
216+ }
217+ return nil
218+ }
219+
220+ func (ec * ecWrapper ) toLotusTipSet (ctx context.Context , ts ec.TipSet ) (* types.TipSet , error ) {
221+ switch tst := ts .(type ) {
222+ case * f3TipSet :
223+ return tst .TipSet , nil
224+ default :
225+ // Fall back on getting the tipset by key. This path is executed only in testing.
226+ return ec .getTipSetFromF3TSK (ctx , ts .Key ())
227+ }
228+ }
229+
230+ func (ec * ecWrapper ) getTipSetFromF3TSK (ctx context.Context , key gpbft.TipSetKey ) (* types.TipSet , error ) {
231+ tsk , err := toLotusTipSetKey (key )
232+ if err != nil {
233+ return nil , err
234+ }
235+ ts , err := ec .ChainStore .GetTipSetFromKey (ctx , tsk )
236+ if err != nil {
237+ return nil , xerrors .Errorf ("getting tipset from key: %w" , err )
238+ }
239+ return ts , nil
240+ }
241+
242+ func toLotusTipSetKey (key gpbft.TipSetKey ) (types.TipSetKey , error ) {
243+ tsk , err := types .TipSetKeyFromBytes (key )
244+ if err != nil {
245+ return types.TipSetKey {}, xerrors .Errorf ("decoding tpiset key: %w" , err )
246+ }
247+ return tsk , nil
248+ }
0 commit comments