[stable] Backported wallet fix (#6104)

* Fix initialisation bug.

* update wallet library modifiers

* v1.6.10

Cargo.lock

@@ -1,6 +1,6 @@
 [root]
 name = "parity"
-version = "1.6.9"
+version = "1.6.10"
 dependencies = [
  "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "app_dirs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -23,7 +23,7 @@ dependencies = [
  "ethcore-secretstore 1.0.0",
  "ethcore-signer 1.6.0",
  "ethcore-stratum 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "ethsync 1.6.0",
  "evmbin 0.1.0",
  "fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -394,7 +394,7 @@ dependencies = [
  "ethcore-ipc-codegen 1.6.0",
  "ethcore-ipc-nano 1.6.0",
  "ethcore-stratum 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "ethjson 0.1.0",
  "ethkey 0.2.0",
  "ethstore 0.1.0",
@@ -444,7 +444,7 @@ dependencies = [
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore-devtools 1.6.0",
  "ethcore-rpc 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "fetch 0.1.0",
  "futures 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.10.0-a.0 (git+https://github.com/ethcore/hyper)",
@@ -492,7 +492,7 @@ name = "ethcore-ipc"
 version = "1.6.0"
 dependencies = [
  "ethcore-devtools 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)",
  "semver 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -539,7 +539,7 @@ dependencies = [
  "ethcore-ipc 1.6.0",
  "ethcore-ipc-codegen 1.6.0",
  "ethcore-ipc-nano 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)",
  "semver 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -554,7 +554,7 @@ dependencies = [
  "ethcore-ipc 1.6.0",
  "ethcore-ipc-codegen 1.6.0",
  "ethcore-network 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "futures 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -570,7 +570,7 @@ name = "ethcore-logger"
 version = "1.6.0"
 dependencies = [
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "isatty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -586,7 +586,7 @@ dependencies = [
  "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore-devtools 1.6.0",
  "ethcore-io 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "ethcrypto 0.1.0",
  "ethkey 0.2.0",
  "igd 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -614,7 +614,7 @@ dependencies = [
  "ethcore-io 1.6.0",
  "ethcore-ipc 1.6.0",
  "ethcore-light 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "ethcrypto 0.1.0",
  "ethjson 0.1.0",
  "ethkey 0.2.0",
@@ -649,7 +649,7 @@ dependencies = [
  "ethcore-ipc 1.6.0",
  "ethcore-ipc-codegen 1.6.0",
  "ethcore-ipc-nano 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "ethcrypto 0.1.0",
  "ethkey 0.2.0",
  "hyper 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -667,7 +667,7 @@ dependencies = [
  "ethcore-devtools 1.6.0",
  "ethcore-io 1.6.0",
  "ethcore-rpc 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "jsonrpc-core 6.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.6)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -686,7 +686,7 @@ dependencies = [
  "ethcore-ipc 1.6.0",
  "ethcore-ipc-codegen 1.6.0",
  "ethcore-ipc-nano 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "futures 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 6.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.6)",
  "jsonrpc-macros 6.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.6)",
@@ -700,7 +700,7 @@ dependencies = [
 
 [[package]]
 name = "ethcore-util"
-version = "1.6.9"
+version = "1.6.10"
 dependencies = [
  "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "arrayvec 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -749,7 +749,7 @@ dependencies = [
 name = "ethjson"
 version = "0.1.0"
 dependencies = [
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -777,7 +777,7 @@ version = "0.1.0"
 dependencies = [
  "docopt 0.6.80 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore-devtools 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "ethcrypto 0.1.0",
  "ethkey 0.2.0",
  "itertools 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -810,7 +810,7 @@ dependencies = [
  "ethcore-ipc-nano 1.6.0",
  "ethcore-light 1.6.0",
  "ethcore-network 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "ethkey 0.2.0",
  "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -828,7 +828,7 @@ version = "0.1.0"
 dependencies = [
  "docopt 0.6.80 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1084,7 +1084,7 @@ version = "1.6.0"
 dependencies = [
  "ethcore-ipc 1.6.0",
  "ethcore-ipc-codegen 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "semver 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1687,7 +1687,7 @@ name = "parity-hash-fetch"
 version = "1.6.0"
 dependencies = [
  "ethabi 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "fetch 0.1.0",
  "futures 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1704,7 +1704,7 @@ version = "1.6.0"
 dependencies = [
  "cid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "hyper 0.10.0-a.0 (git+https://github.com/ethcore/hyper)",
  "jsonrpc-http-server 6.0.0 (git+https://github.com/ethcore/jsonrpc.git?branch=parity-1.6)",
  "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1718,7 +1718,7 @@ version = "0.1.0"
 dependencies = [
  "ethcore 1.6.0",
  "ethcore-io 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "ethkey 0.2.0",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rlp 0.1.0",
@@ -1741,7 +1741,7 @@ version = "1.4.0"
 dependencies = [
  "ethcore-rpc 1.6.0",
  "ethcore-signer 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "futures 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 6.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.6)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1785,7 +1785,7 @@ dependencies = [
  "ethcore 1.6.0",
  "ethcore-ipc 1.6.0",
  "ethcore-ipc-codegen 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "ethsync 1.6.0",
  "ipc-common-types 1.6.0",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2084,7 +2084,7 @@ version = "1.4.0"
 dependencies = [
  "ethcore-bigint 0.1.2",
  "ethcore-rpc 1.6.0",
- "ethcore-util 1.6.9",
+ "ethcore-util 1.6.10",
  "futures 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-rpc-client 1.4.0",
  "rpassword 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 description = "Parity Ethereum client"
 name = "parity"
-version = "1.6.9"
+version = "1.6.10"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 

js/src/contracts/snippets/enhanced-wallet.sol

@@ -104,7 +104,7 @@ contract WalletLibrary is WalletEvents {
 
   // constructor is given number of sigs required to do protected "onlymanyowners" transactions
   // as well as the selection of addresses capable of confirming them.
-  function initMultiowned(address[] _owners, uint _required) {
+  function initMultiowned(address[] _owners, uint _required) only_uninitialized {
     m_numOwners = _owners.length + 1;
     m_owners[1] = uint(msg.sender);
     m_ownerIndex[uint(msg.sender)] = 1;
@@ -198,7 +198,7 @@ contract WalletLibrary is WalletEvents {
   }
 
   // constructor - stores initial daily limit and records the present day's index.
-  function initDaylimit(uint _limit) {
+  function initDaylimit(uint _limit) only_uninitialized {
     m_dailyLimit = _limit;
     m_lastDay = today();
   }
@@ -211,9 +211,12 @@ contract WalletLibrary is WalletEvents {
     m_spentToday = 0;
   }
 
+  // throw unless the contract is not yet initialized.
+  modifier only_uninitialized { if (m_numOwners > 0) throw; _; }
+
   // constructor - just pass on the owner array to the multiowned and
   // the limit to daylimit
-  function initWallet(address[] _owners, uint _required, uint _daylimit) {
+  function initWallet(address[] _owners, uint _required, uint _daylimit) only_uninitialized {
     initDaylimit(_daylimit);
     initMultiowned(_owners, _required);
   }

mac/Parity.pkgproj

@@ -462,7 +462,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.6.9</string>
+				<string>1.6.10</string>
 			</dict>
 			<key>UUID</key>
 			<string>2DCD5B81-7BAF-4DA1-9251-6274B089FD36</string>

mac/Parity/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.9</string>
+	<string>1.6.10</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSApplicationCategoryType</key>

nsis/installer.nsi

@@ -10,7 +10,7 @@
 !define DESCRIPTION "Fast, light, robust Ethereum implementation"
 !define VERSIONMAJOR 1
 !define VERSIONMINOR 6
-!define VERSIONBUILD 9
+!define VERSIONBUILD 10
 !define ARGS "--warp"
 !define FIRST_START_ARGS "ui --warp --mode=passive"
 

util/Cargo.toml

@@ -3,7 +3,7 @@ description = "Ethcore utility library"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-util"
-version = "1.6.9"
+version = "1.6.10"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"