refactor: try make better

Cargo.toml

@@ -16,6 +16,5 @@ serde_json = "1.0.116"
 serde-wasm-bindgen = "0.6.5"
 serde_with = "3.7.0"
 js-sys = "0.3.69"
-tsify = "0.4.5"
-gloo-utils = { version = "0.2", features = ["serde"] }
+tsify = { version = "0.4.5", features = ["js"] }
 anyhow = { version = "1.0.56", features = ["backtrace"] }

examples/etching.js

@@ -1,12 +1,15 @@
-import { SpacedRune, Terms, Etching } from '../runestone/index.js';
+import { SpacedRune, Terms, Etching, Rune } from '../runestone/index.js';
 
 const spacedRune = SpacedRune.fromString('Z•Z•Z•Z•Z•FEHU•Z•Z•Z•Z•Z');
-const etching = new Etching(spacedRune);
-console.log(JSON.stringify(etching));
-
-etching.terms = new Terms(420n, 2n);
-etching.divisibility = 2;
-etching.premine = 100n;
-etching.symbol = '?';
-etching.turbo = false;
-console.log(JSON.stringify(etching));
+const terms = new Terms({ amount: 420n, cap: 2n });
+console.log(spacedRune.rune);
+const etching = new Etching({
+  rune: spacedRune.rune,
+  spacers: spacedRune.spacers,
+  premine: 100n,
+  terms: new Terms({ amount: 420n, cap: 2n }),
+  divisibility: 2,
+  symbol: '?',
+  turbo: true,
+});
+console.log(etching.toJSON());

examples/rune.js

@@ -1,12 +1,14 @@
 import { Rune } from '../runestone/index.js';
 
 const rune = new Rune(67090369340599840949n);
-
 console.log('value:', rune.value);
+rune.value = 67090369340599840950n;
+console.log('value:', rune.value, rune.toString());
+
 console.log('isReserved:', rune.isReserved());
 console.log('name:', rune.toString());
 console.log('commitment:', rune.commitment());
-console.log('json:', JSON.stringify(rune));
+console.log('json:', rune.toJSON());
 
 console.log(Rune.firstRuneHeight('main'));
 console.log(Rune.fromString('ZZZZZFEHUZZZZZ').value);

examples/rune_id.js

@@ -2,6 +2,10 @@ import { RuneId } from '../runestone/index.js';
 
 const runeId = new RuneId(840000n, 1);
 console.log('json:', JSON.stringify(runeId));
+
+runeId.tx = 2;
+console.log('json:', JSON.stringify(runeId));
+
 console.log('runeId:', runeId.toString(), runeId.block, runeId.tx);
 console.log('delta:', runeId.delta(new RuneId(840001n, 10000)).start);
 console.log('next:', runeId.next(1n, 1).toString());

examples/runestone.js

@@ -22,60 +22,55 @@ const tx = {
       value: 0,
     },
   ],
-  // input: [],
 };
 
 const runestone = Runestone.decipher(tx);
 
-console.log('runestone etching:', JSON.stringify(runestone, null, 2));
+console.log('runestone etching:', runestone.toJSON());
 console.log(runestone.encipher());
 
 console.log(
   'runestone mint:',
-  JSON.stringify(
-    Runestone.decipher({
-      output: [
-        {
-          script_pubkey:
-            '51206da59bfd6b08756375d62e8e38e55db6edaaf20a12b3e6e7f3aa36afcfc3c931',
-          value: 0,
-        },
-        {
-          script_pubkey: '6a5d0914f8a83314f0031600',
-          value: 0,
-        },
-      ],
-    }),
-    null,
-    2
-  )
+  Runestone.decipher({
+    output: [
+      {
+        script_pubkey:
+          '51206da59bfd6b08756375d62e8e38e55db6edaaf20a12b3e6e7f3aa36afcfc3c931',
+        value: 0,
+      },
+      {
+        script_pubkey: '6a5d0914f8a83314f0031600',
+        value: 0,
+      },
+    ],
+  }).toJSON()
 );
 
 console.log(
   'runestone edicts:',
-  JSON.stringify(
-    Runestone.decipher({
-      output: [
-        {
-          script_pubkey: '6a5d0800c0a23301d00f00',
-          value: 0,
-        },
-      ],
-    }),
-    null,
-    2
-  )
+  Runestone.decipher({
+    output: [
+      {
+        script_pubkey: '6a5d0800c0a23301d00f00',
+        value: 0,
+      },
+    ],
+  }).toJSON()
 );
 
