Skip to content

Commit 15da01d

Browse files
authored
CI with v2.2 of Agave (#551)
1 parent 591344f commit 15da01d

File tree

7 files changed

+30
-15
lines changed

7 files changed

+30
-15
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,8 @@ describe('sendTransaction', () => {
185185
await expect(resultPromise).rejects.toThrow(
186186
new SolanaError(SOLANA_ERROR__JSON_RPC__INVALID_PARAMS, {
187187
__serverMessage:
188-
'failed to deserialize solana_sdk::transaction::versioned::' +
189-
'VersionedTransaction: invalid value: integer `126`, expected a valid ' +
190-
'transaction message version',
188+
'failed to deserialize solana_transaction::versioned::VersionedTransaction: ' +
189+
'invalid value: integer `126`, expected a valid transaction message version',
191190
}),
192191
);
193192
});
@@ -211,8 +210,8 @@ describe('sendTransaction', () => {
211210
await expect(resultPromise).rejects.toThrow(
212211
new SolanaError(SOLANA_ERROR__JSON_RPC__INVALID_PARAMS, {
213212
__serverMessage:
214-
'failed to deserialize solana_sdk::transaction::versioned::' +
215-
'VersionedTransaction: io error: failed to fill whole buffer',
213+
'failed to deserialize solana_transaction::versioned::VersionedTransaction: ' +
214+
'io error: failed to fill whole buffer',
216215
}),
217216
);
218217
});

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -403,9 +403,8 @@ describe('simulateTransaction', () => {
403403
await expect(resultPromise).rejects.toThrow(
404404
new SolanaError(SOLANA_ERROR__JSON_RPC__INVALID_PARAMS, {
405405
__serverMessage:
406-
'failed to deserialize solana_sdk::transaction::versioned::' +
407-
'VersionedTransaction: invalid value: integer `126`, expected a valid ' +
408-
'transaction message version',
406+
'failed to deserialize solana_transaction::versioned::VersionedTransaction: ' +
407+
'invalid value: integer `126`, expected a valid transaction message version',
409408
}),
410409
);
411410
});
@@ -430,8 +429,8 @@ describe('simulateTransaction', () => {
430429
await expect(resultPromise).rejects.toThrow(
431430
new SolanaError(SOLANA_ERROR__JSON_RPC__INVALID_PARAMS, {
432431
__serverMessage:
433-
'failed to deserialize solana_sdk::transaction::versioned::' +
434-
'VersionedTransaction: io error: failed to fill whole buffer',
432+
'failed to deserialize solana_transaction::versioned::VersionedTransaction: ' +
433+
'io error: failed to fill whole buffer',
435434
}),
436435
);
437436
});

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1778,7 +1778,8 @@ describe('account', () => {
17781778
},
17791779
});
17801780
});
1781-
it('token-group', async () => {
1781+
// FIXME(https://github.com/anza-xyz/kit/issues/556)
1782+
it.failing('token-group', async () => {
17821783
expect.assertions(1);
17831784
const source = /* GraphQL */ `
17841785
query testQuery($address: Address!) {
@@ -1822,7 +1823,8 @@ describe('account', () => {
18221823
},
18231824
});
18241825
});
1825-
it('token-group-member', async () => {
1826+
// FIXME(https://github.com/anza-xyz/kit/issues/556)
1827+
it.failing('token-group-member', async () => {
18261828
expect.assertions(1);
18271829
const source = /* GraphQL */ `
18281830
query testQuery($address: Address!) {

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,13 @@ export const accountTypeDefs = /* GraphQL */ `
215215
lockCpi: Boolean
216216
}
217217
218+
"""
219+
Token-2022 Extension: Unparseable
220+
"""
221+
type SplTokenExtensionUnparseable implements SplTokenExtension {
222+
extension: String
223+
}
224+
218225
"""
219226
Token-2022 Extension: ConfidentialTransferAccount
220227
"""

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ function resolveTokenExtensionType(extensionResult: Token2022ExtensionResult) {
104104
if (extensionResult.extension === 'cpiGuard') {
105105
return 'SplTokenExtensionCpiGuard';
106106
}
107+
if (extensionResult.extension === 'unparseableExtension') {
108+
return 'SplTokenExtensionUnparseable';
109+
}
107110
}
108111

109112
export const accountTypeResolvers = {

packages/rpc-subscriptions-api/src/__tests__/vote-notifications-test.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,13 @@ describe('voteNotifications', () => {
99
rpc = createLocalhostSolanaRpcSubscriptions();
1010
});
1111

12-
it('produces vote notifications', async () => {
13-
expect.assertions(1);
12+
// FIXME: Re-enable once https://github.com/anza-xyz/agave/pull/6645 is live.
13+
it.failing('produces vote notifications', async () => {
14+
expect.assertions(
15+
// FIXME: Set back to `1` once https://github.com/anza-xyz/agave/pull/6645 is live.
16+
0,
17+
);
18+
1419
const abortController = new AbortController();
1520
try {
1621
const voteNotifications = await rpc.voteNotifications().subscribe({ abortSignal: abortController.signal });

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
(
33
set -e
44
version=$(node -e \
5-
'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)));'
5+
'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)));'
66
)
77
if [ -z $version ]; then
88
exit 3

0 commit comments

Comments
 (0)