From a9709f942a8a5b165d33e06a9c066a33a8cba6e4 Mon Sep 17 00:00:00 2001
From: debris <marek.kotewicz@gmail.com>
Date: Fri, 25 Aug 2017 18:29:29 +0200
Subject: [PATCH] fixed verification of signatures signed with eth_sign, closes
 #17

---
 contracts/Authorities.bin    | 2 +-
 contracts/EthereumBridge.abi | 4 ++++
 contracts/EthereumBridge.bin | 2 +-
 contracts/KovanBridge.abi    | 6 ++++++
 contracts/KovanBridge.bin    | 2 +-
 contracts/bridge.sol         | 5 +++--
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/contracts/Authorities.bin b/contracts/Authorities.bin
index e6c4b1d..25347f8 100644
--- a/contracts/Authorities.bin
+++ b/contracts/Authorities.bin
@@ -1 +1 @@
-60606040523415600e57600080fd5b5b603680601c6000396000f30060606040525b600080fd00a165627a7a7230582055040070eecda16f7992555f728eac18e0652f23cefba6637af8a8384e1c5de90029
\ No newline at end of file
+60606040523415600e57600080fd5b5b603680601c6000396000f30060606040525b600080fd00a165627a7a723058209ccf54929d065bb2c6b737f40dbe925c7268d38fa91d71817ee6528f47dfb2dd0029
\ No newline at end of file
diff --git a/contracts/EthereumBridge.abi b/contracts/EthereumBridge.abi
index 7293870..d7ea1b6 100644
--- a/contracts/EthereumBridge.abi
+++ b/contracts/EthereumBridge.abi
@@ -22,6 +22,7 @@
         "name": "withdraw",
         "outputs": [],
         "payable": false,
+        "stateMutability": "nonpayable",
         "type": "function"
     },
     {
@@ -47,6 +48,7 @@
         "name": "reelect",
         "outputs": [],
         "payable": false,
+        "stateMutability": "nonpayable",
         "type": "function"
     },
     {
@@ -61,10 +63,12 @@
             }
         ],
         "payable": false,
