CI/test

.baedeker/collator-selection.jsonnet

@@ -2,18 +2,21 @@ local
 m = import 'baedeker-library/mixin/spec.libsonnet',
 ;
 
+function(relay_spec)
+
 local relay = {
 	name: 'relay',
 	bin: 'bin/polkadot',
 	validatorIdAssignment: 'staking',
 	spec: {Genesis:{
-		chain: 'rococo-local',
+		chain: relay_spec,
 		modify:: m.genericRelay($),
 	}},
 	nodes: {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'relay',
+			expectedDataPath: '/parity',
 		},
 		for name in ['alice', 'bob', 'charlie', 'dave', 'eve']
 	},

.baedeker/forkless-data.jsonnet

@@ -17,6 +17,7 @@ local relay = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'relay',
+			expectedDataPath: '/parity',
 		},
 		for name in ['alice', 'bob', 'charlie', 'dave', 'eve']
 	},

.baedeker/node-only.jsonnet

@@ -2,18 +2,21 @@ local
 m = import 'baedeker-library/mixin/spec.libsonnet',
 ;
 
+function(relay_spec)
+
 local relay = {
 	name: 'relay',
 	bin: 'bin/polkadot',
 	validatorIdAssignment: 'staking',
 	spec: {Genesis:{
-		chain: 'rococo-local',
+		chain: relay_spec,
 		modify:: m.genericRelay($),
 	}},
 	nodes: {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'relay',
+			expectedDataPath: '/parity',	
 		},
 		for name in ['alice', 'bob', 'charlie', 'dave', 'eve']
 	},

.baedeker/xcm-opal-async-backing.jsonnet

@@ -39,13 +39,14 @@ local relay = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'relay',
+			expectedDataPath: '/parity',
 		},
 		for name in ['alice', 'bob', 'charlie', 'dave', 'eve']
 	},
 };
 
