Move @anoma/wasm -> @anoma/shared

OriginStake · Sep 6, 2022 · 1b5e9a5 · 1b5e9a5
1 parent 0da830d
commit 1b5e9a5
Show file tree

Hide file tree

Showing 53 changed files with 39 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -48,6 +48,7 @@ namada-interface/
     ├── namada-interface/   # Main wallet React App
     ├── extension/          # Browser Extension React App
 └── packages/
+    ├── crypto/          # Crypto functions related to anoma extension and interface
     ├── integrations/    # Third-party wallet integrations
     └── masp-web/        # utilities for performing MASP actions
     └── rpc/             # Library for handling HTTP and WebSocket RPC calls
@@ -56,7 +57,7 @@ namada-interface/
     ├── tx/              # Library for interfacing with Anoma transactions
     ├── utils/           # Shared utilities
     ├── wallet/          # Library for deriving keys
-    ├── wasm/            # Rust lib for generating WASM
+    ├── shared/          # Package for interfacing with `namada/shared`
 ```
 
 ### Usage

diff --git a/apps/extension/src/browsers/chrome/manifest.json b/apps/extension/src/browsers/chrome/manifest.json
@@ -17,6 +17,12 @@
     "default_popup": "../../static/popup.html"
   },
   "permissions": ["storage", "notifications", "identity"],
+  "sandbox": {
+    "pages": ["../../background/index.ts"]
+  },
+  "content_security_policy": {
+    "sandbox": "sandbox allow-scripts script-src 'self' 'wasm-eval"
+  },
   "web_accessible_resources": [
     {
       "resources": ["scripts/inject.ts"],

diff --git a/apps/namada-interface/package.json b/apps/namada-interface/package.json
@@ -15,10 +15,10 @@
     "@anoma/rpc": "0.1.0",
     "@anoma/seed-management": "0.1.0",
     "@anoma/session": "0.1.0",
+    "@anoma/shared": "0.1.0",
     "@anoma/tx": "0.1.0",
     "@anoma/utils": "0.1.0",
     "@anoma/wallet": "0.1.0",
-    "@anoma/wasm": "0.1.0",
     "@reduxjs/toolkit": "^1.8.0",
     "crypto-browserify": "^3.12.0",
     "framer-motion": "^6.2.8",

diff --git a/packages/crypto/lib/src/crypto/aead.rs b/packages/crypto/lib/src/crypto/aead.rs
@@ -3,7 +3,7 @@ use orion::{aead, kdf};
 use thiserror::Error;
 use wasm_bindgen::prelude::*;
 
-use crate::crypto::utils::{encryption_key, encryption_salt};
+use crate::utils::{encryption_key, encryption_salt};
 
 #[allow(missing_docs)]
 #[derive(Debug, Error)]

diff --git a/packages/crypto/lib/src/crypto/bip44.rs b/packages/crypto/lib/src/crypto/bip44.rs
@@ -7,7 +7,6 @@ use wasm_bindgen::prelude::*;
 pub struct Bip44 {
     root_key: String,
     seed: Vec<u8>,
-    password: String,
 }
 
 #[wasm_bindgen]
@@ -28,17 +27,14 @@ pub struct ExtendedKeys {
 
 #[wasm_bindgen]
 impl Bip44 {
-    pub fn new(
-        seed: Vec<u8>,
-        password: String) -> Result<Bip44, JsValue> {
+    pub fn new(seed: Vec<u8>) -> Result<Bip44, JsValue> {
         let seed: &[u8] = &seed;
 
         // BIP32 Root Key
         let root_xprv = XPrv::new(&seed).expect("Could not create extended private key from seed");
         let root_xprv_str = root_xprv.to_string(Prefix::XPRV).to_string();
 
         Ok(Bip44 {
-            password,
             root_key: root_xprv_str,
             seed: seed.to_vec(),
         })

diff --git a/packages/crypto/lib/src/crypto/mod.rs b/packages/crypto/lib/src/crypto/mod.rs
@@ -1,4 +1,3 @@
 pub mod aead;
-pub mod utils;
 pub mod mnemonic;
 pub mod bip44;
diff --git a/packages/crypto/lib/src/lib.rs b/packages/crypto/lib/src/lib.rs
@@ -1 +1,2 @@
 pub mod crypto;
+pub mod utils;
diff --git a/packages/crypto/lib/src/crypto/utils.rs → packages/crypto/lib/src/utils.rs b/packages/crypto/lib/src/crypto/utils.rs → packages/crypto/lib/src/utils.rs
diff --git a/packages/crypto/src/index.ts b/packages/crypto/src/index.ts
@@ -1 +1,14 @@
+/* eslint-disable */
+import wasm from "./crypto";
+/* eslint-enable */
+
+export const init = async (): Promise<WebAssembly.Memory | null> => {
+  // Support setting wasm-pack target to "nodejs" (for testing)
+  // A target of "nodejs" will not generate a callable init() function
+  const _init =
+    typeof wasm === "function" ? wasm : () => Promise.resolve({ memory: null });
+  const { memory } = await _init();
+  return memory;
+};
+
 export * from "./crypto";
diff --git a/packages/seed-management/package.json b/packages/seed-management/package.json
@@ -21,7 +21,7 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@anoma/wasm": "0.1.0",
+    "@anoma/shared": "0.1.0",
     "@iarna/toml": "^2.2.5",
     "buffer": "^6.0.3"
   }

diff --git a/packages/seed-management/src/Mnemonic.test.ts b/packages/seed-management/src/Mnemonic.test.ts
@@ -1,5 +1,5 @@
 import { Mnemonic, MnemonicLength } from "./Mnemonic";
-import { AnomaClient } from "@anoma/wasm";
+import { AnomaClient } from "@anoma/shared";
 
 test("mnemonic should have a correct length", async () => {
   const mnemonic1 = await Mnemonic.fromMnemonic(MnemonicLength.Twelve);

diff --git a/packages/seed-management/src/Mnemonic.ts b/packages/seed-management/src/Mnemonic.ts
@@ -1,4 +1,4 @@
-import { AnomaClient } from "@anoma/wasm";
+import { AnomaClient } from "@anoma/shared";
 import { toBase64, fromBase64 } from "@cosmjs/encoding";
 
 export enum MnemonicLength {

diff --git a/packages/wasm/.eslintrc → packages/shared/.eslintrc b/packages/wasm/.eslintrc → packages/shared/.eslintrc
diff --git a/packages/wasm/.gitignore → packages/shared/.gitignore b/packages/wasm/.gitignore → packages/shared/.gitignore
diff --git a/packages/wasm/.prettierignore → packages/shared/.prettierignore b/packages/wasm/.prettierignore → packages/shared/.prettierignore
diff --git a/packages/wasm/.prettierrc → packages/shared/.prettierrc b/packages/wasm/.prettierrc → packages/shared/.prettierrc
diff --git a/packages/wasm/README.md → packages/shared/README.md b/packages/wasm/README.md → packages/shared/README.md
diff --git a/packages/wasm/index.ts → packages/shared/index.ts b/packages/wasm/index.ts → packages/shared/index.ts
diff --git a/packages/wasm/lib/.appveyor.yml → packages/shared/lib/.appveyor.yml b/packages/wasm/lib/.appveyor.yml → packages/shared/lib/.appveyor.yml
diff --git a/packages/wasm/lib/.cargo-ok → packages/shared/lib/.cargo-ok b/packages/wasm/lib/.cargo-ok → packages/shared/lib/.cargo-ok
diff --git a/packages/wasm/lib/.gitignore → packages/shared/lib/.gitignore b/packages/wasm/lib/.gitignore → packages/shared/lib/.gitignore
diff --git a/packages/wasm/lib/.travis.yml → packages/shared/lib/.travis.yml b/packages/wasm/lib/.travis.yml → packages/shared/lib/.travis.yml
diff --git a/packages/wasm/lib/Cargo.toml → packages/shared/lib/Cargo.toml b/packages/wasm/lib/Cargo.toml → packages/shared/lib/Cargo.toml
diff --git a/packages/wasm/lib/LICENSE_APACHE → packages/shared/lib/LICENSE_APACHE b/packages/wasm/lib/LICENSE_APACHE → packages/shared/lib/LICENSE_APACHE
diff --git a/packages/wasm/lib/LICENSE_MIT → packages/shared/lib/LICENSE_MIT b/packages/wasm/lib/LICENSE_MIT → packages/shared/lib/LICENSE_MIT
diff --git a/packages/wasm/lib/src/account.rs → packages/shared/lib/src/account.rs b/packages/wasm/lib/src/account.rs → packages/shared/lib/src/account.rs
diff --git a/packages/wasm/lib/src/ibc_transfer.rs → packages/shared/lib/src/ibc_transfer.rs b/packages/wasm/lib/src/ibc_transfer.rs → packages/shared/lib/src/ibc_transfer.rs
diff --git a/packages/wasm/lib/src/lib.rs → packages/shared/lib/src/lib.rs b/packages/wasm/lib/src/lib.rs → packages/shared/lib/src/lib.rs
diff --git a/packages/wasm/lib/src/transfer.rs → packages/shared/lib/src/transfer.rs b/packages/wasm/lib/src/transfer.rs → packages/shared/lib/src/transfer.rs
diff --git a/...s/wasm/lib/src/types/encrypted_keypair.rs → ...shared/lib/src/types/encrypted_keypair.rs b/...s/wasm/lib/src/types/encrypted_keypair.rs → ...shared/lib/src/types/encrypted_keypair.rs
diff --git a/packages/wasm/lib/src/types/keypair.rs → packages/shared/lib/src/types/keypair.rs b/packages/wasm/lib/src/types/keypair.rs → packages/shared/lib/src/types/keypair.rs
diff --git a/packages/wasm/lib/src/types/mnemonic.rs → packages/shared/lib/src/types/mnemonic.rs b/packages/wasm/lib/src/types/mnemonic.rs → packages/shared/lib/src/types/mnemonic.rs
diff --git a/packages/wasm/lib/src/types/mod.rs → packages/shared/lib/src/types/mod.rs b/packages/wasm/lib/src/types/mod.rs → packages/shared/lib/src/types/mod.rs
diff --git a/packages/wasm/lib/src/types/transaction.rs → packages/shared/lib/src/types/transaction.rs b/packages/wasm/lib/src/types/transaction.rs → packages/shared/lib/src/types/transaction.rs
diff --git a/packages/wasm/lib/src/types/tx.rs → packages/shared/lib/src/types/tx.rs b/packages/wasm/lib/src/types/tx.rs → packages/shared/lib/src/types/tx.rs
diff --git a/packages/wasm/lib/src/types/wrapper.rs → packages/shared/lib/src/types/wrapper.rs b/packages/wasm/lib/src/types/wrapper.rs → packages/shared/lib/src/types/wrapper.rs
diff --git a/packages/wasm/lib/src/utils.rs → packages/shared/lib/src/utils.rs b/packages/wasm/lib/src/utils.rs → packages/shared/lib/src/utils.rs
diff --git a/packages/wasm/lib/src/wallet.rs → packages/shared/lib/src/wallet.rs b/packages/wasm/lib/src/wallet.rs → packages/shared/lib/src/wallet.rs
diff --git a/packages/wasm/lib/tests/web.rs → packages/shared/lib/tests/web.rs b/packages/wasm/lib/tests/web.rs → packages/shared/lib/tests/web.rs
diff --git a/packages/wasm/package.json → packages/shared/package.json b/packages/wasm/package.json → packages/shared/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@anoma/wasm",
+  "name": "@anoma/shared",
   "version": "0.1.0",
   "type": "module",
   "license": "MIT",

diff --git a/packages/wasm/src/AnomaClient.ts → packages/shared/src/AnomaClient.ts b/packages/wasm/src/AnomaClient.ts → packages/shared/src/AnomaClient.ts
diff --git a/packages/wasm/tsconfig.json → packages/shared/tsconfig.json b/packages/wasm/tsconfig.json → packages/shared/tsconfig.json
diff --git a/packages/wasm/yarn.lock → packages/shared/yarn.lock b/packages/wasm/yarn.lock → packages/shared/yarn.lock
diff --git a/packages/tx/README.md b/packages/tx/README.md
@@ -1,5 +1,5 @@
 # tx
 
-Anoma Wallet transaction library for interfacing with packages served from `@anoma/wasm`.
+Anoma Wallet transaction library for interfacing with packages served from `@anoma/shared`.
 
 _TBD_
diff --git a/packages/tx/package.json b/packages/tx/package.json
@@ -28,7 +28,7 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@anoma/wasm": "0.1.0",
+    "@anoma/shared": "0.1.0",
     "slip44": "^1.2.60"
   }
 }
diff --git a/packages/tx/src/Account.ts b/packages/tx/src/Account.ts
@@ -1,4 +1,4 @@
-import { AnomaClient } from "@anoma/wasm";
+import { AnomaClient } from "@anoma/shared";
 import { Tokens } from "@anoma/tx";
 
 class Account {

diff --git a/packages/tx/src/IBCTransfer.ts b/packages/tx/src/IBCTransfer.ts
@@ -1,4 +1,4 @@
-import { AnomaClient } from "@anoma/wasm";
+import { AnomaClient } from "@anoma/shared";
 
 class IBCTransfer {
   private _client: AnomaClient | undefined;

diff --git a/packages/tx/src/Transfer.ts b/packages/tx/src/Transfer.ts
@@ -1,5 +1,5 @@
 import { amountToMicro } from "@anoma/utils";
-import { AnomaClient } from "@anoma/wasm";
+import { AnomaClient } from "@anoma/shared";
 
 type TransactionData = {
   source: string;

diff --git a/packages/wallet/package.json b/packages/wallet/package.json
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@anoma/tx": "0.1.0",
-    "@anoma/wasm": "0.1.0",
+    "@anoma/shared": "0.1.0",
     "@cosmjs/encoding": "^0.27.1",
     "typescript": "^4.7.4"
   },

diff --git a/packages/wallet/src/Wallet.test.ts b/packages/wallet/src/Wallet.test.ts
@@ -2,7 +2,7 @@ import { fromHex, toHex } from "@cosmjs/encoding";
 import fetchMock, { enableFetchMocks } from "jest-fetch-mock";
 import { Tokens } from "@anoma/tx";
 import Wallet from "./Wallet";
-import { AnomaClient } from "@anoma/wasm";
+import { AnomaClient } from "@anoma/shared";
 
 enableFetchMocks();
 

diff --git a/packages/wallet/src/Wallet.ts b/packages/wallet/src/Wallet.ts
@@ -6,7 +6,7 @@ import {
   Result,
   ResultType,
   Wallet as WalletType,
-} from "@anoma/wasm";
+} from "@anoma/shared";
 
 type Encoding = "hex" | "base58" | null;
 

diff --git a/scripts/build-test.sh b/scripts/build-test.sh
@@ -2,4 +2,4 @@
 
 SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd -P)
 
-cd $SCRIPT_DIR/../packages/wasm && yarn wasm:build:node
+cd $SCRIPT_DIR/../packages/shared && yarn wasm:build:node
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -2,4 +2,4 @@
 
 SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd -P)
 
-cd $SCRIPT_DIR/../packages/wasm && yarn wasm:build
+cd $SCRIPT_DIR/../packages/shared && yarn wasm:build
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd -P)

		cd $SCRIPT_DIR/../packages/wasm && yarn wasm:build:node
		cd $SCRIPT_DIR/../packages/shared && yarn wasm:build:node