Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: multisig: accept arbitrary public messages #1252

Merged
merged 12 commits into from
Apr 7, 2023
Merged

feat: multisig: accept arbitrary public messages #1252

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
537c211
accept arbitrary messages in multisig
vyzo Mar 20, 2023
8c59b3e
accept arbitrary messages in paych
vyzo Mar 20, 2023
3d22165
add tests for fallback method handler in account, multisig, and paych
vyzo Mar 20, 2023
7de419c
rustfmt
vyzo Mar 20, 2023
1a5dc53
clippy
vyzo Mar 20, 2023
261e12f
moar clippy
vyzo Mar 20, 2023
b4bb679
leave paych unmolested
vyzo Mar 21, 2023
af27e34
names....
vyzo Mar 21, 2023
9d99a06
Review Response
ZenGround0 Apr 7, 2023
a276308
Merge branch 'master' into feat/multisig-arb
ZenGround0 Apr 7, 2023
b52eef6
Update fallback to mutable runtime
ZenGround0 Apr 7, 2023
d8023da
Clippy
ZenGround0 Apr 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions actors/multisig/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@
use fvm_actor_utils::receiver::UniversalReceiverParams;
use std::collections::BTreeSet;

use fil_actors_runtime::FIRST_EXPORTED_METHOD_NUMBER;
use fvm_ipld_blockstore::Blockstore;
use fvm_ipld_encoding::ipld_block::IpldBlock;
use fvm_ipld_encoding::RawBytes;
use fvm_shared::address::Address;
use fvm_shared::econ::TokenAmount;
use fvm_shared::error::ExitCode;
use fvm_shared::MethodNum;
use fvm_shared::{HAMT_BIT_WIDTH, METHOD_CONSTRUCTOR};
use num_derive::FromPrimitive;
use num_traits::Zero;
Expand Down Expand Up @@ -457,6 +460,19 @@ impl Actor {
rt.validate_immediate_caller_accept_any()?;
Ok(())
}

pub fn fallback(
rt: &mut impl Runtime,
method: MethodNum,
_: Option<IpldBlock>,
) -> Result<Option<IpldBlock>, ActorError> {
rt.validate_immediate_caller_accept_any()?;
if method >= FIRST_EXPORTED_METHOD_NUMBER {
Ok(None)
} else {
Err(actor_error!(unhandled_message; "invalid method: {}", method))
}
}
}

fn execute_transaction_if_approved(
Expand Down Expand Up @@ -569,5 +585,6 @@ impl ActorCode for Actor {
ChangeNumApprovalsThreshold => change_num_approvals_threshold,
LockBalance => lock_balance,
UniversalReceiverHook => universal_receiver_hook,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could remove this, since the Universal Receiver Hook's method is in the exported FRC-42 range, so it gets covered by the fallback. But I'd rather keep this explicit branch for clarity. IMO, the account actor should do the same (which it doesn't).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: lets make the change to explicit handling of universal receiver hook to the account actor in this PR

_ => fallback [raw],
}
}
16 changes: 16 additions & 0 deletions actors/paych/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ use fvm_ipld_blockstore::Blockstore;
use fvm_ipld_encoding::CBOR;
use fvm_shared::address::Address;

use fil_actors_runtime::FIRST_EXPORTED_METHOD_NUMBER;
use fvm_ipld_encoding::ipld_block::IpldBlock;
use fvm_shared::econ::TokenAmount;
use fvm_shared::error::ExitCode;
use fvm_shared::sys::SendFlags;
use fvm_shared::MethodNum;
use fvm_shared::{METHOD_CONSTRUCTOR, METHOD_SEND};
use num_derive::FromPrimitive;
use num_traits::Zero;
Expand Down Expand Up @@ -298,6 +300,19 @@ impl Actor {

Ok(())
}

pub fn fallback(
rt: &mut impl Runtime,
method: MethodNum,
_: Option<IpldBlock>,
) -> Result<Option<IpldBlock>, ActorError> {
rt.validate_immediate_caller_accept_any()?;
if method >= FIRST_EXPORTED_METHOD_NUMBER {
Ok(None)
} else {
Err(actor_error!(unhandled_message; "invalid method: {}", method))
}
}
}

#[inline]
Expand All @@ -324,5 +339,6 @@ impl ActorCode for Actor {
UpdateChannelState => update_channel_state,
Settle => settle,
Collect => collect,
_ => fallback [raw],
}
}