From b76e9c09fd0c7946e33b4fe034e00b1a46ce3048 Mon Sep 17 00:00:00 2001 From: stjet <49297268+stjet@users.noreply.github.com> Date: Thu, 16 Jan 2025 20:46:00 +0000 Subject: [PATCH] bump banani version to fix bug; seed confirm page --- package-lock.json | 42 ++++++++++++------------- package.json | 4 +-- src/lib/ConfirmSeed.svelte | 31 ++++++++++++++++++ src/lib/Seed.svelte | 7 ++--- src/lib/types.ts | 1 + src/routes/api/check_payment/+server.ts | 2 +- src/routes/register/+page.svelte | 3 ++ 7 files changed, 62 insertions(+), 28 deletions(-) create mode 100644 src/lib/ConfirmSeed.svelte diff --git a/package-lock.json b/package-lock.json index 92d5e4b..ada1185 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,8 +8,8 @@ "name": "test", "version": "0.0.1", "dependencies": { - "banani": "^1.0.3", - "banani-bns": "^0.0.6", + "banani": "^1.0.5", + "banani-bns": "^0.0.9", "mongodb": "^6.10.0", "qrcode": "^1.5.4" }, @@ -833,9 +833,9 @@ } }, "node_modules/@sveltejs/kit": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.7.3.tgz", - "integrity": "sha512-Vx7nq5MJ86I8qXYsVidC5PX6xm+uxt8DydvOdmJoyOK7LvGP18OFEG359yY+aa51t6pENvqZAMqAREQQx1OI2Q==", + "version": "2.15.2", + "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.15.2.tgz", + "integrity": "sha512-p208T1kdM6zd8k4YXIUM60pLWQ8dZqehXSiqn4NulXHyHibX53uIAL2xtNL8GjxX2IVPqPRT978MwVYhCKExdQ==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -843,7 +843,7 @@ "@types/cookie": "^0.6.0", "cookie": "^0.6.0", "devalue": "^5.1.0", - "esm-env": "^1.0.0", + "esm-env": "^1.2.1", "import-meta-resolve": "^4.1.0", "kleur": "^4.1.5", "magic-string": "^0.30.5", @@ -860,9 +860,9 @@ "node": ">=18.13" }, "peerDependencies": { - "@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1", + "@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0", "svelte": "^4.0.0 || ^5.0.0-next.0", - "vite": "^5.0.3" + "vite": "^5.0.3 || ^6.0.0" } }, "node_modules/@sveltejs/vite-plugin-svelte": { @@ -1120,20 +1120,20 @@ "license": "MIT" }, "node_modules/banani": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/banani/-/banani-1.0.3.tgz", - "integrity": "sha512-2hr3RUXWRUE9yOMH6wlJYaRdwdFUAjWQ8eHz2QRcYHKWjs+b9wnJ0bgAi85DFVKArQtJ3cFZ8oq/TDVB5GHWVw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/banani/-/banani-1.0.6.tgz", + "integrity": "sha512-wB4nijscW0g18aojQqOm4Lqghg9TDHGQe+AnravbZoH37c3fJXSgQV+pKzBqpT3VIzcASfOjFyAqmUsTDWREHA==", "license": "MIT", "dependencies": { "blake2b": "^2.1.4" } }, "node_modules/banani-bns": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/banani-bns/-/banani-bns-0.0.6.tgz", - "integrity": "sha512-zLzw2U3TEEKTvyw1ohCJItR4cURb4PODt4wvBj/2YPmqr+TcUBpsE2DU3PryQ3EuE/887BEmmm7fMaC5JoKw9g==", + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/banani-bns/-/banani-bns-0.0.9.tgz", + "integrity": "sha512-G9eRXk24ykHLqSCr2LgqNHyUvuzye0VTpNMZdyD4/8HtZRU05Pv1Dbk1lbINkz0ZVf1Y2Jl6dF0ivXMLWBqIRA==", "dependencies": { - "banani": "^1.0.3" + "banani": "^1.0.4" } }, "node_modules/bindings": { @@ -1410,9 +1410,9 @@ } }, "node_modules/esm-env": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.1.4.tgz", - "integrity": "sha512-oO82nKPHKkzIj/hbtuDYy/JHqBHFlMIW36SDiPCVsj87ntDLcWN+sJ1erdVryd4NxODacFTsdrIE3b7IamqbOg==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.2.tgz", + "integrity": "sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==", "dev": true, "license": "MIT" }, @@ -1928,9 +1928,9 @@ "license": "ISC" }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "dev": true, "funding": [ { diff --git a/package.json b/package.json index 35f6bcf..38ecf58 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ "vite": "^5.0.3" }, "dependencies": { - "banani": "^1.0.3", - "banani-bns": "^0.0.6", + "banani": "^1.0.7", + "banani-bns": "^0.0.9", "mongodb": "^6.10.0", "qrcode": "^1.5.4" } diff --git a/src/lib/ConfirmSeed.svelte b/src/lib/ConfirmSeed.svelte new file mode 100644 index 0000000..5fe3565 --- /dev/null +++ b/src/lib/ConfirmSeed.svelte @@ -0,0 +1,31 @@ + + +

Confirm the seed you just saved:

+ +
+
+ + + + diff --git a/src/lib/Seed.svelte b/src/lib/Seed.svelte index a8a8b88..23daef1 100644 --- a/src/lib/Seed.svelte +++ b/src/lib/Seed.svelte @@ -3,14 +3,14 @@ let { bsf_seed, progress = $bindable() } = $props(); - function continue_to_payment() { - progress = Progress.Payment; + function continue_to_confirm() { + progress = Progress.ConfirmSeed; }

Save the seed and continue.

Seed (in BNS Seed Format): {bsf_seed}

- + - diff --git a/src/lib/types.ts b/src/lib/types.ts index e59ba91..c2b42a3 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -1,5 +1,6 @@ export enum Progress { Seed = "seed", + ConfirmSeed = "confirm_seed", Payment = "payment", Declare = "declare", Done = "done", diff --git a/src/routes/api/check_payment/+server.ts b/src/routes/api/check_payment/+server.ts index 29628e0..c44fd10 100644 --- a/src/routes/api/check_payment/+server.ts +++ b/src/routes/api/check_payment/+server.ts @@ -30,7 +30,7 @@ export const POST: RequestHandler = async ({ request }) => { const receive_wallet = new Wallet(rpc, found.receive_seed); await receive_wallet.receive_all(); await sleep(1500); - const balance = Number(raw_to_whole((await rpc.get_account_balance(receive_wallet.address)).balance)); + const balance = Number(raw_to_whole(BigInt((await rpc.get_account_balance(receive_wallet.address)).balance))); if (balance < found.price) { return error(500, `Need to be sent ${found.price}, only got ${balance}`); } diff --git a/src/routes/register/+page.svelte b/src/routes/register/+page.svelte index 27891ce..0b4a3d1 100644 --- a/src/routes/register/+page.svelte +++ b/src/routes/register/+page.svelte @@ -4,6 +4,7 @@ import { Progress } from "$lib/types"; import Seed from "$lib/Seed.svelte"; + import ConfirmSeed from "$lib/ConfirmSeed.svelte"; import Payment from "$lib/Payment.svelte"; import Declare from "$lib/Declare.svelte"; @@ -40,6 +41,8 @@
{#if progress === Progress.Seed} + {:else if progress === Progress.ConfirmSeed} + {:else if progress === Progress.Payment} {:else if progress === Progress.Declare}