From fc77fcfe0ca4e540733ae4cd1db7babfa84bdadf Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Thu, 20 Apr 2023 12:28:04 +0200
Subject: [PATCH] Use Display trait for ResourceId

---
 Cargo.lock                         | 555 ++++++++++++++++++++++++-----
 Cargo.toml                         |   2 +-
 crates/relayer-utils/src/metric.rs |   2 +-
 3 files changed, 475 insertions(+), 84 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 65e89b9b2..2c0a19670 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -992,6 +992,15 @@ version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
 
+[[package]]
+name = "cfg-expr"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db"
+dependencies = [
+ "smallvec",
+]
+
 [[package]]
 name = "cfg-if"
 version = "0.1.10"
@@ -1610,6 +1619,17 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "derive-syn-parse"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.17"
@@ -1982,15 +2002,15 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_json",
- "sp-core",
+ "sp-core 16.0.0",
  "sp-keyring",
- "sp-runtime",
+ "sp-runtime 18.0.0",
  "subxt",
  "tokio 1.27.0",
  "toml 0.5.11",
  "tree_hash 0.4.1 (git+https://github.com/webb-tools/pallet-eth2-light-client)",
  "webb 0.5.21",
- "webb-proposals",
+ "webb-proposals 0.5.4",
  "webb-relayer-types 0.1.0 (git+https://github.com/webb-tools/relayer.git)",
  "webb-relayer-utils 0.1.0 (git+https://github.com/webb-tools/relayer.git)",
 ]
@@ -2128,7 +2148,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "sp-core",
+ "sp-core 16.0.0",
  "sp-keyring",
  "thread",
  "tokio 1.27.0",
@@ -2137,7 +2157,7 @@ dependencies = [
  "types",
  "warp",
  "webb 0.5.21",
- "webb-proposals",
+ "webb-proposals 0.5.4",
  "webb-relayer-utils 0.1.0 (git+https://github.com/webb-tools/relayer.git)",
 ]
 
@@ -2906,6 +2926,72 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "frame-support"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "bitflags",
+ "frame-metadata",
+ "frame-support-procedural",
+ "impl-trait-for-tuples",
+ "k256 0.11.6",
+ "log",
+ "parity-scale-codec",
+ "paste",
+ "scale-info",
+ "smallvec",
+ "sp-api",
+ "sp-arithmetic 6.0.0",
+ "sp-core 7.0.0",
+ "sp-core-hashing-proc-macro",
+ "sp-inherents",
+ "sp-io 7.0.0",
+ "sp-runtime 7.0.0",
+ "sp-staking",
+ "sp-std 5.0.0",
+ "sp-tracing 6.0.0",
+ "sp-weights 4.0.0",
+ "tt-call",
+]
+
+[[package]]
+name = "frame-support-procedural"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "Inflector",
+ "cfg-expr",
+ "derive-syn-parse",
+ "frame-support-procedural-tools",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "frame-support-procedural-tools"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "frame-support-procedural-tools-derive",
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "frame-support-procedural-tools-derive"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "fs2"
 version = "0.4.3"
@@ -6152,6 +6238,44 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "sp-api"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "log",
+ "parity-scale-codec",
+ "sp-api-proc-macro",
+ "sp-core 7.0.0",
+ "sp-runtime 7.0.0",
+ "sp-std 5.0.0",
+ "sp-version",
+]
+
+[[package]]
+name = "sp-api-proc-macro"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "blake2 0.10.6",
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "sp-application-crypto"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core 7.0.0",
+ "sp-io 7.0.0",
+ "sp-std 5.0.0",
+]
+
 [[package]]
 name = "sp-application-crypto"
 version = "17.0.0"
@@ -6161,9 +6285,22 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-core",
- "sp-io",
- "sp-std",
+ "sp-core 16.0.0",
+ "sp-io 17.0.0",
+ "sp-std 6.0.0",
+]
+
+[[package]]
+name = "sp-arithmetic"
+version = "6.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "integer-sqrt",
+ "num-traits",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-std 5.0.0",
+ "static_assertions",
 ]
 
 [[package]]
