cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

WIP: one more step before distraction

Browse Source
This commit is contained in:
whyrusleeping 2020-01-23 11:03:01 -08:00
parent c73c5987c7
commit baa3d09577
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chain/actors/actor_multisig.go
View File

@ -8,7 +8,6 @@ import (
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/lotus/chain/actors/aerrors" "github.com/filecoin-project/lotus/chain/actors/aerrors"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
"github.com/ipfs/go-cid"
samsig "github.com/filecoin-project/specs-actors/actors/builtin/multisig" samsig "github.com/filecoin-project/specs-actors/actors/builtin/multisig"
vmr "github.com/filecoin-project/specs-actors/actors/runtime" vmr "github.com/filecoin-project/specs-actors/actors/runtime"
@ -147,6 +146,11 @@ func (rs *runtimeShim) ValidateImmediateCallerIs(as ...address.Address) {
panic("we like to panic when people call the wrong methods") panic("we like to panic when people call the wrong methods")
} }
func (rs *runtimeShim) State() vmr.StateHandle {
}
/*
type shimStateHandle struct { type shimStateHandle struct {
vmctx types.VMContext vmctx types.VMContext
} }
@ -162,6 +166,7 @@ func (ssh *shimStateHandle) Take() {
func (rs *runtimeShim) AcquireState() vmr.ActorStateHandle { func (rs *runtimeShim) AcquireState() vmr.ActorStateHandle {
return &shimStateHandle{rs.vmctx} return &shimStateHandle{rs.vmctx}
} }
*/
type MultiSigConstructorParams = samsig.ConstructorParams type MultiSigConstructorParams = samsig.ConstructorParams

14
chain/actors/actors.go
View File

@ -17,11 +17,15 @@ var MultisigCodeCid cid.Cid
var InitCodeCid cid.Cid var InitCodeCid cid.Cid
var PaymentChannelCodeCid cid.Cid var PaymentChannelCodeCid cid.Cid
var InitAddress = mustIDAddress(0) var SystemAddress = mustIDAddress(0)
var NetworkAddress = mustIDAddress(1) var InitAddress = mustIDAddress(1)
var StoragePowerAddress = mustIDAddress(2) var RewardActor = mustIDAddress(2)
var StorageMarketAddress = mustIDAddress(3) // TODO: missing from spec var CronAddress = mustIDAddress(3)
var CronAddress = mustIDAddress(4) var StoragePowerAddress = mustIDAddress(4)
var StorageMarketAddress = mustIDAddress(5)
var NetworkAddress = mustIDAddress(17) // TODO: needs to be removed in favor of reward actor
var BurntFundsAddress = mustIDAddress(99) var BurntFundsAddress = mustIDAddress(99)
func mustIDAddress(i uint64) address.Address { func mustIDAddress(i uint64) address.Address {