Merge pull request onflow#63 from onflow/ianthpun/crescendonet

Add Crescendo faucet

.github/workflows/ci.yml

@@ -28,11 +28,13 @@ jobs:
       NEXT_PUBLIC_SIGNER_ADDRESS: "0xf8d6e0586b0a20c7"
       SIGNER_PRIVATE_KEY: "91a22fbd87392b019fbe332c32695c14cf2ba5b6521476a8540228bdf1987068"
       NEXT_PUBLIC_TEST_NET_URL: "http://localhost:3000"
+      NEXT_PUBLIC_CRESCENDO_URL: "http://localhost:3000"
       NEXT_PUBLIC_TOKEN_AMOUNT_FLOW: "1000.0"
       NEXT_PUBLIC_TOKEN_AMOUNT_FUSD: "10.0"
       NEXT_PUBLIC_CONTRACT_FUNGIBLE_TOKEN: "0xee82856bf20e2aa6"
       NEXT_PUBLIC_CONTRACT_FLOW_TOKEN: "0x0ae53cb6e3f42a79"
       NEXT_PUBLIC_CONTRACT_FUSD: "0xf8d6e0586b0a20c7"
+      NEXT_PUBLIC_NETWORK: "testnet"
 
     strategy:
       matrix:

components/FundAccountSubmitted.tsx

@@ -3,6 +3,7 @@ import Label from "components/Label"
 import LoadingFeedback from "components/LoadingFeedback"
 import {Box, Flex, Link, Themed, ThemeUICSSObject} from "theme-ui"
 import {ClientFundAccountResult} from "./FundAccountPanel"
+import publicConfig from "lib/publicConfig"
 
 const styles: Record<string, ThemeUICSSObject> = {
   resultsContainer: {
@@ -46,8 +47,7 @@ export default function FundAccountSubmitted({
             <Box mb={4}>
               <Themed.h3 sx={{my: 0}}>Account Funded!</Themed.h3>
               <Themed.p>
-                The requested amount has been transfered to your Testnet
-                account!
+                {`The requested amount has been transferred to your ${publicConfig.network} account!`}
               </Themed.p>
             </Box>
             <Box>
@@ -61,7 +61,7 @@ export default function FundAccountSubmitted({
                   } tokens`}
                 </div>
                 <Link
-                  href={`https://flow-view-source.com/testnet/account/${result.address}`}
+                  href={`https://${publicConfig.network}.flowdiver.io/account/${result.address}`}
                   target="_blank"
                   variant="secondary"
                   sx={{fontSize: 1}}

components/NetworkLinks.tsx

@@ -1,7 +1,7 @@
 /** @jsxImportSource theme-ui */
 
 import TabNav, {TabNavLink} from "components/TabNav"
-import {TEST_NET} from "lib/constants"
+import {TEST_NET, CRESCENDO_NET} from "lib/constants"
 import {NETWORK_DISPLAY_NAME} from "lib/network"
 import publicConfig from "lib/publicConfig"
 
@@ -40,6 +40,21 @@ export default function NetworkLinks() {
           />
           Testnet
         </TabNavLink>
+        <TabNavLink
+          href={publicConfig.crescendoNetUrl}
+          active={publicConfig.network === CRESCENDO_NET}
+        >
+          <img
+            src={
+              publicConfig.network === CRESCENDO_NET
+                ? "crescendo-faucet-icon.svg"
+                : "gray-faucet-icon.svg"
+            }
+            alt="Crescendo Faucet"
+            sx={{mr: 2}}
+          />
+          Crescendo
+        </TabNavLink>
       </TabNav>
     </div>
   )

components/PageTitle.tsx

@@ -3,7 +3,7 @@ import publicConfig from "lib/publicConfig"
 import Head from "next/head"
 
 export const BASE_HTML_TITLE = `Flow ${
-  publicConfig.network === TEST_NET ? "Testnet" : ""
+  publicConfig.network === TEST_NET ? "Testnet" : "Crescendo"
 } Faucet`
 
 export default function PageTitle({children}: {children?: string}) {

env.example

@@ -1,5 +1,6 @@
 NEXT_PUBLIC_NETWORK=testnet
 NEXT_PUBLIC_TEST_NET_URL=http://localhost:3000
+NEXT_PUBLIC_CRESCENDO_URL=http://localhost:3000
 NEXT_PUBLIC_MIXPANEL_TOKEN="dev"
 NEXT_PUBLIC_TOKEN_AMOUNT_FLOW=1000.0
 NEXT_PUBLIC_TOKEN_AMOUNT_FUSD=10.0

flow.json

@@ -22,7 +22,8 @@
   },
   "networks": {
     "emulator": "127.0.0.1:3569",
-    "testnet": "access.devnet.nodes.onflow.org:9000"
+    "testnet": "access.devnet.nodes.onflow.org:9000",
+    "crescendo": "access.crescendo.nodes.onflow.org:9000" 
   },
   "accounts": {
     "emulator-account": {

lib/constants.ts

@@ -1,7 +1,8 @@
-export type Networks = "testnet"
+export type Networks = "testnet" | "crescendo"
 export type TokenTypes = typeof FLOW_TYPE | typeof FUSD_TYPE
 
 export const TEST_NET = "testnet"
+export const CRESCENDO_NET = "crescendo"
 export const FLOW_TYPE = "FLOW"
 export const FUSD_TYPE = "FUSD"
 export const NETWORK_STATUS_URL = "https://status.onflow.org/"
@@ -36,4 +37,5 @@ export const ADDRESS_REGEXP = /^(0x)?[0-9a-fA-F]{16}$/
 
 export const NETWORK_CODEWORDS = {
   testnet: "0x6834ba37b3980209",
+  crescendo: "0x6834ba37b3980209",
 }

lib/publicConfig.ts

@@ -1,9 +1,14 @@
-import {Networks, TEST_NET, TokenTypes} from "./constants"
+import {Networks, TokenTypes} from "./constants"
+
+const network = process.env.NEXT_PUBLIC_NETWORK as Networks | undefined
+if (!network) throw "Missing NEXT_PUBLIC_NETWORK"
 
-const network = TEST_NET
 const testNetUrl = process.env.NEXT_PUBLIC_TEST_NET_URL
 if (!testNetUrl) throw "Missing NEXT_PUBLIC_TEST_NET_URL"
 
+const crescendoNetUrl = process.env.NEXT_PUBLIC_CRESCENDO_URL
+if (!crescendoNetUrl) throw "Missing NEXT_PUBLIC_CRESCENDO_URL"
+
 const tokenAmountFlow = process.env.NEXT_PUBLIC_TOKEN_AMOUNT_FLOW
 if (!tokenAmountFlow) throw "Missing NEXT_PUBLIC_TOKEN_AMOUNT_FLOW"
 
@@ -29,6 +34,7 @@ const walletDiscovery = process.env.NEXT_PUBLIC_WALLET_DISCOVERY
 export type PublicConfig = {
   network: Networks
   testNetUrl: string
+  crescendoNetUrl: string
   tokenAmountFlow: string
   tokenAmountFusd: string
   hcaptchaSiteKey: string
@@ -44,6 +50,7 @@ export type PublicConfig = {
 const publicConfig: PublicConfig = {
   network,
   testNetUrl,
+  crescendoNetUrl,
   tokenAmountFlow,
   tokenAmountFusd,
   hcaptchaSiteKey: