fix: remove unneeded vars, move .env to extension app

jurevans · jurevans · commit 444df9987398 · 2024-08-20T10:59:43.000-04:00
diff --git a/.github/workflows/release-wallet.yml b/.github/workflows/release-wallet.yml
@@ -1,41 +1,14 @@
-name: Deploy interface and release extension
+name: Release extension
 on:
   workflow_dispatch:
     inputs:
       REF:
         required: true
         type: string
         default: "main"
-      NAMADA_INTERFACE_NAMADA_ALIAS:
-        required: true
-        type: string
-        default: "Namada Testnet"
       NAMADA_INTERFACE_NAMADA_CHAIN_ID:
         required: true
         type: string
-      NAMADA_INTERFACE_NAMADA_URL:
-        required: true
-        type: string
-      NAMADA_INTERFACE_COSMOS_ALIAS:
-        required: false
-        type: string
-        default: "Cosmos Testnet"
-      NAMADA_INTERFACE_COSMOS_CHAIN_ID:
-        required: false
-        type: string
-      NAMADA_INTERFACE_COSMOS_URL:
-        required: false
-        type: string
-      NAMADA_INTERFACE_ETH_ALIAS:
-        required: false
-        type: string
-        default: "Goerli Testnet"
-      NAMADA_INTERFACE_ETH_CHAIN_ID:
-        required: false
-        type: string
-      NAMADA_INTERFACE_ETH_URL:
-        required: false
-        type: string
 
 env:
   CI: false
@@ -62,46 +35,6 @@ jobs:
       - name: Print workflow inputs
         uses: ./.github/actions/print-workflow-inputs
 
-  build-interface:
-    needs: setup
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ inputs.REF }}
-
-      - name: Install yarn dependencies
-        uses: ./.github/actions/yarn-cache
-
-      - name: Restore Rust cache
-        uses: ./.github/actions/rust-cache
-        with:
-          cache-name: build
-
-      - name: Install protoc
-        run: sudo apt-get install -y protobuf-compiler
-
-      - name: Build the interface
-        working-directory: ./apps/namadillo
-        run: yarn build
-        env:
-          NAMADA_INTERFACE_NAMADA_ALIAS: ${{ inputs.NAMADA_INTERFACE_NAMADA_ALIAS }}
-          NAMADA_INTERFACE_NAMADA_CHAIN_ID: ${{ inputs.NAMADA_INTERFACE_NAMADA_CHAIN_ID }}
-          NAMADA_INTERFACE_NAMADA_URL: ${{ inputs.NAMADA_INTERFACE_NAMADA_URL }}
-          NAMADA_INTERFACE_COSMOS_ALIAS: ${{ inputs.NAMADA_INTERFACE_COSMOS_ALIAS }}
-          NAMADA_INTERFACE_COSMOS_CHAIN_ID: ${{ inputs.NAMADA_INTERFACE_COSMOS_CHAIN_ID }}
-          NAMADA_INTERFACE_COSMOS_URL: ${{ inputs.NAMADA_INTERFACE_COSMOS_URL }}
-          NAMADA_INTERFACE_ETH_ALIAS: ${{ inputs.NAMADA_INTERFACE_ETH_ALIAS }}
-          NAMADA_INTERFACE_ETH_CHAIN_ID: ${{ inputs.NAMADA_INTERFACE_ETH_CHAIN_ID }}
-          NAMADA_INTERFACE_ETH_URL: ${{ inputs.NAMADA_INTERFACE_ETH_URL }}
-          NAMADA_INTERFACE_EXTENSION_URL: https://github.com/anoma/namada-interface/releases/tag/${{ needs.setup.outputs.VERSION }}/
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: namadillo
-          path: ./apps/namadillo/dist
-
   build-extension-chrome:
     needs: setup
     runs-on: ubuntu-latest
@@ -130,15 +63,7 @@ jobs:
         working-directory: ./apps/extension
         run: yarn build:chrome
         env:
-          NAMADA_INTERFACE_NAMADA_ALIAS: ${{ inputs.NAMADA_INTERFACE_NAMADA_ALIAS }}
           NAMADA_INTERFACE_NAMADA_CHAIN_ID: ${{ inputs.NAMADA_INTERFACE_NAMADA_CHAIN_ID }}
