fixed providers and nameregs

index.js

@@ -1,12 +1,6 @@
 var Web3 = require('./lib/web3');
 var namereg = require('./lib/web3/namereg');
 
-//Web3.prototype.providers.HttpProvider = require('./lib/web3/httpprovider');
-//Web3.prototype.providers.IpcProvider = require('./lib/web3/ipcprovider');
-
-//Web3.prototype.eth.contract = require('./lib/web3/contract');
-//Web3.prototype.eth.namereg = namereg.namereg;
-//Web3.prototype.eth.ibanNamereg = namereg.ibanNamereg;
 //Web3.prototype.eth.sendIBANTransaction = require('./lib/web3/transfer');
 //Web3.prototype.eth.iban = require('./lib/web3/iban');
 

lib/web3.js

@@ -38,6 +38,9 @@ var sha3 = require('./utils/sha3');
 var extend = require('./web3/extend');
 var Batch = require('./web3/batch');
 var Property = require('./web3/property');
+var HttpProvider = require('./web3/httpprovider');
+var IpcProvider = require('./web3/ipcprovider');
+
 
 function Web3 (provider) {
     this._requestManager = new RequestManager(provider);
@@ -50,11 +53,15 @@ function Web3 (provider) {
     this.version = {
         version: version.version
     };
+    this.providers = {
+        HttpProvider: HttpProvider,
+        IpcProvider: IpcProvider
+    };
     this._extend = extend(this);
     this._extend({
         properties: properties()
     });
-}
+};
 
 Web3.prototype.setProvider = function (provider) {
     this._requestManager.setProvider(provider);

lib/web3/methods/eth.js

@@ -32,6 +32,7 @@ var Contract = require('../contract');
 var watches = require('./watches');
 var Filter = require('../filter');
 var IsSyncing = require('../syncing');
+var namereg = require('../namereg');
 
 var blockCall = function (args) {
     return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? "eth_getBlockByHash" : "eth_getBlockByNumber";
@@ -67,6 +68,9 @@ function Eth(web3) {
         p.attachToObject(self);
         p.setRequestManager(web3._requestManager);
     });
+
+    this.namereg = this.contract(namereg.global.abi).at(namereg.global.address);
+    this.icapNamereg = this.contract(namereg.icap.abi).at(namereg.icap.address);
 }
 
 Object.defineProperty(Eth.prototype, 'defaultBlock', {

lib/web3/namereg.js

@@ -20,15 +20,20 @@
  * @date 2015
  */
 
-var contract = require('./contract');
 var globalRegistrarAbi = require('../contracts/GlobalRegistrar.json');
 var icapRegistrarAbi= require('../contracts/ICAPRegistrar.json');
 
 var globalNameregAddress = '0xc6d9d2cd449a754c494264e1809c50e34d64562b';
-var ibanNameregAddress = '0xa1a111bc074c9cfa781f0c38e63bd51c91b8af00';
+var icapNameregAddress = '0xa1a111bc074c9cfa781f0c38e63bd51c91b8af00';
 
-//module.exports = {
-    //namereg: contract(globalRegistrarAbi).at(globalNameregAddress),
-    //ibanNamereg: contract(icapRegistrarAbi).at(ibanNameregAddress)
-//};
+module.exports = {
+    global: {
+        abi: globalRegistrarAbi,
+        address: globalNameregAddress
+    },
+    icap: {
+        abi: icapRegistrarAbi,
+        icapNameregAddress: icapNameregAddress
+    }
+};