Mobilecoind scis

mob

@@ -394,11 +394,7 @@ if args.name:
 image_and_tag = get_image(conf='.mobconf', image=args.image, tag=args.tag)
 if not args.no_pull:
     pull_image_command = ["docker", "image", "pull", image_and_tag]
-
-    if args.verbose:
-        maybe_run(pull_image_command)
-    else:
-        maybe_run_quiet(pull_image_command)
+    maybe_run(pull_image_command)
 
 docker_run.append(image_and_tag)
 

mobilecoind/api/proto/mobilecoind_api.proto

@@ -48,6 +48,9 @@ service MobilecoindAPI {
     rpc GenerateBurnRedemptionTx (GenerateBurnRedemptionTxRequest) returns (GenerateBurnRedemptionTxResponse) {}
     rpc SubmitTx (SubmitTxRequest) returns (SubmitTxResponse) {}
 
+    // Swaps
+    rpc GenerateSwap (GenerateSwapRequest) returns (GenerateSwapResponse) {}
+
     // Databases
     rpc GetLedgerInfo (google.protobuf.Empty) returns (GetLedgerInfoResponse) {}
     rpc GetBlockInfo (GetBlockInfoRequest) returns (GetBlockInfoResponse) {}
@@ -491,6 +494,7 @@ message GenerateTxRequest {
     // Token id to use for the transaction.
     uint64 token_id = 7;
 }
+
 message GenerateTxResponse {
     TxProposal tx_proposal = 1;
 }
@@ -611,6 +615,54 @@ message GenerateBurnRedemptionTxResponse {
     TxProposal tx_proposal = 1;
 }
 
+// Generate a simple swap proposal. The result is a signed contingent input
+// which trades one currency for another and is suitable for use with the deqs.
+// (This API is restrictive and doesn't let you build more complex SCIs.)
+message GenerateSwapRequest {
+    // Monitor id sending the funds.
+    bytes sender_monitor_id = 1;
+
+    // Subaddress to return change to.
+    uint64 change_subaddress = 2;
+
+    // A specific input, whose value will be offered in full by the swap.
+    //
+    // This becomes the "base token" amount from the point of view of a quoting service.
+    //
+    // You may need to conduct a self-spend first to make an input of exactly
+    // the correct value before using this API if none of your inputs match
+    // the volume of the quote you want to make.
+    UnspentTxOut input = 3;
+
+    // The u64 value we are asking for in exchange for our input
+    //
+    // This becomes the "counter token" value from the point of view of a quoting service.
+    uint64 counter_value = 4;
+
+    // The token_id we are asking for in exchange for our input
+    //
+    // This becomes the "counter token" token id from the point of view of a quoting service.
+    uint64 counter_token_id = 5;
+
+    // If set to false, the offer is "all or nothing", the entire counter token value must be supplied,
+    // in exchange for the entire value of the input we are signing over.
+    // Otherwise, it is a "partial-fill" SCI, and can be filled at less than the maximum volume for
+    // proportionally more of the input value.
+    bool allow_partial_fill = 6;
+
+    // The smallest u64 value that we will accept to conduct the swap.
+    // This can be set to avoid receiving "dust" amounts when allow_partial_fill is true.
+    // This is ignored if allow_partial_fill is false.
+    uint64 minimum_fill_value = 7;
+
+    // Tombstone block (setting to 0 means this offer does not expire).
+    uint64 tombstone = 8;
+}
+
+message GenerateSwapResponse {
+    external.SignedContingentInput sci = 1;
+}
+
 // Submits a transaction to the network.
 message SubmitTxRequest {
     TxProposal tx_proposal = 1;