Merge from bko-transfer-assets-via-bridge

.cargo/config.toml

@@ -0,0 +1,32 @@
+#
+# An auto defined `clippy` feature was introduced,
+# but it was found to clash with user defined features,
+# so was renamed to `cargo-clippy`.
+#
+# If you want standard clippy run:
+# RUSTFLAGS= cargo clippy
+[target.'cfg(feature = "cargo-clippy")']
+rustflags = [
+  "-Aclippy::all",
+  "-Dclippy::correctness",
+  "-Aclippy::if-same-then-else",
+  "-Aclippy::clone-double-ref",
+  "-Dclippy::complexity",
+  "-Aclippy::zero-prefixed-literal",     # 00_1000_000
+  "-Aclippy::type_complexity",           # raison d'etre
+  "-Aclippy::nonminimal-bool",           # maybe
+  "-Aclippy::borrowed-box",              # Reasonable to fix this one
+  "-Aclippy::too-many-arguments",        # (Turning this on would lead to)
+  "-Aclippy::unnecessary_cast",          # Types may change
+  "-Aclippy::identity-op",               # One case where we do 0 +
+  "-Aclippy::useless_conversion",        # Types may change
+  "-Aclippy::unit_arg",                  # styalistic.
+  "-Aclippy::option-map-unit-fn",        # styalistic
+  "-Aclippy::bind_instead_of_map",       # styalistic
+  "-Aclippy::erasing_op",                # E.g. 0 * DOLLARS
+  "-Aclippy::eq_op",                     # In tests we test equality.
+  "-Aclippy::while_immutable_condition", # false positives
+  "-Aclippy::needless_option_as_deref",  # false positives
+  "-Aclippy::derivable_impls",           # false positives
+  "-Aclippy::stable_sort_primitive",     # prefer stable sort
+]

.github/workflows/docs.yml

@@ -23,7 +23,7 @@ jobs:
         run:  rustup show
 
       - name: Rust cache
-        uses: Swatinem/rust-cache@6fd3edff6979b79f87531400ad694fb7f2c84b1f # v2.2.1
+        uses: Swatinem/rust-cache@988c164c3d0e93c4dbab36aaf5bbeb77425b2894 # v2.4.0
 
       - name: Build rustdocs
         run:  SKIP_WASM_BUILD=1 cargo doc --all --no-deps
@@ -32,7 +32,7 @@ jobs:
         run:  echo "<meta http-equiv=refresh content=0;url=cumulus_client_collator/index.html>" > ./target/doc/index.html
 
       - name: Deploy documentation
-        uses: peaceiris/actions-gh-pages@de7ea6f8efb354206b205ef54722213d99067935 # v3.9.0
+        uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3.9.3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_branch: gh-pages

.github/workflows/release-30_create-draft.yml

@@ -126,7 +126,7 @@ jobs:
           path: cumulus
           ref: ${{ github.event.inputs.ref2 }}
 
-      - uses: ruby/setup-ruby@d2b39ad0b52eca07d23f3aa14fdf2a3fcc1f411c # v1.148.0
+      - uses: ruby/setup-ruby@8a45918450651f5e4784b6031db26f4b9f76b251 # v1.150.0
         with:
           ruby-version: 3.0.0
 
@@ -253,7 +253,7 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
 
-      - uses: ruby/setup-ruby@d2b39ad0b52eca07d23f3aa14fdf2a3fcc1f411c # v1.148.0
+      - uses: ruby/setup-ruby@8a45918450651f5e4784b6031db26f4b9f76b251 # v1.150.0
         with:
           ruby-version: 3.0.0
 

.gitignore

@@ -8,5 +8,4 @@ polkadot_argument_parsing
 **/chains/
 *.iml
 .env
-bin
 **/._*

.gitlab-ci.yml

@@ -29,7 +29,7 @@ variables:
   CI_IMAGE: "paritytech/ci-linux:production"
   DOCKER_OS: "debian:stretch"
   ARCH: "x86_64"
-  ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.43"
+  ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.55"
   BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29"
   BUILDAH_COMMAND: "buildah --storage-driver overlay2"
 

BRIDGES.md

@@ -18,13 +18,16 @@ it easier to import that change back to upstream repo.
 
 # 2. How to pull latest Bridges code to the `bridges` subtree
 (in practice)
+
+The `bridges` repo has a stabilized branch `polkadot-staging` dedicated for releasing.
+
 ```
 cd <cumulus-git-repo-dir>
 
 # this will update new git branches from bridges repo
 # there could be unresolved conflicts, but dont worry,
 # lots of them are caused because of removed unneeded files with patch step,
-./scripts/bridges_update_subtree.sh fetch
+BRANCH=polkadot-staging ./scripts/bridges_update_subtree.sh fetch
 
 # so, after fetch and before solving conflicts just run patch,
 # this will remove unneeded files and checks if subtree modules compiles
@@ -68,8 +71,8 @@ $ git remote add -f my-bridges git@github.com:tomusdrw/parity-bridges-common.git
 
 2. To update Bridges:
 ```
-$ git fetch bridges master
-$ git subtree pull --prefix=bridges bridges master --squash
+$ git fetch bridges polkadot-staging
+$ git subtree pull --prefix=bridges bridges polkadot-staging --squash
 ````
 
 We use `--squash` to avoid adding individual commits and rather squashing them
@@ -82,7 +85,7 @@ all into one.
 
 4. Contributing back to Bridges (creating upstream PR)
 ```
-$ git subtree push --prefix=bridges my-bridges master
+$ git subtree push --prefix=bridges my-bridges polkadot-staging
 ```
 This command will push changes to your personal fork of Bridges repo, from where
 you can simply create a PR to the main repo.