From eaf5f8b44847151480a07946c7787acb7c44e3a6 Mon Sep 17 00:00:00 2001 From: zenground0 Date: Thu, 7 Apr 2022 15:03:37 -0600 Subject: [PATCH] Update to new label type in v8 actors --- discovery/impl/local_test.go | 2 +- go.mod | 6 ++-- go.sum | 29 +++++++------------ retrievalmarket/impl/provider_test.go | 2 +- retrievalmarket/migrations/migrations_test.go | 2 +- shared_testutil/generators.go | 4 ++- storagemarket/impl/client.go | 2 +- storagemarket/impl/client_test.go | 2 +- .../impl/clientstates/client_states_test.go | 2 +- storagemarket/impl/clientutils/clientutils.go | 5 ++-- storagemarket/impl/provider_test.go | 2 +- .../impl/providerstates/provider_states.go | 4 +-- .../providerstates/provider_states_test.go | 20 ++----------- .../impl/providerutils/providerutils.go | 2 +- .../impl/providerutils/providerutils_test.go | 2 +- .../request_validation_test.go | 2 +- storagemarket/migrations/migrations.go | 2 +- .../migrations/migrations_cbor_gen.go | 2 +- storagemarket/network/types.go | 2 +- storagemarket/network/types_cbor_gen.go | 2 +- storagemarket/nodes.go | 4 +-- storagemarket/testnodes/testnodes.go | 6 ++-- storagemarket/types.go | 2 +- storagemarket/types_cbor_gen.go | 2 +- 24 files changed, 45 insertions(+), 65 deletions(-) diff --git a/discovery/impl/local_test.go b/discovery/impl/local_test.go index db514334..9d603751 100644 --- a/discovery/impl/local_test.go +++ b/discovery/impl/local_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "github.com/filecoin-project/go-address" - specst "github.com/filecoin-project/specs-actors/v7/support/testing" + specst "github.com/filecoin-project/specs-actors/v8/support/testing" discoveryimpl "github.com/filecoin-project/go-fil-markets/discovery/impl" "github.com/filecoin-project/go-fil-markets/discovery/migrations" diff --git a/go.mod b/go.mod index 3262aa48..ca3507f6 100644 --- a/go.mod +++ b/go.mod @@ -16,13 +16,13 @@ require ( github.com/filecoin-project/go-fil-commp-hashhash v0.1.0 github.com/filecoin-project/go-padreader v0.0.1 github.com/filecoin-project/go-state-types v0.1.3 - github.com/filecoin-project/go-statemachine v1.0.1 + github.com/filecoin-project/go-statemachine v1.0.2-0.20220322104818-27f8fbb86dfd github.com/filecoin-project/go-statestore v0.2.0 github.com/filecoin-project/index-provider v0.6.1 github.com/filecoin-project/specs-actors v0.9.13 github.com/filecoin-project/specs-actors/v2 v2.3.6 // indirect - github.com/filecoin-project/specs-actors/v7 v7.0.1-0.20220312191006-c755c0402f62 - github.com/filecoin-project/storetheindex v0.3.5 + github.com/filecoin-project/specs-actors/v7 v7.0.0 + github.com/filecoin-project/specs-actors/v8 v8.0.0-20220407202104-e375a8763a1c github.com/hannahhoward/cbor-gen-for v0.0.0-20200817222906-ea96cece81f1 github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e github.com/hashicorp/go-multierror v1.1.1 diff --git a/go.sum b/go.sum index c66d89ee..8450a540 100644 --- a/go.sum +++ b/go.sum @@ -242,18 +242,12 @@ github.com/filecoin-project/go-hamt-ipld v0.1.5 h1:uoXrKbCQZ49OHpsTCkrThPNelC4W3 github.com/filecoin-project/go-hamt-ipld v0.1.5/go.mod h1:6Is+ONR5Cd5R6XZoCse1CWaXZc0Hdb/JeX+EQCQzX24= github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0 h1:b3UDemBYN2HNfk3KOXNuxgTTxlWi3xVvbQP0IT38fvM= github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0/go.mod h1:7aWZdaQ1b16BVoQUYR+eEvrDCGJoPLxFpDynFjYfBjI= -<<<<<<< HEAD -github.com/filecoin-project/go-indexer-core v0.2.9/go.mod h1:u03I3HB6ZnqCc3cm8Tq+QkTWBbfKOvNxM8K6Ny/IHRw= -github.com/filecoin-project/go-legs v0.3.10 h1:B14z78do63gkxf5Br7rPnxZsZk/m9PR3Mx5aOf2WTIs= -github.com/filecoin-project/go-legs v0.3.10/go.mod h1:5psVRe2nRQDa3PDtcd+2Ud4CirxOr2DI5VsDVMq7sIk= -======= github.com/filecoin-project/go-hamt-ipld/v3 v3.0.1/go.mod h1:gXpNmr3oQx8l3o7qkGyDjJjYSRX7hp/FGOStdqrWyDI= github.com/filecoin-project/go-hamt-ipld/v3 v3.1.0 h1:rVVNq0x6RGQIzCo1iiJlGFm9AGIZzeifggxtKMU7zmI= github.com/filecoin-project/go-hamt-ipld/v3 v3.1.0/go.mod h1:bxmzgT8tmeVQA1/gvBwFmYdT8SOFUwB3ovSUfG1Ux0g= -github.com/filecoin-project/go-indexer-core v0.2.8/go.mod h1:IagNfTdFuX4057kla43PjRCn3yBuUiZgIxuA0hTUamY= -github.com/filecoin-project/go-legs v0.3.7 h1:yfm7fx+iy1nPtgPEQ6kQjvhoJOVbXide50STYdy+yos= -github.com/filecoin-project/go-legs v0.3.7/go.mod h1:pgekGm8/gKY5zCtQ/qGAoSjGP92wTLFqpO3GPHeu8YU= ->>>>>>> 6ec6b72 (Integrate proposed change to make deal Label a Union) +github.com/filecoin-project/go-indexer-core v0.2.9/go.mod h1:u03I3HB6ZnqCc3cm8Tq+QkTWBbfKOvNxM8K6Ny/IHRw= +github.com/filecoin-project/go-legs v0.3.10 h1:B14z78do63gkxf5Br7rPnxZsZk/m9PR3Mx5aOf2WTIs= +github.com/filecoin-project/go-legs v0.3.10/go.mod h1:5psVRe2nRQDa3PDtcd+2Ud4CirxOr2DI5VsDVMq7sIk= github.com/filecoin-project/go-padreader v0.0.0-20200903213702-ed5fae088b20/go.mod h1:mPn+LRRd5gEKNAtc+r3ScpW2JRU/pj4NBKdADYWHiak= github.com/filecoin-project/go-padreader v0.0.1 h1:8h2tVy5HpoNbr2gBRr+WD6zV6VD6XHig+ynSGJg8ZOs= github.com/filecoin-project/go-padreader v0.0.1/go.mod h1:VYVPJqwpsfmtoHnAmPx6MUwmrK6HIcDqZJiuZhtmfLQ= @@ -279,21 +273,20 @@ github.com/filecoin-project/specs-actors v0.9.13/go.mod h1:TS1AW/7LbG+615j4NsjMK github.com/filecoin-project/specs-actors/v2 v2.3.5-0.20210114162132-5b58b773f4fb/go.mod h1:LljnY2Mn2homxZsmokJZCpRuhOPxfXhvcek5gWkmqAc= github.com/filecoin-project/specs-actors/v2 v2.3.6 h1:UxnWTfQd7JsOae39/aHCK0m1IBjdcyymCJfqxuSkn+g= github.com/filecoin-project/specs-actors/v2 v2.3.6/go.mod h1:DJMpxVRXvev9t8P0XWA26RmTzN+MHiL9IlItVLT0zUc= -<<<<<<< HEAD -github.com/filecoin-project/storetheindex v0.4.0 h1:MPIDJYBknPbwBcVf+2/WEIK6LKxhZmfQGCrqKmvhFyU= -github.com/filecoin-project/storetheindex v0.4.0/go.mod h1:LIwqpXoKeGxOGEjmxPfdYVPQYoZOSI3oXMUd9XTCpjc= -======= github.com/filecoin-project/specs-actors/v3 v3.1.0 h1:s4qiPw8pgypqBGAy853u/zdZJ7K9cTZdM1rTiSonHrg= github.com/filecoin-project/specs-actors/v3 v3.1.0/go.mod h1:mpynccOLlIRy0QnR008BwYBwT9fen+sPR13MA1VmMww= github.com/filecoin-project/specs-actors/v4 v4.0.0/go.mod h1:TkHXf/l7Wyw4ZejyXIPS2rK8bBO0rdwhTZyQQgaglng= github.com/filecoin-project/specs-actors/v5 v5.0.4 h1:OY7BdxJWlUfUFXWV/kpNBYGXNPasDIedf42T3sGx08s= github.com/filecoin-project/specs-actors/v5 v5.0.4/go.mod h1:5BAKRAMsOOlD8+qCw4UvT/lTLInCJ3JwOWZbX8Ipwq4= github.com/filecoin-project/specs-actors/v6 v6.0.0/go.mod h1:V1AYfi5GkHXipx1mnVivoICZh3wtwPxDVuds+fbfQtk= -github.com/filecoin-project/specs-actors/v7 v7.0.1-0.20220312191006-c755c0402f62 h1:3JJG6X+EepoVqrxDtYkYUjEz3CHFr4Y6Qd3SBlOYaC0= -github.com/filecoin-project/specs-actors/v7 v7.0.1-0.20220312191006-c755c0402f62/go.mod h1:TA5FwCna+Yi36POaT7SLKXsgEDvJwc0V/L6ZsO19B9M= -github.com/filecoin-project/storetheindex v0.3.5 h1:KoS9TvjPm6zIZfUH8atAHJbVHOO7GTP1MdTG+v0eE+Q= -github.com/filecoin-project/storetheindex v0.3.5/go.mod h1:0r3d0kSpK63O6AvLr1CjAINLi+nWD49clzcnKV+GLpI= ->>>>>>> 6ec6b72 (Integrate proposed change to make deal Label a Union) +github.com/filecoin-project/specs-actors/v6 v6.0.1 h1:laxvHNsvrq83Y9n+W7znVCePi3oLyRf0Rkl4jFO8Wew= +github.com/filecoin-project/specs-actors/v6 v6.0.1/go.mod h1:V1AYfi5GkHXipx1mnVivoICZh3wtwPxDVuds+fbfQtk= +github.com/filecoin-project/specs-actors/v7 v7.0.0 h1:FQN7tjt3o68hfb3qLFSJBoLMuOFY0REkFVLO/zXj8RU= +github.com/filecoin-project/specs-actors/v7 v7.0.0/go.mod h1:TA5FwCna+Yi36POaT7SLKXsgEDvJwc0V/L6ZsO19B9M= +github.com/filecoin-project/specs-actors/v8 v8.0.0-20220407202104-e375a8763a1c h1:WdAk1RfDBOhypv+tFzdonzk3jjQIfk2FJBZdRyFrLN4= +github.com/filecoin-project/specs-actors/v8 v8.0.0-20220407202104-e375a8763a1c/go.mod h1:UYIPg65iPWoFw5NEftREdJwv9b/5yaLKdCgTvNI/2FA= +github.com/filecoin-project/storetheindex v0.4.0 h1:MPIDJYBknPbwBcVf+2/WEIK6LKxhZmfQGCrqKmvhFyU= +github.com/filecoin-project/storetheindex v0.4.0/go.mod h1:LIwqpXoKeGxOGEjmxPfdYVPQYoZOSI3oXMUd9XTCpjc= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:1i71OnUq3iUe1ma7Lr6yG6/rjvM3emb6yoL7xLFzcVQ= github.com/flynn/noise v1.0.0 h1:DlTHqmzmvcEiKj+4RYo/imoswx/4r6iBlCMfVtrMXpQ= diff --git a/retrievalmarket/impl/provider_test.go b/retrievalmarket/impl/provider_test.go index c1460e40..87882c5f 100644 --- a/retrievalmarket/impl/provider_test.go +++ b/retrievalmarket/impl/provider_test.go @@ -23,7 +23,7 @@ import ( datatransfer "github.com/filecoin-project/go-data-transfer" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - spect "github.com/filecoin-project/specs-actors/v7/support/testing" + spect "github.com/filecoin-project/specs-actors/v8/support/testing" "github.com/filecoin-project/go-fil-markets/piecestore" piecemigrations "github.com/filecoin-project/go-fil-markets/piecestore/migrations" diff --git a/retrievalmarket/migrations/migrations_test.go b/retrievalmarket/migrations/migrations_test.go index c404c290..47023517 100644 --- a/retrievalmarket/migrations/migrations_test.go +++ b/retrievalmarket/migrations/migrations_test.go @@ -15,7 +15,7 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-statemachine/fsm" - tutils "github.com/filecoin-project/specs-actors/v7/support/testing" + tutils "github.com/filecoin-project/specs-actors/v8/support/testing" "github.com/filecoin-project/go-fil-markets/piecestore/migrations" "github.com/filecoin-project/go-fil-markets/retrievalmarket" diff --git a/shared_testutil/generators.go b/shared_testutil/generators.go index cba4d257..993fd7ca 100644 --- a/shared_testutil/generators.go +++ b/shared_testutil/generators.go @@ -17,7 +17,7 @@ import ( "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/specs-actors/actors/builtin/paych" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/storagemarket" @@ -104,6 +104,7 @@ func MakeTestChannelID() datatransfer.ChannelID { func MakeTestUnsignedDealProposal() market.DealProposal { start := uint64(rand.Int31()) end := start + uint64(rand.Int31()) + l, _ := market.NewLabelFromString("") return market.DealProposal{ PieceCID: GenerateCids(1)[0], @@ -111,6 +112,7 @@ func MakeTestUnsignedDealProposal() market.DealProposal { Client: address.TestAddress, Provider: address.TestAddress2, + Label: l, StartEpoch: abi.ChainEpoch(start), EndEpoch: abi.ChainEpoch(end), diff --git a/storagemarket/impl/client.go b/storagemarket/impl/client.go index 7f383668..0c46c4c2 100644 --- a/storagemarket/impl/client.go +++ b/storagemarket/impl/client.go @@ -21,7 +21,7 @@ import ( "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-statemachine/fsm" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" discoveryimpl "github.com/filecoin-project/go-fil-markets/discovery/impl" "github.com/filecoin-project/go-fil-markets/retrievalmarket" diff --git a/storagemarket/impl/client_test.go b/storagemarket/impl/client_test.go index 95a4b203..1adc8e33 100644 --- a/storagemarket/impl/client_test.go +++ b/storagemarket/impl/client_test.go @@ -19,7 +19,7 @@ import ( cborutil "github.com/filecoin-project/go-cbor-util" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/shared_testutil" "github.com/filecoin-project/go-fil-markets/storagemarket" diff --git a/storagemarket/impl/clientstates/client_states_test.go b/storagemarket/impl/clientstates/client_states_test.go index a4f70692..dabae707 100644 --- a/storagemarket/impl/clientstates/client_states_test.go +++ b/storagemarket/impl/clientstates/client_states_test.go @@ -19,7 +19,7 @@ import ( "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-statemachine/fsm" fsmtest "github.com/filecoin-project/go-statemachine/fsm/testutil" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" tut "github.com/filecoin-project/go-fil-markets/shared_testutil" "github.com/filecoin-project/go-fil-markets/storagemarket" diff --git a/storagemarket/impl/clientutils/clientutils.go b/storagemarket/impl/clientutils/clientutils.go index 1949c8ce..c9c1192f 100644 --- a/storagemarket/impl/clientutils/clientutils.go +++ b/storagemarket/impl/clientutils/clientutils.go @@ -3,7 +3,6 @@ package clientutils import ( "context" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" "github.com/ipfs/go-cid" bstore "github.com/ipfs/go-ipfs-blockstore" @@ -17,6 +16,7 @@ import ( "github.com/filecoin-project/go-commp-utils/writer" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/shared" "github.com/filecoin-project/go-fil-markets/storagemarket" @@ -104,10 +104,9 @@ func LabelField(payloadCID cid.Cid) (market.DealLabel, error) { } else { cidStr, err = payloadCID.StringOfBase(multibase.Base64) } - if err != nil { return market.EmptyDealLabel, err } - return market.NewDealLabelFromString(cidStr) + return market.NewLabelFromString(cidStr) } diff --git a/storagemarket/impl/provider_test.go b/storagemarket/impl/provider_test.go index 0aa85971..58f440a7 100644 --- a/storagemarket/impl/provider_test.go +++ b/storagemarket/impl/provider_test.go @@ -17,7 +17,7 @@ import ( cborutil "github.com/filecoin-project/go-cbor-util" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/filestore" "github.com/filecoin-project/go-fil-markets/shared_testutil" diff --git a/storagemarket/impl/providerstates/provider_states.go b/storagemarket/impl/providerstates/provider_states.go index 856b44d0..01727103 100644 --- a/storagemarket/impl/providerstates/provider_states.go +++ b/storagemarket/impl/providerstates/provider_states.go @@ -17,8 +17,8 @@ import ( "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-statemachine/fsm" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/miner" "github.com/filecoin-project/go-fil-markets/filestore" "github.com/filecoin-project/go-fil-markets/piecestore" diff --git a/storagemarket/impl/providerstates/provider_states_test.go b/storagemarket/impl/providerstates/provider_states_test.go index 0573dded..9d21d166 100644 --- a/storagemarket/impl/providerstates/provider_states_test.go +++ b/storagemarket/impl/providerstates/provider_states_test.go @@ -27,9 +27,9 @@ import ( "github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-statemachine/fsm" fsmtest "github.com/filecoin-project/go-statemachine/fsm/testutil" - "github.com/filecoin-project/specs-actors/v7/actors/builtin" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" + "github.com/filecoin-project/specs-actors/v8/actors/builtin" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/verifreg" "github.com/filecoin-project/go-fil-markets/filestore" "github.com/filecoin-project/go-fil-markets/piecestore" @@ -52,11 +52,6 @@ func TestValidateDealProposal(t *testing.T) { bigDataCap := big.NewIntUnsigned(uint64(defaultPieceSize)) smallDataCap := big.NewIntUnsigned(uint64(defaultPieceSize - 1)) - //invalidLabelBytes := make([]byte, 257) - //rand.Read(invalidLabelBytes) - //invalidLabel, err := market.NewDealLabelFromBytes(invalidLabelBytes) - //assert.NoError(t, err) - tests := map[string]struct { nodeParams nodeParams dealParams dealParams @@ -195,15 +190,6 @@ func TestValidateDealProposal(t *testing.T) { require.Equal(t, "deal rejected: verified deal DataCap too small for proposed piece size", deal.Message) }, }, - //"label is too long": { - // dealParams: dealParams{ - // Label: invalidLabel, - // }, - // dealInspector: func(t *testing.T, deal storagemarket.MinerDeal, env *fakeEnvironment) { - // tut.AssertDealState(t, storagemarket.StorageDealRejecting, deal.State) - // require.Equal(t, "deal rejected: deal label can be at most 256 bytes, is 344", deal.Message) - // }, - //}, "invalid piece size": { dealParams: dealParams{ PieceSize: 129, diff --git a/storagemarket/impl/providerutils/providerutils.go b/storagemarket/impl/providerutils/providerutils.go index 012d2dd9..1c56dbe4 100644 --- a/storagemarket/impl/providerutils/providerutils.go +++ b/storagemarket/impl/providerutils/providerutils.go @@ -10,7 +10,7 @@ import ( "github.com/filecoin-project/go-address" cborutil "github.com/filecoin-project/go-cbor-util" "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/filestore" "github.com/filecoin-project/go-fil-markets/piecestore" diff --git a/storagemarket/impl/providerutils/providerutils_test.go b/storagemarket/impl/providerutils/providerutils_test.go index fc596a91..e012d7e4 100644 --- a/storagemarket/impl/providerutils/providerutils_test.go +++ b/storagemarket/impl/providerutils/providerutils_test.go @@ -12,7 +12,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/filestore" "github.com/filecoin-project/go-fil-markets/shared" diff --git a/storagemarket/impl/requestvalidation/request_validation_test.go b/storagemarket/impl/requestvalidation/request_validation_test.go index cea603a3..aab3b706 100644 --- a/storagemarket/impl/requestvalidation/request_validation_test.go +++ b/storagemarket/impl/requestvalidation/request_validation_test.go @@ -17,7 +17,7 @@ import ( datatransfer "github.com/filecoin-project/go-data-transfer" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-statestore" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/storagemarket" rv "github.com/filecoin-project/go-fil-markets/storagemarket/impl/requestvalidation" diff --git a/storagemarket/migrations/migrations.go b/storagemarket/migrations/migrations.go index 18e4c90c..528fbd31 100644 --- a/storagemarket/migrations/migrations.go +++ b/storagemarket/migrations/migrations.go @@ -12,7 +12,7 @@ import ( "github.com/filecoin-project/go-ds-versioning/pkg/versioned" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/filestore" "github.com/filecoin-project/go-fil-markets/storagemarket" diff --git a/storagemarket/migrations/migrations_cbor_gen.go b/storagemarket/migrations/migrations_cbor_gen.go index 5e641c70..04dcecb4 100644 --- a/storagemarket/migrations/migrations_cbor_gen.go +++ b/storagemarket/migrations/migrations_cbor_gen.go @@ -11,7 +11,7 @@ import ( filestore "github.com/filecoin-project/go-fil-markets/filestore" abi "github.com/filecoin-project/go-state-types/abi" crypto "github.com/filecoin-project/go-state-types/crypto" - market "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + market "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" cid "github.com/ipfs/go-cid" peer "github.com/libp2p/go-libp2p-core/peer" cbg "github.com/whyrusleeping/cbor-gen" diff --git a/storagemarket/network/types.go b/storagemarket/network/types.go index 4fd57334..002a298d 100644 --- a/storagemarket/network/types.go +++ b/storagemarket/network/types.go @@ -5,7 +5,7 @@ import ( "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/storagemarket" ) diff --git a/storagemarket/network/types_cbor_gen.go b/storagemarket/network/types_cbor_gen.go index 769fd1cf..acda775c 100644 --- a/storagemarket/network/types_cbor_gen.go +++ b/storagemarket/network/types_cbor_gen.go @@ -10,7 +10,7 @@ import ( storagemarket "github.com/filecoin-project/go-fil-markets/storagemarket" crypto "github.com/filecoin-project/go-state-types/crypto" - market "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + market "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" cid "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" xerrors "golang.org/x/xerrors" diff --git a/storagemarket/nodes.go b/storagemarket/nodes.go index a18abe0f..c6c48609 100644 --- a/storagemarket/nodes.go +++ b/storagemarket/nodes.go @@ -9,8 +9,8 @@ import ( "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/exitcode" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/verifreg" "github.com/filecoin-project/go-fil-markets/shared" ) diff --git a/storagemarket/testnodes/testnodes.go b/storagemarket/testnodes/testnodes.go index df1b0b3d..4beded99 100644 --- a/storagemarket/testnodes/testnodes.go +++ b/storagemarket/testnodes/testnodes.go @@ -18,9 +18,9 @@ import ( "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/exitcode" - "github.com/filecoin-project/specs-actors/v7/actors/builtin" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg" + "github.com/filecoin-project/specs-actors/v8/actors/builtin" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/verifreg" "github.com/filecoin-project/go-fil-markets/commp" "github.com/filecoin-project/go-fil-markets/shared" diff --git a/storagemarket/types.go b/storagemarket/types.go index c2d40596..4dd3b068 100644 --- a/storagemarket/types.go +++ b/storagemarket/types.go @@ -14,7 +14,7 @@ import ( datatransfer "github.com/filecoin-project/go-data-transfer" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/crypto" - "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" "github.com/filecoin-project/go-fil-markets/filestore" ) diff --git a/storagemarket/types_cbor_gen.go b/storagemarket/types_cbor_gen.go index b357b3c4..901acfc3 100644 --- a/storagemarket/types_cbor_gen.go +++ b/storagemarket/types_cbor_gen.go @@ -12,7 +12,7 @@ import ( filestore "github.com/filecoin-project/go-fil-markets/filestore" abi "github.com/filecoin-project/go-state-types/abi" crypto "github.com/filecoin-project/go-state-types/crypto" - market "github.com/filecoin-project/specs-actors/v7/actors/builtin/market" + market "github.com/filecoin-project/specs-actors/v8/actors/builtin/market" cid "github.com/ipfs/go-cid" peer "github.com/libp2p/go-libp2p-core/peer" cbg "github.com/whyrusleeping/cbor-gen"