diff --git a/cc-implementation/SHA256SUMS b/cc-implementation/SHA256SUMS index 88d6a14..a5bbc47 100644 --- a/cc-implementation/SHA256SUMS +++ b/cc-implementation/SHA256SUMS @@ -1,13 +1,13 @@ b9baf7ada4b80d2878b52ab0cf56f878aeb774aec62de88b8b02a168be82cbb5 ./index.html -e2727f446cf90a949200836ece6b9c53ab2f217b1d01cc28f76020f5a3f0bec8 ./build-single-file/index.html +aeca3023e084d3e9427a6dc6a810469eff564631e309efc039b03fc91f719a80 ./build-single-file/index.html 7f8469776f50d7d766cbe3e438e290baf2d91815a3d8233f248b6e412bc8c94e ./package-lock.json d035d1b528f544331f8c697da0d407427f409b4fbb6f86232ec1445c16e85a7e ./package.json 68df121854e628c7d84ee41b7d86875626cc342aa0c8b0f939af322eb4ba1723 ./tsconfig.json 39c8001f6300c1ff63e29639a8b513fa888e61a58053a19716ed6df497a48ed8 ./build/index.html -2462f20149c235e936de6f9420cc0a4630aeb9c26f5dc6c5b906c11edbfc720c ./build/pushtx.js +a7f049f6042b739d4a81b8e0444a02a3bc7adcaf691fa01e75443b7ad95dad26 ./build/pushtx.js 31ebc58b766680c1000cabd7b7da7eeb943aff58ebc805beba608e15ffc7a3f6 ./build/pushtx.css 2ede67555dd622a2be580b3e15fdde6463413f63e79913f54faa75d819a4cc01 ./vite.config.ts -91d383919e958aa174cb525b7b1c415e50e125b32349673235ac850d88ea4a0b ./src/main.ts +2bdc9fe7c30746da1546442b83fb693357603f411df930e86c740f4ad79fc275 ./src/main.ts b41fd5552c271453ce7ee1c661e72495705e5da0e005828b17f4ad057ba91e87 ./src/types.ts 65996936fbb042915f7b74a200fcdde7e410f32a669b1ab9597cfaa4b0faddb5 ./src/vite-env.d.ts 4e6dd4e5d1689110a3645a7ee5f82fac8ec32d4aad8c00d906be60f64ebca678 ./src/style.css diff --git a/cc-implementation/SHA256SUMS.asc b/cc-implementation/SHA256SUMS.asc index a8dd6c3..73d74a6 100644 --- a/cc-implementation/SHA256SUMS.asc +++ b/cc-implementation/SHA256SUMS.asc @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNATURE----- -iQIzBAABCAAdFiEEP00hGW4U/Tk4NUkt+WAjxY4UcskFAmZysiIACgkQ+WAjxY4U -cslP/w/9E+Bgd5+vDPPD+UbDW7qlGulSB6u5zomsCL1L4p7xJuywV23R90pi0e9l -HwJD+Fa2AqISk8OXqzx39eQASLvaxEZBJx0XMGIJlI7Ce54LdOlJXEqBGO4xMiPX -Df7HJI2qXfwIBBVzF9Yoc2ZAq2nGlLcKZCDRmNU66bHl7nV3UFZc7ZPOMw+OXVhk -OYZSlV0EURl2r7NZRMiw3aaJxoY9juhAUvEanfGxfQuS+ONq439Qrly7QXfB2sk6 -+uWutp0lkGCM5ZlVOdRFHuCa+G3sVndjWFvZw35ffjGLqMm3NrzoTFM9+auv7pgz -d2O/eYjWfD/PrAyM+n3voUYYJaXcwzpzf67IrzRY2rw0AlURovMyIOETZk6lJmoU -eBGWTD2oGGxXQODg1WhRH+ueoUhy099c9IcVYt3ZW49GZUYyfRezhrHqdTBIXrSs -+NO4tGdiLl2lglT728jpC+n4DZ1mOGe0rKU8ReuX4K1bN91kAul0Y8vVTLgnZEyh -P3TTv3BeAAWv/0vyqV57Cev3r2Oq/oc2OyVqTIFvNildI3HUN6+WpwZd8IbnWMoB -oFwTiuAbAzeEnUVw5iGFdgVLl/09jEWiT+IsV6a5NAn0IDsqRvlwBc6AGjLrwlFT -fTf+y7c5WpNlSzEFiaGbdwyBGykawZYEDJ4bNC/rAvHOTsKoQxA= -=4uaq +iQIzBAABCAAdFiEEP00hGW4U/Tk4NUkt+WAjxY4UcskFAmZz4YAACgkQ+WAjxY4U +csnQJw//YbupILr2oXyJBpAoVVGriPa9iwGLR53dCNfay8ffTOfU/4KwGE7IN557 +qdq0vQezr+KM92JvVX4l6i23tGAg8X7uPEKD8zgiVbApfJal40ANfBnXa77pmCDU +fFPBRaUnMC+DrlbZDnpnmbMW8XnesS8aXhbiBA1tFo3QuzLZUSECoaOWWKumIZ71 +5/7mOOlIp82+ji9ehCDd1YlaYwIwBka0Lj8p8LGhFLYamf6JTE8CP2E4Lr3kEBSz +6LSMva/VOHHAfGEd1yfRldqwPLXLcgAV/u6oBlQ5ZLFnMiVCvUK6bVBTEwikQUPQ +Zi9TclDM1Q2onDihV0Ic1Td87oG9pj30e7Bp33d7rLEOHyv3SevMapMjJLAgA7xT +4/PX6bcqpqEGw0r2Cw0LBe0AeWgp6Lve5b9kGvUPMQuOJVULU1/370Sp1gVsqXJj +wbhGwizXtX+5Vh44ZectEl0F/A8eqKbuRyu4jENbnOsdjnf4cXaIO7mhNQXQdO7c +SGQGahj1KpR3a/bqp3t0hwCwjbGzryf6eIw8yxbxSqTGBjkOCwYHysYNAXUSpsJp +7FSHX9fcB2J6ao7r1m+zIbhjE8zs4Rq7XQ2mXY+Iz/VuD2iG+y8eCMy4C/5Nvf1J +2tS4UeIViZNHiiufj0v33GvPNakJcYBbxHZqTMG+MhqM5WsDVKg= +=EZHG -----END PGP SIGNATURE----- diff --git a/cc-implementation/build-single-file/index.html b/cc-implementation/build-single-file/index.html index e41ad31..0f81b2c 100644 --- a/cc-implementation/build-single-file/index.html +++ b/cc-implementation/build-single-file/index.html @@ -100,15 +100,15 @@ PROCEED WITH CAUTION! ${r}
${t}
- `}async function Us(){const e=document.querySelector(".pushtx-message-area"),t=document.querySelector(".pushtx-details-area");if(!e||!t)throw new Error("Need message and details areas in HTML.");if(e.innerHTML="",t.innerHTML="",!window.location.hash){const d=` + `}async function Us(){const e=document.querySelector(".pushtx-message-area"),t=document.querySelector(".pushtx-details-area");if(!e||!t)throw new Error("Need message and details areas in HTML.");if(e.innerHTML="",t.innerHTML="",!window.location.hash){const S=`

