From 192ba019f0c6c80d29030c475e4baa508447f80d Mon Sep 17 00:00:00 2001
From: Andrey Fadeev <me@ciiol.net>
Date: Mon, 15 Oct 2018 15:49:08 +0300
Subject: [PATCH] FF-7 Add more wallet accounts to cash flow and more vars to
 terms (#389)

* Add more wallet accounts to cash flow
* Add varset to terms retrival method argruments
* Remove obsolete wallet cash_flow names
---
 proto/domain.thrift             |  6 ++++--
 proto/payment_processing.thrift | 13 +++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/proto/domain.thrift b/proto/domain.thrift
index 0ff6344..67dfcfe 100644
--- a/proto/domain.thrift
+++ b/proto/domain.thrift
@@ -1490,8 +1490,10 @@ enum ExternalCashFlowAccount {
 }
 
 enum WalletCashFlowAccount {
-    settlement
-    payout
+    sender_source
+    sender_settlement
+    receiver_settlement
+    receiver_destination
 }
 
 enum CashFlowConstant {
diff --git a/proto/payment_processing.thrift b/proto/payment_processing.thrift
index 6be41f7..4c07a0c 100644
--- a/proto/payment_processing.thrift
+++ b/proto/payment_processing.thrift
@@ -1215,6 +1215,7 @@ struct Varset {
     3: optional domain.Cash amount
     4: optional domain.PaymentMethodRef payment_method
     5: optional domain.PayoutMethodRef payout_method
+    6: optional domain.WalletID wallet_id
 }
 
 struct PartyParams {
@@ -1758,6 +1759,18 @@ service PartyManagement {
 
     /* Wallet */
 
+    // temporary method for transfer period
+    // do not use
+    domain.TermSet ComputeWalletTermsNew (
+        1: UserInfo user,
+        2: PartyID party_id,
+        3: ContractID contract_id,
+        4: base.Timestamp timestamp
+        5: Varset varset
+    )
+        throws (1: InvalidUser ex1, 2: PartyNotFound ex2, 3: PartyNotExistsYet ex3)
+
+    // deprecated
     domain.TermSet ComputeWalletTerms (
         1: UserInfo user,
         2: PartyID party_id,