Merge branch 'beta' into mergemaster

# Conflicts: # src/main.cpp
2018-04-16 10:16:01 +03:00
parent 9226f69ef1
commit e73b2055c6
910 changed files with 112009 additions and 11364 deletions
--- a/src/cryptoconditions/tests/vectors/0005_test-basic-preimage.json
+++ b/src/cryptoconditions/tests/vectors/0005_test-basic-preimage.json
@@ -0,0 +1,13 @@
+{
+  "json": {
+    "type": "preimage-sha-256",
+    "preimage": "YWFh"
+  },
+  "cost": 3,
+  "subtypes": [],
+  "fingerprintContents": "616161",
+  "fulfillment": "A0058003616161",
+  "conditionBinary": "A02580209834876DCFB05CB167A5C24953EBA58C4AC89B1ADF57F28F2F9D09AF107EE8F0810103",
+  "conditionUri": "ni:///sha-256;mDSHbc-wXLFnpcJJU-uljErImxrfV_KPL50JrxB-6PA?fpt=preimage-sha-256&cost=3",
+  "message": ""
+}