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

Jump to bottom

fix bug in enforcing nil-termination of new AGG_SIG_* conditions #270

Merged
merged 2 commits into from
Sep 22, 2023
Merged

fix bug in enforcing nil-termination of new AGG_SIG_* conditions #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7426a5
fix bug in enforcing nil-termination of new AGG_SIG_* conditions
arvidn Sep 22, 2023
0fde027
bump wheel version to 0.2.11
arvidn Sep 22, 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
80 changes: 65 additions & 15 deletions src/gen/conditions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ pub fn parse_args(
// AGG_SIG_* take two parameters

if (flags & STRICT_ARGS_COUNT) != 0 {
check_nil(a, c)?;
check_nil(a, rest(a, c)?)?;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this is the bugfix. the nil-terminator is expected to be the next item in the list, not the last cons-cell.
The rest are extended tests to cover this and possible other differences in mempool-mode and consensus-mode

}
match op {
AGG_SIG_PARENT => Ok(Condition::AggSigParent(pubkey, message)),
Expand Down Expand Up @@ -1622,15 +1622,19 @@ fn test_invalid_spend_list_terminator() {
#[case(AGG_SIG_PARENT_AMOUNT, "{pubkey} ({msg1}")]
#[case(ASSERT_CONCURRENT_SPEND, "{coin12}")]
#[case(ASSERT_CONCURRENT_PUZZLE, "{h2}")]
fn test_extra_arg_mempool(#[case] condition: ConditionOpcode, #[case] arg: &str) {
fn test_extra_arg_mempool(
#[case] condition: ConditionOpcode,
#[case] arg: &str,
#[values(MEMPOOL_MODE, 0)] mempool: u32,
) {
// extra args are disallowed in mempool mode
assert_eq!(
cond_test_flag(
&format!(
"((({{h1}} ({{h2}} (123 ((({} ({} ( 1337 )))))",
condition as u8, arg
),
STRICT_ARGS_COUNT | ENABLE_ASSERT_BEFORE | ENABLE_SOFTFORK_CONDITION
STRICT_ARGS_COUNT | ENABLE_ASSERT_BEFORE | ENABLE_SOFTFORK_CONDITION | mempool
)
.unwrap_err()
.1,
Expand Down Expand Up @@ -1661,28 +1665,62 @@ fn test_extra_arg_mempool(#[case] condition: ConditionOpcode, #[case] arg: &str)
#[case(ASSERT_MY_PUZZLEHASH, "{h2}", "", |_: &SpendBundleConditions, _: &Spend| {})]
#[case(ASSERT_CONCURRENT_SPEND, "{coin12}", "", |_: &SpendBundleConditions, _: &Spend| {})]
#[case(ASSERT_CONCURRENT_PUZZLE, "{h2}", "", |_: &SpendBundleConditions, _: &Spend| {})]
#[case(AGG_SIG_PARENT, "{pubkey} ({msg1}", "", |_: &SpendBundleConditions, _: &Spend| {})]
#[case(AGG_SIG_PUZZLE, "{pubkey} ({msg1}", "", |_: &SpendBundleConditions, _: &Spend| {})]
#[case(AGG_SIG_AMOUNT, "{pubkey} ({msg1}", "", |_: &SpendBundleConditions, _: &Spend| {})]
#[case(AGG_SIG_PUZZLE_AMOUNT, "{pubkey} ({msg1}", "", |_: &SpendBundleConditions, _: &Spend| {})]
#[case(AGG_SIG_PARENT_PUZZLE, "{pubkey} ({msg1}", "", |_: &SpendBundleConditions, _: &Spend| {})]
#[case(AGG_SIG_PARENT_AMOUNT, "{pubkey} ({msg1}", "", |_: &SpendBundleConditions, _: &Spend| {})]
fn test_extra_arg(
#[case] condition: ConditionOpcode,
#[case] arg: &str,
#[case] extra_cond: &str,
#[case] test: impl Fn(&SpendBundleConditions, &Spend),
) {
// extra args are ignored
// extra args are ignored in consensus mode
// and a failure in mempool mode
assert_eq!(
cond_test_flag(
&format!(
"((({{h1}} ({{h2}} (123 ((({} ({} ( 1337 ) {} ))))",
condition as u8, arg, extra_cond
),
ENABLE_ASSERT_BEFORE | ENABLE_SOFTFORK_CONDITION | MEMPOOL_MODE,
)
.unwrap_err()
.1,
ErrorCode::InvalidCondition
);

let (a, conds) = cond_test_flag(
&format!(
"((({{h1}} ({{h2}} (123 ((({} ({} ( 1337 ) {} ))))",
condition as u8, arg, extra_cond
),
ENABLE_ASSERT_BEFORE,
ENABLE_ASSERT_BEFORE | ENABLE_SOFTFORK_CONDITION,
)
.unwrap();

assert_eq!(conds.cost, 0);
let has_agg_sig = [
AGG_SIG_PARENT,
AGG_SIG_PUZZLE,
AGG_SIG_AMOUNT,
AGG_SIG_PUZZLE_AMOUNT,
AGG_SIG_PARENT_PUZZLE,
AGG_SIG_PARENT_AMOUNT,
]
.contains(&condition);

let expected_cost = if has_agg_sig { 1200000 } else { 0 };

let expected_flags = if has_agg_sig { 0 } else { ELIGIBLE_FOR_DEDUP };

assert_eq!(conds.cost, expected_cost);
assert_eq!(conds.spends.len(), 1);
let spend = &conds.spends[0];
assert_eq!(*spend.coin_id, test_coin_id(H1, H2, 123));
assert_eq!(a.atom(spend.puzzle_hash), H2);
assert!((spend.flags & ELIGIBLE_FOR_DEDUP) != 0);
assert_eq!((spend.flags & ELIGIBLE_FOR_DEDUP), expected_flags);

test(&conds, &spend);
}
Expand Down Expand Up @@ -2761,13 +2799,16 @@ fn agg_sig_vec(c: ConditionOpcode, s: &Spend) -> &[(NodePtr, NodePtr)] {
#[case(AGG_SIG_PUZZLE_AMOUNT)]
#[case(AGG_SIG_PARENT_PUZZLE)]
#[case(AGG_SIG_PARENT_AMOUNT)]
fn test_single_agg_sig_me(#[case] condition: ConditionOpcode) {
fn test_single_agg_sig_me(
#[case] condition: ConditionOpcode,
#[values(MEMPOOL_MODE, 0)] mempool: u32,
) {
let (a, conds) = cond_test_flag(
&format!(
"((({{h1}} ({{h2}} (123 ((({} ({{pubkey}} ({{msg1}} )))))",
condition
),
ENABLE_SOFTFORK_CONDITION,
ENABLE_SOFTFORK_CONDITION | mempool,
)
.unwrap();

Expand Down Expand Up @@ -2797,12 +2838,15 @@ fn test_single_agg_sig_me(#[case] condition: ConditionOpcode) {
#[case(AGG_SIG_PUZZLE_AMOUNT)]
#[case(AGG_SIG_PARENT_PUZZLE)]
#[case(AGG_SIG_PARENT_AMOUNT)]
fn test_duplicate_agg_sig(#[case] condition: ConditionOpcode) {
fn test_duplicate_agg_sig(
#[case] condition: ConditionOpcode,
#[values(MEMPOOL_MODE, 0)] mempool: u32,
) {
// we cannot deduplicate AGG_SIG conditions. Their signatures will be
// aggregated, and so must all copies of the public keys
let (a, conds) =
cond_test_flag(&format!("((({{h1}} ({{h2}} (123 ((({} ({{pubkey}} ({{msg1}} ) (({} ({{pubkey}} ({{msg1}} ) ))))", condition as u8, condition as u8),
ENABLE_SOFTFORK_CONDITION)
ENABLE_SOFTFORK_CONDITION | mempool)
.unwrap();

assert_eq!(conds.cost, AGG_SIG_COST * 2);
Expand Down Expand Up @@ -2831,14 +2875,17 @@ fn test_duplicate_agg_sig(#[case] condition: ConditionOpcode) {
#[case(AGG_SIG_PUZZLE_AMOUNT)]
#[case(AGG_SIG_PARENT_PUZZLE)]
#[case(AGG_SIG_PARENT_AMOUNT)]
fn test_agg_sig_invalid_pubkey(#[case] condition: ConditionOpcode) {
fn test_agg_sig_invalid_pubkey(
#[case] condition: ConditionOpcode,
#[values(MEMPOOL_MODE, 0)] mempool: u32,
) {
assert_eq!(
cond_test_flag(
&format!(
"((({{h1}} ({{h2}} (123 ((({} ({{h2}} ({{msg1}} )))))",
condition as u8
),
ENABLE_SOFTFORK_CONDITION
ENABLE_SOFTFORK_CONDITION | mempool
)
.unwrap_err()
.1,
Expand All @@ -2855,14 +2902,17 @@ fn test_agg_sig_invalid_pubkey(#[case] condition: ConditionOpcode) {
#[case(AGG_SIG_PUZZLE_AMOUNT)]
#[case(AGG_SIG_PARENT_PUZZLE)]
#[case(AGG_SIG_PARENT_AMOUNT)]
fn test_agg_sig_invalid_msg(#[case] condition: ConditionOpcode) {
fn test_agg_sig_invalid_msg(
#[case] condition: ConditionOpcode,
#[values(MEMPOOL_MODE, 0)] mempool: u32,
) {
assert_eq!(
cond_test_flag(
&format!(
"((({{h1}} ({{h2}} (123 ((({} ({{pubkey}} ({{longmsg}} )))))",
condition as u8
),
ENABLE_SOFTFORK_CONDITION
ENABLE_SOFTFORK_CONDITION | mempool
)
.unwrap_err()
.1,
Expand Down
2 changes: 1 addition & 1 deletion wheel/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "chia_rs"
version = "0.2.10"
version = "0.2.11"
authors = ["Richard Kiss <[email protected]>"]
edition = "2021"
license = "Apache-2.0"
Expand Down
Loading