Skip to content

Commit 35ae82b

Browse files
xendarbohxendarboh
committed
feat: update apps/walletshield (v0.4.3)
1 parent ef33eca commit 35ae82b

File tree

3 files changed

+34
-33
lines changed

3 files changed

+34
-33
lines changed

‎apps/walletshield/main.go‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import (
2626
"github.com/katzenpost/katzenpost/client2/thin"
2727
sConstants "github.com/katzenpost/katzenpost/core/sphinx/constants"
2828

29-
"github.com/0KnowledgeNetwork/opt/server_plugins/cbor_plugins/http_proxy"
29+
"github.com/ZeroKnowledgeNetwork/opt/server_plugins/cbor_plugins/http_proxy"
3030
)
3131

3232
var (
33-
timeout = time.Second * 45
33+
timeout = 20 // (default) context timeout
3434
ProxyHTTPService = "http_proxy"
3535

3636
// Note: UserForwardPayloadLength should match the same value passed to genconfig.
@@ -51,7 +51,7 @@ func sendRequest(thin *thin.ThinClient, payload []byte) ([]byte, error) {
5151
}
5252
nodeId := hash.Sum256(target.MixDescriptor.IdentityKey)
5353

54-
timeoutCtx, _ := context.WithTimeout(context.TODO(), timeout)
54+
timeoutCtx, _ := context.WithTimeout(context.TODO(), time.Duration(timeout)*time.Second)
5555
return thin.BlockingSendMessage(timeoutCtx, payload, &nodeId, target.RecipientQueueID)
5656
}
5757

