Skip to content

Commit dd7681c

Browse files
committed
resolve conflicts
2 parents 4d9ac1f + f1cb0b8 commit dd7681c

File tree

19 files changed

+498
-180
lines changed

19 files changed

+498
-180
lines changed

reports/llms-report.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@
3838
"section": "data-feeds",
3939
"pagesProcessed": 37,
4040
"outputPath": "src/content/data-feeds/llms-full.txt",
41-
"bytes": 302350,
42-
"prevBytes": 302350,
43-
"deltaBytes": 0
41+
"bytes": 302816,
42+
"prevBytes": 302589,
43+
"deltaBytes": 227
4444
},
4545
{
4646
"section": "data-streams",
4747
"pagesProcessed": 55,
4848
"outputPath": "src/content/data-streams/llms-full.txt",
49-
"bytes": 477217,
50-
"prevBytes": 477217,
49+
"bytes": 477063,
50+
"prevBytes": 477063,
5151
"deltaBytes": 0
5252
},
5353
{

src/components/LeftSidebar/leftSidebar.module.css

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
.nav {
2-
padding-bottom: calc(2 * var(--doc-padding));
32
width: 100%;
4-
height: calc(100vh - var(--space-16x)); /* Subtract header height */
3+
height: calc(100vh - var(--space-16x));
4+
/* Subtract header height */
55
position: sticky;
6-
top: var(--space-16x); /* Header height */
7-
overflow: hidden; /* Prevent nav overflow */
6+
top: var(--space-16x);
7+
/* Header height */
8+
overflow: hidden;
9+
/* Prevent nav overflow */
10+
display: flex;
11+
flex-direction: column;
812
}
913

1014
.sidebarDropdowns {
1115
padding-top: var(--space-3x);
16+
flex-shrink: 0;
1217
}
1318

1419
.navGroups {
15-
padding: var(--doc-padding) var(--space-8x) var(--doc-padding) 0;
16-
height: 100%;
20+
padding: var(--doc-padding) var(--space-8x) calc(2 * var(--doc-padding)) 0;
21+
flex: 1;
1722
overflow-y: auto;
1823
scrollbar-width: thin;
1924
scrollbar-color: var(--gray-300) transparent;

src/content/data-feeds/aptos/index.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ You now have a funded testnet account on Aptos.
127127
128128
- The `platform` address is the `ChainlinkPlatform` package address on Aptos testnet ([`0x516e771e1b4a903afe74c27d057c65849ecc1383782f6642d7ff21425f4f9c99`](https://explorer.aptoslabs.com/object/0x516e771e1b4a903afe74c27d057c65849ecc1383782f6642d7ff21425f4f9c99/modules/packages/ChainlinkPlatform?network=testnet)).
129129
130-
**Note**: You can find the mainnet addresses in the [Feeds Addresses](/data-feeds/price-feeds/addresses?page=1&testnetPage=1&network=aptos) page.
130+
**Note**: You can find the mainnet addresses in the [Feeds Addresses](/data-feeds/price-feeds/addresses?network=aptos) page.
131131
132132
1. Run the following command to download the compiled bytecode for the `ChainlinkPlatform` and `ChainlinkDataFeeds` packages:
133133

src/content/data-feeds/l2-sequencer-feeds.mdx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@ Soneium Mainnet: [0xaDE1b9AbB98c6A542E4B49db2588a3Ec4bF7Cdf0](https://soneium.bl
7171

7272
<br />
7373

74+
### <img src="/assets/chains/xlayer.svg" style="height: 20px; width: auto; margin-right: 8px;" />X Layer
75+
76+
X Layer Mainnet: [0x45c2b8C204568A03Dc7A2E32B71D67Fe97F908A9](https://www.okx.com/web3/explorer/xlayer/address/0x45c2b8C204568A03Dc7A2E32B71D67Fe97F908A9)
77+
78+
<br />
79+
7480
### <img src="/assets/chains/zksync.svg" style="height: 20px; width: auto; margin-right: 8px;" />ZKsync
7581

7682
zkSync Mainnet: [0x0E6AC8B967393dcD3D36677c126976157F993940](https://explorer.zksync.io/address/0x0E6AC8B967393dcD3D36677c126976157F993940)

src/content/data-feeds/llms-full.txt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ You now have a funded testnet account on Aptos.
560560

561561
- The `platform` address is the `ChainlinkPlatform` package address on Aptos testnet ([`0x516e771e1b4a903afe74c27d057c65849ecc1383782f6642d7ff21425f4f9c99`](https://explorer.aptoslabs.com/object/0x516e771e1b4a903afe74c27d057c65849ecc1383782f6642d7ff21425f4f9c99/modules/packages/ChainlinkPlatform?network=testnet)).
562562

563-
**Note**: You can find the mainnet addresses in the [Feeds Addresses](/data-feeds/price-feeds/addresses?page=1\&testnetPage=1\&network=aptos) page.
563+
**Note**: You can find the mainnet addresses in the [Feeds Addresses](/data-feeds/price-feeds/addresses?network=aptos) page.
564564

565565
3. Run the following command to download the compiled bytecode for the `ChainlinkPlatform` and `ChainlinkDataFeeds` packages:
566566

@@ -1393,6 +1393,10 @@ Scroll Mainnet: [0x45c2b8C204568A03Dc7A2E32B71D67Fe97F908A9](https://scrollscan.
13931393

13941394
Soneium Mainnet: [0xaDE1b9AbB98c6A542E4B49db2588a3Ec4bF7Cdf0](https://soneium.blockscout.com/address/0xaDE1b9AbB98c6A542E4B49db2588a3Ec4bF7Cdf0)
13951395

1396+
### <img src="/assets/chains/xlayer.svg" style="height: 20px; width: auto; margin-right: 8px;" />X Layer
1397+
1398+
X Layer Mainnet: [0x45c2b8C204568A03Dc7A2E32B71D67Fe97F908A9](https://www.okx.com/web3/explorer/xlayer/address/0x45c2b8C204568A03Dc7A2E32B71D67Fe97F908A9)
1399+
13961400
### <img src="/assets/chains/zksync.svg" style="height: 20px; width: auto; margin-right: 8px;" />ZKsync
13971401

13981402
zkSync Mainnet: [0x0E6AC8B967393dcD3D36677c126976157F993940](https://explorer.zksync.io/address/0x0E6AC8B967393dcD3D36677c126976157F993940)
@@ -3212,6 +3216,14 @@ Data feeds managed by Chainlink Labs will be considered for deprecation if they
32123216

32133217
Known users of these feeds will be contacted directly about the feeds' deprecation. Notifications will also be posted on the [Feeds Scheduled For Deprecation](/data-feeds/deprecating-feeds) page and on our [Discord channel](https://discord.com/channels/592041321326182401/991444378335838318) with two weeks of notice before they are shut down.
32143218

3219+
3220+
<Aside type="note" title="Data Feed Shutdown Behavior">
3221+
Once a feed is shutdown, calls to the feed will behave as follows:
3222+
3223+
- `lastAnswer` will return `0`
3224+
- `latestRoundData` will revert with no data available
3225+
</Aside>
3226+
32153227
## Market hours
32163228

32173229
In addition to categories, be aware that markets for several assets are actively traded only during certain hours. Listed data feeds include an attribute describing their market hours. Chainlink Labs recommends using these feeds only during their specified hours:

src/content/data-feeds/selecting-data-feeds.mdx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,13 @@ Data feeds managed by Chainlink Labs will be considered for deprecation if they
103103

104104
Known users of these feeds will be contacted directly about the feeds' deprecation. Notifications will also be posted on the [Feeds Scheduled For Deprecation](/data-feeds/deprecating-feeds) page and on our [Discord channel](https://discord.com/channels/592041321326182401/991444378335838318) with two weeks of notice before they are shut down.
105105

106+
{/* prettier-ignore */}
107+
<Aside type="note" title="Data Feed Shutdown Behavior">
108+
Once a feed is shutdown, calls to the feed will behave as follows:
109+
- `lastAnswer` will return `0`
110+
- `latestRoundData` will revert with no data available
111+
</Aside>
112+
106113
## Market hours
107114

108115
In addition to categories, be aware that markets for several assets are actively traded only during certain hours. Listed data feeds include an attribute describing their market hours. Chainlink Labs recommends using these feeds only during their specified hours:

src/content/data-streams/llms-full.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5809,7 +5809,7 @@ You'll start with the set up of your Go project, installing the SDK and pasting
58095809

58105810
See the [SDK Reference](/data-streams/reference/data-streams-api/go-sdk#config-struct) page for more configuration options.
58115811

5812-
5. Read from a [testnet crypto stream](/data-streams/crypto-streams?page=1\&testnetPage=1#testnet-crypto-streams). The below example executes the application, reading from the `ETH/USD` crypto stream:
5812+
5. Read from a [testnet crypto stream](/data-streams/crypto-streams#testnet-crypto-streams). The below example executes the application, reading from the `ETH/USD` crypto stream:
58135813

58145814
```bash
58155815
go run single-stream.go 0x000359843a543ee2fe414dc14c7e7920ef10f4372990b79d6361cdc0dd1ba782
@@ -5987,7 +5987,7 @@ You'll start with the set up of your Go project, installing the SDK and pasting
59875987
export API_SECRET="<YOUR_API_SECRET>"
59885988
```
59895989

5990-
4. Read from two [testnet crypto streams](/data-streams/crypto-streams?page=1\&testnetPage=1#testnet-crypto-streams). For this example, you will read from the ETH/USD and LINK/USD Data Streams crypto streams. Run your application:
5990+
4. Read from two [testnet crypto streams](/data-streams/crypto-streams#testnet-crypto-streams). For this example, you will read from the ETH/USD and LINK/USD Data Streams crypto streams. Run your application:
59915991

59925992
```bash
59935993
go run multiple-streams.go 0x000359843a543ee2fe414dc14c7e7920ef10f4372990b79d6361cdc0dd1ba782 0x00036fe43f87884450b4c7e093cd5ed99cac6640d8c2000e6afc02c8838d0265
@@ -6427,7 +6427,7 @@ First, you'll set up a basic Go project, installing the SDK and pasting example
64276427

64286428
See the [SDK Reference](/data-streams/reference/data-streams-api/go-sdk#config-struct) page for more configuration options.
64296429

6430-
5. Subscribe to a [testnet crypto stream](/data-streams/crypto-streams?page=1\&testnetPage=1#testnet-crypto-streams). The below example executes the application, subscribing to the `ETH/USD` crypto stream:
6430+
5. Subscribe to a [testnet crypto stream](/data-streams/crypto-streams#testnet-crypto-streams). The below example executes the application, subscribing to the `ETH/USD` crypto stream:
64316431

64326432
Execute your application:
64336433

@@ -6822,7 +6822,7 @@ You'll start with the set up of your Rust project, installing the SDK and pastin
68226822

68236823
See the [Rust SDK Reference](/data-streams/reference/data-streams-api/rust-sdk#configuration-reference) page for more configuration options.
68246824

6825-
3. Read from a [testnet crypto stream](/data-streams/crypto-streams?page=1\&testnetPage=1#testnet-crypto-streams). The below example executes the application, reading from the `ETH/USD` crypto stream:
6825+
3. Read from a [testnet crypto stream](/data-streams/crypto-streams#testnet-crypto-streams). The below example executes the application, reading from the `ETH/USD` crypto stream:
68266826

68276827
```bash
68286828
cargo run -- 0x000359843a543ee2fe414dc14c7e7920ef10f4372990b79d6361cdc0dd1ba782
@@ -7189,7 +7189,7 @@ In this tutorial, you'll learn how to use the [Data Streams SDK](/data-streams/r
71897189

71907190
See the [Rust SDK Reference](/data-streams/reference/data-streams-api/rust-sdk#configuration-reference) page for more configuration options.
71917191

7192-
3. Subscribe to a [testnet crypto stream](/data-streams/crypto-streams?page=1\&testnetPage=1#testnet-crypto-streams). The below example executes the application, subscribing to the `ETH/USD` crypto stream:
7192+
3. Subscribe to a [testnet crypto stream](/data-streams/crypto-streams#testnet-crypto-streams). The below example executes the application, subscribing to the `ETH/USD` crypto stream:
71937193

71947194
```bash
71957195
cargo run -- 0x000359843a543ee2fe414dc14c7e7920ef10f4372990b79d6361cdc0dd1ba782
@@ -8487,7 +8487,7 @@ You'll start with the set up of your TypeScript project, installing the SDK and
84878487
The TypeScript SDK automatically detects the report version based on the provided feed ID.
84888488
</Aside>
84898489

8490-
3. Read from a [testnet crypto stream](/data-streams/crypto-streams?page=1\&testnetPage=1#testnet-crypto-streams). The below example executes the application, reading from the `ETH/USD` crypto stream:
8490+
3. Read from a [testnet crypto stream](/data-streams/crypto-streams#testnet-crypto-streams). The below example executes the application, reading from the `ETH/USD` crypto stream:
84918491

84928492
```bash
84938493
npx tsx singleStream.ts 0x000359843a543ee2fe414dc14c7e7920ef10f4372990b79d6361cdc0dd1ba782
@@ -9020,7 +9020,7 @@ First, you'll set up a basic TypeScript project, installing the SDK and pasting
90209020
accordingly.
90219021
</Aside>
90229022

9023-
3. Subscribe to a [testnet crypto stream](/data-streams/crypto-streams?page=1\&testnetPage=1#testnet-crypto-streams). The below example executes the application, subscribing to the `ETH/USD` crypto stream:
9023+
3. Subscribe to a [testnet crypto stream](/data-streams/crypto-streams#testnet-crypto-streams). The below example executes the application, subscribing to the `ETH/USD` crypto stream:
90249024

90259025
```bash
90269026
npx tsx stream.ts 0x000359843a543ee2fe414dc14c7e7920ef10f4372990b79d6361cdc0dd1ba782

src/content/data-streams/tutorials/go-sdk-fetch.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ You'll start with the set up of your Go project, installing the SDK and pasting
224224

225225
See the [SDK Reference](/data-streams/reference/data-streams-api/go-sdk#config-struct) page for more configuration options.
226226

227-
1. Read from a [testnet crypto stream](/data-streams/crypto-streams?page=1&testnetPage=1#testnet-crypto-streams). The below example executes the application, reading from the `ETH/USD` crypto stream:
227+
1. Read from a [testnet crypto stream](/data-streams/crypto-streams#testnet-crypto-streams). The below example executes the application, reading from the `ETH/USD` crypto stream:
228228

229229
```bash
230230
go run single-stream.go 0x000359843a543ee2fe414dc14c7e7920ef10f4372990b79d6361cdc0dd1ba782
@@ -404,7 +404,7 @@ You'll start with the set up of your Go project, installing the SDK and pasting
404404
export API_SECRET="<YOUR_API_SECRET>"
405405
```
406406

407-
1. Read from two [testnet crypto streams](/data-streams/crypto-streams?page=1&testnetPage=1#testnet-crypto-streams). For this example, you will read from the ETH/USD and LINK/USD Data Streams crypto streams. Run your application:
407+
1. Read from two [testnet crypto streams](/data-streams/crypto-streams#testnet-crypto-streams). For this example, you will read from the ETH/USD and LINK/USD Data Streams crypto streams. Run your application:
408408

409409
```bash
410410
go run multiple-streams.go 0x000359843a543ee2fe414dc14c7e7920ef10f4372990b79d6361cdc0dd1ba782 0x00036fe43f87884450b4c7e093cd5ed99cac6640d8c2000e6afc02c8838d0265

src/content/data-streams/tutorials/go-sdk-stream.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ First, you'll set up a basic Go project, installing the SDK and pasting example
231231

232232
See the [SDK Reference](/data-streams/reference/data-streams-api/go-sdk#config-struct) page for more configuration options.
233233

234-
1. Subscribe to a [testnet crypto stream](/data-streams/crypto-streams?page=1&testnetPage=1#testnet-crypto-streams). The below example executes the application, subscribing to the `ETH/USD` crypto stream:
234+
1. Subscribe to a [testnet crypto stream](/data-streams/crypto-streams#testnet-crypto-streams). The below example executes the application, subscribing to the `ETH/USD` crypto stream:
235235

236236
Execute your application:
237237

src/content/data-streams/tutorials/rust-sdk-fetch.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ You'll start with the set up of your Rust project, installing the SDK and pastin
181181

182182
See the [Rust SDK Reference](/data-streams/reference/data-streams-api/rust-sdk#configuration-reference) page for more configuration options.
183183

184-
1. Read from a [testnet crypto stream](/data-streams/crypto-streams?page=1&testnetPage=1#testnet-crypto-streams). The below example executes the application, reading from the `ETH/USD` crypto stream:
184+
1. Read from a [testnet crypto stream](/data-streams/crypto-streams#testnet-crypto-streams). The below example executes the application, reading from the `ETH/USD` crypto stream:
185185

186186
```bash
187187
cargo run -- 0x000359843a543ee2fe414dc14c7e7920ef10f4372990b79d6361cdc0dd1ba782

0 commit comments

Comments
 (0)