cairo-migrate 0.10

enitrat · Sep 25, 2022 · a9bce06 · a9bce06
1 parent 1069e03
commit a9bce06
Show file tree

Hide file tree

Showing 17 changed files with 817 additions and 817 deletions.
diff --git a/protostar.toml b/protostar.toml
@@ -1,5 +1,5 @@
 ["protostar.config"]
-protostar_version = "0.3.0"
+protostar_version = "0.4.2"
 
 ["protostar.project"]
 libs_path = "lib"

diff --git a/src/contracts/amm_wrapper.cairo b/src/contracts/amm_wrapper.cairo
@@ -5,51 +5,51 @@ from src.contracts.amm_wrapper_library import AmmWrapper
 from starkware.cairo.common.uint256 import Uint256
 
 @constructor
-func constructor{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}(
-    jediswap_router : felt, jediswap_factory : felt
-):
-    AmmWrapper.initializer(jediswap_router, jediswap_factory)
-    return ()
-end
+func constructor{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+    jediswap_router: felt, jediswap_factory: felt
+) {
+    AmmWrapper.initializer(jediswap_router, jediswap_factory);
+    return ();
+}
 
 @view
-func get_pair{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}(
-    token0 : felt, token1 : felt
-) -> (pair : felt):
-    return AmmWrapper.get_pair(token0, token1)
-end
+func get_pair{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+    token0: felt, token1: felt
+) -> (pair: felt) {
+    return AmmWrapper.get_pair(token0, token1);
+}
 
 @view
