Update substrate

Also removes the patch for zip since a new release was issued.

Closes https://github.com/serai-dex/serai/issues/81.

Contracts RPC purged as according to 
https://github.com/paritytech/substrate/pull/12358.

substrate/runtime/Cargo.toml

@@ -14,8 +14,8 @@ rustdoc-args = ["--cfg", "docsrs"]
 [dependencies]
 hex-literal = { version = "0.3.4", optional = true }
 
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
+scale-info = { version = "2", default-features = false, features = ["derive"] }
 
 sp-core = { git = "https://github.com/serai-dex/substrate", default-features = false }
 sp-std = { git = "https://github.com/serai-dex/substrate", default-features = false }
@@ -39,7 +39,6 @@ pallet-transaction-payment = { git = "https://github.com/serai-dex/substrate", d
 
 pallet-contracts-primitives = { git = "https://github.com/serai-dex/substrate", default-features = false }
 pallet-contracts = { git = "https://github.com/serai-dex/substrate", default-features = false }
-pallet-contracts-rpc-runtime-api = { git = "https://github.com/serai-dex/substrate", default-features = false }
 
 # Used for the node template's RPCs
 frame-system-rpc-runtime-api = { git = "https://github.com/serai-dex/substrate", default-features = false }
@@ -81,7 +80,6 @@ std = [
 
 	"pallet-contracts/std",
 	"pallet-contracts-primitives/std",
-	"pallet-contracts-rpc-runtime-api/std",
 ]
 
 runtime-benchmarks = [

substrate/runtime/src/lib.rs

@@ -30,7 +30,6 @@ pub use frame_system::Call as SystemCall;
 pub use pallet_timestamp::Call as TimestampCall;
 pub use pallet_balances::Call as BalancesCall;
 use pallet_transaction_payment::CurrencyAdapter;
-use pallet_contracts::DefaultContractAccessWeight;
 
 /// An index to a block.
 pub type BlockNumber = u32;
@@ -99,10 +98,6 @@ const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
 /// We allow for 2 seconds of compute with a 6 second average block time.
 const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_ref_time(2 * WEIGHT_PER_SECOND.ref_time());
 
-// Prints debug output of the `contracts` pallet to stdout if the node is
-// started with `-lruntime::contracts=debug`.
-const CONTRACTS_DEBUG_OUTPUT: bool = true;
-
 // Unit = the base number of indivisible units for balances
 const UNIT: Balance = 1_000_000_000_000;
 const MILLIUNIT: Balance = 1_000_000_000;
@@ -236,7 +231,6 @@ impl pallet_contracts::Config for Runtime {
   type DeletionWeightLimit = DeletionWeightLimit;
   type Schedule = Schedule;
   type AddressGenerator = pallet_contracts::DefaultAddressGenerator;
-  type ContractAccessWeight = DefaultContractAccessWeight<BlockWeights>;
 
   type MaxCodeLen = ConstU32<{ 128 * 1024 }>;
   type MaxStorageKeyLen = ConstU32<128>;
@@ -388,63 +382,4 @@ sp_api::impl_runtime_apis! {
       TransactionPayment::query_fee_details(uxt, len)
     }
   }
-
-  impl pallet_contracts_rpc_runtime_api::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash>
-      for Runtime
-  {
-    fn call(
-      origin: AccountId,
-      dest: AccountId,
-      value: Balance,
-      gas_limit: u64,
-      storage_deposit_limit: Option<Balance>,
-      input_data: Vec<u8>,
-    ) -> pallet_contracts_primitives::ContractExecResult<Balance> {
-      Contracts::bare_call(
-        origin,
-        dest,
-        value,
-        Weight::from_ref_time(gas_limit),
-        storage_deposit_limit,
-        input_data,
-        CONTRACTS_DEBUG_OUTPUT
-      )
-    }
-
-    fn instantiate(
-      origin: AccountId,
-      value: Balance,
-      gas_limit: u64,
-      storage_deposit_limit: Option<Balance>,
-      code: pallet_contracts_primitives::Code<Hash>,
-      data: Vec<u8>,
-      salt: Vec<u8>,
-    ) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, Balance> {
-      Contracts::bare_instantiate(
-        origin,
-        value,
-        Weight::from_ref_time(gas_limit),
-        storage_deposit_limit,
-        code,
-        data,
-        salt,
-        CONTRACTS_DEBUG_OUTPUT
-      )
-    }
-
-    fn upload_code(
-      origin: AccountId,
-      code: Vec<u8>,
-      storage_deposit_limit: Option<Balance>,
-    ) -> pallet_contracts_primitives::CodeUploadResult<Hash, Balance> {
-      Contracts::bare_upload_code(origin, code, storage_deposit_limit)
-    }
-
-    fn get_storage(
-      address: AccountId,
-      key: Vec<u8>,
-    ) -> pallet_contracts_primitives::GetStorageResult {
-      Contracts::get_storage(address, key)
-    }
-  }
 }