Setup funding evm tx

components/FundAccountFields.tsx

@@ -11,7 +11,7 @@ import {
 } from "lib/constants"
 import {NETWORK_DISPLAY_NAME} from "lib/network"
 import {Box, Link, Themed} from "theme-ui"
-import {CustomInputComponent, CustomSelectComponent} from "./inputs"
+import {CustomInputComponent} from "./inputs"
 
 const FUSD_VAULT_DOCS_LINK = {
   url: "https://docs.onflow.org/fusd/#how-do-i-get-an-fusd-enabled-wallet",
@@ -53,18 +53,18 @@ export default function FundAccountFields({
         max={128}
         sx={{fontFamily: "monospace"}}
       />
+      {/*<Box mb={3} mt={4}>*/}
+      {/*  <Themed.h3 sx={{mb: 0}}>Token</Themed.h3>*/}
+      {/*</Box>*/}
+      {/*<Box mb={4}>*/}
+      {/*  <Field*/}
+      {/*    component={CustomSelectComponent}*/}
+      {/*    name="token"*/}
+      {/*    inputLabel="Token"*/}
+      {/*    options={TOKEN_OPTIONS}*/}
+      {/*  />*/}
+      {/*</Box>*/}
       <Box mb={3} mt={4}>
-        <Themed.h3 sx={{mb: 0}}>Token</Themed.h3>
-      </Box>
-      <Box mb={4}>
-        <Field
-          component={CustomSelectComponent}
-          name="token"
-          inputLabel="Token"
-          options={TOKEN_OPTIONS}
-        />
-      </Box>
-      <Box mb={3}>
         <Captcha onVerify={setCaptchaToken} />
       </Box>
       <Box mb={3}>

flow.json

@@ -90,19 +90,14 @@
 		"test": {
 			"address": "179b6b1cb6755e31",
 			"key": "6d8452af4ffac3d09276ce58358b0fb7f959b48437bf368c1d4b9c02588cabda"
-		},
-		"testnet-account": {
-			"address": "${NEXT_PUBLIC_SIGNER_ADDRESS}",
-			"keys": "${SIGNER_PRIVATE_KEY}"
 		}
 	},
 	"deployments": {
 		"emulator": {
 			"emulator-account": [
 				"FungibleTokenMetadataViews",
 				"Burner",
-				"FUSD",
-				"ViewResolver"
+				"FUSD"
 			]
 		}
 	}

lib/constants.ts

@@ -19,7 +19,7 @@ export const PUBLIC_KEY_FORMAT_ERROR =
   "Public key must be a hexadecimal string with no spaces."
 export const PUBLIC_KEY_MISSING_ERROR = "Public key is required."
 export const ADDRESS_FORMAT_ERROR =
-  "Address must be a 16-character hexadecimal string."
+  "Address must be a 16-character or 42-character hexadecimal string."
 export const ADDRESS_MISSING_ERROR = "Address is required."
 export const CREATE_ACCOUNT_ERROR = "Account creation has failed"
 export const FUND_ACCOUNT_ERROR = "Account funding has failed"
@@ -33,7 +33,7 @@ export const paths = {
   fundAccount: "/fund-account",
 }
 
-export const ADDRESS_REGEXP = /^(0x)?[0-9a-fA-F]{16}$/
+export const ADDRESS_REGEXP = /^(0x)?([0-9a-fA-F]{16}|[0-9a-fA-F]{40})$/
 
 export const NETWORK_CODEWORDS = {
   testnet: "0x6834ba37b3980209",

lib/flow/fund.ts

@@ -32,6 +32,46 @@ transaction(address: Address, amount: UFix64) {
 }
 `
 
+const txFundAccountFlowEVM = `
+import FungibleToken from ${publicConfig.contractFungibleToken}
+import FlowToken from ${publicConfig.contractFlowToken}
+
+import EVM from ${publicConfig.contractEVM}
+
+/// Mints Flow and transfers it to the given EVM address via the signer's CadenceOwnedAccount.
+///
+transaction(to: EVM.EVMAddress, amount: UFix64, gasLimit: UInt64) {
+
+    let tokenAdmin: &FlowToken.Administrator
+    let coa: &EVM.BridgedAccount
+
+    prepare(signer: auth(Storage) &Account) {
+        self.tokenAdmin = signer.storage.borrow<&FlowToken.Administrator>(from: /storage/flowTokenAdmin)
+            ?? panic("Signer is not the token admin")
+
+        if signer.storage.borrow<&EVM.BridgedAccount>(from: /storage/evm) == nil {
+            signer.storage.save(<-EVM.createBridgedAccount(), to: /storage/evm)
+        }
+        self.coa = signer.storage.borrow<&EVM.BridgedAccount>(from: /storage/evm)
+            ?? panic("Could not borrow reference to the signer's COA!")
+    }
+
+    execute {
+        let minter <- self.tokenAdmin.createNewMinter(allowedAmount: amount)
+        let mintedVault <- minter.mintTokens(amount: amount)
+        destroy minter
+
+        self.coa.deposit(from: <-mintedVault)
+        self.coa.call(
+            to: to,
+            data: [],
+            gasLimit: gasLimit,
+            value: EVM.Balance(flow: amount),
+        )
+    }
+}
+`
+
 const txFundAccountFUSD = `
 import FUSD from ${publicConfig.contractFUSD}
 import FungibleToken from ${publicConfig.contractFungibleToken}
@@ -57,7 +97,7 @@ transaction(address: Address, amount: UFix64) {
 }
 `
 
-type TokenType = "FLOW" | "FUSD"
+type TokenType = "FLOW" | "FLOWEVM" | "FUSD"
 type Token = {
   tx: string
   amount: string
@@ -66,14 +106,28 @@ type Tokens = Record<TokenType, Token>
 
 export const tokens: Tokens = {
   FLOW: {tx: txFundAccountFLOW, amount: TOKEN_FUNDING_AMOUNTS[FLOW_TYPE]},
+  FLOWEVM: {tx: txFundAccountFlowEVM, amount: TOKEN_FUNDING_AMOUNTS[FLOW_TYPE]},
   FUSD: {tx: txFundAccountFUSD, amount: TOKEN_FUNDING_AMOUNTS[FUSD_TYPE]},
 }
 
+function getAddressType(address: string = ''): 'FLOW' | 'FLOWEVM' {
+  if (address.length > 16) {
+    return 'FLOWEVM'
+  } else {
+    return 'FLOW'
+  }
+}
+
 export async function fundAccount(
   address: string,
   token: TokenType,
   authorization: fcl.Authorization
 ) {
+
+  const addressType = getAddressType(address)
+
+  console.log("Address Type", addressType)
+
   const {tx, amount} = tokens[token]
 
   await sendTransaction({