@airgap/ethereum 0.13.8-beta.6 → 0.13.8-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airgap/ethereum",
-  "version": "0.13.8-beta.6",
+  "version": "0.13.8-beta.8",
   "description": "The @airgap/ethereum is an Ethereum implementation of the ICoinProtocol interface from @airgap/coinlib-core.",
   "keywords": [
     "airgap",
@@ -36,9 +36,9 @@
     "@metamask/eth-sig-util": "4.0.0"
   },
   "peerDependencies": {
-    "@airgap/coinlib-core": "^0.13.7-beta.0",
-    "@airgap/module-kit": "^0.13.7-beta.0",
-    "@airgap/serializer": "^0.13.7-beta.0"
+    "@airgap/coinlib-core": "^0.13.8-beta.7",
+    "@airgap/module-kit": "^0.13.8-beta.7",
+    "@airgap/serializer": "^0.13.8-beta.7"
   },
   "localDependencies": {
     "ethereumjs-tx": "1.3.7",

package/v1/index.d.ts

@@ -1,12 +1,14 @@
 import { EtherscanBlockExplorer } from './block-explorer/EtherscanBlockExplorer';
+import { EthereumClassicModule } from './module/EthereumClassicModule';
 import { EthereumModule } from './module/EthereumModule';
+import { EthereumRopstenModule } from './module/EthereumRopstenModule';
 import { createERC20Token, ERC20Token } from './protocol/erc20/ERC20Token';
 import { createEthereumClassicProtocol, createEthereumClassicProtocolOptions, EthereumClassicProtocol } from './protocol/EthereumClassicProtocol';
 import { createEthereumProtocol, createEthereumProtocolOptions, EthereumProtocol } from './protocol/EthereumProtocol';
 import { createEthereumRopstenProtocol, createEthereumRopstenProtocolOptions, EthereumRopstenProtocol } from './protocol/EthereumRopstenProtocol';
 import { ERC20TokenMetadata, EthereumProtocolNetwork, EthereumProtocolOptions, EthereumUnits } from './types/protocol';
 import { EthereumRawUnsignedTransaction, EthereumSignedTransaction, EthereumTransactionCursor, EthereumTypedUnsignedTransaction, EthereumUnsignedTransaction } from './types/transaction';
-export { EthereumModule };
+export { EthereumModule, EthereumClassicModule, EthereumRopstenModule };
 export { EthereumProtocol, createEthereumProtocol, createEthereumProtocolOptions, EthereumClassicProtocol, createEthereumClassicProtocol, createEthereumClassicProtocolOptions, EthereumRopstenProtocol, createEthereumRopstenProtocol, createEthereumRopstenProtocolOptions, ERC20Token, createERC20Token };
 export { EtherscanBlockExplorer };
 export { EthereumUnits, EthereumProtocolNetwork, EthereumProtocolOptions, ERC20TokenMetadata, EthereumUnsignedTransaction, EthereumTypedUnsignedTransaction, EthereumRawUnsignedTransaction, EthereumSignedTransaction, EthereumTransactionCursor };

package/v1/index.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EtherscanBlockExplorer = exports.createERC20Token = exports.createEthereumRopstenProtocolOptions = exports.createEthereumRopstenProtocol = exports.createEthereumClassicProtocolOptions = exports.createEthereumClassicProtocol = exports.createEthereumProtocolOptions = exports.createEthereumProtocol = exports.EthereumModule = void 0;
+exports.EtherscanBlockExplorer = exports.createERC20Token = exports.createEthereumRopstenProtocolOptions = exports.createEthereumRopstenProtocol = exports.createEthereumClassicProtocolOptions = exports.createEthereumClassicProtocol = exports.createEthereumProtocolOptions = exports.createEthereumProtocol = exports.EthereumRopstenModule = exports.EthereumClassicModule = exports.EthereumModule = void 0;
 var EtherscanBlockExplorer_1 = require("./block-explorer/EtherscanBlockExplorer");
 Object.defineProperty(exports, "EtherscanBlockExplorer", { enumerable: true, get: function () { return EtherscanBlockExplorer_1.EtherscanBlockExplorer; } });
+var EthereumClassicModule_1 = require("./module/EthereumClassicModule");
+Object.defineProperty(exports, "EthereumClassicModule", { enumerable: true, get: function () { return EthereumClassicModule_1.EthereumClassicModule; } });
 var EthereumModule_1 = require("./module/EthereumModule");
 Object.defineProperty(exports, "EthereumModule", { enumerable: true, get: function () { return EthereumModule_1.EthereumModule; } });
+var EthereumRopstenModule_1 = require("./module/EthereumRopstenModule");
+Object.defineProperty(exports, "EthereumRopstenModule", { enumerable: true, get: function () { return EthereumRopstenModule_1.EthereumRopstenModule; } });
 var ERC20Token_1 = require("./protocol/erc20/ERC20Token");
 Object.defineProperty(exports, "createERC20Token", { enumerable: true, get: function () { return ERC20Token_1.createERC20Token; } });
 var EthereumClassicProtocol_1 = require("./protocol/EthereumClassicProtocol");

package/v1/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/v1/index.ts"],"names":[],"mappings":";;;AAAA,kFAAgF;AA6CvE,uGA7CA,+CAAsB,OA6CA;AA5C/B,0DAAwD;AAwB/C,+FAxBA,+BAAc,OAwBA;AAvBvB,0DAA0E;AAsCxE,iGAtCO,6BAAgB,OAsCP;AArClB,8EAI2C;AA2BzC,8GA9BA,uDAA6B,OA8BA;AAC7B,qHA9BA,8DAAoC,OA8BA;AA3BtC,gEAAqH;AAuBnH,uGAvBO,yCAAsB,OAuBP;AACtB,8GAxB+B,gDAA6B,OAwB/B;AAvB/B,8EAI2C;AAwBzC,8GA3BA,uDAA6B,OA2BA;AAC7B,qHA3BA,8DAAoC,OA2BA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/v1/index.ts"],"names":[],"mappings":";;;AAAA,kFAAgF;AA+CvE,uGA/CA,+CAAsB,OA+CA;AA9C/B,wEAAsE;AA0B7C,sGA1BhB,6CAAqB,OA0BgB;AAzB9C,0DAAwD;AAyB/C,+FAzBA,+BAAc,OAyBA;AAxBvB,wEAAsE;AAwBtB,sGAxBvC,6CAAqB,OAwBuC;AAvBrE,0DAA0E;AAsCxE,iGAtCO,6BAAgB,OAsCP;AArClB,8EAI2C;AA2BzC,8GA9BA,uDAA6B,OA8BA;AAC7B,qHA9BA,8DAAoC,OA8BA;AA3BtC,gEAAqH;AAuBnH,uGAvBO,yCAAsB,OAuBP;AACtB,8GAxB+B,gDAA6B,OAwB/B;AAvB/B,8EAI2C;AAwBzC,8GA3BA,uDAA6B,OA2BA;AAC7B,qHA3BA,8DAAoC,OA2BA"}

package/v1/module/ERC20Module.d.ts

@@ -0,0 +1,9 @@
+import { AirGapModule, ProtocolNetwork } from '@airgap/module-kit';
+import { BlockExplorer } from '@airgap/module-kit/block-explorer/block-explorer';
+import { OfflineProtocol, OnlineProtocol } from '@airgap/module-kit/protocol/protocol';
+export declare class ERC20Module implements AirGapModule {
+    readonly supportedNetworks: Record<string, ProtocolNetwork>;
+    createOfflineProtocol(): Promise<OfflineProtocol | undefined>;
+    createOnlineProtocol(networkId?: string | undefined): Promise<OnlineProtocol | undefined>;
+    createBlockExplorer(networkId?: string | undefined): Promise<BlockExplorer | undefined>;
+}

package/v1/module/ERC20Module.js

@@ -0,0 +1,69 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ERC20Module = void 0;
+var ERC20Module = /** @class */ (function () {
+    function ERC20Module() {
+        // TODO: figure out what to do with modules that should create generic protocols instances
+        this.supportedNetworks = {};
+    }
+    ERC20Module.prototype.createOfflineProtocol = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                throw new Error('Method not implemented.');
+            });
+        });
+    };
+    ERC20Module.prototype.createOnlineProtocol = function (networkId) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                throw new Error('Method not implemented.');
+            });
+        });
+    };
+    ERC20Module.prototype.createBlockExplorer = function (networkId) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                throw new Error('Method not implemented.');
+            });
+        });
+    };
+    return ERC20Module;
+}());
+exports.ERC20Module = ERC20Module;
+//# sourceMappingURL=ERC20Module.js.map

