Gnosis Safe bootstrap

package.json

@@ -15,7 +15,7 @@
     "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",
     "pretest": "npm run ganache:stop && npm run ganache:start && npm run truffle:migrate",

packages/tasit-action/src/TasitAction.js

@@ -5,10 +5,11 @@ import Land from "./erc721/Land";
 import Decentraland from "./marketplace/Decentraland";
 import Estate from "./erc721/Estate";
 import Mana from "./erc20/Mana";
+import DetailedERC20 from "./erc20/DetailedERC20";
 
 export { Contract, NFT, Land, Decentraland, Estate, Mana };
 
-export const ERC20 = { Mana };
+export const ERC20 = { Mana, DetailedERC20 };
 export const ERC721 = { Land, Estate, NFT };
 export const Marketplace = { Decentraland };
 

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;

packages/tasit-action/src/contract/Contract.test.js

@@ -40,6 +40,7 @@ describe("TasitAction.Contract", () => {
     expect(sampleContract.getValue).to.exist;
     expect(sampleContract.setValue).to.exist;
     expect(sampleContract._getProvider()).to.exist;
+    expect(sampleContract.getABI()).to.deep.equal(contractABI);
 
     provider = sampleContract._getProvider();
     testcaseSnaphotId = await createSnapshot(provider);

packages/tasit-action/src/erc20/DetailedERC20.js

@@ -0,0 +1,9 @@
+import Contract from "../contract/Contract";
+import detailedERC20ABI from "../../../tasit-contracts/abi/DetailedERC20.json";
+
+export default class DetailedERC20 extends Contract {
+  constructor(address, wallet) {
+    const abi = detailedERC20ABI;
+    super(address, abi, wallet);
+  }
+}

packages/tasit-action/src/erc20/DetailedERC20.test.js

@@ -0,0 +1,13 @@
+import DetailedERC20 from "./DetailedERC20";
+
+// Note: Under the current `tasit-contracts` setup DetailedERC20 aways will deployed with this address
+// See https://github.com/tasitlabs/TasitSDK/issues/138
+const DETAILED_ERC20_ADDRESS = "0x37E1A58dD465D33263D00185D065Ee36DD34CDb4";
+
+describe("TasitAction.ERC20.DetailedERC20", () => {
+  it("should get the DetailedERC20 name", async function() {
+    const erc20 = new DetailedERC20(DETAILED_ERC20_ADDRESS);
+    const name = await erc20.name();
+    expect(name).to.equal("Detailed ERC20 Token");
+  });
+});

packages/tasit-action/src/erc20/Mana.test.js

@@ -1,6 +1,6 @@
 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", () => {

packages/tasit-action/src/erc721/Estate.test.js

@@ -1,6 +1,6 @@
 import Estate from "./Estate";
 
-import { local as localAddresses } from "../../../tasit-contracts/decentraland/addresses";
+import { local as localAddresses } from "../../../tasit-contracts/3rd-parties/decentraland/addresses";
 const { EstateRegistry: ESTATE_ADDRESS } = localAddresses;
 
 describe("TasitAction.ERC721.Estate", () => {

packages/tasit-action/src/erc721/Land.test.js

@@ -1,6 +1,6 @@
 import Land from "./Land";
 
-import { local as localAddresses } from "../../../tasit-contracts/decentraland/addresses";
+import { local as localAddresses } from "../../../tasit-contracts/3rd-parties/decentraland/addresses";
 const { LANDProxy: LAND_PROXY_ADDRESS } = localAddresses;
 
 describe("TasitAction.ERC721.Land", () => {

packages/tasit-action/src/marketplace/Decentraland.test.js

@@ -1,6 +1,6 @@
 import Decentraland from "./Decentraland";
 
-import { local as localAddresses } from "../../../tasit-contracts/decentraland/addresses";
+import { local as localAddresses } from "../../../tasit-contracts/3rd-parties/decentraland/addresses";
 const { Marketplace: MARKETPLACE_ADDRESS } = localAddresses;
 
 describe("TasitAction.Marketplace.Decentraland", () => {

packages/tasit-contracts/3rd-parties/decentraland/addresses.js

@@ -0,0 +1,13 @@
+const decentralandAddresses = require("./contracts/addresses.json");
+
+const { ropsten } = decentralandAddresses;
+
+const local = {
+  MANAToken: "0x332bfb4d705d3ce37c4bf06141c7104984e91e79",
+  EstateRegistry: "0x6191bc768c2339da9eab9e589fc8bf0b3ab80975",
+  LANDRegistry: "0x773f11ed472aa43e4ebaa963bcfbbea5a10c1bbd",
+  LANDProxy: "0x1212f783f11611b0c029d5e6f86a23be621669e0",
+  Marketplace: "0x70960e803a2bbe90c7db34edfdc2d1e81ed46b79",
+};
+
+module.exports = { ropsten, local };

packages/tasit-contracts/decentraland/scripts/clean.sh → packages/tasit-contracts/3rd-parties/decentraland/scripts/clean.sh

@@ -8,7 +8,7 @@ then
 fi
 
 
-DECENTRALAND_DIR="$PROJECT_DIR/decentraland";
+DECENTRALAND_DIR="$PROJECT_DIR/3rd-parties/decentraland";
 REPOS="mana land marketplace-contracts"
 
 for repo in $REPOS;

packages/tasit-contracts/decentraland/scripts/install.sh → packages/tasit-contracts/3rd-parties/decentraland/scripts/install.sh

@@ -7,7 +7,7 @@ then
     exit;
 fi
 
-DECENTRALAND_DIR="$PROJECT_DIR/decentraland";
+DECENTRALAND_DIR="$PROJECT_DIR/3rd-parties/decentraland";
 
 # Use list of repository_name:commit_hash:is_npm
 REPOS="\

packages/tasit-contracts/decentraland/scripts/migrate.sh → packages/tasit-contracts/3rd-parties/decentraland/scripts/migrate.sh

@@ -6,7 +6,7 @@ then
     exit;
 fi
 
-DECENTRALAND_DIR="$PROJECT_DIR/decentraland"
+DECENTRALAND_DIR="$PROJECT_DIR/3rd-parties/decentraland"
 
 # mana
 cp $DECENTRALAND_DIR/scripts/3_mana_migrations.js $DECENTRALAND_DIR/mana/migrations

packages/tasit-contracts/3rd-parties/gnosis/addresses.js

@@ -0,0 +1,5 @@
+const local = {
+  GnosisSafe: "0x9a4a2e7ed3ee6d481624f5392d8c6169c62065b7",
+};
+
+module.exports = { local };

packages/tasit-contracts/3rd-parties/gnosis/scripts/2_deploy_contracts.js

@@ -0,0 +1,37 @@
+var ProxyFactory = artifacts.require("./ProxyFactory.sol");
+var GnosisSafe = artifacts.require("./GnosisSafe.sol");
+var StateChannelModule = artifacts.require("./StateChannelModule.sol");
+var DailyLimitModule = artifacts.require("./DailyLimitModule.sol");
+var SocialRecoveryModule = artifacts.require("./SocialRecoveryModule.sol");
+var WhitelistModule = artifacts.require("./WhitelistModule.sol");
+var CreateAndAddModules = artifacts.require("./CreateAndAddModules.sol");
+var MultiSend = artifacts.require("./MultiSend.sol");
+
+const anaAddress = "0xd68649157A061454e2c63c175236b07e98Bd9512";
+const bobAddress = "0x8a5D5298dcceA526754064b8094e663162E1dBEa";
+
+module.exports = function(deployer) {
+  deployer.deploy(ProxyFactory);
+  deployer.deploy(GnosisSafe).then(function(safe) {
+    safe.setup([anaAddress], 1, 0, 0);
+    return safe;
+  });
+  deployer.deploy(StateChannelModule).then(function(module) {
+    module.setup();
+    return module;
+  });
+  deployer.deploy(DailyLimitModule).then(function(module) {
+    module.setup([], []);
+    return module;
+  });
+  deployer.deploy(SocialRecoveryModule).then(function(module) {
+    module.setup([anaAddress, bobAddress], 2);
+    return module;
+  });
+  deployer.deploy(WhitelistModule).then(function(module) {
+    module.setup([]);
+    return module;
+  });
+  deployer.deploy(CreateAndAddModules);
+  deployer.deploy(MultiSend);
+};

packages/tasit-contracts/3rd-parties/gnosis/scripts/clean.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+PROJECT_DIR=$1;
+
+if [ -z "$PROJECT_DIR" ];
+then
+    echo "Error! Use: ./$0 <tasit-contract-dir>";
+    exit;
+fi
+
+
+GNOSIS_DIR="$PROJECT_DIR/3rd-parties/gnosis";
+REPOS="safe-contracts"
+
+for repo in $REPOS;
+do
+    REPO_DIR="$GNOSIS_DIR/$repo";
+    cd $REPO_DIR && git reset --hard && git clean -f
+done

packages/tasit-contracts/3rd-parties/gnosis/scripts/install.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+PROJECT_DIR=$1;
+
+if [ -z "$PROJECT_DIR" ];
+then
+    echo "Error! Use: ./$0 <tasit-contract-dir>";
+    exit;
+fi
+
+GNOSIS_DIR="$PROJECT_DIR/3rd-parties/gnosis";
+
+# Use list of repository_name:commit_hash:is_npm
+REPOS="safe-contracts:427d6f7e779431333c54bcb4d4cde31e4d57ce96:true";
+
+for clone in $REPOS;
+do
+    REPO=`echo $clone | awk -F ':' '{print $1}'`;
+    COMMIT=`echo $clone | awk -F ':' '{print $2}'`;
+    IS_NPM=`echo $clone | awk -F ':' '{print $3}'`;
+
+    REPO_DIR="$GNOSIS_DIR/$REPO";
+
+    if [ ! -e "$REPO_DIR/package.json" ];
+    then
+        rm -rf $REPO_DIR;
+        git clone https://github.com/gnosis/$REPO.git $REPO_DIR;
+        cd $REPO_DIR && git fetch origin $COMMIT && git reset --hard FETCH_HEAD;
+    fi
+
+    if [ $IS_NPM ];
+    then
+        npm i --prefix $REPO_DIR;
+    fi
+
+done