@airgap/coinlib-core 0.13.7-beta.0 → 0.13.7-beta.2

package/protocols/tezos/TezosProtocol.js

@@ -91,7 +91,6 @@ var index_2 = require("../../dependencies/src/bip39-2.5.0/index");
 var bs58check = __importStar(require("../../dependencies/src/bs58check-2.1.2/index"));
 var index_3 = require("../../dependencies/src/hd-wallet-js-b216450e56954a6e82ace0aade9474673de5d9d5/src/index");
 var ProtocolSymbols_1 = require("../../utils/ProtocolSymbols");
-var subProtocols_1 = require("../../utils/subProtocols");
 var NonExtendedProtocol_1 = require("../NonExtendedProtocol");
 var TezosAddress_1 = require("./TezosAddress");
 var TezosCryptoClient_1 = require("./TezosCryptoClient");
@@ -124,34 +123,49 @@ var TezosNetwork;
 })(TezosNetwork = exports.TezosNetwork || (exports.TezosNetwork = {}));
 var TezosProtocol = /** @class */ (function (_super) {
     __extends(TezosProtocol, _super);
-    function TezosProtocol(options) {
-        if (options === void 0) { options = new TezosProtocolOptions_1.TezosProtocolOptions(); }
+    function TezosProtocol(_options) {
+        if (_options === void 0) { _options = new TezosProtocolOptions_1.TezosProtocolOptions(); }
         var _this = _super.call(this) || this;
-        _this.options = options;
-        _this.symbol = 'XTZ';
-        _this.name = 'Tezos';
-        _this.marketSymbol = 'xtz';
-        _this.feeSymbol = 'xtz';
-        _this.decimals = 6;
-        _this.feeDecimals = 6; // micro tez is the smallest, 1000000 microtez is 1 tez
-        _this.identifier = ProtocolSymbols_1.MainProtocolSymbols.XTZ;
+        _this._options = _options;
+        _this._symbol = 'XTZ';
+        _this.symbol = Promise.resolve(_this._symbol);
+        _this._name = 'Tezos';
+        _this.name = Promise.resolve(_this._name);
+        _this._marketSymbol = 'xtz';
+        _this.marketSymbol = Promise.resolve(_this._marketSymbol);
+        _this._feeSymbol = 'xtz';
+        _this.feeSymbol = Promise.resolve(_this._feeSymbol);
+        _this._decimals = 6;
+        _this.decimals = Promise.resolve(_this._decimals);
+        _this._feeDecimals = 6; // micro tez is the smallest, 1000000 microtez is 1 tez
+        _this.feeDecimals = Promise.resolve(_this._feeDecimals);
+        _this._identifier = ProtocolSymbols_1.MainProtocolSymbols.XTZ;
+        _this.identifier = Promise.resolve(_this._identifier);
         // tezbox default
-        _this.feeDefaults = {
+        _this._feeDefaults = {
             low: '0.001420',
             medium: '0.001520',
             high: '0.003000'
         };
-        _this.units = [
+        _this.feeDefaults = Promise.resolve(_this._feeDefaults);
+        _this._units = [
             {
                 unitSymbol: 'XTZ',
                 factor: '1'
             }
         ];
-        _this.supportsHD = false;
-        _this.standardDerivationPath = "m/44h/1729h/0h/0h";
-        _this.addressIsCaseSensitive = true;
-        _this.addressValidationPattern = '^((tz1|tz2|tz3|KT1)[1-9A-Za-z]{33}|zet1[1-9A-Za-z]{65})$';
-        _this.addressPlaceholder = 'tz1...';
+        _this.units = Promise.resolve(_this._units);
+        _this._supportsHD = false;
+        _this.supportsHD = Promise.resolve(_this._supportsHD);
+        _this._standardDerivationPath = "m/44h/1729h/0h/0h";
+        _this.standardDerivationPath = Promise.resolve(_this._standardDerivationPath);
+        _this._addressIsCaseSensitive = true;
+        _this.addressIsCaseSensitive = Promise.resolve(_this._addressIsCaseSensitive);
+        _this._addressValidationPattern = '^((tz1|tz2|tz3|KT1)[1-9A-Za-z]{33}|zet1[1-9A-Za-z]{65})$';
+        _this.addressValidationPattern = Promise.resolve(_this._addressValidationPattern);
+        _this._addressPlaceholder = 'tz1...';
+        _this.addressPlaceholder = Promise.resolve(_this._addressPlaceholder);
+        _this.options = Promise.resolve(_this._options);
         // https://gitlab.com/tezos/tezos/-/blob/master/docs/whitedoc/proof_of_stake.rst
         // cycle has 4096 blocks, which are at least one minute apart
         _this.minCycleDuration = 4096 * 60 * 1000; // ms
@@ -164,17 +178,10 @@ var TezosProtocol = /** @class */ (function (_super) {
         _this.cryptoClient = new TezosCryptoClient_1.TezosCryptoClient(TezosUtils_1.TezosUtils.tezosPrefixes.edsig);
         return _this;
     }
-    Object.defineProperty(TezosProtocol.prototype, "subProtocols", {
-        get: function () {
-            return subProtocols_1.getSubProtocolsByIdentifier(this.identifier, this.options.network);
-        },
-        enumerable: false,
-        configurable: true
-    });
     Object.defineProperty(TezosProtocol.prototype, "jsonRPCAPI", {
-        // TODO: Should we remove these getters and replace the calls to `this.options.network...`?
+        // TODO: Should we remove these getters and replace the calls to `this._options.network...`?
         get: function () {
-            return this.options.network.rpcUrl;
+            return this._options.network.rpcUrl;
         },
         enumerable: false,
         configurable: true
@@ -182,14 +189,14 @@ var TezosProtocol = /** @class */ (function (_super) {
     TezosProtocol.prototype.getBlockExplorerLinkForAddress = function (address) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.options.network.blockExplorer.getAddressLink(address)];
+                return [2 /*return*/, this._options.network.blockExplorer.getAddressLink(address)];
             });
         });
     };
     TezosProtocol.prototype.getBlockExplorerLinkForTxId = function (txId) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.options.network.blockExplorer.getTransactionLink(txId)];
+                return [2 /*return*/, this._options.network.blockExplorer.getTransactionLink(txId)];
             });
         });
     };
