fix tests, wasm fetch

Author: jurevans

.yarn/install-state.gz

@@ -2,8 +2,17 @@
   "name": "@namada/sdk",
   "version": "1.0.0",
   "description": "Namada SDK Package",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "lib/cjs/index.js",
+  "module": "lib/esm/index.js",
+  "types": "lib/esm/index.d.ts",
+  "exports": {
+    "import": "./lib/esm/index.js",
+    "require": "./lib/cjs/index.js"
+  },
+  "files": [
+    "lib",
+    "src"
+  ],
   "repository": "https://github.com/anoma/namada-sdkjs/",
   "author": "Heliax Dev <info@heliax.dev>",
   "license": "MIT",
@@ -69,9 +78,6 @@
     "typescript-transform-paths": "^3.4.7",
     "wasm-pack": "^0.13.0"
   },
-  "files": [
-    "dist/**/*.{js,ts,wasm}"
-  ],
   "publishConfig": {
     "registry": "https://registry.npmjs.org",
     "access": "public"

package.json

@@ -1,17 +1,19 @@
 import { execSync } from "child_process";
 
+const modules = ["esm", "cjs"];
 const targets = ["web", "nodejs"];
 const sdkBuilds = ["sdk", "sdk-multicore"];
 const srcDir = "./src/wasm/target";
-const baseDir = "./dist/wasm/target";
+const baseDir = "./dist/lib";
 
-execSync(`rm -rf ${baseDir}`);
-
-targets.forEach((target) => {
-  sdkBuilds.forEach((build) => {
-    execSync(`mkdir -p ${baseDir}/${target}/${build}`);
-    execSync(
-      `cp ${srcDir}/${target}/${build}/sdk_bg.wasm* ${baseDir}/${target}/${build}/`,
-    );
+modules.forEach((mod) => {
+  targets.forEach((target) => {
+    sdkBuilds.forEach((build) => {
+      // execSync(`rm ${baseDir}/${mod}/wasm/${target}/${build}`);
+      execSync(`mkdir -p ${baseDir}/${mod}/wasm/target/${target}/${build}`);
+      execSync(
+        `cp -r ${srcDir}/${target}/${build}/* ${baseDir}/${mod}/wasm/target/${target}/${build}/`,
+      );
+    });
   });
 });

scripts/copy.js

@@ -7,7 +7,7 @@ import {
   Salt,
   VecU8Pointer,
   readVecU8Pointer,
-} from "wasm";
+} from "../wasm";
 import { Argon2Config, CryptoRecord, EncryptionParams, KdfType } from "./types";
 
 /**

src/crypto/crypto.ts

@@ -1,4 +1,4 @@
-import { Argon2Params as Argon2ParamsWasm, VecU8Pointer } from "wasm";
+import { Argon2Params as Argon2ParamsWasm, VecU8Pointer } from "../wasm";
 
 export const Argon2Config = {
   // Number of memory blocks in kibibytes

src/crypto/types.ts

@@ -65,10 +65,10 @@ export type { Signing } from "./signing";
 export type { Tx } from "./tx";
 
 // Export SDK initializer and types
-export { initSdk } from "wasm";
+export { initSdk } from "./wasm";
 export type {
   WasmTarget,
   SdkBuildOptions,
   SdkWasmOptions,
   InitProps,
-} from "wasm";
+} from "./wasm";

src/index.ts

@@ -9,9 +9,9 @@ import {
   ExtendedViewingKey,
   gen_payment_address,
   public_key_to_bech32,
-} from "wasm";
-import { Bip44Path, Zip32Path } from "types";
-import { makeBip44PathArray, makeSaplingPathArray } from "utils";
+} from "../wasm";
+import { Bip44Path, NAMADA_COIN_TYPE as coinType, Zip32Path } from "../types";
+import { makeBip44PathArray, makeSaplingPathArray } from "../utils";
 import {
   Address,
   DEFAULT_BIP44_PATH,
@@ -21,7 +21,6 @@ import {
   ShieldedKeys,
   TransparentKeys,
 } from "./types";
-import { NAMADA_COIN_TYPE as coinType } from "types";
 
 /**
  * Namespace for key related functions

src/keys/keys.ts

@@ -1,4 +1,4 @@
-import { Bip44Path, Zip32Path } from "types";
+import { Bip44Path, Zip32Path } from "../types";
 
 /**
  * Address and public key type

src/keys/types.ts

@@ -13,7 +13,7 @@ import {
 import semver from "semver";
 import { makeBip44Path, makeSaplingPath } from "./utils";
 
-import { NAMADA_COIN_TYPE as coinType } from "types";
+import { NAMADA_COIN_TYPE as coinType } from "./types";
 
 export type LedgerAddressAndPublicKey = { address: string; publicKey: string };
 export type LedgerViewingKey = {

src/ledger.ts

@@ -1,4 +1,4 @@
-import { Sdk as SdkWasm } from "wasm";
+import { Sdk as SdkWasm } from "../wasm";
 
 /**
  * Class representing utilities related to MASP

src/masp/masp.ts

@@ -2,4 +2,4 @@ export {
   ExtendedViewingKey,
   ProofGenerationKey,
   PseudoExtendedKey,
-} from "wasm";
+} from "../wasm";

src/masp/types.ts

@@ -3,7 +3,7 @@ import {
   StringPointer,
   readVecStringPointer,
   readVecU8Pointer,
-} from "wasm";
+} from "./wasm";
 
 export enum PhraseSize {
   N12 = 12,

src/mnemonic.ts

@@ -1,16 +1,17 @@
+// @ts-nocheck
 import { deserialize } from "@dao-xyz/borsh";
 import {
   DatedViewingKey as DatedViewingKeyWasm,
   Query as QueryWasm,
   Sdk as SdkWasm,
   TransferToEthereum,
-} from "wasm";
+} from "../wasm";
 import {
   BroadcastTxError,
   DatedViewingKey,
   TxResponseMsgValue,
   TxResponseProps,
-} from "types";
+} from "../types";
 
 import {
   Balance,

src/rpc/rpc.ts

@@ -1,5 +1,5 @@
 import Transport from "@ledgerhq/hw-transport";
-import { Query as QueryWasm, Sdk as SdkWasm } from "wasm";
+import { Query as QueryWasm, Sdk as SdkWasm } from "./wasm";
 import packageJson from "../package.json";
 import { Crypto } from "./crypto";
 import { Keys } from "./keys";
@@ -10,7 +10,7 @@ import { Rpc } from "./rpc";
 import { Signing } from "./signing";
 import { Tx } from "./tx";
 
-export { ProgressBarNames, SdkEvents } from "wasm";
+export { ProgressBarNames, SdkEvents } from "./wasm";
 
 /**
  * API for interacting with Namada SDK
@@ -19,14 +19,14 @@ export class Sdk {
   /**
    * @param sdk - Instance of Sdk struct from wasm lib
    * @param query - Instance of Query struct from wasm lib
-   * @param cryptoMemory - Memory accessor for crypto lib
+   * @param memory - Memory accessor for wasm lib
    * @param url - RPC url
    * @param nativeToken - Address of chain's native token
    */
   constructor(
     protected sdk: SdkWasm,
     protected query: QueryWasm,
-    public readonly cryptoMemory: WebAssembly.Memory,
+    public readonly memory: WebAssembly.Memory,
     public readonly url: string,
     public readonly nativeToken: string,
   ) {}
@@ -69,15 +69,15 @@ export class Sdk {
    * @returns mnemonic-related functionality
    */
   getMnemonic(): Mnemonic {
-    return new Mnemonic(this.cryptoMemory);
+    return new Mnemonic(this.memory);
   }
 
   /**
    * Return initialized Keys class
    * @returns key-related functionality
    */
   getKeys(): Keys {
-    return new Keys(this.cryptoMemory);
+    return new Keys(this.memory);
   }
 
   /**
@@ -101,7 +101,7 @@ export class Sdk {
    * @returns Utilities for encrypting and decrypting data
    */
   getCrypto(): Crypto {
-    return new Crypto(this.cryptoMemory);
+    return new Crypto(this.memory);
   }
 
   /**

src/sdk.ts

@@ -1,5 +1,5 @@
-import { Sdk as SdkWasm } from "wasm";
-import { Message, TxMsgValue, TxProps } from "types";
+import { Sdk as SdkWasm } from "./wasm";
+import { Message, TxMsgValue, TxProps } from "./types";
 
 type Signature = [string, string];
 

src/signing.ts

@@ -4,17 +4,17 @@ import { initSdk } from "./initSdk";
 const PASSWORD = "super secure";
 
 describe("Crypto", () => {
-  it("should encrypt and decrypt data successfully", () => {
-    const { crypto } = initSdk();
+  it("should encrypt and decrypt data successfully", async () => {
+    const { crypto } = await initSdk();
     const plainText = "This is sensitive data";
     const cryptoRecord = crypto.encrypt(plainText, PASSWORD);
     const decryptedData = crypto.decrypt(cryptoRecord, PASSWORD);
 
     expect(decryptedData).toBe(plainText);
   });
 
-  it("should decrypt stored crypto record successfully", () => {
-    const { crypto } = initSdk();
+  it("should decrypt stored crypto record successfully", async () => {
+    const { crypto } = await initSdk();
     const plainText = "This is sensitive data";
     const decryptedData = crypto.decrypt(CRYPTO_RECORD, PASSWORD);
     expect(decryptedData).toBe(plainText);

src/tests/crypto.test.ts

@@ -1,13 +1,9 @@
-import { Query as QueryWasm, Sdk as SdkWasm } from "wasm";
-import init from "../initNode";
 import { Sdk } from "../sdk";
+import { initSdk as init } from "../wasm";
+
 import { NATIVE_TOKEN as nativeToken, RPC_URL as rpcUrl } from "./data";
 
 // Simplified wrapper to handle initializing SDK for tests
-export const initSdk = (): Sdk => {
-  const { cryptoMemory } = init();
-  const query = new QueryWasm(rpcUrl);
-  const sdk = new SdkWasm(rpcUrl, nativeToken, "some db name");
-
-  return new Sdk(sdk, query, cryptoMemory, rpcUrl, nativeToken);
+export const initSdk = async (): Promise<Sdk> => {
+  return await init({ rpcUrl, token: nativeToken });
 };

src/tests/initSdk.ts

@@ -9,8 +9,8 @@ import {
 import { initSdk } from "./initSdk";
 
 describe("Keys", () => {
-  it("should derive transparent keys from mnemonic phrase", () => {
-    const { keys } = initSdk();
+  it("should derive transparent keys from mnemonic phrase", async () => {
+    const { keys } = await initSdk();
 
     const { address, publicKey, privateKey } =
       keys.deriveFromMnemonic(mnemonic1);
@@ -20,14 +20,14 @@ describe("Keys", () => {
     expect(privateKey).toBe(account1.privateKey);
   });
 
-  it("should derive shielded keys from seed", () => {
-    const { keys, mnemonic } = initSdk();
+  it("should derive shielded keys from seed", async () => {
+    const { keys, mnemonic } = await initSdk();
     const seed = mnemonic.toSeed(mnemonic1);
     const seed2 = mnemonic.toSeed(mnemonic2);
 
     const { address, viewingKey, spendingKey } = keys.deriveShieldedFromSeed(
       seed,
-      shieldedAccount1.path
+      shieldedAccount1.path,
     );
 
     expect(address).toBe(shieldedAccount1.paymentAddress);
@@ -45,8 +45,8 @@ describe("Keys", () => {
     expect(spendingKey2).toBe(shieldedAccount2.spendingKey);
   });
 
-  it("should derive keys from seed", () => {
-    const { keys, mnemonic } = initSdk();
+  it("should derive keys from seed", async () => {
+    const { keys, mnemonic } = await initSdk();
     // Generate a seed from a mnemonic phrase
     const seed = mnemonic.toSeed(mnemonic1);
     // Derive account from that seed
@@ -57,8 +57,8 @@ describe("Keys", () => {
     expect(privateKey).toBe(account1.privateKey);
   });
 
-  it("should generate valid sequential payment addresses", () => {
-    const { keys } = initSdk();
+  it("should generate valid sequential payment addresses", async () => {
+    const { keys } = await initSdk();
     const { viewingKey } = shieldedAccount1;
 
     // Test starting with undefined diversifierIndex, as this will be undefined
@@ -74,7 +74,7 @@ describe("Keys", () => {
     while (paymentAddresses.length < 100) {
       const { diversifierIndex, address } = keys.genPaymentAddress(
         viewingKey,
-        currentIndex + 1
+        currentIndex + 1,
       );
       paymentAddresses.push([diversifierIndex, address]);
       currentIndex = diversifierIndex;

src/tests/keys.test.ts

@@ -4,19 +4,19 @@ import { initSdk } from "./initSdk";
 
 describe("mnemonic", () => {
   it("should generate a 12 word mnemonic phrase", async () => {
-    const { mnemonic } = initSdk();
+    const { mnemonic } = await initSdk();
     const words = mnemonic.generate();
     expect(words.length).toEqual(12);
   });
 
   it("should generate a 24 word mnemonic phrase", async () => {
-    const { mnemonic } = initSdk();
+    const { mnemonic } = await initSdk();
     const words = mnemonic.generate(PhraseSize.N24);
     expect(words.length).toEqual(24);
   });
 
-  it("should generate a seed from mnemonic", () => {
-    const { mnemonic } = initSdk();
+  it("should generate a seed from mnemonic", async () => {
+    const { mnemonic } = await initSdk();
     const seed = mnemonic.toSeed(mnemonic1);
     expect(seed).toBeDefined();
     expect(seed.length).toEqual(64);

src/tests/mnemonic.test.ts

@@ -7,8 +7,8 @@ import { Tx } from "tx";
 import { initSdk } from "./initSdk";
 
 describe("Sdk", () => {
-  it("should initialize Sdk with all sub-components", () => {
-    const { tx, keys, mnemonic, rpc, masp, signing } = initSdk();
+  it("should initialize Sdk with all sub-components", async () => {
+    const { tx, keys, mnemonic, rpc, masp, signing } = await initSdk();
     expect(tx).toBeInstanceOf(Tx);
     expect(keys).toBeInstanceOf(Keys);
     expect(mnemonic).toBeInstanceOf(Mnemonic);