diff --git a/BRIDGES.md b/BRIDGES.md index a9fff624cdc..8766de92c17 100644 --- a/BRIDGES.md +++ b/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 # 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. diff --git a/parachains/runtimes/bridge-hubs/README.md b/parachains/runtimes/bridge-hubs/README.md index 7e50c7be9f5..d457bc770ea 100644 --- a/parachains/runtimes/bridge-hubs/README.md +++ b/parachains/runtimes/bridge-hubs/README.md @@ -36,10 +36,12 @@ The current trustless bridges planned for the BridgeHub(s) are: mkdir -p ~/local_bridge_testing/bin mkdir -p ~/local_bridge_testing/logs +--- # 1. Install zombienet Go to: https://github.com/paritytech/zombienet/releases Copy the apropriate binary (zombienet-linux) from the latest release to ~/local_bridge_testing/bin +--- # 2. Build polkadot binary git clone https://github.com/paritytech/polkadot.git cd polkadot @@ -52,23 +54,33 @@ cd polkadot cargo build --release --features fast-runtime cp target/release/polkadot ~/local_bridge_testing/bin/polkadot +--- # 3. Build cumulus polkadot-parachain binary cd + # checkout desired branch or use master: -# git checkout -b bridge-hub-rococo-wococo --track origin/bridge-hub-rococo-wococo -git checkout -b master --track origin/master +# git checkout -b master --track origin/master + cargo build --release --locked -p polkadot-parachain-bin cp target/release/polkadot-parachain ~/local_bridge_testing/bin/polkadot-parachain cp target/release/polkadot-parachain ~/local_bridge_testing/bin/polkadot-parachain-mint +--- # 4. Build substrate-relay binary git clone https://github.com/paritytech/parity-bridges-common.git cd parity-bridges-common + +# checkout desired branch or use master: +# git checkout -b master --track origin/master +git checkout -b polkadot-staging --track origin/polkadot-staging + cargo build --release -p substrate-relay cp target/release/substrate-relay ~/local_bridge_testing/bin/substrate-relay -# (Optional) 5. Build polkadot-parachain-mint binary with statemine/westmint for moving assets +--- +# 5. Build polkadot-parachain-mint binary with statemine/westmint for moving assets cd +# TODO:check-parameter - change this when merged to master git checkout -b bko-transfer-asset-via-bridge --track origin/bko-transfer-asset-via-bridge cargo build --release --locked -p polkadot-parachain-bin cp target/release/polkadot-parachain ~/local_bridge_testing/bin/polkadot-parachain-mint