@@ -237,23 +244,32 @@ var TezosProtocol = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 secretKey = index_3.generateWalletUsingDerivationPath(Buffer.from(secret, 'hex'), derivationPath) // TODO: Look into typings
                 .secretKey;
-                return [2 /*return*/, Buffer.from(secretKey)];
+                return [2 /*return*/, Buffer.from(secretKey).toString('hex')];
             });
         });
     };
-    TezosProtocol.prototype.getAddressFromPublicKey = function (publicKey) {
+    TezosProtocol.prototype.getAddressFromPublicKey = function (publicKey, cursor) {
         return __awaiter(this, void 0, void 0, function () {
+            var address;
             return __generator(this, function (_a) {
-                return [2 /*return*/, TezosAddress_1.TezosAddress.fromPublicKey(publicKey)];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, TezosAddress_1.TezosAddress.fromPublicKey(publicKey)];
+                    case 1:
+                        address = _a.sent();
+                        return [2 /*return*/, {
+                                address: address.asString(),
+                                cursor: { hasNext: false }
+                            }];
+                }
             });
         });
     };
-    TezosProtocol.prototype.getAddressesFromPublicKey = function (publicKey) {
+    TezosProtocol.prototype.getAddressesFromPublicKey = function (publicKey, cursor) {
         return __awaiter(this, void 0, void 0, function () {
             var address;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
+                    case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey, cursor)];
                     case 1:
                         address = _a.sent();
                         return [2 /*return*/, [address]];
@@ -261,20 +277,13 @@ var TezosProtocol = /** @class */ (function (_super) {
             });
         });
     };