@@ -6177,10 +6314,32 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-std",
+ "sp-std 6.0.0",
  "static_assertions",
 ]
 
+[[package]]
+name = "sp-core"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "bitflags",
+ "bounded-collections",
+ "hash-db",
+ "hash256-std-hasher",
+ "log",
+ "parity-scale-codec",
+ "primitive-types 0.12.1",
+ "scale-info",
+ "secrecy",
+ "sp-debug-derive 5.0.0",
+ "sp-runtime-interface 7.0.0",
+ "sp-std 5.0.0",
+ "sp-storage 7.0.0",
+ "ss58-registry",
+ "zeroize",
+]
+
 [[package]]
 name = "sp-core"
 version = "16.0.0"
@@ -6212,12 +6371,12 @@ dependencies = [
  "secp256k1",
  "secrecy",
  "serde",
- "sp-core-hashing",
- "sp-debug-derive",
- "sp-externalities",
- "sp-runtime-interface",
- "sp-std",
- "sp-storage",
+ "sp-core-hashing 6.0.0",
+ "sp-debug-derive 6.0.0",
+ "sp-externalities 0.17.0",
+ "sp-runtime-interface 13.0.0",
+ "sp-std 6.0.0",
+ "sp-storage 11.0.0",
  "ss58-registry",
  "substrate-bip39",
  "thiserror",
@@ -6225,6 +6384,20 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "sp-core-hashing"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "blake2 0.10.6",
+ "byteorder",
+ "digest 0.10.6",
+ "sha2 0.10.6",
+ "sha3",
+ "sp-std 5.0.0",
+ "twox-hash",
+]
+
 [[package]]
 name = "sp-core-hashing"
 version = "6.0.0"
@@ -6236,10 +6409,31 @@ dependencies = [
  "digest 0.10.6",
  "sha2 0.10.6",
  "sha3",
- "sp-std",
+ "sp-std 6.0.0",
  "twox-hash",
 ]
 
+[[package]]
+name = "sp-core-hashing-proc-macro"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "sp-core-hashing 5.0.0",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "sp-debug-derive"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "sp-debug-derive"
 version = "6.0.0"
@@ -6251,6 +6445,17 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "sp-externalities"
+version = "0.13.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "environmental",
+ "parity-scale-codec",
+ "sp-std 5.0.0",
+ "sp-storage 7.0.0",
+]
+
 [[package]]
 name = "sp-externalities"
 version = "0.17.0"
@@ -6259,8 +6464,36 @@ checksum = "57052935c9c9b070ea6b339ef0da3bf241b7e065fc37f9c551669ee83ecfc3c1"
 dependencies = [
  "environmental",
  "parity-scale-codec",
- "sp-std",
- "sp-storage",
+ "sp-std 6.0.0",
+ "sp-storage 11.0.0",
+]
+
+[[package]]
+name = "sp-inherents"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core 7.0.0",
+ "sp-std 5.0.0",
+]
+
+[[package]]
+name = "sp-io"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "bytes 1.4.0",
+ "parity-scale-codec",
+ "sp-core 7.0.0",
+ "sp-externalities 0.13.0",
+ "sp-runtime-interface 7.0.0",
+ "sp-std 5.0.0",
+ "sp-tracing 6.0.0",
+ "tracing",
+ "tracing-core",
 ]
 
 [[package]]
@@ -6277,13 +6510,13 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "secp256k1",
- "sp-core",
- "sp-externalities",
+ "sp-core 16.0.0",
+ "sp-externalities 0.17.0",
  "sp-keystore",
- "sp-runtime-interface",
+ "sp-runtime-interface 13.0.0",
  "sp-state-machine",
- "sp-std",
- "sp-tracing",
+ "sp-std 6.0.0",
+ "sp-tracing 8.0.0",
  "sp-trie",
  "tracing",
  "tracing-core",
