Skip to content

Commit

Permalink
Firo in text messages
Browse files Browse the repository at this point in the history
  • Loading branch information
a-bezrukov committed May 10, 2021
1 parent c0785cf commit ef73c5a
Show file tree
Hide file tree
Showing 29 changed files with 110 additions and 110 deletions.
2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
MIT License

Copyright (c) 2017 Bertrand256
Copyright (c) 2020 Zcoin Developers
Copyright (c) 2020 Firo Developers

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion contrib/nginx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cp default /etc/nginx/sites-available/

Restart nginx

zcoin.conf example
firo.conf example
```
testnet=1
bind=127.10.10.1
Expand Down
Binary file modified doc/img/conf-masternodes-a-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions src/app_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,12 @@ def __init__(self):

self.dash_network = 'MAINNET'

self.block_explorer_tx_mainnet = 'https://insight.zcoin.io/tx/%TXID%'
self.block_explorer_addr_mainnet = 'https://insight.zcoin.io/address/%ADDRESS%'
self.block_explorer_tx_testnet = 'https://testexplorer.zcoin.io/tx/%TXID%'
self.block_explorer_addr_testnet = 'https://testexplorer.zcoin.io/address/%ADDRESS%'
self.tx_api_url_mainnet = 'https://insight.zcoin.io'
self.tx_api_url_testnet = 'https://testexplorer.zcoin.io'
self.block_explorer_tx_mainnet = 'https://insight.firo.org/tx/%TXID%'
self.block_explorer_addr_mainnet = 'https://insight.firo.org/address/%ADDRESS%'
self.block_explorer_tx_testnet = 'https://testexplorer.firo.org/tx/%TXID%'
self.block_explorer_addr_testnet = 'https://testexplorer.firo.org/address/%ADDRESS%'
self.tx_api_url_mainnet = 'https://insight.firo.org'
self.tx_api_url_testnet = 'https://testexplorer.firo.org'
self.dash_central_proposal_api = 'https://www.dashcentral.org/api/v1/proposal?hash=%HASH%'
self.dash_nexus_proposal_api = 'https://api.dashnexus.org/proposals/%HASH%'

Expand Down
2 changes: 1 addition & 1 deletion src/app_defs.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
APP_NAME_SHORT = 'firo-masternode-tool'
APP_NAME_LONG = 'Firo Masternode Tool'
APP_DATA_DIR_NAME = '.firo-masternode-tool'
PROJECT_URL = 'https://github.com/firorg/firo-masternode-tool'
PROJECT_URL = 'https://github.com/firoorg/firo-masternode-tool'
FEE_DUFF_PER_BYTE = 1
MIN_TX_FEE = 1000
SCREENSHOT_MODE = False
Expand Down
2 changes: 1 addition & 1 deletion src/cmd_console_dlg.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ def rpc_command(self, command: str, *args):
self.message(ret, style="white-space: pre-wrap;")
return True
else:
WndUtils.errorMsg('Not connected to a Zcoin node')
WndUtils.errorMsg('Not connected to a Firo node')
return False

@pyqtSlot()
Expand Down
10 changes: 5 additions & 5 deletions src/config_dlg.py
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@ def on_btnSshReadRpcConfig_clicked(self):
self.disable_cfg_update = True
if isinstance(dashd_conf, tuple) and len(dashd_conf) >= 3:
if not dashd_conf[0]:
self.infoMsg('Remore Zcoin daemon seems to be shut down')
self.infoMsg('Remore Firo daemon seems to be shut down')
elif not dashd_conf[1]:
self.infoMsg('Could not find remote dashd.conf file')
else:
Expand All @@ -796,17 +796,17 @@ def on_btnSshReadRpcConfig_clicked(self):
self.is_modified = modified

if file.get('server', '1') == '0':
self.warnMsg("Remote zcoin.conf parameter 'server' is set to '0', so RPC interface will "
self.warnMsg("Remote firo.conf parameter 'server' is set to '0', so RPC interface will "
"not work.")
if not rpcuser:
self.warnMsg("Remote zcoin.conf parameter 'rpcuser' is not set, so RPC interface will "
self.warnMsg("Remote firo.conf parameter 'rpcuser' is not set, so RPC interface will "
"not work.")
if not rpcpassword:
self.warnMsg("Remote zcoin.conf parameter 'rpcpassword' is not set, so RPC interface will "
self.warnMsg("Remote firo.conf parameter 'rpcpassword' is not set, so RPC interface will "
"not work.")
self.update_connection_details_ui()
elif isinstance(dashd_conf, str):
self.warnMsg("Couldn't read remote zcoind configuration file due the following error: " +
self.warnMsg("Couldn't read remote firod configuration file due the following error: " +
dashd_conf)
ssh.disconnect()
except Exception as e:
Expand Down
16 changes: 8 additions & 8 deletions src/dashd_intf.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,9 @@ def find_dashd_config(self):
try:
# find dashd process id if running
try:
pids = self.remote_command('ps -C "zcoind" -o pid')
pids = self.remote_command('ps -C "firod" -o pid')
except UnknownError:
raise Exception('is zcoind running on the remote machine?')
raise Exception('is firod running on the remote machine?')
pid = None
if isinstance(pids, list):
pids = [pid.strip() for pid in pids]
Expand Down Expand Up @@ -383,13 +383,13 @@ class DashdIndexException(JSONRPCException):
def __init__(self, parent_exception):
JSONRPCException.__init__(self, parent_exception.error)
self.message = self.message + \
'\n\nMake sure the Zcoin daemon you are connecting to has the following options enabled in ' \
'its zcoin.conf:\n\n' + \
'\n\nMake sure the Firo daemon you are connecting to has the following options enabled in ' \
'its firo.conf:\n\n' + \
'addressindex=1\n' + \
'spentindex=1\n' + \
'timestampindex=1\n' + \
'txindex=1\n\n' + \
'Changing these parameters requires to execute zcoind with "-reindex" option (linux: ./zcoind -reindex)'
'Changing these parameters requires to execute firod with "-reindex" option (linux: ./firod -reindex)'


def control_rpc_call(_func=None, *, encrypt_rpc_arguments=False, allow_switching_conns=True):
Expand Down Expand Up @@ -748,7 +748,7 @@ def open(self):
"""
try:
if not self.cur_conn_def:
raise Exception('There is no connections to Zcoin enabled in the configuration.')
raise Exception('There is no connections to Firo enabled in the configuration.')

while True:
try:
Expand Down Expand Up @@ -921,10 +921,10 @@ def getinfo(self, verify_node: bool = True):
if verify_node:
node_under_testnet = info.get('testnet')
if self.app_config.is_testnet() and not node_under_testnet:
raise Exception('This RPC node works under Zcoin MAINNET, but your current configuration is '
raise Exception('This RPC node works under Firo MAINNET, but your current configuration is '
'for TESTNET.')
elif self.app_config.is_mainnet() and node_under_testnet:
raise Exception('This RPC node works under Zcoin TESTNET, but your current configuration is '
raise Exception('This RPC node works under Firo TESTNET, but your current configuration is '
'for MAINNET.')
return info
else:
Expand Down
4 changes: 2 additions & 2 deletions src/find_coll_tx_dlg.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,15 +214,15 @@ def updateUi(self):
def display_title(self):
if len(self.utxos):
if self.read_only:
msg = f'<span>Found 1000 Zcoin transaction(s):</span>'
msg = f'<span>Found 1000 Firo transaction(s):</span>'
else:
msg = f'<span><b>Select the appropriate UTXO then press the &lt;Apply&gt; button or ' \
f'double click on the corresponding row.</b></span>'

self.lblMessage.setText(msg)
self.lblMessage.setVisible(True)
else:
self.lblMessage.setText('<span style="color:red"><b>Found no unspent 1000 Zcoin transactions in your '
self.lblMessage.setText('<span style="color:red"><b>Found no unspent 1000 Firo transactions in your '
'wallet</b></span>')
self.lblMessage.setVisible(True)

Expand Down
2 changes: 1 addition & 1 deletion src/hw_intf_keepkey.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ def get_tx(self, txhash):
data["extraPayload"] = serialize_cbTx(data)
else:
raise NotImplementedError("Only spending of V3 coinbase outputs has been inplemented. "
"Please file an issue at https://github.com/firorg/firo-masternode-tool/issues containing "
"Please file an issue at https://github.com/firoorg/firo-masternode-tool/issues containing "
"the tx type=" + str(dip2_type))
data["extraPayloadSize"] = len(data["extraPayload"]) >> 1

Expand Down
2 changes: 1 addition & 1 deletion src/hw_intf_ledgernano.py
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ def sign_tx(hw_session: HwSessionInfo, utxos_to_spend: List[wallet_common.UtxoTy
data["extraPayload"] = serialize_cbTx(data)
else:
raise NotImplementedError("Only spending of V3 coinbase outputs has been inplemented. "
"Please file an issue at https://github.com/firorg/firo-masternode-tool/issues containing "
"Please file an issue at https://github.com/firoorg/firo-masternode-tool/issues containing "
"the tx type=" + str(dip2_type))

data["extraPayloadSize"] = len(data["extraPayload"]) >> 1
Expand Down
2 changes: 1 addition & 1 deletion src/hw_intf_trezor.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ def json_to_tx(coin, data):
data["extraPayload"] = serialize_cbTx(data)
else:
raise NotImplementedError("Only spending of V3 coinbase outputs has been inplemented. "
"Please file an issue at https://github.com/firorg/firo-masternode-tool/issues containing "
"Please file an issue at https://github.com/firoorg/firo-masternode-tool/issues containing "
"the tx type=" + str(dip2_type))
data["extraPayloadSize"] = len(data["extraPayload"]) >> 1

Expand Down
18 changes: 9 additions & 9 deletions src/main_dlg.py
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ def wait_for_synch_finished_thread(ctrl):
mnsync = self.dashd_intf.mnsync()
self.add_app_message(
DispMessage.DASH_NET_CONNECTION,
'Zcoind is synchronizing: AssetID: %s, AssetName: %s' %
'Firod is synchronizing: AssetID: %s, AssetName: %s' %
(str(mnsync.get('AssetID', '')), str(mnsync.get('AssetName', ''))), 'warn')
cond.wait(mtx, 5000)
self.del_app_message(DispMessage.DASH_NET_CONNECTION)
Expand Down Expand Up @@ -773,7 +773,7 @@ def connection_test_finished():
if self.dashd_connection_ok:
self.show_connection_successful()
if self.is_dashd_syncing:
self.infoMsg('Connection successful, but Zcoin daemon is synchronizing.')
self.infoMsg('Connection successful, but Firo daemon is synchronizing.')
else:
self.infoMsg('Connection successful.')
else:
Expand Down Expand Up @@ -940,7 +940,7 @@ def connect_hardware_wallet(self) -> Optional[object]:

if not found_testnet_support:
url = get_note_url('DMT0002')
msg = f'Your hardware wallet device does not fully support Zcoin TESTNET. ' \
msg = f'Your hardware wallet device does not fully support Firo TESTNET. ' \
f'It will be displaying mainnet addresses instead of testnet ones. ' \
f'(<a href="{url}">See details</a>).'
self.errorMsg(msg)
Expand Down Expand Up @@ -1602,7 +1602,7 @@ def get_masternode_status_description_thread(self, ctrl, masternode: MasternodeC
owner_public_address_mismatch = True
logging.warning(
f'The owner public address mismatch for masternode: {masternode.name}, '
f'address from the app configuration: {owner_address_cfg}, address from the Zcoin '
f'address from the app configuration: {owner_address_cfg}, address from the Firo '
f'network: {owner_address_network}')

voting_address_network = dmn_tx_state.get('votingAddress')
Expand All @@ -1611,7 +1611,7 @@ def get_masternode_status_description_thread(self, ctrl, masternode: MasternodeC
voting_public_address_mismatch = True
logging.warning(
f'The voting public address mismatch for masternode: {masternode.name}. '
f'address from the app configuration: {voting_address_cfg}, address from the Zcoin '
f'address from the app configuration: {voting_address_cfg}, address from the Firo '
f'network: {voting_address_network}')

if not no_operator_pub_key:
Expand All @@ -1622,7 +1622,7 @@ def get_masternode_status_description_thread(self, ctrl, masternode: MasternodeC
operator_pubkey_mismatch = True
logging.warning(
f'The operator public key mismatch for masternode: {masternode.name}. '
f'pubkey from the app configuration: {operator_pubkey_cfg}, pubkey from the Zcoin '
f'pubkey from the app configuration: {operator_pubkey_cfg}, pubkey from the Firo '
f'network: {operator_pubkey_network}')

if mn_data_modified:
Expand Down Expand Up @@ -1745,7 +1745,7 @@ def update():
if operator_pubkey_mismatch and not skip_data_mismatch:
errors.append('<td class="error" colspan="2">Operator public key mismatch</td>')
if voting_public_address_mismatch and not skip_data_mismatch:
errors.append('<td class="error" colspan="2">Voting Zcoin address mismatch</td>')
errors.append('<td class="error" colspan="2">Voting Firo address mismatch</td>')
if not dmn_tx:
warnings.append('<td class="warning" colspan="2">Couldn\'d read protx info for this masternode'
' (look into the logfile for details)</td>')
Expand Down Expand Up @@ -1831,7 +1831,7 @@ def on_get_status_exception(exception):
else:
enable_buttons()
self.lblMnStatus.setText('')
self.errorMsg('Zcoin daemon not connected')
self.errorMsg('Firo daemon not connected')

@pyqtSlot(bool)
def on_action_transfer_funds_for_cur_mn_triggered(self):
Expand Down Expand Up @@ -1880,7 +1880,7 @@ def show_wallet_window(self, initial_mn: Optional[int]):
if the value is None, show the default utxo source type
"""
if not self.dashd_intf.open():
self.errorMsg('Zcoin daemon not connected')
self.errorMsg('Firo daemon not connected')
else:
ui = wallet_dlg.WalletDlg(self, initial_mn_sel=initial_mn)
ui.exec_()
Expand Down
12 changes: 6 additions & 6 deletions src/masternode_details.py
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ def get_label_text(prefix:str, cur_key_type: str, tooltip_anchor: str, group: QA
if not self.edit_mode and not self.act_view_as_owner_private_key.isChecked():
style = 'hl2'
else:
key_type, tooltip_anchor, placeholder_text = ('address', 'privkey', 'Enter the owner Zcoin address')
key_type, tooltip_anchor, placeholder_text = ('address', 'privkey', 'Enter the owner Firo address')
if not self.edit_mode:
style = 'hl1' if self.act_view_as_owner_public_address.isChecked() else 'hl2'
self.lblOwnerKey.setText(get_label_text('Owner', key_type, tooltip_anchor, self.ag_owner_key, style))
Expand All @@ -325,7 +325,7 @@ def get_label_text(prefix:str, cur_key_type: str, tooltip_anchor: str, group: QA
if not self.edit_mode and not self.act_view_as_voting_private_key.isChecked():
style = 'hl2'
else:
key_type, tooltip_anchor, placeholder_text = ('address', 'privkey', 'Enter the voting Zcoin address')
key_type, tooltip_anchor, placeholder_text = ('address', 'privkey', 'Enter the voting Firo address')
if not self.edit_mode:
style = 'hl1' if self.act_view_as_voting_public_address.isChecked() else 'hl2'
self.lblVotingKey.setText(get_label_text('Voting', key_type, tooltip_anchor, self.ag_voting_key, style))
Expand Down Expand Up @@ -545,7 +545,7 @@ def on_lblVotingKey_linkActivated(self, link):
@pyqtSlot(str)
def on_lblOwnerKey_linkHovered(self, link):
if link == 'address':
tt = 'Change input type to Zcoin address'
tt = 'Change input type to Firo address'
else:
tt = 'Change input type to private key'
self.lblOwnerKey.setToolTip(tt)
Expand All @@ -561,7 +561,7 @@ def on_lblOperatorKey_linkHovered(self, link):
@pyqtSlot(str)
def on_lblVotingKey_linkHovered(self, link):
if link == 'address':
tt = 'Change input type to Zcoin address'
tt = 'Change input type to Firo address'
else:
tt = 'Change input type to private key'
self.lblVotingKey.setToolTip(tt)
Expand Down Expand Up @@ -910,7 +910,7 @@ def apply_utxo(utxo):
apply_utxo(utxo)
else:
if utxos is not None:
WndUtils.warnMsg('Couldn\'t find any 1000 Zcoin UTXO in your wallet.')
WndUtils.warnMsg('Couldn\'t find any 1000 Firo UTXO in your wallet.')

def get_collateral_tx_address_thread(self, ctrl: CtrlObject,
bip44_wallet: Bip44Wallet,
Expand All @@ -919,7 +919,7 @@ def get_collateral_tx_address_thread(self, ctrl: CtrlObject,
utxos = []
break_scanning = False
txes_cnt = 0
msg = 'Scanning wallet transactions for 1000 Zcoin UTXOs.<br>' \
msg = 'Scanning wallet transactions for 1000 Firo UTXOs.<br>' \
'This may take a while (<a href="break">break</a>)....'
ctrl.dlg_config_fun(dlg_title="Scanning wallet", show_progress_bar=False)
ctrl.display_msg_fun(msg)
Expand Down
Loading

0 comments on commit ef73c5a

Please sign in to comment.