From 378f359a76ceb0fcee59ace3d1702538ce8bde4c Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Sun, 2 May 2021 10:04:48 +0300
Subject: [PATCH] add known upgrade block for Polkadot v30 (#3468)

---
 CHANGELOG.md                                  | 1 +
 packages/rpc-provider/src/ws/index.ts         | 6 ++++--
 packages/types-known/src/upgrades/polkadot.ts | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be16110561..83842bb3e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ Changes:
 - Allow metadata creation for `Map` or `Record`
 - Expose additional camelCase `method` on `AbiMessage` (maps to decorated name)
 - Added explicit double-byte ss58 `AccountId` encoding test
+- Add known upgrade block for Polkadot v30
 - Update to latest Substrate metadata
 
 
diff --git a/packages/rpc-provider/src/ws/index.ts b/packages/rpc-provider/src/ws/index.ts
index 4aaf987c17..1fe897a66b 100644
--- a/packages/rpc-provider/src/ws/index.ts
+++ b/packages/rpc-provider/src/ws/index.ts
@@ -32,7 +32,7 @@ interface WsStateSubscription extends SubscriptionHandler {
   params: any[];
 }
 
-const ALIASSES: { [index: string]: string } = {
+const ALIASES: { [index: string]: string } = {
   chain_finalisedHead: 'chain_finalizedHead',
   chain_subscribeFinalisedHeads: 'chain_subscribeFinalizedHeads',
   chain_unsubscribeFinalisedHeads: 'chain_unsubscribeFinalizedHeads'
@@ -351,7 +351,9 @@ export class WsProvider implements ProviderInterface {
     }
 
     this.#isConnected = false;
+    this.#websocket = null;
     this.#emit('disconnected');
+
     // reject all hanging requests
     eraseRecord(this.#handlers, (handler) => handler.callback(error, undefined));
     eraseRecord(this.#waitingForId);
@@ -419,7 +421,7 @@ export class WsProvider implements ProviderInterface {
   }
 
   #onSocketMessageSubscribe = (response: JsonRpcResponse): void => {
-    const method = ALIASSES[response.method as string] || response.method || 'invalid';
+    const method = ALIASES[response.method as string] || response.method || 'invalid';
     const subId = `${method}::${response.params.subscription}`;
     const handler = this.#subscriptions[subId];
 
diff --git a/packages/types-known/src/upgrades/polkadot.ts b/packages/types-known/src/upgrades/polkadot.ts
index e441f79ab6..e30371bc06 100644
--- a/packages/types-known/src/upgrades/polkadot.ts
+++ b/packages/types-known/src/upgrades/polkadot.ts
@@ -8,7 +8,7 @@ const upgrades: ChainUpgradesRaw = [
   [244358, 8], [303079, 9], [314201, 10], [342400, 11], [443963, 12],
   [528470, 13], [687751, 14], [746085, 15], [787923, 16], [799302, 17],
   [1205128, 18], [1603423, 23], [1733218, 24], [2005673, 25], [2436698, 26],
-  [3613564, 27], [3899547, 28], [4345767, 29]
+  [3613564, 27], [3899547, 28], [4345767, 29], [4876134, 30]
 ];
 
 export default upgrades;