Use subdomain

embark-ui/src/actions/index.js

@@ -134,7 +134,7 @@ export const messageListen = {
 
 export const ENS_RECORD = createRequestTypes('ENS_RECORD');
 export const ensRecord = {
-  resolve: (name) => action(ENS_RECORD[REQUEST], {name}),
+  resolve: (subdomain) => action(ENS_RECORD[REQUEST], {subdomain}),
   lookup: (address) => action(ENS_RECORD[REQUEST], {address}),
   success: (record, payload) => action(ENS_RECORD[SUCCESS], {ensRecords: [Object.assign(payload, record)]}),
   failure: (error) => action(ENS_RECORD[FAILURE], {error})
@@ -142,12 +142,11 @@ export const ensRecord = {
 
 export const ENS_RECORDS = createRequestTypes('ENS_RECORDS');
 export const ensRecords = {
-  post: (name, address) => action(ENS_RECORDS[REQUEST], {name, address}),
+  post: (subdomain, address) => action(ENS_RECORDS[REQUEST], {subdomain, address}),
-  success: (_record, payload) => action(ENS_RECORDS[SUCCESS], {ensRecords: [{name: payload.name, address: payload.address}]}),
+  success: (_record, payload) => action(ENS_RECORDS[SUCCESS], {ensRecords: [{subdomain: payload.subdomain, address: payload.address}]}),
   failure: (error) => action(ENS_RECORDS[FAILURE], {error})
 };
 
-
 export const FIDDLE = createRequestTypes('FIDDLE');
 export const fiddle = {
   request: (codeToCompile) => action(FIDDLE[REQUEST], {codeToCompile}),

embark-ui/src/api/index.js

@@ -85,7 +85,7 @@ export function fetchContractProfile(payload) {
 }
 
 export function fetchEnsRecord(payload) {
-  if (payload.name) {
+  if (payload.subdomain) {
     return get('/ens/resolve', {params: payload});
   } else {
     return get('/ens/lookup', {params: payload});

embark-ui/src/components/EnsLookup.js

@@ -28,9 +28,9 @@ class EnsLookup extends Component {
   showResult() {
     let ensRecord = this.props.ensRecords.find((record) => record.address === this.state.address);
     if (ensRecord) {
-      return <Alert type="success">The name is: {ensRecord.name}</Alert>;
+      return <Alert type="success">The subdomain is: {ensRecord.subdomain}</Alert>;
     } else {
-      return <Alert type="danger">We could not find a name for this address</Alert>;
+      return <Alert type="danger">We could not find a subdomain for this address</Alert>;
     }
   }
 

embark-ui/src/components/EnsRegister.js

@@ -11,7 +11,7 @@ class EnsRegister extends Component {
     super(props);
 
     this.state = {
-      name: '',
+      subdomain: '',
       address: '',
       showResult: false
     };
@@ -25,12 +25,12 @@ class EnsRegister extends Component {
   }
 
   handleRegister() {
-    this.props.register(this.state.name, this.state.address);
+    this.props.register(this.state.subdomain, this.state.address);
     this.setState({showResult: true});
   }
 
   showResult() {
-    let ensRecord = this.props.ensRecords.find((record) => record.address === this.state.address && record.name === this.state.name);
+    let ensRecord = this.props.ensRecords.find((record) => record.address === this.state.address && record.subdomain === this.state.subdomain);
     if (ensRecord) {
       return <Alert type="success">Successfully registered</Alert>;
     } else {
@@ -46,7 +46,7 @@ class EnsRegister extends Component {
           <Grid.Row>
             <Grid.Col md={6}>
               <Form.Group>
-                <Form.Input placeholder="Enter a name" onChange={e => this.handleChange(e, "name")}/>
+                <Form.Input placeholder="Enter a subdomain" onChange={e => this.handleChange(e, "subdomain")}/>
               </Form.Group>
             </Grid.Col>
             <Grid.Col md={6}>

embark-ui/src/components/EnsResolve.js

@@ -11,26 +11,26 @@ class EnsResolve extends Component {
     super(props);
 
     this.state = {
-      name: '',
+      subdomain: '',
       showResult: false
     };
   }
 
   handleChange(e) {
-    this.setState({name: e.target.value, showResult: false});
+    this.setState({subdomain: e.target.value, showResult: false});
   }
 
   handleResolve() {
     this.setState({showResult: true});
-    this.props.resolve(this.state.name);
+    this.props.resolve(this.state.subdomain);
   }
 
   showResult() {
-    let ensRecord = this.props.ensRecords.find((record) => record.name === this.state.name);
+    let ensRecord = this.props.ensRecords.find((record) => record.subdomain === this.state.subdomain);
     if (ensRecord) {
       return <Alert type="success">The address is: {ensRecord.address}</Alert>;
     } else {
-      return <Alert type="danger">We could not find an address for this name</Alert>;
+      return <Alert type="danger">We could not find an address for this subdomain</Alert>;
     }
   }
 

embark-ui/src/reducers/index.js

@@ -59,8 +59,8 @@ const filtrer = {
     ));
   },
   ensRecords: function(record, index, self) {
-    return record.name && record.address && record.address !== voidAddress && index === self.findIndex((r) => (
+    return record.subdomain && record.address && record.address !== voidAddress && index === self.findIndex((r) => (
-      r.address=== record.address && r.name === record.name
+      r.address=== record.address && r.subdomain === record.subdomain
     ));
   }
 };

lib/modules/ens/index.js

@@ -197,7 +197,7 @@ class ENS {
       'get',
       '/embark-api/ens/resolve',
       (req, res) => {
-        self.resolveName(req.query.name, config, (error, address) => {
+        self.resolveSubdomain(req.query.subdomain, config, (error, address) => {
           if (error) {
             return res.send({error: error.message});
           }
@@ -214,7 +214,8 @@ class ENS {
           if (error) {
             return res.send({error: error.message});
           }
-          res.send({name});
+          const subdomain = name.replace(new RegExp(self.registration.rootDomain + '$'), '');
+          res.send({subdomain});
         });
       }
     );
@@ -252,14 +253,14 @@ class ENS {
     });
   }
 
-  resolveName(name, config, callback) {
+  resolveSubdomain(subdomain, config, callback) {
     let self = this;
     self.createResolverContract(config, (err, resolver) => {
       if (err) {
         return callback(err);
       }
 
-      let node = namehash.hash(name);
+      const node = namehash.hash(`${subdomain}.${self.registration.rootDomain}`);
       resolver.methods.addr(node).call(callback);
     });
   }