From 6702cd7db4ab5936d9a9be5d922300a0adedcfd7 Mon Sep 17 00:00:00 2001
From: Joshy Orndorff <admin@joshyorndorff.com>
Date: Tue, 16 Apr 2024 10:40:05 -0400
Subject: [PATCH] downgrade trie-db back to 0.29 to match sdk

---
 Cargo.lock | 44 ++++++++++++++++----------------------------
 Cargo.toml |  2 +-
 2 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 65e73889..2d7855b8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2206,7 +2206,7 @@ dependencies = [
  "sp-trie",
  "sp-version",
  "staging-xcm",
- "trie-db 0.28.0",
+ "trie-db",
 ]
 
 [[package]]
@@ -11560,9 +11560,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.115"
+version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
+checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
 dependencies = [
  "itoa",
  "ryu",
@@ -12225,7 +12225,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-ec-utils"
 version = "0.10.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a8f4f4f00f8fc0da512a09e1450bf4cda954d70d"
+source = "git+https://github.com/paritytech/polkadot-sdk#61d45ed72b2f8afade997e1a973327f2ada02aa0"
 dependencies = [
  "ark-bls12-377",
  "ark-bls12-377-ext",
@@ -12264,7 +12264,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a8f4f4f00f8fc0da512a09e1450bf4cda954d70d"
+source = "git+https://github.com/paritytech/polkadot-sdk#61d45ed72b2f8afade997e1a973327f2ada02aa0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -12285,7 +12285,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.25.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a8f4f4f00f8fc0da512a09e1450bf4cda954d70d"
+source = "git+https://github.com/paritytech/polkadot-sdk#61d45ed72b2f8afade997e1a973327f2ada02aa0"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -12503,7 +12503,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a8f4f4f00f8fc0da512a09e1450bf4cda954d70d"
+source = "git+https://github.com/paritytech/polkadot-sdk#61d45ed72b2f8afade997e1a973327f2ada02aa0"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -12535,7 +12535,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a8f4f4f00f8fc0da512a09e1450bf4cda954d70d"
+source = "git+https://github.com/paritytech/polkadot-sdk#61d45ed72b2f8afade997e1a973327f2ada02aa0"
 dependencies = [
  "Inflector",
  "expander 2.1.0",
@@ -12592,7 +12592,7 @@ dependencies = [
  "sp-trie",
  "thiserror",
  "tracing",
- "trie-db 0.28.0",
+ "trie-db",
 ]
 
 [[package]]
@@ -12627,7 +12627,7 @@ source = "git+https://github.com/off-narrative-labs/polkadot-sdk?branch=tuxedo-v
 [[package]]
 name = "sp-std"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a8f4f4f00f8fc0da512a09e1450bf4cda954d70d"
+source = "git+https://github.com/paritytech/polkadot-sdk#61d45ed72b2f8afade997e1a973327f2ada02aa0"
 
 [[package]]
 name = "sp-storage"
@@ -12645,7 +12645,7 @@ dependencies = [
 [[package]]
 name = "sp-storage"
 version = "19.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a8f4f4f00f8fc0da512a09e1450bf4cda954d70d"
+source = "git+https://github.com/paritytech/polkadot-sdk#61d45ed72b2f8afade997e1a973327f2ada02aa0"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -12682,7 +12682,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a8f4f4f00f8fc0da512a09e1450bf4cda954d70d"
+source = "git+https://github.com/paritytech/polkadot-sdk#61d45ed72b2f8afade997e1a973327f2ada02aa0"
 dependencies = [
  "parity-scale-codec",
  "tracing",
@@ -12735,7 +12735,7 @@ dependencies = [
  "sp-std 8.0.0",
  "thiserror",
  "tracing",
- "trie-db 0.28.0",
+ "trie-db",
  "trie-root",
 ]
 
@@ -12783,7 +12783,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#a8f4f4f00f8fc0da512a09e1450bf4cda954d70d"
+source = "git+https://github.com/paritytech/polkadot-sdk#61d45ed72b2f8afade997e1a973327f2ada02aa0"
 dependencies = [
  "impl-trait-for-tuples",
  "log",
@@ -13103,7 +13103,7 @@ dependencies = [
  "sp-runtime",
  "sp-state-machine",
  "sp-trie",
- "trie-db 0.28.0",
+ "trie-db",
 ]
 
 [[package]]
@@ -13828,18 +13828,6 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "trie-db"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65ed83be775d85ebb0e272914fff6462c39b3ddd6dc67b5c1c41271aad280c69"
-dependencies = [
- "hash-db",
- "log",
- "rustc-hex",
- "smallvec",
-]
-
 [[package]]
 name = "trie-root"
 version = "0.18.0"
@@ -13998,7 +13986,7 @@ dependencies = [
  "sp-std 8.0.0",
  "sp-tracing 10.0.0",
  "sp-trie",
- "trie-db 0.29.0",
+ "trie-db",
  "tuxedo-core",
  "tuxedo-parachainify",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 9c43db10..17a805ab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -127,7 +127,7 @@ sp-externalities = { branch = "tuxedo-v1.5.0", default_features = false, git = "
 sp-state-machine = { branch = "tuxedo-v1.5.0", default_features = false, git = "https://github.com/Off-Narrative-Labs/polkadot-sdk" }
 sp-tracing = { branch = "tuxedo-v1.5.0", default_features = false, git = "https://github.com/Off-Narrative-Labs/polkadot-sdk" }
 sp-trie = { branch = "tuxedo-v1.5.0", default_features = false, git = "https://github.com/Off-Narrative-Labs/polkadot-sdk" }
-trie-db = { version = "0.29.0", default-features = false }
+trie-db = { version = "0.28.0", default-features = false }
 
 # We need to depend on this explicitly so we can enable the "full-node" feature
 # See https://github.com/paritytech/polkadot-sdk/issues/2551 for more details