Update c-org-abi to 1.2.0 (#165)

HardlyDifficult · Oct 18, 2019 · e555978 · e555978
1 parent e016214
commit e555978
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hardlydifficult-ethereum-contracts",
-  "version": "0.5.6",
+  "version": "0.6.0",
   "description": "A collection of reusable contracts and Javascript helpers for Ethereum.",
   "scripts": {
     "build": "npm run compile",
@@ -34,12 +34,12 @@
   },
   "homepage": "https://github.com/HardlyDifficult/hardlydifficult-test-helpers#readme",
   "dependencies": {
+    "@fairmint/c-org-abi": "1.2.0",
     "@openzeppelin/contracts": "2.3.0",
     "@truffle/contract": "4.0.36",
-    "@fairmint/c-org-abi": "1.2.0",
     "bignumber.js": "9.0.0",
     "erc1820": "0.0.2",
-    "truffle": "5.0.40",
+    "truffle": "5.0.41",
     "truffle-assertions": "0.9.1",
     "unlock-abi-1-1": "1.0.0",
     "web3-utils": "1.2.1"

diff --git a/samples/truffle/test/protocols/c-org.js b/samples/truffle/test/protocols/c-org.js
@@ -15,9 +15,9 @@ contract("protocols / c-org", accounts => {
       buySlopeNum: "1",
       buySlopeDen: "100000000000000000000",
       investmentReserveBasisPoints: "1000",
-      revenueCommitementBasisPoints: "1000",
+      revenueCommitmentBasisPoints: "1000",
       feeBasisPoints: "0",
-      burnThresholdBasisPoints: "0",
+      burnThresholdBasisPoints: false,
       minInvestment: "1",
       openUntilAtLeast: "0",
       name: "FAIR token",

diff --git a/src/protocols/c-org.js b/src/protocols/c-org.js
@@ -1,7 +1,7 @@
+const cOrgAbi = require("@fairmint/c-org-abi/abi.json");
+const cOrgBytecode = require("@fairmint/c-org-abi/bytecode.json");
+const cOrgStaticBytecode = require("@fairmint/c-org-abi/static_bytecode.json");
 const { truffleContract } = require("../helpers");
-const cOrgAbi = require("c-org-abi/abi.json");
-const cOrgBytecode = require("c-org-abi/bytecode.json");
-const cOrgStaticBytecode = require("c-org-abi/static_bytecode.json");
 const constants = require("../constants");
 
 async function getDat(web3, datAddress) {
@@ -32,9 +32,9 @@ module.exports = {
         buySlopeNum: "1",
         buySlopeDen: "100000000000000000000",
         investmentReserveBasisPoints: "1000",
-        revenueCommitementBasisPoints: "1000",
+        revenueCommitmentBasisPoints: "1000",
         feeBasisPoints: "0",
-        burnThresholdBasisPoints: "0",
+        burnThresholdBasisPoints: false,
         minInvestment: "1",
         openUntilAtLeast: "0",
         name: "FAIR token",
@@ -88,7 +88,6 @@ module.exports = {
       callOptions.buySlopeNum,
       callOptions.buySlopeDen,
       callOptions.investmentReserveBasisPoints,
-      callOptions.revenueCommitementBasisPoints,
       { from: callOptions.control }
     );
 
@@ -130,7 +129,8 @@ module.exports = {
       callOptions.control,
       callOptions.feeCollector,
       callOptions.feeBasisPoints,
-      callOptions.burnThresholdBasisPoints,
+      callOptions.autoBurn,
+      callOptions.revenueCommitmentBasisPoints,
       callOptions.minInvestment,
       callOptions.openUntilAtLeast,
       callOptions.name,

diff --git a/test/protocols/c-org.js b/test/protocols/c-org.js
@@ -15,9 +15,9 @@ contract("protocols / c-org", accounts => {
       buySlopeNum: "1",
       buySlopeDen: "100000000000000000000",
       investmentReserveBasisPoints: "1000",
-      revenueCommitementBasisPoints: "1000",
+      revenueCommitmentBasisPoints: "1000",
       feeBasisPoints: "0",
-      burnThresholdBasisPoints: "0",
+      burnThresholdBasisPoints: false,
       minInvestment: "1",
       openUntilAtLeast: "0",
       name: "FAIR token",