|
-
+
|
updated
|
- { 'key ' }
+ key
{ new Buffer(e.parameters.plainKey.value).toString('utf8') }
- { 'of ' }
+ of
diff --git a/js/src/dapps/registry/actions.js b/js/src/dapps/registry/actions.js
index d56c76f4b84..a470349424e 100644
--- a/js/src/dapps/registry/actions.js
+++ b/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 .
-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');
diff --git a/parity/params.rs b/parity/params.rs
index d9aee81cddc..85019b3e79b 100644
--- a/parity/params.rs
+++ b/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 {
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 {
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");
|