@airgap/coinlib-core 0.13.6 → 0.13.7-beta.1

package/airgap-coinlib-core.min.js

@@ -30668,7 +30668,7 @@ var ImportAccountAction = /** @class */ (function (_super) {
                         return [4 /*yield*/, protocol.getAddressesFromPublicKey(this.context.publicKey)];
                     case 1:
                         ktAddresses = _a.sent();
-                        return [2 /*return*/, ktAddresses.map(function (address) { return address.getValue(); })];
+                        return [2 /*return*/, ktAddresses.map(function (address) { return address.address; })];
                 }
             });
         });
@@ -124200,7 +124200,7 @@ var Ed25519CryptoClient = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             var kxSelfPrivateKey, kxSelfPublicKey, decryptedMessage;
             return __generator(this, function (_a) {
-                kxSelfPrivateKey = sodium.crypto_sign_ed25519_sk_to_curve25519(Buffer.from(keypair.privateKey)) // Secret bytes to scalar bytes
+                kxSelfPrivateKey = sodium.crypto_sign_ed25519_sk_to_curve25519(Buffer.from(keypair.privateKey, 'hex')) // Secret bytes to scalar bytes
                 ;
                 kxSelfPublicKey = sodium.crypto_sign_ed25519_pk_to_curve25519(Buffer.from(keypair.publicKey, 'hex')) // Secret bytes to scalar bytes
                 ;
@@ -124244,7 +124244,10 @@ var NonExtendedProtocol = /** @class */ (function () {
         return Promise.reject('extended private key signing for not implemented');
     };
     NonExtendedProtocol.prototype.getAddressFromExtendedPublicKey = function (extendedPublicKey, visibilityDerivationIndex, addressDerivationIndex) {
-        return Promise.resolve({ getValue: function () { return ''; } });
+        return Promise.resolve({
+            address: '',
+            cursor: { hasNext: false }
+        });
     };
     NonExtendedProtocol.prototype.getAddressesFromExtendedPublicKey = function (extendedPublicKey, visibilityDerivationIndex, addressCount, offset) {
         return Promise.resolve([]);
@@ -124336,7 +124339,7 @@ var Secp256k1CryptoClient = /** @class */ (function (_super) {
     Secp256k1CryptoClient.prototype.decryptAsymmetric = function (encryptedPayload, keypair) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, index_1.decrypt(keypair.privateKey.toString('hex'), Buffer.from(encryptedPayload, 'hex')).toString()];
+                return [2 /*return*/, index_1.decrypt(keypair.privateKey, Buffer.from(encryptedPayload, 'hex')).toString()];
             });
         });
     };
@@ -124459,7 +124462,7 @@ var AeternityAddress = /** @class */ (function () {
         var base58 = bs58check.encode(Buffer.from(publicKey, 'hex'));
         return new AeternityAddress("ak_" + base58);
     };
-    AeternityAddress.prototype.getValue = function () {
+    AeternityAddress.prototype.asString = function () {
         return this.value;
     };
     return AeternityAddress;
@@ -124547,7 +124550,7 @@ var AeternityCryptoClient = /** @class */ (function (_super) {
                     case 1:
                         _a.sent();
                         messageBuffer = personalMessageToBinary(message);
-                        rawSignature = sodium.crypto_sign_detached(messageBuffer, keypair.privateKey);
+                        rawSignature = sodium.crypto_sign_detached(messageBuffer, Buffer.from(keypair.privateKey, 'hex'));
                         return [2 /*return*/, Buffer.from(rawSignature).toString('hex')];
                 }
             });
@@ -124656,6 +124659,8 @@ 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 rlp = __importStar(require("../../dependencies/src/rlp-2.2.3/index"));
+var errors_1 = require("../../errors");
+var coinlib_error_1 = require("../../errors/coinlib-error");
 var base64Check_1 = __importDefault(require("../../utils/base64Check"));
 var padStart_1 = require("../../utils/padStart");
 var ProtocolSymbols_1 = require("../../utils/ProtocolSymbols");
@@ -124664,8 +124669,6 @@ var NonExtendedProtocol_1 = require("../NonExtendedProtocol");
 var AeternityAddress_1 = require("./AeternityAddress");
 var AeternityCryptoClient_1 = require("./AeternityCryptoClient");
 var AeternityProtocolOptions_1 = require("./AeternityProtocolOptions");
-var errors_1 = require("../../errors");
-var coinlib_error_1 = require("../../errors/coinlib-error");
 var AeternityProtocol = /** @class */ (function (_super) {
     __extends(AeternityProtocol, _super);
     function AeternityProtocol(options) {
@@ -124757,23 +124760,26 @@ var AeternityProtocol = /** @class */ (function (_super) {
             var secretKey;
             return __generator(this, function (_a) {
                 secretKey = index_3.generateWalletUsingDerivationPath(Buffer.from(secret, 'hex'), derivationPath).secretKey;
-                return [2 /*return*/, Buffer.from(secretKey)];
+                return [2 /*return*/, Buffer.from(secretKey).toString('hex')];
             });
         });
     };
-    AeternityProtocol.prototype.getAddressFromPublicKey = function (publicKey) {
+    AeternityProtocol.prototype.getAddressFromPublicKey = function (publicKey, cursor) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, AeternityAddress_1.AeternityAddress.from(publicKey)];
+                return [2 /*return*/, {
+                        address: AeternityAddress_1.AeternityAddress.from(publicKey).asString(),
+                        cursor: { hasNext: false }
+                    }];
             });
         });
     };
-    AeternityProtocol.prototype.getAddressesFromPublicKey = function (publicKey) {
+    AeternityProtocol.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]];
@@ -124781,13 +124787,6 @@ var AeternityProtocol = /** @class */ (function (_super) {
             });
         });
     };
-    AeternityProtocol.prototype.getNextAddressFromPublicKey = function (publicKey, current) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, current];
-            });
-        });
-    };
     AeternityProtocol.prototype.getTransactionsFromPublicKey = function (publicKey, limit, cursor) {
         return __awaiter(this, void 0, void 0, function () {
             var address;
@@ -124796,7 +124795,7 @@ var AeternityProtocol = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
                         address = _a.sent();
-                        return [2 /*return*/, this.getTransactionsFromAddresses([address.getValue()], limit, cursor)];
+                        return [2 /*return*/, this.getTransactionsFromAddresses([address.address], limit, cursor)];
                 }
             });
         });
@@ -124860,7 +124859,7 @@ var AeternityProtocol = /** @class */ (function (_super) {
                         return [4 /*yield*/, sodium.ready];
                     case 1:
                         _a.sent();
-                        signature = sodium.crypto_sign_detached(Buffer.concat([Buffer.from(transaction.networkId), rawTx]), privateKey);
+                        signature = sodium.crypto_sign_detached(Buffer.concat([Buffer.from(transaction.networkId), rawTx]), Buffer.from(privateKey, 'hex'));
                         txObj = {
                             tag: this.toHexBuffer(11),
                             version: this.toHexBuffer(1),
@@ -124911,11 +124910,11 @@ var AeternityProtocol = /** @class */ (function (_super) {
                         airgapTx = {
                             amount: new bignumber_1.default(parseInt(rlpDecodedTx[4].toString('hex'), 16)).toString(10),
                             fee: new bignumber_1.default(parseInt(rlpDecodedTx[5].toString('hex'), 16)).toString(10),
-                            from: [fromAddress.getValue()],
+                            from: [fromAddress.address],
                             isInbound: false,
                             protocolIdentifier: this.identifier,
                             network: this.options.network,
-                            to: [toAddress.getValue()],
+                            to: [toAddress.address],
                             data: (rlpDecodedTx[8] || '').toString('utf8'),
                             transactionDetails: unsignedTx.transaction
                         };
@@ -124984,7 +124983,7 @@ var AeternityProtocol = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
                         address = _a.sent();
-                        return [2 /*return*/, this.getBalanceOfAddresses([address.getValue()])];
+                        return [2 /*return*/, this.getBalanceOfAddresses([address.address])];
                 }
             });
         });
@@ -125056,7 +125055,7 @@ var AeternityProtocol = /** @class */ (function (_super) {
                         _b.label = 2;
                     case 2:
                         _b.trys.push([2, 4, , 5]);
-                        return [4 /*yield*/, index_1.default.get(this.options.network.rpcUrl + "/v2/accounts/" + address.getValue())];
+                        return [4 /*yield*/, index_1.default.get(this.options.network.rpcUrl + "/v2/accounts/" + address.address)];
                     case 3:
                         accountResponse = (_b.sent()).data;
                         nonce = accountResponse.nonce + 1;
@@ -125308,7 +125307,7 @@ var BitcoinAddress = /** @class */ (function () {
             : node;
         return new BitcoinAddress(_node.getAddress(), visibilityDerivationIndex, addressDerivationIndex);
     };
-    BitcoinAddress.prototype.getValue = function () {
+    BitcoinAddress.prototype.asString = function () {
         return this.value;
     };
     return BitcoinAddress;
@@ -125382,7 +125381,7 @@ var BitcoinCryptoClient = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             var signature;
             return __generator(this, function (_a) {
-                signature = this.bitcoinJSMessage.sign(message, keypair.privateKey, true);
+                signature = this.bitcoinJSMessage.sign(message, Buffer.from(keypair.privateKey, 'hex'), true);
                 return [2 /*return*/, signature.toString('base64')];
             });
         });
@@ -125397,7 +125396,7 @@ var BitcoinCryptoClient = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.protocol.getAddressFromPublicKey(publicKey)];
                     case 1:
                         address = _a.sent();
-                        return [2 /*return*/, this.bitcoinJSMessage.verify(message, address.getValue(), rawSignature)];
+                        return [2 /*return*/, this.bitcoinJSMessage.verify(message, address.address, rawSignature)];
                 }
             });
         });
