Merge pull request #597 from radixdlt/feature/sbor-encoder-decoder-tr…

…aits Feature/sbor encoder decoder traits
radixdlt · Nov 24, 2022 · 56bd796 · 56bd796
2 parents ed3475b + dccfc1d
commit 56bd796
Show file tree

Hide file tree

Showing 102 changed files with 2,620 additions and 1,690 deletions.
diff --git a/radix-engine-interface/src/api/api.rs b/radix-engine-interface/src/api/api.rs
@@ -1,19 +1,18 @@
 use crate::api::types::ScryptoActor;
 use crate::api::wasm_input::NativeFnInvocation;
 use crate::crypto::Hash;
-use crate::data::ScryptoCustomTypeId;
+use crate::data::ScryptoDecode;
 use crate::model::*;
 use sbor::rust::fmt::Debug;
 use sbor::rust::string::String;
 use sbor::rust::vec::Vec;
-use sbor::Decode;
 
 use super::types::*;
 
 pub trait ScryptoNativeInvocation: Into<NativeFnInvocation> + SysInvocation {}
 
 pub trait SysInvocation {
-    type Output: Debug + Decode<ScryptoCustomTypeId>;
+    type Output: Debug + ScryptoDecode;
 }
 
 pub trait SysNativeInvokable<I: SysInvocation, E> {

diff --git a/radix-engine-interface/src/data/custom_value.rs b/radix-engine-interface/src/data/custom_value.rs
@@ -39,8 +39,8 @@ pub enum ScryptoCustomValue {
     NonFungibleId(NonFungibleId),
 }
 
-impl CustomValue<ScryptoCustomTypeId> for ScryptoCustomValue {
-    fn encode_type_id(&self, encoder: &mut ScryptoEncoder) {
+impl<E: Encoder<ScryptoCustomTypeId>> Encode<ScryptoCustomTypeId, E> for ScryptoCustomValue {
+    fn encode_type_id(&self, encoder: &mut E) -> Result<(), EncodeError> {
         match self {
             ScryptoCustomValue::PackageAddress(_) => {
                 encoder.write_type_id(SborTypeId::Custom(ScryptoCustomTypeId::PackageAddress))
@@ -105,7 +105,7 @@ impl CustomValue<ScryptoCustomTypeId> for ScryptoCustomValue {
         }
     }
 
-    fn encode_body(&self, encoder: &mut ScryptoEncoder) {
+    fn encode_body(&self, encoder: &mut E) -> Result<(), EncodeError> {
         match self {
             // TODO: vector free
             ScryptoCustomValue::PackageAddress(v) => encoder.write_slice(&v.to_vec()),
@@ -119,13 +119,13 @@ impl CustomValue<ScryptoCustomTypeId> for ScryptoCustomValue {
             ScryptoCustomValue::Vault(v) => encoder.write_slice(v.as_slice()),
             ScryptoCustomValue::Expression(v) => {
                 let buf = v.to_vec();
-                encoder.write_size(buf.len());
+                encoder.write_size(buf.len())?;
                 encoder.write_slice(&buf)
             }
             ScryptoCustomValue::Blob(v) => encoder.write_slice(&v.to_vec()),
             ScryptoCustomValue::NonFungibleAddress(v) => {
                 let buf = v.to_vec();
-                encoder.write_size(buf.len());
+                encoder.write_size(buf.len())?;
                 encoder.write_slice(&buf)
             }
             ScryptoCustomValue::Hash(v) => encoder.write_slice(&v.to_vec()),
@@ -137,16 +137,21 @@ impl CustomValue<ScryptoCustomTypeId> for ScryptoCustomValue {
             ScryptoCustomValue::PreciseDecimal(v) => encoder.write_slice(&v.to_vec()),
             ScryptoCustomValue::NonFungibleId(v) => {
                 let buf = v.to_vec();
-                encoder.write_size(buf.len());
+                encoder.write_size(buf.len())?;
                 encoder.write_slice(&buf)
             }
         }
     }
+}
 
+impl<D: Decoder<ScryptoCustomTypeId>> Decode<ScryptoCustomTypeId, D> for ScryptoCustomValue {
     fn decode_body_with_type_id(
-        decoder: &mut ScryptoDecoder,
-        type_id: ScryptoCustomTypeId,
+        decoder: &mut D,
+        type_id: SborTypeId<ScryptoCustomTypeId>,
     ) -> Result<Self, DecodeError> {
+        let SborTypeId::Custom(type_id) = type_id else {
+            return Err(DecodeError::UnexpectedCustomTypeId { actual: type_id.as_u8() });
+        };
         match type_id {
             ScryptoCustomTypeId::PackageAddress => {
                 let n = 27;

diff --git a/radix-engine-interface/src/data/indexed_value.rs b/radix-engine-interface/src/data/indexed_value.rs
@@ -13,6 +13,8 @@ use utils::ContextualDisplay;
 
 #[derive(Debug, Clone, PartialEq, Eq, TypeId, Encode, Decode)]
 pub enum ScryptoValueDecodeError {
+    RawValueEncodeError(EncodeError),
+    TypedValueEncodeError(EncodeError),
     DecodeError(DecodeError),
     ValueIndexingError(ValueIndexingError),
 }
@@ -51,13 +53,14 @@ impl IndexedScryptoValue {
         Self::from_typed(&())
     }
 
-    pub fn from_typed<T: Encode<ScryptoCustomTypeId>>(value: &T) -> Self {
-        let bytes = encode(value);
+    pub fn from_typed<T: ScryptoEncode + ?Sized>(value: &T) -> Self {
+        let bytes =
+            scrypto_encode(value).expect("Failed to encode trusted value for IndexedScryptoValue");
         Self::from_slice(&bytes).expect("Failed to convert trusted value into IndexedScryptoValue")
     }
 
     pub fn from_slice(slice: &[u8]) -> Result<Self, ScryptoValueDecodeError> {
-        let value = decode_any(slice).map_err(ScryptoValueDecodeError::DecodeError)?;
+        let value = scrypto_decode(slice).map_err(ScryptoValueDecodeError::DecodeError)?;
         Self::from_value(value)
     }
 
@@ -69,7 +72,8 @@ impl IndexedScryptoValue {
         }
 
         Ok(Self {
-            raw: encode_any(&value),
+            raw: scrypto_encode(&value)
+                .map_err(|err| ScryptoValueDecodeError::RawValueEncodeError(err))?,
             dom: value,
             component_addresses: visitor.component_addresses,
             resource_addresses: visitor.resource_addresses,
@@ -165,7 +169,8 @@ impl IndexedScryptoValue {
         }
         self.bucket_ids = new_bucket_ids;
 
-        self.raw = encode_any(&self.dom);
+        self.raw = scrypto_encode(&self.dom)
+            .expect("Previously encodable raw value is no longer encodable after replacement");
 
         Ok(())
     }
@@ -240,7 +245,7 @@ impl ScryptoCustomValueVisitor {
     }
 }
 
-impl CustomValueVisitor<ScryptoCustomTypeId, ScryptoCustomValue> for ScryptoCustomValueVisitor {
+impl CustomValueVisitor<ScryptoCustomValue> for ScryptoCustomValueVisitor {
     type Err = ValueIndexingError;
 
     fn visit(
@@ -332,7 +337,7 @@ mod tests {
 
     #[test]
     fn should_reject_duplicate_ids() {
-        let buckets = scrypto_encode(&vec![Bucket(0), Bucket(0)]);
+        let buckets = scrypto_encode(&vec![Bucket(0), Bucket(0)]).unwrap();
         assert_eq!(
             IndexedScryptoValue::from_slice(&buckets),
             Err(ScryptoValueDecodeError::ValueIndexingError(