merge master

.github/workflows/ghcr.io.yml

@@ -17,6 +17,7 @@ env:
 on:
   push:
     branches:
+      - master
       - main
       - v**
     tags:

.gitignore

@@ -1,4 +1,5 @@
 miniscript
+miniscript.json
 
 #make
 miniscript.js
@@ -11,3 +12,6 @@ apple-touch-icon.png
 
 #macos
 **.DS_Store**
+
+bash_profile.log
+buildx.dockerfile

CNAME

@@ -0,0 +1 @@
+github.miniscript.app

Dockerfile

@@ -10,34 +10,28 @@ RUN apt-get install systemd bash jq -y
 RUN echo $(date +%s) > updated
 RUN chmod +x /usr/bin/systemctl
 RUN echo $(date +%s) > updated
-FROM systemd as pandoc
-RUN apt-get install pandoc -y
-RUN echo $(date +%s) > updated
-FROM pandoc as docker
-RUN apt-get install docker.io -y
-RUN echo $(date +%s) > updated
-FROM docker as clone
+FROM systemd as clone
 RUN rm -rf /src
-RUN git clone --branch v0.0.2 --depth 1 https://github.com/bitcoincore-dev/miniscript-docker /src
+RUN git clone --branch v0.0.10 --depth 1 https://github.com/bitcoincore-dev/miniscript-docker /src
 RUN echo $(date +%s) > updated
 FROM clone as make
 WORKDIR /src
 RUN make miniscript
 RUN echo $(date +%s) > updated
 RUN install miniscript /usr/local/bin
 RUN echo $(date +%s) > updated
-RUN make miniscript.js
-RUN echo $(date +%s) > updated
+#RUN make miniscript.js ##TODO: better buildx multiplatform building
+#RUN echo $(date +%s) > updated
 FROM make as install
 RUN install ./miniscript /usr/local/bin
 RUN echo $(date +%s) > updated
-RUN install ./miniscript-* /usr/local/bin
+RUN install ./miniscript-** /usr/local/bin
 RUN install ./serve /usr/local/bin
 RUN echo $(date +%s) > updated
 WORKDIR /src
 FROM install as miniscript
 COPY --from=clone /src /src
 ENV PATH=$PATH:/usr/bin/systemctl
 RUN ps -p 1 -o comm=
-EXPOSE 80 6102 8080 8081
+EXPOSE 80 443 6102 8080 8081
 VOLUME /src

GNUmakefile

@@ -1,3 +1,15 @@
+## detect ARCH for buildx
+ARCH                                   :=$(shell uname -m)
+export ARCH
+ifeq ($(ARCH),x86_64)
+TARGET                                 :=amd64
+export TARGET
+endif
+ifeq ($(ARCH),arm64)
+TARGET                                 :=arm64
+export TARGET
+endif
+
 DOCKER=$(shell which docker)
 export DOCKER
 PWD=$(shell echo `pwd`)
@@ -12,21 +24,32 @@ install:
 	@rm ./miniscript || true
 	@rm /usr/local/bin/miniscript || true
 	@$(MAKE) miniscript
+	@$(MAKE) miniscript.json
 	@install $(PWD)/miniscript        /usr/local/bin/
 	@install $(PWD)/miniscript-*      /usr/local/bin/
+	@install $(PWD)/miniscript.json   /usr/local/bin/
+	@install $(PWD)/miniscript.json-* /usr/local/bin/
 
 docker:docker-miniscript## 	        docker-build
+dockerx:docker-buildx## 	        docker-buildx
 docker-build:## 		docker build -f Dockerfile -t miniscript .
 	@./miniscript-docker start
 	@$(DOCKER) pull ghcr.io/bitcoincore-dev/miniscript-docker:latest
 	@$(DOCKER) build -f Dockerfile -t miniscript .
