Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fetch-depth: 1

- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
Expand All @@ -23,7 +23,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v1
with:
node-version: "16.x"
node-version: "18.x"

- name: Install dependencies
run: yarn --frozen-lockfile
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fetch-depth: 1

- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
Expand All @@ -26,7 +26,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v1
with:
node-version: "16.x"
node-version: "18.x"

- name: Install dependencies
run: yarn --frozen-lockfile
Expand All @@ -46,7 +46,7 @@ jobs:
fetch-depth: 1

- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
Expand All @@ -56,7 +56,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v1
with:
node-version: "16.x"
node-version: "18.x"

- name: Install dependencies
run: yarn --frozen-lockfile
Expand All @@ -76,15 +76,15 @@ jobs:
fetch-depth: 1

- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
path: "**/node_modules"
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}

- name: Cache hardhat network fork
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-hardhat-network-fork
with:
Expand All @@ -94,7 +94,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v1
with:
node-version: "16.x"
node-version: "18.x"

- name: Install dependencies
run: yarn --frozen-lockfile
Expand Down
6 changes: 3 additions & 3 deletions BUG_BOUNTY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Mean Finance Bug Bounty
# Balmy Bug Bounty

Mean Finance ImmuneFi bug bounty program is focused on the prevention of negative impacts to the Mean Finance ecosystem, which currently covers our smart contracts and integrations. As such, all bug disclosures must be done through ImmuneFi's platform.
Balmy ImmuneFi bug bounty program is focused on the prevention of negative impacts to the Balmy ecosystem, which currently covers our smart contracts and integrations. As such, all bug disclosures must be done through ImmuneFi's platform.

**Further details and bounty values can be found here**: https://immunefi.com/bounty/meanfinance/
**Further details and bounty values can be found here**: https://immunefi.com/bounty/balmy/
6 changes: 3 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.

Parameters

Licensor: Mean Finance Labs
Licensor: Balmy Labs

Licensed Work: Mean Finance DCA V2
The Licensed Work is (c) 2021 Mean Finance Labs
Licensed Work: Balmy DCA V2
The Licensed Work is (c) 2021 Balmy Labs

Additional Use Grant: Any uses listed and defined at
license-grants.mean-finance.eth
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# DCA V2

