1.0.0 release!

gnosis · Dec 28, 2017 · e78e8fa · e78e8fa
1 parent 8e06665
commit e78e8fa
Show file tree

Hide file tree

Showing 16 changed files with 20,163 additions and 24,223 deletions.
diff --git a/dist/gnosis.js b/dist/gnosis.js
diff --git a/docs/Gnosis.html b/docs/Gnosis.html
@@ -294,7 +294,7 @@ <h4 class="name" id="defaultAccount"><span class="type-signature"></span>default
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="index.js.html">index.js</a>, <a href="index.js.html#line256">line 256</a>
+        <a href="index.js.html">index.js</a>, <a href="index.js.html#line264">line 264</a>
     </li></ul></dd>
 
 
@@ -332,7 +332,8 @@ <h4 class="name" id="etherToken"><span class="type-signature"></span>etherToken<
 
 
 <div class="description">
-    <p>If <a href="https://gnosis.github.io/gnosis-contracts/docs/EtherToken/">EtherToken</a> is deployed to the current network, this will be set to an EtherToken contract abstraction pointing at the deployment address.</p>
+    <p>If on mainnet, this will be an EtherToken contract abstraction pointing to the <a href="https://etherscan.io/address/0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2#code">MakerDAO WETH contract</a>.</p>
+<p>Otherwise, if <a href="https://gnosis.github.io/gnosis-contracts/docs/EtherToken/">EtherToken</a> is deployed to the current network, this will be set to an EtherToken contract abstraction pointing at the deployment address.</p>
 </div>
 
 
@@ -442,7 +443,7 @@ <h4 class="name" id="lmsrMarketMaker"><span class="type-signature"></span>lmsrMa
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="index.js.html">index.js</a>, <a href="index.js.html#line227">line 227</a>
+        <a href="index.js.html">index.js</a>, <a href="index.js.html#line235">line 235</a>
     </li></ul></dd>
 
 
@@ -516,7 +517,7 @@ <h4 class="name" id="olympiaToken"><span class="type-signature"></span>olympiaTo
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="index.js.html">index.js</a>, <a href="index.js.html#line234">line 234</a>
+        <a href="index.js.html">index.js</a>, <a href="index.js.html#line242">line 242</a>
     </li></ul></dd>
 
 
@@ -590,7 +591,7 @@ <h4 class="name" id="standardMarketFactory"><span class="type-signature"></span>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="index.js.html">index.js</a>, <a href="index.js.html#line220">line 220</a>
+        <a href="index.js.html">index.js</a>, <a href="index.js.html#line228">line 228</a>
     </li></ul></dd>
 
 
@@ -5504,7 +5505,7 @@ <h5>Parameters:</h5>
 <br class="clear">
 
 <footer>
-    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
+    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Dec 28 2017 00:03:41 GMT-0600 (CST) using the Minami theme.
 </footer>
 
 <script>hljs.initHighlightingOnLoad();</script>

diff --git a/docs/events.js.html b/docs/events.js.html
@@ -161,7 +161,7 @@ <h1 class="page-title">events.js</h1>
 <br class="clear">
 
 <footer>
-    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
+    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Dec 28 2017 00:03:41 GMT-0600 (CST) using the Minami theme.
 </footer>
 
 <script>hljs.initHighlightingOnLoad();</script>

diff --git a/docs/index.html b/docs/index.html
@@ -96,7 +96,7 @@ <h3>Gas estimations</h3><p>Many of the methods on the gnosis API also have an as
 <br class="clear">
 
 <footer>
-    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
+    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Dec 28 2017 00:03:41 GMT-0600 (CST) using the Minami theme.
 </footer>
 
 <script>hljs.initHighlightingOnLoad();</script>

