diff --git a/scripts/fixtures/sysvar-fees.json b/scripts/fixtures/sysvar-fees.json new file mode 100644 index 000000000000..60f2c7241c22 --- /dev/null +++ b/scripts/fixtures/sysvar-fees.json @@ -0,0 +1,11 @@ +{ + "pubkey": "SysvarFees111111111111111111111111111111111", + "account": { + "lamports": 10000000000, + "data": ["ECcAAAAAAAA=", "base64"], + "owner": "Sysvar1111111111111111111111111111111111111", + "executable": false, + "rentEpoch": 0, + "space": 8 + } +} diff --git a/scripts/start-shared-test-validator.sh b/scripts/start-shared-test-validator.sh index 2e29930b499e..3c6ba4ffbe09 100755 --- a/scripts/start-shared-test-validator.sh +++ b/scripts/start-shared-test-validator.sh @@ -11,6 +11,8 @@ TEST_VALIDATOR=$( cd "$(dirname "${BASH_SOURCE[0]}")/.." ; pwd -P )/.agave/activ TEST_VALIDATOR_LEDGER="$( cd "$(dirname "${BASH_SOURCE[0]}")/.." ; pwd -P )/test-ledger" FIXTURE_ACCOUNTS_DIR="$( cd "$(dirname "${BASH_SOURCE[0]}")/fixtures" ; pwd -P)" +DEACTIVATE_FEES_SYSVAR_FEATURE_ID="JAN1trEUEtZjgXYzNBYHU9DYd7GnThhXfFP7SzPXkPsG" + if [ ! -x "$TEST_VALIDATOR" ]; then echo "ERROR: No test validator is installed. Install one using the following command: pnpm test:live-with-test-validator:setup" >&2 exit 1 @@ -24,7 +26,7 @@ mkdir -p $LOCK_DIR flock -s 200 || exit 1 ( if flock -nx 200; then - $TEST_VALIDATOR --ledger $TEST_VALIDATOR_LEDGER --reset --quiet --account-dir $FIXTURE_ACCOUNTS_DIR --rpc-pubsub-enable-vote-subscription --rpc-pubsub-enable-block-subscription >/dev/null & + $TEST_VALIDATOR --ledger $TEST_VALIDATOR_LEDGER --reset --quiet --account-dir $FIXTURE_ACCOUNTS_DIR --deactivate-feature $DEACTIVATE_FEES_SYSVAR_FEATURE_ID --rpc-pubsub-enable-vote-subscription --rpc-pubsub-enable-block-subscription >/dev/null & validator_pid=$! echo "Started test validator (PID $validator_pid)" wait