Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Service Provider Promotions again #877

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Service Provider Promotions again #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
063f3f2
Remove unused files
michaeldjeffrey Oct 17, 2024
932a4fc
Update service provider promotions types in file_store
michaeldjeffrey Oct 17, 2024
0a6bb83
Rework service provider promotion rewards
michaeldjeffrey Oct 17, 2024
9b182a1
Start to fill out listing incentive programs for service providers fr…
michaeldjeffrey Oct 17, 2024
b74d5ed
Redo carrier client listing incentive promotions
michaeldjeffrey Oct 17, 2024
3902de3
Raise dc_sessions and sp_promotions
michaeldjeffrey Oct 17, 2024
418bea8
Remove funds container, replace with promotions that has bps and prom…
michaeldjeffrey Oct 17, 2024
8469060
Use ServiceProviderPromotions wrapper
michaeldjeffrey Oct 17, 2024
1db7b1b
clean up test structure
michaeldjeffrey Oct 17, 2024
35ded33
clean up exported naming from service provider
michaeldjeffrey Oct 17, 2024
f1255c2
update to use published proto types
michaeldjeffrey Oct 17, 2024
6b807cf
Add metadata db to carrier service
michaeldjeffrey Oct 17, 2024
4fbc63a
Keep importing RadioReward until we stop reading them
michaeldjeffrey Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 35 additions & 19 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ helium-lib = { git = "https://github.com/helium/helium-wallet-rs.git", branch =
hextree = { git = "https://github.com/jaykickliter/HexTree", branch = "main", features = [
"disktree",
] }
helium-proto = { git = "https://github.com/helium/proto", branch = "master", features = [
helium-proto = { git = "https://github.com/helium/proto", branch = "mj/sp-promotions-v2", features = [
"services",
] }
beacon = { git = "https://github.com/helium/proto", branch = "master" }
beacon = { git = "https://github.com/helium/proto", branch = "mj/sp-promotions-v2" }
solana-client = "1.18"
solana-sdk = "1.18"
solana-program = "1.18"
Expand Down
24 changes: 7 additions & 17 deletions file_store/src/cli/dump_mobile_rewards.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ impl Cmd {
let mut subscriber_reward = vec![];
let mut service_provider_reward = vec![];
let mut unallocated_reward = vec![];
// let mut promotion_reward = vec![];
let mut promotion_reward = vec![];

while let Some(result) = file_stream.next().await {
let msg = result?;
Expand Down Expand Up @@ -62,21 +62,11 @@ impl Cmd {
"unallocated_reward_type": reward.reward_type,
"amount": reward.amount,
})),
// PromotionReward(reward) => {
// let entity = reward.entity.unwrap();
// match entity {
// Entity::SubscriberId(id) => promotion_reward.push(json!({
// "subscriber_id": uuid::Uuid::from_slice(&id).unwrap(),
// "service_provider_amount": reward.service_provider_amount,
// "matched_amount": reward.matched_amount,
// })),
// Entity::GatewayKey(key) => promotion_reward.push(json!({
// "gateway_key": PublicKey::try_from(key)?.to_string(),
// "service_provider_amount": reward.service_provider_amount,
// "matched_amount": reward.matched_amount,
// })),
// }
// }
PromotionReward(reward) => promotion_reward.push(json!({
"entity": reward.entity,
"service_provider_amount": reward.service_provider_amount,
"matched_amount": reward.matched_amount,
})),
},
None => todo!(),
}
Expand All @@ -88,7 +78,7 @@ impl Cmd {
"gateway_reward": gateway_reward,
"subscriber_reward": subscriber_reward,
"service_provider_reward": service_provider_reward,
// "promotion_reward": promotion_reward,
"promotion_reward": promotion_reward,
"unallocated_reward": unallocated_reward,
}))?;

Expand Down
1 change: 0 additions & 1 deletion file_store/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ pub mod mobile_radio_threshold;
pub mod mobile_session;
pub mod mobile_subscriber;
pub mod mobile_transfer;
pub mod promotion_reward;
pub mod reward_manifest;
mod settings;
pub mod speedtest;
Expand Down
91 changes: 0 additions & 91 deletions file_store/src/promotion_reward.rs
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions file_store/src/traits/file_sink_write.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,18 +273,3 @@ impl_file_sink!(
FileType::RewardManifest.to_str(),
"reward_manifest"
);
impl_file_sink!(
proto::ServiceProviderPromotionFundV1,
FileType::ServiceProviderPromotionFund.to_str(),
"service_provider_promotion_fund"
);
impl_file_sink!(
poc_mobile::PromotionRewardIngestReportV1,
FileType::PromotionRewardIngestReport.to_str(),
"promotion_reward_ingest_report"
);
impl_file_sink!(
poc_mobile::VerifiedPromotionRewardV1,
FileType::VerifiedPromotionReward.to_str(),
"verified_promotion_reward"
);
3 changes: 2 additions & 1 deletion file_store/src/traits/msg_verify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ impl_msg_verify!(mobile_config::AuthorizationListReqV1, signature);
impl_msg_verify!(mobile_config::AuthorizationListResV1, signature);
impl_msg_verify!(mobile_config::EntityVerifyReqV1, signature);
impl_msg_verify!(mobile_config::EntityVerifyResV1, signature);
impl_msg_verify!(mobile_config::CarrierIncentivePromotionListReqV1, signature);
impl_msg_verify!(mobile_config::CarrierIncentivePromotionListResV1, signature);
impl_msg_verify!(mobile_config::CarrierKeyToEntityReqV1, signature);
impl_msg_verify!(mobile_config::CarrierKeyToEntityResV1, signature);
impl_msg_verify!(mobile_config::GatewayInfoReqV1, signature);
Expand All @@ -95,7 +97,6 @@ impl_msg_verify!(mobile_config::BoostedHexInfoStreamReqV1, signature);
impl_msg_verify!(mobile_config::BoostedHexModifiedInfoStreamReqV1, signature);
impl_msg_verify!(mobile_config::BoostedHexInfoStreamResV1, signature);
impl_msg_verify!(poc_mobile::SubscriberVerifiedMappingEventReqV1, signature);
impl_msg_verify!(poc_mobile::PromotionRewardReqV1, signature);

#[cfg(test)]
mod test {
Expand Down
Loading