package/v1/module/ERC20Module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ERC20Module.js","sourceRoot":"","sources":["../../../src/v1/module/ERC20Module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA;IAAA;QACE,0FAA0F;QAE1E,sBAAiB,GAAoC,EAAE,CAAA;IAazE,CAAC;IAXc,2CAAqB,GAAlC;;;gBACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;;;KAC3C;IAEY,0CAAoB,GAAjC,UAAkC,SAA8B;;;gBAC9D,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;;;KAC3C;IAEY,yCAAmB,GAAhC,UAAiC,SAA8B;;;gBAC7D,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;;;KAC3C;IACH,kBAAC;AAAD,CAAC,AAhBD,IAgBC;AAhBY,kCAAW"}

package/v1/module/EthereumBaseModule.d.ts

@@ -0,0 +1,13 @@
+import { AirGapModule, ProtocolNetwork } from '@airgap/module-kit';
+import { BlockExplorer } from '@airgap/module-kit/block-explorer/block-explorer';
+import { OfflineProtocol, OnlineProtocol } from '@airgap/module-kit/protocol/protocol';
+import { EthereumBaseProtocol } from '../protocol/EthereumBaseProtocol';
+export declare abstract class EthereumBaseModule implements AirGapModule {
+    readonly supportedNetworks: Record<string, ProtocolNetwork>;
+    private readonly networkRegistry;
+    protected constructor(supportedNetworks: ProtocolNetwork[], defaultNetwork?: ProtocolNetwork);
+    abstract createEthereumProtocol(network?: ProtocolNetwork): EthereumBaseProtocol;
+    createOfflineProtocol(): Promise<OfflineProtocol | undefined>;
+    createOnlineProtocol(networkId?: string | undefined): Promise<OnlineProtocol | undefined>;
+    createBlockExplorer(networkId?: string | undefined): Promise<BlockExplorer | undefined>;
+}

