Proposal 1 (#2)

* Proposal 1 * update ci * clean * safe address * safe address * rename * fmt * fix ci * check * change addr * comment * readme
helix-bridge · Apr 11, 2024 · 02cfb9e · 02cfb9e
1 parent a802371
commit 02cfb9e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/sphinx.dry-run.yml b/.github/workflows/sphinx.dry-run.yml
@@ -1,7 +1,6 @@
 name: Sphinx Dry Run
 env:
     SPHINX_API_KEY: ${{ secrets.SPHINX_API_KEY }}
-    PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
 
 on:
   pull_request:

diff --git a/.github/workflows/sphinx.propose.yml b/.github/workflows/sphinx.propose.yml
@@ -1,14 +1,8 @@
 name: Sphinx Propose
 env:
     SPHINX_API_KEY: ${{ secrets.SPHINX_API_KEY }}
-    PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
 
 on: 
-  pull_request:
-    branches:
-      - main
-    paths-ignore:
-      - '**.md'
   push:
     branches:
       - main
@@ -29,4 +23,4 @@ jobs:
       - name: Install Sphinx Solidity Library
         run: yarn sphinx install
       - name: Propose
-        run: npx sphinx propose ./script/common/Proposal.s.sol --confirm --networks <NETWORK_NAMES>
+        run: npx sphinx propose ./script/common/Proposal.s.sol --confirm --networks mainnets
diff --git a/Makefile b/Makefile
@@ -1,13 +1,14 @@
-.PHONY: all fmt clean test
-.PHONY: tools foundry sync
+.PHONY: all fmt clean dry-run propose
+.PHONY: tools foundry sync sphinx
 
 -include .env
 
 all    :; @forge build
 fmt    :; @forge fmt
 clean  :; @forge clean
 
-propose:; @SPHINX_API_KEY=$(SPHINX_API_KEY) npx sphinx propose ./script/common/Proposal.s.sol --networks mainnets
+propose:; npx sphinx propose ./script/common/Proposal.s.sol --networks mainnets
+dry-run:; npx sphinx propose ./script/common/Proposal.s.sol --networks mainnets --dry-run
 
 sphinx :; @yarn sphinx install
 sync   :; @git submodule update --recursive

diff --git a/README.md b/README.md
@@ -1 +1,6 @@
-# sphinx-dao
+# Helix DAO
+
+## Sphinx Safe Address
+```sh
+0xD0a0899c5dc2FEb253D57Ab0b7c6d1b1Fcbbf824
+```
diff --git a/script/1_AcceptOwnership.s.sol b/script/1_AcceptOwnership.s.sol
@@ -18,5 +18,6 @@ contract AcceptOwnership1 is Base {
         if (dao == III(HelixBridge).pendingDao()) {
             III(HelixBridge).acceptOwnership();
         }
+        require(III(HelixBridge).dao() == dao, "failed");
     }
 }
diff --git a/script/common/Base.sol b/script/common/Base.sol
@@ -7,11 +7,11 @@ import "@sphinx-labs/contracts/SphinxPlugin.sol";
 contract Base is Sphinx, Script {
     function configureSphinx() public override {
         sphinxConfig.owners = [
-            0xD70A2e6eACbdeDA77a5d4bBAE3bC70239A0e088f, // CI
+            0x0f14341A7f464320319025540E8Fe48Ad0fe5aec, // Echo
             0x00E3993566b34e5367d1C602439997BD08c11FF7, // Alex
             0x52386BE2397e8EAc26298F733b390684203fB580, // Denny
             0xe59261f6D4088BcD69985A3D369Ff14cC54EF1E5, // Ranji
-            0xd2c7008400F54aA70Af01CF8C747a4473246593E // Xiaoch
+            0x88a39B052d477CfdE47600a7C9950a441Ce61cb4 // Xiaoch
         ];
         sphinxConfig.orgId = "cluanacaw000111jik4xs4wkl";
         sphinxConfig.threshold = 3;