@@ -125408,6 +125407,7 @@ exports.BitcoinCryptoClient = BitcoinCryptoClient;
 
 }).call(this)}).call(this,require("buffer").Buffer)
 },{"../Secp256k1CryptoClient":498,"buffer":67}],506:[function(require,module,exports){
+(function (Buffer){(function (){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -125580,7 +125580,7 @@ var BitcoinProtocol = /** @class */ (function () {
             var bitcoinNode;
             return __generator(this, function (_a) {
                 bitcoinNode = this.options.config.bitcoinJSLib.HDNode.fromSeedHex(secret, this.options.network.extras.network);
-                return [2 /*return*/, bitcoinNode.derivePath(derivationPath).keyPair.d.toBuffer(32)];
+                return [2 /*return*/, bitcoinNode.derivePath(derivationPath).keyPair.d.toBuffer(32).toString('hex')];
             });
         });
     };
@@ -125593,20 +125593,24 @@ var BitcoinProtocol = /** @class */ (function () {
             });
         });
     };
-    BitcoinProtocol.prototype.getAddressFromPublicKey = function (publicKey) {
+    BitcoinProtocol.prototype.getAddressFromPublicKey = function (publicKey, cursor) {
         return __awaiter(this, void 0, void 0, function () {
-            var node;
+            var node, address;
             return __generator(this, function (_a) {
                 node = this.options.config.bitcoinJSLib.HDNode.fromBase58(publicKey, this.options.network.extras.network);
-                return [2 /*return*/, BitcoinAddress_1.BitcoinAddress.from(node)];
+                address = BitcoinAddress_1.BitcoinAddress.from(node);
+                return [2 /*return*/, {
+                        address: address.asString(),
+                        cursor: { hasNext: false }
+                    }];
             });
         });
     };
-    BitcoinProtocol.prototype.getAddressesFromPublicKey = function (publicKey) {
+    BitcoinProtocol.prototype.getAddressesFromPublicKey = function (publicKey, cursor) {
         return __awaiter(this, void 0, void 0, function () {
             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: return [2 /*return*/, [_a.sent()]];
                 }
             });
@@ -125614,10 +125618,14 @@ var BitcoinProtocol = /** @class */ (function () {
     };
     BitcoinProtocol.prototype.getAddressFromExtendedPublicKey = function (extendedPublicKey, visibilityDerivationIndex, addressDerivationIndex) {
         return __awaiter(this, void 0, void 0, function () {
-            var node;
+            var node, address;
             return __generator(this, function (_a) {
                 node = this.options.config.bitcoinJSLib.HDNode.fromBase58(extendedPublicKey, this.options.network.extras.network);
-                return [2 /*return*/, BitcoinAddress_1.BitcoinAddress.from(node, visibilityDerivationIndex, addressDerivationIndex)];
+                address = BitcoinAddress_1.BitcoinAddress.from(node, visibilityDerivationIndex, addressDerivationIndex);
+                return [2 /*return*/, {
+                        address: address.asString(),
+                        cursor: { hasNext: false }
+                    }];
             });
         });
     };
@@ -125627,16 +125635,13 @@ var BitcoinProtocol = /** @class */ (function () {
             return __generator(this, function (_a) {
                 node = this.options.config.bitcoinJSLib.HDNode.fromBase58(extendedPublicKey, this.options.network.extras.network);
                 generatorArray = Array.from(new Array(addressCount), function (_, i) { return i + offset; });
-                return [2 /*return*/, Promise.all(generatorArray.map(function (x) { return BitcoinAddress_1.BitcoinAddress.from(node, visibilityDerivationIndex, x); }))];
-            });
-        });
-    };
-    BitcoinProtocol.prototype.getNextAddressFromPublicKey = function (publicKey, current) {
-        return __awaiter(this, void 0, void 0, function () {
-            var node;
-            return __generator(this, function (_a) {
-                node = this.options.config.bitcoinJSLib.HDNode.fromBase58(publicKey, this.options.network.extras.network);
-                return [2 /*return*/, BitcoinAddress_1.BitcoinAddress.from(node, current.visibilityDerivationIndex, current.addressDerivationIndex !== undefined ? current.addressDerivationIndex + 1 : undefined)];
+                return [2 /*return*/, Promise.all(generatorArray.map(function (x) {
+                        var address = BitcoinAddress_1.BitcoinAddress.from(node, visibilityDerivationIndex, x);
+                        return {
+                            address: address.asString(),
+                            cursor: { hasNext: false }
+                        };
+                    }))];
             });
         });
     };
@@ -125657,9 +125662,9 @@ var BitcoinProtocol = /** @class */ (function () {
                         if (!(_b < _c.length)) return [3 /*break*/, 5];
                         output = _c[_b];
                         if (!output.isChange) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.getAddressFromPublicKey(privateKey.toString('hex'))];
+                        return [4 /*yield*/, this.getAddressFromPublicKey(privateKey)];
                     case 2:
-                        generatedChangeAddress = (_d.sent()).getValue();
+                        generatedChangeAddress = (_d.sent()).address;
                         if (generatedChangeAddress !== output.recipient) {
                             throw new errors_1.ConditionViolationError(coinlib_error_1.Domain.BITCOIN, 'Change address could not be verified.');
                         }
@@ -125672,7 +125677,7 @@ var BitcoinProtocol = /** @class */ (function () {
                         return [3 /*break*/, 1];
                     case 5:
                         for (i = 0; i < transaction.ins.length; i++) {
-                            transactionBuilder.sign(i, privateKey);
+                            transactionBuilder.sign(i, Buffer.from(privateKey, 'hex'));
                         }
                         return [2 /*return*/, transactionBuilder.build().toHex()];
                 }
@@ -125703,7 +125708,7 @@ var BitcoinProtocol = /** @class */ (function () {
                         if (!output.derivationPath) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.getAddressesFromExtendedPublicKey(extendedPrivateKey, 1, 1, parseInt(output.derivationPath, 10))];
                     case 2:
-                        generatedChangeAddress = (_d.sent()).map(function (address) { return address.getValue(); });
+                        generatedChangeAddress = (_d.sent()).map(function (address) { return address.address; });
                         changeAddressIsValid = generatedChangeAddress.includes(output.recipient);
                         return [3 /*break*/, 7];
                     case 3:
@@ -125713,7 +125718,7 @@ var BitcoinProtocol = /** @class */ (function () {
                         if (!(x < changeAddressMaxAddresses)) return [3 /*break*/, 7];
                         return [4 /*yield*/, this.getAddressesFromExtendedPublicKey(extendedPrivateKey, 1, changeAddressBatchSize, x)];
                     case 5:
-                        addresses = (_d.sent()).map(function (address) { return address.getValue(); });
+                        addresses = (_d.sent()).map(function (address) { return address.address; });
                         if (addresses.indexOf(output.recipient) >= 0) {
                             changeAddressIsValid = true;
                             x = changeAddressMaxAddresses;
@@ -125839,7 +125844,7 @@ var BitcoinProtocol = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
                         address = _a.sent();
-                        return [2 /*return*/, this.getBalanceOfAddresses([address.getValue()])];
+                        return [2 /*return*/, this.getBalanceOfAddresses([address.address])];
                 }
             });
         });
@@ -125972,7 +125977,7 @@ var BitcoinProtocol = /** @class */ (function () {
                         return [4 /*yield*/, this.getAddressFromExtendedPublicKey(extendedPublicKey, indexes[0], indexes[1])];
                     case 3:
                         derivedAddress = _a.sent();
-                        if (derivedAddress.getValue() === utxo.address) {
+                        if (derivedAddress.address === utxo.address) {
                             transaction.ins.push({
                                 txId: utxo.txid,
                                 value: new bignumber_1.default(utxo.value).toString(10),
@@ -126015,7 +126020,7 @@ var BitcoinProtocol = /** @class */ (function () {
                     case 6:
                         derivedAddress = _a.sent();
                         transaction.outs.push({
-                            recipient: derivedAddress.getValue(),
+                            recipient: derivedAddress.address,
                             isChange: true,
                             value: changeValue.toString(10),
                             derivationPath: changeAddressIndex.toString()
@@ -126043,7 +126048,7 @@ var BitcoinProtocol = /** @class */ (function () {
                         }
                         return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
-                        address = (_a.sent()).getValue();
+                        address = (_a.sent()).address;
                         return [4 /*yield*/, index_1.default.get(this.options.network.extras.indexerApi + "/api/v2/utxo/" + address, {
                                 responseType: 'json'
                             })];
@@ -126189,7 +126194,7 @@ var BitcoinProtocol = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
                         address = _a.sent();
-                        return [2 /*return*/, this.getTransactionsFromAddresses([address.getValue()], limit, cursor)];
+                        return [2 /*return*/, this.getTransactionsFromAddresses([address.address], limit, cursor)];
                 }
             });
         });
@@ -126305,11 +126310,11 @@ var BitcoinProtocol = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             var childPrivateKey;
             return __generator(this, function (_a) {
-                childPrivateKey = this.options.config.bitcoinJSLib.HDNode.fromBase58(keypair.privateKey.toString('hex'), this.options.network.extras.network)
+                childPrivateKey = this.options.config.bitcoinJSLib.HDNode.fromBase58(keypair.privateKey, this.options.network.extras.network)
                     .derive(0)
                     .derive(0)
                     .keyPair.d.toBuffer(32);
-                return [2 /*return*/, this.cryptoClient.decryptAsymmetric(message, { publicKey: '', privateKey: childPrivateKey })];
+                return [2 /*return*/, this.cryptoClient.decryptAsymmetric(message, { publicKey: '', privateKey: childPrivateKey.toString('hex') })];
             });
         });
     };
@@ -126338,7 +126343,8 @@ var BitcoinProtocol = /** @class */ (function () {
 }());
 exports.BitcoinProtocol = BitcoinProtocol;
 
-},{"../../dependencies/src/axios-0.19.0/index":235,"../../dependencies/src/bignumber.js-9.0.0/bignumber":269,"../../dependencies/src/bip39-2.5.0/index":274,"../../dependencies/src/bitcoinjs-message-2.1.1/index":286,"../../errors":491,"../../errors/coinlib-error":490,"../../utils/ProtocolSymbols":799,"./BitcoinAddress":504,"./BitcoinCryptoClient":505,"./BitcoinProtocolOptions":507}],507:[function(require,module,exports){
+}).call(this)}).call(this,require("buffer").Buffer)
+},{"../../dependencies/src/axios-0.19.0/index":235,"../../dependencies/src/bignumber.js-9.0.0/bignumber":269,"../../dependencies/src/bip39-2.5.0/index":274,"../../dependencies/src/bitcoinjs-message-2.1.1/index":286,"../../errors":491,"../../errors/coinlib-error":490,"../../utils/ProtocolSymbols":799,"./BitcoinAddress":504,"./BitcoinCryptoClient":505,"./BitcoinProtocolOptions":507,"buffer":67}],507:[function(require,module,exports){
 "use strict";
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -126514,7 +126520,7 @@ var BitcoinSegwitAddress = /** @class */ (function (_super) {
     BitcoinSegwitAddress.fromAddress = function (address) {
         return new BitcoinSegwitAddress(address, 0, 0);
     };
-    BitcoinSegwitAddress.prototype.getValue = function () {
+    BitcoinSegwitAddress.prototype.asString = function () {
         return this.value;
     };
     return BitcoinSegwitAddress;
@@ -126604,6 +126610,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BitcoinSegwitProtocol = void 0;
+// tslint:disable: max-classes-per-file
 var __1 = require("../..");
 var index_1 = require("../../dependencies/src/bip39-2.5.0/index");
 var index_2 = __importDefault(require("../../dependencies/src/axios-0.19.0/index"));
@@ -126679,7 +126686,7 @@ var BitcoinSegwitProtocol = /** @class */ (function (_super) {
                 if (!privateKey) {
                     throw new Error('No privatekey!');
                 }
-                return [2 /*return*/, privateKey];
+                return [2 /*return*/, privateKey.toString('hex')];
             });
         });
     };
@@ -126701,19 +126708,23 @@ var BitcoinSegwitProtocol = /** @class */ (function (_super) {
             });
         });
     };
-    BitcoinSegwitProtocol.prototype.getAddressFromPublicKey = function (publicKey) {
+    BitcoinSegwitProtocol.prototype.getAddressFromPublicKey = function (publicKey, cursor) {
         return __awaiter(this, void 0, void 0, function () {
+            var address;
             return __generator(this, function (_a) {
-                // broadcaster knows this (both broadcaster and signer)
-                return [2 /*return*/, BitcoinSegwitAddress_1.BitcoinSegwitAddress.fromAddress(bitcoinJS.bip32.fromBase58(publicKey, this.options.network.extras.network).toBase58())];
+                address = BitcoinSegwitAddress_1.BitcoinSegwitAddress.fromAddress(bitcoinJS.bip32.fromBase58(publicKey, this.options.network.extras.network).toBase58());
+                return [2 /*return*/, {
+                        address: address.asString(),
+                        cursor: { hasNext: false }
+                    }];
             });
         });
     };
-    BitcoinSegwitProtocol.prototype.getAddressesFromPublicKey = function (publicKey) {
+    BitcoinSegwitProtocol.prototype.getAddressesFromPublicKey = function (publicKey, cursor) {
         return __awaiter(this, void 0, void 0, function () {
             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: return [2 /*return*/, [_a.sent()]];
                 }
             });
@@ -126721,7 +126732,7 @@ var BitcoinSegwitProtocol = /** @class */ (function (_super) {
     };
     BitcoinSegwitProtocol.prototype.getAddressFromExtendedPublicKey = function (extendedPublicKey, visibilityDerivationIndex, addressDerivationIndex) {
         return __awaiter(this, void 0, void 0, function () {
-            var xpub, keyPair, obj, address;
+            var xpub, keyPair, obj, addressRaw, address;
             return __generator(this, function (_a) {
                 xpub = new ExtendedPublicKey(extendedPublicKey).toXpub();
                 keyPair = bitcoinJS.bip32
@@ -126729,11 +126740,15 @@ var BitcoinSegwitProtocol = /** @class */ (function (_super) {
                     .derive(visibilityDerivationIndex)
                     .derive(addressDerivationIndex);
                 obj = bitcoinJS.payments.p2wpkh({ pubkey: keyPair.publicKey });
-                address = obj.address;
-                if (!address) {
+                addressRaw = obj.address;
+                if (!addressRaw) {
                     throw new Error('could not generate address');
                 }
-                return [2 /*return*/, BitcoinSegwitAddress_1.BitcoinSegwitAddress.fromAddress(address)];
+                address = BitcoinSegwitAddress_1.BitcoinSegwitAddress.fromAddress(addressRaw);
+                return [2 /*return*/, {
+                        address: address.asString(),
+                        cursor: { hasNext: false }
+                    }];
             });
         });
     };
@@ -126743,11 +126758,15 @@ var BitcoinSegwitProtocol = /** @class */ (function (_super) {
         var generatorArray = Array.from(new Array(addressCount), function (x, i) { return i + offset; });
         return Promise.all(generatorArray.map(function (x) {
             var keyPair = node.derive(visibilityDerivationIndex).derive(x);
-            var address = bitcoinJS.payments.p2wpkh({ pubkey: keyPair.publicKey }).address;
-            if (!address) {
+            var addressRaw = bitcoinJS.payments.p2wpkh({ pubkey: keyPair.publicKey }).address;
+            if (!addressRaw) {
                 throw new Error('could not generate address');
             }
-            return BitcoinSegwitAddress_1.BitcoinSegwitAddress.fromAddress(address);
+            var address = BitcoinSegwitAddress_1.BitcoinSegwitAddress.fromAddress(addressRaw);
+            return {
+                address: address.asString(),
+                cursor: { hasNext: false }
+            };
         }));
     };
     BitcoinSegwitProtocol.prototype.getTransactionDetails = function (unsignedTx) {
@@ -126900,7 +126919,7 @@ var BitcoinSegwitProtocol = /** @class */ (function (_super) {
                         indexes = getPathIndexes(utxo.path);
                         return [4 /*yield*/, this.getAddressFromExtendedPublicKey(extendedPublicKey, indexes[0], indexes[1])];
                     case 3:
-                        derivedAddress = (_a.sent()).getValue();
+                        derivedAddress = (_a.sent()).address;
                         if (derivedAddress === utxo.address) {
                             transaction.ins.push({
                                 txId: utxo.txid,
@@ -126941,7 +126960,7 @@ var BitcoinSegwitProtocol = /** @class */ (function (_super) {
                         changeAddressIndex = lastUsedInternalAddress + 1;
                         return [4 /*yield*/, this.getAddressFromExtendedPublicKey(extendedPublicKey, 1, changeAddressIndex)];
                     case 6:
-                        derivedAddress = (_a.sent()).getValue();
+                        derivedAddress = (_a.sent()).address;
                         transaction.outs.push({
                             recipient: derivedAddress,
                             isChange: true,
@@ -127113,7 +127132,7 @@ var CosmosAddress = /** @class */ (function () {
         var address = BECH32.encode(CosmosAddress.addressPrefix, BECH32.toWords(hash));
         return new CosmosAddress(address);
     };
-    CosmosAddress.prototype.getValue = function () {
+    CosmosAddress.prototype.asString = function () {
         return this.value;
     };
     CosmosAddress.addressPrefix = 'cosmos';
@@ -127246,7 +127265,7 @@ var CosmosCryptoClient = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 sha256Hash = sha('sha256').update(Buffer.from(message)).digest();
                 hash = Buffer.from(sha256Hash);
-                signed = SECP256K1.sign(hash, keypair.privateKey);
+                signed = SECP256K1.sign(hash, Buffer.from(keypair.privateKey, 'hex'));
                 return [2 /*return*/, "0x" + Buffer.from(signed.signature).toString('hex')];
             });
         });
@@ -127865,7 +127884,7 @@ var CosmosProtocol = /** @class */ (function (_super) {
     CosmosProtocol.prototype.getPrivateKeyFromMnemonic = function (mnemonic, derivationPath, password) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.generateKeyPair(mnemonic, derivationPath, password).privateKey];
+                return [2 /*return*/, this.generateKeyPair(mnemonic, derivationPath, password).privateKey.toString('hex')];
             });
         });
     };
@@ -127887,34 +127906,32 @@ var CosmosProtocol = /** @class */ (function (_super) {
             var node;
             return __generator(this, function (_a) {
                 node = index_1.fromSeed(Buffer.from(secret, 'hex'));
-                return [2 /*return*/, this.generateKeyPairFromNode(node, derivationPath).privateKey];
+                return [2 /*return*/, this.generateKeyPairFromNode(node, derivationPath).privateKey.toString('hex')];
             });
         });
     };
-    CosmosProtocol.prototype.getAddressFromPublicKey = function (publicKey) {
+    CosmosProtocol.prototype.getAddressFromPublicKey = function (publicKey, cursor) {
         return __awaiter(this, void 0, void 0, function () {
+            var address;
             return __generator(this, function (_a) {
-                return [2 /*return*/, CosmosAddress_1.CosmosAddress.from(publicKey)];
+                address = CosmosAddress_1.CosmosAddress.from(publicKey);
+                return [2 /*return*/, {
+                        address: address.asString(),
+                        cursor: { hasNext: false }
+                    }];
             });
         });
     };
-    CosmosProtocol.prototype.getAddressesFromPublicKey = function (publicKey) {
+    CosmosProtocol.prototype.getAddressesFromPublicKey = function (publicKey, cursor) {
         return __awaiter(this, void 0, void 0, function () {
             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: return [2 /*return*/, [_a.sent()]];
                 }
             });
         });
     };
-    CosmosProtocol.prototype.getNextAddressFromPublicKey = function (publicKey, current) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, current];
-            });
-        });
-    };
     CosmosProtocol.prototype.getTransactionsFromPublicKey = function (publicKey, limit, cursor) {
         return __awaiter(this, void 0, void 0, function () {
             var address;
@@ -127923,7 +127940,7 @@ var CosmosProtocol = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
                         address = _a.sent();
-                        return [2 /*return*/, this.getTransactionsFromAddresses([address.getValue()], limit, cursor)];
+                        return [2 /*return*/, this.getTransactionsFromAddresses([address.address], limit, cursor)];
                 }
             });
         });
@@ -128045,18 +128062,19 @@ var CosmosProtocol = /** @class */ (function (_super) {
     };
     CosmosProtocol.prototype.signWithPrivateKey = function (privateKey, transaction) {
         return __awaiter(this, void 0, void 0, function () {
-            var publicKey, encodedObject, signBytes, sha256Hash, hash, signed, sigBase64, txBytes;
+            var privateKeyBuffer, publicKey, encodedObject, signBytes, sha256Hash, hash, signed, sigBase64, txBytes;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        publicKey = this.getPublicKeyFromPrivateKey(privateKey);
+                        privateKeyBuffer = Buffer.from(privateKey, 'hex');
+                        publicKey = this.getPublicKeyFromPrivateKey(privateKeyBuffer);
                         encodedObject = transaction.toEncodeObject();
                         return [4 /*yield*/, cosmjs_1.prepareSignBytes(encodedObject, transaction.fee, Uint8Array.from(publicKey), new bignumber_1.default(transaction.sequence).toNumber(), transaction.chainID, new bignumber_1.default(transaction.accountNumber).toNumber())];
                     case 1:
                         signBytes = _a.sent();
                         sha256Hash = sha('sha256').update(signBytes).digest();
                         hash = Buffer.from(sha256Hash);
-                        signed = SECP256K1.sign(hash, privateKey);
+                        signed = SECP256K1.sign(hash, privateKeyBuffer);
                         sigBase64 = Buffer.from(signed.signature, 'binary').toString('base64');
                         return [4 /*yield*/, cosmjs_1.encodeTxBytes(encodedObject, transaction.fee, Uint8Array.from(publicKey), new bignumber_1.default(transaction.sequence).toNumber(), {
                                 signature: sigBase64,
@@ -128148,7 +128166,7 @@ var CosmosProtocol = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
                         address = _a.sent();
-                        return [2 /*return*/, this.getBalanceOfAddresses([address.getValue()])];
+                        return [2 /*return*/, this.getBalanceOfAddresses([address.address])];
                 }
             });
         });
@@ -128196,7 +128214,7 @@ var CosmosProtocol = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
-                        address = (_a.sent()).getValue();
+                        address = (_a.sent()).address;
                         return [4 /*yield*/, this.getAvailableBalanceOfAddresses([address])];
                     case 2:
                         balance = _a.sent();
@@ -128243,7 +128261,7 @@ var CosmosProtocol = /** @class */ (function (_super) {
                         }
                         return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
-                        address = (_d.sent()).getValue();
+                        address = (_d.sent()).address;
                         return [4 /*yield*/, this.nodeClient.fetchNodeInfo()];
                     case 2:
                         nodeInfo = _d.sent();
@@ -128292,7 +128310,7 @@ var CosmosProtocol = /** @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)];
                 }
             });
         });
@@ -128336,7 +128354,7 @@ var CosmosProtocol = /** @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)];
                 }
             });
         });
@@ -128362,7 +128380,7 @@ var CosmosProtocol = /** @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)];
                 }
             });
         });
@@ -128382,7 +128400,7 @@ var CosmosProtocol = /** @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)];
                 }
             });
         });
@@ -128459,7 +128477,7 @@ var CosmosProtocol = /** @class */ (function (_super) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
-                        address = (_b.sent()).getValue();
+                        address = (_b.sent()).address;
                         return [4 /*yield*/, this.nodeClient.fetchNodeInfo()];
                     case 2:
                         nodeInfo = _b.sent();
@@ -128485,7 +128503,7 @@ var CosmosProtocol = /** @class */ (function (_super) {
                         return [3 /*break*/, 4];
                     case 1: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 2:
-                        address_1 = (_b.sent()).getValue();
+                        address_1 = (_b.sent()).address;
                         return [4 /*yield*/, this.nodeClient.fetchRewardDetails(address_1)];
                     case 3:
                         rewards = _b.sent();
@@ -128499,7 +128517,7 @@ var CosmosProtocol = /** @class */ (function (_super) {
                         _b.label = 4;
                     case 4: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 5:
-                        address = (_b.sent()).getValue();
+                        address = (_b.sent()).address;
                         return [4 /*yield*/, this.nodeClient.fetchNodeInfo()];
                     case 6:
                         nodeInfo = _b.sent();
@@ -129436,7 +129454,7 @@ var BaseEthereumProtocol = /** @class */ (function () {
             var ethereumNode;
             return __generator(this, function (_a) {
                 ethereumNode = bitcoinJS.HDNode.fromSeedHex(secret, this.network);
-                return [2 /*return*/, ethereumNode.derivePath(derivationPath).keyPair.d.toBuffer(32)];
+                return [2 /*return*/, ethereumNode.derivePath(derivationPath).keyPair.d.toBuffer(32).toString('hex')];
             });
         });
     };
@@ -129449,19 +129467,24 @@ var BaseEthereumProtocol = /** @class */ (function () {
             });
         });
     };
-    BaseEthereumProtocol.prototype.getAddressFromPublicKey = function (publicKey) {
+    BaseEthereumProtocol.prototype.getAddressFromPublicKey = function (publicKey, cursor) {
         return __awaiter(this, void 0, void 0, function () {
+            var address;
             return __generator(this, function (_a) {
-                return [2 /*return*/, EthereumAddress_1.EthereumAddress.from(publicKey)];
+                address = EthereumAddress_1.EthereumAddress.from(publicKey);
+                return [2 /*return*/, {
+                        address: address.asString(),
+                        cursor: { hasNext: false }
+                    }];
             });
         });
     };
-    BaseEthereumProtocol.prototype.getAddressesFromPublicKey = function (publicKey) {
+    BaseEthereumProtocol.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]];
@@ -129501,13 +129524,6 @@ var BaseEthereumProtocol = /** @class */ (function () {
             return _this.getAddressFromPublicKey(node.derive(visibilityDerivationIndex).derive(x).getPublicKeyBuffer().toString('hex'));
         }));
     };
-    BaseEthereumProtocol.prototype.getNextAddressFromPublicKey = function (publicKey, current) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, current];
-            });
-        });
-    };
     BaseEthereumProtocol.prototype.getPrivateKeyFromExtendedPrivateKey = function (extendedPrivateKey, childDerivationPath) {
         return __awaiter(this, void 0, void 0, function () {
             var dp;
@@ -129543,7 +129559,7 @@ var BaseEthereumProtocol = /** @class */ (function () {
                             return [2 /*return*/, tx.serialize().toString('hex')];
                         }
                         else {
-                            return [2 /*return*/, this.signWithPrivateKey(privateKey, untypedTransaction)];
+                            return [2 /*return*/, this.signWithPrivateKey(privateKey.toString('hex'), untypedTransaction)];
                         }
                         return [2 /*return*/];
                 }
@@ -129564,7 +129580,7 @@ var BaseEthereumProtocol = /** @class */ (function () {
                     common = common_1.default.custom({ chainId: transaction.chainId });
                 }
                 tx = tx_1.TransactionFactory.fromTxData(transaction, { common: common });
-                tx = tx.sign(privateKey);
+                tx = tx.sign(Buffer.from(privateKey, 'hex'));
                 return [2 /*return*/, tx.serialize().toString('hex')];
             });
         });
