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

0.11.1-alpha.2 #300

Open
wants to merge 12 commits into
base: v0.11.1
Choose a base branch
from
Open

0.11.1-alpha.2 #300

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
29a4d9f
lint code with rust 1.85.0
zoedberg Feb 27, 2025
ee1a111
fix stl
zoedberg Feb 28, 2025
41c7dc6
fix select_valid_witness: select best WitnessOrd
zoedberg Feb 21, 2025
a28347c
validation: add unsafe history check
zoedberg Feb 13, 2025
a0074aa
add get_outpoint_unsafe_history
zoedberg Feb 15, 2025
1eae309
change validity check + change some warnings to failures
zoedberg Feb 27, 2025
c1c2f9a
remove blank transitions
zoedberg Feb 20, 2025
52b7fd7
remove supplements
zoedberg Mar 1, 2025
91a913f
remove extensions and valencies
zoedberg Mar 4, 2025
8ab08f3
remove interfaces
zoedberg Mar 5, 2025
f16f611
move rgb resolvers implementation from rgb-runtime
zoedberg Mar 11, 2025
688a6ab
update rgb-core (removed computed state reserved bytes)
zoedberg Mar 12, 2025
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
Prev Previous commit
Next Next commit
change validity check + change some warnings to failures
  • Loading branch information
@zoedberg
zoedberg committed Mar 1, 2025
commit 1eae309fdd78096f4fc214f98fd727e01db5bde6
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions src/containers/consignment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ use amplify::{ByteArray, Bytes32};
use armor::{ArmorHeader, AsciiArmor, StrictArmor, StrictArmorError};
use baid64::{Baid64ParseError, DisplayBaid64, FromBaid64Str};
use commit_verify::{CommitEncode, CommitEngine, CommitId, CommitmentId, DigestExt, Sha256};
use rgb::validation::{ResolveWitness, Validator, Validity, Warning, CONSIGNMENT_MAX_LIBS};
use rgb::validation::{Failure, ResolveWitness, Validator, Validity, CONSIGNMENT_MAX_LIBS};
use rgb::{
impl_serde_baid64, validation, AttachId, BundleId, ChainNet, ContractId, Extension, Genesis,
GraphSeal, Operation, Schema, SchemaId,
Expand Down Expand Up @@ -343,12 +343,12 @@ impl<const TRANSFER: bool> Consignment<TRANSFER> {
let validity = status.validity();

if self.transfer != TRANSFER {
status.add_warning(Warning::Custom(s!("invalid consignment type")));
status.add_failure(Failure::Custom(s!("invalid consignment type")));
}
// check ifaceid match implementation
for (iface, iimpl) in self.ifaces.iter() {
if iface.iface_id() != iimpl.iface_id {
status.add_warning(Warning::Custom(format!(
status.add_failure(Failure::Custom(format!(
"implementation {} targets different interface {} than expected {}",
iimpl.impl_id(),
iimpl.iface_id,
Expand All @@ -360,7 +360,7 @@ impl<const TRANSFER: bool> Consignment<TRANSFER> {
// check bundle ids listed in terminals are present in the consignment
for bundle_id in self.terminals.keys() {
if !index.bundle_ids().any(|id| id == *bundle_id) {
status.add_warning(Warning::Custom(format!(
status.add_failure(Failure::Custom(format!(
"terminal bundle id {bundle_id} is not present in the consignment"
)));
}
Expand All @@ -370,7 +370,7 @@ impl<const TRANSFER: bool> Consignment<TRANSFER> {
// TODO: Check that all extensions present in the consignment are used by state
// transitions

if validity != Validity::Valid {
if validity == Validity::Invalid {
Err((status, self))
} else {
Ok(ValidConsignment {
Expand Down