Merge pull request #217 from tasitlabs/feature/gnosis-safe

Gnosis Safe bootstrap
tasitlabs · Feb 28, 2019 · 46b10e9 · 46b10e9
2 parents af167f6 + b929ebd
commit 46b10e9
Show file tree

Hide file tree

Showing 76 changed files with 2,768 additions and 2,559 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,11 +15,11 @@
     "publish": "npm run clean:all && npm run bootstrap && npm test && npm run clean:3rd-parties && npx lerna publish",
     "bootstrap": "npx lerna bootstrap --hoist",
     "ganache:start:ropsten": "npx ganache-cli --fork https://ropsten.infura.io/latest --blockTime 0.1 -m 'beach swap combine paper music cook electric bullet trust actress liquid asthma' --gasLimit 1000000000000 --host 0.0.0.0 > /dev/null 2>&1 &",
-    "ganache:start": "npx ganache-cli -m 'beach swap combine paper music cook electric bullet trust actress liquid asthma' --gasLimit 1000000000 --host 0.0.0.0 > /dev/null 2>&1 &",
+    "ganache:start": "npx ganache-cli --noVMErrorsOnRPCResponse true -m 'beach swap combine paper music cook electric bullet trust actress liquid asthma' --gasLimit 1000000000 --host 0.0.0.0 > /dev/null 2>&1 &",
     "ganache:stop": "kill `ps ax|grep ganache-cli|grep -v grep| awk '{print $1}'` 2> /dev/null; exit 0",
-    "truffle:migrate": "npx lerna run migrate --scope tasit-contracts",
+    "truffle:migrate": "npx lerna run migrate --scope tasit-contracts --stream",
     "pretest": "npm run ganache:stop && npm run ganache:start && npm run truffle:migrate",
-    "test": "npx lerna run test",
+    "test": "npx lerna run test --stream --concurrency 1",
     "posttest": "npm run ganache:stop"
   },
   "repository": {

diff --git a/packages/tasit-account/package.json b/packages/tasit-account/package.json
@@ -18,7 +18,7 @@
   },
   "scripts": {
     "prepare": "npx babel src --out-dir dist --ignore **/*.test.js",
-    "test": "npm run lint && npx mocha src/*.test.js --require @babel/register",
+    "test": "npm run lint && npx mocha src/*.test.js --require @babel/register --file src/testHelpers/mochaSetup.js",
     "lint": "npx prettier src/* --write"
   },
   "bugs": {
@@ -34,6 +34,6 @@
     "@babel/preset-env": "^7.1.6",
     "@babel/register": "^7.0.0",
     "chai": "^4.2.0",
-    "mocha": "^6.0.1"
+    "mocha": "^6.0.2"
   }
 }
diff --git a/packages/tasit-account/src/TasitAccount.js b/packages/tasit-account/src/TasitAccount.js
@@ -3,6 +3,10 @@ import "ethers/dist/shims.js";
 // shims aren't injected with package import
 import { ethers } from "ethers";
 
