Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump katana to v1.0.0-alpha.19 #1512

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

bump katana to v1.0.0-alpha.19 #1512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9481dcd
bump katana to v1.0.0-alpha.19
tcoratger Oct 29, 2024
806ad70
Merge branch 'main' into v1.0.0-alpha.19
tcoratger Oct 29, 2024
66e9b41
fix
tcoratger Oct 29, 2024
d9510db
fix
tcoratger Oct 29, 2024
702cee7
fix storage slot
tcoratger Oct 30, 2024
7707810
Merge branch 'main' into v1.0.0-alpha.19
tcoratger Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 51 additions & 47 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@ alloy-signer = { version = "0.4.2", default-features = false, optional = true }
alloy-serde = { version = "0.4.2", default-features = false }

# Starknet
dojo-test-utils = { git = 'https://github.com/dojoengine/dojo', tag = "v1.0.0-alpha.15", default-features = false, optional = true }
katana-node = { git = 'https://github.com/dojoengine/dojo', tag = "v1.0.0-alpha.15", default-features = false, optional = true }
katana-primitives = { git = 'https://github.com/dojoengine/dojo', tag = "v1.0.0-alpha.15", default-features = false, features = [
dojo-test-utils = { git = 'https://github.com/dojoengine/dojo', tag = "v1.0.0-alpha.19", default-features = false, optional = true }
katana-node = { git = 'https://github.com/dojoengine/dojo', tag = "v1.0.0-alpha.19", default-features = false, optional = true }
katana-primitives = { git = 'https://github.com/dojoengine/dojo', tag = "v1.0.0-alpha.19", default-features = false, features = [
"serde",
], optional = true }
starknet_api = { version = "0.13.0-rc.0", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ run-dev: load-env
RUST_LOG=trace cargo run --bin kakarot-rpc

install-katana:
cargo install --git https://github.com/dojoengine/dojo --locked --tag v1.0.0-alpha.15 katana
cargo install --git https://github.com/dojoengine/dojo --locked --tag v1.0.0-alpha.19 katana

katana-genesis: install-katana
cargo run --bin katana_genesis --features testing
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
restart: on-failure

starknet:
image: ghcr.io/dojoengine/dojo:v1.0.0-alpha.16
image: ghcr.io/dojoengine/dojo:v1.0.0-alpha.19
command:
- katana
- --disable-fee
Expand Down
2 changes: 1 addition & 1 deletion docker/hive/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# trunk-ignore-all(terrascan/AC_DOCKER_0047)

# CairoVM Chain
FROM ghcr.io/dojoengine/dojo:v1.0.0-alpha.15 as katana
FROM ghcr.io/dojoengine/dojo:v1.0.0-alpha.19 as katana
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you check that this works?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't checked yet but the CI should confirm no?


# Indexer service
### Apibara DNA indexer and indexer
Expand Down
19 changes: 17 additions & 2 deletions src/test_utils/hive/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ use account::{Account, KakarotAccount};
use alloy_primitives::{Address, Bytes, B256, U256, U64};
use katana_primitives::{
contract::ContractAddress,
genesis::json::{ClassNameOrHash, GenesisContractJson, GenesisJson},
genesis::{
constant::DEFAULT_ETH_FEE_TOKEN_ADDRESS,
json::{ClassNameOrHash, GenesisContractJson, GenesisJson},
},
};
use serde::{Deserialize, Serialize};
use starknet::core::{types::Felt, utils::get_storage_var_address};
Expand Down Expand Up @@ -123,7 +126,19 @@ impl HiveGenesisConfig {
contract.storage.get_or_insert_with(BTreeMap::new).extend(additional_kakarot_storage);
});

genesis.fee_token.storage.get_or_insert_with(BTreeMap::new).extend(fee_token_storage);
// Add the fee token storage to the genesis.
genesis
.contracts
.entry(DEFAULT_ETH_FEE_TOKEN_ADDRESS)
.or_insert_with(|| katana_primitives::genesis::json::GenesisContractJson {
balance: None,
nonce: None,
class: None,
storage: Some(BTreeMap::new()),
})
.storage
.get_or_insert_with(BTreeMap::new)
.extend(fee_token_storage);

// Add the contracts to the genesis.
genesis.contracts.extend(contracts);
Expand Down
Loading
Loading