ΔOS v0.8-alpha.6 (#118)

* update-version: Deosfile * add-pubkey: desantis/atd * update-meta: makefile * add: src/pypreprocessor * add: blockstack-cli * blockstack-load: wallet * update-blockstack: wallet * create: var/privkey * refactor: blockstack-cli * add: webpy tools * update: webpy docs * refactor: blockstack_registrar * add: pypreprocessor docs * add: pybitcoin * add: virtualchain * add-blockstack: keylib * refactor: blockstack * update-meta: makefile * update-meta: blockstack * update-meta: makefile * update-meta: makefile * add-feat: blocstack whois * update: src/blockstack * init-app: vault,wallet * add-app-vault: src * init-vault: build,config,main.py,templates * update-app: value/Makefile * update-meta: wiki/.gitignore * add: trezor * add-vault: templates * update-app: vault * update-app: vault * update-app-item: partial templates * add-vault: partials * fix: spacing * app-vault: cleanup main.py * app-vault: fix main.py env * update-app-vault: main.py * app-vault: update-main.py
1deos · Dec 28, 2016 · a644a98 · a644a98
1 parent 2a0b668
commit a644a98
Show file tree

Hide file tree

Showing 360 changed files with 64,055 additions and 2 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -15,11 +15,15 @@ indent_style=tab
 indent_style=space
 indent_size=2
 
+[*.xml]
+indent_style=space
+indent_size=2
+
 [*.{lz,sh}]
 indent_style=space
 indent_size=2
 
-[*.{css,html,hcl,json,js,jsx,pug,yml}]
+[*.{css,ui,html,hcl,json,js,jsx,pug,yml}]
 indent_style=space
 indent_size=2
 

diff --git a/.gitignore b/.gitignore
@@ -5,13 +5,16 @@
 #[dotfolders]
 .cache/
 .deos/
+.venv/
 
 #[folders]
 etc/blockstack/*
 etc/zerotier/*
 node_modules/
 var/backup/*
 var/log/deos/*
+var/privkey/*
+tests/blockstack/integration/*
 
 #[dotfiles]
 .DS_Store
@@ -27,3 +30,5 @@ yarn-error.log
 !etc/zerotier/.gitprivate
 !var/backup/.gitprivate
 !var/log/deos/.gitprivate
+!var/privkey/.gitprivate
+
diff --git a/Deosfile b/Deosfile
@@ -1,5 +1,5 @@
 author=atd@gmx.it
-version=v0.8-alpha.4
+version=v0.8-alpha.6
 
 [.deosrc]
 meta=meta/Δ:.deosrc.md

diff --git a/Makefile b/Makefile
@@ -118,18 +118,141 @@ ifeq ($(HOSTOS),$(ISMAC))
 	@ ($(PRINTM) yellow $@ start)
 	@ (sh bootstrap.sh)
 	@ (python src/hello.py)
+	$(MAKE) blockstack.clone
+	$(MAKE) blockstack.venv
 	@ ($(MAKE) cache)
 	@ ($(MAKE) wiki)
 	@ ($(MAKE) webpy)
 	@ ($(MAKE) terminal)
 	@ ($(MAKE) bips)
+	@ ($(MAKE) pycpp)
 	@-($(MAKE) wikiup)
 	@ ($(PRINTM) yellow $@ stop)
 	@ ($(LOGGER) "INFO" "$(HOSTOS) : make : $@ : 1")
 else
 	@ (echo "'make $@' isn't yet supported on $(HOSTOS).")
 endif
 
+trezor: trezor.clone
+
+trezor.clone:
+ifeq ($(HOSTOS),$(ISMAC))
+	-rm -rf src/trezor
+	cd src && git clone git@github.com:trezor/python-trezor.git trezor
+	rm -rf src/trezor/.git
+	-rm -rf tests/trezor
+	mv src/trezor/tests tests/trezor
+	-rm -rf tools/trezor
+	mv src/trezor/tools tools/trezor
+	-rm -rf docs/trezor
+	mkdir docs/trezor
+	mv src/trezor/COPYING docs/trezor/COPYING
+	mv src/trezor/README.rst docs/trezor/README.rst
+	mv src/trezor/MANIFEST.in docs/trezor/MANIFEST.in
+endif
+
+blockstack:
+	source $(BASEDIR)/.deos/venv/darwin/blockstack/bin/activate && python $(BASEDIR)/src/blockstack.py whois atom.id
+	source $(BASEDIR)/.deos/venv/darwin/blockstack/bin/activate && python $(BASEDIR)/src/blockstack.py wallet test
+
+blockstack.clone:
+ifeq ($(HOSTOS),$(ISMAC))
+	-cd src/blockstack && rm -rf blockstack
+	cd src/blockstack && git clone git@github.com:blockstack/blockstack-cli.git blockstack
+	cd src/blockstack/blockstack && rm -rf .git
+	-cd docs/blockstack && rm -rf blockstack_client
+	mv src/blockstack/blockstack/docs docs/blockstack/blockstack_client
+	mv src/blockstack/blockstack/README.md docs/blockstack/blockstack_client/README.md
+	mv src/blockstack/blockstack/LICENSE docs/blockstack/blockstack_client/LICENSE
+	-cd docs/blockstack && rm -rf blockstack_registrar
+	mv src/blockstack/blockstack/blockstack_registrar/doc docs/blockstack/blockstack_registrar
+	mv src/blockstack/blockstack/blockstack_registrar/README.md docs/blockstack/blockstack_registrar/README.md
+	mv src/blockstack/blockstack/blockstack_registrar/LICENSE docs/blockstack/blockstack_registrar/LICENSE
+	-cd tools/blockstack && rm -rf blockstack_client
+	mv src/blockstack/blockstack/tools tools/blockstack/blockstack_client
+	-cd tools/blockstack && rm -rf blockstack_registrar
+	mv src/blockstack/blockstack/blockstack_registrar/tools tools/blockstack/blockstack_registrar
+	-cd tests/blockstack && rm -rf blockstack_client
+	cd tests/blockstack && mkdir blockstack_client
+	mv src/blockstack/blockstack/unit_tests.py tests/blockstack/blockstack_client/unit_tests.py
+	-cd tests/blockstack && rm -rf blockstack_registrar
+	mv src/blockstack/blockstack/blockstack_registrar/tests tests/blockstack/blockstack_registrar
+
+	-rm -rf tests/blockstack/integration
+	#cd tests/blockstack && git clone git@github.com:blockstack/blockstack-integration-tests.git integration
+	#rm -rf tests/blockstack/integration/.git
+
+	-rm -rf src/blockstack/keychain
+	cd src/blockstack && git clone git@github.com:blockstack/keychain-manager-py.git keychain
+	rm -rf src/blockstack/keychain/.git
+	-rm -rf docs/blockstack/keychain
+	mkdir docs/blockstack/keychain
+	mv src/blockstack/keychain/LICENSE docs/blockstack/keychain/LICENSE
+	mv src/blockstack/keychain/README.md docs/blockstack/keychain/README.md
+	-rm -rf tests/blockstack/keychain
+	mkdir tests/blockstack/keychain
+	mv src/blockstack/keychain/unit_tests.py tests/blockstack/keychain/unit_tests.py
+
+	-rm -rf src/blockstack/keylib
+	cd src/blockstack && git clone git@github.com:blockstack/keylib-py.git keylib
+	rm -rf src/blockstack/keylib/.git
+	-rm -rf docs/blockstack/keylib
+	mkdir docs/blockstack/keylib
+	mv src/blockstack/keylib/LICENSE docs/blockstack/keylib/LICENSE
+	mv src/blockstack/keylib/README.md docs/blockstack/keylib/README.md
+	-rm -rf tests/blockstack/keylib
+	mkdir tests/blockstack/keylib
+	mv src/blockstack/keylib/unit_tests.py tests/blockstack/keylib/unit_tests.py
+
+	-rm -rf src/blockstack/virtualchain
+	cd src/blockstack && git clone git@github.com:blockstack/virtualchain.git
+	rm -rf src/blockstack/virtualchain/.git
+	-rm -rf docs/blockstack/virtualchain
+	mkdir docs/blockstack/virtualchain
+	mv src/blockstack/virtualchain/LICENSE docs/blockstack/virtualchain/LICENSE
+	mv src/blockstack/virtualchain/README.md docs/blockstack/virtualchain/README.md
+	mv src/blockstack/virtualchain/virtualchain/impl_ref docs/blockstack/virtualchain/impl_ref
+
+	-cd src/blockstack && rm -rf pybitcoin
+	cd src/blockstack && git clone git@github.com:blockstack/pybitcoin.git
+	cd src/blockstack/pybitcoin && rm -rf .git
+	-cd tests/blockstack && rm -rf pybitcoin
+	mv src/blockstack/pybitcoin/tests tests/blockstack/pybitcoin
+	mv src/blockstack/pybitcoin/unit_tests.py tests/blockstack/pybitcoin/unit_tests.py
+	-cd docs/blockstack && rm -rf pybitcoin
+	mkdir docs/blockstack/pybitcoin
+	mv src/blockstack/pybitcoin/AUTHORS docs/blockstack/pybitcoin/AUTHORS
+	mv src/blockstack/pybitcoin/DEPRECATED.md docs/blockstack/pybitcoin/DEPRECATED.md
+	mv src/blockstack/pybitcoin/LICENSE docs/blockstack/pybitcoin/LICENSE
+	mv src/blockstack/pybitcoin/README.md docs/blockstack/pybitcoin/README.md
+	mv src/blockstack/pybitcoin/MANIFEST.in docs/blockstack/pybitcoin/MANIFEST.in
+endif
+
+
+blockstack.venv:
+ifeq ($(HOSTOS),$(ISMAC))
+	-([ -d "$(BASEDIR)/.deos/venv/darwin/blockstack" ] && rm -rf $(BASEDIR)/.deos/venv/darwin/blockstack)
+	cd $(BASEDIR)/.deos/venv/darwin && virtualenv blockstack --no-site-packages
+	source $(BASEDIR)/.deos/venv/darwin/blockstack/bin/activate && pip install blockstack && pip install simplejson && pip install ruamel.yaml
+endif
+
+
+pycpp:
+ifeq ($(HOSTOS),$(ISMAC))
+	-cd src && rm -rf pypreprocessor
+	cd src && git clone git@github.com:evanplaice/pypreprocessor.git
+	cd src/pypreprocessor && rm -rf .git
+	-rm tests/pypreprocessor test.py
+	mv src/pypreprocessor/test.py tests/pypreprocessor/test.py
+	-rm -rf docs/pypreprocessor
+	mkdir docs/pypreprocessor
+	mv src/pypreprocessor/Examples docs/pypreprocessor/examples
+	mv src/pypreprocessor/LICENSE docs/pypreprocessor/LICENSE
+	mv src/pypreprocessor/INSTALL.md docs/pypreprocessor/INSTALL.md
+	mv src/pypreprocessor/README.md docs/pypreprocessor/README.md
+	mv src/pypreprocessor/MANIFEST docs/pypreprocessor/MANIFEST
+endif
+
 
 webpy:
 ifeq ($(HOSTOS),$(ISMAC))
@@ -146,8 +269,13 @@ endif
 	@ (rm -rf src/web/.git)
 	@-(rm src/web/.gitignore)
 	@-(rm src/web/.travis.yml)
+	@-(rm -rf tools/web)
+	@ (mv src/web/tools tools/web)
 	@ (mv src/web/test tests/web)
 	@ (mv src/web/docs docs/web)
+	@ (mv src/web/LICENSE.txt docs/web/LICENSE.txt)
+	@ (mv src/web/ChangeLog.txt docs/web/ChangeLog.txt)
+	@ (mv src/web/README.md docs/web/README.md)
 	@ ($(PRINTM) magenta $@ stop)
 	@ ($(LOGGER) "INFO" "$(HOSTOS) : make : $@ : 1")
 else

diff --git a/app/terminal/lib/hterm.js b/app/terminal/lib/hterm.js
@@ -427,5 +427,31 @@ lib.colors.hexToRGB = function (arg) {
   return arg;
 };
 
+// add support for cursor styles 5 and 6, fixes #270
+hterm.VT.CSI[' q'] = function (parseState) {
+  const arg = parseState.args[0];
+  if (arg === '0' || arg === '1') {
+    this.terminal.setCursorShape(hterm.Terminal.cursorShape.BLOCK);
+    this.terminal.setCursorBlink(true);
+  } else if (arg === '2') {
+    this.terminal.setCursorShape(hterm.Terminal.cursorShape.BLOCK);
+    this.terminal.setCursorBlink(false);
+  } else if (arg === '3') {
+    this.terminal.setCursorShape(hterm.Terminal.cursorShape.UNDERLINE);
+    this.terminal.setCursorBlink(true);
+  } else if (arg === '4') {
+    this.terminal.setCursorShape(hterm.Terminal.cursorShape.UNDERLINE);
+    this.terminal.setCursorBlink(false);
+  } else if (arg === '5') {
+    this.terminal.setCursorShape(hterm.Terminal.cursorShape.BEAM);
+    this.terminal.setCursorBlink(true);
+  } else if (arg === '6') {
+    this.terminal.setCursorShape(hterm.Terminal.cursorShape.BEAM);
+    this.terminal.setCursorBlink(false);
+  } else {
+    console.warn('Unknown cursor style: ' + arg);
+  }
+};
+
 export default hterm;
 export {lib};
diff --git a/app/vault/.backup/.gitignore b/app/vault/.backup/.gitignore
@@ -0,0 +1,5 @@
+#[ignore]
+*
+
+#[except]
+!.gitignore
diff --git a/app/vault/Makefile b/app/vault/Makefile
@@ -0,0 +1,60 @@
+export MAKEFLAGS=--no-print-directory
+
+all: #build
+	source .venv/bin/activate && \
+	python main.py
+
+clone:
+	-rm -rf src
+	git clone git@github.com:hiviah/TrezorPass.git src
+	rm -rf src/.git
+
+build: clone
+	source .venv/bin/activate && \
+	cd src && \
+	make && \
+	python TrezorPass.py
+
+install: brew venv sip pyqt
+
+brew:
+	-brew install protobuf
+	-brew install pyqt5
+	-brew install sip
+
+venv:
+	#-rm -rf .venv
+	#-virtualenv --always-copy --no-site-packages .venv
+	source .venv/bin/activate && pip install web.py
+	source .venv/bin/activate && pip install PyCrypto
+	source .venv/bin/activate && pip install trezor
+	source .venv/bin/activate && pip install simplejson
+	source .venv/bin/activate && pip install ruamel.yaml
+	source .venv/bin/activate && pip install jsonschema
+	source .venv/bin/activate && pip install configobj
+
+sip:
+	-rm -rf ext/sip
+	cp .cache/sip-4.18.1.tar.gz sip.tar.gz
+	gunzip sip.tar.gz
+	tar -xvf sip.tar
+	rm -rf sip.tar
+	mv sip-4.18.1 ext/sip
+	source .venv/bin/activate && \
+	cd ext/sip && \
+	python configure.py --incdir=../../.venv/include/python2.7 && \
+	make && \
+	make install
+
+pyqt:
+	-rm -rf ext/pyqt
+	cp .cache/PyQt-mac-gpl-4.11.4.tar.gz pyqt.tar.gz
+	gunzip pyqt.tar.gz
+	tar -xvf pyqt.tar
+	rm -rf pyqt.tar
+	mv PyQt-mac-gpl-4.11.4 ext/pyqt
+	source .venv/bin/activate && \
+	cd ext/pyqt && \
+	python configure-ng.py --qmake=/usr/local/Cellar/qt5/5.7.0/bin/qmake && \
+	make && \
+	make install