diff --git a/apps/data-backend/src/routes/indexer/deploy-launch.ts b/apps/data-backend/src/routes/indexer/deploy-launch.ts index c45526d0e..226f2e437 100644 --- a/apps/data-backend/src/routes/indexer/deploy-launch.ts +++ b/apps/data-backend/src/routes/indexer/deploy-launch.ts @@ -9,11 +9,13 @@ const Router = express.Router() Router.get('/', async (req, res) => { try { - const launchs = await prisma.token_launch.findMany({}) - // console.log("launchs", launchs) - res.status(HTTPStatus.OK).json(launchs) + const launches = await prisma.token_launch.findMany({}) + // console.log("launches", launches) + res.status(HTTPStatus.OK).json({ + data:launches + }) // res.status(HTTPStatus.OK).json({ - // data: launchs + // data: launches // }) } catch (error) { res.status(HTTPStatus.InternalServerError).send(error) diff --git a/apps/mobile/src/screens/Launchpad/LaunchpadComponent.tsx b/apps/mobile/src/screens/Launchpad/LaunchpadComponent.tsx index 16f54dae1..8d8e439b0 100644 --- a/apps/mobile/src/screens/Launchpad/LaunchpadComponent.tsx +++ b/apps/mobile/src/screens/Launchpad/LaunchpadComponent.tsx @@ -27,9 +27,7 @@ export const LaunchpadComponent: React.FC = ({ const {show: showKeyModal} = useKeyModal(); const {show: showModal} = useTokenCreatedModal(); const [menuOpen, setMenuOpen] = useState(false); - const {data: launchs} = useGetTokenLaunch(); - // console.log("Launchs", launchs) - + // const {data: launches} = useGetTokenLaunch(); const {publicKey} = useAuth(); // const width = Dimensions.get("window").width // const isDesktop = width >= 1024 diff --git a/onchain/cairo/.snfoundry_cache/.prev_tests_failed b/onchain/cairo/.snfoundry_cache/.prev_tests_failed index 469d04a97..1af55ad8c 100644 --- a/onchain/cairo/.snfoundry_cache/.prev_tests_failed +++ b/onchain/cairo/.snfoundry_cache/.prev_tests_failed @@ -1,16 +1,16 @@ -afk::social::account::tests::wrong_token -afk::social::account::tests::get_public_key -afk::social::account::tests::successful_transfer -afk::social::account::tests::incorrect_signature -afk::social::account::tests::wrong_recipient -afk::social::account::tests::wrong_sender -afk::social::namespace::tests::link_incorrect_signature -afk::social::namespace::tests::linked_wallet_to afk::social::account::tests::double_transfer afk::social::account::tests::is_valid_signature afk::social::account::tests::validate_transaction -afk::tests::launchpad_tests::launchpad_tests::launchpad_integration -afk::tests::launchpad_tests::launchpad_tests::launchpad_buy_more_then_liquidity_threshold +afk::social::namespace::tests::link_incorrect_signature +afk::social::namespace::tests::linked_wallet_to afk::social::deposit::tests::deposit_claim -afk::social::deposit::tests::claim_incorrect_gas_amount afk::social::deposit::tests::deposit_claim_gas_fee +afk::social::deposit::tests::claim_incorrect_gas_amount +afk::social::account::tests::get_public_key +afk::social::account::tests::successful_transfer +afk::social::account::tests::incorrect_signature +afk::social::account::tests::wrong_sender +afk::social::account::tests::wrong_recipient +afk::social::account::tests::wrong_token +afk::tests::launchpad_tests::launchpad_tests::launchpad_buy_more_then_liquidity_threshold +afk::tests::launchpad_tests::launchpad_tests::launchpad_integration diff --git a/onchain/cairo/src/afk_id.cairo b/onchain/cairo/src/afk_id.cairo new file mode 100644 index 000000000..ac7fe4fb1 --- /dev/null +++ b/onchain/cairo/src/afk_id.cairo @@ -0,0 +1 @@ +pub mod afk_id; diff --git a/onchain/cairo/src/id/afk_id.cairo b/onchain/cairo/src/afk_id/afk_identity.cairo similarity index 95% rename from onchain/cairo/src/id/afk_id.cairo rename to onchain/cairo/src/afk_id/afk_identity.cairo index 8166f6529..156bbc0ac 100644 --- a/onchain/cairo/src/id/afk_id.cairo +++ b/onchain/cairo/src/afk_id/afk_identity.cairo @@ -3,6 +3,9 @@ use starknet::{ contract_address_const, get_block_timestamp, get_contract_address, ClassHash }; +use afk::types::identity_types:: { + +}; #[starknet::interface] pub trait IAfkId { } diff --git a/onchain/cairo/src/id/factory.cairo b/onchain/cairo/src/afk_id/id_factory.cairo similarity index 67% rename from onchain/cairo/src/id/factory.cairo rename to onchain/cairo/src/afk_id/id_factory.cairo index 587556047..75f67d0e8 100644 --- a/onchain/cairo/src/id/factory.cairo +++ b/onchain/cairo/src/afk_id/id_factory.cairo @@ -3,6 +3,10 @@ use starknet::{ contract_address_const, get_block_timestamp, get_contract_address, ClassHash }; +use afk::types::identity_types::{ + AfkIdentiyState +}; + #[starknet::interface] pub trait IFactoryAfkId { fn get_afk_id(self: @T, user:ContractAddress) -> AfkIdentiyState; @@ -16,15 +20,15 @@ mod FactoryAfkIdentity { contract_address_const, get_block_timestamp, get_contract_address, ClassHash }; use core::num::traits::Zero; + use afk::types::identity_types::{ + AfkIdentiyState, + AfkIdentityCreated + }; #[storage] struct Storage { - id_user_exist:LegacyMap - } - - #[event] - #[derive(Drop, starknet::Event)] - enum Event { + id_user_exist:LegacyMap, + user_identity:LegacyMap } #[abi(embed_v0)] @@ -34,8 +38,8 @@ mod FactoryAfkIdentity { } - fn get_afk_id(self:@ContractState, user:ContractAddress) { - + fn get_afk_id(self:@ContractState, user:ContractAddress) -> AfkIdentiyState { + self.user_identity.read(user) } } } diff --git a/onchain/cairo/src/afk_id/mod.cairo b/onchain/cairo/src/afk_id/mod.cairo new file mode 100644 index 000000000..3cbb53faf --- /dev/null +++ b/onchain/cairo/src/afk_id/mod.cairo @@ -0,0 +1,4 @@ +pub mod afk_id { + pub mod afk_identity; + pub mod id_factory; +} diff --git a/onchain/cairo/src/launchpad/launchpad.cairo b/onchain/cairo/src/launchpad/launchpad.cairo index 3beca7e6c..7968866f2 100644 --- a/onchain/cairo/src/launchpad/launchpad.cairo +++ b/onchain/cairo/src/launchpad/launchpad.cairo @@ -704,15 +704,15 @@ mod LaunchpadMarketplace { fn get_all_launch(self: @ContractState) -> Span { let max_key_id = self.total_launch.read() + 1; - let mut launchs: Array = ArrayTrait::new(); + let mut launches: Array = ArrayTrait::new(); let mut i = 0; //Since the stream id starts from 0 loop { if i >= max_key_id {} let pool = self.array_launched_coins.read(i); if pool.owner.is_zero() { - break launchs.span(); + break launches.span(); } - launchs.append(pool); + launches.append(pool); i += 1; } } diff --git a/onchain/cairo/src/lib.cairo b/onchain/cairo/src/lib.cairo index 78772d99f..6652e9c12 100644 --- a/onchain/cairo/src/lib.cairo +++ b/onchain/cairo/src/lib.cairo @@ -5,15 +5,23 @@ pub mod launchpad; pub mod sha256; pub mod social; pub mod utils; +pub mod quests { + pub mod tap; +} + +pub mod afk_id { + pub mod afk_identity; + pub mod id_factory; +} + pub mod types { pub mod jediswap_types; pub mod keys_types; pub mod launchpad_types; pub mod tap_types; + pub mod identity_types; } -pub mod quests { - pub mod tap; -} + pub mod examples { pub mod counter; diff --git a/onchain/cairo/src/types/identity_types.cairo b/onchain/cairo/src/types/identity_types.cairo new file mode 100644 index 000000000..b3a727391 --- /dev/null +++ b/onchain/cairo/src/types/identity_types.cairo @@ -0,0 +1,21 @@ +use starknet::{ContractAddress}; + +pub const ADMIN_ROLE: felt252 = selector!("ADMIN_ROLE"); + +#[derive(Drop, Copy, starknet::Store, Serde)] +pub struct AfkIdentiyState { + pub owner: ContractAddress, + pub last_tap:u64, + pub total_tap:u256, + pub token_address:ContractAddress, +} + + +#[derive(Drop, starknet::Event)] +pub struct AfkIdentityCreated { + #[key] + pub owner: ContractAddress, + pub last_tap:u64, + pub total_tap:u256, +} + diff --git a/onchain/cairo/src/types/mod.cairo b/onchain/cairo/src/types/mod.cairo index 16640da91..93b6bf75b 100644 --- a/onchain/cairo/src/types/mod.cairo +++ b/onchain/cairo/src/types/mod.cairo @@ -3,4 +3,5 @@ pub mod types { pub mod keys_types; pub mod launchpad_types; pub mod tap_types; + pub mod identity_types; }