Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/namadillo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"@keplr-wallet/types": "^0.12.136",
"@namada/chain-registry": "^1.3.0",
"@namada/indexer-client": "3.0.1",
"@namada/sdk-multicore": "../../../namada-sdkjs/dist",
"@tailwindcss/container-queries": "^0.1.1",
"@tanstack/query-core": "^5.40.0",
"@tanstack/react-query": "^5.40.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/namadillo/src/hooks/useSdk.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Sdk } from "@namada/sdk/web";
import { Sdk } from "@namada/sdk-multicore";
import { QueryStatus, useQuery } from "@tanstack/react-query";
import { PageLoader } from "App/Common/PageLoader";
import { chainParametersAtom, nativeTokenAddressAtom } from "atoms/chain";
Expand Down
2 changes: 1 addition & 1 deletion apps/namadillo/src/lib/query.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Sdk } from "@namada/sdk/web";
import { Sdk } from "@namada/sdk-multicore";
import {
Account,
AccountType,
Expand Down
14 changes: 6 additions & 8 deletions apps/namadillo/src/utils/sdk.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import initSdk from "@namada/sdk/inline-init";
import { getSdk, Sdk } from "@namada/sdk/web";
import { Sdk } from "@namada/sdk-multicore";
import { initSdk } from "@namada/sdk-multicore/inline";
import { nativeTokenAddressAtom } from "atoms/chain";
import { maspIndexerUrlAtom, rpcUrlAtom } from "atoms/settings";
import { getDefaultStore } from "jotai";

const initializeSdk = async (): Promise<Sdk> => {
const { cryptoMemory } = await initSdk();
const store = getDefaultStore();
const rpcUrl = store.get(rpcUrlAtom);
const maspIndexerUrl = store.get(maspIndexerUrlAtom);
Expand All @@ -15,13 +14,12 @@ const initializeSdk = async (): Promise<Sdk> => {
throw "Native token not loaded";
}

const sdk = getSdk(
cryptoMemory,
const sdk = await initSdk({
rpcUrl,
maspIndexerUrl,
"",
nativeToken.data
);
token: nativeToken.data,
});

return sdk;
};

Expand Down
14 changes: 5 additions & 9 deletions apps/namadillo/src/workers/MaspTxWorker.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { initMulticore } from "@namada/sdk/inline-init";
import { getSdk, Sdk } from "@namada/sdk/web";
import { Sdk } from "@namada/sdk-multicore";
import { initSdk } from "@namada/sdk-multicore/inline";
import {
IbcTransferMsgValue,
ShieldedTransferMsgValue,
Expand Down Expand Up @@ -37,8 +37,7 @@ export class Worker {
private sdk: Sdk | undefined;

async init(m: Init): Promise<InitDone> {
const { cryptoMemory } = await initMulticore();
this.sdk = newSdk(cryptoMemory, m.payload);
this.sdk = await newSdk(m.payload);
return { type: "init-done", payload: null };
}

Expand Down Expand Up @@ -287,12 +286,9 @@ async function broadcast(
return result;
}

function newSdk(
cryptoMemory: WebAssembly.Memory,
payload: Init["payload"]
): Sdk {
async function newSdk(payload: Init["payload"]): Promise<Sdk> {
const { rpcUrl, token, maspIndexerUrl } = payload;
return getSdk(cryptoMemory, rpcUrl, maspIndexerUrl, "", token);
return await initSdk({ rpcUrl, maspIndexerUrl, dbName: "", token });
}

export const registerTransferHandlers = (): void => {
Expand Down
3 changes: 2 additions & 1 deletion apps/namadillo/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"jsx": "react-jsx",
"lib": ["dom", "dom.iterable", "esnext"],
"module": "esnext",
"moduleResolution": "node",
"moduleResolution": "bundler",
"moduleDetection": "force",
"noEmit": false,
"noFallthroughCasesInSwitch": true,
"resolveJsonModule": true,
Expand Down
8 changes: 4 additions & 4 deletions packages/hooks/src/useSanitizedLocation.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { sanitize } from "isomorphic-dompurify";
import DOMPurify from "isomorphic-dompurify";
import { Location, useLocation } from "react-router-dom";

export const useSanitizedLocation = (): Location => {
const location = useLocation();
return {
...location,
pathname: sanitize(location.pathname),
search: sanitize(location.search),
hash: sanitize(location.hash),
pathname: DOMPurify.sanitize(location.pathname),
search: DOMPurify.sanitize(location.search),
hash: DOMPurify.sanitize(location.hash),
};
};
4 changes: 2 additions & 2 deletions packages/hooks/src/useSanitizedParams.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { sanitize } from "isomorphic-dompurify";
import DOMPurify from "isomorphic-dompurify";
import { Params, useParams } from "react-router-dom";

type ParamsT<ParamsOrKey> = Readonly<
Expand All @@ -12,7 +12,7 @@ export function useSanitizedParams<
return Object.entries(params).reduce(
(acc, [key, value]) => ({
...acc,
[key]: typeof value === "string" ? sanitize(value) : value,
[key]: typeof value === "string" ? DOMPurify.sanitize(value) : value,
}),
{} as ParamsT<ParamsOrKey>
);
Expand Down
18 changes: 18 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3828,6 +3828,7 @@ __metadata:
"@keplr-wallet/types": "npm:^0.12.136"
"@namada/chain-registry": "npm:^1.3.0"
"@namada/indexer-client": "npm:3.0.1"
"@namada/sdk-multicore": ../../../namada-sdkjs/dist
"@playwright/test": "npm:^1.24.1"
"@svgr/webpack": "npm:^6.5.1"
"@tailwindcss/container-queries": "npm:^0.1.1"
Expand Down Expand Up @@ -3912,6 +3913,23 @@ __metadata:
languageName: unknown
linkType: soft

"@namada/sdk-multicore@file:../../../namada-sdkjs/dist::locator=%40namada%2Fnamadillo%40workspace%3Aapps%2Fnamadillo":
version: 1.0.0
resolution: "@namada/sdk-multicore@file:../../../namada-sdkjs/dist#../../../namada-sdkjs/dist::hash=c3ad56&locator=%40namada%2Fnamadillo%40workspace%3Aapps%2Fnamadillo"
dependencies:
"@cosmjs/encoding": "npm:^0.29.0"
"@dao-xyz/borsh": "npm:^5.1.5"
"@ledgerhq/hw-transport": "npm:^6.31.4"
"@ledgerhq/hw-transport-webusb": "npm:^6.29.4"
"@zondax/ledger-namada": "npm:^2.0.0"
bignumber.js: "npm:^9.1.1"
buffer: "npm:^6.0.3"
semver: "npm:^7.6.3"
slip44: "npm:^3.0.18"
checksum: 10c0/fb87926252bd9af03e3ee15a9abe975657d9f9fe30491aef2355e10dd73c1a0b140ad38161d61c4cc9e4b55cb8b17a362e644e4565b2d0548a291d1b0dcebd1a
languageName: node
linkType: hard

"@namada/sdk@workspace:packages/sdk":
version: 0.0.0-use.local
resolution: "@namada/sdk@workspace:packages/sdk"
Expand Down
Loading