Market actor: Export PublishStorageDeals (#857)

Author: arajasek

actors/market/src/lib.rs

@@ -78,6 +78,7 @@ pub enum Method {
     // Method numbers derived from FRC-0042 standards
     AddBalanceExported = frc42_dispatch::method_hash!("AddBalance"),
     WithdrawBalanceExported = frc42_dispatch::method_hash!("WithdrawBalance"),
+    PublishStorageDealsExported = frc42_dispatch::method_hash!("PublishStorageDeals"),
     GetBalanceExported = frc42_dispatch::method_hash!("GetBalance"),
     GetDealDataCommitmentExported = frc42_dispatch::method_hash!("GetDealDataCommitment"),
     GetDealClientExported = frc42_dispatch::method_hash!("GetDealClient"),
@@ -1362,7 +1363,7 @@ impl ActorCode for Actor {
                 let res = Self::withdraw_balance(rt, cbor::deserialize_params(params)?)?;
                 Ok(RawBytes::serialize(res)?)
             }
-            Some(Method::PublishStorageDeals) => {
+            Some(Method::PublishStorageDeals) | Some(Method::PublishStorageDealsExported) => {
                 let res = Self::publish_storage_deals(rt, cbor::deserialize_params(params)?)?;
                 Ok(RawBytes::serialize(res)?)
             }

actors/market/tests/market_actor_test.rs

@@ -1953,7 +1953,7 @@ fn add_balance_restricted_correctly() {
     rt.set_value(amount);
 
     // set caller to not-builtin
-    rt.set_caller(make_identity_cid(b"1234"), Address::new_id(1000));
+    rt.set_caller(make_identity_cid(b"1234"), Address::new_id(1234));
 
     // cannot call the unexported method num
     expect_abort_contains_message(
@@ -1975,3 +1975,93 @@ fn add_balance_restricted_correctly() {
 
     rt.verify();
 }
+
+#[test]
+fn psd_restricted_correctly() {
+    let mut rt = setup();
+
+    let deal = generate_deal_proposal(
+        CLIENT_ADDR,
+        PROVIDER_ADDR,
+        ChainEpoch::from(1),
+        200 * EPOCHS_IN_DAY,
+    );
+
+    // Client gets enough funds
+    add_participant_funds(&mut rt, CLIENT_ADDR, deal.client_balance_requirement());
+
+    // Provider has enough funds
+    rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, OWNER_ADDR);
+    rt.set_value(deal.provider_balance_requirement().clone());
+    rt.expect_validate_caller_any();
+    expect_provider_control_address(&mut rt, PROVIDER_ADDR, OWNER_ADDR, WORKER_ADDR);
+
+    assert_eq!(
+        RawBytes::default(),
+        rt.call::<MarketActor>(
+            Method::AddBalance as u64,
+            &RawBytes::serialize(PROVIDER_ADDR).unwrap(),
+        )
+        .unwrap()
+    );
+
+    rt.verify();
+
+    // Prep the message
+
+    let buf = RawBytes::serialize(&deal).expect("failed to marshal deal proposal");
+
+    let sig = Signature::new_bls(buf.to_vec());
+
+    let params = PublishStorageDealsParams {
+        deals: vec![ClientDealProposal { proposal: deal.clone(), client_signature: sig }],
+    };
+
+    // set caller to not-builtin
+    rt.set_caller(make_identity_cid(b"1234"), WORKER_ADDR);
+
+    // cannot call the unexported method num
+    expect_abort_contains_message(
+        ExitCode::USR_FORBIDDEN,
+        "must be built-in",
+        rt.call::<MarketActor>(
+            Method::PublishStorageDeals as MethodNum,
+            &RawBytes::serialize(params.clone()).unwrap(),
+        ),
+    );
+
+    // can call the exported method num
+
+    let authenticate_param1 = RawBytes::serialize(AuthenticateMessageParams {
+        signature: buf.to_vec(),
+        message: buf.to_vec(),
+    })
+    .unwrap();
+
+    rt.expect_validate_caller_any();
+    expect_provider_control_address(&mut rt, PROVIDER_ADDR, OWNER_ADDR, WORKER_ADDR);
+    expect_query_network_info(&mut rt);
+
+    rt.expect_send(
+        deal.client,
+        AUTHENTICATE_MESSAGE_METHOD as u64,
+        authenticate_param1,
+        TokenAmount::zero(),
+        RawBytes::default(),
+        ExitCode::OK,
+    );
+
+    let ret: PublishStorageDealsReturn = rt
+        .call::<MarketActor>(
+            Method::PublishStorageDealsExported as MethodNum,
+            &RawBytes::serialize(params).unwrap(),
+        )
+        .unwrap()
+        .deserialize()
+        .unwrap();
+
+    assert!(ret.valid_deals.get(0));
+
+    rt.verify();
+    check_state(&rt);
+}