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

Unique Chain 1.14 #1096

Open
wants to merge 105 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
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
13545dd
update to polkadot 1.12
Sep 10, 2024
900de6c
update to polkadot 1.14
Sep 7, 2024
b4aa44a
metadata-hash change
Sep 10, 2024
85e4d33
disable default features for some dependencies
Sep 10, 2024
d633c75
fix node after update
Sep 10, 2024
0b6e8e8
fix quartz/unique register_validate_block
mrshiposha Sep 11, 2024
20f9746
remove lookahead
Sep 11, 2024
17152e9
remove getrandom
Sep 11, 2024
7809d5b
fix node consensus hook
Sep 11, 2024
98ee2b1
update Cargo.lock
Sep 11, 2024
00f7493
switch to own ORML fork
Sep 12, 2024
954c4a2
Merge remote-tracking branch 'origin/update-polkadot-types' into uniq…
vklachkov Nov 15, 2024
19e5714
update baedeker up to 0.1.4
vklachkov Sep 27, 2024
ab98e31
fix cumulus-primitives-aura dependency
vklachkov Sep 29, 2024
ceed567
fix some values in tests
vklachkov Sep 29, 2024
cc77e25
fix rustfmt
vklachkov Sep 29, 2024
1aa410d
fix collator-selection mock.rs
vklachkov Sep 29, 2024
97f6e38
fix timing in waiters for blocks
vklachkov Sep 30, 2024
180b7cf
fix nonce issues in collatorSelection.seqtest, add error to globalSetup
vklachkov Sep 30, 2024
0170cb5
calibrate Unique
vklachkov Oct 1, 2024
7327f8d
migrate to try-runtime-cli
vklachkov Oct 1, 2024
ea2a1ce
remove baedeker library submodule
vklachkov Oct 1, 2024
39ffa84
yarn fix
vklachkov Oct 1, 2024
2e6e647
make waitWithTimeout errors more useful
vklachkov Oct 1, 2024
8d27e31
add missing migrations
vklachkov Oct 2, 2024
d492441
ci: check errors in try runtime script
vklachkov Oct 2, 2024
d1e7495
create workaround for pallet_preimage version
vklachkov Oct 2, 2024
306b5e9
ci: fix try runtime script
vklachkov Oct 2, 2024
d3d9072
create workaround for pallet_membership and pallet_collective migrations
vklachkov Oct 2, 2024
27db869
create workaround for pallet_democracy migrations
vklachkov Oct 3, 2024
6e5b486
create workaround for pallet_xcm migrations
vklachkov Oct 3, 2024
651df58
fix pallet_refungible for Unique
vklachkov Oct 3, 2024
b6a5cf9
fix foreign-assets migration
mrshiposha Oct 4, 2024
51334a7
fix rustfmt
mrshiposha Oct 4, 2024
b50bcad
make foreign-assets independent from staging-xcm storage version
mrshiposha Oct 4, 2024
532fe9e
ci: pin try-runtime-cli to version 0.8.0
vklachkov Oct 7, 2024
4242701
ci: rework try-runtime workflow
BuddyGlas Oct 10, 2024
d2be8ee
wait for finalization in tests
Oct 10, 2024
f78fb9f
ci: disable xnft workflow for master
BuddyGlas Oct 11, 2024
98b47fc
ci: fix network launch in node-only-update
BuddyGlas Oct 11, 2024
dc3c817
debug "unable to create collection"
Oct 11, 2024
f0952f6
ci: try to migrate to assethub 1.14
BuddyGlas Oct 13, 2024
b7ae407
always set nonce in tests
Oct 13, 2024
c014c82
fix clippy warnings for whole project (except runtime-benchmarks)
vklachkov Oct 14, 2024
c6c0ffd
ci: fix try-runtime workflow
BuddyGlas Oct 14, 2024
576fb57
ci: try to fix xcm tests launch
BuddyGlas Oct 15, 2024
999a79d
ci: set new runner label for workflows
BuddyGlas Oct 23, 2024
595cb44
ci: use Parity's chain-spec-generator
BuddyGlas Oct 29, 2024
a45de7e
ci: fix number of relay node and fix xcm parachains launch
BuddyGlas Oct 29, 2024
ac02985
Merge pull request #1094 from UniqueNetwork/ci/fix-rewrites
BuddyGlas Oct 31, 2024
c73f924
ci: fix HydraX image name in xcm workflow
BuddyGlas Oct 31, 2024
8964827
ci: remove not needed legacyRpc for HydraX
BuddyGlas Oct 31, 2024
854a89d
ci: fix assethub for quartz and unique
vklachkov Nov 1, 2024
a5b39b3
fix tests globalSetup
Nov 4, 2024
ae7ac7f
update specVersion
Nov 15, 2024
53c1eda
improve globalSetup
vklachkov Nov 15, 2024
5b311c9
change base image for workflows
BuddyGlas Nov 18, 2024
23a6b30
fixed stack startup for node-only workflow
BuddyGlas Nov 18, 2024
f5f997c
fix logical bag for forkless-with-data workflow
BuddyGlas Nov 18, 2024
d5d383f
fix
BuddyGlas Nov 18, 2024
f4a6a28
fix: token symbols
Nov 18, 2024
8ee9f3d
fix: timings corresponding to block time
Nov 22, 2024
a4fedde
forkless-update-data with two branches
BuddyGlas Nov 18, 2024
0a47d83
Merge branch 'unique-polkadot-1.14' into ci/two-branches-release
BuddyGlas Nov 22, 2024
90bb6cb
Merge pull request #1099 from UniqueNetwork/ci/two-branches-release
BuddyGlas Nov 22, 2024
e0d4344
change cargo_home path in Dockerfiles
BuddyGlas Nov 23, 2024
3e71ab7
delete mount cache folders
BuddyGlas Nov 23, 2024
3825231
add Dockerfile-unique-base-image
BuddyGlas Nov 23, 2024
1ff2c81
fix container names for workflows
BuddyGlas Nov 23, 2024
34bcc99
try para_spec func
BuddyGlas Nov 25, 2024
78ff1f0
fix
BuddyGlas Nov 25, 2024
a2392d0
fix
BuddyGlas Nov 25, 2024
b46759e
fix
BuddyGlas Nov 25, 2024
65ce25f
try forkless
BuddyGlas Nov 25, 2024
4671267
fix sleep step
BuddyGlas Nov 25, 2024
5c10c5e
fix
BuddyGlas Nov 25, 2024
c6fb63d
feat: add force_reset_foreign_asset_location
mrshiposha Nov 21, 2024
362d33a
set ephemeral for snippets
BuddyGlas Nov 26, 2024
bd47950
fix
BuddyGlas Nov 26, 2024
7a9b109
set new repositories for workflows
BuddyGlas Nov 26, 2024
08d4fce
disable cache for docker builds
BuddyGlas Nov 26, 2024
bb5c345
fix
BuddyGlas Nov 26, 2024
cb09e87
switch relay from rococo to westend
BuddyGlas Nov 27, 2024
d82bf71
set long second counter for waiting block
BuddyGlas Nov 27, 2024
61b9df5
merged workflows into one main-process-update
BuddyGlas Nov 27, 2024
687a712
print balance before runtime upgrade in workflow
BuddyGlas Nov 27, 2024
1768811
fix: weights
mrshiposha Nov 27, 2024
2011082
fix: host functions
mrshiposha Nov 26, 2024
20ca740
fix: pallet-xcm benchmarking config
mrshiposha Nov 27, 2024
35bb081
fix: foreign-assets manager
mrshiposha Nov 27, 2024
fa004e3
fix: calibrate weight/price coeffs
mrshiposha Nov 28, 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
3 changes: 2 additions & 1 deletion .baedeker/forkless-data.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,10 @@ local unique = {
wantedKeys: 'para',
extraArgs: [
'--increase-future-pool',
'--pool-type=fork-aware',
],
},
for name in ['alice', 'bob']
for name in ['alice', 'bob', 'charlie']
},
};