-          NAMADA_INTERFACE_NAMADA_URL: ${{ inputs.NAMADA_INTERFACE_NAMADA_URL }}
-          NAMADA_INTERFACE_COSMOS_ALIAS: ${{ inputs.NAMADA_INTERFACE_COSMOS_ALIAS }}
-          NAMADA_INTERFACE_COSMOS_CHAIN_ID: ${{ inputs.NAMADA_INTERFACE_COSMOS_CHAIN_ID }}
-          NAMADA_INTERFACE_COSMOS_URL: ${{ inputs.NAMADA_INTERFACE_COSMOS_URL }}
-          NAMADA_INTERFACE_ETH_ALIAS: ${{ inputs.NAMADA_INTERFACE_ETH_ALIAS }}
-          NAMADA_INTERFACE_ETH_CHAIN_ID: ${{ inputs.NAMADA_INTERFACE_ETH_CHAIN_ID }}
-          NAMADA_INTERFACE_ETH_URL: ${{ inputs.NAMADA_INTERFACE_ETH_URL }}
 
       - uses: actions/upload-artifact@v3
         with:
@@ -173,32 +98,17 @@ jobs:
         working-directory: ./apps/extension
         run: yarn build:firefox
         env:
-          NAMADA_INTERFACE_NAMADA_ALIAS: ${{ inputs.NAMADA_INTERFACE_NAMADA_ALIAS }}
           NAMADA_INTERFACE_NAMADA_CHAIN_ID: ${{ inputs.NAMADA_INTERFACE_NAMADA_CHAIN_ID }}
-          NAMADA_INTERFACE_NAMADA_URL: ${{ inputs.NAMADA_INTERFACE_NAMADA_URL }}
-          NAMADA_INTERFACE_COSMOS_ALIAS: ${{ inputs.NAMADA_INTERFACE_COSMOS_ALIAS }}
-          NAMADA_INTERFACE_COSMOS_CHAIN_ID: ${{ inputs.NAMADA_INTERFACE_COSMOS_CHAIN_ID }}
-          NAMADA_INTERFACE_COSMOS_URL: ${{ inputs.NAMADA_INTERFACE_COSMOS_URL }}
-          NAMADA_INTERFACE_ETH_ALIAS: ${{ inputs.NAMADA_INTERFACE_ETH_ALIAS }}
-          NAMADA_INTERFACE_ETH_CHAIN_ID: ${{ inputs.NAMADA_INTERFACE_ETH_CHAIN_ID }}
-          NAMADA_INTERFACE_ETH_URL: ${{ inputs.NAMADA_INTERFACE_ETH_URL }}
 
       - uses: actions/upload-artifact@v3
         with:
           name: namada-extension-firefox
           path: ./apps/extension/build/firefox/namada_extension-*.zip
 
   release:
-    needs:
-      [setup, build-interface, build-extension-chrome, build-extension-firefox]
+    needs: [setup, build-extension-chrome, build-extension-firefox]
     runs-on: ubuntu-latest
     steps:
-      - name: Download interface build
-        uses: actions/download-artifact@v3
-        with:
-          name: namadillo
-          path: ./namadillo
-
       - name: Download Chrome extension build
         uses: actions/download-artifact@v3
         with:
@@ -217,38 +127,11 @@ jobs:
           echo "CHROME_FILENAME=$(ls -1 ./namada-extension-chrome)" >> "$GITHUB_OUTPUT"
           echo "FIREFOX_FILENAME=$(ls -1 ./namada-extension-firefox)" >> "$GITHUB_OUTPUT"
 
-      - name: Deploy interface to Netlify
-        uses: nwtgck/actions-netlify@v1.2.3
-        with:
-          publish-dir: ./namadillo
-          production-branch: main
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          deploy-message: "Deployed release ${{ needs.setup.outputs.VERSION }}"
-        env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_ACCESS_TOKEN_WALLET_PREVIEW }}
-          NETLIFY_SITE_ID: 2380782e-9b20-477a-bc27-b4e9d05e16f3
-
       - name: Make release body text
         run: |
