From 9d72d77b8bf22dbf01ea41da488ddc01ef9e6396 Mon Sep 17 00:00:00 2001 From: wepsree Date: Thu, 17 Feb 2022 08:37:39 -0800 Subject: [PATCH 1/2] fix: fix ViteAPI.subscribe Remove subscribe_ and Filter from subscribe methodName. No issue was opened for this. --- docs/viteAPI/readme.md | 2 +- src/viteAPI/provider.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/viteAPI/readme.md b/docs/viteAPI/readme.md index e0985d67..4fc59773 100644 --- a/docs/viteAPI/readme.md +++ b/docs/viteAPI/readme.md @@ -251,7 +251,7 @@ Refer to [Vite RPC Subscription](/api/rpc/subscribe_v2) ```javascript // ... -provider.subscribe('createAccountBlockSubscription').then((event) => { +provider.subscribe('subscribe_createAccountBlockSubscription').then((event) => { event.on((result) => { console.log(result); }); diff --git a/src/viteAPI/provider.ts b/src/viteAPI/provider.ts index 6f4b6451..fa2022de 100644 --- a/src/viteAPI/provider.ts +++ b/src/viteAPI/provider.ts @@ -82,7 +82,7 @@ class ProviderClass { } async subscribe(methodName, ...args) { - const subMethodName = this._provider.subscribe ? 'subscribe_subscribe' : `subscribe_${ methodName }Filter`; + const subMethodName = this._provider.subscribe ? 'subscribe_subscribe' : methodName; const params = this._provider.subscribe ? [ methodName, ...args ] : args; let rep; From f11d4103eabd32824577d0ceb45b4269f07634e2 Mon Sep 17 00:00:00 2001 From: allen Date: Mon, 28 Feb 2022 23:17:10 +0800 Subject: [PATCH 2/2] fix: subscription api name --- docs/viteAPI/readme.md | 2 +- src/HTTP/type.ts | 20 ++++++++++---------- src/IPC/type.ts | 20 ++++++++++---------- src/WS/type.ts | 20 ++++++++++---------- src/abi/type.ts | 20 ++++++++++---------- src/accountBlock/type.ts | 20 ++++++++++---------- src/communication/type.ts | 20 ++++++++++---------- src/constant/type.ts | 20 ++++++++++---------- src/error/type.ts | 20 ++++++++++---------- src/keystore/type.ts | 20 ++++++++++---------- src/type.ts | 20 ++++++++++---------- src/utils/type.ts | 20 ++++++++++---------- src/viteAPI/provider.ts | 2 +- src/viteAPI/type.ts | 20 ++++++++++---------- src/vitejs/type.ts | 20 ++++++++++---------- src/wallet/type.ts | 20 ++++++++++---------- 16 files changed, 142 insertions(+), 142 deletions(-) diff --git a/docs/viteAPI/readme.md b/docs/viteAPI/readme.md index 4fc59773..fcdbf574 100644 --- a/docs/viteAPI/readme.md +++ b/docs/viteAPI/readme.md @@ -251,7 +251,7 @@ Refer to [Vite RPC Subscription](/api/rpc/subscribe_v2) ```javascript // ... -provider.subscribe('subscribe_createAccountBlockSubscription').then((event) => { +provider.subscribe('newAccountBlock').then((event) => { event.on((result) => { console.log(result); }); diff --git a/src/HTTP/type.ts b/src/HTTP/type.ts index 08d43734..ab480524 100644 --- a/src/HTTP/type.ts +++ b/src/HTTP/type.ts @@ -220,18 +220,18 @@ export declare type Methods = string | 'net_nodeInfo' | 'net_peers' | 'util_getPoWNonce' | -'subscribe_createSnapshotBlockFilter' | -'subscribe_createAccountBlockFilter' | -'subscribe_createAccountBlockFilterByAddress' | -'subscribe_createUnreceivedBlockFilterByAddress' | -'subscribe_createVmlogFilter' | +'subscribe_newSnapshotBlockFilter' | +'subscribe_newAccountBlockFilter' | +'subscribe_newAccountBlockByAddressFilter' | +'subscribe_newUnreceivedBlockByAddressFilter' | +'subscribe_newVmLogFilter' | 'subscribe_uninstallFilter' | 'subscribe_getChangesByFilterId' | -'subscribe_createSnapshotBlockSubscription' | -'subscribe_createAccountBlockSubscription' | -'subscribe_createAccountBlockSubscriptionByAddress' | -'subscribe_createUnreceivedBlockSubscriptionByAddress' | -'subscribe_createVmlogSubscription'; +'subscribe_newSnapshotBlock' | +'subscribe_newAccountBlock' | +'subscribe_newAccountBlockByAddress' | +'subscribe_newUnreceivedBlockByAddress' | +'subscribe_newVmLog'; export declare interface RPCRequest { type?: string; diff --git a/src/IPC/type.ts b/src/IPC/type.ts index 08d43734..ab480524 100644 --- a/src/IPC/type.ts +++ b/src/IPC/type.ts @@ -220,18 +220,18 @@ export declare type Methods = string | 'net_nodeInfo' | 'net_peers' | 'util_getPoWNonce' | -'subscribe_createSnapshotBlockFilter' | -'subscribe_createAccountBlockFilter' | -'subscribe_createAccountBlockFilterByAddress' | -'subscribe_createUnreceivedBlockFilterByAddress' | -'subscribe_createVmlogFilter' | +'subscribe_newSnapshotBlockFilter' | +'subscribe_newAccountBlockFilter' | +'subscribe_newAccountBlockByAddressFilter' | +'subscribe_newUnreceivedBlockByAddressFilter' | +'subscribe_newVmLogFilter' | 'subscribe_uninstallFilter' | 'subscribe_getChangesByFilterId' | -'subscribe_createSnapshotBlockSubscription' | -'subscribe_createAccountBlockSubscription' | -'subscribe_createAccountBlockSubscriptionByAddress' | -'subscribe_createUnreceivedBlockSubscriptionByAddress' | -'subscribe_createVmlogSubscription'; +'subscribe_newSnapshotBlock' | +'subscribe_newAccountBlock' | +'subscribe_newAccountBlockByAddress' | +'subscribe_newUnreceivedBlockByAddress' | +'subscribe_newVmLog'; export declare interface RPCRequest { type?: string; diff --git a/src/WS/type.ts b/src/WS/type.ts index 08d43734..ab480524 100644 --- a/src/WS/type.ts +++ b/src/WS/type.ts @@ -220,18 +220,18 @@ export declare type Methods = string | 'net_nodeInfo' | 'net_peers' | 'util_getPoWNonce' | -'subscribe_createSnapshotBlockFilter' | -'subscribe_createAccountBlockFilter' | -'subscribe_createAccountBlockFilterByAddress' | -'subscribe_createUnreceivedBlockFilterByAddress' | -'subscribe_createVmlogFilter' | +'subscribe_newSnapshotBlockFilter' | +'subscribe_newAccountBlockFilter' | +'subscribe_newAccountBlockByAddressFilter' | +'subscribe_newUnreceivedBlockByAddressFilter' | +'subscribe_newVmLogFilter' | 'subscribe_uninstallFilter' | 'subscribe_getChangesByFilterId' | -'subscribe_createSnapshotBlockSubscription' | -'subscribe_createAccountBlockSubscription' | -'subscribe_createAccountBlockSubscriptionByAddress' | -'subscribe_createUnreceivedBlockSubscriptionByAddress' | -'subscribe_createVmlogSubscription'; +'subscribe_newSnapshotBlock' | +'subscribe_newAccountBlock' | +'subscribe_newAccountBlockByAddress' | +'subscribe_newUnreceivedBlockByAddress' | +'subscribe_newVmLog'; export declare interface RPCRequest { type?: string; diff --git a/src/abi/type.ts b/src/abi/type.ts index 08d43734..ab480524 100644 --- a/src/abi/type.ts +++ b/src/abi/type.ts @@ -220,18 +220,18 @@ export declare type Methods = string | 'net_nodeInfo' | 'net_peers' | 'util_getPoWNonce' | -'subscribe_createSnapshotBlockFilter' | -'subscribe_createAccountBlockFilter' | -'subscribe_createAccountBlockFilterByAddress' | -'subscribe_createUnreceivedBlockFilterByAddress' | -'subscribe_createVmlogFilter' | +'subscribe_newSnapshotBlockFilter' | +'subscribe_newAccountBlockFilter' | +'subscribe_newAccountBlockByAddressFilter' | +'subscribe_newUnreceivedBlockByAddressFilter' | +'subscribe_newVmLogFilter' | 'subscribe_uninstallFilter' | 'subscribe_getChangesByFilterId' | -'subscribe_createSnapshotBlockSubscription' | -'subscribe_createAccountBlockSubscription' | -'subscribe_createAccountBlockSubscriptionByAddress' | -'subscribe_createUnreceivedBlockSubscriptionByAddress' | -'subscribe_createVmlogSubscription'; +'subscribe_newSnapshotBlock' | +'subscribe_newAccountBlock' | +'subscribe_newAccountBlockByAddress' | +'subscribe_newUnreceivedBlockByAddress' | +'subscribe_newVmLog'; export declare interface RPCRequest { type?: string; diff --git a/src/accountBlock/type.ts b/src/accountBlock/type.ts index 08d43734..ab480524 100644 --- a/src/accountBlock/type.ts +++ b/src/accountBlock/type.ts @@ -220,18 +220,18 @@ export declare type Methods = string | 'net_nodeInfo' | 'net_peers' | 'util_getPoWNonce' | -'subscribe_createSnapshotBlockFilter' | -'subscribe_createAccountBlockFilter' | -'subscribe_createAccountBlockFilterByAddress' | -'subscribe_createUnreceivedBlockFilterByAddress' | -'subscribe_createVmlogFilter' | +'subscribe_newSnapshotBlockFilter' | +'subscribe_newAccountBlockFilter' | +'subscribe_newAccountBlockByAddressFilter' | +'subscribe_newUnreceivedBlockByAddressFilter' | +'subscribe_newVmLogFilter' | 'subscribe_uninstallFilter' | 'subscribe_getChangesByFilterId' | -'subscribe_createSnapshotBlockSubscription' | -'subscribe_createAccountBlockSubscription' | -'subscribe_createAccountBlockSubscriptionByAddress' | -'subscribe_createUnreceivedBlockSubscriptionByAddress' | -'subscribe_createVmlogSubscription'; +'subscribe_newSnapshotBlock' | +'subscribe_newAccountBlock' | +'subscribe_newAccountBlockByAddress' | +'subscribe_newUnreceivedBlockByAddress' | +'subscribe_newVmLog'; export declare interface RPCRequest { type?: string; diff --git a/src/communication/type.ts b/src/communication/type.ts index 08d43734..ab480524 100644 --- a/src/communication/type.ts +++ b/src/communication/type.ts @@ -220,18 +220,18 @@ export declare type Methods = string | 'net_nodeInfo' | 'net_peers' | 'util_getPoWNonce' | -'subscribe_createSnapshotBlockFilter' | -'subscribe_createAccountBlockFilter' | -'subscribe_createAccountBlockFilterByAddress' | -'subscribe_createUnreceivedBlockFilterByAddress' | -'subscribe_createVmlogFilter' | +'subscribe_newSnapshotBlockFilter' | +'subscribe_newAccountBlockFilter' | +'subscribe_newAccountBlockByAddressFilter' | +'subscribe_newUnreceivedBlockByAddressFilter' | +'subscribe_newVmLogFilter' | 'subscribe_uninstallFilter' | 'subscribe_getChangesByFilterId' | -'subscribe_createSnapshotBlockSubscription' | -'subscribe_createAccountBlockSubscription' | -'subscribe_createAccountBlockSubscriptionByAddress' | -'subscribe_createUnreceivedBlockSubscriptionByAddress' | -'subscribe_createVmlogSubscription'; +'subscribe_newSnapshotBlock' | +'subscribe_newAccountBlock' | +'subscribe_newAccountBlockByAddress' | +'subscribe_newUnreceivedBlockByAddress' | +'subscribe_newVmLog'; export declare interface RPCRequest { type?: string; diff --git a/src/constant/type.ts b/src/constant/type.ts index 08d43734..ab480524 100644 --- a/src/constant/type.ts +++ b/src/constant/type.ts @@ -220,18 +220,18 @@ export declare type Methods = string | 'net_nodeInfo' | 'net_peers' | 'util_getPoWNonce' | -'subscribe_createSnapshotBlockFilter' | -'subscribe_createAccountBlockFilter' | -'subscribe_createAccountBlockFilterByAddress' | -'subscribe_createUnreceivedBlockFilterByAddress' | -'subscribe_createVmlogFilter' | +'subscribe_newSnapshotBlockFilter' | +'subscribe_newAccountBlockFilter' | +'subscribe_newAccountBlockByAddressFilter' | +'subscribe_newUnreceivedBlockByAddressFilter' | +'subscribe_newVmLogFilter' | 'subscribe_uninstallFilter' | 'subscribe_getChangesByFilterId' | -'subscribe_createSnapshotBlockSubscription' | -'subscribe_createAccountBlockSubscription' | -'subscribe_createAccountBlockSubscriptionByAddress' | -'subscribe_createUnreceivedBlockSubscriptionByAddress' | -'subscribe_createVmlogSubscription'; +'subscribe_newSnapshotBlock' | +'subscribe_newAccountBlock' | +'subscribe_newAccountBlockByAddress' | +'subscribe_newUnreceivedBlockByAddress' | +'subscribe_newVmLog'; export declare interface RPCRequest { type?: string; diff --git a/src/error/type.ts b/src/error/type.ts index 08d43734..ab480524 100644 --- a/src/error/type.ts +++ b/src/error/type.ts @@ -220,18 +220,18 @@ export declare type Methods = string | 'net_nodeInfo' | 'net_peers' | 'util_getPoWNonce' | -'subscribe_createSnapshotBlockFilter' | -'subscribe_createAccountBlockFilter' | -'subscribe_createAccountBlockFilterByAddress' | -'subscribe_createUnreceivedBlockFilterByAddress' | -'subscribe_createVmlogFilter' | +'subscribe_newSnapshotBlockFilter' | +'subscribe_newAccountBlockFilter' | +'subscribe_newAccountBlockByAddressFilter' | +'subscribe_newUnreceivedBlockByAddressFilter' | +'subscribe_newVmLogFilter' | 'subscribe_uninstallFilter' | 'subscribe_getChangesByFilterId' | -'subscribe_createSnapshotBlockSubscription' | -'subscribe_createAccountBlockSubscription' | -'subscribe_createAccountBlockSubscriptionByAddress' | -'subscribe_createUnreceivedBlockSubscriptionByAddress' | -'subscribe_createVmlogSubscription'; +'subscribe_newSnapshotBlock' | +'subscribe_newAccountBlock' | +'subscribe_newAccountBlockByAddress' | +'subscribe_newUnreceivedBlockByAddress' | +'subscribe_newVmLog'; export declare interface RPCRequest { type?: string; diff --git a/src/keystore/type.ts b/src/keystore/type.ts index 08d43734..ab480524 100644 --- a/src/keystore/type.ts +++ b/src/keystore/type.ts @@ -220,18 +220,18 @@ export declare type Methods = string | 'net_nodeInfo' | 'net_peers' | 'util_getPoWNonce' | -'subscribe_createSnapshotBlockFilter' | -'subscribe_createAccountBlockFilter' | -'subscribe_createAccountBlockFilterByAddress' | -'subscribe_createUnreceivedBlockFilterByAddress' | -'subscribe_createVmlogFilter' | +'subscribe_newSnapshotBlockFilter' | +'subscribe_newAccountBlockFilter' | +'subscribe_newAccountBlockByAddressFilter' | +'subscribe_newUnreceivedBlockByAddressFilter' | +'subscribe_newVmLogFilter' | 'subscribe_uninstallFilter' | 'subscribe_getChangesByFilterId' | -'subscribe_createSnapshotBlockSubscription' | -'subscribe_createAccountBlockSubscription' | -'subscribe_createAccountBlockSubscriptionByAddress' | -'subscribe_createUnreceivedBlockSubscriptionByAddress' | -'subscribe_createVmlogSubscription'; +'subscribe_newSnapshotBlock' | +'subscribe_newAccountBlock' | +'subscribe_newAccountBlockByAddress' | +'subscribe_newUnreceivedBlockByAddress' | +'subscribe_newVmLog'; export declare interface RPCRequest { type?: string; diff --git a/src/type.ts b/src/type.ts index 08d43734..ab480524 100644 --- a/src/type.ts +++ b/src/type.ts @@ -220,18 +220,18 @@ export declare type Methods = string | 'net_nodeInfo' | 'net_peers' | 'util_getPoWNonce' | -'subscribe_createSnapshotBlockFilter' | -'subscribe_createAccountBlockFilter' | -'subscribe_createAccountBlockFilterByAddress' | -'subscribe_createUnreceivedBlockFilterByAddress' | -'subscribe_createVmlogFilter' | +'subscribe_newSnapshotBlockFilter' | +'subscribe_newAccountBlockFilter' | +'subscribe_newAccountBlockByAddressFilter' | +'subscribe_newUnreceivedBlockByAddressFilter' | +'subscribe_newVmLogFilter' | 'subscribe_uninstallFilter' | 'subscribe_getChangesByFilterId' | -'subscribe_createSnapshotBlockSubscription' | -'subscribe_createAccountBlockSubscription' | -'subscribe_createAccountBlockSubscriptionByAddress' | -'subscribe_createUnreceivedBlockSubscriptionByAddress' | -'subscribe_createVmlogSubscription'; +'subscribe_newSnapshotBlock' | +'subscribe_newAccountBlock' | +'subscribe_newAccountBlockByAddress' | +'subscribe_newUnreceivedBlockByAddress' | +'subscribe_newVmLog'; export declare interface RPCRequest { type?: string; diff --git a/src/utils/type.ts b/src/utils/type.ts index 08d43734..ab480524 100644 --- a/src/utils/type.ts +++ b/src/utils/type.ts @@ -220,18 +220,18 @@ export declare type Methods = string | 'net_nodeInfo' | 'net_peers' | 'util_getPoWNonce' | -'subscribe_createSnapshotBlockFilter' | -'subscribe_createAccountBlockFilter' | -'subscribe_createAccountBlockFilterByAddress' | -'subscribe_createUnreceivedBlockFilterByAddress' | -'subscribe_createVmlogFilter' | +'subscribe_newSnapshotBlockFilter' | +'subscribe_newAccountBlockFilter' | +'subscribe_newAccountBlockByAddressFilter' | +'subscribe_newUnreceivedBlockByAddressFilter' | +'subscribe_newVmLogFilter' | 'subscribe_uninstallFilter' | 'subscribe_getChangesByFilterId' | -'subscribe_createSnapshotBlockSubscription' | -'subscribe_createAccountBlockSubscription' | -'subscribe_createAccountBlockSubscriptionByAddress' | -'subscribe_createUnreceivedBlockSubscriptionByAddress' | -'subscribe_createVmlogSubscription'; +'subscribe_newSnapshotBlock' | +'subscribe_newAccountBlock' | +'subscribe_newAccountBlockByAddress' | +'subscribe_newUnreceivedBlockByAddress' | +'subscribe_newVmLog'; export declare interface RPCRequest { type?: string; diff --git a/src/viteAPI/provider.ts b/src/viteAPI/provider.ts index fa2022de..6f4b6451 100644 --- a/src/viteAPI/provider.ts +++ b/src/viteAPI/provider.ts @@ -82,7 +82,7 @@ class ProviderClass { } async subscribe(methodName, ...args) { - const subMethodName = this._provider.subscribe ? 'subscribe_subscribe' : methodName; + const subMethodName = this._provider.subscribe ? 'subscribe_subscribe' : `subscribe_${ methodName }Filter`; const params = this._provider.subscribe ? [ methodName, ...args ] : args; let rep; diff --git a/src/viteAPI/type.ts b/src/viteAPI/type.ts index 08d43734..ab480524 100644 --- a/src/viteAPI/type.ts +++ b/src/viteAPI/type.ts @@ -220,18 +220,18 @@ export declare type Methods = string | 'net_nodeInfo' | 'net_peers' | 'util_getPoWNonce' | -'subscribe_createSnapshotBlockFilter' | -'subscribe_createAccountBlockFilter' | -'subscribe_createAccountBlockFilterByAddress' | -'subscribe_createUnreceivedBlockFilterByAddress' | -'subscribe_createVmlogFilter' | +'subscribe_newSnapshotBlockFilter' | +'subscribe_newAccountBlockFilter' | +'subscribe_newAccountBlockByAddressFilter' | +'subscribe_newUnreceivedBlockByAddressFilter' | +'subscribe_newVmLogFilter' | 'subscribe_uninstallFilter' | 'subscribe_getChangesByFilterId' | -'subscribe_createSnapshotBlockSubscription' | -'subscribe_createAccountBlockSubscription' | -'subscribe_createAccountBlockSubscriptionByAddress' | -'subscribe_createUnreceivedBlockSubscriptionByAddress' | -'subscribe_createVmlogSubscription'; +'subscribe_newSnapshotBlock' | +'subscribe_newAccountBlock' | +'subscribe_newAccountBlockByAddress' | +'subscribe_newUnreceivedBlockByAddress' | +'subscribe_newVmLog'; export declare interface RPCRequest { type?: string; diff --git a/src/vitejs/type.ts b/src/vitejs/type.ts index 08d43734..ab480524 100644 --- a/src/vitejs/type.ts +++ b/src/vitejs/type.ts @@ -220,18 +220,18 @@ export declare type Methods = string | 'net_nodeInfo' | 'net_peers' | 'util_getPoWNonce' | -'subscribe_createSnapshotBlockFilter' | -'subscribe_createAccountBlockFilter' | -'subscribe_createAccountBlockFilterByAddress' | -'subscribe_createUnreceivedBlockFilterByAddress' | -'subscribe_createVmlogFilter' | +'subscribe_newSnapshotBlockFilter' | +'subscribe_newAccountBlockFilter' | +'subscribe_newAccountBlockByAddressFilter' | +'subscribe_newUnreceivedBlockByAddressFilter' | +'subscribe_newVmLogFilter' | 'subscribe_uninstallFilter' | 'subscribe_getChangesByFilterId' | -'subscribe_createSnapshotBlockSubscription' | -'subscribe_createAccountBlockSubscription' | -'subscribe_createAccountBlockSubscriptionByAddress' | -'subscribe_createUnreceivedBlockSubscriptionByAddress' | -'subscribe_createVmlogSubscription'; +'subscribe_newSnapshotBlock' | +'subscribe_newAccountBlock' | +'subscribe_newAccountBlockByAddress' | +'subscribe_newUnreceivedBlockByAddress' | +'subscribe_newVmLog'; export declare interface RPCRequest { type?: string; diff --git a/src/wallet/type.ts b/src/wallet/type.ts index 08d43734..ab480524 100644 --- a/src/wallet/type.ts +++ b/src/wallet/type.ts @@ -220,18 +220,18 @@ export declare type Methods = string | 'net_nodeInfo' | 'net_peers' | 'util_getPoWNonce' | -'subscribe_createSnapshotBlockFilter' | -'subscribe_createAccountBlockFilter' | -'subscribe_createAccountBlockFilterByAddress' | -'subscribe_createUnreceivedBlockFilterByAddress' | -'subscribe_createVmlogFilter' | +'subscribe_newSnapshotBlockFilter' | +'subscribe_newAccountBlockFilter' | +'subscribe_newAccountBlockByAddressFilter' | +'subscribe_newUnreceivedBlockByAddressFilter' | +'subscribe_newVmLogFilter' | 'subscribe_uninstallFilter' | 'subscribe_getChangesByFilterId' | -'subscribe_createSnapshotBlockSubscription' | -'subscribe_createAccountBlockSubscription' | -'subscribe_createAccountBlockSubscriptionByAddress' | -'subscribe_createUnreceivedBlockSubscriptionByAddress' | -'subscribe_createVmlogSubscription'; +'subscribe_newSnapshotBlock' | +'subscribe_newAccountBlock' | +'subscribe_newAccountBlockByAddress' | +'subscribe_newUnreceivedBlockByAddress' | +'subscribe_newVmLog'; export declare interface RPCRequest { type?: string;