@@ -129593,7 +129609,7 @@ var BaseEthereumProtocol = /** @class */ (function () {
                     case 4:
                         ownAddress = _d;
                         airGapTransaction = {
-                            from: [ownAddress.getValue()],
+                            from: [ownAddress.address],
                             to: [(_b = (_a = transaction.to) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : ''],
                             amount: new bignumber_1.BigNumber(transaction.value.toString(10)).toString(10),
                             fee: new bignumber_1.BigNumber(transaction.gasLimit.toString(10))
@@ -129634,7 +129650,7 @@ var BaseEthereumProtocol = /** @class */ (function () {
                         ownAddress = _e;
                         return [2 /*return*/, [
                                 {
-                                    from: [ownAddress.getValue()],
+                                    from: [ownAddress.address],
                                     to: [transaction.to],
                                     amount: new bignumber_1.BigNumber(transaction.value).toString(10),
                                     fee: new bignumber_1.BigNumber(transaction.gasLimit).multipliedBy(new bignumber_1.BigNumber(transaction.gasPrice)).toString(10),
@@ -129720,7 +129736,7 @@ var BaseEthereumProtocol = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
                         address = _a.sent();
-                        return [2 /*return*/, this.getBalanceOfAddresses([address.getValue()])];
+                        return [2 /*return*/, this.getBalanceOfAddresses([address.address])];
                 }
             });
         });
@@ -129748,10 +129764,10 @@ var BaseEthereumProtocol = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)
-                            .then(function (address) { return address.getValue(); })
+                            .then(function (address) { return address.address; })
                             .catch(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
                             switch (_a.label) {
-                                case 0: return [4 /*yield*/, this.getAddressFromExtendedPublicKey(publicKey, 0, 0).then(function (address) { return address.getValue(); })];
+                                case 0: return [4 /*yield*/, this.getAddressFromExtendedPublicKey(publicKey, 0, 0).then(function (address) { return address.address; })];
                                 case 1: return [2 /*return*/, _a.sent()];
                             }
                         }); }); })];
