@@ -236,7 +246,12 @@
- OP_RETURN {{ vout.scriptpubkey_asm | hex2ascii }}
+ OP_RETURN
+ @if (vout.isRunestone) {
+
+ } @else {
+ {{ vout.scriptpubkey_asm | hex2ascii }}
+ }
{{ vout.scriptpubkey_type | scriptpubkeyType }}
@@ -276,6 +291,15 @@
+
+
+ |
+
+ |
+
diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.scss b/frontend/src/app/components/transactions-list/transactions-list.component.scss
index 280e36b0f..335464060 100644
--- a/frontend/src/app/components/transactions-list/transactions-list.component.scss
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.scss
@@ -175,4 +175,15 @@ h2 {
.witness-item {
overflow: hidden;
}
-}
\ No newline at end of file
+}
+
+.badge-ord {
+ background-color: var(--grey);
+ position: relative;
+ top: -2px;
+ font-size: 81%;
+ border: 0;
+ &.primary {
+ background-color: var(--primary);
+ }
+}
diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.ts b/frontend/src/app/components/transactions-list/transactions-list.component.ts
index 316a6ab85..1f45d5241 100644
--- a/frontend/src/app/components/transactions-list/transactions-list.component.ts
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.ts
@@ -11,6 +11,10 @@ import { BlockExtended } from '../../interfaces/node-api.interface';
import { ApiService } from '../../services/api.service';
import { PriceService } from '../../services/price.service';
import { StorageService } from '../../services/storage.service';
+import { OrdApiService } from '../../services/ord-api.service';
+import { Inscription } from '../ord-data/ord-data.component';
+import { Runestone } from '../../shared/ord/rune/runestone';
+import { Etching } from '../../shared/ord/rune/etching';
@Component({
selector: 'app-transactions-list',
@@ -50,12 +54,14 @@ export class TransactionsListComponent implements OnInit, OnChanges {
outputRowLimit: number = 12;
showFullScript: { [vinIndex: number]: boolean } = {};
showFullWitness: { [vinIndex: number]: { [witnessIndex: number]: boolean } } = {};
+ showOrdData: { [key: string]: { show: boolean; inscriptions?: Inscription[]; runestone?: Runestone, runeInfo?: { [id: string]: { etching: Etching; txid: string; } }; } } = {};
constructor(
public stateService: StateService,
private cacheService: CacheService,
private electrsApiService: ElectrsApiService,
private apiService: ApiService,
+ private ordApiService: OrdApiService,
private assetsService: AssetsService,
private ref: ChangeDetectorRef,
private priceService: PriceService,
@@ -239,6 +245,24 @@ export class TransactionsListComponent implements OnInit, OnChanges {
tap((price) => tx['price'] = price),
).subscribe();
}
+
+ // Check for ord data fingerprints in inputs and outputs
+ if (this.stateService.network !== 'liquid' && this.stateService.network !== 'liquidtestnet') {
+ for (let i = 0; i < tx.vin.length; i++) {
+ if (tx.vin[i].prevout?.scriptpubkey_type === 'v1_p2tr' && tx.vin[i].witness?.length) {
+ const hasAnnex = tx.vin[i].witness?.[tx.vin[i].witness.length - 1].startsWith('50');
+ if (tx.vin[i].witness.length > (hasAnnex ? 2 : 1) && tx.vin[i].witness[tx.vin[i].witness.length - (hasAnnex ? 3 : 2)].includes('0063036f7264')) {
+ tx.vin[i].isInscription = true;
+ }
+ }
+ }
+ for (let i = 0; i < tx.vout.length; i++) {
+ if (tx.vout[i]?.scriptpubkey?.startsWith('6a5d')) {
+ tx.vout[i].isRunestone = true;
+ break;
+ }
+ }
+ }
});
if (this.blockTime && this.transactions?.length && this.currency) {
@@ -372,6 +396,40 @@ export class TransactionsListComponent implements OnInit, OnChanges {
this.showFullWitness[vinIndex][witnessIndex] = !this.showFullWitness[vinIndex][witnessIndex];
}
+ toggleOrdData(txid: string, type: 'vin' | 'vout', index: number) {
+ const tx = this.transactions.find((tx) => tx.txid === txid);
+ if (!tx) {
+ return;
+ }
+
+ const key = tx.txid + '-' + type + '-' + index;
+ this.showOrdData[key] = this.showOrdData[key] || { show: false };
+
+ if (type === 'vin') {
+
+ if (!this.showOrdData[key].inscriptions) {
+ const hasAnnex = tx.vin[index].witness?.[tx.vin[index].witness.length - 1].startsWith('50');
+ this.showOrdData[key].inscriptions = this.ordApiService.decodeInscriptions(tx.vin[index].witness[tx.vin[index].witness.length - (hasAnnex ? 3 : 2)]);
+ }
+ this.showOrdData[key].show = !this.showOrdData[key].show;
+
+ } else if (type === 'vout') {
+
+ if (!this.showOrdData[key].runestone) {
+ this.ordApiService.decodeRunestone$(tx).pipe(
+ tap((runestone) => {
+ if (runestone) {
+ Object.assign(this.showOrdData[key], runestone);
+ this.ref.markForCheck();
+ }
+ }),
+ ).subscribe();
+ }
+ this.showOrdData[key].show = !this.showOrdData[key].show;
+
+ }
+ }
+
ngOnDestroy(): void {
this.outspendsSubscription.unsubscribe();
this.currencyChangeSubscription?.unsubscribe();
diff --git a/frontend/src/app/interfaces/electrs.interface.ts b/frontend/src/app/interfaces/electrs.interface.ts
index 5bc5bfc1d..95a749b60 100644
--- a/frontend/src/app/interfaces/electrs.interface.ts
+++ b/frontend/src/app/interfaces/electrs.interface.ts
@@ -74,6 +74,8 @@ export interface Vin {
issuance?: Issuance;
// Custom
lazy?: boolean;
+ // Ord
+ isInscription?: boolean;
}
interface Issuance {
@@ -98,6 +100,8 @@ export interface Vout {
valuecommitment?: number;
asset?: string;
pegout?: Pegout;
+ // Ord
+ isRunestone?: boolean;
}
interface Pegout {
diff --git a/frontend/src/app/services/electrs-api.service.ts b/frontend/src/app/services/electrs-api.service.ts
index 8e991782b..f1468f8aa 100644
--- a/frontend/src/app/services/electrs-api.service.ts
+++ b/frontend/src/app/services/electrs-api.service.ts
@@ -107,6 +107,10 @@ export class ElectrsApiService {
return this.httpClient.get(this.apiBaseUrl + this.apiBasePath + '/api/block-height/' + height, {responseType: 'text'});
}
+ getBlockTxId$(hash: string, index: number): Observable {
+ return this.httpClient.get(this.apiBaseUrl + this.apiBasePath + '/api/block/' + hash + '/txid/' + index, { responseType: 'text' });
+ }
+
getAddress$(address: string): Observable {
return this.httpClient.get(this.apiBaseUrl + this.apiBasePath + '/api/address/' + address);
}
diff --git a/frontend/src/app/services/ord-api.service.ts b/frontend/src/app/services/ord-api.service.ts
new file mode 100644
index 000000000..bc726e839
--- /dev/null
+++ b/frontend/src/app/services/ord-api.service.ts
@@ -0,0 +1,114 @@
+import { Injectable } from '@angular/core';
+import { catchError, forkJoin, map, Observable, of, switchMap, tap } from 'rxjs';
+import { Inscription } from '../components/ord-data/ord-data.component';
+import { Transaction } from '../interfaces/electrs.interface';
+import { getNextInscriptionMark, hexToBytes, extractInscriptionData } from '../shared/ord/inscription.utils';
+import { Runestone } from '../shared/ord/rune/runestone';
+import { Etching } from '../shared/ord/rune/etching';
+import { ElectrsApiService } from './electrs-api.service';
+import { UNCOMMON_GOODS } from '../shared/ord/rune/runestone';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class OrdApiService {
+
+ constructor(
+ private electrsApiService: ElectrsApiService,
+ ) { }
+
+ decodeRunestone$(tx: Transaction): Observable<{ runestone: Runestone, runeInfo: { [id: string]: { etching: Etching; txid: string; } } }> {
+ const runestoneTx = { vout: tx.vout.map(vout => ({ scriptpubkey: vout.scriptpubkey })) };
+ const decipher = Runestone.decipher(runestoneTx);
+
+ // For now, ignore cenotaphs
+ let message = decipher.isSome() ? decipher.unwrap() : null;
+ if (message?.type === 'cenotaph') {
+ return of({ runestone: null, runeInfo: {} });
+ }
+
+ const runestone = message as Runestone;
+ const runeInfo: { [id: string]: { etching: Etching; txid: string; } } = {};
+ const runesToFetch: Set = new Set();
+
+ if (runestone) {
+ if (runestone.mint.isSome()) {
+ const mint = runestone.mint.unwrap().toString();
+
+ if (mint === '1:0') {
+ runeInfo[mint] = { etching: UNCOMMON_GOODS, txid: '0000000000000000000000000000000000000000000000000000000000000000' };
+ } else {
+ runesToFetch.add(mint);
+ }
+ }
+
+ if (runestone.edicts.length) {
+ runestone.edicts.forEach(edict => {
+ runesToFetch.add(edict.id.toString());
+ });
+ }
+
+ if (runesToFetch.size) {
+ const runeEtchingObservables = Array.from(runesToFetch).map(runeId => {
+ return this.getEtchingFromRuneId$(runeId).pipe(
+ tap(etching => {
+ if (etching) {
+ runeInfo[runeId] = etching;
+ }
+ })
+ );
+ });
+
+ return forkJoin(runeEtchingObservables).pipe(
+ map(() => {
+ return { runestone: runestone, runeInfo };
+ })
+ );
+ }
+ }
+
+ return of({ runestone: runestone, runeInfo });
+ }
+
+ // Get etching from runeId by looking up the transaction that etched the rune
+ getEtchingFromRuneId$(runeId: string): Observable<{ etching: Etching; txid: string; }> {
+ const [blockNumber, txIndex] = runeId.split(':');
+
+ return this.electrsApiService.getBlockHashFromHeight$(parseInt(blockNumber)).pipe(
+ switchMap(blockHash => this.electrsApiService.getBlockTxId$(blockHash, parseInt(txIndex))),
+ switchMap(txId => this.electrsApiService.getTransaction$(txId)),
+ switchMap(tx => {
+ const decipheredMessage = Runestone.decipher(tx);
+ if (decipheredMessage.isSome()) {
+ const message = decipheredMessage.unwrap();
+ if (message?.type === 'runestone' && message.etching.isSome()) {
+ return of({ etching: message.etching.unwrap(), txid: tx.txid });
+ }
+ }
+ return of(null);
+ }),
+ catchError(() => of(null))
+ );
+ }
+
+ decodeInscriptions(witness: string): Inscription[] | null {
+
+ const inscriptions: Inscription[] = [];
+ const raw = hexToBytes(witness);
+ let startPosition = 0;
+
+ while (true) {
+ const pointer = getNextInscriptionMark(raw, startPosition);
+ if (pointer === -1) break;
+
+ const inscription = extractInscriptionData(raw, pointer);
+ if (inscription) {
+ inscriptions.push(inscription);
+ }
+
+ startPosition = pointer;
+ }
+
+ return inscriptions;
+ }
+}
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index 92b461548..25a60a70f 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -102,6 +102,7 @@ import { AccelerationsListComponent } from '../components/acceleration/accelerat
import { PendingStatsComponent } from '../components/acceleration/pending-stats/pending-stats.component';
import { AccelerationStatsComponent } from '../components/acceleration/acceleration-stats/acceleration-stats.component';
import { AccelerationSparklesComponent } from '../components/acceleration/sparkles/acceleration-sparkles.component';
+import { OrdDataComponent } from '../components/ord-data/ord-data.component';
import { BlockViewComponent } from '../components/block-view/block-view.component';
import { EightBlocksComponent } from '../components/eight-blocks/eight-blocks.component';
@@ -229,6 +230,7 @@ import { OnlyVsizeDirective, OnlyWeightDirective } from './components/weight-dir
AccelerationStatsComponent,
PendingStatsComponent,
AccelerationSparklesComponent,
+ OrdDataComponent,
HttpErrorComponent,
TwitterWidgetComponent,
FaucetComponent,
@@ -361,6 +363,7 @@ import { OnlyVsizeDirective, OnlyWeightDirective } from './components/weight-dir
AccelerationStatsComponent,
PendingStatsComponent,
AccelerationSparklesComponent,
+ OrdDataComponent,
HttpErrorComponent,
TwitterWidgetComponent,
TwitterLogin,
| |