extract ham.js

its-ham · Aug 13, 2020 · 7a814d2 · 7a814d2
1 parent 668ece9
commit 7a814d2
Show file tree

Hide file tree

Showing 27 changed files with 9,566 additions and 20 deletions.
diff --git a/ham.js/babel.config.js b/ham.js/babel.config.js
@@ -0,0 +1,17 @@
+const presets = [
+  [
+    "@babel/env",
+    {
+      targets: {
+        edge: "17",
+        firefox: "60",
+        chrome: "67",
+        safari: "11.1",
+        node: "10.16.0"
+      },
+      useBuiltIns: "usage",
+    },
+  ],
+];
+
+module.exports = { presets };
diff --git a/ham.js/package-lock.json b/ham.js/package-lock.json
diff --git a/ham.js/package.json b/ham.js/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "ham.js",
+  "version": "0.0.1",
+  "description": "ham JS lib",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "dependencies": {
+    "ethers": "^5.0.8"
+  },
+  "devDependencies": {
+    "@babel/preset-env": "^7.11.0",
+    "@truffle/hdwallet-provider": "^1.0.40",
+    "core-js": "^2.6.5",
+    "ethereumjs-abi": "^0.6.8",
+    "ethereumjs-util": "^7.0.4",
+    "jest": "^26.3.0"
+  }
+}
diff --git a/ham-www/src/ham/Yam.js → ham.js/src/Ham.js b/ham-www/src/ham/Yam.js → ham.js/src/Ham.js
diff --git a/ham-www/src/ham/index.js → ham.js/src/index.js b/ham-www/src/ham/index.js → ham.js/src/index.js
diff --git a/ham-www/src/ham/lib/BytesHelper.js → ham.js/src/lib/BytesHelper.js b/ham-www/src/ham/lib/BytesHelper.js → ham.js/src/lib/BytesHelper.js
diff --git a/ham-www/src/ham/lib/Expect.js → ham.js/src/lib/Expect.js b/ham-www/src/ham/lib/Expect.js → ham.js/src/lib/Expect.js
diff --git a/ham-www/src/ham/lib/Helpers.js → ham.js/src/lib/Helpers.js b/ham-www/src/ham/lib/Helpers.js → ham.js/src/lib/Helpers.js
diff --git a/ham-www/src/ham/lib/accounts.js → ham.js/src/lib/accounts.js b/ham-www/src/ham/lib/accounts.js → ham.js/src/lib/accounts.js
diff --git a/ham-www/src/ham/lib/constants.js → ham.js/src/lib/constants.js b/ham-www/src/ham/lib/constants.js → ham.js/src/lib/constants.js
diff --git a/ham-www/src/ham/lib/contracts.js → ham.js/src/lib/contracts.js b/ham-www/src/ham/lib/contracts.js → ham.js/src/lib/contracts.js
@@ -3,29 +3,29 @@ import Web3 from 'web3';
 import * as Types from "./types.js";
 import { SUBTRACT_GAS_LIMIT, addressMap } from './constants.js';
 
-import ERC20Json from '../clean_build/contracts/IERC20.json';
-import HAMJson from '../clean_build/contracts/HAMDelegator.json';
-import HAMRebaserJson from '../clean_build/contracts/HAMRebaser.json';
-import HAMReservesJson from '../clean_build/contracts/HAMReserves.json';
-import HAMGovJson from '../clean_build/contracts/GovernorAlpha.json';
-import HAMTimelockJson from '../clean_build/contracts/Timelock.json';
+import ERC20Json from '../../../build/contracts/IERC20.json';
+import HAMJson from '../../../build/contracts/HAMDelegator.json';
+import HAMRebaserJson from '../../../build/contracts/HAMRebaser.json';
+import HAMReservesJson from '../../../build/contracts/HAMReserves.json';
+import HAMGovJson from '../../../build/contracts/GovernorAlpha.json';
+import HAMTimelockJson from '../../../build/contracts/Timelock.json';
 import WETHJson from './weth.json';
 import SNXJson from './snx.json';
 import UNIFactJson from './unifact2.json';
 import UNIPairJson from './uni2.json';
 import UNIRouterJson from './uniR.json';
 
-import WETHPoolJson from '../clean_build/contracts/HAMETHPool.json';
-import AMPLPoolJson from '../clean_build/contracts/HAMAMPLPool.json';
-import YFIPoolJson from '../clean_build/contracts/HAMYFIPool.json';
+import WETHPoolJson from '../../../build/contracts/HAMETHPool.json';
+import AMPLPoolJson from '../../../build/contracts/HAMAMPLPool.json';
+import YFIPoolJson from '../../../build/contracts/HAMYFIPool.json';
 