@@ -6296,8 +6529,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc13a168cdc15e185db5cbe8644e3eaafa534e229593768b3044b60bea00fc8c"
 dependencies = [
  "lazy_static",
- "sp-core",
- "sp-runtime",
+ "sp-core 16.0.0",
+ "sp-runtime 18.0.0",
  "strum",
 ]
 
@@ -6313,8 +6546,8 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "schnorrkel",
- "sp-core",
- "sp-externalities",
+ "sp-core 16.0.0",
+ "sp-externalities 0.17.0",
  "thiserror",
 ]
 
@@ -6329,6 +6562,26 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "sp-runtime"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "either",
+ "hash256-std-hasher",
+ "impl-trait-for-tuples",
+ "log",
+ "parity-scale-codec",
+ "paste",
+ "scale-info",
+ "sp-application-crypto 7.0.0",
+ "sp-arithmetic 6.0.0",
+ "sp-core 7.0.0",
+ "sp-io 7.0.0",
+ "sp-std 5.0.0",
+ "sp-weights 4.0.0",
+]
+
 [[package]]
 name = "sp-runtime"
 version = "18.0.0"
@@ -6344,12 +6597,30 @@ dependencies = [
  "rand 0.8.5",
  "scale-info",
  "serde",
- "sp-application-crypto",
- "sp-arithmetic",
- "sp-core",
- "sp-io",
- "sp-std",
- "sp-weights",
+ "sp-application-crypto 17.0.0",
+ "sp-arithmetic 12.0.0",
+ "sp-core 16.0.0",
+ "sp-io 17.0.0",
+ "sp-std 6.0.0",
+ "sp-weights 14.0.0",
+]
+
+[[package]]
+name = "sp-runtime-interface"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "bytes 1.4.0",
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "primitive-types 0.12.1",
+ "sp-externalities 0.13.0",
+ "sp-runtime-interface-proc-macro 6.0.0",
+ "sp-std 5.0.0",
+ "sp-storage 7.0.0",
+ "sp-tracing 6.0.0",
+ "sp-wasm-interface 7.0.0",
+ "static_assertions",
 ]
 
 [[package]]
@@ -6362,15 +6633,27 @@ dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "primitive-types 0.12.1",
- "sp-externalities",
- "sp-runtime-interface-proc-macro",
- "sp-std",
- "sp-storage",
- "sp-tracing",
- "sp-wasm-interface",
+ "sp-externalities 0.17.0",
+ "sp-runtime-interface-proc-macro 9.0.0",
+ "sp-std 6.0.0",
+ "sp-storage 11.0.0",
+ "sp-tracing 8.0.0",
+ "sp-wasm-interface 10.0.0",
  "static_assertions",
 ]
 
+[[package]]
+name = "sp-runtime-interface-proc-macro"
+version = "6.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "Inflector",
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "9.0.0"
@@ -6384,6 +6667,18 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "sp-staking"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core 7.0.0",
+ "sp-runtime 7.0.0",
+ "sp-std 5.0.0",
+]
+
 [[package]]
 name = "sp-state-machine"
 version = "0.22.0"
@@ -6396,21 +6691,37 @@ dependencies = [
  "parking_lot 0.12.1",
  "rand 0.8.5",
  "smallvec",
- "sp-core",
- "sp-externalities",
+ "sp-core 16.0.0",
+ "sp-externalities 0.17.0",
  "sp-panic-handler",
- "sp-std",
+ "sp-std 6.0.0",
  "sp-trie",
  "thiserror",
  "tracing",
 ]
 
+[[package]]
+name = "sp-std"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+
 [[package]]
 name = "sp-std"
 version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af0ee286f98455272f64ac5bb1384ff21ac029fbb669afbaf48477faff12760e"
 
+[[package]]
+name = "sp-storage"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "parity-scale-codec",
+ "ref-cast",
+ "sp-debug-derive 5.0.0",
+ "sp-std 5.0.0",
+]
+
 [[package]]
 name = "sp-storage"
 version = "11.0.0"
