witnet · guidiaz · Oct 10, 2023 · Oct 10, 2023 · Oct 11, 2023 · Oct 11, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "witnet"
-version = "1.6.7"
+version = "2.0.0"
 authors = ["Witnet Foundation <[email protected]>"]
 publish = false
 repository = "witnet/witnet-rust"

diff --git a/bridges/centralized-ethereum/Cargo.toml b/bridges/centralized-ethereum/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "witnet-centralized-ethereum-bridge"
-version = "1.6.7"
+version = "2.0.0"
 authors = ["Witnet Foundation <[email protected]>"]
 edition = "2018"
 

diff --git a/data_structures/Cargo.toml b/data_structures/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Witnet Foundation <[email protected]>"]
 description = "data structures component"
 edition = "2021"
 name = "witnet_data_structures"
-version = "1.6.7"
+version = "2.0.0"
 workspace = ".."
 
 [features]

diff --git a/data_structures/src/chain/mod.rs b/data_structures/src/chain/mod.rs
@@ -1645,11 +1645,17 @@ pub enum RADType {
     /// HTTP POST request
     #[serde(rename = "HTTP-POST")]
     HttpPost,
+    /// HTTP HEAD request
+    #[serde(rename = "HTTP-HEAD")]
+    HttpHead,
 }
 
 impl RADType {
     pub fn is_http(&self) -> bool {
-        matches!(self, RADType::HttpGet | RADType::HttpPost)
+        matches!(
+            self,
+            RADType::HttpGet | RADType::HttpPost | RADType::HttpHead
+        )
     }
 }
 
@@ -1701,7 +1707,7 @@ pub struct RADRetrieve {
     pub script: Vec<u8>,
     /// Body of a HTTP-POST request
     pub body: Vec<u8>,
-    /// Extra headers of a HTTP-GET or HTTP-POST request
+    /// Extra headers of a HTTP-GET, HTTP-POST or HTTP-HEAD request
     pub headers: Vec<(String, String)>,
 }
 
@@ -1810,6 +1816,9 @@ impl RADRetrieve {
                     &[Field::Body, Field::Headers],
                 )
             }
+            RADType::HttpHead => {
+                check(&[Field::Kind, Field::Url, Field::Script], &[Field::Headers])
+            }
         }
     }
 
@@ -2681,7 +2690,7 @@ impl TransactionsPool {
                     for input in &vt_tx.body.inputs {
                         self.output_pointer_map
                             .entry(input.output_pointer)
-                            .or_insert_with(Vec::new)
+                            .or_default()
                             .push(vt_tx.hash());
                     }
 
@@ -2706,7 +2715,7 @@ impl TransactionsPool {
                     for input in &dr_tx.body.inputs {
                         self.output_pointer_map
                             .entry(input.output_pointer)
-                            .or_insert_with(Vec::new)
+                            .or_default()
                             .push(dr_tx.hash());
                     }
 

diff --git a/data_structures/src/data_request.rs b/data_structures/src/data_request.rs
@@ -143,7 +143,7 @@ impl DataRequestPool {
 
         self.data_requests_by_epoch
             .entry(epoch)
-            .or_insert_with(HashSet::new)
+            .or_default()
             .insert(dr_hash);
         self.data_request_pool.insert(dr_hash, dr_state);
 

diff --git a/data_structures/src/proto/mod.rs b/data_structures/src/proto/mod.rs
@@ -51,6 +51,7 @@ impl ProtobufConvert for chain::RADType {
             chain::RADType::HttpGet => witnet::DataRequestOutput_RADRequest_RADType::HttpGet,
             chain::RADType::Rng => witnet::DataRequestOutput_RADRequest_RADType::Rng,
             chain::RADType::HttpPost => witnet::DataRequestOutput_RADRequest_RADType::HttpPost,
+            chain::RADType::HttpHead => witnet::DataRequestOutput_RADRequest_RADType::HttpHead,
         }
     }
 
@@ -60,6 +61,7 @@ impl ProtobufConvert for chain::RADType {
             witnet::DataRequestOutput_RADRequest_RADType::HttpGet => chain::RADType::HttpGet,
             witnet::DataRequestOutput_RADRequest_RADType::Rng => chain::RADType::Rng,
             witnet::DataRequestOutput_RADRequest_RADType::HttpPost => chain::RADType::HttpPost,
+            witnet::DataRequestOutput_RADRequest_RADType::HttpHead => chain::RADType::HttpHead,
         })
     }
 }

