ethereum-alarm-clock · lsaether · Jul 27, 2018 · Jul 27, 2018 · Jul 27, 2018 · Jul 27, 2018
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ site
 site/
 lib/assets/tester.json
 lib/assets/development.json
-lib/build/contracts
+lib/build/contracts
+build
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,7 @@ install: npm install
 script:
   - npm i -g truffle
   - sh deploy.sh
+  - npm run build
   - npm test
 git:
   submodules: true
diff --git a/deploy.js → archive/deploy.js b/deploy.js → archive/deploy.js
@@ -10,7 +10,7 @@ const web3 = new Web3(provider)
 const TruffleContract = require('truffle-contract')
 
 const getArtifact = name => {
-    const contract = TruffleContract(require(`./lib/build/contracts/${name}.json`))
+    const contract = TruffleContract(require(`./static/build/contracts/${name}.json`))
     contract.setProvider(provider)
     contract.detectNetwork()
     return contract
@@ -150,7 +150,7 @@ async function main() {
                 timestampScheduler: timestampScheduler.address
             }
             const fs = require('fs')
-            fs.writeFileSync('./lib/assets/tester.json', JSON.stringify(contracts))
+            fs.writeFileSync('./static/assets/tester.json', JSON.stringify(contracts))
             resolve({
                 // Ganache attached web3
                 web3: web3,

diff --git a/archive/deploy.sh b/archive/deploy.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+echo "Deploying contracts..."
+cd ethereum-alarm-clock
+truffle network --clean
+truffle migrate --reset
+cd ..
+
+echo "Moving the generated contract files..."
+rm -Rfv static/build/*
+mkdir static/build
+cp -Rfv ethereum-alarm-clock/build/* static/build/contracts
+cp -fv ethereum-alarm-clock/package.json static/build/ethereum-alarm-clock.json
+ls static/build
+
+node ./extractContractsInfo.js development
+mv -fv contracts.json static/assets/development.json || true
+
+echo "Done."
diff --git a/docs/API/constants.md → archive/docs/API/constants.md b/docs/API/constants.md → archive/docs/API/constants.md
diff --git a/docs/API/index.md → archive/docs/API/index.md b/docs/API/index.md → archive/docs/API/index.md
diff --git a/docs/API/requestFactory.md → archive/docs/API/requestFactory.md b/docs/API/requestFactory.md → archive/docs/API/requestFactory.md
diff --git a/docs/API/requestTracker.md → archive/docs/API/requestTracker.md b/docs/API/requestTracker.md → archive/docs/API/requestTracker.md
diff --git a/docs/API/scheduler.md → archive/docs/API/scheduler.md b/docs/API/scheduler.md → archive/docs/API/scheduler.md
diff --git a/docs/API/txRequest.md → archive/docs/API/txRequest.md b/docs/API/txRequest.md → archive/docs/API/txRequest.md
diff --git a/docs/API/util.md → archive/docs/API/util.md b/docs/API/util.md → archive/docs/API/util.md
diff --git a/docs/Changelog.md → archive/docs/Changelog.md b/docs/Changelog.md → archive/docs/Changelog.md
diff --git a/docs/Executing_Tut.md → archive/docs/Executing_Tut.md b/docs/Executing_Tut.md → archive/docs/Executing_Tut.md
diff --git a/docs/GUI_Implementer_Guide.md → archive/docs/GUI_Implementer_Guide.md b/docs/GUI_Implementer_Guide.md → archive/docs/GUI_Implementer_Guide.md
diff --git a/docs/index.md → archive/docs/index.md b/docs/index.md → archive/docs/index.md
diff --git a/docs/old/Executing_Tut.md → archive/docs/old/Executing_Tut.md b/docs/old/Executing_Tut.md → archive/docs/old/Executing_Tut.md
diff --git a/docs/old/Tutorial_Geth.txt → archive/docs/old/Tutorial_Geth.txt b/docs/old/Tutorial_Geth.txt → archive/docs/old/Tutorial_Geth.txt
diff --git a/docs/old/spec.txt → archive/docs/old/spec.txt b/docs/old/spec.txt → archive/docs/old/spec.txt
diff --git a/example/webpack/.babelrc → archive/example/webpack/.babelrc b/example/webpack/.babelrc → archive/example/webpack/.babelrc
diff --git a/example/webpack/README.md → archive/example/webpack/README.md b/example/webpack/README.md → archive/example/webpack/README.md
diff --git a/example/webpack/index.html → archive/example/webpack/index.html b/example/webpack/index.html → archive/example/webpack/index.html
diff --git a/example/webpack/package-lock.json → archive/example/webpack/package-lock.json b/example/webpack/package-lock.json → archive/example/webpack/package-lock.json
diff --git a/example/webpack/package.json → archive/example/webpack/package.json b/example/webpack/package.json → archive/example/webpack/package.json
diff --git a/example/webpack/server.js → archive/example/webpack/server.js b/example/webpack/server.js → archive/example/webpack/server.js
diff --git a/example/webpack/src/components/app.js → ...ive/example/webpack/src/components/app.js b/example/webpack/src/components/app.js → ...ive/example/webpack/src/components/app.js
diff --git a/example/webpack/src/components/index.js → ...e/example/webpack/src/components/index.js b/example/webpack/src/components/index.js → ...e/example/webpack/src/components/index.js
diff --git a/example/webpack/webpack.config.js → archive/example/webpack/webpack.config.js b/example/webpack/webpack.config.js → archive/example/webpack/webpack.config.js
diff --git a/example/webpack/yarn.lock → archive/example/webpack/yarn.lock b/example/webpack/yarn.lock → archive/example/webpack/yarn.lock
diff --git a/extractContractsInfo.js → archive/extractContractsInfo.js b/extractContractsInfo.js → archive/extractContractsInfo.js
@@ -8,8 +8,8 @@
  *  Available networks:
  *  mainnet, ropsten, rinkeby, kovan, development
  */
-const artifactsDir = './lib/build/contracts';
-const dest = './lib/build/abi'
+const artifactsDir = './static/build/contracts';
+const dest = './static/build/abi'
 const fs = require('fs');
 const path = require('path');
 

diff --git a/mkdocs.yml → archive/mkdocs.yml b/mkdocs.yml → archive/mkdocs.yml
diff --git a/script.js → archive/script.js b/script.js → archive/script.js
diff --git a/archive/test/RequestFactory.js b/archive/test/RequestFactory.js
@@ -0,0 +1,26 @@
+// const Bignumber = require("bignumber.js");
+// const { expect } = require("chai");
+
+// const initEacjs = require("../index");
+
+// const mockWeb3 = {
+//   version: {
+//     getNetwork: (cb) => {
+//       return ()
+//     }
+//   }
+// };
+
+// describe("RequestFactory", () => {
+//   let eacjs;
+
+//   before(() => {
+//     eacjs = initEacjs(mockWeb3);
+//   })
+
+
+//   it("Creates a new instance of RequestFactory", async () => {
+//     const rFactory = await eacjs.requestFactory();
+//     expect(rFactory.addess).to.exist;
+//   })
+// })
diff --git a/test/dependencies.js → archive/test/dependencies.js b/test/dependencies.js → archive/test/dependencies.js
diff --git a/test/helper/mine.js → archive/test/helper/mine.js b/test/helper/mine.js → archive/test/helper/mine.js
diff --git a/test/helper/mine2.js → archive/test/helper/mine2.js b/test/helper/mine2.js → archive/test/helper/mine2.js
diff --git a/test/requestFactory.js → archive/test/requestFactory.js b/test/requestFactory.js → archive/test/requestFactory.js
@@ -7,7 +7,7 @@ describe("Request Factory", () => {
 	let web3
 
 	before(async () => {
-		const deployed = await Deployer()
+		const deployed = await Deployer();
 		web3 = deployed.web3
 		eac = require('../index')(web3)
 	})

diff --git a/test/scheduler.js → archive/test/scheduler.js b/test/scheduler.js → archive/test/scheduler.js
diff --git a/test/txRequest.js → archive/test/txRequest.js b/test/txRequest.js → archive/test/txRequest.js
@@ -5,7 +5,7 @@ const { timetravel } = require('./helper/mine2')
 
 describe("TxRequest", () => {
 	let eac
-	let delpoyed
+	let deployed
 	let web3
 
 	before(async () => {

diff --git a/test/util.js → archive/test/util.js b/test/util.js → archive/test/util.js
diff --git a/deploy.sh b/deploy.sh
diff --git a/ethereum-alarm-clock b/ethereum-alarm-clock
diff --git a/index.js b/index.js
@@ -1,49 +1 @@
-/* eslint global-require: "off", import/no-dynamic-require: "off" */
-
-const Constants = require("./lib/constants")
-const RequestFactory = require("./lib/requestFactory")
-const Scheduler = require("./lib/scheduling")
-const TxRequest = require("./lib/txRequest")
-const Util = require("./lib/util")
-const RequestData = require("./lib/txRequest/requestData")
-const version = require('./package.json').version;
-const contracts = require("./lib/build/ethereum-alarm-clock.json").version;
-
-module.exports = (web3) => {
-  if (!web3) {
-    return {
-      Constants,
-      RequestFactory,
-      Scheduler,
-      TxRequest,
-      Util: Util(),
-      RequestData,
-      version,
-      contracts
-    }
-  }
-
-  const util = Util(web3)
-  return {
-    Constants,
-    requestFactory: async () => {
-      const chainName = await util.getChainName()
-      const contracts = require(`./lib/assets/${chainName}.json`)
-      return new RequestFactory(contracts.requestFactory, web3)
-    },
-    scheduler: async () => {
-      const chainName = await util.getChainName()
-      const contracts = require(`./lib/assets/${chainName}.json`)
-      return new Scheduler(
-        contracts.blockScheduler,
-        contracts.timestampScheduler,
-        web3
-      )
-    },
-    transactionRequest: address => new TxRequest(address, web3),
-    Util: util,
-    RequestData,
-    version,
-    contracts
-  }
-}
+module.exports = require("./build/index.js").default;
diff --git a/lib/build/abi/BaseScheduler.json b/lib/build/abi/BaseScheduler.json
diff --git a/lib/build/abi/BlockScheduler.json b/lib/build/abi/BlockScheduler.json
diff --git a/lib/build/abi/ClaimLib.json b/lib/build/abi/ClaimLib.json
diff --git a/lib/build/abi/CloneFactory.json b/lib/build/abi/CloneFactory.json
diff --git a/lib/build/abi/DelayedPayment.json b/lib/build/abi/DelayedPayment.json
diff --git a/lib/build/abi/ExecutionLib.json b/lib/build/abi/ExecutionLib.json
diff --git a/lib/build/abi/IterTools.json b/lib/build/abi/IterTools.json
diff --git a/lib/build/abi/MathLib.json b/lib/build/abi/MathLib.json
diff --git a/lib/build/abi/Migrations.json b/lib/build/abi/Migrations.json
diff --git a/lib/build/abi/PaymentLib.json b/lib/build/abi/PaymentLib.json
diff --git a/lib/build/abi/Proxy.json b/lib/build/abi/Proxy.json
diff --git a/lib/build/abi/RecurringPayment.json b/lib/build/abi/RecurringPayment.json
diff --git a/lib/build/abi/RequestFactory.json b/lib/build/abi/RequestFactory.json
diff --git a/lib/build/abi/RequestFactoryInterface.json b/lib/build/abi/RequestFactoryInterface.json