simplified ECKey method naming convention

Author: Weston Siegenthaler

src/bitcoin.js

@@ -157,7 +157,7 @@
    $(function () {
    var key = new Bitcoin.ECKey(Crypto.util.hexToBytes("5c0b98e524ad188ddef35dc6abba13c34a351a05409e5d285403718b93336a4a"));
    key = new Bitcoin.ECKey(Crypto.util.hexToBytes("180cb41c7c600be951b5d3d0a7334acc7506173875834f7a6c4c786a28fcbb19"));
-   //console.log(key.getBitcoinAddress().toString());
+   //console.log(key.getAddress().toString());
    //var message = Crypto.util.hexToBytes("2aec28d323ee7b06a799d540d224b351161fe48967174ca5e43164e86137da11");
    //message = [0];
    //var out = key.sign(message);

src/ecdsa.js

@@ -462,7 +462,7 @@ Bitcoin.ECDSA = (function () {
       for (var i = 0; i < 4; i++) {
         try {
           var pubkey = Bitcoin.ECDSA.recoverPubKey(r, s, hash, i);
-          if (pubkey.getBitcoinAddress().toString() == address) {
+          if (pubkey.getAddress().toString() == address) {
             return i;
           }
         } catch (e) {}

src/eckey.js

@@ -109,7 +109,7 @@ Bitcoin.ECKey = (function () {
     }
   };
 
-  ECKey.prototype.getBitcoinAddress = function () {
+  ECKey.prototype.getAddress = function () {
     var hash = this.getPubKeyHash();
     var addr = new Bitcoin.Address(hash);
     return addr;
@@ -132,8 +132,8 @@ Bitcoin.ECKey = (function () {
   /**
    * Private key encoded as standard Wallet Import Format (WIF)
    */
-  ECKey.prototype.getBitcoinWalletImportFormat = function () {
-    var bytes = this.getBitcoinPrivateKeyByteArray();
+  ECKey.prototype.getWalletImportFormat = function () {
+    var bytes = this.getPrivateKeyByteArray();
     bytes.unshift(ECKey.privateKeyPrefix); // prepend 0x80 byte
     if (this.compressed) bytes.push(0x01); // append 0x01 byte for compressed format
     var checksum = Crypto.SHA256(Crypto.SHA256(bytes, { asBytes: true }), { asBytes: true });
@@ -145,21 +145,21 @@ Bitcoin.ECKey = (function () {
   /**
    * Private key encoded as hexadecimal string.
    */
-  ECKey.prototype.getBitcoinHexFormat = function () {
-    return Crypto.util.bytesToHex(this.getBitcoinPrivateKeyByteArray()).toString().toUpperCase();
+  ECKey.prototype.getHexFormat = function () {
+    return Crypto.util.bytesToHex(this.getPrivateKeyByteArray()).toString().toUpperCase();
   };
 
   /**
    * Private key encoded as Base64 string.
    */
-  ECKey.prototype.getBitcoinBase64Format = function () {
-    return Crypto.util.bytesToBase64(this.getBitcoinPrivateKeyByteArray());
+  ECKey.prototype.getBase64Format = function () {
+    return Crypto.util.bytesToBase64(this.getPrivateKeyByteArray());
   };
 
   /**
    * Private key encoded as raw byte array.
    */
-  ECKey.prototype.getBitcoinPrivateKeyByteArray = function () {
+  ECKey.prototype.getPrivateKeyByteArray = function () {
     // Get a copy of private key as a byte array
     var bytes = this.priv.toByteArrayUnsigned();
     // zero pad if private key is less than 32 bytes 
@@ -170,11 +170,11 @@ Bitcoin.ECKey = (function () {
   ECKey.prototype.toString = function (format) {
     format = format || "";
     if (format.toString().toLowerCase() == "base64" || format.toString().toLowerCase() == "b64") {
-      return this.getBitcoinBase64Format(); // Base 64
+      return this.getBase64Format(); // Base 64
     } else if (format.toString().toLowerCase() == "wif") {
-      return this.getBitcoinWalletImportFormat(); // Wallet Import Format
+      return this.getWalletImportFormat(); // Wallet Import Format
     } else {
-      return this.getBitcoinHexFormat(); // Hex
+      return this.getHexFormat(); // Hex
     }
   };
 

src/message.js

@@ -31,7 +31,7 @@ Bitcoin.Message = (function () {
 
     var obj = Bitcoin.ECDSA.parseSig(sig);
 
-    var address = key.getBitcoinAddress().toString();
+    var address = key.getAddress().toString();
     var i = Bitcoin.ECDSA.calcPubkeyRecoveryParam(address, obj.r, obj.s, hash);
 
     i += 27;
@@ -60,7 +60,7 @@ Bitcoin.Message = (function () {
 
     pubKey.setCompressed(isCompressed);
 
-    var expectedAddress = pubKey.getBitcoinAddress().toString();
+    var expectedAddress = pubKey.getAddress().toString();
 
     return (address === expectedAddress);
   };

src/wallet.js

@@ -43,7 +43,7 @@ Bitcoin.Wallet = (function () {
         key.setPub(pub);
       }
 
-      this.addressHashes.push(key.getBitcoinAddress().getHashBase64());
+      this.addressHashes.push(key.getAddress().getHashBase64());
     };
 
     /**
@@ -120,14 +120,14 @@ Bitcoin.Wallet = (function () {
     this.getAllAddresses = function () {
       var addresses = [];
       for (var i = 0; i < keys.length; i++) {
-        addresses.push(keys[i].getBitcoinAddress());
+        addresses.push(keys[i].getAddress());
       }
       return addresses;
     };
 
     this.getCurAddress = function () {
       if (keys[this.addressPointer]) {
-        return keys[this.addressPointer].getBitcoinAddress();
+        return keys[this.addressPointer].getAddress();
       } else {
         return null;
       }
@@ -144,7 +144,7 @@ Bitcoin.Wallet = (function () {
       if (!keys[this.addressPointer]) {
         this.generateAddress();
       }
-      return keys[this.addressPointer].getBitcoinAddress();
+      return keys[this.addressPointer].getAddress();
     };
 
     /**