+// Account creates an ethres.js Wallet, should it create an Account object that encapsulates the wallet?
+// TasitAcount.create()
+// > Acount { wallet: ..., metaTxInfos..., etc }
+// Related to: https://github.com/tasitlabs/TasitSDK/issues/220
 const create = () => {
   try {
     const wallet = ethers.Wallet.createRandom();

diff --git a/packages/tasit-account/src/ethers.test.js b/packages/tasit-account/src/ethers.test.js
@@ -1,23 +1,18 @@
-import { expect, assert } from "chai";
 import { ethers } from "ethers";
 
-const zero = ethers.utils.bigNumberify(0);
+const { ZERO } = constants;
 
-let wallet, provider;
+let wallet;
 
 // Note: We're intentionally not testing the `fromEncryptedJson` or `encrypt` functions
 // from `ethers.js` because we don't plan to expose that functionality in the Tasit SDK.
 // For a detailed explanation of why, see this GitHub issue:
 // https://github.com/tasitlabs/TasitSDK/issues/24#issuecomment-443576993
 describe("ethers.js", () => {
-  beforeEach("instantiate wallet and provider objects", async function() {
-    provider = new ethers.providers.JsonRpcProvider();
-    provider.pollingInterval = 50;
+  beforeEach("instantiate wallet and provider objects", async () => {
+    [wallet] = accounts;
+    wallet = wallet.connect(provider);
 
-    const privateKey =
-      "0x11d943d7649fbdeb146dc57bd9cfc80b086bfab2330c7b25651dbaf382392f60";
-
-    wallet = new ethers.Wallet(privateKey, provider);
     expect(wallet.address).to.have.lengthOf(42);
     expect(wallet.provider).to.be.not.undefined;
   });
@@ -39,7 +34,7 @@ describe("ethers.js", () => {
     );
 
     expect(fundedWalletBalance).not.to.be.undefined;
-    assert(emptyWalletBalance.eq(zero));
+    expect(`${emptyWalletBalance}`).to.equal(`${ZERO}`);
   });
 
   it("should sign a message", async () => {

diff --git a/packages/tasit-account/src/testHelpers/mochaSetup.js b/packages/tasit-account/src/testHelpers/mochaSetup.js
@@ -0,0 +1,35 @@
+import { ethers } from "ethers";
+
+// Chai
+import { expect, assert } from "chai";
+global.expect = expect;
+//global.assert = assert;
+
+// Helpers
+import actionHelpers from "../../../tasit-action/dist/testHelpers/helpers";
+global = Object.assign(global, actionHelpers);
+
+// Global hooks
+let snapshotId;
+
+beforeEach("global beforeEach() hook", async () => {
+  const provider = new ethers.providers.JsonRpcProvider();
+  provider.pollingInterval = 50;
+  global.provider = provider;
+  snapshotId = await createSnapshot(provider);
+
+  while (snapshotId > 1) {
+    await revertFromSnapshot(provider, snapshotId--);
+  }
+
+  expect(snapshotId).to.equal(1);
+});
+
+afterEach("global afterEach() hook", async () => {
+  expect(snapshotId).to.equal(1);
+  await revertFromSnapshot(provider, snapshotId);
+
+  // Note: Without this the test suite is breaking.
+  // It is still unclear why
+  await mineBlocks(provider, 1);
+});
diff --git a/packages/tasit-action/package.json b/packages/tasit-action/package.json
@@ -18,7 +18,7 @@
   },
   "scripts": {
     "prepare": "rm -rf dist/* && npx babel src --out-dir dist --ignore src/*.test.js,src/**/*.test.js",
-    "test": "npm run lint && npx mocha \"src/**/*.test.js\" --recursive --require @babel/register --require src/testHelpers/mochaSetup.js --no-timeouts",
+    "test": "npm run lint && npx mocha \"src/**/*.test.js\" --recursive --require @babel/register --file src/testHelpers/mochaSetup.js",
     "lint": "npx prettier src/* --write"
   },
   "bugs": {
@@ -34,11 +34,9 @@
     "@babel/plugin-proposal-class-properties": "^7.2.3",
     "@babel/preset-env": "^7.1.6",
     "@babel/register": "^7.0.0",
-    "bn.js": "^4.11.8",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
-    "chai-bn": "^0.1.1",
-    "mocha": "^6.0.1",
+    "mocha": "^6.0.2",
     "sinon": "^7.2.2",
     "tasit-account": "^0.0.9"
   }

diff --git a/packages/tasit-action/src/TasitAction.js b/packages/tasit-action/src/TasitAction.js
@@ -1,15 +1,16 @@
 import ConfigLoader from "./ConfigLoader";
 import Contract from "./contract/Contract";
-import NFT from "./erc721/NFT";
+import ERC721Full from "./erc721/ERC721Full";
 import Land from "./erc721/Land";
 import Decentraland from "./marketplace/Decentraland";
 import Estate from "./erc721/Estate";
 import Mana from "./erc20/Mana";
+import ERC20Full from "./erc20/ERC20Full";
 
-export { Contract, NFT, Land, Decentraland, Estate, Mana };
+export { Contract, ERC721Full, Land, Decentraland, Estate, Mana };
 
-export const ERC20 = { Mana };
-export const ERC721 = { Land, Estate, NFT };
+export const ERC20 = { Mana, ERC20Full };
+export const ERC721 = { Land, Estate, ERC721Full };
 export const Marketplace = { Decentraland };
 
 export const TasitAction = {

diff --git a/packages/tasit-action/src/contract/Contract.js b/packages/tasit-action/src/contract/Contract.js
@@ -64,6 +64,10 @@ export class Contract extends Subscription {
     return this.#ethersContract.address;
   };
 
+  getABI = () => {
+    return this.#ethersContract.interface.abi;
+  };
+
   // For testing purposes
   _getProvider = () => {
     return this.#provider;

diff --git a/packages/tasit-action/src/contract/Contract.test.js b/packages/tasit-action/src/contract/Contract.test.js
@@ -1,8 +1,6 @@
 import Contract from "./Contract";
 import Account from "tasit-account";
 
-// Note: SampleContract.json is originally generated by `tasit-contracts` and was pasted here manually
-// See https://github.com/tasitlabs/TasitSDK/issues/45
 import { abi as contractABI } from "../../../tasit-contracts/build/contracts/SampleContract.json";
 
 // Note: Under the current `tasit-contracts` setup SampleContract aways will deployed with this address
@@ -12,8 +10,6 @@ const sampleContractAddress = "0x6C4A015797DDDd87866451914eCe1e8b19261931";
 describe("TasitAction.Contract", () => {
   let sampleContract;
   let wallet;
-  let testcaseSnaphotId;
-  let provider;
   let action;
 
   beforeEach("should connect to an existing contract", async () => {
@@ -23,31 +19,20 @@ describe("TasitAction.Contract", () => {
 
     sampleContract = undefined;
     wallet = undefined;
-    testcaseSnaphotId = undefined;
-    provider = undefined;
     action = undefined;
 
-    // Account creates a wallet, should it create an account object that encapsulates the wallet?
-    // TasitAcount.create()
-    // > Acount { wallet: ..., metaTxInfos..., etc }
-    wallet = createFromPrivateKey(
-      "0x11d943d7649fbdeb146dc57bd9cfc80b086bfab2330c7b25651dbaf382392f60"
-    );
+    [wallet] = accounts;
 
     sampleContract = new Contract(sampleContractAddress, contractABI);
     expect(sampleContract).to.exist;
     expect(sampleContract.getAddress()).to.equal(sampleContractAddress);
     expect(sampleContract.getValue).to.exist;
     expect(sampleContract.setValue).to.exist;
     expect(sampleContract._getProvider()).to.exist;
-
-    provider = sampleContract._getProvider();
-    testcaseSnaphotId = await createSnapshot(provider);
+    expect(sampleContract.getABI()).to.deep.equal(contractABI);
   });
 
   afterEach("revert blockchain snapshot", async () => {
-    await mineBlocks(provider, 1);
-
     if (sampleContract) {
       sampleContract.unsubscribe();
 
@@ -66,8 +51,6 @@ describe("TasitAction.Contract", () => {
         "ethers.js should not be listening to any events."
       ).to.be.empty;
     }
-
-    await revertFromSnapshot(provider, testcaseSnaphotId);
   });
 
   describe("should throw error when instantiated with invalid args", () => {

diff --git a/packages/tasit-action/src/erc20/ERC20Full.js b/packages/tasit-action/src/erc20/ERC20Full.js
@@ -0,0 +1,8 @@
+import Contract from "../contract/Contract";
+import abi from "../../../tasit-contracts/abi/MyERC20Full.json";
+
+export default class ERC20Full extends Contract {
+  constructor(address, wallet) {
+    super(address, abi, wallet);
+  }
+}
diff --git a/packages/tasit-action/src/erc20/ERC20Full.test.js b/packages/tasit-action/src/erc20/ERC20Full.test.js
@@ -0,0 +1,13 @@
+import ERC20Full from "./ERC20Full";
+
+// Note: Under the current `tasit-contracts` setup ERC20Detailed aways will deployed with this address
+// See https://github.com/tasitlabs/TasitSDK/issues/138
+const ERC20_FULL_ADDRESS = "0x37E1A58dD465D33263D00185D065Ee36DD34CDb4";
+
+describe("TasitAction.ERC20.ERC20Full", () => {
+  it("should get the ERC20Full name", async () => {
+    const erc20 = new ERC20Full(ERC20_FULL_ADDRESS);
+    const name = await erc20.name();
+    expect(name).to.equal("ERC20Full");
+  });
+});
diff --git a/packages/tasit-action/src/erc20/Mana.test.js b/packages/tasit-action/src/erc20/Mana.test.js
@@ -1,10 +1,10 @@
 import Mana from "./Mana";
 
-import { local as localAddresses } from "../../../tasit-contracts/decentraland/addresses";
+import { local as localAddresses } from "../../../tasit-contracts/3rd-parties/decentraland/addresses";
 const { MANAToken: MANA_ADDRESS } = localAddresses;
 
 describe("TasitAction.Decentraland.Mana", () => {
-  it("should get the MANAToken name", async function() {
+  it("should get the MANAToken name", async () => {
     const mana = new Mana(MANA_ADDRESS);
     const name = await mana.name();
     expect(name).to.equal("Decentraland MANA");

diff --git a/packages/tasit-action/src/erc721/ERC721Full.js b/packages/tasit-action/src/erc721/ERC721Full.js
@@ -0,0 +1,8 @@
+import Contract from "../contract/Contract";
+import abi from "../../../tasit-contracts/abi/MyERC721Full.json";
+
+export default class ERC721Full extends Contract {
+  constructor(address, wallet) {
+    super(address, abi, wallet);
+  }
+}