Merge branch 'master' into vishal/metrika_node_monitoring

docs/content/concepts/variable-transaction-fees.md

@@ -102,7 +102,7 @@ You should see the `computationUsed` field. Take a note of the value, you will u
 
 Once a transaction is completed, you can use an explorer like [Flowscan](https://flowscan.org/) to review the transaction details and events emitted. For Flowscan, you can open the transaction in question and look for the event `FeesDeducted` from the [`FlowFees`](https://github.com/onflow/flow-core-contracts/blob/master/contracts/FlowFees.cdc) contract:
 
-![flowscan-fees](flowscan-fees.png)
+![flowscan-fees](./flowscan-fees.png)
 
 In the event data on the right side, you will see a set of fields representing [FeeParameters](https://github.com/onflow/flow-core-contracts/blob/master/contracts/FlowFees.cdc#L58):
 

docs/content/hybrid-custody/flow-docs.json

@@ -0,0 +1,95 @@
+{
+  "$schema": "https://developers.flow.com/schemas/flow-docs.json",
+  "displayName": "Hybrid Custody",
+  "headers": {
+    "": {
+      "icon": "cadence",
+      "title": "Hybrid Custody",
+      "description": "Create superior user experiences unlocking seamless onboarding, real ownership, and self-sovereignty on Flow",
+      "headerCards": [
+        {
+          "title": "Overview",
+          "tags": [
+            "guide",
+            "hybrid-custody"
+          ],
+          "description": "Understand the Hybrid Custody Model from a bird's eye view",
+          "href": ""
+        },
+        {
+          "title": "Explore Walletless Onboarding",
+          "tags": [
+            "guide",
+            "walletless-onboarding"
+          ],
+          "description": "Learn how to build a walletless onboarding experience in your app",
+          "href": "guides/walletless-onboarding"
+        },
+        {
+          "title": "Get Started with Account Linking",
+          "tags": [
+            "guide",
+            "account-linking"
+          ],
+          "description": "Link walletless onboarded accounts, unlocking Hybrid Custody in your app",
+          "href": "guides/linking-accounts"
+        },
+        {
+          "title": "Walletless Onboarding Example",
+          "tags": [
+            "sample",
+            "walletless-onboarding"
+          ],
+          "description": "Check out a Hybrid Custody app leveraging walletless onboarding & account linking",
+          "href": "https://github.com/onflow/walletless-arcade-example"
+        }
+      ]
+    }
+  },
+  "sidebars": {
+    "": [
+      {
+        "title": " Developer Guides",
+        "items": [
+          {
+            "title": "Hybrid Custody Overview",
+            "href": ""
+          },
+          {
+            "title": "Walletless Onboarding",
+            "href": "guides/walletless-onboarding"
+          },
+          {
+            "title": "Account Linking & Delegation",
+            "href": "guides/linking-accounts"
+          },
+          {
+            "title": "Hybrid Custody Account Model",
+            "href": "guides/account-model"
+          },
+          {
+            "title": "Account Abstraction Overview",
+            "href": "/guides/account-abstraction"
+          }
+        ]
+      },
+      {
+        "title": "References",
+        "items": [
+          {
+            "title": "LinkedAccounts Cadence Suite",
+            "href": "https://github.com/onflow/linked-accounts"
+          },
+          {
+            "title": "Walletless Onboarding Sample Apps",
+            "href": "https://github.com/onflow/walletless-arcade-example"
+          },
+          {
+            "title": "LinkedAccounts Contract [Testnet]",
+            "href": "https://f.dnz.dev/0x1b655847a90e644a/LinkedAccounts"
+          }
+        ]
+      }
+    ]
+  }
+}

docs/content/hybrid-custody/get-started.md

@@ -0,0 +1,16 @@
+---
+title: Get Started with Account Linking
+---
+
+There are two sides to Hybrid Custody support - delegation and usage. 
+
+On the delegation side, we have the apps that leverage Hybrid Custody for enhanced UX. This side primarily concerns itself with walletless onboarding + account linking (IOW account delegation). You can think of a Hybrid Custody game client or project-specific NFT app.
+
+From the usage perspective, apps would want to get information about a user's linked accounts to display accounts & assets, enable account & asset management, and even facilitate cross account interactions - think of this from the perspective of a wallet or NFT marketplace.
+
+In either case, you'll want to do the following to get started implementing Hybrid Custody in your application:
+
+1. Set up your environment
+1. Copy the contents of [linked-accounts](https://github.com/onflow/linked-accounts) into your project
+1. ???
+1. Profit

docs/content/hybrid-custody/guides/account-abstraction.md

@@ -0,0 +1,58 @@
+# Account Abstraction on Flow
+
+Flow provides native support for key use cases that are enabled by Account Abstraction, empowering developers to deliver mainstream-ready user experiences.  With Cadence, Flow was designed with these use cases in mind through the separation of the contract and transaction layers.  This guide demonstrates how Flow supports key use cases that are made possible with Account Abstraction.
+
+## Multi-sig Transactions
+
+Since accounts are smart contracts, they can be defined in order to require multiple signatures in order to execute a transaction, which unlocks a range of new users that improve the user experience for Web3 apps.
+
+| Account Abstraction | Flow |
+|--|--|
+| The move from from Externally-Owned Accounts (EOAs) to smart contract accounts enables developers to build in logic to require multiple signatures to execute transactions. | Flow has native support for multi-sig transactions since all accounts are defined as smart contracts. Flow provides [support for multiple keys](https://developers.flow.com/learn/concepts/accounts-and-keys#keys) to be added to an account and weights can be applied to denote relative priority. |
+
+
+## Sponsored Transactions
+
+The concept of paying fees to execute transactions in order to use Web3 apps can be a hurdle for newcomers as they begin to explore these experiences.  In order to remove this significant point of friction in requiring newcomers to acquire crypto before they can get started with an app, developers can subsidize these costs on behalf of users.
+
+| Account Abstraction | Flow |
+|--|--|
+| The ERC-4337 standard introduces the concept of [paymasters](https://eips.ethereum.org/EIPS/eip-4337#extension-paymasters), which can enable a developer to pay the fees for a transaction for their users. | Flow has built-in support for [3 different roles](https://developers.flow.com/learn/concepts/accounts-and-keys#signer-roles) for transactions which provides native support for sponsored transactions. |
+
+
+## Bundled Transactions
+
+Developers can deliver a more streamlined user experience that reduces the amount of interruptions in the form of transaction approvals by bundling multiple transactions together into a single transaction that executes the set of operations with one signature.
+
+| Account Abstraction | Flow |
+|--|--|
+| The ERC-4337 standard outlines support for bundled transactions through a new mempool that holds user operations from smart wallets. Bundlers package sets of these user operations into a single transaction on the blockchain and return the result back to each wallet. | Since Cadence has an explicit separation of contracts and transactions, Flow has protocol-level support for bundling transactions across multiple contracts into a single transaction. |
+
+
+## Account Recovery
+
+Account Abstraction enables developers to build more robust account management features for users, addressing the major pain point of losing access to assets forever if the user loses their keys to their account.  Apps can enable users to recover access to their accounts and enclosed assets through social recovery or pre-approved accounts.
+
+| Account Abstraction | Flow |
+|--|--|
+| Smart contract accounts can be defined to include account recovery logic that enables users to define custom recovery methods that can rely on specific accounts or other validated sources. | Since all accounts are smart contracts, Flow has native support for account recovery and cycling of keys to help users regain access to accounts in a secure manner. |
+
+
+## Multi-factor Authentication
+
+Multi-factor authentication is a broadly accepted concept in Web2 apps for secure access to accounts and Account Abstraction enables developers to deliver the same benefits to Web3 users.
+
+| Account Abstraction | Flow |
+|--|--|
+| Smart contract accounts can require a secondary factor to confirm transactions which can be delivered in the form of familiar confirmation channels such as email or SMS. | Since all accounts are smart contracts, Flow has native support for multi-factor authentication as developers can implement these security mechanisms for their users. |
+
+
+## Seamless Experience
+
+Account Abstraction brings the potential for dramatic improvements to the user experience of Web3 apps.  Developers can introduce conditions under which a user can grant a smart contract account to pre-approve transactions under certain conditions, reducing interruptions for the user to explicitly sign each transaction.
+
+These improvements are especially notable on mobile, where users are typically met with the jarring experience of switching between apps in approve transactions.
+
+| Account Abstraction | Flow |
+|--|--|
+| Developers can build new features that streamline the user experience of Web3 apps, such as ‘session keys’ that pre-approve transactions for a period of time or setting custom limits on transaction volume or network fees. | Since all accounts are smart contracts, Flow has support for these new controls that enable apps to sign pre-approved transactions based on user controls and preferences. |