Add FeeCalculator to the genesis block (#4196)

multinode-demo/fullnode.sh

@@ -154,7 +154,7 @@ default_fullnode_arg() {
 
 extra_fullnode_args=()
 bootstrap_leader=false
-stake=43 # number of lamports to assign as stake (plus transaction fee to setup the stake)
+stake=42 # number of lamports to assign as stake
 poll_for_new_genesis_block=0
 label=
 

multinode-demo/setup.sh

@@ -4,46 +4,6 @@ here=$(dirname "$0")
 # shellcheck source=multinode-demo/common.sh
 source "$here"/common.sh
 
-lamports=100000000000000
-bootstrap_leader_lamports=
-
-usage () {
-  exitcode=0
-  if [[ -n "$1" ]]; then
-    exitcode=1
-    echo "Error: $*"
-  fi
-  cat <<EOF
-usage: $0 [-n lamports] [-b lamports]
-
-Create a cluster configuration
-
- -n lamports    - Number of lamports to create [default: $lamports]
- -b lamports    - Override the number of lamports for the bootstrap leader's stake
-
-EOF
-  exit $exitcode
-}
-
-while getopts "h?n:b:" opt; do
-  case $opt in
-  h|\?)
-    usage
-    exit 0
-    ;;
-  n)
-    lamports="$OPTARG"
-    ;;
-  b)
-    bootstrap_leader_lamports="$OPTARG"
-    ;;
-  *)
-    usage "Error: unhandled option: $opt"
-    ;;
-  esac
-done
-
-
 set -e
 "$here"/clear-fullnode-config.sh
 
@@ -52,17 +12,32 @@ $solana_keygen -o "$SOLANA_CONFIG_DIR"/mint-id.json
 $solana_keygen -o "$SOLANA_CONFIG_DIR"/bootstrap-leader-id.json
 $solana_keygen -o "$SOLANA_CONFIG_DIR"/bootstrap-leader-vote-id.json
 
-args=(
-  --bootstrap-leader-keypair "$SOLANA_CONFIG_DIR"/bootstrap-leader-id.json
-  --bootstrap-vote-keypair "$SOLANA_CONFIG_DIR"/bootstrap-leader-vote-id.json
-  --ledger "$SOLANA_RSYNC_CONFIG_DIR"/ledger
-  --mint "$SOLANA_CONFIG_DIR"/mint-id.json
-  --lamports "$lamports"
-)
 
-if [[ -n $bootstrap_leader_lamports ]]; then
-  args+=(--bootstrap-leader-lamports "$bootstrap_leader_lamports")
-fi
+default_arg() {
+  declare name=$1
+  declare value=$2
+
+  for arg in "${args[@]}"; do
+    if [[ $arg = "$name" ]]; then
+      return
+    fi
+  done
+
+  if [[ -n $value ]]; then
+    args+=("$name" "$value")
+  else
+    args+=("$name")
+  fi
+}
+
+args=("$@")
+default_arg --bootstrap-leader-keypair "$SOLANA_CONFIG_DIR"/bootstrap-leader-id.json
+default_arg --bootstrap-vote-keypair "$SOLANA_CONFIG_DIR"/bootstrap-leader-vote-id.json
+default_arg --ledger "$SOLANA_RSYNC_CONFIG_DIR"/ledger
+default_arg --mint "$SOLANA_CONFIG_DIR"/mint-id.json
+default_arg --lamports 100000000000000
 
 $solana_genesis "${args[@]}"
+
+test -d "$SOLANA_RSYNC_CONFIG_DIR"/ledger
 cp -a "$SOLANA_RSYNC_CONFIG_DIR"/ledger "$SOLANA_CONFIG_DIR"/bootstrap-leader-ledger