dev: update Madara genesis loading #484

ftupas · 2023-08-25T11:46:28Z

Time spent on this PR: 0.2

Depends on: keep-starknet-strange/madara#1018
Resolves: #477

Pull Request type

Please check the type of change your PR introduces:

What is the new behavior?

Uses the official Madara binary and update the genesis json to the latest format

Does this introduce a breaking change?

Yes
No

Added changes to `CHANGELOG.md`

Yes
No

ftupas

Some TODOs for me in this pr

ftupas · 2023-08-25T11:47:22Z

crates/hive-utils/Dockerfile

@@ -1,6 +1,6 @@
 # TODO: Use official madara image when https://github.com/keep-starknet-strange/madara/issues/982 is closed
 # FROM ghcr.io/keep-starknet-strange/madara:v0.1.0.experimental.3 as madara
-FROM fredtupas/madara as madara
+FROM fredtupas/madara-fixed as madara


TODO: will update pr to official image once this pr in Madara is merged keep-starknet-strange/madara#1018

ftupas · 2023-08-25T11:47:43Z

crates/hive-utils/Dockerfile


 # Download Madara genesis config to source path
-RUN svn export https://github.com/keep-starknet-strange/madara/trunk/configs ${MADARA_CONFIG_PATH}
+RUN svn export https://github.com/d-roak/madara/branches/feat/configs-index/configs/genesis-assets ${MADARA_GENESIS_ASSETS_PATH}


TODO: Update to Madara's main branch

ftupas · 2023-08-25T11:48:36Z

crates/hive-utils/scripts/start.sh

