Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
beem
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hive
beem
Commits
4620997b
Commit
4620997b
authored
4 years ago
by
Holger
Browse files
Options
Downloads
Patches
Plain Diff
fix typo
parent
c1f529fa
No related branches found
No related tags found
2 merge requests
!5
Taken current version of master branch in the https://github.com/holgern/beem
,
!4
Original changes pushed to master at https://github.com/holgern/beem
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
beem/blurt.py
+2
-2
2 additions, 2 deletions
beem/blurt.py
beem/hive.py
+2
-2
2 additions, 2 deletions
beem/hive.py
with
4 additions
and
4 deletions
beem/blurt.py
+
2
−
2
View file @
4620997b
...
...
@@ -216,7 +216,7 @@ class Blurt(BlockChainInstance):
"""
# calculate our account voting shares (from vests)
vesting_shares
=
int
(
self
.
s
p_to_vests
(
blurt_power
,
use_stored_data
=
use_stored_data
))
vesting_shares
=
int
(
self
.
b
p_to_vests
(
blurt_power
,
use_stored_data
=
use_stored_data
))
return
self
.
vests_to_rshares
(
vesting_shares
,
post_rshares
=
post_rshares
,
voting_power
=
voting_power
,
vote_pct
=
vote_pct
,
use_stored_data
=
use_stored_data
)
def
vests_to_rshares
(
self
,
vests
,
post_rshares
=
0
,
voting_power
=
STEEM_100_PERCENT
,
vote_pct
=
STEEM_100_PERCENT
,
subtract_dust_threshold
=
True
,
use_stored_data
=
True
):
...
...
@@ -258,7 +258,7 @@ class Blurt(BlockChainInstance):
if
blurt_power
is
not
None
and
vests
is
not
None
:
raise
ValueError
(
"
Either blurt_power or vests has to be set. Not both!
"
)
if
blurt_power
is
not
None
:
vests
=
int
(
self
.
s
p_to_vests
(
blurt_power
,
use_stored_data
=
use_stored_data
)
*
1e6
)
vests
=
int
(
self
.
b
p_to_vests
(
blurt_power
,
use_stored_data
=
use_stored_data
)
*
1e6
)
if
self
.
hardfork
>=
20
:
rshares
+=
math
.
copysign
(
self
.
get_dust_threshold
(
use_stored_data
=
use_stored_data
),
rshares
)
...
...
This diff is collapsed.
Click to expand it.
beem/hive.py
+
2
−
2
View file @
4620997b
...
...
@@ -187,11 +187,11 @@ class Hive(BlockChainInstance):
global_properties
=
self
.
get_dynamic_global_properties
(
use_stored_data
=
use_stored_data
)
if
self
.
get_replace_hive_by_steem
():
return
(
float
(
Amount
(
global_properties
[
'
total_vesting_fund_
hive
'
],
blockchain_instance
=
self
))
/
float
(
Amount
(
global_properties
[
'
total_vesting_fund_
steem
'
],
blockchain_instance
=
self
))
/
(
float
(
Amount
(
global_properties
[
'
total_vesting_shares
'
],
blockchain_instance
=
self
))
/
1e6
)
)
return
(
float
(
Amount
(
global_properties
[
'
total_vesting_fund_
steem
'
],
blockchain_instance
=
self
))
/
float
(
Amount
(
global_properties
[
'
total_vesting_fund_
hive
'
],
blockchain_instance
=
self
))
/
(
float
(
Amount
(
global_properties
[
'
total_vesting_shares
'
],
blockchain_instance
=
self
))
/
1e6
)
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment