diff --git a/packages/ripple-keypairs/src/ed25519.js b/packages/ripple-keypairs/src/ed25519.js index f6440b6d..e82b1b98 100644 --- a/packages/ripple-keypairs/src/ed25519.js +++ b/packages/ripple-keypairs/src/ed25519.js @@ -27,14 +27,6 @@ function Ed25519Pair() { util.inherits(Ed25519Pair, KeyPair); -/** -* @param {Array} seedBytes - A 128 bit seed -* @return {Ed25519Pair} key pair -*/ -Ed25519Pair.fromSeed = function(seedBytes) { - return new Ed25519Pair({seedBytes}); -}; - /** * @param {Seed} publicKey - public key in canonical form (0xED + 32 bytes) * @return {Ed25519Pair} key pair @@ -43,6 +35,14 @@ Ed25519Pair.fromPublic = function(publicKey) { return new Ed25519Pair({pubBytes: parseBytes(publicKey)}); }; +Ed25519Pair.prototype.sign = function(message) { + return this.key().sign(message).toBytes(); +}; + +Ed25519Pair.prototype.verify = function(message, signature) { + return this.key().verify(message, signature); +}; + cachedProperty(Ed25519Pair, function key() { if (this.seedBytes) { const seed256 = deriveEdKeyPairSeed(this.seedBytes); @@ -55,12 +55,12 @@ cachedProperty(Ed25519Pair, function pubKeyCanonicalBytes() { return [0xED].concat(this.key().pubBytes()); }); -Ed25519Pair.prototype.sign = function(message) { - return this.key().sign(message).toBytes(); -}; - -Ed25519Pair.prototype.verify = function(message, signature) { - return this.key().verify(message, signature); +/** +* @param {Array} seedBytes - A 128 bit seed +* @return {Ed25519Pair} key pair +*/ +Ed25519Pair.fromSeed = function(seedBytes) { + return new Ed25519Pair({seedBytes}); }; module.exports = { diff --git a/packages/ripple-keypairs/src/secp256k1.js b/packages/ripple-keypairs/src/secp256k1.js index b1e9d08a..34e7a461 100644 --- a/packages/ripple-keypairs/src/secp256k1.js +++ b/packages/ripple-keypairs/src/secp256k1.js @@ -76,22 +76,6 @@ function K256Pair({validator}) { util.inherits(K256Pair, KeyPair); -K256Pair.fromSeed = function(seedBytes, opts={}) { - return new K256Pair({seedBytes, validator: opts.validator}); -}; - -cachedProperty(K256Pair, function key() { - if (this.seedBytes) { - const options = {validator: this.validator}; - return secp256k1.keyFromPrivate(deriveSecret(this.seedBytes, options)); - } - return secp256k1.keyFromPublic(this.pubKeyCanonicalBytes()); -}); - -cachedProperty(K256Pair, function pubKeyCanonicalBytes() { - return this.key().getPublic().encodeCompressed(); -}); - /* @param {Array} message (bytes) */ @@ -124,6 +108,22 @@ K256Pair.prototype.verify = function(message, signature) { } }; +cachedProperty(K256Pair, function key() { + if (this.seedBytes) { + const options = {validator: this.validator}; + return secp256k1.keyFromPrivate(deriveSecret(this.seedBytes, options)); + } + return secp256k1.keyFromPublic(this.pubKeyCanonicalBytes()); +}); + +cachedProperty(K256Pair, function pubKeyCanonicalBytes() { + return this.key().getPublic().encodeCompressed(); +}); + +K256Pair.fromSeed = function(seedBytes, opts={}) { + return new K256Pair({seedBytes, validator: opts.validator}); +}; + module.exports = { K256Pair, accountPublicFromPublicGenerator