Remove old send

License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
This commit is contained in:
Jakub Sztandera 2019-08-03 13:53:18 +02:00
parent 9577348422
commit b44f778325

View File

@ -92,8 +92,6 @@ func (vmc *VMContext) Origin() address.Address {
return vmc.origin return vmc.origin
} }
var oldSend = false
// Send allows the current execution context to invoke methods on other actors in the system // Send allows the current execution context to invoke methods on other actors in the system
func (vmc *VMContext) Send(to address.Address, method uint64, value types.BigInt, params []byte) ([]byte, aerrors.ActorError) { func (vmc *VMContext) Send(to address.Address, method uint64, value types.BigInt, params []byte) ([]byte, aerrors.ActorError) {
ctx, span := trace.StartSpan(vmc.ctx, "vm.send") ctx, span := trace.StartSpan(vmc.ctx, "vm.send")
@ -113,28 +111,10 @@ func (vmc *VMContext) Send(to address.Address, method uint64, value types.BigInt
Value: value, Value: value,
Params: params, Params: params,
} }
if oldSend {
toAct, err := vmc.state.GetActor(to)
if err != nil {
return nil, aerrors.Absorb(err, 2, "could not find actor for Send")
}
nvmctx := vmc.vm.makeVMContext(ctx, toAct.Head, vmc.origin, msg)
res, aerr := vmc.vm.Invoke(toAct, nvmctx, method, params)
if aerr != nil {
return nil, aerr
}
toAct.Head = nvmctx.Storage().GetHead()
return res, nil
} else {
ret, err, _ := vmc.vm.send(ctx, vmc.origin, msg) ret, err, _ := vmc.vm.send(ctx, vmc.origin, msg)
return ret, err return ret, err
} }
}
// BlockHeight returns the height of the block this message was added to the chain in // BlockHeight returns the height of the block this message was added to the chain in
func (vmc *VMContext) BlockHeight() uint64 { func (vmc *VMContext) BlockHeight() uint64 {
@ -259,87 +239,6 @@ func (vm *VM) ApplyMessage(ctx context.Context, msg *types.Message) (*ApplyRet,
return nil, xerrors.Errorf("from actor not found: %w", err) return nil, xerrors.Errorf("from actor not found: %w", err)
} }
if oldSend {
gascost := types.BigMul(msg.GasLimit, msg.GasPrice)
totalCost := types.BigAdd(gascost, msg.Value)
if types.BigCmp(fromActor.Balance, totalCost) < 0 {
return nil, xerrors.Errorf("not enough funds")
}
if msg.Nonce != fromActor.Nonce {
return nil, xerrors.Errorf("invalid nonce (got %d, expected %d)", msg.Nonce, fromActor.Nonce)
}
fromActor.Nonce++
toActor, err := st.GetActor(msg.To)
if err != nil {
if xerrors.Is(err, types.ErrActorNotFound) {
a, err := TryCreateAccountActor(st, msg.To)
if err != nil {
return nil, err
}
toActor = a
} else {
return nil, err
}
}
if err := DeductFunds(fromActor, totalCost); err != nil {
return nil, xerrors.Errorf("failed to deduct funds: %w", err)
}
DepositFunds(toActor, msg.Value)
vmctx := vm.makeVMContext(ctx, toActor.Head, msg.From, msg)
var errcode byte
var ret []byte
var actorError aerrors.ActorError
if msg.Method != 0 {
ret, actorError = vm.Invoke(toActor, vmctx, msg.Method, msg.Params)
if aerrors.IsFatal(actorError) {
return nil, xerrors.Errorf("during invoke: %w", actorError)
}
if errcode = aerrors.RetCode(actorError); errcode != 0 {
// revert all state changes since snapshot
if err := st.Revert(); err != nil {
return nil, xerrors.Errorf("revert state failed: %w", err)
}
gascost := types.BigMul(vmctx.GasUsed(), msg.GasPrice)
if err := DeductFunds(fromActor, gascost); err != nil {
panic("invariant violated: " + err.Error())
}
} else {
// Update actor head reference
toActor.Head = vmctx.storage.head
// refund unused gas
refund := types.BigMul(types.BigSub(msg.GasLimit, vmctx.GasUsed()), msg.GasPrice)
DepositFunds(fromActor, refund)
}
}
// reward miner gas fees
miner, err := st.GetActor(vm.blockMiner)
if err != nil {
return nil, xerrors.Errorf("getting block miner actor (%s) failed: %w", vm.blockMiner, err)
}
gasReward := types.BigMul(msg.GasPrice, vmctx.GasUsed())
DepositFunds(miner, gasReward)
return &ApplyRet{
MessageReceipt: types.MessageReceipt{
ExitCode: errcode,
Return: ret,
GasUsed: vmctx.GasUsed(),
},
ActorErr: actorError,
}, nil
} else {
gascost := types.BigMul(msg.GasLimit, msg.GasPrice) gascost := types.BigMul(msg.GasLimit, msg.GasPrice)
totalCost := types.BigAdd(gascost, msg.Value) totalCost := types.BigAdd(gascost, msg.Value)
if types.BigCmp(fromActor.Balance, totalCost) < 0 { if types.BigCmp(fromActor.Balance, totalCost) < 0 {
@ -384,7 +283,6 @@ func (vm *VM) ApplyMessage(ctx context.Context, msg *types.Message) (*ApplyRet,
ActorErr: actorErr, ActorErr: actorErr,
}, nil }, nil
} }
}
func (vm *VM) Flush(ctx context.Context) (cid.Cid, error) { func (vm *VM) Flush(ctx context.Context) (cid.Cid, error) {
from := dag.NewDAGService(bserv.New(vm.buf, nil)) from := dag.NewDAGService(bserv.New(vm.buf, nil))