package/v1/module/EthereumBaseModule.js

@@ -0,0 +1,83 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EthereumBaseModule = void 0;
+var coinlib_core_1 = require("@airgap/coinlib-core");
+var errors_1 = require("@airgap/coinlib-core/errors");
+var module_kit_1 = require("@airgap/module-kit");
+var EtherscanBlockExplorer_1 = require("../block-explorer/EtherscanBlockExplorer");
+var EthereumBaseModule = /** @class */ (function () {
+    function EthereumBaseModule(supportedNetworks, defaultNetwork) {
+        this.networkRegistry = new module_kit_1.ModuleNetworkRegistry({ supportedNetworks: supportedNetworks, defaultNetwork: defaultNetwork });
+        this.supportedNetworks = this.networkRegistry.supportedNetworks;
+    }
+    EthereumBaseModule.prototype.createOfflineProtocol = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.createEthereumProtocol()];
+            });
+        });
+    };
+    EthereumBaseModule.prototype.createOnlineProtocol = function (networkId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var network;
+            return __generator(this, function (_a) {
+                network = this.networkRegistry.findNetwork(networkId);
+                if (network === undefined) {
+                    throw new errors_1.ConditionViolationError(coinlib_core_1.Domain.ETHEREUM, 'Protocol network type not supported.');
+                }
+                return [2 /*return*/, this.createEthereumProtocol(network)];
+            });
+        });
+    };
+    EthereumBaseModule.prototype.createBlockExplorer = function (networkId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var network;
+            return __generator(this, function (_a) {
+                network = this.networkRegistry.findNetwork(networkId);
+                if (network === undefined) {
+                    throw new errors_1.ConditionViolationError(coinlib_core_1.Domain.ETHEREUM, 'Block Explorer network type not supported.');
+                }
+                return [2 /*return*/, new EtherscanBlockExplorer_1.EtherscanBlockExplorer()];
+            });
+        });
+    };
+    return EthereumBaseModule;
+}());
+exports.EthereumBaseModule = EthereumBaseModule;
+//# sourceMappingURL=EthereumBaseModule.js.map

