ecash-agora 1.0.1 → 2.0.0

package/README.md

@@ -55,8 +55,8 @@ You can create a "one shot" offer (one that offers all or nothing) using `AgoraO
 
 ```ts
 const enforcedOutputs: TxOutput[] = [
-    { value: 0, script: slpSend(tokenId, SLP_NFT1_CHILD, [0, 1]) },
-    { value: 80000, script: sellerP2pkh },
+    { sats: 0n, script: slpSend(tokenId, SLP_NFT1_CHILD, [0n, 1n]) },
+    { sats: 80000n, script: sellerP2pkh },
 ];
 const agoraOneshot = new AgoraOneshot({
     enforcedOutputs,
@@ -79,7 +79,7 @@ const txBuilder = new TxBuilder({
                     outIdx: 1,
                 },
                 signData: {
-                    value: 546,
+                    sats: 546n,
                     redeemScript: agoraScript,
                 },
             },
@@ -96,7 +96,7 @@ const txBuilder = new TxBuilder({
                     outIdx: 0,
                 },
                 signData: {
-                    value: 90000,
+                    sats: 90000n,
                     outputScript: buyerP2pkh,
                 },
             },
@@ -105,11 +105,11 @@ const txBuilder = new TxBuilder({
     ],
     outputs: [
         {
-            value: 0,
-            script: slpSend(tokenId, SLP_NFT1_CHILD, [0, 1]),
+            sats: 0n,
+            script: slpSend(tokenId, SLP_NFT1_CHILD, [0n, 1n]),
         },
-        { value: 80000, script: sellerP2pkh },
-        { value: 546, script: buyerP2pkh },
+        { sats: 80000n, script: sellerP2pkh },
+        { sats: 546n, script: buyerP2pkh },
     ],
 });
 const acceptTx = txBuilder.sign();
@@ -186,3 +186,8 @@ Running from `bitcoin-abc/modules/ecash-agora` if your build dir is `bitcoin-abc
 ### 1.0.1
 
 -   Do not validate for unspendable offer creation when we calculate fee in `acceptFeeSats()` [D17648](https://reviews.bitcoinabc.org/D17648)
+
+### 2.0.0
+
+-   Improve types and shapes in line with chronik proto updates [D17650](https://reviews.bitcoinabc.org/D17650)
+-   Introduce 'atoms' as term for base unit of tokens. Implement in lib. The term "token" is ambiguous as it is not clear that we are talking about base tokens.

package/agora.py

@@ -321,7 +321,7 @@ class AgoraOneshot:
         op_return_script = slp_send(
             token_type=self.token.token_type,
             token_id=self.token.token_id,
-            amounts=[0, self.token.amount],
+            amounts=[0, self.token.atoms],
         )
         return (
             bytes(8)
@@ -744,11 +744,11 @@ def parse_partial(pushdata: bytes, token) -> Optional[AgoraPartial]:
     token_trunc_factor = 1 << (8 * num_token_trunc_bytes)
 
     # Offers must have a losslessly truncatable token amount
-    if token.amount % token_trunc_factor != 0:
+    if token.atoms % token_trunc_factor != 0:
         return None
 
     partial_alp = AgoraPartial(
-        trunc_tokens=token.amount // token_trunc_factor,
+        trunc_tokens=token.atoms // token_trunc_factor,
         num_token_trunc_bytes=num_token_trunc_bytes,
         token_scale_factor=token_scale_factor,
         scaled_trunc_tokens_per_trunc_sat=scaled_trunc_tokens_per_trunc_sat,

package/dist/ad.js

@@ -26,7 +26,7 @@ function parseAgoraTx(tx) {
     let opreturnScript;
     switch (tokenEntry.tokenType.protocol) {
         case 'SLP':
-            opreturnScript = (0, ecash_lib_1.slpSend)(tokenEntry.tokenId, tokenEntry.tokenType.number, [0, BigInt(offerOutput.token.amount)]);
+            opreturnScript = (0, ecash_lib_1.slpSend)(tokenEntry.tokenId, tokenEntry.tokenType.number, [0n, offerOutput.token.atoms]);
             break;
         case 'ALP':
             // ALP not implemented yet
@@ -73,7 +73,7 @@ function parseAgoraTx(tx) {
         txBuilderInput: {
             prevOut: outpoint,
             signData: {
-                value: offerOutput.value,
+                sats: offerOutput.sats,
                 redeemScript: expectedAgoraScript,
             },
         },

package/dist/ad.js.map

@@ -1 +1 @@
-{"version":3,"file":"ad.js","sourceRoot":"","sources":["../src/ad.ts"],"names":[],"mappings":";AAAA,4CAA4C;AAC5C,mEAAmE;AACnE,sEAAsE;;;AAGtE,yCAWmB;AACnB,2CAAiD;AACjD,6CAA4C;AAa5C,SAAgB,YAAY,CAAC,EAAc;IACvC,IAAI,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,IAAI,EAAE,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,MAAM,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC7B,MAAM,WAAW,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAClC,IAAI,WAAW,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAClC,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,MAAM,UAAU,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACtC,IAAI,cAAsB,CAAC;IAC3B,QAAQ,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QACpC,KAAK,KAAK;YACN,cAAc,GAAG,IAAA,mBAAO,EACpB,UAAU,CAAC,OAAO,EAClB,UAAU,CAAC,SAAS,CAAC,MAAM,EAC3B,CAAC,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CACxC,CAAC;YACF,MAAM;QACV,KAAK,KAAK;YACN,0BAA0B;YAC1B,OAAO,SAAS,CAAC;IACzB,CAAC;IACD,MAAM,SAAS,GAAG,IAAI,kBAAM,CAAC,IAAA,mBAAO,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;IAC3D,MAAM,QAAQ,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAC7C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,IAAI,OAAwB,CAAC;IAC7B,IAAI,mBAA2B,CAAC;IAChC,IAAI,iBAAyB,CAAC;IAC9B,QAAQ,QAAQ,CAAC,eAAe,EAAE,CAAC;QAC/B,KAAK,yBAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC;YACjC,IAAI,YAA0B,CAAC;YAC/B,IAAI,CAAC;gBACD,YAAY,GAAG,yBAAY,CAAC,gBAAgB,CACxC,QAAQ,CAAC,YAAY,EACrB,cAAc,CACjB,CAAC;YACN,CAAC;YAAC,OAAO,EAAE,EAAE,CAAC;gBACV,OAAO,SAAS,CAAC;YACrB,CAAC;YACD,OAAO,GAAG;gBACN,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,YAAY;aACvB,CAAC;YACF,mBAAmB,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;YAC5C,iBAAiB,GAAG,kBAAM,CAAC,IAAI,CAC3B,IAAA,qBAAS,EAAC,mBAAmB,CAAC,QAAQ,CAAC,CAC1C,CAAC;YACF,MAAM;QACV,CAAC;QACD;YACI,OAAO,SAAS,CAAC;IACzB,CAAC;IACD,IAAI,WAAW,CAAC,YAAY,KAAK,IAAA,iBAAK,EAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACjE,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,MAAM,QAAQ,GAAG;QACb,IAAI,EAAE,EAAE,CAAC,IAAI;QACb,MAAM,EAAE,CAAC;KACZ,CAAC;IACF,OAAO;QACH,GAAG,OAAO;QACV,QAAQ;QACR,cAAc,EAAE;YACZ,OAAO,EAAE,QAAQ;YACjB,QAAQ,EAAE;gBACN,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,YAAY,EAAE,mBAAmB;aACpC;SACJ;QACD,OAAO,EAAE,WAAW,CAAC,OAAO;KAC/B,CAAC;AACN,CAAC;AAhFD,oCAgFC;AAQD;;;IAGI;AACJ,MAAM,yBAAyB,GAAG,CAAC,CAAC;AAEpC,SAAS,gBAAgB,CAAC,SAAiB;IACvC,MAAM,GAAG,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;IAC5B,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,IAAI,EAAkB,CAAC;IACvB,OAAO,CAAC,EAAE,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QACvB,IAAI,CAAC,IAAA,oBAAQ,EAAC,EAAE,CAAC,EAAE,CAAC;YAChB,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,GAAG,yBAAyB,EAAE,CAAC;QAC9C,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,IAAA,sBAAU,EAAC,OAAO,CAAC,IAAI,8BAAkB,EAAE,CAAC;QAC5C,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,MAAM,eAAe,GAAG,IAAA,sBAAU,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7C,MAAM,YAAY,GAAG,IAAI,kBAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IAC/D,OAAO;QACH,eAAe;QACf,QAAQ,EAAE,cAAc;QACxB,YAAY;KACf,CAAC;AACN,CAAC"}
+{"version":3,"file":"ad.js","sourceRoot":"","sources":["../src/ad.ts"],"names":[],"mappings":"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"}

package/dist/agora.d.ts

@@ -15,13 +15,11 @@ export type AgoraOfferStatus = 'OPEN' | 'TAKEN' | 'CANCELED';
 /** If an offer is TAKEN */
 export interface TakenInfo {
     /** satoshis paid in taking an offer */
-    satoshisPaid: number;
+    sats: bigint;
     /**
-     * amount of token purchased in base tokens
-     * (aka token satoshis, the token qty without
-     * decimals applied)
+     * amount of token purchased in atoms aka base tokens
      */
-    baseTokens: string;
+    atoms: bigint;
     /** taker outputScript as a hex string*/
     takerScriptHex: string;
 }
@@ -75,13 +73,13 @@ export declare class AgoraOffer {
         fuelInputs: TxBuilderInput[];
         /** Script to send the tokens and the leftover sats (if any) to. */
         recipientScript: Script;
-        /** For partial offers: Number of accepted tokens */
-        acceptedTokens?: bigint;
+        /** For partial offers: Number of accepted atoms (base tokens) */
+        acceptedAtoms?: bigint;
         /** Dust amount to use for the token output. */
-        dustAmount?: number;
+        dustSats?: bigint;
         /** Fee per kB to use when building the tx. */
-        feePerKb?: number;
-        /**  Allow accepting an offer such that the remaining quantity is unacceptable */
+        feePerKb?: bigint;
+        /** Allow accepting an offer such that the remaining quantity is unacceptable */
         allowUnspendable?: boolean;
     }): Tx;
     /**
@@ -96,8 +94,8 @@ export declare class AgoraOffer {
         /** Extra inputs */
         extraInputs?: TxBuilderInput[];
         /** Fee per kB to use when building the tx. */
-        feePerKb?: number;
-        acceptedTokens?: bigint;
+        feePerKb?: bigint;
+        acceptedAtoms?: bigint;
     }): bigint;
     private _acceptTxBuilder;
     /**
@@ -124,9 +122,9 @@ export declare class AgoraOffer {
         /** Script to send canceled tokens and the leftover sats (if any) to. */
         recipientScript: Script;
         /** Dust amount to use for the token output. */
-        dustAmount?: number;
+        dustSats?: bigint;
         /** Fee per kB to use when building the tx. */
-        feePerKb?: number;
+        feePerKb?: bigint;
     }): Tx;
     /**
      * How many extra satoshis are required to fuel cancelling this offer,
@@ -145,14 +143,14 @@ export declare class AgoraOffer {
         /** Extra inputs */
         extraInputs?: TxBuilderInput[];
         /** Fee per kB to use when building the tx. */
-        feePerKb?: number;
+        feePerKb?: bigint;
     }): bigint;
     private _cancelTxBuilder;
     /**
      * How many satoshis are asked to accept this offer, excluding tx fees.
      * This is what should be displayed to the user as the price.
      **/
-    askedSats(acceptedTokens?: bigint): bigint;
+    askedSats(acceptedAtoms?: bigint): bigint;
 }
 /** Which txs to query (confirmed, unconfirmed, reverse history) */
 export type TxHistoryTable = 'CONFIRMED' | 'UNCONFIRMED' | 'HISTORY';
@@ -187,12 +185,12 @@ export interface AgoraHistoryResult {
 export declare class Agora {
     private chronik;
     private plugin;
-    private dustAmount;
+    private dustSats;
     /**
      * Create an Agora instance. The provided Chronik instance must have the
      * "agora" plugin loaded.
      **/
-    constructor(chronik: ChronikClient, dustAmount?: number);
+    constructor(chronik: ChronikClient, dustSats?: bigint);
     /**
      * Query all the token IDs, fungible and non-fungible ones, that have active
      * Agora offers.

package/dist/agora.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agora.d.ts","sourceRoot":"","sources":["../src/agora.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agora.d.ts","sourceRoot":"","sources":["../src/agora.ts"],"names":[],"mappings":"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"}

package/dist/agora.js

@@ -40,8 +40,8 @@ class AgoraOffer {
      * `fuelInputs` has to provide enough sats for this offer to cover ask + tx fee.
      * */
     acceptTx(params) {
-        const dustAmount = params.dustAmount ?? ecash_lib_1.DEFAULT_DUST_LIMIT;
-        const feePerKb = params.feePerKb ?? ecash_lib_1.DEFAULT_FEE_PER_KB;
+        const dustSats = params.dustSats ?? ecash_lib_1.DEFAULT_DUST_SATS;
+        const feePerKb = params.feePerKb ?? ecash_lib_1.DEFAULT_FEE_SATS_PER_KB;
         const allowUnspendable = params.allowUnspendable ?? false;
         const txBuild = this._acceptTxBuilder({
             covenantSk: params.covenantSk,
@@ -49,15 +49,15 @@ class AgoraOffer {
             fuelInputs: params.fuelInputs,
             extraOutputs: [
                 {
-                    value: dustAmount,
+                    sats: dustSats,
                     script: params.recipientScript,
                 },
                 params.recipientScript,
             ],
-            acceptedTokens: params.acceptedTokens,
+            acceptedAtoms: params.acceptedAtoms,
             allowUnspendable,
         });
-        return txBuild.sign({ feePerKb, dustLimit: dustAmount });
+        return txBuild.sign({ feePerKb, dustSats });
     }
     /**
      * How many extra satoshis are required to fuel this offer so it can be
@@ -66,23 +66,23 @@ class AgoraOffer {
      * The total required input amount is askedSats + acceptFeeSats.
      **/
     acceptFeeSats(params) {
-        const feePerKb = params.feePerKb ?? ecash_lib_1.DEFAULT_FEE_PER_KB;
+        const feePerKb = params.feePerKb ?? ecash_lib_1.DEFAULT_FEE_SATS_PER_KB;
         const txBuild = this._acceptTxBuilder({
             covenantSk: new Uint8Array(32),
             covenantPk: new Uint8Array(33),
             fuelInputs: params.extraInputs ?? [],
             extraOutputs: [
                 {
-                    value: 0,
+                    sats: 0n,
                     script: params.recipientScript,
                 },
             ],
-            acceptedTokens: params.acceptedTokens,
+            acceptedAtoms: params.acceptedAtoms,
             /** We do not need to validate for this condition when we get the fee */
             allowUnspendable: true,
         });
         const measureTx = txBuild.sign({ ecc: new ecash_lib_1.EccDummy() });
-        return BigInt(Math.ceil((measureTx.serSize() * feePerKb) / 1000));
+        return BigInt(Math.ceil((measureTx.serSize() * Number(feePerKb)) / 1000));
     }
     _acceptTxBuilder(params) {
         switch (this.variant.type) {
@@ -101,43 +101,43 @@ class AgoraOffer {
                     ],
                 });
             case 'PARTIAL': {
-                if (params.acceptedTokens === undefined) {
-                    throw new Error('Must set acceptedTokens for partial offers');
+                if (params.acceptedAtoms === undefined) {
+                    throw new Error('Must set acceptedAtoms for partial offers');
                 }
                 const txBuild = new ecash_lib_1.TxBuilder();
                 const agoraPartial = this.variant.params;
-                const truncFactor = 1n << BigInt(8 * agoraPartial.numTokenTruncBytes);
-                if (params.acceptedTokens % truncFactor != 0n) {
-                    throw new Error(`Must acceptedTokens must be a multiple of ${truncFactor}`);
+                const truncFactor = 1n << BigInt(8 * agoraPartial.numAtomsTruncBytes);
+                if (params.acceptedAtoms % truncFactor != 0n) {
+                    throw new Error(`Must acceptedAtoms must be a multiple of ${truncFactor}`);
                 }
                 if (params.allowUnspendable === false ||
                     typeof params.allowUnspendable === 'undefined') {
                     // Prevent creation of unacceptable offer
-                    agoraPartial.preventUnacceptableRemainder(params.acceptedTokens);
+                    agoraPartial.preventUnacceptableRemainder(params.acceptedAtoms);
                 }
                 txBuild.inputs.push({
                     input: this.txBuilderInput,
-                    signatory: (0, partial_js_1.AgoraPartialSignatory)(agoraPartial, params.acceptedTokens / truncFactor, params.covenantSk, params.covenantPk),
+                    signatory: (0, partial_js_1.AgoraPartialSignatory)(agoraPartial, params.acceptedAtoms / truncFactor, params.covenantSk, params.covenantPk),
                 });
                 txBuild.inputs.push(...params.fuelInputs);
-                const sendAmounts = [0];
-                const offeredTokens = BigInt(this.token.amount);
-                if (offeredTokens > params.acceptedTokens) {
-                    sendAmounts.push(offeredTokens - params.acceptedTokens);
+                const sendAtomsArray = [0n];
+                const offeredAtoms = this.token.atoms;
+                if (offeredAtoms > params.acceptedAtoms) {
+                    sendAtomsArray.push(offeredAtoms - params.acceptedAtoms);
                 }
-                sendAmounts.push(params.acceptedTokens);
+                sendAtomsArray.push(params.acceptedAtoms);
                 if (agoraPartial.tokenProtocol === 'SLP') {
                     txBuild.outputs.push({
-                        value: 0,
-                        script: (0, ecash_lib_1.slpSend)(this.token.tokenId, this.token.tokenType.number, sendAmounts),
+                        sats: 0n,
+                        script: (0, ecash_lib_1.slpSend)(this.token.tokenId, this.token.tokenType.number, sendAtomsArray),
                     });
                 }
                 else if (agoraPartial.tokenProtocol === 'ALP') {
                     txBuild.outputs.push({
-                        value: 0,
+                        sats: 0n,
                         script: (0, ecash_lib_1.emppScript)([
                             agoraPartial.adPushdata(),
-                            (0, ecash_lib_1.alpSend)(this.token.tokenId, this.token.tokenType.number, sendAmounts),
+                            (0, ecash_lib_1.alpSend)(this.token.tokenId, this.token.tokenType.number, sendAtomsArray),
                         ]),
                     });
                 }
@@ -145,17 +145,16 @@ class AgoraOffer {
                     throw new Error('Not implemented');
                 }
                 txBuild.outputs.push({
-                    value: agoraPartial.askedSats(params.acceptedTokens),
+                    sats: agoraPartial.askedSats(params.acceptedAtoms),
                     script: ecash_lib_1.Script.p2pkh((0, ecash_lib_1.shaRmd160)(agoraPartial.makerPk)),
                 });
-                if (offeredTokens > params.acceptedTokens) {
+                if (offeredAtoms > params.acceptedAtoms) {
                     const newAgoraPartial = new partial_js_1.AgoraPartial({
                         ...agoraPartial,
-                        truncTokens: (offeredTokens - params.acceptedTokens) /
-                            truncFactor,
+                        truncAtoms: (offeredAtoms - params.acceptedAtoms) / truncFactor,
                     });
                     txBuild.outputs.push({
-                        value: agoraPartial.dustAmount,
+                        sats: agoraPartial.dustSats,
                         script: ecash_lib_1.Script.p2sh((0, ecash_lib_1.shaRmd160)(newAgoraPartial.script().bytecode)),
                     });
                 }
@@ -175,20 +174,20 @@ class AgoraOffer {
      * `fuelInputs` must cover the tx fee, you can calculate it with cancelFeeSats.
      **/
     cancelTx(params) {
-        const dustAmount = params.dustAmount ?? ecash_lib_1.DEFAULT_DUST_LIMIT;
-        const feePerKb = params.feePerKb ?? ecash_lib_1.DEFAULT_FEE_PER_KB;
+        const dustSats = params.dustSats ?? ecash_lib_1.DEFAULT_DUST_SATS;
+        const feePerKb = params.feePerKb ?? ecash_lib_1.DEFAULT_FEE_SATS_PER_KB;
         const txBuild = this._cancelTxBuilder({
             cancelSk: params.cancelSk,
             fuelInputs: params.fuelInputs,
             extraOutputs: [
                 {
-                    value: dustAmount,
+                    sats: dustSats,
                     script: params.recipientScript,
                 },
                 params.recipientScript,
             ],
         });
-        return txBuild.sign({ feePerKb, dustLimit: dustAmount });
+        return txBuild.sign({ feePerKb, dustSats });
     }
     /**
      * How many extra satoshis are required to fuel cancelling this offer,
@@ -202,19 +201,19 @@ class AgoraOffer {
      * The total required sats input amount is returned by this function.
      **/
     cancelFeeSats(params) {
-        const feePerKb = params.feePerKb ?? ecash_lib_1.DEFAULT_FEE_PER_KB;
+        const feePerKb = params.feePerKb ?? ecash_lib_1.DEFAULT_FEE_SATS_PER_KB;
         const txBuild = this._cancelTxBuilder({
             cancelSk: new Uint8Array(32),
             fuelInputs: params.extraInputs ?? [],
             extraOutputs: [
                 {
-                    value: 0,
+                    sats: 0n,
                     script: params.recipientScript,
                 },
             ],
         });
         const measureTx = txBuild.sign({ ecc: new ecash_lib_1.EccDummy() });
-        return BigInt(Math.ceil((measureTx.serSize() * feePerKb) / 1000));
+        return BigInt(Math.ceil((measureTx.serSize() * Number(feePerKb)) / 1000));
     }
     _cancelTxBuilder(params) {
         let signatory;
@@ -235,15 +234,15 @@ class AgoraOffer {
         switch (tokenProtocol) {
             case 'SLP':
                 outputs.push({
-                    value: 0,
-                    script: (0, ecash_lib_1.slpSend)(this.token.tokenId, this.token.tokenType.number, [BigInt(this.token.amount)]),
+                    sats: 0n,
+                    script: (0, ecash_lib_1.slpSend)(this.token.tokenId, this.token.tokenType.number, [this.token.atoms]),
                 });
                 break;
             case 'ALP':
                 outputs.push({
-                    value: 0,
+                    sats: 0n,
                     script: (0, ecash_lib_1.emppScript)([
-                        (0, ecash_lib_1.alpSend)(this.token.tokenId, this.token.tokenType.number, [BigInt(this.token.amount)]),
+                        (0, ecash_lib_1.alpSend)(this.token.tokenId, this.token.tokenType.number, [this.token.atoms]),
                     ]),
                 });
                 break;
@@ -264,15 +263,15 @@ class AgoraOffer {
      * How many satoshis are asked to accept this offer, excluding tx fees.
      * This is what should be displayed to the user as the price.
      **/
-    askedSats(acceptedTokens) {
+    askedSats(acceptedAtoms) {
         switch (this.variant.type) {
             case 'ONESHOT':
                 return this.variant.params.askedSats();
             case 'PARTIAL':
-                if (acceptedTokens === undefined) {
-                    throw new Error('Must provide acceptedTokens for PARTIAL offers');
+                if (acceptedAtoms === undefined) {
+                    throw new Error('Must provide acceptedAtoms for PARTIAL offers');
                 }
-                return this.variant.params.askedSats(acceptedTokens);
+                return this.variant.params.askedSats(acceptedAtoms);
             default:
                 throw new Error('Not implemented');
         }
@@ -290,10 +289,10 @@ class Agora {
      * Create an Agora instance. The provided Chronik instance must have the
      * "agora" plugin loaded.
      **/
-    constructor(chronik, dustAmount) {
+    constructor(chronik, dustSats) {
         this.chronik = chronik;
         this.plugin = chronik.plugin(PLUGIN_NAME);
-        this.dustAmount = dustAmount ?? ecash_lib_1.DEFAULT_DUST_LIMIT;
+        this.dustSats = dustSats ?? ecash_lib_1.DEFAULT_DUST_SATS;
     }
     /**
      * Query all the token IDs, fungible and non-fungible ones, that have active
@@ -358,7 +357,7 @@ class Agora {
                 // isCanceled is always the last pushop (before redeemScript)
                 const opIsCanceled = ops[ops.length - 2];
                 const isCanceled = opIsCanceled === ecash_lib_1.OP_0;
-                // If isCanceled, then offer.token.amount is the canceled amount
+                // If isCanceled, then offer.token.atoms is the canceled amount
                 let takenInfo;
                 if (!isCanceled) {
                     // If this tx is not canceling an agora offer
@@ -391,7 +390,7 @@ class Agora {
                     // Note we may see AgoraOffer change in the future and need to update this parsing
                     // The purchase price is satoshis that go to the offer creator
                     // Index 1 output
-                    const satoshisPaid = tx.outputs[1].value;
+                    const sats = tx.outputs[1].sats;
                     // The taker receives the purchased tokens at a p2pkh address
                     // This is at index 2 for a buy of the full offer and index 3 for a partial buy
                     // If tx.outputs[2].outputScript is p2sh, that means partialbuy and takerBuyIndex is 3
@@ -399,14 +398,14 @@ class Agora {
                         ? 2
                         : 3;
                     const takerScriptHex = tx.outputs[takerBuyIndex].outputScript;
-                    const baseTokens = tx.outputs[takerBuyIndex].token?.amount;
-                    if (typeof baseTokens === 'string') {
+                    const atoms = tx.outputs[takerBuyIndex].token?.atoms;
+                    if (typeof atoms === 'bigint') {
                         // Should always be true but we may have different kinds of agora
                         // offers in the future
                         // So, we only set if we have the info we expect
                         takenInfo = {
-                            satoshisPaid,
-                            baseTokens,
+                            sats,
+                            atoms,
                             takerScriptHex,
                         };
                     }
@@ -416,7 +415,7 @@ class Agora {
                     outpoint: input.prevOut,
                     blockHeight: tx.block?.height ?? -1,
                     isCoinbase: tx.isCoinbase,
-                    value: input.value,
+                    sats: input.sats,
                     script: input.outputScript,
                     isFinal: false,
                     plugins: input.plugins,
@@ -539,8 +538,8 @@ class Agora {
         const outputsSerBytes = new ecash_lib_1.Bytes((0, ecash_lib_1.fromHex)(outputsSerHex));
         const enforcedOutputs = [
             {
-                value: BigInt(0),
-                script: (0, ecash_lib_1.slpSend)(utxo.token.tokenId, utxo.token.tokenType.number, [0, BigInt(utxo.token.amount)]),
+                sats: 0n,
+                script: (0, ecash_lib_1.slpSend)(utxo.token.tokenId, utxo.token.tokenType.number, [0n, utxo.token.atoms]),
             },
         ];
         while (outputsSerBytes.data.length > outputsSerBytes.idx) {
@@ -564,7 +563,7 @@ class Agora {
             txBuilderInput: {
                 prevOut: utxo.outpoint,
                 signData: {
-                    value: utxo.value,
+                    sats: utxo.sats,
                     redeemScript: agoraOneshot.script(),
                 },
             },
@@ -577,15 +576,15 @@ class Agora {
             return undefined;
         }
         // Plugin gives us the offer data in this form
-        const [_, numTokenTruncBytesHex, numSatsTruncBytesHex, tokenScaleFactorHex, scaledTruncTokensPerTruncSatHex, minAcceptedScaledTruncTokensHex, enforcedLockTimeHex,] = plugin.data;
+        const [_, numAtomsTruncBytesHex, numSatsTruncBytesHex, atomsScaleFactorHex, scaledTruncAtomsPerTruncSatHex, minAcceptedScaledTruncAtomsHex, enforcedLockTimeHex,] = plugin.data;
         if (enforcedLockTimeHex === undefined) {
             throw new Error('Outdated plugin');
         }
-        const numTokenTruncBytes = (0, ecash_lib_1.fromHex)(numTokenTruncBytesHex)[0];
+        const numAtomsTruncBytes = (0, ecash_lib_1.fromHex)(numAtomsTruncBytesHex)[0];
         const numSatsTruncBytes = (0, ecash_lib_1.fromHex)(numSatsTruncBytesHex)[0];
-        const tokenScaleFactor = new ecash_lib_1.Bytes((0, ecash_lib_1.fromHex)(tokenScaleFactorHex)).readU64();
-        const scaledTruncTokensPerTruncSat = new ecash_lib_1.Bytes((0, ecash_lib_1.fromHex)(scaledTruncTokensPerTruncSatHex)).readU64();
-        const minAcceptedScaledTruncTokens = new ecash_lib_1.Bytes((0, ecash_lib_1.fromHex)(minAcceptedScaledTruncTokensHex)).readU64();
+        const atomsScaleFactor = new ecash_lib_1.Bytes((0, ecash_lib_1.fromHex)(atomsScaleFactorHex)).readU64();
+        const scaledTruncAtomsPerTruncSat = new ecash_lib_1.Bytes((0, ecash_lib_1.fromHex)(scaledTruncAtomsPerTruncSatHex)).readU64();
+        const minAcceptedScaledTruncAtoms = new ecash_lib_1.Bytes((0, ecash_lib_1.fromHex)(minAcceptedScaledTruncAtomsHex)).readU64();
         const enforcedLockTime = new ecash_lib_1.Bytes((0, ecash_lib_1.fromHex)(enforcedLockTimeHex)).readU32();
         const makerPkGroupHex = plugin.groups.find(group => group.startsWith(PUBKEY_PREFIX));
         if (makerPkGroupHex === undefined) {
@@ -593,19 +592,19 @@ class Agora {
         }
         const makerPk = (0, ecash_lib_1.fromHex)(makerPkGroupHex.substring(PUBKEY_PREFIX.length));
         const agoraPartial = new partial_js_1.AgoraPartial({
-            truncTokens: BigInt(utxo.token.amount) >> (8n * BigInt(numTokenTruncBytes)),
-            numTokenTruncBytes,
-            tokenScaleFactor,
-            scaledTruncTokensPerTruncSat,
+            truncAtoms: utxo.token.atoms >> (8n * BigInt(numAtomsTruncBytes)),
+            numAtomsTruncBytes,
+            atomsScaleFactor,
+            scaledTruncAtomsPerTruncSat,
             numSatsTruncBytes,
             makerPk,
-            minAcceptedScaledTruncTokens,
+            minAcceptedScaledTruncAtoms,
             tokenId: utxo.token.tokenId,
             tokenType: utxo.token.tokenType.number,
             tokenProtocol: utxo.token.tokenType.protocol,
             scriptLen: 0x7f,
             enforcedLockTime,
-            dustAmount: this.dustAmount,
+            dustSats: this.dustSats,
         });
         agoraPartial.updateScriptLen();
         return new AgoraOffer({
@@ -617,7 +616,7 @@ class Agora {
             txBuilderInput: {
                 prevOut: utxo.outpoint,
                 signData: {
-                    value: utxo.value,
+                    sats: utxo.sats,
                     redeemScript: agoraPartial.script(),
                 },
             },