Chore: update config and docker version (#1939)

parallel-finance · Jun 2, 2023 · 7db188f · 7db188f
1 parent c0b0d84
commit 7db188f
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 57 deletions.
diff --git a/Makefile b/Makefile
@@ -1,18 +1,16 @@
-PARA_ID        											:= 2012
-CHAIN          											:= kerria-dev
-RELAY_CHAIN                         := polkadot-local
-CUMULUS_CHAIN     									:= statemint-dev
-RUNTIME        											:= kerria-runtime
+PARA_ID        											:= 2085
+CHAIN          											:= vanilla-dev
+RELAY_CHAIN                         					:= kusama-local
+RUNTIME        											:= vanilla-runtime
 BLOCK_AT       											:= 0x0000000000000000000000000000000000000000000000000000000000000000
 URL            											:= ws://localhost:9948
 KEYSTORE_PATH  											:= keystore
 SURI           											:= //Alice
-LAUNCH_CONFIG_YAML	  							:= config.yml
-LAUNCH_CONFIG_JSON	  							:= config.json
-DOCKER_OVERRIDE_YAML                := docker-compose.override.yml
+LAUNCH_CONFIG_YAML	  									:= config.yml
+LAUNCH_CONFIG_JSON	  									:= config.json
+DOCKER_OVERRIDE_YAML                					:= docker-compose.override.yml
 DOCKER_TAG     											:= latest
-RELAY_DOCKER_TAG										:= v0.9.28
-CUMULUS_DOCKER_TAG									:= v0.9.28
+RELAY_DOCKER_TAG										:= v0.9.42
 
 .PHONY: init
 init: submodules
@@ -199,13 +197,9 @@ shutdown:
 launch: shutdown
 	yq -i eval '.relaychain.image = "parallelfinance/polkadot:$(RELAY_DOCKER_TAG)"' $(LAUNCH_CONFIG_YAML)
 	yq -i eval '.relaychain.chain = "$(RELAY_CHAIN)"' $(LAUNCH_CONFIG_YAML)
-	yq -i eval '.relaychain.runtimeGenesisConfig.hrmp.preopenHrmpChannels[0].sender = $(PARA_ID)' $(LAUNCH_CONFIG_YAML)
-	yq -i eval '.relaychain.runtimeGenesisConfig.hrmp.preopenHrmpChannels[1].recipient = $(PARA_ID)' $(LAUNCH_CONFIG_YAML)
 	yq -i eval '.parachains[0].image = "parallelfinance/parallel:$(DOCKER_TAG)"' $(LAUNCH_CONFIG_YAML)
 	yq -i eval '.parachains[0].id = $(PARA_ID)' $(LAUNCH_CONFIG_YAML)
 	yq -i eval '.parachains[0].chain.base = "$(CHAIN)"' $(LAUNCH_CONFIG_YAML)
-	yq -i eval '.parachains[1].image = "parallelfinance/cumulus:$(CUMULUS_DOCKER_TAG)"' $(LAUNCH_CONFIG_YAML)
-	yq -i eval '.parachains[1].chain.base = "$(CUMULUS_CHAIN)"' $(LAUNCH_CONFIG_YAML)
 	docker image pull parallelfinance/polkadot:$(RELAY_DOCKER_TAG)
 	docker image pull parallelfinance/parallel:$(DOCKER_TAG)
 	docker image pull parallelfinance/stake-client:latest
@@ -222,7 +216,7 @@ launch: shutdown
 
 .PHONY: launch-vanilla
 launch-vanilla:
-	make PARA_ID=2085 CHAIN=vanilla-dev RELAY_CHAIN=kusama-local CUMULUS_CHAIN=statemine-dev launch
+	make PARA_ID=2085 CHAIN=vanilla-dev RELAY_CHAIN=kusama-local launch
 
 .PHONY: dev-launch
 dev-launch: shutdown

diff --git a/config.yml b/config.yml
@@ -1,17 +1,6 @@
 relaychain:
-  image: parallelfinance/polkadot:v0.9.28
-  chain: polkadot-local
-  runtimeGenesisConfig:
-    hrmp:
-      preopenHrmpChannels:
-        - sender: 2012
-          recipient: 1000
-          maxCapacity: 8
-          maxMessageSize: 102400
-        - sender: 1000
-          recipient: 2012
-          maxCapacity: 8
-          maxMessageSize: 102400
+  image: parallelfinance/polkadot:v0.9.42
+  chain: kusama-local
   env:
     RUST_LOG: xcm=trace
   flags:
@@ -27,11 +16,11 @@ relaychain:
 parachains:
   - image: parallelfinance/parallel:latest
     chain:
-      base: kerria-dev
+      base: vanilla-dev
       collators:
         - alice
       sudo: dave
-    id: 2012
+    id: 2085
     parachain: true
     flags:
       - --rpc-methods=unsafe
@@ -50,26 +39,3 @@ parachains:
     nodes:
       - flags:
           - --alice
-  - image: parallelfinance/cumulus:v0.9.28
-    chain:
-      base: statemint-local
-      collators:
-        - alice
-      sudo: dave
-    id: 1000
-    parachain: true
-    flags:
-      - --rpc-methods=unsafe
-      - --force-authoring
-      - --wasm-execution=compiled
-      - --execution=wasm
-      - --state-cache-size=0
-    relaychainFlags:
-      - --wasm-execution=compiled
-      - --execution=wasm
-      - --state-cache-size=0
-    env:
-      RUST_LOG: xcm=trace
-    nodes:
-      - flags:
-          - --alice
diff --git a/scripts/helper/src/commands/launch.ts b/scripts/helper/src/commands/launch.ts
@@ -174,6 +174,7 @@ async function relay({ logger, options: { relayWs, network } }: ActionParameters
 
   logger.info('Start new auction.')
   const call = []
+  call.push(api.tx.sudo.sudo(api.tx.xcmPallet.forceXcmVersion(config.location, config.xcmVersion)))
   call.push(api.tx.sudo.sudo(api.tx.auctions.newAuction(config.auctionDuration, config.leaseIndex)))
   call.push(
     ...config.crowdloans.map(({ derivativeIndex }) =>

diff --git a/scripts/helper/src/config/heiko.json b/scripts/helper/src/config/heiko.json
@@ -6,7 +6,9 @@
   "gift": "1000000000000000",
   "stakingLedgerCap": "10000000000000000",
   "paraDeposit": "0",
-  "crowdloanDeposit": "50000000000000",
+  "crowdloanDeposit": "500000000000000",
+  "location": {"parents":0, "interior":{"X1":{"Parachain": 2085}}},
+  "xcmVersion": "2",
   "assets": [
     {
       "name": "Kusama Unbonding",
@@ -269,7 +271,7 @@
       "pool": [1000, 100],
       "liquidityAmounts": ["10000000000", "10000000000"],
       "lptokenReceiver": "5HHMY7e8UAqR5ZaHGaQnRW5EDR8dP7QpAyjeBu6V7vdXxxbf",
-      "liquidityProviderToken": 6003
+      "liquidityProviderToken": 5003
     }
   ],
   "crowdloans": [

diff --git a/scripts/helper/src/config/parallel.json b/scripts/helper/src/config/parallel.json
@@ -6,7 +6,9 @@
   "gift": "1000000000000000",
   "stakingLedgerCap": "1000000000000000",
   "paraDeposit": "0",
-  "crowdloanDeposit": "10000000000000",
+  "crowdloanDeposit": "50000000000000",
+  "location": {"parents":0, "interior":{"X1":{"Parachain": 2012}}},
+  "xcmVersion": "2",
   "assets": [
     {
       "name": "Polkadot Unbonding",

diff --git a/scripts/srtool-build.sh b/scripts/srtool-build.sh
@@ -6,7 +6,7 @@ cd $DIR/../
 
 set -xe
 
-RUSTC_VERSION=1.64.0;
+RUSTC_VERSION=1.66.1;
 PACKAGE=${PACKAGE:-vanilla-runtime};
 BUILD_OPTS=$BUILD_OPTS;