Merge #122: A few website updates

438a523 Remove Blockstream affiliation (Pieter Wuille)
700eafc Stop using deprecated em++ env variable in Makefile (Pieter Wuille)
51f017c Adapt js_bindings.cpp to API changes (Pieter Wuille)

Pull request description:

  * Fix compilation errors in js_bindinds.cpp
  * Modernize em++ command line
  * Drop Blockstream affiliation now most work isn't being done there anymore

ACKs for top commit:
  darosior:
    utACK 438a523

Tree-SHA512: 78a33564764cf295d178398503ad8599d7581845ace1eb2b0243b025fc275cd73527d7bc5f10349c14a4a38e395abd028bffa49f77e8b3d3917da31a75f3e1bc

Author: sipa

Makefile

@@ -5,7 +5,7 @@ miniscript: $(HEADERS) $(SOURCES) main.cpp
 	g++ -O3 -g0 -Wall -std=c++17 -march=native -flto -Ibitcoin $(SOURCES) main.cpp -o miniscript
 
 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 EXTRA_EXPORTED_RUNTIME_METHODS='["cwrap","UTF8ToString"]' -o miniscript.js
+	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
 
 wrapper.dot: wrapper.txt
 	(echo "digraph wrapper {"; cat wrapper.txt | sed -e 's/^ \+//g' | sed -e 's/ \+/ /g' | cut -d ' ' -f 2 | rev | sed -e 's/l/u/g' | sed -e 's/s/a/g' | sort | uniq | sed -e 's/\([a-z]\)/\1,\1/g' | sed -e 's/^[a-z]//g' | sed -e 's/,[a-z]$$//g' | sed -e 's/,\(.\)\(.\)/  \1 -> \2;\n/g' | sort | uniq | sed -e 's/u/"l\/u"/g' | sed -e 's/a/\"a\/s\"/g'; echo "}") >wrapper.dot

blockstream.png

@@ -656,11 +656,5 @@ <h4>Guaranteeing non-malleability</h4>
 
 </div>
 
-<footer class="footer">
-    <div class="container text-center">
-        <img height="144" src="blockstream.png" width="288" alt="Blockstream logo">
-    </div>
-</footer>
-
 </body>
 </html>

index.html

@@ -43,14 +43,10 @@ std::string Props(const miniscript::NodeRef<std::string>& node, std::string in)
 std::string Analyze(const miniscript::NodeRef<std::string>& node) {
     switch (node->fragment) {
         case miniscript::Fragment::PK_K: {
-            std::string str;
-            COMPILER_CTX.ToString(node->keys[0], str);
-            return Props(node, "pk_k(" + std::move(str) + ")");
+            return Props(node, "pk_k(" + (*COMPILER_CTX.ToString(node->keys[0])) + ")");
         }
         case miniscript::Fragment::PK_H: {
-            std::string str;
-            COMPILER_CTX.ToString(node->keys[0], str);
-            return Props(node, "pk_h(" + std::move(str) + ")");
+            return Props(node, "pk_h(" + (*COMPILER_CTX.ToString(node->keys[0])) + ")");
         }
         case miniscript::Fragment::MULTI: return Props(node, "multi(" + std::to_string(node->k) + " of " + std::to_string(node->keys.size()) + ")");
         case miniscript::Fragment::AFTER: return Props(node, "after(" + std::to_string(node->k) + ")");
@@ -101,8 +97,7 @@ void miniscript_compile(const char* desc, char* msout, int msoutlen, char* costo
             Output("[compile error]", asmout, asmoutlen);
             return;
         }
-        ret->ToString(COMPILER_CTX, str);
-        Output(Abbreviate(std::move(str)), msout, msoutlen);
+        Output(Abbreviate(*(ret->ToString(COMPILER_CTX))), msout, msoutlen);
         std::string coststr = "<ul><li>Script: " + std::to_string(ret->ScriptSize()) + " WU</li><li>Input: " + std::to_string(avgcost) + " WU</li><li>Total: " + std::to_string(ret->ScriptSize() + avgcost) + " WU</li></ul>";
         Output(coststr, costout, costoutlen);
         Output(Disassemble(ret->ToScript(COMPILER_CTX)), asmout, asmoutlen);