@@ -6421,8 +6732,19 @@ dependencies = [
  "parity-scale-codec",
  "ref-cast",
  "serde",
- "sp-debug-derive",
- "sp-std",
+ "sp-debug-derive 6.0.0",
+ "sp-std 6.0.0",
+]
+
+[[package]]
+name = "sp-tracing"
+version = "6.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "parity-scale-codec",
+ "sp-std 5.0.0",
+ "tracing",
+ "tracing-core",
 ]
 
 [[package]]
@@ -6432,7 +6754,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e46bd547da89a9cda69b4ce4c91a5b7e1f86915190d83cd407b715d0c6bac042"
 dependencies = [
  "parity-scale-codec",
- "sp-std",
+ "sp-std 6.0.0",
  "tracing",
  "tracing-core",
  "tracing-subscriber 0.2.25",
@@ -6454,14 +6776,48 @@ dependencies = [
  "parking_lot 0.12.1",
  "scale-info",
  "schnellru",
- "sp-core",
- "sp-std",
+ "sp-core 16.0.0",
+ "sp-std 6.0.0",
  "thiserror",
  "tracing",
  "trie-db",
  "trie-root",
 ]
 
+[[package]]
+name = "sp-version"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core-hashing-proc-macro",
+ "sp-runtime 7.0.0",
+ "sp-std 5.0.0",
+ "sp-version-proc-macro",
+]
+
+[[package]]
+name = "sp-version-proc-macro"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "parity-scale-codec",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "sp-wasm-interface"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "sp-std 5.0.0",
+]
+
 [[package]]
 name = "sp-wasm-interface"
 version = "10.0.0"
@@ -6472,11 +6828,25 @@ dependencies = [
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
- "sp-std",
+ "sp-std 6.0.0",
  "wasmi",
  "wasmtime",
 ]
 
+[[package]]
+name = "sp-weights"
+version = "4.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#1837f423b494254e1d27834b1c9da34b2c0c2375"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "smallvec",
+ "sp-arithmetic 6.0.0",
+ "sp-core 7.0.0",
+ "sp-debug-derive 5.0.0",
+ "sp-std 5.0.0",
+]
+
 [[package]]
 name = "sp-weights"
 version = "14.0.0"
@@ -6487,10 +6857,10 @@ dependencies = [
  "scale-info",
  "serde",
  "smallvec",
- "sp-arithmetic",
- "sp-core",
- "sp-debug-derive",
- "sp-std",
+ "sp-arithmetic 12.0.0",
+ "sp-core 16.0.0",
+ "sp-debug-derive 6.0.0",
+ "sp-std 6.0.0",
 ]
 
 [[package]]
