Skip to content

Commit b8cca65

Browse files
tsergtserg
authored
chore: bump snfoundry (#578)
This PR bumps Starknet Foundry to v0.22.0, and makes the necessary changes for starknet-devnet-rs v0.0.5.
1 parent 8442e61 commit b8cca65

25 files changed

+97
-88
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ target/
77

88
.snfoundry_cache/
99

10-
scripts/deploy_alpha-goerli_state.json
10+
scripts/deploy/deploy_devnet_alpha-sepolia_state.json

‎.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
scarb 2.6.3
2-
starknet-foundry 0.21.0
2+
starknet-foundry 0.22.0

‎Scarb.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ dependencies = [
1717

1818
[[package]]
1919
name = "snforge_std"
20-
version = "0.21.0"
21-
source = "git+https://github.com/foundry-rs/starknet-foundry.git?tag=v0.21.0#2996b8c1dd66b2715fc67e69578089f278a46790"
20+
version = "0.22.0"
21+
source = "git+https://github.com/foundry-rs/starknet-foundry.git?tag=v0.22.0#9b215944c6c5871c738381b4ded61bbf06e7ba35"
2222

2323
[[package]]
2424
name = "wadray"

‎Scarb.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ wadray = { git = "https://github.com/lindy-labs/wadray.git", tag = "v0.3.0" }
2222
access_control = { git = "https://github.com/lindy-labs/access_control.git", tag = "v0.3.0" }
2323

2424
[dev-dependencies]
25-
snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.21.0" }
25+
snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.22.0" }
2626

2727
[scripts]
2828
devnet = "starknet-devnet --seed 1087810753 --gas-price 1000"

‎scripts/deploy/Scarb.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ dependencies = [
2424

2525
[[package]]
2626
name = "sncast_std"
27-
version = "0.21.0"
28-
source = "git+https://github.com/foundry-rs/starknet-foundry?tag=v0.21.0#2996b8c1dd66b2715fc67e69578089f278a46790"
27+
version = "0.22.0"
28+
source = "git+https://github.com/foundry-rs/starknet-foundry?tag=v0.22.0#9b215944c6c5871c738381b4ded61bbf06e7ba35"
2929

3030
[[package]]
3131
name = "wadray"

‎scripts/deploy/Scarb.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2023_11"
66
# See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html
77

88
[dependencies]
9-
sncast_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.21.0" }
9+
sncast_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.22.0" }
1010
starknet = ">=2.6.3"
1111
opus = { path = "../../" }
1212

@@ -38,7 +38,7 @@ build-external-contracts = [
3838
]
3939

4040
[scripts]
41-
deploy_devnet = "rm deploy_devnet_alpha-goerli_state.json 2> /dev/null; sncast --profile devnet script run deploy_devnet"
41+
deploy_devnet = "rm deploy_devnet_alpha-sepolia_state.json 2> /dev/null; sncast --profile devnet script run deploy_devnet"
4242
deploy_sepolia = "sncast --profile sepolia script run deploy_sepolia"
4343

4444
[profile.devnet]

‎scripts/deploy/devnet_admin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"alpha-goerli": {
2+
"alpha-sepolia": {
33
"devnet_admin": {
44
"address": "0x42044b3252fcdaeccfc2514c2b72107aed76855f7251469e2f105d97ec6b6e5",
55
"class_hash": "0x61dac032f228abef9c6626f995015233097ae253a7f72d68552db02f2971b8f",

‎src/tests/abbot/utils.cairo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ pub mod abbot_utils {
6464

6565
let abbot_class = match abbot_class {
6666
Option::Some(class) => class,
67-
Option::None => declare("abbot"),
67+
Option::None => declare("abbot").unwrap(),
6868
};
6969

70-
let abbot_addr = abbot_class.deploy(@calldata).expect('abbot deploy failed');
70+
let (abbot_addr, _) = abbot_class.deploy(@calldata).expect('abbot deploy failed');
7171

7272
let abbot = IAbbotDispatcher { contract_address: abbot_addr };
7373

‎src/tests/absorber/test_absorber.cairo

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ mod test_absorber {
5353

5454
#[test]
5555
fn test_set_reward_pass() {
56-
let token_class = Option::Some(declare("erc20_mintable"));
57-
let blesser_class = Option::Some(declare("blesser"));
56+
let token_class = Option::Some(declare("erc20_mintable").unwrap());
57+
let blesser_class = Option::Some(declare("blesser").unwrap());
5858
let (_, _, _, absorber, _, _) = absorber_utils::absorber_deploy(
5959
Option::None, Option::None, token_class, Option::None, Option::None, Option::None
6060
);
@@ -2191,8 +2191,8 @@ mod test_absorber {
21912191

21922192
#[test]
21932193
fn test_bestow_depleted_active_reward() {
2194-
let token_class = Option::Some(declare("erc20_mintable"));
2195-
let blesser_class = Option::Some(declare("blesser"));
2194+
let token_class = Option::Some(declare("erc20_mintable").unwrap());
2195+
let blesser_class = Option::Some(declare("blesser").unwrap());
21962196
let (shrine, _, abbot, absorber, yangs, gates) = absorber_utils::absorber_deploy(
21972197
Option::None, Option::None, token_class, Option::None, Option::None, Option::None
21982198
);

‎src/tests/absorber/utils.cairo

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ pub mod absorber_utils {
110110

111111
let absorber_class = match absorber_class {
112112
Option::Some(class) => class,
113-
Option::None => declare("absorber")
113+
Option::None => declare("absorber").unwrap()
114114
};
115115

116-
let absorber_addr = absorber_class.deploy(@calldata).expect('absorber deploy failed');
116+
let (absorber_addr, _) = absorber_class.deploy(@calldata).expect('absorber deploy failed');
117117

118118
start_prank(CheatTarget::One(absorber_addr), admin);
119119
let absorber_ac = IAccessControlDispatcher { contract_address: absorber_addr };
@@ -161,10 +161,10 @@ pub mod absorber_utils {
161161

162162
let blesser_class = match blesser_class {
163163
Option::Some(class) => class,
164-
Option::None => declare("mock_blesser")
164+
Option::None => declare("mock_blesser").unwrap()
165165
};
166166

167-
let mock_blesser_addr = blesser_class.deploy(@calldata).expect('blesser deploy failed');
167+
let (mock_blesser_addr, _) = blesser_class.deploy(@calldata).expect('blesser deploy failed');
168168

169169
if mint_to_blesser {
170170
let token_minter = IMintableDispatcher { contract_address: asset };
@@ -267,13 +267,13 @@ pub mod absorber_utils {
267267
let token_class = Option::Some(
268268
match token_class {
269269
Option::Some(class) => class,
270-
Option::None => declare("erc20_mintable")
270+
Option::None => declare("erc20_mintable").unwrap()
271271
}
272272
);
273273

274274
let blesser_class = match blesser_class {
275275
Option::Some(class) => class,
276-
Option::None => declare("blesser")
276+
Option::None => declare("blesser").unwrap()
277277
};
278278

279279
let (shrine, sentinel, abbot, absorber, yangs, gates, provider, provided_amt) = absorber_with_first_provider(
@@ -697,13 +697,13 @@ pub mod absorber_utils {
697697
Option<ContractClass>
698698
) {
699699
(
700-
Option::Some(declare("abbot")),
701-
Option::Some(declare("sentinel")),
702-
Option::Some(declare("erc20_mintable")),
703-
Option::Some(declare("gate")),
704-
Option::Some(declare("shrine")),
705-
Option::Some(declare("absorber")),
706-
Option::Some(declare("blesser")),
700+
Option::Some(declare("abbot").unwrap()),
701+
Option::Some(declare("sentinel").unwrap()),
702+
Option::Some(declare("erc20_mintable").unwrap()),
703+
Option::Some(declare("gate").unwrap()),
704+
Option::Some(declare("shrine").unwrap()),
705+
Option::Some(declare("absorber").unwrap()),
706+
Option::Some(declare("blesser").unwrap()),
707707
)
708708
}
709709
}

‎src/tests/caretaker/utils.cairo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ pub mod caretaker_utils {
4444
equalizer.contract_address.into(),
4545
];
4646

47-
let caretaker_class = declare("caretaker");
48-
let caretaker = caretaker_class.deploy(@calldata).expect('failed deploy caretaker');
47+
let caretaker_class = declare("caretaker").unwrap();
48+
let (caretaker, _) = caretaker_class.deploy(@calldata).expect('caretaker deploy failed');
4949

5050
// allow Caretaker to do its business with Shrine
5151
start_prank(CheatTarget::One(shrine.contract_address), shrine_utils::admin());

‎src/tests/common.cairo

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,11 @@ pub fn deploy_token(
193193

194194
let token_class = match token_class {
195195
Option::Some(class) => class,
196-
Option::None => declare("erc20_mintable"),
196+
Option::None => declare("erc20_mintable").unwrap(),
197197
};
198198

199-
token_class.deploy(@calldata).expect('erc20 deploy failed')
199+
let (token_addr, _) = token_class.deploy(@calldata).expect('erc20 deploy failed');
200+
token_addr
200201
}
201202

202203
// Helper function to fund a user account with yang assets

‎src/tests/controller/utils.cairo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ pub mod controller_utils {
4242
BETA_I.into()
4343
];
4444

45-
let controller_class = declare("controller");
46-
let controller_addr = controller_class.deploy(@calldata).expect('controller deploy failed');
45+
let controller_class = declare("controller").unwrap();
46+
let (controller_addr, _) = controller_class.deploy(@calldata).expect('controller deploy failed');
4747

4848
let shrine_ac = IAccessControlDispatcher { contract_address: shrine_addr };
4949
start_prank(CheatTarget::All, shrine_utils::admin());

‎src/tests/equalizer/test_equalizer.cairo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ mod test_equalizer {
269269

270270
#[test]
271271
fn test_set_allocator_pass() {
272-
let allocator_class = Option::Some(declare("allocator"));
272+
let allocator_class = Option::Some(declare("allocator").unwrap());
273273
let (_, equalizer, allocator) = equalizer_utils::equalizer_deploy(allocator_class);
274274
let mut spy = spy_events(SpyOn::One(equalizer.contract_address));
275275

@@ -299,7 +299,7 @@ mod test_equalizer {
299299
#[test]
300300
#[should_panic(expected: ('Caller missing role',))]
301301
fn test_set_allocator_fail() {
302-
let allocator_class = Option::Some(declare("allocator"));
302+
let allocator_class = Option::Some(declare("allocator").unwrap());
303303
let (_, equalizer, _) = equalizer_utils::equalizer_deploy(allocator_class);
304304
let new_allocator = equalizer_utils::allocator_deploy(
305305
equalizer_utils::new_recipients(), equalizer_utils::new_percentages(), allocator_class

‎src/tests/equalizer/utils.cairo

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ pub mod equalizer_utils {
9191

9292
let allocator_class = match allocator_class {
9393
Option::Some(class) => class,
94-
Option::None => declare("allocator")
94+
Option::None => declare("allocator").unwrap()
9595
};
96-
let allocator_addr = allocator_class.deploy(@calldata).expect('failed allocator deploy');
96+
let (allocator_addr, _) = allocator_class.deploy(@calldata).expect('failed allocator deploy');
9797

9898
IAllocatorDispatcher { contract_address: allocator_addr }
9999
}
@@ -115,8 +115,8 @@ pub mod equalizer_utils {
115115

116116
let mut calldata: Array<felt252> = array![admin.into(), shrine.into(), allocator.contract_address.into()];
117117

118-
let equalizer_class = declare("equalizer");
119-
let equalizer_addr = equalizer_class.deploy(@calldata).expect('failed equalizer deploy');
118+
let equalizer_class = declare("equalizer").unwrap();
119+
let (equalizer_addr, _) = equalizer_class.deploy(@calldata).expect('failed equalizer deploy');
120120

121121
let equalizer_ac: IAccessControlDispatcher = IAccessControlDispatcher { contract_address: equalizer_addr };
122122
start_prank(CheatTarget::Multiple(array![equalizer_addr, shrine]), admin);

‎src/tests/external/utils.cairo

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ pub mod pragma_utils {
5252

5353
let mock_pragma_class = match mock_pragma_class {
5454
Option::Some(class) => class,
55-
Option::None => declare("mock_pragma"),
55+
Option::None => declare("mock_pragma").unwrap(),
5656
};
5757

58-
let mock_pragma_addr = mock_pragma_class.deploy(@calldata).expect('failed deploy mock pragma');
58+
let (mock_pragma_addr, _) = mock_pragma_class.deploy(@calldata).expect('mock pragma deploy failed');
5959

6060
IMockPragmaDispatcher { contract_address: mock_pragma_addr }
6161
}
@@ -74,10 +74,10 @@ pub mod pragma_utils {
7474

7575
let pragma_class = match pragma_class {
7676
Option::Some(class) => class,
77-
Option::None => declare("pragma"),
77+
Option::None => declare("pragma").unwrap(),
7878
};
7979

80-
let pragma_addr = pragma_class.deploy(@calldata).expect('failed deploy pragma');
80+
let (pragma_addr, _) = pragma_class.deploy(@calldata).expect('pragma deploy failed');
8181

8282
let pragma = IPragmaDispatcher { contract_address: pragma_addr };
8383

@@ -172,10 +172,12 @@ pub mod switchboard_utils {
172172

173173
let mock_switchboard_class = match mock_switchboard_class {
174174
Option::Some(class) => class,
175-
Option::None => declare("mock_switchboard"),
175+
Option::None => declare("mock_switchboard").unwrap(),
176176
};
177177

178-
let mock_switchboard_addr = mock_switchboard_class.deploy(@calldata).expect('failed deploy mock switchboard');
178+
let (mock_switchboard_addr, _) = mock_switchboard_class
179+
.deploy(@calldata)
180+
.expect('mock switchboard deploy failed');
179181
IMockSwitchboardDispatcher { contract_address: mock_switchboard_addr }
180182
}
181183

@@ -188,10 +190,10 @@ pub mod switchboard_utils {
188190

189191
let switchboard_class = match switchboard_class {
190192
Option::Some(class) => class,
191-
Option::None => declare("switchboard"),
193+
Option::None => declare("switchboard").unwrap(),
192194
};
193195

194-
let switchboard_addr = switchboard_class.deploy(@calldata).expect('failed deploy switchboard');
196+
let (switchboard_addr, _) = switchboard_class.deploy(@calldata).expect('switchboard deploy failed');
195197

196198
let switchboard = ISwitchboardDispatcher { contract_address: switchboard_addr };
197199

‎src/tests/flash_mint/utils.cairo

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ pub mod flash_mint_utils {
2020
}
2121

2222
pub fn flashmint_deploy(shrine: ContractAddress) -> IFlashMintDispatcher {
23-
let flashmint_class = declare("flash_mint");
24-
let flashmint_addr = flashmint_class.deploy(@array![shrine.into()]).expect('flashmint deploy failed');
23+
let flashmint_class = declare("flash_mint").unwrap();
24+
let (flashmint_addr, _) = flashmint_class.deploy(@array![shrine.into()]).expect('flashmint deploy failed');
2525

2626
let flashmint = IFlashMintDispatcher { contract_address: flashmint_addr };
2727

@@ -54,8 +54,11 @@ pub mod flash_mint_utils {
5454
}
5555

5656
pub fn flash_borrower_deploy(flashmint: ContractAddress) -> ContractAddress {
57-
let flash_borrower_class = declare("flash_borrower");
58-
flash_borrower_class.deploy(@array![flashmint.into()]).expect('flsh brrwr deploy failed')
57+
let flash_borrower_class = declare("flash_borrower").unwrap();
58+
let (flash_borrower_addr, _) = flash_borrower_class
59+
.deploy(@array![flashmint.into()])
60+
.expect('flsh brrwr deploy failed');
61+
flash_borrower_addr
5962
}
6063

6164
pub fn flash_borrower_setup() -> (ContractAddress, IFlashMintDispatcher, ContractAddress) {

‎src/tests/gate/utils.cairo

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ pub mod gate_utils {
3333

3434
let gate_class = match gate_class {
3535
Option::Some(class) => class,
36-
Option::None => declare("gate"),
36+
Option::None => declare("gate").unwrap(),
3737
};
38-
gate_class.deploy(@calldata).expect('gate deploy failed')
38+
let (gate_addr, _) = gate_class.deploy(@calldata).expect('gate deploy failed');
39+
gate_addr
3940
}
4041

4142
pub fn eth_gate_deploy(token_class: Option<ContractClass>) -> (ContractAddress, ContractAddress, ContractAddress) {

‎src/tests/purger/utils.cairo

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ pub mod purger_utils {
369369
seer.contract_address.into()
370370
];
371371

372-
let purger_addr = classes.purger.deploy(@calldata).expect('failed deploy purger');
372+
let (purger_addr, _) = classes.purger.deploy(@calldata).expect('purger deploy failed');
373373

374374
let purger = IPurgerDispatcher { contract_address: purger_addr };
375375

@@ -430,10 +430,10 @@ pub mod purger_utils {
430430

431431
let fl_class = match fl_class {
432432
Option::Some(class) => class,
433-
Option::None => declare("flash_liquidator"),
433+
Option::None => declare("flash_liquidator").unwrap(),
434434
};
435435

436-
let flash_liquidator_addr = fl_class.deploy(@calldata).expect('failed deploy flash liquidator');
436+
let (flash_liquidator_addr, _) = fl_class.deploy(@calldata).expect('flash liquidator deploy failed');
437437

438438
IFlashLiquidatorDispatcher { contract_address: flash_liquidator_addr }
439439
}
@@ -696,19 +696,19 @@ pub mod purger_utils {
696696

697697
pub fn declare_contracts() -> PurgerTestClasses {
698698
PurgerTestClasses {
699-
abbot: Option::Some(declare("abbot")),
700-
sentinel: Option::Some(declare("sentinel")),
701-
token: Option::Some(declare("erc20_mintable")),
702-
gate: Option::Some(declare("gate")),
703-
shrine: Option::Some(declare("shrine")),
704-
absorber: Option::Some(declare("absorber")),
705-
blesser: declare("blesser"),
706-
purger: declare("purger"),
707-
pragma: Option::Some(declare("pragma")),
708-
mock_pragma: Option::Some(declare("mock_pragma")),
709-
switchboard: Option::Some(declare("switchboard")),
710-
mock_switchboard: Option::Some(declare("mock_switchboard")),
711-
seer: Option::Some(declare("seer")),
699+
abbot: Option::Some(declare("abbot").unwrap()),
700+
sentinel: Option::Some(declare("sentinel").unwrap()),
701+
token: Option::Some(declare("erc20_mintable").unwrap()),
702+
gate: Option::Some(declare("gate").unwrap()),
703+
shrine: Option::Some(declare("shrine").unwrap()),
704+
absorber: Option::Some(declare("absorber").unwrap()),
705+
blesser: declare("blesser").unwrap(),
706+
purger: declare("purger").unwrap(),
707+
pragma: Option::Some(declare("pragma").unwrap()),
708+
mock_pragma: Option::Some(declare("mock_pragma").unwrap()),
709+
switchboard: Option::Some(declare("switchboard").unwrap()),
710+
mock_switchboard: Option::Some(declare("mock_switchboard").unwrap()),
711+
seer: Option::Some(declare("seer").unwrap()),
712712
}
713713
}
714714

‎src/tests/seer/test_seer.cairo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ mod test_seer {
431431
#[test]
432432
#[should_panic]
433433
fn test_update_prices_fails_with_wrong_yang_in_seer() {
434-
let token_class = Option::Some(declare("erc20_mintable"));
434+
let token_class = Option::Some(declare("erc20_mintable").unwrap());
435435
let (sentinel, shrine, _yangs, _gates) = sentinel_utils::deploy_sentinel_with_gates(
436436
Option::None, token_class, Option::None, Option::None,
437437
);

0 commit comments

Comments
 (0)