Skip to content

Commit

Permalink
changelog: Updates changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
pmerkleplant authored Aug 28, 2024
1 parent b28a3fa commit b4947bf
Show file tree
Hide file tree
Showing 5 changed files with 121 additions and 27 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,15 @@ All notable changes to this project will be documented in this file.

The format is based on [Common Changelog](https://common-changelog.org/).

[1.0.1]: https://github.com/chronicleprotocol/aggor/releases/tag/v1.0.1
[1.0.0]: https://github.com/chronicleprotocol/aggor/releases/tag/v1.0.0

## [1.0.1] - 2024-08-16

### Fixed

- Missing decimals scaling when reading Uniswap TWAP

## [1.0.0] - 2024-06-07

### Added
Expand Down
121 changes: 100 additions & 21 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,100 @@
MIT License

Copyright (c) 2023 Chronicle Association

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Business Source License 1.1

License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
"Business Source License" is a trademark of MariaDB Corporation Ab.

-----------------------------------------------------------------------------

Parameters

Licensor: Chronicle Association

Licensed Work: Aggor
The Licensed Work is (c) 2024 Chronicle Association

Additional Use Grant: Any uses listed and defined at
aggor-license-grants.chronicleassociation.eth

Change Date: The earlier of 2027-06-07 or a date specified at
aggor-license-date.chronicleassociation.eth

Change License: MIT

-----------------------------------------------------------------------------

Terms

The Licensor hereby grants you the right to copy, modify, create derivative
works, redistribute, and make non-production use of the Licensed Work. The
Licensor may make an Additional Use Grant, above, permitting limited
production use.

Effective on the Change Date, or the fourth anniversary of the first publicly
available distribution of a specific version of the Licensed Work under this
License, whichever comes first, the Licensor hereby grants you rights under
the terms of the Change License, and the rights granted in the paragraph
above terminate.

If your use of the Licensed Work does not comply with the requirements
currently in effect as described in this License, you must purchase a
commercial license from the Licensor, its affiliated entities, or authorized
resellers, or you must refrain from using the Licensed Work.

All copies of the original and modified Licensed Work, and derivative works
of the Licensed Work, are subject to this License. This License applies
separately for each version of the Licensed Work and the Change Date may vary
for each version of the Licensed Work released by Licensor.

You must conspicuously display this License on each original or modified copy
of the Licensed Work. If you receive the Licensed Work in original or
modified form from a third party, the terms and conditions set forth in this
License apply to your use of that work.

Any use of the Licensed Work in violation of this License will automatically
terminate your rights under this License for the current and all other
versions of the Licensed Work.

This License does not grant you any right in any trademark or logo of
Licensor or its affiliates (provided that you may use a trademark or logo of
Licensor as expressly required by this License).

TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
TITLE.

MariaDB hereby grants you permission to use this License’s text to license
your works, and to refer to it using the trademark "Business Source License",
as long as you comply with the Covenants of Licensor below.

-----------------------------------------------------------------------------

Covenants of Licensor

In consideration of the right to use this License’s text and the "Business
Source License" name and trademark, Licensor covenants to MariaDB, and to all
other recipients of the licensed work to be provided by Licensor:

1. To specify as the Change License the GPL Version 2.0 or any later version,
or a license that is compatible with GPL Version 2.0 or a later version,
where "compatible" means that software provided under the Change License can
be included in a program with software provided under GPL Version 2.0 or a
later version. Licensor may specify additional Change Licenses without
limitation.

2. To either: (a) specify an additional grant of rights to use that does not
impose any additional restriction on the right granted in this License, as
the Additional Use Grant; or (b) insert the text "None".

3. To specify a Change Date.

4. Not to modify this License in any other way.

-----------------------------------------------------------------------------

Notice

The Business Source License (this document, or the "License") is not an Open
Source license. However, the Licensed Work will eventually be made available
under an Open Source License, as stated in this License.
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<img src="./assets/logo.png"/>

[![Unit Tests](https://github.com/chronicleprotocol/aggor/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/chronicleprotocol/aggor/actions/workflows/unit-tests.yml) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
[![Unit Tests](https://github.com/chronicleprotocol/aggor/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/chronicleprotocol/aggor/actions/workflows/unit-tests.yml)

Aggor is an oracle aggregator distributing trust among different oracle providers. For more info, see [docs/Aggor.md](./docs/Aggor.md).

Expand Down Expand Up @@ -43,3 +43,11 @@ $ forge fmt [--check]
- [chronicleprotocol/chronicle-std@v2](https://github.com/chronicleprotocol/chronicle-std/tree/v2)
- [uniswap/[email protected]](https://github.com/Uniswap/v3-periphery/tree/0.8)
- [uniswap/[email protected]](https://github.com/Uniswap/v3-core/tree/0.8)

## Licensing

The primary license for Aggor is the Business Source License 1.1 (`BUSL-1.1`), see [`LICENSE`](./LICENSE). However, some files are dual licensed under `MIT`:

- All files in `src/libs/` may also be licensed under MIT (as indicated in their SPDX headers)
- Several Solidity interface files may also be licensed under `MIT` (as indicated in their SPDX headers)
- Several files in `script/` and `test/` may also be licensed under `MIT` (as indicated in their SPDX headers)
4 changes: 2 additions & 2 deletions script/Aggor.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import {console2 as console} from "forge-std/console2.sol";
import {IAuth} from "chronicle-std/auth/IAuth.sol";

import {IAggor} from "src/IAggor.sol";
import {Aggor_BASE_QUOTE_COUNTER as Aggor} from "src/Aggor.sol";
// @todo ^^^^ ^^^^^ ^^^^^^^ Adjust name of Aggor instance
import {ChronicleAggor_BASE_QUOTE_COUNTER as Aggor} from "src/Aggor.sol";
// @todo ^^^^ ^^^^^ ^^^^^^^ Adjust name of Aggor instance

/**
* @notice Aggor Management Script
Expand Down
6 changes: 3 additions & 3 deletions src/Aggor.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: BUSL-1.1
pragma solidity ^0.8.16;

import {Auth} from "chronicle-std/auth/Auth.sol";
Expand Down Expand Up @@ -495,8 +495,8 @@ contract Aggor is IAggor, IToll, Auth {
*
* For more info, see docs/Deployment.md.
*/
contract Aggor_BASE_QUOTE_COUNTER is Aggor {
// @todo ^^^^ ^^^^^ ^^^^^^^ Adjust name of Aggor instance
contract ChronicleAggor_BASE_QUOTE_COUNTER is Aggor {
// @todo ^^^^ ^^^^^ ^^^^^^^ Adjust name of Aggor instance
constructor(
address initialAuthed,
address bud_,
Expand Down

0 comments on commit b4947bf

Please sign in to comment.