diff --git a/.circleci/config.yml b/.circleci/config.yml index 0d3b1ba076b..c5bbba7a194 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -723,6 +723,11 @@ workflows: suite: itest-migration_nv19 target: "./itests/migration_nv19_test.go" + - test: + name: test-itest-migration_nv20 + suite: itest-migration_nv20 + target: "./itests/migration_nv20_test.go" + - test: name: test-itest-mpool_msg_uuid suite: itest-mpool_msg_uuid diff --git a/build/openrpc/full.json.gz b/build/openrpc/full.json.gz index f5d6f67476a..9ffb2c679a3 100644 Binary files a/build/openrpc/full.json.gz and b/build/openrpc/full.json.gz differ diff --git a/build/openrpc/gateway.json.gz b/build/openrpc/gateway.json.gz index dac0e82fc69..20ba312c7d6 100644 Binary files a/build/openrpc/gateway.json.gz and b/build/openrpc/gateway.json.gz differ diff --git a/build/openrpc/miner.json.gz b/build/openrpc/miner.json.gz index be2151d62ba..51b4f75ca6b 100644 Binary files a/build/openrpc/miner.json.gz and b/build/openrpc/miner.json.gz differ diff --git a/chain/actors/builtin/evm/v11.go b/chain/actors/builtin/evm/v11.go index 16238b0da4b..fca095ee28d 100644 --- a/chain/actors/builtin/evm/v11.go +++ b/chain/actors/builtin/evm/v11.go @@ -3,6 +3,7 @@ package evm import ( "github.com/ipfs/go-cid" + "github.com/filecoin-project/go-state-types/abi" evm11 "github.com/filecoin-project/go-state-types/builtin/v11/evm" "github.com/filecoin-project/lotus/chain/actors/adt" @@ -43,3 +44,25 @@ func (s *state11) Nonce() (uint64, error) { func (s *state11) GetState() interface{} { return &s.State } + +func (s *state11) GetBytecodeCID() (cid.Cid, error) { + return s.State.Bytecode, nil +} + +func (s *state11) GetBytecodeHash() ([32]byte, error) { + return s.State.BytecodeHash, nil +} + +func (s *state11) GetBytecode() ([]byte, error) { + bc, err := s.GetBytecodeCID() + if err != nil { + return nil, err + } + + var byteCode abi.CborBytesTransparent + if err := s.store.Get(s.store.Context(), bc, &byteCode); err != nil { + return nil, err + } + + return byteCode, nil +} diff --git a/chain/consensus/filcns/compute_state.go b/chain/consensus/filcns/compute_state.go index 86f133d0033..405410f6268 100644 --- a/chain/consensus/filcns/compute_state.go +++ b/chain/consensus/filcns/compute_state.go @@ -15,6 +15,8 @@ import ( "github.com/filecoin-project/go-state-types/abi" actorstypes "github.com/filecoin-project/go-state-types/actors" "github.com/filecoin-project/go-state-types/big" + blockadt "github.com/filecoin-project/specs-actors/actors/util/adt" + "github.com/filecoin-project/lotus/blockstore" "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors" @@ -27,7 +29,6 @@ import ( "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/vm" "github.com/filecoin-project/lotus/metrics" - blockadt "github.com/filecoin-project/specs-actors/actors/util/adt" ) func NewActorRegistry() *vm.ActorRegistry { diff --git a/chain/events/filter/index_migration_test.go b/chain/events/filter/index_migration_test.go new file mode 100644 index 00000000000..1b62a993e21 --- /dev/null +++ b/chain/events/filter/index_migration_test.go @@ -0,0 +1,12 @@ +package filter + +import ( + "testing" + + "github.com/stretchr/testify/require" +) + +func TestMigration(t *testing.T) { + _, err := NewEventIndex("/Users/raul/hyperspace-test/sqlite/eventstest.db") + require.NoError(t, err) +}