Update json-rpc client

This commit is contained in:
AsamK 2022-05-21 12:10:51 +02:00
parent 5a63b5419f
commit cf07512d24
5 changed files with 61 additions and 4 deletions

8
client/Cargo.lock generated
View File

@ -639,9 +639,9 @@ dependencies = [
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.5.5" version = "1.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
@ -650,9 +650,9 @@ dependencies = [
[[package]] [[package]]
name = "regex-syntax" name = "regex-syntax"
version = "0.6.25" version = "0.6.26"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
[[package]] [[package]]
name = "rustc_version" name = "rustc_version"

View File

@ -164,6 +164,15 @@ pub enum CliCommands {
sticker: Option<String>, sticker: Option<String>,
}, },
SendContacts, SendContacts,
SendPaymentNotification {
recipient: String,
#[clap(long)]
receipt: String,
#[clap(long)]
note: String,
},
SendReaction { SendReaction {
recipient: Vec<String>, recipient: Vec<String>,
@ -319,6 +328,9 @@ pub enum CliCommands {
#[clap(long = "about-emoji")] #[clap(long = "about-emoji")]
about_emoji: Option<String>, about_emoji: Option<String>,
#[clap(long = "mobile-coin-address")]
mobile_coin_address: Option<String>,
#[clap(long)] #[clap(long)]
avatar: Option<String>, avatar: Option<String>,

View File

@ -135,6 +135,15 @@ pub trait Rpc {
#[rpc(name = "sendContacts", params = "named")] #[rpc(name = "sendContacts", params = "named")]
fn send_contacts(&self, account: Option<String>) -> Result<Value>; fn send_contacts(&self, account: Option<String>) -> Result<Value>;
#[rpc(name = "sendPaymentNotification", params = "named")]
fn send_payment_notification(
&self,
account: Option<String>,
recipient: String,
receipt: String,
note: String,
) -> Result<Value>;
#[rpc(name = "sendReaction", params = "named")] #[rpc(name = "sendReaction", params = "named")]
fn send_reaction( fn send_reaction(
&self, &self,
@ -263,6 +272,7 @@ pub trait Rpc {
#[allow(non_snake_case)] familyName: Option<String>, #[allow(non_snake_case)] familyName: Option<String>,
about: Option<String>, about: Option<String>,
#[allow(non_snake_case)] aboutEmoji: Option<String>, #[allow(non_snake_case)] aboutEmoji: Option<String>,
#[allow(non_snake_case)] mobileCoinAddress: Option<String>,
avatar: Option<String>, avatar: Option<String>,
#[allow(non_snake_case)] removeAvatar: bool, #[allow(non_snake_case)] removeAvatar: bool,
) -> Result<Value>; ) -> Result<Value>;

View File

@ -147,6 +147,15 @@ async fn main() -> Result<(), anyhow::Error> {
.await .await
} }
cli::CliCommands::SendContacts => client.send_contacts(cli.account).await, cli::CliCommands::SendContacts => client.send_contacts(cli.account).await,
cli::CliCommands::SendPaymentNotification {
recipient,
receipt,
note,
} => {
client
.send_payment_notification(cli.account, recipient, receipt, note)
.await
}
cli::CliCommands::SendReaction { cli::CliCommands::SendReaction {
recipient, recipient,
group_id, group_id,
@ -309,6 +318,7 @@ async fn main() -> Result<(), anyhow::Error> {
family_name, family_name,
about, about,
about_emoji, about_emoji,
mobile_coin_address,
avatar, avatar,
remove_avatar, remove_avatar,
} => { } => {
@ -319,6 +329,7 @@ async fn main() -> Result<(), anyhow::Error> {
family_name, family_name,
about, about,
about_emoji, about_emoji,
mobile_coin_address,
avatar, avatar,
remove_avatar, remove_avatar,
) )

View File

@ -2971,6 +2971,30 @@
{"name":"type_"} {"name":"type_"}
] ]
}, },
{
"name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$OutgoingPayment",
"fields":[
{"name":"bitField0_"},
{"name":"note_"},
{"name":"paymentDetailCase_"},
{"name":"paymentDetail_"},
{"name":"recipientUuid_"}
]
},
{
"name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$OutgoingPayment$MobileCoin",
"fields":[
{"name":"amountPicoMob_"},
{"name":"bitField0_"},
{"name":"feePicoMob_"},
{"name":"ledgerBlockIndex_"},
{"name":"ledgerBlockTimestamp_"},
{"name":"outputPublicKeys_"},
{"name":"receipt_"},
{"name":"recipientAddress_"},
{"name":"spentKeyImages_"}
]
},
{ {
"name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$PniIdentity", "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$PniIdentity",
"fields":[ "fields":[