Merge branch 'canary' into fix/custom-mana-allotment-should-send-itself

iotaledger · May 16, 2024 · 4ad5a05 · 4ad5a05
2 parents fa3d9ed + 6b021cf
commit 4ad5a05
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 25 deletions.
diff --git a/.github/workflows/build-and-release-desktop.yml b/.github/workflows/build-and-release-desktop.yml
@@ -1,13 +1,13 @@
 name: Build and Release Desktop
 
 env:
-    NETWORK: Shimmer
-    NETWORK_CODE: shimmer
+    NETWORK: Canary
+    NETWORK_CODE: canary
 
 on:
     push:
         tags:
-            - desktop-shimmer-*
+            - desktop-canary-*
     workflow_dispatch:
         inputs:
             debugElectronBuilder:
@@ -39,7 +39,7 @@ jobs:
             - id: set_outputs
               name: Set outputs for version, release name, and stage
               run: |
-                  VERSION=${GITHUB_REF#refs/*/desktop-shimmer-}
+                  VERSION=${GITHUB_REF#refs/*/desktop-canary-}
                   RELEASE_NAME=$(echo $VERSION | perl -0777 -pe 's/^([0-9]\d*\.[0-9]\d*\.[0-9]\d*)(?:-([a-z]*)-(\d*))?$/$1 \u$2 $3/')
                   STAGE=$(echo $VERSION | perl -0777 -pe 's/^([0-9]\d*\.[0-9]\d*\.[0-9]\d*)(?:-([a-z]*)-([0-9]\d*(\.[0-9]\d*)*))?$/$2/')
 
@@ -198,7 +198,7 @@ jobs:
                   name: firefly-desktop-${{ matrix.os }}
                   path: |
                       packages/desktop/out/firefly-*
-                      packages/desktop/out/shimmer*
+                      packages/desktop/out/canary*
 
     release:
         runs-on: ubuntu-latest
@@ -315,7 +315,7 @@ jobs:
                   AWS_DEFAULT_REGION: eu-central-1
 
             - name: Invalidate CloudFront cache for auto-update files
-              run: aws cloudfront create-invalidation --distribution-id E32G4HRED4PO65 --paths "/shimmer*"
+              run: aws cloudfront create-invalidation --distribution-id E32G4HRED4PO65 --paths "/canary*"
               env:
                   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
                   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
@@ -1,7 +1,7 @@
 name: Build Desktop (v2)
 
 env:
-    NETWORK_CODE: shimmer
+    NETWORK_CODE: canary
 
 on:
     workflow_dispatch:

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
   <a href=""><img src="header.png"></a>
 </h1>
 
-<h2 align="center">Firefly Shimmer</h2>
+<h2 align="center">Firefly Canary</h2>
 
 <p align="center">
   <a href="https://discord.iota.org/" style="text-decoration:none;"><img src="https://img.shields.io/badge/Discord-9cf.svg?logo=discord" alt="Discord"></a>

diff --git a/packages/desktop/package.json b/packages/desktop/package.json
@@ -1,8 +1,8 @@
 {
     "name": "desktop",
-    "productName": "Firefly Shimmer",
-    "version": "2.1.12",
-    "description": "Official wallet application of Shimmer",
+    "productName": "Firefly Canary",
+    "version": "3.0.0",
+    "description": "Official wallet application of IOTA Canary",
     "main": "public/build/main.js",
     "repository": "git@github.com:iotaledger/firefly.git",
     "author": "IOTA Foundation <contact@iota.org>",

diff --git a/packages/desktop/product.js b/packages/desktop/product.js
@@ -1,6 +1,6 @@
 /* eslint-disable */
-const PRODUCT_NAME = 'Firefly Shimmer'
-const NETWORK = 'shimmer'
+const PRODUCT_NAME = 'Firefly Canary'
+const NETWORK = 'canary'
 
 const STAGE = process.env.STAGE || 'alpha'
 const APP_ID = getAppId()
@@ -47,15 +47,15 @@ function getAppName(isPackaged = true) {
  * If network = 'shimmer' -> 'firefly'
  */
 function getAppProtocol() {
-    return STAGE === 'prod' ? 'firefly' : `firefly-${STAGE.toLowerCase()}`
+    return STAGE === 'prod' ? 'canary' : `canary-${STAGE.toLowerCase()}`
 }
 
 /**
- * If stage = 'prod' -> 'org.iota.firefly-shimmer'
- * If stage = 'alpha' -> 'org.iota.firefly-shimmer.alpha'
+ * If stage = 'prod' -> 'org.iota.firefly-canary'
+ * If stage = 'alpha' -> 'org.iota.firefly-canary.alpha'
  */
 function getAppId() {
-    const defaultAppId = 'org.iota.firefly-shimmer'
+    const defaultAppId = 'org.iota.firefly-canary'
     if (STAGE === 'prod') {
         return defaultAppId
     }
@@ -65,11 +65,11 @@ function getAppId() {
 function getChannelName() {
     switch (STAGE) {
         case 'alpha':
-            return 'shimmer-alpha'
+            return 'canary-alpha'
         case 'beta':
-            return 'shimmer-beta'
+            return 'canary-beta'
         default:
-            return 'shimmer'
+            return 'canary'
     }
 }
 

diff --git a/packages/shared/lib/core/network/constants/explorer-urls.constant.ts b/packages/shared/lib/core/network/constants/explorer-urls.constant.ts
@@ -4,5 +4,5 @@ export const EXPLORER_URLS: Readonly<{ [key in NetworkId]?: string }> = {
     [NetworkId.Iota]: 'https://explorer.iota.org/mainnet',
     [NetworkId.IotaAlphanet]: 'https://explorer.iota-alphanet.iotaledger.net/devnet',
     [NetworkId.Shimmer]: 'https://explorer.shimmer.network/shimmer',
-    [NetworkId.Testnet]: 'https://explorer.shimmer.network/testnet',
+    [NetworkId.Testnet]: 'https://explorer.iota.org/iota2-testnet',
 }
diff --git a/packages/shared/lib/core/network/constants/faucet-urls.constant.ts b/packages/shared/lib/core/network/constants/faucet-urls.constant.ts
@@ -2,5 +2,5 @@ import { NetworkId } from '../enums'
 
 export const FAUCET_URLS: Readonly<{ [key in NetworkId]?: string }> = {
     [NetworkId.IotaAlphanet]: 'https://faucet.iota-alphanet.iotaledger.net/api/enqueue',
-    [NetworkId.Testnet]: 'https://faucet.testnet.shimmer.network/api/enqueue',
+    [NetworkId.Testnet]: 'https://faucet.nova-testnet.iotaledger.net/api/enqueue',
 }
diff --git a/packages/shared/lib/core/network/constants/official-node-urls.constant.ts b/packages/shared/lib/core/network/constants/official-node-urls.constant.ts
@@ -4,5 +4,5 @@ export const OFFICIAL_NODE_URLS: Readonly<{ [key in NetworkId]?: string[] }> = {
     [NetworkId.Iota]: ['https://api.stardust-mainnet.iotaledger.net', 'https://iota-node.tanglebay.com'],
     [NetworkId.IotaAlphanet]: ['https://api.iota-alphanet.iotaledger.net'],
     [NetworkId.Shimmer]: ['https://api.shimmer.network', 'https://shimmer-node.tanglebay.com'],
-    [NetworkId.Testnet]: ['https://api.testnet.shimmer.network'],
+    [NetworkId.Testnet]: ['https://api.nova-testnet.iotaledger.net/'],
 }
diff --git a/packages/shared/lib/core/network/tests/network.test.ts b/packages/shared/lib/core/network/tests/network.test.ts
@@ -24,7 +24,7 @@ describe('File: network.ts', () => {
         [NetworkId.Iota]: ['https://api.stardust-mainnet.iotaledger.net', 'https://iota-node.tanglebay.com'],
         [NetworkId.IotaAlphanet]: ['https://api.iota-alphanet.iotaledger.net'],
         [NetworkId.Shimmer]: ['https://api.shimmer.network', 'https://shimmer-node.tanglebay.com'],
-        [NetworkId.Testnet]: ['https://api.testnet.shimmer.network'],
+        [NetworkId.Testnet]: ['https://api.nova-testnet.iotaledger.net/'],
     }
 
     const EXPECTED_NODES: Readonly<{ [key in NetworkId]: (INode | undefined)[] }> = {

diff --git a/packages/shared/lib/core/network/utils/getNetworkIdFromNetworkName.ts b/packages/shared/lib/core/network/utils/getNetworkIdFromNetworkName.ts
@@ -1,7 +1,7 @@
 import { NetworkId } from '../enums'
 
 export function getNetworkIdFromNetworkName(networkName: string): NetworkId {
-    if (networkName.startsWith('iota2-alphanet')) {
+    if (networkName.startsWith('nova-testnet')) {
         return NetworkId.Testnet
     }
     switch (networkName) {