Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare v7.4.0 #124

Merged
merged 1 commit into from
Jul 6, 2023
+19 −12
Merged

Prepare v7.4.0 #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]
### Added
### Changed
### Removed

## [7.4.0]
### Added
- GenerateACI accepts contract interface again
### Changed
- Updated to [Sophia 7.2.1](https://github.com/aeternity/aesophia/blob/master/CHANGELOG.md#721)
- GenerateACI returns ACI formatted the same way as in aesophia\_cli
### Removed
- Increased `idle_timeout` to 10 minutes to allow slow compilations to succeed

## [7.3.0]
### Changed
Expand Down Expand Up @@ -156,8 +162,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Initial HTTP interface: /aci, /compile, /decode-data, /encode-calldata, /version, /api-version, /api
- Docker support (aeternity/aesophia_http)

[Unreleased]: https://github.com/aeternity/aesophia_http/compare/v7.3.0...HEAD
[7.2.0]: https://github.com/aeternity/aesophia_http/compare/v7.2.0...v7.3.0
[Unreleased]: https://github.com/aeternity/aesophia_http/compare/v7.4.0...HEAD
[7.4.0]: https://github.com/aeternity/aesophia_http/compare/v7.3.0...v7.4.0
[7.3.0]: https://github.com/aeternity/aesophia_http/compare/v7.2.0...v7.3.0
[7.2.0]: https://github.com/aeternity/aesophia_http/compare/v7.1.1...v7.2.0
[7.1.1]: https://github.com/aeternity/aesophia_http/compare/v7.1.0...v7.1.1
[7.1.0]: https://github.com/aeternity/aesophia_http/compare/v7.0.1...v7.1.0
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,13 +221,13 @@ version and the whole actual API (paste into any [swagger file generator](https:
```
curl http://localhost:3080/version
{"version":"7.1.0"}
{"version":"7.2.1"}
```

```
curl http://localhost:3080/api-version
{"api-version":"7.2.0"}
{"api-version":"7.3.0"}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we just forgot to count that up in 7.3.0? maybe its a good time to make at least this in sync with the released version

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, let's keep it this way. If there is an update to just the compiler we'd still have to bump the version of the HTTP-compiler but it would be wrong to bump the API version, right?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe we should so http-compiler version == api-version and if there is a breaking api change also consider it a breaking http compiler change, so the http compiler is the api

```

```
Expand Down
2 changes: 1 addition & 1 deletion apps/aesophia_http/src/aesophia_http.app.src
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{application, aesophia_http,
[{description, "HTTP interface for Sophia compiler"},
{vsn, "7.3.0"},
{vsn, "7.4.0"},
{registered, []},
{mod, { aesophia_http_app, []}},
{applications,
Expand Down
4 changes: 2 additions & 2 deletions apps/aesophia_http/test/aesophia_http_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,8 @@ fate_assembler(_) ->
C = <<"cb_+GZGA6CpNW171TSUfk88PoVv7YslUgxRcOJYKFPRxoGkXArWosC4OZ7+RNZEHwA3ADcAGg6CPwEDP/64F37sADcBBwcBAQCWLwIRRNZEHxFpbml0EbgXfuwRbWFpboIvAIU0LjEuMAANEx2r">>,
_Res = do_get_fate_assembler(C).

-define(API_VERSION, <<"7.2.0">>).
-define(COMPILER_VERSION, <<"7.1.0">>).
-define(API_VERSION, <<"7.3.0">>).
-define(COMPILER_VERSION, <<"7.2.1">>).

compiler_version(_) ->
F = fun({ExpVer, CB}) ->
Expand Down
2 changes: 1 addition & 1 deletion config/swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
swagger: '2.0'
info:
description: 'This is the [Aeternity](https://www.aeternity.com/) compiler API.'
version: 7.2.0
version: 7.3.0
title: Aeternity compiler
termsOfService: 'https://www.aeternity.com/terms/'
contact:
Expand Down
4 changes: 2 additions & 2 deletions rebar.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{aebytecode, {git, "https://github.com/aeternity/aebytecode.git",
{tag, "v3.1.1"}}},
{aesophia, {git, "https://github.com/aeternity/aesophia.git",
{tag, "v7.1.0"}}},
{tag, "v7.2.1"}}},
{eblake2, "1.0.0"},
{jsx, {git, "https://github.com/talentdeficit/jsx.git",
{tag, "v2.11.0"}}},
Expand All @@ -21,7 +21,7 @@
{tag, "2.9.0"}}}
]}.

{relx, [{release, {aesophia_http, "7.3.0"}, [aesophia_http, sasl, aeserialization]},
{relx, [{release, {aesophia_http, "7.4.0"}, [aesophia_http, sasl, aeserialization]},

{sys_config, "./config/sys.config"},
{vm_args, "./config/vm.args"},
Expand Down
2 changes: 1 addition & 1 deletion rebar.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
0},
{<<"aesophia">>,
{git,"https://github.com/aeternity/aesophia.git",
{ref,"311bf495053ee1b2360e776f1989060c525d221b"}},
{ref,"43c8328615ae3752c1e80ea74a9dbade8123e655"}},
0},
{<<"base58">>,
{git,"https://github.com/aeternity/erl-base58.git",
Expand Down