increase chainsql-transaction fee

luleigreat · luleigreat · commit c075509ab070 · 2017-11-22T15:08:16.000+08:00
diff --git a/src/index.js b/src/index.js
@@ -717,6 +717,7 @@ function prepareTable(ChainSQL, payment, object, resolve, reject) {
 			if (data.status == 'error') {
 				errFunc(new Error('getTxJson error'));
 			}
+			data.tx_json.Fee = util.calcFee(data.tx_json);
 			var payment = data.tx_json;
 			let signedRet = ChainSQL.api.sign(JSON.stringify(data.tx_json), ChainSQL.connect.secret);
 			handleSignedTx(ChainSQL,signedRet,object,resolve,reject);
diff --git a/src/table.js b/src/table.js
@@ -361,7 +361,8 @@ function prepareTable(ChainSQL, payment, object, resolve, reject) {
 			getTxJson(ChainSQL, JSON.parse(tx_json.txJSON)).then(function(data) {
 				if (data.status == 'error') {
 					throw new Error('getTxJson error');
-				}
+        }
+        data.tx_json.Fee = util.calcFee(data.tx_json);
 				//var payment = data.tx_json;
 				var signedRet = connect.api.sign(JSON.stringify(data.tx_json), ChainSQL.connect.secret);				
 				// subscribe event
diff --git a/src/util.js b/src/util.js
@@ -134,6 +134,19 @@ function unHexTxData(tx){
   }
 }
 
+function calcFee(tx_json){
+	var fee = parseInt(tx_json.Fee);
+	var drops = 1000000;
+	var multiplier = 0.001;
+	if(tx_json.Raw){
+		var length = tx_json.Raw.length/2;
+		multiplier += length / 1024.0;
+	}
+	var extraFee = drops * multiplier;
+	fee += extraFee;
+	return fee.toString();
+}
+
 module.exports = {
   getFee: getFee,
   getSequence: getSequence,
@@ -145,5 +158,6 @@ module.exports = {
   getTableName: getTableName,
   getTxJson: getTxJson,
   generateToken: generateToken,
-  decodeToken: decodeToken
+  decodeToken: decodeToken,
+  calcFee : calcFee
 }

Original file line number	Diff line number	Diff line change
`@@ -717,6 +717,7 @@ function prepareTable(ChainSQL, payment, object, resolve, reject) {`
`717`	`717`	`if (data.status == 'error') {`
`718`	`718`	`errFunc(new Error('getTxJson error'));`
`719`	`719`	`}`
	`720`	`+ data.tx_json.Fee = util.calcFee(data.tx_json);`
`720`	`721`	`var payment = data.tx_json;`
`721`	`722`	`let signedRet = ChainSQL.api.sign(JSON.stringify(data.tx_json), ChainSQL.connect.secret);`
`722`	`723`	`handleSignedTx(ChainSQL,signedRet,object,resolve,reject);`