From b021ed0df4c55aeb19afe91ae03e066a4e0a860d Mon Sep 17 00:00:00 2001 From: Artem P Date: Sun, 27 Mar 2022 20:04:08 +0300 Subject: [PATCH 1/3] change browser executable file path --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f728abd42ee0..d79055c02e6c 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "access": "public" }, "browser": { - "./lib/index.cjs.js": "./lib/index.browser.esm.js", + "./lib/index.cjs.js": "./lib/index.cjs.js", "./lib/index.esm.js": "./lib/index.browser.esm.js" }, "main": "lib/index.cjs.js", From 876a1d5d41c09cad088d4b52be52e00055f48d92 Mon Sep 17 00:00:00 2001 From: Artem P Date: Sun, 27 Mar 2022 20:11:16 +0300 Subject: [PATCH 2/3] account subscribe expect jsonParsed type instead base64 --- src/connection.ts | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/connection.ts b/src/connection.ts index 2909e0003fd4..46754b8dc3e8 100644 --- a/src/connection.ts +++ b/src/connection.ts @@ -1001,11 +1001,24 @@ const GetLargestAccountsRpcResult = jsonRpcResultAndContext( /** * @internal */ + +const ParsedOrRawAccountData = coerce( + union([instance(Buffer), ParsedAccountDataResult]), + union([RawAccountDataResult, ParsedAccountDataResult]), + value => { + if (Array.isArray(value)) { + return create(value, BufferFromRawAccountData); + } else { + return value; + } + }, +); + const AccountInfoResult = pick({ executable: boolean(), owner: PublicKeyFromString, lamports: number(), - data: BufferFromRawAccountData, + data: ParsedOrRawAccountData, rentEpoch: number(), }); @@ -1017,18 +1030,6 @@ const KeyedAccountInfoResult = pick({ account: AccountInfoResult, }); -const ParsedOrRawAccountData = coerce( - union([instance(Buffer), ParsedAccountDataResult]), - union([RawAccountDataResult, ParsedAccountDataResult]), - value => { - if (Array.isArray(value)) { - return create(value, BufferFromRawAccountData); - } else { - return value; - } - }, -); - /** * @internal */ @@ -3788,7 +3789,7 @@ export class Connection { this._subscribe( sub, 'accountSubscribe', - this._buildArgs([sub.publicKey], sub.commitment, 'base64'), + this._buildArgs([sub.publicKey], sub.commitment, 'jsonParsed'), ); } From e2fbdd0490be96ee42005434ce42e747b4d85f6f Mon Sep 17 00:00:00 2001 From: Artem P Date: Tue, 29 Mar 2022 12:09:15 +0300 Subject: [PATCH 3/3] AccountNotificationResult expecting ParsedAccountInfoResult data type --- src/connection.ts | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/connection.ts b/src/connection.ts index 46754b8dc3e8..7e1c37690f7c 100644 --- a/src/connection.ts +++ b/src/connection.ts @@ -1001,24 +1001,11 @@ const GetLargestAccountsRpcResult = jsonRpcResultAndContext( /** * @internal */ - -const ParsedOrRawAccountData = coerce( - union([instance(Buffer), ParsedAccountDataResult]), - union([RawAccountDataResult, ParsedAccountDataResult]), - value => { - if (Array.isArray(value)) { - return create(value, BufferFromRawAccountData); - } else { - return value; - } - }, -); - const AccountInfoResult = pick({ executable: boolean(), owner: PublicKeyFromString, lamports: number(), - data: ParsedOrRawAccountData, + data: BufferFromRawAccountData, rentEpoch: number(), }); @@ -1030,6 +1017,18 @@ const KeyedAccountInfoResult = pick({ account: AccountInfoResult, }); +const ParsedOrRawAccountData = coerce( + union([instance(Buffer), ParsedAccountDataResult]), + union([RawAccountDataResult, ParsedAccountDataResult]), + value => { + if (Array.isArray(value)) { + return create(value, BufferFromRawAccountData); + } else { + return value; + } + }, +); + /** * @internal */ @@ -1096,7 +1095,7 @@ const GetSignaturesForAddressRpcResult = jsonRpcResult( */ const AccountNotificationResult = pick({ subscription: number(), - result: notificationResultAndContext(AccountInfoResult), + result: notificationResultAndContext(ParsedAccountInfoResult), }); /**