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.

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

Make any zero-valued input inscription unbound #2397

Merged
merged 6 commits into from
Aug 31, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
45 changes: 45 additions & 0 deletions src/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2653,6 +2653,51 @@ mod tests {
}
}

#[test]
fn transaction_with_inscription_inside_zero_value_2nd_input_should_be_unbound_and_cursed() {
for context in Context::configurations() {
context.mine_blocks(1);

// create zero value input
context.rpc_server.broadcast_tx(TransactionTemplate {
inputs: &[(1, 0, 0)],
fee: 50 * 100_000_000,
..Default::default()
});

context.mine_blocks(1);

let txid = context.rpc_server.broadcast_tx(TransactionTemplate {
inputs: &[(2, 0, 0), (2, 1, 0)],
witness: inscription("text/plain", "hello").to_witness(),
..Default::default()
});

let second_inscription_id = InscriptionId { txid, index: 1 };

context.mine_blocks(1);

context.index.assert_inscription_location(
second_inscription_id,
SatPoint {
outpoint: unbound_outpoint(),
offset: 0,
},
None,
);

assert_eq!(
context
.index
.get_inscription_entry(second_inscription_id)
.unwrap()
.unwrap()
.number,
-1
);
}
}

#[test]
fn multiple_inscriptions_in_same_tx_all_but_first_input_are_cursed() {
for context in Context::configurations() {
Expand Down
18 changes: 10 additions & 8 deletions src/index/updater/inscription_updater.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,13 @@ impl<'a, 'db, 'tx> InscriptionUpdater<'a, 'db, 'tx> {
let mut new_inscriptions = Inscription::from_transaction(tx).into_iter().peekable();
let mut floating_inscriptions = Vec::new();
let mut inscribed_offsets = BTreeMap::new();
let mut input_value = 0;
let mut total_input_value = 0;
let mut id_counter = 0;

for (input_index, tx_in) in tx.input.iter().enumerate() {
// skip subsidy since no inscriptions possible
if tx_in.previous_output.is_null() {
input_value += Height(self.height).subsidy();
total_input_value += Height(self.height).subsidy();
continue;
}

Expand All @@ -121,7 +121,7 @@ impl<'a, 'db, 'tx> InscriptionUpdater<'a, 'db, 'tx> {
self.satpoint_to_id,
tx_in.previous_output,
)? {
let offset = input_value + old_satpoint.offset;
let offset = total_input_value + old_satpoint.offset;
floating_inscriptions.push(Flotsam {
offset,
inscription_id,
Expand All @@ -134,10 +134,10 @@ impl<'a, 'db, 'tx> InscriptionUpdater<'a, 'db, 'tx> {
.or_insert((inscription_id, 0));
}

let offset = input_value;
let offset = total_input_value;

// multi-level cache for UTXO set to get to the input amount
input_value += if let Some(value) = self.value_cache.remove(&tx_in.previous_output) {
let current_input_value = if let Some(value) = self.value_cache.remove(&tx_in.previous_output) {
value
} else if let Some(value) = self
.outpoint_to_value
Expand All @@ -153,6 +153,8 @@ impl<'a, 'db, 'tx> InscriptionUpdater<'a, 'db, 'tx> {
})?
};

total_input_value += current_input_value;

// go through all inscriptions in this input
while let Some(inscription) = new_inscriptions.peek() {
if inscription.tx_in_index != u32::try_from(input_index).unwrap() {
Expand Down Expand Up @@ -216,7 +218,7 @@ impl<'a, 'db, 'tx> InscriptionUpdater<'a, 'db, 'tx> {
curse.is_some()
};

let unbound = input_value == 0
let unbound = current_input_value == 0
|| inscription.tx_in_offset != 0
|| curse == Some(Curse::UnrecognizedEvenField);

Expand Down Expand Up @@ -264,7 +266,7 @@ impl<'a, 'db, 'tx> InscriptionUpdater<'a, 'db, 'tx> {
inscription_id,
offset,
origin: Origin::New {
fee: (input_value - total_output_value) / u64::from(id_counter),
fee: (total_input_value - total_output_value) / u64::from(id_counter),
cursed,
unbound,
},
Expand Down Expand Up @@ -338,7 +340,7 @@ impl<'a, 'db, 'tx> InscriptionUpdater<'a, 'db, 'tx> {
offset: self.reward + flotsam.offset - output_value,
..flotsam
}));
self.reward += input_value - output_value;
self.reward += total_input_value - output_value;
Ok(())
}
}
Expand Down
Loading