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

lnv3 auto configure & accept ownership #8

Merged
merged 9 commits into from
May 14, 2024
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
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,9 @@
[submodule "lib/openzeppelin-contracts"]
path = lib/openzeppelin-contracts
url = https://github.com/OpenZeppelin/openzeppelin-contracts
[submodule "lib/@helix/contracts"]
path = lib/@helix/contracts
url = https://github.com/helix-bridge/contracts.git
[submodule "lib/@zeppelin-solidity/contracts"]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicate submodule

path = lib/@zeppelin-solidity/contracts
url = https://github.com/OpenZeppelin/openzeppelin-contracts.git
16 changes: 15 additions & 1 deletion foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@ solc_version = "0.8.17"
script = 'script'
test = 'test'
extra_output = ['storageLayout']
fs_permissions=[{access="read", path="./out"}, {access="read-write", path="./cache"}]
evm_version = "london"
fs_permissions=[
{access="read", path="./out"},
{access="read", path= "./script/config" },
{access="read", path= "./sphinx.lock" },
{access="read-write", path="./cache"},
]
allow_paths = ["../.."]
auto_detect_remappings = false
libs = ["lib"]
Expand All @@ -16,3 +22,11 @@ arbitrum = "https://arb1.arbitrum.io/rpc"
linea = "https://rpc.linea.build"
ethereum = "https://rpc.ankr.com/eth"
blast = "https://rpc.blast.io"
polygon-zkevm = "https://zkevm-rpc.com"
darwinia = "https://rpc.darwinia.network"
bsc = "https://rpc.ankr.com/bsc"
base = "https://mainnet.base.org"
gnosis = "https://rpc.gnosischain.com"
mantle = "https://rpc.mantle.xyz"
scroll = "https://rpc.scroll.io"
astar-zkevm = "https://rpc.startale.com/astar-zkevm"
1 change: 1 addition & 0 deletions lib/@helix/contracts
Submodule contracts added at 77d89f
1 change: 1 addition & 0 deletions lib/@zeppelin-solidity/contracts
Submodule contracts added at 3b8b4b
2 changes: 1 addition & 1 deletion lib/sphinx
Submodule sphinx updated 73 files
+4 −1 .circleci/config.yml
+9 −24 .github/workflows/docker-image.yml
+6 −1 README.md
+57 −0 docs/breaking/registration.md
+32 −30 docs/cli-existing-project.md
+10 −13 docs/cli-quickstart.md
+8 −107 ops/ci-builder/Dockerfile
+0 −8 ops/ci-builder/check-changed.sh
+1 −1 package.json
+25 −0 packages/contracts/CHANGELOG.md
+8 −9 packages/contracts/contracts/foundry/Sphinx.sol
+57 −3 packages/contracts/contracts/foundry/SphinxConstants.sol
+34 −3 packages/contracts/contracts/foundry/SphinxPluginTypes.sol
+83 −89 packages/contracts/contracts/foundry/SphinxUtils.sol
+2 −2 packages/contracts/package.json
+30 −0 packages/contracts/sphinx.lock
+147 −0 packages/contracts/src/addresses.ts
+283 −4 packages/contracts/src/networks.ts
+0 −22 packages/contracts/src/utils.ts
+1 −1 packages/contracts/src/version.ts
+1 −1 packages/contracts/test/ManagedService.t.sol
+9 −15 packages/contracts/test/ScriptConfiguration.t.sol
+7 −13 packages/contracts/test/Sphinx.t.sol
+8 −7 packages/contracts/test/SphinxTestUtils.sol
+5 −4 packages/contracts/test/SphinxUtils.t.sol
+0 −21 packages/contracts/test/issues/CHU572.s.sol
+1 −4 packages/contracts/test/issues/CHU663.s.sol
+0 −23 packages/contracts/test/issues/CHU663/CHU663.s.sol
+38 −0 packages/contracts/test/mocha/address.spec.ts
+0 −35 packages/contracts/test/mocha/utils.spec.ts
+38 −0 packages/core/CHANGELOG.md
+3 −3 packages/core/package.json
+1 −1 packages/core/src/actions/execute.ts
+3 −8 packages/core/src/actions/types.ts
+2 −4 packages/core/src/artifacts.ts
+8 −5 packages/core/src/config/types.ts
+2 −1 packages/core/src/languages/solidity/types.ts
+13 −0 packages/core/src/networks.ts
+18 −0 packages/core/src/types.ts
+52 −64 packages/core/src/utils.ts
+16 −6 packages/core/test/convert.spec.ts
+13 −0 packages/demo/CHANGELOG.md
+5 −5 packages/demo/package.json
+18 −0 packages/demo/sphinx.lock
+2 −2 packages/demo/test/Solc.spec.ts
+22 −16 packages/demo/test/init.spec.ts
+45 −0 packages/plugins/CHANGELOG.md
+1 −5 packages/plugins/contracts/test/script/Cases.s.sol
+0 −4 packages/plugins/contracts/test/script/Empty.s.sol
+1 −5 packages/plugins/contracts/test/script/Large.s.sol
+1 −5 packages/plugins/contracts/test/script/PartiallyEmpty.s.sol
+1 −5 packages/plugins/contracts/test/script/RevertDuringSimulation.s.sol
+3 −15 packages/plugins/contracts/test/script/Simple.s.sol
+1 −4 packages/plugins/contracts/test/script/issues/CHU676.s.sol
+4 −0 packages/plugins/foundry.toml
+6 −5 packages/plugins/package.json
+3 −7 packages/plugins/script/Sample.s.sol
+12 −0 packages/plugins/script/write-version.ts
+18 −0 packages/plugins/sphinx.lock
+10 −6 packages/plugins/src/cli/propose/index.ts
+30 −5 packages/plugins/src/cli/setup.ts
+1 −0 packages/plugins/src/cli/version.ts
+1 −4 packages/plugins/src/foundry/decode.ts
+35 −30 packages/plugins/src/foundry/utils/index.ts
+6 −8 packages/plugins/src/sample-project/index.ts
+4 −11 packages/plugins/src/sample-project/sample-contracts.ts
+2 −1 packages/plugins/src/sample-project/sample-foundry-config.ts
+5 −2 packages/plugins/test/mocha/artifacts.spec.ts
+2 −2 packages/plugins/test/mocha/cli/deploy.spec.ts
+7 −11 packages/plugins/test/mocha/cli/propose.spec.ts
+2 −133 packages/plugins/test/mocha/common.ts
+32 −1 packages/plugins/test/mocha/foundry/utils.spec.ts
+4 −2 packages/plugins/test/mocha/simulate.spec.ts
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"devDependencies": {
"@sphinx-labs/plugins": "0.31.8"
"@sphinx-labs/plugins": "0.32.2"
}
}
2 changes: 2 additions & 0 deletions remappings.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
forge-std/=lib/forge-std/src/
ds-test/=lib/forge-std/lib/ds-test/src/
@helix/contracts/=lib/@helix/contracts/
@zeppelin-solidity/contracts=lib/@zeppelin-solidity/contracts/contracts/
12 changes: 12 additions & 0 deletions script/5_AcceptOwnership.s.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;

