Merge branch 'main' into integration-gelato

Author: briandoyle81

docs/build/getting-started/fcl-quickstart.md

@@ -285,7 +285,7 @@ However:
 
 ### Integrating Authentication and Building the Complete UI
 
-Finally, integrate the query, mutation, and transaction status hooks with authentication using `useCurrentFlowUser`. Combine all parts to build the complete page.
+Finally, integrate the query, mutation, and transaction status hooks with authentication using `useFlowCurrentUser`. Combine all parts to build the complete page.
 
 ```tsx
 "use client";
@@ -295,11 +295,11 @@ import {
   useFlowQuery,
   useFlowMutate,
   useFlowTransactionStatus,
-  useCurrentFlowUser,
+  useFlowCurrentUser,
 } from "@onflow/kit";
 
 export default function Home() {
-  const { user, authenticate, unauthenticate } = useCurrentFlowUser();
+  const { user, authenticate, unauthenticate } = useFlowCurrentUser();
 
   const { data, isLoading, error, refetch } = useFlowQuery({
     cadence: `
@@ -409,7 +409,7 @@ In this complete page:
 - **Step 1** queries the counter value.
 - **Step 2** sends a transaction to increment the counter and stores the transaction ID.
 - **Step 3** subscribes to transaction status updates using the stored transaction ID and uses a `useEffect` hook to automatically refetch the updated count when the transaction is sealed (status code 4).
-- **Step 4** integrates authentication via `useCurrentFlowUser` and combines all the pieces into a single user interface.
+- **Step 4** integrates authentication via `useFlowCurrentUser` and combines all the pieces into a single user interface.
 
 :::tip
 
@@ -451,7 +451,7 @@ Then visit [http://localhost:3000](http://localhost:3000) in your browser. You s
 By following these steps, you've built a simple Next.js dApp that interacts with a Flow smart contract using [**@onflow/kit**]. In this guide you learned how to:
 
 - Wrap your application in a `FlowProvider` to configure blockchain connectivity.
-- Use kit hooks such as `useFlowQuery`, `useFlowMutate`, `useFlowTransactionStatus`, and `useCurrentFlowUser` to manage authentication, query on-chain data, submit transactions, and monitor their status.
+- Use kit hooks such as `useFlowQuery`, `useFlowMutate`, `useFlowTransactionStatus`, and `useFlowCurrentUser` to manage authentication, query on-chain data, submit transactions, and monitor their status.
 - Integrate with the local Flow emulator and Dev Wallet for a fully functional development setup.
 
 For additional details and advanced usage, refer to the [@onflow/kit documentation] and other Flow developer resources.

docs/ecosystem/projects.mdx

@@ -249,5 +249,19 @@ Explore an array of exciting, grassroots initiatives, and projects that thrive w
         githubLink: 'https://github.com/doodles/flooks',
       },
     },
+    {
+      type: 'link',
+      label: 'Stake & Eggs',
+      href: 'https://stakeandeggs.wtf/',
+      description:
+        'A comprehensive Flow staking dashboard to track performance, estimate rewards, and simulate earnings.',
+      customProps: {
+        icon: '',
+        author: {
+          name: 'Chase Fleming',
+          profileImage: 'https://avatars.githubusercontent.com/u/1666730?v=4',
+        },
+      },
+    },
   ]}
 />

docs/evm/guides/index.md

@@ -0,0 +1,47 @@
+---
+title: Flow EVM Guides
+description: Tutorials and guides for building on Flow EVM, integrating with popular Ethereum tools, and leveraging Flow's unique features.
+sidebar_position: 1
+keywords:
+  - Flow EVM
+  - guides
+  - tutorials
+  - Ethereum
+  - Solidity
+  - Foundry
+  - Hardhat
+  - Remix
+  - wagmi
+  - RainbowKit
+  - web3.js
+  - ethers.js
+---
+
+# EVM Guides
+
+This section contains guides and tutorials for building on [Flow EVM], integrating with popular Ethereum tools, and leveraging Flow's unique features.
+
+## Guides
+
+- **[Integrating MetaMask]** - How to connect MetaMask to Flow EVM and interact with your dapps.
+- **[Using ethers.js]** - Learn to use ethers.js with Flow EVM for contract interaction and account management.
+- **[Using web3.js]** - Use web3.js to build and interact with Flow EVM smart contracts.
+- **[Using wagmi]** - Integrate wagmi for React-based EVM dapps on Flow.
+- **[Using RainbowKit]** - Add wallet connection and onboarding with RainbowKit in your Flow EVM dapp.
+- **[Using Foundry]** - Develop, test, and deploy smart contracts on Flow EVM using Foundry.
+- **[Using Hardhat]** - Build, test, and deploy Solidity contracts on Flow EVM with Hardhat.
+- **[Using Remix]** - Write, deploy, and interact with contracts on Flow EVM using the Remix IDE.
+
+## More Coming Soon
+
+Stay tuned - more guides and advanced tutorials are on the way!
+
+[Flow EVM]: ../about.md
+[Integrating MetaMask]: ./integrating-metamask.mdx
+[Using ethers.js]: ./ethers.md
+[Using web3.js]: ./web3-js.md
+[Using wagmi]: ./wagmi.md
+[Using RainbowKit]: ./rainbowkit.md
+[Using Foundry]: ./foundry.md
+[Using Hardhat]: ./hardhat.md
+[Using Remix]: ./remix.md

