rework: Fix various issues in resource interpreter

radixdlt · Sep 28, 2024 · d499922 · d499922
1 parent 1a1408d
commit d499922
Show file tree

Hide file tree

Showing 12 changed files with 1,860 additions and 2,191 deletions.
diff --git a/radix-common/src/math/bnum_integer.rs b/radix-common/src/math/bnum_integer.rs
@@ -366,6 +366,15 @@ macro_rules! op_impl {
                     }
                 }
 
+                impl SaturatingAdd for $t
+                {
+                    type Output = $t;
+
+                    fn saturating_add(self, other: Self) -> Self::Output {
+                        Self(self.0.saturating_add(other.0))
+                    }
+                }
+
                 impl CheckedSub for $t
                 {
                     type Output = $t;

diff --git a/radix-common/src/math/decimal.rs b/radix-common/src/math/decimal.rs
@@ -364,6 +364,15 @@ impl CheckedAdd<Decimal> for Decimal {
     }
 }
 
+impl SaturatingAdd<Decimal> for Decimal {
+    type Output = Self;
+
+    #[inline]
+    fn saturating_add(self, other: Self) -> Self::Output {
+        Self(self.0.saturating_add(other.0))
+    }
+}
+
 impl CheckedSub<Decimal> for Decimal {
     type Output = Self;
 

diff --git a/radix-common/src/math/traits.rs b/radix-common/src/math/traits.rs
@@ -6,6 +6,14 @@ pub trait CheckedAdd<Rhs = Self> {
         Self: Sized;
 }
 
+pub trait SaturatingAdd<Rhs = Self> {
+    type Output;
+
+    fn saturating_add(self, other: Rhs) -> Self::Output
+    where
+        Self: Sized;
+}
+
 pub trait CheckedSub<Rhs = Self> {
     type Output;
 

diff --git a/radix-common/src/types/entity_type.rs b/radix-common/src/types/entity_type.rs
@@ -176,6 +176,15 @@ impl EntityType {
         matches!(self, EntityType::GlobalPackage)
     }
 
+    pub const fn is_global_account(&self) -> bool {
+        matches!(
+            self,
+            EntityType::GlobalAccount
+                | EntityType::GlobalPreallocatedSecp256k1Account
+                | EntityType::GlobalPreallocatedEd25519Account
+        )
+    }
+
     pub const fn is_global_consensus_manager(&self) -> bool {
         matches!(self, EntityType::GlobalConsensusManager)
     }

diff --git a/radix-common/src/types/node_and_substate.rs b/radix-common/src/types/node_and_substate.rs
@@ -72,6 +72,10 @@ impl NodeId {
         matches!(self.entity_type(), Some(t) if t.is_global_component())
     }
 
+    pub const fn is_global_account(&self) -> bool {
+        matches!(self.entity_type(), Some(t) if t.is_global_account())
+    }
+
     pub const fn is_global_package(&self) -> bool {
         matches!(self.entity_type(), Some(t) if t.is_global_package())
     }