[workaround] Merge #676 (gas accounting) with correct branch

src/systems/filecoin_markets/deal/deal.go

@@ -3,10 +3,14 @@ package deal
 import actor "github.com/filecoin-project/specs/systems/filecoin_vm/actor"
 import block "github.com/filecoin-project/specs/systems/filecoin_blockchain/struct/block"
 
-const MIN_PROVIDER_DEAL_COLLATERAL_PER_EPOCH = actor.TokenAmount(1) // TODO: Placeholder
-const MIN_CLIENT_DEAL_COLLATERAL_PER_EPOCH = actor.TokenAmount(1)   // TODO: Placeholder
-const MIN_DEAL_DURATION = block.ChainEpoch(0)                       // TODO: Placeholder
-const MIN_DEAL_PRICE = actor.TokenAmount(0)                         // TODO: Placeholder
+import util "github.com/filecoin-project/specs/util"
+
+var IMPL_FINISH = util.IMPL_FINISH
+
+var MIN_PROVIDER_DEAL_COLLATERAL_PER_EPOCH = actor.TokenAmount_Placeholder()
+var MIN_CLIENT_DEAL_COLLATERAL_PER_EPOCH = actor.TokenAmount_Placeholder()
+var MIN_DEAL_DURATION = block.ChainEpoch(0) // TODO: Placeholder
+var MIN_DEAL_PRICE = actor.TokenAmount_Placeholder()
 
 func (d *StorageDeal_I) Proposal() StorageDealProposal {
 	// extract from d.ProposalMessage

src/systems/filecoin_mining/storage_mining/storage_miner_actor_state.go

@@ -5,8 +5,25 @@ import (
 	deal "github.com/filecoin-project/specs/systems/filecoin_markets/deal"
 	sector "github.com/filecoin-project/specs/systems/filecoin_mining/sector"
 	actor "github.com/filecoin-project/specs/systems/filecoin_vm/actor"
+	addr "github.com/filecoin-project/specs/systems/filecoin_vm/actor/address"
+	st "github.com/filecoin-project/specs/systems/filecoin_vm/state_tree"
+	util "github.com/filecoin-project/specs/util"
 )
 
+var Assert = util.Assert
+
+// Get the owner account address associated to a given miner actor.
+func GetMinerOwnerAddress(tree st.StateTree, minerAddr addr.Address) (addr.Address, error) {
+	panic("TODO")
+}
+
+// Get the owner account address associated to a given miner actor.
+func GetMinerOwnerAddress_Assert(tree st.StateTree, a addr.Address) addr.Address {
+	ret, err := GetMinerOwnerAddress(tree, a)
+	Assert(err == nil)
+	return ret
+}
+
 func (st *StorageMinerActorState_I) _isChallenged() bool {
 	return st.ChallengeStatus().IsChallenged()
 }

src/systems/filecoin_vm/actor/actor.go

@@ -4,6 +4,8 @@ import filcrypto "github.com/filecoin-project/specs/algorithms/crypto"
 import ipld "github.com/filecoin-project/specs/libraries/ipld"
 import util "github.com/filecoin-project/specs/util"
 
+var TODO = util.TODO
+
 type Serialization = util.Serialization
 
 const (
@@ -67,6 +69,11 @@ func (x ActorSubstateCID) Ref() *ActorSubstateCID {
 	return &x
 }
 
+func TokenAmount_Placeholder() TokenAmount {
+	TODO()
+	panic("")
+}
+
 // Interface for runtime/VMContext functionality (to avoid circular dependency in Go imports)
 type Has_AbortArg interface {
 	AbortArg()

src/systems/filecoin_vm/actor/actor.id

@@ -7,7 +7,7 @@ import ipld "github.com/filecoin-project/specs/libraries/ipld"
 // TokenAmount is an amount of Filecoin tokens. This type is used within
 // the VM in message execution, to account movement of tokens, payment
 // of VM gas, and more.
-type TokenAmount UVarint  // TODO: bigint or varint?
+type TokenAmount Int  // TODO: should be BigInt (attoFIL)
 
 // MethodNum is an integer that represents a particular method
 // in an actor's function table. These numbers are used to compress

src/systems/filecoin_vm/actor/address/address.go

@@ -68,3 +68,10 @@ func Address_Make_ActorExec(net Address_NetworkID, hash ActorExecHash) Address {
 		Data_:      Address_Data_Make_ActorExec(hash),
 	}
 }
+
+type Address_Ptr = *Address
+
+func (a *Address_I) Ref() Address_Ptr {
+	var ret Address = a
+	return &ret
+}

src/systems/filecoin_vm/actor/address/address.id

@@ -20,6 +20,7 @@ type Address struct {
     String()         AddressString
     IsKeyType()      bool
     Equals(Address)  bool
+    Ref()            Address_Ptr
 }
 
 // ActorID is a sequential number assigned to actors in a Filecoin Chain.