Bump scionproto and rains dependencies

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: cimg/go:1.20
+      - image: cimg/go:1.21
     steps:
       - run:
           name: Go version
@@ -36,8 +36,14 @@ jobs:
 
   integration:
     machine:
-      image: ubuntu-2004:202111-02 # using go1.17.3
+      image: ubuntu-2204:2023.10.1 # using go1.21.0
     steps:
+      - run:
+          name: Check build tool versions
+          command: |
+            # Log tool versions provided by CircleCi
+            go version
+            python3 --version
       - checkout
       # The following step are shared with netsec-ethz/rains
       - run:
@@ -60,45 +66,33 @@ jobs:
       - run:
           name: Build SCION services and install python3 dependencies
           command: |
-            # Log tool versions provided by CircleCi
-            go version
-            python3 --version
-
             cd ~/scion
-            for service in "posix-router" "cs" "dispatcher" "scion-pki" "daemon" "co"; do
-              go build -o ./bin/ ./go/${service}/ && echo "Built ${service}";
+            for service in "router" "control" "dispatcher" "scion-pki" "daemon"; do
+              go build -o ./bin/ ./${service}/cmd/${service} && echo "Built ${service}";
             done
 
             pip3 install -U wheel setuptools
-            pip3 install -r ~/scion/env/pip3/requirements.txt
+            pip3 install -r tools/env/pip3/requirements.txt
       - run:
           name: Configure and start local SCION AS
           command: |
             cd ~/scion
-            export PYTHONPATH=python/:.
 
             # Generate tiny4.topo
             printf '#!/bin/bash\necho "0.0.0.0"' > tools/docker-ip # Some hackery to make topo scripts run
             # Use IPv4 addresses for this test
-            python3 python/topology/generator.py -c ./topology/tiny4.topo
+            python3 tools/topogen.py -c ./topology/tiny4.topo
             # Link the gen directory containing sciond_addresses.json and as_list.json
             ln -s ~/scion/gen /home/circleci/project/gen
             mkdir gen-cache
 
             # Start all AS tiny4.topo
-            supervisor/supervisor.sh reload
-            supervisor/supervisor.sh start all
+            tools/supervisor.sh reload
+            tools/supervisor.sh start all
       - run:
           name: Install libpam0g-dev
           command:
             sudo apt-get update && sudo apt-get install -y libpam0g-dev
-      # Use different Go version to build scion-apps
-      - run:
-          name: Install Go 1.20.7 to build scion-apps
-          command: |
-            wget https://go.dev/dl/go1.20.7.linux-amd64.tar.gz
-            sudo rm -rf /usr/local/go
-            sudo tar -C /usr/local -xzf go1.20.7.linux-amd64.tar.gz
       - run:
           name: Integration tests
           command: |

Makefile

@@ -24,8 +24,8 @@ build: scion-bat \
 	scion-web-gateway \
 	example-helloworld \
 	example-helloquic \
-	example-hellodrkey \
-	example-shttp-client example-shttp-server example-shttp-fileserver example-shttp-proxy
+	example-shttp-client example-shttp-server example-shttp-fileserver example-shttp-proxy \
+	example-sgrpc-server example-sgrpc-client
 
 clean:
 	go clean ./...
@@ -122,6 +122,10 @@ example-shttp-fileserver:
 example-shttp-proxy:
 	cd _examples && go build -tags=$(TAGS) -o ../$(BIN)/$@ ./shttp/proxy
 
-.PHONY: example-hellodrkey
-example-hellodrkey:
-	cd _examples && go build -tags=$(TAGS) -o ../$(BIN)/$@ ./hellodrkey/
+.PHONY: example-sgrpc-server
+example-sgrpc-server:
+	cd _examples && go build -tags=$(TAGS) -o ../$(BIN)/$@ ./sgrpc/server
+
+.PHONY: example-sgrpc-client
+example-sgrpc-client:
+	cd _examples && go build -tags=$(TAGS) -o ../$(BIN)/$@ ./sgrpc/client

README.md

@@ -99,8 +99,6 @@ The directory _examples contains examples for the usage of the SCION libraries.
   A minimal "hello, world" application using UDP over SCION.
 * [_examples/helloquic](_examples/helloquic/README.md):
   Example for the use of QUIC over SCION.
-* [_examples/hellodrkey](_examples/hellodrkey/README.md):
-  Example for the the use of DRKey.
 * [_examples/sgrpc](_examples/sgrpc/README.md):
   Example for using gRPC over SCION/QUIC with the PAN library.
 * [_examples/shttp](_examples/shttp/README.md):

_examples/go.mod

@@ -1,18 +1,74 @@
 module examples
 
-go 1.16
+go 1.21
 
 require (
-	github.com/golang/protobuf v1.5.2
+	github.com/golang/protobuf v1.5.3
 	github.com/gorilla/handlers v1.5.1
-	github.com/netsec-ethz/scion-apps v0.5.1-0.20220504120040-79211109ed3f
-	github.com/quic-go/quic-go v0.34.0
-	github.com/scionproto/scion v0.6.1-0.20220202161514-5883c725f748
-	google.golang.org/grpc v1.40.0
-	google.golang.org/protobuf v1.28.0
-	inet.af/netaddr v0.0.0-20230525184311-b8eac61e914a
+	github.com/netsec-ethz/scion-apps v0.5.0
+	github.com/quic-go/quic-go v0.38.1
+	google.golang.org/grpc v1.57.2
 )
 
-replace github.com/scionproto/scion => github.com/netsec-ethz/scion v0.6.1-0.20220929101513-2408583f35d1
+require (
+	github.com/antlr/antlr4 v0.0.0-20181218183524-be58ebffde8e // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/britram/borat v0.0.0-20181011130314-f891bcfcfb9b // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/dchest/cmac v1.0.0 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/felixge/httpsnoop v1.0.1 // indirect
+	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
+	github.com/golang/mock v1.6.0 // indirect
+	github.com/google/gopacket v1.1.19 // indirect
+	github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
+	github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
+	github.com/inconshreveable/log15 v0.0.0-20180818164646-67afb5ed74ec // indirect
+	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/mattn/go-sqlite3 v1.14.17 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/netsec-ethz/rains v0.5.1-0.20231016120129-1e8d70642e60 // indirect
+	github.com/onsi/ginkgo/v2 v2.9.5 // indirect
+	github.com/opentracing/opentracing-go v1.2.0 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/prometheus/client_golang v1.14.0 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.37.0 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/quic-go/qtls-go1-20 v0.3.3 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	github.com/scionproto/scion v0.9.1 // indirect
+	github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
+	github.com/uber/jaeger-lib v2.0.0+incompatible // indirect
+	go.uber.org/atomic v1.9.0 // indirect
+	go.uber.org/multierr v1.8.0 // indirect
+	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/crypto v0.9.0 // indirect
+	golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect
+	golang.org/x/mod v0.10.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/tools v0.9.1 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	lukechampine.com/uint128 v1.2.0 // indirect
+	modernc.org/cc/v3 v3.40.0 // indirect
+	modernc.org/ccgo/v3 v3.16.13 // indirect
+	modernc.org/libc v1.22.5 // indirect
+	modernc.org/mathutil v1.5.0 // indirect
+	modernc.org/memory v1.5.0 // indirect
+	modernc.org/opt v0.1.3 // indirect
+	modernc.org/sqlite v1.24.0 // indirect
+	modernc.org/strutil v1.1.3 // indirect
+	modernc.org/token v1.0.1 // indirect
+)
 
 replace github.com/netsec-ethz/scion-apps => ../