+        "stateMutability": "nonpayable",
         "type": "constructor"
     },
     {
         "payable": true,
+        "stateMutability": "payable",
         "type": "fallback"
     },
     {
diff --git a/contracts/EthereumBridge.bin b/contracts/EthereumBridge.bin
index 4ec3e57..be6c29c 100644
--- a/contracts/EthereumBridge.bin
+++ b/contracts/EthereumBridge.bin
@@ -1 +1 @@
-6060604052341561000f57600080fd5b604051610d12380380610d12833981016040528080519060200190919080518201919050505b80516000541115151561004757600080fd5b81600081905550806001908051906020019061006492919061006d565b505b505061013a565b8280548282559060005260206000209081019282156100e6579160200282015b828111156100e55782518260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055509160200191906001019061008d565b5b5090506100f391906100f7565b5090565b61013791905b8082111561013357600081816101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055506001016100fd565b5090565b90565b610bc9806101496000396000f3006060604052361561004a576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680639ce318f6146100b9578063c3371af4146101d6575b5b7fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c3334604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390a15b005b34156100c457600080fd5b6101d4600480803590602001908201803590602001908080602002602001604051908101604052809392919081815260200183836020028082843782019150505050505091908035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509190803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919050506102f3565b005b34156101e157600080fd5b6102f1600480803590602001908201803590602001908080602002602001604051908101604052809392919081815260200183836020028082843782019150505050505091908035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509190803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919050506106d7565b005b6000806000868686866000610306610b38565b600080846040518082805190602001908083835b60208310151561034057805182525b60208201915060208101905060208303925061031a565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020935060005460405180591061037f5750595b908082528060200260200182016040525b5092508751600054111515156103a557600080fd5b600091505b60005482101561059e5760018489848151811015156103c557fe5b9060200190602002015189858151811015156103dd57fe5b9060200190602002015189868151811015156103f557fe5b90602001906020020151604051600081526020016040526000604051602001526040518085600019166000191681526020018460ff1660ff16815260200183600019166000191681526020018260001916600019168152602001945050505050602060405160208103908084039060008661646e5a03f1151561047757600080fd5b505060206040510351905061051b81600180548060200260200160405190810160405280929190818152602001828054801561050857602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190600101908083116104be575b5050505050610a4890919063ffffffff16565b151561052657600080fd5b6105398184610a4890919063ffffffff16565b15151561054557600080fd5b80838381518110151561055457fe5b9060200190602002019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250505b81806001019250506103aa565b8b519a5060328c0151995060648c01519850600260008a6000191660001916815260200190815260200160002060009054906101000a900460ff161515156105e557600080fd5b6001600260008b6000191660001916815260200190815260200160002060006101000a81548160ff0219169083151502179055508a73ffffffffffffffffffffffffffffffffffffffff166108fc8b9081150290604051600060405180830381858888f19350505050151561065957600080fd5b7f884edad9ce6fa2440d8a54cc123490eb96d2768479d49ff9c7366125a94243648b8b604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390a15b5b505050505050505050505050505050565b6000806000808787878760006106eb610b38565b600080846040518082805190602001908083835b60208310151561072557805182525b6020820191506020810190506020830392506106ff565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902093506000546040518059106107645750595b908082528060200260200182016040525b50925087516000541115151561078a57600080fd5b600091505b6000548210156109835760018489848151811015156107aa57fe5b9060200190602002015189858151811015156107c257fe5b9060200190602002015189868151811015156107da57fe5b90602001906020020151604051600081526020016040526000604051602001526040518085600019166000191681526020018460ff1660ff16815260200183600019166000191681526020018260001916600019168152602001945050505050602060405160208103908084039060008661646e5a03f1151561085c57600080fd5b50506020604051035190506109008160018054806020026020016040519081016040528092919081815260200182805480156108ed57602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190600101908083116108a3575b5050505050610a4890919063ffffffff16565b151561090b57600080fd5b61091e8184610a4890919063ffffffff16565b15151561092a57600080fd5b80838381518110151561093957fe5b9060200190602002019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250505b818060010192505061078f565b8c519b5060328d01519a508a8c1115151561099d57600080fd5b6109b18b6001610ac790919063ffffffff16565b600098505b8a891015610a345788603202606401808e01519a50508960018a8154811015156109dc57fe5b906000526020600020900160005b6101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b88806001019950506109b6565b5b5b50505050505050505050505050505050565b600080600090505b8351811015610abb578273ffffffffffffffffffffffffffffffffffffffff168482815181101515610a7e57fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff161415610aad5760019150610ac0565b5b8080600101915050610a50565b600091505b5092915050565b60008190505b8280549050811015610b24578281815481101515610ae757fe5b906000526020600020900160005b6101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690555b8080600101915050610acd565b818381610b319190610b4c565b505b505050565b602060405190810160405280600081525090565b815481835581811511610b7357818360005260206000209182019101610b729190610b78565b5b505050565b610b9a91905b80821115610b96576000816000905550600101610b7e565b5090565b905600a165627a7a723058208aaeee1fe8e4be89ad13acced63a265adee17249982392e02533edb113835cc70029
\ No newline at end of file
+6060604052341561000f57600080fd5b604051610e66380380610e66833981016040528080519060200190919080518201919050505b80516000541115151561004757600080fd5b81600081905550806001908051906020019061006492919061006d565b505b505061013a565b8280548282559060005260206000209081019282156100e6579160200282015b828111156100e55782518260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055509160200191906001019061008d565b5b5090506100f391906100f7565b5090565b61013791905b8082111561013357600081816101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055506001016100fd565b5090565b90565b610d1d806101496000396000f3006060604052361561004a576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680639ce318f6146100b9578063c3371af4146101d6575b5b7fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c3334604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390a15b005b34156100c457600080fd5b6101d4600480803590602001908201803590602001908080602002602001604051908101604052809392919081815260200183836020028082843782019150505050505091908035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509190803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919050506102f3565b005b34156101e157600080fd5b6102f1600480803590602001908201803590602001908080602002602001604051908101604052809392919081815260200183836020028082843782019150505050505091908035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509190803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505091905050610777565b005b600080600086868686610304610c78565b600061030e610c8c565b6000806040805190810160405280601a81526020017f19457468657265756d205369676e6564204d6573736167653a0a0000000000008152509450848651876040518084805190602001908083835b60208310151561038357805182525b60208201915060208101905060208303925061035d565b6001836020036101000a03801982511681845116808217855250505050505090500183815260200182805190602001908083835b6020831015156103dd57805182525b6020820191506020810190506020830392506103b7565b6001836020036101000a03801982511681845116808217855250505050505090500193505050506040518091039020935060005460405180591061041e5750595b908082528060200260200182016040525b50925088516000541115151561044457600080fd5b600091505b60005482101561063d576001848a8481518110151561046457fe5b906020019060200201518a8581518110151561047c57fe5b906020019060200201518a8681518110151561049457fe5b90602001906020020151604051600081526020016040526000604051602001526040518085600019166000191681526020018460ff1660ff16815260200183600019166000191681526020018260001916600019168152602001945050505050602060405160208103908084039060008661646e5a03f1151561051657600080fd5b50506020604051035190506105ba8160018054806020026020016040519081016040528092919081815260200182805480156105a757602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001906001019080831161055d575b5050505050610b8890919063ffffffff16565b15156105c557600080fd5b6105d88184610b8890919063ffffffff16565b1515156105e457600080fd5b8083838151811015156105f357fe5b9060200190602002019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250505b8180600101925050610449565b8c519b5060328d01519a5060648d01519950600260008b6000191660001916815260200190815260200160002060009054906101000a900460ff1615151561068457600080fd5b6001600260008c6000191660001916815260200190815260200160002060006101000a81548160ff0219169083151502179055508b73ffffffffffffffffffffffffffffffffffffffff166108fc8c9081150290604051600060405180830381858888f1935050505015156106f857600080fd5b7f884edad9ce6fa2440d8a54cc123490eb96d2768479d49ff9c7366125a94243648c8c604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390a15b5b50505050505050505050505050505050565b60008060008087878787610789610c78565b6000610793610c8c565b6000806040805190810160405280601a81526020017f19457468657265756d205369676e6564204d6573736167653a0a0000000000008152509450848651876040518084805190602001908083835b60208310151561080857805182525b6020820191506020810190506020830392506107e2565b6001836020036101000a03801982511681845116808217855250505050505090500183815260200182805190602001908083835b60208310151561086257805182525b60208201915060208101905060208303925061083c565b6001836020036101000a0380198251168184511680821785525050505050509050019350505050604051809103902093506000546040518059106108a35750595b908082528060200260200182016040525b5092508851600054111515156108c957600080fd5b600091505b600054821015610ac2576001848a848151811015156108e957fe5b906020019060200201518a8581518110151561090157fe5b906020019060200201518a8681518110151561091957fe5b90602001906020020151604051600081526020016040526000604051602001526040518085600019166000191681526020018460ff1660ff16815260200183600019166000191681526020018260001916600019168152602001945050505050602060405160208103908084039060008661646e5a03f1151561099b57600080fd5b5050602060405103519050610a3f816001805480602002602001604051908101604052809291908181526020018280548015610a2c57602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190600101908083116109e2575b5050505050610b8890919063ffffffff16565b1515610a4a57600080fd5b610a5d8184610b8890919063ffffffff16565b151515610a6957600080fd5b808383815181101515610a7857fe5b9060200190602002019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250505b81806001019250506108ce565b8d519c5060328e01519b508b8d11151515610adc57600080fd5b610af08c6001610c0790919063ffffffff16565b600099505b8b8a1015610b735789603202606401808f01519b50508a60018b815481101515610b1b57fe5b906000526020600020900160005b6101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b89806001019a5050610af5565b5b5b5050505050505050505050505050505050565b600080600090505b8351811015610bfb578273ffffffffffffffffffffffffffffffffffffffff168482815181101515610bbe57fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff161415610bed5760019150610c00565b5b8080600101915050610b90565b600091505b5092915050565b60008190505b8280549050811015610c64578281815481101515610c2757fe5b906000526020600020900160005b6101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690555b8080600101915050610c0d565b818381610c719190610ca0565b505b505050565b602060405190810160405280600081525090565b602060405190810160405280600081525090565b815481835581811511610cc757818360005260206000209182019101610cc69190610ccc565b5b505050565b610cee91905b80821115610cea576000816000905550600101610cd2565b5090565b905600a165627a7a7230582084d5b9603ae40ab8cab34dfcc97564e32b5fd5015a32a724738803923d978c5a0029
\ No newline at end of file
diff --git a/contracts/KovanBridge.abi b/contracts/KovanBridge.abi
index 8593c85..ac8fcbf 100644
--- a/contracts/KovanBridge.abi
+++ b/contracts/KovanBridge.abi
@@ -19,6 +19,7 @@
             }
         ],
         "payable": false,
