UniqueNetwork · vklachkov · Sep 10, 2024 · Sep 7, 2024 · Sep 10, 2024 · Sep 10, 2024
diff --git a/.baedeker/forkless-data.jsonnet b/.baedeker/forkless-data.jsonnet
@@ -57,6 +57,7 @@ local unique = {
 			wantedKeys: 'para',
 			extraArgs: [
 				'--increase-future-pool',
+				'--pool-type=fork-aware',
 			],
 		},
 		for name in ['alice', 'bob']

diff --git a/.baedeker/node-only.jsonnet b/.baedeker/node-only.jsonnet
@@ -35,6 +35,7 @@ local unique = {
 			wantedKeys: 'para',
 			extraArgs: [
 				'--increase-future-pool',
+				'--pool-type=fork-aware',
 			],
 		},
 		for name in ['alice', 'bob']

diff --git a/.baedeker/rewrites.example.jsonnet b/.baedeker/rewrites.example.jsonnet
@@ -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+: [

diff --git a/.baedeker/up.sh b/.baedeker/up.sh
@@ -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
diff --git a/.baedeker/xcm-opal.jsonnet b/.baedeker/xcm-opal.jsonnet
@@ -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']
 	},
@@ -65,6 +66,6 @@ local westmint = {
 relay + {
 	parachains: {
 		[para.name]: para,
-		for para in [unique, westmint]
+		for para in [unique, assethub]
 	},
 }
diff --git a/.baedeker/xcm-quartz.jsonnet b/.baedeker/xcm-quartz.jsonnet
@@ -2,7 +2,7 @@ local
 m = import 'baedeker-library/mixin/spec.libsonnet',
 ;
 
-function(relay_spec)
+function(relay_spec, assethub_spec)
 
 local relay = {
 	name: 'relay',
@@ -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']
 	},
 };
 
@@ -64,6 +64,8 @@ local karura = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
+			parentConnection: 'internal-samedir',
+            expectedDataPath: '/acala/data',				
 		},
 		for name in ['alice', 'bob']
 	},
@@ -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']
 	},
@@ -118,6 +124,8 @@ local shiden = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
+			parentConnection: 'internal-samedir',
+            expectedDataPath: '/data',				
 		},
 		for name in ['alice', 'bob']
 	},
@@ -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]
 	},
 }
diff --git a/.baedeker/xcm-unique.jsonnet b/.baedeker/xcm-unique.jsonnet
@@ -2,7 +2,7 @@ local
 m = import 'baedeker-library/mixin/spec.libsonnet',
 ;
 
-function(relay_spec)
+function(relay_spec, assethub_spec)
 
 local relay = {
 	name: 'relay',
@@ -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']
 	},
 };
 
@@ -65,6 +65,8 @@ local acala = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
+			parentConnection: 'internal-samedir',
+            expectedDataPath: '/acala/data',				
 		},
 		for name in ['alice', 'bob']
 	},
@@ -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']
 	},
@@ -119,6 +125,8 @@ local astar = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
+			parentConnection: 'internal-samedir',
+            expectedDataPath: '/data',				
 		},
 		for name in ['alice', 'bob']
 	},
@@ -136,6 +144,9 @@ local polkadex = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
+			parentConnection: 'internal-samedir',
+            expectedDataPath: '/data',
+
 		},
 		for name in ['alice', 'bob']
 	},
@@ -153,7 +164,8 @@ local hydraDx = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
-			legacyRpc: true,
+			parentConnection: 'internal-samedir',
+            expectedDataPath: '/hydra',			
 		},
 		for name in ['alice', 'bob']
 	},
@@ -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]
 	},
 }
diff --git a/.docker/Dockerfile-acala.j2 b/.docker/Dockerfile-acala.j2
diff --git a/.docker/Dockerfile-astar.j2 b/.docker/Dockerfile-astar.j2
diff --git a/.docker/Dockerfile-chain-dev b/.docker/Dockerfile-chain-dev
@@ -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
diff --git a/.docker/Dockerfile-chain-dev-unit b/.docker/Dockerfile-chain-dev-unit
@@ -1,14 +1,9 @@
-FROM uniquenetwork/services:latest
-
-ENV DEBIAN_FRONTEND=noninteractive
-ENV CARGO_HOME="/cargo-home"
-ENV PATH="/cargo-home/bin:$PATH"
+FROM uniquenetwork/services:base-nightly-1.67.0
 
 ARG NETWORK
 
-RUN mkdir /dev_chain
-COPY . /dev_chain
+COPY . /workdir
 
-WORKDIR /dev_chain
+WORKDIR /workdir
 
 CMD cargo test --features=limit-testing,tests --workspace