@autonomys/auto-utils 1.4.2 → 1.4.4

package/dist/types/wallet.d.ts

@@ -2,6 +2,7 @@ import type { ApiPromise } from '@polkadot/api';
 import type { AddressOrPair, ApiDecoration, Signer, SignerResult } from '@polkadot/api/types';
 import type { InjectedAccountWithMeta } from '@polkadot/extension-inject/types';
 import type { KeyringPair } from '@polkadot/keyring/types';
+import type { KeypairType } from '@polkadot/util-crypto/types';
 import type { DomainParams, NetworkParams } from './network';
 export type Mnemonic = {
     mnemonic: string;
@@ -14,6 +15,10 @@ export type ExtraActivationOptions = {
     api?: ApiPromise;
 };
 export type MnemonicOrURI = Mnemonic | URI;
+export type WalletType = {
+    type?: KeypairType;
+};
+export type SetupWalletParams = MnemonicOrURI & WalletType;
 export type Wallet = {
     keyringPair?: KeyringPair;
     injectedAccount?: InjectedAccountWithMeta;
@@ -23,7 +28,7 @@ export type Wallet = {
 export interface GeneratedWallet extends Wallet {
     mnemonic: string;
 }
-export type ActivateWalletParams = (NetworkParams | DomainParams) & MnemonicOrURI & ExtraActivationOptions;
+export type ActivateWalletParams = (NetworkParams | DomainParams) & MnemonicOrURI & ExtraActivationOptions & WalletType;
 export type WalletActivated = {
     api: ApiPromise;
     accounts: InjectedAccountWithMeta[] & KeyringPair[];
@@ -31,5 +36,5 @@ export type WalletActivated = {
 };
 export type ApiAtBlockHash = ApiDecoration<'promise'>;
 export type Api = ApiPromise | ApiAtBlockHash;
-export type { AddressOrPair, ApiDecoration, ApiPromise, InjectedAccountWithMeta, KeyringPair, Signer, SignerResult, };
+export type { AddressOrPair, ApiDecoration, ApiPromise, InjectedAccountWithMeta, KeypairType, KeyringPair, Signer, SignerResult, };
 //# sourceMappingURL=wallet.d.ts.map

package/dist/types/wallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../src/types/wallet.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAW,MAAM,eAAe,CAAA;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAC7F,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAA;AAC/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAE5D,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,GAAG,GAAG;IAChB,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,GAAG,CAAC,EAAE,UAAU,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,GAAG,CAAA;AAE1C,MAAM,MAAM,MAAM,GAAG;IACnB,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,eAAe,CAAC,EAAE,uBAAuB,CAAA;IACzC,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,MAAM,CAAA;CACtB,CAAA;AAED,MAAM,WAAW,eAAgB,SAAQ,MAAM;IAC7C,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,aAAa,GAAG,YAAY,CAAC,GAC/D,aAAa,GACb,sBAAsB,CAAA;AAExB,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,EAAE,UAAU,CAAA;IACf,QAAQ,EAAE,uBAAuB,EAAE,GAAG,WAAW,EAAE,CAAA;IACnD,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG,aAAa,CAAC,SAAS,CAAC,CAAA;AAErD,MAAM,MAAM,GAAG,GAAG,UAAU,GAAG,cAAc,CAAA;AAE7C,YAAY,EACV,aAAa,EACb,aAAa,EACb,UAAU,EACV,uBAAuB,EACvB,WAAW,EACX,MAAM,EACN,YAAY,GACb,CAAA"}
+{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../src/types/wallet.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAW,MAAM,eAAe,CAAA;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAC7F,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAA;AAC/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAE5D,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,GAAG,GAAG;IAChB,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,GAAG,CAAC,EAAE,UAAU,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,GAAG,CAAA;AAE1C,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,CAAC,EAAE,WAAW,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG,UAAU,CAAA;AAE1D,MAAM,MAAM,MAAM,GAAG;IACnB,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,eAAe,CAAC,EAAE,uBAAuB,CAAA;IACzC,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,MAAM,CAAA;CACtB,CAAA;AAED,MAAM,WAAW,eAAgB,SAAQ,MAAM;IAC7C,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,aAAa,GAAG,YAAY,CAAC,GAC/D,aAAa,GACb,sBAAsB,GACtB,UAAU,CAAA;AAEZ,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,EAAE,UAAU,CAAA;IACf,QAAQ,EAAE,uBAAuB,EAAE,GAAG,WAAW,EAAE,CAAA;IACnD,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG,aAAa,CAAC,SAAS,CAAC,CAAA;AAErD,MAAM,MAAM,GAAG,GAAG,UAAU,GAAG,cAAc,CAAA;AAE7C,YAAY,EACV,aAAa,EACb,aAAa,EACb,UAAU,EACV,uBAAuB,EACvB,WAAW,EACX,WAAW,EACX,MAAM,EACN,YAAY,GACb,CAAA"}

package/dist/wallet.d.ts

@@ -1,8 +1,8 @@
-import type { DomainParams, MnemonicOrURI, NetworkParams } from './types';
-import type { ActivateWalletParams, ApiPromise, GeneratedWallet, Wallet, WalletActivated } from './types/wallet';
-export declare const setupWallet: (params: MnemonicOrURI) => Wallet;
-export declare const generateWallet: () => GeneratedWallet;
+import type { DomainParams, NetworkParams } from './types';
+import type { ActivateWalletParams, ApiPromise, GeneratedWallet, KeypairType, SetupWalletParams, Wallet, WalletActivated } from './types/wallet';
+export declare const setupWallet: (params: SetupWalletParams) => Wallet;
+export declare const generateWallet: (type?: KeypairType) => GeneratedWallet;
 export declare const activateWallet: (params: ActivateWalletParams) => Promise<WalletActivated>;
-export declare const mockWallets: (network?: NetworkParams | DomainParams, api?: ApiPromise) => Promise<WalletActivated[]>;
+export declare const mockWallets: (network?: NetworkParams | DomainParams, api?: ApiPromise, type?: KeypairType) => Promise<WalletActivated[]>;
 export declare const getMockWallet: (name: string, wallets: WalletActivated[]) => WalletActivated;
 //# sourceMappingURL=wallet.d.ts.map

package/dist/wallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,YAAY,EAAY,aAAa,EAAE,aAAa,EAAO,MAAM,SAAS,CAAA;AACxF,OAAO,KAAK,EACV,oBAAoB,EACpB,UAAU,EACV,eAAe,EACf,MAAM,EACN,eAAe,EAChB,MAAM,gBAAgB,CAAA;AAEvB,eAAO,MAAM,WAAW,GAAI,QAAQ,aAAa,KAAG,MAiBnD,CAAA;AAED,eAAO,MAAM,cAAc,QAAO,eAUjC,CAAA;AAED,eAAO,MAAM,cAAc,GAAU,QAAQ,oBAAoB,KAAG,OAAO,CAAC,eAAe,CA4B1F,CAAA;AAED,eAAO,MAAM,WAAW,GACtB,UAAS,aAAa,GAAG,YAA+C,EACxE,MAAM,UAAU,KACf,OAAO,CAAC,eAAe,EAAE,CAW3B,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,SAAS,eAAe,EAAE,KAAG,eAClB,CAAA"}
+{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,YAAY,EAA2B,aAAa,EAAO,MAAM,SAAS,CAAA;AACxF,OAAO,KAAK,EACV,oBAAoB,EACpB,UAAU,EACV,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,MAAM,EACN,eAAe,EAChB,MAAM,gBAAgB,CAAA;AAEvB,eAAO,MAAM,WAAW,GAAI,QAAQ,iBAAiB,KAAG,MAkBvD,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,OAAM,WAAuB,KAAG,eAU9D,CAAA;AAED,eAAO,MAAM,cAAc,GAAU,QAAQ,oBAAoB,KAAG,OAAO,CAAC,eAAe,CAmC1F,CAAA;AAED,eAAO,MAAM,WAAW,GACtB,UAAS,aAAa,GAAG,YAA+C,EACxE,MAAM,UAAU,EAChB,OAAO,WAAW,KACjB,OAAO,CAAC,eAAe,EAAE,CAa3B,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,SAAS,eAAe,EAAE,KAAG,eAClB,CAAA"}

package/dist/wallet.js

@@ -51,7 +51,8 @@ const api_2 = require("./api");
 const network_1 = require("./constants/network");
 const wallet_1 = require("./constants/wallet");
 const setupWallet = (params) => {
-    const keyring = new api_1.Keyring({ type: 'sr25519' });
+    const type = params.type || 'sr25519';
+    const keyring = new api_1.Keyring({ type });
     let keyringPair;
     if (params.uri) {
         // Treat as uri
@@ -65,14 +66,14 @@ const setupWallet = (params) => {
         throw new Error('Invalid mnemonic or private key');
     return {
         keyringPair,
-        address: (0, address_1.address)(keyringPair.address),
+        address: type === 'sr25519' ? (0, address_1.address)(keyringPair.address) : keyringPair.address,
         commonAddress: keyringPair.address,
     };
 };
 exports.setupWallet = setupWallet;
-const generateWallet = () => {
+const generateWallet = (type = 'sr25519') => {
     const mnemonic = (0, util_crypto_1.mnemonicGenerate)();
-    const { keyringPair, address, commonAddress } = (0, exports.setupWallet)({ mnemonic });
+    const { keyringPair, address, commonAddress } = (0, exports.setupWallet)({ mnemonic, type });
     return {
         mnemonic,
         keyringPair,
@@ -108,14 +109,23 @@ const activateWallet = (params) => __awaiter(void 0, void 0, void 0, function* (
     }
     else
         throw new Error('No wallet provided');
-    return { api: params.api, accounts, address: (0, address_1.address)(accounts[0].address) };
+    return {
+        api: params.api,
+        accounts,
+        address: params.type && params.type === 'ethereum'
+            ? accounts[0].address
+            : (0, address_1.address)(accounts[0].address),
+    };
 });
 exports.activateWallet = activateWallet;
-const mockWallets = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* (network = { networkId: network_1.defaultNetwork.id }, api) {
+const mockWallets = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* (network = { networkId: network_1.defaultNetwork.id }, api, type) {
+    if (!type)
+        type = 'sr25519';
     const wallets = [];
     for (const uri of wallet_1.mockURIs) {
         const wallet = yield (0, exports.activateWallet)(Object.assign(Object.assign({}, network), { uri,
-            api }));
+            api,
+            type }));
         wallets.push(wallet);
     }
     return wallets;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autonomys/auto-utils",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "license": "MIT",
   "main": "dist/index.js",
   "repository": {
@@ -43,5 +43,5 @@
   "browser": {
     "fs": false
   },
-  "gitHead": "9121de95bb17b50dcf0e452f0e6544cbf4fb0f74"
+  "gitHead": "93f124f601a292d88221a164b393819586dcb01b"
 }