diff --git a/docker/distribution/generic/build.Dockerfile b/docker/distribution/generic/build.Dockerfile index e183fc683..f6c9358e9 100644 --- a/docker/distribution/generic/build.Dockerfile +++ b/docker/distribution/generic/build.Dockerfile @@ -1,6 +1,9 @@ ARG target FROM ocaml/opam2:${target} +ARG ci_job_id +ENV CI_JOB_ID=$ci_job_id + RUN opam switch 4.07 && eval $(opam env) USER root @@ -26,7 +29,7 @@ RUN opam update # Install ligo RUN sh scripts/install_vendors_deps.sh -RUN opam install -y ./src +RUN opam install -y . # Use the ligo binary as a default command ENTRYPOINT [ "/home/opam/.opam/4.07/bin/ligo" ] diff --git a/src/ligo.opam b/ligo.opam similarity index 100% rename from src/ligo.opam rename to ligo.opam diff --git a/scripts/distribution/generic/build.sh b/scripts/distribution/generic/build.sh index 7f4a89e9a..49aba15e1 100755 --- a/scripts/distribution/generic/build.sh +++ b/scripts/distribution/generic/build.sh @@ -8,4 +8,4 @@ dockerfile="./docker/distribution/generic/build.Dockerfile" echo "Building LIGO for $target" echo "Using Dockerfile: $dockerfile" echo "Tagging as: $tag_build\n" -docker build --build-arg target="$target" -t "$tag_build" -f "$dockerfile" . \ No newline at end of file +docker build --build-arg ci_job_id="${CI_JOB_ID}" --build-arg target="$target" -t "$tag_build" -f "$dockerfile" . diff --git a/scripts/install_native_dependencies.sh b/scripts/install_native_dependencies.sh index 46e354711..2a0e56903 100755 --- a/scripts/install_native_dependencies.sh +++ b/scripts/install_native_dependencies.sh @@ -14,7 +14,8 @@ then m4 \ libcap \ bubblewrap \ - rsync + rsync \ + git else apt-get update -qq @@ -27,5 +28,6 @@ else m4 \ libcap-dev \ bubblewrap \ - rsync + rsync \ + git fi diff --git a/scripts/install_vendors_deps.sh b/scripts/install_vendors_deps.sh index 3da674636..15f9b47d4 100755 --- a/scripts/install_vendors_deps.sh +++ b/scripts/install_vendors_deps.sh @@ -2,5 +2,5 @@ set -e # Install local dependencies -opam install -y --deps-only --with-test $(find src vendors -name \*.opam) +opam install -y --deps-only --with-test ./ligo.opam $(find vendors -name \*.opam) opam install -y $(find vendors -name \*.opam) diff --git a/scripts/setup_switch.sh b/scripts/setup_switch.sh index ee1179109..8810e4483 100755 --- a/scripts/setup_switch.sh +++ b/scripts/setup_switch.sh @@ -2,5 +2,5 @@ set -e set -x -printf '' | opam switch create . ocaml-base-compiler.4.07.1 # toto ocaml-base-compiler.4.06.1 +printf '' | opam switch create . ocaml-base-compiler.4.07.1 --no-install eval $(opam config env) diff --git a/src/bin/expect_tests/contract_tests.ml b/src/bin/expect_tests/contract_tests.ml index 7492ce39d..1facce834 100644 --- a/src/bin/expect_tests/contract_tests.ml +++ b/src/bin/expect_tests/contract_tests.ml @@ -899,3 +899,16 @@ let%expect_test _ = PAIR ; DIP { DROP 5 } } ; DIP { DROP } } } |}] + +let%expect_test _ = + run_ligo_good [ "compile-contract" ; contract "implicit.mligo" ; "main" ] ; + [%expect {| + { parameter key_hash ; + storage unit ; + code { DUP ; + CAR ; + IMPLICIT_ACCOUNT ; + UNIT ; + NIL operation ; + PAIR ; + DIP { DROP 2 } } } |}] diff --git a/src/passes/operators/operators.ml b/src/passes/operators/operators.ml index 40ee08dd4..abb7a3339 100644 --- a/src/passes/operators/operators.ml +++ b/src/passes/operators/operators.ml @@ -920,8 +920,9 @@ module Compiler = struct | C_UNIT -> ok @@ simple_constant @@ prim I_UNIT | C_BALANCE -> ok @@ simple_constant @@ prim I_BALANCE | C_AMOUNT -> ok @@ simple_constant @@ prim I_AMOUNT - | C_ADDRESS -> ok @@ simple_constant @@ prim I_ADDRESS + | C_ADDRESS -> ok @@ simple_unary @@ prim I_ADDRESS | C_SELF_ADDRESS -> ok @@ simple_constant @@ seq [prim I_SELF; prim I_ADDRESS] + | C_IMPLICIT_ACCOUNT -> ok @@ simple_unary @@ prim I_IMPLICIT_ACCOUNT | C_NOW -> ok @@ simple_constant @@ prim I_NOW | C_CALL -> ok @@ simple_ternary @@ prim I_TRANSFER_TOKENS | C_SOURCE -> ok @@ simple_constant @@ prim I_SOURCE diff --git a/src/test/contracts/address.ligo b/src/test/contracts/address.ligo index 555ab6fe7..2113bc7ac 100644 --- a/src/test/contracts/address.ligo +++ b/src/test/contracts/address.ligo @@ -1 +1,5 @@ -function main (const c: contract(unit)) : address is address(c) +// function main (const c: contract(unit)) : address is address(c) + +function main (const p : key_hash) : address is block { + const c : contract(unit) = implicit_account(p) ; +} with address(c) \ No newline at end of file diff --git a/src/test/contracts/address.mligo b/src/test/contracts/address.mligo index efca3d8b8..3651ea223 100644 --- a/src/test/contracts/address.mligo +++ b/src/test/contracts/address.mligo @@ -1 +1,3 @@ -let main (c: unit contract) : address = Current.address c +let main (p : key_hash) = + let c : unit contract = Current.implicit_account p in + Current.address c \ No newline at end of file diff --git a/src/test/contracts/address.religo b/src/test/contracts/address.religo index 1bab0004b..df1742ce1 100644 --- a/src/test/contracts/address.religo +++ b/src/test/contracts/address.religo @@ -1 +1,4 @@ -let main = (c: contract(unit)): address => Current.address(c); +let main = (p : key_hash) : address => { + let c : contract(unit) = Current.implicit_account(p) ; + Current.address(c) ; +}; diff --git a/src/test/contracts/implicit.mligo b/src/test/contracts/implicit.mligo new file mode 100644 index 000000000..c20f45546 --- /dev/null +++ b/src/test/contracts/implicit.mligo @@ -0,0 +1,3 @@ +let main (p : key_hash) (s : unit) = + let c : unit contract = Current.implicit_account p in + (([] : operation list), unit) \ No newline at end of file diff --git a/src/test/contracts/replaceable_id.ligo b/src/test/contracts/replaceable_id.ligo new file mode 100644 index 000000000..3b116e69b --- /dev/null +++ b/src/test/contracts/replaceable_id.ligo @@ -0,0 +1,35 @@ +// storage type +type storage_t is address; + +// entry points parameter types +type change_addr_pt is address + +type message_t is list (operation) ; +type pass_message_pt is (unit -> message_t) + +type contract_return_t is (list(operation) * storage_t) + +type entry_point_t is +| Change_address of change_addr_pt +| Pass_message of pass_message_pt + +function change_address (const param : change_addr_pt; + const s : storage_t) : contract_return_t is + begin + if sender =/= s then failwith("Unauthorized sender") + else skip +end with ((nil : list(operation)), param) + +function pass_message ( const param: pass_message_pt; + const s : storage_t ) : contract_return_t is + begin + if sender =/= s then failwith("Unauthorized sender") else skip ; + var message : pass_message_pt := param ; +end with (param(unit),s) + +function main(const param : entry_point_t; const s : storage_t) : contract_return_t is +block {skip} with + case param of + | Change_address (p) -> change_address(p,s) + | Pass_message (p) -> pass_message(p,s) +end \ No newline at end of file diff --git a/src/test/integration_tests.ml b/src/test/integration_tests.ml index 921a6a376..14cc41e23 100644 --- a/src/test/integration_tests.ml +++ b/src/test/integration_tests.ml @@ -1624,17 +1624,26 @@ let balance_constant_religo () : unit result = expect_eq program "main" input expected +let addr_test program = + let open Proto_alpha_utils.Memory_proto_alpha in + let addr = Protocol.Alpha_context.Contract.to_b58check @@ + (List.nth dummy_environment.identities 0).implicit_contract in + let open Tezos_crypto in + let key_hash = Signature.Public_key_hash.to_b58check @@ + (List.nth dummy_environment.identities 0).public_key_hash in + expect_eq program "main" (e_key_hash key_hash) (e_address addr) + let address () : unit result = - let%bind _ = type_file "./contracts/address.ligo" in - ok () + let%bind program = type_file "./contracts/address.ligo" in + addr_test program let address_mligo () : unit result = - let%bind _ = mtype_file "./contracts/address.mligo" in - ok () + let%bind program = mtype_file "./contracts/address.mligo" in + addr_test program let address_religo () : unit result = - let%bind _ = retype_file "./contracts/address.religo" in - ok () + let%bind program = retype_file "./contracts/address.religo" in + addr_test program let self_address () : unit result = diff --git a/src/test/replaceable_id_tests.ml b/src/test/replaceable_id_tests.ml new file mode 100644 index 000000000..ca04640c1 --- /dev/null +++ b/src/test/replaceable_id_tests.ml @@ -0,0 +1,90 @@ +open Trace +open Test_helpers + +let type_file f = + let%bind simplified = Ligo.Compile.Of_source.compile f (Syntax_name "pascaligo") in + let%bind typed,state = Ligo.Compile.Of_simplified.compile simplified in + ok @@ (typed,state) + +let get_program = + let s = ref None in + fun () -> match !s with + | Some s -> ok s + | None -> ( + let%bind program = type_file "./contracts/replaceable_id.ligo" in + s := Some program ; + ok program + ) + +let compile_main () = + let%bind simplified = Ligo.Compile.Of_source.compile "./contracts/replaceable_id.ligo" (Syntax_name "pascaligo") in + let%bind typed_prg,_ = Ligo.Compile.Of_simplified.compile simplified in + let%bind mini_c_prg = Ligo.Compile.Of_typed.compile typed_prg in + let%bind michelson_prg = Ligo.Compile.Of_mini_c.aggregate_and_compile_contract mini_c_prg "main" in + let%bind (_contract: Tezos_utils.Michelson.michelson) = + (* fails if the given entry point is not a valid contract *) + Ligo.Compile.Of_mini_c.build_contract michelson_prg in + ok () +open Ast_simplified + +let empty_op_list = + (e_typed_list [] t_operation) +let empty_message = e_lambda (Var.of_name "arguments") + (Some t_unit) (Some (t_list t_operation)) + empty_op_list + +let storage id = e_address @@ addr id +let entry_change_addr id = e_constructor "Change_address" + @@ e_address @@ addr @@ id +let entry_pass_message = e_constructor "Pass_message" + @@ empty_message + +let change_addr_success () = + let%bind program,_ = get_program () in + let init_storage = storage 1 in + let param = entry_change_addr 2 in + let options = + let source = contract 1 in + Proto_alpha_utils.Memory_proto_alpha.make_options ~source () in + expect_eq ~options program "main" + (e_pair param init_storage) (e_pair empty_op_list (storage 2)) + +let change_addr_fail () = + let%bind program,_ = get_program () in + let init_storage = storage 1 in + let param = entry_change_addr 2 in + let options = + let source = contract 3 in + Proto_alpha_utils.Memory_proto_alpha.make_options ~source () in + let exp_failwith = "Unauthorized sender" in + expect_string_failwith ~options program "main" + (e_pair param init_storage) exp_failwith + +let pass_message_success () = + let%bind program,_ = get_program () in + let init_storage = storage 1 in + let param = entry_pass_message in + let options = + let source = contract 1 in + Proto_alpha_utils.Memory_proto_alpha.make_options ~source () in + expect_eq ~options program "main" + (e_pair param init_storage) (e_pair empty_op_list init_storage) + +let pass_message_fail () = + let%bind program,_ = get_program () in + let init_storage = storage 1 in + let param = entry_pass_message in + let options = + let source = contract 2 in + Proto_alpha_utils.Memory_proto_alpha.make_options ~source () in + let exp_failwith = "Unauthorized sender" in + expect_string_failwith ~options program "main" + (e_pair param init_storage) exp_failwith + +let main = test_suite "Replaceable ID" [ + test "compile" compile_main ; + test "change_addr_success" change_addr_success ; + test "change_addr_fail" change_addr_fail ; + test "pass_message_success" pass_message_success ; + test "pass_message_fail" pass_message_fail ; + ] diff --git a/src/test/test.ml b/src/test/test.ml index 4db386e5e..b1cafc9cf 100644 --- a/src/test/test.ml +++ b/src/test/test.ml @@ -12,5 +12,6 @@ let () = Vote_tests.main ; Multisig_tests.main ; Multisig_v2_tests.main ; + Replaceable_id_tests.main ; ] ; ()