@@ -129875,7 +129891,7 @@ var BaseEthereumProtocol = /** @class */ (function () {
                         if (recipients.length !== 1) {
                             return [2 /*return*/, Promise.reject('you cannot have 0 recipients')];
                         }
-                        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 = _a.sent();
                         return [4 /*yield*/, this.options.nodeClient.estimateTransactionGas(address, recipients[0], utils_1.EthereumUtils.toHex(values[0]), undefined, utils_1.EthereumUtils.toHex(this.MAX_GAS_ESTIMATE))];
@@ -129906,7 +129922,7 @@ var BaseEthereumProtocol = /** @class */ (function () {
                     case 0:
                         wrappedValues = values.map(function (value) { return new bignumber_1.BigNumber(value); });
                         wrappedFee = new bignumber_1.BigNumber(fee);
-                        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 = _a.sent();
                         if (recipients.length !== values.length) {
@@ -129971,7 +129987,7 @@ var BaseEthereumProtocol = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
                         address = _a.sent();
-                        return [2 /*return*/, this.getTransactionsFromAddresses([address.getValue()], limit, cursor)];
+                        return [2 /*return*/, this.getTransactionsFromAddresses([address.address], limit, cursor)];
                 }
             });
         });
@@ -130086,7 +130102,7 @@ var EthereumAddress = /** @class */ (function () {
         var pubkey = typeof publicKey === 'string' ? Buffer.from(publicKey, 'hex') : publicKey;
         return new EthereumAddress(ethUtil.toChecksumAddress(ethUtil.pubToAddress(pubkey, true).toString('hex')));
     };
-    EthereumAddress.prototype.getValue = function () {
+    EthereumAddress.prototype.asString = function () {
         return this.value;
     };
     return EthereumAddress;
@@ -130465,6 +130481,7 @@ var EthereumClassicProtocol = /** @class */ (function (_super) {
 exports.EthereumClassicProtocol = EthereumClassicProtocol;
 
 },{"./BaseEthereumProtocol":524,"./EthereumProtocolOptions":530}],528:[function(require,module,exports){
+(function (Buffer){(function (){
 "use strict";
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -130536,11 +130553,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EthereumCryptoClient = void 0;
+var eth_sig_util_1 = require("@metamask/eth-sig-util");
 var EthereumJSUtils = __importStar(require("../../dependencies/src/ethereumjs-util-5.2.0/index"));
 var errors_1 = require("../../errors");
 var coinlib_error_1 = require("../../errors/coinlib-error");
 var Secp256k1CryptoClient_1 = require("../Secp256k1CryptoClient");
-var eth_sig_util_1 = require("@metamask/eth-sig-util");
 var EthereumCryptoClient = /** @class */ (function (_super) {
     __extends(EthereumCryptoClient, _super);
     function EthereumCryptoClient(protocol) {
@@ -130550,30 +130567,31 @@ var EthereumCryptoClient = /** @class */ (function (_super) {
     }
     EthereumCryptoClient.prototype.signMessage = function (message, keypair) {
         return __awaiter(this, void 0, void 0, function () {
-            var msgParams_1, msgParams_2, msgParams, messageBuffer, signature;
+            var privateKey, msgParams_1, msgParams_2, msgParams, messageBuffer, signature;
             return __generator(this, function (_a) {
                 if (!keypair.privateKey) {
                     throw new errors_1.NotFoundError(coinlib_error_1.Domain.ETHEREUM, "Private key not provided");
                 }
+                privateKey = Buffer.from(keypair.privateKey, 'hex');
                 try {
                     try {
                         msgParams_1 = JSON.parse(message) // TODO types
                         ;
-                        return [2 /*return*/, eth_sig_util_1.signTypedData({ privateKey: keypair.privateKey, data: msgParams_1, version: eth_sig_util_1.SignTypedDataVersion.V4 })];
+                        return [2 /*return*/, eth_sig_util_1.signTypedData({ privateKey: privateKey, data: msgParams_1, version: eth_sig_util_1.SignTypedDataVersion.V4 })];
                     }
                     catch (e) { }
                     try {
                         msgParams_2 = JSON.parse(message) // TODO types
                         ;
-                        return [2 /*return*/, eth_sig_util_1.signTypedData({ privateKey: keypair.privateKey, data: msgParams_2, version: eth_sig_util_1.SignTypedDataVersion.V3 })];
+                        return [2 /*return*/, eth_sig_util_1.signTypedData({ privateKey: privateKey, data: msgParams_2, version: eth_sig_util_1.SignTypedDataVersion.V3 })];
                     }
                     catch (e) { }
                     msgParams = JSON.parse(message);
-                    return [2 /*return*/, eth_sig_util_1.signTypedData({ privateKey: keypair.privateKey, data: msgParams, version: eth_sig_util_1.SignTypedDataVersion.V1 })];
+                    return [2 /*return*/, eth_sig_util_1.signTypedData({ privateKey: privateKey, data: msgParams, version: eth_sig_util_1.SignTypedDataVersion.V1 })];
                 }
                 catch (error) {
                     messageBuffer = EthereumJSUtils.hashPersonalMessage(EthereumJSUtils.toBuffer(message));
-                    signature = EthereumJSUtils.ecsign(messageBuffer, keypair.privateKey);
+                    signature = EthereumJSUtils.ecsign(messageBuffer, privateKey);
                     return [2 /*return*/, EthereumJSUtils.toRpcSig(signature.v, signature.r, signature.s)];
                 }
                 return [2 /*return*/];
@@ -130596,7 +130614,7 @@ var EthereumCryptoClient = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.protocol.getAddressFromPublicKey(publicKey)];
                     case 1:
                         address = _a.sent();
-                        return [2 /*return*/, recoveredAddress.toLowerCase() === address.getValue().toLowerCase()];
+                        return [2 /*return*/, recoveredAddress.toLowerCase() === address.address.toLowerCase()];
                 }
             });
         });
@@ -130605,7 +130623,8 @@ var EthereumCryptoClient = /** @class */ (function (_super) {
 }(Secp256k1CryptoClient_1.Secp256k1CryptoClient));
 exports.EthereumCryptoClient = EthereumCryptoClient;
 
-},{"../../dependencies/src/ethereumjs-util-5.2.0/index":385,"../../errors":491,"../../errors/coinlib-error":490,"../Secp256k1CryptoClient":498,"@metamask/eth-sig-util":883}],529:[function(require,module,exports){
+}).call(this)}).call(this,require("buffer").Buffer)
+},{"../../dependencies/src/ethereumjs-util-5.2.0/index":385,"../../errors":491,"../../errors/coinlib-error":490,"../Secp256k1CryptoClient":498,"@metamask/eth-sig-util":883,"buffer":67}],529:[function(require,module,exports){
 "use strict";
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -131439,12 +131458,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenericERC20 = void 0;
 var bignumber_1 = __importDefault(require("../../../dependencies/src/bignumber.js-9.0.0/bignumber"));
 var ethUtil = __importStar(require("../../../dependencies/src/ethereumjs-util-5.2.0/index"));
+var errors_1 = require("../../../errors");
+var coinlib_error_1 = require("../../../errors/coinlib-error");
 var ICoinSubProtocol_1 = require("../../ICoinSubProtocol");
 var BaseEthereumProtocol_1 = require("../BaseEthereumProtocol");
 var AirGapNodeClient_1 = require("../clients/node-clients/AirGapNodeClient");
 var utils_1 = require("../utils/utils");
-var errors_1 = require("../../../errors");
-var coinlib_error_1 = require("../../../errors/coinlib-error");
 var EthereumTransaction = require('../../../dependencies/src/ethereumjs-tx-1.3.7/index');
 var GenericERC20 = /** @class */ (function (_super) {
     __extends(GenericERC20, _super);
@@ -131469,7 +131488,7 @@ var GenericERC20 = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
                         address = _a.sent();
-                        return [2 /*return*/, this.getBalanceOfAddresses([address.getValue()])];
+                        return [2 /*return*/, this.getBalanceOfAddresses([address.address])];
                 }
             });
         });
@@ -131530,7 +131549,7 @@ var GenericERC20 = /** @class */ (function (_super) {
                         }
                         return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
-                        address = (_a.sent()).getValue();
+                        address = (_a.sent()).address;
                         return [4 /*yield*/, this.estimateGas(address, recipients[0], utils_1.EthereumUtils.toHex(values[0]))];
                     case 2:
                         estimatedGas = _a.sent();
@@ -131570,7 +131589,7 @@ var GenericERC20 = /** @class */ (function (_super) {
                     case 1:
                         balance = new (_a.apply(bignumber_1.default, [void 0, _c.sent()]))();
                         if (!balance.isGreaterThanOrEqualTo(wrappedValues[0])) return [3 /*break*/, 8];
-                        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 2:
                         address = _c.sent();
                         _b = bignumber_1.default.bind;
@@ -132151,19 +132170,19 @@ var SubstrateCryptoClient = /** @class */ (function (_super) {
         return _super.call(this) || this;
     }
     SubstrateCryptoClient.prototype.signMessage = function (message, keypair) {
-        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var publicKeyBuffer, messageU8a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var privateKeyBuffer, publicKeyBuffer, messageU8a;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0: return [4 /*yield*/, wasm_crypto_1.waitReady()];
                     case 1:
-                        _b.sent();
+                        _a.sent();
+                        privateKeyBuffer = Buffer.from(keypair.privateKey, 'hex');
                         publicKeyBuffer = Buffer.from(keypair.publicKey, 'hex');
                         util_1.assert((publicKeyBuffer === null || publicKeyBuffer === void 0 ? void 0 : publicKeyBuffer.length) === 32, 'Expected a valid publicKey, 32-bytes');
-                        util_1.assert(((_a = keypair.privateKey) === null || _a === void 0 ? void 0 : _a.length) === 64, 'Expected a valid secretKey, 64-bytes');
+                        util_1.assert(privateKeyBuffer.length === 64, 'Expected a valid secretKey, 64-bytes');
                         messageU8a = util_1.u8aToU8a(message);
-                        return [2 /*return*/, "0x" + Buffer.from(wasm_crypto_1.sr25519Sign(publicKeyBuffer, keypair.privateKey, messageU8a)).toString('hex')];
+                        return [2 /*return*/, "0x" + Buffer.from(wasm_crypto_1.sr25519Sign(publicKeyBuffer, privateKeyBuffer, messageU8a)).toString('hex')];
                 }
             });
         });
@@ -132275,7 +132294,7 @@ var SubstrateDelegateProtocol = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.options.nodeClient.getValidators()];
                     case 1:
                         validators = _a.sent();
-                        return [2 /*return*/, validators ? validators[0].getValue() : ''];
+                        return [2 /*return*/, validators ? validators[0].asString() : ''];
                 }
             });
         });