package/v1/module/EthereumBaseModule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EthereumBaseModule.js","sourceRoot":"","sources":["../../../src/v1/module/EthereumBaseModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAA6C;AAC7C,sDAAqE;AACrE,iDAAyF;AAIzF,mFAAiF;AAGjF;IAKE,4BAAsB,iBAAoC,EAAE,cAAgC;QAC1F,IAAI,CAAC,eAAe,GAAG,IAAI,kCAAqB,CAAC,EAAE,iBAAiB,mBAAA,EAAE,cAAc,gBAAA,EAAE,CAAC,CAAA;QACvF,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAA;IACjE,CAAC;IAIY,kDAAqB,GAAlC;;;gBACE,sBAAO,IAAI,CAAC,sBAAsB,EAAE,EAAA;;;KACrC;IAEY,iDAAoB,GAAjC,UAAkC,SAA8B;;;;gBACxD,OAAO,GAAgC,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;gBACxF,IAAI,OAAO,KAAK,SAAS,EAAE;oBACzB,MAAM,IAAI,gCAAuB,CAAC,qBAAM,CAAC,QAAQ,EAAE,sCAAsC,CAAC,CAAA;iBAC3F;gBAED,sBAAO,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAA;;;KAC5C;IAEY,gDAAmB,GAAhC,UAAiC,SAA8B;;;;gBACvD,OAAO,GAAgC,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;gBACxF,IAAI,OAAO,KAAK,SAAS,EAAE;oBACzB,MAAM,IAAI,gCAAuB,CAAC,qBAAM,CAAC,QAAQ,EAAE,4CAA4C,CAAC,CAAA;iBACjG;gBAED,sBAAO,IAAI,+CAAsB,EAAE,EAAA;;;KACpC;IACH,yBAAC;AAAD,CAAC,AAjCD,IAiCC;AAjCqB,gDAAkB"}

package/v1/module/EthereumClassicModule.d.ts

@@ -0,0 +1,7 @@
+import { ProtocolNetwork } from '@airgap/module-kit';
+import { EthereumBaseProtocol } from '../protocol/EthereumBaseProtocol';
+import { EthereumBaseModule } from './EthereumBaseModule';
+export declare class EthereumClassicModule extends EthereumBaseModule {
+    constructor();
+    createEthereumProtocol(network?: ProtocolNetwork | undefined): EthereumBaseProtocol;
+}

package/v1/module/EthereumClassicModule.js

