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: attempt to support cursed inscriptions #266

Merged
merged 13 commits into from
Jun 4, 2023
Merged

feat: attempt to support cursed inscriptions #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9b45f90
feat: attempt to support cursed inscriptions
May 25, 2023
af280b7
chore: add helpers functions
May 25, 2023
fd5da52
feat: handle transfer
May 25, 2023
a030926
refactor: use helpers
May 25, 2023
fe26063
fix: additional adjustments
May 25, 2023
b50bbc1
fix: only avoid override for blessed inscriptions
May 31, 2023
2af31a8
fix: rocket_okapi version
May 31, 2023
969d3cf
chore: update rocket - v0.5 rc3
May 31, 2023
4fe71f2
fix: remove support for p2wsh inscription reveal support
Jun 1, 2023
dcb8054
feat: improving curse approach
Jun 1, 2023
9b987c5
fix: more pessimism on retries
Jun 4, 2023
8a12004
fix: off by one issue on sats overflow
Jun 4, 2023
2b954a2
Merge branch 'develop' into feat/cursed-inscriptions
lgalabru Jun 4, 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
406 changes: 215 additions & 191 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions components/chainhook-cli/src/cli/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ use chainhook_event_observer::chainhooks::types::{
use chainhook_event_observer::hord::db::{
delete_data_in_hord_db, fetch_and_cache_blocks_in_hord_db, find_last_block_inserted,
find_lazy_block_at_block_height, find_watched_satpoint_for_inscription, initialize_hord_db,
insert_entry_in_blocks, open_readonly_hord_db_conn, open_readonly_hord_db_conn_rocks_db,
open_readwrite_hord_db_conn, open_readwrite_hord_db_conn_rocks_db,
retrieve_satoshi_point_using_lazy_storage, LazyBlock,
open_readonly_hord_db_conn, open_readonly_hord_db_conn_rocks_db, open_readwrite_hord_db_conn,
open_readwrite_hord_db_conn_rocks_db, retrieve_satoshi_point_using_lazy_storage,
};
use chainhook_event_observer::hord::{
new_traversals_lazy_cache, retrieve_inscribed_satoshi_points_from_block,
Expand Down Expand Up @@ -643,6 +642,7 @@ async fn handle_command(opts: Opts, ctx: Context) -> Result<(), String> {
&block_identifier,
&transaction_identifier,
0,
0,
Arc::new(traversals_cache),
&ctx,
)?;
Expand Down
12 changes: 6 additions & 6 deletions components/chainhook-cli/src/scan/bitcoin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ pub async fn scan_bitcoin_chainstate_via_http_using_predicate(
let (mut end_block, floating_end_block) = match predicate_spec.end_block {
Some(end_block) => (end_block, false),
None => match bitcoin_rpc.get_blockchain_info() {
Ok(result) => (result.blocks, true),
Ok(result) => (result.blocks - 1, true),
Err(e) => {
return Err(format!(
"unable to retrieve Bitcoin chain tip ({})",
Expand Down Expand Up @@ -184,19 +184,19 @@ pub async fn scan_bitcoin_chainstate_via_http_using_predicate(
}
};

update_storage_and_augment_bitcoin_block_with_inscription_reveal_data(
let _ = update_storage_and_augment_bitcoin_block_with_inscription_reveal_data(
&mut block,
&mut storage,
&traversals,
&hord_db_conn,
&ctx,
);
)?;

let _ = update_storage_and_augment_bitcoin_block_with_inscription_transfer_data(
&mut block,
&mut storage,
&ctx,
);
)?;

let inscriptions_revealed = get_inscriptions_revealed_in_block(&block)
.iter()
Expand Down Expand Up @@ -234,7 +234,7 @@ pub async fn scan_bitcoin_chainstate_via_http_using_predicate(

if cursor == end_block && floating_end_block {
end_block = match bitcoin_rpc.get_blockchain_info() {
Ok(result) => result.blocks,
Ok(result) => result.blocks - 1,
Err(_e) => {
continue;
}
Expand Down Expand Up @@ -294,7 +294,7 @@ pub async fn scan_bitcoin_chainstate_via_http_using_predicate(

if cursor == end_block && floating_end_block {
end_block = match bitcoin_rpc.get_blockchain_info() {
Ok(result) => result.blocks,
Ok(result) => result.blocks - 1,
Err(_e) => {
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions components/chainhook-event-observer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ hiro-system-kit = "0.1.0"
# clarity-repl = { version = "1", path = "../../../clarinet/components/clarity-repl" }
# hiro-system-kit = { version = "0.1.0", path = "../../../clarinet/components/hiro-system-kit" }
chainhook-types = { version = "1.0.3", path = "../chainhook-types-rs" }
rocket = { version = "=0.5.0-rc.2", features = ["json"] }
rocket = { version = "=0.5.0-rc.3", features = ["json"] }
bitcoincore-rpc = "0.16.0"
bitcoincore-rpc-json = "0.16.0"
base64 = "0.13.0"
Expand All @@ -37,7 +37,7 @@ clap_generate = { version = "3.0.3", optional = true }
toml = { version = "0.5.6", features = ["preserve_order"], optional = true }
ctrlc = { version = "3.2.2", optional = true }
schemars = { version = "0.8.10" }
rocket_okapi = "0.8.0-rc.1"
rocket_okapi = "0.8.0-rc.3"
crossbeam-channel = "0.5.6"
chrono = { version = "0.4.19", optional = true }
anyhow = { version = "1.0.56", features = ["backtrace"], optional = true }
Expand Down
Loading