diff --git a/api/src/foreign.rs b/api/src/foreign.rs
index e27772e..af81ae5 100644
--- a/api/src/foreign.rs
+++ b/api/src/foreign.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -479,7 +479,7 @@ macro_rules! doctest_helper_setup_doc_env_foreign {
 		// don't run on windows CI, which gives very inconsistent results
 		if cfg!(windows) {
 			return;
-			}
+		}
 
 		// Set our local chain_type for testing.
 		global::set_local_chain_type(global::ChainTypes::AutomatedTesting);
@@ -497,7 +497,7 @@ macro_rules! doctest_helper_setup_doc_env_foreign {
 		let node_client = HTTPNodeClient::new(&wallet_config.check_node_api_http_addr, None);
 		let mut wallet = Box::new(
 			DefaultWalletImpl::<'static, HTTPNodeClient>::new(node_client.clone()).unwrap(),
-			)
+		)
 			as Box<
 				WalletInst<
 					'static,
@@ -505,7 +505,7 @@ macro_rules! doctest_helper_setup_doc_env_foreign {
 					HTTPNodeClient,
 					ExtKeychain,
 				>,
-				>;
+			>;
 		let lc = wallet.lc_provider().unwrap();
 		let _ = lc.set_top_level_directory(&wallet_config.data_file_dir);
 		lc.open_wallet(None, pw, false, false);
diff --git a/api/src/foreign_rpc.rs b/api/src/foreign_rpc.rs
index 8fc3a62..af7db48 100644
--- a/api/src/foreign_rpc.rs
+++ b/api/src/foreign_rpc.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -557,7 +557,7 @@ macro_rules! doctest_helper_json_rpc_foreign_assert_response {
 			$blocks_to_mine,
 			$init_tx,
 			$init_invoice_tx,
-			)
+		)
 		.unwrap()
 		.unwrap();
 
@@ -566,7 +566,7 @@ macro_rules! doctest_helper_json_rpc_foreign_assert_response {
 				"(left != right) \nleft: {}\nright: {}",
 				serde_json::to_string_pretty(&response).unwrap(),
 				serde_json::to_string_pretty(&expected_response).unwrap()
-				);
-			}
+			);
+		}
 	};
 }
diff --git a/api/src/lib.rs b/api/src/lib.rs
index caf2251..5883cc6 100644
--- a/api/src/lib.rs
+++ b/api/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/api/src/owner.rs b/api/src/owner.rs
index f0b9f57..92b6680 100644
--- a/api/src/owner.rs
+++ b/api/src/owner.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -2436,7 +2436,7 @@ macro_rules! doctest_helper_setup_doc_env {
 		// don't run on windows CI, which gives very inconsistent results
 		if cfg!(windows) {
 			return;
-			}
+		}
 
 		// Set our local chain_type for testing.
 		global::set_local_chain_type(global::ChainTypes::AutomatedTesting);
@@ -2454,7 +2454,7 @@ macro_rules! doctest_helper_setup_doc_env {
 		let node_client = HTTPNodeClient::new(&wallet_config.check_node_api_http_addr, None);
 		let mut wallet = Box::new(
 			DefaultWalletImpl::<'static, HTTPNodeClient>::new(node_client.clone()).unwrap(),
-			)
+		)
 			as Box<
 				WalletInst<
 					'static,
@@ -2462,7 +2462,7 @@ macro_rules! doctest_helper_setup_doc_env {
 					HTTPNodeClient,
 					ExtKeychain,
 				>,
-				>;
+			>;
 		let lc = wallet.lc_provider().unwrap();
 		let _ = lc.set_top_level_directory(&wallet_config.data_file_dir);
 		lc.open_wallet(None, pw, false, false);
diff --git a/api/src/owner_rpc.rs b/api/src/owner_rpc.rs
index f553305..6e61195 100644
--- a/api/src/owner_rpc.rs
+++ b/api/src/owner_rpc.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -2348,7 +2348,7 @@ macro_rules! doctest_helper_json_rpc_owner_assert_response {
 		// disable for now on windows
 		// TODO: Fix properly
 		#[cfg(not(target_os = "windows"))]
-			{
+		{
 			use grin_wallet_api::run_doctest_owner;
 			use serde_json;
 			use serde_json::Value;
@@ -2372,7 +2372,7 @@ macro_rules! doctest_helper_json_rpc_owner_assert_response {
 				$lock_tx,
 				$finalize_tx,
 				$payment_proof,
-				)
+			)
 			.unwrap()
 			.unwrap();
 
@@ -2382,7 +2382,7 @@ macro_rules! doctest_helper_json_rpc_owner_assert_response {
 					serde_json::to_string_pretty(&response).unwrap(),
 					serde_json::to_string_pretty(&expected_response).unwrap()
 				);
-				}
 			}
+		}
 	};
 }
