Skip to content

Commit a2f322f

Browse files
authored
rename upgrade type Da -> NewProtocol (#4423)
* rename upgrade type Da -> NewProtocol * fix ff upgrade genesis * fix test
1 parent 66d661b commit a2f322f

6 files changed

Lines changed: 9 additions & 14 deletions

File tree

crates/espresso/node/src/genesis.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1448,8 +1448,8 @@ mod test {
14481448
start_proposing_view = 1
14491449
stop_proposing_view = 15
14501450

1451-
[upgrade.da]
1452-
[upgrade.da.chain_config]
1451+
[upgrade.new_protocol]
1452+
[upgrade.new_protocol.chain_config]
14531453
chain_id = 12345
14541454
max_block_size = 30000
14551455
base_fee = 1

crates/espresso/types/src/v0/impls/header.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1354,7 +1354,7 @@ impl BlockHeader<SeqTypes> for Header {
13541354
UpgradeType::Fee { chain_config } => chain_config,
13551355
UpgradeType::Epoch { chain_config } => chain_config,
13561356
UpgradeType::DrbAndHeader { chain_config } => chain_config,
1357-
UpgradeType::Da { chain_config } => chain_config,
1357+
UpgradeType::NewProtocol { chain_config } => chain_config,
13581358
UpgradeType::EpochReward { chain_config } => chain_config,
13591359
},
13601360
None => Header::get_chain_config(&validated_state, instance_state).await?,

crates/espresso/types/src/v0/impls/state.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,7 @@ impl ValidatedState {
11431143
UpgradeType::Fee { chain_config } => chain_config,
11441144
UpgradeType::Epoch { chain_config } => chain_config,
11451145
UpgradeType::DrbAndHeader { chain_config } => chain_config,
1146-
UpgradeType::Da { chain_config } => chain_config,
1146+
UpgradeType::NewProtocol { chain_config } => chain_config,
11471147
UpgradeType::EpochReward { chain_config } => chain_config,
11481148
};
11491149

crates/espresso/types/src/v0/v0_1/instance_state.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub enum UpgradeType {
1111
Fee { chain_config: ChainConfig },
1212
Epoch { chain_config: ChainConfig },
1313
DrbAndHeader { chain_config: ChainConfig },
14-
Da { chain_config: ChainConfig },
14+
NewProtocol { chain_config: ChainConfig },
1515
EpochReward { chain_config: ChainConfig },
1616
}
1717

@@ -23,7 +23,7 @@ impl UpgradeType {
2323
UpgradeType::Fee { chain_config } => Some(*chain_config),
2424
UpgradeType::Epoch { chain_config } => Some(*chain_config),
2525
UpgradeType::DrbAndHeader { chain_config } => Some(*chain_config),
26-
UpgradeType::Da { chain_config } => Some(*chain_config),
26+
UpgradeType::NewProtocol { chain_config } => Some(*chain_config),
2727
UpgradeType::EpochReward { chain_config } => Some(*chain_config),
2828
}
2929
}

data/genesis/demo-new-protocol-upgrade.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ version = "0.6"
3737
start_proposing_view = 600
3838
stop_proposing_view = 2000
3939

40-
[upgrade.da]
41-
[upgrade.da.chain_config]
40+
[upgrade.new_protocol]
41+
[upgrade.new_protocol.chain_config]
4242
chain_id = 999999999
4343
max_block_size = "10mb"
4444
base_fee = "1 wei"

light-client/Cargo.toml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,7 @@ edition.workspace = true
88
default = ["decaf", "rlp"]
99
decaf = []
1010
rlp = ["alloy-rlp", "hotshot-types/rlp"]
11-
testing = [
12-
"espresso-types/testing",
13-
"bitvec",
14-
"hotshot-contract-adapter",
15-
"rand",
16-
]
11+
testing = ["espresso-types/testing", "bitvec", "hotshot-contract-adapter", "rand"]
1712

1813
[dependencies]
1914
alloy = { workspace = true }

0 commit comments

Comments
 (0)