+docker-buildx:## 		docker buildx build sequence
+	@./miniscript-docker start
+	@$(DOCKER) run --privileged --rm tonistiigi/binfmt --install all
+	@$(DOCKER) buildx ls
+	@$(DOCKER) buildx create --use --name miniscript-buildx || true
+	@$(DOCKER) buildx build -t miniscript --platform linux/arm64,linux/amd64 .
+	@$(DOCKER) buildx build -t miniscript --platform linux/$(TARGET) . --load
 docker-miniscript:docker-build## 		docker-miniscript
 	@[[ -z "$(shell file ./miniscript | grep inux)" ]] && echo "not linux" && rm ./miniscript || echo "miniscript is built for linux"
 	@$(DOCKER) run --rm -v $(PWD):/src --publish 80:8080  miniscript sh -c "make install"
 
-.PHONY:test-command
-test-command:
-	@cat $< $@ && exit;
+.PHONY:miniscript-tests
+miniscript-tests:## 	miniscript-tests
+	@bash $< $@ 2>/dev/null || true
 
 example-commands:
 	@printf "\n"

Makefile

@@ -1,9 +1,12 @@
 HEADERS := bitcoin/util/vector.h bitcoin/util/strencodings.h bitcoin/span.h bitcoin/util/spanparsing.h bitcoin/script/script.h bitcoin/script/miniscript.h compiler.h bitcoin/crypto/common.h bitcoin/serialize.h bitcoin/prevector.h bitcoin/compat/endian.h bitcoin/compat/byteswap.h bitcoin/attributes.h bitcoin/tinyformat.h bitcoin/primitives/transaction.h
 SOURCES := bitcoin/util/strencodings.cpp bitcoin/util/spanparsing.cpp bitcoin/script/script.cpp bitcoin/script/miniscript.cpp compiler.cpp
 
-miniscript: $(HEADERS) $(SOURCES) main.cpp
+miniscript: $(HEADERS) $(SOURCES) main.cpp## 		miniscript
 	g++ -O3 -g0 -Wall -std=c++17 -march=native -flto -Ibitcoin $(SOURCES) main.cpp -o miniscript
 
+miniscript.json: $(HEADERS) $(SOURCES) miniscript.json.cpp## 		miniscript.json
+	g++ -O3 -g0 -Wall -std=c++17 -march=native -flto -Ibitcoin $(SOURCES) miniscript.json.cpp -o miniscript.json
+
 miniscript.js: $(HEADERS) $(SOURCES) js_bindings.cpp
 	em++ -O3 -g0 -Wall -std=c++17 -fno-rtti -flto -Ibitcoin $(SOURCES) js_bindings.cpp -s WASM=1 -s FILESYSTEM=0 -s ENVIRONMENT=web -s DISABLE_EXCEPTION_CATCHING=0 -s EXPORTED_FUNCTIONS='["_miniscript_compile","_miniscript_analyze","_malloc","_free"]' -s EXPORTED_RUNTIME_METHODS='["cwrap","UTF8ToString"]' -o miniscript.js
 
@@ -13,4 +16,4 @@ wrapper.dot: wrapper.txt
 wrapper.pdf: wrapper.dot
 	dot -Tpdf <wrapper.dot >wrapper.pdf
 
-.PHONY:miniscript miniscript.js
+.PHONY:miniscript miniscript.js miniscript.json

README.md

@@ -1,5 +1,8 @@
 ## miniscript-docker
 
+![miniscript-docker-web](https://github.com/bitcoincore-dev/miniscript-docker/assets/152159/287c6835-b14c-4ae5-a22b-6da9812a8f8d)
+
+
 #### Usage:
 
 ```
@@ -27,16 +30,16 @@ docker pull ghcr.io/bitcoincore-dev/miniscript-docker:latest
 
 
 ```
-miniscript-docker run 'and(pk(A),or(pk(B),or(9@pk(C),older(1000))))'
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/bitcoincore-dev/miniscript-docker/master/miniscript-docker)" - run 'and(pk(A),or(pk(B),or(9@pk(C),older(1000))))'
 ```
 
+![miniscript-docker-run 1](https://github.com/bitcoincore-dev/miniscript-docker/assets/152159/7f1b02db-7063-41c2-859c-33639eb82d5a)
 
 ```