diff --git a/api/src/types.rs b/api/src/types.rs
index e071436..9f0a783 100644
--- a/api/src/types.rs
+++ b/api/src/types.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/api/tests/slate_versioning.rs b/api/tests/slate_versioning.rs
index 9047b58..ede8453 100644
--- a/api/tests/slate_versioning.rs
+++ b/api/tests/slate_versioning.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/config/src/comments.rs b/config/src/comments.rs
index 6d7f2b7..73e80f4 100644
--- a/config/src/comments.rs
+++ b/config/src/comments.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/config/src/config.rs b/config/src/config.rs
index 5673f41..2090888 100644
--- a/config/src/config.rs
+++ b/config/src/config.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/config/src/lib.rs b/config/src/lib.rs
index e64ee56..f6c29d6 100644
--- a/config/src/lib.rs
+++ b/config/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/config/src/types.rs b/config/src/types.rs
index 4f57488..d907388 100644
--- a/config/src/types.rs
+++ b/config/src/types.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/controller/src/command.rs b/controller/src/command.rs
index 2f53b1d..c53bcf9 100644
--- a/controller/src/command.rs
+++ b/controller/src/command.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/controller/src/controller.rs b/controller/src/controller.rs
index 0db390e..78fb0be 100644
--- a/controller/src/controller.rs
+++ b/controller/src/controller.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/controller/src/display.rs b/controller/src/display.rs
index a647054..1f28ad9 100644
--- a/controller/src/display.rs
+++ b/controller/src/display.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/controller/src/error.rs b/controller/src/error.rs
index 22ac767..e634dd8 100644
--- a/controller/src/error.rs
+++ b/controller/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/controller/src/lib.rs b/controller/src/lib.rs
index cc44f34..c910e11 100644
--- a/controller/src/lib.rs
+++ b/controller/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/controller/tests/accounts.rs b/controller/tests/accounts.rs
index fcee4bf..9c1bb79 100644
--- a/controller/tests/accounts.rs
+++ b/controller/tests/accounts.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/controller/tests/check.rs b/controller/tests/check.rs
index 347c3c7..d275fa6 100644
--- a/controller/tests/check.rs
+++ b/controller/tests/check.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/controller/tests/common/mod.rs b/controller/tests/common/mod.rs
index 928f93f..5d1f0b2 100644
--- a/controller/tests/common/mod.rs
+++ b/controller/tests/common/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -50,13 +50,13 @@ macro_rules! create_wallet_and_add {
 			$seed_phrase.clone(),
 			$client.clone(),
 			$create_mask,
-			);
+		);
 		$proxy.add_wallet(
 			$name,
 			$client.get_send_instance(),
 			$wallet.clone(),
 			$mask.clone(),
-			);
+		);
 	};
 }
 
