Skip to content

Commit 9b9f7bf

Browse files
authored
Merge branch 'main' into fassets/autoredeem
2 parents 84fd866 + b93fed6 commit 9b9f7bf

File tree

86 files changed

+1295
-982
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1295
-982
lines changed

.eslintrc.js

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,33 @@ module.exports = {
88
extends: [
99
"eslint:recommended",
1010
"plugin:@typescript-eslint/recommended",
11-
"prettier",
11+
"plugin:prettier/recommended",
1212
"plugin:@docusaurus/recommended",
1313
],
1414
parser: "@typescript-eslint/parser",
1515
parserOptions: {
1616
ecmaVersion: "latest",
1717
sourceType: "module",
1818
},
19-
plugins: ["@typescript-eslint", "prettier"],
19+
plugins: ["@typescript-eslint"],
2020
rules: {
21-
"prettier/prettier": [2],
21+
"prettier/prettier": "error",
22+
"@typescript-eslint/no-unused-vars": ["error", { argsIgnorePattern: "^_" }],
23+
"@typescript-eslint/consistent-type-imports": [
24+
"warn",
25+
{ prefer: "type-imports" },
26+
],
2227
},
28+
overrides: [
29+
{
30+
files: [
31+
"*.config.js",
32+
"*.config.ts",
33+
"docusaurus.config.*",
34+
"sidebars.*",
35+
],
36+
env: { node: true },
37+
rules: { "@typescript-eslint/no-var-requires": "off" },
38+
},
39+
],
2340
};

.github/workflows/check-external-links.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ jobs:
1212
check-external-links:
1313
runs-on: ubuntu-latest
1414
permissions:
15-
issues: write
15+
contents: read
16+
pull-requests: write
1617
steps:
1718
- uses: actions/checkout@v6
1819
- name: Restore lychee cache
@@ -24,16 +25,16 @@ jobs:
2425
- name: Link Checker
2526
id: lychee
2627
uses: lycheeverse/lychee-action@v2
28+
continue-on-error: true
2729
with:
2830
lycheeVersion: "latest"
2931
args: |
3032
--config lychee.toml
31-
.
32-
fail: true
33+
docs
3334
env:
34-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
35+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3536
- name: Comment on PR if broken links found
36-
if: steps.lychee.outputs.exit_code != 0
37+
if: ${{ always() && steps.lychee.outputs.exit_code != 0 }}
3738
uses: thollander/actions-comment-pull-request@v3
3839
with:
3940
message: |
@@ -47,3 +48,6 @@ jobs:
4748
</details>
4849
env:
4950
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
51+
- name: Fail if broken links found
52+
if: ${{ steps.lychee.outputs.exit_code != 0 }}
53+
run: exit 1

automations/ftso_feeds.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,5 +494,13 @@
494494
"category": "Crypto",
495495
"risk": 2,
496496
"feed_index": 61
497+
},
498+
{
499+
"feed_name": "MON/USD",
500+
"feed_id": "0x014d4f4e2f55534400000000000000000000000000",
501+
"base_asset": "Monad",
502+
"category": "Crypto",
503+
"risk": 2,
504+
"feed_index": 62
497505
}
498506
]

automations/ftso_risk.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,6 @@
6060
{ "name": "BERA/USD", "risk": 1 },
6161
{ "name": "OP/USD", "risk": 1 },
6262
{ "name": "PUMP/USD", "risk": 2 },
63-
{ "name": "XPL/USD", "risk": 2 }
63+
{ "name": "XPL/USD", "risk": 2 },
64+
{ "name": "MON/USD", "risk": 2 }
6465
]

automations/solidity_reference.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
},
151151
{
152152
"name": "NodePossessionVerifier",
153-
"address": "0x168F316F4f2FEd0AA99C3c73456ed11ba2FF8cB0"
153+
"address": "0x54380a03d5fe92bd5D95d31411886Faa85844A1b"
154154
},
155155
{
156156
"name": "VoterRegistry",
@@ -412,7 +412,7 @@
412412
},
413413
{
414414
"name": "NodePossessionVerifier",
415-
"address": "0x0b001936e60F02Ee3BEfb4033b6360474F50a538"
415+
"address": "0x8DE9e19E8DB504572cF8e5B789CCD68Afe543bB0"
416416
},
417417
{
418418
"name": "VoterRegistry",

docs/1-intro.mdx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ Additional configuration and API resources are detailed on the [Network](/networ
134134
type: "link",
135135
label: "Wallet SDKs",
136136
href: "/network/developer-tools#wallet-sdks",
137-
description: "Turnkey, Wagmi, Web3Auth, RainbowKit, Etherspot.",
137+
description:
138+
"Turnkey, Wagmi, MetaMask Embedded Wallets, RainbowKit, Etherspot.",
138139
docId: undefined,
139140
}}
140141
/>

