Address Go and Rust comments.

ro-tex · ro-tex · commit a39a206ba2fd · 2025-11-11T10:57:25.000+01:00
diff --git a/go/feed/feed.go b/go/feed/feed.go
@@ -21,6 +21,7 @@ const (
 	FeedVersion8
 	FeedVersion9
 	FeedVersion10
+	FeedVersion13
 	_
 )
 
diff --git a/go/report/v13/data.go b/go/report/v13/data.go
@@ -1,4 +1,4 @@
-package v10
+package v13
 
 import (
 	"fmt"
diff --git a/go/report/v13/data_test.go b/go/report/v13/data_test.go
@@ -1,4 +1,4 @@
-package v10
+package v13
 
 import (
 	"math/big"
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
diff --git a/rust/README.md b/rust/README.md
@@ -20,8 +20,8 @@ Add the following to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-chainlink-data-streams-report = "1.0.3"
-chainlink-data-streams-sdk = { version = "1.0.3", features = ["full"] }
+chainlink-data-streams-report = "1.0.4"
+chainlink-data-streams-sdk = { version = "1.0.4", features = ["full"] }
 ```
 
 #### Features
diff --git a/rust/crates/report/Cargo.toml b/rust/crates/report/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chainlink-data-streams-report"
-version = "1.0.3"
+version = "1.0.4"
 edition = "2021"
 description = "Chainlink Data Streams Report"
 license = "MIT"
diff --git a/rust/crates/report/src/report.rs b/rust/crates/report/src/report.rs
@@ -10,6 +10,7 @@ pub mod v7;
 pub mod v8;
 pub mod v9;
 pub mod v10;
+pub mod v13;
 
 use base::{ReportBase, ReportError};
 
@@ -123,7 +124,7 @@ pub fn decode_full_report(payload: &[u8]) -> Result<(Vec<[u8; 32]>, Vec<u8>), Re
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::report::{v1::ReportDataV1, v2::ReportDataV2, v3::ReportDataV3, v4::ReportDataV4, v5::ReportDataV5, v6::ReportDataV6, v7::ReportDataV7, v8::ReportDataV8, v9::ReportDataV9, v10::ReportDataV10};
+    use crate::report::{v1::ReportDataV1, v2::ReportDataV2, v3::ReportDataV3, v4::ReportDataV4, v5::ReportDataV5, v6::ReportDataV6, v7::ReportDataV7, v8::ReportDataV8, v9::ReportDataV9, v10::ReportDataV10, v13::ReportDataV13};
     use num_bigint::BigInt;
 
     const V1_FEED_ID: ID = ID([
@@ -166,11 +167,20 @@ mod tests {
         00, 10, 107, 74, 167, 229, 124, 167, 182, 138, 225, 191, 69, 101, 63, 86, 182, 86, 253, 58,
         163, 53, 239, 127, 174, 105, 107, 102, 63, 27, 132, 114,
     ]);
+    const V13_FEED_ID: ID = ID([
+        00, 13, 19, 169, 185, 197, 227, 122, 9, 159, 55, 78, 146, 195, 121, 20, 175, 92, 38, 143,
+        58, 138, 151, 33, 241, 114, 81, 53, 191, 180, 203, 184,
+    ]);
 
     pub const MOCK_TIMESTAMP: u32 = 1718885772;
     pub const MOCK_FEE: usize = 10;
     pub const MOCK_PRICE: isize = 100;
     pub const MARKET_STATUS_OPEN: u32 = 2;
+    pub const MOCK_BEST_ASK: isize = 227;
+    pub const MOCK_BEST_BID: isize = 229;
+    pub const MOCK_ASK_VOLUME: u64 = 1500;
+    pub const MOCK_BID_VOLUME: u64 = 1200;
+    pub const MOCK_LAST_TRADED_PRICE: isize = 228;
 
     pub fn generate_mock_report_data_v1() -> ReportDataV1 {
         let report_data = ReportDataV1 {
@@ -347,20 +357,18 @@ mod tests {
         report_data
     }
 
-    pub fn generate_mock_report_data_v13() -> ReportDataV10 {
-        const MOCK_MULTIPLIER: isize = 1000000000000000000; // 1.0 with 18 decimals
-
-        let report_data = ReportDataV10 {
-            feed_id: V10_FEED_ID,
+    pub fn generate_mock_report_data_v13() -> ReportDataV13 {
+        let report_data = ReportDataV13 {
+            feed_id: V13_FEED_ID,
             valid_from_timestamp: MOCK_TIMESTAMP,
             observations_timestamp: MOCK_TIMESTAMP,
             native_fee: BigInt::from(MOCK_FEE),
             link_fee: BigInt::from(MOCK_FEE),
             expires_at: MOCK_TIMESTAMP + 100,
             best_ask: BigInt::from(MOCK_BEST_ASK),
             best_bid: BigInt::from(MOCK_BEST_BID),
-            ask_volume: MARKET_ASK_VOLUME,
-            bid_volume: MARKET_BID_VOLUME,
+            ask_volume: MOCK_ASK_VOLUME,
+            bid_volume: MOCK_BID_VOLUME,
             last_traded_price: BigInt::from(MOCK_LAST_TRADED_PRICE),
         };
 
@@ -716,4 +724,37 @@ mod tests {
 
         assert_eq!(decoded_report.feed_id, V10_FEED_ID);
     }
+
+    #[test]
+    fn test_decode_report_v13() {
+        let report_data = generate_mock_report_data_v13();
+        let encoded_report_data = report_data.abi_encode().unwrap();
+
+        let report = generate_mock_report(&encoded_report_data);
+
+        let (_report_context, report_blob) = decode_full_report(&report).unwrap();
+
+        let expected_report_blob = vec![
+            "000d13a9b9c5e37a099f374e92c37914af5c268f3a8a9721f1725135bfb4cbb8",
+            "0000000000000000000000000000000000000000000000000000000066741d8c",
+            "0000000000000000000000000000000000000000000000000000000066741d8c",
+            "000000000000000000000000000000000000000000000000000000000000000a",
+            "000000000000000000000000000000000000000000000000000000000000000a",
+            "0000000000000000000000000000000000000000000000000000000066741df0",
+            "00000000000000000000000000000000000000000000000000000000000000e3",
+            "00000000000000000000000000000000000000000000000000000000000000e5",
+            "00000000000000000000000000000000000000000000000000000000000005dc",
+            "00000000000000000000000000000000000000000000000000000000000004b0",
+            "00000000000000000000000000000000000000000000000000000000000000e4",
+        ];
+
+        let expected = bytes(&format!("0x{}", expected_report_blob.join("")));
+        println!("Actual  : {}", hex::encode(&report_blob));
+        println!("Expected: {}", hex::encode(&expected));
+        assert_eq!(report_blob, expected);
+
+        let decoded_report = ReportDataV13::decode(&report_blob).unwrap();
+
+        assert_eq!(decoded_report.feed_id, V13_FEED_ID);
+    }
 }
diff --git a/rust/crates/report/src/report/v13.rs b/rust/crates/report/src/report/v13.rs
@@ -44,7 +44,6 @@ pub struct ReportDataV13 {
     pub native_fee: BigInt,
     pub link_fee: BigInt,
     pub expires_at: u32,
-    pub last_update_timestamp: u64,
     pub best_ask: BigInt,
     pub best_bid: BigInt,
     pub ask_volume: u64,
@@ -67,7 +66,7 @@ impl ReportDataV13 {
     ///
     /// Returns a `ReportError` if the data is too short or if the data is invalid.
     pub fn decode(data: &[u8]) -> Result<Self, ReportError> {
-        if data.len() < 12 * ReportBase::WORD_SIZE {
+        if data.len() < 10 * ReportBase::WORD_SIZE {
             return Err(ReportError::DataTooShort("ReportDataV13"));
         }
 
@@ -80,11 +79,11 @@ impl ReportDataV13 {
         let native_fee = ReportBase::read_uint192(data, 3 * ReportBase::WORD_SIZE)?;
         let link_fee = ReportBase::read_uint192(data, 4 * ReportBase::WORD_SIZE)?;
         let expires_at = ReportBase::read_uint32(data, 5 * ReportBase::WORD_SIZE)?;
-        let best_ask = ReportBase::read_int192(data, 7 * ReportBase::WORD_SIZE)?;
-        let best_bid = ReportBase::read_int192(data, 8 * ReportBase::WORD_SIZE)?;
-        let ask_volume = ReportBase::read_uint64(data, 9 * ReportBase::WORD_SIZE)?;
-        let bid_volume = ReportBase::read_uint64(data, 10 * ReportBase::WORD_SIZE)?;
-        let last_traded_price = ReportBase::read_int192(data, 11 * ReportBase::WORD_SIZE)?;
+        let best_ask = ReportBase::read_int192(data, 6 * ReportBase::WORD_SIZE)?;
+        let best_bid = ReportBase::read_int192(data, 7 * ReportBase::WORD_SIZE)?;
+        let ask_volume = ReportBase::read_uint64(data, 8 * ReportBase::WORD_SIZE)?;
+        let bid_volume = ReportBase::read_uint64(data, 9 * ReportBase::WORD_SIZE)?;
+        let last_traded_price = ReportBase::read_int192(data, 10 * ReportBase::WORD_SIZE)?;
 
         Ok(Self {
             feed_id,
@@ -119,7 +118,6 @@ impl ReportDataV13 {
         buffer.extend_from_slice(&ReportBase::encode_uint192(&self.native_fee)?);
         buffer.extend_from_slice(&ReportBase::encode_uint192(&self.link_fee)?);
         buffer.extend_from_slice(&ReportBase::encode_uint32(self.expires_at)?);
-        buffer.extend_from_slice(&ReportBase::encode_uint64(self.last_update_timestamp)?);
         buffer.extend_from_slice(&ReportBase::encode_int192(&self.best_ask)?);
         buffer.extend_from_slice(&ReportBase::encode_int192(&self.best_bid)?);
         buffer.extend_from_slice(&ReportBase::encode_uint64(self.ask_volume)?);
@@ -147,8 +145,6 @@ mod tests {
         let encoded = report_data.abi_encode().unwrap();
         let decoded = ReportDataV13::decode(&encoded).unwrap();
 
-        const MOCK_MULTIPLIER: isize = 1000000000000000000;
-
         let expected_feed_id = ID::from_hex_str(V13_FEED_ID_STR).unwrap();
         let expected_timestamp: u32 = MOCK_TIMESTAMP;
         let expected_fee = BigInt::from(MOCK_FEE);
diff --git a/rust/crates/sdk/Cargo.toml b/rust/crates/sdk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chainlink-data-streams-sdk"
-version = "1.0.3"
+version = "1.0.4"
 edition = "2021"
 rust-version = "1.70"
 description = "Chainlink Data Streams client SDK"
@@ -11,7 +11,7 @@ exclude = ["/target/*", "examples/*", "tests/*", "docs/*", "book/*"]
 keywords = ["chainlink"]
 
 [dependencies]
-chainlink-data-streams-report = { path = "../report", version = "1.0.3" }
+chainlink-data-streams-report = { path = "../report", version = "1.0.4" }
 reqwest = { version = "0.11.20", features = ["json", "rustls-tls"] }
 tokio = { version = "1.29.1", features = ["full"] }
 tokio-tungstenite = { version = "0.20.1", features = [
diff --git a/rust/docs/guides/foundry.md b/rust/docs/guides/foundry.md
@@ -217,8 +217,8 @@ version = "0.0.1"
 edition = "2021"
 
 [dependencies]
-chainlink-data-streams-report = "1.0.0"
-chainlink-data-streams-sdk = { version = "1.0.0", features = ["rest"] }
+chainlink-data-streams-report = "1.0.4"
+chainlink-data-streams-sdk = { version = "1.0.4", features = ["rest"] }
 dotenv = "0.15"
 tokio = { version = "1", features = ["full"] }
 
diff --git a/rust/docs/introduction.md b/rust/docs/introduction.md
@@ -20,8 +20,8 @@ Add the following to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-chainlink-data-streams-report = "1.0.0"
-chainlink-data-streams-sdk = { version = "1.0.0", features = ["full"] }
+chainlink-data-streams-report = "1.0.4"
+chainlink-data-streams-sdk = { version = "1.0.4", features = ["full"] }
 ```
 
 #### Features

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ const (`
`21`	`21`	`FeedVersion8`
`22`	`22`	`FeedVersion9`
`23`	`23`	`FeedVersion10`
	`24`	`+ FeedVersion13`
`24`	`25`	`_`
`25`	`26`	`)`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package v10`
	`1`	`+package v13`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`