Skip to content

Commit e5cf8f0

Browse files
pmerkleplantpmerkleplant
committed
changelog: Updates changelog
1 parent b28a3fa commit e5cf8f0

File tree

4 files changed

+119
-25
lines changed

4 files changed

+119
-25
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,15 @@ All notable changes to this project will be documented in this file.
44

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

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

10+
## [1.0.1] - 2024-08-16
11+
12+
### Fixed
13+
14+
- Missing decimals scaling when reading Uniswap TWAP
15+
916
## [1.0.0] - 2024-06-07
1017

1118
### Added

‎LICENSE‎

Lines changed: 100 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,100 @@
1-
MIT License
2-
3-
Copyright (c) 2023 Chronicle Association
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
11-
12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
1+
Business Source License 1.1
2+
3+
License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
4+
"Business Source License" is a trademark of MariaDB Corporation Ab.
5+
6+
-----------------------------------------------------------------------------
7+
8+
Parameters
9+
10+
Licensor: Chronicle Association
11+
12+
Licensed Work: Aggor
13+
The Licensed Work is (c) 2024 Chronicle Association
14+
15+
Additional Use Grant: Any uses listed and defined at
16+
aggor-license-grants.chronicleassociation.eth
17+
18+
Change Date: The earlier of 2027-06-07 or a date specified at
19+
aggor-license-date.chronicleassociation.eth
20+
21+
Change License: MIT
22+
23+
-----------------------------------------------------------------------------
24+
25+
Terms
26+
27+
The Licensor hereby grants you the right to copy, modify, create derivative
28+
works, redistribute, and make non-production use of the Licensed Work. The
29+
Licensor may make an Additional Use Grant, above, permitting limited
30+
production use.
31+
32+
Effective on the Change Date, or the fourth anniversary of the first publicly
33+
available distribution of a specific version of the Licensed Work under this
34+
License, whichever comes first, the Licensor hereby grants you rights under
35+
the terms of the Change License, and the rights granted in the paragraph
36+
above terminate.
37+
38+
If your use of the Licensed Work does not comply with the requirements
39+
currently in effect as described in this License, you must purchase a
40+
commercial license from the Licensor, its affiliated entities, or authorized
41+
resellers, or you must refrain from using the Licensed Work.
42+
43+
All copies of the original and modified Licensed Work, and derivative works
44+
of the Licensed Work, are subject to this License. This License applies
45+
separately for each version of the Licensed Work and the Change Date may vary
46+
for each version of the Licensed Work released by Licensor.
47+
48+
You must conspicuously display this License on each original or modified copy
49+
of the Licensed Work. If you receive the Licensed Work in original or
50+
modified form from a third party, the terms and conditions set forth in this
51+
License apply to your use of that work.
52+
53+
Any use of the Licensed Work in violation of this License will automatically
54+
terminate your rights under this License for the current and all other
55+
versions of the Licensed Work.
56+
57+
This License does not grant you any right in any trademark or logo of
58+
Licensor or its affiliates (provided that you may use a trademark or logo of
59+
Licensor as expressly required by this License).
60+
61+
TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
62+
AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
63+
EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
64+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
65+
TITLE.
66+
67+
MariaDB hereby grants you permission to use this License’s text to license
68+
your works, and to refer to it using the trademark "Business Source License",
69+
as long as you comply with the Covenants of Licensor below.
70+
71+
-----------------------------------------------------------------------------
72+
73+
Covenants of Licensor
74+
75+
In consideration of the right to use this License’s text and the "Business
76+
Source License" name and trademark, Licensor covenants to MariaDB, and to all
77+
other recipients of the licensed work to be provided by Licensor:
78+
79+
1. To specify as the Change License the GPL Version 2.0 or any later version,
80+
or a license that is compatible with GPL Version 2.0 or a later version,
81+
where "compatible" means that software provided under the Change License can
82+
be included in a program with software provided under GPL Version 2.0 or a
83+
later version. Licensor may specify additional Change Licenses without
84+
limitation.
85+
86+
2. To either: (a) specify an additional grant of rights to use that does not
87+
impose any additional restriction on the right granted in this License, as
88+
the Additional Use Grant; or (b) insert the text "None".
89+
90+
3. To specify a Change Date.
91+
92+
4. Not to modify this License in any other way.
93+
94+
-----------------------------------------------------------------------------
95+
96+
Notice
97+
98+
The Business Source License (this document, or the "License") is not an Open
99+
Source license. However, the Licensed Work will eventually be made available
100+
under an Open Source License, as stated in this License.

‎README.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<img src="./assets/logo.png"/>
22

3-
[![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)
3+
[![Unit Tests](https://github.com/chronicleprotocol/aggor/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/chronicleprotocol/aggor/actions/workflows/unit-tests.yml)
44

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

@@ -43,3 +43,11 @@ $ forge fmt [--check]
4343
- [chronicleprotocol/chronicle-std@v2](https://github.com/chronicleprotocol/chronicle-std/tree/v2)
4444
- [uniswap/[email protected]](https://github.com/Uniswap/v3-periphery/tree/0.8)
4545
- [uniswap/[email protected]](https://github.com/Uniswap/v3-core/tree/0.8)
46+
47+
## Licensing
48+
49+
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`:
50+
51+
- All files in `src/libs/` may also be licensed under MIT (as indicated in their SPDX headers)
52+
- Several Solidity interface files may also be licensed under `MIT` (as indicated in their SPDX headers)
53+
- Several files in `script/` and `test/` may also be licensed under `MIT` (as indicated in their SPDX headers)

‎src/Aggor.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: MIT
1+
// SPDX-License-Identifier: BUSL-1.1
22
pragma solidity ^0.8.16;
33

44
import {Auth} from "chronicle-std/auth/Auth.sol";
@@ -495,8 +495,8 @@ contract Aggor is IAggor, IToll, Auth {
495495
*
496496
* For more info, see docs/Deployment.md.
497497
*/
498-
contract Aggor_BASE_QUOTE_COUNTER is Aggor {
499-
// @todo ^^^^ ^^^^^ ^^^^^^^ Adjust name of Aggor instance
498+
contract ChronicleAggor_BASE_QUOTE_COUNTER is Aggor {
499+
// @todo ^^^^ ^^^^^ ^^^^^^^ Adjust name of Aggor instance
500500
constructor(
501501
address initialAuthed,
502502
address bud_,

0 commit comments

Comments
 (0)