-    TezosProtocol.prototype.getNextAddressFromPublicKey = function (publicKey, current) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, current];
-            });
-        });
-    };
     TezosProtocol.prototype.getTransactionsFromPublicKey = function (publicKey, limit, cursor) {
         return __awaiter(this, void 0, void 0, function () {
             var addresses;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.getAddressesFromPublicKey(publicKey).then(function (addresses) {
-                            return addresses.map(function (address) { return address.getValue(); });
+                            return addresses.map(function (address) { return address.address; });
                         })];
                     case 1:
                         addresses = _a.sent();
@@ -292,11 +301,11 @@ var TezosProtocol = /** @class */ (function (_super) {
                 switch (_b.label) {
                     case 0:
                         address = addresses[0];
-                        return [4 /*yield*/, this.options.network.extras.indexerClient.getTransactions(address, limit, cursor === null || cursor === void 0 ? void 0 : cursor.offset)];
+                        return [4 /*yield*/, this._options.network.extras.indexerClient.getTransactions(address, limit, cursor === null || cursor === void 0 ? void 0 : cursor.offset)];
                     case 1:
                         results = _b.sent();
                         return [2 /*return*/, {
-                                transactions: results.map(function (transaction) { return (__assign(__assign({}, transaction), { protocolIdentifier: _this.identifier, network: _this.options.network })); }),
+                                transactions: results.map(function (transaction) { return (__assign(__assign({}, transaction), { protocolIdentifier: _this._identifier, network: _this._options.network })); }),
                                 cursor: { offset: ((_a = cursor === null || cursor === void 0 ? void 0 : cursor.offset) !== null && _a !== void 0 ? _a : 0) + results.length }
                             }];
                 }
@@ -308,7 +317,7 @@ var TezosProtocol = /** @class */ (function (_super) {
             var opSignature, signedOpBytes;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.cryptoClient.operationSignature(privateKey, transaction)];
+                    case 0: return [4 /*yield*/, this.cryptoClient.operationSignature(Buffer.from(privateKey, 'hex'), transaction)];
                     case 1:
                         opSignature = _a.sent();
                         signedOpBytes = Buffer.concat([Buffer.from(transaction.binaryTransaction, 'hex'), Buffer.from(opSignature)]);
@@ -419,10 +428,11 @@ var TezosProtocol = /** @class */ (function (_super) {
                                     return [3 /*break*/, 8];
                                 case 6: throw new index_4.UnsupportedError(coinlib_error_1.Domain.TEZOS, 'operation not supported: ' + JSON.stringify(tezosOperation.kind));
                                 case 7:
+                                    // Exhaustive switch
                                     assertNever(tezosOperation.kind);
                                     throw new index_4.NotFoundError(coinlib_error_1.Domain.TEZOS, 'no operation to unforge found');
                                 case 8: return [2 /*return*/, partialTxs.map(function (partialTx) {
-                                        return __assign({ amount: '0', fee: operation !== undefined ? new bignumber_1.default(operation.fee).toString(10) : '0', from: [], isInbound: false, protocolIdentifier: _this.identifier, network: _this.options.network, to: [], transactionDetails: tezosOperation }, partialTx);
+                                        return __assign({ amount: '0', fee: operation !== undefined ? new bignumber_1.default(operation.fee).toString(10) : '0', from: [], isInbound: false, protocolIdentifier: _this._identifier, network: _this._options.network, to: [], transactionDetails: tezosOperation }, partialTx);
                                     })];
                             }
                         });
@@ -447,7 +457,7 @@ var TezosProtocol = /** @class */ (function (_super) {
                         _a.label = 2;
                     case 2:
                         _a.trys.push([2, 4, , 5]);
-                        return [4 /*yield*/, index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + address + "/balance")];
+                        return [4 /*yield*/, index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + address + "/balance")];
                     case 3:
                         data = (_a.sent()).data;
                         balance = balance.plus(new bignumber_1.default(data));
@@ -475,7 +485,7 @@ var TezosProtocol = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
                         address = _a.sent();
-                        return [2 /*return*/, this.getBalanceOfAddresses([address.getValue()], data)];
+                        return [2 /*return*/, this.getBalanceOfAddresses([address.address], data)];
                 }
             });
         });
@@ -524,7 +534,7 @@ var TezosProtocol = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.estimateFeeDefaultsFromPublicKey(publicKey, recipients, [balance.toFixed()])];
                     case 2:
                         estimatedFeeDefaults = _a.sent();
