Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-20 19:11:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix typo + git ignore wallet data (#1350)

Browse source 
* Ignore wallet data

* Fix typo
This commit is contained in:
Michalis Kargakis 2018-08-14 00:28:01 +02:00 committed by Antioch Peverell
parent 6f590b3f88
commit dda88f193b
7 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -8,3 +8,4 @@ Cargo.lock
grin.log grin.log
wallet.seed wallet.seed
test_output test_output
wallet_data

2
doc/wallet/transaction/basic-transaction-wf.puml
View file

@ -81,7 +81,7 @@ recipient --> sender: "Ok" - **UUID**
sender -> sender: Execute wallet lock function **sF** sender -> sender: Execute wallet lock function **sF**
...Await confirmation... ...Await confirmation...
recipient -> grin_node: Confirm **receiver_output** recipient -> grin_node: Confirm **receiver_output**
recipient -> recipient: Change status of **reciever_output** to "Confirmed" recipient -> recipient: Change status of **receiver_output** to "Confirmed"
sender -> grin_node: Confirm **change_output** sender -> grin_node: Confirm **change_output**
sender -> sender: Change status of **inputs** to "Spent" sender -> sender: Change status of **inputs** to "Spent"
sender -> sender: Change status of **change_output** to "Confirmed" sender -> sender: Change status of **change_output** to "Confirmed"

6
doc/wallet/usage.md
View file

@ -182,7 +182,7 @@ Spent outputs are not shown by default. To show them, provide the `-s` flag.
### txs ### txs
Every time an operation is performed in your wallet (recieve coinbase, send, receive), an entry is added to an internal transaction log Every time an operation is performed in your wallet (receive coinbase, send, receive), an entry is added to an internal transaction log
containing vital information about the transaction. Because the Mimblewimble chain contains no identifying information whatsoever, containing vital information about the transaction. Because the Mimblewimble chain contains no identifying information whatsoever,
this transaction log is necessary in order to allow your wallet to keep track of what was sent and received. To view the contents of the this transaction log is necessary in order to allow your wallet to keep track of what was sent and received. To view the contents of the
transaction log, use the `txs` transaction log, use the `txs`
@ -204,7 +204,7 @@ Transaction Log - Block Height: 49
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
5 Confirmed Coinbase None 2018-07-20 19:46:45.658864074 UTC true 2018-07-20 19:46:45.658864821 UTC 0 1 60.000000000 0.000000000 None 60.000000000 5 Confirmed Coinbase None 2018-07-20 19:46:45.658864074 UTC true 2018-07-20 19:46:45.658864821 UTC 0 1 60.000000000 0.000000000 None 60.000000000
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
6 Recieved Tx 03715cf6-f29b-4a3a-bda5-b02cba6bf0d9 2018-07-20 19:46:46.120244904 UTC false None 0 1 60.000000000 0.000000000 None 60.000000000 6 Received Tx 03715cf6-f29b-4a3a-bda5-b02cba6bf0d9 2018-07-20 19:46:46.120244904 UTC false None 0 1 60.000000000 0.000000000 None 60.000000000
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
``` ```
@ -216,7 +216,7 @@ Transaction Log - Block Height: 49
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Id Type Shared Transaction Id Creation Time Confirmed? Confirmation Time Num. Inputs Num. Outputs Amount Credited Amount Debited Fee Net Difference Id Type Shared Transaction Id Creation Time Confirmed? Confirmation Time Num. Inputs Num. Outputs Amount Credited Amount Debited Fee Net Difference
=========================================================================================================================================================================================================== ===========================================================================================================================================================================================================
6 Recieved Tx 03715cf6-f29b-4a3a-bda5-b02cba6bf0d9 2018-07-20 19:46:46.120244904 UTC false None 0 1 60.000000000 0.000000000 None 60.000000000 6 Received Tx 03715cf6-f29b-4a3a-bda5-b02cba6bf0d9 2018-07-20 19:46:46.120244904 UTC false None 0 1 60.000000000 0.000000000 None 60.000000000
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

2
grin.toml
View file

@ -130,7 +130,7 @@ attempt_time_per_block = 15
#The minimum acceptable share difficulty to request from miners #The minimum acceptable share difficulty to request from miners
minimum_share_difficulty = 1 minimum_share_difficulty = 1
#the wallet reciever to which coinbase rewards will be sent #the wallet receiver to which coinbase rewards will be sent
wallet_listener_url = "http://127.0.0.1:13415" wallet_listener_url = "http://127.0.0.1:13415"
#whether to ignore the reward (mostly for testing) #whether to ignore the reward (mostly for testing)

2
wallet/src/libwallet/types.rs
View file

@ -449,7 +449,7 @@ impl fmt::Display for TxLogEntryType {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self { match *self {
TxLogEntryType::ConfirmedCoinbase => write!(f, "Confirmed Coinbase"), TxLogEntryType::ConfirmedCoinbase => write!(f, "Confirmed Coinbase"),
TxLogEntryType::TxReceived => write!(f, "Recieved Tx"), TxLogEntryType::TxReceived => write!(f, "Received Tx"),
TxLogEntryType::TxSent => write!(f, "Sent Tx"), TxLogEntryType::TxSent => write!(f, "Sent Tx"),
TxLogEntryType::TxReceivedCancelled => write!(f, "Received Tx - Cancelled"), TxLogEntryType::TxReceivedCancelled => write!(f, "Received Tx - Cancelled"),
TxLogEntryType::TxSentCancelled => write!(f, "Send Tx - Cancelled"), TxLogEntryType::TxSentCancelled => write!(f, "Send Tx - Cancelled"),

2
wallet/tests/common/testclient.rs
View file

@ -262,7 +262,7 @@ where
pub struct LocalWalletClient { pub struct LocalWalletClient {
/// wallet identifier for the proxy queue /// wallet identifier for the proxy queue
pub id: String, pub id: String,
/// proxy's tx queue (recieve messsages from other wallets or node /// proxy's tx queue (receive messsages from other wallets or node
pub proxy_tx: Arc<Mutex<Sender<WalletProxyMessage>>>, pub proxy_tx: Arc<Mutex<Sender<WalletProxyMessage>>>,
/// my rx queue /// my rx queue
pub rx: Arc<Mutex<Receiver<WalletProxyMessage>>>, pub rx: Arc<Mutex<Receiver<WalletProxyMessage>>>,

2
wallet/tests/transaction.rs
View file

@ -186,7 +186,7 @@ fn basic_transaction_api(
None, None,
); );
assert!(wallet1_refreshed); assert!(wallet1_refreshed);
// wallet 1 recieved fees, so amount should be the same // wallet 1 received fees, so amount should be the same
assert_eq!( assert_eq!(
wallet1_info.total, wallet1_info.total,
amount * wallet1_info.last_confirmed_height - amount amount * wallet1_info.last_confirmed_height - amount