Skip to content

Commit 9c87311

Browse files
vanja-vechainvanja-vechain
authored
Vanja/feat/602 thorflux updates (#1096)
* add validator totals * fix after merge * Add debug log * Add debug log * Remove debug log * Add to thorclient
1 parent 84383a4 commit 9c87311

13 files changed

Lines changed: 133 additions & 4 deletions

File tree

‎abi/abi_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ func TestStakerABI(t *testing.T) {
113113
{"withdrawDelegation", false},
114114
{"getRewards", true},
115115
{"getCompletedPeriods", true},
116+
{"getValidatorTotals", true},
116117
}
117118

118119
assert.Equal(t, len(testCases), len(abi.Methods()))

‎builtin/energy/energy.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ func (e *Energy) TotalBurned() (*big.Int, error) {
125125
if err != nil {
126126
return nil, err
127127
}
128-
return new(big.Int).Sub(total.TotalSub, total.TotalAdd), nil
128+
burned := new(big.Int).Sub(total.TotalSub, total.TotalAdd)
129+
return burned, nil
129130
}
130131

131132
// Get returns energy of an account at given block time.

‎builtin/gen/compiled/Staker.abi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"validationID","type":"bytes32"},{"indexed":true,"internalType":"bytes32","name":"delegationID","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"stake","type":"uint256"},{"indexed":false,"internalType":"bool","name":"autoRenew","type":"bool"},{"indexed":false,"internalType":"uint8","name":"multiplier","type":"uint8"}],"name":"DelegationAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"delegationID","type":"bytes32"},{"indexed":false,"internalType":"bool","name":"autoRenew","type":"bool"}],"name":"DelegationUpdatedAutoRenew","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"delegationID","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"stake","type":"uint256"}],"name":"DelegationWithdrawn","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"bytes32","name":"validationID","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"removed","type":"uint256"}],"name":"StakeDecreased","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"bytes32","name":"validationID","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"added","type":"uint256"}],"name":"StakeIncreased","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"address","name":"master","type":"address"},{"indexed":true,"internalType":"bytes32","name":"validationID","type":"bytes32"},{"indexed":false,"internalType":"uint32","name":"period","type":"uint32"},{"indexed":false,"internalType":"uint256","name":"stake","type":"uint256"},{"indexed":false,"internalType":"bool","name":"autoRenew","type":"bool"}],"name":"ValidatorQueued","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"bytes32","name":"validationID","type":"bytes32"},{"indexed":false,"internalType":"bool","name":"autoRenew","type":"bool"}],"name":"ValidatorUpdatedAutoRenew","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"bytes32","name":"validationID","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"stake","type":"uint256"}],"name":"ValidatorWithdrawn","type":"event"},{"stateMutability":"nonpayable","type":"fallback"},{"inputs":[{"internalType":"bytes32","name":"validationID","type":"bytes32"},{"internalType":"bool","name":"autoRenew","type":"bool"},{"internalType":"uint8","name":"multiplier","type":"uint8"}],"name":"addDelegation","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"master","type":"address"},{"internalType":"uint32","name":"period","type":"uint32"},{"internalType":"bool","name":"autoRenew","type":"bool"}],"name":"addValidator","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"decreaseStake","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"firstActive","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"firstQueued","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"name":"get","outputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"address","name":"","type":"address"},{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint8","name":"","type":"uint8"},{"internalType":"bool","name":"","type":"bool"},{"internalType":"bool","name":"","type":"bool"},{"internalType":"uint32","name":"","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"validationID","type":"bytes32"}],"name":"getCompletedPeriods","outputs":[{"internalType":"uint32","name":"","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"delegationID","type":"bytes32"}],"name":"getDelegation","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"},{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint32","name":"","type":"uint32"},{"internalType":"uint32","name":"","type":"uint32"},{"internalType":"uint8","name":"","type":"uint8"},{"internalType":"bool","name":"","type":"bool"},{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"validationID","type":"bytes32"},{"internalType":"uint32","name":"stakingPeriod","type":"uint32"}],"name":"getRewards","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"name":"getWithdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"validationID","type":"bytes32"}],"name":"increaseStake","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"prev","type":"bytes32"}],"name":"next","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"queuedStake","outputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalStake","outputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"bool","name":"autoRenew","type":"bool"}],"name":"updateAutoRenew","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"delegationID","type":"bytes32"},{"internalType":"bool","name":"active","type":"bool"}],"name":"updateDelegationAutoRenew","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"name":"withdraw","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"delegationID","type":"bytes32"}],"name":"withdrawDelegation","outputs":[],"stateMutability":"nonpayable","type":"function"},{"stateMutability":"payable","type":"receive"}]
1+
[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"validationID","type":"bytes32"},{"indexed":true,"internalType":"bytes32","name":"delegationID","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"stake","type":"uint256"},{"indexed":false,"internalType":"bool","name":"autoRenew","type":"bool"},{"indexed":false,"internalType":"uint8","name":"multiplier","type":"uint8"}],"name":"DelegationAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"delegationID","type":"bytes32"},{"indexed":false,"internalType":"bool","name":"autoRenew","type":"bool"}],"name":"DelegationUpdatedAutoRenew","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"delegationID","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"stake","type":"uint256"}],"name":"DelegationWithdrawn","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"bytes32","name":"validationID","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"removed","type":"uint256"}],"name":"StakeDecreased","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"bytes32","name":"validationID","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"added","type":"uint256"}],"name":"StakeIncreased","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"address","name":"master","type":"address"},{"indexed":true,"internalType":"bytes32","name":"validationID","type":"bytes32"},{"indexed":false,"internalType":"uint32","name":"period","type":"uint32"},{"indexed":false,"internalType":"uint256","name":"stake","type":"uint256"},{"indexed":false,"internalType":"bool","name":"autoRenew","type":"bool"}],"name":"ValidatorQueued","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"bytes32","name":"validationID","type":"bytes32"},{"indexed":false,"internalType":"bool","name":"autoRenew","type":"bool"}],"name":"ValidatorUpdatedAutoRenew","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"bytes32","name":"validationID","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"stake","type":"uint256"}],"name":"ValidatorWithdrawn","type":"event"},{"stateMutability":"nonpayable","type":"fallback"},{"inputs":[{"internalType":"bytes32","name":"validationID","type":"bytes32"},{"internalType":"bool","name":"autoRenew","type":"bool"},{"internalType":"uint8","name":"multiplier","type":"uint8"}],"name":"addDelegation","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"master","type":"address"},{"internalType":"uint32","name":"period","type":"uint32"},{"internalType":"bool","name":"autoRenew","type":"bool"}],"name":"addValidator","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"decreaseStake","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"firstActive","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"firstQueued","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"name":"get","outputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"address","name":"","type":"address"},{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint8","name":"","type":"uint8"},{"internalType":"bool","name":"","type":"bool"},{"internalType":"bool","name":"","type":"bool"},{"internalType":"uint32","name":"","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"validationID","type":"bytes32"}],"name":"getCompletedPeriods","outputs":[{"internalType":"uint32","name":"","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"delegationID","type":"bytes32"}],"name":"getDelegation","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"},{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint32","name":"","type":"uint32"},{"internalType":"uint32","name":"","type":"uint32"},{"internalType":"uint8","name":"","type":"uint8"},{"internalType":"bool","name":"","type":"bool"},{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"validationID","type":"bytes32"},{"internalType":"uint32","name":"stakingPeriod","type":"uint32"}],"name":"getRewards","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"validationID","type":"bytes32"}],"name":"getValidatorTotals","outputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"name":"getWithdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"validationID","type":"bytes32"}],"name":"increaseStake","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"prev","type":"bytes32"}],"name":"next","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"queuedStake","outputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalStake","outputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"bool","name":"autoRenew","type":"bool"}],"name":"updateAutoRenew","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"delegationID","type":"bytes32"},{"internalType":"bool","name":"active","type":"bool"}],"name":"updateDelegationAutoRenew","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"name":"withdraw","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"delegationID","type":"bytes32"}],"name":"withdrawDelegation","outputs":[],"stateMutability":"nonpayable","type":"function"},{"stateMutability":"payable","type":"receive"}]

0 commit comments

Comments
 (0)