Make SS58 of precompiles optional

Author: ales-otf

precompiles/src/balance_transfer.rs

@@ -24,11 +24,11 @@ where
     <R as pallet_balances::Config>::Balance: TryFrom<U256>,
 {
     const INDEX: u64 = 2048;
-    const ADDRESS_SS58: [u8; 32] = [
+    const ADDRESS_SS58: Option<[u8; 32]> = Some([
         0x07, 0xec, 0x71, 0x2a, 0x5d, 0x38, 0x43, 0x4d, 0xdd, 0x03, 0x3f, 0x8f, 0x02, 0x4e, 0xcd,
         0xfc, 0x4b, 0xb5, 0x95, 0x1c, 0x13, 0xc3, 0x08, 0x5c, 0x39, 0x9c, 0x8a, 0x5f, 0x62, 0x93,
         0x70, 0x5d,
-    ];
+    ]);
 }
 
 #[precompile_utils::precompile]
@@ -60,6 +60,11 @@ where
             value: amount_sub.unique_saturated_into(),
         };
 
-        handle.try_dispatch_runtime_call::<R, _>(call, contract_to_origin(&Self::ADDRESS_SS58)?)
+        handle.try_dispatch_runtime_call::<R, _>(
+            call,
+            contract_to_origin(
+                &Self::ADDRESS_SS58.expect("ADDRESS_SS58 is defined for BalanceTransferPrecompile"),
+            )?,
+        )
     }
 }

precompiles/src/ed25519.rs

@@ -12,7 +12,7 @@ pub(crate) struct Ed25519Verify;
 
 impl PrecompileExt for Ed25519Verify {
     const INDEX: u64 = 1026;
-    const ADDRESS_SS58: [u8; 32] = [0; 32];
+    const ADDRESS_SS58: Option<[u8; 32]> = None;
 }
 
 impl LinearCostPrecompile for Ed25519Verify {

precompiles/src/lib.rs

@@ -310,5 +310,5 @@ trait PrecompileExt: Precompile {
     const INDEX: u64;
     // ss58 public key i.e., the contract sends funds it received to the destination address from
     // the method parameter.
-    const ADDRESS_SS58: [u8; 32];
+    const ADDRESS_SS58: Option<[u8; 32]>;
 }

precompiles/src/metagraph.rs

@@ -16,7 +16,7 @@ where
     R::AccountId: ByteArray,
 {
     const INDEX: u64 = 2050;
-    const ADDRESS_SS58: [u8; 32] = [0; 32];
+    const ADDRESS_SS58: Option<[u8; 32]> = None;
 }
 
 #[precompile_utils::precompile]

precompiles/src/neuron.rs

@@ -23,11 +23,11 @@ where
     <R as pallet_evm::Config>::AddressMapping: AddressMapping<R::AccountId>,
 {
     const INDEX: u64 = 2052;
-    const ADDRESS_SS58: [u8; 32] = [
+    const ADDRESS_SS58: Option<[u8; 32]> = Some([
         0xbc, 0x46, 0x35, 0x79, 0xbc, 0x99, 0xf9, 0xee, 0x7c, 0x59, 0xed, 0xee, 0x20, 0x61, 0xa3,
         0x09, 0xd2, 0x1e, 0x68, 0xd5, 0x39, 0xb6, 0x40, 0xec, 0x66, 0x46, 0x90, 0x30, 0xab, 0x74,
         0xc1, 0xdb,
-    ];
+    ]);
 }
 
 #[precompile_utils::precompile]

precompiles/src/staking.rs

@@ -62,7 +62,7 @@ where
     <<R as frame_system::Config>::Lookup as StaticLookup>::Source: From<R::AccountId>,
 {
     const INDEX: u64 = 2053;
-    const ADDRESS_SS58: [u8; 32] = [0; 32];
+    const ADDRESS_SS58: Option<[u8; 32]> = None;
 }
 
 #[precompile_utils::precompile]
@@ -211,11 +211,11 @@ where
     <<R as frame_system::Config>::Lookup as StaticLookup>::Source: From<R::AccountId>,
 {
     const INDEX: u64 = 2049;
-    const ADDRESS_SS58: [u8; 32] = [
+    const ADDRESS_SS58: Option<[u8; 32]> = Some([
         0x26, 0xf4, 0x10, 0x1e, 0x52, 0xb7, 0x57, 0x34, 0x33, 0x24, 0x5b, 0xc3, 0x0a, 0xe1, 0x8b,
         0x63, 0x99, 0x53, 0xd8, 0x41, 0x79, 0x33, 0x03, 0x61, 0x4d, 0xfa, 0xcf, 0xf0, 0x37, 0xf7,
         0x12, 0x94,
-    ];
+    ]);
 }
 
 #[precompile_utils::precompile]
@@ -368,7 +368,9 @@ where
         account_id: &<R as frame_system::Config>::AccountId,
         amount: U256,
     ) -> Result<(), PrecompileFailure> {
-        let smart_contract_account_id = R::AccountId::from(Self::ADDRESS_SS58);
+        let smart_contract_account_id = R::AccountId::from(
+            Self::ADDRESS_SS58.expect("ADDRESS_SS58 is defined for StakingPrecompile"),
+        );
         let amount_sub =
             <R as pallet_evm::Config>::BalanceConverter::into_substrate_balance(amount)
                 .ok_or(ExitError::OutOfFund)?;

precompiles/src/subnet.rs

@@ -29,11 +29,11 @@ where
     // <<R as frame_system::Config>::Lookup as StaticLookup>::Source: From<R::AccountId>,
 {
     const INDEX: u64 = 2051;
-    const ADDRESS_SS58: [u8; 32] = [
+    const ADDRESS_SS58: Option<[u8; 32]> = Some([
         0x3a, 0x86, 0x18, 0xfb, 0xbb, 0x1b, 0xbc, 0x47, 0x86, 0x64, 0xff, 0x53, 0x46, 0x18, 0x0c,
         0x35, 0xd0, 0x9f, 0xac, 0x26, 0xf2, 0x02, 0x70, 0x85, 0xb3, 0x1c, 0x56, 0xc1, 0x06, 0x3c,
         0x1c, 0xd3,
-    ];
+    ]);
 }
 
 #[precompile_utils::precompile]