[![Lint](https://github.com/Mean-Finance/dca-v2-core/actions/workflows/lint.yml/badge.svg)](https://github.com/Mean-Finance/dca-v2-core/actions/workflows/lint.yml)
[![Tests (unit, integration, e2e)](https://github.com/Mean-Finance/dca-v2-core/actions/workflows/tests.yml/badge.svg)](https://github.com/Mean-Finance/dca-v2-core/actions/workflows/tests.yml)
[![Lint](https://github.com/Balmy-protocol/dca-v2-core/actions/workflows/lint.yml/badge.svg)](https://github.com/Balmy-protocol/dca-v2-core/actions/workflows/lint.yml)
[![Tests (unit, integration, e2e)](https://github.com/Balmy-protocol/dca-v2-core/actions/workflows/tests.yml/badge.svg)](https://github.com/Balmy-protocol/dca-v2-core/actions/workflows/tests.yml)
[![npm version](https://img.shields.io/npm/v/@mean-finance/dca-v2-core/latest.svg)](https://www.npmjs.com/package/@mean-finance/dca-v2-core/v/latest)

This repository contains the core smart contracts for the DCA V2 Protocol.
Expand All @@ -16,20 +16,20 @@ This repository is subject to the DCA V2 bug bounty program, per the terms defin

## 📖 Docs

Check our docs at [docs.mean.finance](https://docs.mean.finance)
Check our docs at [docs.balmy.xyz](https://docs.balmy.xyz)

## 📦 NPM/YARN Package

- NPM Installation

```bash
npm install @mean-finance/dca-v2-core
npm install @balmy/dca-v2-core
```

- Yarn installation

```bash
yarn add @mean-finance/dca-v2-core
yarn add @balmy/dca-v2-core
```

## 👨‍💻 Development environment
Expand Down
4 changes: 2 additions & 2 deletions contracts/DCAPermissionsManager/DCAPermissionsManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ contract DCAPermissionsManager is ERC721, EIP712, Governable, IDCAPermissionMana
uint256 internal _burnCounter;

constructor(address _governor, IDCAHubPositionDescriptor _descriptor)
ERC721('Mean Finance - DCA Position', 'MF-DCA-P')
EIP712('Mean Finance - DCA Position', '2')
ERC721('Balmy - DCA Position', 'BALMY-DCA-P')
EIP712('Balmy - DCA Position', '2')
Governable(_governor)
{
if (address(_descriptor) == address(0)) revert ZeroAddress();
Expand Down
2 changes: 1 addition & 1 deletion deploy/001_permission_manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const deployFunction: DeployFunction = async function (hre: HardhatRuntimeEnviro
await deployThroughDeterministicFactory({
deployer,
name: 'PermissionsManager',
salt: 'MF-DCAV2-PermissionsManager-V1',
salt: 'BALMY-DCAV2-PermissionsManager-V1',
contract: 'contracts/DCAPermissionsManager/DCAPermissionsManager.sol:DCAPermissionsManager',
bytecode,
constructorArgs: {
Expand Down
2 changes: 1 addition & 1 deletion deploy/002_timelock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const deployFunction: DeployFunction = async function (hre: HardhatRuntimeEnviro
await deployThroughDeterministicFactory({
deployer,
name: 'Timelock',
salt: 'MF-DCAV2-Timelock-V1',
salt: 'BALMY-DCAV2-Timelock-V1',
contract: TimelockController,
bytecode: TimelockController.bytecode,
constructorArgs: {
Expand Down
2 changes: 1 addition & 1 deletion deploy/003_hub.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const deployFunction: DeployFunction = async function (hre: HardhatRuntimeEnviro
const deployment = await deployThroughDeterministicFactory({
deployer,
name: 'DCAHub',
salt: 'MF-DCAV2-DCAHub-V1',
salt: 'BALMY-DCAV2-DCAHub-V1',
contract: 'contracts/DCAHub/DCAHub.sol:DCAHub',
bytecode,
constructorArgs: {
Expand Down
17 changes: 9 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
{
"name": "@mean-finance/dca-v2-core",
"name": "@balmy/dca-v2-core",
"version": "3.4.0",
"description": "Core smart contracts of DCA v2 by mean.finance",
"description": "Core smart contracts of DCA v2 by balmy.xyz",
"keywords": [
"ethereum",
"smart",
"contracts",
"mean",
"dca"
"dca",
"balmy"
],
"homepage": "https://mean.finance",
"homepage": "https://balmy.xyz",
"bugs": {
"url": "https://github.com/Mean-Finance/dca-v2-core/issues"
"url": "https://github.com/Balmy-protocol/dca-v2-core/issues"
},
"repository": {
"type": "git",
"url": "git+https://github.com/Mean-Finance/dca-v2-core.git"
"url": "git+https://github.com/Balmy-protocol/dca-v2-core.git"
},
"license": "BUSL-1.1",
"main": "dist",
Expand Down Expand Up @@ -92,7 +93,7 @@
"dotenv": "16.0.0",
"ethereum-waffle": "3.4.4",
"ethers": "5.6.5",
"hardhat": "2.9.3",
"hardhat": "2.23.0",
"hardhat-contract-sizer": "2.0.3",
"hardhat-gas-reporter": "1.0.8",
"hardhat-preprocessor": "0.1.4",
Expand Down Expand Up @@ -137,7 +138,7 @@
{
"name": "Nicolás Chamo",
"url": "https://github.com/nchamo",
"email": "nchamo@mean.finance"
"email": "nchamo@balmy.xyz"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ describe('DCAHubPositionDescriptor', () => {
const result4 = await DCAPermissionsManager.tokenURI(tokenId);
const { name: name4, description: description4, image: image4 } = extractJSONFromURI(result4);

expect(name1).to.equal('Mean Finance DCA - Hourly - WETH ➔ USDC');
expect(name1).to.equal('Balmy DCA - Hourly - WETH ➔ USDC');
expect(description1).to.equal(
`This NFT represents a DCA position in Mean Finance, where WETH will be swapped for USDC. The owner of this NFT can modify or redeem the position.\n\nWETH Address: ${WETH.address.toLowerCase()}\nUSDC Address: ${USDC.address.toLowerCase()}\nSwap interval: Hourly\nToken ID: 1\n\n⚠️ DISCLAIMER: Due diligence is imperative when assessing this NFT. Make sure token addresses match the expected tokens, as token symbols may be imitated.`
`This NFT represents a DCA position in Balmy, where WETH will be swapped for USDC. The owner of this NFT can modify or redeem the position.\n\nWETH Address: ${WETH.address.toLowerCase()}\nUSDC Address: ${USDC.address.toLowerCase()}\nSwap interval: Hourly\nToken ID: 1\n\n⚠️ DISCLAIMER: Due diligence is imperative when assessing this NFT. Make sure token addresses match the expected tokens, as token symbols may be imitated.`
);
expect(name2).to.equal(name1);
expect(name3).to.equal(name1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { fromRpcSig } from 'ethereumjs-util';
import { BigNumberish } from 'ethers';

contract('DCAPermissionsManager', () => {
const NFT_NAME = 'Mean Finance - DCA Position';
const NFT_NAME = 'Balmy - DCA Position';
const NFT_DESCRIPTOR = wallet.generateRandomAddress();
let hub: SignerWithAddress, governor: SignerWithAddress;
let DCAPermissionsManagerFactory: DCAPermissionsManagerMock__factory;
Expand Down Expand Up @@ -55,7 +55,7 @@ contract('DCAPermissionsManager', () => {
});
then('symbol is correct', async () => {
const symbol = await DCAPermissionsManager.symbol();
expect(symbol).to.equal('MF-DCA-P');
expect(symbol).to.equal('BALMY-DCA-P');
});
then('burn counter starts at 0', async () => {
expect(await DCAPermissionsManager.burnCounter()).to.equal(0);
Expand Down
Loading
Loading