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

Merge pull request #4903 from filecoin-project/asr/delete-fix

Browse Source 
Tweak handling of bad beneficaries in DeleteActor
This commit is contained in:
Łukasz Magiera 2020-11-18 11:09:39 +01:00 committed by GitHub
commit 09c996d572
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chain/vm/runtime.go
View File

@ -281,9 +281,19 @@ func (rt *Runtime) DeleteActor(beneficiary address.Address) {
panic(aerrors.Fatalf("failed to get actor: %s", err)) panic(aerrors.Fatalf("failed to get actor: %s", err))
} }
if !act.Balance.IsZero() { if !act.Balance.IsZero() {
if beneficiary == rt.Receiver() && rt.NetworkVersion() >= network.Version7 { // TODO: Should be safe to drop the version-check,
rt.Abortf(exitcode.SysErrorIllegalArgument, "benefactor cannot be beneficiary") // since only the paych actor called this pre-version 7, but let's leave it for now
if rt.NetworkVersion() >= network.Version7 {
beneficiaryId, found := rt.ResolveAddress(beneficiary)
if !found {
rt.Abortf(exitcode.SysErrorIllegalArgument, "beneficiary doesn't exist")
}
if beneficiaryId == rt.Receiver() {
rt.Abortf(exitcode.SysErrorIllegalArgument, "benefactor cannot be beneficiary")
}
} }
// Transfer the executing actor's balance to the beneficiary // Transfer the executing actor's balance to the beneficiary
if err := rt.vm.transfer(rt.Receiver(), beneficiary, act.Balance); err != nil { if err := rt.vm.transfer(rt.Receiver(), beneficiary, act.Balance); err != nil {
panic(aerrors.Fatalf("failed to transfer balance to beneficiary actor: %s", err)) panic(aerrors.Fatalf("failed to transfer balance to beneficiary actor: %s", err))