Chia-Network · prozacchiwawa · Apr 3, 2023 · Mar 2, 2023 · Mar 2, 2023 · Mar 2, 2023
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -154,6 +154,15 @@ jobs:
         cp support/recompile_check.py chia-blockchain
         (cd chia-blockchain && python recompile_check.py)
 
+    - name: Test Classic command line tools with pytest
+      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.python, '3.7')
+      run: |
+        python -m pip install pytest
+        # This script installs the wheel built during this workflow.
+        python support/wheelname.py
+        # TODO: bring in the other tests in resources/tests/cmdline/tests besides cmds_test.py
+        (cd resources/tests/cmdline/tests && py.test cmds_test.py )
+
     - name: Verify recompilation of cl21 sources
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.python, '3.7')
       run: |
@@ -259,3 +268,4 @@ jobs:
             components: rustfmt, clippy
       - name: cargo test
         run: cargo test
+
diff --git a/resources/tests/cmdline/tests/__init__.py b/resources/tests/cmdline/tests/__init__.py
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/if-1.txt b/resources/tests/cmdline/tests/attic/compiler_001/if-1.txt
@@ -0,0 +1,2 @@
+run '(compile (if () 100 200))'
+(e (i (q ()) (q (q 100)) (q (q 200))) (a))
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/if-2.txt b/resources/tests/cmdline/tests/attic/compiler_001/if-2.txt
@@ -0,0 +1,2 @@
+run '(compile (if 0 100 200))'
+(e (i (q 0) (q (q 100)) (q (q 200))) (a))
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/if-3.txt b/resources/tests/cmdline/tests/attic/compiler_001/if-3.txt
@@ -0,0 +1,2 @@
+run '(compile (if 1 100 200))'
+(e (i (q 1) (q (q 100)) (q (q 200))) (a))
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/if-4.txt b/resources/tests/cmdline/tests/attic/compiler_001/if-4.txt
@@ -0,0 +1,2 @@
+run '(compile (if x0 100 200))'
+(e (i (f (a)) (q (q 100)) (q (q 200))) (a))
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/if-5.txt b/resources/tests/cmdline/tests/attic/compiler_001/if-5.txt
@@ -0,0 +1,2 @@
+run '(compile (if x5 100 200))'
+(e (i (f (r (r (r (r (r (a))))))) (q (q 100)) (q (q 200))) (a))
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/if-6.txt b/resources/tests/cmdline/tests/attic/compiler_001/if-6.txt
@@ -0,0 +1,2 @@
+run '(compile (if x5 (if x1 500 600) 200))'
+(e (i (f (r (r (r (r (r (a))))))) (q (e (i (f (r (a))) (q (q 500)) (q (q 600))) (a))) (q (q 200))) (a))
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/if_1.txt b/resources/tests/cmdline/tests/attic/compiler_001/if_1.txt
@@ -0,0 +1,2 @@
+run '(if 100 200 300)'
+200
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/if_2.txt b/resources/tests/cmdline/tests/attic/compiler_001/if_2.txt
@@ -0,0 +1,2 @@
+run '(if () 200 300)'
+300
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/if_3.txt b/resources/tests/cmdline/tests/attic/compiler_001/if_3.txt
@@ -0,0 +1,2 @@
+run '(if () x0 300)' '(200)'
+300
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/if_4.txt b/resources/tests/cmdline/tests/attic/compiler_001/if_4.txt
@@ -0,0 +1,2 @@
+run '(if x2 x0 x1)' '(200 300 400)'
+200
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/if_5.txt b/resources/tests/cmdline/tests/attic/compiler_001/if_5.txt
@@ -0,0 +1,2 @@
+run '(if x2 x0 x1)' '(200 300 ())'
+300
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/list-1.txt b/resources/tests/cmdline/tests/attic/compiler_001/list-1.txt
@@ -0,0 +1,2 @@
+run '(list x0 x1)' '((100 102) "hello")'
+((100 102) "hello")
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/list-2.txt b/resources/tests/cmdline/tests/attic/compiler_001/list-2.txt
@@ -0,0 +1,2 @@
+run '(compile_op (list + 1 2 (+ 1 2)))'
+(+ (q 1) (q 2) (q 3))
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/list-3.txt b/resources/tests/cmdline/tests/attic/compiler_001/list-3.txt
@@ -0,0 +1,2 @@
+run '(list 100 200 (+ 300 600) 400 500)'
+(100 200 900 400 500)
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/list-4.txt b/resources/tests/cmdline/tests/attic/compiler_001/list-4.txt
@@ -0,0 +1,2 @@
+run '(list x0 100 200 300 400 500)' '(2000)'
+(2000 100 200 300 400 500)
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/list-5.txt b/resources/tests/cmdline/tests/attic/compiler_001/list-5.txt
@@ -0,0 +1,2 @@
+run '(list 100 200 300 400 500)'
+(100 200 300 400 500)
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/map-1.txt b/resources/tests/cmdline/tests/attic/compiler_001/map-1.txt
@@ -0,0 +1,2 @@
+run '(map (function (+ x0 1)) (list 100 2 3 15 20))'
+(101 3 4 16 21)
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/nested.txt b/resources/tests/cmdline/tests/attic/compiler_001/nested.txt
@@ -0,0 +1,2 @@
+run "(+ (+ 5 x0) x1)" "(9 1000)"
+1014
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/partial-bindings-1.txt b/resources/tests/cmdline/tests/attic/compiler_001/partial-bindings-1.txt
@@ -0,0 +1,3 @@
+run "(and (equal 400 x0) (equal 500 x1) (equal 600 x2))" "(400)"
+FAILURE: first of non-cons
+()
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/partial-bindings-2.txt b/resources/tests/cmdline/tests/attic/compiler_001/partial-bindings-2.txt
@@ -0,0 +1,3 @@
+run "(and (equal 400 x0) (equal 500 x1) (equal 600 x2))" "(400 500)"
+FAILURE: first of non-cons
+()
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/quote-1.txt b/resources/tests/cmdline/tests/attic/compiler_001/quote-1.txt
@@ -0,0 +1,2 @@
+run '(quote (+ 1 2 (+ 1 2)))'
+(+ 1 2 (+ 1 2))
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/quote-2.txt b/resources/tests/cmdline/tests/attic/compiler_001/quote-2.txt
@@ -0,0 +1,2 @@
+run '(quote (+ 1 2 (unquote (+ 1 2))))'
+(+ 1 2 (unquote (+ 1 2)))
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/quote-3.txt b/resources/tests/cmdline/tests/attic/compiler_001/quote-3.txt
@@ -0,0 +1,2 @@
+run '(quote (quote (+ 1 2 (unquote (+ 1 2)) (unquote (unquote (+ 1 2))))))'
+(quote (+ 1 2 (unquote (+ 1 2)) (unquote (unquote (+ 1 2)))))
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/simple_add.txt b/resources/tests/cmdline/tests/attic/compiler_001/simple_add.txt
@@ -0,0 +1,2 @@
+run "(+ 10 20)"
+30
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/subtract-1.txt b/resources/tests/cmdline/tests/attic/compiler_001/subtract-1.txt
@@ -0,0 +1,2 @@
+run '(- 10 5)'
+5
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/subtract-2.txt b/resources/tests/cmdline/tests/attic/compiler_001/subtract-2.txt
@@ -0,0 +1,2 @@
+run '(- x0 5)' '(500)'
+495
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/subtract-3.txt b/resources/tests/cmdline/tests/attic/compiler_001/subtract-3.txt
@@ -0,0 +1,2 @@
+run '(- 10 5 2 1)'
+2
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/var_binding1.txt b/resources/tests/cmdline/tests/attic/compiler_001/var_binding1.txt
@@ -0,0 +1,2 @@
+run x0 '("foobarbaz")'
+"foobarbaz"
diff --git a/resources/tests/cmdline/tests/attic/compiler_001/var_binding2.txt b/resources/tests/cmdline/tests/attic/compiler_001/var_binding2.txt
@@ -0,0 +1,2 @@
+run x3 '("junk" "junk" "junk" "foobarbaz" "junk" "junk")'
+"foobarbaz"
diff --git a/resources/tests/cmdline/tests/attic/mkp2taproot-1.txt b/resources/tests/cmdline/tests/attic/mkp2taproot-1.txt
@@ -0,0 +1,15 @@
+# this script creates a pay-to-taproot standard script. x0 = hidden public key; x1 = hidden script
+#
+# if x1 is not specified, the default "(raise)" should be used
+#
+# example: x0 = (pubkey_for_exp 1), x1 = (quote (raise (quote 0xdeadbeef)))
+#    ie. (0x97f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb (raise 0xdeadbeef))
+#
+# reduce '(pubkey_for_exp 1)' => 0x97f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb
+# reduce '(wrap (quote (raise 0xdeadbeef)))' => 0x220964deadbeef
+# reduce '(sha256 x0 (wrap x1))' => 0xac186394ef316cac5e1788286687802ed45b268f5440493e2123f4f80665dfcb
+# reduce '(pubkey_for_exp (sha256 x0 (wrap x1)))' => 0x8bd429b60a77a026949a5fa77f76579de8679f2401c3b0eca8db8aa028884d6742b840f513e2faefbd379ceeeb7b5996
+# reduce '(point_add x0 (pubkey_for_exp (sha256 x0 (wrap x1))))' => 0x98360c4f1e6c01c8600b80595d34ef91c8dd17e82e0df7638c2a181de1333da1a46f0353029417ff5b6ccaa6767836d2
+#
+reduce -s schemas.compiler_001 '(list #e (function (function (if x1 (assert (eq_atom x0 (point_add x3 (pubkey_for_exp (sha256 x3 (wrap x1))))) (e x1 x2)) (cons (list #aggsig x0 (sha256 (wrap x2))) (e x2 x3))))) (list #cons (point_add x0 (pubkey_for_exp (sha256 x0 (wrap x1)))) (list #args)))' '(0x97f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb (quote 0xdeadbeefdeadbeef))'
+(e (quote (e (if_op (first (rest (args))) (quote (e (if_op (eq_atom (first (args)) (point_add (first (rest (rest (rest (args))))) (pubkey_for_exp (sha256 (first (rest (rest (rest (args))))) (wrap (first (rest (args)))))))) (quote (e (first (rest (args))) (first (rest (rest (args)))))) (quote (raise))) (args))) (quote (cons (cons (quote 80) (cons (first (args)) (cons (sha256 (wrap (first (rest (rest (args)))))) (quote ())))) (e (first (rest (rest (args)))) (first (rest (rest (rest (args))))))))) (args))) (cons 0x01031383a372ae073bae6820b487550a7bcb78ae8359daf3db831fe50bda77e7ede389de3a636c44e62841cdc6c38286 (args)))
diff --git a/resources/tests/cmdline/tests/attic/p2taproot-1.txt b/resources/tests/cmdline/tests/attic/p2taproot-1.txt
@@ -0,0 +1,16 @@
+# x0, x1, x2 are passed in, then renamed to x1, x2 and x3 so x0 can be a constant used by both paths
+#
+# taproot case
+# x0 = publicly revealed key (constant)
+# x1 = hidden script (which is run to enumerate conditions)
+# x2 = solution to hidden script
+# x3 = hidden public key
+#
+# regular case
+# x0 = publicly revealed key (constant)
+# x1 = null
+# x2 = signed solution script (which is run to enumerate conditions)
+# x3 = solution to x2
+#
+reduce -s schemas.compiler_001 '(e (quote (e (if_op (first (rest (args))) (quote (e (if_op (eq_atom (first (args)) (point_add (first (rest (rest (rest (args))))) (pubkey_for_exp (sha256 (first (rest (rest (rest (args))))) (wrap (first (rest (args)))))))) (quote (e (first (rest (args))) (first (rest (rest (args)))))) (quote (raise))) (args))) (quote (cons (cons (quote 80) (cons (first (args)) (cons (sha256 (wrap (first (rest (rest (args)))))) (quote ())))) (e (first (rest (rest (args)))) (first (rest (rest (rest (args))))))))) (args))) (cons 0x01031383a372ae073bae6820b487550a7bcb78ae8359daf3db831fe50bda77e7ede389de3a636c44e62841cdc6c38286 (args)))' '(() (quote (300 400 500)) ())'
+((80 0x01031383a372ae073bae6820b487550a7bcb78ae8359daf3db831fe50bda77e7ede389de3a636c44e62841cdc6c38286 0x8d459103c42018689bdc9fe216cc33d31610f9a303f96dc460e9720b81c00d13) 300 400 500)
diff --git a/resources/tests/cmdline/tests/attic/p2taproot-2.txt b/resources/tests/cmdline/tests/attic/p2taproot-2.txt
@@ -0,0 +1,16 @@
+# x0, x1, x2 are passed in, then renamed to x1, x2 and x3 so x0 can be a constant used by both paths
+#
+# taproot case
+# x0 = publicly revealed key (constant)
+# x1 = hidden script (which is run to enumerate conditions)
+# x2 = solution to hidden script
+# x3 = hidden public key
+#
+# regular case
+# x0 = publicly revealed key (constant)
+# x1 = null
+# x2 = signed solution script (which is run to enumerate conditions)
+# x3 = solution to x2
+#
+reduce -s schemas.compiler_001 '(e (quote (e (if_op (first (rest (args))) (quote (e (if_op (eq_atom (first (args)) (point_add (first (rest (rest (rest (args))))) (pubkey_for_exp (sha256 (first (rest (rest (rest (args))))) (wrap (first (rest (args)))))))) (quote (e (first (rest (args))) (first (rest (rest (args)))))) (quote (raise))) (args))) (quote (cons (cons (quote 80) (cons (first (args)) (cons (sha256 (wrap (first (rest (rest (args)))))) (quote ())))) (e (first (rest (rest (args)))) (first (rest (rest (rest (args))))))))) (args))) (cons 0x01031383a372ae073bae6820b487550a7bcb78ae8359daf3db831fe50bda77e7ede389de3a636c44e62841cdc6c38286 (args)))' '((quote 0xdeadbeefdeadbeef) () 0x97f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb)'
+0xdeadbeefdeadbeef
diff --git a/resources/tests/cmdline/tests/attic/simple-1.txt b/resources/tests/cmdline/tests/attic/simple-1.txt
@@ -0,0 +1,2 @@
+opc -s schemas.v0_0_2 '(((equal (sha256 x0) 0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855)) (reduce x0 x2))'
+2221230822094080e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855230a4042
diff --git a/resources/tests/cmdline/tests/attic/simple-2.txt b/resources/tests/cmdline/tests/attic/simple-2.txt
@@ -0,0 +1,2 @@
+opd -s schemas.v0_0_2 2221230822094080e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855230a4042
+(((equal (sha256 x0) 0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855)) (reduce x0 x2))
diff --git a/resources/tests/cmdline/tests/attic/simple-3.txt b/resources/tests/cmdline/tests/attic/simple-3.txt
@@ -0,0 +1,2 @@
+opc -s schemas.v0_0_2 "(((equal (sha256 x0) x1)) (reduce x1 x2))"
+2221230822094041230a4142
diff --git a/resources/tests/cmdline/tests/attic/simple-4.txt b/resources/tests/cmdline/tests/attic/simple-4.txt
@@ -0,0 +1,2 @@
+opd 2221230822094041230a4142
+(((= (sha256 x0) x1)) (reduce x1 x2))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/bool-1.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/bool-1.txt
@@ -0,0 +1,2 @@
+rewrite '(bool 0)'
+(call (if_op (quote 0) (function_op (quote 1)) (function_op (quote ()))) (args))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/bool-2.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/bool-2.txt
@@ -0,0 +1,2 @@
+rewrite '(bool 1000)'
+(call (if_op (quote 1000) (function_op (quote 1)) (function_op (quote ()))) (args))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/bool-3.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/bool-3.txt
@@ -0,0 +1,2 @@
+rewrite '(bool x0)'
+(call (if_op (first (args)) (function_op (quote 1)) (function_op (quote ()))) (args))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/bool-4.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/bool-4.txt
@@ -0,0 +1,2 @@
+rewrite '(bool (not x2))'
+(call (if_op (call (if_op (first (rest (rest (args)))) (function_op (quote ())) (function_op (quote 1))) (args)) (function_op (quote 1)) (function_op (quote ()))) (args))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/if-1.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/if-1.txt
@@ -0,0 +1,2 @@
+rewrite '(if 0 100 200)'
+(call (if_op (quote 0) (function_op (quote 100)) (function_op (quote 200))) (args))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/if-2.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/if-2.txt
@@ -0,0 +1,2 @@
+rewrite '(if 1 100 200)'
+(call (if_op (quote 1) (function_op (quote 100)) (function_op (quote 200))) (args))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/if-3.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/if-3.txt
@@ -0,0 +1,2 @@
+rewrite '(if 0 x0 200)'
+(call (if_op (quote 0) (function_op (quote x0)) (function_op (quote 200))) (args))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/if-4.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/if-4.txt
@@ -0,0 +1,2 @@
+rewrite '(if 0 100 x50)'
+(call (if_op (quote 0) (function_op (quote 100)) (function_op (quote x50))) (args))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/if-5.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/if-5.txt
@@ -0,0 +1,2 @@
+rewrite '(if x0 100 200)'
+(call (if_op (first (args)) (function_op (quote 100)) (function_op (quote 200))) (args))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/if-6.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/if-6.txt
@@ -0,0 +1,2 @@
+rewrite '(if x38 100 200)'
+(call (if_op (first (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (args)))))))))))))))))))))))))))))))))))))))) (function_op (quote 100)) (function_op (quote 200))) (args))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/int-1.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/int-1.txt
@@ -0,0 +1,2 @@
+rewrite 2
+(quote 2)
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/list-1.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/list-1.txt
@@ -0,0 +1,2 @@
+rewrite '(list 100 200 300 400 500)'
+(cons (quote 100) (cons (quote 200) (cons (quote 300) (cons (quote 400) (cons (quote 500) (quote ()))))))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/list-2.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/list-2.txt
@@ -0,0 +1,2 @@
+rewrite '(list 100 200 300 400 x0)'
+(cons (quote 100) (cons (quote 200) (cons (quote 300) (cons (quote 400) (cons (first (args)) (quote ()))))))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/list-3.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/list-3.txt
@@ -0,0 +1,2 @@
+rewrite '(list 100 200 (list 300 400 x0))'
+(cons (quote 100) (cons (quote 200) (cons (cons (quote 300) (cons (quote 400) (cons (first (args)) (quote ())))) (quote ()))))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/list-4.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/list-4.txt
@@ -0,0 +1,2 @@
+rewrite '(list x0 100 200 (list 300 400 500))'
+(cons (first (args)) (cons (quote 100) (cons (quote 200) (cons (cons (quote 300) (cons (quote 400) (cons (quote 500) (quote ())))) (quote ())))))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/map-1.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/map-1.txt
@@ -0,0 +1,2 @@
+rewrite '(map (quote (+ x0 1)) (list 100 200 300))'
+(eval (function_op (quote (eval x0 (args)))) (cons (function_op (quote (if x2 (cons (eval x1 (list (first x2))) (eval x0 (list x0 x1 (rest x2)))) ()))) (cons (quote (+ x0 1)) (cons (cons (quote 100) (cons (quote 200) (cons (quote 300) (quote ())))) (quote ())))))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/map-2.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/map-2.txt
@@ -0,0 +1,2 @@
+rewrite '(map x0 (list 100 200 300))'
+(eval (function_op (quote (eval x0 (args)))) (cons (function_op (quote (if x2 (cons (eval x1 (list (first x2))) (eval x0 (list x0 x1 (rest x2)))) ()))) (cons (first (args)) (cons (cons (quote 100) (cons (quote 200) (cons (quote 300) (quote ())))) (quote ())))))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/map-3.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/map-3.txt
@@ -0,0 +1,2 @@
+rewrite '(map (* x0 x0) (list 100 200 300))'
+(eval (function_op (quote (eval x0 (args)))) (cons (function_op (quote (if x2 (cons (eval x1 (list (first x2))) (eval x0 (list x0 x1 (rest x2)))) ()))) (cons (* (first (args)) (first (args))) (cons (cons (quote 100) (cons (quote 200) (cons (quote 300) (quote ())))) (quote ())))))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/not-1.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/not-1.txt
@@ -0,0 +1,2 @@
+rewrite '(not 0)'
+(call (if_op (quote 0) (function_op (quote ())) (function_op (quote 1))) (args))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/not-2.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/not-2.txt
@@ -0,0 +1,2 @@
+rewrite '(not 1)'
+(call (if_op (quote 1) (function_op (quote ())) (function_op (quote 1))) (args))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/not-3.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/not-3.txt
@@ -0,0 +1,2 @@
+rewrite '(not x0)'
+(call (if_op (first (args)) (function_op (quote ())) (function_op (quote 1))) (args))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/not-4.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/not-4.txt
@@ -0,0 +1,2 @@
+rewrite '(not (not x0))'
+(call (if_op (call (if_op (first (args)) (function_op (quote ())) (function_op (quote 1))) (args)) (function_op (quote ())) (function_op (quote 1))) (args))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/quasiquote-1.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/quasiquote-1.txt
@@ -0,0 +1,2 @@
+rewrite '(quasiquote 1)'
+(quote 1)
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/quasiquote-2.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/quasiquote-2.txt
@@ -0,0 +1,2 @@
+rewrite '(quasiquote x0)'
+(quote x0)
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/quasiquote-3.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/quasiquote-3.txt
@@ -0,0 +1,2 @@
+rewrite '(quasiquote (unquote x0))'
+(first (args))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/quasiquote-4.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/quasiquote-4.txt
@@ -0,0 +1,2 @@
+rewrite '(quasiquote (+ x0 (unquote x0)))'
+(cons (quote +) (cons (function_op (quote x0)) (cons (first (args)) (quote ()))))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/quasiquote-5.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/quasiquote-5.txt
@@ -0,0 +1,2 @@
+rewrite '(quasiquote (unquote (+ 7 8 20)))'
+(+ (quote 7) (quote 8) (quote 20))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/quasiquote-6.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/quasiquote-6.txt
@@ -0,0 +1,2 @@
+rewrite '(quasiquote (+ x0 (unquote (sha256 x0))))'
+(cons (quote +) (cons (function_op (quote x0)) (cons (sha256 (first (args))) (quote ()))))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/quasiquote-7.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/quasiquote-7.txt
@@ -0,0 +1,2 @@
+rewrite '(quasiquote (100 200 300 400 500))'
+(cons (quote 100) (cons (function_op (quote 200)) (cons (function_op (quote 300)) (cons (function_op (quote 400)) (cons (function_op (quote 500)) (quote ()))))))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/var-1.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/var-1.txt
@@ -0,0 +1,2 @@
+rewrite x0
+(first (args))
diff --git a/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/var-2.txt b/resources/tests/cmdline/tests/attic/v0_0_2/rewrite/var-2.txt
@@ -0,0 +1,2 @@
+rewrite x59
+(first (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (rest (args)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
diff --git a/resources/tests/cmdline/tests/clvm_runtime/and-1.txt b/resources/tests/cmdline/tests/clvm_runtime/and-1.txt
@@ -0,0 +1,2 @@
+run -i clvm_runtime '(mod (A B) (include "macros.clvm") (and (= 1 1) (= 2 2) (= 3 3)))'
+(q . 1)
diff --git a/resources/tests/cmdline/tests/clvm_runtime/and-2.txt b/resources/tests/cmdline/tests/clvm_runtime/and-2.txt
@@ -0,0 +1,2 @@
+run -i clvm_runtime '(mod (A B) (include "macros.clvm") (and (= 1 1) (= 2 4) (= 3 3)))'
+()
diff --git a/resources/tests/cmdline/tests/clvm_runtime/and-3.txt b/resources/tests/cmdline/tests/clvm_runtime/and-3.txt
@@ -0,0 +1,2 @@
+run -i clvm_runtime '(mod (A B) (include "macros.clvm") (and (= 1 2) (= 2 2) (= 3 3)))'
+()
diff --git a/resources/tests/cmdline/tests/clvm_runtime/and-4.txt b/resources/tests/cmdline/tests/clvm_runtime/and-4.txt
@@ -0,0 +1,2 @@
+run -i clvm_runtime '(mod (A . B) (include "macros.clvm") (and (= 1 A) (= 2 B)))'
+(a (i (= (q . 1) 2) (q 2 (i (= (q . 2) 3) (q 1 . 1) ()) 1) ()) 1)
diff --git a/resources/tests/cmdline/tests/clvm_runtime/and-5.txt b/resources/tests/cmdline/tests/clvm_runtime/and-5.txt
@@ -0,0 +1,2 @@
+run -i clvm_runtime '(a (mod (A . B) (include "macros.clvm") (and (= 1 A) (= 2 B))) @)' "(1 . 2)"
+1
diff --git a/resources/tests/cmdline/tests/clvm_runtime/and-6.txt b/resources/tests/cmdline/tests/clvm_runtime/and-6.txt
@@ -0,0 +1,2 @@
+run -i clvm_runtime '(a (mod (A . B) (include "macros.clvm") (and (= 1 A) (= 2 B))) @)' "(1 . 3)"
+()
diff --git a/resources/tests/cmdline/tests/clvm_runtime/chia-constants.clvm b/resources/tests/cmdline/tests/clvm_runtime/chia-constants.clvm
@@ -0,0 +1,13 @@
+(
+  ; these constants are for creating output conditions
+
+  (defconstant AGG_SIG 50)
+  (defconstant CREATE_COIN 51)
+  (defconstant ASSERT_COIN_CONSUMED 52)
+  (defconstant ASSERT_MY_COIN_ID 53)
+  (defconstant ASSERT_TIME_EXCEEDS 54)
+  (defconstant ASSERT_BLOCK_INDEX_EXCEEDS 55)
+  (defconstant ASSERT_BLOCK_AGE_EXCEEDS 56)
+  (defconstant AGG_SIG_ME 57)
+  (defconstant ASSERT_FEE 58)
+)
diff --git a/resources/tests/cmdline/tests/clvm_runtime/curry.clvm b/resources/tests/cmdline/tests/clvm_runtime/curry.clvm
@@ -0,0 +1,56 @@
+(
+  ;; This include file defines various forms of `curry`
+  ;; A "curry" binds values to a function, making them constant,
+  ;; and returning a new function that returns fewer arguments (since the
+  ;; arguments are now fixed).
+  ;; Example: (defun add2 (V1 V2) (+ V1 V2))  ; add two values
+  ;; (curry add2 15) ; this yields a function that accepts ONE argument, and adds 15 to it
+
+  ; (curry_args sum (list 50 60)) => returns a function that is like (sum 50 60 ...)
+  (defun curry_args (func list_of_args) (qq (a (q . (unquote func)) (unquote (fix_curry_args list_of_args (q . 1))))))
+
+  ;; (curry sum 50 60) => returns a function that is like (sum 50 60 ...)
+  (defun curry (func . args) (curry_args func args))
+
+  ;; utility function used by `curry_args`
+  (defun fix_curry_args (items core)
+    (if items
+        (qq (c (q . (unquote (f items))) (unquote (fix_curry_args (r items) core))))
+        core
+    )
+  )
+
+  ;; `curry_sha_args`: curry a function, passing in the hash of the original function,
+  ;; and return (NEW_FUNCTION . SHA_TREE_OF_NEW_FUNCTION)
+  ;; Since this function knows the hash of the original function, it doesn't need to recurse into that function;
+  ;; it just uses the memoized hash.
+  ;; If you're going to curry a function multiple times, using this function can save you
+  ;; currying the core muliple times.
+
+  ;; Example:
+  ;;
+  ;; Calculate the sha256tree of `add2`
+  ;;
+  ;; run -i clvm_runtime '(mod (X) (defun add2 (A B) (+ A B)) (include sha256tree.clvm) (sha256tree add2))' 
+  ;; (q . 0x4212e6549edf9ba3ce6bcd8839ecca37b430ec96ddbbae17e5c669d8e18bd17f)
+
+  ;; Now calculate the sha256tree of `add2` when curried with `15`, ie. fixing A to 15
+  ;;
+  ;; run -i clvm_runtime '(mod (X) (defun add2 (A B) (+ A B)) (include curry.clvm) (include sha256tree.clvm) (sha256tree (curry add2 15)) )'
+  ;; (q . 0xf90da10ec9e353929eb8ad3294986874e000fae0b62d5810e58ec6806b2a70ed)
+
+  ;; Now, supposing we know the hash of `add2`, do it again but don't rehash `add2
+  ;;
+  ;; run -i clvm_runtime '(mod (X) (defun add2 (A B) (+ A B)) (include curry.clvm) (include sha256tree.clvm) (curry_sha add2 0x4212e6549edf9ba3ce6bcd8839ecca37b430ec96ddbbae17e5c669d8e18bd17f 15) )'
+  ;; (q (a (q 16 5 11) (c (q . 15) 1)) . 0xf90da10ec9e353929eb8ad3294986874e000fae0b62d5810e58ec6806b2a70ed)
+
+  (defun curry_sha_args (func func_hash args)
+    (c (curry_args func args) (sha256tree_esc (curry_args func_hash args) func_hash))
+  )
+
+  ;; return the hash of the curried function
+
+  (defun curry_sha (func func_hash . args)
+    (curry_sha_args func func_hash args)
+  )
+)
diff --git a/resources/tests/cmdline/tests/clvm_runtime/macros.clvm b/resources/tests/cmdline/tests/clvm_runtime/macros.clvm
@@ -0,0 +1,23 @@
+(
+    ;; boolean and macro
+    ;; This lets you write something like (if (and COND1 COND2 COND3) (do-something) (do-something-else))
+    (defmacro and ARGS
+        (if ARGS
+            (qq (if (unquote (f ARGS))
+                (unquote (c and (r ARGS)))
+                ()
+                ))
+            1)
+    )
+
+    ;; boolean or macro
+    ;; This lets you write something like (if (or COND1 COND2 COND3) (do-something) (do-something-else))
+    (defmacro or ARGS
+        (if ARGS
+            (qq (if (unquote (f ARGS))
+                1
+                (unquote (c or (r ARGS)))
+            ))
+        0)
+    )
+)
diff --git a/resources/tests/cmdline/tests/clvm_runtime/or-1.txt b/resources/tests/cmdline/tests/clvm_runtime/or-1.txt
@@ -0,0 +1,2 @@
+run -i clvm_runtime '(mod (A B) (include "macros.clvm") (or (= 1 0) (= 2 0) (= 3 3)))'
+(q . 1)
diff --git a/resources/tests/cmdline/tests/clvm_runtime/or-2.txt b/resources/tests/cmdline/tests/clvm_runtime/or-2.txt
@@ -0,0 +1,2 @@
+run -i clvm_runtime -i clvm_runtime '(mod (A B) (include "macros.clvm") (or (= 0 1) (= 2 4) (= 3 3)))'
+(q . 1)
diff --git a/resources/tests/cmdline/tests/clvm_runtime/or-3.txt b/resources/tests/cmdline/tests/clvm_runtime/or-3.txt
@@ -0,0 +1,2 @@
+run -i clvm_runtime '(mod (A B) (include "macros.clvm") (or))'
+()
diff --git a/resources/tests/cmdline/tests/clvm_runtime/or-4.txt b/resources/tests/cmdline/tests/clvm_runtime/or-4.txt
@@ -0,0 +1,2 @@
+run -i clvm_runtime '(mod (A . B) (include "macros.clvm") (or (= 1 A) (= 2 B)))'
+(a (i (= (q . 1) 2) (q 1 . 1) (q 2 (i (= (q . 2) 3) (q 1 . 1) ()) 1)) 1)
diff --git a/resources/tests/cmdline/tests/clvm_runtime/or-5.txt b/resources/tests/cmdline/tests/clvm_runtime/or-5.txt
@@ -0,0 +1,2 @@
+run -i clvm_runtime '(a (mod (A . B) (include "macros.clvm") (or (= 1 A) (= 2 B))) @)' "(1 . 2)"
+1
diff --git a/resources/tests/cmdline/tests/clvm_runtime/sha256tree-1.txt b/resources/tests/cmdline/tests/clvm_runtime/sha256tree-1.txt
@@ -0,0 +1,2 @@
+run -i clvm_runtime '(mod X (include sha256tree.clvm) (sha256tree (quote (foo (bar baz 100 (383))))))'
+(q . 0x6eeb86c37c74918fbaa0ba997bd938a63db7fbcc13e6680b1ea2ac8d6d1f7fb2)