@@ -8,6 +8,7 @@ export PROXY_ACCOUNT_CLASS_HASH=$(starkli class-hash ${MADARA_PATH}/cairo-contra
    --rpc-external \
    --rpc-methods=unsafe \
    --rpc-cors=all \
+    --disable-madara-configs \


Since we're copying all the genesis assets into the local Madara path, we need to add this flag to use them

codecov · 2023-08-25T12:33:48Z

Codecov Report

Patch coverage: 83.25% and project coverage change: +49.21% 🎉

Comparison is base (71506a8) 23.17% compared to head (ba37efa) 72.38%.
Report is 191 commits behind head on main.

Additional details and impacted files

@@             Coverage Diff             @@
##             main     #484       +/-   ##
===========================================
+ Coverage   23.17%   72.38%   +49.21%     
===========================================
  Files           9       44       +35     
  Lines        1247     3998     +2751     
===========================================
+ Hits          289     2894     +2605     
- Misses        958     1104      +146

Files Changed	Coverage Δ
crates/core/src/mock/serde.rs	`0.00% <0.00%> (ø)`
crates/core/src/models/transaction.rs	`93.63% <ø> (ø)`
crates/core/src/models/transaction_receipt.rs	`97.02% <ø> (ø)`
crates/core/src/test_utils/bin/dump-katana.rs	`0.00% <ø> (ø)`
crates/core/src/test_utils/deploy_helpers.rs	`32.44% <ø> (ø)`
crates/core/src/test_utils/execution_helpers.rs	`100.00% <ø> (ø)`
crates/core/src/test_utils/fixtures.rs	`100.00% <ø> (ø)`
crates/eth-rpc/src/api/alchemy_api.rs	`100.00% <ø> (ø)`
crates/eth-rpc/src/api/eth_api.rs	`100.00% <ø> (ø)`
crates/eth-rpc/src/api/net_api.rs	`100.00% <ø> (ø)`
... and 34 more

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

d-roak · 2023-08-25T13:15:40Z

crates/hive-utils/scripts/start.sh

@@ -8,6 +8,7 @@ export PROXY_ACCOUNT_CLASS_HASH=$(starkli class-hash ${MADARA_PATH}/cairo-contra
    --rpc-external \
    --rpc-methods=unsafe \


u can remove --rpc-externaland --rpc-methods=unsafe because they will be enabled when u set the --dev

Gotcha, thanks will remove this!

d-roak · 2023-08-25T13:16:24Z

crates/hive-utils/scripts/start.sh

@@ -8,6 +8,7 @@ export PROXY_ACCOUNT_CLASS_HASH=$(starkli class-hash ${MADARA_PATH}/cairo-contra
    --rpc-external \
    --rpc-methods=unsafe \
    --rpc-cors=all \
+    --disable-madara-configs \
    --tmp \


why are u setting a tmp path for the db? since it's a docker container, u can just let it go to the default madara-path

Forgot to remove this, had to add this flag before in the fork because it was initializing but not including the Kakarot contracts for some reason and it worked when we added it

ftupas

Thanks for the comments @d-roak !

ftupas · 2023-08-25T13:17:41Z

crates/hive-utils/scripts/start.sh

@@ -8,6 +8,7 @@ export PROXY_ACCOUNT_CLASS_HASH=$(starkli class-hash ${MADARA_PATH}/cairo-contra
    --rpc-external \
    --rpc-methods=unsafe \


Gotcha, thanks will remove this!

ftupas · 2023-08-25T13:18:41Z

crates/hive-utils/scripts/start.sh

@@ -8,6 +8,7 @@ export PROXY_ACCOUNT_CLASS_HASH=$(starkli class-hash ${MADARA_PATH}/cairo-contra
    --rpc-external \
    --rpc-methods=unsafe \
    --rpc-cors=all \
+    --disable-madara-configs \
    --tmp \


Forgot to remove this, had to add this flag before in the fork because it was initializing but not including the Kakarot contracts for some reason and it worked when we added it

ClementWalter · 2023-08-29T16:23:59Z

hey, what's the blocker for moving this into ready for review?

…official-madara-hive

ftupas · 2023-08-29T17:11:05Z

hey, what's the blocker for moving this into ready for review?

Ah I was waiting for this pr to be merged but actually I think we can have this ready for review 🙂 I just pulled the latest commits from Oak's pr and tested it locally and confirming it's still working, moving it to ready

d-roak · 2023-08-29T17:28:29Z

That PR is going to take a big refactor soon. Be careful while using it

ClementWalter · 2023-08-31T09:47:12Z

@d-roak so you suggest that we don't merge yet?

Eikix · 2023-09-05T02:37:51Z

That PR is going to take a big refactor soon. Be careful while using it

Can I get the context for this refactor, to have more clarity on our steps

d-roak · 2023-09-05T05:01:52Z

Sry for the delay!

@ClementWalter U can merge it, but instead of fixing the branch, you should fix a specific commit within the branch. Once it's merge on main, I can help you refactor whatever is needed on your side

@Eikix We are changing the way that we run/setup madara. So we are going to have:
madara setup
madara run --dev
In your specific use case, you might want to pass some flags to madara setup, or, set it manually (i believe that's what u are doing atm)

greged93 · 2023-11-06T16:24:03Z

@ClementWalter is it ok to close this for you? I will make one high level issue to rework everything linked with dumping

d-roak · 2023-11-07T02:40:15Z

@greged93 lmk if you want me to review anything madara wise

greged93 · 2023-11-07T06:48:21Z

@d-roak we're doing a big clean of this repo, will rework the madara part later on and let you know if we need some help

ftupas added 2 commits August 25, 2023 13:27

update: use new flow to load genesis to Madara

600b870

feat: add eoa receiver to pre-deployed accounts

cb37f1f

ftupas added the skip-changelog label Aug 25, 2023

ftupas commented Aug 25, 2023

View reviewed changes

add hive eoa to count

8a47a42

ftupas force-pushed the dev/use-official-madara-hive branch from 7f4040c to 8a47a42 Compare August 25, 2023 12:20

d-roak reviewed Aug 25, 2023

View reviewed changes

ftupas commented Aug 25, 2023

View reviewed changes

dev: remove extra madara flags

fec7f69

Eikix removed the skip-changelog label Aug 25, 2023

Merge branch 'main' of github.com:kkrt-labs/kakarot-rpc into dev/use-…

ba37efa

…official-madara-hive

ftupas marked this pull request as ready for review August 29, 2023 17:11

ftupas requested review from ClementWalter and Eikix as code owners August 29, 2023 17:11

ClementWalter marked this pull request as draft September 12, 2023 14:15

ClementWalter closed this Nov 6, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

dev: update Madara genesis loading #484

dev: update Madara genesis loading #484

ftupas commented Aug 25, 2023 •

edited

Loading

ftupas left a comment

ftupas Aug 25, 2023

ftupas Aug 25, 2023

ftupas Aug 25, 2023 •

edited

Loading

codecov bot commented Aug 25, 2023 •

edited

Loading

d-roak Aug 25, 2023

ftupas Aug 25, 2023

d-roak Aug 25, 2023

ftupas Aug 25, 2023

ftupas left a comment

ftupas Aug 25, 2023

ftupas Aug 25, 2023

ClementWalter commented Aug 29, 2023

ftupas commented Aug 29, 2023

d-roak commented Aug 29, 2023

ClementWalter commented Aug 31, 2023

Eikix commented Sep 5, 2023

d-roak commented Sep 5, 2023

greged93 commented Nov 6, 2023

d-roak commented Nov 7, 2023

greged93 commented Nov 7, 2023 •

edited

Loading

		@@ -8,6 +8,7 @@ export PROXY_ACCOUNT_CLASS_HASH=$(starkli class-hash ${MADARA_PATH}/cairo-contra
		--rpc-external \
		--rpc-methods=unsafe \

dev: update Madara genesis loading #484

dev: update Madara genesis loading #484

Conversation

ftupas commented Aug 25, 2023 • edited Loading

Pull Request type

What is the new behavior?

Does this introduce a breaking change?

Added changes to CHANGELOG.md

ftupas left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ftupas Aug 25, 2023 • edited Loading

Choose a reason for hiding this comment

codecov bot commented Aug 25, 2023 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ftupas left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ClementWalter commented Aug 29, 2023

ftupas commented Aug 29, 2023

d-roak commented Aug 29, 2023

ClementWalter commented Aug 31, 2023

Eikix commented Sep 5, 2023

d-roak commented Sep 5, 2023

greged93 commented Nov 6, 2023

d-roak commented Nov 7, 2023

greged93 commented Nov 7, 2023 • edited Loading

ftupas commented Aug 25, 2023 •

edited

Loading

Added changes to `CHANGELOG.md`

ftupas Aug 25, 2023 •

edited

Loading

codecov bot commented Aug 25, 2023 •

edited

Loading

greged93 commented Nov 7, 2023 •

edited

Loading