@@ -70,6 +70,7 @@ func main() {
7070
var testProbe bool
7171
var testProbeCount int
7272
var testProbeResponseDelay int
73+
var testProbeSendDelay int
7374

7475
flag.StringVar(&configPath, "config", "", "file path of the client configuration TOML file")
7576
flag.IntVar(&delayStart, "delay_start", 0, "max random seconds to delay start")
@@ -79,6 +80,8 @@ func main() {
7980
flag.BoolVar(&testProbe, "probe", false, "send test probes instead of handling requests")
8081
flag.IntVar(&testProbeCount, "probe_count", 1, "number of test probes to send")
8182
flag.IntVar(&testProbeResponseDelay, "probe_response_delay", 0, "test probe response deplay")
83+
flag.IntVar(&testProbeSendDelay, "probe_send_delay", 10, "test probe delay between probes")
84+
flag.IntVar(&timeout, "timeout", timeout, "seconds to wait for a request")
8285
flag.Parse()
8386

8487
if listenAddr == "" && !testProbe {
@@ -139,7 +142,7 @@ func main() {
139142
}
140143

141144
if testProbe {
142-
server.SendTestProbes(10*time.Second, testProbeCount, testProbeResponseDelay)
145+
server.SendTestProbes(testProbeSendDelay, testProbeCount, testProbeResponseDelay)
143146
} else {
144147
http.HandleFunc("/", server.Handler)
145148
err := http.ListenAndServe(listenAddr, nil)
@@ -217,7 +220,7 @@ func (s *Server) Handler(w http.ResponseWriter, req *http.Request) {
217220
fmt.Fprintf(w, string(response.Payload))
218221
}
219222

220-
func (s *Server) SendTestProbes(d time.Duration, testProbeCount int, testProbeResponseDelay int) {
223+
func (s *Server) SendTestProbes(testProbeSendDelay int, testProbeCount int, testProbeResponseDelay int) {
221224
url := fmt.Sprintf("http://nowhere/_/probe/%d", testProbeResponseDelay)
222225
req, err := http.NewRequest("GET", url, nil)
223226
buf := new(bytes.Buffer)
@@ -265,6 +268,6 @@ func (s *Server) SendTestProbes(d time.Duration, testProbeCount int, testProbeRe
265268
os.Exit(0)
266269
}
267270

268-
time.Sleep(d)
271+
time.Sleep(time.Duration(testProbeSendDelay) * time.Second)
269272
}
270273
}

‎go.mod‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
module tmp-goreleaser
22

3-
go 1.22.3
4-
5-
toolchain go1.23.2
3+
go 1.23.0
64

75
require (
8-
github.com/0KnowledgeNetwork/opt v0.0.0-20240501001727-cc3d40b63cb3
6+
github.com/ZeroKnowledgeNetwork/opt v0.4.3
97
github.com/charmbracelet/log v0.4.0
108
github.com/fxamacker/cbor/v2 v2.7.0
119
github.com/katzenpost/hpqc v0.0.45
@@ -39,22 +37,22 @@ require (
3937
github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
4038
github.com/onsi/ginkgo/v2 v2.20.2 // indirect
4139
github.com/quic-go/qpack v0.5.1 // indirect
42-
github.com/quic-go/quic-go v0.47.0 // indirect
40+
github.com/quic-go/quic-go v0.50.0 // indirect
4341
github.com/rfjakob/eme v1.1.2 // indirect
4442
github.com/rivo/uniseg v0.4.7 // indirect
4543
github.com/x448/float16 v0.8.4 // indirect
4644
gitlab.com/yawning/aez.git v0.0.0-20211027044916-e49e68abd344 // indirect
4745
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
4846
gitlab.com/yawning/x448.git v0.0.0-20221003101044-617eb9b7d9b7 // indirect
4947
go.etcd.io/bbolt v1.3.10 // indirect
50-
go.uber.org/mock v0.4.0 // indirect
51-
golang.org/x/crypto v0.27.0 // indirect
48+
go.uber.org/mock v0.5.0 // indirect
49+
golang.org/x/crypto v0.36.0 // indirect
5250
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
5351
golang.org/x/mod v0.21.0 // indirect
54-
golang.org/x/net v0.29.0 // indirect
55-
golang.org/x/sync v0.8.0 // indirect
56-
golang.org/x/sys v0.25.0 // indirect
57-
golang.org/x/text v0.18.0 // indirect
52+
golang.org/x/net v0.37.0 // indirect
53+
golang.org/x/sync v0.12.0 // indirect
54+
golang.org/x/sys v0.31.0 // indirect
55+
golang.org/x/text v0.23.0 // indirect
5856
golang.org/x/tools v0.24.0 // indirect
5957
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
6058
)

‎go.sum‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
44
filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
55
filippo.io/mlkem768 v0.0.0-20240221181710-5ce91625fdc1 h1:xbdqh5aDZeO0XqW896qVjKnAqRji9nkIwmsBEEbCA10=
66
filippo.io/mlkem768 v0.0.0-20240221181710-5ce91625fdc1/go.mod h1:mIEHrcJ2xBlJRQwnRO0ujmZ+Rt6m6eNeCPq8E3Wkths=
7-
github.com/0KnowledgeNetwork/opt v0.0.0-20240501001727-cc3d40b63cb3 h1:VT7LlEDks5EPEwkpI0+Ti7FSDAzMz6CMBUvTjfsIESY=
8-
github.com/0KnowledgeNetwork/opt v0.0.0-20240501001727-cc3d40b63cb3/go.mod h1:evyi8uAnS0Oq4hCDhlIjlqoGRtMpeaL1OdmWjXjm6XE=
97
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
108
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
9+
github.com/ZeroKnowledgeNetwork/opt v0.4.3 h1:fXPzngul9juY7yGbWtgBz2Jm66L+JBbkaECknN6jJts=
10+
github.com/ZeroKnowledgeNetwork/opt v0.4.3/go.mod h1:kNnG8tM0j35SzwSUEpjJG/YmnYxnabNi5DygljD23Zo=
1111
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
1212
github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
1313
github.com/charmbracelet/lipgloss v0.10.0 h1:KWeXFSexGcfahHX+54URiZGkBFazf70JNMtwg/AFW3s=
@@ -74,8 +74,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
7474
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
7575
github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
7676
github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
77-
github.com/quic-go/quic-go v0.47.0 h1:yXs3v7r2bm1wmPTYNLKAAJTHMYkPEsfYJmTazXrCZ7Y=
78-
github.com/quic-go/quic-go v0.47.0/go.mod h1:3bCapYsJvXGZcipOHuu7plYtaV6tnF+z7wIFsU0WK9E=
77+
github.com/quic-go/quic-go v0.50.0 h1:3H/ld1pa3CYhkcc20TPIyG1bNsdhn9qZBGN3b9/UyUo=
78+
github.com/quic-go/quic-go v0.50.0/go.mod h1:Vim6OmUvlYdwBhXP9ZVrtGmCMWa3wEqhq3NgYrI8b4E=
7979
github.com/rfjakob/eme v1.1.2 h1:SxziR8msSOElPayZNFfQw4Tjx/Sbaeeh3eRvrHVMUs4=
8080
github.com/rfjakob/eme v1.1.2/go.mod h1:cVvpasglm/G3ngEfcfT/Wt0GwhkuO32pf/poW6Nyk1k=
8181
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
@@ -97,26 +97,26 @@ gitlab.com/yawning/x448.git v0.0.0-20221003101044-617eb9b7d9b7 h1:ITrNVw6uSwSdEa
9797
gitlab.com/yawning/x448.git v0.0.0-20221003101044-617eb9b7d9b7/go.mod h1:BC2R0OW0tAYTMNLB4UMXwkk7WKokoDZP5n73hyLPyCo=
9898
go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0=
9999
go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ=
100-
go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
101-
go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
102-
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
103-
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
100+
go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
101+
go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
102+
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
103+
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
104104
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e h1:I88y4caeGeuDQxgdoFPUq097j7kNfw6uvuiNxUBfcBk=
105105
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
106106
golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
107107
golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
108-
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
109-
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
110-
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
111-
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
108+
golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
109+
golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
110+
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
111+
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
112112
golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
113113
golang.org/x/sys v0.0.0-20190902133755-9109b7679e13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
114114
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
115115
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
116-
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
117-
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
118-
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
119-
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
116+
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
117+
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
118+
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
119+
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
120120
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
121121
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
122122
golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=

0 commit comments

Comments
 (0)