difftreelog
Merge branch 'CI-86-87-XCM-docker' into feature/multi-assets-redone
in: master
5 files changed
.docker/Dockerfile-xcm.j2diffbeforeafterboth--- a/.docker/Dockerfile-xcm.j2
+++ b/.docker/Dockerfile-xcm.j2
@@ -39,6 +39,7 @@
COPY ./xcm-config/launch-config-xcm-{{ NETWORK }}.json ./launch-config-xcm-{{ NETWORK }}.json
COPY ./xcm-config/5validators.jsonnet ./5validators.jsonnet
+COPY ./xcm-config/minBondFix.jsonnet ./minBondFix.jsonnet
RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git && \
cd unique-chain && \
@@ -129,9 +130,11 @@
npm install --global yarn && \
yarn install
-COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/
COPY --from=builder-unique /unique_parachain/launch-config-xcm-{{ NETWORK }}.json /polkadot-launch/
COPY --from=builder-unique /unique_parachain/5validators.jsonnet /polkadot-launch/5validators.jsonnet
+COPY --from=builder-unique /unique_parachain/minBondFix.jsonnet /polkadot-launch/minBondFix.jsonnet
+
+COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/
COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
COPY --from=builder-moonbeam /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/
COPY --from=builder-cumulus /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus
.docker/xcm-config/launch-config-xcm-quartz.jsondiffbeforeafterboth1{2 "relaychain": {3 "bin": "/polkadot/target/release/polkadot",4 "chain": "westend-local",5 "chainInitializer": [6 "chainql",7 "--tla-code=spec=import '${spec}'",8 "5validators.jsonnet"9 ], 10 "nodes": [11 {12 "name": "alice",13 "wsPort": 9844,14 "rpcPort": 9843,15 "port": 30444,16 "flags": [17 "--unsafe-rpc-external",18 "--unsafe-ws-external",19 "-lparachain::candidate_validation=debug"20 ]21 },22 {23 "name": "bob",24 "wsPort": 9855,25 "rpcPort": 9854,26 "port": 30555,27 "flags": [28 "--unsafe-rpc-external",29 "--unsafe-ws-external",30 "-lparachain::candidate_validation=debug"31 ]32 },33 {34 "name": "charlie",35 "wsPort": 9866,36 "rpcPort": 9865,37 "port": 30666,38 "flags": [39 "--unsafe-rpc-external",40 "--unsafe-ws-external",41 "-lparachain::candidate_validation=debug"42 ]43 },44 {45 "name": "dave",46 "wsPort": 9877,47 "rpcPort": 9876,48 "port": 30777,49 "flags": [50 "--unsafe-rpc-external",51 "--unsafe-ws-external",52 "-lparachain::candidate_validation=debug"53 ]54 },55 {56 "name": "eve",57 "wsPort": 9888,58 "rpcPort": 9887,59 "port": 30888,60 "flags": [61 "--unsafe-rpc-external",62 "--unsafe-ws-external",63 "-lparachain::candidate_validation=debug"64 ]65 }6667 ],68 "genesis": {69 "runtime": {70 "runtime_genesis_config": {71 "parachainsConfiguration": {72 "config": {73 "validation_upgrade_frequency": 1,74 "validation_upgrade_delay": 175 }76 }77 }78 }79 }80 },81 "parachains": [82 {83 "bin": "/unique-chain/target/release/unique-collator",84 "id": "2095",85 "balance": "1000000000000000000000000",86 "nodes": [87 {88 "port": 31200,89 "wsPort": 9944,90 "rpcPort": 9933,91 "name": "alice",92 "flags": [93 "--unsafe-rpc-external",94 "--unsafe-ws-external"95 ]96 }97 ]98 },99 {100 "bin": "/acala/target/release/acala",101 "id": "2000",102 "chain": "karura-dev",103 "balance": "1000000000000000000000",104 "nodes": [105 {106 "wsPort": 9946,107 "port": 31202,108 "name": "alice",109 "flags": [110 "--unsafe-rpc-external",111 "--unsafe-ws-external"112 ]113 }114 ]115 },116 {117 "bin": "/moonbeam/target/release/moonbeam",118 "id": 2023,119 "balance": "1000000000000000000000",120 "chain": "moonriver-local",121 "nodes": [122 {123 "wsPort": 9947,124 "port": 31203,125 "name": "alice",126 "flags": [127 "--unsafe-rpc-external",128 "--unsafe-ws-external",129 "--",130 "--execution=wasm"131 ]132 }133 ]134 },135 {136 "bin": "/cumulus/target/release/cumulus",137 "id": "1000",138 "chain": "statemine-local",139 "balance": "1000000000000000000000000",140 "nodes": [141 {142 "wsPort": 9948,143 "port": 31204,144 "name": "alice",145 "flags": [146 "--unsafe-rpc-external",147 "--unsafe-ws-external"148 ]149 }150 ]151 }152 ],153 "simpleParachains": [],154 "hrmpChannels": [155 {156 "sender": 2095,157 "recipient": 2000,158 "maxCapacity": 8,159 "maxMessageSize": 512160 },161 {162 "sender": 2000,163 "recipient": 2095,164 "maxCapacity": 8,165 "maxMessageSize": 512166 },167 {168 "sender": 2095,169 "recipient": 2023,170 "maxCapacity": 8,171 "maxMessageSize": 512172 },173 {174 "sender": 2023,175 "recipient": 2095,176 "maxCapacity": 8,177 "maxMessageSize": 512178 },179 {180 "sender": 2095,181 "recipient": 1000,182 "maxCapacity": 8,183 "maxMessageSize": 512184 },185 {186 "sender": 1000,187 "recipient": 2095,188 "maxCapacity": 8,189 "maxMessageSize": 512190 }191 ],192 "finalization": false193}1941{2 "relaychain": {3 "bin": "/polkadot/target/release/polkadot",4 "chain": "westend-local",5 "chainInitializer": [6 "chainql",7 "--tla-code=spec=import '${spec}'",8 "5validators.jsonnet"9 ], 10 "nodes": [11 {12 "name": "alice",13 "wsPort": 9844,14 "rpcPort": 9843,15 "port": 30444,16 "flags": [17 "--unsafe-rpc-external",18 "--unsafe-ws-external",19 "-lparachain::candidate_validation=debug"20 ]21 },22 {23 "name": "bob",24 "wsPort": 9855,25 "rpcPort": 9854,26 "port": 30555,27 "flags": [28 "--unsafe-rpc-external",29 "--unsafe-ws-external",30 "-lparachain::candidate_validation=debug"31 ]32 },33 {34 "name": "charlie",35 "wsPort": 9866,36 "rpcPort": 9865,37 "port": 30666,38 "flags": [39 "--unsafe-rpc-external",40 "--unsafe-ws-external",41 "-lparachain::candidate_validation=debug"42 ]43 },44 {45 "name": "dave",46 "wsPort": 9877,47 "rpcPort": 9876,48 "port": 30777,49 "flags": [50 "--unsafe-rpc-external",51 "--unsafe-ws-external",52 "-lparachain::candidate_validation=debug"53 ]54 },55 {56 "name": "eve",57 "wsPort": 9888,58 "rpcPort": 9887,59 "port": 30888,60 "flags": [61 "--unsafe-rpc-external",62 "--unsafe-ws-external",63 "-lparachain::candidate_validation=debug"64 ]65 }6667 ],68 "genesis": {69 "runtime": {70 "runtime_genesis_config": {71 "parachainsConfiguration": {72 "config": {73 "validation_upgrade_frequency": 1,74 "validation_upgrade_delay": 175 }76 }77 }78 }79 }80 },81 "parachains": [82 {83 "bin": "/unique-chain/target/release/unique-collator",84 "id": "2095",85 "balance": "1000000000000000000000000",86 "nodes": [87 {88 "port": 31200,89 "wsPort": 9944,90 "rpcPort": 9933,91 "name": "alice",92 "flags": [93 "--unsafe-rpc-external",94 "--unsafe-ws-external"95 ]96 }97 ]98 },99 {100 "bin": "/acala/target/release/acala",101 "id": "2000",102 "chain": "karura-dev",103 "balance": "1000000000000000000000",104 "nodes": [105 {106 "wsPort": 9946,107 "port": 31202,108 "name": "alice",109 "flags": [110 "--unsafe-rpc-external",111 "--unsafe-ws-external"112 ]113 }114 ]115 },116 {117 "bin": "/moonbeam/target/release/moonbeam",118 "id": 2023,119 "balance": "1000000000000000000000",120 "chain": "moonriver-local",121 "chainInitializer": [122 "chainql",123 "--tla-code=spec=import '${spec}'",124 "minBondFix.jsonnet"125 ], 126 "nodes": [127 {128 "wsPort": 9947,129 "port": 31203,130 "name": "alice",131 "flags": [132 "--unsafe-rpc-external",133 "--unsafe-ws-external",134 "--",135 "--execution=wasm"136 ]137 }138 ]139 },140 {141 "bin": "/cumulus/target/release/cumulus",142 "id": "1000",143 "chain": "statemine-local",144 "balance": "1000000000000000000000000",145 "nodes": [146 {147 "wsPort": 9948,148 "port": 31204,149 "name": "alice",150 "flags": [151 "--unsafe-rpc-external",152 "--unsafe-ws-external"153 ]154 }155 ]156 }157 ],158 "simpleParachains": [],159 "hrmpChannels": [160 {161 "sender": 2095,162 "recipient": 2000,163 "maxCapacity": 8,164 "maxMessageSize": 512165 },166 {167 "sender": 2000,168 "recipient": 2095,169 "maxCapacity": 8,170 "maxMessageSize": 512171 },172 {173 "sender": 2095,174 "recipient": 2023,175 "maxCapacity": 8,176 "maxMessageSize": 512177 },178 {179 "sender": 2023,180 "recipient": 2095,181 "maxCapacity": 8,182 "maxMessageSize": 512183 },184 {185 "sender": 2095,186 "recipient": 1000,187 "maxCapacity": 8,188 "maxMessageSize": 512189 },190 {191 "sender": 1000,192 "recipient": 2095,193 "maxCapacity": 8,194 "maxMessageSize": 512195 }196 ],197 "finalization": false198}199.docker/xcm-config/minBondFix.jsonnetdiffbeforeafterboth--- /dev/null
+++ b/.docker/xcm-config/minBondFix.jsonnet
@@ -0,0 +1,10 @@
+function(spec)
+spec {
+ genesis+: {
+ runtime+: {
+ parachainStaking+: {
+ candidates: std.map(function(candidate) [candidate[0], candidate[1] * 1000], super.candidates)
+ },
+ },
+ },
+}
.envdiffbeforeafterboth--- a/.env
+++ b/.env
@@ -2,12 +2,12 @@
POLKADOT_BUILD_BRANCH=release-v0.9.27
POLKADOT_MAINNET_BRANCH=release-v0.9.26
-UNIQUE_MAINNET_TAG=feature/multi-assets-redone
+UNIQUE_MAINNET_TAG=v924010
KUSAMA_MAINNET_BRANCH=release-v0.9.26
-QUARTZ_MAINNET_TAG=feature/multi-assets-redone
+QUARTZ_MAINNET_TAG=quartz-v924012-2
-OPAL_MAINNET_TAG=feature/multi-assets-redone
+UNQWND_MAINNET_BRANCH=release-v0.9.24
OPAL_REPLICA_FROM=wss://eu-ws-opal.unique.network:443
QUARTZ_REPLICA_FROM=wss://eu-ws-quartz.unique.network:443
.github/workflows/xcm-testnet.ymldiffbeforeafterboth--- a/.github/workflows/xcm-testnet.yml
+++ b/.github/workflows/xcm-testnet.yml
@@ -114,7 +114,7 @@
POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}
FEATURE=${{ matrix.features }}
RUNTIME=${{ matrix.runtime }}
- BRANCH=${{ mainnet_branch }}
+ BRANCH=${{ github.head_ref }}
ACALA_BUILD_BRANCH=${{ env.ACALA_BUILD_BRANCH }}
MOONBEAM_BUILD_BRANCH=${{ env.MOONBEAM_BUILD_BRANCH }}
CUMULUS_BUILD_BRANCH=${{ env.CUMULUS_BUILD_BRANCH }}
@@ -126,7 +126,7 @@
run: cat .docker/xcm-config/launch-config-xcm-${{ matrix.network }}.json
- name: Build the stack
- run: cd .docker/ && docker build --file ./Dockerfile-xcm.${{ matrix.network }}.yml --tag xcm-nodes-${{ matrix.network }} --tag uniquenetwork/xcm-${{ matrix.network }}-testnet-local:nightly-${{ mainnet_branch }}-${{ github.sha }} --tag uniquenetwork/xcm-${{ matrix.network }}-testnet-local:latest .
+ run: cd .docker/ && docker build --file ./Dockerfile-xcm.${{ matrix.network }}.yml --tag xcm-nodes-${{ matrix.network }} --tag uniquenetwork/xcm-${{ matrix.network }}-testnet-local:nightly-${{ github.head_ref }}-${{ github.sha }} --tag uniquenetwork/xcm-${{ matrix.network }}-testnet-local:latest .
# - name: Collect Docker Logs
# if: success() || failure()
@@ -146,7 +146,7 @@
password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}
- name: Push docker version image
- run: docker push uniquenetwork/xcm-${{ matrix.network }}-testnet-local:nightly-${{ mainnet_branch }}-${{ github.sha }}
+ run: docker push uniquenetwork/xcm-${{ matrix.network }}-testnet-local:nightly-${{ github.head_ref }}-${{ github.sha }}
- name: Push docker image latest
run: docker push uniquenetwork/xcm-${{ matrix.network }}-testnet-local:latest