Market actor accepts deals published from miner control addresses (fi…

…lecoin-project#1321)
EpiK-Protocol · Feb 19, 2021 · 5581ee4 · 5581ee4
1 parent 935462d
commit 5581ee4
Show file tree

Hide file tree

Showing 2 changed files with 104 additions and 249 deletions.
diff --git a/actors/builtin/market/market_actor.go b/actors/builtin/market/market_actor.go
@@ -174,9 +174,17 @@ func (a Actor) PublishStorageDeals(rt Runtime, params *PublishStorageDealsParams
 		rt.Abortf(exitcode.ErrIllegalArgument, "deal provider is not a StorageMinerActor")
 	}
 
-	_, worker, _ := builtin.RequestMinerControlAddrs(rt, provider)
-	if worker != rt.Caller() {
-		rt.Abortf(exitcode.ErrForbidden, "caller is not provider %v", provider)
+	caller := rt.Caller()
+	_, worker, controllers := builtin.RequestMinerControlAddrs(rt, provider)
+	callerOk := caller == worker
+	for _, controller := range controllers {
+		if callerOk {
+			break
+		}
+		callerOk = caller == controller
+	}
+	if !callerOk {
+		rt.Abortf(exitcode.ErrForbidden, "caller %v is not worker or control address of provider %v", caller, provider)
 	}
 
 	pids := make([]builtin.CheckedCID, 0, len(params.Deals))