Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI fixes for polkadot 1.14 #1091

Closed
wants to merge 101 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
c033111
fix rewrites.example.jsonnet for bdk
BuddyGlas Jul 18, 2024
252d797
update to polkadot 1.12
Sep 10, 2024
5aaf85b
update to polkadot 1.14
Sep 7, 2024
f095f68
metadata-hash change
Sep 10, 2024
cfec4f2
temp
Sep 10, 2024
337fc78
fixes
Sep 10, 2024
bdf4286
fix: quartz/unique register_validate_block
mrshiposha Sep 11, 2024
57bc80e
remove lookahead
Sep 11, 2024
6b3ab34
remove getrandom
Sep 11, 2024
3900c0b
fix: problem with node not starting and issue with conssensus hook
Sep 11, 2024
88c25d0
update Cargo.lock
Sep 11, 2024
69bbd56
undo default-features
Sep 12, 2024
a66f3b3
update polkadot types
Sep 13, 2024
f544220
update polkadot types to v11
Sep 13, 2024
86feec9
update polkadot types to v12
Sep 13, 2024
345ee8e
Merge branch 'update-polkadot-types' into unique-polkadot-1.14
Sep 17, 2024
2f8af9b
Set baedeker version to 0.1.4
vklachkov Sep 27, 2024
a11ee60
CI trigger
vklachkov Sep 27, 2024
4109647
Fix cumulus-primitives-aura dependency
vklachkov Sep 29, 2024
f31d2bc
Fix some values in tests
vklachkov Sep 29, 2024
288c7a4
Fix rustfmt
vklachkov Sep 29, 2024
4db0fa4
Secont try to fix creditFeesToTreasury test
vklachkov Sep 29, 2024
0d9603b
Fix collator-selection mock.rs
vklachkov Sep 29, 2024
d782fa8
Disable clippy for now
vklachkov Sep 29, 2024
d6707d6
CI trigger
vklachkov Sep 29, 2024
a903c5f
Experiments with labels and return clippy
vklachkov Sep 30, 2024
093ae31
Fix timing in waiters for blocks
vklachkov Sep 30, 2024
cb97290
Do strange things
vklachkov Sep 30, 2024
02348de
Fix CI
vklachkov Oct 1, 2024
75a9e27
Calibrate Unique
vklachkov Oct 1, 2024
2daade7
Fix try-runtime
vklachkov Oct 1, 2024
457353c
Remove baedeker submodule
vklachkov Oct 1, 2024
0b10b98
yarn fix
vklachkov Oct 1, 2024
0bb8bde
Make errors for waitWithTimeout users more useful
vklachkov Oct 1, 2024
bf97119
Fix statemine
vklachkov Oct 1, 2024
e991b9c
Do not build try-runtime-cli
vklachkov Oct 1, 2024
7452b80
Build try-runtime-cli
vklachkov Oct 1, 2024
9c16d6f
Fix try-runtime keys
vklachkov Oct 1, 2024
6a8c89f
Add migrations
vklachkov Oct 2, 2024
c4c8d7c
Check errors in try runtime script
vklachkov Oct 2, 2024
5c51ca6
Replace preimage migration with own workaround migration
vklachkov Oct 2, 2024
0fffcfb
Fix try runtime script
vklachkov Oct 2, 2024
7bc2c65
Fix pallet_membership and pallet_collective migrations
vklachkov Oct 2, 2024
c81b6e4
Fix pallet_democracy migration
vklachkov Oct 3, 2024
e92d725
Fix pallet_xcm migration
vklachkov Oct 3, 2024
8c36835
Set pallet_refungible version to 1
vklachkov Oct 3, 2024
145ea87
Bump pallet_refungible version up to 2
vklachkov Oct 3, 2024
a9d3664
fix: foreign-assets migration
mrshiposha Oct 4, 2024
d82120b
fix: fmt
mrshiposha Oct 4, 2024
6a5e051
fix: foreign-assets xcm independent storageversion
mrshiposha Oct 4, 2024
77f2403
Fix try-runtime again
vklachkov Oct 7, 2024
a20cc67
change try-runtime wf
BuddyGlas Oct 10, 2024
9999fad
fix
BuddyGlas Oct 10, 2024
c4e99fa
fix
BuddyGlas Oct 10, 2024
663d16d
fix
BuddyGlas Oct 10, 2024
79fffe4
wait for finalization in tests
Oct 10, 2024
c1bd2f8
disable xnft wf for master
BuddyGlas Oct 11, 2024
1e4ffd9
fix
BuddyGlas Oct 11, 2024
b0ff062
add test error info
Oct 11, 2024
9f6e6ce
update version in .env & fix asset-hub
BuddyGlas Oct 13, 2024
0812c17
always set nonce in tests
Oct 13, 2024
9c114e0
Fix clippy for whole project (except runtime-benchmarks)
vklachkov Oct 14, 2024
01694c1
fix
BuddyGlas Oct 14, 2024
0d017e8
try runs_on
BuddyGlas Oct 15, 2024
ce61175
try asset-hub runtime name
BuddyGlas Oct 15, 2024
b3d48b8
experiments with xcm
vklachkov Oct 17, 2024
c03229e
fix assethub launch
vklachkov Oct 17, 2024
a5ff4c0
fix assethub URL
BuddyGlas Oct 17, 2024
154bb6f
set new runner label for workflows
BuddyGlas Oct 23, 2024
61d976c
add chain-spec-generator
BuddyGlas Oct 29, 2024
5fb90f0
fix xcm assethub
BuddyGlas Oct 29, 2024
9641361
fix
BuddyGlas Oct 29, 2024
56b6384
Fix spec import for unique and quartz
vklachkov Oct 29, 2024
37a9d62
Fix #100500
vklachkov Oct 29, 2024
ec3b611
fix
BuddyGlas Oct 29, 2024
a6b2765
fix
BuddyGlas Oct 29, 2024
bd4b1c7
fix
BuddyGlas Oct 29, 2024
46443fa
fix
BuddyGlas Oct 29, 2024
1111de4
fix
BuddyGlas Oct 29, 2024
bb7f4f0
fix
BuddyGlas Oct 29, 2024
a526ec9
fix
BuddyGlas Oct 29, 2024
713e3a5
fix
BuddyGlas Oct 29, 2024
2a232fc
fix
BuddyGlas Oct 30, 2024
9c19403
fix
BuddyGlas Oct 30, 2024
27c8dd6
fix
BuddyGlas Oct 30, 2024
682d06f
fix
BuddyGlas Oct 30, 2024
d51e2f4
fix
BuddyGlas Oct 30, 2024
66fab56
fix
BuddyGlas Oct 30, 2024
9dd26e5
fix
BuddyGlas Oct 30, 2024
63f38f2
fix
BuddyGlas Oct 31, 2024
13096fa
fix
BuddyGlas Oct 31, 2024
0ef33ae
fix
BuddyGlas Oct 31, 2024
f484c2d
Merge branch 'ci/fix-for-polkadot-1.14' into ci/fix-rewrites
BuddyGlas Oct 31, 2024
34d9b22
Merge pull request #1094 from UniqueNetwork/ci/fix-rewrites
BuddyGlas Oct 31, 2024
a966c22
fix
BuddyGlas Oct 31, 2024
f881baf
fix
BuddyGlas Oct 31, 2024
b199a8d
fix
BuddyGlas Oct 31, 2024
9854a05
fix assethub for quartz
vklachkov Nov 1, 2024
473cb06
fix
BuddyGlas Nov 2, 2024
13cafa9
fix globalSetup
Nov 4, 2024
16355ed
update specVersion
Nov 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .baedeker/rewrites.example.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ function(prev, repoDir)
(import 'baedeker-library/ops/rewrites.libsonnet').rewriteNodePaths(
{
'bin/unique': '%s/target/release/unique-collator' % repoDir,
'bin/polkadot': { dockerImage: 'uniquenetwork/builder-polkadot:%s' % dotenv.POLKADOT_MAINNET_BRANCH },
'bin/acala': { dockerImage: 'uniquenetwork/builder-acala:%s' % dotenv.ACALA_BUILD_BRANCH },
'bin/moonbeam': { dockerImage: 'uniquenetwork/builder-moonbeam:%s' % dotenv.MOONBEAM_BUILD_BRANCH },
'bin/cumulus': { dockerImage: 'uniquenetwork/builder-cumulus:%s' % dotenv.STATEMINE_BUILD_BRANCH },
'bin/astar': { dockerImage: 'uniquenetwork/builder-astar:%s' % dotenv.ASTAR_BUILD_BRANCH },
'bin/polkadex': { dockerImage: 'uniquenetwork/builder-polkadex:%s' % dotenv.POLKADEX_BUILD_BRANCH },
'bin/polkadot': { dockerImage: 'parity/polkadot:%s' % dotenv.POLKADOT_MAINNET_BRANCH },
'bin/acala': { dockerImage: 'acala/acala-node:%s' % dotenv.ACALA_BUILD_BRANCH },
'bin/moonbeam': { dockerImage: 'moonbeamfoundation/moonbeam:%s' % dotenv.MOONBEAM_BUILD_BRANCH },
'bin/assethub': { dockerImage: 'parity/polkadot-parachain:%s' % dotenv.STATEMINE_BUILD_BRANCH },
'bin/astar': { dockerImage: 'staketechnologies/astar-collator:%s' % dotenv.ASTAR_BUILD_BRANCH },
'bin/polkadex': { dockerImage: 'polkadex/mainnet:%s' % dotenv.POLKADEX_BUILD_BRANCH },
'bin/hydradx': { dockerImage: 'uniquenetwork/builder-hydraDx:%s' % dotenv.HYDRADX_BUILD_BRANCH },
},
extra_node_mixin={
Expand Down
4 changes: 2 additions & 2 deletions .baedeker/up.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
set -e
BDK_DIR=$(dirname $(readlink -f "$0"))
RUST_LOG=info baedeker --spec=docker -J$BDK_DIR/vendor/ --generator=docker_compose=$BDK_DIR/.bdk-env --generator=docker_compose_discover=$BDK_DIR/.bdk-env/discover.env --secret=file=$BDK_DIR/.bdk-env/secret --tla-str=relay_spec=rococo-local --input-modules='lib:baedeker-library/ops/nginx.libsonnet' --input-modules='lib:baedeker-library/ops/devtools.libsonnet' --tla-str=repoDir=$(realpath $BDK_DIR/..) $@ $BDK_DIR/rewrites.jsonnet
RUST_LOG=info ./baedeker --spec=docker -J$BDK_DIR/vendor/ --generator=docker_compose=$BDK_DIR/.bdk-env --generator=docker_compose_discover=$BDK_DIR/.bdk-env/discover.env --secret=file=$BDK_DIR/.bdk-env/secret --tla-str=relay_spec=rococo-local --tla-code=assethub_spec="import 'assethub-spec.json'" --input-modules='lib:baedeker-library/ops/nginx.libsonnet' --input-modules='lib:baedeker-library/ops/devtools.libsonnet' --tla-str=repoDir=$(realpath $BDK_DIR/..) $@ $BDK_DIR/rewrites.jsonnet
cd $BDK_DIR/.bdk-env
docker compose up -d --wait --remove-orphans
docker compose up
11 changes: 6 additions & 5 deletions .baedeker/xcm-opal.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,20 @@ local unique = {
},
};

local westmint = {
name: 'westmint',
local assethub = {
name: 'assethub',
bin: 'bin/assethub',
paraId: 1002,
spec: {Genesis:{
chain: 'westmint-local',
chain: 'asset-hub-westend-local',
modify:: m.genericPara($),
}},
nodes: {
[name]: {
bin: $.bin,
wantedKeys: 'para',
expectedDataPath: '/parity',
parentConnection: 'internal-samedir',
expectedDataPath: '/parity',
},
for name in ['alice', 'bob']
},
Expand All @@ -65,6 +66,6 @@ local westmint = {
relay + {
parachains: {
[para.name]: para,
for para in [unique, westmint]
for para in [unique, assethub]
},
}
28 changes: 18 additions & 10 deletions .baedeker/xcm-quartz.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ local
m = import 'baedeker-library/mixin/spec.libsonnet',
;

function(relay_spec)
function(relay_spec, assethub_spec)

local relay = {
name: 'relay',
Expand All @@ -26,7 +26,7 @@ local relay = {
wantedKeys: 'relay',
expectedDataPath: '/parity',
},
for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie']
for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie', 'gregory', 'holly', 'iggy', 'john', 'kurt']
},
};

Expand Down Expand Up @@ -64,6 +64,8 @@ local karura = {
[name]: {
bin: $.bin,
wantedKeys: 'para',
parentConnection: 'internal-samedir',
expectedDataPath: '/acala/data',
},
for name in ['alice', 'bob']
},
Expand All @@ -83,24 +85,28 @@ local moonriver = {
[name]: {
bin: $.bin,
wantedKeys: 'para-nimbus',
parentConnection: 'internal-samedir',
expectedDataPath: '/data',
},
for name in ['alith', 'baltathar']
},
};

local statemine = {
name: 'statemine',
local assethub = {
name: 'assethub',
bin: 'bin/assethub',
paraId: 1004,
spec: {Genesis:{
chain: 'statemine-local',
modify:: m.genericPara($),
}},
spec: {
FromScratchGenesis: {
spec: m.genericPara($)(assethub_spec),
}
},
nodes: {
[name]: {
bin: $.bin,
wantedKeys: 'para',
expectedDataPath: '/parity',
parentConnection: 'internal-samedir',
expectedDataPath: '/parity',
},
for name in ['alice', 'bob']
},
Expand All @@ -118,6 +124,8 @@ local shiden = {
[name]: {
bin: $.bin,
wantedKeys: 'para',
parentConnection: 'internal-samedir',
expectedDataPath: '/data',
},
for name in ['alice', 'bob']
},
Expand All @@ -126,6 +134,6 @@ local shiden = {
relay + {
parachains: {
[para.name]: para,
for para in [unique, karura, moonriver, statemine, shiden]
for para in [unique, karura, moonriver, assethub, shiden]
},
}
34 changes: 23 additions & 11 deletions .baedeker/xcm-unique.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ local
m = import 'baedeker-library/mixin/spec.libsonnet',
;

function(relay_spec)
function(relay_spec, assethub_spec)

local relay = {
name: 'relay',
Expand All @@ -27,7 +27,7 @@ local relay = {
wantedKeys: 'relay',
expectedDataPath: '/parity',
},
for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie', 'gregory', 'holly']
for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie', 'gregory', 'holly', 'iggy', 'john', 'kurt', 'larry', 'mike', 'norman', 'osvald']
},
};

Expand Down Expand Up @@ -65,6 +65,8 @@ local acala = {
[name]: {
bin: $.bin,
wantedKeys: 'para',
parentConnection: 'internal-samedir',
expectedDataPath: '/acala/data',
},
for name in ['alice', 'bob']
},
Expand All @@ -84,24 +86,28 @@ local moonbeam = {
[name]: {
bin: $.bin,
wantedKeys: 'para-nimbus',
parentConnection: 'internal-samedir',
expectedDataPath: '/data',
},
for name in ['alith', 'baltathar']
},
};

local statemint = {
name: 'statemint',
local assethub = {
name: 'assethub',
bin: 'bin/assethub',
paraId: 1004,
spec: {Genesis:{
chain: 'statemint-local',
modify:: m.genericPara($),
}},
spec: {
FromScratchGenesis: {
spec: m.genericPara($)(assethub_spec),
}
},
nodes: {
[name]: {
bin: $.bin,
wantedKeys: 'para-ed',
expectedDataPath: '/parity',
parentConnection: 'internal-samedir',
expectedDataPath: '/parity',
},
for name in ['alice', 'bob']
},
Expand All @@ -119,6 +125,8 @@ local astar = {
[name]: {
bin: $.bin,
wantedKeys: 'para',
parentConnection: 'internal-samedir',
expectedDataPath: '/data',
},
for name in ['alice', 'bob']
},
Expand All @@ -136,6 +144,9 @@ local polkadex = {
[name]: {
bin: $.bin,
wantedKeys: 'para',
parentConnection: 'internal-samedir',
expectedDataPath: '/data',

},
for name in ['alice', 'bob']
},
Expand All @@ -153,7 +164,8 @@ local hydraDx = {
[name]: {
bin: $.bin,
wantedKeys: 'para',
legacyRpc: true,
parentConnection: 'internal-samedir',
expectedDataPath: '/hydra',
},
for name in ['alice', 'bob']
},
Expand All @@ -163,6 +175,6 @@ local hydraDx = {
relay + {
parachains: {
[para.name]: para,
for para in [unique, acala, moonbeam, statemint, astar, polkadex, hydraDx]
for para in [unique, acala, moonbeam, assethub, astar, polkadex, hydraDx]
},
}
38 changes: 38 additions & 0 deletions .docker/Dockerfile-try-runtime
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# ===== Rust builder =====
FROM ubuntu:22.04 AS rust-builder
LABEL maintainer="Unique.Network"

ENV CARGO_HOME="/cargo-home"
ENV PATH="/cargo-home/bin:$PATH"
ENV TZ=UTC
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

RUN apt-get update && \
apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev protobuf-compiler && \
apt-get clean && \
rm -r /var/lib/apt/lists/*

RUN curl https://sh.rustup.rs -sSf | sh -s -- -y

RUN cargo install --git https://github.com/paritytech/try-runtime-cli --tag v0.8.0 --locked

RUN mkdir /unique_parachain
WORKDIR /unique_parachain

# ===== BUILD ======
FROM rust-builder AS builder-unique

ARG NETWORK
ARG REPLICA_FROM

ENV NETWORK=${NETWORK}
ENV REPLICA_FROM=${REPLICA_FROM}

COPY . /unique_parachain
WORKDIR /unique_parachain

RUN echo "Requested features: ${NETWORK}-runtime\n" && \
echo "Fork from: ${REPLICA_FROM}\n" && \
cargo build --features=try-runtime,${NETWORK}-runtime --profile=production

CMD try-runtime --runtime target/production/wbuild/${NETWORK}-runtime/${NETWORK}_runtime.compact.compressed.wasm on-runtime-upgrade --blocktime 6000 --checks all live --uri ${REPLICA_FROM}
33 changes: 0 additions & 33 deletions .docker/Dockerfile-try-runtime.j2

This file was deleted.

2 changes: 1 addition & 1 deletion .docker/docker-compose.try-runtime.j2
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.5"

services:
try-runtime:
image: uniquenetwork/ci-tryruntime-local:{{ NETWORK }}-{{ BUILD_TAG }}
image: uniquenetwork/ci-tryruntime-local:{{ BUILD_TAG }}
container_name: try-runtime
expose:
- 9944
Expand Down
16 changes: 8 additions & 8 deletions .env
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
RUST_TOOLCHAIN=nightly-2024-04-10
RELAY_CHAIN_TYPE=rococo

POLKADOT_MAINNET_BRANCH=v1.9.0
STATEMINT_BUILD_BRANCH=1.9.0
POLKADOT_MAINNET_BRANCH=v1.14.0
STATEMINT_BUILD_BRANCH=1.14.0
ACALA_BUILD_BRANCH=2.25.0
MOONBEAM_BUILD_BRANCH=runtime-2901
ASTAR_BUILD_BRANCH=v5.39.1
HYDRADX_BUILD_BRANCH=v27.0.0
POLKADEX_BUILD_BRANCH=v6.0.0
HYDRADX_BUILD_BRANCH=latest
POLKADEX_BUILD_BRANCH=v1.0.0
UNIQUE_MAINNET_BRANCH=release-v10030070
UNIQUE_REPLICA_FROM=wss://ws.unique.network:443

KUSAMA_MAINNET_BRANCH=v1.9.0
STATEMINE_BUILD_BRANCH=1.9.0
KUSAMA_MAINNET_BRANCH=v1.14.0
STATEMINE_BUILD_BRANCH=1.14.0
KARURA_BUILD_BRANCH=2.25.0
MOONRIVER_BUILD_BRANCH=runtime-2901
SHIDEN_BUILD_BRANCH=v5.39.1
QUARTZ_MAINNET_BRANCH=release-v10030070
QUARTZ_REPLICA_FROM=wss://ws-quartz.unique.network:443

UNIQUEWEST_MAINNET_BRANCH=v1.9.0
WESTMINT_BUILD_BRANCH=1.9.0
UNIQUEWEST_MAINNET_BRANCH=v1.14.0
WESTMINT_BUILD_BRANCH=1.14.0
OPAL_MAINNET_BRANCH=release-v10030070
OPAL_REPLICA_FROM=wss://ws-opal.unique.network:443

9 changes: 3 additions & 6 deletions .github/workflows/ci-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
uses: ./.github/workflows/xcm.yml
secrets: inherit # pass all secrets from initial workflow to nested

xnft:
uses: ./.github/workflows/xnft.yml
secrets: inherit # pass all secrets from initial workflow to nested
# xnft:
# uses: ./.github/workflows/xnft.yml
# secrets: inherit # pass all secrets from initial workflow to nested

collator-selection:
uses: ./.github/workflows/collator-selection.yml
Expand Down Expand Up @@ -62,6 +62,3 @@ jobs:

polkadot-types:
uses: ./.github/workflows/polkadot-types.yml



Loading
Loading