Skip to content

Commit 6091b95

Browse files
authored
Update: tzkt v1.16 (#45)
* Removed frozen... fields from Delegate account; Added operations test * Updated cycle fields * Removed rolls from ballot * Removed rolls from proposal op. * Baking op. fields updated * Updated double baking and double endorsing operations * Updated DoublePreendorsing * Updated EndorsingReward and NonceRevelation * Added staking operation * Updated VdfRevelation * Updated Block and Statistics * Updated ProtocolConstants * Comments typos fix * TzKT v1.16.0: updated attestation op * TzKT v1.16.0: renamed preendorsement to preattestation * TzKT v1.16.0: renamed EndorsingReward to AttestationReward * TzKT v1.16.0: renamed UpdateConsensusKey to UpdateSecondaryKey * TzKT v1.16.0: merged DoubleEndorsing and DoublePreendorsing to DoubleConsensus * TzKT v1.16.0: fixed incorrect test method naming * TzKT v1.16.0: added publicKey filed to reveal * TzKT v1.16.0: updated Delegate * TzKT v1.16.0: added fields to DoubleBaking * TzKT v1.16.0: added fields to DoubleConsensus * TzKT v1.16.0: added fields to NonceRevelation * TzKT v1.16.0: added fields to AttestationReward
1 parent dd6cbbe commit 6091b95

File tree

10 files changed

+280
-221
lines changed

10 files changed

+280
-221
lines changed

tzkt/api/accounts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ func (tzkt *API) AccountCounter(ctx context.Context, address string) (uint64, er
1010
return tzkt.count(ctx, fmt.Sprintf("/v1/accounts/%s/counter", address), nil)
1111
}
1212

13-
// AccountCounter - Returns a number of accounts.
13+
// AccountsCount - Returns a number of accounts.
1414
func (tzkt *API) AccountsCount(ctx context.Context, filters map[string]string) (uint64, error) {
1515
return tzkt.count(ctx, "/v1/accounts/count", filters)
1616
}

tzkt/api/operations.go

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"github.com/pkg/errors"
1010
)
1111