-                        maxFee = new bignumber_1.default(estimatedFeeDefaults.medium).shiftedBy(this.decimals);
+                        maxFee = new bignumber_1.default(estimatedFeeDefaults.medium).shiftedBy(this._decimals);
                         if (maxFee.gte(balance)) {
                             maxFee = new bignumber_1.default(0);
                         }
@@ -601,9 +611,9 @@ var TezosProtocol = /** @class */ (function (_super) {
                         mediumFee = lowFee.plus(lowFee.times(feeStepFactor).integerValue(bignumber_1.default.ROUND_FLOOR));
                         highFee = mediumFee.plus(mediumFee.times(feeStepFactor).integerValue(bignumber_1.default.ROUND_FLOOR));
                         return [2 /*return*/, {
-                                low: lowFee.shiftedBy(-this.feeDecimals).toFixed(),
-                                medium: mediumFee.shiftedBy(-this.feeDecimals).toFixed(),
-                                high: highFee.shiftedBy(-this.feeDecimals).toFixed()
+                                low: lowFee.shiftedBy(-this._feeDecimals).toFixed(),
+                                medium: mediumFee.shiftedBy(-this._feeDecimals).toFixed(),
+                                high: highFee.shiftedBy(-this._feeDecimals).toFixed()
                             }];
                 }
             });
@@ -650,7 +660,7 @@ var TezosProtocol = /** @class */ (function (_super) {
                         operations = [];
                         addressIndex = data && data.addressIndex ? data.addressIndex : 0;
                         return [4 /*yield*/, this.getAddressesFromPublicKey(publicKey).then(function (addresses) {
-                                return addresses.map(function (address) { return address.getValue(); });
+                                return addresses.map(function (address) { return address.address; });
                             })];
                     case 1:
                         addresses = _f.sent();
@@ -659,9 +669,9 @@ var TezosProtocol = /** @class */ (function (_super) {
                         }
                         address = addresses[addressIndex];
                         return [4 /*yield*/, Promise.all([
-                                index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + address + "/counter"),
-                                index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head~2/hash"),
-                                index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + address + "/manager_key")
+                                index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + address + "/counter"),
+                                index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head~2/hash"),
+                                index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + address + "/manager_key")
                             ]).catch(function (error) {
                                 throw new index_4.NetworkError(coinlib_error_1.Domain.TEZOS, error);
                             })];
@@ -815,7 +825,7 @@ var TezosProtocol = /** @class */ (function (_super) {
             var activeBakers;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head/context/delegates?active")];
+                    case 0: return [4 /*yield*/, index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head/context/delegates?active")];
                     case 1:
                         activeBakers = (_a.sent()).data;
                         return [2 /*return*/, activeBakers[0] || ''];
@@ -831,7 +841,7 @@ var TezosProtocol = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
                         address = _a.sent();
-                        return [2 /*return*/, this.getCurrentDelegateesForAddress(address.getValue())];
+                        return [2 /*return*/, this.getCurrentDelegateesForAddress(address.address)];
                 }
             });
         });
@@ -841,7 +851,7 @@ var TezosProtocol = /** @class */ (function (_super) {
             var data;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + address)];
+                    case 0: return [4 /*yield*/, index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + address)];
                     case 1:
                         data = (_a.sent()).data;
                         return [2 /*return*/, data.delegate ? [data.delegate] : []];
@@ -854,7 +864,7 @@ var TezosProtocol = /** @class */ (function (_super) {
             var response, isBakingActive;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head/context/delegates/" + address + "/deactivated")];
+                    case 0: return [4 /*yield*/, index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head/context/delegates/" + address + "/deactivated")];
                     case 1:
                         response = _a.sent();
                         isBakingActive = !response.data;
@@ -874,7 +884,7 @@ var TezosProtocol = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
                         address = _a.sent();
-                        return [2 /*return*/, this.isAddressDelegating(address.getValue())];
+                        return [2 /*return*/, this.isAddressDelegating(address.address)];
                 }
             });
         });
@@ -884,7 +894,7 @@ var TezosProtocol = /** @class */ (function (_super) {
             var data;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + address)];
+                    case 0: return [4 /*yield*/, index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + address)];
                     case 1:
                         data = (_a.sent()).data;
                         return [2 /*return*/, !!data.delegate];