-const rs = new Runestone();
-
-const terms = new Terms(69n, 420n);
-const etching = new Etching(SpacedRune.fromString('HI•JEASON'));
-etching.premine = 100n;
-etching.terms = terms;
-rs.etching = etching;
+const spacedRune = SpacedRune.fromString('HI•JEASON');
+const etching = new Etching({
+  rune: 1n,
+  spacers: 2,
+  premine: 100n,
+  // terms: new Terms({ amount: 69n, cap: 420n }),
+});
+const rs = new Runestone({
+  etching,
+});
+console.log(rs.toJSON());
 
 const edict = new Edict(new RuneId(840000n, 1), 10000n, 0);
 rs.edicts = [edict];
-console.log(JSON.stringify(rs, null, 2));
-console.log(rs.encipher());
+console.log(rs.toJSON());
+console.log(rs.encipher());

examples/spaced_rune.js

@@ -3,8 +3,8 @@ import { SpacedRune, Rune } from '../runestone/index.js';
 const rune = new Rune(67090369340599840949n);
 const spacedRune = new SpacedRune(rune, 7967);
 
-console.log('spaced rune:', spacedRune.toString());
-console.log('spaced rune:', JSON.stringify(spacedRune));
+console.log('spaced rune:', spacedRune.name);
+console.log('spaced rune:', spacedRune.toJSON());
 console.log(
   'rune value:',
   SpacedRune.fromString('Z•Z•Z•Z•Z•FEHU•Z•Z•Z•Z•Z').rune.value
@@ -13,3 +13,6 @@ console.log(
   'rune spacers:',
   SpacedRune.fromString('Z•Z•Z•Z•Z•FEHU•Z•Z•Z•Z•Z').spacers
 );
+
+spacedRune.spacers = 8888;
+console.log('spaced rune:', spacedRune.name);

examples/terms.js

@@ -1,10 +1,18 @@
 import { Range, Terms } from '../runestone/index.js';
 
-const terms = new Terms(420n, 2n);
+console.log(JSON.stringify(new Terms()));
+const terms = new Terms({
+  amount: 420n,
+  cap: 2n,
+  offset: { start: 1n },
+});
+console.log(JSON.stringify(terms));
+
+terms.amount = 20202n;
 console.log(JSON.stringify(terms));
 
 terms.height = new Range(1n, 2n);
 console.log(JSON.stringify(terms));
 
 terms.offset = new Range(1n, 2n);
-console.log(JSON.stringify(terms));
+console.log(JSON.stringify(terms));

src/create_tx.rs

@@ -2,19 +2,13 @@ use super::ord::{
     fee_rate::FeeRate, inscription_id::InscriptionId, transaction_builder::Target,
     transaction_builder::TransactionBuilder,
 };
-use super::transaction::Transaction;
+use super::*;
 use bitcoin::{
     address::{Address, NetworkUnchecked},
     Amount, OutPoint, TxOut,
 };
 use ordinals::SatPoint;
-use serde::{Deserialize, Serialize};
-use std::{
-    collections::{BTreeMap, BTreeSet},
-    str::FromStr,
-};
-use tsify::Tsify;
-use wasm_bindgen::prelude::*;
+use std::collections::{BTreeMap, BTreeSet};
 use wasm_bindgen::throw_str;
 
 #[derive(Default, Serialize, Deserialize, Tsify)]