Merge pull request #8 from cosmostation/develop

Develop

Author: Booyoun

README.md

@@ -57,9 +57,10 @@ Generate Cosmos address from mnemonic
 const cosmosjs = require("@cosmostation/cosmosjs");
 
 const chainId = "chain-id";
-const cosmos = cosmosjs.network(chainId)
+const cosmos = cosmosjs.network(lcdUrl, chainId)
 
 const mnemonic = "..."
+cosmos.setPath("m/44'/118'/0'/0/0");
 const address = cosmos.getAddress(mnemonic);
 const ecpairPriv = cosmos.getECPairPriv(mnemonic);
 ```
@@ -93,12 +94,14 @@ cosmos.getAccounts(address).then(data => {
 ```
 
 Sign transaction by using stdSignMsg and broadcast by using [/txs](https://lcd-do-not-abuse.cosmostation.io/txs) REST API
-* API Call Limit: 10 per second
 ```js
 const signedTx = cosmos.sign(stdSignMsg, ecpairPriv);
 cosmos.broadcast(signedTx).then(response => console.log(response));
 ```
 
+Cosmostation offers LCD url(https://lcd-do-not-abuse.cosmostation.io).
+* API Rate Limiting: 10 requests per second
+
 ## Supporting Message Types (Updating...)
 
 - MsgSend
@@ -229,6 +232,20 @@ stdSignMsg = cosmos.NewStdMsg({
 	sequence: data.value.sequence
 });
 ```
+- MsgModifyWithdrawAddress
+```js
+stdSignMsg = cosmos.NewStdMsg({
+	type: "cosmos-sdk/MsgModifyWithdrawAddress",
+	delegator_address: address,
+	withdraw_address: "cosmos133mtfk63fuac5e2npfgcktwufnty2536wedfal",
+	feeDenom: "uatom",
+	fee: 5000,
+	gas: 200000,
+	memo: "",
+	account_number: data.value.account_number,
+	sequence: data.value.sequence
+});
+```
 
 ## Documentation
 

example/cosmos.js

@@ -4,6 +4,7 @@ const cosmosjs = require("../src");
 const mnemonic = "swear buyer security impulse public stereo peasant correct cross tornado bid discover anchor float venture deal patch property cool wreck eight dwarf december surface";
 const chainId = "cosmoshub-2";
 const cosmos = cosmosjs.network("https://lcd-do-not-abuse.cosmostation.io", chainId);
+cosmos.setPath("m/44'/118'/0'/0/0");
 const address = cosmos.getAddress(mnemonic);
 const ecpairPriv = cosmos.getECPairPriv(mnemonic);
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmostation/cosmosjs",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "A javascript open source library for Cosmos Network.",
   "main": "./src/index.js",
   "engines": {

src/index.js

@@ -14,11 +14,11 @@ const secp256k1 = require('secp256k1');
 const crypto = require('crypto');
 const bitcoinjs = require('bitcoinjs-lib');
 
-const PATH = "m/44'/118'/0'/0/0";
-
-let Cosmos = function (url, chainId) {
+let Cosmos = function(url, chainId) {
 	this.url = url;
 	this.chainId = chainId;
+	this.path = "m/44'/118'/0'/0/0";
+	this.bech32MainPrefix = "cosmos";
 
 	if (!this.url) {
 		throw new Error("url object was not set or invalid")
@@ -49,6 +49,34 @@ function getPubKeyBase64(ecpairPriv) {
 	return Buffer.from(pubKeyByte, 'binary').toString('base64');
 }
 
+function sortObject(obj) {
+	if (obj === null) return null;
+	if (typeof obj !== "object") return obj;
+	if (Array.isArray(obj)) return obj.map(sortObject);
+	const sortedKeys = Object.keys(obj).sort();
+	const result = {};
+	sortedKeys.forEach(key => {
+		result[key] = sortObject(obj[key])
+	});
+	return result;
+}
+
+Cosmos.prototype.setBech32MainPrefix = function(bech32MainPrefix) {
+	this.bech32MainPrefix = bech32MainPrefix;
+
+	if (!this.bech32MainPrefix) {
+		throw new Error("bech32MainPrefix object was not set or invalid")
+	}
+}
+
+Cosmos.prototype.setPath = function(path) {
+	this.path = path;
+
+	if (!this.path) {
+		throw new Error("path object was not set or invalid")
+	}
+}
+
 Cosmos.prototype.getAccounts = function(address) {
 	return fetch(this.url + "/auth/accounts/" + address)
 	.then(response => response.json())
@@ -60,9 +88,9 @@ Cosmos.prototype.getAddress = function(mnemonic) {
 	}
 	const seed = bip39.mnemonicToSeed(mnemonic);
 	const node = bip32.fromSeed(seed);
-	const child = node.derivePath(PATH);
+	const child = node.derivePath(this.path);
 	const words = bech32.toWords(child.identifier);
-	return bech32.encode('cosmos', words);
+	return bech32.encode(this.bech32MainPrefix, words);
 }
 
 Cosmos.prototype.getECPairPriv = function(mnemonic) {
@@ -71,7 +99,7 @@ Cosmos.prototype.getECPairPriv = function(mnemonic) {
 	}
 	const seed = bip39.mnemonicToSeed(mnemonic);
 	const node = bip32.fromSeed(seed);
-	const child = node.derivePath(PATH);
+	const child = node.derivePath(this.path);
 	const ecpair = bitcoinjs.ECPair.fromPrivateKey(child.privateKey, {compressed : false})
 	return ecpair.privateKey;
 }
@@ -82,7 +110,7 @@ Cosmos.prototype.NewStdMsg = function(input) {
 	if (input.type == "cosmos-sdk/MsgSend") {
 		stdSignMsg.json =
 		{
-		  	account_number: String(input.account_number),
+			account_number: String(input.account_number),
 			chain_id: this.chainId,
 			fee: {
 				amount: [
@@ -321,18 +349,44 @@ Cosmos.prototype.NewStdMsg = function(input) {
 			],
 			sequence: String(input.sequence)
 		}
+	} else if (input.type == "cosmos-sdk/MsgModifyWithdrawAddress") {
+	    stdSignMsg.json = 
+		{
+		  	account_number: String(input.account_number),
+			chain_id: this.chainId,
+			fee: { 
+				amount: [ 
+					{ 
+						amount: String(input.fee), 
+						denom: input.feeDenom 
+					} 
+				], 
+				gas: String(input.gas) 
+			},
+			memo: input.memo,
+			msgs: [
+				{ 
+					type: input.type,
+					value: {
+						delegator_address: input.delegator_address,
+						withdraw_address: input.withdraw_address
+					}
+				}
+			],
+			sequence: String(input.sequence)
+		}
 	} else {
 		throw new Error("No such input.type: " + input.type)
 	}
 
-	stdSignMsg.bytes = convertStringToBytes(JSON.stringify(stdSignMsg.json));
+	stdSignMsg.bytes = convertStringToBytes(JSON.stringify(sortObject(stdSignMsg.json)));
 
 	return stdSignMsg;
 }
 
 Cosmos.prototype.sign = function(stdSignMsg, ecpairPriv, modeType = "sync") {
 	// The supported return types includes "block"(return after tx commit), "sync"(return afer CheckTx) and "async"(return right away).
-	const hash = crypto.createHash('sha256').update(JSON.stringify(stdSignMsg.json)).digest('hex');
+	const hash = crypto.createHash('sha256').update(JSON.stringify(sortObject(stdSignMsg.json))).digest('hex');
 	const buf = Buffer.from(hash, 'hex');
 	let signObj = secp256k1.sign(buf, ecpairPriv);
 	var signatureBase64 = Buffer.from(signObj.signature, 'binary').toString('base64');