Skip to content

Commit a73f5bc

Browse files
author
Nikita Khateev
committed
Merge branch 'feature/payment-renaming' of github.com:Artemkaaas/indy-sdk into renaming
2 parents 2c54f6d + 5be018d commit a73f5bc

File tree

41 files changed

+843
-328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+843
-328
lines changed

‎cli/src/commands/did.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ pub mod new_command {
6666
println_succ!("Did \"{}\" has been created with \"{}\" verkey", did, vk);
6767
Ok(did)
6868
}
69-
Err(ErrorCode::DidAlreadyExistsError) => Err(println_err!("Did already exists: {:?}", did.unwrap_or(""))),
69+
Err(ErrorCode::DidAlreadyExistsError) => Err(println_err!("Did already exists")),
7070
Err(ErrorCode::UnknownCryptoTypeError) => Err(println_err!("Unknown crypto type")),
7171
Err(ErrorCode::CommonInvalidStructure) => Err(println_err!("Invalid format of command params. Please check format of posted JSONs, Keys, DIDs and etc...")),
7272
Err(err) => Err(println_err!("Indy SDK error occurred {:?}", err)),

‎cli/src/commands/ledger.rs‎

Lines changed: 115 additions & 24 deletions
Large diffs are not rendered by default.

‎cli/src/commands/wallet.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,6 @@ pub mod tests {
433433
use std::path::PathBuf;
434434

435435
const WALLET: &'static str = "wallet";
436-
const POOL: &'static str = "pool";
437436
const WALLET_KEY: &'static str = "wallet_key";
438437
const EXPORT_KEY: &'static str = "export_key";
439438

‎cli/src/libindy/payment.rs‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use super::ErrorCode;
22

33
use libc::c_char;
44
use std::ffi::CString;
5+
use std::ptr::null;
56

67
pub struct Payment {}
78

@@ -35,13 +36,14 @@ impl Payment {
3536
super::results::result_to_string(err, receiver)
3637
}
3738

38-
pub fn add_request_fees(wallet_handle: i32, submitter_did: &str, req_json: &str, inputs_json: &str, outputs_json: &str) -> Result<(String, String), ErrorCode> {
39+
pub fn add_request_fees(wallet_handle: i32, submitter_did: &str, req_json: &str, inputs_json: &str, outputs_json: &str, extra: Option<&str>) -> Result<(String, String), ErrorCode> {
3940
let (receiver, command_handle, cb) = super::callbacks::_closure_to_cb_ec_string_string();
4041

4142
let submitter_did = CString::new(submitter_did).unwrap();
4243
let req_json = CString::new(req_json).unwrap();
4344
let inputs_json = CString::new(inputs_json).unwrap();
4445
let outputs_json = CString::new(outputs_json).unwrap();
46+
let extra_str = extra.map(|s| CString::new(s).unwrap()).unwrap_or(CString::new("").unwrap());
4547

4648
let err = unsafe {
4749
indy_add_request_fees(command_handle,
@@ -50,6 +52,7 @@ impl Payment {
5052
req_json.as_ptr(),
5153
inputs_json.as_ptr(),
5254
outputs_json.as_ptr(),
55+
if extra.is_some() { extra_str.as_ptr() } else { null() },
5356
cb)
5457
};
5558

@@ -92,20 +95,22 @@ impl Payment {
9295
super::results::result_to_string(err, receiver)
9396
}
9497

95-
pub fn build_payment_req(wallet_handle: i32, submitter_did: &str, inputs: &str, outputs: &str) -> Result<(String, String), ErrorCode> {
98+
pub fn build_payment_req(wallet_handle: i32, submitter_did: &str, inputs: &str, outputs: &str, extra: Option<&str>) -> Result<(String, String), ErrorCode> {
9699
let (receiver, command_handle, cb) =
97100
super::callbacks::_closure_to_cb_ec_string_string();
98101

99102
let submitter_did = CString::new(submitter_did).unwrap();
100103
let inputs = CString::new(inputs).unwrap();
101104
let outputs = CString::new(outputs).unwrap();
105+
let extra_str = extra.map(|s| CString::new(s).unwrap()).unwrap_or(CString::new("").unwrap());
102106

103107
let err = unsafe {
104108
indy_build_payment_req(command_handle,
105109
wallet_handle,
106110
submitter_did.as_ptr(),
107111
inputs.as_ptr(),
108112
outputs.as_ptr(),
113+
if extra.is_some() { extra_str.as_ptr() } else { null() },
109114
cb)
110115
};
111116

@@ -129,18 +134,20 @@ impl Payment {
129134
super::results::result_to_string(err, receiver)
130135
}
131136

132-
pub fn build_mint_req(wallet_handle: i32, submitter_did: &str, outputs_json: &str) -> Result<(String, String), ErrorCode> {
137+
pub fn build_mint_req(wallet_handle: i32, submitter_did: &str, outputs_json: &str, extra: Option<&str>) -> Result<(String, String), ErrorCode> {
133138
let (receiver, command_handle, cb) =
134139
super::callbacks::_closure_to_cb_ec_string_string();
135140

136141
let submitter_did = CString::new(submitter_did).unwrap();
137142
let outputs_json = CString::new(outputs_json).unwrap();
143+
let extra_str = extra.map(|s| CString::new(s).unwrap()).unwrap_or(CString::new("").unwrap());
138144

139145
let err = unsafe {
140146
indy_build_mint_req(command_handle,
141147
wallet_handle,
142148
submitter_did.as_ptr(),
143149
outputs_json.as_ptr(),
150+
if extra.is_some() { extra_str.as_ptr() } else { null() },
144151
cb)
145152
};
146153

@@ -244,6 +251,7 @@ extern {
244251
req_json: *const c_char,
245252
inputs_json: *const c_char,
246253
outputs_json: *const c_char,
254+
extra: *const c_char,
247255
cb: Option<extern fn(command_handle_: i32,
248256
err: ErrorCode,
249257
req_with_fees_json: *const c_char,
@@ -273,6 +281,7 @@ extern {
273281
submitter_did: *const c_char,
274282
inputs_json: *const c_char,
275283
outputs_json: *const c_char,
284+
extra: *const c_char,
276285
cb: Option<extern fn(command_handle_: i32,
277286
err: ErrorCode,
278287
payment_req_json: *const c_char,
@@ -291,6 +300,7 @@ extern {
291300
wallet_handle: i32,
292301
submitter_did: *const c_char,
293302
outputs_json: *const c_char,
303+
extra: *const c_char,
294304
cb: Option<extern fn(command_handle_: i32,
295305
err: ErrorCode,
296306
mint_req_json: *const c_char,

‎doc/design/001-cli/README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ indy> ledger <subcommand>
235235
#### NYM transaction
236236
Send NYM transaction
237237
```
238-
ledger nym did=<did-value> [verkey=<verkey-value>] [role=<role-value>] [fees_inputs=<source-1,..,source-n>] [fees_outputs=(<recipient-1>,<amount>,<extra>),..,(<recipient-n>,<amount>,<extra>)]
238+
ledger nym did=<did-value> [verkey=<verkey-value>] [role=<role-value>] [fees_inputs=<source-1,..,source-n>] [fees_outputs=(<recipient-1>,<amount>),..,(<recipient-n>,<amount>)] [extra=<extra>]
239239
```
240240
241241
#### GET_NYM transaction
@@ -247,7 +247,7 @@ ledger get-nym did=<did-value>
247247
#### ATTRIB transaction
248248
Send ATTRIB transaction
249249
```
250-
ledger attrib did=<did-value> [hash=<hash-value>] [raw=<raw-value>] [enc=<enc-value>] [fees_inputs=<source-1,..,source-n>] [fees_outputs=(<recipient-1>,<amount>,<extra>),..,(<recipient-n>,<amount>,<extra>)]
250+
ledger attrib did=<did-value> [hash=<hash-value>] [raw=<raw-value>] [enc=<enc-value>] [fees_inputs=<source-1,..,source-n>] [fees_outputs=(<recipient-1>,<amount>),..,(<recipient-n>,<amount>)] [extra=<extra>]
251251
```
252252
253253
#### GET_ATTRIB transaction
@@ -259,7 +259,7 @@ ledger get-attrib did=<did-value> [raw=<raw-value>] [hash=<hash-value>] [enc=<en
259259
#### SCHEMA transaction
260260
Send SCHEMA transaction
261261
```
262-
ledger schema name=<name-value> version=<version-value> attr_names=<attr_names-value> [fees_inputs=<source-1,..,source-n>] [fees_outputs=(<recipient-1>,<amount>,<extra>),..,(<recipient-n>,<amount>,<extra>)]
262+
ledger schema name=<name-value> version=<version-value> attr_names=<attr_names-value> [fees_inputs=<source-1,..,source-n>] [fees_outputs=(<recipient-1>,<amount>),..,(<recipient-n>,<amount>)] [extra=<extra>]
263263
```
264264
265265
#### GET_SCHEMA transaction
@@ -270,7 +270,7 @@ ledger get-schema did=<did-value> name=<name-value> version=<version-value>
270270
#### CRED_DEF transaction
271271
Send CRED_DEF transaction
272272
```
273-
ledger cred-def schema_id=<schema_id-value> signature_type=<signature_type-value> [tag=<tag>] primary=<primary-value> [revocation=<revocation-value>] [fees_inputs=<source-1,..,source-n>] [fees_outputs=(<recipient-1>,<amount>,<extra>),..,(<recipient-n>,<amount>,<extra>)]
273+
ledger cred-def schema_id=<schema_id-value> signature_type=<signature_type-value> [tag=<tag>] primary=<primary-value> [revocation=<revocation-value>] [fees_inputs=<source-1,..,source-n>] [fees_outputs=(<recipient-1>,<amount>),..,(<recipient-n>,<amount>)] [extra=<extra>]
274274
```
275275
276276
#### GET_CRED_DEF transaction
@@ -324,7 +324,7 @@ ledger get-sources payment_address=<payment_address>
324324
#### PAYMENT transaction
325325
Send PAYMENT transaction
326326
```
327-
ledger payment inputs=<source-1>,..,<source-n> outputs=(<recipient-1>,<amount>,<extra>),..,(<recipient-n>,<amount>,<extra>)
327+
ledger payment inputs=<source-1>,..,<source-n> outputs=(<recipient-1>,<amount>),..,(<recipient-n>,<amount>) [extra=<extra>]
328328
```
329329
330330
#### GET_FEES transaction
@@ -336,7 +336,7 @@ ledger get-fees payment_address=<payment_address>
336336
#### MINT transaction
337337
Prepare MINT transaction
338338
```
339-
ledger mint-prepare outputs=(<pay-addr-1>,<amount>,<extra>),..,(<pay-addr-n>,<amount>,<extra>)
339+
ledger mint-prepare outputs=(<pay-addr-1>,<amount>),..,(<pay-addr-n>,<amount>) [extra=<extra>]
340340
```
341341
342342
#### SET_FEES transaction
@@ -379,7 +379,7 @@ pool(sandbox):indy> pool list
379379
380380
#### Create and open wallet
381381
```
382-
sandbox|indy> wallet create alice_wallet pool_name=sandbox
382+
sandbox|indy> wallet create alice_wallet
383383
sandbox|indy> wallet open alice_wallet
384384
pool(sandbox):wallet(alice_wallet):indy> wallet list
385385
```

‎doc/design/004-payment-interface/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ type CreatePaymentAddressCB = extern fn(command_handle: i32,
133133
/// [{
134134
/// recipient: <str>, // payment address of recipient
135135
/// amount: <int>, // amount
136-
/// extra: <str>, // optional data
137136
/// }]
137+
/// extra: // optional information for payment operation
138138
///
139139
/// #Returns
140140
/// req_with_fees_json - modified Indy request with added fees info
@@ -228,8 +228,8 @@ type ParseGetPaymentSourcesResponseCB = extern fn(command_handle: i32,
228228
/// [{
229229
/// recipient: <str>, // payment address of recipient
230230
/// amount: <int>, // amount
231-
/// extra: <str>, // optional data
232231
/// }]
232+
/// extra: // optional information for payment operation
233233
///
234234
/// #Returns
235235
/// payment_req_json - Indy request for doing payment
@@ -274,8 +274,8 @@ type ParsePaymentResponseCB = extern fn(command_handle: i32,
274274
/// [{
275275
/// recipient: <str>, // payment address of recipient
276276
/// amount: <int>, // amount
277-
/// extra: <str>, // optional data
278277
/// }]
278+
/// extra: // optional information for payment operation
279279
///
280280
/// #Returns
281281
/// mint_req_json - Indy request for doing minting
@@ -421,8 +421,8 @@ pub extern fn indy_list_payment_addresses(command_handle: i32,
421421
/// [{
422422
/// recipient: <str>, // payment address of recipient
423423
/// amount: <int>, // amount
424-
/// extra: <str>, // optional data
425424
/// }]
425+
/// extra: // optional information for payment operation
426426
///
427427
/// #Returns
428428
/// req_with_fees_json - modified Indy request with added fees info
@@ -524,8 +524,8 @@ pub extern fn indy_parse_get_payment_sources_response(command_handle: i32,
524524
/// [{
525525
/// recipient: <str>, // payment address of recipient
526526
/// amount: <int>, // amount
527-
/// extra: <str>, // optional data
528527
/// }]
528+
/// extra: // optional information for payment operation
529529
///
530530
/// #Returns
531531
/// payment_req_json - Indy request for doing payment
@@ -574,8 +574,8 @@ pub extern fn indy_parse_payment_response(command_handle: i32,
574574
/// [{
575575
/// recipient: <str>, // payment address of recipient
576576
/// amount: <int>, // amount
577-
/// extra: <str>, // optional data
578577
/// }]
578+
/// extra: // optional information for mint operation
579579
///
580580
/// #Returns
581581
/// mint_req_json - Indy request for doing minting

‎doc/design/006-cli-plugins/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ indy-cli --plugins <lib-1-name>:<init-func-1-name>,...,<lib-n-name>:<init-func-n
2626
Example:
2727

2828
```bash
29-
indy-cli --plugins libsovplugin:sovplugin_init,libstorage:storage_init
29+
indy-cli --plugins libnullpay:nullpay_init,libstorage:storage_init
3030
```
3131

3232
## Command to load plugin

‎doc/design/007-cli-payments/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Returns:
5757
Send payment transaction
5858

5959
```indy-cli
60-
indy> ledger payment inputs=<source-1>,..,<source-n> outputs=(<recipient-0>,<amount>,<extra>),..,(<recipient-n>,<amount>,<extra>)
60+
indy> ledger payment inputs=<source-1>,..,<source-n> outputs=(<recipient-0>,<amount>),..,(<recipient-n>,<amount>) [extra=<extra>]
6161
```
6262

6363
Returns:
@@ -83,7 +83,7 @@ Returns:
8383
Prepare MINT transaction as json.
8484

8585
```indy-cli
86-
indy> ledger mint-prepare outputs=(<pay-addr-0>,<amount-0>,<extra-0>),..,(<pay-addr-n>,<amount-n>,<extra-n>)
86+
indy> ledger mint-prepare outputs=(<pay-addr-0>,<amount-0>),..,(<pay-addr-n>,<amount-n>) [extra=<extra>]
8787
```
8888

8989
Returns:
@@ -139,7 +139,7 @@ Returns:
139139
All commands to send domain transactions require new optional params to add transactions fees:
140140

141141
```indy-cli
142-
[fees_inputs=<source-1>,..,<source-n>] [fees_outputs=(<recipient-0>,<amount>,<extra>),..,(<recipient-n>,<amount>,<extra>)]
142+
[fees_inputs=<source-1>,..,<source-n>] [fees_outputs=(<recipient-0>,<amount>),..,(<recipient-n>,<amount>)] [extra=<extra>]
143143
```
144144

145145
Note that "source-n" is identifier presented in "Source" column of ```ledger get-sources``` command output

‎libindy/include/indy_payment.h‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ extern "C" {
127127
/// [{
128128
/// recipient: <str>, // payment address of recipient
129129
/// amount: <int>, // amount
130-
/// extra: <str>, // optional data
131130
/// }]
131+
/// extra: // optional information for payment operation
132132
///
133133
/// #Returns
134134
/// req_with_fees_json - modified Indy request with added fees info
@@ -140,6 +140,7 @@ extern "C" {
140140
const char * req_json,
141141
const char * inputs_json,
142142
const char * outputs_json,
143+
const char * extra,
143144

144145
void (*cb)(indy_handle_t xcommand_handle,
145146
indy_error_t err,
@@ -242,8 +243,8 @@ extern "C" {
242243
/// [{
243244
/// recipient: <str>, // payment address of recipient
244245
/// amount: <int>, // amount
245-
/// extra: <str>, // optional data
246246
/// }]
247+
/// extra: // optional information for payment operation
247248
///
248249
/// #Returns
249250
/// payment_req_json - Indy request for doing payment
@@ -254,6 +255,7 @@ extern "C" {
254255
const char * submitter_did,
255256
const char * inputs_json,
256257
const char * outputs_json,
258+
const char * extra,
257259

258260
void (*cb)(indy_handle_t xcommand_handle,
259261
indy_error_t err,
@@ -298,8 +300,8 @@ extern "C" {
298300
/// [{
299301
/// recipient: <str>, // payment address of recipient
300302
/// amount: <int>, // amount
301-
/// extra: <str>, // optional data
302303
/// }]
304+
/// extra: // optional information for payment operation
303305
///
304306
/// #Returns
305307
/// mint_req_json - Indy request for doing minting
@@ -309,6 +311,7 @@ extern "C" {
309311
indy_handle_t wallet_handle,
310312
const char * submitter_did,
311313
const char * outputs_json,
314+
const char * extra,
312315

313316
void (*cb)(indy_handle_t xcommand_handle,
314317
indy_error_t err,

0 commit comments

Comments
 (0)