Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: actors: Integrate builtin-actors changes for FIP-0045 #9355

Merged
merged 30 commits into from
Oct 7, 2022
+1,538 −800
Merged

feat: actors: Integrate builtin-actors changes for FIP-0045 #9355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
4218612
Update builtin-actors to dev/20220922-v9 which includes FIP-0045 chan…
geoff-vball Sep 22, 2022
bc4f9bb
Integrate verifreg changes to lotus
geoff-vball Sep 21, 2022
530e6a0
Setup datacap actor
geoff-vball Sep 22, 2022
7c62f9e
Update builtin-actors to dev/20220922-v9-1
geoff-vball Sep 22, 2022
1973e44
Update datacap actor to query datacap instead of verifreg
geoff-vball Sep 22, 2022
558a8bc
update gst
geoff-vball Sep 26, 2022
b4c04ad
update markets
geoff-vball Sep 26, 2022
64b1a52
update actors with hamt fix
geoff-vball Sep 26, 2022
c246366
update gst
geoff-vball Sep 26, 2022
a604a60
Update datacap to parse tokens
geoff-vball Sep 27, 2022
d4db1bf
Update bundles
geoff-vball Sep 27, 2022
4fdcc3d
datacap and verifreg actors use ID addresses without protocol byte
geoff-vball Sep 27, 2022
a054f57
update builtin-actors to rc1
geoff-vball Sep 28, 2022
652c370
update go-fil-markets
geoff-vball Sep 29, 2022
2a60cbe
Update bundles to rc2
geoff-vball Oct 4, 2022
de95667
Integrate the v9 migration
arajasek Oct 4, 2022
f55dc46
Add api for getting allocation
geoff-vball Oct 3, 2022
d121e20
Add upgrade epoch for butterfly
geoff-vball Oct 4, 2022
6510e5f
Tweak PreSeal struct to be infra-friendly
arajasek Oct 4, 2022
5f0ad23
docsgen
geoff-vball Oct 5, 2022
97b04b7
More tweaking of PreSeal for genesis
arajasek Oct 5, 2022
b5c5e66
review fixes
geoff-vball Oct 5, 2022
d3eba74
Use fake cid for test
geoff-vball Oct 5, 2022
b5e9f27
add butterfly artifacts for oct 5 upgrade
jennijuju Oct 6, 2022
1a1eff3
check datacaps for v8 verifreg match v9 datacap actor
geoff-vball Oct 6, 2022
098d403
Merge pull request #9446 from filecoin-project/gstuart/check-state-in…
arajasek Oct 6, 2022
b376735
Remove print statements
arajasek Oct 6, 2022
f49cde8
Update to go-state-types master
arajasek Oct 7, 2022
c6eb7b6
Update to go-state-types v0.9.0-rc1
arajasek Oct 7, 2022
a629bca
review fixes
geoff-vball Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,6 +964,11 @@ workflows:
suite: itest-paych_cli
target: "./itests/paych_cli_test.go"

- test:
name: test-itest-pending_deal_allocation
suite: itest-pending_deal_allocation
target: "./itests/pending_deal_allocation_test.go"

