Feat/madara bootstrapper v0.0.2 #14

Mohiiit · 2024-10-23T10:02:51Z

starknet rs version bump
for declaring legacy, using the same types created in the madara
zaun updated with latest core contract

…ionality uncommented

Refactor

Tests Refactoring

Cargo.toml

src/.DS_Store

src/contract_clients/core_contract.rs

src/contract_clients/legacy_class.rs

src/contract_clients/utils.rs

src/helpers/account_actions.rs

src/main.rs

src/tests/mod.rs

akhercha

Nice! Few coms - first time checking this codebase so not sure what's relevant, maybe we don't want to move things too much. Feel free to self resolve comments if they don't make sense. :)

akhercha · 2024-11-01T15:03:15Z

src/main.rs

@@ -5,16 +5,26 @@ mod setup_scripts;
 pub mod tests;
 pub mod utils;

-use clap::{ArgAction, Parser};
+use std::fs::File;


More of a general comment but I think the code would gain clarity if the functions/structs only accepts clearly the arguments they need, instead of passing args and config everywhere, it makes it harder to understand what composes each structs/what functions uses without diving in the implementation

I will add this in the refactor PR that we are planning

akhercha · 2024-11-01T15:09:20Z

src/main.rs

+    Argent,
+    Braavos,
+}
+
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]
 pub struct CliArgs {


I guess a config file would make sense here, this would look hard to manage/update only through CLI (similar to the ChainConfig in madara)

akhercha · 2024-11-01T15:11:26Z

src/main.rs

@@ -5,16 +5,26 @@ mod setup_scripts;
 pub mod tests;
 pub mod utils;



We should use anyhow/eyre and have proper error handling

this would be part of another PR, @cchudant already created one, I will rebase that after this PR

akhercha · 2024-11-01T15:17:49Z

src/contract_clients/utils.rs

-    } else {
-        starknet_accounts::ExecutionEncoding::New
-    };
+    let signer = LocalWallet::from(SigningKey::from_secret_scalar(Felt::from_hex(private_key).unwrap()));


(nit) Cloning would help use removing this lifetime everywhere, right? Should probably be done at some point, the bootstraper doesn't really care about this small perf gain and the code would be simpler (in other places too)

yes that's true, adding it to the refactor issue

akhercha · 2024-11-01T15:19:10Z

src/contract_clients/starknet_validity.rs

