From a06a331d855aa3158ee3bbb075a087d1878f126a Mon Sep 17 00:00:00 2001 From: Eric Corson Date: Wed, 19 Jul 2023 10:25:09 +0900 Subject: [PATCH] chore: rename anoma to namada Closes #323. --- README.md | 6 ++-- apps/extension/README.md | 8 ++--- apps/extension/package.json | 18 +++++----- .../src/App/Accounts/AccountListing.tsx | 6 ++-- apps/extension/src/App/Accounts/Accounts.tsx | 2 +- .../extension/src/App/Accounts/AddAccount.tsx | 6 ++-- apps/extension/src/App/App.tsx | 10 +++--- .../src/App/LockWrapper/LockWrapper.tsx | 2 +- apps/extension/src/App/Login/Login.tsx | 2 +- .../DeleteAccount/DeleteAccount.tsx | 4 +-- .../Settings/ExtraSettings/ExtraSettings.tsx | 2 +- .../ResetPassword/ResetPassword.tsx | 4 +-- apps/extension/src/App/Settings/Settings.tsx | 6 ++-- apps/extension/src/App/Setup/Setup.tsx | 2 +- apps/extension/src/Approvals/Approvals.tsx | 4 +-- .../ApproveConnection/ApproveConnection.tsx | 2 +- .../ApproveTransfer/ApproveTransfer.tsx | 6 ++-- .../ApproveTransfer/ConfirmTransfer.tsx | 4 +-- .../Setup/AccountCreation/AccountCreation.tsx | 2 +- .../Steps/SeedPhrase/SeedPhrase.tsx | 4 +-- .../SeedPhraseConfirmation.tsx | 2 +- .../Setup/Common/Completion/Completion.tsx | 4 +-- .../Common/Password/Password.components.ts | 2 +- .../src/Setup/Common/Password/Password.tsx | 2 +- .../src/Setup/ImportAccount/ImportAccount.tsx | 2 +- .../ImportAccount/Steps/SeedPhraseImport.tsx | 2 +- apps/extension/src/Setup/Ledger/Ledger.tsx | 4 +-- apps/extension/src/Setup/Setup.tsx | 2 +- apps/extension/src/Setup/Start/Start.tsx | 4 +-- .../src/background/approvals/service.ts | 4 +-- .../src/background/chains/handler.ts | 2 +- .../src/background/chains/messages.ts | 2 +- .../src/background/chains/service.ts | 6 ++-- apps/extension/src/background/index.ts | 14 ++++---- .../src/background/keyring/crypto.ts | 6 ++-- .../src/background/keyring/keyring.ts | 14 ++++---- .../src/background/keyring/messages.ts | 6 ++-- .../src/background/keyring/service.ts | 14 ++++---- .../extension/src/background/keyring/types.ts | 2 +- .../extension/src/background/keyring/utils.ts | 2 +- .../extension/src/background/ledger/ledger.ts | 2 +- .../src/background/offscreen/offscreen.html | 2 +- .../src/background/offscreen/utils.ts | 2 +- .../src/background/web-workers/index.ts | 2 +- .../web-workers/submit-transfer-web-worker.ts | 8 ++--- apps/extension/src/content/events.ts | 2 +- apps/extension/src/content/index.ts | 14 ++++---- apps/extension/src/content/injected.ts | 14 ++++---- .../src/extension/ExtensionRouter.ts | 6 ++-- apps/extension/src/extension/utils.ts | 6 ++-- apps/extension/src/manifest/_base.json | 4 +-- apps/extension/src/manifest/v2/_base.json | 8 ++--- apps/extension/src/manifest/v3/_base.json | 6 ++-- .../{InjectedAnoma.ts => InjectedNamada.ts} | 6 ++-- .../{Anoma.test.ts => Namada.test.ts} | 30 ++++++++-------- .../src/provider/{Anoma.ts => Namada.ts} | 4 +-- apps/extension/src/provider/Proxy.ts | 8 ++--- apps/extension/src/provider/Signer.ts | 18 +++++----- apps/extension/src/provider/data.mock.ts | 4 +-- apps/extension/src/provider/index.ts | 4 +-- apps/extension/src/provider/messages.ts | 2 +- apps/extension/src/provider/types.ts | 8 ++--- apps/extension/src/public/approvals.html | 6 ++-- apps/extension/src/public/popup.html | 6 ++-- apps/extension/src/public/setup.html | 6 ++-- apps/extension/src/router/types/enums.ts | 18 +++++----- apps/extension/src/services/requester.tsx | 6 ++-- apps/extension/src/test/init.ts | 24 ++++++------- apps/extension/webpack.config.js | 2 +- apps/namada-interface/README.md | 10 +++--- apps/namada-interface/package.json | 12 +++---- .../AccountOverview.components.ts | 2 +- .../App/AccountOverview/AccountOverview.tsx | 12 +++---- .../DerivedAccounts.components.ts | 2 +- .../DerivedAccounts/DerivedAccounts.tsx | 6 ++-- .../src/App/App.components.ts | 2 +- apps/namada-interface/src/App/App.tsx | 8 ++--- .../src/App/Bridge/Bridge.tsx | 2 +- .../src/App/Governance/Governance.tsx | 2 +- apps/namada-interface/src/App/NotFound.tsx | 2 +- .../PublicGoodsFunding/PublicGoodsFunding.tsx | 2 +- apps/namada-interface/src/App/Redirect.tsx | 2 +- .../src/App/Settings/Settings.tsx | 2 +- .../SettingsWalletSettings.tsx | 6 ++-- .../NewBondingPosition.components.ts | 2 +- .../NewBondingPosition/NewBondingPosition.tsx | 4 +-- .../src/App/Staking/Staking.tsx | 6 ++-- .../StakingOverview/StakingOverview.tsx | 2 +- .../Staking/UnbondPosition/UnbondPosition.tsx | 4 +-- .../ValidatorDetails/ValidatorDetails.tsx | 4 +-- .../MainContainerNavigation.tsx | 2 +- .../StakingAndGovernance.tsx | 4 +-- apps/namada-interface/src/App/Toast/toast.tsx | 2 +- .../src/App/Token/IBCTransfer/IBCTransfer.tsx | 10 +++--- .../src/App/Token/TokenDetails.tsx | 10 +++--- .../App/Token/TokenReceive/TokenReceive.tsx | 4 +-- .../Token/TokenSend/TokenSend.components.ts | 2 +- .../src/App/Token/TokenSend/TokenSend.tsx | 8 ++--- .../src/App/Token/TokenSend/TokenSendForm.tsx | 6 ++-- .../App/Token/Transfers/TransferDetails.tsx | 10 +++--- .../src/App/Token/Transfers/Transfers.tsx | 8 ++--- .../TopNavigation/topNavigation.components.ts | 2 +- .../src/App/TopNavigation/topNavigation.tsx | 10 +++--- .../topNavigationLoggedIn.components.ts | 2 +- .../TopNavigation/topNavigationLoggedIn.tsx | 4 +-- apps/namada-interface/src/App/types.ts | 8 ++--- apps/namada-interface/src/index.tsx | 2 +- .../extensionEvents/handlers/index.ts | 2 +- .../extensionEvents/handlers/keplr.ts | 2 +- .../extensionEvents/handlers/metamask.ts | 2 +- .../handlers/{anoma.ts => namada.ts} | 16 ++++----- .../src/services/extensionEvents/provider.tsx | 36 +++++++++---------- .../src/services/integrations/provider.tsx | 2 +- .../slices/StakingAndGovernance/actions.ts | 8 ++--- apps/namada-interface/src/slices/accounts.ts | 6 ++-- apps/namada-interface/src/slices/coins.ts | 4 +-- apps/namada-interface/src/slices/settings.ts | 2 +- apps/namada-interface/src/slices/transfers.ts | 4 +-- apps/namada-interface/src/store/mocks.ts | 28 +++++++-------- apps/namada-interface/src/store/store.ts | 2 +- apps/namada-interface/src/styled.d.ts | 2 +- package.json | 2 +- packages/chains/package.json | 4 +-- packages/chains/src/chains/cosmos.ts | 2 +- packages/chains/src/chains/ethereum.ts | 2 +- packages/chains/src/chains/namada.ts | 4 +-- packages/components/package.json | 6 ++-- .../src/Button/button.components.ts | 2 +- .../components/src/Input/input.components.ts | 2 +- .../src/Select/Select.components.ts | 2 +- .../src/Toggle/toggle.components.ts | 2 +- packages/crypto/README.md | 2 +- packages/crypto/lib/Cargo.toml | 2 +- packages/crypto/lib/src/lib.rs | 2 +- packages/crypto/package.json | 4 +-- packages/hooks/README.md | 2 +- packages/hooks/package.json | 10 +++--- packages/hooks/src/useIntegration.ts | 14 ++++---- packages/hooks/src/useUntil.ts | 2 +- packages/integrations/README.md | 2 +- packages/integrations/package.json | 8 ++--- packages/integrations/src/Keplr.test.ts | 2 +- packages/integrations/src/Keplr.ts | 4 +-- packages/integrations/src/Metamask.ts | 4 +-- .../integrations/src/{Anoma.ts => Namada.ts} | 30 ++++++++-------- packages/integrations/src/index.ts | 4 +-- .../integrations/src/types/Integration.ts | 2 +- packages/shared/README.md | 2 +- packages/shared/lib/Cargo.toml | 2 +- packages/shared/lib/src/lib.rs | 2 +- packages/shared/lib/src/sdk/mod.js | 2 +- packages/shared/lib/src/types/masp.rs | 8 ++--- packages/shared/package.json | 4 +-- packages/storage/package.json | 4 +-- packages/storage/src/store/Store.ts | 2 +- packages/types/README.md | 10 +++--- packages/types/package.json | 4 +-- packages/types/src/chain.ts | 8 ++--- packages/types/src/events.ts | 10 +++--- packages/types/src/index.ts | 2 +- packages/types/src/{anoma.ts => namada.ts} | 6 ++-- packages/utils/README.md | 2 +- packages/utils/package.json | 4 +-- packages/utils/src/helpers/index.ts | 2 +- packages/utils/src/theme/theme.ts | 2 +- specs/browser-extension/integration.md | 12 +++---- specs/browser-extension/security.md | 2 +- specs/interface/shielded-transfers.md | 12 +++---- specs/interface/transparent-transactions.md | 8 ++--- specs/packages/overview.md | 2 +- specs/packages/sdk.md | 4 +-- 171 files changed, 482 insertions(+), 484 deletions(-) rename apps/extension/src/provider/{InjectedAnoma.ts => InjectedNamada.ts} (96%) rename apps/extension/src/provider/{Anoma.test.ts => Namada.test.ts} (86%) rename apps/extension/src/provider/{Anoma.ts => Namada.ts} (96%) rename apps/namada-interface/src/services/extensionEvents/handlers/{anoma.ts => namada.ts} (76%) rename packages/integrations/src/{Anoma.ts => Namada.ts} (75%) rename packages/types/src/{anoma.ts => namada.ts} (90%) diff --git a/README.md b/README.md index 9dd246aaf..243676d03 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,6 @@ for solving possible issue see [Troubleshooting](#troubleshooting) ## Introduction -This is the main app of the project and it is the user interface of the application. It is based on create-react-app and uses TypeScript. Some of its' functionality is split to external project living in this repository, under the directory `packages`. They are: [anoma-lib](#anoma-lib), [key-management](#key-management), [masp-web](#masp-web). All of those dependencies use Rust code that is compiled to WASM with [bindgen](https://rustwasm.github.io/wasm-bindgen). Anoma-wallet and its developers do not have to care about this fact, except when compiling the dependencies in the beginning. All of the libraries using WASM exposes a usual TypeScript interface. - This is the `namada-interface` monorepo. Within it, you will find the code for the web wallet implementation. it contains the following packages: ```bash @@ -49,14 +47,14 @@ namada-interface/ ├── namada-interface/ # Main wallet React App ├── extension/ # Browser Extension React App └── packages/ - ├── crypto/ # Crypto functions related to anoma extension and interface + ├── crypto/ # Crypto functions related to namada extension and interface ├── integrations/ # Third-party wallet integrations ├── masp-web/ # utilities for performing MASP actions ├── rpc/ # Library for handling HTTP and WebSocket RPC calls ├── seed-management/ # Seed management library ├── session/ # Session management library ├── shared/ # Package for interfacing with `namada/shared` - ├── tx/ # Library for interfacing with Anoma transactions + ├── tx/ # Library for interfacing with Namada transactions ├── utils/ # Shared utilities ├── wallet/ # Library for deriving keys └── wasm/ # Legacy wasm library diff --git a/apps/extension/README.md b/apps/extension/README.md index 54e623bfa..d73968913 100644 --- a/apps/extension/README.md +++ b/apps/extension/README.md @@ -1,6 +1,6 @@ -# Anoma Browser Extension +# Namada Browser Extension -This is the Anoma Browser Extension project. +This is the Namada Browser Extension project. ## Usage @@ -52,10 +52,10 @@ Once you have run `yarn build`, you can use the files in `./dist` to install the 1. In Firefox, navigate to `about:debugging#/runtime/this-firefox` 2. Select `Load Temporary Add-On...` -3. Navigate to either the `build/browser/manifest.json` or the `build/firefox/anoma_extension-0.1.0.zip` file to install +3. Navigate to either the `build/browser/manifest.json` or the `build/firefox/namada_extension-0.1.0.zip` file to install The extension should be installed. Currently, this is enabled for `namada.me`, so navigating to that page will call the `content` scripts, -hopefully instantiating an instance of the `Anoma()` class API for handling communication between client and key store. +hopefully instantiating an instance of the `Namada()` class API for handling communication between client and key store. ## Notes diff --git a/apps/extension/package.json b/apps/extension/package.json index 9ed075975..a9b975be3 100644 --- a/apps/extension/package.json +++ b/apps/extension/package.json @@ -1,7 +1,7 @@ { - "name": "@anoma/extension", + "name": "@namada/extension", "version": "0.1.0", - "description": "Anoma Browser Extension", + "description": "Namada Browser Extension", "repository": "https://github.com/anoma/namada-interface/", "author": "Heliax Dev ", "license": "MIT", @@ -26,13 +26,13 @@ "wasm:build:dev": "./scripts/build.sh" }, "dependencies": { - "@anoma/chains": "0.1.0", - "@anoma/components": "0.1.0", - "@anoma/crypto": "0.1.0", - "@anoma/shared": "0.1.0", - "@anoma/storage": "0.1.0", - "@anoma/types": "0.1.0", - "@anoma/utils": "0.1.0", + "@namada/chains": "0.1.0", + "@namada/components": "0.1.0", + "@namada/crypto": "0.1.0", + "@namada/shared": "0.1.0", + "@namada/storage": "0.1.0", + "@namada/types": "0.1.0", + "@namada/utils": "0.1.0", "@cosmjs/encoding": "^0.29.0", "@ledgerhq/hw-transport": "^6.28.3", "@ledgerhq/hw-transport-webhid": "^6.27.14", diff --git a/apps/extension/src/App/Accounts/AccountListing.tsx b/apps/extension/src/App/Accounts/AccountListing.tsx index 6393fcd63..a061517e1 100644 --- a/apps/extension/src/App/Accounts/AccountListing.tsx +++ b/apps/extension/src/App/Accounts/AccountListing.tsx @@ -1,8 +1,8 @@ import { useNavigate } from "react-router-dom"; -import { Icon, IconName } from "@anoma/components"; -import { AccountType, Bip44Path, DerivedAccount } from "@anoma/types"; -import { shortenAddress } from "@anoma/utils"; +import { Icon, IconName } from "@namada/components"; +import { AccountType, Bip44Path, DerivedAccount } from "@namada/types"; +import { shortenAddress } from "@namada/utils"; import { TopLevelRoute } from "App/types"; import { diff --git a/apps/extension/src/App/Accounts/Accounts.tsx b/apps/extension/src/App/Accounts/Accounts.tsx index 6193a90ba..fef97fa16 100644 --- a/apps/extension/src/App/Accounts/Accounts.tsx +++ b/apps/extension/src/App/Accounts/Accounts.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { DerivedAccount } from "@anoma/types"; +import { DerivedAccount } from "@namada/types"; import { AccountsContainer, AccountsList, diff --git a/apps/extension/src/App/Accounts/AddAccount.tsx b/apps/extension/src/App/Accounts/AddAccount.tsx index ff2f4dd6a..3b823b4df 100644 --- a/apps/extension/src/App/Accounts/AddAccount.tsx +++ b/apps/extension/src/App/Accounts/AddAccount.tsx @@ -7,9 +7,9 @@ import { Input, InputVariants, Toggle, -} from "@anoma/components"; -import { AccountType, DerivedAccount } from "@anoma/types"; -import { chains, defaultChainId } from "@anoma/chains"; +} from "@namada/components"; +import { AccountType, DerivedAccount } from "@namada/types"; +import { chains, defaultChainId } from "@namada/chains"; import { ExtensionRequester } from "extension"; import { Ports } from "router"; diff --git a/apps/extension/src/App/App.tsx b/apps/extension/src/App/App.tsx index 5bd85db9f..e669253b8 100644 --- a/apps/extension/src/App/App.tsx +++ b/apps/extension/src/App/App.tsx @@ -2,10 +2,10 @@ import React, { useEffect, useState } from "react"; import { ThemeProvider } from "styled-components"; import { Routes, Route, useNavigate } from "react-router-dom"; -import { DerivedAccount } from "@anoma/types"; -import { getTheme } from "@anoma/utils"; -import { Icon, IconName } from "@anoma/components"; -import { useUntil } from "@anoma/hooks"; +import { DerivedAccount } from "@namada/types"; +import { getTheme } from "@namada/utils"; +import { Icon, IconName } from "@namada/components"; +import { useUntil } from "@namada/hooks"; import { Ports } from "router"; import { @@ -188,7 +188,7 @@ export const App: React.FC = () => { - Anoma Browser Extension + Namada Browser Extension { diff --git a/apps/extension/src/Approvals/Approvals.tsx b/apps/extension/src/Approvals/Approvals.tsx index 979b3d0ef..d689ad1f3 100644 --- a/apps/extension/src/Approvals/Approvals.tsx +++ b/apps/extension/src/Approvals/Approvals.tsx @@ -2,7 +2,7 @@ import React, { useState } from "react"; import { ThemeProvider } from "styled-components"; import { Routes, Route } from "react-router-dom"; -import { getTheme } from "@anoma/utils"; +import { getTheme } from "@namada/utils"; import { AppContainer, @@ -32,7 +32,7 @@ export const Approvals: React.FC = () => { - Anoma Browser Extension + Namada Browser Extension void; diff --git a/apps/extension/src/background/index.ts b/apps/extension/src/background/index.ts index b34b5ca5d..6f3c2ce0d 100644 --- a/apps/extension/src/background/index.ts +++ b/apps/extension/src/background/index.ts @@ -3,11 +3,11 @@ import { ExtensionKVStore, IndexedDBKVStore, MemoryKVStore, -} from "@anoma/storage"; -import { defaultChainId, chains } from "@anoma/chains"; -import { init as initCrypto } from "@anoma/crypto/src/init"; -import { init as initShared } from "@anoma/shared/src/init"; -import { Query, Sdk } from "@anoma/shared"; +} from "@namada/storage"; +import { defaultChainId, chains } from "@namada/chains"; +import { init as initCrypto } from "@namada/crypto/src/init"; +import { init as initShared } from "@namada/shared/src/init"; +import { Query, Sdk } from "@namada/shared"; import { ExtensionRouter, @@ -15,7 +15,7 @@ import { ContentScriptEnv, ExtensionMessenger, ExtensionRequester, - getAnomaRouterId, + getNamadaRouterId, } from "extension"; import { Ports, KVPrefix } from "router"; import { ApprovalsService, init as initApprovals } from "./approvals"; @@ -53,7 +53,7 @@ const { REACT_APP_NAMADA_URL = DEFAULT_URL } = process.env; await initShared(); - const routerId = await getAnomaRouterId(extensionStore); + const routerId = await getNamadaRouterId(extensionStore); const messenger = new ExtensionMessenger(); const requester = new ExtensionRequester(messenger, routerId); diff --git a/apps/extension/src/background/keyring/crypto.ts b/apps/extension/src/background/keyring/crypto.ts index ce8bc5c92..28eb6e54a 100644 --- a/apps/extension/src/background/keyring/crypto.ts +++ b/apps/extension/src/background/keyring/crypto.ts @@ -6,11 +6,11 @@ import { Rng, Salt, VecU8Pointer, -} from "@anoma/crypto"; -import { AccountType, Bip44Path } from "@anoma/types"; +} from "@namada/crypto"; +import { AccountType, Bip44Path } from "@namada/types"; import { Argon2Config } from "config"; import { CryptoRecord, KdfType, KeyStore } from "./types"; -import { readVecU8Pointer } from "@anoma/crypto/src/utils"; +import { readVecU8Pointer } from "@namada/crypto/src/utils"; type CryptoArgs = { alias: string; diff --git a/apps/extension/src/background/keyring/keyring.ts b/apps/extension/src/background/keyring/keyring.ts index 7de229502..51db0b80b 100644 --- a/apps/extension/src/background/keyring/keyring.ts +++ b/apps/extension/src/background/keyring/keyring.ts @@ -7,7 +7,7 @@ import { PhraseSize, ShieldedHDWallet, VecU8Pointer, -} from "@anoma/crypto"; +} from "@namada/crypto"; import { Account, Address, @@ -16,15 +16,15 @@ import { PaymentAddress, Sdk, Query, -} from "@anoma/shared"; -import { IStore, KVStore, Store } from "@anoma/storage"; +} from "@namada/shared"; +import { IStore, KVStore, Store } from "@namada/storage"; import { AccountType, Bip44Path, DerivedAccount, TransferMsgValue, -} from "@anoma/types"; -import { chains } from "@anoma/chains"; +} from "@namada/types"; +import { chains } from "@namada/chains"; import { Crypto } from "./crypto"; import { KeyRingStatus, @@ -37,8 +37,8 @@ import { import { readVecStringPointer, readStringPointer, -} from "@anoma/crypto/src/utils"; -import { Result } from "@anoma/utils"; +} from "@namada/crypto/src/utils"; +import { Result } from "@namada/utils"; import { deserialize } from "@dao-xyz/borsh"; // Generated UUID namespace for uuid v5 diff --git a/apps/extension/src/background/keyring/messages.ts b/apps/extension/src/background/keyring/messages.ts index c0bd0ed40..0e8758a3f 100644 --- a/apps/extension/src/background/keyring/messages.ts +++ b/apps/extension/src/background/keyring/messages.ts @@ -1,9 +1,9 @@ -import { PhraseSize } from "@anoma/crypto"; -import { AccountType, Bip44Path, DerivedAccount } from "@anoma/types"; +import { PhraseSize } from "@namada/crypto"; +import { AccountType, Bip44Path, DerivedAccount } from "@namada/types"; import { Message } from "router"; import { ROUTE } from "./constants"; import { KeyRingStatus, ResetPasswordError, DeleteAccountError } from "./types"; -import { Result } from "@anoma/utils"; +import { Result } from "@namada/utils"; enum MessageType { CheckIsLocked = "check-is-locked", diff --git a/apps/extension/src/background/keyring/service.ts b/apps/extension/src/background/keyring/service.ts index 85278bddc..1bf68f281 100644 --- a/apps/extension/src/background/keyring/service.ts +++ b/apps/extension/src/background/keyring/service.ts @@ -1,10 +1,10 @@ import { fromBase64, toBase64 } from "@cosmjs/encoding"; -import { PhraseSize } from "@anoma/crypto"; -import { KVStore } from "@anoma/storage"; -import { AccountType, Bip44Path, DerivedAccount } from "@anoma/types"; -import { Query, Sdk } from "@anoma/shared"; -import { Result } from "@anoma/utils"; +import { PhraseSize } from "@namada/crypto"; +import { KVStore } from "@namada/storage"; +import { AccountType, Bip44Path, DerivedAccount } from "@namada/types"; +import { Query, Sdk } from "@namada/shared"; +import { Result } from "@namada/utils"; import { KeyRing } from "./keyring"; import { @@ -16,7 +16,7 @@ import { UtilityStore, } from "./types"; import { syncTabs, updateTabStorage } from "./utils"; -import { ExtensionRequester, getAnomaRouterId } from "extension"; +import { ExtensionRequester, getNamadaRouterId } from "extension"; import { Ports } from "router"; import { AccountChangedEventMsg, @@ -178,7 +178,7 @@ export class KeyRingService { xsk?: string ): Promise { const offscreenDocumentPath = "offscreen.html"; - const routerId = await getAnomaRouterId(this.extensionStore); + const routerId = await getNamadaRouterId(this.extensionStore); if (!(await hasOffscreenDocument(offscreenDocumentPath))) { await createOffscreenWithTxWorker(offscreenDocumentPath); diff --git a/apps/extension/src/background/keyring/types.ts b/apps/extension/src/background/keyring/types.ts index 42cf222ff..318a55e6c 100644 --- a/apps/extension/src/background/keyring/types.ts +++ b/apps/extension/src/background/keyring/types.ts @@ -1,4 +1,4 @@ -import { AccountType, Bip44Path, DerivedAccount } from "@anoma/types"; +import { AccountType, Bip44Path, DerivedAccount } from "@namada/types"; export enum KdfType { Argon2 = "argon2", diff --git a/apps/extension/src/background/keyring/utils.ts b/apps/extension/src/background/keyring/utils.ts index c35b6d642..304fc6c25 100644 --- a/apps/extension/src/background/keyring/utils.ts +++ b/apps/extension/src/background/keyring/utils.ts @@ -1,4 +1,4 @@ -import { KVStore } from "@anoma/storage"; +import { KVStore } from "@namada/storage"; import { TabStore } from "./types"; import { ExtensionRequester } from "extension"; diff --git a/apps/extension/src/background/ledger/ledger.ts b/apps/extension/src/background/ledger/ledger.ts index 13fd0b08e..f8a9b7432 100644 --- a/apps/extension/src/background/ledger/ledger.ts +++ b/apps/extension/src/background/ledger/ledger.ts @@ -8,7 +8,7 @@ import TransportUSB from "@ledgerhq/hw-transport-webusb"; import TransportHID from "@ledgerhq/hw-transport-webhid"; import Transport from "@ledgerhq/hw-transport"; -import { defaultChainId, chains } from "@anoma/chains"; +import { defaultChainId, chains } from "@namada/chains"; const namadaChain = chains[defaultChainId]; const bip44CoinType = namadaChain.bip44.coinType; diff --git a/apps/extension/src/background/offscreen/offscreen.html b/apps/extension/src/background/offscreen/offscreen.html index 468488767..be7cc97bb 100644 --- a/apps/extension/src/background/offscreen/offscreen.html +++ b/apps/extension/src/background/offscreen/offscreen.html @@ -1,2 +1,2 @@ - + diff --git a/apps/extension/src/background/offscreen/utils.ts b/apps/extension/src/background/offscreen/utils.ts index b9a951e5a..a974e31b0 100644 --- a/apps/extension/src/background/offscreen/utils.ts +++ b/apps/extension/src/background/offscreen/utils.ts @@ -24,4 +24,4 @@ export const createOffscreenWithTxWorker = async ( }; export const SUBMIT_TRANSFER_MSG_TYPE = "submit-transfer-offscreen"; -export const OFFSCREEN_TARGET = "offscreen.anoma"; +export const OFFSCREEN_TARGET = "offscreen.namada"; diff --git a/apps/extension/src/background/web-workers/index.ts b/apps/extension/src/background/web-workers/index.ts index e1f54fe9f..ff368d136 100644 --- a/apps/extension/src/background/web-workers/index.ts +++ b/apps/extension/src/background/web-workers/index.ts @@ -14,7 +14,7 @@ export const init = ( payload?: string ) => Promise ): void => { - const w = new Worker("submit-transfer-web-worker.anoma.js"); + const w = new Worker("submit-transfer-web-worker.namada.js"); w.onmessage = (e: MessageEvent) => { const { msgName, payload } = e.data; diff --git a/apps/extension/src/background/web-workers/submit-transfer-web-worker.ts b/apps/extension/src/background/web-workers/submit-transfer-web-worker.ts index ac0293b17..eeeb9a09c 100644 --- a/apps/extension/src/background/web-workers/submit-transfer-web-worker.ts +++ b/apps/extension/src/background/web-workers/submit-transfer-web-worker.ts @@ -1,7 +1,7 @@ -import { defaultChainId, chains } from "@anoma/chains"; -import { Sdk } from "@anoma/shared"; -import { init as initShared } from "@anoma/shared/src/init"; -import { IndexedDBKVStore } from "@anoma/storage"; +import { defaultChainId, chains } from "@namada/chains"; +import { Sdk } from "@namada/shared"; +import { init as initShared } from "@namada/shared/src/init"; +import { IndexedDBKVStore } from "@namada/storage"; import { fromBase64 } from "@cosmjs/encoding"; import { KVPrefix } from "router"; import { diff --git a/apps/extension/src/content/events.ts b/apps/extension/src/content/events.ts index 0d98d5434..afcbb9486 100644 --- a/apps/extension/src/content/events.ts +++ b/apps/extension/src/content/events.ts @@ -1,4 +1,4 @@ -import { Events } from "@anoma/types"; +import { Events } from "@namada/types"; import { Message, Router, Routes } from "../router"; diff --git a/apps/extension/src/content/index.ts b/apps/extension/src/content/index.ts index 1bbc56839..76383ae69 100644 --- a/apps/extension/src/content/index.ts +++ b/apps/extension/src/content/index.ts @@ -1,28 +1,28 @@ import browser from "webextension-polyfill"; -import { Anoma, Proxy } from "provider"; +import { Namada, Proxy } from "provider"; import { ExtensionRouter, ExtensionRequester, ContentScriptEnv, ContentScriptGuards, ExtensionMessenger, - getAnomaRouterId, + getNamadaRouterId, } from "extension"; import { KVPrefix, Ports } from "router/types"; import { initEvents } from "./events"; import manifest from "manifest/_base.json"; -import { ExtensionKVStore } from "@anoma/storage"; +import { ExtensionKVStore } from "@namada/storage"; -// Start proxying messages from Anoma to InjectedAnoma +// Start proxying messages from Namada to InjectedNamada (async function init() { const extensionStore = new ExtensionKVStore(KVPrefix.LocalStorage, { get: browser.storage.local.get, set: browser.storage.local.set, }); - const routerId = await getAnomaRouterId(extensionStore); + const routerId = await getNamadaRouterId(extensionStore); const messenger = new ExtensionMessenger(); Proxy.start( - new Anoma(manifest.version, new ExtensionRequester(messenger, routerId)) + new Namada(manifest.version, new ExtensionRequester(messenger, routerId)) ); const router = new ExtensionRouter( @@ -38,7 +38,7 @@ import { ExtensionKVStore } from "@anoma/storage"; const container = document.head || document.documentElement; const scriptElement = document.createElement("script"); - scriptElement.src = browser.runtime.getURL("injected.anoma.js"); + scriptElement.src = browser.runtime.getURL("injected.namada.js"); scriptElement.type = "text/javascript"; container.insertBefore(scriptElement, container.children[0]); scriptElement.remove(); diff --git a/apps/extension/src/content/injected.ts b/apps/extension/src/content/injected.ts index 987d285da..fc55bbb16 100644 --- a/apps/extension/src/content/injected.ts +++ b/apps/extension/src/content/injected.ts @@ -1,20 +1,20 @@ -import { InjectedAnoma } from "provider"; +import { InjectedNamada } from "provider"; import manifest from "manifest/_base.json"; declare global { // NOTE: var is required to extend globalThis // eslint-disable-next-line - var anoma: InjectedAnoma; + var namada: InjectedNamada; } -export function init(anoma: InjectedAnoma): void { +export function init(namada: InjectedNamada): void { if (process.env.NODE_ENV !== "production") { - if (!window.anoma) { - window.anoma = anoma; + if (!window.namada) { + window.namada = namada; } } else { - window.anoma = anoma; + window.namada = namada; } } -init(new InjectedAnoma(manifest.version)); +init(new InjectedNamada(manifest.version)); diff --git a/apps/extension/src/extension/ExtensionRouter.ts b/apps/extension/src/extension/ExtensionRouter.ts index 236f3e139..6bd931ba2 100644 --- a/apps/extension/src/extension/ExtensionRouter.ts +++ b/apps/extension/src/extension/ExtensionRouter.ts @@ -1,4 +1,4 @@ -import { getAnomaRouterId } from "./utils"; +import { getNamadaRouterId } from "./utils"; import { EnvProducer, MessageSender, @@ -6,7 +6,7 @@ import { RoutedMessage, Router, } from "router"; -import { KVStore } from "@anoma/storage"; +import { KVStore } from "@namada/storage"; import { Messenger } from "./ExtensionMessenger"; export class ExtensionRouter extends Router { @@ -43,7 +43,7 @@ export class ExtensionRouter extends Router { if ( message.msg?.meta?.routerId && - message.msg.meta.routerId !== (await getAnomaRouterId(this.store)) + message.msg.meta.routerId !== (await getNamadaRouterId(this.store)) ) { return; } diff --git a/apps/extension/src/extension/utils.ts b/apps/extension/src/extension/utils.ts index 200f6f865..05df8d670 100644 --- a/apps/extension/src/extension/utils.ts +++ b/apps/extension/src/extension/utils.ts @@ -1,11 +1,11 @@ import browser from "webextension-polyfill"; -import { KVStore } from "@anoma/storage"; +import { KVStore } from "@namada/storage"; import { Env, MessageSender } from "router/types"; -const ROUTER_ID_KEY = "anomaExtensionRouterId"; +const ROUTER_ID_KEY = "namadaExtensionRouterId"; const NO_TAB_ID = -2; -export const getAnomaRouterId = async ( +export const getNamadaRouterId = async ( store: KVStore ): Promise => { const storedId = await store.get(ROUTER_ID_KEY); diff --git a/apps/extension/src/manifest/_base.json b/apps/extension/src/manifest/_base.json index df80f3f9d..7fe3358a2 100644 --- a/apps/extension/src/manifest/_base.json +++ b/apps/extension/src/manifest/_base.json @@ -1,5 +1,5 @@ { - "name": "Anoma Extension", - "description": "The Anoma Extension manages a user's wallet for the Anoma ecosystem.", + "name": "Namada Extension", + "description": "The Namada Extension manages a user's wallet for the Namada ecosystem.", "version": "0.1.0" } diff --git a/apps/extension/src/manifest/v2/_base.json b/apps/extension/src/manifest/v2/_base.json index b1b219bd9..c9a1ad276 100644 --- a/apps/extension/src/manifest/v2/_base.json +++ b/apps/extension/src/manifest/v2/_base.json @@ -2,10 +2,10 @@ "manifest_version": 2, "browser_action": { "default_popup": "popup.html", - "default_title": "Anoma Extension" + "default_title": "Namada Extension" }, "background": { - "scripts": ["background.anoma.js"], + "scripts": ["background.namada.js"], "persistent": true }, "permissions": [ @@ -18,10 +18,10 @@ "content_scripts": [ { "matches": [""], - "js": ["content.anoma.js"], + "js": ["content.namada.js"], "run_at": "document_start", "all_frames": true } ], - "web_accessible_resources": ["injected.anoma.js", "assets/app.css"] + "web_accessible_resources": ["injected.namada.js", "assets/app.css"] } diff --git a/apps/extension/src/manifest/v3/_base.json b/apps/extension/src/manifest/v3/_base.json index 076dd8c96..2f4b28a71 100644 --- a/apps/extension/src/manifest/v3/_base.json +++ b/apps/extension/src/manifest/v3/_base.json @@ -1,13 +1,13 @@ { "manifest_version": 3, "background": { - "service_worker": "background.anoma.js", + "service_worker": "background.namada.js", "type": "module" }, "content_scripts": [ { "matches": [""], - "js": ["content.anoma.js"] + "js": ["content.namada.js"] } ], "action": { @@ -19,7 +19,7 @@ }, "web_accessible_resources": [ { - "resources": ["injected.anoma.js", "assets/app.css"], + "resources": ["injected.namada.js", "assets/app.css"], "matches": [""] } ] diff --git a/apps/extension/src/provider/InjectedAnoma.ts b/apps/extension/src/provider/InjectedNamada.ts similarity index 96% rename from apps/extension/src/provider/InjectedAnoma.ts rename to apps/extension/src/provider/InjectedNamada.ts index 8b34a9a3d..dc4acca6d 100644 --- a/apps/extension/src/provider/InjectedAnoma.ts +++ b/apps/extension/src/provider/InjectedNamada.ts @@ -1,13 +1,13 @@ import { - Anoma as IAnoma, + Namada as INamada, Chain, DerivedAccount, Signer as ISigner, -} from "@anoma/types"; +} from "@namada/types"; import { InjectedProxy } from "./InjectedProxy"; import { Signer } from "./Signer"; -export class InjectedAnoma implements IAnoma { +export class InjectedNamada implements INamada { constructor(private readonly _version: string) {} public async connect(chainId: string): Promise { diff --git a/apps/extension/src/provider/Anoma.test.ts b/apps/extension/src/provider/Namada.test.ts similarity index 86% rename from apps/extension/src/provider/Anoma.test.ts rename to apps/extension/src/provider/Namada.test.ts index d95ad519a..a2a90bd32 100644 --- a/apps/extension/src/provider/Anoma.test.ts +++ b/apps/extension/src/provider/Namada.test.ts @@ -10,12 +10,12 @@ import { TransferMsgValue, TransferProps, Chain, - Anoma, -} from "@anoma/types"; + Namada, +} from "@namada/types"; import { KVKeys } from "router"; import { init, KVStoreMock } from "test/init"; -import { chains as defaultChains } from "@anoma/chains"; +import { chains as defaultChains } from "@namada/chains"; import { chain, keyStore, password, ACTIVE_ACCOUNT_ID } from "./data.mock"; import { KeyRing, @@ -25,21 +25,21 @@ import { PARENT_ACCOUNT_ID_KEY, UtilityStore, } from "background/keyring"; -import { Sdk } from "@anoma/shared"; +import { Sdk } from "@namada/shared"; import * as utils from "extension/utils"; // Needed for now as utils import webextension-polyfill directly jest.mock("webextension-polyfill", () => ({})); -describe("Anoma", () => { - let anoma: Anoma; +describe("Namada", () => { + let namada: Namada; let iDBStore: KVStoreMock; let utilityStore: KVStoreMock; let keyRingService: KeyRingService; beforeAll(async () => { - jest.spyOn(utils, "getAnomaRouterId").mockResolvedValue(1); - ({ anoma, iDBStore, utilityStore, keyRingService } = await init()); + jest.spyOn(utils, "getNamadaRouterId").mockResolvedValue(1); + ({ namada, iDBStore, utilityStore, keyRingService } = await init()); jest .spyOn(KeyRing.prototype, "checkPassword") @@ -54,14 +54,14 @@ describe("Anoma", () => { it("should return chain by chainId", async () => { iDBStore.set(KVKeys.Chains, [chain]); - const storedChain = await anoma.chain(chain.chainId); + const storedChain = await namada.chain(chain.chainId); expect(storedChain).toEqual(chain); }); it("should return all chains", async () => { iDBStore.set(KVKeys.Chains, [chain]); - const storedChains = await anoma.chains(); + const storedChains = await namada.chains(); expect(storedChains).toEqual([...Object.values(defaultChains), chain]); }); @@ -72,13 +72,13 @@ describe("Anoma", () => { const storedKeyStore = keyStore.map( ({ crypto: _crypto, owner: _owner, ...account }) => account ); - const storedAccounts = await anoma.accounts(chain.chainId); + const storedAccounts = await namada.accounts(chain.chainId); expect(storedAccounts).toEqual(storedKeyStore); }); it("should add a chain configuration", async () => { - await anoma.suggestChain(chain); + await namada.suggestChain(chain); const chains = await iDBStore.get("chains"); expect(chains?.pop()).toEqual(chain); @@ -108,7 +108,7 @@ describe("Anoma", () => { const serializedTransfer = transferMessage.encode(transferMsgValue); jest.spyOn(keyRingService, "submitTransfer"); - anoma.submitTransfer(toBase64(serializedTransfer)); + namada.submitTransfer(toBase64(serializedTransfer)); expect(keyRingService.submitTransfer).toBeCalled(); }); @@ -141,7 +141,7 @@ describe("Anoma", () => { const transferMessage = new Message(); const serializedTransfer = transferMessage.encode(transferMsgValue); - const res = anoma.submitIbcTransfer(toBase64(serializedTransfer)); + const res = namada.submitIbcTransfer(toBase64(serializedTransfer)); await expect(res).resolves.not.toBeDefined(); }); @@ -156,7 +156,7 @@ describe("Anoma", () => { const serialized = accountMessage.encode(accountMsgValue); await expect( - anoma.encodeInitAccount({ + namada.encodeInitAccount({ txMsg: toBase64(serialized), address: keyStore[0].address, }) diff --git a/apps/extension/src/provider/Anoma.ts b/apps/extension/src/provider/Namada.ts similarity index 96% rename from apps/extension/src/provider/Anoma.ts rename to apps/extension/src/provider/Namada.ts index 9599037f5..7551af508 100644 --- a/apps/extension/src/provider/Anoma.ts +++ b/apps/extension/src/provider/Namada.ts @@ -1,4 +1,4 @@ -import { Anoma as IAnoma, Chain, DerivedAccount } from "@anoma/types"; +import { Namada as INamada, Chain, DerivedAccount } from "@namada/types"; import { Ports, MessageRequester } from "router"; import { @@ -17,7 +17,7 @@ import { SubmitIbcTransferMsg, } from "./messages"; -export class Anoma implements IAnoma { +export class Namada implements INamada { constructor( private readonly _version: string, protected readonly requester?: MessageRequester diff --git a/apps/extension/src/provider/Proxy.ts b/apps/extension/src/provider/Proxy.ts index a6ad19d68..7a0cf0872 100644 --- a/apps/extension/src/provider/Proxy.ts +++ b/apps/extension/src/provider/Proxy.ts @@ -1,8 +1,8 @@ -import { Anoma } from "./Anoma"; +import { Namada } from "./Namada"; import { ProxyRequest, ProxyRequestResponse, ProxyRequestTypes } from "./types"; export class Proxy { - static start(anoma: Anoma): void { + static start(namada: Namada): void { Proxy.addMessageListener(async (e) => { const message = e.data; @@ -13,11 +13,11 @@ export class Proxy { const { method, args } = message; try { - if (!anoma[method] || typeof anoma[method] !== "function") { + if (!namada[method] || typeof namada[method] !== "function") { throw new Error(`${message.method} not found!`); } - const result = await anoma[method](args); + const result = await namada[method](args); const proxyResponse: ProxyRequestResponse = { type: ProxyRequestTypes.Response, id: message.id, diff --git a/apps/extension/src/provider/Signer.ts b/apps/extension/src/provider/Signer.ts index 36c0f3132..42d2a4536 100644 --- a/apps/extension/src/provider/Signer.ts +++ b/apps/extension/src/provider/Signer.ts @@ -1,7 +1,7 @@ import { toBase64 } from "@cosmjs/encoding"; import { Account, - Anoma, + Namada, AccountMsgValue, IbcTransferMsgValue, IbcTransferProps, @@ -14,16 +14,16 @@ import { SubmitBondProps, SubmitBondMsgValue, SubmitUnbondMsgValue, -} from "@anoma/types"; +} from "@namada/types"; export class Signer implements ISigner { constructor( protected readonly chainId: string, - private readonly _anoma: Anoma + private readonly _namada: Namada ) {} public async accounts(): Promise { - return (await this._anoma.accounts(this.chainId))?.map( + return (await this._namada.accounts(this.chainId))?.map( ({ alias, address, chainId, type }) => ({ alias, address, @@ -42,7 +42,7 @@ export class Signer implements ISigner { const msg = new Message(); const encoded = msg.encode(msgValue); - return await this._anoma.submitBond(toBase64(encoded)); + return await this._namada.submitBond(toBase64(encoded)); } /** @@ -54,7 +54,7 @@ export class Signer implements ISigner { const msg = new Message(); const encoded = msg.encode(msgValue); - return await this._anoma.submitUnbond(toBase64(encoded)); + return await this._namada.submitUnbond(toBase64(encoded)); } /** @@ -65,7 +65,7 @@ export class Signer implements ISigner { const transferMessage = new Message(); const serializedTransfer = transferMessage.encode(transferMsgValue); - return await this._anoma.submitTransfer(toBase64(serializedTransfer)); + return await this._namada.submitTransfer(toBase64(serializedTransfer)); } /** @@ -77,7 +77,7 @@ export class Signer implements ISigner { const serializedIbcTransfer = ibcTransferMessage.encode(ibcTransferMsgValue); - return await this._anoma.submitIbcTransfer(toBase64(serializedIbcTransfer)); + return await this._namada.submitIbcTransfer(toBase64(serializedIbcTransfer)); } /** @@ -94,7 +94,7 @@ export class Signer implements ISigner { const accountMessage = new Message(); const serialized = accountMessage.encode(accountMsgValue); - return await this._anoma.encodeInitAccount({ + return await this._namada.encodeInitAccount({ txMsg: toBase64(serialized), address: signer, }); diff --git a/apps/extension/src/provider/data.mock.ts b/apps/extension/src/provider/data.mock.ts index f46ebdcab..346115138 100644 --- a/apps/extension/src/provider/data.mock.ts +++ b/apps/extension/src/provider/data.mock.ts @@ -1,4 +1,4 @@ -import { AccountType, BridgeType, Chain, Extensions } from "@anoma/types"; +import { AccountType, BridgeType, Chain, Extensions } from "@namada/types"; import { KdfType, KeyStore } from "background/keyring"; export const ACTIVE_ACCOUNT_ID = "324bfe0e-cb19-5f1a-9630-9daaaecadabe"; @@ -14,7 +14,7 @@ export const chain: Chain = { bridgeType: [BridgeType.IBC, BridgeType.Ethereum], rpc: "http://localhost:26657", chainId: "namada-75a7e12.69483d59a9fb174", - extension: Extensions["anoma"], + extension: Extensions["namada"], currency: { token: "Namada", symbol: "NAM", diff --git a/apps/extension/src/provider/index.ts b/apps/extension/src/provider/index.ts index 43ab80d42..b99fc501f 100644 --- a/apps/extension/src/provider/index.ts +++ b/apps/extension/src/provider/index.ts @@ -1,5 +1,5 @@ -export * from "./Anoma"; -export * from "./InjectedAnoma"; +export * from "./Namada"; +export * from "./InjectedNamada"; export * from "./InjectedProxy"; export * from "./messages"; export * from "./Proxy"; diff --git a/apps/extension/src/provider/messages.ts b/apps/extension/src/provider/messages.ts index cb2df8927..85e53869b 100644 --- a/apps/extension/src/provider/messages.ts +++ b/apps/extension/src/provider/messages.ts @@ -1,4 +1,4 @@ -import { Chain, DerivedAccount } from "@anoma/types"; +import { Chain, DerivedAccount } from "@namada/types"; import { Message } from "router"; /** diff --git a/apps/extension/src/provider/types.ts b/apps/extension/src/provider/types.ts index dedc134de..196bff894 100644 --- a/apps/extension/src/provider/types.ts +++ b/apps/extension/src/provider/types.ts @@ -1,11 +1,11 @@ -import { Anoma } from "./Anoma"; +import { Namada } from "./Namada"; import { Result } from "router/types"; -export type ProxyMethod = keyof Omit; +export type ProxyMethod = keyof Omit; export enum ProxyRequestTypes { - Request = "anoma-proxy-request", - Response = "anoma-proxy-request-response", + Request = "namada-proxy-request", + Response = "namada-proxy-request-response", } // TODO: Look into better generic typing for this: diff --git a/apps/extension/src/public/approvals.html b/apps/extension/src/public/approvals.html index a8fad1b55..8676d00e5 100644 --- a/apps/extension/src/public/approvals.html +++ b/apps/extension/src/public/approvals.html @@ -4,8 +4,8 @@ - - Anoma Extension + + Namada Extension @@ -13,5 +13,5 @@
- + diff --git a/apps/extension/src/public/popup.html b/apps/extension/src/public/popup.html index 013cf5555..97d5e9161 100644 --- a/apps/extension/src/public/popup.html +++ b/apps/extension/src/public/popup.html @@ -4,8 +4,8 @@ - - Anoma Extension + + Namada Extension @@ -13,5 +13,5 @@
- + diff --git a/apps/extension/src/public/setup.html b/apps/extension/src/public/setup.html index 3ba9db50d..c6c6bce53 100644 --- a/apps/extension/src/public/setup.html +++ b/apps/extension/src/public/setup.html @@ -4,8 +4,8 @@ - - Anoma Extension + + Namada Extension @@ -13,5 +13,5 @@
- + diff --git a/apps/extension/src/router/types/enums.ts b/apps/extension/src/router/types/enums.ts index 759428b8b..6db902d0f 100644 --- a/apps/extension/src/router/types/enums.ts +++ b/apps/extension/src/router/types/enums.ts @@ -5,21 +5,21 @@ export enum Ports { } export enum Events { - KeystoreChanged = "anoma-keystore-changed", - PushEventData = "anoma-push-event-data", + KeystoreChanged = "namada-keystore-changed", + PushEventData = "namada-push-event-data", } export enum Routes { - InteractionForeground = "anoma-interaction-foreground", + InteractionForeground = "namada-interaction-foreground", } export enum KVPrefix { - IndexedDB = "Anoma::IndexedDB", - LocalStorage = "Anoma::LocalStorage", - Memory = "Anoma::Memory", - SDK = "Anoma::SDK", - Utility = "Anoma::Utility", - ConnectedTabs = "Anoma::ConnectedTabs", + IndexedDB = "Namada::IndexedDB", + LocalStorage = "Namada::LocalStorage", + Memory = "Namada::Memory", + SDK = "Namada::SDK", + Utility = "Namada::Utility", + ConnectedTabs = "Namada::ConnectedTabs", } export enum KVKeys { diff --git a/apps/extension/src/services/requester.tsx b/apps/extension/src/services/requester.tsx index 250116c2b..9f30db5c5 100644 --- a/apps/extension/src/services/requester.tsx +++ b/apps/extension/src/services/requester.tsx @@ -1,12 +1,12 @@ import browser from "webextension-polyfill"; import { createContext, useEffect, useState } from "react"; -import { ExtensionKVStore } from "@anoma/storage"; +import { ExtensionKVStore } from "@namada/storage"; import { KVPrefix } from "router"; import { ExtensionMessenger, ExtensionRequester, - getAnomaRouterId, + getNamadaRouterId, } from "extension"; const store = new ExtensionKVStore(KVPrefix.LocalStorage, { @@ -22,7 +22,7 @@ export const RequesterProvider: React.FC = ({ children }) => { useEffect(() => { const getRequester = async (): Promise => { - const routerId = await getAnomaRouterId(store); + const routerId = await getNamadaRouterId(store); const requester = new ExtensionRequester(messenger, routerId); setRequester(requester); }; diff --git a/apps/extension/src/test/init.ts b/apps/extension/src/test/init.ts index e1086a33a..acfc57a26 100644 --- a/apps/extension/src/test/init.ts +++ b/apps/extension/src/test/init.ts @@ -1,13 +1,13 @@ -import { KVStore } from "@anoma/storage"; +import { KVStore } from "@namada/storage"; import { ExtensionRouter, ExtensionMessengerMock, ExtensionRequester, - getAnomaRouterId, + getNamadaRouterId, } from "../extension"; import { Ports, KVPrefix } from "../router"; -import { chains } from "@anoma/chains"; +import { chains } from "@namada/chains"; import { ChainsService, init as initChains } from "../background/chains"; import { KeyRingService, @@ -22,13 +22,13 @@ import { init as initApprovals, } from "../background/approvals"; -import { Anoma } from "provider"; -import { Chain } from "@anoma/types"; -import { Query, Sdk } from "@anoma/shared"; +import { Namada } from "provider"; +import { Chain } from "@namada/types"; +import { Query, Sdk } from "@namada/shared"; // __wasm is not exported in crypto.d.ts so need to use require instead of import /* eslint-disable @typescript-eslint/no-var-requires */ -const cryptoMemory = require("@anoma/crypto").__wasm.memory; +const cryptoMemory = require("@namada/crypto").__wasm.memory; const chainId = "namada-75a7e12.69483d59a9fb174"; export class KVStoreMock implements KVStore { @@ -52,7 +52,7 @@ export class KVStoreMock implements KVStore { } export const init = async (): Promise<{ - anoma: Anoma; + namada: Namada; iDBStore: KVStoreMock; extStore: KVStoreMock; utilityStore: KVStoreMock; @@ -67,8 +67,8 @@ export const init = async (): Promise<{ const connectedTabsStore = new KVStoreMock( KVPrefix.ConnectedTabs ); - const anomaRouterId = await getAnomaRouterId(extStore); - const requester = new ExtensionRequester(messenger, anomaRouterId); + const namadaRouterId = await getNamadaRouterId(extStore); + const requester = new ExtensionRequester(messenger, namadaRouterId); const txStore = new KVStoreMock(KVPrefix.LocalStorage); const router = new ExtensionRouter( @@ -118,10 +118,10 @@ export const init = async (): Promise<{ router.listen(Ports.Background); const version = "0.1.0"; - const anoma = new Anoma(version, requester); + const namada = new Namada(version, requester); return { - anoma, + namada, iDBStore, extStore, utilityStore, diff --git a/apps/extension/webpack.config.js b/apps/extension/webpack.config.js index da008b650..99b99fdbb 100644 --- a/apps/extension/webpack.config.js +++ b/apps/extension/webpack.config.js @@ -89,7 +89,7 @@ module.exports = { output: { publicPath: "", path: resolve(__dirname, `./build/${TARGET}`), - filename: "[name].anoma.js", + filename: "[name].namada.js", }, module: { rules: [ diff --git a/apps/namada-interface/README.md b/apps/namada-interface/README.md index fa3516799..2aabc207e 100644 --- a/apps/namada-interface/README.md +++ b/apps/namada-interface/README.md @@ -61,7 +61,7 @@ By default, running the wallet in local-development mode (`yarn dev:local`), wil the following options are available: ```bash -REACT_APP_LOCAL_LEDGER_CHAIN_ID=anoma-test.fd58c789bc11e6c6392 +REACT_APP_LOCAL_LEDGER_CHAIN_ID=local.3424d591c781bb2c788b9201 REACT_APP_LOCAL_LEDGER_URL=172.0.00.123 REACT_APP_LOCAL_LEDGER_PORT=27657 REACT_APP_LOCAL_FAUCET=atest1v4ehgw36gfprwdekgg6rsdesg3rry3pjx9prqv3exumrg3zzx3q5vv3nx4zr2v6yggurgwp4rzjk2v @@ -75,15 +75,15 @@ We can configure the app to work with two chains, both with IBC enabled (assumin ```bash # CHAIN A - Default Chain -REACT_APP_CHAIN_A_ALIAS=Anoma Fractal Instance - 1 # OPTIONAL - Defaults to "IBC - 1" -REACT_APP_CHAIN_A_ID=anoma-test.1e670ba91369ec891fc # REQUIRED +REACT_APP_CHAIN_A_ALIAS=Namada - 1 # OPTIONAL - Defaults to "IBC - 1" +REACT_APP_CHAIN_A_ID=local.3424d591c781bb2c788b9201 # REQUIRED REACT_APP_CHAIN_A_URL=10.0.1.123 # OPTIONAL - Defaults to 127.0.0.1 REACT_APP_CHAIN_A_PORT=27657 # OPTIONAL - Defaults to 27657 REACT_APP_CHAIN_A_FAUCET=atest1v4ehgw36gfprwdekgg6rsdesg3rry3pjx9prqv3exumrg3zzx3q5vv3nx4zr2v6yggurgwp4rzjk2v # CHAIN B -REACT_APP_CHAIN_B_ALIAS=Anoma Fractal Instance - 2 # OPTIONAL - Defaults to "IBC - 2" -REACT_APP_CHAIN_B_ID=anoma-test.89060614ce340f4baae # REQUIRED +REACT_APP_CHAIN_B_ALIAS=Namada - 2 # OPTIONAL - Defaults to "IBC - 2" +REACT_APP_CHAIN_B_ID=local.11350caf633557b1f9a22d44 # REQUIRED REACT_APP_CHAIN_B_URL=10.0.1.123 # OPTIONAL - Defaults to 127.0.0.1 REACT_APP_CHAIN_B_PORT=28657 # OPTIONAL - Defaults to 28657 REACT_APP_CHAIN_B_FAUCET=atest1v4ehgw36xscyvdpcxgenvdf3x5c523j98pqnz3fjgfq5yvp4xpqnvv69x5erzvjzgse5yd3suq5pd0 diff --git a/apps/namada-interface/package.json b/apps/namada-interface/package.json index 01ce7606a..52a425f97 100644 --- a/apps/namada-interface/package.json +++ b/apps/namada-interface/package.json @@ -1,16 +1,16 @@ { - "name": "@anoma/namada-interface", + "name": "@namada/namada-interface", "version": "0.1.0", - "description": "Anoma Browser Extension", + "description": "Namada Browser Extension", "repository": "https://github.com/anoma/namada-interface/", "author": "Heliax Dev ", "license": "MIT", "private": true, "dependencies": { - "@anoma/components": "0.1.0", - "@anoma/hooks": "0.1.0", - "@anoma/integrations": "0.1.0", - "@anoma/utils": "0.1.0", + "@namada/components": "0.1.0", + "@namada/hooks": "0.1.0", + "@namada/integrations": "0.1.0", + "@namada/utils": "0.1.0", "@reduxjs/toolkit": "^1.8.0", "bignumber.js": "^9.1.1", "buffer": "^6.0.3", diff --git a/apps/namada-interface/src/App/AccountOverview/AccountOverview.components.ts b/apps/namada-interface/src/App/AccountOverview/AccountOverview.components.ts index 2e33b5fc3..e63bb9d78 100644 --- a/apps/namada-interface/src/App/AccountOverview/AccountOverview.components.ts +++ b/apps/namada-interface/src/App/AccountOverview/AccountOverview.components.ts @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { DesignConfiguration, ColorMode } from "@anoma/utils"; +import { DesignConfiguration, ColorMode } from "@namada/utils"; enum ComponentColor { TabLabelActive, diff --git a/apps/namada-interface/src/App/AccountOverview/AccountOverview.tsx b/apps/namada-interface/src/App/AccountOverview/AccountOverview.tsx index 0025fd89e..ca51c802f 100644 --- a/apps/namada-interface/src/App/AccountOverview/AccountOverview.tsx +++ b/apps/namada-interface/src/App/AccountOverview/AccountOverview.tsx @@ -2,13 +2,13 @@ import { useState } from "react"; import { useNavigate } from "react-router-dom"; import BigNumber from "bignumber.js"; -import { chains } from "@anoma/chains"; +import { chains } from "@namada/chains"; import { useIntegrationConnection, useUntilIntegrationAttached, -} from "@anoma/hooks"; -import { Account, ExtensionKey, Extensions } from "@anoma/types"; -import { formatCurrency } from "@anoma/utils"; +} from "@namada/hooks"; +import { Account, ExtensionKey, Extensions } from "@namada/types"; +import { formatCurrency } from "@namada/utils"; import { useAppSelector, useAppDispatch } from "store"; import { AccountsState, addAccounts, fetchBalances } from "slices/accounts"; @@ -20,7 +20,7 @@ import { ButtonVariant, Heading, HeadingLevel, -} from "@anoma/components"; +} from "@namada/components"; import { AccountOverviewContainer, AccountOverviewContent, @@ -48,7 +48,7 @@ export const AccountOverview = (): JSX.Element => { const [isExtensionConnected, setIsExtensionConnected] = useState< Record >({ - anoma: false, + namada: false, keplr: false, metamask: false, }); diff --git a/apps/namada-interface/src/App/AccountOverview/DerivedAccounts/DerivedAccounts.components.ts b/apps/namada-interface/src/App/AccountOverview/DerivedAccounts/DerivedAccounts.components.ts index e0363cc54..ae4a62710 100644 --- a/apps/namada-interface/src/App/AccountOverview/DerivedAccounts/DerivedAccounts.components.ts +++ b/apps/namada-interface/src/App/AccountOverview/DerivedAccounts/DerivedAccounts.components.ts @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { ColorMode, DesignConfiguration } from "@anoma/utils"; +import { ColorMode, DesignConfiguration } from "@namada/utils"; enum ComponentColor { ScrollbarThumb, diff --git a/apps/namada-interface/src/App/AccountOverview/DerivedAccounts/DerivedAccounts.tsx b/apps/namada-interface/src/App/AccountOverview/DerivedAccounts/DerivedAccounts.tsx index 9b284cc48..d87cda15a 100644 --- a/apps/namada-interface/src/App/AccountOverview/DerivedAccounts/DerivedAccounts.tsx +++ b/apps/namada-interface/src/App/AccountOverview/DerivedAccounts/DerivedAccounts.tsx @@ -3,12 +3,12 @@ import { ThemeContext } from "styled-components"; import { useNavigate } from "react-router-dom"; import BigNumber from "bignumber.js"; -import { chains } from "@anoma/chains"; +import { chains } from "@namada/chains"; import { useAppDispatch, useAppSelector } from "store"; import { AccountsState, Balance } from "slices/accounts"; import { SettingsState } from "slices/settings"; -import { TokenType } from "@anoma/types"; -import { formatCurrency, formatRoute } from "@anoma/utils"; +import { TokenType } from "@namada/types"; +import { formatCurrency, formatRoute } from "@namada/utils"; import { DerivedAccountsContainer, diff --git a/apps/namada-interface/src/App/App.components.ts b/apps/namada-interface/src/App/App.components.ts index 82464d96f..cf749fc90 100644 --- a/apps/namada-interface/src/App/App.components.ts +++ b/apps/namada-interface/src/App/App.components.ts @@ -1,7 +1,7 @@ import styled, { createGlobalStyle } from "styled-components"; import { motion } from "framer-motion"; -import { ColorMode, DesignConfiguration } from "@anoma/utils"; +import { ColorMode, DesignConfiguration } from "@namada/utils"; enum ComponentColor { BorderColor, diff --git a/apps/namada-interface/src/App/App.tsx b/apps/namada-interface/src/App/App.tsx index 866f542ad..d6e75a34d 100644 --- a/apps/namada-interface/src/App/App.tsx +++ b/apps/namada-interface/src/App/App.tsx @@ -10,7 +10,7 @@ import { loadColorMode, storeColorMode, ColorMode, -} from "@anoma/utils"; +} from "@namada/utils"; import { TopNavigation } from "./TopNavigation"; import { @@ -25,11 +25,11 @@ import { import { persistor, store, useAppDispatch, useAppSelector } from "store"; import { Toasts } from "App/Toast"; import { SettingsState } from "slices/settings"; -import { chains } from "@anoma/chains"; -import { useIntegration, useUntilIntegrationAttached } from "@anoma/hooks"; +import { chains } from "@namada/chains"; +import { useIntegration, useUntilIntegrationAttached } from "@namada/hooks"; import { Outlet } from "react-router-dom"; import { addAccounts, fetchBalances } from "slices/accounts"; -import { Account } from "@anoma/types"; +import { Account } from "@namada/types"; export const history = createBrowserHistory({ window }); diff --git a/apps/namada-interface/src/App/Bridge/Bridge.tsx b/apps/namada-interface/src/App/Bridge/Bridge.tsx index e013a180c..f7c3daf82 100644 --- a/apps/namada-interface/src/App/Bridge/Bridge.tsx +++ b/apps/namada-interface/src/App/Bridge/Bridge.tsx @@ -1,4 +1,4 @@ -import { Heading, HeadingLevel, NavigationContainer } from "@anoma/components"; +import { Heading, HeadingLevel, NavigationContainer } from "@namada/components"; import { BridgeContainer } from "./Bridge.components"; import IBCTransfer from "App/Token/IBCTransfer/IBCTransfer"; diff --git a/apps/namada-interface/src/App/Governance/Governance.tsx b/apps/namada-interface/src/App/Governance/Governance.tsx index af636c536..3d7109af9 100644 --- a/apps/namada-interface/src/App/Governance/Governance.tsx +++ b/apps/namada-interface/src/App/Governance/Governance.tsx @@ -1,7 +1,7 @@ import { useState } from "react"; import { MainContainerNavigation } from "App/StakingAndGovernance/MainContainerNavigation"; import { GovernanceContainer } from "./Governance.components"; -import { Button, ButtonVariant } from "@anoma/components"; +import { Button, ButtonVariant } from "@namada/components"; const initialTitle = "Governance"; export const Governance = (): JSX.Element => { diff --git a/apps/namada-interface/src/App/NotFound.tsx b/apps/namada-interface/src/App/NotFound.tsx index a323ef178..5a41948e6 100644 --- a/apps/namada-interface/src/App/NotFound.tsx +++ b/apps/namada-interface/src/App/NotFound.tsx @@ -7,7 +7,7 @@ import { Icon, IconName, NavigationContainer, -} from "@anoma/components"; +} from "@namada/components"; import { TopLevelRoute } from "./types"; import { diff --git a/apps/namada-interface/src/App/PublicGoodsFunding/PublicGoodsFunding.tsx b/apps/namada-interface/src/App/PublicGoodsFunding/PublicGoodsFunding.tsx index d32185031..2422c312f 100644 --- a/apps/namada-interface/src/App/PublicGoodsFunding/PublicGoodsFunding.tsx +++ b/apps/namada-interface/src/App/PublicGoodsFunding/PublicGoodsFunding.tsx @@ -1,7 +1,7 @@ import { useState } from "react"; import { MainContainerNavigation } from "App/StakingAndGovernance/MainContainerNavigation"; import { PublicGoodsFundingContainer } from "./PublicGoodsFunding.components"; -import { Button, ButtonVariant } from "@anoma/components"; +import { Button, ButtonVariant } from "@namada/components"; const initialTitle = "Public Goods Funding"; diff --git a/apps/namada-interface/src/App/Redirect.tsx b/apps/namada-interface/src/App/Redirect.tsx index 9c6da6b57..ae1065436 100644 --- a/apps/namada-interface/src/App/Redirect.tsx +++ b/apps/namada-interface/src/App/Redirect.tsx @@ -1,7 +1,7 @@ import { useEffect } from "react"; import { useNavigate } from "react-router-dom"; import { TopLevelRoute } from "./types"; -import { useSanitizedLocation } from "@anoma/hooks"; +import { useSanitizedLocation } from "@namada/hooks"; type Props = { password?: string; diff --git a/apps/namada-interface/src/App/Settings/Settings.tsx b/apps/namada-interface/src/App/Settings/Settings.tsx index 37ce06486..22cbc4c3e 100644 --- a/apps/namada-interface/src/App/Settings/Settings.tsx +++ b/apps/namada-interface/src/App/Settings/Settings.tsx @@ -10,7 +10,7 @@ import { Icon, IconName, NavigationContainer, -} from "@anoma/components"; +} from "@namada/components"; import { SettingsContainer, SettingsContent, diff --git a/apps/namada-interface/src/App/Settings/SettingsWalletSettings/SettingsWalletSettings.tsx b/apps/namada-interface/src/App/Settings/SettingsWalletSettings/SettingsWalletSettings.tsx index ddda9ecf4..5c2f30374 100644 --- a/apps/namada-interface/src/App/Settings/SettingsWalletSettings/SettingsWalletSettings.tsx +++ b/apps/namada-interface/src/App/Settings/SettingsWalletSettings/SettingsWalletSettings.tsx @@ -1,6 +1,6 @@ import { useNavigate } from "react-router-dom"; -import { chains } from "@anoma/chains"; -import { Chain } from "@anoma/types"; +import { chains } from "@namada/chains"; +import { Chain } from "@namada/types"; import { setFiatCurrency, setChainId, SettingsState } from "slices/settings"; import { useAppDispatch, useAppSelector } from "store"; @@ -16,7 +16,7 @@ import { IconName, Select, Option, -} from "@anoma/components"; +} from "@namada/components"; import { InputContainer } from "App/AccountOverview/AccountOverview.components"; import { BackButton } from "App/Token/TokenSend/TokenSendForm.components"; import { ButtonsContainer, SettingsContent } from "../Settings.components"; diff --git a/apps/namada-interface/src/App/Staking/NewBondingPosition/NewBondingPosition.components.ts b/apps/namada-interface/src/App/Staking/NewBondingPosition/NewBondingPosition.components.ts index 8925a7e1e..2618bc554 100644 --- a/apps/namada-interface/src/App/Staking/NewBondingPosition/NewBondingPosition.components.ts +++ b/apps/namada-interface/src/App/Staking/NewBondingPosition/NewBondingPosition.components.ts @@ -3,7 +3,7 @@ import { Select, Table, Props as TableProps, -} from "@anoma/components"; +} from "@namada/components"; import { FC } from "react"; import styled from "styled-components"; diff --git a/apps/namada-interface/src/App/Staking/NewBondingPosition/NewBondingPosition.tsx b/apps/namada-interface/src/App/Staking/NewBondingPosition/NewBondingPosition.tsx index 5f28de4a2..87d8a7138 100644 --- a/apps/namada-interface/src/App/Staking/NewBondingPosition/NewBondingPosition.tsx +++ b/apps/namada-interface/src/App/Staking/NewBondingPosition/NewBondingPosition.tsx @@ -12,8 +12,8 @@ import { ButtonVariant, TableConfigurations, KeyValueData, -} from "@anoma/components"; -import { truncateInMiddle } from "@anoma/utils"; +} from "@namada/components"; +import { truncateInMiddle } from "@namada/utils"; import { StakingPosition, ChangeInStakingPosition, diff --git a/apps/namada-interface/src/App/Staking/Staking.tsx b/apps/namada-interface/src/App/Staking/Staking.tsx index 83f43c576..351aa0e36 100644 --- a/apps/namada-interface/src/App/Staking/Staking.tsx +++ b/apps/namada-interface/src/App/Staking/Staking.tsx @@ -1,8 +1,8 @@ import { useState, useEffect } from "react"; import { Routes, Route, useNavigate } from "react-router-dom"; -import { truncateInMiddle } from "@anoma/utils"; -import { Modal } from "@anoma/components"; +import { truncateInMiddle } from "@namada/utils"; +import { Modal } from "@namada/components"; import { MainContainerNavigation } from "App/StakingAndGovernance/MainContainerNavigation"; import { StakingContainer } from "./Staking.components"; @@ -18,7 +18,7 @@ import { import { NewBondingPosition } from "./NewBondingPosition"; import { UnbondPosition } from "./UnbondPosition"; import { Account } from "slices/accounts"; -import { useSanitizedLocation } from "@anoma/hooks"; +import { useSanitizedLocation } from "@namada/hooks"; const initialTitle = "Staking"; diff --git a/apps/namada-interface/src/App/Staking/StakingOverview/StakingOverview.tsx b/apps/namada-interface/src/App/Staking/StakingOverview/StakingOverview.tsx index 9f5daecba..d1f6c1dfb 100644 --- a/apps/namada-interface/src/App/Staking/StakingOverview/StakingOverview.tsx +++ b/apps/namada-interface/src/App/Staking/StakingOverview/StakingOverview.tsx @@ -1,5 +1,5 @@ import BigNumber from "bignumber.js"; -import { Table, TableLink, TableConfigurations } from "@anoma/components"; +import { Table, TableLink, TableConfigurations } from "@namada/components"; import { Account } from "slices/accounts"; import { Validator, MyValidators } from "slices/StakingAndGovernance"; import { diff --git a/apps/namada-interface/src/App/Staking/UnbondPosition/UnbondPosition.tsx b/apps/namada-interface/src/App/Staking/UnbondPosition/UnbondPosition.tsx index 606080e04..5f1a7d05a 100644 --- a/apps/namada-interface/src/App/Staking/UnbondPosition/UnbondPosition.tsx +++ b/apps/namada-interface/src/App/Staking/UnbondPosition/UnbondPosition.tsx @@ -6,14 +6,14 @@ import { Table, TableConfigurations, KeyValueData, -} from "@anoma/components"; +} from "@namada/components"; import { StakingPosition, ChangeInStakingPosition, } from "slices/StakingAndGovernance"; import { UnstakePositionContainer } from "./UnbondPosition.components"; -import { useSanitizedParams } from "@anoma/hooks"; +import { useSanitizedParams } from "@namada/hooks"; // keys for the table that we want to act upon in table configuration const AMOUNT_TO_UNBOND_KEY = "Amount to unbond"; diff --git a/apps/namada-interface/src/App/Staking/ValidatorDetails/ValidatorDetails.tsx b/apps/namada-interface/src/App/Staking/ValidatorDetails/ValidatorDetails.tsx index 38531ac1b..fb064d2cf 100644 --- a/apps/namada-interface/src/App/Staking/ValidatorDetails/ValidatorDetails.tsx +++ b/apps/namada-interface/src/App/Staking/ValidatorDetails/ValidatorDetails.tsx @@ -1,6 +1,6 @@ import { Outlet } from "react-router-dom"; -import { truncateInMiddle } from "@anoma/utils"; +import { truncateInMiddle } from "@namada/utils"; import { Button, ButtonVariant, @@ -8,7 +8,7 @@ import { TableConfigurations, KeyValueData, TableLink, -} from "@anoma/components"; +} from "@namada/components"; import { ValidatorDetailsContainer, diff --git a/apps/namada-interface/src/App/StakingAndGovernance/MainContainerNavigation/MainContainerNavigation.tsx b/apps/namada-interface/src/App/StakingAndGovernance/MainContainerNavigation/MainContainerNavigation.tsx index b146c036f..8eed5e3ab 100644 --- a/apps/namada-interface/src/App/StakingAndGovernance/MainContainerNavigation/MainContainerNavigation.tsx +++ b/apps/namada-interface/src/App/StakingAndGovernance/MainContainerNavigation/MainContainerNavigation.tsx @@ -1,4 +1,4 @@ -import { Icon, IconName } from "@anoma/components"; +import { Icon, IconName } from "@namada/components"; import { MainContainerNavigationContainer, BackButtonContainer, diff --git a/apps/namada-interface/src/App/StakingAndGovernance/StakingAndGovernance.tsx b/apps/namada-interface/src/App/StakingAndGovernance/StakingAndGovernance.tsx index 21aac1330..50807ce74 100644 --- a/apps/namada-interface/src/App/StakingAndGovernance/StakingAndGovernance.tsx +++ b/apps/namada-interface/src/App/StakingAndGovernance/StakingAndGovernance.tsx @@ -2,7 +2,7 @@ import { useEffect } from "react"; import { useAppDispatch, useAppSelector, RootState } from "store"; import { Routes, Route, useNavigate } from "react-router-dom"; -import { useIntegrationConnection } from "@anoma/hooks"; +import { useIntegrationConnection } from "@namada/hooks"; import { Staking } from "App/Staking"; import { Governance } from "App/Governance"; import { PublicGoodsFunding } from "App/PublicGoodsFunding"; @@ -12,7 +12,7 @@ import { StakingAndGovernanceSubRoute, locationToStakingAndGovernanceSubRoute, } from "App/types"; -import { useSanitizedLocation } from "@anoma/hooks"; +import { useSanitizedLocation } from "@namada/hooks"; import { fetchValidators, diff --git a/apps/namada-interface/src/App/Toast/toast.tsx b/apps/namada-interface/src/App/Toast/toast.tsx index f80207fc3..b64d4a596 100644 --- a/apps/namada-interface/src/App/Toast/toast.tsx +++ b/apps/namada-interface/src/App/Toast/toast.tsx @@ -1,7 +1,7 @@ import { useEffect, useContext, useCallback } from "react"; import { AnimatePresence } from "framer-motion"; -import { Icon, IconName } from "@anoma/components"; +import { Icon, IconName } from "@namada/components"; import { useAppSelector, useAppDispatch } from "store"; import { ThemeContext } from "styled-components"; diff --git a/apps/namada-interface/src/App/Token/IBCTransfer/IBCTransfer.tsx b/apps/namada-interface/src/App/Token/IBCTransfer/IBCTransfer.tsx index a00beaeeb..403e4c666 100644 --- a/apps/namada-interface/src/App/Token/IBCTransfer/IBCTransfer.tsx +++ b/apps/namada-interface/src/App/Token/IBCTransfer/IBCTransfer.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from "react"; import BigNumber from "bignumber.js"; -import { chains } from "@anoma/chains"; +import { chains } from "@namada/chains"; import { Account as AccountType, BridgeType, @@ -10,7 +10,7 @@ import { Extensions, Tokens, TokenType, -} from "@anoma/types"; +} from "@namada/types"; import { Button, ButtonVariant, @@ -20,12 +20,12 @@ import { InputVariants, Option, Select, -} from "@anoma/components"; +} from "@namada/components"; import { useIntegrationConnection, useUntilIntegrationAttached, -} from "@anoma/hooks"; +} from "@namada/hooks"; import { useAppDispatch, useAppSelector } from "store"; import { Account, @@ -65,7 +65,7 @@ const IBCTransfer = (): JSX.Element => { const [isExtensionConnected, setIsExtensionConnected] = useState< Record >({ - anoma: false, + namada: false, keplr: false, metamask: false, }); diff --git a/apps/namada-interface/src/App/Token/TokenDetails.tsx b/apps/namada-interface/src/App/Token/TokenDetails.tsx index 39abefbec..bf54edf85 100644 --- a/apps/namada-interface/src/App/Token/TokenDetails.tsx +++ b/apps/namada-interface/src/App/Token/TokenDetails.tsx @@ -1,15 +1,15 @@ import { useNavigate } from "react-router-dom"; -import { chains } from "@anoma/chains"; -import { Chain, Tokens } from "@anoma/types"; -import { formatRoute, stringFromTimestamp } from "@anoma/utils"; +import { chains } from "@namada/chains"; +import { Chain, Tokens } from "@namada/types"; +import { formatRoute, stringFromTimestamp } from "@namada/utils"; import { Button, ButtonVariant, Heading, HeadingLevel, NavigationContainer, -} from "@anoma/components"; +} from "@namada/components"; import { TopLevelRoute } from "App/types"; import { AccountsState } from "slices/accounts"; @@ -23,7 +23,7 @@ import { TransactionListItem, AccountsDetailsNavContainer, } from "./TokenDetails.components"; -import { useSanitizedParams } from "@anoma/hooks"; +import { useSanitizedParams } from "@namada/hooks"; type TokenDetailsParams = { id: string; diff --git a/apps/namada-interface/src/App/Token/TokenReceive/TokenReceive.tsx b/apps/namada-interface/src/App/Token/TokenReceive/TokenReceive.tsx index c9f4c6f9d..9bd8af8ba 100644 --- a/apps/namada-interface/src/App/Token/TokenReceive/TokenReceive.tsx +++ b/apps/namada-interface/src/App/Token/TokenReceive/TokenReceive.tsx @@ -2,7 +2,7 @@ import { useEffect, useState } from "react"; import { useNavigate } from "react-router-dom"; import { useQRCode } from "next-qrcode"; -import { formatRoute } from "@anoma/utils"; +import { formatRoute } from "@namada/utils"; import { Heading, HeadingLevel, @@ -10,7 +10,7 @@ import { IconName, NavigationContainer, Select, -} from "@anoma/components"; +} from "@namada/components"; import { Address } from "../Transfers/TransferDetails.components"; import { diff --git a/apps/namada-interface/src/App/Token/TokenSend/TokenSend.components.ts b/apps/namada-interface/src/App/Token/TokenSend/TokenSend.components.ts index 413db2bfe..93cb91157 100644 --- a/apps/namada-interface/src/App/Token/TokenSend/TokenSend.components.ts +++ b/apps/namada-interface/src/App/Token/TokenSend/TokenSend.components.ts @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { ColorMode, DesignConfiguration } from "@anoma/utils"; +import { ColorMode, DesignConfiguration } from "@namada/utils"; enum ComponentColor { TabBackgroundColorActive, diff --git a/apps/namada-interface/src/App/Token/TokenSend/TokenSend.tsx b/apps/namada-interface/src/App/Token/TokenSend/TokenSend.tsx index 5412704e6..30d070d59 100644 --- a/apps/namada-interface/src/App/Token/TokenSend/TokenSend.tsx +++ b/apps/namada-interface/src/App/Token/TokenSend/TokenSend.tsx @@ -5,16 +5,16 @@ import { SettingsState } from "slices/settings"; import { TransferType } from "slices/transfers"; import { useAppSelector } from "store"; -import { TokenType } from "@anoma/types"; +import { TokenType } from "@namada/types"; import { Heading, HeadingLevel, NavigationContainer, Select, Option, -} from "@anoma/components"; +} from "@namada/components"; import TokenSendForm from "./TokenSendForm"; -import { useSanitizedParams } from "@anoma/hooks"; +import { useSanitizedParams } from "@namada/hooks"; import { TokenSendContainer, @@ -28,7 +28,7 @@ import { ESTABLISHED_ADDRESS_LENGTH, ESTABLISHED_ADDRESS_PREFIX, } from "./types"; -import { chains } from "@anoma/chains"; +import { chains } from "@namada/chains"; export const parseTarget = (target: string): TransferType | undefined => { if ( diff --git a/apps/namada-interface/src/App/Token/TokenSend/TokenSendForm.tsx b/apps/namada-interface/src/App/Token/TokenSend/TokenSendForm.tsx index b764bb2b7..e92c58c81 100644 --- a/apps/namada-interface/src/App/Token/TokenSend/TokenSendForm.tsx +++ b/apps/namada-interface/src/App/Token/TokenSend/TokenSendForm.tsx @@ -4,8 +4,8 @@ import { ThemeContext } from "styled-components"; import QrReader from "react-qr-reader"; import BigNumber from "bignumber.js"; -import { Tokens, TokenType } from "@anoma/types"; -import { ColorMode, DesignConfiguration } from "@anoma/utils"; +import { Tokens, TokenType } from "@namada/types"; +import { ColorMode, DesignConfiguration } from "@namada/utils"; import { Button, ButtonVariant, @@ -13,7 +13,7 @@ import { IconName, Input, InputVariants, -} from "@anoma/components"; +} from "@namada/components"; import { AccountsState } from "slices/accounts"; import { diff --git a/apps/namada-interface/src/App/Token/Transfers/TransferDetails.tsx b/apps/namada-interface/src/App/Token/Transfers/TransferDetails.tsx index a6134949d..0e4ef9028 100644 --- a/apps/namada-interface/src/App/Token/Transfers/TransferDetails.tsx +++ b/apps/namada-interface/src/App/Token/Transfers/TransferDetails.tsx @@ -1,22 +1,22 @@ import { useNavigate } from "react-router-dom"; -import { chains } from "@anoma/chains"; -import { Chain } from "@anoma/types"; -import { stringFromTimestamp } from "@anoma/utils"; +import { chains } from "@namada/chains"; +import { Chain } from "@namada/types"; +import { stringFromTimestamp } from "@namada/utils"; import { Heading, HeadingLevel, NavigationContainer, Icon, IconName, -} from "@anoma/components"; +} from "@namada/components"; import { TransfersState } from "slices/transfers"; import { useAppSelector } from "store"; import { Address, TransferDetailContainer } from "./TransferDetails.components"; import { BackButton } from "../TokenSend/TokenSendForm.components"; import { ButtonsContainer, TransfersContent } from "./Transfers.components"; -import { useSanitizedParams } from "@anoma/hooks"; +import { useSanitizedParams } from "@namada/hooks"; type TransferDetailsParams = { id: string; diff --git a/apps/namada-interface/src/App/Token/Transfers/Transfers.tsx b/apps/namada-interface/src/App/Token/Transfers/Transfers.tsx index 167d25824..1993d84fc 100644 --- a/apps/namada-interface/src/App/Token/Transfers/Transfers.tsx +++ b/apps/namada-interface/src/App/Token/Transfers/Transfers.tsx @@ -1,7 +1,7 @@ import { useNavigate } from "react-router-dom"; -import { TokenType } from "@anoma/types"; -import { formatRoute, stringFromTimestamp } from "@anoma/utils"; +import { TokenType } from "@namada/types"; +import { formatRoute, stringFromTimestamp } from "@namada/utils"; import { Button, ButtonVariant, @@ -10,7 +10,7 @@ import { Icon, IconName, NavigationContainer, -} from "@anoma/components"; +} from "@namada/components"; import { TopLevelRoute } from "App/types"; import { Account, AccountsState } from "slices/accounts"; @@ -26,7 +26,7 @@ import { TransfersContent, } from "./Transfers.components"; import { BackButton } from "../TokenSend/TokenSendForm.components"; -import { useSanitizedParams } from "@anoma/hooks"; +import { useSanitizedParams } from "@namada/hooks"; type TokenDetailsParams = { id: string; diff --git a/apps/namada-interface/src/App/TopNavigation/topNavigation.components.ts b/apps/namada-interface/src/App/TopNavigation/topNavigation.components.ts index 5943c2267..7b4e44e0b 100644 --- a/apps/namada-interface/src/App/TopNavigation/topNavigation.components.ts +++ b/apps/namada-interface/src/App/TopNavigation/topNavigation.components.ts @@ -1,5 +1,5 @@ import styled, { css, FlattenSimpleInterpolation } from "styled-components"; -import { ColorMode, DesignConfiguration } from "@anoma/utils"; +import { ColorMode, DesignConfiguration } from "@namada/utils"; enum ComponentColor { Logo, diff --git a/apps/namada-interface/src/App/TopNavigation/topNavigation.tsx b/apps/namada-interface/src/App/TopNavigation/topNavigation.tsx index 3e5cb2865..a015417c7 100644 --- a/apps/namada-interface/src/App/TopNavigation/topNavigation.tsx +++ b/apps/namada-interface/src/App/TopNavigation/topNavigation.tsx @@ -6,9 +6,9 @@ import { Location, } from "react-router-dom"; -import { ColorMode } from "@anoma/utils"; -import { chains } from "@anoma/chains"; -import { Chain } from "@anoma/types"; +import { ColorMode } from "@namada/utils"; +import { chains } from "@namada/chains"; +import { Chain } from "@namada/types"; import { Icon, IconName, @@ -16,8 +16,8 @@ import { ImageName, Toggle, Select, -} from "@anoma/components"; -import { useSanitizedLocation } from "@anoma/hooks"; +} from "@namada/components"; +import { useSanitizedLocation } from "@namada/hooks"; import { useAppDispatch, useAppSelector } from "store"; import { AppStore } from "store/store"; diff --git a/apps/namada-interface/src/App/TopNavigation/topNavigationLoggedIn.components.ts b/apps/namada-interface/src/App/TopNavigation/topNavigationLoggedIn.components.ts index 93edfed47..272c00d06 100644 --- a/apps/namada-interface/src/App/TopNavigation/topNavigationLoggedIn.components.ts +++ b/apps/namada-interface/src/App/TopNavigation/topNavigationLoggedIn.components.ts @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { ColorMode, DesignConfiguration } from "@anoma/utils"; +import { ColorMode, DesignConfiguration } from "@namada/utils"; enum ComponentColor { NavItem, diff --git a/apps/namada-interface/src/App/TopNavigation/topNavigationLoggedIn.tsx b/apps/namada-interface/src/App/TopNavigation/topNavigationLoggedIn.tsx index 007d6b4b0..b81e632f8 100644 --- a/apps/namada-interface/src/App/TopNavigation/topNavigationLoggedIn.tsx +++ b/apps/namada-interface/src/App/TopNavigation/topNavigationLoggedIn.tsx @@ -1,7 +1,7 @@ import { useNavigate } from "react-router-dom"; -import { Icon, IconName, Toggle } from "@anoma/components"; -import { ColorMode } from "@anoma/utils"; +import { Icon, IconName, Toggle } from "@namada/components"; +import { ColorMode } from "@namada/utils"; import { TopLevelRoute } from "App/types"; import { ColorModeContainer, OnlyInMedium } from "./topNavigation.components"; diff --git a/apps/namada-interface/src/App/types.ts b/apps/namada-interface/src/App/types.ts index e88adeee1..2eddd594a 100644 --- a/apps/namada-interface/src/App/types.ts +++ b/apps/namada-interface/src/App/types.ts @@ -83,8 +83,8 @@ export const locationToStakingAndGovernanceSubRoute = ( }; export enum LocalStorageKeys { - MasterSeed = "com.anoma.network:seed", - Session = "com.anoma.network:session", - Persist = "com.anoma.network:state", - ColorMode = "com.anoma.color-mode", + MasterSeed = "com.namada.network:seed", + Session = "com.namada.network:session", + Persist = "com.namada.network:state", + ColorMode = "com.namada.color-mode", } diff --git a/apps/namada-interface/src/index.tsx b/apps/namada-interface/src/index.tsx index cb8fad0e7..edfef3edc 100644 --- a/apps/namada-interface/src/index.tsx +++ b/apps/namada-interface/src/index.tsx @@ -2,7 +2,7 @@ import React from "react"; import ReactDOM from "react-dom"; import { RouterProvider } from "react-router-dom"; import reportWebVitals from "./reportWebVitals"; -import { init as initShared } from "@anoma/shared/src/init"; +import { init as initShared } from "@namada/shared/src/init"; import "./index.css"; import { store } from "store/store"; import { getRouter } from "./App/AppRoutes"; diff --git a/apps/namada-interface/src/services/extensionEvents/handlers/index.ts b/apps/namada-interface/src/services/extensionEvents/handlers/index.ts index b1ef3e6f1..2ffb72911 100644 --- a/apps/namada-interface/src/services/extensionEvents/handlers/index.ts +++ b/apps/namada-interface/src/services/extensionEvents/handlers/index.ts @@ -1,3 +1,3 @@ -export * from "./anoma"; +export * from "./namada"; export * from "./keplr"; export * from "./metamask"; diff --git a/apps/namada-interface/src/services/extensionEvents/handlers/keplr.ts b/apps/namada-interface/src/services/extensionEvents/handlers/keplr.ts index 9eb06af33..da1cd3d9f 100644 --- a/apps/namada-interface/src/services/extensionEvents/handlers/keplr.ts +++ b/apps/namada-interface/src/services/extensionEvents/handlers/keplr.ts @@ -1,6 +1,6 @@ import { Dispatch } from "react"; -import { Keplr } from "@anoma/integrations"; +import { Keplr } from "@namada/integrations"; import { addAccounts, fetchBalances } from "slices/accounts"; diff --git a/apps/namada-interface/src/services/extensionEvents/handlers/metamask.ts b/apps/namada-interface/src/services/extensionEvents/handlers/metamask.ts index 7d60dae73..7809c0341 100644 --- a/apps/namada-interface/src/services/extensionEvents/handlers/metamask.ts +++ b/apps/namada-interface/src/services/extensionEvents/handlers/metamask.ts @@ -1,5 +1,5 @@ import { Dispatch } from "react"; -import { Metamask } from "@anoma/integrations"; +import { Metamask } from "@namada/integrations"; import { addAccounts, fetchBalances } from "slices/accounts"; export const MetamaskAccountChangedHandler = diff --git a/apps/namada-interface/src/services/extensionEvents/handlers/anoma.ts b/apps/namada-interface/src/services/extensionEvents/handlers/namada.ts similarity index 76% rename from apps/namada-interface/src/services/extensionEvents/handlers/anoma.ts rename to apps/namada-interface/src/services/extensionEvents/handlers/namada.ts index 742361703..d577e9f41 100644 --- a/apps/namada-interface/src/services/extensionEvents/handlers/anoma.ts +++ b/apps/namada-interface/src/services/extensionEvents/handlers/namada.ts @@ -1,19 +1,19 @@ import { Dispatch } from "react"; -import { chains } from "@anoma/chains"; -import { Anoma } from "@anoma/integrations"; +import { chains } from "@namada/chains"; +import { Namada } from "@namada/integrations"; import { addAccounts, fetchBalances } from "slices/accounts"; import { actions as notificationsActions } from "slices/notifications"; import { getToast, Toasts } from "slices/transfers"; -export const AnomaAccountChangedHandler = - (dispatch: Dispatch, integration: Anoma) => +export const NamadaAccountChangedHandler = + (dispatch: Dispatch, integration: Namada) => async (event: CustomEventInit) => { const chainId = event.detail?.chainId; const chain = chains[chainId]; - if (chain.extension.id === "anoma") { + if (chain.extension.id === "namada") { const accounts = (await integration.accounts()) || []; dispatch(addAccounts(accounts)); @@ -21,12 +21,12 @@ export const AnomaAccountChangedHandler = } }; -export const AnomaUpdatedBalancesHandler = +export const NamadaUpdatedBalancesHandler = (dispatch: Dispatch) => async () => { dispatch(fetchBalances()); }; -export const AnomaTransferStartedHandler = +export const NamadaTransferStartedHandler = (dispatch: Dispatch) => async (event: CustomEventInit) => { const { msgId } = event.detail; dispatch( @@ -39,7 +39,7 @@ export const AnomaTransferStartedHandler = ); }; -export const AnomaTransferCompletedHandler = +export const NamadaTransferCompletedHandler = (dispatch: Dispatch) => async (event: CustomEventInit) => { const { msgId, success } = event.detail; dispatch( diff --git a/apps/namada-interface/src/services/extensionEvents/provider.tsx b/apps/namada-interface/src/services/extensionEvents/provider.tsx index ff0e37687..77dac031b 100644 --- a/apps/namada-interface/src/services/extensionEvents/provider.tsx +++ b/apps/namada-interface/src/services/extensionEvents/provider.tsx @@ -1,20 +1,20 @@ import { createContext } from "react"; -import { Events, KeplrEvents, MetamaskEvents } from "@anoma/types"; +import { Events, KeplrEvents, MetamaskEvents } from "@namada/types"; import { defaultChainId, defaultCosmosChainId, defaultEthereumChainId, -} from "@anoma/chains"; -import { Anoma, Keplr, Metamask } from "@anoma/integrations"; -import { useEventListenerOnce, useIntegration } from "@anoma/hooks"; +} from "@namada/chains"; +import { Namada, Keplr, Metamask } from "@namada/integrations"; +import { useEventListenerOnce, useIntegration } from "@namada/hooks"; import { useAppDispatch } from "store"; import { - AnomaAccountChangedHandler, - AnomaTransferCompletedHandler, - AnomaTransferStartedHandler, - AnomaUpdatedBalancesHandler, + NamadaAccountChangedHandler, + NamadaTransferCompletedHandler, + NamadaTransferStartedHandler, + NamadaUpdatedBalancesHandler, KeplrAccountChangedHandler, MetamaskAccountChangedHandler, } from "./handlers"; @@ -23,18 +23,18 @@ export const ExtensionEventsContext = createContext({}); export const ExtensionEventsProvider: React.FC = (props): JSX.Element => { const dispatch = useAppDispatch(); - const anomaIntegration = useIntegration(defaultChainId); + const namadaIntegration = useIntegration(defaultChainId); const keplrIntegration = useIntegration(defaultCosmosChainId); const metamaskIntegration = useIntegration(defaultEthereumChainId); // Instantiate handlers: - const anomaAccountChangedHandler = AnomaAccountChangedHandler( + const namadaAccountChangedHandler = NamadaAccountChangedHandler( dispatch, - anomaIntegration as Anoma + namadaIntegration as Namada ); - const anomaTransferStartedHandler = AnomaTransferStartedHandler(dispatch); - const anomaTransferCompletedHandler = AnomaTransferCompletedHandler(dispatch); - const anomaUpdatedBalancesHandler = AnomaUpdatedBalancesHandler(dispatch); + const namadaTransferStartedHandler = NamadaTransferStartedHandler(dispatch); + const namadaTransferCompletedHandler = NamadaTransferCompletedHandler(dispatch); + const namadaUpdatedBalancesHandler = NamadaUpdatedBalancesHandler(dispatch); // Keplr handlers const keplrAccountChangedHandler = KeplrAccountChangedHandler( @@ -49,10 +49,10 @@ export const ExtensionEventsProvider: React.FC = (props): JSX.Element => { ); // Register handlers: - useEventListenerOnce(Events.AccountChanged, anomaAccountChangedHandler); - useEventListenerOnce(Events.TransferStarted, anomaTransferStartedHandler); - useEventListenerOnce(Events.TransferCompleted, anomaTransferCompletedHandler); - useEventListenerOnce(Events.UpdatedBalances, anomaUpdatedBalancesHandler); + useEventListenerOnce(Events.AccountChanged, namadaAccountChangedHandler); + useEventListenerOnce(Events.TransferStarted, namadaTransferStartedHandler); + useEventListenerOnce(Events.TransferCompleted, namadaTransferCompletedHandler); + useEventListenerOnce(Events.UpdatedBalances, namadaUpdatedBalancesHandler); useEventListenerOnce(KeplrEvents.AccountChanged, keplrAccountChangedHandler); useEventListenerOnce( MetamaskEvents.AccountChanged, diff --git a/apps/namada-interface/src/services/integrations/provider.tsx b/apps/namada-interface/src/services/integrations/provider.tsx index 160a87b83..d86726859 100644 --- a/apps/namada-interface/src/services/integrations/provider.tsx +++ b/apps/namada-interface/src/services/integrations/provider.tsx @@ -1,4 +1,4 @@ -import { IntegrationsContext, integrations } from "@anoma/hooks"; +import { IntegrationsContext, integrations } from "@namada/hooks"; export const IntegrationsProvider: React.FC = (props): JSX.Element => { return ( diff --git a/apps/namada-interface/src/slices/StakingAndGovernance/actions.ts b/apps/namada-interface/src/slices/StakingAndGovernance/actions.ts index 5e0a83e68..12fb09c41 100644 --- a/apps/namada-interface/src/slices/StakingAndGovernance/actions.ts +++ b/apps/namada-interface/src/slices/StakingAndGovernance/actions.ts @@ -1,10 +1,10 @@ import { createAsyncThunk } from "@reduxjs/toolkit"; import BigNumber from "bignumber.js"; -import { Query } from "@anoma/shared"; -import { Signer, Tokens } from "@anoma/types"; -import { chains } from "@anoma/chains"; -import { getIntegration } from "@anoma/hooks"; +import { Query } from "@namada/shared"; +import { Signer, Tokens } from "@namada/types"; +import { chains } from "@namada/chains"; +import { getIntegration } from "@namada/hooks"; import { FETCH_VALIDATORS, diff --git a/apps/namada-interface/src/slices/accounts.ts b/apps/namada-interface/src/slices/accounts.ts index bfa58b060..bbc32b4b7 100644 --- a/apps/namada-interface/src/slices/accounts.ts +++ b/apps/namada-interface/src/slices/accounts.ts @@ -1,9 +1,9 @@ import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit"; import BigNumber from "bignumber.js"; -import { Account as AccountDetails, TokenType } from "@anoma/types"; -import { chains } from "@anoma/chains"; -import { getIntegration } from "@anoma/hooks"; +import { Account as AccountDetails, TokenType } from "@namada/types"; +import { chains } from "@namada/chains"; +import { getIntegration } from "@namada/hooks"; import { RootState } from "store"; diff --git a/apps/namada-interface/src/slices/coins.ts b/apps/namada-interface/src/slices/coins.ts index 1acc455b5..48bd48abb 100644 --- a/apps/namada-interface/src/slices/coins.ts +++ b/apps/namada-interface/src/slices/coins.ts @@ -1,7 +1,7 @@ import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit"; -import { Symbols, Tokens } from "@anoma/types"; -import { getTimeStamp } from "@anoma/utils"; +import { Symbols, Tokens } from "@namada/types"; +import { getTimeStamp } from "@namada/utils"; import Config from "config"; import { Currencies } from "currencies"; diff --git a/apps/namada-interface/src/slices/settings.ts b/apps/namada-interface/src/slices/settings.ts index 741307b1a..24b6e99e4 100644 --- a/apps/namada-interface/src/slices/settings.ts +++ b/apps/namada-interface/src/slices/settings.ts @@ -1,5 +1,5 @@ import { createSlice, PayloadAction } from "@reduxjs/toolkit"; -import { defaultChainId } from "@anoma/chains"; +import { defaultChainId } from "@namada/chains"; const SETTINGS_ACTIONS_BASE = "settings"; diff --git a/apps/namada-interface/src/slices/transfers.ts b/apps/namada-interface/src/slices/transfers.ts index 75851a928..5a311eb87 100644 --- a/apps/namada-interface/src/slices/transfers.ts +++ b/apps/namada-interface/src/slices/transfers.ts @@ -1,8 +1,8 @@ import { createAsyncThunk, createSlice } from "@reduxjs/toolkit"; import BigNumber from "bignumber.js"; -import { Account, Tokens, TokenType, Signer } from "@anoma/types"; -import { getIntegration } from "@anoma/hooks"; +import { Account, Tokens, TokenType, Signer } from "@namada/types"; +import { getIntegration } from "@namada/hooks"; import { actions as notificationsActions, diff --git a/apps/namada-interface/src/store/mocks.ts b/apps/namada-interface/src/store/mocks.ts index 8e2861067..73dca8884 100644 --- a/apps/namada-interface/src/store/mocks.ts +++ b/apps/namada-interface/src/store/mocks.ts @@ -7,11 +7,11 @@ import { StakingOrUnstakingState } from "slices/StakingAndGovernance"; export const mockAppState: RootState = { accounts: { derived: { - "anoma-masp-1.5.32ccad5356012a7": { + "namada-masp-1.5.32ccad5356012a7": { atest1v4ehgw36xqcyz3zrxsenzd3kxsunsvzzxymyywpkg4zrjv2pxepyyd3cgse5gwzxgsm5x3zrkf2pwp: { details: { - chainId: "anoma-masp-1.5.32ccad5356012a7", + chainId: "namada-masp-1.5.32ccad5356012a7", alias: "Namada", address: "atest1v4ehgw36xqcyz3zrxsenzd3kxsunsvzzxymyywpkg4zrjv2pxepyyd3cgse5gwzxgsm5x3zrkf2pwp", @@ -24,10 +24,10 @@ export const mockAppState: RootState = { }, }, }, - "anoma-test.1e670ba91369ec891fc": { + "namada-test.1e670ba91369ec891fc": { "39UL18": { details: { - chainId: "anoma-test.1e670ba91369ec891fc", + chainId: "namada-test.1e670ba91369ec891fc", alias: "Namada", address: "atest1v4ehgw36xqcyz3zrxsenzd3kxsunsvzzxymyywpkg4zrjv2pxepyyd3cgse5gwzxgsm5x3zrkf2pwp", @@ -40,10 +40,10 @@ export const mockAppState: RootState = { }, }, }, - "anoma-test.89060614ce340f4baae": { + "namada-test.89060614ce340f4baae": { "2MLGVA": { details: { - chainId: "anoma-test.89060614ce340f4baae", + chainId: "namada-test.89060614ce340f4baae", alias: "Namada", address: "L1qDtV8TRwYLSHdMDW518hgRw9nWnRjFTenkcBYNJruyYoLjaj8F", isShielded: false, @@ -61,7 +61,7 @@ export const mockAppState: RootState = { transfers: { transactions: [ { - chainId: "anoma-masp-1.5.32ccad5356012a7", + chainId: "namada-masp-1.5.32ccad5356012a7", source: "atest1v4ehgw36gc6yxvpjxccyzvphxycrxw2xxsuyydesxgcnjs3cg9znwv3cxgmnj32yxy6rssf5tcqjm3", target: @@ -77,7 +77,7 @@ export const mockAppState: RootState = { type: TransferType.NonShielded, }, { - chainId: "anoma-masp-1.5.32ccad5356012a7", + chainId: "namada-masp-1.5.32ccad5356012a7", source: "atest1v4ehgw36gc6yxvpjxccyzvphxycrxw2xxsuyydesxgcnjs3cg9znwv3cxgmnj32yxy6rssf5tcqjm3", target: @@ -93,7 +93,7 @@ export const mockAppState: RootState = { type: TransferType.NonShielded, }, { - chainId: "anoma-masp-1.5.32ccad5356012a7", + chainId: "namada-masp-1.5.32ccad5356012a7", source: "atest1v4ehgw36gc6yxvpjxccyzvphxycrxw2xxsuyydesxgcnjs3cg9znwv3cxgmnj32yxy6rssf5tcqjm3", target: @@ -116,17 +116,17 @@ export const mockAppState: RootState = { }, channels: { channelsByChain: { - "anoma-test.1e670ba91369ec891fc": { - "anoma-test.89060614ce340f4baae": ["channel-0"], + "namada-test.1e670ba91369ec891fc": { + "namada-test.89060614ce340f4baae": ["channel-0"], }, - "anoma-test.89060614ce340f4baae": { - "anoma-test.1e670ba91369ec891fc": ["channel-0"], + "namada-test.89060614ce340f4baae": { + "namada-test.1e670ba91369ec891fc": ["channel-0"], }, }, }, settings: { fiatCurrency: "USD", - chainId: "anoma-masp-1.5.32ccad5356012a7", + chainId: "namada-masp-1.5.32ccad5356012a7", connectedChains: [], }, coins: { diff --git a/apps/namada-interface/src/store/store.ts b/apps/namada-interface/src/store/store.ts index db5d4dd73..c7f0a38f5 100644 --- a/apps/namada-interface/src/store/store.ts +++ b/apps/namada-interface/src/store/store.ts @@ -15,7 +15,7 @@ import { import { LocalStorageKeys } from "App/types"; import { createTransform } from "redux-persist"; import { SettingsState } from "slices/settings"; -import { chains, defaultChainId } from "@anoma/chains"; +import { chains, defaultChainId } from "@namada/chains"; const { REACT_APP_LOCAL, NODE_ENV } = process.env; const POSTFIX = diff --git a/apps/namada-interface/src/styled.d.ts b/apps/namada-interface/src/styled.d.ts index f758193be..a75432c21 100644 --- a/apps/namada-interface/src/styled.d.ts +++ b/apps/namada-interface/src/styled.d.ts @@ -1,5 +1,5 @@ import "styled-components"; -import { DesignConfiguration } from "@anoma/utils"; +import { DesignConfiguration } from "@namada/utils"; interface IPalette { main: string; contrastText: string; diff --git a/package.json b/package.json index f87184556..1d0a57823 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "anoma", + "name": "namada", "version": "0.1.0", "private": true, "workspaces": [ diff --git a/packages/chains/package.json b/packages/chains/package.json index 11abd18f5..6269f1974 100644 --- a/packages/chains/package.json +++ b/packages/chains/package.json @@ -1,5 +1,5 @@ { - "name": "@anoma/chains", + "name": "@namada/chains", "version": "0.1.0", "description": "Chain configurations for Namada", "main": "src/index.ts", @@ -9,7 +9,7 @@ "private": false, "dependencies": { "typescript": "^5.1.3", - "@anoma/types": "0.1.0" + "@namada/types": "0.1.0" }, "devDependencies": { "eslint": "^8.27.0", diff --git a/packages/chains/src/chains/cosmos.ts b/packages/chains/src/chains/cosmos.ts index 743a1d239..9757638e5 100644 --- a/packages/chains/src/chains/cosmos.ts +++ b/packages/chains/src/chains/cosmos.ts @@ -1,4 +1,4 @@ -import { BridgeType, Chain, Extensions } from "@anoma/types"; +import { BridgeType, Chain, Extensions } from "@namada/types"; const DEFAULT_ALIAS = "Cosmos Hub"; const DEFAULT_CHAIN_ID = "cosmoshub-4"; diff --git a/packages/chains/src/chains/ethereum.ts b/packages/chains/src/chains/ethereum.ts index d64f9c392..48917d51b 100644 --- a/packages/chains/src/chains/ethereum.ts +++ b/packages/chains/src/chains/ethereum.ts @@ -1,4 +1,4 @@ -import { BridgeType, Chain, Extensions } from "@anoma/types"; +import { BridgeType, Chain, Extensions } from "@namada/types"; const DEFAULT_ALIAS = "Goerli Testnet"; const DEFAULT_CHAIN_ID = "0x5"; diff --git a/packages/chains/src/chains/namada.ts b/packages/chains/src/chains/namada.ts index eb9e36e96..0c4ce3cb8 100644 --- a/packages/chains/src/chains/namada.ts +++ b/packages/chains/src/chains/namada.ts @@ -1,4 +1,4 @@ -import { BridgeType, Chain, Extensions } from "@anoma/types"; +import { BridgeType, Chain, Extensions } from "@namada/types"; const DEFAULT_ALIAS = "Namada Testnet"; const DEFAULT_CHAIN_ID = "qc-testnet-5.1.025a61165acd05e"; @@ -28,7 +28,7 @@ const namada: Chain = { symbol: "NAM", gasPriceStep: { low: 0.01, average: 0.025, high: 0.03 }, }, - extension: Extensions["anoma"], + extension: Extensions["namada"], ibc: { portId: "transfer", }, diff --git a/packages/components/package.json b/packages/components/package.json index 45decd36f..d5c6c8192 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,7 +1,7 @@ { - "name": "@anoma/components", + "name": "@namada/components", "version": "0.1.0", - "description": "A collection of components for use with the Anoma ecosystem", + "description": "A collection of components for use with the Namada ecosystem", "main": "src/index.ts", "repository": "https://github.com/anoma/namada-interface", "author": "Heliax Dev ", @@ -13,7 +13,7 @@ "lint:ci": "yarn lint --max-warnings 0" }, "dependencies": { - "@anoma/utils": "0.1.0", + "@namada/utils": "0.1.0", "react": "^17.0.2", "styled-components": "^5.3.5", "typescript": "^5.1.3" diff --git a/packages/components/src/Button/button.components.ts b/packages/components/src/Button/button.components.ts index 892b6fd9d..8edf9660c 100644 --- a/packages/components/src/Button/button.components.ts +++ b/packages/components/src/Button/button.components.ts @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { DesignConfiguration, ColorMode } from "@anoma/utils"; +import { DesignConfiguration, ColorMode } from "@namada/utils"; enum ComponentColor { ButtonBackground, diff --git a/packages/components/src/Input/input.components.ts b/packages/components/src/Input/input.components.ts index efd479225..a8d62a3b8 100644 --- a/packages/components/src/Input/input.components.ts +++ b/packages/components/src/Input/input.components.ts @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { ColorMode, DesignConfiguration } from "@anoma/utils"; +import { ColorMode, DesignConfiguration } from "@namada/utils"; enum ComponentColor { BorderColor, diff --git a/packages/components/src/Select/Select.components.ts b/packages/components/src/Select/Select.components.ts index 4db4a73d0..3de816dc7 100644 --- a/packages/components/src/Select/Select.components.ts +++ b/packages/components/src/Select/Select.components.ts @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { ColorMode, DesignConfiguration } from "@anoma/utils"; +import { ColorMode, DesignConfiguration } from "@namada/utils"; enum ComponentColor { Arrow, diff --git a/packages/components/src/Toggle/toggle.components.ts b/packages/components/src/Toggle/toggle.components.ts index 3014f75db..91396b083 100644 --- a/packages/components/src/Toggle/toggle.components.ts +++ b/packages/components/src/Toggle/toggle.components.ts @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { ColorMode, DesignConfiguration } from "@anoma/utils"; +import { ColorMode, DesignConfiguration } from "@namada/utils"; const COMPONENT_WIDTH_PIXELS = 46; const CIRCLE_DIAMETER_PIXELS = 20; diff --git a/packages/crypto/README.md b/packages/crypto/README.md index 94098f536..81a9db944 100644 --- a/packages/crypto/README.md +++ b/packages/crypto/README.md @@ -1,6 +1,6 @@ # crypto -The `@anoma/crypto` package is to provide cryptography functionality with Rust via WebAssembly. +The `@namada/crypto` package is to provide cryptography functionality with Rust via WebAssembly. The Rust source code lives in `lib/`, and currently provides the following crates: diff --git a/packages/crypto/lib/Cargo.toml b/packages/crypto/lib/Cargo.toml index c98f49f67..75e065cc2 100644 --- a/packages/crypto/lib/Cargo.toml +++ b/packages/crypto/lib/Cargo.toml @@ -4,7 +4,7 @@ authors = ["Heliax AG "] version = "0.1.0" edition = "2021" repository = "https://github.com/anoma/namada-interface/" -description = "Cryptographic functions for Anoma apps" +description = "Cryptographic functions for Namada apps" license = "MIT" [lib] diff --git a/packages/crypto/lib/src/lib.rs b/packages/crypto/lib/src/lib.rs index 2cf767d20..45743fede 100644 --- a/packages/crypto/lib/src/lib.rs +++ b/packages/crypto/lib/src/lib.rs @@ -1,5 +1,5 @@ //! # crypto //! -//! A library of cryptographic functions for use in the Anoma ecosystem +//! A library of cryptographic functions for use in the Namada ecosystem pub mod crypto; diff --git a/packages/crypto/package.json b/packages/crypto/package.json index 97dc374a8..2acc83321 100644 --- a/packages/crypto/package.json +++ b/packages/crypto/package.json @@ -1,7 +1,7 @@ { - "name": "@anoma/crypto", + "name": "@namada/crypto", "version": "0.1.0", - "description": "Crypto functions related to Anoma", + "description": "Crypto functions related to Namada", "main": "src/index.ts", "repository": "https://github.com/anoma/namada-interface/", "author": "Heliax Dev ", diff --git a/packages/hooks/README.md b/packages/hooks/README.md index 6f8d283fa..4b14fa780 100644 --- a/packages/hooks/README.md +++ b/packages/hooks/README.md @@ -1,6 +1,6 @@ # hooks -The `@anoma/hooks` package contains re-usable React hooks that may be of use to both the `extension` and `namada-interface` apps, +The `@namada/hooks` package contains re-usable React hooks that may be of use to both the `extension` and `namada-interface` apps, as well as for third-party integrations. Currently, the following hooks are defined: diff --git a/packages/hooks/package.json b/packages/hooks/package.json index 6c9dd079a..d7d9b0338 100644 --- a/packages/hooks/package.json +++ b/packages/hooks/package.json @@ -1,5 +1,5 @@ { - "name": "@anoma/hooks", + "name": "@namada/hooks", "version": "0.1.0", "description": "A collection of React hooks", "main": "src/index.ts", @@ -13,10 +13,10 @@ "lint:ci": "yarn lint --max-warnings 0" }, "dependencies": { - "@anoma/chains": "0.1.0", - "@anoma/integrations": "0.1.0", - "@anoma/types": "0.1.0", - "@anoma/utils": "0.1.0", + "@namada/chains": "0.1.0", + "@namada/integrations": "0.1.0", + "@namada/types": "0.1.0", + "@namada/utils": "0.1.0", "react": "^17.0.2", "typescript": "^5.1.3" }, diff --git a/packages/hooks/src/useIntegration.ts b/packages/hooks/src/useIntegration.ts index 91ff55d6e..fa2f6af41 100644 --- a/packages/hooks/src/useIntegration.ts +++ b/packages/hooks/src/useIntegration.ts @@ -6,12 +6,12 @@ import { useState, } from "react"; -import { chains } from "@anoma/chains"; -import { Anoma, Keplr, Metamask } from "@anoma/integrations"; -import { Chain, ExtensionKey } from "@anoma/types"; -import { useUntil } from "@anoma/hooks"; +import { chains } from "@namada/chains"; +import { Namada, Keplr, Metamask } from "@namada/integrations"; +import { Chain, ExtensionKey } from "@namada/types"; +import { useUntil } from "@namada/hooks"; -type Integration = typeof Anoma | typeof Keplr | typeof Metamask; +type Integration = typeof Namada | typeof Keplr | typeof Metamask; type ChainId = string; type IntegrationsMap = Record; export type Integrations = Record>; @@ -21,7 +21,7 @@ type ExtensionConnection = ( ) => Promise; const extensionMap: IntegrationsMap = { - anoma: Anoma, + namada: Namada, keplr: Keplr, metamask: Metamask, }; @@ -106,7 +106,7 @@ export const useUntilIntegrationAttached = (chain: Chain): AttachStatusMap => { const integration = useIntegration(chainId); const [attachStatusMap, setAttachStatus] = useState({ - anoma: "pending", + namada: "pending", keplr: "pending", metamask: "pending", }); diff --git a/packages/hooks/src/useUntil.ts b/packages/hooks/src/useUntil.ts index 3c81f8cae..1929a71e8 100644 --- a/packages/hooks/src/useUntil.ts +++ b/packages/hooks/src/useUntil.ts @@ -1,6 +1,6 @@ import { useEffect } from "react"; -import { executeUntil, Config } from "@anoma/utils"; +import { executeUntil, Config } from "@namada/utils"; type Options = { predFn: () => Promise; diff --git a/packages/integrations/README.md b/packages/integrations/README.md index 9edeb7821..9ffbf5d46 100644 --- a/packages/integrations/README.md +++ b/packages/integrations/README.md @@ -1,6 +1,6 @@ # integrations -Anoma Wallet third-party integrations. +Namada Wallet third-party integrations. - Keplr Wallet - Metamask Wallet diff --git a/packages/integrations/package.json b/packages/integrations/package.json index cf5c6d327..51eecdda4 100644 --- a/packages/integrations/package.json +++ b/packages/integrations/package.json @@ -1,7 +1,7 @@ { - "name": "@anoma/integrations", + "name": "@namada/integrations", "version": "0.1.0", - "description": "Anoma Wallet third-party integrations", + "description": "Namada Wallet third-party integrations", "main": "src/index.ts", "repository": "https://github.com/anoma/namada-interface", "author": "Heliax Dev ", @@ -30,8 +30,8 @@ "ts-node": "^10.9.1" }, "dependencies": { - "@anoma/types": "0.1.0", - "@anoma/utils": "0.1.0", + "@namada/types": "0.1.0", + "@namada/utils": "0.1.0", "@cosmjs/launchpad": "^0.27.1", "@cosmjs/proto-signing": "^0.27.1", "@cosmjs/stargate": "^0.29.5", diff --git a/packages/integrations/src/Keplr.test.ts b/packages/integrations/src/Keplr.test.ts index dd3f924a0..c32517946 100644 --- a/packages/integrations/src/Keplr.test.ts +++ b/packages/integrations/src/Keplr.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { mock } from "jest-mock-extended"; -import { Chain } from "@anoma/types"; +import { Chain } from "@namada/types"; import { Key, Keplr as IKeplr } from "@keplr-wallet/types"; import Keplr from "./Keplr"; diff --git a/packages/integrations/src/Keplr.ts b/packages/integrations/src/Keplr.ts index 667d39fab..53f9d7638 100644 --- a/packages/integrations/src/Keplr.ts +++ b/packages/integrations/src/Keplr.ts @@ -12,8 +12,8 @@ import { import { Coin } from "@cosmjs/launchpad"; import Long from "long"; -import { Account, Chain, CosmosTokens, TokenBalance } from "@anoma/types"; -import { shortenAddress } from "@anoma/utils"; +import { Account, Chain, CosmosTokens, TokenBalance } from "@namada/types"; +import { shortenAddress } from "@namada/utils"; import { BridgeProps, Integration } from "./types/Integration"; const KEPLR_NOT_FOUND = "Keplr extension not found!"; diff --git a/packages/integrations/src/Metamask.ts b/packages/integrations/src/Metamask.ts index ef75ec36e..08a0e4c36 100644 --- a/packages/integrations/src/Metamask.ts +++ b/packages/integrations/src/Metamask.ts @@ -1,8 +1,8 @@ import { type MetaMaskInpageProvider } from "@metamask/providers"; import MetaMaskSDK from "@metamask/sdk"; -import { Account, Chain, TokenBalance } from "@anoma/types"; -import { shortenAddress } from "@anoma/utils"; +import { Account, Chain, TokenBalance } from "@namada/types"; +import { shortenAddress } from "@namada/utils"; import { BridgeProps, Integration } from "./types/Integration"; const MULTIPLE_WALLETS = "Multiple wallets installed!"; diff --git a/packages/integrations/src/Anoma.ts b/packages/integrations/src/Namada.ts similarity index 75% rename from packages/integrations/src/Anoma.ts rename to packages/integrations/src/Namada.ts index aff6e0bba..f68be24ce 100644 --- a/packages/integrations/src/Anoma.ts +++ b/packages/integrations/src/Namada.ts @@ -1,50 +1,50 @@ import { Account, - Anoma as IAnoma, + Namada as INamada, Chain, Signer, Tokens, TokenType, TokenBalance, - WindowWithAnoma, -} from "@anoma/types"; + WindowWithNamada, +} from "@namada/types"; import BigNumber from "bignumber.js"; import { BridgeProps, Integration } from "./types/Integration"; -export default class Anoma implements Integration { - private _anoma: WindowWithAnoma["anoma"] | undefined; +export default class Namada implements Integration { + private _namada: WindowWithNamada["namada"] | undefined; constructor(public readonly chain: Chain) {} - public get instance(): IAnoma | undefined { - return this._anoma; + public get instance(): INamada | undefined { + return this._namada; } private _init(): void { - if (!this._anoma) { - this._anoma = (window)?.anoma; + if (!this._namada) { + this._namada = (window)?.namada; } } public detect(): boolean { this._init(); - return !!this._anoma; + return !!this._namada; } public async connect(): Promise { this._init(); - await this._anoma?.connect(this.chain.chainId); + await this._namada?.connect(this.chain.chainId); } public async accounts(): Promise { await this.connect(); - const signer = this._anoma?.getSigner(this.chain.chainId); + const signer = this._namada?.getSigner(this.chain.chainId); return await signer?.accounts(); } public signer(): Signer | undefined { - return this._anoma?.getSigner(this.chain.chainId); + return this._namada?.getSigner(this.chain.chainId); } public async submitBridgeTransfer(props: BridgeProps): Promise { @@ -52,7 +52,7 @@ export default class Anoma implements Integration { const { source, receiver, channelId, portId, amount, token } = props.ibcProps; const tokenAddress = Tokens[token as TokenType]?.address; - const signer = this._anoma?.getSigner(this.chain.chainId); + const signer = this._namada?.getSigner(this.chain.chainId); return await signer?.submitIbcTransfer({ tx: { @@ -77,7 +77,7 @@ export default class Anoma implements Integration { } public async queryBalances(owner: string): Promise { - const balance = (await this._anoma?.balances(owner)) || []; + const balance = (await this._namada?.balances(owner)) || []; const tokenBalances = Object.keys(Tokens).map((tokenType: string) => { const { address: tokenAddress = "" } = Tokens[tokenType as TokenType]; const amount = diff --git a/packages/integrations/src/index.ts b/packages/integrations/src/index.ts index 695e8a5c6..95402873c 100644 --- a/packages/integrations/src/index.ts +++ b/packages/integrations/src/index.ts @@ -1,5 +1,5 @@ -import Anoma from "./Anoma"; +import Namada from "./Namada"; import Keplr from "./Keplr"; import Metamask from "./Metamask"; -export { Anoma, Keplr, Metamask }; +export { Namada, Keplr, Metamask }; diff --git a/packages/integrations/src/types/Integration.ts b/packages/integrations/src/types/Integration.ts index b156d1e64..74f77d4c5 100644 --- a/packages/integrations/src/types/Integration.ts +++ b/packages/integrations/src/types/Integration.ts @@ -2,7 +2,7 @@ import { BridgeTransferProps, IbcTransferProps, TokenBalance, -} from "@anoma/types"; +} from "@namada/types"; export type BridgeProps = { ibcProps?: IbcTransferProps; diff --git a/packages/shared/README.md b/packages/shared/README.md index 56bb45a9d..7353c5844 100644 --- a/packages/shared/README.md +++ b/packages/shared/README.md @@ -1,6 +1,6 @@ # shared -Anoma shared library functionality, providing wasm-compability for features in `namada/shared`. +Namada shared library functionality, providing wasm-compability for features in `namada/shared`. ## Usage diff --git a/packages/shared/lib/Cargo.toml b/packages/shared/lib/Cargo.toml index d470ea419..8c39026ce 100644 --- a/packages/shared/lib/Cargo.toml +++ b/packages/shared/lib/Cargo.toml @@ -4,7 +4,7 @@ authors = ["Heliax AG "] version = "0.1.0" edition = "2021" repository = "https://github.com/anoma/namada-interface/" -description = "Shared functionality from Anoma protocol" +description = "Shared functionality from Namada protocol" license = "MIT" [lib] diff --git a/packages/shared/lib/src/lib.rs b/packages/shared/lib/src/lib.rs index dfe376646..6054948cd 100644 --- a/packages/shared/lib/src/lib.rs +++ b/packages/shared/lib/src/lib.rs @@ -1,6 +1,6 @@ //! # shared //! -//! A library of functions to integrate shared functionality from the Anoma ecosystem +//! A library of functions to integrate shared functionality from the Namada ecosystem pub mod account; pub mod query; diff --git a/packages/shared/lib/src/sdk/mod.js b/packages/shared/lib/src/sdk/mod.js index 94f1fea18..3cbefade7 100644 --- a/packages/shared/lib/src/sdk/mod.js +++ b/packages/shared/lib/src/sdk/mod.js @@ -1,4 +1,4 @@ -export const PREFIX = "Anoma::SDK"; +export const PREFIX = "Namada::SDK"; export async function hasMaspParams() { return ( diff --git a/packages/shared/lib/src/types/masp.rs b/packages/shared/lib/src/types/masp.rs index 5f86a5f40..117358d33 100644 --- a/packages/shared/lib/src/types/masp.rs +++ b/packages/shared/lib/src/types/masp.rs @@ -1,5 +1,5 @@ //! PaymentAddress - Provide wasm_bindgen bindings for shielded addresses -//! See @anoma/crypto for zip32 HD wallet functionality. +//! See @namada/crypto for zip32 HD wallet functionality. use borsh::BorshDeserialize; use masp_primitives::{sapling, zip32}; use namada::types::masp; @@ -105,7 +105,7 @@ mod tests { #[test] fn can_deserialize_an_extended_spending_key() { - // BorshSerialize'd slice, generated from @anoma/crypto - zip32 + // BorshSerialize'd slice, generated from @namada/crypto - zip32 let encoded_xsk: &[u8] = &[ 1, 233, 222, 184, 155, 1, 0, 0, 0, 232, 94, 130, 41, 9, 58, 197, 35, 245, 249, 232, 225, 222, 38, 148, 105, 204, 14, 230, 30, 241, 22, 214, 38, 221, 49, 17, 147, 255, 136, @@ -135,7 +135,7 @@ mod tests { #[test] fn can_deserialize_an_extended_viewing_key() { - // BorshSerialize'd slice, generated from @anoma/crypto - zip32 + // BorshSerialize'd slice, generated from @namada/crypto - zip32 let encoded_xfvk: &[u8] = &[ 1, 233, 222, 184, 155, 1, 0, 0, 0, 232, 94, 130, 41, 9, 58, 197, 35, 245, 249, 232, 225, 222, 38, 148, 105, 204, 14, 230, 30, 241, 22, 214, 38, 221, 49, 17, 147, 255, 136, @@ -164,7 +164,7 @@ mod tests { #[test] fn can_deserialize_a_payment_address() { - // BorshSerialize'd slice, generated from @anoma/crypto - zip32 + // BorshSerialize'd slice, generated from @namada/crypto - zip32 let encoded_payment_address: &[u8] = &[ 100, 199, 34, 96, 93, 67, 18, 95, 86, 139, 123, 213, 141, 228, 147, 169, 218, 247, 75, 83, 195, 72, 73, 44, 65, 232, 243, 229, 209, 63, 183, 1, 87, 87, 203, 40, 180, 242, diff --git a/packages/shared/package.json b/packages/shared/package.json index 9b6330bf1..9a0dc9a05 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,7 +1,7 @@ { - "name": "@anoma/shared", + "name": "@namada/shared", "version": "0.1.0", - "description": "Anoma shared functionality", + "description": "Namada shared functionality", "main": "src/index.ts", "repository": "https://github.com/anoma/namada-interface/", "author": "Heliax Dev ", diff --git a/packages/storage/package.json b/packages/storage/package.json index 36729e507..47300417e 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -1,7 +1,7 @@ { - "name": "@anoma/storage", + "name": "@namada/storage", "version": "0.1.0", - "description": "Browser storage for Anoma apps", + "description": "Browser storage for Namada apps", "main": "src/index.ts", "repository": "https://github.com/anoma/namada-interface", "author": "Heliax Dev ", diff --git a/packages/storage/src/store/Store.ts b/packages/storage/src/store/Store.ts index 9115c6b5b..343d9f2de 100644 --- a/packages/storage/src/store/Store.ts +++ b/packages/storage/src/store/Store.ts @@ -1,4 +1,4 @@ -import { KVStore } from "@anoma/storage"; +import { KVStore } from "@namada/storage"; // StoredRecords in storage should have a unique identifier export type StoredRecord = { id: string }; diff --git a/packages/types/README.md b/packages/types/README.md index a11da0897..c060f506a 100644 --- a/packages/types/README.md +++ b/packages/types/README.md @@ -1,21 +1,21 @@ # types -This package is to provide types shared between applications in the Anoma ecosystem, primarily that of +This package is to provide types shared between applications in the Namada ecosystem, primarily that of the `namada-interface` and `extension` apps. Some types from `@keplr-wallet/types` have been aliased and re-exported, as we may want to support a more custom configuration for chain and currency configurations. These have been added to reduce the work necessary to refactor against a custom type definition. -The exported `Anoma` and `WindowWithAnoma` types serve as a public interface allowing other applications to +The exported `Namada` and `WindowWithNamada` types serve as a public interface allowing other applications to integrate with the APIs provided by the extension using TypeScript. ## Borsh schemas In `src/tx`, we have several schemas for handling Borsh serialization and deserialization when submitting transaction data. As transaction data from the user needs to move between an external application and the extension, this allow greater -privacy using with the `postMessage` API. These directly correllate to Rust `struct`s defined in the `@anoma/shared` package, -but exist here as to decouple them from the wasm dependency in the build pipeline. Including `@anoma/shared` would imply +privacy using with the `postMessage` API. These directly correllate to Rust `struct`s defined in the `@namada/shared` package, +but exist here as to decouple them from the wasm dependency in the build pipeline. Including `@namada/shared` would imply that you're willing to deliver compiled wasm in your final bundle, but that shouldn't be the case when you're merely interacting with the extension. @@ -27,7 +27,7 @@ from the user and passing into the extension where the associated private keys c An application can serialize transaction data using these schemas as follows: ```ts -import { Message, TransferMsgSchema, TransferMsgValue } from "@anoma/types"; +import { Message, TransferMsgSchema, TransferMsgValue } from "@namada/types"; // The user's data for transfer: const source = diff --git a/packages/types/package.json b/packages/types/package.json index 344369cc6..be30c64bb 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,7 +1,7 @@ { - "name": "@anoma/types", + "name": "@namada/types", "version": "0.1.0", - "description": "Types related to the Anoma Extension", + "description": "Types related to the Namada Extension", "main": "src/index.ts", "repository": "https://github.com/anoma/namada-interface/", "author": "Heliax AG ", diff --git a/packages/types/src/chain.ts b/packages/types/src/chain.ts index b0a1c62fd..3403fce3e 100644 --- a/packages/types/src/chain.ts +++ b/packages/types/src/chain.ts @@ -16,7 +16,7 @@ export enum BridgeType { } // Define keys for supported extensions -export type ExtensionKey = "anoma" | "keplr" | "metamask"; +export type ExtensionKey = "namada" | "keplr" | "metamask"; export type ExtensionInfo = { alias: string; @@ -26,9 +26,9 @@ export type ExtensionInfo = { // Define constant with extension properties export const Extensions: Record = { - anoma: { - alias: "Anoma", - id: "anoma", + namada: { + alias: "Namada", + id: "namada", url: "https://namada.me/", }, keplr: { diff --git a/packages/types/src/events.ts b/packages/types/src/events.ts index 5fecc6e84..482c6ff47 100644 --- a/packages/types/src/events.ts +++ b/packages/types/src/events.ts @@ -1,11 +1,11 @@ // Constants defining events which may be subscribed to -// Anoma extension events +// Namada extension events export enum Events { - AccountChanged = "anoma-account-changed", - TransferStarted = "anoma-transfer-started", - TransferCompleted = "anoma-transfer-completed", - UpdatedBalances = "anoma-updated-balances", + AccountChanged = "namada-account-changed", + TransferStarted = "namada-transfer-started", + TransferCompleted = "namada-transfer-completed", + UpdatedBalances = "namada-updated-balances", } // Keplr extension events diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index c052e0e04..f702338d0 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -1,5 +1,5 @@ export * from "./account"; -export * from "./anoma"; +export * from "./namada"; export * from "./chain"; export * from "./events"; export * from "./signer"; diff --git a/packages/types/src/anoma.ts b/packages/types/src/namada.ts similarity index 90% rename from packages/types/src/anoma.ts rename to packages/types/src/namada.ts index e0335a5fb..db47aaf32 100644 --- a/packages/types/src/anoma.ts +++ b/packages/types/src/namada.ts @@ -2,7 +2,7 @@ import { DerivedAccount } from "./account"; import { Chain } from "./chain"; import { Signer } from "./signer"; -export interface Anoma { +export interface Namada { connect(chainId: string): Promise; accounts(chainId: string): Promise; balances( @@ -22,9 +22,9 @@ export interface Anoma { version: () => string; } -export type WindowWithAnoma = Window & +export type WindowWithNamada = Window & typeof globalThis & { - anoma: Anoma & { + namada: Namada & { getSigner: (chainId: string) => Signer; }; }; diff --git a/packages/utils/README.md b/packages/utils/README.md index c87e0164b..a9946e25f 100644 --- a/packages/utils/README.md +++ b/packages/utils/README.md @@ -1,5 +1,5 @@ # util -Anoma Wallet utility library +Namada Wallet utility library _TBD_ diff --git a/packages/utils/package.json b/packages/utils/package.json index 83b9cebd1..d394222bb 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,7 +1,7 @@ { - "name": "@anoma/utils", + "name": "@namada/utils", "version": "0.1.0", - "description": "Anoma Wallet Utilities", + "description": "Namada Wallet Utilities", "main": "src/index.ts", "repository": "https://github.com/anoma/namada-interface/", "author": "Heliax Dev ", diff --git a/packages/utils/src/helpers/index.ts b/packages/utils/src/helpers/index.ts index e7d9a9fd2..e6ea41efa 100644 --- a/packages/utils/src/helpers/index.ts +++ b/packages/utils/src/helpers/index.ts @@ -1,6 +1,6 @@ import { JsonRpcRequest } from "@cosmjs/json-rpc"; import { DateTime } from "luxon"; -import { JsonCompatibleArray, JsonCompatibleDictionary } from "@anoma/types"; +import { JsonCompatibleArray, JsonCompatibleDictionary } from "@namada/types"; import BigNumber from "bignumber.js"; const MICRO_FACTOR = 1000000; // 1,000,000 diff --git a/packages/utils/src/theme/theme.ts b/packages/utils/src/theme/theme.ts index 5c8212b82..6420b7256 100644 --- a/packages/utils/src/theme/theme.ts +++ b/packages/utils/src/theme/theme.ts @@ -2,7 +2,7 @@ // our Figma, which is considered to be the source of truth. // https://www.figma.com/file/aiWZpaXjPLW6fDjE7dpFaU/Projects-2021?node-id=9102%3A8806 -const ColorModeStorageKey = "com.anoma.color-mode"; +const ColorModeStorageKey = "com.namada.color-mode"; type Colors = { primary: { diff --git a/specs/browser-extension/integration.md b/specs/browser-extension/integration.md index b8ad5d573..92750c529 100644 --- a/specs/browser-extension/integration.md +++ b/specs/browser-extension/integration.md @@ -9,7 +9,7 @@ The extension is able to be integrated with in a similar fasion to Keplr and Met If the extension is installed, and the domain is enabled (currently, all domains are enabled by the extension), detection can be achieved simply by doing the following: ```typescript= -const isExtensionInstalled = typeof window.anoma === 'object'; +const isExtensionInstalled = typeof window.namada === 'object'; ``` ## 2. Connecting to the extension @@ -18,7 +18,7 @@ To connect your application to the extension, you can invoke the following, prov ```typescript= const chainId = 'namada-test.XXXXXXXXXX'; -await anoma.connect(chainId); +await namada.connect(chainId); ``` Soon, this will prompt the user to either `Accept` or `Reject` a connection, but this isn't currently implemented. @@ -28,7 +28,7 @@ Soon, this will prompt the user to either `Accept` or `Reject` a connection, but To query available accounts in the extension, we first instantiate a signing client: ```typescript= -const client = await anoma.getSigner(chainId); +const client = await namada.getSigner(chainId); const accounts = await client.accounts(); @@ -49,7 +49,7 @@ const accounts = await client.accounts(); There are two types that can be imported from `namada-interface`: ```typescript= -import { TxProps, TransferProps } from "@anoma/types"; +import { TxProps, TransferProps } from "@namada/types"; ``` Where the following is defined (for reference - these are the properties we will need to provide to the signing client): @@ -76,7 +76,7 @@ export type TransferProps = { We will need to import a pre-built `tx-transfer` wasm file to provide to `TxProps`. There is a utility (see the following) that handles fetching these: ```typescript= -import { fetchWasmCode } from "@anoma/utils"; +import { fetchWasmCode } from "@namada/utils"; (async () { const txCode = await fetchWasmCode('./path/to/tx-transfer.wasm'); @@ -87,7 +87,7 @@ import { fetchWasmCode } from "@anoma/utils"; ### 4.2 Encoding a transfer tx ```typescript= -const client = anoma.getSigner("namada-test.XXXXXXXXXXX"); +const client = namada.getSigner("namada-test.XXXXXXXXXXX"); const address = "atest1v4ehgw368ycryv2z8qcnxv3cxgmrgvjpxs6yg333gym5vv2zxepnj334g4rryvj9xucrgve4x3xvr4"; // NOTE: Transfer amount is converted to micro-units diff --git a/specs/browser-extension/security.md b/specs/browser-extension/security.md index db3460600..50fcf4bf3 100644 --- a/specs/browser-extension/security.md +++ b/specs/browser-extension/security.md @@ -19,7 +19,7 @@ when communicating between the web client and the content scripts. This requires ## Routing -When the extension is installed, the content and background scripts establish a shared state variable, `anomaExtensionRouterId`, stored in the extension's `localStorage`, which allows +When the extension is installed, the content and background scripts establish a shared state variable, `namadaExtensionRouterId`, stored in the extension's `localStorage`, which allows us to validate messages between the two before performing any actions in the background scripts. ## Handling sensitive data in WASM memory diff --git a/specs/interface/shielded-transfers.md b/specs/interface/shielded-transfers.md index f3d03a073..95c80e93d 100644 --- a/specs/interface/shielded-transfers.md +++ b/specs/interface/shielded-transfers.md @@ -2,12 +2,12 @@ **NOTE**: The following documentation is outdated, but included below while updated functionality which incorporates the Namada SDK is being integrated: -Shielded transfers are based on [MASP](https://github.com/anoma/masp) and allows users of Anoma to performs transactions where only the recipient, sender and a holder of a viewing key can see the transactions details. It is based on the specifications defined at [Shielded execution](../../ledger/shielded-execution/masp.md). +Shielded transfers are based on [MASP](https://github.com/anoma/masp) and allows users of Namada to performs transactions where only the recipient, sender and a holder of a viewing key can see the transactions details. It is based on the specifications defined at [Shielded execution](../../ledger/shielded-execution/masp.md). - [Shielded Transfers In Web Client](#shielded-transfers-in-web-client) - [Codebase](#codebase) - [High level data flow in the client](#high-level-data-flow-in-the-client) - - [Relation to MASP/Anoma CLI](#relation-to-maspanoma-cli) + - [Relation to MASP/Namada CLI](#relation-to-maspnamada-cli) - [The API](#the-api) - [`getMaspWeb`](#getmaspweb) - [`MaspWeb`](#maspweb) @@ -26,7 +26,7 @@ Shielded transfers are based on [MASP](https://github.com/anoma/masp) and allows The code for interacting with the shielded transfers is split in 2 places: -- `anoma-wallet` (TypeScript) +- `namada-wallet` (TypeScript) - capturing the user interactions - providing user feedback - fetching the existing MASP transactions from the ledger @@ -38,7 +38,7 @@ The code for interacting with the shielded transfers is split in 2 places: ``` packages │ ├── masp-web # MASP specific Rust code -│ ├── anoma-wallet # anoma web wallet +│ ├── namada-wallet # namada web wallet ``` ## High level data flow in the client @@ -47,10 +47,10 @@ In the current implementation whenever a user start to perform a new action rela This process can be further optimized: -- Anoma CLI already does caching of fetched transfers, so that logic can be ru-used by providing virtual filesystem (for example [memfs](https://github.com/streamich/memfs#readme)) implementation to Rust: +- Namada CLI already does caching of fetched transfers, so that logic can be ru-used by providing virtual filesystem (for example [memfs](https://github.com/streamich/memfs#readme)) implementation to Rust: - Likely the scanning can already start parallel while the fetching is running and if a sufficient amount of notes are found in scanning the fetching could be terminated. -## Relation to MASP/Anoma CLI +## Relation to MASP/Namada CLI The feature set and logic between the CLI and the web client should be the same. There are however a few differences in how they work, they are listed here: diff --git a/specs/interface/transparent-transactions.md b/specs/interface/transparent-transactions.md index 5f6ea82a7..fb81aeae5 100644 --- a/specs/interface/transparent-transactions.md +++ b/specs/interface/transparent-transactions.md @@ -77,7 +77,7 @@ let data = transfer ``` _In namada CLI:_ -https://github.com/namada/namada/blob/f6e78278608aaef253617885bb7ef95a50057268/apps/src/lib/client/tx.rs#L406-L411 +https://github.com/anoma/namada/blob/f6e78278608aaef253617885bb7ef95a50057268/apps/src/lib/client/tx.rs#L406-L411 #### Creating and signing the `proto::Tx` struct @@ -100,7 +100,7 @@ impl Tx { **NOTE** Here we provide a work around to an issue with `proto::Tx::new()` in wasm - instead of calling the method directly on `Tx`, we create a new implementation that returns a `proto::Tx`, with the timestamp being set using `js_sys` in order to make this wasm-compatible. _In namada CLI:_ -https://github.com/namada/namada/blob/f6e78278608aaef253617885bb7ef95a50057268/apps/src/lib/client/tx.rs#L417-L419 +https://github.com/anoma/namada/blob/f6e78278608aaef253617885bb7ef95a50057268/apps/src/lib/client/tx.rs#L417-L419 ### 1.2 - Creating the `namada::types::transaction::WrapperTx` struct @@ -133,7 +133,7 @@ transaction::WrapperTx::new( **NOTE** Here we can directly invoke `WrapperTx::new`, so we only need to concern ourselves with convering the JavaScript-provided values into the appropriate types. _In namada CLI:_ -https://github.com/namada/namada/blob/f6e78278608aaef253617885bb7ef95a50057268/apps/src/lib/client/tx.rs#L687-L696 +https://github.com/anoma/namada/blob/f6e78278608aaef253617885bb7ef95a50057268/apps/src/lib/client/tx.rs#L687-L696 #### 1.3 - Create a new `Tx` with `WrapperTx` and sign it @@ -186,7 +186,7 @@ Ok(Transaction { ``` _In namada CLI:_ -https://github.com/namada/namada/blob/f6e78278608aaef253617885bb7ef95a50057268/apps/src/lib/client/tx.rs#L810-L814 +https://github.com/anoma/namada/blob/f6e78278608aaef253617885bb7ef95a50057268/apps/src/lib/client/tx.rs#L810-L814 ## Part 2 - Initialize Account Transaction diff --git a/specs/packages/overview.md b/specs/packages/overview.md index 6cd79550e..3d5bca6f5 100644 --- a/specs/packages/overview.md +++ b/specs/packages/overview.md @@ -39,7 +39,7 @@ Aside from `wasm-bindgen` bindings for Rust crypography libraries, this package ## integrations This package introduces an `Intergration` interface, which wraps the APIs of various extensions to expose a -single API to the interface. Currently, this supports integrations with Keplr, Metamask, and the Anoma browser extension. +single API to the interface. Currently, this supports integrations with Keplr, Metamask, and the Namada browser extension. ## rpc diff --git a/specs/packages/sdk.md b/specs/packages/sdk.md index 826cfa07e..62661e3f9 100644 --- a/specs/packages/sdk.md +++ b/specs/packages/sdk.md @@ -34,7 +34,7 @@ Contains the logic for: ### Why we are not using key generation functions from the Namada Shared? -Currently, the Anoma extension derives keys based on a mnemonic, while Namada derives keys based on a source of randomness (`OsRng`). As such, we have introduced functions that allow us to add keys derived within the extension into Sdk's wallet storage. This will most likely change in future after Namada introduces support for mnemonics into the Sdk. +Currently, the Namada extension derives keys based on a mnemonic, while Namada derives keys based on a source of randomness (`OsRng`). As such, we have introduced functions that allow us to add keys derived within the extension into Sdk's wallet storage. This will most likely change in future after Namada introduces support for mnemonics into the Sdk. ## sdk @@ -42,5 +42,5 @@ Sdk struct wraps logic from the other modules, creating public API using `wasm_b ## About wallet storage -At the moment, the client of the Sdk is responsible for keeping storage in sync with the Sdk's wallet instance. What does that mean? The Anoma extension has its own key storage, which is modified by user actions. Every time the extension storage changes (for example, when a new address is derived), we must manually sync the extension and Sdk wallet storage +At the moment, the client of the Sdk is responsible for keeping storage in sync with the Sdk's wallet instance. What does that mean? The Namada extension has its own key storage, which is modified by user actions. Every time the extension storage changes (for example, when a new address is derived), we must manually sync the extension and Sdk wallet storage using functions provided by `wallet` module. This is something that will most likely change in the future.