support irishub-1

Author: Booyoun-Kim

README.md

@@ -79,7 +79,7 @@ const ecpairPriv = cosmos.getECPairPriv(mnemonic);
 ```js
 const cosmosjs = require("@cosmostation/cosmosjs");
 
-const chainId = "irishub";
+const chainId = "irishub-1";
 const iris = cosmosjs.network(lcdUrl, chainId);
 iris.setBech32MainPrefix("iaa");
 ```

example/irishub.js

@@ -2,51 +2,37 @@ const cosmosjs = require("../src");
 
 // [WARNING] This mnemonic is just for the demo purpose. DO NOT USE THIS MNEMONIC for your own wallet.
 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 = "irishub";
+const chainId = "irishub-1";
 // Please install and use rest server separately. (https://hub.cosmos.network/master/resources/service-providers.html#setting-up-the-rest-server)
-const iris = cosmosjs.network("YOUR REST SERVER URL", chainId);
+const iris = cosmosjs.network("https://api.irisnet.org", chainId);
 iris.setBech32MainPrefix("iaa");
 iris.setPath("m/44'/118'/0'/0/0");
 const address = iris.getAddress(mnemonic);
 const ecpairPriv = iris.getECPairPriv(mnemonic);
 
-// Generate irishub/bank/Send transaction and broadcast 
+// Generate MsgSend transaction and broadcast 
 iris.getAccounts(address).then(data => {
 	let stdSignMsg = iris.newStdMsg({
 		msgs: [
 			{
-				type: "irishub/bank/Send",
+				type: "cosmos-sdk/MsgSend",
 				value: {
-					inputs: [
+					amount: [
 						{
-							address: address,
-							coins: [
-								{
-									denom: "iris-atto",
-									amount: String(1000000000000000000)		// 18 decimal places
-								}
-							]
+							amount: String(100000), 	// 6 decimal places (1000000 uiris = 1 IRIS)
+							denom: "uiris"
 						}
 					],
-					outputs: [
-						{
-							address: "iaa12g4vfyq65yf5cds4v5pr3jmdd4v6s40fkaaxtf",
-							coins: [
-								{
-									denom: "iris-atto",
-									amount: String(1000000000000000000)
-								}
-							]
-						}
-					]
+					from_address: address,
+					to_address: "iaa12g4vfyq65yf5cds4v5pr3jmdd4v6s40fkaaxtf"
 				}
 			}
 		],
 		chain_id: chainId,
-		fee: { amount: [ { amount: String(400000000000000000), denom: "iris-atto" } ], gas: String(50000) },
+		fee: { amount: [ { amount: String(20000), denom: "uiris" } ], gas: String(200000) },
 		memo: "",
-		account_number: String(data.value.account_number),
-		sequence: String(data.value.sequence)
+		account_number: String(data.account.account_number),
+		sequence: String(data.account.sequence)
 	});
 
 	const signedTx = iris.sign(stdSignMsg, ecpairPriv);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmostation/cosmosjs",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "A JavasSript Open Source Library for Cosmos Network, IRISnet, Kava, Band Protocol, Starname, Secret Network, Akash, and Certik. (HTML developers can use /dist/cosmos.js)",
   "main": "./src/index.js",
   "repository": {

src/index.js

@@ -26,7 +26,7 @@ let Cosmos = function(url, chainId) {
 		throw new Error("chainId object was not set or invalid")
 	}
 
-	console.log("WARN deprecated @cosmostation/cosmosjs@0.8.2: You needs to upgrade to @cosmostation/cosmosjs above 0.9.0+ : 1) Proper nodejs v14+ support 2) 0.9.0+ supports protobuf signing for cosmos-sdk 0.40.0+");
+	console.log("WARN deprecated @cosmostation/cosmosjs@0.9.x: You needs to upgrade to @cosmostation/cosmosjs above 0.10.0+ : 1) Proper nodejs v14+ support 2) 0.10.0+ supports protobuf signing for cosmos-sdk 0.40.0+");
 }
 
 function network(url, chainId) {
@@ -84,8 +84,10 @@ Cosmos.prototype.getAccounts = function(address) {
 		accountsApi = "/cosmos/auth/v1beta1/accounts/";
 	} else if (this.chainId.indexOf("stargate-final") != -1) {
 		accountsApi = "/cosmos/auth/v1beta1/accounts/";
+	} else if (this.chainId.indexOf("bifrost") != -1) {
+		accountsApi = "/cosmos/auth/v1beta1/accounts/";
 	} else if (this.chainId.indexOf("irishub") != -1) {
-		accountsApi = "/bank/accounts/";
+		accountsApi = "/cosmos/auth/v1beta1/accounts/";
 	} else {
 		accountsApi = "/auth/accounts/";
 	}
@@ -121,150 +123,44 @@ Cosmos.prototype.getECPairPriv = function(mnemonic) {
 Cosmos.prototype.newStdMsg = function(input) {
 	const stdSignMsg = new Object;
 	stdSignMsg.json = input;
-
-	// Exception
-	if (input.msgs[0].type == "irishub/bank/Send") {
-		stdSignMsg.jsonForSigningIrisTx =
-		{
-			msgs: [
-				{
-					inputs: [
-						{
-							address: input.msgs[0].value.inputs[0].address,
-							coins: [
-								{
-									denom: input.msgs[0].value.inputs[0].coins[0].denom,
-									amount: input.msgs[0].value.inputs[0].coins[0].amount
-								}
-							]
-						}
-					],
-					outputs: [
-						...input.msgs[0].value.outputs
-					]
-				}
-			],
-			chain_id: input.chain_id,
-			fee: { amount: [ { amount: input.fee.amount[0].amount, denom: input.fee.amount[0].denom } ], gas: input.fee.gas },
-			memo: input.memo,
-			account_number: input.account_number,
-			sequence: input.sequence
-		}
-	} else if (input.msgs[0].type == "irishub/stake/BeginUnbonding") {
-		stdSignMsg.jsonForSigningIrisTx =
-		{
-			msgs: [
-				{
-					shares_amount: String(input.msgs[0].value.shares_amount),
-					delegator_addr: input.msgs[0].value.delegator_addr,
-					validator_addr: input.msgs[0].value.validator_addr
-				}
-			],
-			chain_id: input.chain_id,
-			fee: { amount: [ { amount: input.fee.amount[0].amount, denom: input.fee.amount[0].denom } ], gas: input.fee.gas },
-			memo: input.memo,
-			account_number: input.account_number,
-			sequence: input.sequence
-		}
-	} else if (input.msgs[0].type == "irishub/stake/BeginRedelegate") {
-		stdSignMsg.jsonForSigningIrisTx =
-		{
-			msgs: [
-				{
-					delegator_addr: input.msgs[0].value.delegator_addr,
-					validator_src_addr: input.msgs[0].value.validator_src_addr,
-					validator_dst_addr: input.msgs[0].value.validator_dst_addr,
-					shares: String(input.msgs[0].value.shares_amount) + ".0000000000"		// IRIS Exception) For signing, shares is correct.
-				}
-			],
-			chain_id: input.chain_id,
-			fee: { amount: [ { amount: input.fee.amount[0].amount, denom: input.fee.amount[0].denom } ], gas: input.fee.gas },
-			memo: input.memo,
-			account_number: input.account_number,
-			sequence: input.sequence
-		}
-	}
-
 	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 after CheckTx) and "async"(return right away).
 	let signMessage = new Object;
-	if (stdSignMsg.json.msgs[0].type == "irishub/bank/Send" ||
-		stdSignMsg.json.msgs[0].type == "irishub/stake/BeginUnbonding" ||
-		stdSignMsg.json.msgs[0].type == "irishub/stake/BeginRedelegate") {
-		signMessage = stdSignMsg.jsonForSigningIrisTx;
-	} else {
-		signMessage = stdSignMsg.json;
-	}
+	signMessage = stdSignMsg.json;
 	const hash = crypto.createHash('sha256').update(JSON.stringify(sortObject(signMessage))).digest('hex');
 	const buf = Buffer.from(hash, 'hex');
 	let signObj = secp256k1.sign(buf, ecpairPriv);
 	var signatureBase64 = Buffer.from(signObj.signature, 'binary').toString('base64');
 	let signedTx = new Object;
-	if (this.chainId.indexOf("irishub") != -1) {
-		signedTx = {
-		    "tx": {
-		        "msg": stdSignMsg.json.msgs,
-		        "fee": stdSignMsg.json.fee,
-		        "signatures": [
-		            {
-		                "signature": signatureBase64,
-		                "account_number": stdSignMsg.json.account_number,
-                		"sequence": stdSignMsg.json.sequence,
-		                "pub_key": {
-		                    "type": "tendermint/PubKeySecp256k1",
-		                    "value": getPubKeyBase64(ecpairPriv)
-		                }
-		            }
-		        ],
-		        "memo": stdSignMsg.json.memo
-		    },
-		    "mode": modeType
-		}
-
-		// The key of "shares" is using to sign for IRIS Redelegate.
-		// After signing, you have to replace the "shares" key name to "shares_amount".
-		// It is an exception to "irishub/stake/BeginRedelegate".
-		if (stdSignMsg.json.msgs[0].type == "irishub/stake/BeginRedelegate") {
-			var txBodyStr = JSON.stringify(signedTx);
-			txBodyStr = txBodyStr.replace("\"shares", "\"shares_amount");
-			signedTx = JSON.parse(txBodyStr);
-		}
-	} else {
-		signedTx = {
-		    "tx": {
-		        "msg": stdSignMsg.json.msgs,
-		        "fee": stdSignMsg.json.fee,
-		        "signatures": [
-		            {
-		            	"account_number": stdSignMsg.json.account_number,
-		            	"sequence": stdSignMsg.json.sequence,
-		                "signature": signatureBase64,
-		                "pub_key": {
-		                    "type": "tendermint/PubKeySecp256k1",
-		                    "value": getPubKeyBase64(ecpairPriv)
-		                }
-		            }
-		        ],
-		        "memo": stdSignMsg.json.memo
-		    },
-		    "mode": modeType
-		}
+	signedTx = {
+	    "tx": {
+	        "msg": stdSignMsg.json.msgs,
+	        "fee": stdSignMsg.json.fee,
+	        "signatures": [
+	            {
+	            	"account_number": stdSignMsg.json.account_number,
+	            	"sequence": stdSignMsg.json.sequence,
+	                "signature": signatureBase64,
+	                "pub_key": {
+	                    "type": "tendermint/PubKeySecp256k1",
+	                    "value": getPubKeyBase64(ecpairPriv)
+	                }
+	            }
+	        ],
+	        "memo": stdSignMsg.json.memo
+	    },
+	    "mode": modeType
 	}
 
 	return signedTx;
 }
 
 Cosmos.prototype.broadcast = function(signedTx) {
-	let broadcastApi = "";
-	if (this.chainId.indexOf("irishub") != -1) {
-		broadcastApi = "/tx/broadcast";
-	} else {
-		broadcastApi = "/txs";
-	}
+	let broadcastApi = "/txs";
 
 	return fetch(this.url + broadcastApi, {
 		method: 'POST',