import {LnBridgeV3Base} from "./common/LnBridgeV3Base.s.sol";
import {safeconsole} from "forge-std/safeconsole.sol";

contract AcceptOwnership5 is LnBridgeV3Base {
function run() public sphinx {
initLnBridgeAddress();
acceptOwnership();
}
}
12 changes: 1 addition & 11 deletions script/common/Base.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,7 @@ import "@sphinx-labs/contracts/SphinxPlugin.sol";

contract Base is Sphinx, Script {
function configureSphinx() public override {
sphinxConfig.owners = [
0x0f14341A7f464320319025540E8Fe48Ad0fe5aec, // Echo
0x00E3993566b34e5367d1C602439997BD08c11FF7, // Alex
0x52386BE2397e8EAc26298F733b390684203fB580, // Denny
0xe59261f6D4088BcD69985A3D369Ff14cC54EF1E5, // Ranji
0x88a39B052d477CfdE47600a7C9950a441Ce61cb4 // Xiaoch
];
sphinxConfig.orgId = "cluanacaw000111jik4xs4wkl";
sphinxConfig.threshold = 3;
sphinxConfig.projectName = "Helix-DAO";
// sphinxConfig.mainnets = ["polygon", "arbitrum", "optimism", "mantle"];
sphinxConfig.mainnets = ["arbitrum", "optimism"];
sphinxConfig.mainnets = ["darwinia", "bsc", "base", "gnosis", "mantle", "scroll", "astar-zkevm", "polygon-zkevm"];
}
}
11 changes: 11 additions & 0 deletions script/common/LnBridgeV3.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.17;

import "@helix/contracts/helix-contract/contracts/messagers/MsgportMessager.sol";
import "@helix/contracts/helix-contract/contracts/messagers/LayerZeroMessager.sol";
import "@helix/contracts/helix-contract/contracts/ln/lnv3/HelixLnBridgeV3.sol";
import "@helix/contracts/helix-contract/contracts/tool/WToken.sol";
import "@helix/contracts/helix-contract/contracts/tool/Erc20.sol";
import "@helix/contracts/helix-contract/contracts/tool/Create2Deployer.sol";
import "@helix/contracts/helix-contract/contracts/tool/ProxyAdmin.sol";
import "@helix/contracts/helix-contract/contracts/tool/TransparentUpgradeableProxy.sol";
Loading
Loading