-import MKRPoolJson from '../clean_build/contracts/HAMMKRPool.json';
-import LENDPoolJson from '../clean_build/contracts/HAMLENDPool.json';
-import COMPPoolJson from '../clean_build/contracts/HAMCOMPPool.json';
-import SNXPoolJson from '../clean_build/contracts/HAMSNXPool.json';
-import LINKPoolJson from '../clean_build/contracts/HAMLINKPool.json';
+import MKRPoolJson from '../../../build/contracts/HAMMKRPool.json';
+import LENDPoolJson from '../../../build/contracts/HAMLENDPool.json';
+import COMPPoolJson from '../../../build/contracts/HAMCOMPPool.json';
+import SNXPoolJson from '../../../build/contracts/HAMSNXPool.json';
+import LINKPoolJson from '../../../build/contracts/HAMLINKPool.json';
 
-import IncJson from '../clean_build/contracts/HAMIncentivizer.json';
+import IncJson from '../../../build/contracts/HAMIncentivizer.json';
 
 export class Contracts {
   constructor(

diff --git a/ham-www/src/ham/lib/evm.js → ham.js/src/lib/evm.js b/ham-www/src/ham/lib/evm.js → ham.js/src/lib/evm.js
diff --git a/ham-www/src/ham/lib/snx.json → ham.js/src/lib/snx.json b/ham-www/src/ham/lib/snx.json → ham.js/src/lib/snx.json
diff --git a/ham-www/src/ham/lib/types.js → ham.js/src/lib/types.js b/ham-www/src/ham/lib/types.js → ham.js/src/lib/types.js
diff --git a/ham-www/src/ham/lib/uni.json → ham.js/src/lib/uni.json b/ham-www/src/ham/lib/uni.json → ham.js/src/lib/uni.json
diff --git a/ham-www/src/ham/lib/uni2.json → ham.js/src/lib/uni2.json b/ham-www/src/ham/lib/uni2.json → ham.js/src/lib/uni2.json
diff --git a/ham-www/src/ham/lib/uniR.json → ham.js/src/lib/uniR.json b/ham-www/src/ham/lib/uniR.json → ham.js/src/lib/uniR.json
diff --git a/ham-www/src/ham/lib/unifact2.json → ham.js/src/lib/unifact2.json b/ham-www/src/ham/lib/unifact2.json → ham.js/src/lib/unifact2.json
diff --git a/ham-www/src/ham/lib/weth.json → ham.js/src/lib/weth.json b/ham-www/src/ham/lib/weth.json → ham.js/src/lib/weth.json
diff --git a/ham-www/src/ham/lib/ycrv.json → ham.js/src/lib/ycrv.json b/ham-www/src/ham/lib/ycrv.json → ham.js/src/lib/ycrv.json
diff --git a/ham-www/src/ham/tests/EIP712.js → ham.js/src/tests/EIP712.js b/ham-www/src/ham/tests/EIP712.js → ham.js/src/tests/EIP712.js
diff --git a/ham-www/src/ham/tests/deployment.test.js → ham.js/src/tests/deployment.test.js b/ham-www/src/ham/tests/deployment.test.js → ham.js/src/tests/deployment.test.js
diff --git a/ham-www/src/ham/tests/distribution.test.js → ham.js/src/tests/distribution.test.js b/ham-www/src/ham/tests/distribution.test.js → ham.js/src/tests/distribution.test.js
diff --git a/ham-www/src/ham/tests/governance.test.js → ham.js/src/tests/governance.test.js b/ham-www/src/ham/tests/governance.test.js → ham.js/src/tests/governance.test.js
diff --git a/ham-www/src/ham/tests/governorAlpha.test.js → ham.js/src/tests/governorAlpha.test.js b/ham-www/src/ham/tests/governorAlpha.test.js → ham.js/src/tests/governorAlpha.test.js
@@ -12,11 +12,6 @@ import {
 
 const ethUtil = require('ethereumjs-util');
 
-async function enfranchise(actor, amount, user) {
-  await ham.contracts.ham.methods.transfer(actor, amount.toString()).send({from: user});
-  await ham.contracts.ham.methods.delegate(actor).send({from: actor});
-}
-
 export const ham = new Ham(
   "http://localhost:8545/",
   // "http://127.0.0.1:9545/",
@@ -32,6 +27,12 @@ export const ham = new Ham(
     ethereumNodeTimeout: 10000
   }
 )
+
+async function enfranchise(actor, amount, user) {
+  await ham.contracts.ham.methods.transfer(actor, amount.toString()).send({from: user});
+  await ham.contracts.ham.methods.delegate(actor).send({from: actor});
+}
+
 const oneEther = 10 ** 18;
 
 const EIP712 = require('./EIP712');

diff --git a/ham-www/src/ham/tests/rebase.test.js → ham.js/src/tests/rebase.test.js b/ham-www/src/ham/tests/rebase.test.js → ham.js/src/tests/rebase.test.js
diff --git a/ham-www/src/ham/tests/token.test.js → ham.js/src/tests/token.test.js b/ham-www/src/ham/tests/token.test.js → ham.js/src/tests/token.test.js