-miniscript-docker run 'and_v(or_c(pk(B),or_c(pk(C),v:older(1000))),pk(A))'
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/bitcoincore-dev/miniscript-docker/master/miniscript-docker)" - run 'and_v(or_c(pk(B),or_c(pk(C),v:older(1000))),pk(A))'
 ```
 
-
-EXAMPLES
+![miniscript-docker-run 2 png](https://github.com/bitcoincore-dev/miniscript-docker/assets/152159/1da94b41-ad45-4bda-8113-fa7b4f1326d5)
 
 ##### miniscript-docker examples
 
@@ -46,6 +49,16 @@ EXAMPLES
 
 ![miniscript-docker-examples](https://github.com/bitcoincore-dev/miniscript-docker/assets/152159/a9b7e0d6-bcdf-4e86-abe7-0af4dd3b887e)
 
+
+##### miniscript-docker serve
+
+```
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/bitcoincore-dev/miniscript-docker/master/miniscript-docker)" - serve
+```
+
+![miniscript-docker-web](https://github.com/bitcoincore-dev/miniscript-docker/assets/152159/287c6835-b14c-4ae5-a22b-6da9812a8f8d)
+
+
 <hr>
 
 Go to [the Miniscript website](http://bitcoin.sipa.be/miniscript/).

main.cpp

@@ -17,49 +17,13 @@ static bool run(std::string&& line, int64_t count) {
     miniscript::NodeRef<std::string> ret;
     double avgcost = 0;
     if (Compile(Expand(line), ret, avgcost)) {
-
         auto str = ret->ToString(COMPILER_CTX);
-
         assert(str);
-
-        printf(
-				"\n{ \"X\":\"X\",\n\"2\":\"%17.10f\",\n\"3\":\"%5i\",\n\"4\":\"%s\"\n }\n",
-				ret->ScriptSize() + avgcost, (int)ret->ScriptSize(),
-				Abbreviate(std::move(*str)).c_str()
-				);
-
+        printf("X %17.10f %5i %s %s\n", ret->ScriptSize() + avgcost, (int)ret->ScriptSize(), Abbreviate(std::move(*str)).c_str(), line.c_str());
     } else if ((ret = miniscript::FromString(Expand(line), COMPILER_CTX))) {
-
         auto ms = ret->ToString(COMPILER_CTX);
-		assert(ms);
-		printf("{ \"count\": \"%7li\",\n",(long)count);
-		printf("\"scriptlen\" : \"%i\",\n",(int)ret->ScriptSize());
-		printf("\"maxops\" : \"%i\",\n",(int)ret->GetOps());
-		printf("\"type\" : \"%s\",\n",ret->GetType() << "B"_mst ? "B" : ret->GetType() << "V"_mst ? "V" : ret->GetType() << "W"_mst ? "W" : ret->GetType() << "K"_mst ? "K" : "(invalid)");
-
-		printf("\"safe\" : \"%s\",\n",ret->GetType() << "s"_mst ? "yes" : "no");
-		printf("\"nonmal\" : \"%s\",\n",ret->GetType() << "m"_mst ? "yes" : "no");
-		printf("\"dissat\" : \"%s\",\n",ret->GetType() << "f"_mst ? "no" : ret->GetType() << "e"_mst ? "unique" : ret->GetType() << "d"_mst ? "yes" : "unknown");
-		printf("\"input\" : \"%s\",\n",ret->GetType() << "z"_mst ? "0" : ret->GetType() << "o"_mst ? (ret->GetType() << "n"_mst ? "1n" : "1") : ret->GetType() << "n"_mst ? "n" : "-");
-		printf("\"output\" : \"%s\",\n",ret->GetType() << "u"_mst ? "1" : "nonzero");
-		printf("\"timelock_mix\" : \"%s\",\n",ret->GetType() << "k"_mst ? "no": "yes");
-		printf("\"miniscript\" : \"%s\" }\n",Abbreviate(*ms).c_str());
-
-
-
         assert(ms);
-// 		printf("%7li\nscriptlen=%i\nmaxops=%i\ntype=%s\nsafe=%s\nnonmal=%s\ndissat=%s\ninput=%s\noutput=%s\ntimelock_mix=%s\nminiscript=%s\n",
-// (long)count,
-// (int)ret->ScriptSize(),
-// (int)ret->GetOps(),
-// ret->GetType() << "B"_mst ? "B" : ret->GetType() << "V"_mst ? "V" : ret->GetType() << "W"_mst ? "W" : ret->GetType() << "K"_mst ? "K" : "(invalid)",
-// ret->GetType() << "s"_mst ? "yes" : "no",
-// ret->GetType() << "m"_mst ? "yes" : "no",
-// ret->GetType() << "f"_mst ? "no" : ret->GetType() << "e"_mst ? "unique" : ret->GetType() << "d"_mst ? "yes" : "unknown",
-// ret->GetType() << "z"_mst ? "0" : ret->GetType() << "o"_mst ? (ret->GetType() << "n"_mst ? "1n" : "1") : ret->GetType() << "n"_mst ? "n" : "-",
-// ret->GetType() << "u"_mst ? "1" : "nonzero",
-// ret->GetType() << "k"_mst ? "no": "yes",
-// Abbreviate(*ms).c_str());
+        printf("%7li scriptlen=%i maxops=%i type=%s safe=%s nonmal=%s dissat=%s input=%s output=%s timelock_mix=%s miniscript=%s\n", (long)count, (int)ret->ScriptSize(), (int)ret->GetOps(), ret->GetType() << "B"_mst ? "B" : ret->GetType() << "V"_mst ? "V" : ret->GetType() << "W"_mst ? "W" : ret->GetType() << "K"_mst ? "K" : "(invalid)", ret->GetType() << "s"_mst ? "yes" : "no", ret->GetType() << "m"_mst ? "yes" : "no", ret->GetType() << "f"_mst ? "no" : ret->GetType() << "e"_mst ? "unique" : ret->GetType() << "d"_mst ? "yes" : "unknown", ret->GetType() << "z"_mst ? "0" : ret->GetType() << "o"_mst ? (ret->GetType() << "n"_mst ? "1n" : "1") : ret->GetType() << "n"_mst ? "n" : "-", ret->GetType() << "u"_mst ? "1" : "nonzero", ret->GetType() << "k"_mst ? "no": "yes", Abbreviate(*ms).c_str());
     } else {
         printf("Failed to parse as policy or miniscript '%s'\n", line.c_str());
     }

miniscript-docker

@@ -183,11 +183,10 @@ function shell (){
     docker-start
     docker \
         run \
-        -d \
         -t \
         -i \
         --rm \
-        -p 127.0.0.1:$PORT:8080/tcp \
+        -p 127.0.0.1:0:8080/tcp \
         -v `pwd`:/src miniscript bash
 
 }

miniscript-test-0

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+#
+echo "or_i(and_v(v:thresh(2,pkh(M1),a:pkh(M2),a:pkh(M3)),after(1005)),and_v(v:thresh(2,pk(P1),s:pk(P2),s:pk(P3),sun:after(1002),sun:after(1003)),and_v(or_c(pk(SA1),or_c(pk(SA3),v:pkh(SA2))),thresh(2,pk(A1),s:pk(A2),s:pk(A3),sln:after(1004)))))" | miniscript

miniscript-tests

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+[[ -z "$(command -v miniscript-tests)" ]] && \
+        install $0 /usr/local/bin || true
+## add your won tests
+## miniscript-test-0
+## miniscript-test-1000
+## etc..
+
+TESTS=$(echo miniscript-test-{0..1000}*)
+for ms in $TESTS
+do
+    . $ms 2>/dev/null
+done