diff --git a/data_structures/src/radon_error.rs b/data_structures/src/radon_error.rs
@@ -34,6 +34,8 @@ pub enum RadonErrors {
     HTTPError = 0x30,
     /// Al least one of the sources could not be retrieved, timeout reached.
     RetrieveTimeout = 0x31,
+    /// Value cannot be extracted from binary buffer
+    BufferIsNotValue = 0x32,
     // Math errors
     /// Math operator caused an underflow.
     Underflow = 0x40,

diff --git a/data_structures/src/serialization_helpers.rs b/data_structures/src/serialization_helpers.rs
@@ -360,7 +360,7 @@ struct RADRetrieveSerializationHelperJson {
     /// Body of a HTTP-POST request
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub body: Vec<u8>,
-    /// Extra headers of a HTTP-GET or HTTP-POST request
+    /// Extra headers of a HTTP-GET, HTTP-HEAD or HTTP-POST request
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub headers: Vec<(String, String)>,
 }
@@ -377,7 +377,7 @@ struct RADRetrieveSerializationHelperBincode {
     pub script: Vec<u8>,
     /// Body of a HTTP-POST request
     pub body: Vec<u8>,
-    /// Extra headers of a HTTP-GET or HTTP-POST request
+    /// Extra headers of a HTTP-GET, HTTP-HEAD or HTTP-POST request
     pub headers: Vec<(String, String)>,
 }
 

diff --git a/net/src/client/http/mod.rs b/net/src/client/http/mod.rs
@@ -151,7 +151,7 @@ pub struct WitnetHttpResponse {
 
 impl WitnetHttpResponse {
     #[inline]
-    /// Simple wrapper around `isahc::Response::status`.
+    /// Simple wrapper around `isahc::Response`.
     pub fn inner(self) -> isahc::Response<isahc::AsyncBody> {
         self.res
     }

diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "witnet_node"
-version = "1.6.7"
+version = "2.0.0"
 authors = ["Witnet Foundation <[email protected]>"]
 workspace = ".."
 description = "node component"

diff --git a/rad/Cargo.toml b/rad/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "witnet_rad"
-version = "0.3.2"
+version = "0.3.3"
 authors = ["Witnet Foundation <[email protected]>"]
 edition = "2021"
 workspace = ".."
@@ -10,6 +10,7 @@ description = "RAD component"
 rocksdb-backend = ["witnet_data_structures/rocksdb-backend"]
 
 [dependencies]
+base64 = "0.21.5"
 cbor-codec = { git = "https://github.com/witnet/cbor-codec.git", branch = "feat/ldexpf-shim" }
 failure = "0.1.8"
 futures = "0.3.4"
@@ -23,9 +24,11 @@ minidom = { git = "https://github.com/witnet/xmpp-rs", rev = "bc8a33ff5da95ee403
 num_enum = "0.4.2"
 ordered-float = "3.0"
 rand = "0.7.3"
+regex = "1.4.2"
 serde = "1.0.111"
 serde_cbor = "0.11.2"
 serde_json = "1.0.96"
+slicestring = "0.3.2"
 # the url crate is used to perform additional validations before passing arguments to the surf http client
 # the version of url must be kept in sync with the version used by surf in the `witnet_net` crate
 url = "2.1.1"

diff --git a/rad/src/error.rs b/rad/src/error.rs
@@ -431,6 +431,10 @@ impl RadError {
         }
 
         Ok(RadonError::new(match kind {
+            RadonErrors::BufferIsNotValue => {
+                let (description,) = deserialize_args(error_args)?;
+                RadError::BufferIsNotValue { description }
+            }
             RadonErrors::RequestTooManySources => RadError::RequestTooManySources,
             RadonErrors::ScriptTooManyCalls => RadError::ScriptTooManyCalls,
             RadonErrors::Overflow => RadError::Overflow,
@@ -574,6 +578,7 @@ impl RadError {
     pub fn try_into_error_code(&self) -> Result<RadonErrors, RadError> {
         Ok(match self {
             RadError::Unknown => RadonErrors::Unknown,
+            RadError::BufferIsNotValue { .. } => RadonErrors::BufferIsNotValue,
             RadError::SourceScriptNotCBOR => RadonErrors::SourceScriptNotCBOR,
             RadError::SourceScriptNotArray => RadonErrors::SourceScriptNotArray,
             RadError::SourceScriptNotRADON => RadonErrors::SourceScriptNotRADON,