git.delta.rocks / unique-network / refs/commits / 308a52eaeb70

difftreelog

Merge pull request #660 from UniqueNetwork/fix/merge-929030

Yaroslav Bolyukin2022-10-18parents: #67c56fa #e5efe22.patch.diff
in: master
Fix/merge 929030

15 files changed

modified.docker/Dockerfile-try-runtimediffbeforeafterboth
46 echo "Fork from: $REPLICA_FROM\n" && \46 echo "Fork from: $REPLICA_FROM\n" && \
47 cargo build --features=$FEATURE --release47 cargo build --features=$FEATURE --release
48 48
49
50CMD cargo run --features=try-runtime,$FEATURE --release -- try-runtime on-runtime-upgrade live --uri $REPLICA_FROM49CMD cargo run --features=try-runtime,$FEATURE --release -- try-runtime --no-spec-name-check on-runtime-upgrade live --uri $REPLICA_FROM
5150
modified.envdiffbeforeafterboth
5UNIQUE_MAINNET_TAG=v9240105UNIQUE_MAINNET_TAG=v924010
66
7KUSAMA_MAINNET_BRANCH=release-v0.9.267KUSAMA_MAINNET_BRANCH=release-v0.9.26
8QUARTZ_MAINNET_TAG=quartz-v924012-28QUARTZ_MAINNET_TAG=quartz-v924012-2-opal-runtime-feature
99
10UNQWND_MAINNET_BRANCH=release-v0.9.2410UNQWND_MAINNET_BRANCH=release-v0.9.24
1111
modified.github/workflows/market-test_v2.ymldiffbeforeafterboth
1010
11 market_test:11 market_test:
12 # The type of runner that the job will run on12 # The type of runner that the job will run on
13 runs-on: [self-hosted-ci,large]13 runs-on: [self-hosted-ci,medium]
14 timeout-minutes: 138014 timeout-minutes: 180
1515
16 name: ${{ matrix.network }} 16 name: ${{ matrix.network }}
1717
91 rm -rf .env91 rm -rf .env
92 cp .env.docker .env92 cp .env.docker .env
93
94# Temporary disable node readyness check. Have to dig into the script logic.
95# - name: Wait for chain up and running
96# working-directory: tests
97# run: |
98# yarn install
99# node scripts/readyness.js
100# echo "Ready to start tests"
101# env:
102# RPC_URL: http://127.0.0.1:9933/
93103
94 - name: Wait for chain up and running104 - name: Wait for chain up and running
95 working-directory: tests
96 run: |105 run: |
97 yarn install106 sleep 1200s
98 node scripts/readyness.js107 echo "Ready to start Market e2e tests"
99 echo "Ready to start tests"
100108
101 - name: Show content of .env file and Generate accounts109 - name: Show content of .env file and Generate accounts
102 working-directory: qa-tests110 working-directory: qa-tests
modified.github/workflows/node-only-update_v2.ymldiffbeforeafterboth
4949
5050
5151
52 timeout-minutes: 138052 timeout-minutes: 2880
5353
54 name: ${{ matrix.network }}54 name: ${{ matrix.network }}
5555
165165
166 - name: Run tests before Node Parachain upgrade166 - name: Run tests before Node Parachain upgrade
167 working-directory: ${{ matrix.mainnet_branch }}/tests167 working-directory: ${{ matrix.mainnet_branch }}/tests
168 run: |168 run: |
169 yarn install169 yarn install
170 yarn add mochawesome170 yarn add mochawesome
171 echo "Ready to start tests"171 echo "Ready to start tests"
172 yarn polkadot-types172 yarn polkadot-types
173 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}173 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-before-${NOW}
174 env:174 env:
175 RPC_URL: http://127.0.0.1:9933/175 RPC_URL: http://127.0.0.1:9933/
176176
180 if: success() || failure() # run this step even if previous step failed180 if: success() || failure() # run this step even if previous step failed
181 with:181 with:
182 name: Tests before node upgrade ${{ matrix.network }} # Name of the check run which will be created182 name: Tests before node upgrade ${{ matrix.network }} # Name of the check run which will be created
183 path: ${{ matrix.mainnet_branch }}/tests/mochawesome-report/test-*.json # Path to test results183 path: ${{ matrix.mainnet_branch }}/tests/mochawesome-report/test-before-*.json # Path to test results
184 reporter: mochawesome-json184 reporter: mochawesome-json
185 fail-on-error: 'false'185 fail-on-error: 'false'
186186
187 - name: Send SIGUSR1 to polkadotlaunch process187 - name: Send SIGUSR1 to polkadot-launch process
188 if: success() || failure()188 if: success() || failure()
189 run: |189 run: |
190 #Get PID of polkadot-launch190 ContainerID=$(docker ps -aqf "name=node-parachain")
191 PID=$(docker exec node-parachain pidof 'polkadot-launch')191 PID=$(docker exec node-parachain pidof 'polkadot-launch')
192 echo "Polkadot-launch PID: $PID"192 sleep 30s
193 #Send SIGUSR1 signal to $PID193 echo -e "Show logs of node-parachain container.\n"
194 docker exec node-parachain kill -SIGUSR1 ${PID}194 docker logs ${ContainerID}
195195 echo -e "\n"
196 # 🌗 All parachain collators restarted with the new binaries.196 echo -e "Restart polkadot-launch process: $PID\n"
197 docker exec node-parachain kill -SIGUSR1 ${PID}
198 echo -e "SIGUSR1 sent to Polkadot-launch PID: $PID\n"
199 echo -e "Get node-parachain logs:\n"
200 docker logs -t -n 5 ${ContainerID}
201
202 - name: Get chain logs
203 if: failure() # run this step only at failure
204 run: |
205 docker exec node-parachain cat /polkadot-launch/9944.log
206 docker exec node-parachain cat /polkadot-launch/9945.log
207 docker exec node-parachain cat /polkadot-launch/alice.log
208 docker exec node-parachain cat /polkadot-launch/eve.log
209 docker exec node-parachain cat /polkadot-launch/dave.log
210 docker exec node-parachain cat /polkadot-launch/charlie.log
211
197 - name: Check if docker logs consist messages related to testing of Node Parachain Upgrade.212 - name: Check if docker logs consist messages related to testing of Node Parachain Upgrade.
198 if: success()213 if: success()
240 shell: bash255 shell: bash
241256
242 - name: Run tests after Node Parachain upgrade257 - name: Run tests after Node Parachain upgrade
258 if: success()
243 working-directory: tests259 working-directory: ${{ matrix.mainnet_branch }}/tests
244 run: |260 run: |
245 yarn install261 yarn install
246 yarn add mochawesome262 yarn add mochawesome
247 node scripts/readyness.js263 echo "Ready to start tests"
248 echo "Ready to start tests"264 yarn polkadot-types
249 yarn polkadot-types265 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-after-${NOW}
250 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
251 env:266 env:
252 RPC_URL: http://127.0.0.1:9933/267 RPC_URL: http://127.0.0.1:9933/
253268
257 if: success() || failure() # run this step even if previous step failed272 if: success() || failure() # run this step even if previous step failed
258 with:273 with:
259 name: Tests after node upgrade ${{ matrix.network }} # Name of the check run which will be created274 name: Tests after node upgrade ${{ matrix.network }} # Name of the check run which will be created
260 path: tests/mochawesome-report/test-*.json # Path to test results275 path: ${{ matrix.mainnet_branch }}/tests/mochawesome-report/test-after-*.json # Path to test results
261 reporter: mochawesome-json276 reporter: mochawesome-json
262 fail-on-error: 'false'277 fail-on-error: 'false'
263278
modifiedCargo.lockdiffbeforeafterboth
6710 "up-sponsorship",6710 "up-sponsorship",
6711]6711]
6712
6713[[package]]
6714name = "pallet-unique-scheduler-v2"
6715version = "0.1.0"
6716dependencies = [
6717 "frame-benchmarking",
6718 "frame-support",
6719 "frame-system",
6720 "log",
6721 "pallet-preimage",
6722 "parity-scale-codec 3.2.1",
6723 "scale-info",
6724 "sp-core",
6725 "sp-io",
6726 "sp-runtime",
6727 "sp-std",
6728 "substrate-test-utils",
6729]
67126730
6713[[package]]6731[[package]]
6714name = "pallet-utility"6732name = "pallet-utility"
85768594
8577[[package]]8595[[package]]
8578name = "quartz-runtime"8596name = "quartz-runtime"
8579version = "0.9.27"8597version = "0.9.29"
8580dependencies = [8598dependencies = [
8581 "app-promotion-rpc",8599 "app-promotion-rpc",
8582 "cumulus-pallet-aura-ext",8600 "cumulus-pallet-aura-ext",
1256812586
12569[[package]]12587[[package]]
12570name = "unique-runtime"12588name = "unique-runtime"
12571version = "0.9.27"12589version = "0.9.29"
12572dependencies = [12590dependencies = [
12573 "app-promotion-rpc",12591 "app-promotion-rpc",
12574 "cumulus-pallet-aura-ext",12592 "cumulus-pallet-aura-ext",
modifiedREADME.mddiffbeforeafterboth
92```92```
93git clone https://github.com/paritytech/polkadot.git93git clone https://github.com/paritytech/polkadot.git
94cd polkadot94cd polkadot
95git checkout release-v0.9.2795git checkout release-v0.9.29
96cargo build --release96cargo build --release
97```97```
9898
modifiedruntime/common/construct_runtime/mod.rsdiffbeforeafterboth
57 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,57 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,
58 Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,58 Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,
5959
60 #[runtimes(opal)]60 // #[runtimes(opal)]
61 Scheduler: pallet_unique_scheduler::{Pallet, Call, Storage, Event<T>} = 62,61 // Scheduler: pallet_unique_scheduler::{Pallet, Call, Storage, Event<T>} = 62,
6262
63 Configuration: pallet_configuration::{Pallet, Call, Storage} = 63,63 Configuration: pallet_configuration::{Pallet, Call, Storage} = 63,
6464
modifiedruntime/common/mod.rsdiffbeforeafterboth
21pub mod instance;21pub mod instance;
22pub mod runtime_apis;22pub mod runtime_apis;
23
24#[cfg(feature = "scheduler")]
23pub mod scheduler;25pub mod scheduler;
26
24pub mod sponsoring;27pub mod sponsoring;
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
168 "pallet-foreign-assets/std"168 "pallet-foreign-assets/std"
169]169]
170limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']170limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']
171opal-runtime = ['refungible', 'scheduler', 'rmrk', 'app-promotion', 'foreign-assets']171opal-runtime = ['refungible', 'rmrk', 'app-promotion', 'foreign-assets']
172172
173refungible = []173refungible = []
174scheduler = []174scheduler = []
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
50 spec_name: create_runtime_str!(RUNTIME_NAME),50 spec_name: create_runtime_str!(RUNTIME_NAME),
51 impl_name: create_runtime_str!(RUNTIME_NAME),51 impl_name: create_runtime_str!(RUNTIME_NAME),
52 authoring_version: 1,52 authoring_version: 1,
53 spec_version: 927030,53 spec_version: 929030,
54 impl_version: 0,54 impl_version: 0,
55 apis: RUNTIME_API_VERSIONS,55 apis: RUNTIME_API_VERSIONS,
56 transaction_version: 2,56 transaction_version: 2,
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
10license = 'GPLv3'10license = 'GPLv3'
11name = 'quartz-runtime'11name = 'quartz-runtime'
12repository = 'https://github.com/UniqueNetwork/unique-chain'12repository = 'https://github.com/UniqueNetwork/unique-chain'
13version = '0.9.27'13version = '0.9.29'
1414
15[package.metadata.docs.rs]15[package.metadata.docs.rs]
16targets = ['x86_64-unknown-linux-gnu']16targets = ['x86_64-unknown-linux-gnu']
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
50 spec_name: create_runtime_str!(RUNTIME_NAME),50 spec_name: create_runtime_str!(RUNTIME_NAME),
51 impl_name: create_runtime_str!(RUNTIME_NAME),51 impl_name: create_runtime_str!(RUNTIME_NAME),
52 authoring_version: 1,52 authoring_version: 1,
53 spec_version: 927030,53 spec_version: 929030,
54 impl_version: 0,54 impl_version: 0,
55 apis: RUNTIME_API_VERSIONS,55 apis: RUNTIME_API_VERSIONS,
56 transaction_version: 2,56 transaction_version: 2,
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
10license = 'GPLv3'10license = 'GPLv3'
11name = 'unique-runtime'11name = 'unique-runtime'
12repository = 'https://github.com/UniqueNetwork/unique-chain'12repository = 'https://github.com/UniqueNetwork/unique-chain'
13version = '0.9.27'13version = '0.9.29'
1414
15[package.metadata.docs.rs]15[package.metadata.docs.rs]
16targets = ['x86_64-unknown-linux-gnu']16targets = ['x86_64-unknown-linux-gnu']
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
50 spec_name: create_runtime_str!(RUNTIME_NAME),50 spec_name: create_runtime_str!(RUNTIME_NAME),
51 impl_name: create_runtime_str!(RUNTIME_NAME),51 impl_name: create_runtime_str!(RUNTIME_NAME),
52 authoring_version: 1,52 authoring_version: 1,
53 spec_version: 927030,53 spec_version: 929030,
54 impl_version: 0,54 impl_version: 0,
55 apis: RUNTIME_API_VERSIONS,55 apis: RUNTIME_API_VERSIONS,
56 transaction_version: 2,56 transaction_version: 2,
modifiedtests/scripts/readyness.jsdiffbeforeafterboth
25 }25 }
26 catch(e) {26 catch(e) {
27 await sleep(10000);27 await sleep(10000);
28 console.log(e);
28 }29 }
29 }30 }
30}31}