@@ -17,7 +16,7 @@ use crate::contract_clients::core_contract::{
 use crate::utils::convert_felt_to_u256;

 pub struct StarknetValidityContract {


I don't have much knowledge about the bootstraper but why isn't it imported from Zaun?

@apoorvsadana do you have context of this?

we use it

pub struct StarknetValidityContract { pub core_contract_client: StarknetValidityContractClient, }

StarknetValidityContractClient is from zaun

we created a wrapper for our use case here

ah yup, my bad

akhercha · 2024-11-01T15:23:43Z

src/utils/mod.rs

@@ -1,19 +1,15 @@
 use std::path::Path;
-use std::time::Duration;
 use std::{fs, io};

 use ethers::addressbook::Address;
 use ethers::types::U256;


We should update to alloy at some point since ethers is in the process of being deprecated

yes we need to do that but we need to update zaun first, hence another PR for that refactor

akhercha · 2024-11-01T15:25:06Z

src/utils/mod.rs

-pub fn convert_felt_to_u256(felt: StarkFelt) -> U256 {
-    U256::from_big_endian(felt.bytes())
+pub fn convert_felt_to_u256(felt: Felt) -> U256 {
+    U256::from_big_endian(&felt.to_bytes_le())


If we use from_big_endian this should be felt.to_bytes_be(), no? Else we can use U256::from_little_endian

akhercha · 2024-11-01T15:27:05Z

src/tests/mod.rs

@@ -106,11 +164,16 @@ fn get_config() -> CliArgs {
        config_hash_version: String::from(SN_OS_CONFIG_HASH_VERSION),
        app_chain_id: String::from(APP_CHAIN_ID),
        fee_token_address: String::from(FEE_TOKEN_ADDRESS),
-        cross_chain_wait_time: 120,
+        native_fee_token_address: String::from(NATIVE_FEE_TOKEN_ADDRESS),


So this is the default config for CliArgs? We should probably just implement Default

akhercha

Nice!

mohiiit and others added 30 commits October 9, 2024 00:45

updated starknet version, made it compatible with madara

d4f807e

formatting and linting

2a39ecc

lint: removing print statements

3f857a4

formatting and cleaning

e818e85

legacy class seperated from utils, mostly cleaning

97d6402

formatting and linting

90dd1cd

support added for native token, config hash updated, withdrawal funct…

97e9d90

…ionality uncommented

madara function call updated

006b5f4

feat : updated file core_contract.rs

0218a1b

feat : temp push (to remove 11th block config)

7ef9775

feat : updated imports

a3152b2

refactor code

b3b6d48

refactor

5543668

remove bootstrapper.json

62e3990

remove not needed files

b0b6475

Merge pull request #13 from madara-alliance/refactor

27f3679

Refactor

refactor: refactoring tests

303c132

refactor: tests working now

7ddcad8

formatting and linting

8a706d3

refactor: removed extras

57717e6

refactor: removed extra enter input

3560987

refactor: tests refactor to run madara inside code

1f25fa8

refactor: yml file added

956156a

refactor: binary removed and yaml updated to build madara on the fly

1c8152f

workflow updated to trigger ci

3bafe83

workflow updated to trigger ci

2644edd

refactor: workflow updated to build cairo

111b76c

runner updated to ubuntu

2dcaefb

runner updated to ubuntu

b555569

refactor: workflow updated to run after anvil

81316cc

mohiiit and others added 10 commits October 26, 2024 20:59

refactor: updated logs, l1 and l2 mods added

fb4a2b7

feat: print added for bootstraper outputs

8d538bf

doc: comment added regarding tests

f90426c

Merge pull request #15 from madara-alliance/feat/refactor/tests

cf3de1a

Tests Refactoring

testing branch merged

0fb5155

refactor: bin location updated, yml filed fix

fdadec9

fix: devnet.yml file location fixed

3c887f4

fix: file extension updated

60ee752

fix: updating devnet.yaml file's location

7b8642b

fix: location of devnet.yaml updated

a334bd0

Mohiiit requested review from apoorvsadana and akhercha October 28, 2024 10:42

apoorvsadana reviewed Oct 30, 2024

View reviewed changes

mohiiit added 3 commits November 1, 2024 13:44

resloved: comments

035597b

resolved: comments

ad43767

resolved: comments

c98c84a

akhercha suggested changes Nov 1, 2024

View reviewed changes

mohiiit added 4 commits November 4, 2024 17:04

refactor: removed cli params and taking input from json file

40b8839

feat: config added as file, commit updated for madara

ce3ef52

refactor: checking tests and using defaul

b727fc2

fix: port of madara fixed in default

bdc8b80

akhercha approved these changes Nov 4, 2024

View reviewed changes

mohiiit added 2 commits November 4, 2024 18:47

fix: amount in test fixed

2ce31a6

fix: convert to u256 function fixed

81ed942

apoorvsadana merged commit f717bf1 into main Nov 4, 2024
7 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat/madara bootstrapper v0.0.2 #14

Feat/madara bootstrapper v0.0.2 #14

Mohiiit commented Oct 23, 2024

akhercha left a comment •

edited

Loading

akhercha Nov 1, 2024

Mohiiit Nov 4, 2024

akhercha Nov 1, 2024

Mohiiit Nov 4, 2024

akhercha Nov 1, 2024

Mohiiit Nov 4, 2024

akhercha Nov 1, 2024

Mohiiit Nov 4, 2024 •

edited

Loading

akhercha Nov 1, 2024

Mohiiit Nov 4, 2024

apoorvsadana Nov 4, 2024

apoorvsadana Nov 4, 2024

akhercha Nov 4, 2024

akhercha Nov 1, 2024 •

edited

Loading

Mohiiit Nov 4, 2024

akhercha Nov 1, 2024

Mohiiit Nov 4, 2024

Mohiiit Nov 4, 2024

akhercha Nov 1, 2024

Mohiiit Nov 4, 2024

akhercha left a comment

		@@ -5,16 +5,26 @@ mod setup_scripts;
		pub mod tests;
		pub mod utils;

		@@ -17,7 +16,7 @@ use crate::contract_clients::core_contract::{
		use crate::utils::convert_felt_to_u256;

		pub struct StarknetValidityContract {

Feat/madara bootstrapper v0.0.2 #14

Feat/madara bootstrapper v0.0.2 #14

Conversation

Mohiiit commented Oct 23, 2024

akhercha left a comment • edited Loading

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

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

Mohiiit Nov 4, 2024 • edited Loading

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

akhercha Nov 1, 2024 • edited Loading

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

akhercha left a comment

Choose a reason for hiding this comment

akhercha left a comment •

edited

Loading

Mohiiit Nov 4, 2024 •

edited

Loading

akhercha Nov 1, 2024 •

edited

Loading