@@ -71,7 +71,7 @@ macro_rules! open_wallet_and_add {
 			$client.get_send_instance(),
 			$wallet.clone(),
 			$mask.clone(),
-			);
+		);
 	};
 }
 pub fn clean_output_dir(test_dir: &str) {
diff --git a/controller/tests/file.rs b/controller/tests/file.rs
index 3f09d83..155ffd5 100644
--- a/controller/tests/file.rs
+++ b/controller/tests/file.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/controller/tests/invoice.rs b/controller/tests/invoice.rs
index c4eacb8..0972ad5 100644
--- a/controller/tests/invoice.rs
+++ b/controller/tests/invoice.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/controller/tests/late_lock.rs b/controller/tests/late_lock.rs
index e6efcaa..b038c6f 100644
--- a/controller/tests/late_lock.rs
+++ b/controller/tests/late_lock.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/controller/tests/no_change.rs b/controller/tests/no_change.rs
index 0a3bc27..d171e19 100644
--- a/controller/tests/no_change.rs
+++ b/controller/tests/no_change.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/controller/tests/payment_proofs.rs b/controller/tests/payment_proofs.rs
index 8d022d8..1176643 100644
--- a/controller/tests/payment_proofs.rs
+++ b/controller/tests/payment_proofs.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/controller/tests/repost.rs b/controller/tests/repost.rs
index 4ca0177..41bd296 100644
--- a/controller/tests/repost.rs
+++ b/controller/tests/repost.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/controller/tests/revert.rs b/controller/tests/revert.rs
index 5708776..899a3ba 100644
--- a/controller/tests/revert.rs
+++ b/controller/tests/revert.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/controller/tests/self_send.rs b/controller/tests/self_send.rs
index d79bc63..7ccbdb1 100644
--- a/controller/tests/self_send.rs
+++ b/controller/tests/self_send.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/controller/tests/slatepack.rs b/controller/tests/slatepack.rs
index 285c2c9..68168f2 100644
--- a/controller/tests/slatepack.rs
+++ b/controller/tests/slatepack.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/controller/tests/transaction.rs b/controller/tests/transaction.rs
index e122e71..6eb3eb7 100644
--- a/controller/tests/transaction.rs
+++ b/controller/tests/transaction.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/controller/tests/ttl_cutoff.rs b/controller/tests/ttl_cutoff.rs
index 0f501dd..428caaa 100644
--- a/controller/tests/ttl_cutoff.rs
+++ b/controller/tests/ttl_cutoff.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/controller/tests/updater_thread.rs b/controller/tests/updater_thread.rs
index ca59b44..7cb756f 100644
--- a/controller/tests/updater_thread.rs
+++ b/controller/tests/updater_thread.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/impls/src/adapters/file.rs b/impls/src/adapters/file.rs
index 5843ce8..5464c11 100644
--- a/impls/src/adapters/file.rs
+++ b/impls/src/adapters/file.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/adapters/http.rs b/impls/src/adapters/http.rs
index 4f15725..29ca347 100644
--- a/impls/src/adapters/http.rs
+++ b/impls/src/adapters/http.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/adapters/keybase.rs b/impls/src/adapters/keybase.rs
index d78aef5..5003d23 100644
--- a/impls/src/adapters/keybase.rs
+++ b/impls/src/adapters/keybase.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/adapters/mod.rs b/impls/src/adapters/mod.rs
index 9ca9ce6..0c8b761 100644
--- a/impls/src/adapters/mod.rs
+++ b/impls/src/adapters/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/adapters/slatepack.rs b/impls/src/adapters/slatepack.rs
index f47b385..8846273 100644
--- a/impls/src/adapters/slatepack.rs
+++ b/impls/src/adapters/slatepack.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/backends/lmdb.rs b/impls/src/backends/lmdb.rs
index 6be42ee..6a8bd03 100644
--- a/impls/src/backends/lmdb.rs
+++ b/impls/src/backends/lmdb.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/backends/mod.rs b/impls/src/backends/mod.rs
index 5e0f777..56b5df6 100644
--- a/impls/src/backends/mod.rs
+++ b/impls/src/backends/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/client_utils/json_rpc.rs b/impls/src/client_utils/json_rpc.rs
index fa8918d..9889699 100644
--- a/impls/src/client_utils/json_rpc.rs
+++ b/impls/src/client_utils/json_rpc.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/client_utils/mod.rs b/impls/src/client_utils/mod.rs
index f863030..1e6777d 100644
--- a/impls/src/client_utils/mod.rs
+++ b/impls/src/client_utils/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/error.rs b/impls/src/error.rs
index fb88da1..b361bab 100644
--- a/impls/src/error.rs
+++ b/impls/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/lib.rs b/impls/src/lib.rs
index 365b7e8..7f60b15 100644
--- a/impls/src/lib.rs
+++ b/impls/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/lifecycle/default.rs b/impls/src/lifecycle/default.rs
index 1184e1c..0f71cbc 100644
--- a/impls/src/lifecycle/default.rs
+++ b/impls/src/lifecycle/default.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/lifecycle/mod.rs b/impls/src/lifecycle/mod.rs
index 511d876..fb9113d 100644
--- a/impls/src/lifecycle/mod.rs
+++ b/impls/src/lifecycle/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/lifecycle/seed.rs b/impls/src/lifecycle/seed.rs
index 20619eb..e2610fc 100644
--- a/impls/src/lifecycle/seed.rs
+++ b/impls/src/lifecycle/seed.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/node_clients/http.rs b/impls/src/node_clients/http.rs
index 1f380cd..f6988a6 100644
--- a/impls/src/node_clients/http.rs
+++ b/impls/src/node_clients/http.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/node_clients/mod.rs b/impls/src/node_clients/mod.rs
index 517f04c..5b3596d 100644
--- a/impls/src/node_clients/mod.rs
+++ b/impls/src/node_clients/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/node_clients/resp_types.rs b/impls/src/node_clients/resp_types.rs
index 390151e..86c6414 100644
--- a/impls/src/node_clients/resp_types.rs
+++ b/impls/src/node_clients/resp_types.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/test_framework/mod.rs b/impls/src/test_framework/mod.rs
index e7aa166..176706c 100644
--- a/impls/src/test_framework/mod.rs
+++ b/impls/src/test_framework/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/test_framework/testclient.rs b/impls/src/test_framework/testclient.rs
index 0a5e299..f89c71b 100644
--- a/impls/src/test_framework/testclient.rs
+++ b/impls/src/test_framework/testclient.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/tor/config.rs b/impls/src/tor/config.rs
index eb2507b..5960704 100644
--- a/impls/src/tor/config.rs
+++ b/impls/src/tor/config.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/impls/src/tor/process.rs b/impls/src/tor/process.rs
index 8ad1c05..d837cef 100644
--- a/impls/src/tor/process.rs
+++ b/impls/src/tor/process.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/integration/src/lib.rs b/integration/src/lib.rs
index 3507bb5..6083201 100644
--- a/integration/src/lib.rs
+++ b/integration/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/integration/tests/api.rs b/integration/tests/api.rs
index 5ce9818..2158805 100644
--- a/integration/tests/api.rs
+++ b/integration/tests/api.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/integration/tests/dandelion.rs b/integration/tests/dandelion.rs
index 719c56b..c80e3b6 100644
--- a/integration/tests/dandelion.rs
+++ b/integration/tests/dandelion.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/integration/tests/framework.rs b/integration/tests/framework.rs
index 3b7db33..b692c8a 100644
--- a/integration/tests/framework.rs
+++ b/integration/tests/framework.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/integration/tests/simulnet.rs b/integration/tests/simulnet.rs
index a11b19d..df407ec 100644
--- a/integration/tests/simulnet.rs
+++ b/integration/tests/simulnet.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/integration/tests/stratum.rs b/integration/tests/stratum.rs
index 0ae3977..ac19e79 100644
--- a/integration/tests/stratum.rs
+++ b/integration/tests/stratum.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/address.rs b/libwallet/src/address.rs
index ce06284..a8d2420 100644
--- a/libwallet/src/address.rs
+++ b/libwallet/src/address.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Develope;
+// Copyright 2021 The Grin Develope;
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/api_impl.rs b/libwallet/src/api_impl.rs
index a5da6e2..88fa561 100644
--- a/libwallet/src/api_impl.rs
+++ b/libwallet/src/api_impl.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/api_impl/foreign.rs b/libwallet/src/api_impl/foreign.rs
index 6f86843..d8cfdaa 100644
--- a/libwallet/src/api_impl/foreign.rs
+++ b/libwallet/src/api_impl/foreign.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/api_impl/owner.rs b/libwallet/src/api_impl/owner.rs
index 89f1dae..655ee1d 100644
--- a/libwallet/src/api_impl/owner.rs
+++ b/libwallet/src/api_impl/owner.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Develope;
+// Copyright 2021 The Grin Develope;
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/api_impl/owner_updater.rs b/libwallet/src/api_impl/owner_updater.rs
index bfdeb8f..d46cdaa 100644
--- a/libwallet/src/api_impl/owner_updater.rs
+++ b/libwallet/src/api_impl/owner_updater.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/api_impl/types.rs b/libwallet/src/api_impl/types.rs
index bcd8409..1a9fd23 100644
--- a/libwallet/src/api_impl/types.rs
+++ b/libwallet/src/api_impl/types.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/error.rs b/libwallet/src/error.rs
index 673ff84..3e0d888 100644
--- a/libwallet/src/error.rs
+++ b/libwallet/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/internal.rs b/libwallet/src/internal.rs
index d2fc340..6c1b135 100644
--- a/libwallet/src/internal.rs
+++ b/libwallet/src/internal.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/internal/keys.rs b/libwallet/src/internal/keys.rs
index 8026e8d..4d6ad63 100644
--- a/libwallet/src/internal/keys.rs
+++ b/libwallet/src/internal/keys.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/internal/scan.rs b/libwallet/src/internal/scan.rs
index 4f08824..d8cb349 100644
--- a/libwallet/src/internal/scan.rs
+++ b/libwallet/src/internal/scan.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/internal/selection.rs b/libwallet/src/internal/selection.rs
index d246e1c..7c66b96 100644
--- a/libwallet/src/internal/selection.rs
+++ b/libwallet/src/internal/selection.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/internal/tx.rs b/libwallet/src/internal/tx.rs
index fe8968b..505b554 100644
--- a/libwallet/src/internal/tx.rs
+++ b/libwallet/src/internal/tx.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/internal/updater.rs b/libwallet/src/internal/updater.rs
index 24338d5..da2209e 100644
--- a/libwallet/src/internal/updater.rs
+++ b/libwallet/src/internal/updater.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/lib.rs b/libwallet/src/lib.rs
index a9dce0b..2ae08f0 100644
--- a/libwallet/src/lib.rs
+++ b/libwallet/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/slate.rs b/libwallet/src/slate.rs
index c790316..20de6c1 100644
--- a/libwallet/src/slate.rs
+++ b/libwallet/src/slate.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/slate_versions/mod.rs b/libwallet/src/slate_versions/mod.rs
index 94ade6c..ca2e749 100644
--- a/libwallet/src/slate_versions/mod.rs
+++ b/libwallet/src/slate_versions/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/slate_versions/ser.rs b/libwallet/src/slate_versions/ser.rs
index c68f342..58f866a 100644
--- a/libwallet/src/slate_versions/ser.rs
+++ b/libwallet/src/slate_versions/ser.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/slate_versions/v4.rs b/libwallet/src/slate_versions/v4.rs
index 3ce4f28..26c59e0 100644
--- a/libwallet/src/slate_versions/v4.rs
+++ b/libwallet/src/slate_versions/v4.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/slate_versions/v4_bin.rs b/libwallet/src/slate_versions/v4_bin.rs
index d86b969..5b93d91 100644
--- a/libwallet/src/slate_versions/v4_bin.rs
+++ b/libwallet/src/slate_versions/v4_bin.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/slatepack/address.rs b/libwallet/src/slatepack/address.rs
index 3160394..382cedb 100644
--- a/libwallet/src/slatepack/address.rs
+++ b/libwallet/src/slatepack/address.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/slatepack/armor.rs b/libwallet/src/slatepack/armor.rs
index 7988ce8..72aaa57 100644
--- a/libwallet/src/slatepack/armor.rs
+++ b/libwallet/src/slatepack/armor.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/slatepack/mod.rs b/libwallet/src/slatepack/mod.rs
index c2dbcaf..157b5cf 100644
--- a/libwallet/src/slatepack/mod.rs
+++ b/libwallet/src/slatepack/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/slatepack/packer.rs b/libwallet/src/slatepack/packer.rs
index f42b485..9ef31cc 100644
--- a/libwallet/src/slatepack/packer.rs
+++ b/libwallet/src/slatepack/packer.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/slatepack/types.rs b/libwallet/src/slatepack/types.rs
index 6490fcd..52375da 100644
--- a/libwallet/src/slatepack/types.rs
+++ b/libwallet/src/slatepack/types.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/src/types.rs b/libwallet/src/types.rs
index bef865c..6f1ee58 100644
--- a/libwallet/src/types.rs
+++ b/libwallet/src/types.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/libwallet/tests/libwallet.rs b/libwallet/tests/libwallet.rs
index cc300ca..bd14a95 100644
--- a/libwallet/tests/libwallet.rs
+++ b/libwallet/tests/libwallet.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/libwallet/tests/slate_versioning.rs b/libwallet/tests/slate_versioning.rs
index df440e5..2db6a8c 100644
--- a/libwallet/tests/slate_versioning.rs
+++ b/libwallet/tests/slate_versioning.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/src/bin/grin-wallet.rs b/src/bin/grin-wallet.rs
index c9071b4..7f870d0 100644
--- a/src/bin/grin-wallet.rs
+++ b/src/bin/grin-wallet.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/build/build.rs b/src/build/build.rs
index 97bc680..4f7904d 100644
--- a/src/build/build.rs
+++ b/src/build/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/cli/cli.rs b/src/cli/cli.rs
index 25b12ee..e4fad0e 100644
--- a/src/cli/cli.rs
+++ b/src/cli/cli.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index d4c2ee4..7d24895 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/cmd/mod.rs b/src/cmd/mod.rs
index 2db8193..00fc0fb 100644
--- a/src/cmd/mod.rs
+++ b/src/cmd/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/cmd/wallet.rs b/src/cmd/wallet.rs
index 30c5c55..2a76b98 100644
--- a/src/cmd/wallet.rs
+++ b/src/cmd/wallet.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/cmd/wallet_args.rs b/src/cmd/wallet_args.rs
index 1db6bed..6915710 100644
--- a/src/cmd/wallet_args.rs
+++ b/src/cmd/wallet_args.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -45,8 +45,8 @@ macro_rules! arg_parse {
 			Ok(res) => res,
 			Err(e) => {
 				return Err(ErrorKind::ArgumentError(format!("{}", e)).into());
-				}
 			}
+		}
 	};
 }
 /// Simple error definition, just so we can return errors from all commands
