Merge pull request #85 from peaqnetwork/feat/1207284003387464_update_…

…to_token_economy_v1 Update to token economy v1
peaqnetwork · May 14, 2024 · 605dfd3 · 605dfd3
2 parents bff7bab + 0938d1f
commit 605dfd3
Show file tree

Hide file tree

Showing 9 changed files with 363 additions and 14 deletions.
diff --git a/config.parachain.yml b/config.parachain.yml
@@ -40,6 +40,7 @@ parachains:
     chainType: Development
     collators: # override collators
       - ferdie
+      # - dave
       # - eve
     sudo: alice # override sudo key to //Alice
     runtimeGenesisConfig: # additonal genesis override
@@ -61,7 +62,7 @@ parachains:
   relaychainFlags: # CLI flags for the relaychain port
     - --execution=wasm
   env: # environment variables for this parachain nodes
-    RUST_LOG: sc_basic_authorship=trace,xcm=trace
+    RUST_LOG: sc_basic_authorship=trace,cumulus-consensus=trace,cumulus-collator=trace,collator_protocol=trace,collation_generation=trace,aura=debug,xcm=trace
   volumePath: /chain-data # The path to mount volume and base path, default to /data
   nodes: # nodes config
     - name: ferdie
@@ -80,7 +81,14 @@ parachains:
     #     - --eve
     #   relaychainFlags: # additional CLI flags for relaychain part
     #     - --name=relaychain-eve
-
+    # - name: dave
+    #   wsPort: 10046
+    #   rpcPort: 10035
+    #   port: 40338
+    #   flags: # additional CLI flags for this node
+    #     - --dave
+    #   relaychainFlags: # additional CLI flags for relaychain part
+    #     - --name=relaychain-dave
 - image: acala/acala-node:2.21.0
   chain:
     base: acala-local

