diff --git a/chains/ropsten/ACL.json b/chains/ropsten/contracts/ACL.json similarity index 100% rename from chains/ropsten/ACL.json rename to chains/ropsten/contracts/ACL.json diff --git a/chains/ropsten/ACLHelpers.json b/chains/ropsten/contracts/ACLHelpers.json similarity index 100% rename from chains/ropsten/ACLHelpers.json rename to chains/ropsten/contracts/ACLHelpers.json diff --git a/chains/ropsten/ACLOracle.json b/chains/ropsten/contracts/ACLOracle.json similarity index 100% rename from chains/ropsten/ACLOracle.json rename to chains/ropsten/contracts/ACLOracle.json diff --git a/chains/ropsten/ACLSyntaxSugar.json b/chains/ropsten/contracts/ACLSyntaxSugar.json similarity index 100% rename from chains/ropsten/ACLSyntaxSugar.json rename to chains/ropsten/contracts/ACLSyntaxSugar.json diff --git a/chains/ropsten/AppProxyBase.json b/chains/ropsten/contracts/AppProxyBase.json similarity index 100% rename from chains/ropsten/AppProxyBase.json rename to chains/ropsten/contracts/AppProxyBase.json diff --git a/chains/ropsten/AppProxyFactory.json b/chains/ropsten/contracts/AppProxyFactory.json similarity index 100% rename from chains/ropsten/AppProxyFactory.json rename to chains/ropsten/contracts/AppProxyFactory.json diff --git a/chains/ropsten/AppProxyPinned.json b/chains/ropsten/contracts/AppProxyPinned.json similarity index 100% rename from chains/ropsten/AppProxyPinned.json rename to chains/ropsten/contracts/AppProxyPinned.json diff --git a/chains/ropsten/AppProxyUpgradeable.json b/chains/ropsten/contracts/AppProxyUpgradeable.json similarity index 100% rename from chains/ropsten/AppProxyUpgradeable.json rename to chains/ropsten/contracts/AppProxyUpgradeable.json diff --git a/chains/ropsten/AppStorage.json b/chains/ropsten/contracts/AppStorage.json similarity index 100% rename from chains/ropsten/AppStorage.json rename to chains/ropsten/contracts/AppStorage.json diff --git a/chains/ropsten/AragonApp.json b/chains/ropsten/contracts/AragonApp.json similarity index 100% rename from chains/ropsten/AragonApp.json rename to chains/ropsten/contracts/AragonApp.json diff --git a/chains/ropsten/CallsScript.json b/chains/ropsten/contracts/CallsScript.json similarity index 100% rename from chains/ropsten/CallsScript.json rename to chains/ropsten/contracts/CallsScript.json diff --git a/chains/ropsten/DAOFactory.json b/chains/ropsten/contracts/DAOFactory.json similarity index 100% rename from chains/ropsten/DAOFactory.json rename to chains/ropsten/contracts/DAOFactory.json diff --git a/chains/ropsten/DelegateProxy.json b/chains/ropsten/contracts/DelegateProxy.json similarity index 100% rename from chains/ropsten/DelegateProxy.json rename to chains/ropsten/contracts/DelegateProxy.json diff --git a/chains/ropsten/DelegateScript.json b/chains/ropsten/contracts/DelegateScript.json similarity index 100% rename from chains/ropsten/DelegateScript.json rename to chains/ropsten/contracts/DelegateScript.json diff --git a/chains/ropsten/DelegateScriptTarget.json b/chains/ropsten/contracts/DelegateScriptTarget.json similarity index 100% rename from chains/ropsten/DelegateScriptTarget.json rename to chains/ropsten/contracts/DelegateScriptTarget.json diff --git a/chains/ropsten/DeployDelegateScript.json b/chains/ropsten/contracts/DeployDelegateScript.json similarity index 100% rename from chains/ropsten/DeployDelegateScript.json rename to chains/ropsten/contracts/DeployDelegateScript.json diff --git a/chains/ropsten/DepositableDelegateProxy.json b/chains/ropsten/contracts/DepositableDelegateProxy.json similarity index 100% rename from chains/ropsten/DepositableDelegateProxy.json rename to chains/ropsten/contracts/DepositableDelegateProxy.json diff --git a/chains/ropsten/ERC20.json b/chains/ropsten/contracts/ERC20.json similarity index 100% rename from chains/ropsten/ERC20.json rename to chains/ropsten/contracts/ERC20.json diff --git a/chains/ropsten/ERC20Basic.json b/chains/ropsten/contracts/ERC20Basic.json similarity index 100% rename from chains/ropsten/ERC20Basic.json rename to chains/ropsten/contracts/ERC20Basic.json diff --git a/chains/ropsten/ERCProxy.json b/chains/ropsten/contracts/ERCProxy.json similarity index 100% rename from chains/ropsten/ERCProxy.json rename to chains/ropsten/contracts/ERCProxy.json diff --git a/chains/ropsten/EVMScriptRegistry.json b/chains/ropsten/contracts/EVMScriptRegistry.json similarity index 100% rename from chains/ropsten/EVMScriptRegistry.json rename to chains/ropsten/contracts/EVMScriptRegistry.json diff --git a/chains/ropsten/EVMScriptRegistryConstants.json b/chains/ropsten/contracts/EVMScriptRegistryConstants.json similarity index 100% rename from chains/ropsten/EVMScriptRegistryConstants.json rename to chains/ropsten/contracts/EVMScriptRegistryConstants.json diff --git a/chains/ropsten/EVMScriptRegistryFactory.json b/chains/ropsten/contracts/EVMScriptRegistryFactory.json similarity index 100% rename from chains/ropsten/EVMScriptRegistryFactory.json rename to chains/ropsten/contracts/EVMScriptRegistryFactory.json diff --git a/chains/ropsten/EVMScriptRunner.json b/chains/ropsten/contracts/EVMScriptRunner.json similarity index 100% rename from chains/ropsten/EVMScriptRunner.json rename to chains/ropsten/contracts/EVMScriptRunner.json diff --git a/chains/ropsten/EtherTokenConstant.json b/chains/ropsten/contracts/EtherTokenConstant.json similarity index 100% rename from chains/ropsten/EtherTokenConstant.json rename to chains/ropsten/contracts/EtherTokenConstant.json diff --git a/chains/ropsten/IACL.json b/chains/ropsten/contracts/IACL.json similarity index 100% rename from chains/ropsten/IACL.json rename to chains/ropsten/contracts/IACL.json diff --git a/chains/ropsten/IEVMScriptExecutor.json b/chains/ropsten/contracts/IEVMScriptExecutor.json similarity index 100% rename from chains/ropsten/IEVMScriptExecutor.json rename to chains/ropsten/contracts/IEVMScriptExecutor.json diff --git a/chains/ropsten/IEVMScriptRegistry.json b/chains/ropsten/contracts/IEVMScriptRegistry.json similarity index 100% rename from chains/ropsten/IEVMScriptRegistry.json rename to chains/ropsten/contracts/IEVMScriptRegistry.json diff --git a/chains/ropsten/IKernel.json b/chains/ropsten/contracts/IKernel.json similarity index 100% rename from chains/ropsten/IKernel.json rename to chains/ropsten/contracts/IKernel.json diff --git a/chains/ropsten/ILPVault.json b/chains/ropsten/contracts/ILPVault.json similarity index 100% rename from chains/ropsten/ILPVault.json rename to chains/ropsten/contracts/ILPVault.json diff --git a/chains/ropsten/ILiquidPledging.json b/chains/ropsten/contracts/ILiquidPledging.json similarity index 100% rename from chains/ropsten/ILiquidPledging.json rename to chains/ropsten/contracts/ILiquidPledging.json diff --git a/chains/ropsten/ILiquidPledgingPlugin.json b/chains/ropsten/contracts/ILiquidPledgingPlugin.json similarity index 100% rename from chains/ropsten/ILiquidPledgingPlugin.json rename to chains/ropsten/contracts/ILiquidPledgingPlugin.json diff --git a/chains/ropsten/IVaultRecoverable.json b/chains/ropsten/contracts/IVaultRecoverable.json similarity index 100% rename from chains/ropsten/IVaultRecoverable.json rename to chains/ropsten/contracts/IVaultRecoverable.json diff --git a/chains/ropsten/Initializable.json b/chains/ropsten/contracts/Initializable.json similarity index 100% rename from chains/ropsten/Initializable.json rename to chains/ropsten/contracts/Initializable.json diff --git a/chains/ropsten/IsContract.json b/chains/ropsten/contracts/IsContract.json similarity index 100% rename from chains/ropsten/IsContract.json rename to chains/ropsten/contracts/IsContract.json diff --git a/chains/ropsten/Kernel.json b/chains/ropsten/contracts/Kernel.json similarity index 100% rename from chains/ropsten/Kernel.json rename to chains/ropsten/contracts/Kernel.json diff --git a/chains/ropsten/KernelConstants.json b/chains/ropsten/contracts/KernelConstants.json similarity index 100% rename from chains/ropsten/KernelConstants.json rename to chains/ropsten/contracts/KernelConstants.json diff --git a/chains/ropsten/KernelProxy.json b/chains/ropsten/contracts/KernelProxy.json similarity index 100% rename from chains/ropsten/KernelProxy.json rename to chains/ropsten/contracts/KernelProxy.json diff --git a/chains/ropsten/KernelStorage.json b/chains/ropsten/contracts/KernelStorage.json similarity index 100% rename from chains/ropsten/KernelStorage.json rename to chains/ropsten/contracts/KernelStorage.json diff --git a/chains/ropsten/LPConstants.json b/chains/ropsten/contracts/LPConstants.json similarity index 100% rename from chains/ropsten/LPConstants.json rename to chains/ropsten/contracts/LPConstants.json diff --git a/chains/ropsten/LPFactory.json b/chains/ropsten/contracts/LPFactory.json similarity index 100% rename from chains/ropsten/LPFactory.json rename to chains/ropsten/contracts/LPFactory.json diff --git a/chains/ropsten/LPVault.json b/chains/ropsten/contracts/LPVault.json similarity index 100% rename from chains/ropsten/LPVault.json rename to chains/ropsten/contracts/LPVault.json diff --git a/chains/ropsten/LiquidPledging.json b/chains/ropsten/contracts/LiquidPledging.json similarity index 100% rename from chains/ropsten/LiquidPledging.json rename to chains/ropsten/contracts/LiquidPledging.json diff --git a/chains/ropsten/LiquidPledgingACLHelpers.json b/chains/ropsten/contracts/LiquidPledgingACLHelpers.json similarity index 100% rename from chains/ropsten/LiquidPledgingACLHelpers.json rename to chains/ropsten/contracts/LiquidPledgingACLHelpers.json diff --git a/chains/ropsten/LiquidPledgingBase.json b/chains/ropsten/contracts/LiquidPledgingBase.json similarity index 100% rename from chains/ropsten/LiquidPledgingBase.json rename to chains/ropsten/contracts/LiquidPledgingBase.json diff --git a/chains/ropsten/LiquidPledgingMock.json b/chains/ropsten/contracts/LiquidPledgingMock.json similarity index 100% rename from chains/ropsten/LiquidPledgingMock.json rename to chains/ropsten/contracts/LiquidPledgingMock.json diff --git a/chains/ropsten/LiquidPledgingPlugins.json b/chains/ropsten/contracts/LiquidPledgingPlugins.json similarity index 100% rename from chains/ropsten/LiquidPledgingPlugins.json rename to chains/ropsten/contracts/LiquidPledgingPlugins.json diff --git a/chains/ropsten/LiquidPledgingStorage.json b/chains/ropsten/contracts/LiquidPledgingStorage.json similarity index 100% rename from chains/ropsten/LiquidPledgingStorage.json rename to chains/ropsten/contracts/LiquidPledgingStorage.json diff --git a/chains/ropsten/PledgeAdmins.json b/chains/ropsten/contracts/PledgeAdmins.json similarity index 100% rename from chains/ropsten/PledgeAdmins.json rename to chains/ropsten/contracts/PledgeAdmins.json diff --git a/chains/ropsten/Pledges.json b/chains/ropsten/contracts/Pledges.json similarity index 100% rename from chains/ropsten/Pledges.json rename to chains/ropsten/contracts/Pledges.json diff --git a/chains/ropsten/RecoveryVault.json b/chains/ropsten/contracts/RecoveryVault.json similarity index 100% rename from chains/ropsten/RecoveryVault.json rename to chains/ropsten/contracts/RecoveryVault.json diff --git a/chains/ropsten/SNT.json b/chains/ropsten/contracts/SNT.json similarity index 100% rename from chains/ropsten/SNT.json rename to chains/ropsten/contracts/SNT.json diff --git a/chains/ropsten/ScriptHelpers.json b/chains/ropsten/contracts/ScriptHelpers.json similarity index 100% rename from chains/ropsten/ScriptHelpers.json rename to chains/ropsten/contracts/ScriptHelpers.json diff --git a/chains/ropsten/StandardToken.json b/chains/ropsten/contracts/StandardToken.json similarity index 100% rename from chains/ropsten/StandardToken.json rename to chains/ropsten/contracts/StandardToken.json diff --git a/chains/ropsten/TestSimpleDelegatePlugin.json b/chains/ropsten/contracts/TestSimpleDelegatePlugin.json similarity index 100% rename from chains/ropsten/TestSimpleDelegatePlugin.json rename to chains/ropsten/contracts/TestSimpleDelegatePlugin.json diff --git a/chains/ropsten/TestSimpleDelegatePluginFactory.json b/chains/ropsten/contracts/TestSimpleDelegatePluginFactory.json similarity index 100% rename from chains/ropsten/TestSimpleDelegatePluginFactory.json rename to chains/ropsten/contracts/TestSimpleDelegatePluginFactory.json diff --git a/chains/ropsten/TestSimpleProjectPlugin.json b/chains/ropsten/contracts/TestSimpleProjectPlugin.json similarity index 100% rename from chains/ropsten/TestSimpleProjectPlugin.json rename to chains/ropsten/contracts/TestSimpleProjectPlugin.json diff --git a/chains/ropsten/TestSimpleProjectPluginFactory.json b/chains/ropsten/contracts/TestSimpleProjectPluginFactory.json similarity index 100% rename from chains/ropsten/TestSimpleProjectPluginFactory.json rename to chains/ropsten/contracts/TestSimpleProjectPluginFactory.json diff --git a/chains/ropsten/VaultRecoverable.json b/chains/ropsten/contracts/VaultRecoverable.json similarity index 100% rename from chains/ropsten/VaultRecoverable.json rename to chains/ropsten/contracts/VaultRecoverable.json diff --git a/src/actions.js b/src/actions.js index 56c75a2..2ab9e75 100644 --- a/src/actions.js +++ b/src/actions.js @@ -33,7 +33,6 @@ class Actions { } connect(url, cb) { - console.dir("chain: " + url); console.dir("connecting to: " + url); web3.setProvider(url); diff --git a/src/contracts.js b/src/contracts.js index c5d461e..7fed692 100644 --- a/src/contracts.js +++ b/src/contracts.js @@ -8,11 +8,12 @@ class Contracts { } loadContracts() { - const LiquidPledgingJSONConfig = require("../dist/contracts/LiquidPledging.json"); + console.dir("loading contracts for " + this.chain); + const LiquidPledgingJSONConfig = require(`../chains/${this.chain}/contracts/LiquidPledging.json`); const LiquidPledging = new this.web3.eth.Contract(LiquidPledgingJSONConfig.abiDefinition, LiquidPledgingJSONConfig.address); this.contracts.LiquidPledging = LiquidPledging; - const StandardTokenJSONConfig = require("../dist/contracts/StandardToken.json"); + const StandardTokenJSONConfig = require(`../chains/${this.chain}/contracts/StandardToken.json`); const StandardToken = new this.web3.eth.Contract(StandardTokenJSONConfig.abiDefinition, StandardTokenJSONConfig.address); this.contracts.StandardToken = StandardToken; }