Support both V1 & V2 DataChanged events in registry

ethcore/res/ethereum/frontier.json → ethcore/res/ethereum/foundation.json

@@ -1,5 +1,5 @@
 {
-	"name": "Frontier/Homestead",
+	"name": "Foundation",
 	"dataDir": "ethereum",
 	"engine": {
 		"Ethash": {
@@ -9,7 +9,7 @@
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
 				"blockReward": "0x4563918244F40000",
-				"registrar" : "0x3bb2bb5c6c9c9b7f4ef430b47dc7e026310042ea",
+				"registrar" : "0xe3389675d0338462dC76C6f9A3e432550c36A142",
 				"homesteadTransition": "0x118c30",
 				"daoHardforkTransition": "0x1d4c00",
 				"daoHardforkBeneficiary": "0xbf4ed7b27f1d666546e30d74d50d173d20bca754",

ethcore/src/ethereum/mod.rs

@@ -30,7 +30,7 @@ pub use self::denominations::*;
 use super::spec::*;
 
 /// Most recent fork block that we support on Mainnet.
-pub const FORK_SUPPORTED_FRONTIER: u64 = 2675000;
+pub const FORK_SUPPORTED_FOUNDATION: u64 = 2675000;
 
 /// Most recent fork block that we support on Ropsten.
 pub const FORK_SUPPORTED_ROPSTEN: u64 = 10;
@@ -46,7 +46,7 @@ fn load(b: &[u8]) -> Spec {
 pub fn new_olympic() -> Spec { load(include_bytes!("../../res/ethereum/olympic.json")) }
 
 /// Create a new Frontier mainnet chain spec.
-pub fn new_frontier() -> Spec { load(include_bytes!("../../res/ethereum/frontier.json")) }
+pub fn new_foundation() -> Spec { load(include_bytes!("../../res/ethereum/foundation.json")) }
 
 /// Create a new Frontier mainnet chain spec without the DAO hardfork.
 pub fn new_classic() -> Spec { load(include_bytes!("../../res/ethereum/classic.json")) }
@@ -118,7 +118,7 @@ mod tests {
 
 	#[test]
 	fn frontier() {
-		let frontier = new_frontier();
+		let frontier = new_foundation();
 
 		assert_eq!(frontier.state_root(), "d7f8974fb5ac78d9ac099b9ad5018bedc2ce0a72dad1827a1709da30580f0544".into());
 		let genesis = frontier.genesis_block();

ethcore/src/miner/mod.rs

@@ -32,7 +32,7 @@
 //! use ethcore::miner::{Miner, MinerService};
 //!
 //! fn main() {
-//!		let miner: Miner = Miner::with_spec(&ethereum::new_frontier());
+//!		let miner: Miner = Miner::with_spec(&ethereum::new_foundation());
 //!		// get status
 //!		assert_eq!(miner.status().transactions_in_pending_queue, 0);
 //!

js/src/contracts/abi/index.js

@@ -14,34 +14,18 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import badgereg from './badgereg.json';
-import basiccoin from './basiccoin.json';
-import basiccoinmanager from './basiccoinmanager.json';
-import dappreg from './dappreg.json';
-import eip20 from './eip20.json';
-import emailverification from './email-verification.json';
-import gavcoin from './gavcoin.json';
-import githubhint from './githubhint.json';
-import owned from './owned.json';
-import registry from './registry.json';
-import signaturereg from './signaturereg.json';
-import smsverification from './sms-verification.json';
-import tokenreg from './tokenreg.json';
-import wallet from './wallet.json';
-
-export {
-  badgereg,
-  basiccoin,
-  basiccoinmanager,
-  dappreg,
-  eip20,
-  emailverification,
-  gavcoin,
-  githubhint,
-  owned,
-  registry,
-  signaturereg,
-  smsverification,
-  tokenreg,
-  wallet
-};
+export badgereg from './badgereg.json';
+export basiccoin from './basiccoin.json';
+export basiccoinmanager from './basiccoinmanager.json';
+export dappreg from './dappreg.json';
+export eip20 from './eip20.json';
+export emailverification from './email-verification.json';
+export gavcoin from './gavcoin.json';
+export githubhint from './githubhint.json';
+export owned from './owned.json';
+export registry from './registry.json';
+export registry2 from './registry2.json';
+export signaturereg from './signaturereg.json';
+export smsverification from './sms-verification.json';
+export tokenreg from './tokenreg.json';
+export wallet from './wallet.json';

js/src/contracts/abi/registry2.json

@@ -0,0 +1 @@
+[{"constant":true,"inputs":[{"name":"_data","type":"address"}],"name":"canReverse","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"bytes32"}],"name":"setData","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"}],"name":"confirmReverse","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserve","outputs":[{"name":"success","type":"bool"}],"payable":true,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"drop","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_amount","type":"uint256"}],"name":"setFee","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_to","type":"address"}],"name":"transfer","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getData","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserved","outputs":[{"name":"reserved","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"},{"name":"_who","type":"address"}],"name":"proposeReverse","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"hasReverse","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"getOwner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"getReverse","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_data","type":"address"}],"name":"reverse","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"uint256"}],"name":"setUint","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"},{"name":"_who","type":"address"}],"name":"confirmReverseAs","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"removeReverse","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"address"}],"name":"setAddress","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"amount","type":"uint256"}],"name":"Drained","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"amount","type":"uint256"}],"name":"FeeChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"string"},{"indexed":true,"name":"reverse","type":"address"}],"name":"ReverseProposed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"string"},{"indexed":true,"name":"reverse","type":"address"}],"name":"ReverseConfirmed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"string"},{"indexed":true,"name":"reverse","type":"address"}],"name":"ReverseRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"owner","type":"address"}],"name":"Reserved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"oldOwner","type":"address"},{"indexed":true,"name":"newOwner","type":"address"}],"name":"Transferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"owner","type":"address"}],"name":"Dropped","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"key","type":"string"},{"indexed":false,"name":"plainKey","type":"string"}],"name":"DataChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]