+        "stateMutability": "view",
         "type": "function"
     },
     {
@@ -40,6 +41,7 @@
         "name": "deposit",
         "outputs": [],
         "payable": false,
+        "stateMutability": "nonpayable",
         "type": "function"
     },
     {
@@ -58,6 +60,7 @@
             }
         ],
         "payable": false,
+        "stateMutability": "view",
         "type": "function"
     },
     {
@@ -75,6 +78,7 @@
         "name": "submitSignature",
         "outputs": [],
         "payable": false,
+        "stateMutability": "nonpayable",
         "type": "function"
     },
     {
@@ -96,6 +100,7 @@
         "name": "transfer",
         "outputs": [],
         "payable": false,
+        "stateMutability": "nonpayable",
         "type": "function"
     },
     {
@@ -110,6 +115,7 @@
             }
         ],
         "payable": false,
+        "stateMutability": "nonpayable",
         "type": "constructor"
     },
     {
diff --git a/contracts/KovanBridge.bin b/contracts/KovanBridge.bin
index b45b11d..f6b7bb7 100644
--- a/contracts/KovanBridge.bin
+++ b/contracts/KovanBridge.bin
@@ -1 +1 @@
-6060604052341561000f57600080fd5b60405161105f38038061105f833981016040528080519060200190919080518201919050505b80516000541115151561004757600080fd5b81600081905550806001908051906020019061006492919061006d565b505b505061013a565b8280548282559060005260206000209081019282156100e6579160200282015b828111156100e55782518260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055509160200191906001019061008d565b5b5090506100f391906100f7565b5090565b61013791905b8082111561013357600081816101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055506001016100fd565b5090565b90565b610f16806101496000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680631812d9961461006a57806326b3293f14610114578063490a32c614610163578063630cea8e14610204578063e1ad1162146102a4575b600080fd5b341561007557600080fd5b6100986004808035600019169060200190919080359060200190919050506102f1565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100d95780820151818401525b6020810190506100bd565b50505050905090810190601f1680156101065780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561011f57600080fd5b610161600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091908035600019169060200190919050506103d5565b005b341561016e57600080fd5b61018860048080356000191690602001909190505061069c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101c95780820151818401525b6020810190506101ad565b50505050905090810190601f1680156101f65780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561020f57600080fd5b6102a2600480803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505091905050610763565b005b34156102af57600080fd5b6102ef600480803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919080351515906020019091905050610ae2565b005b6102f9610d65565b6004600084600019166000191681526020019081526020016000206002018281548110151561032457fe5b906000526020600020900160005b508054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156103c75780601f1061039c576101008083540402835291602001916103c7565b820191906000526020600020905b8154815290600101906020018083116103aa57829003601f168201915b505050505090505b92915050565b61046e33600180548060200260200160405190810160405280929190818152602001828054801561045b57602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019060010190808311610411575b5050505050610ce690919063ffffffff16565b151561047957600080fd5b61052b3360036000846000191660001916815260200190815260200160002080548060200260200160405190810160405280929190818152602001828054801561051857602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190600101908083116104ce575b5050505050610ce690919063ffffffff16565b15151561053757600080fd5b60036000826000191660001916815260200190815260200160002080548060010182816105649190610d79565b916000526020600020900160005b33909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506000546003600083600019166000191681526020019081526020016000208054905014156106955781600260008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055507fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c8383604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390a15b5b5b505050565b6106a4610d65565b6004600083600019166000191681526020019081526020016000206000018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156107565780601f1061072b57610100808354040283529160200191610756565b820191906000526020600020905b81548152906001019060200180831161073957829003601f168201915b505050505090505b919050565b60006107fe3360018054806020026020016040519081016040528092919081815260200182805480156107eb57602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190600101908083116107a1575b5050505050610ce690919063ffffffff16565b151561080957600080fd5b816040518082805190602001908083835b60208310151561084057805182525b60208201915060208101905060208303925061081a565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902090506109243360046000846000191660001916815260200190815260200160002060010180548060200260200160405190810160405280929190818152602001828054801561091157602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190600101908083116108c7575b5050505050610ce690919063ffffffff16565b15151561093057600080fd5b816004600083600019166000191681526020019081526020016000206000019080519060200190610962929190610da5565b5060046000826000191660001916815260200190815260200160002060010180548060010182816109939190610d79565b916000526020600020900160005b33909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506004600082600019166000191681526020019081526020016000206002018054806001018281610a139190610e25565b916000526020600020900160005b8590919091509080519060200190610a3a929190610da5565b5050600054600460008360001916600019168152602001908152602001600020600101805490501415610adb577feb043d149eedb81369bec43d4c3a3a53087debc88d2525f13bfaa3eecda28b5c3382604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182600019166000191681526020019250505060405180910390a15b5b5b505050565b81600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410151515610b3057600080fd5b81600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055508015610bf3577f884edad9ce6fa2440d8a54cc123490eb96d2768479d49ff9c7366125a94243648383604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390a1610ce0565b81600260008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055507fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef338484604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001828152602001935050505060405180910390a15b5b505050565b600080600090505b8351811015610d59578273ffffffffffffffffffffffffffffffffffffffff168482815181101515610d1c57fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff161415610d4b5760019150610d5e565b5b8080600101915050610cee565b600091505b5092915050565b602060405190810160405280600081525090565b815481835581811511610da057818360005260206000209182019101610d9f9190610e51565b5b505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f10610de657805160ff1916838001178555610e14565b82800160010185558215610e14579182015b82811115610e13578251825591602001919060010190610df8565b5b509050610e219190610e51565b5090565b815481835581811511610e4c57818360005260206000209182019101610e4b9190610e76565b5b505050565b610e7391905b80821115610e6f576000816000905550600101610e57565b5090565b90565b610e9f91905b80821115610e9b5760008181610e929190610ea2565b50600101610e7c565b5090565b90565b50805460018160011615610100020316600290046000825580601f10610ec85750610ee7565b601f016020900490600052602060002090810190610ee69190610e51565b5b505600a165627a7a723058204da806f79f9286628d8ab9263a680e307783d58dfbb9b26f97f0dd372fbe82950029
\ No newline at end of file
+6060604052341561000f57600080fd5b60405161105f38038061105f833981016040528080519060200190919080518201919050505b80516000541115151561004757600080fd5b81600081905550806001908051906020019061006492919061006d565b505b505061013a565b8280548282559060005260206000209081019282156100e6579160200282015b828111156100e55782518260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055509160200191906001019061008d565b5b5090506100f391906100f7565b5090565b61013791905b8082111561013357600081816101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055506001016100fd565b5090565b90565b610f16806101496000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680631812d9961461006a57806326b3293f14610114578063490a32c614610163578063630cea8e14610204578063e1ad1162146102a4575b600080fd5b341561007557600080fd5b6100986004808035600019169060200190919080359060200190919050506102f1565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100d95780820151818401525b6020810190506100bd565b50505050905090810190601f1680156101065780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561011f57600080fd5b610161600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091908035600019169060200190919050506103d5565b005b341561016e57600080fd5b61018860048080356000191690602001909190505061069c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101c95780820151818401525b6020810190506101ad565b50505050905090810190601f1680156101f65780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561020f57600080fd5b6102a2600480803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509190803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505091905050610763565b005b34156102af57600080fd5b6102ef600480803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919080351515906020019091905050610ae2565b005b6102f9610d65565b6004600084600019166000191681526020019081526020016000206002018281548110151561032457fe5b906000526020600020900160005b508054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156103c75780601f1061039c576101008083540402835291602001916103c7565b820191906000526020600020905b8154815290600101906020018083116103aa57829003601f168201915b505050505090505b92915050565b61046e33600180548060200260200160405190810160405280929190818152602001828054801561045b57602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019060010190808311610411575b5050505050610ce690919063ffffffff16565b151561047957600080fd5b61052b3360036000846000191660001916815260200190815260200160002080548060200260200160405190810160405280929190818152602001828054801561051857602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190600101908083116104ce575b5050505050610ce690919063ffffffff16565b15151561053757600080fd5b60036000826000191660001916815260200190815260200160002080548060010182816105649190610d79565b916000526020600020900160005b33909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506000546003600083600019166000191681526020019081526020016000208054905014156106955781600260008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055507fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c8383604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390a15b5b5b505050565b6106a4610d65565b6004600083600019166000191681526020019081526020016000206000018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156107565780601f1061072b57610100808354040283529160200191610756565b820191906000526020600020905b81548152906001019060200180831161073957829003601f168201915b505050505090505b919050565b60006107fe3360018054806020026020016040519081016040528092919081815260200182805480156107eb57602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190600101908083116107a1575b5050505050610ce690919063ffffffff16565b151561080957600080fd5b816040518082805190602001908083835b60208310151561084057805182525b60208201915060208101905060208303925061081a565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902090506109243360046000846000191660001916815260200190815260200160002060010180548060200260200160405190810160405280929190818152602001828054801561091157602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190600101908083116108c7575b5050505050610ce690919063ffffffff16565b15151561093057600080fd5b816004600083600019166000191681526020019081526020016000206000019080519060200190610962929190610da5565b5060046000826000191660001916815260200190815260200160002060010180548060010182816109939190610d79565b916000526020600020900160005b33909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506004600082600019166000191681526020019081526020016000206002018054806001018281610a139190610e25565b916000526020600020900160005b8590919091509080519060200190610a3a929190610da5565b5050600054600460008360001916600019168152602001908152602001600020600101805490501415610adb577feb043d149eedb81369bec43d4c3a3a53087debc88d2525f13bfaa3eecda28b5c3382604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182600019166000191681526020019250505060405180910390a15b5b5b505050565b81600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410151515610b3057600080fd5b81600260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055508015610bf3577f884edad9ce6fa2440d8a54cc123490eb96d2768479d49ff9c7366125a94243648383604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390a1610ce0565b81600260008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055507fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef338484604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001828152602001935050505060405180910390a15b5b505050565b600080600090505b8351811015610d59578273ffffffffffffffffffffffffffffffffffffffff168482815181101515610d1c57fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff161415610d4b5760019150610d5e565b5b8080600101915050610cee565b600091505b5092915050565b602060405190810160405280600081525090565b815481835581811511610da057818360005260206000209182019101610d9f9190610e51565b5b505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f10610de657805160ff1916838001178555610e14565b82800160010185558215610e14579182015b82811115610e13578251825591602001919060010190610df8565b5b509050610e219190610e51565b5090565b815481835581811511610e4c57818360005260206000209182019101610e4b9190610e76565b5b505050565b610e7391905b80821115610e6f576000816000905550600101610e57565b5090565b90565b610e9f91905b80821115610e9b5760008181610e929190610ea2565b50600101610e7c565b5090565b90565b50805460018160011615610100020316600290046000825580601f10610ec85750610ee7565b601f016020900490600052602060002090810190610ee69190610e51565b5b505600a165627a7a72305820415643bd8188cf2b00c61bfeb032686e5b788daf3e78e53b153686387119380c0029
\ No newline at end of file
diff --git a/contracts/bridge.sol b/contracts/bridge.sol
index 6200746..b0b4111 100644
--- a/contracts/bridge.sol
+++ b/contracts/bridge.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.15;
+pragma solidity ^0.4.16;
 
 library Authorities {
     function contains (address[] self, address value) internal returns (bool) {
@@ -40,7 +40,8 @@ contract EthereumBridge {
 
     /// Multisig authority validation
     modifier allAuthorities (uint8[] v, bytes32[] r, bytes32[] s, bytes message) {
-        var hash = sha3(message);
+        bytes memory prefix = "\x19Ethereum Signed Message:\n";
+        var hash = sha3(prefix, message.length, message);
         var used = new address[](requiredSignatures);
 
         require(requiredSignatures <= v.length);