Expand Down
3 changes: 2 additions & 1 deletion .baedeker/node-only.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ local unique = {
wantedKeys: 'para',
extraArgs: [
'--increase-future-pool',
'--pool-type=fork-aware',
],
},
for name in ['alice', 'bob']
for name in ['alice', 'bob', 'charlie']
},
};

Expand Down
14 changes: 7 additions & 7 deletions .baedeker/rewrites.example.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ 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/hydradx': { dockerImage: 'uniquenetwork/builder-hydraDx:%s' % dotenv.HYDRADX_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: 'galacticcouncil/hydra-dx:%s' % dotenv.HYDRADX_BUILD_BRANCH },
},
extra_node_mixin={
extraArgs+: [
Expand Down
2 changes: 1 addition & 1 deletion .baedeker/up.sh
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Точно нужно здесь прописывать частный случай импортирования спеки для запуска ассетхаба?

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=westend-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
2 changes: 1 addition & 1 deletion .baedeker/xcm-opal-async-backing.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ local unique = {
'--increase-future-pool',
],
},
for name in ['alice', 'bob', 'charlie', 'dave', 'eve']
for name in ['alice', 'bob', 'charlie']
},
};

Expand Down
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']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Не многовато ли для локального запуска?
Осталось от отладки?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

У меня есть убеждение, что для корректной работы коллаторов валидаторов должно быть как минимум на 1 больше.

},
};

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]
},
}
47 changes: 0 additions & 47 deletions .docker/Dockerfile-acala.j2

This file was deleted.

46 changes: 0 additions & 46 deletions .docker/Dockerfile-astar.j2

This file was deleted.

15 changes: 3 additions & 12 deletions .docker/Dockerfile-chain-dev
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
FROM uniquenetwork/services:latest
FROM uniquenetwork/services:base-nightly-1.67.0

ARG NETWORK

ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=Etc/UTC
ENV NETWORK=$NETWORK
ENV CARGO_HOME="/cargo-home"
ENV PATH="/cargo-home/bin:$PATH"

RUN mkdir /dev_chain
COPY . /dev_chain

WORKDIR /dev_chain
COPY . /workdir
WORKDIR /workdir

RUN cargo build --profile integration-tests --features=${NETWORK}-runtime,fast-inflation
RUN echo "$NETWORK"

CMD cargo run --profile integration-tests --features=${NETWORK}-runtime,fast-inflation -- --dev -linfo --rpc-cors=all --unsafe-rpc-external
Loading