@@ -0,0 +1,32 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EthereumClassicModule = void 0;
+var EthereumClassicProtocol_1 = require("../protocol/EthereumClassicProtocol");
+var EthereumBaseModule_1 = require("./EthereumBaseModule");
+var EthereumClassicModule = /** @class */ (function (_super) {
+    __extends(EthereumClassicModule, _super);
+    function EthereumClassicModule() {
+        return _super.call(this, [EthereumClassicProtocol_1.ETHEREUM_CLASSIC_MAINNET_PROTOCOL_NETWORK]) || this;
+    }
+    EthereumClassicModule.prototype.createEthereumProtocol = function (network) {
+        return (0, EthereumClassicProtocol_1.createEthereumClassicProtocol)({ network: network });
+    };
+    return EthereumClassicModule;
+}(EthereumBaseModule_1.EthereumBaseModule));
+exports.EthereumClassicModule = EthereumClassicModule;
+//# sourceMappingURL=EthereumClassicModule.js.map

package/v1/module/EthereumClassicModule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EthereumClassicModule.js","sourceRoot":"","sources":["../../../src/v1/module/EthereumClassicModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAGA,+EAA8H;AAE9H,2DAAyD;AAEzD;IAA2C,yCAAkB;IAC3D;eACE,kBAAM,CAAC,mEAAyC,CAAC,CAAC;IACpD,CAAC;IAEM,sDAAsB,GAA7B,UAA8B,OAAqC;QACjE,OAAO,IAAA,uDAA6B,EAAC,EAAE,OAAO,SAAA,EAAE,CAAC,CAAA;IACnD,CAAC;IACH,4BAAC;AAAD,CAAC,AARD,CAA2C,uCAAkB,GAQ5D;AARY,sDAAqB"}

package/v1/module/EthereumModule.d.ts

@@ -1,12 +1,7 @@
-import { AirGapModule, ProtocolConfiguration, ProtocolNetwork } from '@airgap/module-kit';
-import { BlockExplorer } from '@airgap/module-kit/block-explorer/block-explorer';
-import { AirGapProtocol, OfflineProtocol, OnlineProtocol } from '@airgap/module-kit/protocol/protocol';
-export declare class EthereumModule implements AirGapModule {
-    private readonly networkRegistries;
-    readonly supportedProtocols: Record<string, ProtocolConfiguration>;
+import { ProtocolNetwork } from '@airgap/module-kit';
+import { EthereumBaseProtocol } from '../protocol/EthereumBaseProtocol';
+import { EthereumBaseModule } from './EthereumBaseModule';
+export declare class EthereumModule extends EthereumBaseModule {
     constructor();
-    createOfflineProtocol(identifier: string): Promise<OfflineProtocol | undefined>;
-    createOnlineProtocol(identifier: string, networkId?: string): Promise<OnlineProtocol | undefined>;
-    createBlockExplorer(identifier: string, networkId?: string): Promise<BlockExplorer | undefined>;
-    createProtocol(identifier: string, network?: ProtocolNetwork): AirGapProtocol;
+    createEthereumProtocol(network?: ProtocolNetwork | undefined): EthereumBaseProtocol;
 }

package/v1/module/EthereumModule.js

@@ -1,118 +1,32 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
     };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EthereumModule = void 0;
-var coinlib_core_1 = require("@airgap/coinlib-core");
-var errors_1 = require("@airgap/coinlib-core/errors");
-var module_kit_1 = require("@airgap/module-kit");
-var EtherscanBlockExplorer_1 = require("../block-explorer/EtherscanBlockExplorer");
-var ERC20Token_1 = require("../protocol/erc20/ERC20Token");
 var EthereumProtocol_1 = require("../protocol/EthereumProtocol");
