diff --git a/chain/messagepool/messagepool.go b/chain/messagepool/messagepool.go index e30d8c5e3..e3354d3e6 100644 --- a/chain/messagepool/messagepool.go +++ b/chain/messagepool/messagepool.go @@ -798,7 +798,7 @@ func (mp *MessagePool) VerifyMsgSig(m *types.SignedMessage) error { if err != nil { return xerrors.Errorf("failedl to get network version: %w", err) } - + if err := chain.AuthenticateMessage(m, m.Message.From, nv); err != nil { return xerrors.Errorf("failed to validate signature: %w", err) } diff --git a/chain/signatures.go b/chain/signatures.go index 0074bc42f..1701482f2 100644 --- a/chain/signatures.go +++ b/chain/signatures.go @@ -1,10 +1,10 @@ package chain import ( - "github.com/filecoin-project/go-state-types/builtin" "golang.org/x/xerrors" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/builtin" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/network" diff --git a/chain/vm/fvm.go b/chain/vm/fvm.go index 1b5a0cd7b..0fa77b680 100644 --- a/chain/vm/fvm.go +++ b/chain/vm/fvm.go @@ -12,7 +12,6 @@ import ( "sync/atomic" "time" - "github.com/filecoin-project/lotus/chain/types/legacy" "github.com/ipfs/go-cid" cbor "github.com/ipfs/go-ipld-cbor" cbg "github.com/whyrusleeping/cbor-gen" @@ -36,6 +35,7 @@ import ( "github.com/filecoin-project/lotus/chain/actors/policy" "github.com/filecoin-project/lotus/chain/state" "github.com/filecoin-project/lotus/chain/types" + "github.com/filecoin-project/lotus/chain/types/legacy" "github.com/filecoin-project/lotus/lib/sigs" "github.com/filecoin-project/lotus/node/bundle" ) diff --git a/go.mod b/go.mod index e901fb34e..1ed20747d 100644 --- a/go.mod +++ b/go.mod @@ -133,6 +133,7 @@ require ( github.com/multiformats/go-multiaddr v0.7.0 github.com/multiformats/go-multiaddr-dns v0.3.1 github.com/multiformats/go-multibase v0.1.1 + github.com/multiformats/go-multicodec v0.6.0 github.com/multiformats/go-multihash v0.2.1 github.com/multiformats/go-varint v0.0.6 github.com/open-rpc/meta-schema v0.0.0-20201029221707-1b72ef2ea333 @@ -294,7 +295,6 @@ require ( github.com/mr-tron/base58 v1.2.0 // indirect github.com/multiformats/go-base36 v0.1.0 // indirect github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect - github.com/multiformats/go-multicodec v0.6.0 // indirect github.com/multiformats/go-multistream v0.3.3 // indirect github.com/nikkolasg/hexjson v0.0.0-20181101101858-78e39397e00c // indirect github.com/nkovacs/streamquote v1.0.0 // indirect diff --git a/node/impl/full/eth.go b/node/impl/full/eth.go index 6122143f8..98194557b 100644 --- a/node/impl/full/eth.go +++ b/node/impl/full/eth.go @@ -10,7 +10,6 @@ import ( "sync" "time" - "github.com/filecoin-project/go-state-types/network" "github.com/google/uuid" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" @@ -26,6 +25,7 @@ import ( "github.com/filecoin-project/go-state-types/builtin/v10/evm" "github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/exitcode" + "github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/build"