Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix gratuitous console error messages #98

Merged
merged 4 commits into from
Jul 2, 2024
Merged

Fix gratuitous console error messages #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
312a74e
Bug fixes
seriouscatsoserious Jul 1, 2024
09836c6
Bug fixes
seriouscatsoserious Jul 1, 2024
e154ac4
Hide BMM button
seriouscatsoserious Jul 2, 2024
b1881b4
Merge branch 'LayerTwo-Labs:main' into srs-branch
seriouscatsoserious Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion autoloads/appstate.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const VERSION_CONFIG : String = "res://version.cfg"

const DRIVENET_NODE : String = "172.105.148.135"

@onready var chain_state : Resource = preload("res://models/chain_state.tscn")
@onready var chain_state : Resource = load("res://models/chain_state.tscn")
@onready var chain_provider_info : Resource = preload("res://ui/components/dashboard/chain_providers_info/chain_provider_info.tscn")
#@onready var z_params_modal : Resource = preload("res://ui/components/dashboard/z_params_modal/z_params_modal.tscn")

Expand Down
6 changes: 3 additions & 3 deletions project.godot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ config/windows_native_icon="res://icon.ico"

Appstate="*res://autoloads/appstate.tscn"
Net="*res://net.gd"
DashboardPanel="*res://ui/components/dashboard/base_dashboard_panel/base_chain_dashboard_panel.gd"
chain_state="*res://models/chain_state.gd"
ResetSidechainWindow="*res://ui/components/dashboard/chain_providers_info/reset_sidechain_window.gd"
DashboardPanel="*res://ui/components/dashboard/base_dashboard_panel/base_chain_dashboard_panel.tscn"
chain_state="*res://models/chain_state.tscn"
ResetSidechainWindow="*res://ui/components/dashboard/chain_providers_info/reset_sidechain_window.tscn"

[display]

Expand Down
9 changes: 5 additions & 4 deletions ui/components/dashboard/base_dashboard_panel/base_chain_dashboard_panel.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var cooldown_timer : Timer
@onready var progress_bar : Control = $Margin/Footer/ProgressBar
@onready var settings_button : Control = $Margin/Footer/SettingsButton
@onready var delete_node_button : Control = $Margin/Footer/SettingsButton2
@onready var reset_confirm_scene = preload("res://ui/components/settings/reset_confirm_scene.tscn")
@onready var reset_confirm_scene = load("res://ui/components/settings/reset_confirm_scene.tscn")
var available : bool = true

var enabled_modulate : Color
Expand Down Expand Up @@ -82,8 +82,6 @@ func setup(_chain_provider: ChainProvider, _chain_state: ChainState):


func update_view():
block_height.visible = chain_state.state == ChainState.c_state.RUNNING
block_height.text = 'Block height: %d' % chain_state.height

if chain_state == null:
show_unsupported_state()
Expand All @@ -103,6 +101,9 @@ func update_view():
show_waiting_on_drivechain_state()
else:
show_running_state()

block_height.visible = chain_state.state == ChainState.c_state.RUNNING
block_height.text = 'Block height: %d' % chain_state.height

func show_waiting_on_drivechain_state():
action_button.disabled = true
Expand All @@ -122,7 +123,7 @@ func show_running_state():
action_button.theme = load("res://ui/components/dashboard/base_dashboard_panel/drivechain_btn_running.tres")
get_parent().get_parent().get_node("Label").hide()
else:
refresh_bmm_button.visible = true
#refresh_bmm_button.visible = true
refresh_bmm_button.set_pressed_no_signal(chain_state.refreshbmm)

# Stop any cooldown timer that might be running since the state is now running
Expand Down
2 changes: 1 addition & 1 deletion ui/components/dashboard/chain_providers_info/chain_provider_info.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ extends ColorRect
@onready var remote_hash = $Center/Panel/Margin/VBox/RemoteHash/Hash
@onready var directory = $Center/Panel/Margin/VBox/SidechainDirectory/Value
@onready var local_hash = $Center/Panel/Margin/VBox/LocalHash/Hash
@onready var reset_sidechain_window_scene = preload("res://ui/components/dashboard/chain_providers_info/reset_sidechain_window.tscn")
@onready var reset_sidechain_window_scene = load("res://ui/components/dashboard/chain_providers_info/reset_sidechain_window.tscn")
var chain_provider: ChainProvider

func setup(_chain_provider: ChainProvider):
Expand Down
Loading
Loading