@@ -900,7 +910,7 @@ var TezosProtocol = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
                         address = _a.sent();
-                        return [2 /*return*/, this.getDelegatorDetailsFromAddress(address.getValue())];
+                        return [2 /*return*/, this.getDelegatorDetailsFromAddress(address.address)];
                 }
             });
         });
@@ -920,7 +930,7 @@ var TezosProtocol = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
                         address = _a.sent();
-                        return [2 /*return*/, this.getDelegationDetailsFromAddress(address.getValue(), delegatees)];
+                        return [2 /*return*/, this.getDelegationDetailsFromAddress(address.address, delegatees)];
                 }
             });
         });
@@ -954,7 +964,7 @@ var TezosProtocol = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, Promise.all([
-                            index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + address)
+                            index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + address)
                             // this.getDelegationRewardsForAddress(address).catch(() => [] as DelegationRewardInfo[])
                         ])];
                     case 1:
@@ -1035,13 +1045,13 @@ var TezosProtocol = /** @class */ (function (_super) {
                     case 0:
                         counter = new bignumber_1.default(1);
                         operations = [];
-                        return [4 /*yield*/, this.getAddressFromPublicKey(publicKey).then(function (address) { return address.getValue(); })];
+                        return [4 /*yield*/, this.getAddressFromPublicKey(publicKey).then(function (address) { return address.address; })];
                     case 1:
                         address = _f.sent();
                         return [4 /*yield*/, Promise.all([
-                                index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + address + "/counter"),
-                                index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head~2/hash"),
-                                index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + address + "/manager_key")
+                                index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + address + "/counter"),
+                                index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head~2/hash"),
+                                index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + address + "/manager_key")
                             ]).catch(function (error) {
                                 throw new index_4.NetworkError(coinlib_error_1.Domain.TEZOS, error);
                             })];
@@ -1189,7 +1199,7 @@ var TezosProtocol = /** @class */ (function (_super) {
                             var counter = startingCounter ? startingCounter.plus(i).toString() : op.counter;
                             return __assign(__assign({}, operation), { gas_limit: gas_limit, counter: counter });
                         });
