testing

amisolution · amisolution · commit 584f0d10d02f · 2018-09-01T15:50:07.000+02:00
diff --git a/config_testnet.js b/config_testnet.js
@@ -6,7 +6,7 @@ module.exports = {
   contractToken: 'smart_contract/token.sol',
   contractReserveToken: 'smart_contract/reservetoken.sol',
   contractDecentrExAddrs: [
-    { addr: '0x228344536a03c0910fb8be9c2755c1a0ba6f89e1', info: 'Deployed 02/09/2017' },
+    { addr: '0x228344536a03c0910fb8be9c2755c1a0ba6f89e1', info: 'ED Deployed 02/09/2017' },
     { addr: '0xf80cd360e96fa96b8b7d9e95d5a7911ac5f09ec2', info: 'Deployed 10/24/2016' },
     { addr: '0xcdd152384c55dd4e5b5a3128cc90e0d9311570de', info: 'Deployed 10/06/2016' },
     { addr: '0x24b0ed7ba8d6d969bfe8409b4e6aeee3a40f8855', info: 'Deployed 08/03/2016' },
diff --git a/js/bundle.js b/js/bundle.js
@@ -1189,15 +1189,16 @@ module.exports = (config) => {
 
 module.exports = {
   homeURL: 'https://amisolution.github.io/amis-decentrex',
-  contractDecentrEx: 'smart_contract/etherdelta.sol',
+  contractDecentrEx: 'smart_contract/decentrex.sol',
   contractToken: 'smart_contract/token.sol',
   contractReserveToken: 'smart_contract/reservetoken.sol',
   contractDecentrExAddrs: [
       { addr: '0xbf29685856fae1e228878dfb35b280c0adcc3b05', info: 'Deployed 05/26/2017' },
-      { addr: '0x8d12a197cb00d4747a1fe03395095ce2a5cc6819', info: 'Etherdelta contract' }
+      { addr: '0x8d12a197cb00d4747a1fe03395095ce2a5cc6819', info: 'Etherdelta contract' },
+      { addr: '0x228344536a03c0910fb8be9c2755c1a0ba6f89e1', info: 'ED Testnet contract' },
     
   ],
-  ethTestnet: false,
+  ethTestnet: 'ropsten',
   ethProvider: 'http://localhost:8545',
   ethGasPrice: 20000000000,
   ethAddr: '0x0000000000000000000000000000000000000000',
@@ -1640,7 +1641,7 @@ module.exports = {
 
 module.exports = {
   homeURL: 'http://localhost:8080',
-  contractDecentrEx: 'smart_contract/etherdelta.sol',
+  contractDecentrEx: 'smart_contract/decentrex.sol',
   contractToken: 'smart_contract/token.sol',
   contractReserveToken: 'smart_contract/reservetoken.sol',
   contractDecentrExAddrs: [
diff --git a/market_maker_config_schema.js b/market_maker_config_schema.js
@@ -29,7 +29,7 @@ const pairs = {
     properties: {
       pair: {
         title: 'Pair',
-        description: 'The pair name should match what you see on DecentrEx, for example MKR/ETH',
+        description: 'The pair name should match what you see on DecentrEx, for example AMIS/ETH',
         type: 'string',
       },
       expires: {
