From fc8bf8c15dfccfb1c7c249184be8364f162ebe62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Thu, 6 Feb 2020 20:57:13 +0100 Subject: [PATCH] Fix validation with extracted msig --- chain/validation/message.go | 20 +++++++++++--------- go.sum | 2 -- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/chain/validation/message.go b/chain/validation/message.go index 2e497184f..d0f6201ea 100644 --- a/chain/validation/message.go +++ b/chain/validation/message.go @@ -10,7 +10,9 @@ import ( vaddress "github.com/filecoin-project/chain-validation/pkg/state/address" vtypes "github.com/filecoin-project/chain-validation/pkg/state/types" + "github.com/filecoin-project/specs-actors/actors/builtin" "github.com/filecoin-project/go-address" + "github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/types" ) @@ -83,14 +85,14 @@ var methods = []uint64{ vchain.StorageMinerGetPeerID: actors.MAMethods.GetPeerID, vchain.StorageMinerGetSectorSize: actors.MAMethods.GetSectorSize, - vchain.MultiSigConstructor: actors.MultiSigMethods.MultiSigConstructor, - vchain.MultiSigPropose: actors.MultiSigMethods.Propose, - vchain.MultiSigApprove: actors.MultiSigMethods.Approve, - vchain.MultiSigCancel: actors.MultiSigMethods.Cancel, - vchain.MultiSigClearCompleted: actors.MultiSigMethods.ClearCompleted, - vchain.MultiSigAddSigner: actors.MultiSigMethods.AddSigner, - vchain.MultiSigRemoveSigner: actors.MultiSigMethods.RemoveSigner, - vchain.MultiSigSwapSigner: actors.MultiSigMethods.SwapSigner, - vchain.MultiSigChangeRequirement: actors.MultiSigMethods.ChangeRequirement, + vchain.MultiSigConstructor: uint64(builtin.MethodsMultisig.Constructor), + vchain.MultiSigPropose: uint64(builtin.MethodsMultisig.Propose), + vchain.MultiSigApprove: uint64(builtin.MethodsMultisig.Approve), + vchain.MultiSigCancel: uint64(builtin.MethodsMultisig.Cancel), + vchain.MultiSigClearCompleted: uint64(builtin.MethodsMultisig.ClearCompleted), + vchain.MultiSigAddSigner: uint64(builtin.MethodsMultisig.AddSigner), + vchain.MultiSigRemoveSigner: uint64(builtin.MethodsMultisig.RemoveSigner), + vchain.MultiSigSwapSigner: uint64(builtin.MethodsMultisig.SwapSigner), + vchain.MultiSigChangeRequirement: uint64(builtin.MethodsMultisig.ChangeNumApprovalsThreshold), // More to follow... } diff --git a/go.sum b/go.sum index 8c377f2b3..7470c18b1 100644 --- a/go.sum +++ b/go.sum @@ -123,8 +123,6 @@ github.com/filecoin-project/go-sectorbuilder v0.0.2-0.20200203173614-42d67726bb6 github.com/filecoin-project/go-sectorbuilder v0.0.2-0.20200203173614-42d67726bb62/go.mod h1:jNGVCDihkMFnraYVLH1xl4ceZQVxx/u4dOORrTKeRi0= github.com/filecoin-project/go-statestore v0.1.0 h1:t56reH59843TwXHkMcwyuayStBIiWBRilQjQ+5IiwdQ= github.com/filecoin-project/go-statestore v0.1.0/go.mod h1:LFc9hD+fRxPqiHiaqUEZOinUJB4WARkRfNl10O7kTnI= -github.com/filecoin-project/specs-actors v0.0.0-20200204204849-b1474eeb2fb5 h1:rDyP5UTPFxdfS7D5I0XLdaQZZoNGYTic1X9ptKmRSlM= -github.com/filecoin-project/specs-actors v0.0.0-20200204204849-b1474eeb2fb5/go.mod h1:9vrrnLVhF2Zz6R3VBI7lKxQYRvPpsc1FTUyNqCvuYME= github.com/filecoin-project/specs-actors v0.0.0-20200206185502-20fc70907293 h1:k/xtj90OknHTVOJikJ9mnf81UN2BaflS3R83OUg3BJM= github.com/filecoin-project/specs-actors v0.0.0-20200206185502-20fc70907293/go.mod h1:gx4vDpIVf3AfF23iyVn9PNQhKy7wGQDrhxNyCHDzG8I= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=