Skip to content

Commit

Permalink
Merge pull request #33 from marmarachain/development
Browse files Browse the repository at this point in the history 
[fix] fixed update linux making executable.
  • Loading branch information
@rumeysayilmaz
rumeysayilmaz committed Jun 16, 2023
2 parents 83680e4 + 569a148 commit 8b375ae
Show file tree
Hide file tree
Showing 6 changed files with 110 additions and 107 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
build_Debian:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
Expand Down
2 changes: 1 addition & 1 deletion src/build/settings/base.json
View file
Expand Up @@ -2,6 +2,6 @@
"app_name": "MarmaraConnector",
"author": "Marmara Credit Loops",
"main_module": "src/main/python/mainApp.py",
"version": "0.4.0",
"version": "0.4.1",
"public_settings": ["app_name", "author", "version"]
}
4 changes: 2 additions & 2 deletions src/main/python/mainApp.py
View file
Expand Up @@ -2639,8 +2639,8 @@ def marmaraholderloops_result(self, result_out):
self.set_holder_loops_table(result_out[0])
self.total_transferrable_loop_amount_label_value.setText(str(result_out[1].get('totalamount')))
self.numberof_transferrable_loop_amount_label_value.setText(str(result_out[1].get('numpending')))
self.holderloops_closed_amount_label_value.setText(str(result_out[1].get('numclosed')))
self.holderloops_closed_number_label_value.setText(str(result_out[1].get('totalclosed')))
self.holderloops_closed_amount_label_value.setText(str(result_out[1].get('totalclosed')))
self.holderloops_closed_number_label_value.setText(str(result_out[1].get('numclosed')))
if result_out[2] == 1:
self.bottom_err_info(result_out[1])
logging.error(str(result_out[1]))
Expand Down
7 changes: 5 additions & 2 deletions src/main/python/marmarachain_rpc.py
View file
Expand Up @@ -962,7 +962,8 @@ def local_chain_update(self):
cmd_list = None
if platform.system() == 'Linux':
cmd_list = ['wget ' + str(self.mcl_download_url) + '/' + self.mcl_linux_zipname + " -O " +
self.mcl_linux_zipname, 'unzip -o ' + self.mcl_linux_zipname]
self.mcl_linux_zipname, 'unzip -o ' + self.mcl_linux_zipname,
'chmod +x komodod komodo-cli fetch-params.sh']
if platform.system() == 'Windows':
cmd_list = [self.win_command_list[1], self.win_command_list[2]]
if cmd_list:
Expand All @@ -986,7 +987,9 @@ def local_chain_update(self):

def remote_chain_update(self):
cmd_list = ['curl -L ' + str(self.mcl_download_url) + '/' + self.mcl_linux_zipname + ' > ' + marmara_path +
self.mcl_linux_zipname, 'unzip -o ' + marmara_path + self.mcl_linux_zipname + ' -d ' + marmara_path]
self.mcl_linux_zipname, 'unzip -o ' + marmara_path + self.mcl_linux_zipname + ' -d ' + marmara_path,
'chmod +x ' + marmara_path + 'komodod ' + marmara_path + 'komodo-cli ' + marmara_path +
'fetch-params.sh']
sshclient = remote_connection.server_ssh_connect()
for cmd in cmd_list:
session = sshclient.get_transport().open_session()
Expand Down
84 changes: 42 additions & 42 deletions src/main/python/qtguidesign.py
View file
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-