@@ -6661,9 +7031,9 @@ dependencies = [
  "scale-value",
  "serde",
  "serde_json",
- "sp-core",
- "sp-core-hashing",
- "sp-runtime",
+ "sp-core 16.0.0",
+ "sp-core-hashing 6.0.0",
+ "sp-runtime 18.0.0",
  "subxt-macro",
  "subxt-metadata",
  "thiserror",
@@ -6712,7 +7082,7 @@ dependencies = [
  "frame-metadata",
  "parity-scale-codec",
  "scale-info",
- "sp-core-hashing",
+ "sp-core-hashing 6.0.0",
 ]
 
 [[package]]
@@ -7357,6 +7727,12 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
+[[package]]
+name = "tt-call"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df"
+
 [[package]]
 name = "tungstenite"
 version = "0.11.1"
@@ -8006,11 +8382,11 @@ dependencies = [
  "hex",
  "hex-literal",
  "native-tls",
- "sp-core",
+ "sp-core 16.0.0",
  "tokio 1.27.0",
  "typed-builder 0.12.0",
  "webb 0.5.22",
- "webb-proposals",
+ "webb-proposals 0.5.22",
  "webb-relayer-config",
  "webb-relayer-utils 0.1.0",
 ]
@@ -8042,7 +8418,7 @@ dependencies = [
  "tracing",
  "tracing-test",
  "webb 0.5.22",
- "webb-proposals",
+ "webb-proposals 0.5.22",
  "webb-relayer-config",
  "webb-relayer-context",
  "webb-relayer-store",
@@ -8062,7 +8438,7 @@ dependencies = [
  "tracing",
  "webb 0.5.22",
  "webb-event-watcher-traits",
- "webb-proposals",
+ "webb-proposals 0.5.22",
  "webb-relayer-config",
  "webb-relayer-store",
  "webb-relayer-utils 0.1.0",
@@ -8091,7 +8467,7 @@ dependencies = [
  "webb-bridge-registry-backends",
  "webb-event-watcher-traits",
  "webb-proposal-signing-backends",
- "webb-proposals",
+ "webb-proposals 0.5.22",
  "webb-relayer-config",
  "webb-relayer-store",
  "webb-relayer-utils 0.1.0",
@@ -8106,14 +8482,14 @@ dependencies = [
  "libsecp256k1",
  "native-tls",
  "sled",
- "sp-core",
+ "sp-core 16.0.0",
  "tokio 1.27.0",
  "tracing",
  "webb 0.5.22",
  "webb-bridge-registry-backends",
  "webb-event-watcher-traits",
  "webb-proposal-signing-backends",
- "webb-proposals",
+ "webb-proposals 0.5.22",
  "webb-relayer-config",
  "webb-relayer-store",
  "webb-relayer-types 0.1.0",
@@ -8145,7 +8521,7 @@ dependencies = [
  "tracing",
  "webb 0.5.22",
  "webb-proposal-signing-backends",
- "webb-proposals",
+ "webb-proposals 0.5.4",
  "webb-relayer",
  "webb-relayer-config",
  "webb-relayer-context",
@@ -8187,12 +8563,12 @@ dependencies = [
  "hex",
  "native-tls",
  "sled",
- "sp-core",
+ "sp-core 16.0.0",
  "tokio 1.27.0",
  "tracing",
  "typed-builder 0.12.0",
  "webb 0.5.22",
- "webb-proposals",
+ "webb-proposals 0.5.22",
  "webb-relayer-store",
  "webb-relayer-types 0.1.0",
  "webb-relayer-utils 0.1.0",
@@ -8214,6 +8590,21 @@ dependencies = [
  "typed-builder 0.10.0",
 ]
 
+[[package]]
+name = "webb-proposals"
+version = "0.5.22"
+source = "git+https://github.com/webb-tools/webb-rs?branch=felix/display-resource-id#68b95ae02c231999170cafc2e91d1ccfdc3f1ff5"
+dependencies = [
+ "frame-support",
+ "hex",
+ "num-traits",
+ "parity-scale-codec",
+ "scale-info",
+ "schemars",
+ "tiny-keccak",
+ "typed-builder 0.10.0",
+]
+
 [[package]]
 name = "webb-relayer"
 version = "0.5.0"
@@ -8227,8 +8618,8 @@ dependencies = [
  "paw",
  "serde_json",
  "sled",
- "sp-core",
- "sp-runtime",
+ "sp-core 16.0.0",
+ "sp-runtime 18.0.0",
  "tempfile",
  "tokio 1.27.0",
  "tower-http",
@@ -8241,7 +8632,7 @@ dependencies = [
  "webb-ew-evm",
  "webb-ew-substrate",
  "webb-proposal-signing-backends",
- "webb-proposals",
+ "webb-proposals 0.5.22",
  "webb-relayer-config",
  "webb-relayer-context",
  "webb-relayer-handlers",
@@ -8265,13 +8656,13 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_path_to_error",
- "sp-core",
+ "sp-core 16.0.0",
  "structopt",
  "tracing",
  "tracing-subscriber 0.3.16",
  "url",
  "webb 0.5.22",
- "webb-proposals",
+ "webb-proposals 0.5.22",
  "webb-relayer-store",
  "webb-relayer-types 0.1.0",
  "webb-relayer-utils 0.1.0",
@@ -8282,7 +8673,7 @@ name = "webb-relayer-context"
 version = "0.1.0"
 dependencies = [
  "native-tls",
- "sp-core",
+ "sp-core 16.0.0",
  "tokio 1.27.0",
  "webb 0.5.22",
  "webb-price-oracle-backends",
@@ -8313,12 +8704,12 @@ dependencies = [
  "native-tls",
  "serde",
  "serde_json",
- "sp-core",
+ "sp-core 16.0.0",
  "tokio 1.27.0",
  "tokio-stream",
  "tracing",
  "webb 0.5.22",
- "webb-proposals",
+ "webb-proposals 0.5.22",
  "webb-relayer-config",
  "webb-relayer-context",
  "webb-relayer-handler-utils",
@@ -8340,7 +8731,7 @@ dependencies = [
  "tempfile",
  "tracing",
  "webb 0.5.22",
- "webb-proposals",
+ "webb-proposals 0.5.22",
  "webb-relayer-utils 0.1.0",
 ]
 
@@ -8354,8 +8745,8 @@ dependencies = [
  "native-tls",
  "rand 0.8.5",
  "sled",
- "sp-core",
- "sp-runtime",
+ "sp-core 16.0.0",
+ "sp-runtime 18.0.0",
  "tokio 1.27.0",
  "tracing",
  "webb 0.5.22",
@@ -8380,7 +8771,7 @@ dependencies = [
  "webb 0.5.22",
  "webb-chains-info",
  "webb-price-oracle-backends",
- "webb-proposals",
+ "webb-proposals 0.5.22",
  "webb-relayer-config",
  "webb-relayer-context",
  "webb-relayer-handler-utils",
@@ -8402,7 +8793,7 @@ dependencies = [
  "ethereum-types 0.14.1",
  "native-tls",
  "serde",
- "sp-core",
+ "sp-core 16.0.0",
  "tiny-bip39",
  "tracing",
  "url",
@@ -8417,7 +8808,7 @@ dependencies = [
  "ethereum-types 0.14.1",
  "native-tls",
  "serde",
- "sp-core",
+ "sp-core 16.0.0",
  "tiny-bip39",
  "tracing",
  "url",
@@ -8446,7 +8837,7 @@ dependencies = [
  "thiserror",
  "url",
  "webb 0.5.22",
- "webb-proposals",
+ "webb-proposals 0.5.22",
 ]
 
 [[package]]
@@ -8471,7 +8862,7 @@ dependencies = [
  "thiserror",
  "url",
  "webb 0.5.21",
- "webb-proposals",
+ "webb-proposals 0.5.4",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index e001ce4a5..6a370e707 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,7 +43,7 @@ sp-core = { version = "16.0.0", default-features = false }
 sp-runtime = { version = "18.0.0", default-features = false }
 # Used by ethers (but we need it to be vendored with the lib).
 native-tls = { version = "^0.2", features = ["vendored"] }
-webb-proposals = { version = "0.5.4", default-features = false, features = ["scale"] }
+webb-proposals = { git = "https://github.com/webb-tools/webb-rs", branch = "felix/display-resource-id", default-features = false, features = ["scale"] }
 ethereum-types = "0.14.1"
 dotenv = "0.15.0"
 axum = { version = "0.6.12", features = ["ws"] }
diff --git a/crates/relayer-utils/src/metric.rs b/crates/relayer-utils/src/metric.rs
index 61ca25f1f..03995a815 100644
--- a/crates/relayer-utils/src/metric.rs
+++ b/crates/relayer-utils/src/metric.rs
@@ -167,7 +167,7 @@ impl Metrics {
     pub fn register_resource_id_counters(
         resource_id: ResourceId,
     ) -> ResourceMetric {
-        let resource_name = hex::encode(resource_id.to_bytes().as_ref());
+        let resource_name = format!("{resource_id");
 
         // Total gas fee spent on particular resource.
         let total_gas_spent = register_counter!(opts!(