Did you get here by accident?

This page is meant to be loaded together with transaction data using the COLDCARD NFC Push TX feature. The complete URL should look something like this (but longer):

-

https://coldcard.com/pushtx#t=AgAAAAMNCxXtp2GVYVhkRXHLMmdZFs4p3kbFK ⋯ ABf&c=uiSVRda-1tw

- `;e.innerHTML=Kt("info",d);return}e.innerHTML=Kt("progress","Sending transaction, please wait...");const[r,n]=await dr(vh(window.location.hash));if(r){e.innerHTML=Kt("error",r.message);return}const{tx:i,network:c}=n,s=i.getId(),[a,p]=await dr(Ph(i,c)),[w,f]=await dr(Bh(s,c));if(p||f){const d=f!=null&&f.status.confirmed?"This transaction has already been confirmed.":"The transaction has been sent and is waiting to be confirmed.",S=Ah[c].map(([y,_])=>`
  • ${y}
  • `).join("");e.innerHTML=Kt("success",`

    ${d} Transaction ID:

    +

    ${window.location.origin+window.location.pathname}#t=AgAAAAMNCxXtp2GVYVhkRXHLMmdZFs4p3kbFK ⋯ ABf&c=uiSVRda-1tw

    + `;e.innerHTML=Kt("info",S);return}e.innerHTML=Kt("progress","Sending transaction, please wait...");const[r,n]=await dr(vh(window.location.hash));if(r){e.innerHTML=Kt("error",r.message);return}const{tx:i,network:c}=n,s=i.getId(),[a,p]=await dr(Ph(i,c)),[w,f]=await dr(Bh(s,c));if(p||f){const d=f!=null&&f.status.confirmed?"This transaction has already been confirmed.":"The transaction has been sent and is waiting to be confirmed.",S=Ah[c].map(([y,_])=>`
  • ${y}
  • `).join("");e.innerHTML=Kt("success",`

    ${d} Transaction ID:

    ${s}

    diff --git a/cc-implementation/build/pushtx.js b/cc-implementation/build/pushtx.js index 8a70ef5..d4f934f 100644 --- a/cc-implementation/build/pushtx.js +++ b/cc-implementation/build/pushtx.js @@ -93,15 +93,15 @@ PROCEED WITH CAUTION! ${r}
    ${t}
    - `}async function Us(){const e=document.querySelector(".pushtx-message-area"),t=document.querySelector(".pushtx-details-area");if(!e||!t)throw new Error("Need message and details areas in HTML.");if(e.innerHTML="",t.innerHTML="",!window.location.hash){const d=` + `}async function Us(){const e=document.querySelector(".pushtx-message-area"),t=document.querySelector(".pushtx-details-area");if(!e||!t)throw new Error("Need message and details areas in HTML.");if(e.innerHTML="",t.innerHTML="",!window.location.hash){const S=`

    Did you get here by accident?

    This page is meant to be loaded together with transaction data using the COLDCARD NFC Push TX feature. The complete URL should look something like this (but longer):

    -

    https://coldcard.com/pushtx#t=AgAAAAMNCxXtp2GVYVhkRXHLMmdZFs4p3kbFK ⋯ ABf&c=uiSVRda-1tw

    - `;e.innerHTML=Kt("info",d);return}e.innerHTML=Kt("progress","Sending transaction, please wait...");const[r,n]=await dr(vh(window.location.hash));if(r){e.innerHTML=Kt("error",r.message);return}const{tx:i,network:c}=n,s=i.getId(),[a,p]=await dr(Ph(i,c)),[w,f]=await dr(Bh(s,c));if(p||f){const d=f!=null&&f.status.confirmed?"This transaction has already been confirmed.":"The transaction has been sent and is waiting to be confirmed.",S=Ah[c].map(([y,_])=>`
  • ${y}
  • `).join("");e.innerHTML=Kt("success",`

    ${d} Transaction ID:

    +

    ${window.location.origin+window.location.pathname}#t=AgAAAAMNCxXtp2GVYVhkRXHLMmdZFs4p3kbFK ⋯ ABf&c=uiSVRda-1tw

    + `;e.innerHTML=Kt("info",S);return}e.innerHTML=Kt("progress","Sending transaction, please wait...");const[r,n]=await dr(vh(window.location.hash));if(r){e.innerHTML=Kt("error",r.message);return}const{tx:i,network:c}=n,s=i.getId(),[a,p]=await dr(Ph(i,c)),[w,f]=await dr(Bh(s,c));if(p||f){const d=f!=null&&f.status.confirmed?"This transaction has already been confirmed.":"The transaction has been sent and is waiting to be confirmed.",S=Ah[c].map(([y,_])=>`
  • ${y}
  • `).join("");e.innerHTML=Kt("success",`

    ${d} Transaction ID:

    ${s}

    diff --git a/cc-implementation/src/main.ts b/cc-implementation/src/main.ts index 5034ea1..8f98f02 100644 --- a/cc-implementation/src/main.ts +++ b/cc-implementation/src/main.ts @@ -317,6 +317,8 @@ async function run() { detailsArea.innerHTML = ''; if (!window.location.hash) { + const path = window.location.origin + window.location.pathname; + const msg = `

    Did you get here by accident?

    @@ -324,7 +326,7 @@ async function run() { COLDCARD NFC Push TX feature. The complete URL should look something like this (but longer):

    -

    https://coldcard.com/pushtx#t=AgAAAAMNCxXtp2GVYVhkRXHLMmdZFs4p3kbFK ⋯ ABf&c=uiSVRda-1tw

    +

    ${path}#t=AgAAAAMNCxXtp2GVYVhkRXHLMmdZFs4p3kbFK ⋯ ABf&c=uiSVRda-1tw

    `; messageArea.innerHTML = renderMessage('info', msg);