Merge pull request #374 from sora-xor/trustless-evm-bridge

Merge trustless-evm-bridge to develop
sora-xor · Apr 7, 2023 · 3cf266c · 3cf266c
2 parents 122da7f + 9ab31a5
commit 3cf266c
Show file tree

Hide file tree

Showing 572 changed files with 47,632 additions and 141,632 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -10,3 +10,6 @@ debug = false
 
 [unstable]
 weak-dep-features = true
+
+[env]
+PARACHAIN_METADATA_BRANCH = "polkadot-v0.9.38" # 'develop' branch after merge
diff --git a/.dockerignore b/.dockerignore
@@ -13,4 +13,4 @@ housekeeping
 *.sh
 LICENSE
 rustfmt.toml
-db*
+db*
diff --git a/.gitignore b/.gitignore
@@ -24,4 +24,4 @@ db-stg-chain*
 # Generated by run_script.sh
 db?
 
-.vscode/launch.json
+.vscode/launch.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -9,6 +9,7 @@
     "rust-analyzer.diagnostics.experimental.enable": false,
     "rust-analyzer.cargo.features": [
         "private-net",
-        "runtime-benchmarks"
+        "runtime-benchmarks",
+        "try-runtime",
     ]
 }
diff --git a/BRIDGE.md b/BRIDGE.md
@@ -31,6 +31,7 @@ Example genesis
     "petersburgBlock": 0,
     "istanbulBlock": 0,
     "muirGlacierBlock": 0,
+    "grayGlacierBlock": 0,
     "berlinBlock": 0,
     "londonBlock": 0,
     "ethash": {}