-var EthereumRopstenProtocol_1 = require("../protocol/EthereumRopstenProtocol");
-var ERC20Tokens_1 = require("./ERC20Tokens");
-var EthereumModule = /** @class */ (function () {
+var EthereumBaseModule_1 = require("./EthereumBaseModule");
+var EthereumModule = /** @class */ (function (_super) {
+    __extends(EthereumModule, _super);
     function EthereumModule() {
-        var _a;
-        var networkRegistry = new module_kit_1.ModuleNetworkRegistry({
-            supportedNetworks: [EthereumProtocol_1.ETHEREUM_MAINNET_PROTOCOL_NETWORK]
-        });
-        var ropstenNetworkRegistry = new module_kit_1.ModuleNetworkRegistry({
-            supportedNetworks: [EthereumRopstenProtocol_1.ETHEREUM_ROPSTEN_MAINNET_PROTOCOL_NETWORK]
-        });
-        this.networkRegistries = __assign((_a = {}, _a[coinlib_core_1.MainProtocolSymbols.ETH] = networkRegistry, _a), ERC20Tokens_1.erc20TokensIdentifiers.reduce(function (obj, next) {
-            var _a;
-            return Object.assign(obj, (_a = {}, _a[next] = ropstenNetworkRegistry, _a));
-        }, {}));
-        this.supportedProtocols = (0, module_kit_1.createSupportedProtocols)(this.networkRegistries);
+        return _super.call(this, [EthereumProtocol_1.ETHEREUM_MAINNET_PROTOCOL_NETWORK]) || this;
     }
-    EthereumModule.prototype.createOfflineProtocol = function (identifier) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.createProtocol(identifier)];
-            });
-        });
-    };
-    EthereumModule.prototype.createOnlineProtocol = function (identifier, networkId) {
-        return __awaiter(this, void 0, void 0, function () {
-            var network;
-            return __generator(this, function (_a) {
-                network = this.networkRegistries[identifier].findNetwork(networkId);
-                if (network === undefined) {
-                    throw new errors_1.ConditionViolationError(coinlib_core_1.Domain.ETHEREUM, 'Protocol network type not supported.');
-                }
-                return [2 /*return*/, this.createProtocol(identifier, network)];
-            });
-        });
-    };
-    EthereumModule.prototype.createBlockExplorer = function (identifier, networkId) {
-        return __awaiter(this, void 0, void 0, function () {
-            var network;
-            return __generator(this, function (_a) {
-                network = this.networkRegistries[identifier].findNetwork(networkId);
-                if (network === undefined) {
-                    throw new errors_1.ConditionViolationError(coinlib_core_1.Domain.ETHEREUM, 'Block Explorer network type not supported.');
-                }
-                return [2 /*return*/, new EtherscanBlockExplorer_1.EtherscanBlockExplorer()];
-            });
-        });
-    };
-    EthereumModule.prototype.createProtocol = function (identifier, network) {
-        if (identifier === coinlib_core_1.MainProtocolSymbols.ETH) {
-            return (0, EthereumProtocol_1.createEthereumProtocol)({ network: network });
-        }
-        if (ERC20Tokens_1.erc20Tokens[identifier] !== undefined) {
-            var tokenMetadata = ERC20Tokens_1.erc20Tokens[identifier];
-            return (0, ERC20Token_1.createERC20Token)(tokenMetadata);
-        }
-        throw new errors_1.ConditionViolationError(coinlib_core_1.Domain.ETHEREUM, "Protocol ".concat(identifier, " not supported."));
+    EthereumModule.prototype.createEthereumProtocol = function (network) {
+        return (0, EthereumProtocol_1.createEthereumProtocol)({ network: network });
     };
     return EthereumModule;
-}());
+}(EthereumBaseModule_1.EthereumBaseModule));
 exports.EthereumModule = EthereumModule;
 //# sourceMappingURL=EthereumModule.js.map

