diff --git a/Cargo.lock b/Cargo.lock
index 9b77708061..53570ff7a7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -671,6 +671,7 @@ dependencies = [
  "bitcoin_hashes",
  "frame-support",
  "hex",
+ "impl-serde 0.3.2",
  "mocktopus",
  "parity-scale-codec",
  "primitive-types",
@@ -3062,7 +3063,7 @@ dependencies = [
  "fixed-hash 0.8.0",
  "impl-codec",
  "impl-rlp",
- "impl-serde",
+ "impl-serde 0.4.0",
  "scale-info",
  "tiny-keccak",
 ]
@@ -3095,7 +3096,7 @@ dependencies = [
  "fixed-hash 0.8.0",
  "impl-codec",
  "impl-rlp",
- "impl-serde",
+ "impl-serde 0.4.0",
  "primitive-types",
  "scale-info",
  "uint",
@@ -3286,7 +3287,7 @@ dependencies = [
 [[package]]
 name = "fc-api"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "async-trait",
  "fp-storage",
@@ -3298,7 +3299,7 @@ dependencies = [
 [[package]]
 name = "fc-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "async-trait",
  "fp-consensus",
@@ -3314,7 +3315,7 @@ dependencies = [
 [[package]]
 name = "fc-db"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "async-trait",
  "ethereum",
@@ -3345,7 +3346,7 @@ dependencies = [
 [[package]]
 name = "fc-mapping-sync"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "fc-db",
  "fc-storage",
@@ -3368,7 +3369,7 @@ dependencies = [
 [[package]]
 name = "fc-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -3418,7 +3419,7 @@ dependencies = [
 [[package]]
 name = "fc-rpc-core"
 version = "1.1.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -3431,7 +3432,7 @@ dependencies = [
 [[package]]
 name = "fc-storage"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -3648,10 +3649,10 @@ dependencies = [
 [[package]]
 name = "fp-account"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "hex",
- "impl-serde",
+ "impl-serde 0.4.0",
  "libsecp256k1 0.7.1",
  "log",
  "parity-scale-codec",
@@ -3667,7 +3668,7 @@ dependencies = [
 [[package]]
 name = "fp-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "ethereum",
  "parity-scale-codec",
@@ -3679,7 +3680,7 @@ dependencies = [
 [[package]]
 name = "fp-ethereum"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -3693,7 +3694,7 @@ dependencies = [
 [[package]]
 name = "fp-evm"
 version = "3.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "evm",
  "frame-support",
@@ -3708,7 +3709,7 @@ dependencies = [
 [[package]]
 name = "fp-rpc"
 version = "3.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -3725,7 +3726,7 @@ dependencies = [
 [[package]]
 name = "fp-self-contained"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3737,7 +3738,7 @@ dependencies = [
 [[package]]
 name = "fp-storage"
 version = "2.0.0"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -4746,6 +4747,15 @@ dependencies = [
  "rlp",
 ]
 
+[[package]]
+name = "impl-serde"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "impl-serde"
 version = "0.4.0"
@@ -7743,7 +7753,7 @@ dependencies = [
 [[package]]
 name = "pallet-base-fee"
 version = "1.0.0"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "fp-evm",
  "frame-support",
@@ -8007,7 +8017,7 @@ dependencies = [
 [[package]]
 name = "pallet-ethereum"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -8030,7 +8040,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm"
 version = "6.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "environmental",
  "evm",
@@ -8055,7 +8065,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-chain-id"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8076,7 +8086,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-modexp"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "fp-evm",
  "num",
@@ -8085,7 +8095,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-sha3fips"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "fp-evm",
  "tiny-keccak",
@@ -8094,7 +8104,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-simple"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 dependencies = [
  "fp-evm",
  "ripemd",
@@ -10588,7 +10598,7 @@ dependencies = [
  "fixed-hash 0.8.0",
  "impl-codec",
  "impl-rlp",
- "impl-serde",
+ "impl-serde 0.4.0",
  "scale-info",
  "uint",
 ]
@@ -13844,7 +13854,7 @@ dependencies = [
  "futures",
  "hash-db 0.15.2",
  "hash256-std-hasher",
- "impl-serde",
+ "impl-serde 0.4.0",
  "lazy_static",
  "libsecp256k1 0.7.1",
  "log",
@@ -13890,7 +13900,7 @@ dependencies = [
  "futures",
  "hash-db 0.16.0",
  "hash256-std-hasher",
- "impl-serde",
+ "impl-serde 0.4.0",
  "lazy_static",
  "libsecp256k1 0.7.1",
  "log",
@@ -14411,7 +14421,7 @@ name = "sp-storage"
 version = "6.0.0"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
 dependencies = [
- "impl-serde",
+ "impl-serde 0.4.0",
  "parity-scale-codec",
  "ref-cast",
  "serde",
@@ -14424,7 +14434,7 @@ name = "sp-storage"
 version = "13.0.0"
 source = "git+https://github.com/paritytech//substrate?rev=6d28d2eb6fa1589105e970ff1b97555d91a1495b#6d28d2eb6fa1589105e970ff1b97555d91a1495b"
 dependencies = [
- "impl-serde",
+ "impl-serde 0.4.0",
  "parity-scale-codec",
  "ref-cast",
  "serde",
@@ -14544,7 +14554,7 @@ name = "sp-version"
 version = "22.0.0"
 source = "git+https://github.com/paritytech//substrate?rev=6d28d2eb6fa1589105e970ff1b97555d91a1495b#6d28d2eb6fa1589105e970ff1b97555d91a1495b"
 dependencies = [
- "impl-serde",
+ "impl-serde 0.4.0",
  "parity-scale-codec",
  "parity-wasm",
  "scale-info",
@@ -17535,24 +17545,24 @@ source = "git+https://github.com/paritytech//substrate?rev=6d28d2eb6fa1589105e97
 [[patch.unused]]
 name = "fc-cli"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 
 [[patch.unused]]
 name = "fp-dynamic-fee"
 version = "1.0.0"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 
 [[patch.unused]]
 name = "pallet-dynamic-fee"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 
 [[patch.unused]]
 name = "pallet-evm-test-vector-support"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
 
 [[patch.unused]]
 name = "pallet-hotfix-sufficients"
 version = "1.0.0"
-source = "git+https://github.com/paritytech//frontier?branch=master#ff8bd85fe73da92a6266b1f3859e9e9c78a5f420"
+source = "git+https://github.com/paritytech//frontier?rev=22aaafe089218f6cee625898fff7b953cc793228#22aaafe089218f6cee625898fff7b953cc793228"
diff --git a/Cargo.toml b/Cargo.toml
index fb94ac023b..ed384fe624 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -276,31 +276,31 @@ orml-xtokens = { git = "https://github.com/open-web3-stack//open-runtime-module-
 
 #ToDo: Change to commit id instead of master
 [patch."https://github.com/paritytech/frontier"]
-fc-api = { git = "https://github.com/paritytech//frontier", branch = "master" }
-fc-cli = { git = "https://github.com/paritytech//frontier", branch = "master" }
-fc-consensus = { git = "https://github.com/paritytech//frontier", branch = "master" }
-fc-db = { git = "https://github.com/paritytech//frontier", branch = "master" }
-fc-mapping-sync = { git = "https://github.com/paritytech//frontier", branch = "master" }
-fc-rpc = { git = "https://github.com/paritytech//frontier", branch = "master" }
-fc-rpc-core = { git = "https://github.com/paritytech//frontier", branch = "master" }
-fc-storage = { git = "https://github.com/paritytech//frontier", branch = "master" }
+fc-api = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+fc-cli = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+fc-consensus = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+fc-db = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+fc-mapping-sync = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+fc-rpc = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+fc-rpc-core = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+fc-storage = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
 # Frontier Primitive
-fp-account = { git = "https://github.com/paritytech//frontier", branch = "master" }
-fp-consensus = { git = "https://github.com/paritytech//frontier", branch = "master" }
-fp-dynamic-fee = { git = "https://github.com/paritytech//frontier", branch = "master" }
-fp-ethereum = { git = "https://github.com/paritytech//frontier", branch = "master" }
-fp-evm = { git = "https://github.com/paritytech//frontier", branch = "master" }
-fp-rpc = { git = "https://github.com/paritytech//frontier", branch = "master" }
-fp-self-contained = { git = "https://github.com/paritytech//frontier", branch = "master" }
-fp-storage = { git = "https://github.com/paritytech//frontier", branch = "master" }
+fp-account = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+fp-consensus = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+fp-dynamic-fee = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+fp-ethereum = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+fp-evm = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+fp-rpc = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+fp-self-contained = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+fp-storage = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
 # Frontier FRAME
-pallet-base-fee = { git = "https://github.com/paritytech//frontier", branch = "master" }
-pallet-dynamic-fee = { git = "https://github.com/paritytech//frontier", branch = "master" }
-pallet-ethereum = { git = "https://github.com/paritytech//frontier", branch = "master" }
-pallet-evm = { git = "https://github.com/paritytech//frontier", branch = "master" }
-pallet-evm-chain-id = { git = "https://github.com/paritytech//frontier", branch = "master" }
-pallet-evm-precompile-modexp = { git = "https://github.com/paritytech//frontier", branch = "master" }
-pallet-evm-precompile-sha3fips = { git = "https://github.com/paritytech//frontier", branch = "master" }
-pallet-evm-precompile-simple = { git = "https://github.com/paritytech//frontier", branch = "master" }
-pallet-evm-test-vector-support = { git = "https://github.com/paritytech//frontier", branch = "master" }
-pallet-hotfix-sufficients = { git = "https://github.com/paritytech//frontier", branch = "master" }
+pallet-base-fee = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+pallet-dynamic-fee = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+pallet-ethereum = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+pallet-evm = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+pallet-evm-chain-id = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+pallet-evm-precompile-modexp = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+pallet-evm-precompile-sha3fips = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+pallet-evm-precompile-simple = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+pallet-evm-test-vector-support = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
+pallet-hotfix-sufficients = { git = "https://github.com/paritytech//frontier", rev = "22aaafe089218f6cee625898fff7b953cc793228" }
diff --git a/crates/bitcoin/Cargo.toml b/crates/bitcoin/Cargo.toml
index 129ca1d610..438c405281 100644
--- a/crates/bitcoin/Cargo.toml
+++ b/crates/bitcoin/Cargo.toml
@@ -8,6 +8,7 @@ edition = "2021"
 codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.130", default-features = false, features = ["derive"] }
+impl-serde = { version = "0.3.1", default-features = false }
 sha2 = { version = "0.8.2", default-features = false }
 hex = { version = "0.4.2", default-features = false }
 spin = { version = "0.7.1", default-features = false }
@@ -24,12 +25,12 @@ frame-support = { git = "https://github.com/paritytech/substrate", branch = "pol
 default = ["std"]
 std = [
 	"codec/std",
+	"impl-serde/std",
 	"scale-info/std",
 	"serde/std",
 	"sha2/std",
 	"hex/alloc",
 	"primitive-types/std",
-#	"primitive-types/serde",
 	"secp256k1/std",
 ]
 parser = []
diff --git a/crates/bitcoin/src/address.rs b/crates/bitcoin/src/address.rs
index 91082fe96f..43edece67d 100644
--- a/crates/bitcoin/src/address.rs
+++ b/crates/bitcoin/src/address.rs
@@ -153,29 +153,26 @@ impl From<[u8; PUBLIC_KEY_SIZE]> for PublicKey {
     }
 }
 
-// #[cfg(feature = "std")]
 impl serde::Serialize for PublicKey {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: serde::Serializer,
     {
         let mut slice = [0u8; 2 + 2 * PUBLIC_KEY_SIZE];
-        // impl_serde::serialize::serialize_raw(&mut slice, &self.0, serializer)
-        todo!()
+        impl_serde::serialize::serialize_raw(&mut slice, &self.0, serializer)
     }
 }
 
-// #[cfg(feature = "std")]
 impl<'de> serde::Deserialize<'de> for PublicKey {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
         D: serde::Deserializer<'de>,
     {
         let mut bytes = [0u8; PUBLIC_KEY_SIZE];
-        // impl_serde::serialize::deserialize_check_len(
-        //     deserializer,
-        //     impl_serde::serialize::ExpectedLen::Exact(&mut bytes),
-        // )?;todo()
+        impl_serde::serialize::deserialize_check_len(
+            deserializer,
+            impl_serde::serialize::ExpectedLen::Exact(&mut bytes),
+        )?;
         Ok(PublicKey(bytes))
     }
 }
diff --git a/crates/bitcoin/src/lib.rs b/crates/bitcoin/src/lib.rs
index b5bcb44215..6699ea8d96 100644
--- a/crates/bitcoin/src/lib.rs
+++ b/crates/bitcoin/src/lib.rs
@@ -14,8 +14,7 @@
 //! - Script (address) construction and parsing.
 //! - Merkle proof construction and verification.
 //! - Elliptic curve multiplication over Secp256k1.
-// #![allow(clippy::all)]
-// #![deny(warnings)]
+#![deny(warnings)]
 #![cfg_attr(test, feature(proc_macro_hygiene))]
 #![cfg_attr(not(feature = "std"), no_std)]
 
diff --git a/crates/bitcoin/src/types.rs b/crates/bitcoin/src/types.rs
index 0faf094029..40f8c43172 100644
--- a/crates/bitcoin/src/types.rs
+++ b/crates/bitcoin/src/types.rs
@@ -591,18 +591,7 @@ pub struct BlockChain {
 
 /// Represents a bitcoin 32 bytes hash digest encoded in little-endian
 #[derive(
-    serde::Serialize,
-    serde::Deserialize,
-    Encode,
-    Decode,
-    Default,
-    PartialEq,
-    Eq,
-    Clone,
-    Copy,
-    Debug,
-    TypeInfo,
-    MaxEncodedLen,
+    Serialize, Deserialize, Encode, Decode, Default, PartialEq, Eq, Clone, Copy, Debug, TypeInfo, MaxEncodedLen,
 )]
 pub struct H256Le {
     content: [u8; 32],
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index 99c8258eca..52fc16caea 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -25,7 +25,6 @@ std = [
     "serde/std",
     "codec/std",
 	"primitive-types/std",
-#	"primitive-types/serde",
     "scale-decode",
     "scale-encode",