diff --git a/.drom b/.drom index 01041a6..40945e5 100644 --- a/.drom +++ b/.drom @@ -2,17 +2,17 @@ # hash of toml configuration files # used for generation of all files -0e9b66abb305f418e9c6701323bd855d:. +eaf0d0bd408cc31f56f28cae7aabc539:. # end context for . # begin context for .github/workflows/doc-deploy.yml # file .github/workflows/doc-deploy.yml -f98976f98b0215fd0f98718976ab0756:.github/workflows/doc-deploy.yml +e5c654f9557b31aa070c7ef28060ae9e:.github/workflows/doc-deploy.yml # end context for .github/workflows/doc-deploy.yml # begin context for .github/workflows/workflow.yml # file .github/workflows/workflow.yml -567136f433695a73febc90f5a2a69967:.github/workflows/workflow.yml +6d0739e985277a2c6ee4e7f98ea45b24:.github/workflows/workflow.yml # end context for .github/workflows/workflow.yml # begin context for .gitignore @@ -37,7 +37,7 @@ a8d1bcd6f62c6b813b77d3ff8959d8d2:.ocamlformat-ignore # begin context for CHANGES.md # file CHANGES.md -5aadc83c9bdcbe1346be4cbe5e2dfea7:CHANGES.md +d15a796a0dc7cb31a6a917998e7f5f8e:CHANGES.md # end context for CHANGES.md # begin context for LICENSE.md @@ -97,12 +97,12 @@ c8281f46ba9a11d0b61bc8ef67eaa357:docs/style.css # begin context for dune-project # file dune-project -4eda589dedb472f06b76ba8e66710e52:dune-project +99b59bc5699daeee756ea487634c9e65:dune-project # end context for dune-project # begin context for ez_hash.opam # file ez_hash.opam -961240618ebc27ee726b8e96918af860:ez_hash.opam +ebb17ef384f5f507750f9dbf99bd4634:ez_hash.opam # end context for ez_hash.opam # begin context for scripts/after.sh @@ -122,27 +122,27 @@ bb3a9d286f0dc64021db4194427263ee:scripts/copy-bin.sh # begin context for solidity-alcotest.opam # file solidity-alcotest.opam -f6e0864e7e9dbb168402f42292970f8a:solidity-alcotest.opam +46c7ae6bddb0890e6e4aef40dcd859f6:solidity-alcotest.opam # end context for solidity-alcotest.opam # begin context for solidity-common.opam # file solidity-common.opam -f80014505a175a739b826cca6d89072c:solidity-common.opam +7ee642e4fb70f30e8d144390bc3fb0d8:solidity-common.opam # end context for solidity-common.opam # begin context for solidity-parser.opam # file solidity-parser.opam -b198f4ea160926c6b9bf02ea7c8c2f0a:solidity-parser.opam +6940d87ea57a5ed719e6d8df015d6783:solidity-parser.opam # end context for solidity-parser.opam # begin context for solidity-test.opam # file solidity-test.opam -b7b33c746586515a74b432329603ba11:solidity-test.opam +fe2781ece8eb3681fcd92d1dcff3155c:solidity-test.opam # end context for solidity-test.opam # begin context for solidity-typechecker.opam # file solidity-typechecker.opam -277a8cedf9280f8d375eb00bcd7305c4:solidity-typechecker.opam +dbf3d1e4092a9ccd80a55946c961ec44:solidity-typechecker.opam # end context for solidity-typechecker.opam # begin context for sphinx/_static/css/fixes.css @@ -197,7 +197,7 @@ e86f9a67236dac57aaae3ca819cb7dbb:src/ocaml-solidity/package.toml # begin context for src/solidity-alcotest/version.mlt # file src/solidity-alcotest/version.mlt -06d7b97cb774143de55aa8972a6d084d:src/solidity-alcotest/version.mlt +275d671a55d9bee3b649991bd4823c43:src/solidity-alcotest/version.mlt # end context for src/solidity-alcotest/version.mlt # begin context for src/solidity-common/dune @@ -217,7 +217,7 @@ e86f9a67236dac57aaae3ca819cb7dbb:src/ocaml-solidity/package.toml # begin context for src/solidity-common/version.mlt # file src/solidity-common/version.mlt -06d7b97cb774143de55aa8972a6d084d:src/solidity-common/version.mlt +275d671a55d9bee3b649991bd4823c43:src/solidity-common/version.mlt # end context for src/solidity-common/version.mlt # begin context for src/solidity-parser/dune @@ -237,7 +237,7 @@ be413a351ddaf3cdf0d44e91ad35680e:src/solidity-parser/main.ml # begin context for src/solidity-parser/version.mlt # file src/solidity-parser/version.mlt -06d7b97cb774143de55aa8972a6d084d:src/solidity-parser/version.mlt +275d671a55d9bee3b649991bd4823c43:src/solidity-parser/version.mlt # end context for src/solidity-parser/version.mlt # begin context for src/solidity-test/dune @@ -247,7 +247,7 @@ be413a351ddaf3cdf0d44e91ad35680e:src/solidity-parser/main.ml # begin context for src/solidity-test/version.mlt # file src/solidity-test/version.mlt -06d7b97cb774143de55aa8972a6d084d:src/solidity-test/version.mlt +275d671a55d9bee3b649991bd4823c43:src/solidity-test/version.mlt # end context for src/solidity-test/version.mlt # begin context for src/solidity-typechecker/dune @@ -267,5 +267,5 @@ be413a351ddaf3cdf0d44e91ad35680e:src/solidity-parser/main.ml # begin context for src/solidity-typechecker/version.mlt # file src/solidity-typechecker/version.mlt -06d7b97cb774143de55aa8972a6d084d:src/solidity-typechecker/version.mlt +275d671a55d9bee3b649991bd4823c43:src/solidity-typechecker/version.mlt # end context for src/solidity-typechecker/version.mlt diff --git a/.github/workflows/doc-deploy.yml b/.github/workflows/doc-deploy.yml index 9be6278..ce2d31e 100644 --- a/.github/workflows/doc-deploy.yml +++ b/.github/workflows/doc-deploy.yml @@ -20,9 +20,9 @@ jobs: path: ~/.opam key: v1-Linux-ocaml-solidity-4.10.0-${{ hashFiles('*.opam') }} - name: setup-ocaml - uses: avsm/setup-ocaml@v1 + uses: avsm/setup-ocaml@v2 with: - ocaml-version: 4.10.0 + ocaml-compiler: 4.10.0 - name: setup-doc run: | sudo apt install -yqq python3-sphinx python3-sphinx-rtd-theme diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 79e7862..56cc145 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -16,14 +16,14 @@ jobs: os: - ubuntu-latest - macos-latest - ocaml-version: + ocaml-compiler: - 4.10.0 skip_test: - false include: - os: ubuntu-latest - ocaml-version: 4.08.0 + ocaml-compiler: 4.08.0 skip_test: true @@ -38,14 +38,14 @@ jobs: id: cache-opam with: path: ~/.opam - key: v1-${{ runner.os }}-ocaml-solidity-${{ matrix.ocaml-version }}-${{ hashFiles('*.opam') }} + key: v2-${{ runner.os }}-ocaml-solidity-${{ matrix.ocaml-compiler }}-${{ hashFiles('*.opam') }} # restore-keys: | -# v1-${{ runner.os }}-opam-${{ matrix.ocaml-version }}- +# v2-${{ runner.os }}-opam-${{ matrix.ocaml-compiler }}- - - name: Use OCaml ${{ matrix.ocaml-version }} - uses: avsm/setup-ocaml@v1 + - name: Use OCaml ${{ matrix.ocaml-compiler }} + uses: avsm/setup-ocaml@v2 with: - ocaml-version: ${{ matrix.ocaml-version }} + ocaml-compiler: ${{ matrix.ocaml-compiler }} - name: Set git user run: | @@ -80,4 +80,4 @@ jobs: - name: test source is well formatted run: make fmt continue-on-error: true - if: matrix.ocaml-version == '4.10.0' && matrix.os == 'ubuntu-latest' + if: matrix.ocaml-compiler == '4.10.0' && matrix.os == 'ubuntu-latest' diff --git a/CHANGES.md b/CHANGES.md index 957a44e..7e0b203 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -## v0.1.0 ( 2021-08-25 ) +## v0.1.0 ( 2021-09-06 ) * Initial commit diff --git a/drom.toml b/drom.toml index db12218..4429ddf 100644 --- a/drom.toml +++ b/drom.toml @@ -15,7 +15,7 @@ license = "LGPL2" min-edition = "4.08.0" name = "ocaml-solidity" synopsis = "The ocaml-solidity project" -version = "0.3.5" +version = "0.3.6" # keys that you could also define: # odoc-target = "...odoc-target..." diff --git a/dune-project b/dune-project index dac89a1..3b690e8 100644 --- a/dune-project +++ b/dune-project @@ -3,7 +3,7 @@ (name ocaml-solidity) (allow_approximate_merlin) (generate_opam_files false) -(version 0.3.5) +(version 0.3.6) (formatting (enabled_for ocaml reason)) (using menhir 2.0) diff --git a/ez_hash.opam b/ez_hash.opam index d5ff75a..3db23a7 100644 --- a/ez_hash.opam +++ b/ez_hash.opam @@ -2,7 +2,7 @@ # Do not modify, or add to the `skip` field of `drom.toml`. opam-version: "2.0" name: "ez_hash" -version: "0.3.5" +version: "0.3.6" license: "LGPL-2.1-only with OCaml-LGPL-linking-exception" synopsis: "Hash functions: sha3, sha256, blake2b" description: """ diff --git a/solidity-alcotest.opam b/solidity-alcotest.opam index 14e9b4f..1ec3ad6 100644 --- a/solidity-alcotest.opam +++ b/solidity-alcotest.opam @@ -2,7 +2,7 @@ # Do not modify, or add to the `skip` field of `drom.toml`. opam-version: "2.0" name: "solidity-alcotest" -version: "0.3.5" +version: "0.3.6" license: "LGPL-2.1-only with OCaml-LGPL-linking-exception" synopsis: "The ocaml-solidity project" description: """ diff --git a/solidity-common.opam b/solidity-common.opam index 9e208f3..45d7f4e 100644 --- a/solidity-common.opam +++ b/solidity-common.opam @@ -2,7 +2,7 @@ # Do not modify, or add to the `skip` field of `drom.toml`. opam-version: "2.0" name: "solidity-common" -version: "0.3.5" +version: "0.3.6" license: "LGPL-2.1-only with OCaml-LGPL-linking-exception" synopsis: "The ocaml-solidity project" description: """ diff --git a/solidity-parser.opam b/solidity-parser.opam index af098da..793e642 100644 --- a/solidity-parser.opam +++ b/solidity-parser.opam @@ -2,7 +2,7 @@ # Do not modify, or add to the `skip` field of `drom.toml`. opam-version: "2.0" name: "solidity-parser" -version: "0.3.5" +version: "0.3.6" license: "LGPL-2.1-only with OCaml-LGPL-linking-exception" synopsis: "The ocaml-solidity project" description: """ diff --git a/solidity-test.opam b/solidity-test.opam index efda030..283210d 100644 --- a/solidity-test.opam +++ b/solidity-test.opam @@ -2,7 +2,7 @@ # Do not modify, or add to the `skip` field of `drom.toml`. opam-version: "2.0" name: "solidity-test" -version: "0.3.5" +version: "0.3.6" license: "LGPL-2.1-only with OCaml-LGPL-linking-exception" synopsis: "The ocaml-solidity project" description: """ diff --git a/solidity-typechecker.opam b/solidity-typechecker.opam index bd5abd2..049e36e 100644 --- a/solidity-typechecker.opam +++ b/solidity-typechecker.opam @@ -2,7 +2,7 @@ # Do not modify, or add to the `skip` field of `drom.toml`. opam-version: "2.0" name: "solidity-typechecker" -version: "0.3.5" +version: "0.3.6" license: "LGPL-2.1-only with OCaml-LGPL-linking-exception" synopsis: "The ocaml-solidity project" description: """ diff --git a/src/solidity-alcotest/version.mlt b/src/solidity-alcotest/version.mlt index 040165c..7ae3c0f 100644 --- a/src/solidity-alcotest/version.mlt +++ b/src/solidity-alcotest/version.mlt @@ -13,7 +13,7 @@ let query cmd = let commit_hash = query "git show -s --pretty=format:%H" let commit_date = query "git show -s --pretty=format:%ci" -let version = "0.3.5" +let version = "0.3.6" let version = match commit_hash with | Some commit_hash -> diff --git a/src/solidity-common/version.mlt b/src/solidity-common/version.mlt index 040165c..7ae3c0f 100644 --- a/src/solidity-common/version.mlt +++ b/src/solidity-common/version.mlt @@ -13,7 +13,7 @@ let query cmd = let commit_hash = query "git show -s --pretty=format:%H" let commit_date = query "git show -s --pretty=format:%ci" -let version = "0.3.5" +let version = "0.3.6" let version = match commit_hash with | Some commit_hash -> diff --git a/src/solidity-parser/version.mlt b/src/solidity-parser/version.mlt index 040165c..7ae3c0f 100644 --- a/src/solidity-parser/version.mlt +++ b/src/solidity-parser/version.mlt @@ -13,7 +13,7 @@ let query cmd = let commit_hash = query "git show -s --pretty=format:%H" let commit_date = query "git show -s --pretty=format:%ci" -let version = "0.3.5" +let version = "0.3.6" let version = match commit_hash with | Some commit_hash -> diff --git a/src/solidity-test/version.mlt b/src/solidity-test/version.mlt index 040165c..7ae3c0f 100644 --- a/src/solidity-test/version.mlt +++ b/src/solidity-test/version.mlt @@ -13,7 +13,7 @@ let query cmd = let commit_hash = query "git show -s --pretty=format:%H" let commit_date = query "git show -s --pretty=format:%ci" -let version = "0.3.5" +let version = "0.3.6" let version = match commit_hash with | Some commit_hash -> diff --git a/src/solidity-typechecker/solidity_type_conv.ml b/src/solidity-typechecker/solidity_type_conv.ml index 4221c86..6e52e27 100644 --- a/src/solidity-typechecker/solidity_type_conv.ml +++ b/src/solidity-typechecker/solidity_type_conv.ml @@ -250,6 +250,8 @@ let rec explicitly_convertible ~from ~to_ : type_ option = | TEnum _, (TInt _ | TUint _) -> Some (to_) + | TFixBytes 1, TUint 8 when !for_freeton -> Some (to_) + | _ -> if_true (Solidity_type.same_type from to_) diff --git a/src/solidity-typechecker/version.mlt b/src/solidity-typechecker/version.mlt index 040165c..7ae3c0f 100644 --- a/src/solidity-typechecker/version.mlt +++ b/src/solidity-typechecker/version.mlt @@ -13,7 +13,7 @@ let query cmd = let commit_hash = query "git show -s --pretty=format:%H" let commit_date = query "git show -s --pretty=format:%ci" -let version = "0.3.5" +let version = "0.3.6" let version = match commit_hash with | Some commit_hash ->