js/src/dapps/registry/Events/events.js

@@ -53,7 +53,13 @@ const renderEvent = (classNames, verb) => (e) => {
   return (
     <tr key={ e.key } className={ classes }>
       <td>
-        <Address address={ e.parameters.owner.value } />
+        <Address
+          address={
+            e.parameters.owner
+              ? e.parameters.owner.value
+              : e.from
+          }
+        />
       </td>
       <td>
         <abbr title={ e.transaction }>{ verb }</abbr>
@@ -80,17 +86,23 @@ const renderDataChanged = (e) => {
   return (
     <tr key={ e.key } className={ classNames }>
       <td>
-        <Address address={ e.parameters.owner.value } />
+        <Address
+          address={
+            e.parameters.owner
+              ? e.parameters.owner.value
+              : e.from
+          }
+        />
       </td>
       <td>
         <abbr title={ e.transaction }>updated</abbr>
       </td>
       <td>
-        { 'key ' }
+        key&nbsp;
         <code>
           { new Buffer(e.parameters.plainKey.value).toString('utf8') }
         </code>
-        { 'of ' }
+        &nbsp;of&nbsp;
         <code>
           <Hash hash={ bytesToHex(e.parameters.name.value) } />
         </code>

js/src/dapps/registry/actions.js

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import { registry as registryAbi } from '~/contracts/abi';
+import { registry as registryAbi, registry2 as registryAbi2 } from '~/contracts/abi';
 
 import { api } from './parity.js';
 import * as addresses from './addresses/actions.js';
@@ -27,6 +27,11 @@ import * as reverse from './Reverse/actions.js';
 
 export { addresses, accounts, lookup, events, names, records, reverse };
 
+const REGISTRY_V1_HASHES = [
+  '0x34f7c51bbb1b1902fbdabfdf04811100f5c9f998f26dd535d2f6f977492c748e', // ropsten
+  '0x64c3ee34851517a9faecd995c102b339f03e564ad6772dc43a26f993238b20ec' // homestead
+];
+
 export const setIsTestnet = (isTestnet) => ({ type: 'set isTestnet', isTestnet });
 
 export const fetchIsTestnet = () => (dispatch) =>
@@ -47,13 +52,28 @@ export const fetchIsTestnet = () => (dispatch) =>
 export const setContract = (contract) => ({ type: 'set contract', contract });
 
 export const fetchContract = () => (dispatch) =>
-  api.parity.registryAddress()
+  api.parity
+    .registryAddress()
     .then((address) => {
-      const contract = api.newContract(registryAbi, address);
-
-      dispatch(setContract(contract));
-      dispatch(fetchFee());
-      dispatch(fetchOwner());
+      return api.eth
+        .getCode(address)
+        .then((code) => {
+          const codeHash = api.util.sha3(code);
+          const isVersion1 = REGISTRY_V1_HASHES.includes(codeHash);
+
+          console.log(`registry at ${address}, code ${codeHash}, version ${isVersion1 ? 1 : 2}`);
+
+          const contract = api.newContract(
+            isVersion1
+              ? registryAbi
+              : registryAbi2,
+            address
+          );
+
+          dispatch(setContract(contract));
+          dispatch(fetchFee());
+          dispatch(fetchOwner());
+        });
     })
     .catch((err) => {
       console.error('could not fetch contract');

parity/params.rs

@@ -26,7 +26,7 @@ use user_defaults::UserDefaults;
 
 #[derive(Debug, PartialEq)]
 pub enum SpecType {
-	Mainnet,
+	Foundation,
 	Morden,
 	Ropsten,
 	Kovan,
@@ -39,7 +39,7 @@ pub enum SpecType {
 
 impl Default for SpecType {
 	fn default() -> Self {
-		SpecType::Mainnet
+		SpecType::Foundation
 	}
 }
 
@@ -48,7 +48,7 @@ impl str::FromStr for SpecType {
 
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
 		let spec = match s {
-			"frontier" | "homestead" | "mainnet" => SpecType::Mainnet,
+			"foundation" | "frontier" | "homestead" | "mainnet" => SpecType::Foundation,
 			"frontier-dogmatic" | "homestead-dogmatic" | "classic" => SpecType::Classic,
 			"morden" | "classic-testnet" => SpecType::Morden,
 			"ropsten" => SpecType::Ropsten,
@@ -65,7 +65,7 @@ impl str::FromStr for SpecType {
 impl fmt::Display for SpecType {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		f.write_str(match *self {
-			SpecType::Mainnet => "homestead",
+			SpecType::Foundation => "foundation",
 			SpecType::Morden => "morden",
 			SpecType::Ropsten => "ropsten",
 			SpecType::Olympic => "olympic",
@@ -81,7 +81,7 @@ impl fmt::Display for SpecType {
 impl SpecType {
 	pub fn spec(&self) -> Result<Spec, String> {
 		match *self {
-			SpecType::Mainnet => Ok(ethereum::new_frontier()),
+			SpecType::Foundation => Ok(ethereum::new_foundation()),
 			SpecType::Morden => Ok(ethereum::new_morden()),
 			SpecType::Ropsten => Ok(ethereum::new_ropsten()),
 			SpecType::Olympic => Ok(ethereum::new_olympic()),
@@ -321,9 +321,10 @@ mod tests {
 
 	#[test]
 	fn test_spec_type_parsing() {
-		assert_eq!(SpecType::Mainnet, "frontier".parse().unwrap());
-		assert_eq!(SpecType::Mainnet, "homestead".parse().unwrap());
-		assert_eq!(SpecType::Mainnet, "mainnet".parse().unwrap());
+		assert_eq!(SpecType::Foundation, "frontier".parse().unwrap());
+		assert_eq!(SpecType::Foundation, "homestead".parse().unwrap());
+		assert_eq!(SpecType::Foundation, "mainnet".parse().unwrap());
+		assert_eq!(SpecType::Foundation, "foundation".parse().unwrap());
 		assert_eq!(SpecType::Kovan, "testnet".parse().unwrap());
 		assert_eq!(SpecType::Kovan, "kovan".parse().unwrap());
 		assert_eq!(SpecType::Morden, "morden".parse().unwrap());
@@ -335,12 +336,12 @@ mod tests {
 
 	#[test]
 	fn test_spec_type_default() {
-		assert_eq!(SpecType::Mainnet, SpecType::default());
+		assert_eq!(SpecType::Foundation, SpecType::default());
 	}
 
 	#[test]
 	fn test_spec_type_display() {
-		assert_eq!(format!("{}", SpecType::Mainnet), "homestead");
+		assert_eq!(format!("{}", SpecType::Foundation), "foundation");
 		assert_eq!(format!("{}", SpecType::Ropsten), "ropsten");
 		assert_eq!(format!("{}", SpecType::Morden), "morden");
 		assert_eq!(format!("{}", SpecType::Olympic), "olympic");