Browse Source

message encode bugfix

0x4a52466c696e74 2 years ago
parent
commit
c064bd1f08
5 changed files with 13 additions and 5 deletions
  1. BIN
      curve-app
  2. BIN
      curve-app.exe
  3. 4 4
      go.mod
  4. 8 0
      go.sum
  5. 1 1
      method.go

BIN
curve-app


BIN
curve-app.exe


+ 4 - 4
go.mod

@@ -3,9 +3,9 @@ module curve-app
 go 1.18
 
 require (
-	git.ali33.ru/fcg-xvii/curve/v2 v2.0.8
+	git.ali33.ru/fcg-xvii/curve/v2 v2.0.9
 	git.ali33.ru/fcg-xvii/go-tools v0.0.0-20221003202615-4f03edf5cf03
-	git.ali33.ru/fcg-xvii/net/v3 v3.2.1
+	git.ali33.ru/fcg-xvii/net/v3 v3.2.2
 	github.com/gorilla/websocket v1.5.0
 	golang.org/x/net v0.1.0
 )
@@ -14,11 +14,11 @@ require (
 	git.ali33.ru/fcg-xvii/metla v0.0.0-20220925104102-c0394c741ec0 // indirect
 	git.ali33.ru/fcg-xvii/mjs v0.0.0-20221008153018-6dc4c41d564e // indirect
 	github.com/dlclark/regexp2 v1.7.0 // indirect
-	github.com/dop251/goja v0.0.0-20221024130056-0ad46a434ac5 // indirect
+	github.com/dop251/goja v0.0.0-20221025165401-cb5011b539fe // indirect
 	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
-	github.com/jackc/pgx/v5 v5.0.3 // indirect
+	github.com/jackc/pgx/v5 v5.0.4 // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/xlab/closer v1.1.0 // indirect
 	golang.org/x/crypto v0.1.0 // indirect

+ 8 - 0
go.sum

@@ -12,6 +12,8 @@ git.ali33.ru/fcg-xvii/curve/v2 v2.0.6 h1:CY0DSQRIKkfiPVfQ0Dk6cvqv+MfLzDmYzxXRKFn
 git.ali33.ru/fcg-xvii/curve/v2 v2.0.6/go.mod h1:eGQ1B63EQk4oPgIH6++g9Yv9VTrGEsVZKQN3rDos0YE=
 git.ali33.ru/fcg-xvii/curve/v2 v2.0.8 h1:p5uOAaUxHDufPeS2BrIC95iWi9era04dDgAFjQPFDYM=
 git.ali33.ru/fcg-xvii/curve/v2 v2.0.8/go.mod h1:eGQ1B63EQk4oPgIH6++g9Yv9VTrGEsVZKQN3rDos0YE=
+git.ali33.ru/fcg-xvii/curve/v2 v2.0.9 h1:/v/imNjddJS5D0pDENfL/ts/qe7b/0fa2XczQ7fsF88=
+git.ali33.ru/fcg-xvii/curve/v2 v2.0.9/go.mod h1:eGQ1B63EQk4oPgIH6++g9Yv9VTrGEsVZKQN3rDos0YE=
 git.ali33.ru/fcg-xvii/go-tools v0.0.0-20220506161429-319953bb5590/go.mod h1:8XpQShSOR7fAiCJg56M2mhf1KxiqnTeGttW/CUuyyCk=
 git.ali33.ru/fcg-xvii/go-tools v0.0.0-20221003202615-4f03edf5cf03 h1:1ZnIuj6Z2f/Rv8TDSQuDBBwWCezEE5aZSBjo88tSIBE=
 git.ali33.ru/fcg-xvii/go-tools v0.0.0-20221003202615-4f03edf5cf03/go.mod h1:YbBhWFFNNQIKcRisQFnpVaN5KA+XHGImSU1Z/MuntqU=
@@ -30,6 +32,8 @@ git.ali33.ru/fcg-xvii/net/v3 v3.2.0 h1:9eOGPP1HttkajmpaGJAYumo5h6nGeBOrQVQ5sAs94
 git.ali33.ru/fcg-xvii/net/v3 v3.2.0/go.mod h1:onmfJhthLc8AJBpxyQ8WH/bU3zwNQuJAuvRbaLYeUws=
 git.ali33.ru/fcg-xvii/net/v3 v3.2.1 h1:adMRkMb9n02K4ayJ5A1VFGyO9g6e8ruU2KfSimn3N8o=
 git.ali33.ru/fcg-xvii/net/v3 v3.2.1/go.mod h1:onmfJhthLc8AJBpxyQ8WH/bU3zwNQuJAuvRbaLYeUws=
+git.ali33.ru/fcg-xvii/net/v3 v3.2.2 h1:BPTmJkKb8cxVxFP8+EE6xj2rW5ETU4OK5QMXSzkfhcw=
+git.ali33.ru/fcg-xvii/net/v3 v3.2.2/go.mod h1:onmfJhthLc8AJBpxyQ8WH/bU3zwNQuJAuvRbaLYeUws=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -47,6 +51,8 @@ github.com/dop251/goja v0.0.0-20221019153710-09250e0eba20 h1:AxWn8phZA9tjgDGKyDR
 github.com/dop251/goja v0.0.0-20221019153710-09250e0eba20/go.mod h1:yRkwfj0CBpOGre+TwBsqPV0IH0Pk73e4PXJOeNDboGs=
 github.com/dop251/goja v0.0.0-20221024130056-0ad46a434ac5 h1:vecG6NrggTQGPjFrQndy8t2x3YZ1X9ReiU5EOus/ofg=
 github.com/dop251/goja v0.0.0-20221024130056-0ad46a434ac5/go.mod h1:yRkwfj0CBpOGre+TwBsqPV0IH0Pk73e4PXJOeNDboGs=
+github.com/dop251/goja v0.0.0-20221025165401-cb5011b539fe h1:eJUWWwcoq0m/pD0HdB2TwMixgnoWiey69IfYIpIb3YA=
+github.com/dop251/goja v0.0.0-20221025165401-cb5011b539fe/go.mod h1:yRkwfj0CBpOGre+TwBsqPV0IH0Pk73e4PXJOeNDboGs=
 github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
 github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d/go.mod h1:DngW8aVqWbuLRMHItjPUyqdj+HWPvnQe8V8y1nDpIbM=
 github.com/fcg-xvii/go-tools v0.0.0-20220316201232-6d6629b9d1e7/go.mod h1:iqeLyAqB+RN0zxQTNk7yWI9dzy09Oc6yUk1m1vkdws0=
@@ -63,6 +69,8 @@ github.com/jackc/pgx/v5 v5.0.0-beta.5 h1:7H5vxAbAN3zpEif3dpdsXvbhfIUb2NVIogwoMNZ
 github.com/jackc/pgx/v5 v5.0.0-beta.5/go.mod h1:h6/rDxQ5OUUxMEeTJYC3HZ/6Rh6uPVD0zLsdODEcwps=
 github.com/jackc/pgx/v5 v5.0.3 h1:4flM5ecR/555F0EcnjdaZa6MhBU+nr0QbZIo5vaKjuM=
 github.com/jackc/pgx/v5 v5.0.3/go.mod h1:JBbvW3Hdw77jKl9uJrEDATUZIFM2VFPzRq4RWIhkF4o=
+github.com/jackc/pgx/v5 v5.0.4 h1:r5O6y84qHX/z/HZV40JBdx2obsHz7/uRj5b+CcYEdeY=
+github.com/jackc/pgx/v5 v5.0.4/go.mod h1:U0ynklHtgg43fue9Ly30w3OCSTDPlXjig9ghrNGaguQ=
 github.com/jackc/puddle/v2 v2.0.0-beta.1/go.mod h1:itE7ZJY8xnoo0JqJEpSMprN0f+NQkMCuEV/N9j8h0oc=
 github.com/jackc/puddle/v2 v2.0.0-beta.2 h1:xhhtVfiDyh29TTvZPIvY5zld5YYMmA9ErRr+fjMkmE0=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=

+ 1 - 1
method.go

@@ -66,7 +66,7 @@ func MethodExec(p1, p2 curve.KeyPair, ch chan<- *Event, ctx context.Context, mes
 			Value: json.Map{
 				"method":  method,
 				"text":    message,
-				"encoded": encoded,
+				"encoded": encoded.Encoded(),
 				"time":    int64(time.Since(t) / time.Millisecond),
 			},
 		}