@@ -132333,7 +132352,7 @@ var SubstrateDelegateProtocol = /** @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)];
                 }
             });
         });
@@ -132353,7 +132372,7 @@ var SubstrateDelegateProtocol = /** @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)];
                 }
             });
         });
@@ -132765,6 +132784,7 @@ var SubstrateNetwork;
 })(SubstrateNetwork = exports.SubstrateNetwork || (exports.SubstrateNetwork = {}));
 
 },{}],544:[function(require,module,exports){
+(function (Buffer){(function (){
 "use strict";
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -132884,7 +132904,7 @@ var SubstrateProtocol = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.options.accountController.createKeyPairFromMnemonic(mnemonic, derivationPath, password)];
                     case 1:
                         keyPair = _a.sent();
-                        return [2 /*return*/, keyPair.privateKey];
+                        return [2 /*return*/, keyPair.privateKey.toString('hex')];
                 }
             });
         });
@@ -132910,42 +132930,44 @@ var SubstrateProtocol = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.options.accountController.createKeyPairFromHexSecret(secret, derivationPath)];
                     case 1:
                         keyPair = _a.sent();
-                        return [2 /*return*/, keyPair.privateKey];
+                        return [2 /*return*/, keyPair.privateKey.toString('hex')];
                 }
             });
         });
     };
-    SubstrateProtocol.prototype.getAddressFromPublicKey = function (publicKey) {
+    SubstrateProtocol.prototype.getAddressFromPublicKey = function (publicKey, cursor) {
         return __awaiter(this, void 0, void 0, function () {
+            var address;
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.options.accountController.createAddressFromPublicKey(publicKey)];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.options.accountController.createAddressFromPublicKey(publicKey)];
+                    case 1:
+                        address = _a.sent();
+                        return [2 /*return*/, {
+                                address: address.asString(),
+                                cursor: { hasNext: false }
+                            }];
+                }
             });
         });
     };
-    SubstrateProtocol.prototype.getAddressesFromPublicKey = function (publicKey) {
+    SubstrateProtocol.prototype.getAddressesFromPublicKey = function (publicKey, cursor) {
         return __awaiter(this, void 0, void 0, function () {
             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: return [2 /*return*/, [_a.sent()]];
                 }
             });
         });
     };
-    SubstrateProtocol.prototype.getNextAddressFromPublicKey = function (publicKey, current) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, current];
-            });
-        });
-    };
     SubstrateProtocol.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();
@@ -132979,7 +133001,7 @@ var SubstrateProtocol = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         txs = this.options.transactionController.decodeDetails(rawTransaction.encoded);
-                        return [4 /*yield*/, Promise.all(txs.map(function (tx) { return _this.options.transactionController.signTransaction(privateKey, tx.transaction, tx.payload); }))];
+                        return [4 /*yield*/, Promise.all(txs.map(function (tx) { return _this.options.transactionController.signTransaction(Buffer.from(privateKey, 'hex'), tx.transaction, tx.payload); }))];
                     case 1:
                         signed = _a.sent();
                         txs.forEach(function (tx, index) { return (tx.transaction = signed[index]); });
@@ -133040,7 +133062,7 @@ var SubstrateProtocol = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
                     case 1:
                         address = _a.sent();
-                        return [2 /*return*/, this.getBalanceOfAddresses([address.getValue()])];
+                        return [2 /*return*/, this.getBalanceOfAddresses([address.address])];
                 }
             });
         });
@@ -133312,9 +133334,9 @@ var SubstrateProtocol = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             var key;
             return __generator(this, function (_a) {
-                key = privateKey.slice(0, 32) // Substrate key is 32 bytes key + 32 bytes nonce
+                key = Buffer.from(privateKey, 'hex').slice(0, 32) // Substrate key is 32 bytes key + 32 bytes nonce
                 ;
-                return [2 /*return*/, this.cryptoClient.encryptAES(message, key)];
+                return [2 /*return*/, this.cryptoClient.encryptAES(message, key.toString('hex'))];
             });
         });
     };
@@ -133322,9 +133344,9 @@ var SubstrateProtocol = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             var key;
             return __generator(this, function (_a) {
-                key = privateKey.slice(0, 32) // Substrate key is 32 bytes key + 32 bytes nonce
+                key = Buffer.from(privateKey, 'hex').slice(0, 32) // Substrate key is 32 bytes key + 32 bytes nonce
                 ;
-                return [2 /*return*/, this.cryptoClient.decryptAES(message, key)];
+                return [2 /*return*/, this.cryptoClient.decryptAES(message, key.toString('hex'))];
             });
         });
     };
@@ -133339,7 +133361,8 @@ var SubstrateProtocol = /** @class */ (function (_super) {
 }(NonExtendedProtocol_1.NonExtendedProtocol));
 exports.SubstrateProtocol = SubstrateProtocol;
 
-},{"../../dependencies/src/bignumber.js-9.0.0/bignumber":269,"../../errors":491,"../../errors/coinlib-error":490,"../NonExtendedProtocol":497,"./SubstrateCryptoClient":541,"./common/data/account/SubstrateAddress":555,"./common/data/transaction/SubstrateTransaction":625}],545:[function(require,module,exports){
+}).call(this)}).call(this,require("buffer").Buffer)
+},{"../../dependencies/src/bignumber.js-9.0.0/bignumber":269,"../../errors":491,"../../errors/coinlib-error":490,"../NonExtendedProtocol":497,"./SubstrateCryptoClient":541,"./common/data/account/SubstrateAddress":555,"./common/data/transaction/SubstrateTransaction":625,"buffer":67}],545:[function(require,module,exports){
 "use strict";
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -134025,7 +134048,7 @@ var SubstrateAccountController = /** @class */ (function () {
                         }
                         _b.label = 4;
                     case 4: return [2 /*return*/, {
-                            address: address.getValue(),
+                            address: address.asString(),
                             name: identity ? identity.display.toString() : undefined,
                             status: status || undefined,
                             ownStash: exposure ? exposure.own.toString() : undefined,
@@ -134076,7 +134099,7 @@ var SubstrateAccountController = /** @class */ (function () {
                     case 3:
                         availableActions = _c.sent();
                         return [2 /*return*/, {
-                                address: address.getValue(),
+                                address: address.asString(),
                                 balance: balance.toString(),
                                 delegatees: validators,
                                 availableActions: availableActions,
@@ -134384,7 +134407,7 @@ var SubstrateAccountController = /** @class */ (function () {
                                 exposures: exposuresWithValidators === null || exposuresWithValidators === void 0 ? void 0 : exposuresWithValidators.map(function (_a) {
                                     var validator = _a[0], _ = _a[1], exposure = _a[2];
                                     return [
-                                        validator.getValue(),
+                                        validator.asString(),
                                         exposure === null || exposure === void 0 ? void 0 : exposure.others.elements.findIndex(function (element) { return element.first.compare(accountId) === 0; })
                                     ];
                                 }).filter(function (_a) {
@@ -134414,7 +134437,7 @@ var SubstrateAccountController = /** @class */ (function () {
                     case 0:
                         availableActions = [];
                         currentValidators = ((_b = (_a = nominations === null || nominations === void 0 ? void 0 : nominations.targets) === null || _a === void 0 ? void 0 : _a.elements) === null || _b === void 0 ? void 0 : _b.map(function (target) { return target.asAddress(); })) || [];
-                        validatorAddresses = validatorIds.map(function (id) { return _this.substrateAddressFrom(id).getValue(); });
+                        validatorAddresses = validatorIds.map(function (id) { return _this.substrateAddressFrom(id).asString(); });
                         isBonded = new bignumber_1.default((_c = stakingDetails === null || stakingDetails === void 0 ? void 0 : stakingDetails.active) !== null && _c !== void 0 ? _c : 0).gt(0);
                         isDelegating = nominations !== null;
                         isUnbonding = stakingDetails && stakingDetails.locked.length > 0;
@@ -135145,13 +135168,13 @@ var SubstrateAddress = /** @class */ (function () {
             return this.payload.compare(Buffer.from(other, 'hex'));
         }
         else if (typeof other === 'string') {
-            return this.getValue().localeCompare(other);
+            return this.asString().localeCompare(other);
         }
         else {
             return this.payload.compare(other.payload);
         }
     };
-    SubstrateAddress.prototype.getValue = function () {
+    SubstrateAddress.prototype.asString = function () {
         if (!this.encoded) {
             this.encoded = bs58.encode(Buffer.concat([this.version, this.payload, this.checksum]));
         }
@@ -138148,7 +138171,7 @@ var SCALEAccountId = /** @class */ (function (_super) {
         }
     };
     SCALEAccountId.prototype.asAddress = function () {
-        return this.address.getValue();
+        return this.address.asString();
     };
     SCALEAccountId.prototype.asBytes = function () {
         return this.address.getBufferBytes();
@@ -140098,7 +140121,7 @@ var TransferArgsFactory = /** @class */ (function (_super) {
         var _this = this;
         return function () { return [
             {
-                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.to).getValue()],
+                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.to).asString()],
                 amount: _this.args.value.toString()
             }
         ]; };
@@ -140139,7 +140162,7 @@ var BondArgsFactory = /** @class */ (function (_super) {
         var _this = this;
         return function () { return [
             {
-                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.controller).getValue()],
+                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.controller).asString()],
                 amount: _this.args.value.toString()
             }
         ]; };
@@ -140310,7 +140333,7 @@ var NominateArgsFactory = /** @class */ (function (_super) {
         var _this = this;
         return function () { return [
             {
-                to: _this.args.targets.map(function (target) { return SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(target).getValue(); })
+                to: _this.args.targets.map(function (target) { return SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(target).asString(); })
             }
         ]; };
     };
@@ -140435,7 +140458,7 @@ var SetControllerArgsFactory = /** @class */ (function (_super) {
         var _this = this;
         return function () { return [
             {
-                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.controller).getValue()]
+                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.controller).asString()]
             }
         ]; };
     };
@@ -140509,7 +140532,7 @@ var MoonbeamDelegateArgsFactory = /** @class */ (function (_super) {
         var _this = this;
         return function () { return [
             {
-                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.candidate).getValue()],
+                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.candidate).asString()],
                 amount: new bignumber_1.default(_this.args.amount).toString()
             }
         ]; };
@@ -140636,7 +140659,7 @@ var MoonbeamScheduleRevokeDelegationArgsFactory = /** @class */ (function (_supe
         var _this = this;
         return function () { return [
             {
-                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.collator).getValue()]
+                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.collator).asString()]
             }
         ]; };
     };
@@ -140673,8 +140696,8 @@ var MoonbeamExecuteDelegationRequestArgsFactory = /** @class */ (function (_supe
         var _this = this;
         return function () { return [
             {
-                from: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.delegator).getValue()],
-                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.candidate).getValue()]
+                from: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.delegator).asString()],
+                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.candidate).asString()]
             }
         ]; };
     };
