Migrate udc

Cargo.toml

@@ -31,7 +31,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.0.0-alpha.6"
+version = "1.0.0-alpha.7"
 edition = "2021"
 repository = "https://github.com/starkware-libs/cairo/"
 license = "Apache-2.0"
@@ -43,9 +43,8 @@ ark-ff = "0.4.0-alpha.7"
 ark-std = "0.3.0"
 assert_matches = "1.5"
 bimap = "0.6.2"
-cairo-felt = "0.1.1"
-cairo-vm = "0.1.2"
-chrono = "0.4.23"
+cairo-felt = "0.3.0-rc1"
+cairo-vm = "0.3.0-rc1"
 clap = { version = "4.0", features = ["derive"] }
 colored = "2"
 const-fnv1a-hash = "1.1.0"
@@ -57,16 +56,16 @@ genco = "0.17.0"
 good_lp = { version = "1.3.2", features = ["minilp"], default-features = false }
 id-arena = "2.2.1"
 ignore = "0.4.20"
-indexmap = "1.9.1"
-indoc = "1.0.7"
+indexmap = { version = "1.9.1", features = ["serde"] }
+indoc = "2.0.1"
 itertools = "0.10.3"
-lalrpop-util = { version = "0.19.8", features = ["lexer"] }
-lazy_static = "1.4.0"
+lalrpop-util = { version = "0.19.9", features = ["lexer"] }
 log = "0.4"
 lsp = { version = "0.93", package = "lsp-types" }
 num-bigint = "0.4"
 num-integer = "0.1"
 num-traits = "0.2"
+once_cell = "1.17.1"
 path-clean = "0.1.0"
 pretty_assertions = "1.2.1"
 proc-macro2 = "1.0"
@@ -78,12 +77,13 @@ scarb-metadata = "1.0.1"
 serde = { version = "1.0.130", features = ["derive"] }
 serde_json = "1.0"
 sha3 = "0.10.6"
-smol_str = "0.1.23"
+smol_str = { version = "0.2.0", features = ["serde"] }
 syn = { version = "1.0.99", features = ["full", "extra-traits"] }
 test-case = "2.2.2"
 test-case-macros = "2.2.2"
 test-log = "0.2.11"
 thiserror = "1.0.32"
+time = { version = "0.3.20", features = ["formatting", "macros", "local-offset"] }
 tokio = { version = "1.18.2", features = ["full", "sync"] }
 toml = "0.4.2"
 tower-lsp = "0.17.0"

Makefile

@@ -12,7 +12,7 @@ build:
 	cargo build
 
 test:
-	cargo run --bin cairo-test -- --starknet --path $(SOURCE_FOLDER)
+	cargo run --bin cairo-test -- --starknet $(SOURCE_FOLDER)
 
 format:
 	cargo run --bin cairo-format -- --recursive $(SOURCE_FOLDER) --print-parsing-errors

src/openzeppelin/lib.cairo

@@ -1,3 +1,4 @@
 mod security;
 mod token;
+mod utils;
 mod tests;

src/openzeppelin/security/initializable.cairo