-          echo "NAMADA_INTERFACE_NAMADA_ALIAS: $NAMADA_INTERFACE_NAMADA_ALIAS" >> RELEASE
           echo "NAMADA_INTERFACE_NAMADA_CHAIN_ID: $NAMADA_INTERFACE_NAMADA_CHAIN_ID" >> RELEASE
-          echo "NAMADA_INTERFACE_NAMADA_URL: $NAMADA_INTERFACE_NAMADA_URL" >> RELEASE
-          echo "NAMADA_INTERFACE_COSMOS_ALIAS: $NAMADA_INTERFACE_COSMOS_ALIAS" >> RELEASE
-          echo "NAMADA_INTERFACE_COSMOS_CHAIN_ID: $NAMADA_INTERFACE_COSMOS_CHAIN_ID" >> RELEASE
-          echo "NAMADA_INTERFACE_COSMOS_URL: $NAMADA_INTERFACE_COSMOS_URL" >> RELEASE
-          echo "NAMADA_INTERFACE_ETH_ALIAS: $NAMADA_INTERFACE_ETH_ALIAS" >> RELEASE
-          echo "NAMADA_INTERFACE_ETH_CHAIN_ID: $NAMADA_INTERFACE_ETH_CHAIN_ID" >> RELEASE
-          echo "NAMADA_INTERFACE_ETH_URL: $NAMADA_INTERFACE_ETH_URL" >> RELEASE
         env:
-          NAMADA_INTERFACE_NAMADA_ALIAS: ${{ inputs.NAMADA_INTERFACE_NAMADA_ALIAS }}
           NAMADA_INTERFACE_NAMADA_CHAIN_ID: ${{ inputs.NAMADA_INTERFACE_NAMADA_CHAIN_ID }}
-          NAMADA_INTERFACE_NAMADA_URL: ${{ inputs.NAMADA_INTERFACE_NAMADA_URL }}
-          NAMADA_INTERFACE_COSMOS_ALIAS: ${{ inputs.NAMADA_INTERFACE_COSMOS_ALIAS }}
-          NAMADA_INTERFACE_COSMOS_CHAIN_ID: ${{ inputs.NAMADA_INTERFACE_COSMOS_CHAIN_ID }}
-          NAMADA_INTERFACE_COSMOS_URL: ${{ inputs.NAMADA_INTERFACE_COSMOS_URL }}
-          NAMADA_INTERFACE_ETH_ALIAS: ${{ inputs.NAMADA_INTERFACE_ETH_ALIAS }}
-          NAMADA_INTERFACE_ETH_CHAIN_ID: ${{ inputs.NAMADA_INTERFACE_ETH_CHAIN_ID }}
-          NAMADA_INTERFACE_ETH_URL: ${{ inputs.NAMADA_INTERFACE_ETH_URL }}
 
       - name: Create release
         id: create-release
diff --git a/apps/extension/.env.sample b/apps/extension/.env.sample
@@ -0,0 +1,5 @@
+# Specify the following if you wish to override the defaults defined in @anoma/chains:
+
+# NAMADA
+NAMADA_INTERFACE_NAMADA_CHAIN_ID=namada-testnet.ddf12d74622ca25f3ad6fe14
+
diff --git a/apps/extension/.gitignore b/apps/extension/.gitignore
@@ -0,0 +1,4 @@
+# dependencies
+.env
+/node_modules
+/build
diff --git a/apps/extension/README.md b/apps/extension/README.md
@@ -4,6 +4,8 @@ This is the Namada Browser Extension project.
 
 ## Usage
 
+Note: if you wish to set a default chain ID in the extension, set this value in `.env`. See [env.sample](./.env.sample).
+
 ```bash
 # Build wasm dependencies
 yarn wasm:build # This needs to be run initially to ensure wasm dependencies are available
diff --git a/apps/extension/webpack.config.js b/apps/extension/webpack.config.js
@@ -11,7 +11,7 @@ const packageJson = require("./package.json");
 const { getProcessEnv } = require("@namada/config/webpack.js");
 
 // Load .env from namadillo:
-require("dotenv").config({ path: "../namadillo/.env" });
+require("dotenv").config({ path: "./.env" });
 
 const { NODE_ENV, TARGET, BUNDLE_ANALYZE } = process.env;
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +# dependencies
 +.env
 +/node_modules
 +/build