update chain-val with latest tests (#1325)
* update chain-val with latest tests
This commit is contained in:
Frrist
GitHub
parent
1a0bcfe018
commit
e4728eb719
@ -235,248 +235,3 @@ func (s *StateWrapper) SetupSingletonActor(addr address.Address) (vstate.Actor,
|
||||
return nil, xerrors.Errorf("%v is not a singleton actor address", addr)
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
func NewState() *StateWrapper {
|
||||
bs := blockstore.NewBlockstore(datastore.NewMapDatastore())
|
||||
cst := cbor.NewCborStore(bs)
|
||||
// Put EmptyObjectCid value in the store. When an actor is initially created its Head is set to this value.
|
||||
_, err := cst.Put(context.TODO(), map[string]string{})
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
treeImpl, err := state.NewStateTree(cst)
|
||||
if err != nil {
|
||||
panic(err) // Never returns error, the error return should be removed.
|
||||
}
|
||||
root, err := treeImpl.Flush(context.TODO())
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
storageImpl := &directStorage{cst}
|
||||
return &StateWrapper{bs, cst, newKeyStore(), root, storageImpl}
|
||||
}
|
||||
|
||||
func (s *StateWrapper) Cid() cid.Cid {
|
||||
return s.stateRoot
|
||||
}
|
||||
|
||||
func (s *StateWrapper) Actor(addr address.Address) (vstate.Actor, error) {
|
||||
vaddr, err := address.NewFromBytes(addr.Bytes())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
tree, err := state.LoadStateTree(s.cst, s.stateRoot)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
fcActor, err := tree.GetActor(vaddr)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &actorWrapper{*fcActor}, nil
|
||||
}
|
||||
|
||||
func (s *StateWrapper) Storage(addr address.Address) (vstate.Storage, error) {
|
||||
return s.storage, nil
|
||||
}
|
||||
|
||||
func (s *StateWrapper) NewAccountAddress() (address.Address, error) {
|
||||
return s.keys.NewAddress()
|
||||
}
|
||||
|
||||
func (s *StateWrapper) SetActor(addr address.Address, code vactors.ActorCodeID, balance vtypes.BigInt) (vstate.Actor, vstate.Storage, error) {
|
||||
addrInt, err := address.NewFromBytes(addr.Bytes())
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
tree, err := state.LoadStateTree(s.cst, s.stateRoot)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
actr := &actorWrapper{types.Actor{
|
||||
Code: fromActorCode(code),
|
||||
Balance: types.BigInt{balance.Int},
|
||||
Head: vm.EmptyObjectCid,
|
||||
}}
|
||||
// The ID-based address is dropped here, but should be reported back to the caller.
|
||||
_, err = tree.RegisterNewAddress(addrInt, &actr.Actor)
|
||||
if err != nil {
|
||||
return nil, nil, xerrors.Errorf("register new address for actor: %w", err)
|
||||
}
|
||||
return actr, s.storage, s.flush(tree)
|
||||
}
|
||||
|
||||
func (s *StateWrapper) SetSingletonActor(addr vactors.SingletonActorID, balance vtypes.BigInt) (vstate.Actor, vstate.Storage, error) {
|
||||
vaddr := fromSingletonAddress(addr)
|
||||
|
||||
tree, err := state.LoadStateTree(s.cst, s.stateRoot)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
lotusAddr, err := address.NewFromBytes(vaddr.Bytes())
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
switch lotusAddr {
|
||||
case actors.InitAddress:
|
||||
initact, err := genesis.SetupInitActor(s.bs, "testing", nil)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
if err := tree.SetActor(actors.InitAddress, initact); err != nil {
|
||||
return nil, nil, xerrors.Errorf("set init actor: %w", err)
|
||||
}
|
||||
|
||||
return &actorWrapper{*initact}, s.storage, s.flush(tree)
|
||||
case actors.StorageMarketAddress:
|
||||
nsroot, err := genesis.SetupStorageMarketActor(s.bs)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
s.stateRoot = nsroot
|
||||
|
||||
tree, err = state.LoadStateTree(s.cst, s.stateRoot)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
smact, err := tree.GetActor(actors.StorageMarketAddress)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
return &actorWrapper{*smact}, s.storage, s.flush(tree)
|
||||
case actors.StoragePowerAddress:
|
||||
spact, err := genesis.SetupStoragePowerActor(s.bs)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
if err := tree.SetActor(actors.StoragePowerAddress, spact); err != nil {
|
||||
return nil, nil, xerrors.Errorf("set network storage market actor: %w", err)
|
||||
}
|
||||
return &actorWrapper{*spact}, s.storage, s.flush(tree)
|
||||
case actors.NetworkAddress:
|
||||
ntwkact := &types.Actor{
|
||||
Code: actors.AccountCodeCid,
|
||||
Balance: types.BigInt{balance.Int},
|
||||
Head: vm.EmptyObjectCid,
|
||||
}
|
||||
if err := tree.SetActor(actors.NetworkAddress, ntwkact); err != nil {
|
||||
return nil, nil, xerrors.Errorf("set network actor: %w", err)
|
||||
}
|
||||
return &actorWrapper{*ntwkact}, s.storage, s.flush(tree)
|
||||
case actors.BurntFundsAddress:
|
||||
ntwkact := &types.Actor{
|
||||
Code: actors.AccountCodeCid,
|
||||
Balance: types.BigInt{balance.Int},
|
||||
Head: vm.EmptyObjectCid,
|
||||
}
|
||||
if err := tree.SetActor(actors.BurntFundsAddress, ntwkact); err != nil {
|
||||
return nil, nil, xerrors.Errorf("set network actor: %w", err)
|
||||
}
|
||||
return &actorWrapper{*ntwkact}, s.storage, s.flush(tree)
|
||||
default:
|
||||
return nil, nil, xerrors.Errorf("%v is not a singleton actor address", addr)
|
||||
}
|
||||
}
|
||||
|
||||
func (s *StateWrapper) Sign(ctx context.Context, addr address.Address, data []byte) (*vtypes.Signature, error) {
|
||||
sig, err := s.keys.Sign(ctx, addr, data)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &vtypes.Signature{
|
||||
Type: sig.Type,
|
||||
Data: sig.Data,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (s *StateWrapper) Signer() *keyStore {
|
||||
return s.keys
|
||||
}
|
||||
|
||||
// Flushes a state tree to storage and sets this state's root to that tree's root CID.
|
||||
func (s *StateWrapper) flush(tree *state.StateTree) (err error) {
|
||||
s.stateRoot, err = tree.Flush(context.TODO())
|
||||
return
|
||||
}
|
||||
|
||||
//
|
||||
// Key store
|
||||
//
|
||||
type keyStore struct {
|
||||
// Private keys by address
|
||||
keys map[address.Address]vtypes.KeyInfo
|
||||
// Seed for deterministic key generation.
|
||||
seed int64
|
||||
}
|
||||
|
||||
func newKeyStore() *keyStore {
|
||||
return &keyStore{
|
||||
keys: make(map[address.Address]vtypes.KeyInfo),
|
||||
seed: 0,
|
||||
}
|
||||
}
|
||||
|
||||
func (s *keyStore) NewAddress() (address.Address, error) {
|
||||
randSrc := rand.New(rand.NewSource(s.seed))
|
||||
prv, err := crypto.GenerateKeyFromSeed(randSrc)
|
||||
if err != nil {
|
||||
return address.Undef, err
|
||||
}
|
||||
|
||||
vki := vtypes.KeyInfo{
|
||||
PrivateKey: prv,
|
||||
Type: types.KTSecp256k1,
|
||||
}
|
||||
key, err := wallet.NewKey(types.KeyInfo{
|
||||
Type: vki.Type,
|
||||
PrivateKey: vki.PrivateKey,
|
||||
})
|
||||
if err != nil {
|
||||
return address.Undef, err
|
||||
}
|
||||
vaddr, err := address.NewFromBytes(key.Address.Bytes())
|
||||
if err != nil {
|
||||
return address.Undef, err
|
||||
}
|
||||
s.keys[vaddr] = vki
|
||||
s.seed++
|
||||
return address.NewFromBytes(key.Address.Bytes())
|
||||
}
|
||||
|
||||
func (s *keyStore) Sign(ctx context.Context, addr address.Address, data []byte) (*types.Signature, error) {
|
||||
ki, ok := s.keys[addr]
|
||||
if !ok {
|
||||
return &types.Signature{}, fmt.Errorf("unknown address %v", addr)
|
||||
}
|
||||
b2sum := blake2b.Sum256(data)
|
||||
digest, err := crypto.Sign(ki.PrivateKey, b2sum[:])
|
||||
if err != nil {
|
||||
return &types.Signature{}, err
|
||||
}
|
||||
return &types.Signature{
|
||||
Type: types.KTSecp256k1,
|
||||
Data: digest,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// Storage
|
||||
//
|
||||
|
||||
type directStorage struct {
|
||||
cst cbor.IpldStore
|
||||
}
|
||||
|
||||
func (d *directStorage) Get(c cid.Cid, out interface{}) error {
|
||||
if err := d.cst.Get(context.TODO(), c, out.(cbg.CBORUnmarshaler)); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
@ -8,6 +8,7 @@ import (
|
||||
|
||||
suites "github.com/filecoin-project/chain-validation/suites"
|
||||
"github.com/filecoin-project/chain-validation/suites/message"
|
||||
"github.com/filecoin-project/chain-validation/suites/tipset"
|
||||
|
||||
factory "github.com/filecoin-project/lotus/chain/validation"
|
||||
)
|
||||
@ -39,8 +40,10 @@ func init() {
|
||||
message.TestPaych,
|
||||
// Fails due to state initialization
|
||||
message.TestMultiSigActor,
|
||||
// Fails due to state initialization
|
||||
//message.TestMessageApplicationEdgecases,
|
||||
|
||||
// Fails due to incorrect implicit actor creation
|
||||
// https://filecoinproject.slack.com/archives/CHMNDCK9P/p1583358693160000
|
||||
tipset.TestInternalMessageApplicationFailure,
|
||||
}}
|
||||
}
|
||||
|
||||
|
||||
2
go.mod
2
go.mod
@ -10,7 +10,7 @@ require (
|
||||
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
|
||||
github.com/coreos/go-systemd/v22 v22.0.0
|
||||
github.com/docker/go-units v0.4.0
|
||||
github.com/filecoin-project/chain-validation v0.0.6-0.20200304211828-4b541348b199
|
||||
github.com/filecoin-project/chain-validation v0.0.6-0.20200305211456-9486e8896d92
|
||||
github.com/filecoin-project/filecoin-ffi v0.0.0-20200226205820-4da0bccccefb
|
||||
github.com/filecoin-project/go-address v0.0.2-0.20200218010043-eb9bb40ed5be
|
||||
github.com/filecoin-project/go-amt-ipld/v2 v2.0.1-0.20200131012142-05d80eeccc5e
|
||||
|
||||
7
go.sum
7
go.sum
@ -97,8 +97,9 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP
|
||||
github.com/fatih/color v1.8.0 h1:5bzFgL+oy7JITMTxUPJ00n7VxmYd/PdMp5mHFX40/RY=
|
||||
github.com/fatih/color v1.8.0/go.mod h1:3l45GVGkyrnYNl9HoIjnp2NnNWvh6hLAqD8yTfGjnw8=
|
||||
github.com/fd/go-nat v1.0.0/go.mod h1:BTBu/CKvMmOMUPkKVef1pngt2WFH/lg7E6yQnulfp6E=
|
||||
github.com/filecoin-project/chain-validation v0.0.6-0.20200304211828-4b541348b199 h1:HIdN3/s/fda3kQYMawG8ysYC207LJ5GnH0XziyTgQJk=
|
||||
github.com/filecoin-project/chain-validation v0.0.6-0.20200304211828-4b541348b199/go.mod h1:JU9alo66MwdCHkpk1kDXB8vT8A/oMkTkdZ4mQjA4I5E=
|
||||
github.com/filecoin-project/chain-validation v0.0.6-0.20200305211456-9486e8896d92 h1:a4Vr6yy7V8n6/Vmw6g0fu9Vlf56lUy/bl4roO2Ik16E=
|
||||
github.com/filecoin-project/chain-validation v0.0.6-0.20200305211456-9486e8896d92/go.mod h1:g9PtEzAwUNn45uM2xOWS4fUKTOFRQAFKZz2zYdKQivk=
|
||||
github.com/filecoin-project/go-address v0.0.0-20200107215422-da8eea2842b5 h1:/MmWluswvDIbuPvBct4q6HeQgVm62O2DzWYTB38kt4A=
|
||||
github.com/filecoin-project/go-address v0.0.0-20200107215422-da8eea2842b5/go.mod h1:SAOwJoakQ8EPjwNIsiakIQKsoKdkcbx8U3IapgCg9R0=
|
||||
github.com/filecoin-project/go-address v0.0.2-0.20200218010043-eb9bb40ed5be h1:TooKBwR/g8jG0hZ3lqe9S5sy2vTUcLOZLlz3M5wGn2E=
|
||||
github.com/filecoin-project/go-address v0.0.2-0.20200218010043-eb9bb40ed5be/go.mod h1:SAOwJoakQ8EPjwNIsiakIQKsoKdkcbx8U3IapgCg9R0=
|
||||
@ -127,8 +128,6 @@ github.com/filecoin-project/go-statestore v0.1.0 h1:t56reH59843TwXHkMcwyuayStBIi
|
||||
github.com/filecoin-project/go-statestore v0.1.0/go.mod h1:LFc9hD+fRxPqiHiaqUEZOinUJB4WARkRfNl10O7kTnI=
|
||||
github.com/filecoin-project/specs-actors v0.0.0-20200210130641-2d1fbd8672cf/go.mod h1:xtDZUB6pe4Pksa/bAJbJ693OilaC5Wbot9jMhLm3cZA=
|
||||
github.com/filecoin-project/specs-actors v0.0.0-20200226200336-94c9b92b2775/go.mod h1:0HAWYrvajFHDgRaKbF0rl+IybVLZL5z4gQ8koCMPhoU=
|
||||
github.com/filecoin-project/specs-actors v0.0.0-20200304210626-21ee86aadcb9 h1:5/XkV9N7Zlidi2RYY/04BToD/XeQrudUseI7Gx6owl8=
|
||||
github.com/filecoin-project/specs-actors v0.0.0-20200304210626-21ee86aadcb9/go.mod h1:0HAWYrvajFHDgRaKbF0rl+IybVLZL5z4gQ8koCMPhoU=
|
||||
github.com/filecoin-project/specs-actors v0.0.0-20200305205312-53bb01da9aeb h1:9Ch6f/LYCh/BoriHfSp8sRX0OaO+9gQVK6x0vGl9o0s=
|
||||
github.com/filecoin-project/specs-actors v0.0.0-20200305205312-53bb01da9aeb/go.mod h1:0HAWYrvajFHDgRaKbF0rl+IybVLZL5z4gQ8koCMPhoU=
|
||||
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
|
||||
|
||||
Loading…
Reference in New Issue
Block a user