@@ -1,7 +1,7 @@
 #[contract]
 mod Initializable {
     struct Storage {
-        initialized: bool,
+        initialized: bool
     }
 
     #[internal]

src/openzeppelin/security/pausable.cairo

@@ -4,7 +4,7 @@ mod Pausable {
     use starknet::get_caller_address;
 
     struct Storage {
-        paused: bool,
+        paused: bool
     }
 
     #[event]

src/openzeppelin/tests/test_erc20.cairo

@@ -84,7 +84,7 @@ fn test_approve() {
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('ERC20: approve from 0', ))]
+#[should_panic(expected: ('ERC20: approve from 0', ))]
 fn test_approve_from_zero() {
     let (owner, supply) = setup();
     let spender: ContractAddress = contract_address_const::<2>();
@@ -97,7 +97,7 @@ fn test_approve_from_zero() {
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('ERC20: approve to 0', ))]
+#[should_panic(expected: ('ERC20: approve to 0', ))]
 fn test_approve_to_zero() {
     let (owner, supply) = setup();
     let spender: ContractAddress = contract_address_const::<0>();
@@ -120,7 +120,7 @@ fn test__approve() {
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('ERC20: approve from 0', ))]
+#[should_panic(expected: ('ERC20: approve from 0', ))]
 fn test__approve_from_zero() {
     let owner: ContractAddress = contract_address_const::<0>();
     let spender: ContractAddress = contract_address_const::<1>();
@@ -130,7 +130,7 @@ fn test__approve_from_zero() {
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('ERC20: approve to 0', ))]
+#[should_panic(expected: ('ERC20: approve to 0', ))]
 fn test__approve_to_zero() {
     let (owner, supply) = setup();
 
@@ -170,7 +170,7 @@ fn test__transfer() {
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('u256_sub Overflow', ))]
+#[should_panic(expected: ('u256_sub Overflow', ))]
 fn test__transfer_not_enough_balance() {
     let (sender, supply) = setup();
 
@@ -181,7 +181,7 @@ fn test__transfer_not_enough_balance() {
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('ERC20: transfer from 0', ))]
+#[should_panic(expected: ('ERC20: transfer from 0', ))]
 fn test__transfer_from_zero() {
     let sender: ContractAddress = contract_address_const::<0>();
     let recipient: ContractAddress = contract_address_const::<1>();
@@ -191,7 +191,7 @@ fn test__transfer_from_zero() {
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('ERC20: transfer to 0', ))]
+#[should_panic(expected: ('ERC20: transfer to 0', ))]
 fn test__transfer_to_zero() {
     let (sender, supply) = setup();
 
@@ -245,7 +245,7 @@ fn test_transfer_from_doesnt_consume_infinite_allowance() {
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('u256_sub Overflow', ))]
+#[should_panic(expected: ('u256_sub Overflow', ))]
 fn test_transfer_from_greater_than_allowance() {
     let (owner, supply) = setup();
 
@@ -263,7 +263,7 @@ fn test_transfer_from_greater_than_allowance() {
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('ERC20: transfer to 0', ))]
+#[should_panic(expected: ('ERC20: transfer to 0', ))]
 fn test_transfer_from_to_zero_address() {
     let (owner, supply) = setup();
 
@@ -280,7 +280,7 @@ fn test_transfer_from_to_zero_address() {
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('u256_sub Overflow', ))]
+#[should_panic(expected: ('u256_sub Overflow', ))]
 fn test_transfer_from_from_zero_address() {
     let (owner, supply) = setup();
 
@@ -312,7 +312,7 @@ fn test_increase_allowance() {
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('ERC20: approve to 0', ))]
+#[should_panic(expected: ('ERC20: approve to 0', ))]
 fn test_increase_allowance_to_zero_address() {
     let (owner, supply) = setup();
 
@@ -324,7 +324,7 @@ fn test_increase_allowance_to_zero_address() {
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('ERC20: approve from 0', ))]
+#[should_panic(expected: ('ERC20: approve from 0', ))]
 fn test_increase_allowance_from_zero_address() {
     let (owner, supply) = setup();
 
@@ -355,7 +355,7 @@ fn test_decrease_allowance() {
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('u256_sub Overflow', ))]
+#[should_panic(expected: ('u256_sub Overflow', ))]
 fn test_decrease_allowance_to_zero_address() {
     let (owner, supply) = setup();
 
@@ -367,7 +367,7 @@ fn test_decrease_allowance_to_zero_address() {
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('u256_sub Overflow', ))]
+#[should_panic(expected: ('u256_sub Overflow', ))]
 fn test_decrease_allowance_from_zero_address() {
     let (owner, supply) = setup();
 
@@ -423,7 +423,7 @@ fn test__mint() {
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('ERC20: mint to 0', ))]
+#[should_panic(expected: ('ERC20: mint to 0', ))]
 fn test__mint_to_zero() {
     let minter: ContractAddress = contract_address_const::<0>();
     let amount: u256 = u256_from_felt252(100);
@@ -445,7 +445,7 @@ fn test__burn() {
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('ERC20: burn from 0', ))]
+#[should_panic(expected: ('ERC20: burn from 0', ))]
 fn test__burn_from_zero() {
     setup();
     let zero_address: ContractAddress = contract_address_const::<0>();

src/openzeppelin/tests/test_initializable.cairo

@@ -3,14 +3,14 @@ use openzeppelin::security::initializable::Initializable;
 #[test]
 #[available_gas(2000000)]
 fn test_initialize() {
-    assert(!Initializable::is_initialized(),'Should not be initialized');
+    assert(!Initializable::is_initialized(), 'Should not be initialized');
     Initializable::initialize();
-    assert(Initializable::is_initialized(),'Should be initialized');
+    assert(Initializable::is_initialized(), 'Should be initialized');
 }
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('Contract already initialized', ))]
+#[should_panic(expected: ('Contract already initialized', ))]
 fn test_initialize_when_initialized() {
     Initializable::initialize();
     Initializable::initialize();

src/openzeppelin/tests/test_pausable.cairo

@@ -3,7 +3,7 @@ use openzeppelin::tests::mocks::mock_pausable::MockPausable;
 #[test]
 #[available_gas(2000000)]
 fn test_pause_when_unpaused() {
-    assert(! MockPausable::is_paused(), 'Should not be paused');
+    assert(!MockPausable::is_paused(), 'Should not be paused');
     assert(MockPausable::get_count() == 0, 'Should be 0');
     MockPausable::assert_unpaused_and_increment();
     assert(MockPausable::get_count() == 1, 'Should increment');
@@ -13,15 +13,15 @@ fn test_pause_when_unpaused() {
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('Pausable: paused', ))]
+#[should_panic(expected: ('Pausable: paused', ))]
 fn test_pause_when_paused() {
     MockPausable::pause();
     MockPausable::pause();
 }
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('Pausable: paused', ))]
+#[should_panic(expected: ('Pausable: paused', ))]
 fn test_pause_increment() {
     MockPausable::pause();
     MockPausable::assert_unpaused_and_increment();
@@ -33,15 +33,15 @@ fn test_unpause_when_paused() {
     MockPausable::pause();
     assert(MockPausable::is_paused(), 'Should be paused');
     MockPausable::unpause();
-    assert(! MockPausable::is_paused(), 'Should not be paused');
+    assert(!MockPausable::is_paused(), 'Should not be paused');
     MockPausable::assert_unpaused_and_increment();
     assert(MockPausable::get_count() == 1, 'Should increment');
 }
 
 #[test]
 #[available_gas(2000000)]
-#[should_panic(expected = ('Pausable: not paused', ))]
+#[should_panic(expected: ('Pausable: not paused', ))]
 fn test_unpause_when_unpaused() {
-    assert(! MockPausable::is_paused(), 'Should be unpaused');
+    assert(!MockPausable::is_paused(), 'Should be unpaused');
     MockPausable::unpause();
 }

src/openzeppelin/token/erc20.cairo

@@ -17,7 +17,6 @@ mod ERC20 {
     use openzeppelin::token::erc20::IERC20;
     use starknet::get_caller_address;
     use starknet::ContractAddress;
-    use starknet::ContractAddressZeroable;
     use zeroable::Zeroable;
 
     struct Storage {

src/openzeppelin/utils.cairo

@@ -0,0 +1 @@
+mod udc;

src/openzeppelin/utils/udc.cairo

@@ -0,0 +1,64 @@
+use starknet::class_hash::ClassHash;
+use starknet::ContractAddress;
+
+// TODO: Fix trait impl errors in abi
+// #[abi]
+trait IUniversalDeployerContract {
+    #[event]
+    fn ContractDeployed(
+        address: ContractAddress,
+        deployer: ContractAddress,
+        unique: bool,
+        class_hash: ClassHash,
+        calldata: Array<felt252>,
+        salt: felt252,
+    );
+    #[external]
+    fn deploy_contract(
+        class_hash: ClassHash, salt: felt252, unique: bool, calldata: Array<felt252>
+    ) -> ContractAddress;
+}
+
+#[contract]
+mod UniversalDeployerContract {
+    use array::ArrayTrait;
+    use hash::pedersen;
+    use starknet::class_hash::ClassHash;
+    use starknet::ContractAddress;
+    use starknet::get_caller_address;
+    use traits::Into;
+
+    #[event]
+    fn ContractDeployed(
+        address: ContractAddress,
+        deployer: ContractAddress,
+        unique: bool,
+        class_hash: ClassHash,
+        calldata: Array<felt252>,
+        salt: felt252,
+    ) {}
+
+    #[external]
+    fn deploy_contract(
+        class_hash: ClassHash, salt: felt252, unique: bool, calldata: Array<felt252>
+    ) -> ContractAddress {
+        let deployer: ContractAddress = get_caller_address();
+
+        // Defaults for non-unique deployment
+        let mut _salt: felt252 = salt;
+        let mut from_zero: bool = true;
+
+        if unique {
+            _salt = pedersen(deployer.into(), salt);
+            from_zero = false;
+        }
+
+        let (address, _) = starknet::syscalls::deploy_syscall(
+            class_hash, _salt, calldata.span(), from_zero
+        ).unwrap_syscall();
+
+        ContractDeployed(address, deployer, unique, class_hash, calldata, salt);
+
+        return address;
+    }
+}