Test validator installer now sources from version 2.0.x line

.changeset/wicked-bikes-pay.md

@@ -0,0 +1,11 @@
+---
+'@solana/sysvars': minor
+---
+
+Removed the fees sysvar which has been disabled on the network for a year, and has now been removed from the test validator in Agave 2.0
+
+```
+% solana feature status JAN1trEUEtZjgXYzNBYHU9DYd7GnThhXfFP7SzPXkPsG
+Feature                                      | Status                  | Activation Slot | Description
+JAN1trEUEtZjgXYzNBYHU9DYd7GnThhXfFP7SzPXkPsG | active since epoch 483  | 208656004       | disable fees sysvar
+```

packages/rpc-api/src/__tests__/get-program-accounts-test.ts

@@ -2063,7 +2063,7 @@ describe('getProgramAccounts', () => {
                                     data: {
                                         parsed: {
                                             info: expect.any(Object),
-                                            type: 'fees',
+                                            type: 'lastRestartSlot',
                                         },
                                         program: 'sysvar',
                                         space: 8n,
@@ -2074,7 +2074,7 @@ describe('getProgramAccounts', () => {
                                     rentEpoch: expect.any(BigInt),
                                     space: 8n,
                                 },
-                                pubkey: 'SysvarFees111111111111111111111111111111111',
+                                pubkey: 'SysvarLastRestartS1ot1111111111111111111111',
                             },
                             {
                                 account: {

packages/rpc-api/src/__tests__/simulate-transaction-test.ts

@@ -174,6 +174,7 @@ describe('simulateTransaction', () => {
                         err: null,
                         innerInstructions: null,
                         logs: expect.any(Array),
+                        replacementBlockhash: null,
                         returnData: null,
                         unitsConsumed: expect.any(BigInt),
                     },
@@ -284,6 +285,7 @@ describe('simulateTransaction', () => {
                 err: null,
                 innerInstructions: null,
                 logs: expect.any(Array),
+                replacementBlockhash: null,
                 returnData: null,
                 unitsConsumed: expect.any(BigInt),
             },
@@ -323,6 +325,7 @@ describe('simulateTransaction', () => {
                 err: 'BlockhashNotFound',
                 innerInstructions: null,
                 logs: expect.any(Array),
+                replacementBlockhash: null,
                 returnData: null,
                 unitsConsumed: expect.any(BigInt),
             },
@@ -362,6 +365,10 @@ describe('simulateTransaction', () => {
                 err: null,
                 innerInstructions: null,
                 logs: expect.any(Array),
+                replacementBlockhash: {
+                    blockhash: expect.any(String),
+                    lastValidBlockHeight: expect.any(BigInt),
+                },
                 returnData: null,
                 unitsConsumed: expect.any(BigInt),
             },
@@ -464,6 +471,7 @@ describe('simulateTransaction', () => {
                 err: 'AccountNotFound',
                 innerInstructions: null,
                 logs: expect.any(Array),
+                replacementBlockhash: null,
                 returnData: null,
                 unitsConsumed: expect.any(BigInt),
             },
@@ -513,6 +521,7 @@ describe('simulateTransaction', () => {
                 err: null,
                 innerInstructions: null,
                 logs: expect.any(Array),
+                replacementBlockhash: null,
                 returnData: null,
                 unitsConsumed: expect.any(BigInt),
             },
@@ -562,6 +571,7 @@ describe('simulateTransaction', () => {
                 err: null,
                 innerInstructions: null,
                 logs: expect.any(Array),
+                replacementBlockhash: null,
                 returnData: null,
                 unitsConsumed: expect.any(BigInt),
             },
@@ -628,6 +638,7 @@ describe('simulateTransaction', () => {
                 err: null,
                 innerInstructions: null,
                 logs: expect.any(Array),
+                replacementBlockhash: null,
                 returnData: null,
                 unitsConsumed: expect.any(BigInt),
             },
@@ -678,6 +689,7 @@ describe('simulateTransaction', () => {
                 err: null,
                 innerInstructions: null,
                 logs: expect.any(Array),
+                replacementBlockhash: null,
                 returnData: null,
                 unitsConsumed: expect.any(BigInt),
             },
@@ -727,6 +739,7 @@ describe('simulateTransaction', () => {
                 innerInstructions: null,
 
                 logs: expect.any(Array),
+                replacementBlockhash: null,
                 returnData: null,
                 unitsConsumed: expect.any(BigInt),
             },
@@ -781,6 +794,7 @@ describe('simulateTransaction', () => {
                 err: null,
                 innerInstructions: null,
                 logs: expect.any(Array),
+                replacementBlockhash: null,
                 returnData: null,
                 unitsConsumed: expect.any(BigInt),
             },
@@ -821,6 +835,7 @@ describe('simulateTransaction', () => {
                 err: null,
                 innerInstructions: null,
                 logs: expect.any(Array),
+                replacementBlockhash: null,
                 returnData: null,
                 unitsConsumed: expect.any(BigInt),
             },

packages/rpc-graphql/src/__tests__/account-test.ts

@@ -994,47 +994,6 @@ describe('account', () => {
                     },
                 });
             });
-            it('can get the fees sysvar', async () => {
-                expect.assertions(1);
-                const variableValues = {
-                    address: 'SysvarFees111111111111111111111111111111111',
-                };
-                const source = /* GraphQL */ `
-                    query testQuery($address: Address!) {
-                        account(address: $address) {
-                            address
-                            lamports
-                            ownerProgram {
-                                address
-                            }
-                            rentEpoch
-                            space
-                            ... on SysvarFeesAccount {
-                                feeCalculator {
-                                    lamportsPerSignature
-                                }
-                            }
-                        }
-                    }
-                `;
-                const result = await rpcGraphQL.query(source, variableValues);
-                expect(result).toMatchObject({
-                    data: {
-                        account: {
-                            address: 'SysvarFees111111111111111111111111111111111',
-                            feeCalculator: {
-                                lamportsPerSignature: expect.any(BigInt),
-                            },
-                            lamports: expect.any(BigInt),
-                            ownerProgram: {
-                                address: 'Sysvar1111111111111111111111111111111111111',
-                            },
-                            rentEpoch: expect.any(BigInt),
-                            space: expect.any(BigInt),
-                        },
-                    },
-                });
-            });
             it('can get the last restart slot sysvar', async () => {
                 expect.assertions(1);
                 const variableValues = {

packages/rpc-graphql/src/schema/type-defs/account.ts

@@ -470,20 +470,6 @@ export const accountTypeDefs = /* GraphQL */ `
         lamportsPerSignature: Lamports
     }
 
-    """
-    Sysvar Fees
-    """
-    type SysvarFeesAccount implements Account {
-        address: Address
-        data(encoding: AccountEncoding!, dataSlice: DataSlice): String
-        executable: Boolean
-        lamports: Lamports
-        ownerProgram: Account
-        space: BigInt
-        rentEpoch: Epoch
-        feeCalculator: FeeCalculator
-    }
-
     """
     Sysvar Last Restart Slot
     """

packages/rpc-graphql/src/schema/type-resolvers/account.ts

@@ -147,9 +147,6 @@ export const accountTypeResolvers = {
                     if (jsonParsedConfigs.accountType === 'epochSchedule') {
                         return 'SysvarEpochScheduleAccount';
                     }
-                    if (jsonParsedConfigs.accountType === 'fees') {
-                        return 'SysvarFeesAccount';
-                    }
                     if (jsonParsedConfigs.accountType === 'lastRestartSlot') {
                         return 'SysvarLastRestartSlotAccount';
                     }
@@ -271,10 +268,6 @@ export const accountTypeResolvers = {
         data: resolveAccountData(),
         ownerProgram: resolveAccount('ownerProgram'),
     },
-    SysvarFeesAccount: {
-        data: resolveAccountData(),
-        ownerProgram: resolveAccount('ownerProgram'),
-    },
     SysvarLastRestartSlotAccount: {
         data: resolveAccountData(),
         ownerProgram: resolveAccount('ownerProgram'),

packages/sysvars/src/__tests__/sysvar-test.ts

@@ -6,7 +6,6 @@ import {
     fetchJsonParsedSysvarAccount,
     SYSVAR_CLOCK_ADDRESS,
     SYSVAR_EPOCH_SCHEDULE_ADDRESS,
-    SYSVAR_FEES_ADDRESS,
     SYSVAR_LAST_RESTART_SLOT_ADDRESS,
     SYSVAR_RECENT_BLOCKHASHES_ADDRESS,
     SYSVAR_RENT_ADDRESS,
@@ -77,22 +76,6 @@ describe('sysvar account', () => {
             });
         });
     });
-    describe('fees', () => {
-        it('fetch encoded', async () => {
-            expect.assertions(3);
-            await assertValidEncodedSysvarAccount(SYSVAR_FEES_ADDRESS);
-        });
-        it('fetch JSON-parsed', async () => {
-            expect.assertions(3);
-            await assertValidJsonParsedSysvarAccount(SYSVAR_FEES_ADDRESS, {
-                data: {
-                    feeCalculator: {
-                        lamportsPerSignature: expect.any(String), // JsonParsed converts to string
-                    },
-                },
-            });
-        });
-    });
     // `Instructions` does not exist on-chain.
     describe('last restart slot', () => {
         it('fetch encoded', async () => {

packages/sysvars/src/__typetests__/sysvar-typetest.ts

@@ -6,7 +6,6 @@ import type { JsonParsedSysvarAccount } from '@solana/rpc-parsed-types';
 import { fetchSysvarClock, type SysvarClock } from '../clock';
 import { fetchSysvarEpochRewards, type SysvarEpochRewards } from '../epoch-rewards';
 import { fetchSysvarEpochSchedule, type SysvarEpochSchedule } from '../epoch-schedule';
-import { fetchSysvarFees, type SysvarFees } from '../fees';
 import { fetchSysvarLastRestartSlot, type SysvarLastRestartSlot } from '../last-restart-slot';
 import { fetchSysvarRecentBlockhashes, type SysvarRecentBlockhashes } from '../recent-blockhashes';
 import { fetchSysvarRent, type SysvarRent } from '../rent';
@@ -79,14 +78,6 @@ const rpc = null as unknown as Parameters<typeof fetchEncodedSysvarAccount>[0];
     fetchSysvarEpochSchedule(rpc) satisfies Promise<{ foo: string }>;
 }
 
-// `fetchSysvarFees`
-{
-    // Returns a `SysvarFees`.
-    fetchSysvarFees(rpc) satisfies Promise<SysvarFees>;
-    // @ts-expect-error Returns a `SysvarFees`.
-    fetchSysvarFees(rpc) satisfies Promise<{ foo: string }>;
-}
-
 // `fetchSysvarLastRestartSlot`
 {
     // Returns a `SysvarLastRestartSlot`.

packages/sysvars/src/index.ts

@@ -1,7 +1,6 @@
 export * from './clock';
 export * from './epoch-rewards';
 export * from './epoch-schedule';
-export * from './fees';
 export * from './last-restart-slot';
 export * from './recent-blockhashes';
 export * from './rent';

packages/sysvars/src/sysvar.ts

@@ -16,8 +16,6 @@ export const SYSVAR_EPOCH_REWARDS_ADDRESS =
     'SysvarEpochRewards1111111111111111111111111' as Address<'SysvarEpochRewards1111111111111111111111111'>;
 export const SYSVAR_EPOCH_SCHEDULE_ADDRESS =
     'SysvarEpochSchedu1e111111111111111111111111' as Address<'SysvarEpochSchedu1e111111111111111111111111'>;
-export const SYSVAR_FEES_ADDRESS =
-    'SysvarFees111111111111111111111111111111111' as Address<'SysvarFees111111111111111111111111111111111'>;
 export const SYSVAR_INSTRUCTIONS_ADDRESS =
     'Sysvar1nstructions1111111111111111111111111' as Address<'Sysvar1nstructions1111111111111111111111111'>;
 export const SYSVAR_LAST_RESTART_SLOT_ADDRESS =
@@ -37,7 +35,6 @@ type SysvarAddress =
     | typeof SYSVAR_CLOCK_ADDRESS
     | typeof SYSVAR_EPOCH_REWARDS_ADDRESS
     | typeof SYSVAR_EPOCH_SCHEDULE_ADDRESS
-    | typeof SYSVAR_FEES_ADDRESS
     | typeof SYSVAR_INSTRUCTIONS_ADDRESS
     | typeof SYSVAR_LAST_RESTART_SLOT_ADDRESS
     | typeof SYSVAR_RECENT_BLOCKHASHES_ADDRESS

scripts/get-latest-validator-release-version.sh

@@ -2,7 +2,7 @@
 (
     set -e
     version=$(node -e \
-      'fetch("https://api.github.com/repos/anza-xyz/agave/releases").then(res => res.json().then(rs => rs.filter(r => !r.prerelease && r.tag_name.startsWith("v1.18."))).then(x => console.log(x[0].tag_name)));'
+      'fetch("https://api.github.com/repos/anza-xyz/agave/releases").then(res => res.json().then(rs => rs.filter(r => !r.prerelease && r.tag_name.startsWith("v2.0."))).then(x => console.log(x[0].tag_name)));'
     )
     if [ -z $version ]; then
       exit 3