From c71ba59db994caba8e2e110f5cf9390e465ddc09 Mon Sep 17 00:00:00 2001
From: James Wilson <james@jsdw.me>
Date: Mon, 25 Nov 2024 07:20:24 +0000
Subject: [PATCH] Bump frame-decode and frame-metadata to latest (#1870)

---
 Cargo.lock | 70 +++++++++++++++++-------------------------------------
 Cargo.toml |  4 ++--
 2 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d258726874..9d65ff1b67 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2464,7 +2464,6 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.87",
- "unicode-xid",
 ]
 
 [[package]]
@@ -3002,13 +3001,11 @@ dependencies = [
 
 [[package]]
 name = "frame-decode"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02d3379df61ff3dd871e2dde7d1bcdc0263e613c21c7579b149fd4f0ad9b1dc2"
+version = "0.6.0"
 dependencies = [
- "frame-metadata 17.0.0",
+ "frame-metadata 18.0.0",
  "parity-scale-codec",
- "scale-decode 0.14.0",
+ "scale-decode",
  "scale-info",
  "scale-type-resolver",
  "sp-crypto-hashing",
@@ -3076,9 +3073,9 @@ dependencies = [
 
 [[package]]
 name = "frame-metadata"
-version = "17.0.0"
+version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "701bac17e9b55e0f95067c428ebcb46496587f08e8cf4ccc0fe5903bea10dbb8"
+checksum = "daaf440c68eb2c3d88e5760fe8c7af3f9fee9181fab6c2f2c4e7cc48dcc40bb8"
 dependencies = [
  "cfg-if",
  "parity-scale-codec",
@@ -3389,7 +3386,7 @@ dependencies = [
 name = "generate-custom-metadata"
 version = "0.38.0"
 dependencies = [
- "frame-metadata 17.0.0",
+ "frame-metadata 18.0.0",
  "parity-scale-codec",
  "scale-info",
 ]
@@ -3965,7 +3962,7 @@ version = "0.38.0"
 dependencies = [
  "assert_matches",
  "cfg_aliases",
- "frame-metadata 17.0.0",
+ "frame-metadata 18.0.0",
  "futures",
  "hex",
  "parity-scale-codec",
@@ -8477,16 +8474,6 @@ dependencies = [
  "wasmtime",
 ]
 
-[[package]]
-name = "scale-bits"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e57b1e7f6b65ed1f04e79a85a57d755ad56d76fdf1e9bddcc9ae14f71fcdcf54"
-dependencies = [
- "parity-scale-codec",
- "scale-type-resolver",
-]
-
 [[package]]
 name = "scale-bits"
 version = "0.7.0"
@@ -8499,19 +8486,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "scale-decode"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ae9cc099ae85ff28820210732b00f019546f36f33225f509fe25d5816864a0"
-dependencies = [
- "derive_more 1.0.0",
- "parity-scale-codec",
- "scale-bits 0.6.0",
- "scale-type-resolver",
- "smallvec",
-]
-
 [[package]]
 name = "scale-decode"
 version = "0.16.0"
@@ -8520,7 +8494,7 @@ checksum = "4d78196772d25b90a98046794ce0fe2588b39ebdfbdc1e45b4c6c85dd43bebad"
 dependencies = [
  "parity-scale-codec",
  "primitive-types 0.13.1",
- "scale-bits 0.7.0",
+ "scale-bits",
  "scale-decode-derive",
  "scale-type-resolver",
  "smallvec",
@@ -8547,7 +8521,7 @@ checksum = "64901733157f9d25ef86843bd783eda439fac7efb0ad5a615d12d2cf3a29464b"
 dependencies = [
  "parity-scale-codec",
  "primitive-types 0.13.1",
- "scale-bits 0.7.0",
+ "scale-bits",
  "scale-encode-derive",
  "scale-type-resolver",
  "smallvec",
@@ -8644,8 +8618,8 @@ dependencies = [
  "blake2",
  "either",
  "parity-scale-codec",
- "scale-bits 0.7.0",
- "scale-decode 0.16.0",
+ "scale-bits",
+ "scale-decode",
  "scale-encode",
  "scale-type-resolver",
  "serde",
@@ -10576,7 +10550,7 @@ dependencies = [
  "derive-where",
  "either",
  "finito",
- "frame-metadata 17.0.0",
+ "frame-metadata 18.0.0",
  "futures",
  "getrandom",
  "hex",
@@ -10587,8 +10561,8 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-sdk",
  "primitive-types 0.13.1",
- "scale-bits 0.7.0",
- "scale-decode 0.16.0",
+ "scale-bits",
+ "scale-decode",
  "scale-encode",
  "scale-info",
  "scale-value",
@@ -10616,7 +10590,7 @@ version = "0.38.0"
 dependencies = [
  "clap",
  "color-eyre",
- "frame-metadata 17.0.0",
+ "frame-metadata 18.0.0",
  "heck 0.5.0",
  "hex",
  "indoc",
@@ -10644,7 +10618,7 @@ dependencies = [
 name = "subxt-codegen"
 version = "0.38.0"
 dependencies = [
- "frame-metadata 17.0.0",
+ "frame-metadata 18.0.0",
  "getrandom",
  "heck 0.5.0",
  "parity-scale-codec",
@@ -10667,7 +10641,7 @@ dependencies = [
  "blake2",
  "derive-where",
  "frame-decode",
- "frame-metadata 17.0.0",
+ "frame-metadata 18.0.0",
  "hashbrown 0.14.5",
  "hex",
  "impl-serde 0.5.0",
@@ -10675,8 +10649,8 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-sdk",
  "primitive-types 0.13.1",
- "scale-bits 0.7.0",
- "scale-decode 0.16.0",
+ "scale-bits",
+ "scale-decode",
  "scale-encode",
  "scale-info",
  "scale-value",
@@ -10736,7 +10710,7 @@ dependencies = [
  "bitvec",
  "criterion",
  "frame-decode",
- "frame-metadata 17.0.0",
+ "frame-metadata 18.0.0",
  "hashbrown 0.14.5",
  "parity-scale-codec",
  "polkadot-sdk",
@@ -10787,7 +10761,7 @@ dependencies = [
 name = "subxt-utils-fetchmetadata"
 version = "0.38.0"
 dependencies = [
- "frame-metadata 17.0.0",
+ "frame-metadata 18.0.0",
  "hex",
  "jsonrpsee",
  "parity-scale-codec",
@@ -11322,7 +11296,7 @@ checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 name = "ui-tests"
 version = "0.38.0"
 dependencies = [
- "frame-metadata 17.0.0",
+ "frame-metadata 18.0.0",
  "generate-custom-metadata",
  "hex",
  "parity-scale-codec",
diff --git a/Cargo.toml b/Cargo.toml
index 03f862c6ba..3700d0cdda 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -77,8 +77,8 @@ darling = "0.20.10"
 derive-where = "1.2.7"
 either = { version = "1.13.0", default-features = false }
 finito = { version = "0.1.0", default-features = false }
-frame-decode = { version = "0.5.0", default-features = false }
-frame-metadata = { version = "17.0.0", default-features = false }
+frame-decode = { version = "0.6.0", default-features = false }
+frame-metadata = { version = "18.0.0", default-features = false }
 futures = { version = "0.3.31", default-features = false, features = ["std"] }
 getrandom = { version = "0.2", default-features = false }
 hashbrown = "0.14.5"