@@ -140710,7 +140733,7 @@ var MoonbeamCancelDelegationRequestArgsFactory = /** @class */ (function (_super
         var _this = this;
         return function () { return [
             {
-                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.candidate).getValue()]
+                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.candidate).asString()]
             }
         ]; };
     };
@@ -140747,7 +140770,7 @@ var MoonbeamDelegatorBondMoreArgsFactory = /** @class */ (function (_super) {
         var _this = this;
         return function () { return [
             {
-                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.candidate).getValue()],
+                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.candidate).asString()],
                 amount: new bignumber_1.default(_this.args.more).toString()
             }
         ]; };
@@ -140787,7 +140810,7 @@ var MoonbeamScheduleDelegatorBondLessArgsFactory = /** @class */ (function (_sup
         var _this = this;
         return function () { return [
             {
-                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.candidate).getValue()],
+                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.candidate).asString()],
                 amount: new bignumber_1.default(_this.args.less).toString()
             }
         ]; };
@@ -140824,7 +140847,7 @@ var MoonbeamExecuteCandidateBondLessArgsFactory = /** @class */ (function (_supe
         var _this = this;
         return function () { return [
             {
-                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.candidate).getValue()]
+                to: [SubstrateCompatAddress_1.substrateAddressFactory(_this.network).from(_this.args.candidate).asString()]
             }
         ]; };
     };
@@ -141987,7 +142010,7 @@ var MoonbeamProtocol = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.options.nodeClient.getCollators()];
                     case 1:
                         collators = _a.sent();
-                        return [2 /*return*/, collators ? collators[0].getValue() : ''];
+                        return [2 /*return*/, collators ? collators[0].asString() : ''];
                 }
             });
         });
@@ -142060,7 +142083,7 @@ var MoonbeamProtocol = /** @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)];
                 }
             });
         });
@@ -142253,7 +142276,7 @@ var MoonbeamProtocol = /** @class */ (function (_super) {
                         results = _a.sent();
                         delegatorDetails = results[0];
                         balance = results[1];
-                        delegator = results[2].getValue();
+                        delegator = results[2].address;
                         return [4 /*yield*/, this.options.transactionController.prepareSubmittableTransactions(publicKey, balance, [
                                 {
                                     type: SubstrateTransaction_1.SubstrateTransactionType.M_EXECUTE_LEAVE_DELEGATORS,
@@ -142378,7 +142401,7 @@ var MoonbeamProtocol = /** @class */ (function (_super) {
                     case 1:
                         results = _a.sent();
                         balance = results[0];
-                        delegator = results[1].getValue();
+                        delegator = results[1].address;
                         return [4 /*yield*/, this.options.transactionController.prepareSubmittableTransactions(publicKey, balance, [
                                 {
                                     type: SubstrateTransaction_1.SubstrateTransactionType.M_EXECUTE_DELGATION_REQUEST,
@@ -142806,7 +142829,7 @@ var MoonbeamAccountController = /** @class */ (function (_super) {
                                 break;
                         }
                         _c = {
-                            address: address.getValue(),
+                            address: address.asString(),
                             balance: balance.toString(),
                             totalBond: totalBond.toString(),
                             delegatees: (_b = delegatorState === null || delegatorState === void 0 ? void 0 : delegatorState.delegations.elements.map(function (bond) { return bond.owner.asAddress(); })) !== null && _b !== void 0 ? _b : []
@@ -142845,7 +142868,7 @@ var MoonbeamAccountController = /** @class */ (function (_super) {
                                 status = 'Leaving';
                         }
                         return [2 /*return*/, {
-                                address: address.getValue(),
+                                address: address.asString(),
                                 status: status,
                                 minEligibleBalance: candidateInfo.lowestTopDelegationAmount.toString(),
                                 ownStakingBalance: candidateInfo.bond.toString(),
@@ -142895,7 +142918,7 @@ var MoonbeamAccountController = /** @class */ (function (_super) {
                                 break;
                         }
                         _f = {
-                            address: delegatorAddress.getValue(),
+                            address: delegatorAddress.asString(),
                             balance: balance.toString(),
                             totalBond: totalBond.toString(),
                             delegatees: (_e = delegatorState === null || delegatorState === void 0 ? void 0 : delegatorState.delegations.elements.map(function (bond) { return bond.owner.asAddress(); })) !== null && _e !== void 0 ? _e : []
@@ -143282,10 +143305,10 @@ var MoonbeamAddress = /** @class */ (function () {
         return new MoonbeamAddress(address);
     };
     MoonbeamAddress.prototype.compare = function (other) {
-        var value = typeof other === 'string' ? other : other.getValue();
-        return hex_1.stripHexPrefix(this.getValue()).localeCompare(hex_1.stripHexPrefix(value));
+        var value = typeof other === 'string' ? other : other.asString();
+        return hex_1.stripHexPrefix(this.asString()).localeCompare(hex_1.stripHexPrefix(value));
     };
-    MoonbeamAddress.prototype.getValue = function () {
+    MoonbeamAddress.prototype.asString = function () {
         return hex_1.addHexPrefix(this.value);
     };
     MoonbeamAddress.prototype.getBufferBytes = function () {
@@ -144611,7 +144634,7 @@ var TezosAddress = /** @class */ (function () {
     TezosAddress.isTzAddress = function (address) {
         return address.startsWith('tz1') || address.startsWith('tz2') || address.startsWith('tz3');
     };
-    TezosAddress.prototype.getValue = function () {
+    TezosAddress.prototype.asString = function () {
         return this.value;
     };
     return TezosAddress;
@@ -144721,7 +144744,7 @@ var TezosCryptoClient = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.hash(bufferMessage)];
                     case 3:
                         hash = _a.sent();
-                        rawSignature = sodium.crypto_sign_detached(hash, keypair.privateKey);
+                        rawSignature = sodium.crypto_sign_detached(hash, Buffer.from(keypair.privateKey, 'hex'));
                         signature = bs58check.encode(Buffer.concat([Buffer.from(this.edsigPrefix), Buffer.from(rawSignature)]));
                         return [2 /*return*/, signature];
                 }
@@ -145064,23 +145087,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]];
@@ -145088,20 +145120,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();
@@ -145135,7 +145160,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)]);
@@ -145302,7 +145327,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)];
                 }
             });
         });
@@ -145477,7 +145502,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();
@@ -145658,7 +145683,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)];
                 }
             });
         });
@@ -145701,7 +145726,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)];
                 }
             });
         });
@@ -145727,7 +145752,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)];
                 }
             });
         });
@@ -145747,7 +145772,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)];
                 }
             });
         });
@@ -145862,7 +145887,7 @@ 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([
@@ -146261,7 +146286,7 @@ 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([
@@ -148482,18 +148507,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TezosFA1Protocol = void 0;
 var bignumber_1 = __importDefault(require("../../../dependencies/src/bignumber.js-9.0.0/bignumber"));
+var errors_1 = require("../../../errors");
+var coinlib_error_1 = require("../../../errors/coinlib-error");
 var hex_1 = require("../../../utils/hex");
 var TezosProtocol_1 = require("../TezosProtocol");
 var TezosUtils_1 = require("../TezosUtils");
 var MichelsonPair_1 = require("../types/michelson/generics/MichelsonPair");
 var MichelsonAddress_1 = require("../types/michelson/primitives/MichelsonAddress");
 var MichelsonInt_1 = require("../types/michelson/primitives/MichelsonInt");
+var MichelsonString_1 = require("../types/michelson/primitives/MichelsonString");
 var TezosOperationType_1 = require("../types/TezosOperationType");
 var utils_1 = require("../types/utils");
 var TezosFAProtocol_1 = require("./TezosFAProtocol");
-var errors_1 = require("../../../errors");
-var coinlib_error_1 = require("../../../errors/coinlib-error");
-var MichelsonString_1 = require("../types/michelson/primitives/MichelsonString");
 var TezosFA1ContractEntrypoint;
 (function (TezosFA1ContractEntrypoint) {
     TezosFA1ContractEntrypoint["BALANCE"] = "getBalance";
@@ -148686,7 +148711,7 @@ var TezosFA1Protocol = /** @class */ (function (_super) {
                         addressIndex = data && data.addressIndex !== undefined ? data.addressIndex : 0;
                         return [4 /*yield*/, this.getAddressesFromPublicKey(publicKey)];
                     case 1:
-                        addresses = (_a.sent()).map(function (address) { return address.getValue(); });
+                        addresses = (_a.sent()).map(function (address) { return address.address; });
                         if (!addresses[addressIndex]) {
                             throw new errors_1.NotFoundError(coinlib_error_1.Domain.TEZOSFA, "no kt-address with index " + addressIndex + " exists");
                         }
@@ -148955,7 +148980,7 @@ var TezosFA2Protocol = /** @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)];
                 }
             });
         });
@@ -149242,7 +149267,7 @@ var TezosFA2Protocol = /** @class */ (function (_super) {
                         tokenID = (_c = (_b = data === null || data === void 0 ? void 0 : data.assetID) !== null && _b !== void 0 ? _b : this.tokenID) !== null && _c !== void 0 ? _c : 0;
                         return [4 /*yield*/, this.getAddressesFromPublicKey(publicKey)];
                     case 1:
-                        addresses = (_d.sent()).map(function (address) { return address.getValue(); });
+                        addresses = (_d.sent()).map(function (address) { return address.address; });
                         if (!addresses[addressIndex]) {
                             throw new errors_1.NotFoundError(coinlib_error_1.Domain.TEZOSFA, "no kt-address with index " + addressIndex + " exists");
                         }
@@ -149437,7 +149462,7 @@ var TezosFAProtocol = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.getAddressesFromPublicKey(publicKey)];
                     case 1:
-                        addresses = (_a.sent()).map(function (address) { return address.getValue(); });
+                        addresses = (_a.sent()).map(function (address) { return address.address; });
                         return [2 /*return*/, this.getTransactionsFromAddresses(addresses, limit, cursor)];
                 }
             });
@@ -151129,6 +151154,7 @@ var TezosProtocol_1 = require("../TezosProtocol");
 var TezosOperationType_1 = require("../types/TezosOperationType");
 var TezosKtAddress_1 = require("./TezosKtAddress");
 var TezosUtils_1 = require("../TezosUtils");
+var INDEX_LIMIT = 10000;
 var TezosKtProtocol = /** @class */ (function (_super) {
     __extends(TezosKtProtocol, _super);
     function TezosKtProtocol() {
@@ -151140,15 +151166,16 @@ var TezosKtProtocol = /** @class */ (function (_super) {
         _this.migrationFee = new bignumber_1.default(5000);
         return _this;
     }
-    TezosKtProtocol.prototype.getAddressFromPublicKey = function (publicKey, addressIndex) {
+    TezosKtProtocol.prototype.getAddressFromPublicKey = function (publicKey, cursor) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var addresses, index;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, this.getAddressesFromPublicKey(publicKey)];
                     case 1:
-                        addresses = _a.sent();
-                        index = addressIndex !== null && addressIndex !== void 0 ? addressIndex : 0;
+                        addresses = _b.sent();
+                        index = (_a = cursor === null || cursor === void 0 ? void 0 : cursor.index) !== null && _a !== void 0 ? _a : 0;
                         if (index >= addresses.length) {
                             throw new errors_1.NotFoundError(coinlib_error_1.Domain.TEZOS, 'No address for the specified index exists');
                         }
@@ -151157,18 +151184,40 @@ var TezosKtProtocol = /** @class */ (function (_super) {
             });
         });
     };
-    TezosKtProtocol.prototype.getAddressesFromPublicKey = function (publicKey) {
+    TezosKtProtocol.prototype.getAddressesFromPublicKey = function (publicKey, cursor) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var tz1address, ktAddresses;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var tz1address, startIndex, ktAddresses, addresses;
+            var _this = this;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, _super.prototype.getAddressFromPublicKey.call(this, publicKey)];
                     case 1:
-                        tz1address = (_a.sent()).getValue();
-                        return [4 /*yield*/, this.options.network.extras.indexerClient.getDelegatorContracts(tz1address, 10000)];
+                        tz1address = (_b.sent()).address;
+                        startIndex = (_a = cursor === null || cursor === void 0 ? void 0 : cursor.index) !== null && _a !== void 0 ? _a : 0;
+                        return [4 /*yield*/, this.options.network.extras.indexerClient.getDelegatorContracts(tz1address, INDEX_LIMIT)];
                     case 2:
-                        ktAddresses = _a.sent();
-                        return [2 /*return*/, Promise.all(ktAddresses.reverse().map(function (ktAddress) { return TezosKtAddress_1.TezosKtAddress.from(ktAddress); }))];
+                        ktAddresses = _b.sent();
+                        return [4 /*yield*/, Promise.all(ktAddresses.reverse().map(function (ktAddress, index) { return __awaiter(_this, void 0, void 0, function () {
+                                var address;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0: return [4 /*yield*/, TezosKtAddress_1.TezosKtAddress.from(ktAddress)];
+                                        case 1:
+                                            address = _a.sent();
+                                            return [2 /*return*/, {
+                                                    address: address.asString(),
+                                                    cursor: {
+                                                        hasNext: index < INDEX_LIMIT - 1,
+                                                        index: index
+                                                    }
+                                                }];
+                                    }
+                                });
+                            }); }))];
+                    case 3:
+                        addresses = _b.sent();
+                        return [2 /*return*/, addresses.slice(startIndex)];
                 }
             });
         });