12-
// GetEndorsements -
13-
func (tzkt *API) GetEndorsements(ctx context.Context, filters map[string]string) (operations []data.Endorsement, err error) {
14-
err = tzkt.json(ctx, "/v1/operations/endorsements", filters, false, &operations)
12+
// GetAttestations -
13+
func (tzkt *API) GetAttestations(ctx context.Context, filters map[string]string) (operations []data.Attestation, err error) {
14+
err = tzkt.json(ctx, "/v1/operations/attestations", filters, false, &operations)
1515
return
1616
}
1717

@@ -39,9 +39,9 @@ func (tzkt *API) GetDoubleBakings(ctx context.Context, filters map[string]string
3939
return
4040
}
4141

42-
// GetDoubleEndorsings -
43-
func (tzkt *API) GetDoubleEndorsings(ctx context.Context, filters map[string]string) (operations []data.DoubleEndorsing, err error) {
44-
err = tzkt.json(ctx, "/v1/operations/double_endorsing", filters, false, &operations)
42+
// GetDoubleConsensus -
43+
func (tzkt *API) GetDoubleConsensus(ctx context.Context, filters map[string]string) (operations []data.DoubleConsensus, err error) {
44+
err = tzkt.json(ctx, "/v1/operations/double_consensus", filters, false, &operations)
4545
return
4646
}
4747

@@ -102,9 +102,9 @@ func (tzkt *API) GetTransactionsByHash(ctx context.Context, hash string, filters
102102
return
103103
}
104104

105-
// GetPreendorsement -
106-
func (tzkt *API) GetPreendorsement(ctx context.Context, filters map[string]string) (operations []data.Preendorsement, err error) {
107-
err = tzkt.json(ctx, "/v1/operations/preendorsement", filters, false, &operations)
105+
// GetPreattestation -
106+
func (tzkt *API) GetPreattestation(ctx context.Context, filters map[string]string) (operations []data.Preattestation, err error) {
107+
err = tzkt.json(ctx, "/v1/operations/preattestations", filters, false, &operations)
108108
return
109109
}
110110

@@ -174,9 +174,9 @@ func (tzkt *API) GetBakings(ctx context.Context, filters map[string]string) (ope
174174
return
175175
}
176176

177-
// GetEndorsingRewards -
178-
func (tzkt *API) GetEndorsingRewards(ctx context.Context, filters map[string]string) (operations []data.EndorsingReward, err error) {
179-
err = tzkt.json(ctx, "/v1/operations/endorsing_rewards", filters, false, &operations)
177+
// GetAttestationReward -
178+
func (tzkt *API) GetAttestationReward(ctx context.Context, filters map[string]string) (operations []data.AttestationReward, err error) {
179+
err = tzkt.json(ctx, "/v1/operations/attestation_rewards", filters, false, &operations)
180180
return
181181
}
182182

@@ -186,12 +186,6 @@ func (tzkt *API) GetRevelationPenalties(ctx context.Context, filters map[string]
186186
return
187187
}
188188

189-
// GetDoublePreendorsings -
190-
func (tzkt *API) GetDoublePreendorsings(ctx context.Context, filters map[string]string) (operations []data.DoublePreendorsing, err error) {
191-
err = tzkt.json(ctx, "/v1/operations/double_preendorsing", filters, false, &operations)
192-
return
193-
}
194-
195189
// GetVdfRevelations -
196190
func (tzkt *API) GetVdfRevelations(ctx context.Context, filters map[string]string) (operations []data.VdfRevelation, err error) {
197191
err = tzkt.json(ctx, "/v1/operations/vdf_revelations", filters, false, &operations)
@@ -204,9 +198,9 @@ func (tzkt *API) GetIncreasePaidStorage(ctx context.Context, filters map[string]
204198
return
205199
}
206200

207-
// GetUpdateConsensusKey -
208-
func (tzkt *API) GetUpdateConsensusKey(ctx context.Context, filters map[string]string) (operations []data.UpdateConsensusKey, err error) {
209-
err = tzkt.json(ctx, "/v1/operations/update_consensus_key", filters, false, &operations)
201+
// GetUpdateSecondaryKey -
202+
func (tzkt *API) GetUpdateSecondaryKey(ctx context.Context, filters map[string]string) (operations []data.UpdateSecondaryKey, err error) {
203+
err = tzkt.json(ctx, "/v1/operations/update_secondary_key", filters, false, &operations)
210204
return
211205
}
212206

@@ -263,3 +257,9 @@ func (tzkt *API) GetDalPublishCommitment(ctx context.Context, filters map[string
263257
err = tzkt.json(ctx, "/v1/operations/dal_publish_commitment", filters, false, &operations)
264258
return
265259
}
260+
261+
// GetStaking -
262+
func (tzkt *API) GetStaking(ctx context.Context, filters map[string]string) (operations []data.Staking, err error) {
263+
err = tzkt.json(ctx, "/v1/operations/staking", filters, false, &operations)
264+
return
265+
}

tzkt/api/operations_test.go

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
package api
2+
3+
import (
4+
"testing"
5+
6+
"github.com/stretchr/testify/assert"
7+
"github.com/stretchr/testify/require"
8+
)
9+
10+
func TestGetBakings(t *testing.T) {
11+
api := New("https://staging.api.tzkt.io")
12+
13+
bakings, err := api.GetBakings(t.Context(), map[string]string{
14+
"level": "9935996",
15+
})
16+
17+
require.NoError(t, err)
18+
assert.Len(t, bakings, 1)
19+
assert.NotEmpty(t, bakings[0].Level)
20+
}
21+
22+
func TestGetStaking(t *testing.T) {
23+
api := New("https://staging.api.tzkt.io")
24+
25+
stakings, err := api.GetStaking(t.Context(), map[string]string{
26+
"hash": "opEK5fRFrjzyGcXS8Euh9EsxRAATKsEV94m2mejsgWHMHbxTAPo",
27+
})
28+
29+
require.NoError(t, err)
30+
assert.Len(t, stakings, 1)
31+
assert.Equal(t, uint64(9967034), stakings[0].Level)
32+
}
33+
34+
func TestGetDoubleConsensus(t *testing.T) {
35+
api := New("https://staging.api.tzkt.io")
36+
37+
doubleConsensus, err := api.GetDoubleConsensus(t.Context(), map[string]string{
38+
"level": "554813",
39+
})
40+
41+
require.NoError(t, err)
42+
assert.Len(t, doubleConsensus, 1)
43+
assert.Equal(t, "ooaLQnmRTDFf2JZa5skBcYVKUTUxrE6gtuejs31YFeRKXpxRawR", doubleConsensus[0].Hash)
44+
}

tzkt/data/account.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,18 @@ type Delegate struct {
99
Address string `json:"address"`
1010
PublicKey string `json:"publicKey"`
1111
Balance int64 `json:"balance"`
12-
FrozenDeposits int64 `json:"frozenDeposits"`
13-
FrozenRewards int64 `json:"frozenRewards"`
14-
FrozenFees int64 `json:"frozenFees"`
1512
Counter int64 `json:"counter"`
1613
ActivationLevel int64 `json:"activationLevel"`
1714
StakingBalance int64 `json:"stakingBalance"`
1815
NumContracts int64 `json:"numContracts"`
1916
NumDelegators int64 `json:"numDelegators"`
2017
NumBlocks int64 `json:"numBlocks"`
21-
NumEndorsements int64 `json:"numEndorsements"`
18+
NumAttestations int64 `json:"numAttestations"`
2219
NumBallots int64 `json:"numBallots"`
2320
NumProposals int64 `json:"numProposals"`
2421
NumActivations int64 `json:"numActivations"`
2522
NumDoubleBaking int64 `json:"numDoubleBaking"`
26-
NumDoubleEndorsing int64 `json:"numDoubleEndorsing"`
23+
NumDoubleConsensus int64 `json:"numDoubleConsensus"`
2724
NumNonceRevelations int64 `json:"numNonceRevelations"`
2825
NumRevelationPenalties int64 `json:"numRevelationPenalties"`
2926
NumDelegations int64 `json:"numDelegations"`

tzkt/data/blocks.go

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,26 @@ import (
88

99
// Block -
1010
type Block struct {
11-
Cycle int64 `json:"cycle"`
12-
Level uint64 `json:"level"`
13-
Hash string `json:"hash"`
14-
Timestamp time.Time `json:"timestamp"`
15-
Proto int64 `json:"proto"`
16-
Priority int64 `json:"priority"`
17-
Validations int64 `json:"validations"`
18-
BlockRound uint64 `json:"blockRound"`
19-
PayloadRound uint64 `josn:"payloadRound"`
20-
Deposit int64 `json:"deposit"`
21-
Reward int64 `json:"reward"`
22-
Fees int64 `json:"fees"`
23-
Bonus int64 `json:"bonus"`
24-
LbEscapeEma int64 `json:"lbEscapeEma"`
25-
NonceRevealed bool `json:"nonceRevealed"`
26-
LbEscapeVote bool `json:"lbEscapeVote"`
27-
LbToggleEma uint64 `json:"lbToggleEma"`
28-
Baker Address `json:"baker"`
11+
Cycle int64 `json:"cycle"`
12+
Level uint64 `json:"level"`
13+
Hash string `json:"hash"`
14+
Timestamp time.Time `json:"timestamp"`
15+
Proto int64 `json:"proto"`
16+
Validations int64 `json:"validations"`
17+
BlockRound uint64 `json:"blockRound"`
18+
PayloadRound uint64 `json:"payloadRound"`
19+
Deposit int64 `json:"deposit"`
20+
RewardDelegated int64 `json:"rewardDelegated"`
21+
RewardStakedOwn int64 `json:"rewardStakedOwn"`
22+
RewardStakedEdge int64 `json:"rewardStakedEdge"`
23+
RewardStakedShared int64 `json:"rewardStakedShared"`
24+
BonusDelegated int64 `json:"bonusDelegated"`
25+
BonusStakedOwn int64 `json:"bonusStakedOwn"`
26+
BonusStakedEdge int64 `json:"bonusStakedEdge"`
27+
BonusStakedShared int64 `json:"bonusStakedShared"`
28+
Fees int64 `json:"fees"`
29+
NonceRevealed bool `json:"nonceRevealed"`
30+
LbToggleEma uint64 `json:"lbToggleEma"`
2931
}
3032

3133
// Head -

tzkt/data/consts.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ package data
44
const (
55
KindTransaction = "transaction"
66
KindOrigination = "origination"
7-
KindEndorsement = "endorsement"
8-
KindPreendorsement = "preendorsement"
7+
KindAttestation = "attestation"
8+
KindPreattestations = "preattestations"
99
KindBallot = "ballot"
1010
KindProposal = "proposal"
1111
KindDoubleBaking = "double_baking"
12-
KindDoubleEndorsing = "double_endorsing"
13-
KindDoublePreendorsing = "double_preendorsing"
12+
KindDoubleConsensus = "double_consensus"
1413
KindActivation = "activation"
1514
KindMigration = "migration"
1615
KindNonceRevelation = "nonce_revelation"
@@ -29,10 +28,10 @@ const (
2928
KindSetDepositsLimit = "set_deposits_limit"
3029
KindRevelationPenalty = "revelation_penalty"
3130
KindBaking = "baking"
32-
KindEndorsingReward = "endorsing_reward"
31+
KindAttestationReward = "attestation_reward "
3332
KindVdfRevelation = "vdf_revelation"
3433
KindIncreasePaidStorage = "increase_paid_storage"
35-
KindUpdateConsensusKey = "update_consensus_key"
34+
KindUpdateSecondaryKey = "update_secondary_key"
3635
KindDrainDelegate = "drain_delegate"
3736
KindSrAddMessages = "sr_add_messages"
3837
KindSrCement = "sr_cement"
@@ -42,6 +41,7 @@ const (
4241
KindSrRecoverBond = "sr_recover_bond"
4342
KindSrRefute = "sr_refute"
4443
KindDalPublishCommitment = "dal_publish_commitment"
44+
KindStaking = "staking"
4545
)
4646

4747
// urls

tzkt/data/cylce.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ import "time"
44

55
// Cycle -
66
type Cycle struct {
7-
Index uint64 `json:"index"`
8-
FirstLevel uint64 `json:"firstLevel"`
9-
StartTime time.Time `json:"startTime"`
10-
LastLevel uint64 `json:"lastLevel"`
11-
EndTime time.Time `json:"endTime"`
12-
SnapshotIndex uint64 `json:"snapshotIndex"`
13-
SnapshotLevel uint64 `json:"snapshotLevel"`
14-
RandomSeed string `json:"randomSeed,omitempty"`
15-
TotalBakers uint64 `json:"totalBakers"`
16-
TotalStaking uint64 `json:"totalStaking"`
17-
TotalDelegators uint64 `json:"totalDelegators"`
18-
TotalDelegated uint64 `json:"totalDelegated"`
19-
SelectedBakers uint64 `json:"selectedBakers"`
20-
SelectedStake uint64 `json:"selectedStake"`
21-
Quote *Quote `json:"quote,omitempty"`
22-
TotalRolls uint64 `json:"totalRolls"`
7+
Index uint64 `json:"index"`
8+
FirstLevel uint64 `json:"firstLevel"`
9+
StartTime time.Time `json:"startTime"`
10+
LastLevel uint64 `json:"lastLevel"`
11+
EndTime time.Time `json:"endTime"`
12+
SnapshotLevel uint64 `json:"snapshotLevel"`
13+
RandomSeed string `json:"randomSeed,omitempty"`
14+
TotalBakers uint64 `json:"totalBakers"`
15+
TotalBakingPower uint64 `json:"totalBakingPower,omitempty"`
16+
BlockReward uint64 `json:"blockReward,omitempty"`
17+
BlockBonusPerSlot uint64 `json:"blockBonusPerSlot,omitempty"`
18+
AttestationRewardPerSlot uint64 `json:"attestationRewardPerSlot,omitempty"`
19+
NonceRevelationReward uint64 `json:"nonceRevelationReward,omitempty"`
20+
VdfRevelationReward uint64 `json:"vdfRevelationReward,omitempty"`
21+
DalAttestationRewardPerShard uint64 `json:"dalAttestationRewardPerShard,omitempty"`
22+
Quote *Quote `json:"quote,omitempty"`
2323
}

tzkt/data/general.go

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -78,46 +78,48 @@ type Protocol struct {
7878

7979
// ProtocolConstants -
8080
type ProtocolConstants struct {
81-
RampUpCycles int64 `json:"rampUpCycles"`
82-
NoRewardCycles int64 `json:"noRewardCycles"`
83-
PreservedCycles int64 `json:"preservedCycles"`
84-
BlocksPerCycle int64 `json:"blocksPerCycle"`
85-
BlocksPerCommitment int64 `json:"blocksPerCommitment"`
86-
BlocksPerSnapshot int64 `json:"blocksPerSnapshot"`
87-
BlocksPerVoting int64 `json:"blocksPerVoting"`
88-
TimeBetweenBlocks int64 `json:"timeBetweenBlocks"`
89-
EndorsersPerBlock int64 `json:"endorsersPerBlock"`
90-
HardOperationGasLimit int64 `json:"hardOperationGasLimit"`
91-
HardOperationStorageLimit int64 `json:"hardOperationStorageLimit"`
92-
HardBlockGasLimit int64 `json:"hardBlockGasLimit"`
93-
TokensPerRoll int64 `json:"tokensPerRoll"`
94-
RevelationReward int64 `json:"revelationReward"`
95-
BlockDeposit int64 `json:"blockDeposit"`
96-
BlockReward []int64 `json:"blockReward"`
97-
EndorsementDeposit int64 `json:"endorsementDeposit"`
98-
EndorsementReward []int64 `json:"endorsementReward"`
99-
OriginationSize int64 `json:"originationSize"`
100-
ByteCost int64 `json:"byteCost"`
101-
ProposalQuorum int64 `json:"proposalQuorum"`
102-
BallotQuorumMin int64 `json:"ballotQuorumMin"`
103-
BallotQuorumMax int64 `json:"ballotQuorumMax"`
104-
LbSubsidy int64 `json:"lbSubsidy"`
105-
LbSunsetLevel int64 `json:"lbSunsetLevel"`
106-
LbToggleThreshold int64 `json:"lbToggleThreshold"`
107-
ConsensusThreshold int64 `json:"consensusThreshold"`
108-
MinParticipationNumerator int64 `json:"minParticipationNumerator"`
109-
MinParticipationDenominator int64 `json:"minParticipationDenominator"`
110-
MaxSlashingPeriod int64 `json:"maxSlashingPeriod"`
111-
FrozenDepositsPercentage int64 `json:"frozenDepositsPercentage"`
112-
DoubleBakingPunishment int64 `json:"doubleBakingPunishment"`
113-
DoubleEndorsingPunishmentNumerator int64 `json:"doubleEndorsingPunishmentNumerator"`
114-
DoubleEndorsingPunishmentDenominator int64 `json:"doubleEndorsingPunishmentDenominator"`
115-
TxRollupOriginationSize int64 `json:"txRollupOriginationSize"`
116-
TxRollupCommitmentBond int64 `json:"txRollupCommitmentBond"`
117-
LbEscapeThreshold int64 `json:"lbEscapeThreshold"`
81+
RampUpCycles int64 `json:"rampUpCycles"`
82+
NoRewardCycles int64 `json:"noRewardCycles"`
83+
ConsensusRightsDelay int64 `json:"consensusRightsDelay"`
84+
DelegateParametersActivationDelay int64 `json:"delegateParametersActivationDelay"`
85+
BlocksPerCycle int64 `json:"blocksPerCycle"`
86+
BlocksPerCommitment int64 `json:"blocksPerCommitment"`
87+
BlocksPerSnapshot int64 `json:"blocksPerSnapshot"`
88+
BlocksPerVoting int64 `json:"blocksPerVoting"`
89+
TimeBetweenBlocks int64 `json:"timeBetweenBlocks"`
90+
AttestersPerBlock int64 `json:"attestersPerBlock"`
91+
HardOperationGasLimit int64 `json:"hardOperationGasLimit"`
92+
HardOperationStorageLimit int64 `json:"hardOperationStorageLimit"`
93+
HardBlockGasLimit int64 `json:"hardBlockGasLimit"`
94+
MinimalStake int64 `json:"minimalStake"`
95+
MinimalFrozenStake int64 `json:"minimalFrozenStake"`
96+
BlockDeposit int64 `json:"blockDeposit"`
97+
BlockReward []int64 `json:"blockReward"`
98+
AttestationDeposit int64 `json:"attestationDeposit"`
99+
AttestationReward []int64 `json:"attestationReward"`
100+
OriginationSize int64 `json:"originationSize"`
101+
ByteCost int64 `json:"byteCost"`
102+
ProposalQuorum int64 `json:"proposalQuorum"`
103+
BallotQuorumMin int64 `json:"ballotQuorumMin"`
104+
BallotQuorumMax int64 `json:"ballotQuorumMax"`
105+
LbToggleThreshold int64 `json:"lbToggleThreshold"`
106+
ConsensusThreshold int64 `json:"consensusThreshold"`
107+
MinParticipationNumerator int64 `json:"minParticipationNumerator"`
108+
MinParticipationDenominator int64 `json:"minParticipationDenominator"`
109+
DenunciationPeriod int64 `json:"denunciationPeriod"`
110+
SlashingDelay int64 `json:"slashingDelay"`
111+
MaxDelegatedOverFrozenRatio int64 `json:"maxDelegatedOverFrozenRatio"`
112+
MaxExternalOverOwnStakeRatio int64 `json:"maxExternalOverOwnStakeRatio"`
113+
SmartRollupOriginationSize int64 `json:"smartRollupOriginationSize"`
114+
SmartRollupStakeAmount int64 `json:"smartRollupStakeAmount"`
115+
SmartRollupChallengeWindow int64 `json:"smartRollupChallengeWindow"`
116+
SmartRollupCommitmentPeriod int64 `json:"smartRollupCommitmentPeriod"`
117+
SmartRollupTimeoutPeriod int64 `json:"smartRollupTimeoutPeriod"`
118+
DalNumberOfShards int64 `json:"dalNumberOfShards"`
119+
Dictator string `json:"dictator"`
118120
}
119121

120-
// ProtocolConstants -
122+
// ProtocolMetadata -
121123
type ProtocolMetadata struct {
122124
Docs string `json:"docs"`
123125
Alias string `json:"alias"`
@@ -137,6 +139,5 @@ type Statistics struct {
137139
TotalBanished uint64 `json:"totalBanished"`
138140
TotalFrozen uint64 `json:"totalFrozen"`
139141
TotalRollupBonds uint64 `json:"totalRollupBonds"`
140-
TotalVested uint64 `json:"totalVested"`
141142
Quote *Quote `json:"quote,omitempty"`
142143
}

0 commit comments

Comments
 (0)