Browse Source

version bump

pkg_automation_electrum
pbca26 7 years ago
parent
commit
b743b026c2
  1. 6
      main.js
  2. 16
      routes/shepherd/electrum/createtx.js
  3. 4
      version
  4. 2
      version_build

6
main.js

@ -115,7 +115,7 @@ process.once('loaded', () => {
applicationVersion: `${app.getVersion().replace('version=', '')}-beta`,
copyright: 'Released under the MIT license',
credits: 'SuperNET Team',
})
});
}
if (osPlatform === 'linux') {
process.setFdLimit(appConfig.maxDescriptors.linux);
@ -416,7 +416,7 @@ app.on('window-all-closed', () => {
/*if (process.platform !== 'darwin' || process.platform !== 'linux' || process.platform !== 'win32') {
app.quit()
}*/
})
});
// Emitted before the application starts closing its windows.
// Calling event.preventDefault() will prevent the default behaviour, which is terminating the application.
@ -444,7 +444,7 @@ app.on('quit', (event) => {
shepherd.log('quit while loading window active');
// event.preventDefault();
}
})
});
app.commandLine.appendSwitch('ignore-certificate-errors'); // dirty hack

16
routes/shepherd/electrum/createtx.js

@ -640,9 +640,7 @@ module.exports = (shepherd) => {
}
shepherd.log('buildSignedTx', true);
// console.log(`buildSignedTx priv key ${wif}`);
shepherd.log(`buildSignedTx pub key ${key.getAddress().toString()}`, true);
// console.log('buildSignedTx std tx fee ' + shepherd.electrumServers[network].txfee);
for (let i = 0; i < utxo.length; i++) {
tx.addInput(utxo[i].txid, utxo[i].vout);
@ -660,7 +658,7 @@ module.exports = (shepherd) => {
if (shepherd.isPos(network)) {
tx.addOutput(changeAddress, Number(change), shepherd.getNetworkData(network));
} else {
console.log(`change ${change}`);
shepherd.log(`change ${change}`, true);
tx.addOutput(changeAddress, Number(change));
}
}
@ -672,13 +670,6 @@ module.exports = (shepherd) => {
shepherd.log(`kmd tx locktime set to ${_locktime}`, true);
}
/*shepherd.log('buildSignedTx unsigned tx data vin', true);
shepherd.log(tx.tx.ins, true);
shepherd.log('buildSignedTx unsigned tx data vout', true);
shepherd.log(tx.tx.outs, true);
shepherd.log('buildSignedTx unsigned tx data', true);
shepherd.log(tx, true);*/
for (let i = 0; i < utxo.length; i++) {
if (shepherd.isPos(network)) {
tx.sign(shepherd.getNetworkData(network), i, key);
@ -689,11 +680,6 @@ module.exports = (shepherd) => {
const rawtx = tx.build().toHex();
/*shepherd.log('buildSignedTx signed tx hex', true);
shepherd.log(rawtx, true);*/
// return rawtx;
const successObj = {
msg: 'success',
result: rawtx,

4
version

@ -1,3 +1,3 @@
version=0.2.0.27b
type=b-beta
version=0.2.0.27c
type=c-beta
minversion=0.2.0.27

2
version_build

@ -1 +1 @@
0.2.0.27b-beta
0.2.0.27c-beta
Loading…
Cancel
Save