Skip to content

Commit dbf2d03

Browse files
CoveMBericglau
CoveMB
and
ericglau
authored
Fix access control dependency access (#608)
Co-authored-by: Eric Lau <[email protected]>
1 parent 6bbb326 commit dbf2d03

File tree

8 files changed

+37
-32
lines changed

8 files changed

+37
-32
lines changed

‎.changeset/shy-results-like.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@openzeppelin/wizard-stellar': patch
3+
---
4+
5+
Fixe access control dependency import to import from `stellar_access` instead of `stellar_contract_utils`

‎packages/core/stellar/src/fungible.test.ts.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Generated by [AVA](https://avajs.dev).
8181
#![no_std]␊
8282
␊
8383
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
84-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
84+
use stellar_access::ownable::{self as ownable, Ownable};␊
8585
use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
8686
use stellar_macros::{default_impl, only_owner, when_not_paused};␊
8787
use stellar_tokens::fungible::{Base, FungibleToken};␊
@@ -148,7 +148,7 @@ Generated by [AVA](https://avajs.dev).
148148
#![no_std]␊
149149
␊
150150
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
151-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
151+
use stellar_access::ownable::{self as ownable, Ownable};␊
152152
use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
153153
use stellar_macros::{default_impl, only_owner, when_not_paused};␊
154154
use stellar_tokens::fungible::{Base, burnable::FungibleBurnable, FungibleToken};␊
@@ -323,7 +323,7 @@ Generated by [AVA](https://avajs.dev).
323323
#![no_std]␊
324324
␊
325325
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
326-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
326+
use stellar_access::ownable::{self as ownable, Ownable};␊
327327
use stellar_macros::default_impl;␊
328328
use stellar_tokens::fungible::{Base, FungibleToken};␊
329329
␊
@@ -363,7 +363,7 @@ Generated by [AVA](https://avajs.dev).
363363
#![no_std]␊
364364
␊
365365
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
366-
use stellar_contract_utils::access_control::{self as access_control, AccessControl};␊
366+
use stellar_access::access_control::{self as access_control, AccessControl};␊
367367
use stellar_macros::default_impl;␊
368368
use stellar_tokens::fungible::{Base, FungibleToken};␊
369369
␊
@@ -403,7 +403,7 @@ Generated by [AVA](https://avajs.dev).
403403
#![no_std]␊
404404
␊
405405
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
406-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
406+
use stellar_access::ownable::{self as ownable, Ownable};␊
407407
use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
408408
use stellar_macros::{default_impl, only_owner, when_not_paused};␊
409409
use stellar_tokens::fungible::{Base, burnable::FungibleBurnable, FungibleToken};␊
@@ -494,7 +494,7 @@ Generated by [AVA](https://avajs.dev).
494494
#![no_std]␊
495495
␊
496496
use soroban_sdk::{Address, contract, contractimpl, Env, String, Symbol};␊
497-
use stellar_contract_utils::access_control::{self as access_control, AccessControl};␊
497+
use stellar_access::access_control::{self as access_control, AccessControl};␊
498498
use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
499499
use stellar_contract_utils::upgradeable::UpgradeableInternal;␊
500500
use stellar_macros::{default_impl, only_role, Upgradeable, when_not_paused};␊
@@ -604,7 +604,7 @@ Generated by [AVA](https://avajs.dev).
604604
#![no_std]␊
605605
␊
606606
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
607-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
607+
use stellar_access::ownable::{self as ownable, Ownable};␊
608608
use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
609609
use stellar_contract_utils::upgradeable::UpgradeableInternal;␊
610610
use stellar_macros::{default_impl, only_owner, Upgradeable, when_not_paused};␊

‎packages/core/stellar/src/fungible.test.ts.snap

3 Bytes
Binary file not shown.

‎packages/core/stellar/src/non-fungible.test.ts.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Generated by [AVA](https://avajs.dev).
8787
#![no_std]␊
8888
␊
8989
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
90-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
90+
use stellar_access::ownable::{self as ownable, Ownable};␊
9191
use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
9292
use stellar_macros::{default_impl, only_owner, when_not_paused};␊
9393
use stellar_tokens::non_fungible::{Base, NonFungibleToken};␊
@@ -157,7 +157,7 @@ Generated by [AVA](https://avajs.dev).
157157
#![no_std]␊
158158
␊
159159
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
160-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
160+
use stellar_access::ownable::{self as ownable, Ownable};␊
161161
use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
162162
use stellar_macros::{default_impl, only_owner, when_not_paused};␊
163163
use stellar_tokens::non_fungible::{Base, burnable::NonFungibleBurnable, NonFungibleToken};␊
@@ -244,7 +244,7 @@ Generated by [AVA](https://avajs.dev).
244244
#![no_std]␊
245245
␊
246246
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
247-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
247+
use stellar_access::ownable::{self as ownable, Ownable};␊
248248
use stellar_macros::{default_impl, only_owner};␊
249249
use stellar_tokens::non_fungible::{Base, NonFungibleToken};␊
250250
␊
@@ -335,7 +335,7 @@ Generated by [AVA](https://avajs.dev).
335335
#![no_std]␊
336336
␊
337337
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
338-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
338+
use stellar_access::ownable::{self as ownable, Ownable};␊
339339
use stellar_macros::{default_impl, only_owner};␊
340340
use stellar_tokens::non_fungible::{␊
341341
Base, consecutive::{NonFungibleConsecutive, Consecutive}, NonFungibleToken␊
@@ -392,7 +392,7 @@ Generated by [AVA](https://avajs.dev).
392392
#![no_std]␊
393393
␊
394394
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
395-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
395+
use stellar_access::ownable::{self as ownable, Ownable};␊
396396
use stellar_macros::{default_impl, only_owner};␊
397397
use stellar_tokens::non_fungible::{␊
398398
Base, burnable::NonFungibleBurnable, consecutive::{NonFungibleConsecutive, Consecutive},␊
@@ -454,7 +454,7 @@ Generated by [AVA](https://avajs.dev).
454454
#![no_std]␊
455455
␊
456456
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
457-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
457+
use stellar_access::ownable::{self as ownable, Ownable};␊
458458
use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
459459
use stellar_macros::{default_impl, only_owner, when_not_paused};␊
460460
use stellar_tokens::non_fungible::{␊
@@ -539,7 +539,7 @@ Generated by [AVA](https://avajs.dev).
539539
#![no_std]␊
540540
␊
541541
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
542-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
542+
use stellar_access::ownable::{self as ownable, Ownable};␊
543543
use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
544544
use stellar_macros::{default_impl, only_owner, when_not_paused};␊
545545
use stellar_tokens::non_fungible::{␊
@@ -671,7 +671,7 @@ Generated by [AVA](https://avajs.dev).
671671
#![no_std]␊
672672
␊
673673
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
674-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
674+
use stellar_access::ownable::{self as ownable, Ownable};␊
675675
use stellar_contract_utils::upgradeable::UpgradeableInternal;␊
676676
use stellar_macros::{default_impl, only_owner, Upgradeable};␊
677677
use stellar_tokens::non_fungible::{Base, NonFungibleToken};␊
@@ -723,7 +723,7 @@ Generated by [AVA](https://avajs.dev).
723723
#![no_std]␊
724724
␊
725725
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
726-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
726+
use stellar_access::ownable::{self as ownable, Ownable};␊
727727
use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
728728
use stellar_contract_utils::upgradeable::UpgradeableInternal;␊
729729
use stellar_macros::{default_impl, only_owner, Upgradeable, when_not_paused};␊
@@ -831,7 +831,7 @@ Generated by [AVA](https://avajs.dev).
831831
#![no_std]␊
832832
␊
833833
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
834-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
834+
use stellar_access::ownable::{self as ownable, Ownable};␊
835835
use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
836836
use stellar_macros::{default_impl, only_owner, when_not_paused};␊
837837
use stellar_tokens::non_fungible::{Base, burnable::NonFungibleBurnable, NonFungibleToken};␊

‎packages/core/stellar/src/non-fungible.test.ts.snap

2 Bytes
Binary file not shown.

‎packages/core/stellar/src/set-access-control.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ export function setAccessControl(c: ContractBuilder, access: Access): void {
2121
if (!c.ownable) {
2222
c.ownable = true;
2323
c.addUseClause('soroban_sdk', 'Address');
24-
c.addUseClause('stellar_contract_utils::ownable', 'self', { alias: 'ownable' });
25-
c.addUseClause('stellar_contract_utils::ownable', 'Ownable');
24+
c.addUseClause('stellar_access::ownable', 'self', { alias: 'ownable' });
25+
c.addUseClause('stellar_access::ownable', 'Ownable');
2626

2727
const ownableTrait = {
2828
traitName: 'Ownable',
@@ -39,8 +39,8 @@ export function setAccessControl(c: ContractBuilder, access: Access): void {
3939
}
4040
case 'roles': {
4141
c.addUseClause('soroban_sdk', 'Address');
42-
c.addUseClause('stellar_contract_utils::access_control', 'self', { alias: 'access_control' });
43-
c.addUseClause('stellar_contract_utils::access_control', 'AccessControl');
42+
c.addUseClause('stellar_access::access_control', 'self', { alias: 'access_control' });
43+
c.addUseClause('stellar_access::access_control', 'AccessControl');
4444

4545
const accessControltrait = {
4646
traitName: 'AccessControl',

‎packages/core/stellar/src/stablecoin.test.ts.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Generated by [AVA](https://avajs.dev).
8181
#![no_std]␊
8282
␊
8383
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
84-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
84+
use stellar_access::ownable::{self as ownable, Ownable};␊
8585
use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
8686
use stellar_macros::{default_impl, only_owner, when_not_paused};␊
8787
use stellar_tokens::fungible::{Base, FungibleToken};␊
@@ -148,7 +148,7 @@ Generated by [AVA](https://avajs.dev).
148148
#![no_std]␊
149149
␊
150150
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
151-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
151+
use stellar_access::ownable::{self as ownable, Ownable};␊
152152
use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
153153
use stellar_macros::{default_impl, only_owner, when_not_paused};␊
154154
use stellar_tokens::fungible::{Base, burnable::FungibleBurnable, FungibleToken};␊
@@ -323,7 +323,7 @@ Generated by [AVA](https://avajs.dev).
323323
#![no_std]␊
324324
␊
325325
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
326-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
326+
use stellar_access::ownable::{self as ownable, Ownable};␊
327327
use stellar_macros::default_impl;␊
328328
use stellar_tokens::fungible::{Base, FungibleToken};␊
329329
␊
@@ -363,7 +363,7 @@ Generated by [AVA](https://avajs.dev).
363363
#![no_std]␊
364364
␊
365365
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
366-
use stellar_contract_utils::access_control::{self as access_control, AccessControl};␊
366+
use stellar_access::access_control::{self as access_control, AccessControl};␊
367367
use stellar_macros::default_impl;␊
368368
use stellar_tokens::fungible::{Base, FungibleToken};␊
369369
␊
@@ -403,7 +403,7 @@ Generated by [AVA](https://avajs.dev).
403403
#![no_std]␊
404404
␊
405405
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
406-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
406+
use stellar_access::ownable::{self as ownable, Ownable};␊
407407
use stellar_macros::{default_impl, only_owner};␊
408408
use stellar_tokens::fungible::{␊
409409
allowlist::{AllowList, FungibleAllowList}, Base, FungibleToken␊
@@ -466,7 +466,7 @@ Generated by [AVA](https://avajs.dev).
466466
#![no_std]␊
467467
␊
468468
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
469-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
469+
use stellar_access::ownable::{self as ownable, Ownable};␊
470470
use stellar_macros::{default_impl, only_owner};␊
471471
use stellar_tokens::fungible::{␊
472472
Base, blocklist::{BlockList, FungibleBlockList}, FungibleToken␊
@@ -529,7 +529,7 @@ Generated by [AVA](https://avajs.dev).
529529
#![no_std]␊
530530
␊
531531
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
532-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
532+
use stellar_access::ownable::{self as ownable, Ownable};␊
533533
use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
534534
use stellar_macros::{default_impl, only_owner, when_not_paused};␊
535535
use stellar_tokens::fungible::{␊
@@ -639,7 +639,7 @@ Generated by [AVA](https://avajs.dev).
639639
#![no_std]␊
640640
␊
641641
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
642-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
642+
use stellar_access::ownable::{self as ownable, Ownable};␊
643643
use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
644644
use stellar_macros::{default_impl, only_owner, when_not_paused};␊
645645
use stellar_tokens::fungible::{␊
@@ -749,7 +749,7 @@ Generated by [AVA](https://avajs.dev).
749749
#![no_std]␊
750750
␊
751751
use soroban_sdk::{Address, contract, contractimpl, Env, String, Symbol};␊
752-
use stellar_contract_utils::access_control::{self as access_control, AccessControl};␊
752+
use stellar_access::access_control::{self as access_control, AccessControl};␊
753753
use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
754754
use stellar_macros::{default_impl, only_role, when_not_paused};␊
755755
use stellar_tokens::fungible::{␊
@@ -869,7 +869,7 @@ Generated by [AVA](https://avajs.dev).
869869
#![no_std]␊
870870
␊
871871
use soroban_sdk::{Address, contract, contractimpl, Env, String, Symbol};␊
872-
use stellar_contract_utils::access_control::{self as access_control, AccessControl};␊
872+
use stellar_access::access_control::{self as access_control, AccessControl};␊
873873
use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
874874
use stellar_macros::{default_impl, only_role, when_not_paused};␊
875875
use stellar_tokens::fungible::{␊
@@ -989,7 +989,7 @@ Generated by [AVA](https://avajs.dev).
989989
#![no_std]␊
990990
␊
991991
use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
992-
use stellar_contract_utils::ownable::{self as ownable, Ownable};␊
992+
use stellar_access::ownable::{self as ownable, Ownable};␊
993993
use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
994994
use stellar_macros::{default_impl, only_owner, when_not_paused};␊
995995
use stellar_tokens::fungible::{Base, burnable::FungibleBurnable, FungibleToken};␊

‎packages/core/stellar/src/stablecoin.test.ts.snap

6 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)