Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@hthieu1110
hthieu1110 committed Oct 16, 2024
2 parents 2a7df9d + c81b3c3 commit 3beae23
Show file tree
Hide file tree
Showing 24 changed files with 406 additions and 412 deletions.
129 changes: 0 additions & 129 deletions api/launchpad/v1/launchpad.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ service LaunchpadService {
rpc UploadMetadatas(UploadMetadatasRequest) returns (UploadMetadatasResponse);
rpc CalculateCollectionMerkleRoot(CalculateCollectionMerkleRootRequest) returns (CalculateCollectionMerkleRootResponse);
rpc TokenMetadata(TokenMetadataRequest) returns (TokenMetadataResponse);
// rpc CollectionsByCreator(CollectionsByCreatorRequest) returns (CollectionsByCreatorResponse);
rpc LaunchpadProjectsByCreator(LaunchpadProjectsByCreatorRequest) returns (LaunchpadProjectsByCreatorResponse);
rpc LaunchpadProjects(LaunchpadProjectsRequest) returns (LaunchpadProjectsResponse);
rpc LaunchpadProjectById(LaunchpadProjectByIdRequest) returns (LaunchpadProjectByIdResponse);
Expand Down Expand Up @@ -35,20 +34,6 @@ enum Status {

// -------------------------------

// message CollectionsByCreatorRequest {
// string creator_id = 1;
// string network_id = 2;
// int32 limit = 3;
// int32 offset = 4;
// Sort sort = 5;
// SortDirection sort_direction = 6;
// optional Status status = 7;
// }

// message CollectionsByCreatorResponse {
// repeated string collections = 1;
// }

message LaunchpadProjectsByCreatorRequest {
string creator_id = 1;
string network_id = 2;
Expand All @@ -57,8 +42,6 @@ message LaunchpadProjectsByCreatorRequest {
Sort sort = 5;
SortDirection sort_direction = 6;
optional Status status = 7;
// TODO: user authentication (Member of the admin DAO) using a token
// string user_address = 8;
}

message LaunchpadProjectsByCreatorResponse {
Expand All @@ -72,8 +55,6 @@ message LaunchpadProjectsRequest {
Sort sort = 4;
SortDirection sort_direction = 5;
optional Status status = 6;
// TODO: user authentication (Member of the admin DAO) using a token
// string user_address = 7;
}

message LaunchpadProjectsResponse {
Expand All @@ -83,8 +64,6 @@ message LaunchpadProjectsResponse {
message LaunchpadProjectByIdRequest {
string network_id = 1;
string project_id = 2;
// TODO: user authentication (Member of the admin DAO) using a token
// string user_address = 3;
}

message LaunchpadProjectByIdResponse {
Expand Down Expand Up @@ -128,8 +107,6 @@ message TokenMetadataResponse {
message LaunchpadProjectsCountRequest {
string network_id = 1;
optional Status status = 2;
// TODO: user authentication (Member of the admin DAO) using a token
// string user_address = 3;
}

message LaunchpadProjectsCountResponse {
Expand Down Expand Up @@ -167,110 +144,4 @@ message Trait {
string value = 3;
}

// message UpdateCollectionWhitelistsRequest {
// string sender = 1;
// string network_id = 2;
// uint32 project_id = 3;
// repeated WhitelistMintInfo whitelist_mint_infos = 4;
// }

// message UpdateCollectionWhitelistsResponse {
// repeated string merkle_roots = 1;
// }

// message WhitelistedAddressMerkleInfoRequest {
// string sender = 1;
// string network_id = 2;
// uint32 project_id = 3;
// uint32 whitelist_id = 4;
// string address = 5;
// }

// message WhitelistedAddressMerkleInfoResponse {
// string merkle_root = 1;
// repeated string merkle_proof = 2;
// }

// message ProjectInfo {
// // Collection info ----------------------------
// string name = 1;
// string desc = 2;
// string symbol = 3;
// string cover_img_uri = 4;
// string target_network = 5;
// string external_link = 6;

// // Collection details ----------------------------
// string website_link = 7;

// string twitter_profile = 8;
// uint64 twitter_followers_count = 9;

// string contact_discord_name = 10;
// string contact_email = 11;

// bool is_project_derivative = 12;

// string project_type = 13;
// string project_desc = 14;

// bool is_applied_previously = 15;

// // Team info --------------------------------------
// string team_desc = 16;
// string team_link = 17;

// string partners = 18;

// string investment_desc = 19;
// string investment_link = 20;

// string whitepaper_link = 21;
// string roadmap_link = 22;

// // Additional info ----------------------------
// string artwork_desc = 23;

// bool is_ready_for_mint = 24;

// uint32 expected_supply = 25;
// uint64 expected_public_mint_price = 26;
// uint64 expected_mint_date = 27;

// uint64 escrow_mint_proceeds_period = 28;
// bool is_dox = 29;

// uint32 dao_whitelist_count = 30;

// // Minting details ----------------------------
// uint32 tokens_count = 31;
// uint64 unit_price = 32;
// uint32 limit_per_address = 33;
// uint64 start_time = 34;

// // Whitelist minting --------------------------
// // repeated WhitelistMinting whitelist_mintings = 35;

// // Royalty --------------------------
// string royalty_address = 35;
// uint32 royalty_percentage = 36;

// // Extend info --------------------------
// string base_token_uri = 37;
// string merkle_root = 38;
// string deployed_address = 39;
// }

// message WhitelistMintInfo {
// repeated string addresses = 1;
// uint64 unit_price = 2;
// string denom = 3;
// uint32 limit_per_address = 4;
// uint32 addresses_count = 5;
// uint64 start_time = 6;
// uint64 end_time = 7;
// }




85 changes: 0 additions & 85 deletions go/pkg/launchpad/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,27 +323,6 @@ func (s *Launchpad) LaunchpadProjects(ctx context.Context, req *launchpadpb.Laun
return nil, errors.Wrap(err, fmt.Sprintf("unknown network id '%s'", networkID))
}

// userAddress := req.GetUserAddress()
// if userAddress == "" {
// return nil, errors.New("missing user address")
// }

// daoService := dao.NewDAOService(context.Background(), &dao.Config{
// Logger: s.conf.Logger,
// IndexerDB: s.conf.IndexerDB,
// NetStore: &s.conf.NetworkStore,
// })

// isUserAdminResponse, err := daoService.IsUserAdmin(context.Background(), &daopb.IsUserAdminRequest{
// UserAddress: userAddress,
// })
// if err != nil {
// return nil, errors.Wrap(err, "failed to verify user's authentication")
// }
// if !isUserAdminResponse.IsUserAdmin {
// return nil, errors.New("Unauthorized")
// }

status := req.GetStatus()
if status < 0 {
return nil, errors.New("invalid status")
Expand Down Expand Up @@ -423,27 +402,6 @@ func (s *Launchpad) LaunchpadProjectById(ctx context.Context, req *launchpadpb.L
return nil, errors.New("missing project id")
}

// userAddress := req.GetUserAddress()
// if userAddress == "" {
// return nil, errors.New("missing user address")
// }

// daoService := dao.NewDAOService(context.Background(), &dao.Config{
// Logger: s.conf.Logger,
// IndexerDB: s.conf.IndexerDB,
// NetStore: &s.conf.NetworkStore,
// })

// isUserAdminResponse, err := daoService.IsUserAdmin(context.Background(), &daopb.IsUserAdminRequest{
// UserAddress: userAddress,
// })
// if err != nil {
// return nil, errors.Wrap(err, "failed to verify user's authentication")
// }
// if !isUserAdminResponse.IsUserAdmin {
// return nil, errors.New("Unauthorized")
// }

var project *indexerdb.LaunchpadProject

err = s.conf.IndexerDB.Raw(`SELECT * FROM launchpad_projects AS lp WHERE lp.project_id = ? AND lp.network_id = ?`, projectID, networkID).Scan(&project).Error
Expand Down Expand Up @@ -493,27 +451,6 @@ func (s *Launchpad) LaunchpadProjectsCount(ctx context.Context, req *launchpadpb
statusFilterSQL = "AND NOT lp.deployed_address = ''"
}

// userAddress := req.GetUserAddress()
// if userAddress == "" {
// return nil, errors.New("missing user address")
// }

// daoService := dao.NewDAOService(context.Background(), &dao.Config{
// Logger: s.conf.Logger,
// IndexerDB: s.conf.IndexerDB,
// NetStore: &s.conf.NetworkStore,
// })

// isUserAdminResponse, err := daoService.IsUserAdmin(context.Background(), &daopb.IsUserAdminRequest{
// UserAddress: userAddress,
// })
// if err != nil {
// return nil, errors.Wrap(err, "failed to verify user's authentication")
// }
// if !isUserAdminResponse.IsUserAdmin {
// return nil, errors.New("Unauthorized")
// }

var count uint32
err = s.conf.IndexerDB.Raw(fmt.Sprintf(`SELECT COUNT(*) FROM launchpad_projects AS lp WHERE lp.network_id = ? %s`, statusFilterSQL), networkID).Scan(&count).Error
if err != nil {
Expand All @@ -524,25 +461,3 @@ func (s *Launchpad) LaunchpadProjectsCount(ctx context.Context, req *launchpadpb
Count: count,
}, nil
}

// func (s *Launchpad) IsUserAdmin(userAddress string) (bool, error) {
// // TODO: user authentication (Member of the admin DAO)
// // Control if sender is member of the admin DAO
// daoAdminAddress := "tori129kpfu7krgumuc38hfyxwfluq7eu06rhr3awcztr3a9cgjjcx5hswlqj8v"
// var isUserAuthorized bool
// err := s.conf.IndexerDB.Raw(`SELECT EXISTS (
// SELECT 1
// FROM dao_members dm
// JOIN daos d ON dm.dao_contract_address = d.contract_address
// WHERE d.contract_address = ?
// AND dm.member_address = ?
// ) AS dao_exists;
// `,
// daoAdminAddress,
// userAddress,
// ).Scan(&isUserAuthorized).Error
// if err != nil {
// return false, errors.Wrap(err, "failed to query database")
// }
// return isUserAuthorized, nil
// }
2 changes: 0 additions & 2 deletions go/pkg/launchpadpb/launchpad_grpc.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 0 additions & 17 deletions packages/api/launchpad/v1/launchpad.ts
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 13 additions & 9 deletions packages/components/dao/DAOProposals.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,11 @@ export const DAOProposals: React.FC<{
// TODO: double check we properly use threshold and quorum
// TODO: use correct threshold, quorum and total power for passed/executed proposals

const ProposalRow: React.FC<{
export const ProposalRow: React.FC<{
daoId: string | undefined;
proposal: AppProposalResponse;
}> = ({ daoId, proposal }) => {
style?: StyleProp<ViewStyle>;
}> = ({ daoId, proposal, style }) => {
const [network] = parseUserId(daoId);

const halfGap = 24;
Expand Down Expand Up @@ -109,13 +110,16 @@ const ProposalRow: React.FC<{

return (
<View
style={{
flexDirection: "row",
height: 64,
alignItems: "center",
borderBottomColor: neutral33,
borderBottomWidth: 1,
}}
style={[
{
flexDirection: "row",
height: 64,
alignItems: "center",
borderBottomColor: neutral33,
borderBottomWidth: 1,
},
style,
]}
>
<View
style={{
Expand Down
Loading

0 comments on commit 3beae23

Please sign in to comment.