Merge branch 'main' into issue1225-add-sample-apy-calculations

# Conflicts:
#	user-guides/how-to-data-farm.md

.gitbook.yaml

@@ -1,37 +1,65 @@
 root: ./
 
 redirects:
-    building-with-ocean/wallets: discover/wallets/README
-    orientation/metamask-setup: discover/wallets/metamask-setup
-    building-with-ocean/wallets-and-ocean-tokens: discover/wallets-and-ocean-tokens
-    core-concepts/architecture: developers/architecture
-    core-concepts/datanft-and-datatoken: developers/contracts/datanft-and-datatoken
-    core-concepts/roles: developers/contracts/roles
-    core-concepts/networks: discover/networks/README
-    core-concepts/networks/bridges: discover/networks/bridges
-    core-concepts/fees: developers/contracts/fees
-    core-concepts/asset-pricing: developers/contracts/pricing-schemas
-    core-concepts/did-ddo: developers/identifiers
-    using-ocean-market/marketplace-publish-data-asset: user-guides/publish-data-nfts
-    using-ocean-market/marketplace-download-data-asset: user-guides/buy-data-nfts
-    using-ocean-market/asset-hosting: user-guides/asset-hosting/README
-    using-ocean-market/remove-liquidity-using-etherscan: user-guides/remove-liquidity-pools
-    building-with-ocean/build-a-marketplace/forking-ocean-market: developers/build-a-marketplace/forking-ocean-market
-    building-with-ocean/build-a-marketplace/customising-your-market: developers/build-a-marketplace/customising-your-market
-    building-with-ocean/build-a-marketplace/deploying-market: developers/build-a-marketplace/deploying-market
-    building-with-ocean/using-ocean-libraries/configuration: developers/ocean.js/configuration
-    building-with-ocean/using-ocean-libraries/creating_dataNFT: developers/ocean.js/creating-datanft
-    building-with-ocean/using-ocean-libraries/mint-datatoken: developers/ocean.js/mint-datatoken
-    building-with-ocean/using-ocean-libraries/update-metadata: developers/ocean.js/update-metadata
-    building-with-ocean/compute-to-data/compute-to-data-architecture: developers/compute-to-data/compute-to-data-architecture
-    building-with-ocean/compute-to-data/compute-to-data-datasets-algorithms: developers/compute-to-data/compute-to-data-datasets-algorithms
-    building-with-ocean/compute-to-data/compute-to-data-algorithms: developers/compute-to-data/compute-to-data-algorithms
-    building-with-ocean/deploying-components/deploying-marketplace: developers/build-a-marketplace/deploying-market
-    building-with-ocean/using-ocean-subgraph/list-data-nfts: developers/using-ocean-subgraph/list-data-nfts
-    building-with-ocean/using-ocean-subgraph/list-datatokens: developers/using-ocean-subgraph/list-datatokens
-    building-with-ocean/using-ocean-subgraph/get-swap-tx: developers/using-ocean-subgraph/get-swap-tx
-    building-with-ocean/deploying-components/deploying-subgraph: developers/using-ocean-subgraph/deploying-subgraph
-    building-with-ocean/deploying-components/deploying-provider: infrastructure/deploying-components/deploying-provider
-    building-with-ocean/using-ocean-subgraph/deploying-ocean-subgraph: infrastructure/deploying-components/deploying-ocean-subgraph
-    using-ocean-market/ocean-kubernetes: infrastructure/ocean-kubernetes
-    resources: resources/README
+    readme/metamask-setup: discover/wallets/metamask-setup.md
+    readme/wallets: discover/wallets/README.md
+    readme/wallets-and-ocean-tokens: discover/wallets-and-ocean-tokens.md
+    core-concepts: developers/README.md
+    core-concepts/architecture: developers/architecture.md
+    core-concepts/datanft-and-datatoken: developers/contracts/datanft-and-datatoken.md
+    core-concepts/roles: developers/contracts/roles.md
+    core-concepts/networks: discover/networks.md
+    core-concepts/networks/bridges: discover/networks/bridges.md
+    core-concepts/fees: developers/contracts/fees.md
+    core-concepts/asset-pricing: developers/contracts/pricing-schemas.md
+    core-concepts/did-ddo: developers/identifiers.md
+    using-ocean-market: user-guides/using-ocean-market.md
+    using-ocean-market/marketplace-publish-data-asset: user-guides/publish-data-nfts.md
+    using-ocean-market/marketplace-download-data-asset: user-guides/buy-data-nfts.md
+    using-ocean-market/asset-hosting: user-guides/asset-hosting.md
+    using-ocean-market/remove-liquidity-using-etherscan: user-guides/remove-liquidity-pools.md
+    building-with-ocean: developers/README.md
+    building-with-ocean/build-a-marketplace: developers/build-a-marketplace/README.md
+    building-with-ocean/build-a-marketplace/forking-ocean-market: developers/build-a-marketplace/forking-ocean-market.md
+    building-with-ocean/build-a-marketplace/customising-your-market: developers/build-a-marketplace/customising-your-market.md
+    building-with-ocean/build-a-marketplace/deploying-market: developers/build-a-marketplace/deploying-market.md
+    building-with-ocean/using-ocean-libraries: developers/ocean.js/README.md
+    building-with-ocean/using-ocean-libraries/configuration: developers/ocean.js/configuration.md
+    building-with-ocean/using-ocean-libraries/creating_dataNFT: developers/ocean.js/creating-datanft.md
+    building-with-ocean/using-ocean-libraries/create-datatoken-with-fixed-pricing: developers/ocean.js/publish.md
+    building-with-ocean/using-ocean-libraries/mint-datatoken: developers/ocean.js/mint-datatoken.md
+    building-with-ocean/using-ocean-libraries/update-metadata: developers/ocean.js/update-metadata.md
+    building-with-ocean/compute-to-data: developers/compute-to-data/README.md
+    building-with-ocean/compute-to-data/compute-to-data-architecture: developers/compute-to-data/compute-to-data-architecture.md
+    building-with-ocean/compute-to-data/compute-to-data-datasets-algorithms: developers/compute-to-data/compute-to-data-datasets-algorithms.md
+    building-with-ocean/compute-to-data/compute-to-data-algorithms: developers/compute-to-data/compute-to-data-algorithms.md
+    building-with-ocean/compute-to-data/compute-to-data-minikube: infrastructure/compute-to-data-minikube.md
+    building-with-ocean/compute-to-data/compute-to-data-docker-registry: infrastructure/compute-to-data-docker-registry.md
+    building-with-ocean/compute-to-data/user-defined-parameters: developers/compute-to-data/compute-options.md
+    building-with-ocean/deploying-components: infrastructure/README.md
+    building-with-ocean/deploying-components/setup-server: infrastructure/setup-server.md
+    building-with-ocean/deploying-components/deploying-ocean-subgraph: infrastructure/deploying-ocean-subgraph.md
+    building-with-ocean/deploying-components/deploying-marketplace: infrastructure/deploying-marketplace.md
+    building-with-ocean/deploying-components/deploying-aquarius: infrastructure/deploying-aquarius.md
+    building-with-ocean/deploying-components/deploying-provider: infrastructure/deploying-provider.md
+    building-with-ocean/using-ocean-subgraph: developers/subgraph/README.md
+    building-with-ocean/using-ocean-subgraph/list-data-nfts: developers/subgraph/list-data-nfts.md
+    building-with-ocean/using-ocean-subgraph/list-datatokens: developers/subgraph/list-datatokens.md
+    building-with-ocean/using-ocean-subgraph/get-data-nft-information: developers/subgraph/get-data-nft-information.md
+    building-with-ocean/using-ocean-subgraph/get-datatoken-information: developers/subgraph/get-datatoken-information.md
+    building-with-ocean/using-ocean-subgraph/list-fixed-rate-exchanges: developers/subgraph/list-fixed-rate-exchanges.md
+    building-with-ocean/using-ocean-subgraph/deploying-ocean-subgraph: infrastructure/deploying-components/deploying-ocean-subgraph.md
+    building-with-ocean/contributing: contribute/README.md
+    building-with-ocean/contributing/code-of-conduct: contribute/code-of-conduct.md
+    building-with-ocean/contributing/legal-reqs: contribute/legal-reqs.md
+    building-with-ocean/projects-using-ocean: contribute/projects-using-ocean.md
+    veocean-data-farming: rewards/README.md
+    veocean-data-farming/veocean: rewards/veocean.md
+    veocean-data-farming/df-intro: rewards/df-intro.md
+    veocean-data-farming/df-background: rewards/df-max-out-yield.md
+    veocean-data-farming/emissions-apys: rewards/df-emissions-apys.md
+    veocean-data-farming/delegation: rewards/README.md
+    rewards/veOcean-Data-Farming-Tutorial: user-guides/get-started-df.md
+    api-references: developers/README.md
+    api-references/aquarius-rest-api: developers/aquarius/asset-requests.md
+    api-references/provider-rest-api: developers/provider/general-endpoints.md

