From 79ea87c0bed3025f9910ee3d619aa0c40808b0a6 Mon Sep 17 00:00:00 2001 From: Xendarboh <1435589+xendarboh@users.noreply.github.com> Date: Wed, 19 Mar 2025 23:26:48 -0700 Subject: [PATCH 1/2] chore: from 0 to Zero --- .github/workflows/docker.yml | 2 +- apps/walletshield/main.go | 2 +- docker/README.md | 12 ++++++------ docker/node/Dockerfile | 4 ++-- docker/node/env.example | 4 ++-- genconfig/cmd/genconfig/main.go | 2 +- genconfig/genconfig.go | 4 ++-- go.mod | 4 ++-- go.sum | 4 ++-- pki/main.go | 2 +- pki/server.go | 2 +- pki/state.go | 4 ++-- pki/state_chain_comm.go | 4 ++-- .../cbor_plugins/http_proxy/cmd/http_proxy/main.go | 2 +- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 1e2c725..89767cd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,4 +1,4 @@ -name: Build 0KN Node Docker Image +name: Build Node Docker Image on: pull_request: diff --git a/apps/walletshield/main.go b/apps/walletshield/main.go index ac73d9e..059efdd 100644 --- a/apps/walletshield/main.go +++ b/apps/walletshield/main.go @@ -26,7 +26,7 @@ import ( "github.com/katzenpost/katzenpost/client2/thin" sConstants "github.com/katzenpost/katzenpost/core/sphinx/constants" - "github.com/0KnowledgeNetwork/opt/server_plugins/cbor_plugins/http_proxy" + "github.com/ZeroKnowledgeNetwork/opt/server_plugins/cbor_plugins/http_proxy" ) var ( diff --git a/docker/README.md b/docker/README.md index 7675bdc..028f280 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,7 +1,7 @@ # Dockerized Test Networks This directory provides Makefiles and scripts to set up a local, offline test network for developing -and testing 0KN mix network applications and server-side plugins. The setup leverages a +and testing ZKN mix network applications and server-side plugins. The setup leverages a Podman-compatible `docker-compose` configuration for simulating a Katzenpost network environment. The goal is to support core development workflows by enabling local testing of both client and @@ -10,14 +10,14 @@ server mix network components in isolated, controlled conditions. There are two Makefiles available, each corresponding to a different PKI. - **`Makefile`:** (Default) Manages a local test network using Katzenpost’s voting PKI. -- **`Makefile.appchain`:** Uses 0KN’s ZKAppChain PKI. +- **`Makefile.appchain`:** Uses ZKN’s ZKAppChain PKI. ## Voting PKI -This setup, managed by the default `Makefile`, covers 0KN-specifics and proxies other targets to +This setup, managed by the default `Makefile`, covers ZKN-specifics and proxies other targets to Katzenpost's `docker/Makefile`. For additional details, refer to the [Katzenpost Docker Test Network documentation](https://github.com/katzenpost/katzenpost/tree/main/docker). The voting PKI -functionality offers less complex local testing of 0KN mix plugins and client apps that do not +functionality offers less complex local testing of ZKN mix plugins and client apps that do not require the appchain. ## Appchain PKI @@ -32,8 +32,8 @@ appchain-agent, utilizing UNIX domain sockets for communication. To run the Appchain PKI network, ensure the following components are available: -- [appchain-agent](https://github.com/0KnowledgeNetwork/appchain-agent) Docker image -- An operational 0KN ZKAppChain +- [appchain-agent](https://github.com/ZeroKnowledgeNetwork/appchain-agent) Docker image +- An operational ZKN ZKAppChain ### Example Workflow diff --git a/docker/node/Dockerfile b/docker/node/Dockerfile index 6f4af19..5238c3b 100644 --- a/docker/node/Dockerfile +++ b/docker/node/Dockerfile @@ -41,7 +41,7 @@ COPY . /src # Build Katzenpost components RUN --mount=type=cache,target="${GOCACHE}" \ mkdir /dest \ - # clone 0KN opt-specific katzenpost branch, if one does not exist + # clone opt-specific katzenpost branch, if one does not exist && if [ ! -d "${KATZENPOST_DIR}" ]; then make katzenpost_dir=${KATZENPOST_DIR} -C /src/docker clone-katzenpost ; fi \ # a function to build and move the binary && build() { cd ${KATZENPOST_DIR}/$1 ; b=$(basename $1) ; go build ${GO_BUILD_OPTS} ; chmod u+x $b ; mv $b /dest/$2; } \ @@ -58,7 +58,7 @@ RUN --mount=type=cache,target="${GOCACHE}" \ && build panda/server/cmd/panda_server panda_server \ && build server_plugins/cbor_plugins/echo-go echo_server -# Build 0KN mix network components +# Build ZKN mix network components RUN --mount=type=cache,target="${GOCACHE}" \ # a function to build and move the binary build() { cd /src/$1 ; b=$(basename $1) ; go build ${GO_BUILD_OPTS} ; chmod u+x $b ; mv $b /dest/$2; } \ diff --git a/docker/node/env.example b/docker/node/env.example index fbe427e..b644816 100644 --- a/docker/node/env.example +++ b/docker/node/env.example @@ -8,8 +8,8 @@ VOLUME_MIXNET=/tmp/mix DIR_BASE=/mixnet DIR_BIN=/opt/zkn -IMAGE_AGENT=ghcr.io/0knowledgenetwork/appchain-agent:latest -IMAGE_NODE=ghcr.io/0knowledgenetwork/node:latest +IMAGE_AGENT=ghcr.io/zeroknowledgenetwork/appchain-agent:latest +IMAGE_NODE=ghcr.io/zeroknowledgenetwork/node:latest URL_APPCHAIN_INDEXER=http://localhost:8081/graphql URL_APPCHAIN_SEQUENCER=http://localhost:8080/graphql URL_APPCHAIN_PROCESSOR=http://localhost:8082/graphql diff --git a/genconfig/cmd/genconfig/main.go b/genconfig/cmd/genconfig/main.go index d7d200b..dd45336 100644 --- a/genconfig/cmd/genconfig/main.go +++ b/genconfig/cmd/genconfig/main.go @@ -3,7 +3,7 @@ package main import ( "log" - "github.com/0KnowledgeNetwork/opt/genconfig" + "github.com/ZeroKnowledgeNetwork/opt/genconfig" ) func main() { diff --git a/genconfig/genconfig.go b/genconfig/genconfig.go index 680e4fc..d876808 100644 --- a/genconfig/genconfig.go +++ b/genconfig/genconfig.go @@ -36,7 +36,7 @@ import ( "github.com/katzenpost/katzenpost/core/sphinx/geo" sConfig "github.com/katzenpost/katzenpost/server/config" - zknConfig "github.com/0KnowledgeNetwork/opt/genconfig/config" + zknConfig "github.com/ZeroKnowledgeNetwork/opt/genconfig/config" ) const ( @@ -370,7 +370,7 @@ func (s *katzenpost) genNodeConfig(identifier string, isGateway bool, isServiceN s.hasProxy = true } - // 0KN JSON RPC - HTTP Proxy + // ZKN JSON RPC - HTTP Proxy httpProxyCfg := &sConfig.CBORPluginKaetzchen{ Capability: "http_proxy", Endpoint: "http_proxy", diff --git a/go.mod b/go.mod index d5324c7..1b9ef95 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ -module github.com/0KnowledgeNetwork/opt +module github.com/ZeroKnowledgeNetwork/opt go 1.23.0 require ( - github.com/0KnowledgeNetwork/appchain-agent/clients/go v0.0.0-20250108045135-72cb54760c56 github.com/BurntSushi/toml v1.4.0 + github.com/ZeroKnowledgeNetwork/appchain-agent/clients/go v0.0.0-20250320061231-774b32400141 github.com/carlmjohnson/versioninfo v0.22.5 github.com/charmbracelet/log v0.4.0 github.com/fxamacker/cbor/v2 v2.7.0 diff --git a/go.sum b/go.sum index 8d1322b..d2d987c 100644 --- a/go.sum +++ b/go.sum @@ -4,10 +4,10 @@ filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= filippo.io/mlkem768 v0.0.0-20240221181710-5ce91625fdc1 h1:xbdqh5aDZeO0XqW896qVjKnAqRji9nkIwmsBEEbCA10= filippo.io/mlkem768 v0.0.0-20240221181710-5ce91625fdc1/go.mod h1:mIEHrcJ2xBlJRQwnRO0ujmZ+Rt6m6eNeCPq8E3Wkths= -github.com/0KnowledgeNetwork/appchain-agent/clients/go v0.0.0-20250108045135-72cb54760c56 h1:CX9n4//lUS6bhHfUJEKPKmY/KFitHfmIn6YYFc3y8Tk= -github.com/0KnowledgeNetwork/appchain-agent/clients/go v0.0.0-20250108045135-72cb54760c56/go.mod h1:sMFBunupwopr9TDPw5bxUrs1mSYDn2QPF/vFI7gvWwU= github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= +github.com/ZeroKnowledgeNetwork/appchain-agent/clients/go v0.0.0-20250320061231-774b32400141 h1:Bzu2TizLmnFrUSlmQg+yJigXpFz3DRYhxjUih2LuAcg= +github.com/ZeroKnowledgeNetwork/appchain-agent/clients/go v0.0.0-20250320061231-774b32400141/go.mod h1:Vs5ELDdDNNQDSEhEKs4UNlujZkTQaW8jCtfjlOCHDno= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/carlmjohnson/versioninfo v0.22.5 h1:O00sjOLUAFxYQjlN/bzYTuZiS0y6fWDQjMRvwtKgwwc= diff --git a/pki/main.go b/pki/main.go index 322dab3..c33a138 100644 --- a/pki/main.go +++ b/pki/main.go @@ -10,7 +10,7 @@ import ( "github.com/carlmjohnson/versioninfo" - "github.com/0KnowledgeNetwork/opt/pki/config" + "github.com/ZeroKnowledgeNetwork/opt/pki/config" "github.com/katzenpost/katzenpost/core/compat" ) diff --git a/pki/server.go b/pki/server.go index a82e05b..a967749 100644 --- a/pki/server.go +++ b/pki/server.go @@ -29,7 +29,7 @@ import ( "github.com/katzenpost/katzenpost/core/utils" "github.com/katzenpost/katzenpost/http/common" - "github.com/0KnowledgeNetwork/opt/pki/config" + "github.com/ZeroKnowledgeNetwork/opt/pki/config" ) // ErrGenerateOnly is the error returned when the server initialization diff --git a/pki/state.go b/pki/state.go index 1531f93..7911a60 100644 --- a/pki/state.go +++ b/pki/state.go @@ -24,8 +24,8 @@ import ( "github.com/katzenpost/katzenpost/core/sphinx/constants" "github.com/katzenpost/katzenpost/core/worker" - "github.com/0KnowledgeNetwork/appchain-agent/clients/go/chainbridge" - "github.com/0KnowledgeNetwork/opt/pki/config" + "github.com/ZeroKnowledgeNetwork/appchain-agent/clients/go/chainbridge" + "github.com/ZeroKnowledgeNetwork/opt/pki/config" ) const ( diff --git a/pki/state_chain_comm.go b/pki/state_chain_comm.go index 0394368..189a779 100644 --- a/pki/state_chain_comm.go +++ b/pki/state_chain_comm.go @@ -9,8 +9,8 @@ import ( "github.com/katzenpost/hpqc/sign" "github.com/katzenpost/katzenpost/core/pki" - "github.com/0KnowledgeNetwork/appchain-agent/clients/go/chainbridge" - "github.com/0KnowledgeNetwork/opt/pki/config" + "github.com/ZeroKnowledgeNetwork/appchain-agent/clients/go/chainbridge" + "github.com/ZeroKnowledgeNetwork/opt/pki/config" ) func (s *state) chNodesGet(name string) (*chainbridge.Node, error) { diff --git a/server_plugins/cbor_plugins/http_proxy/cmd/http_proxy/main.go b/server_plugins/cbor_plugins/http_proxy/cmd/http_proxy/main.go index 8ad1ad2..072894f 100644 --- a/server_plugins/cbor_plugins/http_proxy/cmd/http_proxy/main.go +++ b/server_plugins/cbor_plugins/http_proxy/cmd/http_proxy/main.go @@ -22,7 +22,7 @@ import ( "github.com/katzenpost/katzenpost/core/log" "github.com/katzenpost/katzenpost/server/cborplugin" - "github.com/0KnowledgeNetwork/opt/server_plugins/cbor_plugins/http_proxy" + "github.com/ZeroKnowledgeNetwork/opt/server_plugins/cbor_plugins/http_proxy" ) // Note: UserForwardPayloadLength should match the same value passed to genconfig. From e3992e7cfb398fcc2d4eb3528e1b62c12252a9ab Mon Sep 17 00:00:00 2001 From: Xendarboh <1435589+xendarboh@users.noreply.github.com> Date: Thu, 20 Mar 2025 12:11:43 -0700 Subject: [PATCH 2/2] ci: disable walletshield e2e tests some testnet RPC endpoints are not suited for automated tests #102 --- .github/workflows/go.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 3eb6bc0..1bd8221 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -48,11 +48,11 @@ jobs: sleep 10 sudo -E make walletshield-logs - - name: Test walletshield - run: ./tests/e2e/walletshield/test.sh + # - name: Test walletshield + # run: ./tests/e2e/walletshield/test.sh - - name: Test walletshield request concurrency - run: ./tests/e2e/walletshield/test-concurrent-requests.sh + # - name: Test walletshield request concurrency + # run: ./tests/e2e/walletshield/test-concurrent-requests.sh - name: Stop walletshield run: |