add filter to all runtimes

AstarNetwork · Sep 19, 2023 · 2854089 · 2854089
1 parent a5dc1b1
commit 2854089
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 9 deletions.
diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs
@@ -844,6 +844,29 @@ impl pallet_xc_asset_config::Config for Runtime {
     type WeightInfo = pallet_xc_asset_config::weights::SubstrateWeight<Self>;
 }
 
+#[derive(Default)]
+pub struct DispatchPrecompileFilter;
+
+impl InstanceFilter<RuntimeCall> for DispatchPrecompileFilter {
+    fn filter(&self, c: &RuntimeCall) -> bool {
+        match c {
+            RuntimeCall::Utility(pallet_utility::Call::batch { calls }) => {
+                for call in calls {
+                    if !DispatchPrecompileFilter::default().filter(call) {
+                        return false;
+                    }
+                }
+                true
+            }
+            RuntimeCall::DappsStaking(_) => true,
+            _ => false,
+        }
+    }
+    fn is_superset(&self, _o: &Self) -> bool {
+        false
+    }
+}
+
 /// The type used to represent the kinds of proxying allowed.
 #[derive(
     Copy,

diff --git a/runtime/astar/src/precompiles.rs b/runtime/astar/src/precompiles.rs
@@ -18,7 +18,8 @@
 
 //! The Astar Network EVM precompiles. This can be compiled with ``#[no_std]`, ready for Wasm.
 
