merge

.gitignore

@@ -2,4 +2,5 @@ node_modules
 yarn-error.log
 logs
 dist
-.vscode
+.vscode
+.DS_Store

README.md

@@ -97,4 +97,8 @@ For issues not covered in the documentation, please jump into our channel and we
 
 This code is provided as is, under [MIT Licence](LICENCE).
 
+## Todo
+
+- Support ARM binaries for leap version
+
 

docker/Dockerfile

@@ -2,8 +2,7 @@ FROM ubuntu:20.04
 WORKDIR /app
 
 # # Install prerequisites
-RUN apt-get update \
-    && apt-get update --fix-missing
+RUN apt-get update 
 RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
 RUN apt-get -y install zip unzip libncurses5 wget git build-essential cmake curl libboost-all-dev libcurl4-openssl-dev libgmp-dev libssl-dev libusb-1.0.0-dev libzstd-dev time pkg-config llvm-11-dev
 
@@ -25,7 +24,7 @@ ENV EOSIO_PRV_KEY=5JKxAqBoQuAYSh6YMcjxcougPpt1pi9L4PyJHwEQuZgYYgkWpjS
 
 EXPOSE 8888
 
-HEALTHCHECK --start-period=2s --interval=2s --timeout=2s --retries=5\
+HEALTHCHECK --start-period=100ms --interval=500ms --timeout=500ms --retries=20\
   CMD ./scripts/health_check.sh || exit 1
 
 ENTRYPOINT ["./entrypoint.sh"]

docker/Makefile

@@ -1,7 +1,7 @@
 WAX_CLEOS=cleos -u https://wax.greymass.com
 EOS_CLEOS=cleos -u https://eos.greymass.com
 TELOS_CLEOS=cleos -u https://mainnet.telos.net
-
+IMAGE_VERSION=v4.0.4
 ARCH=`uname -m`
 
 get_wax: 
@@ -33,21 +33,24 @@ build_snapshots:
 	docker build -f Dockerfile.snapshot -t qsnapshot . --platform linux/${ARCH}
 
 create_snapshots: stop
-	docker run --name qsnapshot --env EOSIO_PUB_KEY=EOS5dUsCQCAyHVjnqr6BFqVEE7w8XksnkRtz22wd9eFrSq4NHoKEH --env EOSIO_PRV_KEY=5JKxAqBoQuAYSh6YMcjxcougPpt1pi9L4PyJHwEQuZgYYgkWpjS --env SYSTEM_TOKEN_SYMBOL="WAX" -d -p 8888:8888 qsnapshot:latest --platform linux/${ARCH}
+	docker run --name qsnapshot --env EOSIO_PUB_KEY=EOS5dUsCQCAyHVjnqr6BFqVEE7w8XksnkRtz22wd9eFrSq4NHoKEH --env EOSIO_PRV_KEY=5JKxAqBoQuAYSh6YMcjxcougPpt1pi9L4PyJHwEQuZgYYgkWpjS -d -p 8888:8888 qsnapshot:latest --platform linux/${ARCH}
 
 copy_snapshots:
 	./copy_snapshot.sh
 
 build:
-	# docker build -f Dockerfile -t genereos/qtest:amd64-v1.1.0 . --platform linux/amd64
-	# docker build -f Dockerfile -t genereos/qtest:arm64-v1.1.0 . --platform linux/arm64
-	# docker buildx create --use
-	docker buildx build -f Dockerfile -t genereos/qtest:v1.1.1 --platform linux/amd64,linux/arm64 . --push
-
+	# docker build -f Dockerfile -t songmai108/qtest:$(IMAGE_VERSION) . --platform linux/amd64
+	# docker build -f Dockerfile -t songmai108/qtest:$(IMAGE_VERSION) . --platform linux/arm64
+	docker buildx build -f Dockerfile -t songmai108/qtest:$(IMAGE_VERSION) --platform linux/amd64,linux/arm64 . --push
 
 start: stop
-	docker run --name qtest --env SYSTEM_TOKEN_SYMBOL="WAX" -d -p 8888:8888 genereos/qtest:v1.1.1
+	docker run --name qtest --env SYSTEM_TOKEN_SYMBOL="TLOS" -d -p 8888:8888 songmai108/qtest:$(IMAGE_VERSION)
 
 stop:
 	docker container rm qtest -f
-	docker container rm qsnapshot -f
+	docker container rm qsnapshot -f
+
+push-docker:
+	docker push songmai108/qtest:$(IMAGE_VERSION)
+	docker tag songmai108/qtest:$(IMAGE_VERSION) songmai108/qtest:latest
+	docker push songmai108/qtest:latest

docker/Readme.md

@@ -2,13 +2,32 @@
 
 ```
 $ make build_snapshots
+
 $ make create_snapshots
+
 # wait until all snapshots are created with following logs:
+$ docker logs qsnapshot
+{
+   "head_block_id" : "000000108afb765fa579df87aef399987315b3c3f11dd44a2a98f14869e674af",
+   "head_block_num" : 16,
+   "head_block_time" : "2022-09-18T07:52:34.000",
+   "snapshot_name" : "/app/snapshot-node/./logs/EOS/data/snapshots/snapshot-000000108afb765fa579df87aef399987315b3c3f11dd44a2a98f14869e674af.bin",
+   "version" : 5
+}
+...
 {
-   "head_block_id" : "00000012970061bb6b3aeac9d36303e9832b7363c8f7ae5db7fc0c90735cb37c",
-   "head_block_num" : 18,
-   "head_block_time" : "2022-07-14T01:58:07.000",
-   "snapshot_name" : "/app/snapshot-node/./logs/TLOS/data/snapshots/snapshot-00000012970061bb6b3aeac9d36303e9832b7363c8f7ae5db7fc0c90735cb37c.bin",
+   "head_block_id" : "0000000d7b70ad64ac368b01f5ccfaa97481ac610877bbe9307a09e52a75e451",
+   "head_block_num" : 13,
+   "head_block_time" : "2022-09-18T07:52:42.000",
+   "snapshot_name" : "/app/snapshot-node/./logs/WAX/data/snapshots/snapshot-0000000d7b70ad64ac368b01f5ccfaa97481ac610877bbe9307a09e52a75e451.bin",
+   "version" : 5
+}
+...
+{
+   "head_block_id" : "0000000d30b1c9f92065e95037619b4ddbb20f7c9143c7863e46a7d0f3f5a103",
+   "head_block_num" : 13,
+   "head_block_time" : "2022-09-18T07:52:50.000",
+   "snapshot_name" : "/app/snapshot-node/./logs/TLOS/data/snapshots/snapshot-0000000d30b1c9f92065e95037619b4ddbb20f7c9143c7863e46a7d0f3f5a103.bin",
    "version" : 5
 }
 $ make copy_snapshots
@@ -34,7 +53,6 @@ docker run --name qtest  --env SYSTEM_TOKEN_SYMBOL="WAX" -d -p 8888:8888 qtest:l
 ```
 
 ## Time manipulation:
-
 ```
 $ docker exec qtest cleos get info
 {

docker/contracts/eos/eosio.msig.abi

@@ -286,6 +286,5 @@
   "error_messages": [],
   "abi_extensions": [],
   "variants": [],
-  "action_results": [],
-  "kv_tables": {}
+  "action_results": []
 }