-                        return [4 /*yield*/, index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head")];
+                        return [4 /*yield*/, index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head")];
                     case 1:
                         block = (_a.sent()).data;
                         body = {
@@ -1205,7 +1215,7 @@ var TezosProtocol = /** @class */ (function (_super) {
                         forgedOperation = _a.sent();
                         gasLimitTotal = 0;
                         return [4 /*yield*/, index_1.default
-                                .post(this.options.network.rpcUrl + "/chains/main/blocks/head/helpers/scripts/run_operation", body, {
+                                .post(this._options.network.rpcUrl + "/chains/main/blocks/head/helpers/scripts/run_operation", body, {
                                 headers: { 'Content-Type': 'application/json' }
                             })
                                 .catch(function (runOperationError) {
@@ -1295,11 +1305,11 @@ var TezosProtocol = /** @class */ (function (_super) {
             var data, delegatedOpLevel, delegatedDate, recentTransactionData;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + delegatedAddress)];
+                    case 0: return [4 /*yield*/, index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + delegatedAddress)];
                     case 1:
                         data = (_a.sent()).data;
                         if (!(data.delegate && fetchExtraInfo)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.options.network.extras.indexerClient.getDelegationInfo(delegatedAddress)];
+                        return [4 /*yield*/, this._options.network.extras.indexerClient.getDelegationInfo(delegatedAddress)];
                     case 2:
                         recentTransactionData = _a.sent();
                         if (recentTransactionData) {
@@ -1330,13 +1340,13 @@ var TezosProtocol = /** @class */ (function (_super) {
                         }
                         return [4 /*yield*/, Promise.all([
                                 index_1.default
-                                    .get(this.options.network.rpcUrl + "/chains/main/blocks/head/context/delegates/" + tzAddress + "/balance")
+                                    .get(this._options.network.rpcUrl + "/chains/main/blocks/head/context/delegates/" + tzAddress + "/balance")
                                     .catch(function (_error) { return undefined; }),
                                 index_1.default
-                                    .get(this.options.network.rpcUrl + "/chains/main/blocks/head/context/delegates/" + tzAddress + "/full_balance")
+                                    .get(this._options.network.rpcUrl + "/chains/main/blocks/head/context/delegates/" + tzAddress + "/full_balance")
                                     .catch(function (_error) { return undefined; }),
-                                index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head/context/delegates/" + tzAddress + "/delegated_balance"),
-                                index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head/context/delegates/" + tzAddress + "/staking_balance")
+                                index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head/context/delegates/" + tzAddress + "/delegated_balance"),
+                                index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head/context/delegates/" + tzAddress + "/staking_balance")
                             ]).catch(function (error) {
                                 throw new index_4.NetworkError(coinlib_error_1.Domain.TEZOS, error);
                             })];
@@ -1382,12 +1392,12 @@ var TezosProtocol = /** @class */ (function (_super) {
                 // TODO: use the adapt logic for ithaca upgrade
                 return [2 /*return*/, []
                     // const { data: frozenBalance }: AxiosResponse<TezosFrozenBalance[]> = await axios.get(
-                    //   `${this.options.network.rpcUrl}/chains/main/blocks/head/context/delegates/${bakerAddress}/frozen_balance_by_cycle`
+                    //   `${this._options.network.rpcUrl}/chains/main/blocks/head/context/delegates/${bakerAddress}/frozen_balance_by_cycle`
                     // )
                     // const lastConfirmedCycle: number = frozenBalance[0].cycle - 1
                     // const mostRecentCycle: number = frozenBalance[frozenBalance.length - 1].cycle
                     // const { data: mostRecentBlock } = await axios.get(
-                    //   `${this.options.network.rpcUrl}/chains/main/blocks/${this.cycleToBlockLevel(mostRecentCycle)}`
+                    //   `${this._options.network.rpcUrl}/chains/main/blocks/${this.cycleToBlockLevel(mostRecentCycle)}`
                     // )
                     // const timestamp: Date = new Date(mostRecentBlock.header.timestamp)
                     // const address = delegatorAddress ?? bakerAddress
@@ -1434,13 +1444,13 @@ var TezosProtocol = /** @class */ (function (_super) {
                         counter = new bignumber_1.default(1);
                         branch = '';
                         operations = [];
-                        return [4 /*yield*/, this.getAddressFromPublicKey(publicKey).then(function (address) { return address.getValue(); })];
+                        return [4 /*yield*/, this.getAddressFromPublicKey(publicKey).then(function (address) { return address.address; })];
                     case 1:
                         tzAddress = _d.sent();
                         return [4 /*yield*/, Promise.all([
-                                index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + tzAddress + "/counter"),
-                                index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head~2/hash"),
-                                index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + tzAddress + "/manager_key")
+                                index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + tzAddress + "/counter"),
+                                index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head~2/hash"),
+                                index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/head/context/contracts/" + tzAddress + "/manager_key")
                             ]).catch(function (error) {
                                 throw new index_4.NetworkError(coinlib_error_1.Domain.TEZOS, error);
                             })];
@@ -1524,7 +1534,8 @@ var TezosProtocol = /** @class */ (function (_super) {
                 case TezosOperationType_1.TezosOperationType.PROPOSALS:
                 case TezosOperationType_1.TezosOperationType.BALLOT:
                     break;
-                default: // Exhaustive switch
+                default:
+                    // Exhaustive switch
                     assert_1.assertNever(operation.kind);
                     throw new index_4.UnsupportedError(coinlib_error_1.Domain.TEZOS, "operation type not supported " + JSON.stringify(operation.kind));
             }
@@ -1539,7 +1550,7 @@ var TezosProtocol = /** @class */ (function (_super) {
                     case 0:
                         payload = rawTransaction;
                         return [4 /*yield*/, index_1.default
-                                .post(this.options.network.rpcUrl + "/injection/operation?chain=main", JSON.stringify(payload), {
+                                .post(this._options.network.rpcUrl + "/injection/operation?chain=main", JSON.stringify(payload), {
                                 headers: { 'content-type': 'application/json' }
                             })
                                 .catch(function (error) {
@@ -1612,7 +1623,7 @@ var TezosProtocol = /** @class */ (function (_super) {
             var response;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/" + blockHash + "/votes/listings")];
+                    case 0: return [4 /*yield*/, index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/" + blockHash + "/votes/listings")];
                     case 1:
                         response = _a.sent();
                         return [2 /*return*/, response.data];
@@ -1637,9 +1648,9 @@ var TezosProtocol = /** @class */ (function (_super) {
     TezosProtocol.prototype.timeIntervalBetweenCycles = function (fromCycle, toCycle) {
         var cycle1 = Math.min(fromCycle, toCycle);
         var cycle2 = Math.max(fromCycle, toCycle);
-        var timeBetweenBlocks = TezosProtocol.TIME_BETWEEN_BLOCKS[this.options.network.extras.network];
-        var blocksPerCycle = TezosProtocol.BLOCKS_PER_CYCLE[this.options.network.extras.network];
-        if (this.options.network.extras.network === TezosNetwork.MAINNET && cycle2 > TezosProtocol.FIRST_010_CYCLE) {
+        var timeBetweenBlocks = TezosProtocol.TIME_BETWEEN_BLOCKS[this._options.network.extras.network];
+        var blocksPerCycle = TezosProtocol.BLOCKS_PER_CYCLE[this._options.network.extras.network];
+        if (this._options.network.extras.network === TezosNetwork.MAINNET && cycle2 > TezosProtocol.FIRST_010_CYCLE) {
             if (cycle1 < TezosProtocol.FIRST_010_CYCLE) {
                 return (((TezosProtocol.FIRST_010_CYCLE - cycle1) * blocksPerCycle[0] * timeBetweenBlocks[0] +
                     (cycle2 - TezosProtocol.FIRST_010_CYCLE) * blocksPerCycle[1] * timeBetweenBlocks[1]) *
@@ -1650,15 +1661,15 @@ var TezosProtocol = /** @class */ (function (_super) {
         return (cycle2 - cycle1) * blocksPerCycle[0] * timeBetweenBlocks[0] * 1000;
     };
     TezosProtocol.prototype.cycleToBlockLevel = function (cycle) {
-        var blocksPerCycle = TezosProtocol.BLOCKS_PER_CYCLE[this.options.network.extras.network];
-        if (this.options.network.extras.network === TezosNetwork.MAINNET && cycle > TezosProtocol.FIRST_010_CYCLE) {
+        var blocksPerCycle = TezosProtocol.BLOCKS_PER_CYCLE[this._options.network.extras.network];
+        if (this._options.network.extras.network === TezosNetwork.MAINNET && cycle > TezosProtocol.FIRST_010_CYCLE) {
             return TezosProtocol.FIRST_010_CYCLE * blocksPerCycle[0] + (cycle - TezosProtocol.FIRST_010_CYCLE) * blocksPerCycle[1] + 1;
         }
         return cycle * blocksPerCycle[0] + 1;
     };
     TezosProtocol.prototype.blockLevelToCycle = function (blockLevel) {
-        var blocksPerCycle = TezosProtocol.BLOCKS_PER_CYCLE[this.options.network.extras.network];
-        if (this.options.network.extras.network === TezosNetwork.MAINNET) {
+        var blocksPerCycle = TezosProtocol.BLOCKS_PER_CYCLE[this._options.network.extras.network];
+        if (this._options.network.extras.network === TezosNetwork.MAINNET) {
             var last009BlockLevel = TezosProtocol.FIRST_010_CYCLE * blocksPerCycle[0];
             if (blockLevel > last009BlockLevel) {
                 var deltaLevels = blockLevel - last009BlockLevel;
@@ -1680,7 +1691,7 @@ var TezosProtocol = /** @class */ (function (_super) {
             var result;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, index_1.default.get(this.options.network.rpcUrl + "/chains/main/blocks/" + block + "/metadata")];
+                    case 0: return [4 /*yield*/, index_1.default.get(this._options.network.rpcUrl + "/chains/main/blocks/" + block + "/metadata")];
                     case 1:
                         result = _a.sent();
                         return [2 /*return*/, result.data];