diff --git a/cashtab/package-lock.json b/cashtab/package-lock.json
--- a/cashtab/package-lock.json
+++ b/cashtab/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "cashtab",
- "version": "2.45.11",
+ "version": "2.45.12",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "cashtab",
- "version": "2.45.11",
+ "version": "2.45.12",
"dependencies": {
"@bitgo/utxo-lib": "^9.33.0",
"@zxing/browser": "^0.1.4",
diff --git a/cashtab/package.json b/cashtab/package.json
--- a/cashtab/package.json
+++ b/cashtab/package.json
@@ -1,6 +1,6 @@
{
"name": "cashtab",
- "version": "2.45.11",
+ "version": "2.45.12",
"private": true,
"scripts": {
"start": "node scripts/start.js",
diff --git a/cashtab/src/components/Agora/fixtures/mocks.js b/cashtab/src/components/Agora/fixtures/mocks.js
new file mode 100644
--- /dev/null
+++ b/cashtab/src/components/Agora/fixtures/mocks.js
@@ -0,0 +1,1221 @@
+// Copyright (c) 2024 The Bitcoin developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+import * as wif from 'wif';
+import appConfig from 'config/app';
+import { fromHex } from 'ecash-lib';
+import { AgoraPartial, AgoraOffer } from 'ecash-agora';
+
+/**
+ * Mocks for the Agora screen
+ * Note that these mocks must be properly typed AgoraOffer<s>
+ * to accurately mock the ecash-agora lib use of the screen
+ */
+
+// Real wallet with a (trace) balance on 20241017 if anyone wants it 👀
+export const agoraPartialAlphaWallet = {
+ state: {
+ balanceSats: 420000,
+ slpUtxos: [
+ {
+ outpoint: {
+ txid: '9cf904c798295bfee43670162dc816e25d129ae9a0b13a41f11560cf7dbbb5b8',
+ outIdx: 1,
+ },
+ blockHeight: -1,
+ isCoinbase: false,
+ value: 546,
+ isFinal: false,
+ token: {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '100000',
+ isMintBaton: false,
+ },
+ path: 1899,
+ },
+ {
+ outpoint: {
+ txid: 'e4d6a30f647dd8f2ab91c5bdb86b5ce68430638b4ed49b46e71b055627a76078',
+ outIdx: 1,
+ },
+ blockHeight: -1,
+ isCoinbase: false,
+ value: 546,
+ isFinal: false,
+ token: {
+ tokenId:
+ '01d63c4f4cb496829a6743f7b1805d086ea3877a1dd34b3f92ffba2c9c99f896',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '3000',
+ isMintBaton: false,
+ },
+ path: 1899,
+ },
+ ],
+ nonSlpUtxos: [
+ {
+ outpoint: {
+ txid: '5963aebb41910aee8014cbbf2e2fb487dcbecb8b4a66b26e07f5b6542355bbf7',
+ outIdx: 0,
+ },
+ blockHeight: -1,
+ isCoinbase: false,
+ value: 420000,
+ isFinal: false,
+ path: 1899,
+ },
+ ],
+ tokens: new Map([
+ [
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ '1000.00',
+ ],
+ [
+ '01d63c4f4cb496829a6743f7b1805d086ea3877a1dd34b3f92ffba2c9c99f896',
+ '3000',
+ ],
+ ]),
+ parsedTxHistory: [
+ {
+ txid: 'e4d6a30f647dd8f2ab91c5bdb86b5ce68430638b4ed49b46e71b055627a76078',
+ version: 2,
+ inputs: [
+ {
+ prevOut: {
+ txid: 'e7ca2e9e9c778f130206520eebfa7244c300ca95e90284782ed54a8b376406da',
+ outIdx: 2,
+ },
+ inputScript:
+ '4175beba74315f8f184c629a6c59a645789c7711bd36536234f226aea983df3528b4d9bb38929c94d177d156c193600ed0f591d662d0254ed9c14cb145e5fb8bab412103771805b54969a9bea4e3eb14a82851c67592156ddb5e52d3d53677d14a40fba6',
+ value: 546,
+ sequenceNo: 4294967295,
+ token: {
+ tokenId:
+ '01d63c4f4cb496829a6743f7b1805d086ea3877a1dd34b3f92ffba2c9c99f896',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '20989999',
+ isMintBaton: false,
+ entryIdx: 0,
+ },
+ outputScript:
+ '76a91495e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d88ac',
+ },
+ {
+ prevOut: {
+ txid: 'f8f8751507771aae3649a4c3956c767c5cab0885c3a52ccc5a2b772ea379c2a1',
+ outIdx: 1,
+ },
+ inputScript:
+ '411507c71cf5785a081b31e872cc33958072e00261791541bb5b322ce239b8a4c1559e9fc0d812ba977bb72c0a3fac6490368dba7c2690ccefe6879bf43f10602a412103771805b54969a9bea4e3eb14a82851c67592156ddb5e52d3d53677d14a40fba6',
+ value: 11028,
+ sequenceNo: 4294967295,
+ outputScript:
+ '76a91495e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d88ac',
+ },
+ ],
+ outputs: [
+ {
+ value: 0,
+ outputScript:
+ '6a04534c500001010453454e442001d63c4f4cb496829a6743f7b1805d086ea3877a1dd34b3f92ffba2c9c99f896080000000000000bb8080000000001403c77',
+ },
+ {
+ value: 546,
+ outputScript:
+ '76a91403b830e4b9dce347f3495431e1f9d1005f4b420488ac',
+ token: {
+ tokenId:
+ '01d63c4f4cb496829a6743f7b1805d086ea3877a1dd34b3f92ffba2c9c99f896',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '3000',
+ isMintBaton: false,
+ entryIdx: 0,
+ },
+ },
+ {
+ value: 546,
+ outputScript:
+ '76a91476458db0ed96fe9863fc1ccec9fa2cfab884b0f688ac',
+ token: {
+ tokenId:
+ '01d63c4f4cb496829a6743f7b1805d086ea3877a1dd34b3f92ffba2c9c99f896',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '20986999',
+ isMintBaton: false,
+ entryIdx: 0,
+ },
+ },
+ {
+ value: 10015,
+ outputScript:
+ '76a91495e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d88ac',
+ },
+ ],
+ lockTime: 0,
+ timeFirstSeen: 1729116118,
+ size: 467,
+ isCoinbase: false,
+ tokenEntries: [
+ {
+ tokenId:
+ '01d63c4f4cb496829a6743f7b1805d086ea3877a1dd34b3f92ffba2c9c99f896',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ txType: 'SEND',
+ isInvalid: false,
+ burnSummary: '',
+ failedColorings: [],
+ actualBurnAmount: '0',
+ intentionalBurn: '0',
+ burnsMintBatons: false,
+ },
+ ],
+ tokenFailedParsings: [],
+ tokenStatus: 'TOKEN_STATUS_NORMAL',
+ parsed: {
+ xecTxType: 'Received',
+ satoshisSent: 546,
+ stackArray: [
+ '534c5000',
+ '01',
+ '53454e44',
+ '01d63c4f4cb496829a6743f7b1805d086ea3877a1dd34b3f92ffba2c9c99f896',
+ '0000000000000bb8',
+ '0000000001403c77',
+ ],
+ recipients: [
+ 'ecash:qpmytrdsakt0axrrlswvaj069nat3p9s7cjctmjasj',
+ 'ecash:qz2708636snqhsxu8wnlka78h6fdp77ar59jrf5035',
+ ],
+ },
+ },
+ {
+ txid: '9cf904c798295bfee43670162dc816e25d129ae9a0b13a41f11560cf7dbbb5b8',
+ version: 2,
+ inputs: [
+ {
+ prevOut: {
+ txid: '9252eddeaf6c054df169569edd12a2b8ee6e5a199eb71cbdaaf1e4e9a3cbc685',
+ outIdx: 2,
+ },
+ inputScript:
+ '41ceb2cdb712138d3ee6b14304d33658388ad474e049bed0d62a9d581685b8dbcaa044e043ee43cc38244e85f9f1b150779285bbfba3dd715a35ffe5a93c395f50412102c237f49dd4c812f27b09d69d4c8a4da12744fda8ad63ce151fed2a3f41fd8795',
+ value: 546,
+ sequenceNo: 4294967295,
+ token: {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '4621',
+ isMintBaton: false,
+ entryIdx: 0,
+ },
+ outputScript:
+ '76a91476458db0ed96fe9863fc1ccec9fa2cfab884b0f688ac',
+ },
+ {
+ prevOut: {
+ txid: '4a9760fbad9be655578facf1c6dd9f692bbdbd7e6bcf8d111d52f3a689fab4ca',
+ outIdx: 1,
+ },
+ inputScript:
+ '41cc1b1fb6a49b0ecb793887832a4ed51f465f0e2b802e9cf96915cc4bff0aa2bc3cff78e7bdc8004cb9b3ac2e3c73a42fd320cda51ded9f73fb4cfb987a9b89ac412102c237f49dd4c812f27b09d69d4c8a4da12744fda8ad63ce151fed2a3f41fd8795',
+ value: 546,
+ sequenceNo: 4294967295,
+ token: {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '26101',
+ isMintBaton: false,
+ entryIdx: 0,
+ },
+ outputScript:
+ '76a91476458db0ed96fe9863fc1ccec9fa2cfab884b0f688ac',
+ },
+ {
+ prevOut: {
+ txid: '8861577451c801ea5494aa0ee50767026f9a5d1ee2d9280ff5d6221a51d3b0bc',
+ outIdx: 1,
+ },
+ inputScript:
+ '41ddb9e54a08bb9e498db59d744a90ab5825b60a7d9ed755ea6f9ebe9474fe8f05bf95683bf90d0181138b0f7b090d48b4f119319821e6946abca1e1105a0c24f8412102c237f49dd4c812f27b09d69d4c8a4da12744fda8ad63ce151fed2a3f41fd8795',
+ value: 546,
+ sequenceNo: 4294967295,
+ token: {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '18850',
+ isMintBaton: false,
+ entryIdx: 0,
+ },
+ outputScript:
+ '76a91476458db0ed96fe9863fc1ccec9fa2cfab884b0f688ac',
+ },
+ {
+ prevOut: {
+ txid: '2bec8ef2b93a4cc859d2b5eef36516d5e559ed6c8ba14437ebd910d7110e8e7b',
+ outIdx: 1,
+ },
+ inputScript:
+ '41ae70070af786bebf975fcf867b1c62817654301391748998289814172472f92a9ef1ade2c141aad9a32f00a428cad8784ee5c684ee7506a6c71d7a2ce1b19c3e412102c237f49dd4c812f27b09d69d4c8a4da12744fda8ad63ce151fed2a3f41fd8795',
+ value: 546,
+ sequenceNo: 4294967295,
+ token: {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '22508',
+ isMintBaton: false,
+ entryIdx: 0,
+ },
+ outputScript:
+ '76a91476458db0ed96fe9863fc1ccec9fa2cfab884b0f688ac',
+ },
+ {
+ prevOut: {
+ txid: '5f26f48aaf8406d614408e8d54d73ab9308562d2c0fc258f5965aaa627f976bf',
+ outIdx: 1,
+ },
+ inputScript:
+ '4184f1c491fd4f4a166b785c405cd5a4506fbcd59d1cd215e0eaf90b75f9aa36af18fc89d74a3706c17417a12dac2fc3b374e2acace4c26bd8ee4dadcecd133243412102c237f49dd4c812f27b09d69d4c8a4da12744fda8ad63ce151fed2a3f41fd8795',
+ value: 546,
+ sequenceNo: 4294967295,
+ token: {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '17631',
+ isMintBaton: false,
+ entryIdx: 0,
+ },
+ outputScript:
+ '76a91476458db0ed96fe9863fc1ccec9fa2cfab884b0f688ac',
+ },
+ {
+ prevOut: {
+ txid: 'cc98286f8181bb929c800f543ae999119db6bc24bae633b8adc0b6084e1be1f3',
+ outIdx: 1,
+ },
+ inputScript:
+ '412779265c3bba36e1d9121c0c4310039c8ff2857442c9f9340899be900e6e49339ead33e591ba2ad799beaf81ed510d2f8c54146b1b4f96a68bb26bdde474de8a412102c237f49dd4c812f27b09d69d4c8a4da12744fda8ad63ce151fed2a3f41fd8795',
+ value: 546,
+ sequenceNo: 4294967295,
+ token: {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '31763',
+ isMintBaton: false,
+ entryIdx: 0,
+ },
+ outputScript:
+ '76a91476458db0ed96fe9863fc1ccec9fa2cfab884b0f688ac',
+ },
+ ],
+ outputs: [
+ {
+ value: 0,
+ outputScript:
+ '6a04534c500001010453454e4420aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb10800000000000186a00800000000000053e2',
+ },
+ {
+ value: 546,
+ outputScript:
+ '76a91403b830e4b9dce347f3495431e1f9d1005f4b420488ac',
+ token: {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '100000',
+ isMintBaton: false,
+ entryIdx: 0,
+ },
+ },
+ {
+ value: 546,
+ outputScript:
+ '76a91476458db0ed96fe9863fc1ccec9fa2cfab884b0f688ac',
+ token: {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '21474',
+ isMintBaton: false,
+ entryIdx: 0,
+ },
+ },
+ {
+ value: 1153,
+ outputScript:
+ '76a91476458db0ed96fe9863fc1ccec9fa2cfab884b0f688ac',
+ },
+ ],
+ lockTime: 0,
+ timeFirstSeen: 1729116092,
+ size: 1031,
+ isCoinbase: false,
+ tokenEntries: [
+ {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ txType: 'SEND',
+ isInvalid: false,
+ burnSummary: '',
+ failedColorings: [],
+ actualBurnAmount: '0',
+ intentionalBurn: '0',
+ burnsMintBatons: false,
+ },
+ ],
+ tokenFailedParsings: [],
+ tokenStatus: 'TOKEN_STATUS_NORMAL',
+ parsed: {
+ xecTxType: 'Received',
+ satoshisSent: 546,
+ stackArray: [
+ '534c5000',
+ '01',
+ '53454e44',
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ '00000000000186a0',
+ '00000000000053e2',
+ ],
+ recipients: [
+ 'ecash:qpmytrdsakt0axrrlswvaj069nat3p9s7cjctmjasj',
+ ],
+ },
+ },
+ {
+ txid: '5963aebb41910aee8014cbbf2e2fb487dcbecb8b4a66b26e07f5b6542355bbf7',
+ version: 2,
+ inputs: [
+ {
+ prevOut: {
+ txid: 'df4ba87ebf76f8282a688794b67ec70212f4d6659240856f8cf6f581e535946d',
+ outIdx: 4,
+ },
+ inputScript:
+ '416dc42feba5d75bba26f448afb3ae7d2d7b49cb6823397bf1c4bf00808a8716102838ec0631c8f941a439e8e6fd5aee62d695a21e3937899c5cf4e3d06fabcf4d412102c237f49dd4c812f27b09d69d4c8a4da12744fda8ad63ce151fed2a3f41fd8795',
+ value: 274786076,
+ sequenceNo: 4294967295,
+ outputScript:
+ '76a91476458db0ed96fe9863fc1ccec9fa2cfab884b0f688ac',
+ },
+ ],
+ outputs: [
+ {
+ value: 4200,
+ outputScript:
+ '76a91403b830e4b9dce347f3495431e1f9d1005f4b420488ac',
+ },
+ {
+ value: 274781657,
+ outputScript:
+ '76a91476458db0ed96fe9863fc1ccec9fa2cfab884b0f688ac',
+ },
+ ],
+ lockTime: 0,
+ timeFirstSeen: 1729116036,
+ size: 219,
+ isCoinbase: false,
+ tokenEntries: [],
+ tokenFailedParsings: [],
+ tokenStatus: 'TOKEN_STATUS_NON_TOKEN',
+ parsed: {
+ xecTxType: 'Received',
+ satoshisSent: 4200,
+ stackArray: [],
+ recipients: [
+ 'ecash:qpmytrdsakt0axrrlswvaj069nat3p9s7cjctmjasj',
+ ],
+ },
+ },
+ ],
+ },
+ mnemonic:
+ 'boat lava egg soap winter alone minute erode evoke dune mixture clump',
+ paths: new Map([
+ [
+ 1899,
+
+ {
+ hash: '03b830e4b9dce347f3495431e1f9d1005f4b4204',
+ address: 'ecash:qqpmsv8yh8wwx3lnf92rrc0e6yq97j6zqs8av8vx8h',
+ wif: 'KwdT9LwmWEWgSvon9BTABY3SMmCNCDptKio9kY8CYUA6oB9sWcRP',
+ },
+ ],
+ ]),
+ name: 'Agora Partial Alpha',
+};
+// Real wallet with a (trace) balance on 20241017 if anyone wants it 👀
+export const agoraPartialBetaWallet = {
+ state: {
+ balanceSats: 4200,
+ slpUtxos: [
+ {
+ outpoint: {
+ txid: '50b388cd351b7d22d82dcab8d1ea58c461a28884f856a95399ba9a161a5a1152',
+ outIdx: 1,
+ },
+ blockHeight: -1,
+ isCoinbase: false,
+ value: 546,
+ isFinal: false,
+ token: {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '30000',
+ isMintBaton: false,
+ },
+ path: 1899,
+ },
+ ],
+ nonSlpUtxos: [
+ {
+ outpoint: {
+ txid: '4711d244d0f540e6fcd69c01a8095f692da2a66ae7a7da8990627ecf12f727f3',
+ outIdx: 0,
+ },
+ blockHeight: -1,
+ isCoinbase: false,
+ value: 4200,
+ isFinal: false,
+ path: 1899,
+ },
+ ],
+ tokens: new Map([
+ [
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ '300.00',
+ ],
+ ]),
+ parsedTxHistory: [
+ {
+ txid: '50b388cd351b7d22d82dcab8d1ea58c461a28884f856a95399ba9a161a5a1152',
+ version: 2,
+ inputs: [
+ {
+ prevOut: {
+ txid: '6c4d8dd0d854a7e38bd87eac5c3be541fceec3e2ee52c7072012488604d90ad8',
+ outIdx: 2,
+ },
+ inputScript:
+ '416cf72fa0fa46369307d5a5320908c93283ba825384b12692f15968d840f82ff12c6a0a7e2983ff1d3a2273d075f1ca774d17dfe6af67b7e7ca77591401741a9941210233f09cd4dc3381162f09975f90866f085350a5ec890d7fba5f6739c9c0ac2afd',
+ value: 546,
+ sequenceNo: 4294967295,
+ token: {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '70000',
+ isMintBaton: false,
+ entryIdx: 0,
+ },
+ outputScript:
+ '76a91403b830e4b9dce347f3495431e1f9d1005f4b420488ac',
+ },
+ {
+ prevOut: {
+ txid: '9f685edca7c87da35d549588856e93b9facc9b22a629797bf179f5db5c6d6fdb',
+ outIdx: 3,
+ },
+ inputScript:
+ '413e9ebd5dcf4d0ee6faa85dd6250e12ce2c8c436122dcd3bcfa3570de219b1b54fec51a926f729c0ef651ee3e556252aea6ba2a0053eb1d10aba32c6ec3e7405341210233f09cd4dc3381162f09975f90866f085350a5ec890d7fba5f6739c9c0ac2afd',
+ value: 8095,
+ sequenceNo: 4294967295,
+ outputScript:
+ '76a91403b830e4b9dce347f3495431e1f9d1005f4b420488ac',
+ },
+ ],
+ outputs: [
+ {
+ value: 0,
+ outputScript:
+ '6a04534c500001010453454e4420aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1080000000000007530080000000000009c40',
+ },
+ {
+ value: 546,
+ outputScript:
+ '76a914f208ef75eb0dd778ea4540cbd966a830c7b94bb088ac',
+ token: {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '30000',
+ isMintBaton: false,
+ entryIdx: 0,
+ },
+ },
+ {
+ value: 546,
+ outputScript:
+ '76a91403b830e4b9dce347f3495431e1f9d1005f4b420488ac',
+ token: {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '40000',
+ isMintBaton: false,
+ entryIdx: 0,
+ },
+ },
+ {
+ value: 6610,
+ outputScript:
+ '76a91403b830e4b9dce347f3495431e1f9d1005f4b420488ac',
+ },
+ ],
+ lockTime: 0,
+ timeFirstSeen: 1729122723,
+ size: 467,
+ isCoinbase: false,
+ tokenEntries: [
+ {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ txType: 'SEND',
+ isInvalid: false,
+ burnSummary: '',
+ failedColorings: [],
+ actualBurnAmount: '0',
+ intentionalBurn: '0',
+ burnsMintBatons: false,
+ },
+ ],
+ tokenFailedParsings: [],
+ tokenStatus: 'TOKEN_STATUS_NORMAL',
+ parsed: {
+ xecTxType: 'Received',
+ satoshisSent: 546,
+ stackArray: [
+ '534c5000',
+ '01',
+ '53454e44',
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ '0000000000007530',
+ '0000000000009c40',
+ ],
+ recipients: [
+ 'ecash:qqpmsv8yh8wwx3lnf92rrc0e6yq97j6zqs8av8vx8h',
+ ],
+ },
+ },
+ {
+ txid: '4711d244d0f540e6fcd69c01a8095f692da2a66ae7a7da8990627ecf12f727f3',
+ version: 2,
+ inputs: [
+ {
+ prevOut: {
+ txid: 'b0142c32136747d1ccf487274f489b5584d58f25de289d66fe9b8d93d1843517',
+ outIdx: 2,
+ },
+ inputScript:
+ '415a784d081e335d3289e85feaac7d2caff51a016071aa5112dc987269bc6376efb67e60932d9cb3e1713a3ed35caa1a516cfadac5947066bcc7a86d31af19df7e4121021d7fd45a888292cf3a022a95acdbcf82f9f2d5bbbfbdbc740acd558a9f25b5d0',
+ value: 3170,
+ sequenceNo: 4294967295,
+ outputScript:
+ '76a9140d94ba179ec21c42417a71a77873b3619363d8ea88ac',
+ },
+ {
+ prevOut: {
+ txid: 'd842821f216f4a941b1e68bc275475f8e375c652fe22b49a8c8e7084823aca76',
+ outIdx: 300,
+ },
+ inputScript:
+ '413795c48264e243bf51371dde61d377ff5682edd51fff810a4d17a37d7cc0a8214413e15964d0c10ca79c37061ef89dee5b8b95ac2ce047a99db270ab70393ee94121021d7fd45a888292cf3a022a95acdbcf82f9f2d5bbbfbdbc740acd558a9f25b5d0',
+ value: 4246,
+ sequenceNo: 4294967295,
+ outputScript:
+ '76a9140d94ba179ec21c42417a71a77873b3619363d8ea88ac',
+ },
+ ],
+ outputs: [
+ {
+ value: 4200,
+ outputScript:
+ '76a914f208ef75eb0dd778ea4540cbd966a830c7b94bb088ac',
+ },
+ {
+ value: 2492,
+ outputScript:
+ '76a9140d94ba179ec21c42417a71a77873b3619363d8ea88ac',
+ },
+ ],
+ lockTime: 0,
+ timeFirstSeen: 1729122695,
+ size: 360,
+ isCoinbase: false,
+ tokenEntries: [],
+ tokenFailedParsings: [],
+ tokenStatus: 'TOKEN_STATUS_NON_TOKEN',
+ parsed: {
+ xecTxType: 'Received',
+ satoshisSent: 4200,
+ stackArray: [],
+ recipients: [
+ 'ecash:qqxefwshnmppcsjp0fc6w7rnkdsexc7cagdus7ugd0',
+ ],
+ },
+ },
+ ],
+ },
+ mnemonic:
+ 'end object argue chalk toward blouse square primary fragile glad engine paddle',
+ paths: new Map([
+ [
+ 1899,
+ {
+ hash: 'f208ef75eb0dd778ea4540cbd966a830c7b94bb0',
+ address: 'ecash:qreq3mm4avxaw782g4qvhktx4qcv0w2tkqj3j5jaad',
+ wif: 'L1pjs2zuVGMx4jzegPaSHauNmDrchm8vS1m1T263z5Wzw6ehHwLD',
+ },
+ ],
+ ]),
+ name: 'Agora Partial Beta',
+};
+
+export const agoraPartialAlphaKeypair = {
+ sk: wif.decode(
+ agoraPartialAlphaWallet.paths.get(appConfig.derivationPath).wif,
+ ).privateKey,
+ // Hardcoded for easier mock management
+ // Got this by console.logging toHex(ecc.derivePubkey(agoraPartialAlphaKeypair))
+ pk: fromHex(
+ '0233f09cd4dc3381162f09975f90866f085350a5ec890d7fba5f6739c9c0ac2afd',
+ ),
+};
+
+export const agoraPartialBetaKeypair = {
+ sk: wif.decode(
+ agoraPartialBetaWallet.paths.get(appConfig.derivationPath).wif,
+ ).privateKey,
+ pk: fromHex(
+ '021e75febb8ae57a8805e80df93732ab7d5d8606377cb30c0f02444809cc085f39',
+ ),
+};
+
+// CACHET candle created by Agora Partial Alpha
+// Created by approx params offering 100, min 0.1, 10,000 XEC per CACHET
+const agoraPartialCachetAlphaOne = new AgoraPartial({
+ dustAmount: 546,
+ enforcedLockTime: 1040365320,
+ minAcceptedScaledTruncTokens: 2147470n,
+ numSatsTruncBytes: 1,
+ numTokenTruncBytes: 0,
+ scaledTruncTokensPerTruncSat: 5497n,
+ scriptLen: 214,
+ tokenId: 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenProtocol: 'SLP',
+ tokenScaleFactor: 214747n,
+ tokenType: 1,
+ truncTokens: 10000n,
+ makerPk: agoraPartialAlphaKeypair.pk,
+});
+export const agoraOfferCachetAlphaOne = new AgoraOffer({
+ outpoint: {
+ txid: '6d9f99d86c869b9ef2ca84c0c3ceb6889da6a0360b75ea0c82b7744dec8cd0bf',
+ outIdx: 1,
+ },
+ status: 'OPEN',
+ token: {
+ amount: '10000',
+ isMintBaton: false,
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ number: 1,
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ },
+ },
+ txBuilderInput: {
+ prevOut: {
+ outIdx: 1,
+ txid: '6d9f99d86c869b9ef2ca84c0c3ceb6889da6a0360b75ea0c82b7744dec8cd0bf',
+ },
+ signData: {
+ redeemScript: agoraPartialCachetAlphaOne.script(),
+ value: 546,
+ },
+ },
+ variant: {
+ type: 'PARTIAL',
+ params: agoraPartialCachetAlphaOne,
+ },
+});
+
+// CACHET candle created by Agora Partial Alpha
+// Created by approx params offering 200, min 0.2, 1200 XEC per CACHET
+const agoraPartialCachetAlphaTwo = new AgoraPartial({
+ dustAmount: 546,
+ enforcedLockTime: 1653017945,
+ minAcceptedScaledTruncTokens: 2147460n,
+ numSatsTruncBytes: 1,
+ numTokenTruncBytes: 0,
+ scaledTruncTokensPerTruncSat: 22906n,
+ scriptLen: 214,
+ tokenId: 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenProtocol: 'SLP',
+ tokenScaleFactor: 107373n,
+ tokenType: 1,
+ truncTokens: 20000n,
+ makerPk: agoraPartialAlphaKeypair.pk,
+});
+export const agoraOfferCachetAlphaTwo = new AgoraOffer({
+ outpoint: {
+ txid: '0c93907dc9377b2c8bfb1ca8f8ce1ce24adb4ab1289cdc94511a989caea43ccc',
+ outIdx: 1,
+ },
+ status: 'OPEN',
+ token: {
+ amount: '20000',
+ isMintBaton: false,
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ number: 1,
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ },
+ },
+ txBuilderInput: {
+ prevOut: {
+ outIdx: 1,
+ txid: '0c93907dc9377b2c8bfb1ca8f8ce1ce24adb4ab1289cdc94511a989caea43ccc',
+ },
+ signData: {
+ redeemScript: agoraPartialCachetAlphaTwo.script(),
+ value: 546,
+ },
+ },
+ variant: {
+ type: 'PARTIAL',
+ params: agoraPartialCachetAlphaTwo,
+ },
+});
+
+// BULL candle created by Agora Partial Alpha
+// Created by approx params offering 888, min 8, 50,000 XEC per BULL
+const agoraPartialBullAlphaOne = new AgoraPartial({
+ dustAmount: 546,
+ enforcedLockTime: 1350463393,
+ minAcceptedScaledTruncTokens: 19346408n,
+ numSatsTruncBytes: 2,
+ numTokenTruncBytes: 0,
+ scaledTruncTokensPerTruncSat: 31697n,
+ scriptLen: 216,
+ tokenId: '01d63c4f4cb496829a6743f7b1805d086ea3877a1dd34b3f92ffba2c9c99f896',
+ tokenProtocol: 'SLP',
+ tokenScaleFactor: 2418301n,
+ tokenType: 1,
+ truncTokens: 888n,
+ makerPk: agoraPartialAlphaKeypair.pk,
+});
+export const agoraOfferBullAlphaOne = new AgoraOffer({
+ outpoint: {
+ txid: '25c4d4ae16b17d7259948b2b841984c7e63756bca7f79d5cee94c7dc93dd484c',
+ outIdx: 1,
+ },
+ status: 'OPEN',
+ token: {
+ amount: '888',
+ isMintBaton: false,
+ tokenId:
+ '01d63c4f4cb496829a6743f7b1805d086ea3877a1dd34b3f92ffba2c9c99f896',
+ tokenType: {
+ number: 1,
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ },
+ },
+ txBuilderInput: {
+ prevOut: {
+ outIdx: 1,
+ txid: '25c4d4ae16b17d7259948b2b841984c7e63756bca7f79d5cee94c7dc93dd484c',
+ },
+ signData: {
+ redeemScript: agoraPartialBullAlphaOne.script(),
+ value: 546,
+ },
+ },
+ variant: {
+ type: 'PARTIAL',
+ params: agoraPartialBullAlphaOne,
+ },
+});
+
+// CACHET candle created by Agora Partial Beta
+// Created by approx params offering 300, min 0.3, 12,000 XEC per CACHET
+const agoraPartialCachetBetaOne = new AgoraPartial({
+ dustAmount: 546,
+ enforcedLockTime: 1075803086,
+ minAcceptedScaledTruncTokens: 2147460n,
+ numSatsTruncBytes: 1,
+ numTokenTruncBytes: 0,
+ scaledTruncTokensPerTruncSat: 1527n,
+ scriptLen: 214,
+ tokenId: 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenProtocol: 'SLP',
+ tokenScaleFactor: 71582n,
+ tokenType: 1,
+ truncTokens: 30000n,
+ makerPk: agoraPartialBetaKeypair.pk,
+});
+export const agoraOfferCachetBetaOne = new AgoraOffer({
+ outpoint: {
+ txid: '819cb562c90c0994362f753bbd0c74730a8030785fae1c5ef45fdf4f211a093f',
+ outIdx: 1,
+ },
+ status: 'OPEN',
+ token: {
+ amount: '30000',
+ isMintBaton: false,
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ number: 1,
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ },
+ },
+ txBuilderInput: {
+ prevOut: {
+ outIdx: 1,
+ txid: '819cb562c90c0994362f753bbd0c74730a8030785fae1c5ef45fdf4f211a093f',
+ },
+ signData: {
+ // "redeemScript" key is calculated from the built AgoraPartial
+ redeemScript: agoraPartialCachetBetaOne.script(),
+ value: 546,
+ },
+ },
+ variant: {
+ type: 'PARTIAL',
+ params: agoraPartialCachetBetaOne,
+ },
+});
+
+export const cachetCacheMocks = {
+ token: {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ timeFirstSeen: 0,
+ genesisInfo: {
+ tokenTicker: 'CACHET',
+ tokenName: 'Cachet',
+ url: 'https://cashtab.com/',
+ decimals: 2,
+ hash: '',
+ },
+ block: {
+ height: 838192,
+ hash: '0000000000000000132232769161d6211f7e6e20cf63b26e5148890aacd26962',
+ timestamp: 1711779364,
+ },
+ },
+ tx: {
+ txid: 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ version: 2,
+ inputs: [
+ {
+ prevOut: {
+ txid: 'dd3eafefb1941fd67d8a29b7dd057ac48ec11712887e2ae7c008a7c72d0cd9fc',
+ outIdx: 0,
+ },
+ inputScript:
+ '4830450221009bb1fb7d49d9ac64b79ea041be2e2efa5a8709a470930b04c27c9fc46ed1906302206a0a9daf5e64e934a3467951dd2da37405969d4434d4006ddfea3ed39ff4e0ae412103771805b54969a9bea4e3eb14a82851c67592156ddb5e52d3d53677d14a40fba6',
+ value: 2200,
+ sequenceNo: 4294967295,
+ outputScript:
+ '76a91495e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d88ac',
+ },
+ ],
+ outputs: [
+ {
+ value: 0,
+ outputScript:
+ '6a04534c500001010747454e4553495306434143484554064361636865741468747470733a2f2f636173687461622e636f6d2f4c0001020102080000000000989680',
+ },
+ {
+ value: 546,
+ outputScript:
+ '76a91495e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d88ac',
+ token: {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '10000000',
+ isMintBaton: false,
+ entryIdx: 0,
+ },
+ spentBy: {
+ txid: 'aa13c6f214ff58f36ed5e108a7f36d8f98729c50186b27a53b989c7f36fbf517',
+ outIdx: 0,
+ },
+ },
+ {
+ value: 546,
+ outputScript:
+ '76a91495e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d88ac',
+ token: {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '0',
+ isMintBaton: true,
+ entryIdx: 0,
+ },
+ spentBy: {
+ txid: '4b5b2a0f8bcacf6bccc7ef49e7f82a894c9c599589450eaeaf423e0f5926c38e',
+ outIdx: 0,
+ },
+ },
+ {
+ value: 773,
+ outputScript:
+ '76a91495e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d88ac',
+ spentBy: {
+ txid: '343356b9d4acd59065f90b1ace647c1f714f1fd4c411e2cf77081a0246c7416d',
+ outIdx: 3,
+ },
+ },
+ ],
+ lockTime: 0,
+ timeFirstSeen: 0,
+ size: 335,
+ isCoinbase: false,
+ tokenEntries: [
+ {
+ tokenId:
+ 'aed861a31b96934b88c0252ede135cb9700d7649f69191235087a3030e553cb1',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ txType: 'GENESIS',
+ isInvalid: false,
+ burnSummary: '',
+ failedColorings: [],
+ actualBurnAmount: '0',
+ intentionalBurn: '0',
+ burnsMintBatons: false,
+ },
+ ],
+ tokenFailedParsings: [],
+ tokenStatus: 'TOKEN_STATUS_NORMAL',
+ block: {
+ height: 838192,
+ hash: '0000000000000000132232769161d6211f7e6e20cf63b26e5148890aacd26962',
+ timestamp: 1711779364,
+ },
+ },
+};
+export const bullCacheMocks = {
+ token: {
+ tokenId:
+ '01d63c4f4cb496829a6743f7b1805d086ea3877a1dd34b3f92ffba2c9c99f896',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ timeFirstSeen: 0,
+ genesisInfo: {
+ tokenTicker: 'BULL',
+ tokenName: 'Bull',
+ url: 'https://cashtab.com/',
+ decimals: 0,
+ hash: '',
+ },
+ block: {
+ height: 835482,
+ hash: '0000000000000000133bf16cb7fdab5c6ff64a874632eb2fe80265e34a6ad99f',
+ timestamp: 1710174132,
+ },
+ },
+ tx: {
+ txid: '01d63c4f4cb496829a6743f7b1805d086ea3877a1dd34b3f92ffba2c9c99f896',
+ version: 2,
+ inputs: [
+ {
+ prevOut: {
+ txid: 'f211007def30735a245bdaa6f9efe429c999e02713f6ce6328478da3444b7248',
+ outIdx: 1,
+ },
+ inputScript:
+ '47304402207801a307548c5ecccd6e37043bda5e96cb9d27c93e4e60deaff4344605f138b202201a7fd155a42171c4b3331425b3e708df4e9606edfd221b2e500e3fb6bb541f2b412103771805b54969a9bea4e3eb14a82851c67592156ddb5e52d3d53677d14a40fba6',
+ value: 981921,
+ sequenceNo: 4294967295,
+ outputScript:
+ '76a91495e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d88ac',
+ },
+ ],
+ outputs: [
+ {
+ value: 0,
+ outputScript:
+ '6a04534c500001010747454e455349530442554c4c0442756c6c1468747470733a2f2f636173687461622e636f6d2f4c0001004c00080000000001406f40',
+ },
+ {
+ value: 546,
+ outputScript:
+ '76a91495e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d88ac',
+ token: {
+ tokenId:
+ '01d63c4f4cb496829a6743f7b1805d086ea3877a1dd34b3f92ffba2c9c99f896',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ amount: '21000000',
+ isMintBaton: false,
+ entryIdx: 0,
+ },
+ spentBy: {
+ txid: '3dff51c3a8a78dcd56ef77dcf041aa5167e719ebd6d8c4f6cacb6e06d0b851f4',
+ outIdx: 0,
+ },
+ },
+ {
+ value: 981078,
+ outputScript:
+ '76a91495e79f51d4260bc0dc3ba7fb77c7be92d0fbdd1d88ac',
+ spentBy: {
+ txid: '4d8c8d06b724493f5ab172a18d9bf9f4d8419c09bc5a93fe780902b21dab75ba',
+ outIdx: 0,
+ },
+ },
+ ],
+ lockTime: 0,
+ timeFirstSeen: 0,
+ size: 296,
+ isCoinbase: false,
+ tokenEntries: [
+ {
+ tokenId:
+ '01d63c4f4cb496829a6743f7b1805d086ea3877a1dd34b3f92ffba2c9c99f896',
+ tokenType: {
+ protocol: 'SLP',
+ type: 'SLP_TOKEN_TYPE_FUNGIBLE',
+ number: 1,
+ },
+ txType: 'GENESIS',
+ isInvalid: false,
+ burnSummary: '',
+ failedColorings: [],
+ actualBurnAmount: '0',
+ intentionalBurn: '0',
+ burnsMintBatons: false,
+ },
+ ],
+ tokenFailedParsings: [],
+ tokenStatus: 'TOKEN_STATUS_NORMAL',
+ block: {
+ height: 835482,
+ hash: '0000000000000000133bf16cb7fdab5c6ff64a874632eb2fe80265e34a6ad99f',
+ timestamp: 1710174132,
+ },
+ },
+};
diff --git a/cashtab/src/wallet/__tests__/index.test.js b/cashtab/src/wallet/__tests__/index.test.js
--- a/cashtab/src/wallet/__tests__/index.test.js
+++ b/cashtab/src/wallet/__tests__/index.test.js
@@ -18,13 +18,19 @@
removeLeadingZeros,
getHashes,
hasUnfinalizedTxsInHistory,
- getAgoraPartialFuelInput,
+ getAgoraPartialAcceptFuelInputs,
+ getAgoraPartialCancelFuelInputs,
} from 'wallet';
import { isValidCashtabWallet } from 'validation';
import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
import vectors from '../fixtures/vectors';
+import { initWasm } from 'ecash-lib';
describe('Cashtab wallet methods', () => {
+ beforeAll(async () => {
+ // Need this to use AgoraOffer methods
+ await initWasm();
+ });
describe('Calculates total balance in satoshis from a valid set of chronik utxos', () => {
const { expectedReturns, expectedErrors } =
vectors.getBalanceSatsVectors;
@@ -251,24 +257,76 @@
});
});
});
- describe('We can get a fuel input for an AgoraOffer (partial) accept or cancel tx', () => {
+ describe('We can get fuel inputs for an AgoraOffer (partial) accept tx', () => {
+ const { expectedReturns, expectedErrors } =
+ vectors.getAgoraPartialAcceptFuelInputs;
+ expectedReturns.forEach(expectedReturn => {
+ const {
+ description,
+ agoraOffer,
+ utxos,
+ acceptedTokens,
+ feePerKb,
+ returned,
+ } = expectedReturn;
+ it(`getAgoraPartialAcceptFuelInputs: ${description}`, () => {
+ expect(
+ getAgoraPartialAcceptFuelInputs(
+ agoraOffer,
+ utxos,
+ acceptedTokens,
+ feePerKb,
+ ),
+ ).toStrictEqual(returned);
+ });
+ });
+ expectedErrors.forEach(expectedError => {
+ const {
+ description,
+ agoraOffer,
+ utxos,
+ acceptedTokens,
+ feePerKb,
+ error,
+ } = expectedError;
+ it(`getAgoraPartialAcceptFuelInputs throws error for: ${description}`, () => {
+ expect(() =>
+ getAgoraPartialAcceptFuelInputs(
+ agoraOffer,
+ utxos,
+ acceptedTokens,
+ feePerKb,
+ ),
+ ).toThrow(error);
+ });
+ });
+ });
+ describe('We can get fuel inputs for an AgoraOffer (partial) cancel tx', () => {
const { expectedReturns, expectedErrors } =
- vectors.getAgoraPartialFuelInput;
+ vectors.getAgoraPartialCancelFuelInputs;
expectedReturns.forEach(expectedReturn => {
- const { description, xecUtxos, requiredSats, returned } =
+ const { description, agoraOffer, utxos, feePerKb, returned } =
expectedReturn;
- it(`getFuelInput: ${description}`, () => {
+ it(`getAgoraPartialCancelFuelInputs: ${description}`, () => {
expect(
- getAgoraPartialFuelInput(xecUtxos, requiredSats),
+ getAgoraPartialCancelFuelInputs(
+ agoraOffer,
+ utxos,
+ feePerKb,
+ ),
).toStrictEqual(returned);
});
});
expectedErrors.forEach(expectedError => {
- const { description, xecUtxos, requiredSats, error } =
+ const { description, agoraOffer, utxos, feePerKb, error } =
expectedError;
- it(`getFuelInput throws error for: ${description}`, () => {
+ it(`getAgoraPartialCancelFuelInputs throws error for: ${description}`, () => {
expect(() =>
- getAgoraPartialFuelInput(xecUtxos, requiredSats),
+ getAgoraPartialCancelFuelInputs(
+ agoraOffer,
+ utxos,
+ feePerKb,
+ ),
).toThrow(error);
});
});
diff --git a/cashtab/src/wallet/fixtures/vectors.js b/cashtab/src/wallet/fixtures/vectors.js
--- a/cashtab/src/wallet/fixtures/vectors.js
+++ b/cashtab/src/wallet/fixtures/vectors.js
@@ -3,6 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
+import { agoraOfferCachetAlphaOne } from 'components/Agora/fixtures/mocks';
export const UNSAFE_INTEGER_STRING = '10000000000000000';
export default {
@@ -581,44 +582,112 @@
},
],
},
- getAgoraPartialFuelInput: {
+ getAgoraPartialAcceptFuelInputs: {
expectedReturns: [
{
- description: 'A single utxo that is exactly sufficient',
- xecUtxos: [{ value: 1000 }],
- requiredSats: 1000,
- returned: { value: 1000 },
+ description:
+ 'We can get a single fuel input to accept the offer, if the wallet has one exactly covering the price + fee',
+ agoraOffer: agoraOfferCachetAlphaOne,
+ // acceptFeeSats 1182n
+ // askedSats 5460736n
+ // requiredSats 5461918n
+ utxos: [{ value: 5461918 }],
+ acceptedTokens: 546n,
+ feePerKb: 1000,
+ returned: [{ value: 5461918 }],
+ },
+ {
+ description:
+ 'We can get a single fuel input to accept the offer, if the wallet has one exactly covering the price + fee, at a higher than min fee',
+ agoraOffer: agoraOfferCachetAlphaOne,
+ // acceptFeeSats 2376n
+ // askedSats 5460736n
+ // requiredSats 5463112
+ utxos: [{ value: 5463112 }],
+ acceptedTokens: 546n,
+ feePerKb: 2010,
+ returned: [{ value: 5463112 }],
+ },
+ {
+ description: 'Two inputs exactly covering the price + fee',
+ agoraOffer: agoraOfferCachetAlphaOne,
+ // acceptFeeSats 1323n
+ // askedSats 5460736n
+ // requiredSats 5462059n
+ utxos: [{ value: 5461917 }, { value: 142 }],
+ acceptedTokens: 546n,
+ feePerKb: 1000,
+ returned: [{ value: 5461917 }, { value: 142 }],
+ },
+ {
+ description: 'Three inputs exactly covering the price + fee',
+ agoraOffer: agoraOfferCachetAlphaOne,
+ // acceptFeeSats 1464n
+ // askedSats 5460736n
+ // requiredSats 5462059n
+ utxos: [{ value: 5461917 }, { value: 141 }, { value: 142 }],
+ acceptedTokens: 546n,
+ feePerKb: 1000,
+ returned: [{ value: 5461917 }, { value: 141 }, { value: 142 }],
},
+ ],
+ expectedErrors: [
{
- description: 'We ignore an insufficient utxo',
- xecUtxos: [{ value: 999 }, { value: 1000 }],
- requiredSats: 1000,
- returned: { value: 1000 },
+ description:
+ 'We throw an error if available utxos can only cover 1 satoshi less than price + fee',
+ agoraOffer: agoraOfferCachetAlphaOne,
+ utxos: [{ value: 5461917 }],
+ acceptedTokens: 546n,
+ feePerKb: 1000,
+ error: 'Insufficient utxos to accept this offer',
},
+ ],
+ },
+ getAgoraPartialCancelFuelInputs: {
+ expectedReturns: [
{
- description: 'We return the first good utxo',
- xecUtxos: [
- { value: 998 },
- { value: 999 },
- { value: 1000 },
- { value: 1001 },
- ],
- requiredSats: 1000,
- returned: { value: 1000 },
+ description:
+ 'We can get a single fuel input to cancel the offer, if the wallet has one exactly covering the fee',
+ agoraOffer: agoraOfferCachetAlphaOne,
+ // cancelFeeSats 719n
+ utxos: [{ value: 719 }],
+ feePerKb: 1000,
+ returned: [{ value: 719 }],
+ },
+ {
+ description:
+ 'We can get a single fuel input to cancel the offer, if the wallet has one exactly covering the fee, at a higher than min fee',
+ agoraOffer: agoraOfferCachetAlphaOne,
+ // cancelFeeSats 1446
+ utxos: [{ value: 1446 }],
+ feePerKb: 2010,
+ returned: [{ value: 1446 }],
+ },
+ {
+ description: 'Two inputs exactly covering the fee',
+ agoraOffer: agoraOfferCachetAlphaOne,
+ // cancelFeeSats 860n
+ utxos: [{ value: 718 }, { value: 142 }],
+ feePerKb: 1000,
+ returned: [{ value: 718 }, { value: 142 }],
+ },
+ {
+ description: 'Three inputs exactly covering the fee',
+ agoraOffer: agoraOfferCachetAlphaOne,
+ // cancelFeeSats 1001n
+ utxos: [{ value: 718 }, { value: 141 }, { value: 142 }],
+ feePerKb: 1000,
+ returned: [{ value: 718 }, { value: 141 }, { value: 142 }],
},
],
expectedErrors: [
{
description:
- 'We throw an error if no fuel inputs are available',
- xecUtxos: [
- { value: 998 },
- { value: 999 },
- { value: 1000 },
- { value: 1001 },
- ],
- requiredSats: 1002,
- error: `You do not have a fuel utxo that can cover 1002 satoshis`,
+ 'We throw an error if available utxos can only cover 1 satoshi less than fee',
+ agoraOffer: agoraOfferCachetAlphaOne,
+ utxos: [{ value: 1 }],
+ feePerKb: 1000,
+ error: 'Insufficient utxos to cancel this offer',
},
],
},
diff --git a/cashtab/src/wallet/index.js b/cashtab/src/wallet/index.js
--- a/cashtab/src/wallet/index.js
+++ b/cashtab/src/wallet/index.js
@@ -8,12 +8,39 @@
import * as utxolib from '@bitgo/utxo-lib';
import cashaddr from 'ecashaddrjs';
import appConfig from 'config/app';
+import { fromHex, Script, P2PKHSignatory, ALL_BIP143 } from 'ecash-lib';
const SATOSHIS_PER_XEC = 100;
const NANOSATS_PER_XEC = new BN(1e11);
const STRINGIFIED_INTEGER_REGEX = /^[0-9]+$/;
export const STRINGIFIED_DECIMALIZED_REGEX = /^\d*\.?\d*$/;
+const DUMMY_TXID =
+ '1111111111111111111111111111111111111111111111111111111111111111';
+const DUMMY_WALLET_HASH = fromHex('12'.repeat(20));
+const DUMMY_SUFFICIENT_CANCEL_VALUE = 10000;
+const DUMMY_SCRIPT = Script.p2pkh(DUMMY_WALLET_HASH);
+export const DUMMY_KEYPAIR = {
+ sk: fromHex('33'.repeat(32)),
+ pk: fromHex(
+ '023c72addb4fdf09af94f0c94d7fe92a386a7e70cf8a1d85916386bb2535c7b1b1',
+ ),
+};
+// Used for accept and cancel fee estimation of agora partial offers
+const DUMMY_INPUT = {
+ input: {
+ prevOut: {
+ txid: DUMMY_TXID,
+ outIdx: 1,
+ },
+ signData: {
+ value: DUMMY_SUFFICIENT_CANCEL_VALUE,
+ outputScript: DUMMY_SCRIPT,
+ },
+ },
+ signatory: P2PKHSignatory(DUMMY_KEYPAIR.sk, DUMMY_KEYPAIR.pk, ALL_BIP143),
+};
+
/**
* Get total value of satoshis associated with an array of chronik utxos
* @param {array} nonSlpUtxos array of chronik utxos
@@ -436,26 +463,87 @@
};
/**
- * Find a utxo that has enough value to cover requiredSats
- * of an AgoraPartial offer
- * This method is useful in building minimum-fee accept and
- * cancel txs that are constructed by an AgoraOffer object
- * with type === "PARTIAL"
- * It is possible that edge cases could exist where the user
- * "has enough" XEC to cancel a tx or take an offer, but must
- * combine utxos to do so
- * For now, we do not support this
- * @param {array} xecUtxos
- * @param {integer} requiredSats
+ * Determine input utxos to cover an Agora Partial accept offer
+ * @param {AgoraOffer} agoraOffer
+ * @param {utxos[]} utxos array of utxos as stored in Cashtab wallet object
+ * @param {bigint} acceptedTokens
+ * @param {number} feePerKb in satoshis
+ * @returns {CashtabUtxo[]} fuelInputs
+ * @throws {error} if we cannot afford this tx
*/
-export const getAgoraPartialFuelInput = (xecUtxos, requiredSats) => {
- // Iterate over utxos until you find a suitable one
- for (const utxo of xecUtxos) {
- if (utxo.value >= requiredSats) {
- return utxo;
+export const getAgoraPartialAcceptFuelInputs = (
+ agoraOffer,
+ utxos,
+ acceptedTokens,
+ feePerKb,
+) => {
+ const fuelInputs = [];
+ const dummyInputs = [];
+ let inputSatoshis = 0n;
+ for (const utxo of utxos) {
+ // Accumulative utxo selection
+ fuelInputs.push(utxo);
+ // Match our fuelInput count with dummyInputs
+ dummyInputs.push(DUMMY_INPUT);
+ inputSatoshis += BigInt(utxo.value);
+
+ const askedSats = agoraOffer.askedSats(BigInt(acceptedTokens));
+
+ // Get the tx fee for this tx
+ const acceptFeeSats = agoraOffer.acceptFeeSats({
+ recipientScript: DUMMY_SCRIPT,
+ extraInputs: dummyInputs,
+ acceptedTokens,
+ feePerKb,
+ });
+
+ // We need to cover the tx fee and the asking price
+ const requiredSats = acceptFeeSats + askedSats;
+
+ if (inputSatoshis >= requiredSats) {
+ return fuelInputs;
}
}
- throw new Error(
- `You do not have a fuel utxo that can cover ${requiredSats} satoshis`,
- );
+ throw new Error('Insufficient utxos to accept this offer');
+};
+
+/**
+ * Determine input utxos to cancel an Agora Partial offer
+ * @param {AgoraOffer} agoraOffer
+ * @param {utxos[]} utxos array of utxos as stored in Cashtab wallet object
+ * @param {number} feePerKb in satoshis
+ * @returns {CashtabUtxo[]} fuelInputs
+ * @throws {error} if we cannot afford this tx
+ */
+export const getAgoraPartialCancelFuelInputs = (
+ agoraOffer,
+ utxos,
+ feePerKb,
+) => {
+ const fuelInputs = [];
+ const dummyInputs = [];
+ let inputSatoshis = 0n;
+ for (const utxo of utxos) {
+ // Accumulative utxo selection
+ fuelInputs.push(utxo);
+ // Match our fuelInput count with dummyInputs
+ dummyInputs.push(DUMMY_INPUT);
+ inputSatoshis += BigInt(utxo.value);
+
+ // Get the tx fee for this tx
+ // In practice, this is always bigger than dust
+ // So we do not check to make sure the output we cover is at least dust
+ const cancelFeeSats = agoraOffer.cancelFeeSats({
+ recipientScript: DUMMY_SCRIPT,
+ extraInputs: dummyInputs,
+ feePerKb,
+ });
+
+ // There is no asking price for cancellation
+ // cancelFeeSats is the size of the output we need
+ if (inputSatoshis >= cancelFeeSats) {
+ return fuelInputs;
+ }
+ }
+ throw new Error('Insufficient utxos to cancel this offer');
};