Skip to content

Commit

Permalink
build: bump solc and v2 core (#244)
Browse files Browse the repository at this point in the history
* build: bump v2-core

* build: bump solc to v0.8.23

* test: update precompiles

* docs: roll v1.1.1

* test: bring back deployment addresess

closes #193

* docs: update 1.1.1 date in changelog

---------

Co-authored-by: andreivladbrg <[email protected]>
  • Loading branch information
PaulRBerg and andreivladbrg authored Dec 20, 2023
1 parent 020e1d5 commit 53e2590
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 18 deletions.
13 changes: 11 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,28 @@ All notable changes to this project will be documented in this file.

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

[1.1.1]: https://github.com/sablier-labs/v2-periphery/compare/v1.1.0...v1.1.1
[1.1.0]: https://github.com/sablier-labs/v2-periphery/compare/v1.0.3...v1.1.0
[1.0.3]: https://github.com/sablier-labs/v2-periphery/compare/v1.0.2...v1.0.3
[1.0.2]: https://github.com/sablier-labs/v2-periphery/compare/v1.0.1...v1.0.2
[1.0.1]: https://github.com/sablier-labs/v2-periphery/compare/v1.0.0...v1.0.1
[1.0.0]: https://github.com/sablier-labs/v2-periphery/releases/tag/v1.0.0

## [1.1.1] - 2023-12-20

### Changed

- Upgrade to V2 Core v1.1.2 ([#244](https://github.com/sablier-labs/v2-periphery/pull/244))
- Use Solidity v0.8.23 ([#244](https://github.com/sablier-labs/v2-periphery/pull/244))

## [1.1.0] - 2023-12-17

### Changed

- **Breaking** Upgrade to V2 Core v1.1.0 ([#191](https://github.com/sablier-labs/v2-periphery/pull/191))
- **Breaking** Upgrade to V2 Core v1.1.1 ([#191](https://github.com/sablier-labs/v2-periphery/pull/191),
[#236](https://github.com/sablier-labs/v2-periphery/pull/236))
- Refactor import paths to use Node.js dependencies([#236](https://github.com/sablier-labs/v2-periphery/pull/236))
- Upgrade Solidity to `0.8.21` ([#187](https://github.com/sablier-labs/v2-periphery/pull/187))
- Use Solidity v0.8.21 ([#187](https://github.com/sablier-labs/v2-periphery/pull/187))

### Added

Expand Down
2 changes: 1 addition & 1 deletion foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
out = "out"
script = "script"
sender = "0x1804c8AB1F12E6bbf3894d4083f33e07309d1f38"
solc = "0.8.21"
solc = "0.8.23"
src = "src"
test = "test"

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@sablier/v2-periphery",
"description": "Peripheral smart contracts for interacting with Sablier V2",
"version": "1.1.0",
"version": "1.1.1",
"author": {
"name": "Sablier Labs Ltd",
"url": "https://sablier.com"
Expand All @@ -12,7 +12,7 @@
"dependencies": {
"@openzeppelin/contracts": "4.9.2",
"@prb/math": "4.0.2",
"@sablier/v2-core": "1.1.1"
"@sablier/v2-core": "1.1.2"
},
"devDependencies": {
"@prb/test": "0.6.4",
Expand Down Expand Up @@ -49,7 +49,7 @@
"web3"
],
"peerDependencies": {
"@sablier/v2-core": "1.1.1"
"@sablier/v2-core": "1.1.2"
},
"publishConfig": {
"access": "public"
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions test/fork/Fork.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
pragma solidity >=0.8.19 <0.9.0;

import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
// import { ISablierV2LockupDynamic } from "@sablier/v2-core/src/interfaces/ISablierV2LockupDynamic.sol";
// import { ISablierV2LockupLinear } from "@sablier/v2-core/src/interfaces/ISablierV2LockupLinear.sol";
import { Precompiles as V2CorePrecompiles } from "@sablier/v2-core/test/utils/Precompiles.sol";
import { ISablierV2LockupDynamic } from "@sablier/v2-core/src/interfaces/ISablierV2LockupDynamic.sol";
import { ISablierV2LockupLinear } from "@sablier/v2-core/src/interfaces/ISablierV2LockupLinear.sol";

import { Fuzzers as V2CoreFuzzers } from "@sablier/v2-core/test/utils/Fuzzers.sol";

Expand All @@ -27,7 +26,7 @@ abstract contract Fork_Test is Base_Test, V2CoreFuzzers {

function setUp() public virtual override {
// Fork Ethereum Mainnet at a specific block number.
vm.createSelectFork({ blockNumber: 17_665_000, urlOrAlias: "mainnet" });
vm.createSelectFork({ blockNumber: 18_821_300, urlOrAlias: "mainnet" });

// Set up the base test contract.
Base_Test.setUp();
Expand Down Expand Up @@ -70,7 +69,7 @@ abstract contract Fork_Test is Base_Test, V2CoreFuzzers {

/// @dev Loads all dependencies pre-deployed on Mainnet.
function loadDependencies() private {
// TODO: update the contract addresses once they are deployed.
(, lockupDynamic, lockupLinear,) = new V2CorePrecompiles().deployCore(users.admin);
lockupDynamic = ISablierV2LockupDynamic(0x7CC7e125d83A581ff438608490Cc0f7bDff79127);
lockupLinear = ISablierV2LockupLinear(0xAFb979d9afAd1aD27C5eFf4E27226E3AB9e5dCC9);
}
}
4 changes: 2 additions & 2 deletions test/utils/Precompiles.sol

Large diffs are not rendered by default.

0 comments on commit 53e2590

Please sign in to comment.