fix build & collator script (#472)

* fix build & collator script * use submodule * fix missing reserve_factor * update specs module's commit
parallel-finance · Aug 26, 2021 · f029505 · f029505
1 parent 8cc97bb
commit f029505
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 122 deletions.
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
@@ -20,6 +20,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           lfs: true
+          submodules: true
       - name: Checkout LFS objects
         run: git lfs checkout
       - name: Set up QEMU

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "resources/specs"]
+	path = resources/specs
+	url = https://github.com/parallel-finance/specs
diff --git a/Makefile b/Makefile
@@ -80,8 +80,7 @@ wasm:
 
 .PHONY: spec
 spec:
-	docker run --rm parallelfinance/parallel:latest build-spec --chain $(CHAIN) --disable-default-bootnode > ./resources/$(CHAIN)-plain.json
-	docker run --rm -v $(PWD)/resources:/app/resources parallelfinance/parallel:latest build-spec --chain=/app/resources/$(CHAIN)-plain.json --raw --disable-default-bootnode > ./resources/$(CHAIN)-raw.json
+	docker run --rm parallelfinance/parallel:latest build-spec --chain $(CHAIN) --disable-default-bootnode --raw > ./resources/$(CHAIN)-raw.json
 
 .PHONY: image
 image:

diff --git a/node/parallel/res/heiko.json b/node/parallel/res/heiko.json
diff --git a/node/parallel/src/chain_spec/heiko.rs b/node/parallel/src/chain_spec/heiko.rs
@@ -132,7 +132,7 @@ pub fn heiko_dev_config(id: ParaId) -> ChainSpec {
 }
 
 pub fn heiko_config(_id: ParaId) -> Result<ChainSpec, String> {
-    ChainSpec::from_json_bytes(&include_bytes!("../../res/heiko.json")[..])
+    ChainSpec::from_json_bytes(&include_bytes!("../../../../resources/specs/heiko.json")[..])
     // Ok(ChainSpec::from_genesis(
     //     // Name
     //     "Heiko",

diff --git a/resources/specs b/resources/specs
diff --git a/runtime/heiko/src/lib.rs b/runtime/heiko/src/lib.rs
@@ -1402,7 +1402,7 @@ impl_runtime_apis! {
 
             list_benchmark!(list, extra, pallet_balances, Balances);
             list_benchmark!(list, extra, pallet_membership, TechnicalCommitteeMembership);
-            list_benchmark!(list, extra, pallet_liquid_staking, LiquidStaking);
+            // list_benchmark!(list, extra, pallet_liquid_staking, LiquidStaking);
             list_benchmark!(list, extra, pallet_multisig, Multisig);
             list_benchmark!(list, extra, pallet_loans, LoansBench::<Runtime>);
             list_benchmark!(list, extra, frame_system, SystemBench::<Runtime>);

diff --git a/scripts/collator.sh b/scripts/collator.sh
@@ -15,7 +15,7 @@ PARA_RPC_PORT=9940
 PARA_P2P_PORT=30340
 
 PARA_CHAIN="heiko"
-RELAY_CHAIN="kusama"
+RELAY_CHAIN="westend"
 VOLUME="chains"
 NODE_KEY="$1"
 KEYSTORE_PATH="$2"
@@ -35,13 +35,14 @@ docker run --restart=always --name heiko-collator \
   -p $RELAY_RPC_PORT:$RELAY_RPC_PORT \
   -p $RELAY_P2P_PORT:$RELAY_P2P_PORT \
   -v "$VOLUME:/data" \
+  -v "$KEYSTORE_PATH:/app/keystore" \
   parallelfinance/parallel:latest \
     -d /data \
-    --chain=$RARA_CHAIN \
+    --chain=$PARA_CHAIN \
     --validator \
     --ws-port=$PARA_WS_PORT \
     --rpc-port=$PARA_RPC_PORT \
-    --keystore-path=$KEYSTORE_PATH \
+    --keystore-path=/app/keystore \
     --node-key=$NODE_KEY \
     --ws-external \
     --rpc-external \