-func get_all_pairs{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}() -> (
-    all_pairs_len : felt, all_pairs : felt*
-):
-    return AmmWrapper.get_all_pairs()
-end
+func get_all_pairs{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() -> (
+    all_pairs_len: felt, all_pairs: felt*
+) {
+    return AmmWrapper.get_all_pairs();
+}
 
 @view
-func get_pair_token0{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}(
-    pair : felt
-) -> (token0 : felt):
-    return AmmWrapper.get_pair_token0(pair)
-end
+func get_pair_token0{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+    pair: felt
+) -> (token0: felt) {
+    return AmmWrapper.get_pair_token0(pair);
+}
 
 @view
-func get_pair_token1{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}(
-    pair : felt
-) -> (token1 : felt):
-    return AmmWrapper.get_pair_token1(pair)
-end
+func get_pair_token1{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+    pair: felt
+) -> (token1: felt) {
+    return AmmWrapper.get_pair_token1(pair);
+}
 
 @view
-func get_pair_reserves{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}(
-    pair : felt
-) -> (reserve_0 : Uint256, reserve_1 : Uint256):
-    return AmmWrapper.get_pair_reserves(pair)
-end
+func get_pair_reserves{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+    pair: felt
+) -> (reserve_0: Uint256, reserve_1: Uint256) {
+    return AmmWrapper.get_pair_reserves(pair);
+}
 
 @view
-func get_amounts_out{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}(
-    amount_in : Uint256, path_len : felt, path : felt*
-) -> (amounts_len : felt, amounts : Uint256*):
-    return AmmWrapper.get_amounts_out(amount_in, path_len, path)
-end
+func get_amounts_out{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+    amount_in: Uint256, path_len: felt, path: felt*
+) -> (amounts_len: felt, amounts: Uint256*) {
+    return AmmWrapper.get_amounts_out(amount_in, path_len, path);
+}
diff --git a/src/contracts/amm_wrapper_library.cairo b/src/contracts/amm_wrapper_library.cairo
@@ -9,82 +9,82 @@ from src.data_types.data_types import Pair, Node
 from starkware.cairo.common.alloc import alloc
 
 @storage_var
-func AmmWrapper_jediswap_router() -> (address : felt):
-end
+func AmmWrapper_jediswap_router() -> (address: felt) {
+}
 
 @storage_var
-func AmmWrapper_jediswap_factory() -> (address : felt):
-end
+func AmmWrapper_jediswap_factory() -> (address: felt) {
+}
 
-namespace AmmWrapper:
-    func initializer{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}(
-        jediswap_router : felt, jediswap_factory : felt
-    ):
-        AmmWrapper_jediswap_router.write(jediswap_router)
-        AmmWrapper_jediswap_factory.write(jediswap_factory)
-        return ()
-    end
+namespace AmmWrapper {
+    func initializer{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+        jediswap_router: felt, jediswap_factory: felt
+    ) {
+        AmmWrapper_jediswap_router.write(jediswap_router);
+        AmmWrapper_jediswap_factory.write(jediswap_factory);
+        return ();
+    }
 
-    func get_pair{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}(
-        token0 : felt, token1 : felt
-    ) -> (pair : felt):
-        let (factory_address) = AmmWrapper_jediswap_factory.read()
-        let (pair) = IFactory.get_pair(factory_address, token0, token1)
-        return (pair)
-    end
+    func get_pair{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+        token0: felt, token1: felt
+    ) -> (pair: felt) {
+        let (factory_address) = AmmWrapper_jediswap_factory.read();
+        let (pair) = IFactory.get_pair(factory_address, token0, token1);
+        return (pair,);
+    }
 
-    func get_parsed_pairs{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}():
-        let (parsed_pairs : Pair*) = alloc()
+    func get_parsed_pairs{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() {
+        let (parsed_pairs: Pair*) = alloc();
 
-        return ()
-    end
+        return ();
+    }
 
-    func get_pair_tokens{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}(
-        pair_address : felt
-    ) -> (pair : felt):
-        let (token0) = get_pair_token0(pair_address)
-        let (token1) = get_pair_token1(pair_address)
-        tempvar pair : Pair = Pair(token0, token1)
-        return (pair)
-    end
+    func get_pair_tokens{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+        pair_address: felt
+    ) -> (pair: felt) {
+        let (token0) = get_pair_token0(pair_address);
+        let (token1) = get_pair_token1(pair_address);
+        tempvar pair: Pair = Pair(token0, token1);
+        return (pair,);
+    }
 
-    func get_all_pairs{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}() -> (
-        all_pairs_len : felt, all_pairs : felt*
-    ):
-        let (factory_address) = AmmWrapper_jediswap_factory.read()
-        let (all_pairs_len, all_pairs) = IFactory.get_all_pairs(factory_address)
-        return (all_pairs_len, all_pairs)
-    end
+    func get_all_pairs{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() -> (
+        all_pairs_len: felt, all_pairs: felt*
+    ) {
+        let (factory_address) = AmmWrapper_jediswap_factory.read();
+        let (all_pairs_len, all_pairs) = IFactory.get_all_pairs(factory_address);
+        return (all_pairs_len, all_pairs);
+    }
 
-    func get_pair_token0{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}(
-        pair : felt
-    ) -> (token0 : felt):
-        let (token0) = IJediSwapPair.token0(pair)
-        return (token0)
-    end
+    func get_pair_token0{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+        pair: felt
+    ) -> (token0: felt) {
+        let (token0) = IJediSwapPair.token0(pair);
+        return (token0,);
+    }
 
-    func get_pair_token1{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}(
-        pair : felt
-    ) -> (token1 : felt):
-        let (token1) = IJediSwapPair.token1(pair)
-        return (token1)
-    end
+    func get_pair_token1{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+        pair: felt
+    ) -> (token1: felt) {
+        let (token1) = IJediSwapPair.token1(pair);
+        return (token1,);
+    }
 
-    func get_pair_reserves{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}(
-        pair : felt
-    ) -> (reserve_0 : Uint256, reserve_1 : Uint256):
-        let (reserve_0, reserve_1, _) = IJediSwapPair.get_reserves(pair)
-        return (reserve_0, reserve_1)
-    end
+    func get_pair_reserves{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+        pair: felt
+    ) -> (reserve_0: Uint256, reserve_1: Uint256) {
+        let (reserve_0, reserve_1, _) = IJediSwapPair.get_reserves(pair);
+        return (reserve_0, reserve_1);
+    }
 
-    func get_amounts_out{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}(
-        amount_in : Uint256, path_len : felt, path : felt*
-    ) -> (amounts_len : felt, amounts : Uint256*):
-        alloc_locals
-        let (router_address) = AmmWrapper_jediswap_router.read()
+    func get_amounts_out{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+        amount_in: Uint256, path_len: felt, path: felt*
+    ) -> (amounts_len: felt, amounts: Uint256*) {
+        alloc_locals;
+        let (router_address) = AmmWrapper_jediswap_router.read();
         let (amounts_len, amounts) = IRouter.get_amounts_out(
             router_address, amount_in, path_len, path
-        )
-        return (amounts_len, amounts)
-    end
-end
+        );
+        return (amounts_len, amounts);
+    }
+}
diff --git a/src/contracts/hubble.cairo b/src/contracts/hubble.cairo
@@ -7,37 +7,37 @@ from src.contracts.hubble_library import Hubble
 from cairo_graphs.data_types.data_types import Edge, Vertex
 
 @constructor
-func constructor{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}(
-    amm_wrapper_contract : felt
-):
-    Hubble.initializer(amm_wrapper_contract)
-    return ()
-end
+func constructor{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+    amm_wrapper_contract: felt
+) {
+    Hubble.initializer(amm_wrapper_contract);
+    return ();
+}
 
 @view
-func get_minimal_route{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}(
-    token_from : felt, token_to : felt
-) -> (path_len : felt, path : felt*, distance : felt):
-    return Hubble.get_minimal_route(token_from, token_to)
-end
+func get_minimal_route{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+    token_from: felt, token_to: felt
+) -> (path_len: felt, path: felt*, distance: felt) {
+    return Hubble.get_minimal_route(token_from, token_to);
+}
 
 @view
-func get_all_pairs{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}() -> (
-    pairs_len : felt, pairs : Edge*
-):
-    return Hubble.get_all_pairs()
-end
+func get_all_pairs{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() -> (
+    pairs_len: felt, pairs: Edge*
+) {
+    return Hubble.get_all_pairs();
+}
 
 @view
-func get_all_routes{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}(
-    token_from : felt, token_to : felt, max_hops : felt
-) -> (routes_len : felt, routes : felt*):
-    return Hubble.get_all_routes(token_from, token_to, max_hops)
-end
+func get_all_routes{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+    token_from: felt, token_to: felt, max_hops: felt
+) -> (routes_len: felt, routes: felt*) {
+    return Hubble.get_all_routes(token_from, token_to, max_hops);
+}
 
 @view
-func get_best_route{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}(
-    amount_in : Uint256, token_from : felt, token_to : felt, max_hops : felt
-) -> (route_len : felt, route : Uint256*, amount_out : Uint256):
-    return Hubble.get_best_route(amount_in, token_from, token_to, max_hops)
-end
+func get_best_route{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+    amount_in: Uint256, token_from: felt, token_to: felt, max_hops: felt
+) -> (route_len: felt, route: Uint256*, amount_out: Uint256) {
+    return Hubble.get_best_route(amount_in, token_from, token_to, max_hops);
+}