From 1f6dbebdbb5d1125da3bbe4d4be3dc821f0e3e38 Mon Sep 17 00:00:00 2001 From: nikdementev Date: Tue, 6 Jun 2023 14:01:32 +0300 Subject: [PATCH] :recycle: Renaming to zRex --- README.md | 6 +++--- contracts/ACLManager.sol | 2 +- contracts/Account.sol | 2 +- contracts/AddressesProvider.sol | 2 +- contracts/Configurator.sol | 4 ++-- contracts/Connectors.sol | 2 +- contracts/Proxy.sol | 2 +- contracts/Router.sol | 4 ++-- contracts/lib/Errors.sol | 4 ++-- contracts/lib/PercentageMath.sol | 2 +- hardhat.config.ts | 12 +++++++++--- lib/forge-std | 2 +- lib/openzeppelin-contracts | 2 +- remappings.txt | 1 + 14 files changed, 27 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 7a12ebf..1856651 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# NFTxCards +🦖 Contracts [![codecov](https://codecov.io/gh/Flash-Flow/core-contracts/branch/master/graph/badge.svg?token=94VIK7W295)](https://codecov.io/gh/Flash-Flow/core-contracts) ## Overview of the protocol @@ -86,8 +86,8 @@ If the user does not have a token from the list, the flash flow protocol will be ### Configurator -- implements the configuration methods for the FlashFlow protocol. +- implements the configuration methods for the zRex protocol. ### License -Smart contracts for FlashFlow protocol are available under the [MIT License](LICENSE.md). +Smart contracts for zRex protocol are available under the [MIT License](LICENSE.md). diff --git a/contracts/ACLManager.sol b/contracts/ACLManager.sol index f1a8e67..8b518ff 100644 --- a/contracts/ACLManager.sol +++ b/contracts/ACLManager.sol @@ -10,7 +10,7 @@ import { Errors } from './lib/Errors.sol'; /** * @title ACLManager - * @author FlashFlow + * @author zRex * @notice Access Control List Manager. Main registry of system roles and permissions. */ contract ACLManager is AccessControl, IACLManager { diff --git a/contracts/Account.sol b/contracts/Account.sol index 76112c7..6da20e7 100644 --- a/contracts/Account.sol +++ b/contracts/Account.sol @@ -19,7 +19,7 @@ import { IAddressesProvider } from './interfaces/IAddressesProvider.sol'; /** * @title Account - * @author FlashFlow + * @author zRex * @notice Contract used as implimentation user account. * @dev Interaction with contracts is carried out by means of calling the proxy contract. */ diff --git a/contracts/AddressesProvider.sol b/contracts/AddressesProvider.sol index 17fea61..2fccc25 100644 --- a/contracts/AddressesProvider.sol +++ b/contracts/AddressesProvider.sol @@ -8,7 +8,7 @@ import { IAddressesProvider } from './interfaces/IAddressesProvider.sol'; /** * @title AddressesProvider - * @author FlashFlow + * @author zRex * @notice Main registry of addresses part of or connected to the protocol * @dev Acts as factory of proxies, so with right to change its implementations */ diff --git a/contracts/Configurator.sol b/contracts/Configurator.sol index c143417..ebd7fb3 100644 --- a/contracts/Configurator.sol +++ b/contracts/Configurator.sol @@ -13,8 +13,8 @@ import { Errors } from './lib/Errors.sol'; /** * @title Configurator - * @author FlashFlow - * @dev Implements the configuration methods for the FlashFlow protocol + * @author zRex + * @dev Implements the configuration methods for the zRex protocol */ contract Configurator is VersionedInitializable, IConfigurator { /* ============ Constants ============ */ diff --git a/contracts/Connectors.sol b/contracts/Connectors.sol index 5c1191a..c55dd89 100644 --- a/contracts/Connectors.sol +++ b/contracts/Connectors.sol @@ -9,7 +9,7 @@ import { Errors } from './lib/Errors.sol'; /** * @title Connectors - * @author FlashFlow + * @author zRex * @notice Contract to manage and store auxiliary contracts to work with the necessary protocols */ contract Connectors is IConnectors { diff --git a/contracts/Proxy.sol b/contracts/Proxy.sol index fb1c6cb..b72d7d7 100644 --- a/contracts/Proxy.sol +++ b/contracts/Proxy.sol @@ -6,7 +6,7 @@ import { Errors } from './lib/Errors.sol'; /** * @title Proxy - * @author FlashFlow + * @author zRex * @notice Contract used as proxy for the user account. * @dev This abstract contract provides a fallback function that delegates all calls to another contract using the EVM * instruction `delegatecall`. diff --git a/contracts/Router.sol b/contracts/Router.sol index edc7b6c..5b73555 100644 --- a/contracts/Router.sol +++ b/contracts/Router.sol @@ -18,8 +18,8 @@ import { IAddressesProvider } from './interfaces/IAddressesProvider.sol'; /** * @title Router contract - * @author FlashFlow - * @notice Main point of interaction with an FlashFlow protocol + * @author zRex + * @notice Main point of interaction with an zRex protocol * - Users can: * # Open position * # Close position diff --git a/contracts/lib/Errors.sol b/contracts/lib/Errors.sol index 36e848d..24f7e09 100644 --- a/contracts/lib/Errors.sol +++ b/contracts/lib/Errors.sol @@ -3,8 +3,8 @@ pragma solidity ^0.8.17; /** * @title Errors library - * @author FlashFlow - * @notice Defines the error messages emitted by the different contracts of the FlashFlow protocol + * @author zRex + * @notice Defines the error messages emitted by the different contracts of the zRex protocol */ library Errors { // The caller of the function is not a account owner diff --git a/contracts/lib/PercentageMath.sol b/contracts/lib/PercentageMath.sol index 55834fa..d83cdd6 100644 --- a/contracts/lib/PercentageMath.sol +++ b/contracts/lib/PercentageMath.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.17; /** * @title PercentageMath library - * @author FlashFlow + * @author zRex * @notice Provides functions to perform percentage calculations * @dev Percentages are defined by default with 2 decimals of precision (100.00). The precision is indicated by PERCENTAGE_FACTOR */ diff --git a/hardhat.config.ts b/hardhat.config.ts index e5d4df2..37f0533 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -44,6 +44,12 @@ const config = { mnemonic: 'test test test test test test test test test test test junk', }, }, + bsc: { + url: 'https://bsc-dataseed.binance.org/', + accounts: process.env.PRIVATE_KEY + ? [process.env.PRIVATE_KEY] + : { mnemonic: 'test test test test test test test test test test test junk' }, + }, goerli: { url: `https://goerli.infura.io/v3/${INFURA_TOKEN}`, accounts: PRIVATE_KEY @@ -70,10 +76,10 @@ const config = { }, hardhat: { blockGasLimit: 9500000, - chainId: 1, + chainId: 56, forking: { - url: `https://eth-mainnet.alchemyapi.io/v2/qPC1XAgnhOiR3kuhw9DJ8g8WVLWs6R9Q`, - blockNumber: 17278900, + url: `https://bsc-mainnet.nodereal.io/v1/64a9df0874fb4a93b9d0a3849de012d3`, + blockNumber: 28718507, }, initialBaseFeePerGas: 5, }, diff --git a/lib/forge-std b/lib/forge-std index c223685..e8a047e 160000 --- a/lib/forge-std +++ b/lib/forge-std @@ -1 +1 @@ -Subproject commit c2236853aadb8e2d9909bbecdc490099519b70a4 +Subproject commit e8a047e3f40f13fa37af6fe14e6e06283d9a060e diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts index 49c0e43..5420879 160000 --- a/lib/openzeppelin-contracts +++ b/lib/openzeppelin-contracts @@ -1 +1 @@ -Subproject commit 49c0e4370d0cc50ea6090709e3835a3091e33ee2 +Subproject commit 5420879d9b834a0579423d668fb60c5fc13b60cc diff --git a/remappings.txt b/remappings.txt index ae60611..d968832 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1,6 +1,7 @@ @prb/test/=lib/prb-test/src/ forge-std/=lib/forge-std/src/ src/=src/ +contracts/=contracts/ solmate/=lib/solmate/src/ ds-test/=lib/forge-std/lib/ds-test/src/ @openzeppelin/=lib/openzeppelin-contracts/