.gitbook/assets/file.excalidraw.svg

@@ -1,16 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 558.2830840223749 23.380556316496808" width="558.2830840223749" height="23.380556316496808">
-  <!-- svg-source:excalidraw -->
-  <!-- payload-type:application/vnd.excalidraw+json --><!-- payload-version:2 --><!-- payload-start -->eyJ2ZXJzaW9uIjoiMSIsImVuY29kaW5nIjoiYnN0cmluZyIsImNvbXByZXNzZWQiOnRydWUsImVuY29kZWQiOiJ4nHVTy26jMFx1MDAxNN3zXHUwMDE1iG47Kc80dDd9SO1oNKqURVx1MDAxN1VcdTAwMTdcdTAwMGV2wMLYlm1CM1X+fWxDbcqkXlx1MDAwMPfcc1x1MDAxZtxz/Vx1MDAxMYRhpI5cdTAwMWNFN2GE3itAMFx1MDAxNGCILlxyfkBCYka1K7W2ZL2oLLNRisubqyvA+arGasdYu6pYN4YhgjpEldTEV22H4Yd9zlxuXHUwMDExTJHlWtSXScpkif5h1JZMsjwr13mWb1x1MDAxY1x1MDAwM8t7XUohqN17QCTyXHUwMDFlXHUwMDAzRcPvX2DbJYdcdTAwMWa7uipcdTAwMWXjh/v25bn0ZfeYkK06kvGHQNX0YtaUVIK16Fx1MDAwNUPVmOpcdTAwMGLcxUmmXHUwMDA35qNcdTAwMDTr64ZcIim/xDBcdTAwMGUqrI5cdTAwMDaLY4dcdTAwMDJa21x1MDAxY1x1MDAxZXnXVp5mzrZcdTAwMTHZZlx1MDAxNc9Ptmjljlx1MDAxMSZMK1x1MDAxN6PfN7NcdTAwMDNVW+uOKHRcdTAwMWMlXHUwMDAwlVx1MDAxY1xiLY/nXHLTT1x1MDAxNtm1w1x1MDAxYYTrRn0qP5ZDdtJ5ml8nRZHmzmFq8Cdo9X6bj4LCaVx1MDAxNJ9cdTAwMGLgVyCdkJPv1vBcdTAwMWZmq+NT9Vx1MDAxY4JR5mS9WcfFOs7KtCydX69Tq520J8RjrGrPbIZUQKhbTCGm9TJcdTAwMDRR+I2HXHUwMDAwqe5Y12Gl23hmmKolw+b9KVx1MDAwNFx1MDAxYlx1MDAxYVx1MDAwNOCZzN/6uEnn74o5/iv022Fccvf9dnmWPZPQnNTzg/n7XHUwMDE0TFx1MDAxOVwifYG3Slx1MDAwZteJpNXEcIv/oi99Rlx1MDAwN4yG2//36WJvT1x1MDAxNExKmkuFrOKn4PRcdTAwMGZK/Vx1MDAxN2wifQ==<!-- payload-end -->
-  <defs>
-    <style class="style-fonts">
-      @font-face {
-        font-family: "Virgil";
-        src: url("https://unpkg.com/@excalidraw/excalidraw@0.14.2/dist/excalidraw-assets/Virgil.woff2");
-      }
-      @font-face {
-        font-family: "Cascadia";
-        src: url("https://unpkg.com/@excalidraw/excalidraw@0.14.2/dist/excalidraw-assets/Cascadia.woff2");
-      }
-    </style>
-  </defs>
-  <rect x="0" y="0" width="558.2830840223749" height="23.380556316496808" fill="#ffffff"/><g stroke-linecap="round"><g transform="translate(10.321380500495422 10.676766553344208) rotate(0 268.5 1)"><path d="M-0.32 0.24 C88.9 0.5, 446.19 2.44, 535.85 2.7 M1.71 -0.68 C91.23 -0.25, 448.71 0.33, 537.96 0.95" stroke="#000000" stroke-width="1" fill="none"/></g></g><mask/></svg>