diff --git a/src/lib.rs b/src/lib.rs
index ff766d4..d1d30e1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/tests/cmd_line_basic.rs b/tests/cmd_line_basic.rs
index 1b991f2..78f0ec2 100644
--- a/tests/cmd_line_basic.rs
+++ b/tests/cmd_line_basic.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index 1f38bcf..d2b6c62 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -68,7 +68,7 @@ macro_rules! setup_proxy {
 		println!("{:?}", target);
 		if !target.exists() {
 			execute_command(&app, $test_dir, "wallet1", &$client1, arg_vec.clone())?;
-			}
+		}
 
 		// add wallet to proxy
 		let config1 = initial_setup_wallet($test_dir, "wallet1");
@@ -79,14 +79,14 @@ macro_rules! setup_proxy {
 			$client1.clone(),
 			"password",
 			"default",
-			)?;
+		)?;
 		let $mask1 = (&mask1_i).as_ref();
 		wallet_proxy.add_wallet(
 			"wallet1",
 			$client1.get_send_instance(),
 			$wallet1.clone(),
 			mask1_i.clone(),
-			);
+		);
 
 		// Create wallet 2, which will run a listener
 		let $client2 = LocalWalletClient::new("wallet2", wallet_proxy.tx.clone());
@@ -94,7 +94,7 @@ macro_rules! setup_proxy {
 		let target = std::path::PathBuf::from(format!("{}/wallet2/grin-wallet.toml", $test_dir));
 		if !target.exists() {
 			execute_command(&app, $test_dir, "wallet2", &$client2, arg_vec.clone())?;
-			}
+		}
 
 		let config2 = initial_setup_wallet($test_dir, "wallet2");
 		let wallet_config2 = config2.clone().members.unwrap().wallet;
