Add moonbeam 0.0.14

peaqnetwork · Feb 13, 2024 · fd083df · fd083df
1 parent 89a918e
commit fd083df
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 49 deletions.
diff --git a/config.parachain.moonbeam.yml b/config.parachain.moonbeam.yml
@@ -1,6 +1,6 @@
 # Relaychain Configuration
 relaychain:
-  image: parity/polkadot:v0.9.43 # the docker image to use
+  image: parity/polkadot:v1.0.0 # the docker image to use
   chain: rococo-local # the chain to use
   runtimeGenesisConfig: # additonal genesis override
     configuration:
@@ -73,28 +73,40 @@ parachains:
       relaychainFlags: # additional CLI flags for relaychain part
         - --name=relaychain-ferdie
 
-- image: bifrostnetwork/bifrost:latest
-  chain: # this could be a string like `dev` or a config object
-    base: bifrost-local # the chain to use
-    collators: # override collators
-      - alice # this imply //Alice
-      - charlie
-    sudo: alice # override sudo key to //Alice
-  id: 3000 # override parachain id
-  parachain: true # this is parachain, not parathread
-  flags: # CLI flags for this parachain nodes
+- image: acala/acala-node:2.21.0
+  chain:
+    base: acala-local
+    collators:
+      - bob
+    sudo: alice
+    runtimeGenesisConfig: # additonal genesis override
+      balances:
+        balances:
+          - [5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY, 1000000000000000000000]
+          - [5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty, 1000000000000000000000]
+          - [5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y, 1000000000000000000000]
+          - [5DAAnrj7VHTznn2AWBemMuyBwZWs6FNFjdyVXUeYum3PTXFy, 1000000000000000000000]
+          - [5HGjWAeFDfFCWPsjFQdVV2Msvz2XtMktvgocEZcCj68kUMaw, 1000000000000000000000]
+          - [5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL, 1000000000000000000000]
+  id: 3000
+  parachain: true
+  flags:
     - --rpc-methods=unsafe
     - --force-authoring
+    - --wasm-execution=compiled
     - --execution=wasm
-  relaychainFlags: # CLI flags for the relaychain port
+  relaychainFlags:
+    - --wasm-execution=compiled
     - --execution=wasm
-  env: # environment variables for this parachain nodes
-    RUST_LOG: sc_basic_authorship=trace
+  env:
+    RUST_LOG: sc_basic_authorship=trace,cumulus-consensus=trace,cumulus-collator=trace,collator_protocol=trace,collation_generation=trace,aura=debug,xcm=trace
+  # Acala's path should be under the acala/data
+  volumePath: /acala/data
   nodes: # nodes config
-    - wsPort: 10144
-      rpcPort: 10133
-      port: 40336
-      flags: # additional CLI flags for this node
-        - --alice
-      relaychainFlags: # additional CLI flags for relaychian part
-        - --name=relaychain-alice
+    - name: bob # the node name and session key, this imply `--alice`
+      wsPort: 10144 # default ws port number is `9944 + global_node_index`
+      rpcPort: 10133 # default rpc port number is `9933 + global_node_index`
+      port: 30533 # default libp2p port number is `30333 + global_node_index`
+      flags:
+        - --bob
+      relaychainFlags: # additional CLI flags for relaychain part
diff --git a/config.parachain.yml b/config.parachain.yml
@@ -40,6 +40,7 @@ parachains:
     chainType: Development
     collators: # override collators
       - ferdie
+      # - eve
     sudo: alice # override sudo key to //Alice
     runtimeGenesisConfig: # additonal genesis override
       balances:
@@ -71,6 +72,14 @@ parachains:
         - --ferdie
       relaychainFlags: # additional CLI flags for relaychain part
         - --name=relaychain-ferdie
+    # - name: eve
+    #   wsPort: 10045
+    #   rpcPort: 10034
+    #   port: 40337
+    #   flags: # additional CLI flags for this node
+    #     - --eve
+    #   relaychainFlags: # additional CLI flags for relaychain part
+    #     - --name=relaychain-eve
 
 - image: acala/acala-node:2.21.0
   chain:

diff --git a/...hain.peaq-dev.forked.moonbeam.v0.0.13.yml → ...hain.peaq-dev.forked.moonbeam.v0.0.14.yml b/...hain.peaq-dev.forked.moonbeam.v0.0.13.yml → ...hain.peaq-dev.forked.moonbeam.v0.0.14.yml
@@ -34,7 +34,7 @@ relaychain:
 # Parachain Configuration
 parachains:
 # Config for first parachain
-- image: sfffaaa/peaq-test:peaq-dev-moonbeam-v0.0.13
+- image: sfffaaa/peaq-test:peaq-dev-moonbeam-v0.0.14
   chain: # this could be a string like `dev` or a config object
     base: dev-local # the chain to use
     chainType: Development

diff --git a/scripts/config.parachain.peaq.forked.v0.0.2.yml b/scripts/config.parachain.peaq.forked.v0.0.2.yml
@@ -18,7 +18,7 @@ relaychain:
           maxCapacity: 8
           maxMessageSize: 102400
   env: # environment variables for all relaychain nodes