# Form implementation generated from reading ui file 'python/qtguidesign.ui'
# Form implementation generated from reading ui file 'src/main/python/qtguidesign.ui'
#
# Created by: PyQt5 UI code generator 5.15.4
#
Expand Down Expand Up @@ -2385,69 +2385,69 @@ def setupUi(self, MainWindow):
self.gridLayout_11 = QtWidgets.QGridLayout(self.chainstatus_frame)
self.gridLayout_11.setContentsMargins(-1, 6, -1, 6)
self.gridLayout_11.setObjectName("gridLayout_11")
self.currentblock_label = QtWidgets.QLabel(self.chainstatus_frame)
self.currentblock_label.setObjectName("currentblock_label")
self.gridLayout_11.addWidget(self.currentblock_label, 6, 0, 1, 1)
self.difficulty_label = QtWidgets.QLabel(self.chainstatus_frame)
self.difficulty_label.setObjectName("difficulty_label")
self.gridLayout_11.addWidget(self.difficulty_label, 5, 0, 1, 1)
self.currentblock_value_label = QtWidgets.QLabel(self.chainstatus_frame)
self.currentblock_value_label.setFrameShape(QtWidgets.QFrame.NoFrame)
self.currentblock_value_label.setFrameShadow(QtWidgets.QFrame.Plain)
self.currentblock_value_label.setText("")
self.currentblock_value_label.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
self.currentblock_value_label.setObjectName("currentblock_value_label")
self.gridLayout_11.addWidget(self.currentblock_value_label, 6, 1, 1, 2)
self.longestchain_label = QtWidgets.QLabel(self.chainstatus_frame)
self.longestchain_label.setObjectName("longestchain_label")
self.gridLayout_11.addWidget(self.longestchain_label, 7, 0, 1, 1)
self.connections_label = QtWidgets.QLabel(self.chainstatus_frame)
self.connections_label.setObjectName("connections_label")
self.gridLayout_11.addWidget(self.connections_label, 8, 0, 1, 1)
self.chainstatus_label_value = QtWidgets.QLabel(self.chainstatus_frame)
self.chainstatus_label_value.setText("")
self.chainstatus_label_value.setAlignment(QtCore.Qt.AlignCenter)
self.chainstatus_label_value.setObjectName("chainstatus_label_value")
self.gridLayout_11.addWidget(self.chainstatus_label_value, 0, 1, 1, 2)
self.chainstatus_label = QtWidgets.QLabel(self.chainstatus_frame)
self.chainstatus_label.setObjectName("chainstatus_label")
self.gridLayout_11.addWidget(self.chainstatus_label, 0, 0, 1, 1)
self.connections_value_label = QtWidgets.QLabel(self.chainstatus_frame)
self.connections_value_label.setFrameShape(QtWidgets.QFrame.NoFrame)
self.connections_value_label.setFrameShadow(QtWidgets.QFrame.Sunken)
self.connections_value_label.setText("")
self.connections_value_label.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
self.connections_value_label.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
self.connections_value_label.setObjectName("connections_value_label")
self.gridLayout_11.addWidget(self.connections_value_label, 8, 1, 1, 1)
self.connections_warning_label = QtWidgets.QLabel(self.chainstatus_frame)
self.connections_warning_label.setText("")
self.connections_warning_label.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
self.connections_warning_label.setObjectName("connections_warning_label")
self.gridLayout_11.addWidget(self.connections_warning_label, 8, 2, 1, 1)
self.longestchain_value_label = QtWidgets.QLabel(self.chainstatus_frame)
self.longestchain_value_label.setFrameShape(QtWidgets.QFrame.NoFrame)
self.longestchain_value_label.setFrameShadow(QtWidgets.QFrame.Sunken)
self.longestchain_value_label.setText("")
self.longestchain_value_label.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
self.longestchain_value_label.setObjectName("longestchain_value_label")
self.gridLayout_11.addWidget(self.longestchain_value_label, 7, 1, 1, 2)
self.currentblock_value_label = QtWidgets.QLabel(self.chainstatus_frame)
self.currentblock_value_label.setFrameShape(QtWidgets.QFrame.NoFrame)
self.currentblock_value_label.setFrameShadow(QtWidgets.QFrame.Plain)
self.currentblock_value_label.setText("")
self.currentblock_value_label.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
self.currentblock_value_label.setObjectName("currentblock_value_label")
self.gridLayout_11.addWidget(self.currentblock_value_label, 6, 1, 1, 2)
self.difficulty_value_label = QtWidgets.QLabel(self.chainstatus_frame)
self.difficulty_value_label.setMinimumSize(QtCore.QSize(0, 0))
self.difficulty_value_label.setFrameShape(QtWidgets.QFrame.NoFrame)
self.difficulty_value_label.setFrameShadow(QtWidgets.QFrame.Plain)
self.difficulty_value_label.setText("")
self.difficulty_value_label.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
self.difficulty_value_label.setObjectName("difficulty_value_label")
self.gridLayout_11.addWidget(self.difficulty_value_label, 5, 1, 1, 2)
self.chainstatus_label_value = QtWidgets.QLabel(self.chainstatus_frame)
self.chainstatus_label_value.setText("")
self.chainstatus_label_value.setAlignment(QtCore.Qt.AlignCenter)
self.chainstatus_label_value.setObjectName("chainstatus_label_value")
self.gridLayout_11.addWidget(self.chainstatus_label_value, 0, 1, 1, 2)
self.chainsync_label = QtWidgets.QLabel(self.chainstatus_frame)
self.chainsync_label.setObjectName("chainsync_label")
self.gridLayout_11.addWidget(self.chainsync_label, 1, 0, 4, 1)
self.currentblock_label = QtWidgets.QLabel(self.chainstatus_frame)
self.currentblock_label.setObjectName("currentblock_label")
self.gridLayout_11.addWidget(self.currentblock_label, 6, 0, 1, 1)
self.chainsync_label_value = QtWidgets.QLabel(self.chainstatus_frame)
self.chainsync_label_value.setText("")
self.chainsync_label_value.setAlignment(QtCore.Qt.AlignCenter)
self.chainsync_label_value.setObjectName("chainsync_label_value")
self.gridLayout_11.addWidget(self.chainsync_label_value, 1, 1, 4, 2)
self.connections_warning_label = QtWidgets.QLabel(self.chainstatus_frame)
self.connections_warning_label.setText("")
self.connections_warning_label.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
self.connections_warning_label.setObjectName("connections_warning_label")
self.gridLayout_11.addWidget(self.connections_warning_label, 8, 2, 1, 1)
self.connections_value_label = QtWidgets.QLabel(self.chainstatus_frame)
self.connections_value_label.setFrameShape(QtWidgets.QFrame.NoFrame)
self.connections_value_label.setFrameShadow(QtWidgets.QFrame.Sunken)
self.connections_value_label.setText("")
self.connections_value_label.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
self.connections_value_label.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
self.connections_value_label.setObjectName("connections_value_label")
self.gridLayout_11.addWidget(self.connections_value_label, 8, 1, 1, 1)
self.difficulty_label = QtWidgets.QLabel(self.chainstatus_frame)
self.difficulty_label.setObjectName("difficulty_label")
self.gridLayout_11.addWidget(self.difficulty_label, 9, 0, 1, 1)
self.difficulty_value_label = QtWidgets.QLabel(self.chainstatus_frame)
self.difficulty_value_label.setMinimumSize(QtCore.QSize(0, 0))
self.difficulty_value_label.setFrameShape(QtWidgets.QFrame.NoFrame)
self.difficulty_value_label.setFrameShadow(QtWidgets.QFrame.Plain)
self.difficulty_value_label.setText("")
self.difficulty_value_label.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
self.difficulty_value_label.setObjectName("difficulty_value_label")
self.gridLayout_11.addWidget(self.difficulty_value_label, 9, 1, 1, 2)
self.chainsummary_Layout.addWidget(self.chainstatus_frame, 2, 0, 1, 1)
self.address_pubkey_frame = QtWidgets.QFrame(self.side_panel_frame)
self.address_pubkey_frame.setMaximumSize(QtCore.QSize(16777215, 16777215))
Expand Down Expand Up @@ -3113,12 +3113,12 @@ def retranslateUi(self, MainWindow):
self.cpu_core_lineEdit.setText(_translate("MainWindow", "1"))
self.cpu_core_set_button.setText(_translate("MainWindow", "Set"))
self.miningstatus_label.setText(_translate("MainWindow", "Mining Status"))
self.currentblock_label.setText(_translate("MainWindow", "Current Block"))
self.difficulty_label.setText(_translate("MainWindow", "Difficulty"))
self.longestchain_label.setText(_translate("MainWindow", "Longest Chain"))
self.connections_label.setText(_translate("MainWindow", "Connections"))
self.chainstatus_label.setText(_translate("MainWindow", "Chain Status"))
self.chainsync_label.setText(_translate("MainWindow", "Chain Sync"))
self.currentblock_label.setText(_translate("MainWindow", "Current Block"))
self.difficulty_label.setText(_translate("MainWindow", "Difficulty"))
self.getinfo_refresh_button.setText(_translate("MainWindow", "Refresh"))
self.last_update_label.setText(_translate("MainWindow", "Last Update: 00:00:00"))
self.support_pushButton.setText(_translate("MainWindow", "Support"))
Expand Down

0 comments on commit 8b375ae

Please sign in to comment.