diff --git a/.gitignore b/.gitignore index b4e04acb5..115aeaeb9 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ Cargo.lock grin.log wallet.seed test_output +wallet_data diff --git a/doc/wallet/transaction/basic-transaction-wf.puml b/doc/wallet/transaction/basic-transaction-wf.puml index 191abb6e1..562a982bc 100644 --- a/doc/wallet/transaction/basic-transaction-wf.puml +++ b/doc/wallet/transaction/basic-transaction-wf.puml @@ -81,7 +81,7 @@ recipient --> sender: "Ok" - **UUID** sender -> sender: Execute wallet lock function **sF** ...Await confirmation... 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 -> sender: Change status of **inputs** to "Spent" sender -> sender: Change status of **change_output** to "Confirmed" diff --git a/doc/wallet/usage.md b/doc/wallet/usage.md index ef953fb9e..21c51c1fc 100644 --- a/doc/wallet/usage.md +++ b/doc/wallet/usage.md @@ -182,7 +182,7 @@ Spent outputs are not shown by default. To show them, provide the `-s` flag. ### 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, 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` @@ -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 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ - 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 =========================================================================================================================================================================================================== - 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 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/grin.toml b/grin.toml index 41dbcda04..ca6efc445 100644 --- a/grin.toml +++ b/grin.toml @@ -130,7 +130,7 @@ attempt_time_per_block = 15 #The minimum acceptable share difficulty to request from miners 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" #whether to ignore the reward (mostly for testing) diff --git a/wallet/src/libwallet/types.rs b/wallet/src/libwallet/types.rs index ef76e956a..0a1bef48e 100644 --- a/wallet/src/libwallet/types.rs +++ b/wallet/src/libwallet/types.rs @@ -449,7 +449,7 @@ impl fmt::Display for TxLogEntryType { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match *self { 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::TxReceivedCancelled => write!(f, "Received Tx - Cancelled"), TxLogEntryType::TxSentCancelled => write!(f, "Send Tx - Cancelled"), diff --git a/wallet/tests/common/testclient.rs b/wallet/tests/common/testclient.rs index b52c35c3e..c240dad76 100644 --- a/wallet/tests/common/testclient.rs +++ b/wallet/tests/common/testclient.rs @@ -262,7 +262,7 @@ where pub struct LocalWalletClient { /// wallet identifier for the proxy queue 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>>, /// my rx queue pub rx: Arc>>, diff --git a/wallet/tests/transaction.rs b/wallet/tests/transaction.rs index fb6f4f214..f785220e7 100644 --- a/wallet/tests/transaction.rs +++ b/wallet/tests/transaction.rs @@ -186,7 +186,7 @@ fn basic_transaction_api( None, ); 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!( wallet1_info.total, amount * wallet1_info.last_confirmed_height - amount