@substrate/api-sidecar 17.1.0 → 17.1.1

package/build/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "17.1.0",
+    "version": "17.1.1",
     "name": "@substrate/api-sidecar",
     "description": "REST service that makes it easy to interact with blockchain nodes built using Substrate's FRAME framework.",
     "homepage": "https://github.com/paritytech/substrate-api-sidecar#readme",

package/build/src/chains-config/assetHubKusamaControllers.d.ts

@@ -0,0 +1,5 @@
+import { ControllerConfig } from '../types/chains-config';
+/**
+ * Asset Hub Kusama configuration for Sidecar.
+ */
+export declare const assetHubKusamaControllers: ControllerConfig;

package/build/src/chains-config/{statemineControllers.js → assetHubKusamaControllers.js}

@@ -15,12 +15,12 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.statemineControllers = void 0;
+exports.assetHubKusamaControllers = void 0;
 const cache_1 = require("./cache");
 /**
- * Statemine configuration for Sidecar.
+ * Asset Hub Kusama configuration for Sidecar.
  */
-exports.statemineControllers = {
+exports.assetHubKusamaControllers = {
     controllers: [
         'AccountsAssets',
         'AccountsBalanceInfo',
@@ -49,4 +49,4 @@ exports.statemineControllers = {
         hasQueryFeeApi: new cache_1.QueryFeeDetailsCache(null, null),
     },
 };
-//# sourceMappingURL=statemineControllers.js.map
+//# sourceMappingURL=assetHubKusamaControllers.js.map

package/build/src/chains-config/assetHubKusamaControllers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assetHubKusamaControllers.js","sourceRoot":"","sources":["../../../src/chains-config/assetHubKusamaControllers.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAGxE,mCAA6D;AAE7D;;GAEG;AACU,QAAA,yBAAyB,GAAqB;IAC1D,WAAW,EAAE;QACZ,gBAAgB;QAChB,qBAAqB;QACrB,kBAAkB;QAClB,QAAQ;QACR,kBAAkB;QAClB,aAAa;QACb,qBAAqB;QACrB,aAAa;QACb,eAAe;QACf,eAAe;QACf,eAAe;QACf,eAAe;QACf,aAAa;QACb,iBAAiB;QACjB,aAAa;QACb,mBAAmB;QACnB,wBAAwB;QACxB,qBAAqB;QACrB,mBAAmB;KACnB;IACD,OAAO,EAAE;QACR,SAAS,EAAE,IAAI;QACf,iBAAiB,EAAE,CAAC;QACpB,UAAU,EAAE,IAAA,oBAAY,GAAE;QAC1B,cAAc,EAAE,IAAI,4BAAoB,CAAC,IAAI,EAAE,IAAI,CAAC;KACpD;CACD,CAAC"}

package/build/src/chains-config/assetHubPolkadotControllers.d.ts

@@ -0,0 +1,5 @@
+import { ControllerConfig } from '../types/chains-config';
+/**
+ * Asset Hub Polkadot configuration for Sidecar.
+ */
+export declare const assetHubPolkadotControllers: ControllerConfig;

package/build/src/chains-config/{statemintControllers.js → assetHubPolkadotControllers.js}

@@ -15,12 +15,12 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.statemintControllers = void 0;
+exports.assetHubPolkadotControllers = void 0;
 const cache_1 = require("./cache");
 /**
- * Statemint configuration for Sidecar.
+ * Asset Hub Polkadot configuration for Sidecar.
  */
-exports.statemintControllers = {
+exports.assetHubPolkadotControllers = {
     controllers: [
         'AccountsAssets',
         'AccountsBalanceInfo',
@@ -50,4 +50,4 @@ exports.statemintControllers = {
         hasQueryFeeApi: new cache_1.QueryFeeDetailsCache(null, null),
     },
 };
-//# sourceMappingURL=statemintControllers.js.map
+//# sourceMappingURL=assetHubPolkadotControllers.js.map

package/build/src/chains-config/assetHubPolkadotControllers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assetHubPolkadotControllers.js","sourceRoot":"","sources":["../../../src/chains-config/assetHubPolkadotControllers.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAGxE,mCAA6D;AAE7D;;GAEG;AACU,QAAA,2BAA2B,GAAqB;IAC5D,WAAW,EAAE;QACZ,gBAAgB;QAChB,qBAAqB;QACrB,kBAAkB;QAClB,QAAQ;QACR,kBAAkB;QAClB,aAAa;QACb,qBAAqB;QACrB,aAAa;QACb,eAAe;QACf,sBAAsB;QACtB,eAAe;QACf,eAAe;QACf,eAAe;QACf,aAAa;QACb,iBAAiB;QACjB,aAAa;QACb,mBAAmB;QACnB,wBAAwB;QACxB,qBAAqB;QACrB,mBAAmB;KACnB;IACD,OAAO,EAAE;QACR,SAAS,EAAE,IAAI;QACf,iBAAiB,EAAE,GAAG;QACtB,UAAU,EAAE,IAAA,oBAAY,GAAE;QAC1B,cAAc,EAAE,IAAI,4BAAoB,CAAC,IAAI,EAAE,IAAI,CAAC;KACpD;CACD,CAAC"}

package/build/src/chains-config/index.js

@@ -18,6 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getControllersForSpec = void 0;
 const controllers_1 = require("../controllers");
 const acalaControllers_1 = require("./acalaControllers");
+const assetHubKusamaControllers_1 = require("./assetHubKusamaControllers");
+const assetHubPolkadotControllers_1 = require("./assetHubPolkadotControllers");
 const astarControllers_1 = require("./astarControllers");
 const bifrostControllers_1 = require("./bifrostControllers");
 const bifrostPolkadotControllers_1 = require("./bifrostPolkadotControllers");
@@ -39,8 +41,6 @@ const polkadotControllers_1 = require("./polkadotControllers");
 const polymeshControllers_1 = require("./polymeshControllers");
 const shidenControllers_1 = require("./shidenControllers");
 const soraControllers_1 = require("./soraControllers");
-const statemineControllers_1 = require("./statemineControllers");
-const statemintControllers_1 = require("./statemintControllers");
 const westendControllers_1 = require("./westendControllers");
 const specToControllerMap = {
     westend: westendControllers_1.westendControllers,
@@ -53,10 +53,10 @@ const specToControllerMap = {
     'dock-main-runtime': dockMainnetControllers_1.dockMainnetControllers,
     'dock-pos-main-runtime': dockPoSMainnetControllers_1.dockPoSMainnetControllers,
     'dock-pos-test-runtime': dockPoSTestnetControllers_1.dockTestnetControllers,
-    statemine: statemineControllers_1.statemineControllers,
-    statemint: statemintControllers_1.statemintControllers,
-    westmine: statemineControllers_1.statemineControllers,
-    westmint: statemintControllers_1.statemintControllers,
+    'asset-hub-kusama': assetHubKusamaControllers_1.assetHubKusamaControllers,
+    'asset-hub-polkadot': assetHubPolkadotControllers_1.assetHubPolkadotControllers,
+    westmine: assetHubKusamaControllers_1.assetHubKusamaControllers,
+    'asset-hub-westend': assetHubPolkadotControllers_1.assetHubPolkadotControllers,
     shiden: shidenControllers_1.shidenControllers,
     astar: astarControllers_1.astarControllers,
     sora: soraControllers_1.soraControllers,

package/build/src/chains-config/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/chains-config/index.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAIxE,gDAA6C;AAI7C,yDAAsD;AACtD,yDAAsD;AACtD,6DAA0D;AAC1D,6EAA0E;AAC1E,+DAA4D;AAC5D,yDAAsD;AACtD,6DAA0D;AAC1D,qEAAkE;AAClE,2EAAwE;AACxE,2EAAqE;AACrE,yDAAsD;AACtD,2DAAwD;AACxD,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AACxD,6DAA0D;AAC1D,yDAAsD;AACtD,+DAA4D;AAC5D,+DAA4D;AAC5D,+DAA4D;AAC5D,2DAAwD;AACxD,uDAAoD;AACpD,iEAA8D;AAC9D,iEAA8D;AAC9D,6DAA0D;AAE1D,MAAM,mBAAmB,GAAsC;IAC9D,OAAO,EAAE,uCAAkB;IAC3B,QAAQ,EAAE,yCAAmB;IAC7B,QAAQ,EAAE,yCAAmB;IAC7B,MAAM,EAAE,qCAAiB;IACzB,MAAM,EAAE,qCAAiB;IACzB,IAAI,EAAE,iCAAe;IACrB,OAAO,EAAE,uCAAkB;IAC3B,mBAAmB,EAAE,+CAAsB;IAC3C,uBAAuB,EAAE,qDAAyB;IAClD,uBAAuB,EAAE,kDAAsB;IAC/C,SAAS,EAAE,2CAAoB;IAC/B,SAAS,EAAE,2CAAoB;IAC/B,QAAQ,EAAE,2CAAoB;IAC9B,QAAQ,EAAE,2CAAoB;IAC9B,MAAM,EAAE,qCAAiB;IACzB,KAAK,EAAE,mCAAgB;IACvB,IAAI,EAAE,iCAAe;IACrB,QAAQ,EAAE,yCAAmB;IAC7B,MAAM,EAAE,qCAAiB;IACzB,KAAK,EAAE,mCAAgB;IACvB,KAAK,EAAE,mCAAgB;IACvB,KAAK,EAAE,mCAAgB;IACvB,OAAO,EAAE,uCAAkB;IAC3B,gBAAgB,EAAE,uDAA0B;IAC5C,KAAK,EAAE,mCAAgB;IACvB,QAAQ,EAAE,yCAAmB;CAC7B,CAAC;AAEF;;;;;GAKG;AACH,SAAgB,qBAAqB,CACpC,GAAe,EACf,QAAgB;IAEhB,IAAI,mBAAmB,CAAC,QAAQ,CAAC,EAAE;QAClC,OAAO,wBAAwB,CAAC,GAAG,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;KACpE;IAED,8EAA8E;IAC9E,mBAAmB;IACnB,OAAO,wBAAwB,CAAC,GAAG,EAAE,uCAAkB,CAAC,CAAC;AAC1D,CAAC;AAXD,sDAWC;AAED;;;;;;GAMG;AACH,SAAS,wBAAwB,CAAC,GAAe,EAAE,MAAwB;IAC1E,MAAM,oBAAoB,GAAG,MAAM,CAAC,WAAW,CAAC;IAEhD,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;QACtD,GAAG,CAAC,IAAI,CAAC,IAAI,yBAAW,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAE3D,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,EAA2C,CAAC,CAAC;AACjD,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/chains-config/index.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAIxE,gDAA6C;AAI7C,yDAAsD;AACtD,2EAAwE;AACxE,+EAA4E;AAC5E,yDAAsD;AACtD,6DAA0D;AAC1D,6EAA0E;AAC1E,+DAA4D;AAC5D,yDAAsD;AACtD,6DAA0D;AAC1D,qEAAkE;AAClE,2EAAwE;AACxE,2EAAqE;AACrE,yDAAsD;AACtD,2DAAwD;AACxD,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AACxD,6DAA0D;AAC1D,yDAAsD;AACtD,+DAA4D;AAC5D,+DAA4D;AAC5D,+DAA4D;AAC5D,2DAAwD;AACxD,uDAAoD;AACpD,6DAA0D;AAE1D,MAAM,mBAAmB,GAAsC;IAC9D,OAAO,EAAE,uCAAkB;IAC3B,QAAQ,EAAE,yCAAmB;IAC7B,QAAQ,EAAE,yCAAmB;IAC7B,MAAM,EAAE,qCAAiB;IACzB,MAAM,EAAE,qCAAiB;IACzB,IAAI,EAAE,iCAAe;IACrB,OAAO,EAAE,uCAAkB;IAC3B,mBAAmB,EAAE,+CAAsB;IAC3C,uBAAuB,EAAE,qDAAyB;IAClD,uBAAuB,EAAE,kDAAsB;IAC/C,kBAAkB,EAAE,qDAAyB;IAC7C,oBAAoB,EAAE,yDAA2B;IACjD,QAAQ,EAAE,qDAAyB;IACnC,mBAAmB,EAAE,yDAA2B;IAChD,MAAM,EAAE,qCAAiB;IACzB,KAAK,EAAE,mCAAgB;IACvB,IAAI,EAAE,iCAAe;IACrB,QAAQ,EAAE,yCAAmB;IAC7B,MAAM,EAAE,qCAAiB;IACzB,KAAK,EAAE,mCAAgB;IACvB,KAAK,EAAE,mCAAgB;IACvB,KAAK,EAAE,mCAAgB;IACvB,OAAO,EAAE,uCAAkB;IAC3B,gBAAgB,EAAE,uDAA0B;IAC5C,KAAK,EAAE,mCAAgB;IACvB,QAAQ,EAAE,yCAAmB;CAC7B,CAAC;AAEF;;;;;GAKG;AACH,SAAgB,qBAAqB,CACpC,GAAe,EACf,QAAgB;IAEhB,IAAI,mBAAmB,CAAC,QAAQ,CAAC,EAAE;QAClC,OAAO,wBAAwB,CAAC,GAAG,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;KACpE;IAED,8EAA8E;IAC9E,mBAAmB;IACnB,OAAO,wBAAwB,CAAC,GAAG,EAAE,uCAAkB,CAAC,CAAC;AAC1D,CAAC;AAXD,sDAWC;AAED;;;;;;GAMG;AACH,SAAS,wBAAwB,CAAC,GAAe,EAAE,MAAwB;IAC1E,MAAM,oBAAoB,GAAG,MAAM,CAAC,WAAW,CAAC;IAEhD,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;QACtD,GAAG,CAAC,IAAI,CAAC,IAAI,yBAAW,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAE3D,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,EAA2C,CAAC,CAAC;AACjD,CAAC"}

package/build/src/services/accounts/AccountsConvertService.js

@@ -18,10 +18,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccountsConvertService = void 0;
 const api_1 = require("@polkadot/api");
 const util_1 = require("@polkadot/util");
+const util_2 = require("@polkadot/util");
 const util_crypto_1 = require("@polkadot/util-crypto");
-const util_crypto_2 = require("@polkadot/util-crypto");
 const http_errors_1 = require("http-errors");
 const AbstractService_1 = require("../AbstractService");
+/**
+ * Copyright 2023 via polkadot-js/common
+ *
+ * The slightly modified below logic is copyrighted from polkadot-js/common . The exact path to the code can be seen here:
+ * https://github.com/polkadot-js/common/blob/e5cb0ba2b4a6b5817626cc964b4f66334f2410e4/packages/keyring/src/pair/index.ts#L44-L49
+ */
+const TYPE_ADDRESS = {
+    ecdsa: (p) => ((0, util_2.hexToU8a)(p).length > 32 ? (0, util_crypto_1.blake2AsHex)(p) : p),
+    ed25519: (p) => p,
+    sr25519: (p) => p,
+};
 class AccountsConvertService extends AbstractService_1.AbstractService {
     /**
      * Takes a given AccountId or Public Key (hex) and converts it to an SS58 address.
@@ -48,7 +59,9 @@ class AccountsConvertService extends AbstractService_1.AbstractService {
         if (network === null) {
             throw new http_errors_1.BadRequest('The given `prefix` query parameter does not correspond to an existing network.');
         }
-        const accountId2Encode = publicKey ? (0, util_crypto_2.blake2AsHex)(accountId) : accountId;
+        const accountId2Encode = publicKey
+            ? TYPE_ADDRESS[scheme](accountId)
+            : accountId;
         const keyring = new api_1.Keyring({ type: scheme, ss58Format: ss58Prefix });
         const address = keyring.encodeAddress(accountId2Encode, ss58Prefix);
         return {

package/build/src/services/accounts/AccountsConvertService.js.map

@@ -1 +1 @@
-{"version":3,"file":"AccountsConvertService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsConvertService.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAExE,uCAAwC;AACxC,yCAAuC;AACvC,uDAAoD;AACpD,uDAAoD;AACpD,6CAAyC;AAGzC,wDAAqD;AAErD,MAAa,sBAAuB,SAAQ,iCAAe;IAC1D;;;;;;;;;OASG;IACI,cAAc,CACpB,SAAiB,EACjB,MAAuC,EACvC,UAAkB,EAClB,SAAkB;QAElB,MAAM,cAAc,GAAG,IAAA,YAAK,EAAC,SAAS,CAAC,CAAC;QACxC,IAAI,CAAC,cAAc,EAAE;YACpB,MAAM,IAAI,wBAAU,CACnB,8DAA8D,CAC9D,CAAC;SACF;QACD,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,KAAK,MAAM,aAAa,IAAI,yBAAW,EAAE;YACxC,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,UAAU,EAAE;gBAC3C,OAAO,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;gBACnC,MAAM;aACN;SACD;QACD,IAAI,OAAO,KAAK,IAAI,EAAE;YACrB,MAAM,IAAI,wBAAU,CACnB,gFAAgF,CAChF,CAAC;SACF;QAED,MAAM,gBAAgB,GAAG,SAAS,CAAC,CAAC,CAAC,IAAA,yBAAW,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAExE,MAAM,OAAO,GAAG,IAAI,aAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;QACtE,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;QAEpE,OAAO;YACN,UAAU;YACV,OAAO;YACP,OAAO;YACP,SAAS;YACT,MAAM;YACN,SAAS;SACT,CAAC;IACH,CAAC;CACD;AAlDD,wDAkDC"}
+{"version":3,"file":"AccountsConvertService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsConvertService.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAExE,uCAAwC;AACxC,yCAAuC;AACvC,yCAA0C;AAC1C,uDAAiE;AACjE,6CAAyC;AAGzC,wDAAqD;AAErD;;;;;GAKG;AACH,MAAM,YAAY,GAAG;IACpB,KAAK,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAA,eAAQ,EAAC,CAAC,CAAC,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpE,OAAO,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC;IACzB,OAAO,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC;CACzB,CAAC;AAEF,MAAa,sBAAuB,SAAQ,iCAAe;IAC1D;;;;;;;;;OASG;IACI,cAAc,CACpB,SAAiB,EACjB,MAAuC,EACvC,UAAkB,EAClB,SAAkB;QAElB,MAAM,cAAc,GAAG,IAAA,YAAK,EAAC,SAAS,CAAC,CAAC;QACxC,IAAI,CAAC,cAAc,EAAE;YACpB,MAAM,IAAI,wBAAU,CACnB,8DAA8D,CAC9D,CAAC;SACF;QACD,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,KAAK,MAAM,aAAa,IAAI,yBAAW,EAAE;YACxC,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,UAAU,EAAE;gBAC3C,OAAO,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;gBACnC,MAAM;aACN;SACD;QACD,IAAI,OAAO,KAAK,IAAI,EAAE;YACrB,MAAM,IAAI,wBAAU,CACnB,gFAAgF,CAChF,CAAC;SACF;QAED,MAAM,gBAAgB,GAAG,SAAS;YACjC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC;YACjC,CAAC,CAAC,SAAS,CAAC;QAEb,MAAM,OAAO,GAAG,IAAI,aAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;QACtE,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;QAEpE,OAAO;YACN,UAAU;YACV,OAAO;YACP,OAAO;YACP,SAAS;YACT,MAAM;YACN,SAAS;SACT,CAAC;IACH,CAAC;CACD;AApDD,wDAoDC"}

package/build/src/services/accounts/AccountsConvertService.spec.js

@@ -99,6 +99,20 @@ describe('Convert accounts', () => {
         const polkadotPublicKey = '0x026e42c81603c7eaa2bdc40115306f05c94b563ff9e92120e8ea3480fec939e2e9';
         expect((0, sanitize_1.sanitizeNumbers)(validateService.accountConvert(polkadotPublicKey, 'ecdsa', 0, false))).toStrictEqual(expectedResponse);
     });
+    // This ensures the behaviour of the endpoint correctly converts a kusama publicKey given
+    // the following input. See PR: https://github.com/paritytech/substrate-api-sidecar/pull/1280
+    it('Should convert a valid Kusama publicKey when `publicKey` equals `true`', () => {
+        const expectedResponse = {
+            accountId: '0x96074594cccf1cd185fa8a72ceaeefd86648f8d45514f3ce33c31bdd07e4655d',
+            address: 'Fy2rsYCoowQBtuFXqLE65ehAY9T6KWcGiNCQAyPDCkfpm4s',
+            network: 'kusama',
+            publicKey: true,
+            scheme: 'sr25519',
+            ss58Prefix: '2',
+        };
+        const kusamaPublicKey = '0x96074594cccf1cd185fa8a72ceaeefd86648f8d45514f3ce33c31bdd07e4655d';
+        expect((0, sanitize_1.sanitizeNumbers)(validateService.accountConvert(kusamaPublicKey, 'sr25519', 2, true))).toStrictEqual(expectedResponse);
+    });
     // We try to convert a Polkadot AccountId to an SS58 Address by setting the publicKey=true
     // which is not correct and that is why in the response we have an invalid address.
     // If we would like to convert it correctly and have the expected SS58 address
@@ -107,7 +121,7 @@ describe('Convert accounts', () => {
         const expectedResponse = {
             ss58Prefix: '0',
             network: 'polkadot',
-            address: '12ZviSbX1Pzmnw1mg4FUg6Qra2CW7Q3z9iqmcWKWUphp5qgq',
+            address: '1rsCBWhPgyDETNS9yxnANSnm3KAtkxm4mu9jjfMhDF6xaV8',
             accountId: '0x2607fd20388303bd409e551202ee47b753b4382feac914e9f7ab0d4f728c2bf7',
             scheme: 'ecdsa',
             publicKey: true,

package/build/src/services/accounts/AccountsConvertService.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"AccountsConvertService.spec.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsConvertService.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AccountsConvertService.spec.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsConvertService.spec.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "17.1.0",
+  "version": "17.1.1",
   "name": "@substrate/api-sidecar",
   "description": "REST service that makes it easy to interact with blockchain nodes built using Substrate's FRAME framework.",
   "homepage": "https://github.com/paritytech/substrate-api-sidecar#readme",

package/build/src/chains-config/statemineControllers.d.ts

@@ -1,5 +0,0 @@
-import { ControllerConfig } from '../types/chains-config';
-/**
- * Statemine configuration for Sidecar.
- */
-export declare const statemineControllers: ControllerConfig;

package/build/src/chains-config/statemineControllers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"statemineControllers.js","sourceRoot":"","sources":["../../../src/chains-config/statemineControllers.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAGxE,mCAA6D;AAE7D;;GAEG;AACU,QAAA,oBAAoB,GAAqB;IACrD,WAAW,EAAE;QACZ,gBAAgB;QAChB,qBAAqB;QACrB,kBAAkB;QAClB,QAAQ;QACR,kBAAkB;QAClB,aAAa;QACb,qBAAqB;QACrB,aAAa;QACb,eAAe;QACf,eAAe;QACf,eAAe;QACf,eAAe;QACf,aAAa;QACb,iBAAiB;QACjB,aAAa;QACb,mBAAmB;QACnB,wBAAwB;QACxB,qBAAqB;QACrB,mBAAmB;KACnB;IACD,OAAO,EAAE;QACR,SAAS,EAAE,IAAI;QACf,iBAAiB,EAAE,CAAC;QACpB,UAAU,EAAE,IAAA,oBAAY,GAAE;QAC1B,cAAc,EAAE,IAAI,4BAAoB,CAAC,IAAI,EAAE,IAAI,CAAC;KACpD;CACD,CAAC"}

package/build/src/chains-config/statemintControllers.d.ts

@@ -1,5 +0,0 @@
-import { ControllerConfig } from '../types/chains-config';
-/**
- * Statemint configuration for Sidecar.
- */
-export declare const statemintControllers: ControllerConfig;

package/build/src/chains-config/statemintControllers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"statemintControllers.js","sourceRoot":"","sources":["../../../src/chains-config/statemintControllers.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAGxE,mCAA6D;AAE7D;;GAEG;AACU,QAAA,oBAAoB,GAAqB;IACrD,WAAW,EAAE;QACZ,gBAAgB;QAChB,qBAAqB;QACrB,kBAAkB;QAClB,QAAQ;QACR,kBAAkB;QAClB,aAAa;QACb,qBAAqB;QACrB,aAAa;QACb,eAAe;QACf,sBAAsB;QACtB,eAAe;QACf,eAAe;QACf,eAAe;QACf,aAAa;QACb,iBAAiB;QACjB,aAAa;QACb,mBAAmB;QACnB,wBAAwB;QACxB,qBAAqB;QACrB,mBAAmB;KACnB;IACD,OAAO,EAAE;QACR,SAAS,EAAE,IAAI;QACf,iBAAiB,EAAE,GAAG;QACtB,UAAU,EAAE,IAAA,oBAAY,GAAE;QAC1B,cAAc,EAAE,IAAI,4BAAoB,CAAC,IAAI,EAAE,IAAI,CAAC;KACpD;CACD,CAAC"}