docs/fassets/developer-guides/usdt0-fxrp-swap.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ Before starting, make sure you have:
2626

2727
## Required Addresses on Flare Mainnet
2828

29-
- V3 SwapRouter (SparkDEX): [0x8a1E35F5c98C4E85B36B7B253222eE17773b2781](https://flarescan.com/address/0x8a1E35F5c98C4E85B36B7B253222eE17773b2781/contract/14/code).
30-
- USDT0: [0xe7cd86e13AC4309349F30B3435a9d337750fC82D](https://flarescan.com/address/0xe7cd86e13AC4309349F30B3435a9d337750fC82D).
29+
- V3 SwapRouter (SparkDEX): [0x8a1E35F5c98C4E85B36B7B253222eE17773b2781](https://flare-explorer.flare.network/address/0x8a1E35F5c98C4E85B36B7B253222eE17773b2781?tab=contract).
30+
- USDT0: [0xe7cd86e13AC4309349F30B3435a9d337750fC82D](https://flare-explorer.flare.network/address/0xe7cd86e13AC4309349F30B3435a9d337750fC82D).
3131
- FXRP: [resolved dynamically from the Asset Manager](/fassets/developer-guides/fassets-fxrp-address).
3232

3333
## Solidity Uniswap V3 Wrapper Contract

docs/network/2-developer-tools.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
id: developer-tools
33
title: Developer Tools
44
sidebar_label: Developer Tools
5-
description: Developer tools for Flare including RPCs, bridges, indexers, wallet SDKs, and more.
5+
description: Developer tools for Flare including RPCs, bridges, wallet SDKs, and more.
66
keywords: [developer tools, rpc, bridge, indexer, sdk, wallet]
77
toc_min_heading_level: 2
88
toc_max_heading_level: 3
@@ -14,12 +14,12 @@ import DeveloperTools from "@site/src/components/developerTools";
1414

1515
<div className="visually-hidden">
1616

17+
## Bridges
18+
1719
## RPCs
1820

1921
## OFTs
2022

21-
## Bridges
22-
2323
## Indexers
2424

2525
## Wallet SDKs

docs/run-node/2-from-source.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Make sure to check the [hardware requirements](/run-node/system-requirements) be
2020
- [git](https://git-scm.com/install/)
2121
- [GCC](https://gcc.gnu.org/install/)
2222
- [jq](https://stedolan.github.io/jq/download/)
23-
- [rsync](https://rsync.samba.org/download.html)
23+
- [rsync](https://github.com/RsyncProject/rsync)
2424
- [cURL](https://curl.se/download.html)
2525
- [Ubuntu](https://ubuntu.com) (`>=24.10`)
2626

docs/run-node/6-GCP-marketplace-nodes.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Ensure you have:
5959
- **roles/compute.admin**
6060
- **roles/iam.serviceAccountUser**
6161

62-
- Verify that your [Quotas and System Limits](https://cloud.google.com/docs/quotas/view-manage), located in **IAM and admin > Quotas and system limits**, meet the resource requirements for the blockchain node you intend to deploy. Refer to the [Supported blockchain nodes](#supported-blockchain-nodes) table for the specific resource requirements of each node. Adjust your quotas as needed to ensure sufficient resources are available.
62+
- Verify that your [Quotas and System Limits](https://docs.cloud.google.com/docs/quotas/view-manage), located in **IAM and admin > Quotas and system limits**, meet the resource requirements for the blockchain node you intend to deploy. Refer to the [Supported blockchain nodes](#supported-blockchain-nodes) table for the specific resource requirements of each node. Adjust your quotas as needed to ensure sufficient resources are available.
6363

6464
## Setup a node
6565

@@ -260,4 +260,4 @@ resource "google_compute_instance" "this" {
260260
limit = 500
261261
dimensions = map[region:us-west1]
262262
```
263-
- **Solution**: Resource quotas need to be increased manually. To do this, refer to the [Quotas and System Limits documentation](https://cloud.google.com/docs/quotas/view-manage) and navigate to **IAM & Admin > Quotas**. After adjusting the quotas, delete the failed deployment and deploy a new one.
263+
- **Solution**: Resource quotas need to be increased manually. To do this, refer to the [Quotas and System Limits documentation](https://docs.cloud.google.com/docs/quotas/view-manage) and navigate to **IAM & Admin > Quotas**. After adjusting the quotas, delete the failed deployment and deploy a new one.

0 commit comments

Comments
 (0)