From 4038cf95c7ef0eb623782bd1e911ed5b9a04739f Mon Sep 17 00:00:00 2001 From: pbca26 Date: Mon, 22 Mar 2021 18:05:16 +0300 Subject: [PATCH 1/9] move chain params to a separate file --- api/chains.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 api/chains.js diff --git a/api/chains.js b/api/chains.js new file mode 100644 index 0000000..86b2159 --- /dev/null +++ b/api/chains.js @@ -0,0 +1,16 @@ +var chains = { + 'RICK': { + isV2: false, + params: '-ac_supply=90000000000 -ac_reward=100000000 -ac_cc=3 -ac_staked=10 -addnode=138.201.136.145 -addnode=95.217.44.58', + }, + 'WSB': { + isV2: false, + params: '-ac_supply=90000000000 -ac_cc=3 -ac_reward=100000000 -addnode=94.130.38.173 -addnode=178.63.47.105', + }, + 'TOKENSV2': { + isV2: true, + params: '-ac_supply=10000000 -ac_reward=1000000000 -ac_decay=77700000 -ac_halving=43800 -ac_cc=1 -ac_ccenable=227,224,245,243,228,242,123,247 -addnode=159.69.53.25', + }, +}; + +module.exports = chains; \ No newline at end of file From 904d7b6b9f998c6099947445cf7b75b4c216adbd Mon Sep 17 00:00:00 2001 From: pbca26 Date: Mon, 22 Mar 2021 18:08:38 +0300 Subject: [PATCH 2/9] api add set chain helpers --- api/daemon.js | 90 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 31 deletions(-) diff --git a/api/daemon.js b/api/daemon.js index 99237ef..c32606a 100644 --- a/api/daemon.js +++ b/api/daemon.js @@ -9,6 +9,8 @@ const platform = os.platform() const path = require('path'); const fixPath = require('fix-path'); +const chains = require('./chains'); + let default_config; if (process.argv.indexOf('chain=rick') > -1) { @@ -16,17 +18,31 @@ if (process.argv.indexOf('chain=rick') > -1) { bin_folder: getBinsFolder(), chain_name: 'RICK', coin_name: 'RICK', - chain_launch_params: '-ac_supply=90000000000 -ac_reward=100000000 -ac_cc=3 -ac_staked=10 -addnode=138.201.136.145 -addnode=95.217.44.58 -printtoconsole' + chain_launch_params: chains.RICK + ' -printtoconsole' } } else { default_config = { bin_folder: getBinsFolder(), chain_name: 'WSB', coin_name: 'WSB', - chain_launch_params: '-ac_supply=90000000000 -ac_cc=3 -ac_reward=100000000 -addnode=94.130.38.173 -addnode=178.63.47.105 -printtoconsole' + chain_launch_params: chains.WSB + ' -printtoconsole' } } +function setChain(chain) { + default_config = { + bin_folder: getBinsFolder(), + chain_name: chain, + coin_name: chain, + chain_launch_params: chains[chain].params + ' -printtoconsole' + }; + + config.coin_name = chain; + + console.warn('setChain config', default_config); + readConfig(); +} + // Data let komodod_path = undefined let cli_path = undefined @@ -43,7 +59,7 @@ function to_cli_args(command) { function readConfig() { // Set default config = { ...default_config } - + // FIXME const config_path = getKomodoFolder() + 'gui_config.json' try { let data = JSON.parse(fs.readFileSync(config_path)) @@ -86,6 +102,7 @@ function forceImportKey(keypair) { getAddressFromPubkey(keypair.pubkey).then(addr_info => { keypair.address = addr_info.address keypair.CCaddress = addr_info.CCaddress + keypair.pubkey = keypair.pubkey resolve({ generated: false, @@ -105,6 +122,7 @@ function prepareDaemon(needs_keygen) { getAddressFromPubkey(keypair.pubkey).then(addr_info => { keypair.address = addr_info.address keypair.CCaddress = addr_info.CCaddress + keypair.pubkey = keypair.pubkey resolve({ generated: needs_keygen, @@ -180,6 +198,7 @@ function launchDaemon(pubkey) { getAddressFromPubkey(keypair.pubkey).then(addr_info => { keypair.address = addr_info.address keypair.CCaddress = addr_info.CCaddress + keypair.pubkey = keypair.pubkey resolve({ generated: false, @@ -213,12 +232,18 @@ function stopDaemon() { // Wait a bit and tell that it's done, not being sure let timeout = setTimeout(() => { resolve() }, 20000) - // If we get a close signal, that's it - komodod.on('close', code => { - clearTimeout(timeout) - - resolve() - }) + if (komodod) { + // If we get a close signal, that's it + komodod.on('close', code => { + clearTimeout(timeout) + + resolve() + }) + } else { + clearTimeout(timeout) + + resolve() + } }) }) @@ -411,7 +436,7 @@ function getAddressFromPubkey(pubkey) { if(stdout) { let json = JSON.parse(stdout) // console.log('getAddressFromPubkey success: ', json) - resolve({ address: json.myaddress, CCaddress: json['PubkeyCCaddress(Tokens)'], } ) + resolve({ address: json.myaddress, CCaddress: json['mypk Tokens CC Address'], } ) } }) @@ -470,6 +495,8 @@ function sendTokenToAddress(token_id, address, amount) { reject(stderr) } + console.warn('tokentransfer hex', stdout); + if(stdout) { console.log('tokentransfer ' + address + ' ' + amount) @@ -488,30 +515,30 @@ function sendTokenToAddress(token_id, address, amount) { function createToken(name, supply, description) { - return new Promise((resolve, reject) => { - console.log('Creating token ' + name + ', supply: ' + supply + ' (' + (supply * 0.00000001) + ') ' + ' description: ' + description) - - let args = to_cli_args('tokencreate ' + name + ' ' + supply * 0.00000001) - if(description !== '') args.push('"' + description + '"') + return new Promise((resolve, reject) => { + console.log('Creating token ' + name + ', supply: ' + supply + ' (' + (supply * 0.00000001) + ') ' + ' description: ' + description) + + let args = to_cli_args('tokencreate ' + name + ' ' + supply * 0.00000001) + if(description !== '') args.push('"' + description + '"') - child_process.execFile(cli_path, args, (error, stdout, stderr) => { + child_process.execFile(cli_path, args, (error, stdout, stderr) => { - if(stderr) { - console.log('createToken failed: ', stderr) - reject(stderr) - } + if(stderr) { + console.log('createToken failed: ', stderr) + reject(stderr) + } - if(stdout) { - console.log('Broadcasting tokencreate...') - broadcastTX(JSON.parse(stdout).hex).then(txid => { - resolve(txid) - }).catch(e => { - reject(e) - }) - } + if(stdout) { + console.log('Broadcasting tokencreate...') + broadcastTX(JSON.parse(stdout).hex).then(txid => { + resolve(txid) + }).catch(e => { + reject(e) + }) + } - }) - }) + }) + }) } @@ -651,5 +678,6 @@ module.exports = { cancelTokenOrder, readConfig, forceImportKey, - chainName: default_config.chain_name, + chains, + setChain, } \ No newline at end of file From a2a596c653fbc161ba6d986317735c27fb524e75 Mon Sep 17 00:00:00 2001 From: pbca26 Date: Mon, 29 Mar 2021 18:03:42 +0300 Subject: [PATCH 3/9] add chain selector modal html --- index.html | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 83ba84a..b20a9e4 100644 --- a/index.html +++ b/index.html @@ -138,7 +138,7 @@
- My tokens address + My tokens address | pubkey @@ -612,7 +612,21 @@
- + + From 631a5bba22db78c47c8144a73f612c766e7a560e Mon Sep 17 00:00:00 2001 From: pbca26 Date: Mon, 29 Mar 2021 20:53:24 +0300 Subject: [PATCH 4/9] add chain selector logic --- renderer.js | 108 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 66 insertions(+), 42 deletions(-) diff --git a/renderer.js b/renderer.js index c042bed..a032a89 100644 --- a/renderer.js +++ b/renderer.js @@ -309,45 +309,69 @@ $('#form-submit-password').submit(event => { function init(pubkey) { return new Promise((resolve, reject) => { - inputLock(true, 'Preparing the daemon.') - - // Launch daemon - daemon.startUp(pubkey).then(wallet => { - // Store the key - store.set('pubkey', wallet.pubkey) - - // Save the new pubkey if generated for first time - if(wallet.generated) { - store.set('generated_privkey', wallet.privkey) - store.set('generated_pubkey', wallet.pubkey) - - console.log('Firstprivkey : ', store.get('first_privkey')) - if(store.get('first_privkey') === '') { - store.set('first_privkey', wallet.privkey) - store.set('first_pubkey', wallet.pubkey) - } - } - - // // Add block for test - // let transactions = [] - // for(let i = 0; i < 500; ++i) - // transactions.push(daemon.sendToAddress('RKSXk8CSb1tR1WBfx4z4xdedYLHPcPTFTx', 0.01)) - // Promise.all(transactions, () => { console.log('Sent all') }) - - // Set UI Values - updateNewAddress(wallet.address) - $('#myccaddress').val(daemon.getKeyPair().CCaddress); - Promise.all([ - updateBalance(), - updateTokenLists(), - updateTokenOrders() - ]).then(() => { - // Unlock input - inputLock(false) - - resolve() - }) - }) + console.warn('init'); + + $("#chain-selector").modal({ + backdrop: "static", // Remove ability to close modal with click + keyboard: false, // Remove option to close with keyboard + show: true // Display loader! + }) + + var $secondChoice = $("#chain-selector-dropdown"); + $secondChoice.empty(); + $secondChoice.append(""); + $.each(Object.keys(daemon.chains), function(index, value) { + $secondChoice.append(""); + }); + + $('#chain-selector-dropdown').on('change', function() { + console.warn(this.value); + + if (this.value !== 'None') { + daemon.setChain(this.value); + $("#chain-selector").modal('hide'); + + inputLock(true, 'Preparing the daemon.') + + // Launch daemon + daemon.startUp(pubkey).then(wallet => { + // Store the key + store.set('pubkey', wallet.pubkey) + + // Save the new pubkey if generated for first time + if(wallet.generated) { + store.set('generated_privkey', wallet.privkey) + store.set('generated_pubkey', wallet.pubkey) + + console.log('Firstprivkey : ', store.get('first_privkey')) + if(store.get('first_privkey') === '') { + store.set('first_privkey', wallet.privkey) + store.set('first_pubkey', wallet.pubkey) + } + } + + // // Add block for test + // let transactions = [] + // for(let i = 0; i < 500; ++i) + // transactions.push(daemon.sendToAddress('RKSXk8CSb1tR1WBfx4z4xdedYLHPcPTFTx', 0.01)) + // Promise.all(transactions, () => { console.log('Sent all') }) + + // Set UI Values + updateNewAddress(wallet.address) + $('#myccaddress').val(daemon.getKeyPair().CCaddress + ' | ' + daemon.getKeyPair().pubkey); + Promise.all([ + updateBalance(), + updateTokenLists(), + updateTokenOrders() + ]).then(() => { + // Unlock input + inputLock(false) + + resolve() + }) + }) + } + }); }) } @@ -574,7 +598,7 @@ $('#form-create-token-submit').submit(event => { (description !== '' ? ('(' + description + ')') : '') + ' with ' + supply + ' ' + daemon.getCoinName() + '\nTransaction ID: ' + createTokenTxid + '') $('#txid-link').on('click', function(e) { - openExtLink('http://www.atomicexplorer.com:10026/#/tokens/contract/' + daemon.chainName + '/' + createTokenTxid); + openExtLink('http://www.atomicexplorer.com:10026/#/tokens/contract/' + daemon.getCoinName() + '/' + createTokenTxid); }) addToHistory('Created token ' + name + (description !== '' ? ('(' + description + ')') : '') @@ -631,7 +655,7 @@ actions.forEach(action => { addToHistory('Created token order, ' + action + 'ing ' + supply + ' ' + name + ' for ' + stripZeros(price) + ' ' + daemon.getCoinName() + ' each. \nTransaction ID: ' + sellTokenOrderTxid) $('#txid-link').on('click', function(e) { - openExtLink('http://www.atomicexplorer.com:10026/#/tokens/transaction/' + daemon.chainName + '/' + tokenid + '/' + sellTokenOrderTxid); + openExtLink('http://www.atomicexplorer.com:10026/#/tokens/transaction/' + daemon.getCoinName() + '/' + tokenid + '/' + sellTokenOrderTxid); }) }).catch(e => { statusAlert(false, 'Could not create token trade order: ' + e) @@ -875,7 +899,7 @@ $('#form-token-fill-order-submit').submit(event => { '\nOrder ID: ' + txid + '\nFill Order ID: ' + fill_order_id) $('#txid-link').on('click', function(e) { - openExtLink('http://www.atomicexplorer.com:10026/#/tokens/transactions/' + daemon.chainName + '/' + tokenid); + openExtLink('http://www.atomicexplorer.com:10026/#/tokens/transactions/' + daemon.getCoinName() + '/' + tokenid); }) }).catch(e => { statusAlert(false, e) From 66d5afdd4bd8fd24d4765f475385637cbc39b82c Mon Sep 17 00:00:00 2001 From: pbca26 Date: Thu, 1 Apr 2021 16:39:00 +0300 Subject: [PATCH 5/9] #18 add nft creator form --- api/daemon.js | 65 ++++++++++++++++++++++++++++++++------------------- index.html | 40 +++++++++++++++++++++++++++++++ renderer.js | 44 ++++++++++++++++++++++++++++++---- style.css | 3 +++ 4 files changed, 124 insertions(+), 28 deletions(-) diff --git a/api/daemon.js b/api/daemon.js index c32606a..f1b297a 100644 --- a/api/daemon.js +++ b/api/daemon.js @@ -514,31 +514,48 @@ function sendTokenToAddress(token_id, address, amount) { -function createToken(name, supply, description) { - return new Promise((resolve, reject) => { - console.log('Creating token ' + name + ', supply: ' + supply + ' (' + (supply * 0.00000001) + ') ' + ' description: ' + description) - - let args = to_cli_args('tokencreate ' + name + ' ' + supply * 0.00000001) - if(description !== '') args.push('"' + description + '"') - - child_process.execFile(cli_path, args, (error, stdout, stderr) => { - - if(stderr) { - console.log('createToken failed: ', stderr) - reject(stderr) - } - - if(stdout) { - console.log('Broadcasting tokencreate...') - broadcastTX(JSON.parse(stdout).hex).then(txid => { - resolve(txid) - }).catch(e => { - reject(e) - }) - } +function createToken(name, supply, description, opreturn) { + return new Promise((resolve, reject) => { + console.log('Creating token ' + name + ', supply: ' + supply + ' (' + (supply * 0.00000001) + ') ' + ' description: ' + description) + + if (opreturn && opreturn !== null) { + console.warn('Create token NFT', opreturn) + opreturn = Buffer.from(JSON.stringify(opreturn)).toString('hex') + console.warn('NTF opreturn hex', opreturn) + } - }) - }) + let args = to_cli_args('tokencreate ' + name + ' ' + supply * 0.00000001) + if(description !== '') args.push('"' + description + '"') + if(opreturn && opreturn !== null) args.push('f7' + opreturn) + + console.warn('token create cliarg', args) + console.warn(args.join(' ')) + + child_process.execFile(cli_path, args, (error, stdout, stderr) => { + + if(stderr) { + console.log('createToken failed: ', stderr) + reject(stderr) + } + + if (JSON.stringify(stdout).indexOf('Non-fungible data incorrect') > -1) { + console.log('createToken failed: ', stdout) + reject(stdout) + } + + console.warn('daemon token create stdout', stdout) + + if(stdout) { + console.log('Broadcasting tokencreate...') + broadcastTX(JSON.parse(stdout).hex).then(txid => { + resolve(txid) + }).catch(e => { + reject(e) + }) + } + + }) + }) } diff --git a/index.html b/index.html index b20a9e4..27c1117 100644 --- a/index.html +++ b/index.html @@ -426,6 +426,16 @@
+
+
+ + +
+
@@ -446,6 +456,36 @@
+ +
diff --git a/renderer.js b/renderer.js index a032a89..89f1dad 100644 --- a/renderer.js +++ b/renderer.js @@ -592,17 +592,35 @@ $('#form-create-token-submit').submit(event => { return false } + let opretJSON = {}; + if (!$('#nft-form').hasClass('hidden')) { + console.warn('create nft'); + + if ($('#input-create-token-nft-image').val().length > 0) { + opretJSON['image'] = $('#input-create-token-nft-image').val(); + } + if ($('#input-create-token-nft-info').val().length > 0) { + opretJSON['info'] = $('#input-create-token-nft-info').val(); + } + + opretJSON['physical'] = $('#input-create-token-nft-physical').val(); + + console.warn(opretJSON); + } else { + console.warn('create regular token'); + } + // Create token - daemon.createToken(name, supply, description).then((createTokenTxid) => { - statusAlert(true, 'Created token ' + name + + daemon.createToken(name, supply, description, !$('#nft-form').hasClass('hidden') ? opretJSON : null).then((createTokenTxid) => { + statusAlert(true, 'Created token ' + (!$('#nft-form').hasClass('hidden') ? '(NTF) ' : '') + name + (description !== '' ? ('(' + description + ')') : '') + ' with ' + supply + ' ' + daemon.getCoinName() + '\nTransaction ID: ' + createTokenTxid + '') $('#txid-link').on('click', function(e) { openExtLink('http://www.atomicexplorer.com:10026/#/tokens/contract/' + daemon.getCoinName() + '/' + createTokenTxid); }) - addToHistory('Created token ' + name + + addToHistory('Created token ' + (!$('#nft-form').hasClass('hidden') ? '(NTF) ' : '') + name + (description !== '' ? ('(' + description + ')') : '') - + ' with ' + supply + ' ' + daemon.getCoinName() + '\nTransaction ID: ' + createTokenTxid) + + ' with ' + supply + ' ' + daemon.getCoinName() + '\nTransaction ID: ' + createTokenTxid + (!$('#nft-form').hasClass('hidden') ? '\nTransaction NFT data: ' + JSON.stringify(opretJSON) + '\n' : '')) }).catch(e => { statusAlert(false, 'Failed to create token: ' + e) }) @@ -939,3 +957,21 @@ $("#nav-explorer").click(function(e) { e.preventDefault() openExtLink('http://www.atomicexplorer.com:10026/#/tokens') }) + +$('input[type=radio][name=create-token-type]').change(function() { + console.warn(this.value); + + if (this.value === 'default') { + $('#nft-form').addClass('hidden'); + $('#input-create-token-supply').val(''); + $('#input-create-token-supply').attr('disabled', false); + } else { + $('#nft-form').removeClass('hidden'); + $('#input-create-token-supply').attr('disabled', true); + $('#input-create-token-supply').val(1); + } +}); + +$('#input-create-token-nft-image').change(function() { + $("#input-create-token-nft-image-preview").attr('src', this.value); +}); \ No newline at end of file diff --git a/style.css b/style.css index 3bc2b09..8ea7674 100644 --- a/style.css +++ b/style.css @@ -245,3 +245,6 @@ body { top: 90%; } +.hidden { + display: none; +} From 50b625e276be45f2ddd5cce3a1535bf50ac93c4f Mon Sep 17 00:00:00 2001 From: pbca26 Date: Wed, 14 Apr 2021 17:21:23 +0300 Subject: [PATCH 6/9] add TKLTEST chain, add NFT chain flag --- api/chains.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/api/chains.js b/api/chains.js index 86b2159..a499a84 100644 --- a/api/chains.js +++ b/api/chains.js @@ -8,9 +8,14 @@ var chains = { params: '-ac_supply=90000000000 -ac_cc=3 -ac_reward=100000000 -addnode=94.130.38.173 -addnode=178.63.47.105', }, 'TOKENSV2': { - isV2: true, + NFT: true, params: '-ac_supply=10000000 -ac_reward=1000000000 -ac_decay=77700000 -ac_halving=43800 -ac_cc=1 -ac_ccenable=227,224,245,243,228,242,123,247 -addnode=159.69.53.25', }, + 'TKLTEST': { + NFT: true, + isV2: true, + params: '-ac_supply=1000000000 -ac_reward=10000000000 -ac_decay=77700000 -ac_halving=525600 -ac_cc=1 -ac_ccenable=224,243,245,246,247,228 -addnode=51.38.124.215 -addnode=94.130.38.173', + }, }; module.exports = chains; \ No newline at end of file From beb09336d0d1e2c966fc8aa3a021785419bc9ef9 Mon Sep 17 00:00:00 2001 From: pbca26 Date: Wed, 14 Apr 2021 17:21:46 +0300 Subject: [PATCH 7/9] update komodod fetch script urls --- fetch-kmd-bins.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fetch-kmd-bins.sh b/fetch-kmd-bins.sh index 17cb537..2af9cdd 100755 --- a/fetch-kmd-bins.sh +++ b/fetch-kmd-bins.sh @@ -3,14 +3,14 @@ mkdir bin/win64 mkdir bin/linux64 mkdir bin/osx cd bin/win64 -wget https://github.com/pbca26/komodod/releases/download/cd_release_8688665_dev/komodo_8688665_dev_win.zip -unzip komodo_8688665_dev_win.zip -rm komodo_8688665_dev_win.zip +wget https://github.com/pbca26/komodod/releases/download/cd_release_4c1f3bb_tokens/komodo_4c1f3bb_tokens_win.zip +unzip komodo_4c1f3bb_tokens_win.zip +rm komodo_4c1f3bb_tokens_win.zip cd ../linux64 -wget https://github.com/pbca26/komodod/releases/download/cd_release_8688665_dev/komodo_8688665_dev_linux.zip -unzip komodo_8688665_dev_linux.zip -rm komodo_8688665_dev_linux.zip +wget https://github.com/pbca26/komodod/releases/download/cd_release_4c1f3bb_tokens/komodo_4c1f3bb_tokens_linux.zip +unzip komodo_4c1f3bb_tokens_linux.zip +rm komodo_4c1f3bb_tokens_linux.zip cd ../osx -wget https://github.com/pbca26/komodod/releases/download/cd_release_8688665_dev/komodo_8688665_dev_osx.zip -unzip komodo_8688665_dev_osx.zip -rm komodo_8688665_dev_osx.zip \ No newline at end of file +wget https://github.com/pbca26/komodod/releases/download/cd_release_4c1f3bb_tokens/komodo_4c1f3bb_tokens_osx.zip +unzip komodo_4c1f3bb_tokens_osx.zip +rm komodo_4c1f3bb_tokens_osx.zip \ No newline at end of file From eef1f82625db1358f46a43b765eacae70fa5efc4 Mon Sep 17 00:00:00 2001 From: pbca26 Date: Wed, 14 Apr 2021 21:37:38 +0300 Subject: [PATCH 8/9] add tokensv2 support --- api/daemon.js | 58 ++++++++++++++++++++++++++++++++++----------------- index.html | 2 +- renderer.js | 58 ++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 81 insertions(+), 37 deletions(-) diff --git a/api/daemon.js b/api/daemon.js index f1b297a..94ebdf7 100644 --- a/api/daemon.js +++ b/api/daemon.js @@ -18,14 +18,14 @@ if (process.argv.indexOf('chain=rick') > -1) { bin_folder: getBinsFolder(), chain_name: 'RICK', coin_name: 'RICK', - chain_launch_params: chains.RICK + ' -printtoconsole' + chain_launch_params: chains.RICK.params + ' -printtoconsole' } } else { default_config = { bin_folder: getBinsFolder(), chain_name: 'WSB', coin_name: 'WSB', - chain_launch_params: chains.WSB + ' -printtoconsole' + chain_launch_params: chains.WSB.params + ' -printtoconsole' } } @@ -251,6 +251,20 @@ function stopDaemon() { function getBalance() { return new Promise((resolve, reject) => { + if (chains[config.chain_name].isV2) { + child_process.execFile(cli_path, to_cli_args('tokenv2address'), (error, stdout, stderr) => { + + if(stderr) { + console.log('getBalance failed: ', stderr) + reject(stderr) + } + + if(stdout) { + resolve(JSON.parse(stdout)['mypk Normal Balance']) + } + + }) + } else { child_process.execFile(cli_path, to_cli_args('getwalletinfo'), (error, stdout, stderr) => { if(stderr) { @@ -263,6 +277,7 @@ function getBalance() { } }) + } }) } @@ -286,7 +301,7 @@ function getNewAddress() { function getTokenBalance(id) { return new Promise((resolve, reject) => { - child_process.execFile(cli_path, to_cli_args('tokenbalance ' + id), (error, stdout, stderr) => { + child_process.execFile(cli_path, to_cli_args((chains[config.chain_name].isV2 ? 'tokenv2balance ' : 'tokenbalance ') + id), (error, stdout, stderr) => { if(stderr) { console.log('getTokenBalance failed: ', stderr) @@ -303,7 +318,7 @@ function getTokenBalance(id) { function getTokenName(id) { return new Promise((resolve, reject) => { - child_process.execFile(cli_path, to_cli_args('tokeninfo ' + id), (error, stdout, stderr) => { + child_process.execFile(cli_path, to_cli_args((chains[config.chain_name].isV2 ? 'tokenv2info ' : 'tokeninfo ') + id), (error, stdout, stderr) => { if(stderr) { console.log('getTokenName failed: ', stderr) @@ -321,7 +336,7 @@ function getTokenName(id) { function getTokenList() { return new Promise((resolve, reject) => { - child_process.execFile(cli_path, to_cli_args('tokenlist'), (error, stdout, stderr) => { + child_process.execFile(cli_path, to_cli_args(chains[config.chain_name].isV2 ? 'tokenv2list' : 'tokenlist'), (error, stdout, stderr) => { if(stderr) { console.log('getTokenList failed: ', stderr) @@ -353,7 +368,7 @@ function getTokenList() { function getTokenOrders() { return new Promise((resolve, reject) => { - child_process.execFile(cli_path, to_cli_args('mytokenorders'), (error1, stdout1, stderr1) => { + child_process.execFile(cli_path, to_cli_args(chains[config.chain_name].isV2 ? 'mytokenv2orders' : 'mytokenorders'), (error1, stdout1, stderr1) => { if(stderr1) { console.log('getTokenOrders failed (mytokenorders): ', stderr1) reject(stderr1) @@ -363,7 +378,7 @@ function getTokenOrders() { let myorders = JSON.parse(stdout1) //console.warn('myorders', myorders); - child_process.execFile(cli_path, to_cli_args('tokenorders'), (error, stdout, stderr) => { + child_process.execFile(cli_path, to_cli_args(chains[config.chain_name].isV2 ? 'tokenv2orders' : 'tokenorders'), (error, stdout, stderr) => { if(stderr) { console.log('getTokenOrders failed: ', stderr) @@ -426,7 +441,7 @@ function importPrivKey(key) { function getAddressFromPubkey(pubkey) { return new Promise((resolve, reject) => { - child_process.execFile(cli_path, to_cli_args('tokenaddress ' + pubkey), (error, stdout, stderr) => { + child_process.execFile(cli_path, to_cli_args((chains[config.chain_name].isV2 ? 'tokenv2address ' : 'tokenaddress ') + pubkey), (error, stdout, stderr) => { if(stderr) { console.log('getAddressFromPubkey failed: ', stderr) @@ -436,7 +451,7 @@ function getAddressFromPubkey(pubkey) { if(stdout) { let json = JSON.parse(stdout) // console.log('getAddressFromPubkey success: ', json) - resolve({ address: json.myaddress, CCaddress: json['mypk Tokens CC Address'], } ) + resolve({ address: json['mypk Normal Address'], CCaddress: json[chains[config.chain_name].isV2 ? 'mypk Tokensv2 CC Address' : 'mypk Tokens CC Address'], } ) } }) @@ -448,7 +463,7 @@ function getAddressFromPubkey(pubkey) { function sendToAddress(address, amount) { return new Promise((resolve, reject) => { console.log('Sending ' + amount + ' ' + getCoinName() + ' to ' + address) - const cli = child_process.execFile(cli_path, to_cli_args('sendtoaddress ' + address + ' ' + amount), (error, stdout, stderr) => { + const cli = child_process.execFile(cli_path, to_cli_args('sendtoaddress ' + address + ' ' + Number(amount)), (error, stdout, stderr) => { if(stderr) { console.log('sendToAddress failed: ', stderr) @@ -488,7 +503,7 @@ function broadcastTX(raw_tx) { function sendTokenToAddress(token_id, address, amount) { return new Promise((resolve, reject) => { console.log('Sending ' + amount + ' of token_id: ' + token_id + ' to ' + address) - child_process.execFile(cli_path, to_cli_args('tokentransfer ' + token_id + ' ' + address + ' ' + amount), (error, stdout, stderr) => { + child_process.execFile(cli_path, to_cli_args((chains[config.chain_name].isV2 ? 'tokenv2transfer ' : 'tokentransfer ') + token_id + ' ' + address + ' ' + Number(amount)), (error, stdout, stderr) => { if(stderr) { console.log('sendTokenToAddress failed: ', stderr) @@ -516,7 +531,7 @@ function sendTokenToAddress(token_id, address, amount) { function createToken(name, supply, description, opreturn) { return new Promise((resolve, reject) => { - console.log('Creating token ' + name + ', supply: ' + supply + ' (' + (supply * 0.00000001) + ') ' + ' description: ' + description) + console.log('Creating token ' + name + ', supply: ' + supply + ' (' + Number(supply * 0.00000001).toFixed(8) + ') ' + ' description: ' + description) if (opreturn && opreturn !== null) { console.warn('Create token NFT', opreturn) @@ -524,8 +539,8 @@ function createToken(name, supply, description, opreturn) { console.warn('NTF opreturn hex', opreturn) } - let args = to_cli_args('tokencreate ' + name + ' ' + supply * 0.00000001) - if(description !== '') args.push('"' + description + '"') + let args = to_cli_args((chains[config.chain_name].isV2 ? 'tokenv2create ' : 'tokencreate ') + name + ' ' + Number(supply * 0.00000001).toFixed(8)) + if(description !== '') args.push(description) if(opreturn && opreturn !== null) args.push('f7' + opreturn) console.warn('token create cliarg', args) @@ -563,8 +578,8 @@ function createTokenTradeOrder(action, supply, tokenid, price) { return new Promise((resolve, reject) => { console.log('Creating token buy order supply:' + supply + ', tokenid: ' + tokenid + ', price: ' + price) - child_process.execFile(cli_path, to_cli_args('token' + (action === 'buy' ? 'bid' : 'ask') - + ' ' + supply + ' ' + tokenid + ' ' + price), (error, stdout, stderr) => { + child_process.execFile(cli_path, to_cli_args((chains[config.chain_name].isV2 ? 'tokenv2' : 'token') + (action === 'buy' ? 'bid' : 'ask') + + ' ' + Number(supply) + ' ' + tokenid + ' ' + Number(price)), (error, stdout, stderr) => { if(stderr) { console.log('createTokenTradeOrder failed: ', stderr) @@ -588,8 +603,8 @@ function fillTokenOrder(func, tokenid, txid, count) { return new Promise((resolve, reject) => { console.log('Filling order token order:' + func + ', tokenid: ' + tokenid + ', txid: ' + txid + ' count: ' + count) - child_process.execFile(cli_path, to_cli_args('tokenfill' + (func === 'buy' ? 'ask' : 'bid') - + ' ' + tokenid + ' ' + txid + ' ' + count), (error, stdout, stderr) => { + child_process.execFile(cli_path, to_cli_args((chains[config.chain_name].isV2 ? 'tokenv2fill' : 'tokenfill') + (func === 'buy' ? 'ask' : 'bid') + + ' ' + tokenid + ' ' + txid + ' ' + Number(count)), (error, stdout, stderr) => { if(stderr) { console.log('fillTokenOrder failed: ', stderr) @@ -613,7 +628,7 @@ function cancelTokenOrder(action, tokenid, txid) { return new Promise((resolve, reject) => { console.log('Cancelling order token order:' + action + ', tokenid: ' + tokenid + ', txid: ' + txid) - const cli = child_process.execFile(cli_path, to_cli_args('tokencancel' + action + ' ' + tokenid + ' ' + txid), (error, stdout, stderr) => { + const cli = child_process.execFile(cli_path, to_cli_args((chains[config.chain_name].isV2 ? 'tokenv2cancel' : 'tokencancel') + action + ' ' + tokenid + ' ' + txid), (error, stdout, stderr) => { if(stderr) { console.log('cancelTokenOrder failed: ', stderr) @@ -638,6 +653,10 @@ function getCoinName() { return config.coin_name } +function isNFTCoin() { + return chains[config.chain_name].NFT +} + function getChainName() { return config.chain_name } @@ -682,6 +701,7 @@ module.exports = { getBalance, getChainName, getCoinName, + isNFTCoin, getKomodoFolder, sendToAddress, getNewAddress, diff --git a/index.html b/index.html index 27c1117..48f8ea7 100644 --- a/index.html +++ b/index.html @@ -426,7 +426,7 @@
-
+