package/v1/module/EthereumModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"EthereumModule.js","sourceRoot":"","sources":["../../../src/v1/module/EthereumModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAkE;AAClE,sDAAqE;AACrE,iDAA0I;AAI1I,mFAAiF;AACjF,2DAA+D;AAC/D,iEAAwG;AACxG,+EAA+F;AAG/F,6CAAmE;AAEnE;IAIE;;QACE,IAAM,eAAe,GAA0B,IAAI,kCAAqB,CAAC;YACvE,iBAAiB,EAAE,CAAC,oDAAiC,CAAC;SACvD,CAAC,CAAA;QACF,IAAM,sBAAsB,GAA0B,IAAI,kCAAqB,CAAC;YAC9E,iBAAiB,EAAE,CAAC,mEAAyC,CAAC;SAC/D,CAAC,CAAA;QACF,IAAI,CAAC,iBAAiB,yBACnB,kCAAmB,CAAC,GAAG,IAAG,eAAe,OACvC,oCAAsB,CAAC,MAAM,CAC9B,UAAC,GAA0C,EAAE,IAAY;;YAAK,OAAA,MAAM,CAAC,MAAM,CAAC,GAAG,YAAI,GAAC,IAAI,IAAG,sBAAsB,MAAG;QAAtD,CAAsD,EACpH,EAAE,CACH,CACF,CAAA;QACD,IAAI,CAAC,kBAAkB,GAAG,IAAA,qCAAwB,EAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;IAC5E,CAAC;IAEY,8CAAqB,GAAlC,UAAmC,UAAkB;;;gBACnD,sBAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,EAAA;;;KACvC;IAEY,6CAAoB,GAAjC,UAAkC,UAAkB,EAAE,SAAkB;;;;gBAChE,OAAO,GAAgC,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;gBACtG,IAAI,OAAO,KAAK,SAAS,EAAE;oBACzB,MAAM,IAAI,gCAAuB,CAAC,qBAAM,CAAC,QAAQ,EAAE,sCAAsC,CAAC,CAAA;iBAC3F;gBAED,sBAAO,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,EAAA;;;KAChD;IAEY,4CAAmB,GAAhC,UAAiC,UAAkB,EAAE,SAAkB;;;;gBAC/D,OAAO,GAAgC,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;gBACtG,IAAI,OAAO,KAAK,SAAS,EAAE;oBACzB,MAAM,IAAI,gCAAuB,CAAC,qBAAM,CAAC,QAAQ,EAAE,4CAA4C,CAAC,CAAA;iBACjG;gBAED,sBAAO,IAAI,+CAAsB,EAAE,EAAA;;;KACpC;IAEM,uCAAc,GAArB,UAAsB,UAAkB,EAAE,OAAyB;QACjE,IAAI,UAAU,KAAK,kCAAmB,CAAC,GAAG,EAAE;YAC1C,OAAO,IAAA,yCAAsB,EAAC,EAAE,OAAO,SAAA,EAAE,CAAC,CAAA;SAC3C;QAED,IAAI,yBAAW,CAAC,UAAU,CAAC,KAAK,SAAS,EAAE;YACzC,IAAM,aAAa,GAAuB,yBAAW,CAAC,UAAU,CAAC,CAAA;YAEjE,OAAO,IAAA,6BAAgB,EAAC,aAAa,CAAC,CAAA;SACvC;QAED,MAAM,IAAI,gCAAuB,CAAC,qBAAM,CAAC,QAAQ,EAAE,mBAAY,UAAU,oBAAiB,CAAC,CAAA;IAC7F,CAAC;IACH,qBAAC;AAAD,CAAC,AAxDD,IAwDC;AAxDY,wCAAc"}
+{"version":3,"file":"EthereumModule.js","sourceRoot":"","sources":["../../../src/v1/module/EthereumModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAGA,iEAAwG;AAExG,2DAAyD;AAEzD;IAAoC,kCAAkB;IACpD;eACE,kBAAM,CAAC,oDAAiC,CAAC,CAAC;IAC5C,CAAC;IAEM,+CAAsB,GAA7B,UAA8B,OAAqC;QACjE,OAAO,IAAA,yCAAsB,EAAC,EAAE,OAAO,SAAA,EAAE,CAAC,CAAA;IAC5C,CAAC;IACH,qBAAC;AAAD,CAAC,AARD,CAAoC,uCAAkB,GAQrD;AARY,wCAAc"}

package/v1/module/EthereumRopstenModule.d.ts

@@ -0,0 +1,7 @@
+import { ProtocolNetwork } from '@airgap/module-kit';
+import { EthereumBaseProtocol } from '../protocol/EthereumBaseProtocol';
+import { EthereumBaseModule } from './EthereumBaseModule';
+export declare class EthereumRopstenModule extends EthereumBaseModule {
+    constructor();
+    createEthereumProtocol(network?: ProtocolNetwork | undefined): EthereumBaseProtocol;
+}

package/v1/module/EthereumRopstenModule.js

@@ -0,0 +1,32 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EthereumRopstenModule = void 0;
+var EthereumRopstenProtocol_1 = require("../protocol/EthereumRopstenProtocol");
+var EthereumBaseModule_1 = require("./EthereumBaseModule");
+var EthereumRopstenModule = /** @class */ (function (_super) {
+    __extends(EthereumRopstenModule, _super);
+    function EthereumRopstenModule() {
+        return _super.call(this, [EthereumRopstenProtocol_1.ETHEREUM_ROPSTEN_MAINNET_PROTOCOL_NETWORK]) || this;
+    }
+    EthereumRopstenModule.prototype.createEthereumProtocol = function (network) {
+        return (0, EthereumRopstenProtocol_1.createEthereumRopstenProtocol)({ network: network });
+    };
+    return EthereumRopstenModule;
+}(EthereumBaseModule_1.EthereumBaseModule));
+exports.EthereumRopstenModule = EthereumRopstenModule;
+//# sourceMappingURL=EthereumRopstenModule.js.map

package/v1/module/EthereumRopstenModule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EthereumRopstenModule.js","sourceRoot":"","sources":["../../../src/v1/module/EthereumRopstenModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAGA,+EAA8H;AAE9H,2DAAyD;AAEzD;IAA2C,yCAAkB;IAC3D;eACE,kBAAM,CAAC,mEAAyC,CAAC,CAAC;IACpD,CAAC;IAEM,sDAAsB,GAA7B,UAA8B,OAAqC;QACjE,OAAO,IAAA,uDAA6B,EAAC,EAAE,OAAO,SAAA,EAAE,CAAC,CAAA;IACnD,CAAC;IACH,4BAAC;AAAD,CAAC,AARD,CAA2C,uCAAkB,GAQ5D;AARY,sDAAqB"}

package/v1/protocol/EthereumBaseProtocol.js

@@ -148,9 +148,7 @@ var EthereumBaseProtocolImpl = /** @class */ (function () {
             units: options.units,
             mainUnit: options.mainUnit,
             fee: {
-                defaults: this.feeDefaults,
-                units: this.feeUnits,
-                mainUnit: 'ETH'
+                defaults: this.feeDefaults
             },
             account: {
                 standardDerivationPath: (_b = options.standardDerivationPath) !== null && _b !== void 0 ? _b : "m/44'/60'/0'/0/0",
@@ -241,7 +239,7 @@ var EthereumBaseProtocolImpl = /** @class */ (function () {
                                     hash: "0x".concat(tx.hash().toString('hex'))
                                 },
                                 arbitraryData: "0x".concat(tx.data.toString('hex')),
-                                extra: {
+                                json: {
                                     chainId: chainId,
                                     nonce: parseInt(hexNonce, 16)
                                 }
@@ -259,7 +257,7 @@ var EthereumBaseProtocolImpl = /** @class */ (function () {
                                 fee: (0, module_kit_1.newAmount)(new bignumber_1.BigNumber(feeTx.gasLimit.toString(10)).multipliedBy(feeTx.maxFeePerGas.toString(10)), 'blockchain'),
                                 network: this.options.network,
                                 arbitraryData: feeTx.data.toString('hex'),
-                                extra: {
+                                json: {
                                     chainId: feeTx.chainId.toNumber(),
                                     nonce: feeTx.nonce.toNumber()
                                 }