From f91034b0f8525f800c5f0b2b54f7a8f612bbfb78 Mon Sep 17 00:00:00 2001
From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com>
Date: Thu, 24 Oct 2024 13:16:10 +1000
Subject: [PATCH] Fill gaps in ref conversions to Val

---
 soroban-env-common/src/convert.rs        | 60 ++++++++++++++++++++++++
 soroban-env-common/src/option.rs         | 11 +++++
 soroban-env-common/src/tuple.rs          | 10 ++++
 soroban-env-common/src/val.rs            |  7 +++
 soroban-env-common/src/wrapper_macros.rs |  6 +++
 5 files changed, 94 insertions(+)

diff --git a/soroban-env-common/src/convert.rs b/soroban-env-common/src/convert.rs
index 2b7cb2819..fe284fb42 100644
--- a/soroban-env-common/src/convert.rs
+++ b/soroban-env-common/src/convert.rs
@@ -86,6 +86,14 @@ impl<E: Env> TryFromVal<E, i64> for Val {
     }
 }
 
+impl<E: Env> TryFromVal<E, &i64> for Val {
+    type Error = crate::Error;
+
+    fn try_from_val(env: &E, v: &&i64) -> Result<Self, Self::Error> {
+        Self::try_from_val(env, *v)
+    }
+}
+
 // u64 conversions
 
 impl<E: Env> TryFromVal<E, Val> for u64 {
@@ -110,6 +118,14 @@ impl<E: Env> TryFromVal<E, u64> for Val {
     }
 }
 
+impl<E: Env> TryFromVal<E, &u64> for Val {
+    type Error = crate::Error;
+
+    fn try_from_val(env: &E, v: &&u64) -> Result<Self, Self::Error> {
+        Self::try_from_val(env, *v)
+    }
+}
+
 impl<E: Env> TryFromVal<E, U64Val> for u64 {
     type Error = crate::Error;
 
@@ -219,6 +235,14 @@ impl<E: Env> TryFromVal<E, i128> for Val {
     }
 }
 
+impl<E: Env> TryFromVal<E, &i128> for Val {
+    type Error = crate::Error;
+
+    fn try_from_val(env: &E, v: &&i128) -> Result<Self, Self::Error> {
+        Self::try_from_val(env, *v)
+    }
+}
+
 impl<E: Env> TryFromVal<E, i128> for I128Val {
     type Error = crate::Error;
 
@@ -261,6 +285,14 @@ impl<E: Env> TryFromVal<E, u128> for Val {
     }
 }
 
+impl<E: Env> TryFromVal<E, &u128> for Val {
+    type Error = crate::Error;
+
+    fn try_from_val(env: &E, v: &&u128) -> Result<Self, Self::Error> {
+        Self::try_from_val(env, *v)
+    }
+}
+
 impl<E: Env> TryFromVal<E, u128> for U128Val {
     type Error = crate::Error;
 
@@ -304,6 +336,14 @@ impl<E: Env> TryFromVal<E, I256> for Val {
     }
 }
 
+impl<E: Env> TryFromVal<E, &I256> for Val {
+    type Error = crate::Error;
+
+    fn try_from_val(env: &E, v: &&I256) -> Result<Self, Self::Error> {
+        Self::try_from_val(env, *v)
+    }
+}
+
 impl<E: Env> TryFromVal<E, I256> for I256Val {
     type Error = crate::Error;
 
@@ -348,6 +388,14 @@ impl<E: Env> TryFromVal<E, U256> for Val {
     }
 }
 
+impl<E: Env> TryFromVal<E, &U256> for Val {
+    type Error = crate::Error;
+
+    fn try_from_val(env: &E, v: &&U256) -> Result<Self, Self::Error> {
+        Self::try_from_val(env, *v)
+    }
+}
+
 impl<E: Env> TryFromVal<E, U256> for U256Val {
     type Error = crate::Error;
 
@@ -550,3 +598,15 @@ where
         })
     }
 }
+
+#[cfg(feature = "std")]
+impl<E: Env> TryFromVal<E, &ScVal> for Val
+where
+    Object: for<'a> TryFromVal<E, ScValObjRef<'a>>,
+    for<'a> <Object as TryFromVal<E, ScValObjRef<'a>>>::Error: Into<crate::Error>,
+{
+    type Error = crate::Error;
+    fn try_from_val(env: &E, val: &&ScVal) -> Result<Val, Self::Error> {
+        Self::try_from_val(env, *val)
+    }
+}
diff --git a/soroban-env-common/src/option.rs b/soroban-env-common/src/option.rs
index b221c8595..7e03f5fe1 100644
--- a/soroban-env-common/src/option.rs
+++ b/soroban-env-common/src/option.rs
@@ -28,3 +28,14 @@ where
         }
     }
 }
+
+impl<E: Env, T> TryFromVal<E, &Option<T>> for Val
+where
+    T: TryIntoVal<E, Val>,
+{
+    type Error = T::Error;
+
+    fn try_from_val(env: &E, v: &&Option<T>) -> Result<Self, Self::Error> {
+        Self::try_from_val(env, *v)
+    }
+}
diff --git a/soroban-env-common/src/tuple.rs b/soroban-env-common/src/tuple.rs
index 79f5a674a..91328a231 100644
--- a/soroban-env-common/src/tuple.rs
+++ b/soroban-env-common/src/tuple.rs
@@ -33,6 +33,16 @@ macro_rules! impl_for_tuple {
             }
         }
 
+        impl<E: Env, $($typ),*> TryFromVal<E, &($($typ,)*)> for Val
+        where
+            $($typ: TryIntoVal<E, Val>),*
+        {
+            type Error = crate::Error;
+            fn try_from_val(env: &E, v: &&($($typ,)*)) -> Result<Self, Self::Error> {
+                Self::try_from_val(env, *v)
+            }
+        }
+
 
         // Conversions to and from Array of Val.
 
diff --git a/soroban-env-common/src/val.rs b/soroban-env-common/src/val.rs
index 689e8954e..4224b4c0b 100644
--- a/soroban-env-common/src/val.rs
+++ b/soroban-env-common/src/val.rs
@@ -275,6 +275,13 @@ impl<E: Env> TryFromVal<E, Val> for Val {
     }
 }
 
+impl<E: Env> TryFromVal<E, &Val> for Val {
+    type Error = ConversionError;
+    fn try_from_val(_env: &E, val: &&Val) -> Result<Self, Self::Error> {
+        Ok(**val)
+    }
+}
+
 // Declare a few extra small-value wrapper types that don't live anywhere else.
 declare_tag_based_wrapper!(Void);
 
diff --git a/soroban-env-common/src/wrapper_macros.rs b/soroban-env-common/src/wrapper_macros.rs
index 704d5fcfb..e76f2f547 100644
--- a/soroban-env-common/src/wrapper_macros.rs
+++ b/soroban-env-common/src/wrapper_macros.rs
@@ -74,6 +74,12 @@ macro_rules! impl_tryfroms_and_tryfromvals_delegating_to_valconvert {
                 Ok((*val).into())
             }
         }
+        impl<E: $crate::Env> $crate::TryFromVal<E, &$T> for $crate::Val {
+            type Error = $crate::ConversionError;
+            fn try_from_val(_env: &E, val: &&$T) -> Result<Self, Self::Error> {
+                Ok((**val).into())
+            }
+        }
     };
 }