@@ -151178,10 +151227,14 @@ var TezosKtProtocol = /** @class */ (function (_super) {
             var address;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey, data === null || data === void 0 ? void 0 : data.addressIndex)];
+                    case 0: return [4 /*yield*/, this.getAddressFromPublicKey(publicKey, (data === null || data === void 0 ? void 0 : data.addressIndex) ? {
+                            hasNext: data.addressIndex < INDEX_LIMIT - 1,
+                            index: data.addressIndex
+                        }
+                            : undefined)];
                     case 1:
                         address = _a.sent();
-                        return [2 /*return*/, this.getBalanceOfAddresses([address.getValue()])];
+                        return [2 /*return*/, this.getBalanceOfAddresses([address.address])];
                 }
             });
         });
@@ -151231,7 +151284,7 @@ var TezosKtProtocol = /** @class */ (function (_super) {
                         operations = [];
                         return [4 /*yield*/, _super.prototype.getAddressFromPublicKey.call(this, publicKey)];
                     case 1:
-                        address = (_e.sent()).getValue();
+                        address = (_e.sent()).address;
                         _a = bignumber_1.default.bind;
                         return [4 /*yield*/, _super.prototype.getBalanceOfAddresses.call(this, [address])];
                     case 2:
@@ -151809,16 +151862,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TezosSaplingProtocol = void 0;
 var sapling = __importStar(require("@airgap/sapling-wasm"));
 var sodium = require("libsodium-wrappers");
-var __1 = require("../../..");
 var bignumber_1 = __importDefault(require("../../../dependencies/src/bignumber.js-9.0.0/bignumber"));
 var bip39_2_5_0_1 = require("../../../dependencies/src/bip39-2.5.0");
 var errors_1 = require("../../../errors");
+var coinlib_error_1 = require("../../../errors/coinlib-error");
 var array_1 = require("../../../utils/array");
 var NonExtendedProtocol_1 = require("../../NonExtendedProtocol");
 var TezosContract_1 = require("../contract/TezosContract");
 var TezosAddress_1 = require("../TezosAddress");
 var TezosProtocol_1 = require("../TezosProtocol");
 var TezosProtocolOptions_1 = require("../TezosProtocolOptions");
+var TezosUtils_1 = require("../TezosUtils");
 var MichelsonAddress_1 = require("../types/michelson/primitives/MichelsonAddress");
 var TezosOperationType_1 = require("../types/TezosOperationType");
 var TezosSaplingNodeClient_1 = require("./node/TezosSaplingNodeClient");
@@ -151927,23 +151981,60 @@ var TezosSaplingProtocol = /** @class */ (function (_super) {
     };
     TezosSaplingProtocol.prototype.getPrivateKeyFromHexSecret = function (secret, derivationPath) {
         return __awaiter(this, void 0, void 0, function () {
+            var xsk;
             return __generator(this, function (_a) {
-                return [2 /*return*/, sapling.getExtendedSpendingKey(secret, derivationPath)];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, sapling.getExtendedSpendingKey(secret, derivationPath)];
+                    case 1:
+                        xsk = _a.sent();
+                        return [2 /*return*/, xsk.toString('hex')];
+                }
             });
         });
     };
-    TezosSaplingProtocol.prototype.getAddressFromPublicKey = function (viewingKey) {
+    TezosSaplingProtocol.prototype.getAddressFromPublicKey = function (viewingKey, cursor) {
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, TezosSaplingAddress_1.TezosSaplingAddress.fromViewingKey(viewingKey)];
+            var current, _a, address, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        if (!((cursor === null || cursor === void 0 ? void 0 : cursor.hasNext) && (cursor === null || cursor === void 0 ? void 0 : cursor.diversifierIndex))) return [3 /*break*/, 2];
+                        return [4 /*yield*/, TezosSaplingAddress_1.TezosSaplingAddress.fromViewingKey(viewingKey, cursor.diversifierIndex)];
+                    case 1:
+                        _a = _c.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        _a = undefined;
+                        _c.label = 3;
+                    case 3:
+                        current = _a;
+                        if (!current) return [3 /*break*/, 5];
+                        return [4 /*yield*/, TezosSaplingAddress_1.TezosSaplingAddress.next(viewingKey, current)];
+                    case 4:
+                        _b = _c.sent();
+                        return [3 /*break*/, 7];
+                    case 5: return [4 /*yield*/, TezosSaplingAddress_1.TezosSaplingAddress.fromViewingKey(viewingKey)];
+                    case 6:
+                        _b = _c.sent();
+                        _c.label = 7;
+                    case 7:
+                        address = _b;
+                        return [2 /*return*/, {
+                                address: address.asString(),
+                                cursor: {
+                                    hasNext: address.diversifierIndex !== undefined,
+                                    diversifierIndex: address.diversifierIndex
+                                }
+                            }];
+                }
             });
         });
     };
-    TezosSaplingProtocol.prototype.getAddressesFromPublicKey = function (viewingKey) {
+    TezosSaplingProtocol.prototype.getAddressesFromPublicKey = function (viewingKey, cursor) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getAddressFromPublicKey(viewingKey)];
+                    case 0: return [4 /*yield*/, this.getAddressFromPublicKey(viewingKey, cursor)];
                     case 1: return [2 /*return*/, [_a.sent()]];
                 }
             });
@@ -151951,15 +152042,20 @@ var TezosSaplingProtocol = /** @class */ (function (_super) {
     };
     TezosSaplingProtocol.prototype.getAddressFromViewingKey = function (viewingKey, index) {
         return __awaiter(this, void 0, void 0, function () {
+            var address;
             return __generator(this, function (_a) {
-                return [2 /*return*/, TezosSaplingAddress_1.TezosSaplingAddress.fromViewingKey(viewingKey, index)];
-            });
-        });
-    };
-    TezosSaplingProtocol.prototype.getNextAddressFromPublicKey = function (viewingKey, current) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, TezosSaplingAddress_1.TezosSaplingAddress.next(viewingKey, current)];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, TezosSaplingAddress_1.TezosSaplingAddress.fromViewingKey(viewingKey, index)];
+                    case 1:
+                        address = _a.sent();
+                        return [2 /*return*/, {
+                                address: address.asString(),
+                                cursor: {
+                                    hasNext: address.diversifierIndex !== undefined,
+                                    diversifierIndex: address.diversifierIndex
+                                }
+                            }];
+                }
             });
         });
     };
