Skip to content

Commit 5f3fe65

Browse files
committed
Rebase
1 parent bd1ac2e commit 5f3fe65

5 files changed

Lines changed: 30 additions & 40 deletions

File tree

Cargo.lock

Lines changed: 9 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

clients/js/src/generated/types/delegation.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ import {
1010
combineCodec,
1111
getAddressDecoder,
1212
getAddressEncoder,
13-
getF64Decoder,
14-
getF64Encoder,
13+
getArrayDecoder,
14+
getArrayEncoder,
1515
getStructDecoder,
1616
getStructEncoder,
1717
getU64Decoder,
1818
getU64Encoder,
19+
getU8Decoder,
20+
getU8Encoder,
1921
type Address,
2022
type FixedSizeCodec,
2123
type FixedSizeDecoder,
@@ -33,15 +35,15 @@ export type Delegation = {
3335
stake: bigint;
3436
activationEpoch: Epoch;
3537
deactivationEpoch: Epoch;
36-
warmupCooldownRate: number;
38+
reserved: Array<number>;
3739
};
3840

3941
export type DelegationArgs = {
4042
voterPubkey: Address;
4143
stake: number | bigint;
4244
activationEpoch: EpochArgs;
4345
deactivationEpoch: EpochArgs;
44-
warmupCooldownRate: number;
46+
reserved: Array<number>;
4547
};
4648

4749
export function getDelegationEncoder(): FixedSizeEncoder<DelegationArgs> {
@@ -50,7 +52,7 @@ export function getDelegationEncoder(): FixedSizeEncoder<DelegationArgs> {
5052
['stake', getU64Encoder()],
5153
['activationEpoch', getEpochEncoder()],
5254
['deactivationEpoch', getEpochEncoder()],
53-
['warmupCooldownRate', getF64Encoder()],
55+
['reserved', getArrayEncoder(getU8Encoder(), { size: 8 })],
5456
]);
5557
}
5658

@@ -60,7 +62,7 @@ export function getDelegationDecoder(): FixedSizeDecoder<Delegation> {
6062
['stake', getU64Decoder()],
6163
['activationEpoch', getEpochDecoder()],
6264
['deactivationEpoch', getEpochDecoder()],
63-
['warmupCooldownRate', getF64Decoder()],
65+
['reserved', getArrayDecoder(getU8Decoder(), { size: 8 })],
6466
]);
6567
}
6668

clients/rust/src/generated/types/delegation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ pub struct Delegation {
2222
pub stake: u64,
2323
pub activation_epoch: Epoch,
2424
pub deactivation_epoch: Epoch,
25-
pub warmup_cooldown_rate: f64,
25+
pub reserved: [u8; 8],
2626
}

interface/idl.json

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -464,11 +464,18 @@
464464
},
465465
{
466466
"kind": "structFieldTypeNode",
467-
"name": "warmupCooldownRate",
467+
"name": "reserved",
468468
"type": {
469-
"endian": "le",
470-
"format": "f64",
471-
"kind": "numberTypeNode"
469+
"count": {
470+
"kind": "fixedCountNode",
471+
"value": 8
472+
},
473+
"item": {
474+
"endian": "le",
475+
"format": "u8",
476+
"kind": "numberTypeNode"
477+
},
478+
"kind": "arrayTypeNode"
472479
}
473480
}
474481
],

program/src/processor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ impl Processor {
440440
validate_delegated_amount(stake_account_info, &meta)?;
441441

442442
// Get current activation status at this epoch
443-
let effective_stake = stake.delegation.stake(
443+
let effective_stake = stake.delegation.stake_v2(
444444
clock.epoch,
445445
stake_history,
446446
PERPETUAL_NEW_WARMUP_COOLDOWN_RATE_EPOCH,

0 commit comments

Comments
 (0)