Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(experimental): add getTokenAccountsByDelegate method #1524

Merged
merged 1 commit into from
Aug 15, 2023
Merged

refactor(experimental): add getTokenAccountsByDelegate method #1524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 31 additions & 0 deletions packages/rpc-core/src/__tests__/stringified-number-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { assertIsStringifiedNumber } from '../stringified-number';

describe('assertIsStringifiedNumber()', () => {
it("throws when supplied a string that can't parse as a number", () => {
expect(() => {
assertIsStringifiedNumber('abc');
}).toThrow();
expect(() => {
assertIsStringifiedNumber('123a');
}).toThrow();
});
it('does not throw when supplied a string that parses as a float', () => {
expect(() => {
assertIsStringifiedNumber('123.0');
}).not.toThrow();
expect(() => {
assertIsStringifiedNumber('123.5');
}).not.toThrow();
});
it('does not throw when supplied a string that parses as an integer', () => {
expect(() => {
assertIsStringifiedNumber('-123');
}).not.toThrow();
expect(() => {
assertIsStringifiedNumber('0');
}).not.toThrow();
expect(() => {
assertIsStringifiedNumber('123');
}).not.toThrow();
});
});
67 changes: 67 additions & 0 deletions packages/rpc-core/src/response-patcher-allowed-numeric-values.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ export const ALLOWED_NUMERIC_KEYPATHS: Partial<
['value', 'data', 'parsed', 'info', 'tokenAmount', 'decimals'],
['value', 'data', 'parsed', 'info', 'tokenAmount', 'uiAmount'],
['value', 'data', 'parsed', 'info', 'rentExemptReserve', 'decimals'],
['value', 'data', 'parsed', 'info', 'rentExemptReserve', 'uiAmount'],
['value', 'data', 'parsed', 'info', 'delegatedAmount', 'decimals'],
['value', 'data', 'parsed', 'info', 'delegatedAmount', 'uiAmount'],
[
'value',
'data',
Expand Down Expand Up @@ -76,7 +78,9 @@ export const ALLOWED_NUMERIC_KEYPATHS: Partial<
['value', KEYPATH_WILDCARD, 'data', 'parsed', 'info', 'tokenAmount', 'decimals'],
['value', KEYPATH_WILDCARD, 'data', 'parsed', 'info', 'tokenAmount', 'uiAmount'],
['value', KEYPATH_WILDCARD, 'data', 'parsed', 'info', 'rentExemptReserve', 'decimals'],
['value', KEYPATH_WILDCARD, 'data', 'parsed', 'info', 'rentExemptReserve', 'uiAmount'],
['value', KEYPATH_WILDCARD, 'data', 'parsed', 'info', 'delegatedAmount', 'decimals'],
['value', KEYPATH_WILDCARD, 'data', 'parsed', 'info', 'delegatedAmount', 'uiAmount'],
[
'value',
KEYPATH_WILDCARD,
Expand Down Expand Up @@ -143,8 +147,12 @@ export const ALLOWED_NUMERIC_KEYPATHS: Partial<
['value', KEYPATH_WILDCARD, 'account', 'data', 'parsed', 'info', 'tokenAmount', 'uiAmount'],
[KEYPATH_WILDCARD, 'account', 'data', 'parsed', 'info', 'rentExemptReserve', 'decimals'],
['value', KEYPATH_WILDCARD, 'account', 'data', 'parsed', 'info', 'rentExemptReserve', 'decimals'],
[KEYPATH_WILDCARD, 'account', 'data', 'parsed', 'info', 'rentExemptReserve', 'uiAmount'],
['value', KEYPATH_WILDCARD, 'account', 'data', 'parsed', 'info', 'rentExemptReserve', 'uiAmount'],
[KEYPATH_WILDCARD, 'account', 'data', 'parsed', 'info', 'delegatedAmount', 'decimals'],
['value', KEYPATH_WILDCARD, 'account', 'data', 'parsed', 'info', 'delegatedAmount', 'decimals'],
[KEYPATH_WILDCARD, 'account', 'data', 'parsed', 'info', 'delegatedAmount', 'uiAmount'],
['value', KEYPATH_WILDCARD, 'account', 'data', 'parsed', 'info', 'delegatedAmount', 'uiAmount'],
[
KEYPATH_WILDCARD,
'account',
Expand Down Expand Up @@ -268,6 +276,65 @@ export const ALLOWED_NUMERIC_KEYPATHS: Partial<
['value', 'decimals'],
['value', 'uiAmount'],
],
getTokenAccountsByDelegate: [
// parsed Token/Token22 token account
['value', KEYPATH_WILDCARD, 'account', 'data', 'parsed', 'info', 'tokenAmount', 'decimals'],
['value', KEYPATH_WILDCARD, 'account', 'data', 'parsed', 'info', 'tokenAmount', 'uiAmount'],
['value', KEYPATH_WILDCARD, 'account', 'data', 'parsed', 'info', 'rentExemptReserve', 'decimals'],
['value', KEYPATH_WILDCARD, 'account', 'data', 'parsed', 'info', 'rentExemptReserve', 'uiAmount'],
['value', KEYPATH_WILDCARD, 'account', 'data', 'parsed', 'info', 'delegatedAmount', 'decimals'],
['value', KEYPATH_WILDCARD, 'account', 'data', 'parsed', 'info', 'delegatedAmount', 'uiAmount'],
[
'value',
KEYPATH_WILDCARD,
'account',
'data',
'parsed',
'info',
'extensions',
KEYPATH_WILDCARD,
'state',
'olderTransferFee',
'transferFeeBasisPoints',
],
[
'value',
KEYPATH_WILDCARD,
'account',
'data',
'parsed',
'info',
'extensions',
KEYPATH_WILDCARD,
'state',
'newerTransferFee',
'transferFeeBasisPoints',
],
[
'value',
KEYPATH_WILDCARD,
'account',
'data',
'parsed',
'info',
'extensions',
KEYPATH_WILDCARD,
'state',
'preUpdateAverageRate',
],
[
'value',
KEYPATH_WILDCARD,
'account',
'data',
'parsed',
'info',
'extensions',
KEYPATH_WILDCARD,
'state',
'currentRate',
],
],
getTokenLargestAccounts: [
['value', KEYPATH_WILDCARD, 'decimals'],
['value', KEYPATH_WILDCARD, 'uiAmount'],
Expand Down
8 changes: 4 additions & 4 deletions packages/rpc-core/src/rpc-methods/__tests__/get-genesis-hash-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ const genesisHashPattern = /genesis hash: ([\d\w]{32,})/;
async function getGenesisHashFromLogFile() {
return new Promise<string | undefined>((resolve, reject) => {
const logFileStream = fs.createReadStream(logFilePath, { end: 64 * 1024 });
logFileStream.on('error', e => reject(e))
logFileStream.on('error', e => reject(e));

logFileStream.on('data', data => {
const chunk = data.toString('utf-8');
const expectedGenesisHash = chunk.match(genesisHashPattern)?.[1];
if (expectedGenesisHash) {
logFileStream.destroy();
resolve(expectedGenesisHash)
resolve(expectedGenesisHash);
}
})
});

logFileStream.on('end', () => resolve(undefined));
})
});
}

describe('getGenesisHash', () => {
Expand Down
Loading