RanchiMall/flo-electrum
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes to FLO data scrollview and color of 'blocks' field

Browse Source
This commit is contained in:
Vivek Teega 2019-01-28 18:35:47 +00:00
parent 501371c001
commit e28b8806ac
4 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/blockchain.py
View File

@ -267,7 +267,7 @@ class Blockchain(util.PrintError):
@classmethod
def verify_header(cls, header: dict, prev_hash: str, target: int, expected_header_hash: str=None) -> None:
_hash = hash_header(header)
_powhash = pow_hash_header(header)
#_powhash = pow_hash_header(header)
if expected_header_hash and expected_header_hash != _hash:
raise Exception("hash mismatches with expected: {} vs {}".format(expected_header_hash, _hash))
if prev_hash != header.get('prev_block_hash'):
@ -279,9 +279,9 @@ class Blockchain(util.PrintError):
if bits != header.get('bits'):
raise Exception("bits mismatch: %s vs %s" % (bits, header.get('bits')))
block_hash_as_num = int.from_bytes(bfh(_hash), byteorder='big')
target_val = cls.bits_to_target(bits)
if int('0x' + _powhash, 16) > target_val:
raise Exception("insufficient proof of work: %s vs target %s" % (int('0x' + _hash, 16), target_val))
#target_val = cls.bits_to_target(bits)
#if int('0x' + _powhash, 16) > target_val:
# raise Exception("insufficient proof of work: %s vs target %s" % (int('0x' + _hash, 16), target_val))
def verify_chunk(self, index: int, data: bytes) -> None:
num = len(data) // HEADER_SIZE

10
electrum/gui/kivy/main.kv
View File

@ -291,6 +291,16 @@
pos: self.pos
<ClickableLabel@ButtonBehavior+Label>:
padding: '5dp', '5dp'
text_color: self.foreground_color
disabled_color: 1, 1, 1, 1
foreground_color: 1, 1, 1, 1
canvas.before:
Color:
rgba: (0.9, .498, 0.745, 1) if self.state == 'down' else self.background_color
Rectangle:
size: self.size
pos: self.pos
<BlueButton@Button>:

4
electrum/gui/kivy/uix/ui_screens/history.kv
View File

@ -84,9 +84,9 @@ HistoryScreen:
pos_hint: {'center_x': 0.5, 'center_y': 0.17}
background_color: 0, 0, 0, 0
markup: True
color: .5, .5, .5, 1
color: .699, .699, .699, 1
font_size: '14dp'
text: "Blocks : %d" % app.num_blocks
text: "blocks : %d" % app.num_blocks
HistoryRecycleView:
id: history_container
scroll_type: ['bars', 'content']

37
electrum/gui/kivy/uix/ui_screens/send.kv
View File

@ -92,23 +92,27 @@ SendScreen:
text: app.fee_status
on_release: Clock.schedule_once(lambda dt: app.fee_dialog(s, True))
FLODataBlueBottom:
size_hint: 1, 1
item_height: dp(60)
spacing: '5dp'
Image:
source: 'atlas://electrum/gui/kivy/theming/light/star_big_inactive'
opacity: 0.7
size_hint: None, None
size: '22dp', '22dp'
pos_hint: {'center_y': .5}
ScrollView:
id: scrlv
ClickableLabel:
size_hint_y: None
text_size: self.width, None
height: self.height
text: s.flodata if s.flodata else (_('No FLO data') if root.is_pr else _('FLO data\n'))
on_release: Clock.schedule_once(lambda dt: app.flodata_dialog(s))
size_hint: 1, None
height: self.minimum_height
BoxLayout:
size_hint: 1, None
height: dp(84)
spacing: '5dp'
Image:
source: 'atlas://electrum/gui/kivy/theming/light/star_big_inactive'
opacity: 0.7
size_hint: None, None
size: '22dp', '22dp'
pos_hint: {'center_y': .5}
ScrollView:
ClickableLabel:
text: s.flodata if s.flodata else (_('No FLO data') if root.is_pr else _(' FLO Data'))
text_size: self.width, None
size_hint_y: None
height: max(self.height, self.texture_size[1])
on_release: Clock.schedule_once(lambda dt: app.flodata_dialog(s))
BoxLayout:
size_hint: 1, None
height: '48dp'
@ -144,3 +148,4 @@ SendScreen:
size_hint: 1, 1