Skip to content

Commit 12a4520

Browse files
committed
Merge remote-tracking branch 'origin/main' into ft/demo_app
2 parents 73ac0c2 + cb83bd7 commit 12a4520

File tree

196 files changed

+10849
-4410
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+10849
-4410
lines changed

Cargo.lock

Lines changed: 37 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,13 @@ codec = { package = "parity-scale-codec", version = "3.0.0", features = [
6464
color-print = "0.3.4"
6565
diesel = { version = "2.2.4", features = ["postgres", "chrono", "numeric"] }
6666
diesel-async = { version = "0.5.0", features = ["bb8", "postgres", "tokio"] }
67+
diesel_migrations = { version = "2.2", features = ["postgres"] }
6768
futures-timer = "3.0.1"
6869
hash-db = "0.16.0"
6970
headers = "0.4.1"
7071
hex = { version = "0.4.3", default-features = false }
7172
hex-literal = { version = "0.4.1" }
73+
itoa = "1.0"
7274
jsonrpsee = { version = "0.24.9" }
7375
jsonrpsee-core = { version = "0.24.9" }
7476
jsonwebtoken = "9"
@@ -105,8 +107,9 @@ tokio-postgres = "0.7"
105107
tokio-postgres-rustls = "0.13"
106108
tokio-util = { version = "0.7", features = ["io"] }
107109
toml = "0.8.19"
108-
tower-http = { version = "0.5", features = ["cors"] }
110+
tower-http = { version = "0.5", features = ["cors", "trace"] }
109111
tracing = "0.1"
112+
tracing-bunyan-formatter = "0.3"
110113
tracing-subscriber = { version = "=0.3.19", features = [
111114
"env-filter",
112115
] } # Dependency pinned because 0.3.20 messes up text formatting in substrate logs

0 commit comments

Comments
 (0)