diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cbfa2db09..d8b6782ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,6 +52,7 @@ jobs: - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: + base: develop branch: master reviewers: robosupport token: ${{ github.token }} diff --git a/.gitmodules b/.gitmodules index cd299745b..6300cefb5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,18 +10,13 @@ [submodule "scripts/ledger/resources/speculos"] path = scripts/ledger/resources/speculos url = https://github.com/LedgerHQ/speculos.git -[submodule "contracts/ethereum/scripts/resources/ssv-network"] - path = contracts/ethereum/scripts/resources/ssv-network - url = https://github.com/bloxapp/ssv-network.git -[submodule "contracts/ethereum/scripts/resources/ssv-contracts"] - path = contracts/ethereum/scripts/resources/ssv-contracts - url = https://github.com/bloxapp/ssv-contracts.git -[submodule "contracts/ethereum/scripts/resources/consensus-specs"] - path = contracts/ethereum/scripts/resources/consensus-specs - url = https://github.com/ethereum/consensus-specs.git [submodule "scripts/trezor/resources/trezor-user-env"] path = scripts/trezor/resources/trezor-user-env url = https://github.com/trezor/trezor-user-env.git -[submodule "services/keys/scripts/resources/dkg"] - path = services/keys/scripts/resources/dkg - url = https://github.com/RockX-SG/frost-dkg-demo.git +[submodule "services/validators/scripts/resources/rockx-dkg-cli"] + path = services/oracle/scripts/resources/rockx-dkg-cli + url = https://github.com/RockX-SG/rockx-dkg-cli.git +[submodule "contracts/ethereum/scripts/resources/ssv-network"] + path = contracts/ethereum/scripts/resources/ssv-network + url = https://github.com/bloxapp/ssv-network.git + branch = contract-v3 diff --git a/README.md b/README.md index 2665bf0dd..2f24c5dc2 100644 --- a/README.md +++ b/README.md @@ -27,11 +27,15 @@ Get started contributing to Casimir's codebase. Make sure your development environment has these prerequisites. -1. [Node.js (v18.x)](https://nodejs.org/en/download/) – we use [nvm](https://github.com/nvm-sh/nvm) to manage Node.js versions. +1. [AWS CLI (v2.x)](https://aws.amazon.com/cli/) – create an [AWS profile](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html) named `consensus-networks-dev`. 2. [Docker (v4.x)](https://docs.docker.com/engine/install/) - make sure your Docker runs on startup. -3. [AWS CLI (v2.x)](https://aws.amazon.com/cli/) – create an [AWS profile](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html) named `consensus-networks-dev`. +3. [Git (v2.x)](https://git-scm.com/downloads) – we use [git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) to manage shared code. + +4. [Go (v1.18.x)](https://golang.org/doc/install) – we use [Go modules](https://blog.golang.org/using-go-modules) to manage Go dependencies. + +5. [Node.js (v18.x)](https://nodejs.org/en/download/) – we use [nvm](https://github.com/nvm-sh/nvm) to manage Node.js versions. > 🚩 You also need to make sure to have at least one SSH authentication key on your GitHub account (for the git cloning of submodules in various scripts). See [Adding a new SSH key to your GitHub account](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account). @@ -46,7 +50,7 @@ git checkout -b feature/stake-button develop npm install ``` -> 🚩 'All workspace dependencies' includes `package.json` dependencies listed in the project root and any workspace subdirectories. See [Scripts and dependencies](#-scripts-and-dependencies). +> 🚩 'All workspace dependencies' includes `package.json` dependencies listed in the project root and any workspace subdirectories. See [Scripts and dependencies](#scripts-and-dependencies). ### Serve diff --git a/apps/landing/vite.config.ts b/apps/landing/vite.config.ts index c5858cdde..ed3293579 100644 --- a/apps/landing/vite.config.ts +++ b/apps/landing/vite.config.ts @@ -4,7 +4,7 @@ import { fileURLToPath } from 'url' import * as path from 'path' export default defineConfig({ - server: { port: 3000 }, + server: { port: 3001 }, plugins: [ vue({ include: [/\.vue$/] }) ], diff --git a/apps/web/src/components/Wallet.vue b/apps/web/src/components/Wallet.vue index 8cdc40e47..01d05896c 100644 --- a/apps/web/src/components/Wallet.vue +++ b/apps/web/src/components/Wallet.vue @@ -146,7 +146,7 @@