diff --git a/docs/index.js.html b/docs/index.js.html
@@ -254,11 +254,19 @@ <h1 class="page-title">index.js</h1>
 
         await Promise.all([
             /**
-             * If [EtherToken](https://gnosis.github.io/gnosis-contracts/docs/EtherToken/) is deployed to the current network, this will be set to an EtherToken contract abstraction pointing at the deployment address.
+             * If on mainnet, this will be an EtherToken contract abstraction pointing to the [MakerDAO WETH contract](https://etherscan.io/address/0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2#code).
+             *
+             * Otherwise, if [EtherToken](https://gnosis.github.io/gnosis-contracts/docs/EtherToken/) is deployed to the current network, this will be set to an EtherToken contract abstraction pointing at the deployment address.
              *
              * @member {Contract} Gnosis#etherToken
              */
-            this.trySettingContractInstance('etherToken', this.contracts.EtherToken),
+            (async () => {
+                if(await utils.promisify(this.web3.version.getNetwork)() === '1') {
+                    this.etherToken = this.contracts.EtherToken.at('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2')
+                } else {
+                    await this.trySettingContractInstance('etherToken', this.contracts.EtherToken)
+                }
+            })(),
 
             /**
              * If [StandardMarketFactory](https://gnosis.github.io/gnosis-contracts/docs/StandardMarketFactory/) is deployed to the current network, this will be set to an StandardMarketFactory contract abstraction pointing at the deployment address.
@@ -326,7 +334,7 @@ <h1 class="page-title">index.js</h1>
 <br class="clear">
 
 <footer>
-    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
+    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Dec 28 2017 00:03:41 GMT-0600 (CST) using the Minami theme.
 </footer>
 
 <script>hljs.initHighlightingOnLoad();</script>

diff --git a/docs/lmsr.js.html b/docs/lmsr.js.html
@@ -229,7 +229,7 @@ <h1 class="page-title">lmsr.js</h1>
 <br class="clear">
 
 <footer>
-    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
+    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Dec 28 2017 00:03:41 GMT-0600 (CST) using the Minami theme.
 </footer>
 
 <script>hljs.initHighlightingOnLoad();</script>

diff --git a/docs/markets.js.html b/docs/markets.js.html
@@ -316,7 +316,7 @@ <h1 class="page-title">markets.js</h1>
 <br class="clear">
 
 <footer>
-    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
+    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Dec 28 2017 00:03:41 GMT-0600 (CST) using the Minami theme.
 </footer>
 
 <script>hljs.initHighlightingOnLoad();</script>

diff --git a/docs/oracles.js.html b/docs/oracles.js.html
@@ -106,7 +106,7 @@ <h1 class="page-title">oracles.js</h1>
 <br class="clear">
 
 <footer>
-    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
+    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Dec 28 2017 00:03:41 GMT-0600 (CST) using the Minami theme.
 </footer>
 
 <script>hljs.initHighlightingOnLoad();</script>

diff --git a/docs/tutorial-api-overview.html b/docs/tutorial-api-overview.html
@@ -69,7 +69,7 @@ <h1 class="page-title">API Overview</h1>
 <br class="clear">
 
 <footer>
-    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
+    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Dec 28 2017 00:03:41 GMT-0600 (CST) using the Minami theme.
 </footer>
 
 <script>hljs.initHighlightingOnLoad();</script>

diff --git a/docs/tutorial-developer-guide.html b/docs/tutorial-developer-guide.html
@@ -61,7 +61,7 @@ <h1 class="page-title">Developer Guide</h1>
 <br class="clear">
 
 <footer>
-    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
+    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Dec 28 2017 00:03:41 GMT-0600 (CST) using the Minami theme.
 </footer>
 
 <script>hljs.initHighlightingOnLoad();</script>

diff --git a/docs/tutorial-events-oracles-and-markets.html b/docs/tutorial-events-oracles-and-markets.html
@@ -175,7 +175,7 @@ <h3>Events and Collateral</h3><p>Once an oracle is created, an event contract ma
 <br class="clear">
 
 <footer>
-    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
+    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Dec 28 2017 00:03:41 GMT-0600 (CST) using the Minami theme.
 </footer>
 
 <script>hljs.initHighlightingOnLoad();</script>

diff --git a/docs/tutorial-installation.html b/docs/tutorial-installation.html
@@ -80,7 +80,7 @@ <h4>MetaMask</h4><p><a href="https://metamask.io/">MetaMask</a> is a Chrome brow
 <br class="clear">
 
 <footer>
-    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
+    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Dec 28 2017 00:03:41 GMT-0600 (CST) using the Minami theme.
 </footer>
 
 <script>hljs.initHighlightingOnLoad();</script>

diff --git a/docs/tutorial-lmsr-primer.html b/docs/tutorial-lmsr-primer.html
@@ -81,7 +81,7 @@ <h3>LMSR Calculation Functions</h3><p>The functions <a href="Gnosis.html#.calcLM
 <br class="clear">
 
 <footer>
-    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
+    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Dec 28 2017 00:03:41 GMT-0600 (CST) using the Minami theme.
 </footer>
 
 <script>hljs.initHighlightingOnLoad();</script>

diff --git a/docs/utils.js.html b/docs/utils.js.html
@@ -410,7 +410,7 @@ <h1 class="page-title">utils.js</h1>
 <br class="clear">
 
 <footer>
-    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
+    Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Dec 28 2017 00:03:41 GMT-0600 (CST) using the Minami theme.
 </footer>
 
 <script>hljs.initHighlightingOnLoad();</script>