Merge pull request #19 from Conflux-Chain/posConfig

add script to create pos configurations

.github/workflows/dev.yml

@@ -53,7 +53,6 @@ jobs:
             VERSION=v${{ steps.meta.outputs.version }}
           file: ./Dockerfile.dev.buildx
           platforms: ${{ matrix.platform }}
-          tags: ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }},${{ env.REGISTRY_IMAGE }}:latest
           outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
@@ -94,7 +93,7 @@ jobs:
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Create manifest list and push

.github/workflows/mainAndTest.yml

@@ -18,13 +18,7 @@ jobs:
         platform:
           - linux/amd64
           - linux/arm64
-
     steps:
-      - name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
@@ -34,6 +28,16 @@ jobs:
             # get the tag version eg: v1.0.0 => 1.0.0
             type=semver,pattern={{version}}
 
+            type=semver,pattern={{major}}.{{minor}}.{{patch}}
+
+      - name: Prepare
+        id: prepare
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+          VERSION=${{ steps.meta.outputs.version }}
+          [[ ${VERSION} == *-testnet* ]] && echo "CONFLUX_GIT_TAG=${VERSION}" >> ${GITHUB_OUTPUT} || echo "CONFLUX_GIT_TAG=${VERSION%-mainnet}" >> ${GITHUB_OUTPUT}
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -49,10 +53,9 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           build-args: |
-            VERSION=v{{ steps.meta.outputs.major }}.{{ steps.meta.outputs.minor }}.{{ steps.meta.outputs.patch }}
+            VERSION=v${{ steps.prepare.outputs.CONFLUX_GIT_TAG }}
           file: ./Dockerfile.buildx
           platforms: ${{ matrix.platform }}
-          tags: ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
           outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
@@ -93,7 +96,7 @@ jobs:
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Create manifest list and push

cfxrun/conflux.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
+
 # init config
-cd ./scripts
-node initConfig.js
-cd ..
+cd ./scripts && node initConfig.js && cd ..
 
 # start conflux
 /bin/conflux --config ./conflux.toml

cfxrun/scripts/account.js

@@ -1,4 +1,4 @@
-const {providerFactory: provider} = require('js-conflux-sdk');
+import {providerFactory as provider} from 'js-conflux-sdk';
 
 const client = provider({url: 'http://localhost:12537'});
 

cfxrun/scripts/createPosConfig.js

@@ -0,0 +1,21 @@
+import { execa } from "execa";
+import fs from "node:fs/promises";
+import YAML from 'yaml'
+
+
+export async function createPosConfig(chainId) {
+  await execa`pos-genesis-tool random --initial-seed=0000000000000000000000000000000000000000000000000000000000000000  --num-validator=1 --num-genesis-validator=1 --chain-id=${chainId}`;
+
+  const waypoint_config  =  await fs.readFile('./waypoint_config', 'utf8');
+  const posConfigRaw = await fs.readFile('../pos_config/pos_config.yaml', 'utf8');
+
+  const posConfig = YAML.parse(posConfigRaw);
+  console.log("posConfig", posConfig);
+  posConfig.base.waypoint.from_config = waypoint_config;
+  console.log("update posConfig", posConfig);
+  await fs.writeFile('../pos_config/pos_config.yaml', YAML.stringify(posConfig));
+  await execa`ls -l`
+  await execa`mv ./genesis_file ../pos_config/genesis_file`;
+
+  await execa`mv ./initial_nodes.json ../pos_config/initial_nodes.json`;
+}

cfxrun/scripts/index.js

@@ -1,6 +1,7 @@
-const {Conflux, providerFactory: provider, Drip} = require('js-conflux-sdk');
-const TOML = require('@iarna/toml');
-const fs = require('fs');
+import {Conflux, providerFactory as provider, Drip} from 'js-conflux-sdk';
+import fs from 'node:fs'
+import TOML from '@iarna/toml';
+
 const PASSWORD = '123456';
 const URL = "http://localhost:12537";
 const client = provider({url: URL});

cfxrun/scripts/initConfig.js

@@ -1,15 +1,43 @@
-const TOML = require('@iarna/toml');
-const fs = require('fs');
-const {PrivateKeyAccount: Account, format} = require('js-conflux-sdk');
+import TOML from '@iarna/toml'
+import fs from 'node:fs' 
+import {PrivateKeyAccount as Account, format} from 'js-conflux-sdk'
+import { createPosConfig } from './createPosConfig.js';
 
-function initialConfig() {
+async function initialConfig() {
     const configStr = fs.readFileSync("../conflux.toml", "utf-8");
     const config = TOML.parse(configStr);
-
-    // if "mode" is not docker leave it alone
-    if (config.mode !== 'docker') {  
-        return;
+
+    if (config.mode !== "docker") {
+      // If the mode is not Docker, refrain from altering the conflux.toml file or any other elements, including comments or spaces.
+      const stream = fs.createWriteStream("../conflux.toml", {flags: 'a'});
+
+      if (!config.chain_id) {
+        config.chain_id = parseInt(Math.random() * 10000);
+
+        console.warn(
+          "chain_id not found in conflux.toml, generate a random one: " +
+            config.chain_id
+        );
+
+        stream.write(`\nchain_id = ${config.chain_id}\n`);
+      }
+      if (!config.evm_chain_id) {
+        config.evm_chain_id = config.chain_id + 1;
+
+        console.warn(
+          "evm_chain_id not found in conflux.toml, generate a one: " +
+            config.evm_chain_id
+        );
+
+        stream.write(`\nevm_chain_id = ${config.evm_chain_id}\n`);
+      }
+
+      // The createPosConfig function must always be executed to generate the pos configuration.
+      stream.end();
+      await createPosConfig(config.chain_id);
+      return;
     }
+
     config.mode = 'dev';
 
     // generate a random chain_id
@@ -27,7 +55,9 @@ function initialConfig() {
 
     // write config back
     fs.writeFileSync("../conflux.toml", TOML.stringify(config));
+
+    await createPosConfig(config.chain_id)
     console.log('CFXDOCKER: config file set success !');
 }
 
-initialConfig();
+await initialConfig();