docs/evm/quickstart.md

@@ -251,6 +251,14 @@ export default ClickerModule;
 
 Visit the [Flow Faucet] and follow the instructions to add testnet funds. Compared to other networks, the [Flow Faucet] grants a vast amount of tokens - enough gas for millions of transactions.
 
+:::warning
+
+EVM accounts created by the [Flow Wallet] are [Cadence-Owned Accounts], or COAs - **Not** EOAs. COAs have many advantages over EOAs, but they are generated differently, which means they don't have a key that's compatible with hardhat.
+
+Use your [MetaMask] or similar EOA account to deploy contracts on Flow EVM.
+
+:::
+
 ### Deploy the Contract
 
 Deploy the contract with:
@@ -354,3 +362,4 @@ Ready to unlock the full potential of Flow EVM? Start with our [Batched Transact
 [Cross-VM Apps]: ../tutorials/cross-vm-apps/introduction.md
 [Batched Transactions]: ../tutorials/cross-vm-apps/introduction.md
 [OpenZeppelin Contracts]: https://www.openzeppelin.com/contracts
+[Cadence-Owned Accounts]: ./accounts.md#cadence-owned-accounts

docs/tools/clients/fcl-js/index.md

@@ -78,7 +78,8 @@ import * as fcl from "@onflow/fcl";
 
 const result = await fcl.query({
   cadence: `
-    pub fun main(a: Int, b: Int, addr: Address): Int {
+    access(all)
+    fun main(a: Int, b: Int, addr: Address): Int {
       log(addr)
       return a + b
     }
@@ -98,7 +99,7 @@ import * as fcl from "@onflow/fcl";
 const txId = await fcl.mutate({
   cadence: `
     import Profile from 0xba1132bc08f82fe2
-    
+
     transaction(name: String) {
       prepare(account: AuthAccount) {
         account.borrow<&{Profile.Owner}>(from: Profile.privatePath)!.setName(name)
@@ -127,7 +128,7 @@ FCL JS supports TypeScript. If you need to import specific types, you can do so
 ```typescript
 import {CurrentUser} from "@onflow/typedefs"
 
-const newUser: CurrentUser = { 
+const newUser: CurrentUser = {
   addr: null,
   cid: null,
   expiresAt: null,

docs/tools/flow-cli/flow.json/configuration.md

@@ -25,7 +25,7 @@ Flow configuration (`flow.json`) file will contain the following properties:
   "accounts": {
     "emulator-account": {
       "address": "f8d6e0586b0a20c7",
-      "key": "ae1b44c0f5e8f6992ef2348898a35e50a8b0b9684000da8b1dade1b3bcd6ebee",
+      "key": "ae1b44c0f5e8f6992ef2348898a35e50a8b0b9684000da8b1dade1b3bcd6ebee"
     }
   },
   "deployments": {},
@@ -80,7 +80,7 @@ We'll walk through each property one by one.
     },
     "emulator-account": {
       "address": "f8d6e0586b0a20c7",
-      "key": "2eae2f31cb5b756151fa11d82949c634b8f28796a711d7eb1e52cc301ed11111",
+      "key": "2eae2f31cb5b756151fa11d82949c634b8f28796a711d7eb1e52cc301ed11111"
     }
   },
 

docs/tools/kit/index.md

@@ -10,7 +10,7 @@ sidebar_position: 1
 
 ## 🔌 Included React Hooks
 
-- [`useCurrentFlowUser`](#usecurrentflowuser) – Authenticate and manage the current Flow user
+- [`useFlowCurrentUser`](#useflowcurrentuser) – Authenticate and manage the current Flow user
 - [`useFlowAccount`](#useflowaccount) – Fetch Flow account details by address
 - [`useFlowBlock`](#useflowblock) – Query latest or specific Flow blocks
 - [`useFlowChainId`](#useflowchainid) – Retrieve the current Flow chain ID
@@ -20,6 +20,7 @@ sidebar_position: 1
 - [`useFlowQueryRaw`](#useflowqueryraw) – Execute Cadence scripts with optional arguments returning non-decoded data
 - [`useFlowMutate`](#useflowmutate) – Send transactions to the Flow blockchain
 - [`useFlowRevertibleRandom`](#useflowrevertiblerandom) – Generate pseudorandom values tied to block height
+- [`useFlowTransaction`](#useflowtransaction) – Fetch a Flow transaction by ID
 - [`useFlowTransactionStatus`](#useflowtransactionstatus) – Track transaction status updates
 
 ### Cross-VM (Flow EVM ↔ Cadence) Hooks
@@ -82,10 +83,10 @@ Many of these hooks are built using [`@tanstack/react-query`](https://tanstack.c
 
 :::
 
-### `useCurrentFlowUser`
+### `useFlowCurrentUser`
 
 ```tsx
-import { useCurrentFlowUser } from "@onflow/kit"
+import { useFlowCurrentUser } from "@onflow/kit"
 ```
 
 #### Returns:
@@ -96,7 +97,7 @@ import { useCurrentFlowUser } from "@onflow/kit"
 
 ```tsx
 function AuthComponent() {
-  const { user, authenticate, unauthenticate } = useCurrentFlowUser()
+  const { user, authenticate, unauthenticate } = useFlowCurrentUser()
 
   return (
     <div>
@@ -470,6 +471,45 @@ function RandomValues() {
 
 ---
 
+### `useFlowTransaction`
+
+```tsx
+import { useFlowTransaction } from "@onflow/kit"
+```
+
+Fetches a Flow transaction by ID and returns the decoded transaction object.
+
+#### Parameters:
+
+* `txId?: string` – The Flow transaction ID to fetch.
+* `query?: Omit<UseQueryOptions<Transaction | null, Error>, "queryKey" | "queryFn">` – Optional TanStack Query options like `staleTime`, `enabled`, etc.
+
+#### Returns: `UseQueryResult<Transaction | null, Error>`
+
+```tsx
+function TransactionDetails({ txId }: { txId: string }) {
+  const { data: transaction, isLoading, error, refetch } = useFlowTransaction({
+    txId,
+    query: { staleTime: 10000 },
+  })
+
+  if (isLoading) return <p>Loading transaction...</p>
+  if (error) return <p>Error fetching transaction: {error.message}</p>
+  if (!transaction) return <p>No transaction data.</p>
+
+  return (
+    <div>
+      <h2>Transaction ID: {transaction.id}</h2>
+      <p>Gas Limit: {transaction.gasLimit}</p>
+      <pre>Arguments: {JSON.stringify(transaction.arguments, null, 2)}</pre>
+      <button onClick={refetch}>Refetch</button>
+    </div>
+  )
+}
+```
+
+---
+
 ### `useFlowTransactionStatus`
 
 ```tsx

docs/tutorials/cross-vm-apps/add-to-wagmi.md

@@ -503,6 +503,7 @@ For a complete reference implementation, check out the [FCL + RainbowKit + wagmi
 [create an issue]: https://github.com/onflow/docs/issues/new/choose
 [Cadence]: https://cadence-lang.org
 [Solidity]: https://soliditylang.org/
+[native VRF]: ../../tutorials/native-vrf/vrf-in-solidity.md
 [structure and call EVM transactions]: ./batched-evm-transactions.md
 [FLIP 316]: https://github.com/onflow/flips/pull/317
 [Flow Client Library (FCL)]: ../../tools/clients/fcl-js
@@ -516,4 +517,4 @@ For a complete reference implementation, check out the [FCL + RainbowKit + wagmi
 [Testnet Cadence Flowscan]: https://testnet.flowscan.io
 [Cadence Owned Accounts]: ../../build/basics/accounts.md
 [Testnet EVM Flowscan]: https://evm-testnet.flowscan.io
-[pre-built utility from the `@onflow/kit`]: ../../tools/kit/index.md#usecrossvmbatchtransaction
+[pre-built utility from the `@onflow/kit`]: ../../tools/kit/index.md#usecrossvmbatchtransaction

docs/tutorials/flowtobooth/image-gallery.md

@@ -393,7 +393,8 @@ const flowWallet = ({ projectId }: MyWalletOptions): Wallet => ({
     qrCode: 'https://link.lilico.app',
   },
   mobile: {
-    getUri: (uri: string) => `https://fcw-link.lilico.app/wc?uri=${encodeURIComponent(uri)}`,
+    getUri: (uri: string) =>
+      `https://fcw-link.lilico.app/wc?uri=${encodeURIComponent(uri)}`,
   },
   qrCode: {
     getUri: (uri: string) => uri,

docs/tutorials/native-vrf/index.md

@@ -27,6 +27,7 @@ This series covers how to leverage Flow's native VRF (Verifiable Random Function
 - **[Secure Randomness with Commit-Reveal in Cadence]** - Learn how to implement secure randomness in Cadence using Flow's commit-reveal scheme.
 - **[VRF (Randomness) in Solidity]** - Learn how to use Flow's native VRF capabilities in Solidity.
 - **[Deploy a Solidity Contract Using Cadence]** - Discover how to deploy and interact with Solidity contracts on Flow EVM using Cadence.
+- **[VRF (Randomness) in Solidity]** - How to access Flow's native verifiable randomness from Solidity smart contracts on Flow EVM, including code examples and security considerations.
 
 ## More Coming Soon
 
@@ -35,3 +36,4 @@ Stay tuned—more tutorials and advanced guides are on the way!
 [Secure Randomness with Commit-Reveal in Cadence]: ./commit-reveal-cadence.md
 [VRF (Randomness) in Solidity]: ./vrf-in-solidity.md
 [Deploy a Solidity Contract Using Cadence]: ./deploy-solidity-contract.md
+[VRF (Randomness) in Solidity]: ./vrf-in-solidity.md