Miner: Export ChangeOwnerAddress

Author: arajasek

actors/miner/src/lib.rs

@@ -131,6 +131,7 @@ pub enum Method {
     ChangeMultiaddrsExported = frc42_dispatch::method_hash!("ChangeMultiaddrs"),
     ConfirmUpdateWorkerKeyExported = frc42_dispatch::method_hash!("ConfirmUpdateWorkerKey"),
     RepayDebtExported = frc42_dispatch::method_hash!("RepayDebt"),
+    ChangeOwnerAddressExported = frc42_dispatch::method_hash!("ChangeOwnerAddress"),
     ChangeBenificiaryExported = frc42_dispatch::method_hash!("ChangeBeneficiary"),
     GetBeneficiaryExported = frc42_dispatch::method_hash!("GetBeneficiary"),
     GetOwnerExported = frc42_dispatch::method_hash!("GetOwner"),
@@ -5023,7 +5024,7 @@ impl ActorCode for Actor {
                 Self::repay_debt(rt)?;
                 Ok(RawBytes::default())
             }
-            Some(Method::ChangeOwnerAddress) => {
+            Some(Method::ChangeOwnerAddress) | Some(Method::ChangeOwnerAddressExported) => {
                 Self::change_owner_address(rt, cbor::deserialize_params(params)?)?;
                 Ok(RawBytes::default())
             }

actors/miner/tests/change_owner_address_test.rs

@@ -1,6 +1,9 @@
+use fil_actor_miner::{Actor, Method};
 use fil_actors_runtime::test_utils::{
-    expect_abort, new_bls_addr, MockRuntime, ACCOUNT_ACTOR_CODE_ID, MULTISIG_ACTOR_CODE_ID,
+    expect_abort, expect_abort_contains_message, make_identity_cid, new_bls_addr, MockRuntime,
+    ACCOUNT_ACTOR_CODE_ID, MULTISIG_ACTOR_CODE_ID,
 };
+use fvm_ipld_encoding::RawBytes;
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::{address::Address, error::ExitCode};
 
@@ -52,6 +55,47 @@ fn successful_change() {
     h.check_state(&rt);
 }
 
+#[test]
+fn change_owner_address_restricted_correctly() {
+    let (h, mut rt) = setup();
+
+    let params = &RawBytes::serialize(NEW_ADDRESS).unwrap();
+    rt.set_caller(make_identity_cid(b"1234"), h.owner);
+
+    // fail to call the unexported method
+
+    expect_abort_contains_message(
+        ExitCode::USR_FORBIDDEN,
+        "must be built-in",
+        rt.call::<Actor>(Method::ChangeOwnerAddress as u64, &params),
+    );
+
+    // can call the exported method
+
+    rt.expect_validate_caller_addr(vec![h.owner]);
+    rt.call::<Actor>(Method::ChangeOwnerAddressExported as u64, params).unwrap();
+
+    rt.verify();
+
+    let info = h.get_info(&rt);
+    assert_eq!(h.owner, info.owner);
+    assert_eq!(NEW_ADDRESS, info.pending_owner_address.unwrap());
+
+    // new owner can also call the exported method
+
+    rt.expect_validate_caller_addr(vec![NEW_ADDRESS]);
+    rt.set_caller(make_identity_cid(b"1234"), NEW_ADDRESS);
+    rt.call::<Actor>(Method::ChangeOwnerAddressExported as u64, params).unwrap();
+
+    rt.verify();
+    let info = h.get_info(&rt);
+    assert_eq!(NEW_ADDRESS, info.owner);
+    assert_eq!(NEW_ADDRESS, info.beneficiary);
+    assert!(info.pending_owner_address.is_none());
+
+    h.check_state(&rt);
+}
+
 #[test]
 fn successful_keep_beneficiary_when_change_owner() {
     let (mut h, mut rt) = setup();