From 2b59d0adaeb841201920b792e18f1a39c8b93d29 Mon Sep 17 00:00:00 2001
From: Juan Cazala <juancazala@gmail.com>
Date: Fri, 9 Feb 2018 17:21:29 -0300
Subject: [PATCH 1/7] 0.2.10

---
 .gitignore            |  1 +
 package.json          |  4 +--
 pages/linker.js       | 73 ++++++++++++++++++++++++++++++++++++-------
 src/utils/linker.ts   | 11 +++++++
 src/utils/uploader.ts | 37 ++++++++++++++++++++--
 5 files changed, 109 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 99146d84..cc61cbe6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .vs/
 .vscode/
+.idea
 bower_components/
 node_modules/
 tmp/
diff --git a/package.json b/package.json
index 3c454300..45b88670 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "decentraland",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "CLI tool for parcel management.",
   "main": "./dist/index.js",
   "scripts": {
-    "start": "./dev.js",
+    "start": "LAND_REGISTRY_CONTRACT_ADDRESS='0x7a73483784ab79257bb11b96fd62a2c3ae4fb75b' ./dev.js",
     "watch": "tsc --watch",
     "build": "npm run clean && tsc && npm run linker:build",
     "clean": "rimraf dist && rimraf tmp",
diff --git a/pages/linker.js b/pages/linker.js
index 272a8198..f96bcb55 100644
--- a/pages/linker.js
+++ b/pages/linker.js
@@ -1,19 +1,22 @@
 import "babel-polyfill";
 import React from 'react';
 import Router from 'next/router';
-import { eth } from 'decentraland-commons';
+import { eth, txUtils } from 'decentraland-commons';
 import { LANDRegistry } from 'decentraland-commons/dist/contracts/LANDRegistry';
 
 async function ethereum() {
-  const { address } = await getContractAddress()
+  // const { address } = await getContractAddress()
+  const address = '0x7a73483784ab79257bb11b96fd62a2c3ae4fb75b'
   const land = new LANDRegistry(address)
 
-  await eth.connect({ contracts: [land]})
+  const connected = await eth.connect({
+    contracts: [LANDRegistry]
+  })
 
   return {
     address: await eth.getAddress(),
-    land,
-    web3: eth.web3
+    land: eth.getContract('LANDRegistry'),
+    web3: eth.web3,
   }
 }
 
@@ -33,17 +36,31 @@ async function getIPFSKey() {
   return ipfsKey;
 }
 
+async function getPeerId() {
+  const res = await fetch('/api/get-ipfs-peerid');
+  const peerId = await res.json();
+  return peerId;
+}
+
 async function closeServer(ok, message) {
   console.log('closing server:', message)
   await fetch(`/api/close?ok=${ok}&reason=${message}`);
 }
 
+async function pinFiles (peerId, x, y) {
+  const res = await fetch(`http://ipfs.decentraland.zone:3000/api/pin/${peerId}/${x}/${y}`);
+  const { ok } = await res.json()
+  return ok
+}
+
 export default class Page extends React.Component {
   constructor(...args) {
     super(...args);
 
     this.state = {
       loading: true,
+      transactionLoading: false,
+      pinningLoading: false,
       error: false,
       address: null,
       tx: null
@@ -51,7 +68,7 @@ export default class Page extends React.Component {
   }
 
   async componentDidMount() {
-    try { 
+    try {
       let land, address, web3
 
       try {
@@ -59,12 +76,12 @@ export default class Page extends React.Component {
         land = res.land
         address = res.address
         web3 = res.web3
-
         this.setState({
           loading: false,
           address
         })
       } catch(err) {
+        console.log(err.message)
         this.setState({
           error: `Could not connect to MetaMask`
         });
@@ -84,7 +101,8 @@ export default class Page extends React.Component {
 
       try {
         const ipfsKey = await getIPFSKey();
-        this.setState({ ipfsKey });
+        const peerId = await getPeerId();
+        this.setState({ ipfsKey, peerId });
       } catch(err) {
         this.setState({
           error: `There was a problem getting IPNS hash of your scene.\nTry to re-upload with dcl upload.`
@@ -129,10 +147,12 @@ export default class Page extends React.Component {
       try {
         console.log('update land data', coordinates, data)
         const tx = await land.updateManyLandData(coordinates, data)
-        this.setState({ tx })
-        closeServer(true, 'transaction successful')
+        this.watchTransactions(tx, coordinates[0].x, coordinates[0].y)
+        this.setState({ tx, transactionLoading: true })
+        // closeServer(true, 'transaction successful')
       } catch(err) {
         this.setState({loading: false, error: 'Transaction Rejected'})
+        console.log(err.message)
         closeServer(false, 'transaction rejected')
       }
     } catch(err) {
@@ -141,6 +161,17 @@ export default class Page extends React.Component {
     }
   }
 
+  async watchTransactions (tx, x, y) {
+    const { peerId } = this.state
+    await txUtils.waitForCompletion(tx)
+    this.setState({ transactionLoading: false, pinningLoading: true })
+    const success = await pinFiles(peerId, x, y)
+    this.setState({
+      pinningLoading: false,
+      error: !success ? 'Failed pinning files to ipfs' : null
+    })
+  }
+
   renderTxHash = () => (
     this.state.tx ? (
       <p>Transaction:<br />
@@ -155,6 +186,22 @@ export default class Page extends React.Component {
     this.state.error ? <p style={{ color: 'red' }}>{this.state.error}</p> : null
   )
 
+  renderTransactionStatus = () => (
+    this.state.tx ?
+      !this.state.transactionLoading ?
+        <p style={{ color: 'green' }}>{`Transaction confirmed.`}</p>
+        :  <p style={{ color: 'orange' }}>{`Transaction pending. Will take a while...`}</p>
+      : null
+  )
+
+  renderPinningIPFSStatus = () => (
+    !this.state.error && this.state.tx && !this.state.transactionLoading ?
+      !this.state.pinningLoading ?
+        <p style={{ color: 'green' }}>{`Pinning Success.`}</p>
+        :  <p style={{ color: 'orange' }}>{`Pinning pending. Will take a while...`}</p>
+      : null
+  )
+
   render() {
     return (
       <div className="dcl-linker-main">
@@ -163,8 +210,10 @@ export default class Page extends React.Component {
         <p>MetaMask address:<br />
           {this.state.loading ? "loading..." : this.state.address}
         </p>
-        {this.renderTxHash()}
-        {this.renderError()}
+        { this.renderTxHash() }
+        { this.renderTransactionStatus() }
+        { this.renderPinningIPFSStatus() }
+        { this.renderError() }
         <style jsx>{`
           .dcl-icon {
             width: 52px;
diff --git a/src/utils/linker.ts b/src/utils/linker.ts
index 35bacfe8..c93d431d 100644
--- a/src/utils/linker.ts
+++ b/src/utils/linker.ts
@@ -54,6 +54,17 @@ export async function linker(vorpal: any, args: any, callback: () => void) {
     ctx.body = JSON.stringify(project.ipfsKey);
   });
 
+  router.get('/api/get-ipfs-peerid', async (ctx) => {
+    let project
+    try {
+      project = JSON.parse(fs.readFileSync(`${path}/.decentraland/project.json`, 'utf-8'))
+    } catch (error) {
+      vorpal.log(chalk.red('Could not find `.decentraland/project.json`'))
+      process.exit(1)
+    }
+    ctx.body = JSON.stringify(project.peerId);
+  });
+
   router.get('/api/contract-address', async (ctx) => {
     let LANDRegistryAddress: string = null;
 
diff --git a/src/utils/uploader.ts b/src/utils/uploader.ts
index 81960183..cbf2fa04 100644
--- a/src/utils/uploader.ts
+++ b/src/utils/uploader.ts
@@ -6,10 +6,12 @@ import * as project from './project';
 import { cliPath }from './cli-path';
 import { prompt } from './prompt';
 import { getRoot } from './get-root';
+import axios from 'axios';
 
 export async function uploader(vorpal: any, args: any, callback: () => void) {
+  let isUpdate = true
   // You need to have ipfs daemon running!
-  const ipfsApi = ipfsAPI('localhost', args.options.port || '5001');
+  const ipfsApi = ipfsAPI('0.0.0.0', args.options.port || '5001');
 
   const path = getRoot()
 
@@ -63,8 +65,18 @@ export async function uploader(vorpal: any, args: any, callback: () => void) {
     process.exit(1)
   }
 
+  // Get ipfs node peer ID
+  if (project.peerId == null) {
+    vorpal.log('Getting IPFS node peer ID...')
+    const { id } = await ipfsApi.id()
+    project.peerId = id
+    vorpal.log(`Peer ID: ${JSON.stringify(project.peerId)}`)
+    fs.outputFileSync(`${path}/.decentraland/project.json`, JSON.stringify(project, null, 2))
+  }
+
   if (project.ipfsKey == null) {
     vorpal.log('Generating IPFS key...')
+    isUpdate = false
     const { id } = await ipfsApi.key.gen(project.id, { type: 'rsa', size: 2048 })
     project.ipfsKey = id
     vorpal.log(`New IPFS key: ${project.ipfsKey}`)
@@ -85,8 +97,6 @@ export async function uploader(vorpal: any, args: any, callback: () => void) {
     vorpal.log('');
     vorpal.log(`Uploading ${progCount}/${progCount} files to IPFS. done! ${accumProgress} bytes uploaded.`);
     vorpal.log(`IPFS Folder Hash: ${ipfsHash}`);
-    // TODO: pinning --- ipfs.pin.add(hash, function (err) {})
-
     vorpal.log('Updating IPNS reference to folder hash... (this might take a while)');
     const { name } = await ipfsApi.name.publish(ipfsHash, { key: project.id });
     vorpal.log(`IPNS Link: /ipns/${name}`);
@@ -98,5 +108,26 @@ export async function uploader(vorpal: any, args: any, callback: () => void) {
     process.exit(1)
   }
 
+  if (isUpdate) { // TODO: support multiples parcels
+    try {
+      vorpal.log('Pinning Files to Decentraland IPFS node... (this might take a while)');
+      const coordinates: any = [];
+      const sceneMetadata = JSON.parse(fs.readFileSync(`${path}/scene.json`, 'utf-8'));
+      sceneMetadata.scene.parcels.forEach((parcel: any) => {
+        const [x, y] = parcel.split(',');
+
+        coordinates.push({
+          x: parseInt(x, 10),
+          y: parseInt(y, 10)
+        });
+      });
+      const { ok } = await axios.get(`http://ipfs.decentraland.zone:3000/api/pin/${project.peerId}/${coordinates[0].x}/${coordinates[0].y}`)
+      .then(response => response.data);
+      vorpal.log(`Pinning files ${ok ? 'success' : 'failed'}`);
+    } catch (err) {
+      vorpal.log('Error', JSON.stringify(err.message));
+    }
+  }
+
   return ipnsHash;
 }

From 71cf7d6da6eb4b3f3cf852896c455f0ae3c74b15 Mon Sep 17 00:00:00 2001
From: Ignacio <ignaciomazzara@hotmail.com>
Date: Mon, 26 Feb 2018 17:14:39 -0300
Subject: [PATCH 2/7] :arrow_upper_right: env var for ipfs url

---
 .env.example          | 1 +
 package.json          | 2 +-
 pages/linker.js       | 3 +--
 src/utils/linker.ts   | 8 ++++++++
 src/utils/uploader.ts | 4 +++-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.env.example b/.env.example
index ec1ad24c..4a90a5dc 100644
--- a/.env.example
+++ b/.env.example
@@ -1 +1,2 @@
 LAND_REGISTRY_CONTRACT_ADDRESS=
+IPFS_GATEWAY=
diff --git a/package.json b/package.json
index 45b88670..d1a3da59 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "CLI tool for parcel management.",
   "main": "./dist/index.js",
   "scripts": {
-    "start": "LAND_REGISTRY_CONTRACT_ADDRESS='0x7a73483784ab79257bb11b96fd62a2c3ae4fb75b' ./dev.js",
+    "start": "./dev.js",
     "watch": "tsc --watch",
     "build": "npm run clean && tsc && npm run linker:build",
     "clean": "rimraf dist && rimraf tmp",
diff --git a/pages/linker.js b/pages/linker.js
index f96bcb55..78d03d7d 100644
--- a/pages/linker.js
+++ b/pages/linker.js
@@ -48,7 +48,7 @@ async function closeServer(ok, message) {
 }
 
 async function pinFiles (peerId, x, y) {
-  const res = await fetch(`http://ipfs.decentraland.zone:3000/api/pin/${peerId}/${x}/${y}`);
+  const res = await fetch(`/api/pin-files/${peerId}/${x}/${y}`);
   const { ok } = await res.json()
   return ok
 }
@@ -56,7 +56,6 @@ async function pinFiles (peerId, x, y) {
 export default class Page extends React.Component {
   constructor(...args) {
     super(...args);
-
     this.state = {
       loading: true,
       transactionLoading: false,
diff --git a/src/utils/linker.ts b/src/utils/linker.ts
index c93d431d..8a7bec22 100644
--- a/src/utils/linker.ts
+++ b/src/utils/linker.ts
@@ -82,6 +82,14 @@ export async function linker(vorpal: any, args: any, callback: () => void) {
     });
   });
 
+  router.get('/api/pin-files/:peerId/:x/:y', async (ctx) => {
+    const { peerId, x, y } = ctx.params;
+    const { ok } = await axios.get(`${env.get('IPFS_GATEWAY')}pin/${peerId}/${x}/${y}`)
+      .then(response => response.data)
+      .catch(error => ({ 'ok': false }));
+    ctx.body = JSON.stringify({ ok });
+  });
+
   router.get('/api/close', async (ctx) => {
     ctx.res.end();
     const ok = require('url').parse(ctx.req.url, true).query.ok;
diff --git a/src/utils/uploader.ts b/src/utils/uploader.ts
index cbf2fa04..c2676b60 100644
--- a/src/utils/uploader.ts
+++ b/src/utils/uploader.ts
@@ -7,6 +7,8 @@ import { cliPath }from './cli-path';
 import { prompt } from './prompt';
 import { getRoot } from './get-root';
 import axios from 'axios';
+import { env } from 'decentraland-commons';
+env.load()
 
 export async function uploader(vorpal: any, args: any, callback: () => void) {
   let isUpdate = true
@@ -121,7 +123,7 @@ export async function uploader(vorpal: any, args: any, callback: () => void) {
           y: parseInt(y, 10)
         });
       });
-      const { ok } = await axios.get(`http://ipfs.decentraland.zone:3000/api/pin/${project.peerId}/${coordinates[0].x}/${coordinates[0].y}`)
+      const { ok } = await axios.get(`${process.env.IPFS_GATEWAY}pin/${project.peerId}/${coordinates[0].x}/${coordinates[0].y}`)
       .then(response => response.data);
       vorpal.log(`Pinning files ${ok ? 'success' : 'failed'}`);
     } catch (err) {

From ea7b467e68b8082335f0f0e8f4701fa70c37bdd2 Mon Sep 17 00:00:00 2001
From: Ignacio <ignaciomazzara@hotmail.com>
Date: Thu, 1 Mar 2018 09:48:03 -0300
Subject: [PATCH 3/7] :arrow_upper_right: update decentraland commons

---
 package.json    |  2 +-
 pages/linker.js | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index d1a3da59..5ed985a7 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "axios": "^0.17.1",
     "babel-polyfill": "^6.26.0",
     "chalk": "^2.3.0",
-    "decentraland-commons": "^2.7.2",
+    "decentraland-commons": "^3.1.1",
     "docker-names": "^1.0.3",
     "fs-extra": "^5.0.0",
     "get-installed-path": "^4.0.8",
diff --git a/pages/linker.js b/pages/linker.js
index 78d03d7d..bc13bac9 100644
--- a/pages/linker.js
+++ b/pages/linker.js
@@ -1,22 +1,21 @@
 import "babel-polyfill";
 import React from 'react';
 import Router from 'next/router';
-import { eth, txUtils } from 'decentraland-commons';
-import { LANDRegistry } from 'decentraland-commons/dist/contracts/LANDRegistry';
+import { eth, txUtils, contracts } from 'decentraland-commons';
+const { LANDRegistry } = contracts
 
 async function ethereum() {
-  // const { address } = await getContractAddress()
-  const address = '0x7a73483784ab79257bb11b96fd62a2c3ae4fb75b'
+  const { address } = await getContractAddress()
   const land = new LANDRegistry(address)
 
-  const connected = await eth.connect({
-    contracts: [LANDRegistry]
+  await eth.connect({
+    contracts: [land]
   })
 
   return {
     address: await eth.getAddress(),
-    land: eth.getContract('LANDRegistry'),
     web3: eth.web3,
+    land
   }
 }
 
@@ -123,7 +122,7 @@ export default class Page extends React.Component {
       let oldData
       try {
         console.log('oldData coordinates', coordinates[0].x, coordinates[0].y)
-        oldData = await land.getData(coordinates[0].x, coordinates[0].y)
+        oldData = await land.landData(coordinates[0].x, coordinates[0].y)
         console.log('oldData data', oldData)
       } catch(e) {
         console.error('oldData error', e)

From 1cc9347b438093a9734f778c9c866ad67b4fcf6c Mon Sep 17 00:00:00 2001
From: Ignacio <ignaciomazzara@hotmail.com>
Date: Thu, 1 Mar 2018 11:42:02 -0300
Subject: [PATCH 4/7] :new: beforeUnload event

---
 README.md       |  3 ++-
 pages/linker.js | 34 +++++++++++++++++++++++++---------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index b145e861..859bcba0 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@ CLI tool for parcel management.
 * [x] Uploading scenes to IPFS
 * [x] Hot reloading
 * [x] Linking Ethereum to the scene
+* [x] Pinning scene to Decentraland IPFS node
 * [ ] Editor modifying local files and “uploading” to the directory
 * [ ] Optimizing objects, textures
 * [ ] Warnings and linting of scenes
@@ -48,7 +49,7 @@ Note: You need to have IPFS daemon running for this to work!
 $ dcl upload
 ```
 
-- Link Ethereum to the current scene:
+- Link Ethereum to the current scene and pin scene to Decentraland IPFS node:
 
 ```bash
 $ dcl link
diff --git a/pages/linker.js b/pages/linker.js
index bc13bac9..0eb03252 100644
--- a/pages/linker.js
+++ b/pages/linker.js
@@ -63,9 +63,20 @@ export default class Page extends React.Component {
       address: null,
       tx: null
     }
+
+    this.onUnload = this.onUnload.bind(this)
+  }
+
+  onUnload(event) {
+    event.returnValue = 'Please, wait until the transaction and pinning are completed'
+  }
+
+  componentWillUnmount() {
+    window.removeEventListener("beforeunload", this.onUnload)
   }
 
   async componentDidMount() {
+    window.addEventListener("beforeunload", this.onUnload)
     try {
       let land, address, web3
 
@@ -159,15 +170,20 @@ export default class Page extends React.Component {
     }
   }
 
-  async watchTransactions (tx, x, y) {
-    const { peerId } = this.state
-    await txUtils.waitForCompletion(tx)
-    this.setState({ transactionLoading: false, pinningLoading: true })
-    const success = await pinFiles(peerId, x, y)
-    this.setState({
-      pinningLoading: false,
-      error: !success ? 'Failed pinning files to ipfs' : null
-    })
+  async watchTransactions (txId, x, y) {
+    const {peerId} = this.state
+    const tx = await txUtils.waitForCompletion(txId)
+    if (!txUtils.isFailure(tx)) {
+      this.setState({transactionLoading: false, pinningLoading: true})
+      const success = await pinFiles(peerId, x, y)
+      this.setState({
+        pinningLoading: false,
+        error: !success ? 'Failed pinning files to ipfs' : null
+      })
+    } else {
+      this.setState({transactionLoading: false, error: 'Transaction failed'})
+    }
+    window.removeEventListener("beforeunload", this.onUnload)
   }
 
   renderTxHash = () => (

From b98d30af37bdcf827a6cd56f6e95b9b4ae97a00f Mon Sep 17 00:00:00 2001
From: Ignacio <ignaciomazzara@hotmail.com>
Date: Thu, 1 Mar 2018 11:48:11 -0300
Subject: [PATCH 5/7] :twisted_rightwards_arrows: refactor

---
 pages/linker.js       | 2 --
 src/utils/uploader.ts | 8 +++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pages/linker.js b/pages/linker.js
index 0eb03252..dfc32218 100644
--- a/pages/linker.js
+++ b/pages/linker.js
@@ -158,10 +158,8 @@ export default class Page extends React.Component {
         const tx = await land.updateManyLandData(coordinates, data)
         this.watchTransactions(tx, coordinates[0].x, coordinates[0].y)
         this.setState({ tx, transactionLoading: true })
-        // closeServer(true, 'transaction successful')
       } catch(err) {
         this.setState({loading: false, error: 'Transaction Rejected'})
-        console.log(err.message)
         closeServer(false, 'transaction rejected')
       }
     } catch(err) {
diff --git a/src/utils/uploader.ts b/src/utils/uploader.ts
index c2676b60..5f45a4eb 100644
--- a/src/utils/uploader.ts
+++ b/src/utils/uploader.ts
@@ -11,11 +11,13 @@ import { env } from 'decentraland-commons';
 env.load()
 
 export async function uploader(vorpal: any, args: any, callback: () => void) {
-  let isUpdate = true
+  // If it is the first time, not pin the scene to Decentraland IPFS node
+  let isUpdate = true;
+
   // You need to have ipfs daemon running!
-  const ipfsApi = ipfsAPI('0.0.0.0', args.options.port || '5001');
+  const ipfsApi = ipfsAPI('localhost', args.options.port || '5001');
 
-  const path = getRoot()
+  const path = getRoot();
 
   const isDclProject = await fs.pathExists(`${path}/scene.json`);
   if (!isDclProject) {

From 5b6cc3967b2f6ca49e2118c9e62f90904c037bef Mon Sep 17 00:00:00 2001
From: Ignacio <ignaciomazzara@hotmail.com>
Date: Mon, 5 Mar 2018 14:40:12 -0300
Subject: [PATCH 6/7] :arrow_upper_right: move ipfs url to gh-pages, scene.html
 as default main and format code

---
 .gitignore            |  4 +++-
 README.md             |  2 ++
 pages/linker.js       |  2 +-
 src/commands/init.ts  |  2 +-
 src/utils/linker.ts   | 15 ++++++++++++---
 src/utils/uploader.ts | 23 +++++++++++++++++++----
 6 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index cc61cbe6..903bfa2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,9 @@ tmp/
 dist/
 
 .next/
-.decentraland/ipns
+.decentraland
+scene.html
+scene.json
 
 # Until API is stable
 package-lock.json
diff --git a/README.md b/README.md
index 859bcba0..7e735c40 100644
--- a/README.md
+++ b/README.md
@@ -72,6 +72,8 @@ $ dcl push
 
 For CLI tool development, run `npm start` in your terminal. The cli will use the mainnet address for the LANDProxy contract by default. If you want to change it, you can add a `.env` file on the root folder, with a `LAND_REGISTRY_CONTRACT_ADDRESS` var. It'll use [dotenv](https://github.com/motdotla/dotenv#faq) to fetch the value. You can check the current contract addresses [here](https://contracts.decentraland.org/addresses.json).
 
+For the Decentraland IPFS node, we are getting the url from [here](decentraland.github.io/ipfs-node/url.json). If you want to set a different url set the `IPFS_GATEWAY` var in the `.env` file.
+
 You can run CLI commands in development mode like this: `npm start -- init`
 
 You can do incremental compilations by running `npm run watch`, but you will need to run `npm run build` at least once before to build the `linker-app`, and if you make changes to the linker you will need to re-run `npm run build`.
diff --git a/pages/linker.js b/pages/linker.js
index dfc32218..248e8c18 100644
--- a/pages/linker.js
+++ b/pages/linker.js
@@ -172,7 +172,7 @@ export default class Page extends React.Component {
     const {peerId} = this.state
     const tx = await txUtils.waitForCompletion(txId)
     if (!txUtils.isFailure(tx)) {
-      this.setState({transactionLoading: false, pinningLoading: true})
+      this.setState({ transactionLoading: false, pinningLoading: true })
       const success = await pinFiles(peerId, x, y)
       this.setState({
         pinningLoading: false,
diff --git a/src/commands/init.ts b/src/commands/init.ts
index 8c8e05d0..8de482ee 100644
--- a/src/commands/init.ts
+++ b/src/commands/init.ts
@@ -30,7 +30,7 @@ export function init(vorpal: any) {
         { type: 'input', name: 'owner', message: chalk.blue('Your MetaMask address: ') },
         { type: 'input', name: 'contact.name', message: chalk.blue('Your name: ') },
         { type: 'input', name: 'contact.email', message: chalk.blue('Your email: ') },
-        { type: 'input', name: 'main', message: chalk.blue('Main: '), default: 'scene' },
+        { type: 'input', name: 'main', message: chalk.blue('Main: '), default: 'scene.html' },
         { type: 'input', name: 'tags', message: chalk.blue('Tags: ') },
         { type: 'input', name: 'scene.parcels', message: `${chalk.blue('Parcels')} ${chalk.grey('(use the format \'x,y; x,y; x,y ...\'):')} ` },
         { type: 'input', name: 'communications.type', message: chalk.blue('Communication type: '), default: 'webrtc' },
diff --git a/src/utils/linker.ts b/src/utils/linker.ts
index 8a7bec22..ff36ed43 100644
--- a/src/utils/linker.ts
+++ b/src/utils/linker.ts
@@ -84,10 +84,19 @@ export async function linker(vorpal: any, args: any, callback: () => void) {
 
   router.get('/api/pin-files/:peerId/:x/:y', async (ctx) => {
     const { peerId, x, y } = ctx.params;
-    const { ok } = await axios.get(`${env.get('IPFS_GATEWAY')}pin/${peerId}/${x}/${y}`)
+    let ipfsURL: string = null;
+    try {
+      const { data } = await axios.get('https://decentraland.github.io/ipfs-node/url.json');
+      ipfsURL = data.staging;
+    } catch (error) {
+      // fallback to ENV
+    }
+
+    const url = env.get('IPFS_GATEWAY', () => ipfsURL);
+    const { ok, message } = await axios.get(`${url}/pin/${peerId}/${x}/${y}`)
       .then(response => response.data)
-      .catch(error => ({ 'ok': false }));
-    ctx.body = JSON.stringify({ ok });
+      .catch(error => ({ 'ok': false, message: error.message }));
+    ctx.body = JSON.stringify({ ok, message });
   });
 
   router.get('/api/close', async (ctx) => {
diff --git a/src/utils/uploader.ts b/src/utils/uploader.ts
index 5f45a4eb..32cd75fb 100644
--- a/src/utils/uploader.ts
+++ b/src/utils/uploader.ts
@@ -112,10 +112,10 @@ export async function uploader(vorpal: any, args: any, callback: () => void) {
     process.exit(1)
   }
 
-  if (isUpdate) { // TODO: support multiples parcels
+  if (isUpdate) {
+    vorpal.log('Pinning Files to Decentraland IPFS node... (this might take a while)');
+    const coordinates: any = [];
     try {
-      vorpal.log('Pinning Files to Decentraland IPFS node... (this might take a while)');
-      const coordinates: any = [];
       const sceneMetadata = JSON.parse(fs.readFileSync(`${path}/scene.json`, 'utf-8'));
       sceneMetadata.scene.parcels.forEach((parcel: any) => {
         const [x, y] = parcel.split(',');
@@ -125,11 +125,26 @@ export async function uploader(vorpal: any, args: any, callback: () => void) {
           y: parseInt(y, 10)
         });
       });
-      const { ok } = await axios.get(`${process.env.IPFS_GATEWAY}pin/${project.peerId}/${coordinates[0].x}/${coordinates[0].y}`)
+    } catch (err) {
+      vorpal.log('Error', JSON.stringify(err.message));
+      process.exit(1);
+    }
+
+    let ipfsURL: string = null;
+    try {
+      const { data } = await axios.get('https://decentraland.github.io/ipfs-node/url.json');
+      ipfsURL = data.staging;
+    } catch (error) {
+      // fallback to ENV
+    }
+    const url = env.get('IPFS_GATEWAY', () => ipfsURL);
+    try {
+      const { ok } = await axios.get(`${url}/pin/${project.peerId}/${coordinates[0].x}/${coordinates[0].y}`)
       .then(response => response.data);
       vorpal.log(`Pinning files ${ok ? 'success' : 'failed'}`);
     } catch (err) {
       vorpal.log('Error', JSON.stringify(err.message));
+      process.exit(1);
     }
   }
 

From f6c6f329b774008d4b95b1d74475baa3366acb8a Mon Sep 17 00:00:00 2001
From: Ignacio <ignaciomazzara@hotmail.com>
Date: Mon, 5 Mar 2018 15:25:32 -0300
Subject: [PATCH 7/7] :twisted_rightwards_arrows: refactor and prettier

---
 src/utils/get-ipfs-url.ts         | 15 +++++++
 src/utils/linker.ts               | 74 ++++++++++++++++++-------------
 src/utils/uploader.ts             | 17 ++-----
 typings/decentraland-commons.d.ts |  6 +--
 4 files changed, 64 insertions(+), 48 deletions(-)
 create mode 100644 src/utils/get-ipfs-url.ts

diff --git a/src/utils/get-ipfs-url.ts b/src/utils/get-ipfs-url.ts
new file mode 100644
index 00000000..a1fb8ea9
--- /dev/null
+++ b/src/utils/get-ipfs-url.ts
@@ -0,0 +1,15 @@
+import axios from 'axios';
+import { env } from 'decentraland-commons';
+env.load();
+
+export const getIPFSURL = async () => {
+  let ipfsURL: string = null;
+  try {
+    const { data } = await axios.get('https://decentraland.github.io/ipfs-node/url.json');
+    ipfsURL = data.staging;
+  } catch (error) {
+    // fallback to ENV
+  }
+
+  return env.get('IPFS_GATEWAY', () => ipfsURL);
+}
diff --git a/src/utils/linker.ts b/src/utils/linker.ts
index ff36ed43..3f7eb35c 100644
--- a/src/utils/linker.ts
+++ b/src/utils/linker.ts
@@ -9,23 +9,30 @@ import * as project from '../utils/project';
 import { prompt } from './prompt';
 import opn = require('opn');
 import { getRoot } from './get-root';
+import { getIPFSURL } from './get-ipfs-url';
 
 export async function linker(vorpal: any, args: any, callback: () => void) {
-  const path = getRoot()
+  const path = getRoot();
 
   const isDclProject = await fs.pathExists(`${path}/scene.json`);
   if (!isDclProject) {
-    vorpal.log(`Seems like this is not a Decentraland project! ${chalk.grey('(\'scene.json\' not found.)')}`);
+    vorpal.log(
+      `Seems like this is not a Decentraland project! ${chalk.grey(
+        "('scene.json' not found.)",
+      )}`,
+    );
     callback();
     return;
   }
 
   const hasLinker = await fs.pathExists(
-    `${path}/.decentraland/linker-app/linker/index.html`
+    `${path}/.decentraland/linker-app/linker/index.html`,
   );
 
   if (!hasLinker) {
-    vorpal.log(`Looks like linker app is missing. Try to re-initialize your project.`);
+    vorpal.log(
+      `Looks like linker app is missing. Try to re-initialize your project.`,
+    );
     callback();
     return;
   }
@@ -39,67 +46,70 @@ export async function linker(vorpal: any, args: any, callback: () => void) {
 
   app.use(serve(`${path}/.decentraland/linker-app`));
 
-  router.get('/api/get-scene-data', async (ctx) => {
+  router.get('/api/get-scene-data', async ctx => {
     ctx.body = await fs.readJson(`${path}/scene.json`);
   });
 
-  router.get('/api/get-ipfs-key', async (ctx) => {
-    let project
+  router.get('/api/get-ipfs-key', async ctx => {
+    let project;
     try {
-      project = JSON.parse(fs.readFileSync(`${path}/.decentraland/project.json`, 'utf-8'))
+      project = JSON.parse(
+        fs.readFileSync(`${path}/.decentraland/project.json`, 'utf-8'),
+      );
     } catch (error) {
-      vorpal.log(chalk.red('Could not find `.decentraland/project.json`'))
-      process.exit(1)
+      vorpal.log(chalk.red('Could not find `.decentraland/project.json`'));
+      process.exit(1);
     }
     ctx.body = JSON.stringify(project.ipfsKey);
   });
 
-  router.get('/api/get-ipfs-peerid', async (ctx) => {
-    let project
+  router.get('/api/get-ipfs-peerid', async ctx => {
+    let project;
     try {
-      project = JSON.parse(fs.readFileSync(`${path}/.decentraland/project.json`, 'utf-8'))
+      project = JSON.parse(
+        fs.readFileSync(`${path}/.decentraland/project.json`, 'utf-8'),
+      );
     } catch (error) {
-      vorpal.log(chalk.red('Could not find `.decentraland/project.json`'))
-      process.exit(1)
+      vorpal.log(chalk.red('Could not find `.decentraland/project.json`'));
+      process.exit(1);
     }
     ctx.body = JSON.stringify(project.peerId);
   });
 
-  router.get('/api/contract-address', async (ctx) => {
+  router.get('/api/contract-address', async ctx => {
     let LANDRegistryAddress: string = null;
 
     try {
-      const { data } = await axios.get('https://contracts.decentraland.org/addresses.json');
+      const { data } = await axios.get(
+        'https://contracts.decentraland.org/addresses.json',
+      );
       LANDRegistryAddress = data.mainnet.LANDProxy;
     } catch (error) {
       // fallback to ENV
     }
 
-    LANDRegistryAddress = env.get('LAND_REGISTRY_CONTRACT_ADDRESS', () => LANDRegistryAddress);
+    LANDRegistryAddress = env.get(
+      'LAND_REGISTRY_CONTRACT_ADDRESS',
+      () => LANDRegistryAddress,
+    );
 
     ctx.body = JSON.stringify({
-      address: LANDRegistryAddress
+      address: LANDRegistryAddress,
     });
   });
 
-  router.get('/api/pin-files/:peerId/:x/:y', async (ctx) => {
+  router.get('/api/pin-files/:peerId/:x/:y', async ctx => {
     const { peerId, x, y } = ctx.params;
-    let ipfsURL: string = null;
-    try {
-      const { data } = await axios.get('https://decentraland.github.io/ipfs-node/url.json');
-      ipfsURL = data.staging;
-    } catch (error) {
-      // fallback to ENV
-    }
+    let ipfsURL: string = await getIPFSURL();
 
-    const url = env.get('IPFS_GATEWAY', () => ipfsURL);
-    const { ok, message } = await axios.get(`${url}/pin/${peerId}/${x}/${y}`)
+    const { ok, message } = await axios
+      .get(`${ipfsURL}/pin/${peerId}/${x}/${y}`)
       .then(response => response.data)
-      .catch(error => ({ 'ok': false, message: error.message }));
+      .catch(error => ({ ok: false, message: error.message }));
     ctx.body = JSON.stringify({ ok, message });
   });
 
-  router.get('/api/close', async (ctx) => {
+  router.get('/api/close', async ctx => {
     ctx.res.end();
     const ok = require('url').parse(ctx.req.url, true).query.ok;
     if (ok === 'true') {
@@ -110,7 +120,7 @@ export async function linker(vorpal: any, args: any, callback: () => void) {
     process.exit(0);
   });
 
-  router.get('*', async (ctx) => {
+  router.get('*', async ctx => {
     ctx.respond = false;
   });
 
diff --git a/src/utils/uploader.ts b/src/utils/uploader.ts
index 32cd75fb..eb49c3d8 100644
--- a/src/utils/uploader.ts
+++ b/src/utils/uploader.ts
@@ -2,13 +2,11 @@ import chalk from 'chalk';
 import fs = require('fs-extra');
 import inquirer = require('inquirer');
 const ipfsAPI = require('ipfs-api');
-import * as project from './project';
-import { cliPath }from './cli-path';
-import { prompt } from './prompt';
 import { getRoot } from './get-root';
+import { getIPFSURL } from './get-ipfs-url';
 import axios from 'axios';
 import { env } from 'decentraland-commons';
-env.load()
+env.load();
 
 export async function uploader(vorpal: any, args: any, callback: () => void) {
   // If it is the first time, not pin the scene to Decentraland IPFS node
@@ -130,16 +128,9 @@ export async function uploader(vorpal: any, args: any, callback: () => void) {
       process.exit(1);
     }
 
-    let ipfsURL: string = null;
+    let ipfsURL: string = await getIPFSURL();
     try {
-      const { data } = await axios.get('https://decentraland.github.io/ipfs-node/url.json');
-      ipfsURL = data.staging;
-    } catch (error) {
-      // fallback to ENV
-    }
-    const url = env.get('IPFS_GATEWAY', () => ipfsURL);
-    try {
-      const { ok } = await axios.get(`${url}/pin/${project.peerId}/${coordinates[0].x}/${coordinates[0].y}`)
+      const { ok } = await axios.get(`${ipfsURL}/pin/${project.peerId}/${coordinates[0].x}/${coordinates[0].y}`)
       .then(response => response.data);
       vorpal.log(`Pinning files ${ok ? 'success' : 'failed'}`);
     } catch (err) {
diff --git a/typings/decentraland-commons.d.ts b/typings/decentraland-commons.d.ts
index cf7c433c..34c42bfe 100644
--- a/typings/decentraland-commons.d.ts
+++ b/typings/decentraland-commons.d.ts
@@ -1,6 +1,6 @@
 declare module 'decentraland-commons' {
-  module env {
-    export function load(): void
-    export function get(name: string, fallback?: () => any): string
+  namespace env {
+    export function load(): void;
+    export function get(name: string, fallback?: () => any): string;
   }
 }