Merge pull request #112 from ObsidianLabs/develop

feat: update conflux to 2 version
ObsidianLabs · Apr 14, 2022 · 8f00e10 · 8f00e10
2 parents 91bd0f3 + 51f41a2
commit 8f00e10
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/ReduxApp.js b/src/ReduxApp.js
@@ -24,7 +24,7 @@ let dockerImageForNode = process.env.DOCKER_IMAGE_NODE
 //   dockerImageForNode += '-arm64'
 // }
 instanceChannel.node = new DockerImageChannel(dockerImageForNode, {
-  filter: v => semver.valid(v) && semver.gte(v, '1.0.0') && v.indexOf('2.') !== 0 && semver.lt(v, '2.0.0') && v.indexOf('testnet') === -1 && v.indexOf('mainnet') === -1
+  filter: v => semver.valid(v) && semver.gte(v, '1.0.0') && v.indexOf('testnet') === -1 && v.indexOf('mainnet') === -1
 })
 
 export default class ReduxApp extends Component {

diff --git a/src/components/Routes/Network/index.js b/src/components/Routes/Network/index.js
@@ -12,8 +12,14 @@ let dockerImageForNode = process.env.DOCKER_IMAGE_NODE
 nodeManager.generateCommand = ({ name, version }) => {
   const containerName = `${process.env.PROJECT}-${name}-${version}`
 
+  let configFile = 'default.toml'
+
+  if (version.startsWith('2.')) { 
+    configFile = 'conflux.toml'
+  }
+
   return [
-    'docker run -it --rm',
+    `pwd && docker run -it --rm`,
     `--name ${containerName}`,
     `-p 12535:12535`,
     `-p 12536:12536`,
@@ -22,7 +28,7 @@ nodeManager.generateCommand = ({ name, version }) => {
     `-w /${process.env.PROJECT}-node`,
     `--entrypoint conflux`,
     `${dockerImageForNode}:${version}`,
-    `--config default.toml`
+    `--config ${configFile}`,
   ].join(' ')
 }