-    RUST_LOG: parachain::candidate-backing=trace
+    RUST_LOG: parachain::candidate-backing=trace,xcm=trace
   flags: # additional CLI flags for all relaychain nodes
     - --rpc-methods=unsafe
   nodes: # nodes config
@@ -28,8 +28,6 @@ relaychain:
       port: 30333 # default libp2p port number is `30333 + global_node_index`
       flags: # additional CLI flags for this node
         - --force-authoring
-      env:
-        RUST_LOG: babe=debug # environment varitables for this node
     - name: bob
     - name: charlie
 
@@ -44,6 +42,7 @@ parachains:
       # - alice
       # - bob
       - ferdie
+      # - eve
     sudo: alice # override sudo key to //Alice
     runtimeGenesisConfig: # additonal genesis override
       balances:
@@ -64,32 +63,25 @@ parachains:
   relaychainFlags: # CLI flags for the relaychain port
     - --execution=wasm
   env: # environment variables for this parachain nodes
-    RUST_LOG: sc_basic_authorship=trace
+    RUST_LOG: sc_basic_authorship=trace,xcm=trace
   volumePath: /chain-data # The path to mount volume and base path, default to /data
   nodes: # nodes config
-    - wsPort: 10044
+    - name: ferdie
+      wsPort: 10044
       rpcPort: 10033
-      port: 40336
+      port: 30433
       flags: # additional CLI flags for this node
         - --ferdie
-    # - wsPort: 10045
+      relaychainFlags: # additional CLI flags for relaychain part
+        - --name=relaychain-ferdie
+    # - name: eve
+    #   wsPort: 10045
     #   rpcPort: 10034
     #   port: 40337
-    #   flags:
-    #     - --dave
-    # - wsPort: 10046
-    #   rpcPort: 10035
-    #   port: 40338
     #   flags: # additional CLI flags for this node
-    #     - --alice
-    # - wsPort: 10047
-    #   rpcPort: 10036
-    #   port: 40339
-    #   flags:
-    #     - --bob
-    # - wsPort: 10048
-    #   rpcPort: 10037
-    #   port: 40340
+    #     - --eve
+    #   relaychainFlags: # additional CLI flags for relaychain part
+    #     - --name=relaychain-eve
 
 - image: acala/acala-node:2.21.0
   chain:

diff --git a/scripts/forked-moonbeam.sh b/scripts/forked-moonbeam.sh
@@ -1,7 +1,7 @@
-FORKED_CONFIG_FILE="scripts/config.parachain.peaq-dev.forked.moonbeam.v0.0.13.yml" \
+FORKED_CONFIG_FILE="scripts/config.parachain.peaq-dev.forked.moonbeam.v0.0.14.yml" \
 RPC_ENDPOINT="https://moonbeam.peaq.network" \
 DOCKER_COMPOSE_FOLDER="yoyo" \
-FORK_FOLDER="/home/jaypan/Work/peaq/fork-test/fork-binary/peaq-dev-moonbeam-v0.0.13" \
+FORK_FOLDER="/home/jaypan/Work/peaq/fork-test/fork-binary/peaq-dev-v0.0.14.moonbeam" \
 KEEP_COLLATOR="false" \
 KEEP_PARACHAIN="false" \
 sh -e -x forked.generated.sh
diff --git a/scripts/run-parachain-collator.sh b/scripts/run-parachain-collator.sh
@@ -3,12 +3,16 @@
 KEEP_CHAIN=${KEEP_CHAIN:-"false"}
 SURI=${SURI}
 
-PARACHAIN_CONFIG="/home/jaypan/Work/peaq/parachain-launch/yoyo/dev-local-2000.json"
-PARACHAIN_BOOTNODE="/ip4/127.0.0.1/tcp/40336/p2p/12D3KooWBD8acxfoqmVzC3eu7XqrQdvh7TMF1LW2PQtWRTjTVZBR"
+PARACHAIN_ID="3013"
+PARACHAIN_CONFIG="/home/jaypan/Work/peaq/parachain-launch/yoyo/dev-local-3013.json"
+PARACHAIN_BOOTNODE="/ip4/127.0.0.1/tcp/31333/p2p/12D3KooWExYdFUvpfKee9W5B1Ybp8JQgKECf6TUVDdYsMmcYkFma"
 RELAYCHAIN_CONFIG="/home/jaypan/Work/peaq/parachain-launch/yoyo/rococo-local.json"
-BINARY_PATH="/home/jaypan/Work/peaq/fork-test/fork-binary/peaq-dev-v0.0.10/peaq-node"
+BINARY_PATH="/home/jaypan/Work/peaq/fork-test/fork-binary/peaq-dev-v0.0.15.moonbeam/peaq-node"
 CHAIN_FOLDER="chain-folder-need-delete"
 
+# main sub-libp2p: [Parachain] 🏷n  Local node identity is: 12D3KooWSKbKXoRM1Au6ycCQAAS6ESCMNLBkbEC84Zd9ysQXJsrD
+
+
 if [ KEEP_CHAIN != "true" ]; then
   rm -rf $CHAIN_FOLDER
 fi
@@ -26,7 +30,7 @@ $BINARY_PATH \
   --key-type aura
 
 $BINARY_PATH \
-  --parachain-id 2000 \
+  --parachain-id $PARACHAIN_ID \
   --collator \
   --chain $PARACHAIN_CONFIG \
   --port 50334 \