Revert "feat: 🎸 add metadata-hash-extension (#1265)" (#1268)

This reverts commit 489fc9c.
bifrost-io · Jun 18, 2024 · 3f7d6b2 · 3f7d6b2
1 parent 7b0aaaf
commit 3f7d6b2
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 111 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -132,7 +132,6 @@ cumulus-primitives-utility                 = { version = "0.8.0", default-featur
 cumulus-test-relay-sproof-builder          = { version = "0.8.0", default-features = false }
 frame-benchmarking                         = { version = "29.0.0", default-features = false }
 frame-executive                            = { version = "29.0.0", default-features = false }
-frame-metadata-hash-extension              = { version = "0.1.0", default-features = false }
 frame-support                              = { version = "29.0.0", default-features = false }
 frame-system                               = { version = "29.0.0", default-features = false }
 frame-system-benchmarking                  = { version = "29.0.0", default-features = false }
@@ -265,7 +264,7 @@ sp-rpc                                        = { version = "27.0.0" }
 substrate-build-script-utils                  = { version = "11.0.0" }
 substrate-frame-rpc-system                    = { version = "29.0.0" }
 substrate-prometheus-endpoint                 = { version = "0.17.0" }
-substrate-wasm-builder                        = { version = "18.0.1" }
+substrate-wasm-builder                        = { version = "18.0.0" }
 try-runtime-cli                               = { version = "0.39.0" }
 xcm-emulator                                  = { version = "0.6.0" }
 xcm-simulator                                 = { version = "8.0.0" }

diff --git a/runtime/bifrost-kusama/Cargo.toml b/runtime/bifrost-kusama/Cargo.toml
@@ -21,7 +21,6 @@ serde_json = { workspace = true }
 # frame dependencies
 frame-benchmarking = { workspace = true, optional = true }
 frame-executive = { workspace = true }
-frame-metadata-hash-extension = { workspace = true }
 frame-support = { workspace = true, features = ["tuples-96"] }
 frame-system = { workspace = true }
 frame-system-benchmarking = { workspace = true, optional = true }
@@ -160,7 +159,6 @@ std = [
 
 	"frame-benchmarking?/std",
 	"frame-executive/std",
-	"frame-metadata-hash-extension/std",
 	"frame-support/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
@@ -399,8 +397,6 @@ try-runtime = [
 	"bifrost-channel-commission/try-runtime",
 ]
 
-# Enable the metadata hash generation in the wasm builder.
-metadata-hash = ["substrate-wasm-builder/metadata-hash"]
 # When enabled, the runtime API will not be build.
 #
 # This is required by Cumulus to access certain types of the
@@ -411,7 +407,7 @@ disable-runtime-api = []
 # A feature that should be enabled when the runtime should be build for on-chain
 # deployment. This will disable stuff that shouldn't be part of the on-chain wasm
 # to make it smaller like logging for example.
-on-chain-release-build = ["metadata-hash", "sp-api/disable-logging"]
+on-chain-release-build = ["sp-api/disable-logging"]
 
 # Set timing constants (e.g. session period) to faster versions to speed up testing.
 fast-runtime = []
diff --git a/runtime/bifrost-kusama/build.rs b/runtime/bifrost-kusama/build.rs
@@ -16,17 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-#[cfg(all(feature = "metadata-hash", feature = "std"))]
-fn main() {
-	substrate_wasm_builder::WasmBuilder::new()
-		.with_current_project()
-		.export_heap_base()
-		.import_memory()
-		.enable_metadata_hash("BNC", 12)
-		.build()
-}
-
-#[cfg(all(not(feature = "metadata-hash"), feature = "std"))]
+#[cfg(feature = "std")]
 fn main() {
 	substrate_wasm_builder::WasmBuilder::new()
 		.with_current_project()

diff --git a/runtime/bifrost-kusama/src/lib.rs b/runtime/bifrost-kusama/src/lib.rs
@@ -923,7 +923,6 @@ where
 			frame_system::CheckNonce::<Runtime>::from(nonce),
 			frame_system::CheckWeight::<Runtime>::new(),
 			pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),
-			frame_metadata_hash_extension::CheckMetadataHash::<Runtime>::new(true),
 		);
 		let raw_payload = SignedPayload::new(call, extra)
 			.map_err(|e| {
@@ -2031,7 +2030,6 @@ pub type SignedExtra = (
 	frame_system::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
 	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
-	frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 );
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic =

diff --git a/runtime/bifrost-polkadot/Cargo.toml b/runtime/bifrost-polkadot/Cargo.toml
@@ -21,7 +21,6 @@ serde_json = { workspace = true }
 # frame dependencies
 frame-benchmarking = { workspace = true, optional = true }
 frame-executive = { workspace = true }
-frame-metadata-hash-extension = { workspace = true }
 frame-support = { workspace = true, features = ["tuples-96"] }
 frame-system = { workspace = true }
 frame-system-benchmarking = { workspace = true, optional = true }
@@ -157,7 +156,6 @@ std = [
 	"strum/std",
 
 	"frame-executive/std",
-	"frame-metadata-hash-extension/std",
 	"frame-support/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
@@ -374,8 +372,6 @@ try-runtime = [
 	"zenlink-protocol/try-runtime",
 ]
 
-# Enable the metadata hash generation in the wasm builder.
-metadata-hash = ["substrate-wasm-builder/metadata-hash"]
 # When enabled, the runtime API will not be build.
 #
 # This is required by Cumulus to access certain types of the
@@ -386,7 +382,7 @@ disable-runtime-api = []
 # A feature that should be enabled when the runtime should be build for on-chain
 # deployment. This will disable stuff that shouldn't be part of the on-chain wasm
 # to make it smaller like logging for example.
-on-chain-release-build = ["metadata-hash", "sp-api/disable-logging"]
+on-chain-release-build = ["sp-api/disable-logging"]
 
 # Set timing constants (e.g. session period) to faster versions to speed up testing.
 fast-runtime = []
diff --git a/runtime/bifrost-polkadot/build.rs b/runtime/bifrost-polkadot/build.rs
@@ -15,17 +15,7 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
-#[cfg(all(feature = "metadata-hash", feature = "std"))]
-fn main() {
-	substrate_wasm_builder::WasmBuilder::new()
-		.with_current_project()
-		.export_heap_base()
-		.import_memory()
-		.enable_metadata_hash("BNC", 12)
-		.build()
-}
-
-#[cfg(all(not(feature = "metadata-hash"), feature = "std"))]
+#[cfg(feature = "std")]
 fn main() {
 	substrate_wasm_builder::WasmBuilder::new()
 		.with_current_project()

diff --git a/runtime/bifrost-polkadot/src/lib.rs b/runtime/bifrost-polkadot/src/lib.rs
@@ -1864,7 +1864,6 @@ pub type SignedExtra = (
 	frame_system::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
 	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
-	frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 );
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic =