Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New release #28

Merged
merged 22 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6f9995a
Merge pull request #24 from VenusProtocol/main
chechu Feb 27, 2024
63368ac
feat: add deployments for XVS and XVSBridge
Debugger022 Mar 26, 2024
def4075
feat: updating deployment files
Debugger022 Mar 26, 2024
da5de59
refactor: change tx single and daily tx limits for bsctestnet, opbnbt…
Debugger022 Mar 26, 2024
5e7bdc9
refactor: argument chain id for bridge commands and update deployments
Debugger022 Mar 26, 2024
a763f74
feat: updating deployment files
Debugger022 Mar 26, 2024
e679346
feat!: migrate to Solidity 0.8.25
kkirka Apr 12, 2024
c16f8f9
refactor: add bridgeConfig for all networks
Debugger022 Apr 17, 2024
eddc2b2
fix: chain id for arbitrumsepolia methods
Debugger022 Apr 18, 2024
7e13d37
docs: add certik report about the mesh architecture
chechu Apr 19, 2024
f165dd8
Merge pull request #26 from VenusProtocol/feat/solidity-0.8.25
kkirka Apr 19, 2024
9abd980
chore(release): 2.0.0-dev.1 [skip ci]
toolsvenus Apr 19, 2024
c61add2
Merge branch 'develop' into VEN-2497-VEN-2498
Debugger022 Apr 22, 2024
2ee7258
chore: add new deployments with new solidity version
Debugger022 Apr 22, 2024
5650290
feat: updating deployment files
Debugger022 Apr 22, 2024
d552c6c
Merge pull request #27 from VenusProtocol/docs/VEN-2519
chechu Apr 22, 2024
eb6e31b
chore(release): 2.0.0-dev.2 [skip ci]
toolsvenus Apr 22, 2024
345f9bb
refactor: update maxDailyReceiveLimit and maxSingleReceiveTransaction…
Debugger022 Apr 24, 2024
d28836d
chore: update oracle package version
Debugger022 Apr 25, 2024
9978ea5
chore: update oracle package version
Debugger022 Apr 25, 2024
d678df8
Merge pull request #25 from VenusProtocol/VEN-2497-VEN-2498
Debugger022 Apr 25, 2024
be4dfc7
chore(release): 2.0.0-dev.3 [skip ci]
toolsvenus Apr 25, 2024
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: 3 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@ DEPLOYER_PRIVATE_KEY=
#ARCHIVE_NODE_sepolia=https://ethereum-sepolia.blockpi.network/v1/rpc/public
#ARCHIVE_NODE_ethereum=https://eth-mainnet.nodereal.io/v1/API_KEY
#ARCHIVE_NODE_opbnbtestnet=https://opbnb-testnet.nodereal.io/v1/<YOUR_KEY_HERE>
#ARCHIVE_NODE_opbnbmainnet=https://opbnb-mainnet.nodereal.io/v1/<YOUR_KEY_HERE>
#ARCHIVE_NODE_opbnbmainnet=https://opbnb-mainnet.nodereal.io/v1/<YOUR_KEY_HERE>
#ARCHIVE_NODE_arbitrumsepolia="https://sepolia-rollup.arbitrum.io/rpc"
#ARCHIVE_NODE_arbitrumone="https://open-platform.nodereal.io/<YOUR_KEY_HERE>/arbitrum-nitro/"
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:

- name: Export deployments
run: |
for NETWORK in bsctestnet bscmainnet ethereum sepolia opbnbtestnet opbnbmainnet; do
for NETWORK in bsctestnet bscmainnet ethereum sepolia opbnbtestnet opbnbmainnet arbitrumsepolia arbitrumone; do
EXPORT=true yarn hardhat export --network ${NETWORK} --export ./deployments/${NETWORK}.json
jq -M '{name, chainId, addresses: .contracts | map_values(.address)}' ./deployments/${NETWORK}.json > ./deployments/${NETWORK}_addresses.json
done
Expand Down
Binary file added audits/104_mesh_architecture_certik_20240419.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion contracts/Bridge/BaseXVSProxyOFT.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSD-3-Clause
pragma solidity 0.8.13;
pragma solidity 0.8.25;

import { SafeERC20, IERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
import { ResilientOracleInterface } from "@venusprotocol/oracle/contracts/interfaces/OracleInterface.sol";
Expand Down
3 changes: 1 addition & 2 deletions contracts/Bridge/XVSBridgeAdmin.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: BSD-3-Clause

pragma solidity 0.8.13;
pragma solidity 0.8.25;

import { AccessControlledV8 } from "@venusprotocol/governance-contracts/contracts/Governance/AccessControlledV8.sol";
import { ensureNonzeroAddress } from "@venusprotocol/solidity-utilities/contracts/validators.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/Bridge/XVSProxyOFTDest.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSD-3-Clause
pragma solidity 0.8.13;
pragma solidity 0.8.25;

import { IXVS } from "./interfaces/IXVS.sol";
import { BaseXVSProxyOFT } from "./BaseXVSProxyOFT.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/Bridge/XVSProxyOFTSrc.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSD-3-Clause
pragma solidity 0.8.13;
pragma solidity 0.8.25;

import { SafeERC20, IERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
import { BaseXVSProxyOFT } from "./BaseXVSProxyOFT.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/Bridge/interfaces/IXVS.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSD-3-Clause
pragma solidity 0.8.13;
pragma solidity ^0.8.25;

/**
* @title IXVS
Expand Down
2 changes: 1 addition & 1 deletion contracts/Bridge/interfaces/IXVSProxyOFT.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSD-3-Clause
pragma solidity 0.8.13;
pragma solidity ^0.8.25;

/**
* @title IXVSProxyOFT
Expand Down
3 changes: 2 additions & 1 deletion contracts/Bridge/token/TokenController.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause
pragma solidity 0.8.13;
pragma solidity 0.8.25;

import { IAccessControlManagerV8 } from "@venusprotocol/governance-contracts/contracts/Governance/IAccessControlManagerV8.sol";
import { Pausable } from "@openzeppelin/contracts/security/Pausable.sol";
import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/Bridge/token/XVS.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSD-3-Clause
pragma solidity 0.8.13;
pragma solidity 0.8.25;

import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";

Expand Down
5 changes: 5 additions & 0 deletions deployments/arbitrumone.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "arbitrumone",
"chainId": "42161",
"contracts": {}
}
5 changes: 5 additions & 0 deletions deployments/arbitrumone_addresses.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "arbitrumone",
"chainId": "42161",
"addresses": {}
}
Loading