update chain-val with latest tests (#1325)
* update chain-val with latest tests
This commit is contained in:
Frrist
GitHub
@@ -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
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user