diff --git a/scripts/config.parachain.krest.forked.v0.0.6.yml b/scripts/config.parachain.krest.forked.v0.0.6.yml
@@ -0,0 +1,113 @@
+# Relaychain Configuration
+relaychain:
+  image: parity/polkadot:v1.0.0 # the docker image to use
+  chain: rococo-local # the chain to use
+  runtimeGenesisConfig: # additonal genesis override
+    configuration:
+      config:
+        validation_upgrade_cooldown: 10
+        validation_upgrade_delay: 10
+    hrmp:
+      preopenHrmpChannels:
+        - sender: 3000
+          recipient: 2241
+          maxCapacity: 8
+          maxMessageSize: 102400
+        - sender: 2241
+          recipient: 3000
+          maxCapacity: 8
+          maxMessageSize: 102400
+  env: # environment variables for all relaychain nodes
+    RUST_LOG: parachain::candidate-backing=trace,xcm=trace
+  flags: # additional CLI flags for all relaychain nodes
+    - --rpc-methods=unsafe
+  nodes: # nodes config
+    - name: alice # the node name and session key, this imply `--alice`
+      wsPort: 9944 # default ws port number is `9944 + global_node_index`
+      rpcPort: 9933 # default rpc port number is `9933 + global_node_index`
+      port: 30333 # default libp2p port number is `30333 + global_node_index`
+      flags: # additional CLI flags for this node
+        - --force-authoring
+    - name: bob
+    - name: charlie
+
+# Parachain Configuration
+parachains:
+# Config for first parachain
+- image: peaq/parachain:krest-v0.0.6
+  chain: # this could be a string like `dev` or a config object
+    base: krest-local # the chain to use
+    chainType: Development
+    collators: # override collators
+      # - dave # this imply //Alice
+      - ferdie
+    sudo: alice # override sudo key to //Alice
+    runtimeGenesisConfig: # additonal genesis override
+      balances:
+        balances:
+          - [5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY, 1000000000000000000000]
+          - [5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty, 1000000000000000000000]
+          - [5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y, 1000000000000000000000]
+          - [5DAAnrj7VHTznn2AWBemMuyBwZWs6FNFjdyVXUeYum3PTXFy, 1000000000000000000000]
+          - [5HGjWAeFDfFCWPsjFQdVV2Msvz2XtMktvgocEZcCj68kUMaw, 1000000000000000000000]
+          - [5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL, 1000000000000000000000]
+  id: 2241 # override parachain id
+  parachain: true # this is parachain, not parathread
+  flags: # CLI flags for this parachain nodes
+    - --rpc-methods=unsafe
+    # - --force-authoring
+    - --execution=wasm
+    - --state-pruning=archive
+  relaychainFlags: # CLI flags for the relaychain port
+    - --execution=wasm
+  env: # environment variables for this parachain nodes
+    RUST_LOG: sc_basic_authorship=trace
+  volumePath: /chain-data # The path to mount volume and base path, default to /data
+  nodes: # nodes config
+    - wsPort: 10044
+      rpcPort: 10033
+      port: 40336
+      flags: # additional CLI flags for this node
+        - --ferdie
+    # - wsPort: 10045
+    #   rpcPort: 10034
+    #   port: 40337
+    #   flags:
+    #     - --dave
+- 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:
+    - --wasm-execution=compiled
+    - --execution=wasm
+  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
+    - 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/scripts/config.parachain.krest.forked.v0.0.7.yml b/scripts/config.parachain.krest.forked.v0.0.7.yml
@@ -0,0 +1,113 @@
+# Relaychain Configuration
+relaychain:
+  image: parity/polkadot:v1.0.0 # the docker image to use
+  chain: rococo-local # the chain to use
+  runtimeGenesisConfig: # additonal genesis override
+    configuration:
+      config:
+        validation_upgrade_cooldown: 10
+        validation_upgrade_delay: 10
+    hrmp:
+      preopenHrmpChannels:
+        - sender: 3000
+          recipient: 2241
+          maxCapacity: 8
+          maxMessageSize: 102400
+        - sender: 2241
+          recipient: 3000
+          maxCapacity: 8
+          maxMessageSize: 102400
+  env: # environment variables for all relaychain nodes
+    RUST_LOG: parachain::candidate-backing=trace,xcm=trace
+  flags: # additional CLI flags for all relaychain nodes
+    - --rpc-methods=unsafe
+  nodes: # nodes config
+    - name: alice # the node name and session key, this imply `--alice`
+      wsPort: 9944 # default ws port number is `9944 + global_node_index`
+      rpcPort: 9933 # default rpc port number is `9933 + global_node_index`
+      port: 30333 # default libp2p port number is `30333 + global_node_index`
+      flags: # additional CLI flags for this node
+        - --force-authoring
+    - name: bob
+    - name: charlie
+
+# Parachain Configuration
+parachains:
+# Config for first parachain
+- image: peaq/parachain:krest-v0.0.7
+  chain: # this could be a string like `dev` or a config object
+    base: krest-local # the chain to use
+    chainType: Development
+    collators: # override collators
+      # - dave # this imply //Alice
+      - ferdie
+    sudo: alice # override sudo key to //Alice
+    runtimeGenesisConfig: # additonal genesis override
+      balances:
+        balances:
+          - [5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY, 1000000000000000000000]
+          - [5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty, 1000000000000000000000]
+          - [5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y, 1000000000000000000000]
+          - [5DAAnrj7VHTznn2AWBemMuyBwZWs6FNFjdyVXUeYum3PTXFy, 1000000000000000000000]
+          - [5HGjWAeFDfFCWPsjFQdVV2Msvz2XtMktvgocEZcCj68kUMaw, 1000000000000000000000]
+          - [5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL, 1000000000000000000000]
+  id: 2241 # override parachain id
+  parachain: true # this is parachain, not parathread
+  flags: # CLI flags for this parachain nodes
+    - --rpc-methods=unsafe
+    # - --force-authoring
+    - --execution=wasm
+    - --state-pruning=archive
+  relaychainFlags: # CLI flags for the relaychain port
+    - --execution=wasm
+  env: # environment variables for this parachain nodes
+    RUST_LOG: sc_basic_authorship=trace
+  volumePath: /chain-data # The path to mount volume and base path, default to /data
+  nodes: # nodes config
+    - wsPort: 10044
+      rpcPort: 10033
+      port: 40336
+      flags: # additional CLI flags for this node
+        - --ferdie
+    # - wsPort: 10045
+    #   rpcPort: 10034
+    #   port: 40337
+    #   flags:
+    #     - --dave
+- 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:
+    - --wasm-execution=compiled
+    - --execution=wasm
+  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
+    - 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/scripts/config.parachain.peaq-dev.forked.v0.0.16.yml b/scripts/config.parachain.peaq-dev.forked.v0.0.16.yml
@@ -0,0 +1,113 @@
+# Relaychain Configuration
+relaychain:
+  image: parity/polkadot:v1.1.0 # the docker image to use
+  chain: rococo-local # the chain to use
+  runtimeGenesisConfig: # additonal genesis override
+    configuration:
+      config:
+        validation_upgrade_cooldown: 10
+        validation_upgrade_delay: 10
+    hrmp:
+      preopenHrmpChannels:
+        - sender: 3000
+          recipient: 2000
+          maxCapacity: 8
+          maxMessageSize: 102400
+        - sender: 2000
+          recipient: 3000
+          maxCapacity: 8
+          maxMessageSize: 102400
+  env: # environment variables for all relaychain nodes
+    RUST_LOG: parachain::candidate-backing=trace
+  flags: # additional CLI flags for all relaychain nodes
+    - --rpc-methods=unsafe
+  nodes: # nodes config
+    - name: alice # the node name and session key, this imply `--alice`
+      wsPort: 9944 # default ws port number is `9944 + global_node_index`
+      rpcPort: 9933 # default rpc port number is `9933 + global_node_index`
+      port: 30333 # default libp2p port number is `30333 + global_node_index`
+      flags: # additional CLI flags for this node
+        - --force-authoring
+    - name: bob
+    - name: charlie
+
+# Parachain Configuration
+parachains:
+# Config for first parachain
+- image: peaq/parachain:peaq-dev-v0.0.16
+  chain: # this could be a string like `dev` or a config object
+    base: dev-local # the chain to use
+    chainType: Development
+    collators: # override collators
+      - ferdie
+      # - dave
+    sudo: alice # override sudo key to //Alice
+    runtimeGenesisConfig: # additonal genesis override
+      balances:
+        balances:
+          - [5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY, 1000000000000000000000]
+          - [5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty, 1000000000000000000000]
+          - [5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y, 1000000000000000000000]
+          - [5DAAnrj7VHTznn2AWBemMuyBwZWs6FNFjdyVXUeYum3PTXFy, 1000000000000000000000]
+          - [5HGjWAeFDfFCWPsjFQdVV2Msvz2XtMktvgocEZcCj68kUMaw, 1000000000000000000000]
+          - [5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL, 1000000000000000000000]
+  id: 2000 # override parachain id
+  parachain: true # this is parachain, not parathread
+  flags: # CLI flags for this parachain nodes
+    - --rpc-methods=unsafe
+    # - --force-authoring
+    - --execution=wasm
+    - --state-pruning=archive
+  relaychainFlags: # CLI flags for the relaychain port
+    - --execution=wasm
+  env: # environment variables for this parachain nodes
+    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
+      rpcPort: 10033
+      port: 40336
+      flags: # additional CLI flags for this node
+        - --ferdie
+    # - wsPort: 10045
+    #   rpcPort: 10034
+    #   port: 40337
+    #   flags:
+    #     - --dave
+- 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:
+    - --wasm-execution=compiled
+    - --execution=wasm
+  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
+    - 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/...s/config.parachain.peaq.forked.v0.0.2.yml → ...s/config.parachain.peaq.forked.v0.0.5.yml b/...s/config.parachain.peaq.forked.v0.0.2.yml → ...s/config.parachain.peaq.forked.v0.0.5.yml
@@ -34,7 +34,7 @@ relaychain:
 # Parachain Configuration
 parachains:
 # Config for first parachain
-- image: peaq/parachain:peaq-v0.0.2
+- image: peaq/parachain:peaq-v0.0.5
   chain: # this could be a string like `dev` or a config object
     base: peaq-local # the chain to use
     chainType: Development

diff --git a/scripts/forked-agung.sh b/scripts/forked-agung.sh
@@ -1,8 +1,8 @@
-FORKED_CONFIG_FILE="scripts/config.parachain.peaq-dev.forked.v0.0.11.yml" \
+FORKED_CONFIG_FILE="scripts/config.parachain.peaq-dev.forked.v0.0.16.yml" \
 RPC_ENDPOINT="https://rpcpc1-qa.agung.peaq.network" \
 DOCKER_COMPOSE_FOLDER="yoyo" \
-FORK_FOLDER="/home/jaypan/Work/peaq/fork-test/fork-binary/peaq-dev-v0.0.11" \
+FORK_FOLDER="/home/jaypan/Work/peaq/fork-test/fork-binary/peaq-dev-v0.0.16" \
 KEEP_COLLATOR="false" \
 KEEP_ASSET="true" \
-KEEP_PARACHAIN="true" \
+KEEP_PARACHAIN="false" \
 sh -e -x forked.generated.sh