Add Gnosis multisig wallet.

telcoin · Nov 9, 2017 · f7fcaaa · f7fcaaa
1 parent 86e2bd5
commit f7fcaaa
Show file tree

Hide file tree

Showing 6 changed files with 498 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "vendor/testrpc"]
 	path = vendor/testrpc
 	url = https://github.com/ethereumjs/testrpc.git
+[submodule "vendor/GnosisMultiSigWallet"]
+	path = vendor/GnosisMultiSigWallet
+	url = https://github.com/gnosis/MultiSigWallet
diff --git a/.solcover.js b/.solcover.js
@@ -1,5 +1,6 @@
 module.exports = {
   skipFiles: [
-    'lib/SafeMath.sol' // Covered by Zeppelin
+    'lib/SafeMath.sol', // Covered by Zeppelin
+    'lib/Wallet.sol' // Covered by Gnosis MultiSigWallet
   ]
 }
diff --git a/.soliumignore b/.soliumignore
@@ -1 +1,2 @@
-node_modules
+contracts/Wallet.sol
+node_modules
diff --git a/Makefile b/Makefile
@@ -1,4 +1,6 @@
-.PHONY: default build lint test coverage
+.PHONY: default build lint test coverage wallet
+
+GNOSIS := vendor/GnosisMultiSigWallet
 
 default: build
 
@@ -13,3 +15,7 @@ test: lint
 
 coverage: lint
 	./node_modules/.bin/solidity-coverage
+
+wallet: $(GNOSIS)/contracts/MultiSigWallet.sol $(GNOSIS)/contracts/MultiSigWalletWithDailyLimit.sol
+	(cat $(GNOSIS)/contracts/MultiSigWallet.sol && \
+		sed '/^$$/,$$!d' $(GNOSIS)/contracts/MultiSigWalletWithDailyLimit.sol) > contracts/Wallet.sol