Add oracle data pointer check (#1194)

* Add oracle data pointer check * update benchmarks * fix tests
entropyxyz · Dec 5, 2024 · 765a86e · 765a86e
1 parent aca49ad
commit 765a86e
Show file tree

Hide file tree

Showing 13 changed files with 116 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/client/entropy_metadata.scale b/crates/client/entropy_metadata.scale
diff --git a/pallets/programs/Cargo.toml b/pallets/programs/Cargo.toml
@@ -23,6 +23,7 @@ sp-io             ={ version="31.0.0", default-features=false }
 sp-runtime        ={ version="32.0.0", default-features=false }
 sp-staking        ={ version="27.0.0", default-features=false }
 sp-std            ={ version="14.0.0", default-features=false }
+pallet-oracle     ={ version='0.3.0', path='../oracle', default-features=false }
 
 [dev-dependencies]
 pallet-balances={ version="29.0.0" }
@@ -40,5 +41,6 @@ std=[
   'frame-support/std',
   'frame-system/std',
   'log/std',
+  'pallet-oracle/std',
 ]
 try-runtime=['frame-support/try-runtime']
diff --git a/pallets/programs/src/benchmarking.rs b/pallets/programs/src/benchmarking.rs
@@ -21,6 +21,7 @@ use frame_support::{
     BoundedVec,
 };
 use frame_system::{EventRecord, RawOrigin};
+use pallet_oracle::OracleData;
 use sp_runtime::{traits::Hash, Saturating};
 use sp_std::{vec, vec::Vec};
 
@@ -52,6 +53,12 @@ benchmarks! {
     hash_input.extend(&configuration_schema);
     hash_input.extend(&auxiliary_data_schema);
     hash_input.extend(&vec![version_number]);
+
+    OracleData::<T>::insert(
+      BoundedVec::try_from(oracle_data_pointers[0].clone()).unwrap(),
+      BoundedVec::default(),
+    );
+
     let (_oracle_length, hash_input_with_oracle) =
     ProgramsPallet::<T>::get_length_and_hash_of_oracle(&oracle_data_pointers, hash_input).unwrap();
 
@@ -97,6 +104,12 @@ benchmarks! {
     hash_input.extend(&configuration_schema);
     hash_input.extend(&auxiliary_data_schema);
     hash_input.extend(&vec![version_number]);
+
+    OracleData::<T>::insert(
+      BoundedVec::try_from(oracle_data_pointers[0].clone()).unwrap(),
+      BoundedVec::default(),
+    );
+
     let (_oracle_length, hash_input_with_oracle) =
     ProgramsPallet::<T>::get_length_and_hash_of_oracle(&oracle_data_pointers, hash_input).unwrap();
 

diff --git a/pallets/programs/src/lib.rs b/pallets/programs/src/lib.rs
@@ -62,7 +62,7 @@ pub mod pallet {
     pub use crate::weights::WeightInfo;
 
     #[pallet::config]
-    pub trait Config: frame_system::Config {
+    pub trait Config: frame_system::Config + pallet_oracle::Config {
         /// The overarching event type.
         type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 
@@ -218,10 +218,14 @@ pub mod pallet {
         ProgramAlreadySet,
         /// User owns too many programs.
         TooManyProgramsOwned,
-        /// Program is being used by an account
+        /// Program is being used by an account.
         ProgramInUse,
-        /// Arithmetic overflow error
+        /// Arithmetic overflow error.
         ArithmeticError,
+        /// Oracle data non existent.
+        CannotFindOracleData,
+        /// The oracle data length is too long.
+        OracleDataLengthExceeded,
     }
 
     #[pallet::call]
@@ -400,6 +404,13 @@ pub mod pallet {
         ) -> Result<(usize, Vec<u8>), Error<T>> {
             let mut length: usize = 0;
             for oracle_data in oracle_datas {
+                ensure!(
+                    pallet_oracle::OracleData::<T>::contains_key(
+                        BoundedVec::try_from(oracle_data.clone())
+                            .map_err(|_| Error::<T>::CannotFindOracleData)?
+                    ),
+                    Error::<T>::CannotFindOracleData
+                );
                 hash_input.extend(oracle_data);
                 length =
                     length.checked_add(oracle_data.len()).ok_or(Error::<T>::ArithmeticError)?;

diff --git a/pallets/programs/src/mock.rs b/pallets/programs/src/mock.rs
@@ -32,6 +32,7 @@ frame_support::construct_runtime!(
     System: frame_system,
     ProgramsPallet: pallet_programs,
     Balances: pallet_balances,
+    Oracle: pallet_oracle,
   }
 );
 
@@ -95,6 +96,18 @@ impl pallet_balances::Config for Test {
     type WeightInfo = ();
 }
 
+parameter_types! {
+  pub const MaxOracleKeyLength: u32 = 100;
+  pub const MaxOracleValueLength: u32 = 100;
+}
+
+impl pallet_oracle::Config for Test {
+    type RuntimeEvent = RuntimeEvent;
+    type MaxOracleKeyLength = MaxOracleKeyLength;
+    type MaxOracleValueLength = MaxOracleValueLength;
+    type WeightInfo = ();
+}
+
 impl pallet_programs::Config for Test {
     type Currency = Balances;
     type MaxBytecodeLength = MaxBytecodeLength;

diff --git a/pallets/programs/src/tests.rs b/pallets/programs/src/tests.rs
@@ -37,11 +37,24 @@ fn set_program() {
         hash_input.extend(&configuration_schema);
         hash_input.extend(&auxiliary_data_schema);
         hash_input.extend(&vec![version_number]);
-        let (_oracle_length, hash_input_with_oracle) =
-            ProgramsPallet::get_length_and_hash_of_oracle(&oracle_data_pointers, hash_input)
-                .unwrap();
 
-        let program_hash = <Test as frame_system::Config>::Hashing::hash(&hash_input_with_oracle);
+        assert_noop!(
+            ProgramsPallet::set_program(
+                RuntimeOrigin::signed(PROGRAM_MODIFICATION_ACCOUNT),
+                program.clone(),
+                configuration_schema.clone(),
+                auxiliary_data_schema.clone(),
+                oracle_data_pointers.clone(),
+                version_number
+            ),
+            Error::<Test>::CannotFindOracleData
+        );
+
+        pallet_oracle::OracleData::<Test>::insert(
+            BoundedVec::try_from(oracle_data_pointers[0].clone()).unwrap(),
+            BoundedVec::default(),
+        );
+
         // can't pay deposit
         assert_noop!(
             ProgramsPallet::set_program(
@@ -57,6 +70,12 @@ fn set_program() {
 
         Balances::make_free_balance_be(&PROGRAM_MODIFICATION_ACCOUNT, 100);
 
+        let (_oracle_length, hash_input_with_oracle) =
+            ProgramsPallet::get_length_and_hash_of_oracle(&oracle_data_pointers, hash_input)
+                .unwrap();
+
+        let program_hash = <Test as frame_system::Config>::Hashing::hash(&hash_input_with_oracle);
+
         assert_ok!(ProgramsPallet::set_program(
             RuntimeOrigin::signed(PROGRAM_MODIFICATION_ACCOUNT),
             program.clone(),
@@ -141,6 +160,11 @@ fn remove_program() {
         hash_input.extend(&auxiliary_data_schema);
         hash_input.extend(&vec![version_number]);
 
+        pallet_oracle::OracleData::<Test>::insert(
+            BoundedVec::try_from(oracle_data_pointers[0].clone()).unwrap(),
+            BoundedVec::default(),
+        );
+
         let (_oracle_length, hash_input_with_oracle) =
             ProgramsPallet::get_length_and_hash_of_oracle(&oracle_data_pointers, hash_input)
                 .unwrap();

diff --git a/pallets/propagation/Cargo.toml b/pallets/propagation/Cargo.toml
@@ -48,6 +48,7 @@ pallet-timestamp               ={ version="28.0.0", default-features=false }
 sp-keystore                    ={ version="0.35.0" }
 sp-npos-elections              ={ version="27.0.0", default-features=false }
 pallet-parameters              ={ version="0.3.0", path="../parameters", default-features=false }
+pallet-oracle                  ={ version='0.3.0', path='../oracle', default-features=false }
 
 [features]
 default=['std']

diff --git a/pallets/propagation/src/mock.rs b/pallets/propagation/src/mock.rs
@@ -60,6 +60,7 @@ frame_support::construct_runtime!(
     BagsList: pallet_bags_list,
     Parameters: pallet_parameters,
     Attestation: pallet_attestation,
+    Oracle: pallet_oracle,
   }
 );
 
@@ -347,6 +348,18 @@ impl pallet_registry::Config for Test {
     type WeightInfo = ();
 }
 
+parameter_types! {
+  pub const MaxOracleKeyLength: u32 = 100;
+  pub const MaxOracleValueLength: u32 = 100;
+}
+
+impl pallet_oracle::Config for Test {
+    type RuntimeEvent = RuntimeEvent;
+    type MaxOracleKeyLength = MaxOracleKeyLength;
+    type MaxOracleValueLength = MaxOracleValueLength;
+    type WeightInfo = ();
+}
+
 parameter_types! {
   pub const MaxBytecodeLength: u32 = 3;
   pub const ProgramDepositPerByte: u32 = 5;

diff --git a/pallets/registry/Cargo.toml b/pallets/registry/Cargo.toml
@@ -45,6 +45,7 @@ pallet-timestamp               ={ version="28.0.0", default-features=false }
 sp-io                          ={ version="31.0.0", default-features=false }
 sp-npos-elections              ={ version="27.0.0", default-features=false }
 sp-staking                     ={ version="27.0.0", default-features=false }
+pallet-oracle                  ={ version='0.3.0', path='../oracle', default-features=false }
 
 [features]
 

diff --git a/pallets/registry/src/mock.rs b/pallets/registry/src/mock.rs
@@ -59,6 +59,7 @@ frame_support::construct_runtime!(
     BagsList: pallet_bags_list,
     Programs: pallet_programs,
     Parameters: pallet_parameters,
+    Oracle: pallet_oracle,
   }
 );
 
@@ -344,6 +345,18 @@ impl pallet_registry::Config for Test {
     type WeightInfo = ();
 }
 
+parameter_types! {
+  pub const MaxOracleKeyLength: u32 = 100;
+  pub const MaxOracleValueLength: u32 = 100;
+}
+
+impl pallet_oracle::Config for Test {
+    type RuntimeEvent = RuntimeEvent;
+    type MaxOracleKeyLength = MaxOracleKeyLength;
+    type MaxOracleValueLength = MaxOracleValueLength;
+    type WeightInfo = ();
+}
+
 parameter_types! {
   pub const MaxBytecodeLength: u32 = 3;
   pub const ProgramDepositPerByte: u32 = 5;

diff --git a/pallets/transaction-pause/Cargo.toml b/pallets/transaction-pause/Cargo.toml
@@ -22,6 +22,7 @@ sp-std            ={ version="14.0.0", default-features=false }
 smallvec="1.13.2"
 
 pallet-balances={ version="29.0.0" }
+pallet-oracle  ={ version='0.3.0', path='../oracle', default-features=false }
 sp-core        ={ version="29.0.0" }
 sp-io          ={ version="31.0.0" }
 

diff --git a/pallets/transaction-pause/src/mock.rs b/pallets/transaction-pause/src/mock.rs
@@ -82,6 +82,18 @@ impl pallet_balances::Config for Runtime {
     type WeightInfo = ();
 }
 
+parameter_types! {
+  pub const MaxOracleKeyLength: u32 = 100;
+  pub const MaxOracleValueLength: u32 = 100;
+}
+
+impl pallet_oracle::Config for Runtime {
+    type RuntimeEvent = RuntimeEvent;
+    type MaxOracleKeyLength = MaxOracleKeyLength;
+    type MaxOracleValueLength = MaxOracleValueLength;
+    type WeightInfo = ();
+}
+
 parameter_types! {
   pub const MaxBytecodeLength: u32 = 3;
   pub const ProgramDepositPerByte: u32 = 5;
@@ -117,6 +129,7 @@ construct_runtime!(
     TransactionPause: transaction_pause,
     Balances: pallet_balances,
     ProgramsPallet: pallet_programs,
+    Oracle: pallet_oracle,
   }
 );