-use astar_primitives::precompiles::BlockAllDispatchValidate;
+use crate::{DispatchPrecompileFilter, RuntimeCall};
+use astar_primitives::precompiles::DispatchFilterValidate;
 use pallet_evm::{
     ExitRevert, IsPrecompileResult, Precompile, PrecompileFailure, PrecompileHandle,
     PrecompileResult, PrecompileSet,
@@ -75,7 +76,7 @@ where
     DappsStakingWrapper<R>: Precompile,
     BatchPrecompile<R>: Precompile,
     XcmPrecompile<R, C>: Precompile,
-    Dispatch<R, BlockAllDispatchValidate>: Precompile,
+    Dispatch<R, DispatchFilterValidate<RuntimeCall, DispatchPrecompileFilter>>: Precompile,
     R: pallet_evm::Config
         + pallet_assets::Config
         + pallet_xcm::Config
@@ -107,7 +108,10 @@ where
             a if a == hash(9) => Some(Blake2F::execute(handle)),
             // nor Ethereum precompiles :
             a if a == hash(1024) => Some(Sha3FIPS256::execute(handle)),
-            a if a == hash(1025) => Some(Dispatch::<R, BlockAllDispatchValidate>::execute(handle)),
+            a if a == hash(1025) => Some(Dispatch::<
+                R,
+                DispatchFilterValidate<RuntimeCall, DispatchPrecompileFilter>,
+            >::execute(handle)),
             a if a == hash(1026) => Some(ECRecoverPublicKey::execute(handle)),
             a if a == hash(1027) => Some(Ed25519Verify::execute(handle)),
             // Astar precompiles (starts from 0x5000):

diff --git a/runtime/local/src/lib.rs b/runtime/local/src/lib.rs
@@ -845,6 +845,29 @@ impl pallet_sudo::Config for Runtime {
     type WeightInfo = pallet_sudo::weights::SubstrateWeight<Runtime>;
 }
 
+#[derive(Default)]
+pub struct DispatchPrecompileFilter;
+
+impl InstanceFilter<RuntimeCall> for DispatchPrecompileFilter {
+    fn filter(&self, c: &RuntimeCall) -> bool {
+        match c {
+            RuntimeCall::Utility(pallet_utility::Call::batch { calls }) => {
+                for call in calls {
+                    if !DispatchPrecompileFilter::default().filter(call) {
+                        return false;
+                    }
+                }
+                true
+            }
+            RuntimeCall::DappsStaking(_) => true,
+            _ => false,
+        }
+    }
+    fn is_superset(&self, _o: &Self) -> bool {
+        false
+    }
+}
+
 /// The type used to represent the kinds of proxying allowed.
 #[derive(
     Copy,

diff --git a/runtime/local/src/precompiles.rs b/runtime/local/src/precompiles.rs
@@ -18,7 +18,8 @@
 
 //! The Local EVM precompiles. This can be compiled with ``#[no_std]`, ready for Wasm.
 
-use astar_primitives::precompiles::BlockAllDispatchValidate;
+use crate::{DispatchPrecompileFilter, RuntimeCall};
+use astar_primitives::precompiles::DispatchFilterValidate;
 use pallet_evm::{
     ExitRevert, IsPrecompileResult, Precompile, PrecompileFailure, PrecompileHandle,
     PrecompileResult, PrecompileSet,
@@ -73,7 +74,7 @@ where
     DappsStakingWrapper<R>: Precompile,
     BatchPrecompile<R>: Precompile,
     XvmPrecompile<R, pallet_xvm::Pallet<R>>: Precompile,
-    Dispatch<R, BlockAllDispatchValidate>: Precompile,
+    Dispatch<R, DispatchFilterValidate<RuntimeCall, DispatchPrecompileFilter>>: Precompile,
     R: pallet_evm::Config
         + pallet_xvm::Config
         + pallet_assets::Config
@@ -104,7 +105,10 @@ where
             a if a == hash(9) => Some(Blake2F::execute(handle)),
             // nor Ethereum precompiles :
             a if a == hash(1024) => Some(Sha3FIPS256::execute(handle)),
-            a if a == hash(1025) => Some(Dispatch::<R, BlockAllDispatchValidate>::execute(handle)),
+            a if a == hash(1025) => Some(Dispatch::<
+                R,
+                DispatchFilterValidate<RuntimeCall, DispatchPrecompileFilter>,
+            >::execute(handle)),
             a if a == hash(1026) => Some(ECRecoverPublicKey::execute(handle)),
             a if a == hash(1027) => Some(Ed25519Verify::execute(handle)),
             // Astar precompiles (starts from 0x5000):

diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs
@@ -832,6 +832,29 @@ impl pallet_xc_asset_config::Config for Runtime {
     type WeightInfo = pallet_xc_asset_config::weights::SubstrateWeight<Self>;
 }
 
+#[derive(Default)]
+pub struct DispatchPrecompileFilter;
+
+impl InstanceFilter<RuntimeCall> for DispatchPrecompileFilter {
+    fn filter(&self, c: &RuntimeCall) -> bool {
+        match c {
+            RuntimeCall::Utility(pallet_utility::Call::batch { calls }) => {
+                for call in calls {
+                    if !DispatchPrecompileFilter::default().filter(call) {
+                        return false;
+                    }
+                }
+                true
+            }
+            RuntimeCall::DappsStaking(_) => true,
+            _ => false,
+        }
+    }
+    fn is_superset(&self, _o: &Self) -> bool {
+        false
+    }
+}
+
 /// The type used to represent the kinds of proxying allowed.
 #[derive(
     Copy,

diff --git a/runtime/shiden/src/precompiles.rs b/runtime/shiden/src/precompiles.rs
@@ -18,7 +18,8 @@
 
 //! The Shiden Network EVM precompiles. This can be compiled with ``#[no_std]`, ready for Wasm.
 
-use astar_primitives::precompiles::BlockAllDispatchValidate;
+use crate::{DispatchPrecompileFilter, RuntimeCall};
+use astar_primitives::precompiles::DispatchFilterValidate;
 use pallet_evm::{
     ExitRevert, IsPrecompileResult, Precompile, PrecompileFailure, PrecompileHandle,
     PrecompileResult, PrecompileSet,
@@ -75,7 +76,7 @@ where
     DappsStakingWrapper<R>: Precompile,
     BatchPrecompile<R>: Precompile,
     XcmPrecompile<R, C>: Precompile,
-    Dispatch<R, BlockAllDispatchValidate>: Precompile,
+    Dispatch<R, DispatchFilterValidate<RuntimeCall, DispatchPrecompileFilter>>: Precompile,
     R: pallet_evm::Config
         + pallet_assets::Config
         + pallet_xcm::Config
@@ -107,7 +108,10 @@ where
             a if a == hash(9) => Some(Blake2F::execute(handle)),
             // nor Ethereum precompiles :
             a if a == hash(1024) => Some(Sha3FIPS256::execute(handle)),
-            a if a == hash(1025) => Some(Dispatch::<R, BlockAllDispatchValidate>::execute(handle)),
+            a if a == hash(1025) => Some(Dispatch::<
+                R,
+                DispatchFilterValidate<RuntimeCall, DispatchPrecompileFilter>,
+            >::execute(handle)),
             a if a == hash(1026) => Some(ECRecoverPublicKey::execute(handle)),
             a if a == hash(1027) => Some(Ed25519Verify::execute(handle)),
             // Astar precompiles (starts from 0x5000):