feat/608 - Support memo, use native token (#611)

* fix: balances should support native token properly

* feat: adding memo field

* fix: adding memo to Tx

* fix: make bond form legible

* fix: version bump for next release

apps/extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@namada/extension",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Namada Browser Extension",
   "repository": "https://github.com/anoma/namada-interface/",
   "author": "Heliax Dev <[email protected]>",

apps/extension/src/background/chains/service.ts

@@ -1,8 +1,14 @@
 import { chains } from "@namada/chains";
+import { Query } from "@namada/shared";
 import { KVStore } from "@namada/storage";
 import { Chain } from "@namada/types";
 import { ExtensionBroadcaster } from "extension";
 
+const {
+  NAMADA_INTERFACE_NAMADA_TOKEN:
+  tokenAddress = "tnam1qxgfw7myv4dh0qna4hq0xdg6lx77fzl7dcem8h7e",
+} = process.env;
+
 export const CHAINS_KEY = "chains";
 
 export class ChainsService {
@@ -16,6 +22,15 @@ export class ChainsService {
     if (!chain) {
       // Initialize default chain in storage
       const defaultChain = chains.namada;
+      const {
+        currency: { address },
+      } = defaultChain;
+      if (!address) {
+        const query = new Query(defaultChain.rpc);
+        const nativeToken = await query.query_native_token();
+        defaultChain.currency.address = nativeToken || tokenAddress;
+      }
+
       await this.chainsStore.set(CHAINS_KEY, defaultChain);
       return defaultChain;
     }
@@ -27,10 +42,25 @@ export class ChainsService {
     if (!chain) {
       throw new Error("No chain found!");
     }
+    let {
+      currency: { address },
+    } = chain;
+
+    // Attempt to fetch native token, fallback to env
+    if (!address) {
+      const query = new Query(chain.rpc);
+      const nativeToken = await query.query_native_token();
+      address = nativeToken || tokenAddress;
+    }
+
     await this.chainsStore.set(CHAINS_KEY, {
       ...chain,
       chainId,
       rpc: url,
+      currency: {
+        ...chain.currency,
+        address,
+      },
     });
     this.broadcaster.updateNetwork();
   }

apps/extension/src/background/index.ts

@@ -88,6 +88,7 @@ const init = new Promise<void>(async (resolve) => {
   const keyRingService = new KeyRingService(
     vaultService,
     sdkService,
+    chainsService,
     utilityStore,
     connectedTabsStore,
     extensionStore,

apps/extension/src/background/keyring/handler.ts

@@ -225,8 +225,8 @@ const handleQueryDefaultAccountMsg: (
 const handleQueryBalancesMsg: (
   service: KeyRingService
 ) => InternalHandler<QueryBalancesMsg> = (service) => {
-  return async (_, msg) => {
-    return await service.queryBalances(msg.owner);
+  return async (_, { owner, tokens }) => {
+    return await service.queryBalances(owner, tokens);
   };
 };
 

apps/extension/src/background/keyring/keyring.ts

@@ -30,7 +30,6 @@ import {
   SubmitUnbondMsgValue,
   SubmitVoteProposalMsgValue,
   SubmitWithdrawMsgValue,
-  Tokens,
   TransferMsgValue,
 } from "@namada/types";
 import {
@@ -879,15 +878,13 @@ export class KeyRing {
   }
 
   async queryBalances(
-    owner: string
+    owner: string,
+    tokens: string[]
   ): Promise<{ token: string; amount: string }[]> {
     const query = await this.sdkService.getQuery();
-    const tokenAddresses: string[] = Object.values(Tokens)
-      .filter((token) => token.address)
-      .map(({ address }) => address);
 
     try {
-      return (await query.query_balance(owner, tokenAddresses)).map(
+      return (await query.query_balance(owner, tokens)).map(
         ([token, amount]: [string, string]) => {
           return {
             token,

apps/extension/src/background/keyring/service.ts

@@ -11,6 +11,7 @@ import {
 } from "@namada/types";
 import { Result, truncateInMiddle } from "@namada/utils";
 
+import { ChainsService } from "background/chains";
 import {
   createOffscreenWithTxWorker,
   hasOffscreenDocument,
@@ -39,12 +40,18 @@ import {
 } from "./types";
 import { syncTabs, updateTabStorage } from "./utils";
 
+const {
+  NAMADA_INTERFACE_NAMADA_TOKEN:
+  tokenAddress = "tnam1qxgfw7myv4dh0qna4hq0xdg6lx77fzl7dcem8h7e",
+} = process.env;
+
 export class KeyRingService {
   private _keyRing: KeyRing;
 
   constructor(
     protected readonly vaultService: VaultService,
     protected readonly sdkService: SdkService,
+    protected readonly chainsService: ChainsService,
     protected readonly utilityStore: KVStore<UtilityStore>,
     protected readonly connectedTabsStore: KVStore<TabStore[]>,
     protected readonly extensionStore: KVStore<number>,
@@ -260,6 +267,9 @@ export class KeyRingService {
     const offscreenDocumentPath = "offscreen.html";
     const routerId = await getNamadaRouterId(this.extensionStore);
     const rpc = await this.sdkService.getRpc();
+    const {
+      currency: { address: nativeToken = tokenAddress },
+    } = await this.chainsService.getChain();
 
     if (!(await hasOffscreenDocument(offscreenDocumentPath))) {
       await createOffscreenWithTxWorker(offscreenDocumentPath);
@@ -269,7 +279,7 @@ export class KeyRingService {
       type: SUBMIT_TRANSFER_MSG_TYPE,
       target: OFFSCREEN_TARGET,
       routerId,
-      data: { transferMsg, txMsg, msgId, signingKey, rpc },
+      data: { transferMsg, txMsg, msgId, signingKey, rpc, nativeToken },
     });
 
     if (result?.error) {
@@ -286,13 +296,18 @@ export class KeyRingService {
     signingKey: SigningKey
   ): Promise<void> {
     const rpc = await this.sdkService.getRpc();
+    const {
+      currency: { address: nativeToken = tokenAddress },
+    } = await this.chainsService.getChain();
+
     initSubmitTransferWebWorker(
       {
         transferMsg,
         txMsg,
         msgId,
         signingKey,
         rpc,
+        nativeToken,
       },
       this.handleTransferCompleted.bind(this)
     );
@@ -438,14 +453,15 @@ export class KeyRingService {
   }
 
   async queryBalances(
-    address: string
+    owner: string,
+    tokens: string[]
   ): Promise<{ token: string; amount: string }[]> {
     const account = await this.vaultService.findOneOrFail<AccountStore>(
       KEYSTORE_KEY,
       "address",
-      address
+      owner
     );
-    return this._keyRing.queryBalances(account.public.owner);
+    return this._keyRing.queryBalances(account.public.owner, tokens);
   }
 
   async queryPublicKey(address: string): Promise<string | undefined> {

apps/extension/src/background/sdk/service.ts

@@ -1,8 +1,13 @@
 import { Query, Sdk } from "@namada/shared";
 import { ChainsService } from "background/chains";
 
+const {
+  NAMADA_INTERFACE_NAMADA_TOKEN:
+  tokenAddress = "tnam1qxgfw7myv4dh0qna4hq0xdg6lx77fzl7dcem8h7e",
+} = process.env;
+
 export class SdkService {
-  constructor(protected readonly chainsService: ChainsService) {}
+  constructor(protected readonly chainsService: ChainsService) { }
 
   public async getRpc(): Promise<string> {
     // Pull chain config from store, as the RPC value may have changed:
@@ -17,7 +22,9 @@ export class SdkService {
 
   async getSdk(): Promise<Sdk> {
     const rpc = await this.getRpc();
-    return new Sdk(rpc);
+    const chain = await this.chainsService.getChain();
+
+    return new Sdk(rpc, chain.currency.address || tokenAddress);
   }
 
   async getQuery(): Promise<Query> {

apps/extension/src/background/web-workers/submit-transfer-web-worker.ts

@@ -24,10 +24,11 @@ import {
         const {
           signingKey: { privateKey, xsk },
           rpc,
+          nativeToken,
         } = data;
         let txMsg = fromBase64(data.txMsg);
 
-        const sdk = new Sdk(rpc);
+        const sdk = new Sdk(rpc, nativeToken);
         await sdk.load_masp_params();
         // For transparent transactions we have to reveal the public key.
         if (privateKey) {

apps/extension/src/background/web-workers/types.ts

@@ -13,6 +13,7 @@ export type SubmitTransferMessageData = {
   msgId: string;
   signingKey: SigningKey;
   rpc: string;
+  nativeToken: string;
 };
 
 export const INIT_MSG = "init";

apps/extension/src/provider/InjectedNamada.ts

@@ -1,4 +1,5 @@
 import {
+  BalancesProps,
   Chain,
   DerivedAccount,
   Namada as INamada,
@@ -12,7 +13,7 @@ import { InjectedProxy } from "./InjectedProxy";
 import { Signer } from "./Signer";
 
 export class InjectedNamada implements INamada {
-  constructor(private readonly _version: string) {}
+  constructor(private readonly _version: string) { }
 
   public async connect(): Promise<void> {
     return await InjectedProxy.requestMethod<string, void>("connect");
@@ -47,12 +48,12 @@ export class InjectedNamada implements INamada {
   }
 
   public async balances(
-    owner: string
+    props: BalancesProps
   ): Promise<{ token: string; amount: string }[]> {
     return await InjectedProxy.requestMethod<
-      string,
+      BalancesProps,
       { token: string; amount: string }[]
-    >("balances", owner);
+    >("balances", props);
   }
 
   public async getChain(): Promise<Chain | undefined> {

apps/extension/src/provider/Namada.ts

@@ -1,4 +1,5 @@
 import {
+  BalancesProps,
   Chain,
   DerivedAccount,
   Namada as INamada,
@@ -103,11 +104,12 @@ export class Namada implements INamada {
   }
 
   public async balances(
-    owner: string
+    props: BalancesProps
   ): Promise<{ token: string; amount: string }[] | undefined> {
+    const { owner, tokens } = props;
     return await this.requester?.sendMessage(
       Ports.Background,
-      new QueryBalancesMsg(owner)
+      new QueryBalancesMsg(owner, tokens)
     );
   }
 

apps/extension/src/provider/messages.ts

@@ -74,7 +74,7 @@ export class GetChainMsg extends Message<Chain> {
     super();
   }
 
-  validate(): void {}
+  validate(): void { }
 
   route(): string {
     return Route.Chains;
@@ -125,12 +125,15 @@ export class QueryBalancesMsg extends Message<
     return MessageType.QueryBalances;
   }
 
-  constructor(public readonly owner: string) {
+  constructor(
+    public readonly owner: string,
+    public readonly tokens: string[]
+  ) {
     super();
   }
 
   validate(): void {
-    return;
+    validateProps(this, ["owner", "tokens"]);
   }
 
   route(): string {

apps/extension/src/test/init.ts

@@ -43,7 +43,7 @@ const cryptoMemory = require("@namada/crypto").__wasm.memory;
 export class KVStoreMock<T> implements KVStore<T> {
   private storage: { [key: string]: T | null } = {};
 
-  constructor(readonly _prefix: string) {}
+  constructor(readonly _prefix: string) { }
 
   get<U extends T>(key: string): Promise<U | undefined> {
     return new Promise((resolve) => {
@@ -114,6 +114,7 @@ export const init = async (): Promise<{
   const keyRingService = new KeyRingService(
     vaultService,
     sdkService,
+    chainsService,
     utilityStore,
     connectedTabsStore,
     extStore,

apps/namada-interface/.env.sample

@@ -2,6 +2,7 @@
 
 # NAMADA
 NAMADA_INTERFACE_NAMADA_ALIAS=Namada Testnet
+NAMADA_INTERFACE_NAMADA_TOKEN=tnam1qxvg64psvhwumv3mwrrjfcz0h3t3274hwggyzcee
 NAMADA_INTERFACE_NAMADA_CHAIN_ID=namada-1.5.32ccad5356012a7
 NAMADA_INTERFACE_NAMADA_URL=http://127.0.0.1:26657
 NAMADA_INTERFACE_NAMADA_BECH32_PREFIX=atest