@@ -152022,7 +152118,7 @@ var TezosSaplingProtocol = /** @class */ (function (_super) {
                                         case 0:
                                             _a = {};
                                             return [4 /*yield*/, this.getAddressFromPublicKey(publicKey)];
-                                        case 1: return [2 /*return*/, (_a.from = [(_b.sent()).getValue()],
+                                        case 1: return [2 /*return*/, (_a.from = [(_b.sent()).address],
                                                 _a.to = [input.address],
                                                 _a.isInbound = false,
                                                 _a.amount = input.value,
@@ -152054,7 +152150,7 @@ var TezosSaplingProtocol = /** @class */ (function (_super) {
                         boundData = transaction.unshieldTarget && transaction.unshieldTarget.length > 0
                             ? this.createAddressBoundData(transaction.unshieldTarget)
                             : undefined;
-                        return [4 /*yield*/, this.forger.forgeSaplingTransaction(transaction.ins, transaction.outs, stateTree, this.getAntiReplay(transaction.chainId, transaction.contractAddress), boundData, privateKey)];
+                        return [4 /*yield*/, this.forger.forgeSaplingTransaction(transaction.ins, transaction.outs, stateTree, this.getAntiReplay(transaction.chainId, transaction.contractAddress), boundData, Buffer.from(privateKey, 'hex'))];
                     case 2:
                         forgedTransaction = _a.sent();
                         return [2 /*return*/, this.encoder.encodeTransaction(forgedTransaction).toString('hex')];
@@ -152072,7 +152168,7 @@ var TezosSaplingProtocol = /** @class */ (function (_super) {
                         airGapTxs = [];
                         if (!this.isRawTezosSaplingTransaction(tx)) return [3 /*break*/, 2];
                         unshieldTarget = tx.unshieldTarget.length > 0 ? tx.unshieldTarget : undefined;
-                        return [4 /*yield*/, this.getAddressFromPublicKey(transaction.publicKey)];
+                        return [4 /*yield*/, this.getAddressFromPublicKey(transaction.publicKey).then(function (address) { return TezosSaplingAddress_1.TezosSaplingAddress.fromValue(address.address, address.cursor.diversifierIndex); })];
                     case 1:
                         from = _d.sent();
                         details = this.bookkeeper
@@ -152285,11 +152381,11 @@ var TezosSaplingProtocol = /** @class */ (function (_super) {
                             rpcErrors = error_1.data;
                             cannotPayStorageFee = rpcErrors.find(function (error) { return error.id.endsWith('.contract.cannot_pay_storage_fee'); });
                             if (cannotPayStorageFee) {
-                                throw new errors_1.BalanceError(__1.Domain.TEZOS, 'Balance too low, cannot pay for storage fee');
+                                throw new errors_1.BalanceError(coinlib_error_1.Domain.TEZOS, 'Balance too low, cannot pay for storage fee');
                             }
                             balanceTooLowError = rpcErrors.find(function (error) { return error.id.endsWith('.contract.balance_too_low'); });
                             if (balanceTooLowError) {
-                                throw new errors_1.BalanceError(__1.Domain.TEZOS, 'Balance too low');
+                                throw new errors_1.BalanceError(coinlib_error_1.Domain.TEZOS, 'Balance too low');
                             }
                         }
                         throw error_1;
@@ -152360,7 +152456,9 @@ var TezosSaplingProtocol = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.chooseInputs(viewingKey, stateDiff.commitments_and_ciphertexts, stateDiff.nullifiers, value)];
                     case 2:
                         _d = _g.sent(), inputs = _d[0], toSpend = _d[1];
-                        return [4 /*yield*/, this.getAddressFromPublicKey(viewingKey)];
+                        return [4 /*yield*/, this.getAddressFromPublicKey(viewingKey).then(function (address) {
+                                return TezosSaplingAddress_1.TezosSaplingAddress.fromValue(address.address, address.cursor.diversifierIndex);
+                            })];
                     case 3:
                         address = _g.sent();
                         _e = this.createPaymentOutput;
@@ -152405,7 +152503,7 @@ var TezosSaplingProtocol = /** @class */ (function (_super) {
                         _b = {};
                         return [4 /*yield*/, TezosSaplingAddress_1.TezosSaplingAddress.fromValue(recipient)];
                     case 2:
-                        output = (_b.address = (_c.sent()).getValue(),
+                        output = (_b.address = (_c.sent()).asString(),
                             _b.value = value,
                             _b.memo = Buffer.alloc(this.options.config.memoSize).toString('hex'),
                             _b.browsable = true,
@@ -152439,7 +152537,7 @@ var TezosSaplingProtocol = /** @class */ (function (_super) {
                         _c = {};
                         return [4 /*yield*/, this.getAddressFromPublicKey(viewingKey)];
                     case 3:
-                        paybackOutput = (_c.address = (_d.sent()).getValue(),
+                        paybackOutput = (_c.address = (_d.sent()).address,
                             _c.value = toSpend.minus(value).toString(),
                             _c.memo = Buffer.alloc(this.options.config.memoSize).toString('hex'),
                             _c.browsable = true,
@@ -152486,7 +152584,7 @@ var TezosSaplingProtocol = /** @class */ (function (_super) {
     TezosSaplingProtocol.prototype.createPaymentOutput = function (address, value, memo) {
         if (memo === void 0) { memo = Buffer.alloc(this.options.config.memoSize); }
         return {
-            address: address.getValue(),
+            address: address.asString(),
             value: new bignumber_1.default(value).toString(),
             memo: memo.toString('hex'),
             browsable: true
@@ -152497,7 +152595,7 @@ var TezosSaplingProtocol = /** @class */ (function (_super) {
         var paybackValue = toSpend.minus(value);
         return paybackValue.gt(0)
             ? {
-                address: address.getValue(),
+                address: address.asString(),
                 value: paybackValue.toString(),
                 memo: memo.toString('hex'),
                 browsable: true
@@ -152516,7 +152614,7 @@ var TezosSaplingProtocol = /** @class */ (function (_super) {
                                 rcm: rcm.toString('hex'),
                                 pos: '0',
                                 value: '0',
-                                address: address.getValue()
+                                address: address.asString()
                             }];
                 }
             });
@@ -152535,7 +152633,7 @@ var TezosSaplingProtocol = /** @class */ (function (_super) {
                         address = _a.sent();
                         memo = sodium.randombytes_buf(this.options.config.memoSize);
                         return [2 /*return*/, {
-                                address: address.getValue(),
+                                address: address.address,
                                 value: '0',
                                 memo: Buffer.from(memo).toString('hex'),
                                 browsable: false
@@ -152562,8 +152660,8 @@ var TezosSaplingProtocol = /** @class */ (function (_super) {
         });
     };
     TezosSaplingProtocol.prototype.createAddressBoundData = function (address) {
-        var michelson = MichelsonAddress_1.MichelsonAddress.from(__1.TezosUtils.encodeTzAddress(address));
-        return __1.TezosUtils.packMichelsonType(michelson);
+        var michelson = MichelsonAddress_1.MichelsonAddress.from(TezosUtils_1.TezosUtils.encodeTzAddress(address));
+        return TezosUtils_1.TezosUtils.packMichelsonType(michelson);
     };
     TezosSaplingProtocol.prototype.getAntiReplay = function (chainId, contractAddress) {
         return (contractAddress !== null && contractAddress !== void 0 ? contractAddress : this.options.config.contractAddress) + chainId;
@@ -152672,7 +152770,7 @@ var TezosSaplingProtocol = /** @class */ (function (_super) {
 exports.TezosSaplingProtocol = TezosSaplingProtocol;
 
 }).call(this)}).call(this,require("buffer").Buffer)
-},{"../../..":492,"../../../dependencies/src/bignumber.js-9.0.0/bignumber":269,"../../../dependencies/src/bip39-2.5.0":274,"../../../errors":491,"../../../utils/array":800,"../../NonExtendedProtocol":497,"../TezosAddress":657,"../TezosProtocol":659,"../TezosProtocolOptions":660,"../contract/TezosContract":662,"../types/TezosOperationType":705,"../types/michelson/primitives/MichelsonAddress":715,"./TezosSaplingAddress":695,"./TezosSaplingCryptoClient":696,"./node/TezosSaplingNodeClient":700,"./utils/TezosSaplingBookkeeper":701,"./utils/TezosSaplingEncoder":702,"./utils/TezosSaplingForger":703,"./utils/TezosSaplingState":704,"@airgap/sapling-wasm":829,"buffer":67,"libsodium-wrappers":1160}],698:[function(require,module,exports){
+},{"../../../dependencies/src/bignumber.js-9.0.0/bignumber":269,"../../../dependencies/src/bip39-2.5.0":274,"../../../errors":491,"../../../errors/coinlib-error":490,"../../../utils/array":800,"../../NonExtendedProtocol":497,"../TezosAddress":657,"../TezosProtocol":659,"../TezosProtocolOptions":660,"../TezosUtils":661,"../contract/TezosContract":662,"../types/TezosOperationType":705,"../types/michelson/primitives/MichelsonAddress":715,"./TezosSaplingAddress":695,"./TezosSaplingCryptoClient":696,"./node/TezosSaplingNodeClient":700,"./utils/TezosSaplingBookkeeper":701,"./utils/TezosSaplingEncoder":702,"./utils/TezosSaplingForger":703,"./utils/TezosSaplingState":704,"@airgap/sapling-wasm":829,"buffer":67,"libsodium-wrappers":1160}],698:[function(require,module,exports){
 "use strict";
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -153024,7 +153122,7 @@ var TezosSaplingBookkeeper = /** @class */ (function () {
         var _this = this;
         if (unshieldTarget === undefined) {
             return outputs.map(function (out) { return ({
-                from: [sender.getValue()],
+                from: [sender.asString()],
                 to: [out.address],
                 isInbound: false,
                 amount: out.value,
@@ -153037,7 +153135,7 @@ var TezosSaplingBookkeeper = /** @class */ (function () {
             var amount = this.sumNotes(inputs).minus(this.sumNotes(outputs));
             return [
                 {
-                    from: [sender.getValue()],
+                    from: [sender.asString()],
                     to: [unshieldTarget],
                     isInbound: false,
                     amount: amount.toFixed(),
@@ -153086,7 +153184,7 @@ var TezosSaplingBookkeeper = /** @class */ (function () {
                                         _e = {};
                                         return [4 /*yield*/, TezosSaplingAddress_1.TezosSaplingAddress.fromViewingKey(from)];
                                     case 2:
-                                        unshieldDetails = _c.apply(_b, _d.concat([(_e.from = [(_f.sent()).getValue()], _e)]));
+                                        unshieldDetails = _c.apply(_b, _d.concat([(_e.from = [(_f.sent()).asString()], _e)]));
                                         _f.label = 3;
                                     case 3:
                                         details.push(unshieldDetails);
@@ -153140,10 +153238,10 @@ var TezosSaplingBookkeeper = /** @class */ (function () {
                                             _b = _c.sent(), to = _b[0], amount = _b[1];
                                             outputDetails = {};
                                             if (from !== undefined) {
-                                                outputDetails = Object.assign(outputDetails, { from: [from.getValue()] });
+                                                outputDetails = Object.assign(outputDetails, { from: [from.asString()] });
                                             }
                                             if (to !== undefined) {
-                                                outputDetails = Object.assign(outputDetails, { to: [to.getValue()] });
+                                                outputDetails = Object.assign(outputDetails, { to: [to.asString()] });
                                             }
                                             if (amount !== undefined) {
                                                 outputDetails = Object.assign(outputDetails, { amount: amount.toFixed() });
@@ -153412,7 +153510,7 @@ var TezosSaplingBookkeeper = /** @class */ (function () {
                         };
                         return [4 /*yield*/, TezosSaplingAddress_1.TezosSaplingAddress.fromRaw(address)];
                     case 4:
-                        input = (_c.address = (_d.sent()).getValue(),
+                        input = (_c.address = (_d.sent()).asString(),
                             _c);
                         return [2 /*return*/, [Buffer.from(memo), input]];
                     case 5:
@@ -153441,7 +153539,7 @@ var TezosSaplingBookkeeper = /** @class */ (function () {
                         };
                         return [4 /*yield*/, TezosSaplingAddress_1.TezosSaplingAddress.fromRaw(address)];
                     case 2:
-                        input = (_c.address = (_d.sent()).getValue(),
+                        input = (_c.address = (_d.sent()).asString(),
                             _c);
                         return [2 /*return*/, [Buffer.from(memo), input]];
                     case 3:
@@ -161002,6 +161100,7 @@ exports.AES = void 0;
 var crypto = __importStar(require("crypto"));
 var errors_1 = require("../errors");
 var coinlib_error_1 = require("../errors/coinlib-error");
+var hex_1 = require("./hex");
 // https://github.com/microsoft/botbuilder-js/blob/master/libraries/botframework-config/src/encrypt.ts#L20
 var AES = /** @class */ (function () {
     function AES(AES_KEY_SIZE, KEY_DERIVATION_ITERATION_COUNT, ALGORITHM, encoding) {
@@ -161087,8 +161186,9 @@ var AES = /** @class */ (function () {
     };
     AES.prototype.deriveKeyFromPrivateKey = function (privateKey) {
         var _this = this;
+        var password = hex_1.isHex(privateKey) ? Buffer.from(privateKey, 'hex') : privateKey;
         return new Promise(function (resolve, reject) {
-            crypto.pbkdf2(privateKey, '', _this.KEY_DERIVATION_ITERATION_COUNT, 32, 'sha512', function (pbkdf2Error, key) {
+            crypto.pbkdf2(password, '', _this.KEY_DERIVATION_ITERATION_COUNT, 32, 'sha512', function (pbkdf2Error, key) {
                 if (pbkdf2Error) {
                     reject(pbkdf2Error);
                 }
@@ -161101,7 +161201,7 @@ var AES = /** @class */ (function () {
 exports.AES = AES;
 
 }).call(this)}).call(this,require("buffer").Buffer)
-},{"../errors":491,"../errors/coinlib-error":490,"buffer":67,"crypto":78}],796:[function(require,module,exports){
+},{"../errors":491,"../errors/coinlib-error":490,"./hex":808,"buffer":67,"crypto":78}],796:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNetworkEqual = void 0;
@@ -161749,16 +161849,7 @@ var getProtocolByIdentifier = function (identifier, network) {
         throw new errors_1.InvalidValueError(coinlib_error_1.Domain.UTILS, 'No protocol identifier provided');
     }
     var targetNetwork = network ? network : protocolOptionsByIdentifier_1.getProtocolOptionsByIdentifier(identifier).network;
-    // create a complete list of all protocols and subprotocols
-    var candidates = supportedProtocols_1.supportedProtocols()
-        .map(function (protocol) {
-        var protocols = [protocol];
-        if (protocol.subProtocols) {
-            protocols.push.apply(protocols, protocol.subProtocols);
-        }
-        return protocols;
-    })
-        .reduce(function (current, next) { return current.concat(next); }, []);
+    var candidates = supportedProtocols_1.supportedProtocols();
     // filter out potential candidates, those where our identifier startsWith the identifier of the protocol
     var filteredCandidates = candidates.filter(function (protocol) { return identifier === protocol.identifier && Network_1.isNetworkEqual(protocol.options.network, targetNetwork); });
     if (filteredCandidates.length === 0) {
@@ -163147,7 +163238,7 @@ var AirGapWallet = /** @class */ (function () {
                     case 3:
                         addresses = _a.sent();
                         _a.label = 4;
-                    case 4: return [2 /*return*/, addresses.map(function (address) { return address.getValue(); })];
+                    case 4: return [2 /*return*/, addresses.map(function (address) { return address.address; })];
                 }
             });
         });