Merge remote-tracking branch 'origin/develop' into release/v2.0.0

mobilecoinofficial · Oct 12, 2022 · 92ede7d · 92ede7d
2 parents c335d44 + 3432c59
commit 92ede7d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 31 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -65,9 +65,9 @@ jobs:
         run: |
           mkdir -pv build_artifacts/${{ matrix.network }}/bin
           cp /var/tmp/*.css build_artifacts/${{ matrix.network }}
-          cp target/release/mc-full-service build_artifacts/${{ matrix.network }}
-          cp target/release/mc-transaction-signer build_artifacts/${{ matrix.network }}
-          cp target/release/mc-validator-service build_artifacts/${{ matrix.network }}
+          cp target/release/full-service build_artifacts/${{ matrix.network }}
+          cp target/release/transaction-signer build_artifacts/${{ matrix.network }}
+          cp target/release/validator-service build_artifacts/${{ matrix.network }}
 
       - name: Create Artifact
         run: |

diff --git a/full-service/Cargo.toml b/full-service/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 build = "build.rs"
 
 [[bin]]
-name = "mc-full-service"
+name = "full-service"
 path = "src/bin/main.rs"
 
 [dependencies]

diff --git a/full-service/src/config.rs b/full-service/src/config.rs
@@ -168,7 +168,7 @@ pub struct PeersConfig {
     pub tx_source_urls: Option<Vec<String>>,
 
     /// Chain Id
-    #[structopt(long)]
+    #[structopt(default_value = "", long)]
     pub chain_id: String,
 }
 

diff --git a/tools/run-fs.sh b/tools/run-fs.sh
@@ -51,11 +51,11 @@ if [ "$2" != "--no-build" ]; then
     echo "Building"
     SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
     $SCRIPT_DIR/build-fs.sh $NET
-    cp $SCRIPT_DIR/../target/release/mc-full-service $WORK_DIR
+    cp $SCRIPT_DIR/../target/release/full-service $WORK_DIR
 fi 
 
 mkdir -p ${WALLET_DB_DIR}
-$WORK_DIR/mc-full-service \
+$WORK_DIR/full-service \
     --wallet-db ${WALLET_DB_DIR}/wallet.db \
     --ledger-db ${LEDGER_DB_DIR} \
     --peer mc://node1.${PEER_DOMAIN} \

diff --git a/tools/run-testnet-no-wallet-db.sh b/tools/run-testnet-no-wallet-db.sh
diff --git a/transaction-signer/Cargo.toml b/transaction-signer/Cargo.toml
@@ -5,7 +5,7 @@ version = "2.0.0"
 edition = "2021"
 
 [[bin]]
-name = "mc-transaction-signer"
+name = "transaction-signer"
 path = "src/bin/main.rs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/validator/service/Cargo.toml b/validator/service/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 license = "GPL-3.0"
 
 [[bin]]
-name = "mc-validator-service"
+name = "validator-service"
 path = "src/bin/main.rs"
 
 [dependencies]