-
Notifications
You must be signed in to change notification settings - Fork 459
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5900 from filecoin-project/feat/update-actor-and-…
…network-skeleton Feat/update actor and network skeleton / 升级网络框架以及 actor bundle
- Loading branch information
Showing
60 changed files
with
3,038 additions
and
93 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "actorVersions": [0, 2, 3, 4, 5, 6, 7, 8, 9, 10], | ||
| "latestActorsVersion": 10, | ||
| "actorVersions": [0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], | ||
| "latestActorsVersion": 11, | ||
|
|
||
| "networkVersions": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18], | ||
| "latestNetworkVersion": 18 | ||
| } | ||
| "networkVersions": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20], | ||
| "latestNetworkVersion": 20 | ||
| } |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| // FETCHED FROM LOTUS: builtin/account/state.go.template | ||
|
|
||
| package account | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| actorstypes "github.com/filecoin-project/go-state-types/actors" | ||
|
|
||
| "github.com/filecoin-project/go-address" | ||
| "github.com/ipfs/go-cid" | ||
|
|
||
| "github.com/filecoin-project/go-state-types/manifest" | ||
| "github.com/filecoin-project/venus/venus-shared/actors" | ||
| "github.com/filecoin-project/venus/venus-shared/actors/adt" | ||
|
|
||
| account11 "github.com/filecoin-project/go-state-types/builtin/v11/account" | ||
| ) | ||
|
|
||
| var _ State = (*state11)(nil) | ||
|
|
||
| func load11(store adt.Store, root cid.Cid) (State, error) { | ||
| out := state11{store: store} | ||
| err := store.Get(store.Context(), root, &out) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return &out, nil | ||
| } | ||
|
|
||
| func make11(store adt.Store, addr address.Address) (State, error) { | ||
| out := state11{store: store} | ||
| out.State = account11.State{Address: addr} | ||
| return &out, nil | ||
| } | ||
|
|
||
| type state11 struct { | ||
| account11.State | ||
| store adt.Store | ||
| } | ||
|
|
||
| func (s *state11) PubkeyAddress() (address.Address, error) { | ||
| return s.Address, nil | ||
| } | ||
|
|
||
| func (s *state11) GetState() interface{} { | ||
| return &s.State | ||
| } | ||
|
|
||
| func (s *state11) ActorKey() string { | ||
| return manifest.AccountKey | ||
| } | ||
|
|
||
| func (s *state11) ActorVersion() actorstypes.Version { | ||
| return actorstypes.Version11 | ||
| } | ||
|
|
||
| func (s *state11) Code() cid.Cid { | ||
| code, ok := actors.GetActorCodeID(s.ActorVersion(), s.ActorKey()) | ||
| if !ok { | ||
| panic(fmt.Errorf("didn't find actor %v code id for actor version %d", s.ActorKey(), s.ActorVersion())) | ||
| } | ||
|
|
||
| return code | ||
| } |
Oops, something went wrong.