-local opal = {
-	name: 'opal',
+local unique = {
+	name: 'unique',
 	bin: 'bin/unique',
 	paraId: 1001,
 	spec: {Genesis:{
@@ -66,6 +67,6 @@ local opal = {
 relay + {
 	parachains: {
 		[para.name]: para,
-		for para in [opal]
+		for para in [unique]
 	},
 }

.baedeker/xcm-opal.jsonnet

@@ -19,13 +19,14 @@ local relay = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'relay',
+			expectedDataPath: '/parity',
 		},
 		for name in ['alice', 'bob', 'charlie', 'dave', 'eve']
 	},
 };
 
-local opal = {
-	name: 'opal',
+local unique = {
+	name: 'unique',
 	bin: 'bin/unique',
 	paraId: 1001,
 	spec: {Genesis:{
@@ -45,7 +46,7 @@ local opal = {
 
 local westmint = {
 	name: 'westmint',
-	bin: 'bin/cumulus',
+	bin: 'bin/assethub',
 	paraId: 1002,
 	spec: {Genesis:{
 		chain: 'westmint-local',
@@ -55,6 +56,7 @@ local westmint = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
+			expectedDataPath: '/parity',			
 		},
 		for name in ['alice', 'bob']
 	},
@@ -63,6 +65,6 @@ local westmint = {
 relay + {
 	parachains: {
 		[para.name]: para,
-		for para in [opal, westmint]
+		for para in [unique, westmint]
 	},
 }

.baedeker/xcm-quartz.jsonnet

@@ -24,13 +24,14 @@ local relay = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'relay',
+			expectedDataPath: '/parity',
 		},
 		for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie']
 	},
 };
 
-local quartz = {
-	name: 'quartz',
+local unique = {
+	name: 'unique',
 	bin: 'bin/unique',
 	paraId: 1001,
 	spec: {Genesis:{
@@ -89,7 +90,7 @@ local moonriver = {
 
 local statemine = {
 	name: 'statemine',
-	bin: 'bin/cumulus',
+	bin: 'bin/assethub',
 	paraId: 1004,
 	spec: {Genesis:{
 		chain: 'statemine-local',
@@ -99,6 +100,7 @@ local statemine = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
+			expectedDataPath: '/parity',			
 		},
 		for name in ['alice', 'bob']
 	},
@@ -124,6 +126,6 @@ local shiden = {
 relay + {
 	parachains: {
 		[para.name]: para,
-		for para in [quartz, karura, moonriver, statemine, shiden]
+		for para in [unique, karura, moonriver, statemine, shiden]
 	},
 }

.baedeker/xcm-unique.jsonnet

@@ -25,6 +25,7 @@ local relay = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'relay',
+			expectedDataPath: '/parity',
 		},
 		for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie', 'gregory', 'holly']
 	},
@@ -90,7 +91,7 @@ local moonbeam = {
 
 local statemint = {
 	name: 'statemint',
-	bin: 'bin/cumulus',
+	bin: 'bin/assethub',
 	paraId: 1004,
 	spec: {Genesis:{
 		chain: 'statemint-local',
@@ -100,6 +101,7 @@ local statemint = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para-ed',
+			expectedDataPath: '/parity',			
 		},
 		for name in ['alice', 'bob']
 	},

.docker/Dockerfile-chain-dev

@@ -1,6 +1,5 @@
 FROM uniquenetwork/services:latest
 
-ARG RUST_TOOLCHAIN
 ARG NETWORK
 
 ENV DEBIAN_FRONTEND=noninteractive
@@ -9,14 +8,6 @@ ENV NETWORK=$NETWORK
 ENV CARGO_HOME="/cargo-home"
 ENV PATH="/cargo-home/bin:$PATH"
 
-RUN echo "$NETWORK\n" && echo "$RUST_TOOLCHAIN\n"
-
-RUN rustup toolchain uninstall $(rustup toolchain list) && \
-    rustup toolchain install $RUST_TOOLCHAIN && \
-    rustup default $RUST_TOOLCHAIN && \
-    rustup component add --toolchain $RUST_TOOLCHAIN rust-src && \
-    rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN
-
 RUN mkdir /dev_chain
 COPY . /dev_chain
 

.docker/Dockerfile-chain-dev-unit

@@ -4,15 +4,8 @@ ENV DEBIAN_FRONTEND=noninteractive
 ENV CARGO_HOME="/cargo-home"
 ENV PATH="/cargo-home/bin:$PATH"
 
-ARG RUST_TOOLCHAIN
 ARG NETWORK
 
-RUN rustup toolchain uninstall $(rustup toolchain list) && \
-    rustup toolchain install $RUST_TOOLCHAIN && \
-    rustup default $RUST_TOOLCHAIN && \
-    rustup component add --toolchain $RUST_TOOLCHAIN rust-src && \
-    rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN
-
 RUN mkdir /dev_chain
 COPY . /dev_chain
 

.docker/Dockerfile-polkadot.j2 → .docker/Dockerfile-hydradx

@@ -2,6 +2,7 @@
 FROM ubuntu:22.04 as rust-builder
 LABEL maintainer="Unique.Network"
 
+ARG RUST_TOOLCHAIN
 ENV CARGO_HOME="/cargo-home"
 ENV PATH="/cargo-home/bin:$PATH"
 ENV TZ=UTC
@@ -14,33 +15,36 @@ RUN apt-get update && \
 
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
 
-RUN rustup toolchain install {{ RUST_TOOLCHAIN }} && \
-    rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }} && \
-    rustup default {{ RUST_TOOLCHAIN }} && \
-    rustup component add --toolchain {{ RUST_TOOLCHAIN }} rust-src && \
+RUN rustup toolchain install "${RUST_TOOLCHAIN}" && \
+    rustup target add wasm32-unknown-unknown --toolchain "${RUST_TOOLCHAIN}" && \
+    rustup default "${RUST_TOOLCHAIN}" && \
+    rustup component add --toolchain "${RUST_TOOLCHAIN}" rust-src && \
     rustup target list --installed && \
     rustup show
 
 RUN mkdir /unique_parachain
 WORKDIR /unique_parachain
 
-# ===== BUILD POLKADOT =====
-FROM rust-builder as builder-polkadot-bin
+# ===== BUILD BIN =====
+FROM rust-builder as builder-hydradx-bin
+
+ARG HYDRADX_BUILD_BRANCH
 
 WORKDIR /unique_parachain
 
-RUN git clone -b {{ POLKADOT_BUILD_BRANCH }} --depth 1 https://github.com/paritytech/polkadot.git
+RUN git clone --depth 1 -b "${HYDRADX_BUILD_BRANCH}" https://github.com/galacticcouncil/HydraDX-node.git
 
 RUN --mount=type=cache,target=/cargo-home/registry \
     --mount=type=cache,target=/cargo-home/git \
-    --mount=type=cache,target=/unique_parachain/polkadot/target \
-    cd polkadot && \
+    --mount=type=cache,target=/unique_parachain/parachain/target \
+    cd HydraDX-node && \
     CARGO_INCREMENTAL=0 cargo build --release --locked && \
-    mv ./target/release/polkadot /unique_parachain/polkadot/
+    mkdir /unique_parachain/Hydradx && \
+    mv ./target/release/hydradx /unique_parachain/Hydradx/hydradx
 
 # ===== BIN ======
 
-FROM ubuntu:22.04 as builder-polkadot
+FROM ubuntu:22.04 as builder-hydradx
 
-COPY --from=builder-polkadot-bin /unique_parachain/polkadot/polkadot /bin/polkadot
-ENTRYPOINT ["/bin/polkadot"]
+COPY --from=builder-hydradx-bin /unique_parachain/Hydradx/hydradx /bin/hydradx
+ENTRYPOINT ["/bin/hydradx"]