- test:
name: test-itest-sdr_upgrade
suite: itest-sdr_upgrade
Expand Down
7 changes: 6 additions & 1 deletion api/api_full.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ import (
"github.com/filecoin-project/go-fil-markets/storagemarket"
"github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/go-state-types/big"
"github.com/filecoin-project/go-state-types/builtin/v8/market"
"github.com/filecoin-project/go-state-types/builtin/v8/paych"
"github.com/filecoin-project/go-state-types/builtin/v9/market"
"github.com/filecoin-project/go-state-types/builtin/v9/miner"
verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
"github.com/filecoin-project/go-state-types/crypto"
"github.com/filecoin-project/go-state-types/dline"
abinetwork "github.com/filecoin-project/go-state-types/network"
Expand Down Expand Up @@ -527,6 +528,10 @@ type FullNode interface {
StateMarketDeals(context.Context, types.TipSetKey) (map[string]*MarketDeal, error) //perm:read
// StateMarketStorageDeal returns information about the indicated deal
StateMarketStorageDeal(context.Context, abi.DealID, types.TipSetKey) (*MarketDeal, error) //perm:read
// StateGetAllocationForPendingDeal returns the allocation for a given deal ID of a pending deal.
StateGetAllocationForPendingDeal(ctx context.Context, dealId abi.DealID, tsk types.TipSetKey) (*verifregtypes.Allocation, error) //perm:read
// StateGetAllocation returns the allocation for a given address and allocation ID.
StateGetAllocation(ctx context.Context, clientAddr address.Address, allocationId verifregtypes.AllocationId, tsk types.TipSetKey) (*verifregtypes.Allocation, error) //perm:read
// StateComputeDataCID computes DataCID from a set of on-chain deals
StateComputeDataCID(ctx context.Context, maddr address.Address, sectorType abi.RegisteredSealProof, deals []abi.DealID, tsk types.TipSetKey) (cid.Cid, error) //perm:read
// StateLookupID retrieves the ID address of the given address
Expand Down
2 changes: 1 addition & 1 deletion api/api_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/filecoin-project/go-jsonrpc/auth"
"github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/go-state-types/big"
"github.com/filecoin-project/go-state-types/builtin/v8/market"
"github.com/filecoin-project/go-state-types/builtin/v9/market"
"github.com/filecoin-project/go-state-types/builtin/v9/miner"
abinetwork "github.com/filecoin-project/go-state-types/network"

Expand Down
2 changes: 1 addition & 1 deletion api/cbor_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions api/docgen/docgen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"github.com/filecoin-project/go-fil-markets/retrievalmarket"
"github.com/filecoin-project/go-jsonrpc/auth"
"github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
"github.com/filecoin-project/go-state-types/crypto"
"github.com/filecoin-project/go-state-types/exitcode"

Expand Down Expand Up @@ -138,6 +139,9 @@ func init() {
addExample(&apiSelExample)
addExample(network.ReachabilityPublic)
addExample(build.TestNetworkVersion)
allocationId := verifreg.AllocationId(0)
addExample(allocationId)
addExample(&allocationId)
addExample(map[string]int{"name": 42})
addExample(map[string]time.Time{"name": time.Unix(1615243938, 0).UTC()})
addExample(&types.ExecutionTrace{
Expand Down
31 changes: 31 additions & 0 deletions api/mocks/mock_full.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions api/proxy_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions api/v0api/full.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/go-state-types/builtin/v8/paych"
"github.com/filecoin-project/go-state-types/builtin/v9/miner"
verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
"github.com/filecoin-project/go-state-types/crypto"
"github.com/filecoin-project/go-state-types/dline"
abinetwork "github.com/filecoin-project/go-state-types/network"
Expand Down Expand Up @@ -531,6 +532,10 @@ type FullNode interface {
StateMarketDeals(context.Context, types.TipSetKey) (map[string]*api.MarketDeal, error) //perm:read
// StateMarketStorageDeal returns information about the indicated deal
StateMarketStorageDeal(context.Context, abi.DealID, types.TipSetKey) (*api.MarketDeal, error) //perm:read
// StateGetAllocationForPendingDeal returns the allocation for a given deal ID of a pending deal.
StateGetAllocationForPendingDeal(ctx context.Context, dealId abi.DealID, tsk types.TipSetKey) (*verifregtypes.Allocation, error)
// StateGetAllocation returns the allocation for a given address and allocation ID.
StateGetAllocation(ctx context.Context, clientAddr address.Address, allocationId verifregtypes.AllocationId, tsk types.TipSetKey) (*verifregtypes.Allocation, error) //perm:read
// StateLookupID retrieves the ID address of the given address
StateLookupID(context.Context, address.Address, types.TipSetKey) (address.Address, error) //perm:read
// StateAccountKey returns the public key address of the given ID address
Expand Down
27 changes: 27 additions & 0 deletions api/v0api/proxy_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 31 additions & 0 deletions api/v0api/v0mocks/mock_full.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified build/actors/v9.tar.zst
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions build/bootstrap/butterflynet.pi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWHc8xB2S1wFeF9ar9bVdXoEEaBPGLqfKxVQH55c4nNmxs
/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWPcNcwS3cKarWrN7MfANWNpzXmZA9Ag6eH9FHFdLQ3LFQ
/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWF4Yn38Y131nRN9Zn5JD8yyAJoXUKFFKATb86cd6pKBh9
/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWG7UQKGwXY4LpKRT8Cshz1vUmU414bvJmAWSeJsw3m7GW
Loading