@@ -362,7 +362,7 @@ pub fn find_latest_inscription_number_at_block_height(
362
362
block_height : & u64 ,
363
363
inscriptions_db_conn : & Connection ,
364
364
_ctx : & Context ,
365
- ) -> Result < Option < u64 > , String > {
365
+ ) -> Result < Option < i64 > , String > {
366
366
let args: & [ & dyn ToSql ] = & [ & block_height. to_sql ( ) . unwrap ( ) ] ;
367
367
let mut stmt = inscriptions_db_conn
368
368
. prepare (
@@ -373,25 +373,28 @@ pub fn find_latest_inscription_number_at_block_height(
373
373
. query ( args)
374
374
. map_err ( |e| format ! ( "unable to query inscriptions: {}" , e. to_string( ) ) ) ?;
375
375
while let Ok ( Some ( row) ) = rows. next ( ) {
376
- let inscription_number: u64 = row. get ( 0 ) . unwrap ( ) ;
376
+ let inscription_number: i64 = row. get ( 0 ) . unwrap ( ) ;
377
377
return Ok ( Some ( inscription_number) ) ;
378
378
}
379
379
Ok ( None )
380
380
}
381
381
382
- pub fn find_latest_inscription_number (
382
+ pub fn find_latest_cursed_inscription_number_at_block_height (
383
+ block_height : & u64 ,
383
384
inscriptions_db_conn : & Connection ,
384
385
_ctx : & Context ,
385
- ) -> Result < Option < u64 > , String > {
386
- let args: & [ & dyn ToSql ] = & [ ] ;
386
+ ) -> Result < Option < i64 > , String > {
387
+ let args: & [ & dyn ToSql ] = & [ & block_height . to_sql ( ) . unwrap ( ) ] ;
387
388
let mut stmt = inscriptions_db_conn
388
389
. prepare (
389
- "SELECT inscription_number FROM inscriptions ORDER BY inscription_number DESC LIMIT 1" ,
390
+ "SELECT inscription_number FROM inscriptions WHERE block_height < ? ORDER BY inscription_number ASC LIMIT 1" ,
390
391
)
391
- . unwrap ( ) ;
392
- let mut rows = stmt. query ( args) . unwrap ( ) ;
392
+ . map_err ( |e| format ! ( "unable to query inscriptions: {}" , e. to_string( ) ) ) ?;
393
+ let mut rows = stmt
394
+ . query ( args)
395
+ . map_err ( |e| format ! ( "unable to query inscriptions: {}" , e. to_string( ) ) ) ?;
393
396
while let Ok ( Some ( row) ) = rows. next ( ) {
394
- let inscription_number: u64 = row. get ( 0 ) . unwrap ( ) ;
397
+ let inscription_number: i64 = row. get ( 0 ) . unwrap ( ) ;
395
398
return Ok ( Some ( inscription_number) ) ;
396
399
}
397
400
Ok ( None )
@@ -428,7 +431,7 @@ pub fn find_inscription_with_id(
428
431
while let Ok ( Some ( row) ) = rows. next ( ) {
429
432
let inscription_block_hash: String = row. get ( 2 ) . unwrap ( ) ;
430
433
if block_hash. eq ( & inscription_block_hash) {
431
- let inscription_number: u64 = row. get ( 0 ) . unwrap ( ) ;
434
+ let inscription_number: i64 = row. get ( 0 ) . unwrap ( ) ;
432
435
let ordinal_number: u64 = row. get ( 1 ) . unwrap ( ) ;
433
436
let traversal = TraversalResult {
434
437
inscription_number,
@@ -451,7 +454,7 @@ pub fn find_all_inscriptions(
451
454
let mut results: BTreeMap < u64 , Vec < ( TransactionIdentifier , TraversalResult ) > > = BTreeMap :: new ( ) ;
452
455
let mut rows = stmt. query ( args) . unwrap ( ) ;
453
456
while let Ok ( Some ( row) ) = rows. next ( ) {
454
- let inscription_number: u64 = row. get ( 0 ) . unwrap ( ) ;
457
+ let inscription_number: i64 = row. get ( 0 ) . unwrap ( ) ;
455
458
let ordinal_number: u64 = row. get ( 1 ) . unwrap ( ) ;
456
459
let block_height: u64 = row. get ( 2 ) . unwrap ( ) ;
457
460
let transaction_id = {
@@ -476,7 +479,7 @@ pub fn find_all_inscriptions(
476
479
#[ derive( Clone , Debug ) ]
477
480
pub struct WatchedSatpoint {
478
481
pub inscription_id : String ,
479
- pub inscription_number : u64 ,
482
+ pub inscription_number : i64 ,
480
483
pub ordinal_number : u64 ,
481
484
pub offset : u64 ,
482
485
}
@@ -503,7 +506,7 @@ pub fn find_watched_satpoint_for_inscription(
503
506
. map_err ( |e| format ! ( "unable to query inscriptions table: {}" , e. to_string( ) ) ) ?;
504
507
while let Ok ( Some ( row) ) = rows. next ( ) {
505
508
let inscription_id: String = row. get ( 0 ) . unwrap ( ) ;
506
- let inscription_number: u64 = row. get ( 1 ) . unwrap ( ) ;
509
+ let inscription_number: i64 = row. get ( 1 ) . unwrap ( ) ;
507
510
let ordinal_number: u64 = row. get ( 2 ) . unwrap ( ) ;
508
511
let offset: u64 = row. get ( 3 ) . unwrap ( ) ;
509
512
let block_height: u64 = row. get ( 4 ) . unwrap ( ) ;
@@ -537,7 +540,7 @@ pub fn find_inscriptions_at_wached_outpoint(
537
540
. map_err ( |e| format ! ( "unable to query inscriptions table: {}" , e. to_string( ) ) ) ?;
538
541
while let Ok ( Some ( row) ) = rows. next ( ) {
539
542
let inscription_id: String = row. get ( 0 ) . unwrap ( ) ;
540
- let inscription_number: u64 = row. get ( 1 ) . unwrap ( ) ;
543
+ let inscription_number: i64 = row. get ( 1 ) . unwrap ( ) ;
541
544
let ordinal_number: u64 = row. get ( 2 ) . unwrap ( ) ;
542
545
let offset: u64 = row. get ( 3 ) . unwrap ( ) ;
543
546
results. push ( WatchedSatpoint {
@@ -813,7 +816,7 @@ pub async fn fetch_and_cache_blocks_in_hord_db(
813
816
814
817
#[ derive( Clone , Debug ) ]
815
818
pub struct TraversalResult {
816
- pub inscription_number : u64 ,
819
+ pub inscription_number : i64 ,
817
820
pub ordinal_number : u64 ,
818
821
pub transfers : u32 ,
819
822
}
@@ -834,7 +837,7 @@ pub fn retrieve_satoshi_point_using_lazy_storage(
834
837
blocks_db : & DB ,
835
838
block_identifier : & BlockIdentifier ,
836
839
transaction_identifier : & TransactionIdentifier ,
837
- inscription_number : u64 ,
840
+ inscription_number : i64 ,
838
841
traversals_cache : Arc <
839
842
DashMap < ( u32 , [ u8 ; 8 ] ) , LazyBlockTransaction , BuildHasherDefault < FxHasher > > ,
840
843
> ,
0 commit comments