@@ -104,21 +104,21 @@ macro_rules! setup_proxy {
 			$client2.clone(),
 			"password",
 			"default",
-			)?;
+		)?;
 		let $mask2 = (&mask2_i).as_ref();
 		wallet_proxy.add_wallet(
 			"wallet2",
 			$client2.get_send_instance(),
 			$wallet2.clone(),
 			mask2_i.clone(),
-			);
+		);
 
 		// Set the wallet proxy listener running
 		thread::spawn(move || {
 			if let Err(e) = wallet_proxy.run() {
 				error!("Wallet Proxy error: {}", e);
-				}
-			});
+			}
+		});
 	};
 }
 
diff --git a/tests/owner_v3_init_secure.rs b/tests/owner_v3_init_secure.rs
index 1630f17..51e7083 100644
--- a/tests/owner_v3_init_secure.rs
+++ b/tests/owner_v3_init_secure.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/tests/owner_v3_lifecycle.rs b/tests/owner_v3_lifecycle.rs
index 8b1edae..7cbe0e3 100644
--- a/tests/owner_v3_lifecycle.rs
+++ b/tests/owner_v3_lifecycle.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/tests/tor_dev_helper.rs b/tests/tor_dev_helper.rs
index 5f229ea..3011e61 100644
--- a/tests/tor_dev_helper.rs
+++ b/tests/tor_dev_helper.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/util/src/byte_ser.rs b/util/src/byte_ser.rs
index c944b6e..8e5a936 100644
--- a/util/src/byte_ser.rs
+++ b/util/src/byte_ser.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/util/src/lib.rs b/util/src/lib.rs
index 74f14d3..8b8bd8d 100644
--- a/util/src/lib.rs
+++ b/util/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/util/src/ov3.rs b/util/src/ov3.rs
index 00bed2e..b9edc21 100644
--- a/util/src/ov3.rs
+++ b/util/src/ov3.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 The Grin Developers
+// Copyright 2021 The Grin Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.