Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions packages/rpc-api/src/__tests__/send-transaction-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,8 @@ describe('sendTransaction', () => {
await expect(resultPromise).rejects.toThrow(
new SolanaError(SOLANA_ERROR__JSON_RPC__INVALID_PARAMS, {
__serverMessage:
'failed to deserialize solana_sdk::transaction::versioned::' +
'VersionedTransaction: invalid value: integer `126`, expected a valid ' +
'transaction message version',
'failed to deserialize solana_transaction::versioned::VersionedTransaction: ' +
'invalid value: integer `126`, expected a valid transaction message version',
}),
);
});
Expand All @@ -211,8 +210,8 @@ describe('sendTransaction', () => {
await expect(resultPromise).rejects.toThrow(
new SolanaError(SOLANA_ERROR__JSON_RPC__INVALID_PARAMS, {
__serverMessage:
'failed to deserialize solana_sdk::transaction::versioned::' +
'VersionedTransaction: io error: failed to fill whole buffer',
'failed to deserialize solana_transaction::versioned::VersionedTransaction: ' +
'io error: failed to fill whole buffer',
}),
);
});
Expand Down
9 changes: 4 additions & 5 deletions packages/rpc-api/src/__tests__/simulate-transaction-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -403,9 +403,8 @@ describe('simulateTransaction', () => {
await expect(resultPromise).rejects.toThrow(
new SolanaError(SOLANA_ERROR__JSON_RPC__INVALID_PARAMS, {
__serverMessage:
'failed to deserialize solana_sdk::transaction::versioned::' +
'VersionedTransaction: invalid value: integer `126`, expected a valid ' +
'transaction message version',
'failed to deserialize solana_transaction::versioned::VersionedTransaction: ' +
'invalid value: integer `126`, expected a valid transaction message version',
}),
);
});
Expand All @@ -430,8 +429,8 @@ describe('simulateTransaction', () => {
await expect(resultPromise).rejects.toThrow(
new SolanaError(SOLANA_ERROR__JSON_RPC__INVALID_PARAMS, {
__serverMessage:
'failed to deserialize solana_sdk::transaction::versioned::' +
'VersionedTransaction: io error: failed to fill whole buffer',
'failed to deserialize solana_transaction::versioned::VersionedTransaction: ' +
'io error: failed to fill whole buffer',
}),
);
});
Expand Down
6 changes: 4 additions & 2 deletions packages/rpc-graphql/src/__tests__/account-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1778,7 +1778,8 @@ describe('account', () => {
},
});
});
it('token-group', async () => {
// FIXME(https://github.com/anza-xyz/kit/issues/556)
it.failing('token-group', async () => {
expect.assertions(1);
const source = /* GraphQL */ `
query testQuery($address: Address!) {
Expand Down Expand Up @@ -1822,7 +1823,8 @@ describe('account', () => {
},
});
});
it('token-group-member', async () => {
// FIXME(https://github.com/anza-xyz/kit/issues/556)
it.failing('token-group-member', async () => {
expect.assertions(1);
const source = /* GraphQL */ `
query testQuery($address: Address!) {
Expand Down
7 changes: 7 additions & 0 deletions packages/rpc-graphql/src/schema/type-defs/account.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,13 @@ export const accountTypeDefs = /* GraphQL */ `
lockCpi: Boolean
}

"""
Token-2022 Extension: Unparseable
"""
type SplTokenExtensionUnparseable implements SplTokenExtension {
extension: String
}
Comment on lines +218 to +223
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@buffalojoec, I snuck this in here, because the current test fixtures actually produce an unparseable extension as of Agave 2.2.


"""
Token-2022 Extension: ConfidentialTransferAccount
"""
Expand Down
3 changes: 3 additions & 0 deletions packages/rpc-graphql/src/schema/type-resolvers/account.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ function resolveTokenExtensionType(extensionResult: Token2022ExtensionResult) {
if (extensionResult.extension === 'cpiGuard') {
return 'SplTokenExtensionCpiGuard';
}
if (extensionResult.extension === 'unparseableExtension') {
return 'SplTokenExtensionUnparseable';
}
}

export const accountTypeResolvers = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,13 @@ describe('voteNotifications', () => {
rpc = createLocalhostSolanaRpcSubscriptions();
});

it('produces vote notifications', async () => {
expect.assertions(1);
// FIXME: Re-enable once https://github.com/anza-xyz/agave/pull/6645 is live.
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it.failing('produces vote notifications', async () => {
expect.assertions(
// FIXME: Set back to `1` once https://github.com/anza-xyz/agave/pull/6645 is live.
0,
);

const abortController = new AbortController();
try {
const voteNotifications = await rpc.voteNotifications().subscribe({ abortSignal: abortController.signal });
Expand Down
2 changes: 1 addition & 1 deletion scripts/get-latest-validator-release-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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("v2.0."))).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.2."))).then(x => console.log(x[0].tag_name)));'
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the change.

)
if [ -z $version ]; then
exit 3
Expand Down