From d5b6a9e467ed5ab57e67f3149ad643099203c7f6 Mon Sep 17 00:00:00 2001 From: Linus Gasser Date: Thu, 10 Oct 2024 16:01:43 +0200 Subject: [PATCH 1/2] Moving paths from github.com/c4dt to github.com/dedis --- .github/workflows/build-docker.yml | 6 +- .github/workflows/go_dvoting_test.yml | 2 +- .github/workflows/go_scenario_test.yml | 2 +- Makefile | 4 +- README.md | 52 +- autotest.sh | 2 +- cli/cosipbftcontroller/action_test.go | 2 +- cli/cosipbftcontroller/mod_test.go | 4 +- cli/dvoting/mod.go | 16 +- cli/postinstall/mod.go | 8 +- contracts/evoting/controller/action.go | 14 +- contracts/evoting/evoting.go | 2 +- contracts/evoting/json/ciphervote.go | 2 +- contracts/evoting/json/forms.go | 2 +- contracts/evoting/json/mod.go | 2 +- contracts/evoting/json/suffragia.go | 2 +- contracts/evoting/json/transaction.go | 2 +- contracts/evoting/mod.go | 8 +- contracts/evoting/mod_test.go | 6 +- deb-package/README.md | 2 +- deb-package/build-deb.sh | 2 +- docker-compose/docker-compose.debug.yml | 4 +- docker-compose/docker-compose.yml | 6 +- docs/coverpage.md | 2 +- docs/index.html | 2 +- go.mod | 71 +- go.sum | 1220 ++--------------- integration/ballot.go | 14 +- integration/dkg.go | 4 +- integration/dvotingdela.go | 12 +- integration/form.go | 10 +- integration/integration_test.go | 6 +- integration/nodes.go | 2 +- integration/performance_test.go | 6 +- integration/scenario_test.go | 4 +- integration/shuffle.go | 2 +- integration/transaction.go | 4 +- integration/votes_test.go | 6 +- internal/testing/fake/dkg.go | 2 +- internal/testing/fake/election.go | 2 +- internal/testing/fake/ordering.go | 2 +- metrics/controller/action.go | 2 +- mod.go | 2 +- proxy/dkg.go | 4 +- proxy/dkg_test.go | 4 +- proxy/election.go | 8 +- proxy/mod.go | 2 +- proxy/shuffle.go | 4 +- proxy/txnmanager/mod.go | 2 +- proxy/txnmanager/transaction.go | 2 +- proxy/types/election.go | 2 +- scripts/run_docker.sh | 2 +- services/dkg/pedersen/controller/action.go | 6 +- .../dkg/pedersen/controller/action_test.go | 4 +- services/dkg/pedersen/controller/mod.go | 6 +- services/dkg/pedersen/controller/mod_test.go | 2 +- services/dkg/pedersen/handler.go | 8 +- services/dkg/pedersen/handler_test.go | 8 +- services/dkg/pedersen/json/mod.go | 2 +- services/dkg/pedersen/json/mod_test.go | 4 +- services/dkg/pedersen/mod.go | 14 +- services/dkg/pedersen/mod_test.go | 10 +- services/dkg/pedersen/types/messages_test.go | 2 +- services/shuffle/neff/controller/action.go | 4 +- services/shuffle/neff/controller/mod.go | 4 +- services/shuffle/neff/controller/mod_test.go | 2 +- services/shuffle/neff/handler.go | 6 +- services/shuffle/neff/handler_test.go | 6 +- services/shuffle/neff/json/mod.go | 2 +- services/shuffle/neff/json/mod_test.go | 4 +- services/shuffle/neff/mod.go | 6 +- services/shuffle/neff/mod_test.go | 6 +- services/shuffle/neff/types/messages_test.go | 2 +- web/backend/run_votes.sh | 2 +- web/frontend/src/layout/Footer.tsx | 4 +- web/frontend/src/pages/Home.tsx | 2 +- web/frontend/tests/footer.spec.ts | 2 +- 77 files changed, 307 insertions(+), 1368 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index cf9f3fe87..08b3739cc 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -48,7 +48,7 @@ jobs: REACT_APP_BUILD REACT_APP_BUILD_TIME push: ${{ env.push }} - tags: ghcr.io/c4dt/d-voting-frontend:${{ env.DockerTag }} + tags: ghcr.io/dedis/d-voting-frontend:${{ env.DockerTag }} - name: Build Backend uses: docker/build-push-action@v2 with: @@ -56,7 +56,7 @@ jobs: file: Dockerfiles/Dockerfile.backend platforms: linux/amd64 push: ${{ env.push }} - tags: ghcr.io/c4dt/d-voting-backend:${{ env.DockerTag }} + tags: ghcr.io/dedis/d-voting-backend:${{ env.DockerTag }} - name: Build D-Voting uses: docker/build-push-action@v2 with: @@ -64,4 +64,4 @@ jobs: file: Dockerfiles/Dockerfile.dela platforms: linux/amd64 push: ${{ env.push }} - tags: ghcr.io/c4dt/d-voting-dela:${{ env.DockerTag }} + tags: ghcr.io/dedis/d-voting-dela:${{ env.DockerTag }} diff --git a/.github/workflows/go_dvoting_test.yml b/.github/workflows/go_dvoting_test.yml index 19acabb77..f82bdbd53 100644 --- a/.github/workflows/go_dvoting_test.yml +++ b/.github/workflows/go_dvoting_test.yml @@ -19,7 +19,7 @@ jobs: - name: Install crypto util from Dela run: | - git clone https://github.com/c4dt/dela.git + git clone https://github.com/dedis/dela.git cd dela go install ./cli/crypto diff --git a/.github/workflows/go_scenario_test.yml b/.github/workflows/go_scenario_test.yml index c6f274417..54027938f 100644 --- a/.github/workflows/go_scenario_test.yml +++ b/.github/workflows/go_scenario_test.yml @@ -18,7 +18,7 @@ jobs: - name: Install crypto util from Dela run: | - git clone https://github.com/c4dt/dela.git + git clone https://github.com/dedis/dela.git cd dela go install ./cli/crypto diff --git a/Makefile b/Makefile index a7eb71f25..a774d69a0 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ version=$(shell git describe --abbrev=0 --tags || echo '0.0.0') -versionFlag="github.com/c4dt/d-voting.Version=$(version)" +versionFlag="github.com/dedis/d-voting.Version=$(version)" versionFile=$(shell echo $(version) | tr . _) -timeFlag="github.com/c4dt/d-voting.BuildTime=$(shell date +'%d/%m/%y_%H:%M')" +timeFlag="github.com/dedis/d-voting.BuildTime=$(shell date +'%d/%m/%y_%H:%M')" lint: # Coding style static check. diff --git a/README.md b/README.md index 0daa94363..cf4c87cc7 100644 --- a/README.md +++ b/README.md @@ -12,13 +12,13 @@ - - + +
- + GitHub contributors - + GitHub release (latest SemVer) @@ -26,37 +26,37 @@ Blockchain - - + + - - + + - - + + - - + +
- - + + - - Go Reference + + Go Reference WEB - - + + - - + + @@ -67,7 +67,7 @@ # D-Voting **D-Voting** is an e-voting platform based on the -[Dela](https://github.com/c4dt/dela) blockchain. It uses state-of-the-art +[Dela](https://github.com/dedis/dela) blockchain. It uses state-of-the-art protocols that guarantee privacy of votes and a fully decentralized process. This project was born in early 2021 and has been iteratively implemented by EPFL students under the supervision of DEDIS members. @@ -147,7 +147,7 @@ sometimes refer to the blockchain node simply as a "node". The following component diagrams summarizes the interaction between those high-level components: -[minogrpc]: https://github.com/c4dt/dela/tree/master/mino/minogrpc +[minogrpc]: https://github.com/dedis/dela/tree/master/mino/minogrpc ![Global component diagram](http://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/dedis/d-voting/main/docs/assets/component-global.puml) @@ -390,7 +390,7 @@ results. 2: Install the `crypto` utility from Dela: ```sh -git clone https://github.com/c4dt/dela.git +git clone https://github.com/dedis/dela.git cd dela/cli/crypto go install ``` @@ -601,7 +601,7 @@ Afterwards use the following commands, replace 4 by the desired nb of nodes : ./runNode.sh -n 4 -a true -d true ./setupnNode.sh -n 4 -d true -NNODES=4 KILLNODE=true go test -v -run ^TestScenario$ github.com/c4dt/d-voting/integration -count=1 +NNODES=4 KILLNODE=true go test -v -run ^TestScenario$ github.com/dedis/d-voting/integration -count=1 ``` Here we set KILLNODE=true or false to decide whether kill and restart a node @@ -650,8 +650,8 @@ Build info can be added to the binary with the `ldflags`, at build time. Infos are stored on variables in the root `mod.go`. For example: ```sh -versionFlag="github.com/c4dt/d-voting.Version=`git describe --tags`" -timeFlag="github.com/c4dt/d-voting.BuildTime=`date +'%d/%m/%y_%H:%M'`" +versionFlag="github.com/dedis/d-voting.Version=`git describe --tags`" +timeFlag="github.com/dedis/d-voting.BuildTime=`date +'%d/%m/%y_%H:%M'`" go build -ldflags="-X $versionFlag -X $timeFlag" ./cli/dvoting ``` diff --git a/autotest.sh b/autotest.sh index 67ef14ec1..b9872287b 100755 --- a/autotest.sh +++ b/autotest.sh @@ -52,7 +52,7 @@ do ./setupnNode.sh -n $N_NODE -d true sleep 3 # Start scenario test and keep logs - NNODES=$N_NODE go test -v -run ^TestScenario$ github.com/c4dt/d-voting/integration -count=1 | tee ./log/log/gotest.log + NNODES=$N_NODE go test -v -run ^TestScenario$ github.com/dedis/d-voting/integration -count=1 | tee ./log/log/gotest.log sleep 3 # Stop the test ./kill_test.sh diff --git a/cli/cosipbftcontroller/action_test.go b/cli/cosipbftcontroller/action_test.go index 20f9b475f..2d0ba484c 100644 --- a/cli/cosipbftcontroller/action_test.go +++ b/cli/cosipbftcontroller/action_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/c4dt/d-voting/internal/testing/fake" + "github.com/dedis/d-voting/internal/testing/fake" "github.com/stretchr/testify/require" "go.dedis.ch/dela/cli/node" "go.dedis.ch/dela/core/access" diff --git a/cli/cosipbftcontroller/mod_test.go b/cli/cosipbftcontroller/mod_test.go index 5f29fedb1..ac9e3525e 100644 --- a/cli/cosipbftcontroller/mod_test.go +++ b/cli/cosipbftcontroller/mod_test.go @@ -6,10 +6,10 @@ import ( "path/filepath" "testing" - "github.com/c4dt/d-voting/services/dkg" + "github.com/dedis/d-voting/services/dkg" "go.dedis.ch/dela/core/ordering" - "github.com/c4dt/d-voting/internal/testing/fake" + "github.com/dedis/d-voting/internal/testing/fake" "github.com/stretchr/testify/require" "go.dedis.ch/dela/cli" "go.dedis.ch/dela/cli/node" diff --git a/cli/dvoting/mod.go b/cli/dvoting/mod.go index a378a12c5..f562ed5bf 100644 --- a/cli/dvoting/mod.go +++ b/cli/dvoting/mod.go @@ -30,14 +30,14 @@ import ( "io" "os" - dkg "github.com/c4dt/d-voting/services/dkg/pedersen/controller" - "github.com/c4dt/d-voting/services/dkg/pedersen/json" - shuffle "github.com/c4dt/d-voting/services/shuffle/neff/controller" + dkg "github.com/dedis/d-voting/services/dkg/pedersen/controller" + "github.com/dedis/d-voting/services/dkg/pedersen/json" + shuffle "github.com/dedis/d-voting/services/shuffle/neff/controller" - cosipbft "github.com/c4dt/d-voting/cli/cosipbftcontroller" - "github.com/c4dt/d-voting/cli/postinstall" - evoting "github.com/c4dt/d-voting/contracts/evoting/controller" - metrics "github.com/c4dt/d-voting/metrics/controller" + cosipbft "github.com/dedis/d-voting/cli/cosipbftcontroller" + "github.com/dedis/d-voting/cli/postinstall" + evoting "github.com/dedis/d-voting/contracts/evoting/controller" + metrics "github.com/dedis/d-voting/metrics/controller" "go.dedis.ch/dela/cli/node" access "go.dedis.ch/dela/contracts/access/controller" db "go.dedis.ch/dela/core/store/kv/controller" @@ -46,7 +46,7 @@ import ( mino "go.dedis.ch/dela/mino/minogrpc/controller" proxy "go.dedis.ch/dela/mino/proxy/http/controller" - _ "github.com/c4dt/d-voting/services/shuffle/neff/json" + _ "github.com/dedis/d-voting/services/shuffle/neff/json" gapi "go.dedis.ch/dela-apps/gapi/controller" ) diff --git a/cli/postinstall/mod.go b/cli/postinstall/mod.go index 1c3e8ccf3..560e57d40 100644 --- a/cli/postinstall/mod.go +++ b/cli/postinstall/mod.go @@ -5,10 +5,10 @@ import ( "path/filepath" "time" - evoting "github.com/c4dt/d-voting/contracts/evoting/controller" - prom "github.com/c4dt/d-voting/metrics/controller" - dkg "github.com/c4dt/d-voting/services/dkg/pedersen/controller" - neff "github.com/c4dt/d-voting/services/shuffle/neff/controller" + evoting "github.com/dedis/d-voting/contracts/evoting/controller" + prom "github.com/dedis/d-voting/metrics/controller" + dkg "github.com/dedis/d-voting/services/dkg/pedersen/controller" + neff "github.com/dedis/d-voting/services/shuffle/neff/controller" "go.dedis.ch/dela" "go.dedis.ch/dela/cli" "go.dedis.ch/dela/cli/node" diff --git a/contracts/evoting/controller/action.go b/contracts/evoting/controller/action.go index 1b674e716..7073e16c9 100644 --- a/contracts/evoting/controller/action.go +++ b/contracts/evoting/controller/action.go @@ -17,13 +17,13 @@ import ( "go.dedis.ch/kyber/v3/sign/schnorr" "go.dedis.ch/kyber/v3/suites" - "github.com/c4dt/d-voting/contracts/evoting/types" - "github.com/c4dt/d-voting/internal/testing/fake" - eproxy "github.com/c4dt/d-voting/proxy" - "github.com/c4dt/d-voting/proxy/txnmanager" - ptypes "github.com/c4dt/d-voting/proxy/types" - "github.com/c4dt/d-voting/services/dkg" - "github.com/c4dt/d-voting/services/shuffle" + "github.com/dedis/d-voting/contracts/evoting/types" + "github.com/dedis/d-voting/internal/testing/fake" + eproxy "github.com/dedis/d-voting/proxy" + "github.com/dedis/d-voting/proxy/txnmanager" + ptypes "github.com/dedis/d-voting/proxy/types" + "github.com/dedis/d-voting/services/dkg" + "github.com/dedis/d-voting/services/shuffle" "github.com/gorilla/mux" "go.dedis.ch/dela" "go.dedis.ch/dela/cli/node" diff --git a/contracts/evoting/evoting.go b/contracts/evoting/evoting.go index 082597c31..03e7e4cc7 100644 --- a/contracts/evoting/evoting.go +++ b/contracts/evoting/evoting.go @@ -15,7 +15,7 @@ import ( "go.dedis.ch/dela/core/ordering/cosipbft/contracts/viewchange" "go.dedis.ch/kyber/v3/share" - "github.com/c4dt/d-voting/contracts/evoting/types" + "github.com/dedis/d-voting/contracts/evoting/types" "go.dedis.ch/dela/core/execution" "go.dedis.ch/dela/core/execution/native" "go.dedis.ch/dela/core/ordering/cosipbft/authority" diff --git a/contracts/evoting/json/ciphervote.go b/contracts/evoting/json/ciphervote.go index 2c9032b5c..b8c51b65d 100644 --- a/contracts/evoting/json/ciphervote.go +++ b/contracts/evoting/json/ciphervote.go @@ -1,7 +1,7 @@ package json import ( - "github.com/c4dt/d-voting/contracts/evoting/types" + "github.com/dedis/d-voting/contracts/evoting/types" "go.dedis.ch/dela/serde" "golang.org/x/xerrors" ) diff --git a/contracts/evoting/json/forms.go b/contracts/evoting/json/forms.go index 2640cfd80..cd74d4b8f 100644 --- a/contracts/evoting/json/forms.go +++ b/contracts/evoting/json/forms.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "encoding/json" - "github.com/c4dt/d-voting/contracts/evoting/types" + "github.com/dedis/d-voting/contracts/evoting/types" "go.dedis.ch/dela/core/ordering/cosipbft/authority" ctypes "go.dedis.ch/dela/core/ordering/cosipbft/types" "go.dedis.ch/dela/serde" diff --git a/contracts/evoting/json/mod.go b/contracts/evoting/json/mod.go index c9845338a..5906611ce 100644 --- a/contracts/evoting/json/mod.go +++ b/contracts/evoting/json/mod.go @@ -1,7 +1,7 @@ package json import ( - "github.com/c4dt/d-voting/contracts/evoting/types" + "github.com/dedis/d-voting/contracts/evoting/types" "go.dedis.ch/dela/serde" ) diff --git a/contracts/evoting/json/suffragia.go b/contracts/evoting/json/suffragia.go index 424c83910..7510f18bb 100644 --- a/contracts/evoting/json/suffragia.go +++ b/contracts/evoting/json/suffragia.go @@ -3,7 +3,7 @@ package json import ( "encoding/json" - "github.com/c4dt/d-voting/contracts/evoting/types" + "github.com/dedis/d-voting/contracts/evoting/types" "go.dedis.ch/dela/serde" "golang.org/x/xerrors" ) diff --git a/contracts/evoting/json/transaction.go b/contracts/evoting/json/transaction.go index 1093416df..6bbe77a98 100644 --- a/contracts/evoting/json/transaction.go +++ b/contracts/evoting/json/transaction.go @@ -3,7 +3,7 @@ package json import ( "encoding/json" - "github.com/c4dt/d-voting/contracts/evoting/types" + "github.com/dedis/d-voting/contracts/evoting/types" "go.dedis.ch/dela/serde" "golang.org/x/xerrors" ) diff --git a/contracts/evoting/mod.go b/contracts/evoting/mod.go index b431bc445..f6ce0b466 100644 --- a/contracts/evoting/mod.go +++ b/contracts/evoting/mod.go @@ -1,9 +1,9 @@ package evoting import ( - dvoting "github.com/c4dt/d-voting" - "github.com/c4dt/d-voting/contracts/evoting/types" - "github.com/c4dt/d-voting/services/dkg" + dvoting "github.com/dedis/d-voting" + "github.com/dedis/d-voting/contracts/evoting/types" + "github.com/dedis/d-voting/services/dkg" "github.com/prometheus/client_golang/prometheus" "go.dedis.ch/dela/core/access" "go.dedis.ch/dela/core/execution" @@ -18,7 +18,7 @@ import ( "golang.org/x/xerrors" // Register the JSON format for the form - _ "github.com/c4dt/d-voting/contracts/evoting/json" + _ "github.com/dedis/d-voting/contracts/evoting/json" ) var ( diff --git a/contracts/evoting/mod_test.go b/contracts/evoting/mod_test.go index adf46e2a4..f752ea62f 100644 --- a/contracts/evoting/mod_test.go +++ b/contracts/evoting/mod_test.go @@ -7,9 +7,9 @@ import ( "strconv" "testing" - "github.com/c4dt/d-voting/contracts/evoting/types" - "github.com/c4dt/d-voting/internal/testing/fake" - "github.com/c4dt/d-voting/services/dkg" + "github.com/dedis/d-voting/contracts/evoting/types" + "github.com/dedis/d-voting/internal/testing/fake" + "github.com/dedis/d-voting/services/dkg" "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/require" "go.dedis.ch/dela/core/access" diff --git a/deb-package/README.md b/deb-package/README.md index 99e609bf1..a6222c9f3 100644 --- a/deb-package/README.md +++ b/deb-package/README.md @@ -198,7 +198,7 @@ sudo apt install rubygems build-essential git ## Get the code ```sh -git clone https://github.com/c4dt/d-voting.git +git clone https://github.com/dedis/d-voting.git ``` ## Build the deb package diff --git a/deb-package/build-deb.sh b/deb-package/build-deb.sh index 0a61454ec..a374e11fa 100755 --- a/deb-package/build-deb.sh +++ b/deb-package/build-deb.sh @@ -45,7 +45,7 @@ fpm \ --after-install pkg/after-install.sh \ --before-remove pkg/before-remove.sh \ --after-remove pkg/after-remove.sh \ - --url https://dedis.github.com/c4dt/dvoting \ + --url https://dedis.github.com/dedis/dvoting \ --description 'D-Voting package' \ --package dist . diff --git a/docker-compose/docker-compose.debug.yml b/docker-compose/docker-compose.debug.yml index 66a1ea7f5..642823d52 100644 --- a/docker-compose/docker-compose.debug.yml +++ b/docker-compose/docker-compose.debug.yml @@ -65,7 +65,7 @@ services: ipv4_address: 172.19.44.251 frontend: # web service frontend - image: ghcr.io/c4dt/d-voting-frontend:latest + image: ghcr.io/dedis/d-voting-frontend:latest build: dockerfile: Dockerfiles/Dockerfile.frontend context: ../ @@ -83,7 +83,7 @@ services: ipv4_address: 172.19.44.2 backend: # web service backend - image: ghcr.io/c4dt/d-voting-backend:latest + image: ghcr.io/dedis/d-voting-backend:latest build: dockerfile: Dockerfiles/Dockerfile.backend context: ../ diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 2e86e7634..88fd088e9 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -1,6 +1,6 @@ version: "3.8" x-dela: &dela - image: ghcr.io/c4dt/d-voting-dela:latest + image: ghcr.io/dedis/d-voting-dela:latest env_file: ../.env x-dela-env: &dela-env PROXYKEY: ${PUBLIC_KEY} @@ -55,7 +55,7 @@ services: ipv4_address: 172.19.44.251 frontend: # web service frontend - image: ghcr.io/c4dt/d-voting-frontend:latest + image: ghcr.io/dedis/d-voting-frontend:latest build: dockerfile: Dockerfiles/Dockerfile.frontend context: ../ @@ -67,7 +67,7 @@ services: ipv4_address: 172.19.44.2 backend: # web service backend - image: ghcr.io/c4dt/d-voting-backend:latest + image: ghcr.io/dedis/d-voting-backend:latest build: dockerfile: Dockerfiles/Dockerfile.backend context: ../ diff --git a/docs/coverpage.md b/docs/coverpage.md index 4462113e3..df717a4c8 100644 --- a/docs/coverpage.md +++ b/docs/coverpage.md @@ -5,7 +5,7 @@

- +

- An open platform to run voting instances on a blockchain diff --git a/docs/index.html b/docs/index.html index 4a414ee1a..1fd7617bc 100644 --- a/docs/index.html +++ b/docs/index.html @@ -13,7 +13,7 @@