Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Build contracts and check formatting
on:
push:
merge_group:
pull_request:
jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: software-mansion/setup-scarb@v1
with:
scarb-version: "2.12.2"
- run: scarb build
- run: scarb fmt --check
- run: scarb lint
6 changes: 3 additions & 3 deletions Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ edition = "2024_07"
# See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html

[dependencies]
starknet = "2.11.4"
starknet = "2.12.2"

[dev-dependencies]
snforge_std = "0.48.0"
assert_macros = "2.11.4"
snforge_std = "0.48.1"
assert_macros = "2.12.2"

[[target.starknet-contract]]
sierra = true
Expand Down
15 changes: 9 additions & 6 deletions src/contracts/HelloStarknet.cairo
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/// Simple contract for managing balance.
#[starknet::contract]
pub mod HelloStarknet {

use cairo_bootcamp_5::interfaces::IHelloStarknet::IHelloStarknet;
// use starknet::storage::{StoragePointerReadAccess, StoragePathEntry, StoragePointerWriteAccess, Map };
use starknet::storage::{Map, StorageMapReadAccess, StorageMapWriteAccess, StoragePointerReadAccess, StoragePointerWriteAccess };
// use starknet::storage::{StoragePointerReadAccess, StoragePathEntry,
// StoragePointerWriteAccess, Map };
use starknet::storage::{
Map, StorageMapReadAccess, StorageMapWriteAccess, StoragePointerReadAccess,
StoragePointerWriteAccess,
};
use starknet::{ContractAddress, get_caller_address};

#[storage]
Expand All @@ -16,7 +19,7 @@ pub mod HelloStarknet {
#[event]
#[derive(Drop, starknet::Event)]
pub enum Event {
Balance : BalanceIncreased,
Balance: BalanceIncreased,
}

#[derive(Drop, starknet::Event)]
Expand All @@ -42,11 +45,11 @@ pub mod HelloStarknet {

// self.balance.write(self.balance.read() + amount);

self.emit(BalanceIncreased{caller, amount});
self.emit(BalanceIncreased { caller, amount });
}

fn get_balance(self: @ContractState) -> felt252 {
self.balance.read()
}
}
}
}
4 changes: 2 additions & 2 deletions src/contracts/counter.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub mod Counter {
#[event]
#[derive(Drop, starknet::Event)]
pub enum Event {
CountUpdated : CountUpdated,
CountUpdated: CountUpdated,
}

#[derive(Drop, starknet::Event)]
Expand Down Expand Up @@ -48,4 +48,4 @@ pub mod Counter {
self.emit(CountUpdated { old_value, new_value });
}
}
}
}
2 changes: 1 addition & 1 deletion src/interfaces/ICounter.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ pub trait ICounter<TContractState> {
fn get_count(self: @TContractState) -> u32;
fn increment(ref self: TContractState);
fn decrement(ref self: TContractState);
}
}
2 changes: 1 addition & 1 deletion src/interfaces/IHelloStarknet.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ pub trait IHelloStarknet<TContractState> {
fn increase_balance(ref self: TContractState, amount: felt252);
/// Retrieve contract balance.
fn get_balance(self: @TContractState) -> felt252;
}
}
6 changes: 3 additions & 3 deletions src/lib.cairo
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
pub mod interfaces{
pub mod IHelloStarknet;
pub mod interfaces {
pub mod ICounter;
pub mod IHelloStarknet;
}

pub mod contracts{
pub mod contracts {
pub mod HelloStarknet;
pub mod counter;
}
14 changes: 6 additions & 8 deletions tests/test_contract.cairo
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
use cairo_bootcamp_5::interfaces::IHelloStarknet::{
IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait, IHelloStarknetSafeDispatcher,
IHelloStarknetSafeDispatcherTrait,
};
use snforge_std::{ContractClassTrait, DeclareResultTrait, declare};
use starknet::ContractAddress;

use snforge_std::{declare, ContractClassTrait, DeclareResultTrait};

use cairo_bootcamp_5::interfaces::IHelloStarknet::IHelloStarknetSafeDispatcher;
use cairo_bootcamp_5::interfaces::IHelloStarknet::IHelloStarknetSafeDispatcherTrait;
use cairo_bootcamp_5::interfaces::IHelloStarknet::IHelloStarknetDispatcher;
use cairo_bootcamp_5::interfaces::IHelloStarknet::IHelloStarknetDispatcherTrait;

fn deploy_contract(name: ByteArray) -> ContractAddress {
let contract = declare(name).unwrap().contract_class();
let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();
Expand Down Expand Up @@ -42,6 +40,6 @@ fn test_cannot_increase_balance_with_zero_value() {
Result::Ok(_) => core::panic_with_felt252('Should have panicked'),
Result::Err(panic_data) => {
assert(*panic_data.at(0) == 'Amount cannot be 0', *panic_data.at(0));
}
},
};
}