From 218a7b161a450630283c1fd3eb295f77538a6769 Mon Sep 17 00:00:00 2001 From: SREENIDHI DR Date: Mon, 17 Mar 2025 16:56:36 +0530 Subject: [PATCH 01/30] issue fix --- go.mod | 18 ++++++++--- go.sum | 46 ++++++++++++++++++++++++++-- token/services/ttx/accept.go | 15 ++++----- token/services/ttx/auditor.go | 7 +++-- token/services/ttx/endorse.go | 32 +++++++++++++------ token/services/ttx/multisig/spend.go | 42 +++++++++++++++---------- 6 files changed, 117 insertions(+), 43 deletions(-) diff --git a/go.mod b/go.mod index 5bffe2a60..1fcedf504 100644 --- a/go.mod +++ b/go.mod @@ -6,10 +6,13 @@ require ( github.com/IBM/idemix v0.0.2-0.20240816143710-3dce4618d760 github.com/IBM/idemix/bccsp/types v0.0.0-20240816143710-3dce4618d760 github.com/IBM/mathlib v0.0.3-0.20241219051532-81539b287cf5 + github.com/docker/docker v27.2.0+incompatible + github.com/docker/go-connections v0.5.0 github.com/gin-gonic/gin v1.10.0 github.com/gobuffalo/packr/v2 v2.7.1 github.com/hashicorp/go-uuid v1.0.3 - github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250319152028-b53f202e2b62 + github.com/hashicorp/vault/api v1.16.0 + github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250314124232-4cd027590cfb github.com/hyperledger-labs/orion-sdk-go v0.2.10 github.com/hyperledger-labs/orion-server v0.2.10 github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2 @@ -79,8 +82,6 @@ require ( github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect github.com/distribution/reference v0.6.0 // indirect - github.com/docker/docker v27.2.0+incompatible // indirect - github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/elastic/gosigar v0.14.3 // indirect @@ -93,6 +94,7 @@ require ( github.com/ghodss/yaml v1.0.0 // indirect github.com/gin-contrib/cors v1.7.2 // indirect github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-jose/go-jose/v4 v4.0.1 // indirect github.com/go-kit/kit v0.13.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect @@ -121,7 +123,13 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect github.com/hashicorp/consul/sdk v0.16.1 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hashicorp/go-retryablehttp v0.7.7 // indirect + github.com/hashicorp/go-rootcerts v1.0.2 // indirect + github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect + github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect + github.com/hashicorp/go-sockaddr v1.0.2 // indirect github.com/hashicorp/golang-lru v1.0.2 // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hashicorp/hcl v1.0.0 // indirect @@ -172,6 +180,7 @@ require ( github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect github.com/minio/sha256-simd v1.0.1 // indirect github.com/miracl/conflate v1.3.4 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mmcloughlin/addchain v0.4.0 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/patternmatcher v0.6.0 // indirect @@ -227,6 +236,7 @@ require ( github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 // indirect github.com/raulk/go-watchdog v1.3.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect + github.com/ryanuber/go-glob v1.0.0 // indirect github.com/sagikazarmark/locafero v0.6.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/shirou/gopsutil/v3 v3.23.12 // indirect @@ -288,4 +298,4 @@ require ( modernc.org/strutil v1.2.0 // indirect modernc.org/token v1.1.0 // indirect rsc.io/tmplfunc v0.0.3 // indirect -) +) \ No newline at end of file diff --git a/go.sum b/go.sum index 461d85473..e6c8dba08 100644 --- a/go.sum +++ b/go.sum @@ -665,6 +665,7 @@ github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0I github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4xei5aX110hRiI= github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o= @@ -672,6 +673,7 @@ github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZx github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE= github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= @@ -798,6 +800,9 @@ github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w= github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= @@ -835,6 +840,8 @@ github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmn github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-jose/go-jose/v4 v4.0.1 h1:QVEPDE3OluqXBQZDcnNvQrInro2h0e4eqNbnZSWqS6U= +github.com/go-jose/go-jose/v4 v4.0.1/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY= github.com/go-kit/kit v0.13.0 h1:OoneCcHKHQ03LfBpoQCUfCluwd2Vt3ohz+kvbJneZAU= github.com/go-kit/kit v0.13.0/go.mod h1:phqEHMMUbyrCFCTgH48JueqrM3md2HcAZ8N3XE4FKDg= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= @@ -869,6 +876,8 @@ github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg78 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= +github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw= +github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0= github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= github.com/gobuffalo/envy v1.7.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w= @@ -1040,8 +1049,24 @@ github.com/hashicorp/consul/sdk v0.16.1/go.mod h1:fSXvwxB2hmh1FMZCNl6PwX0Q/1wdWt github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= +github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= +github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= +github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 h1:om4Al8Oy7kCm/B86rLCLah4Dt5Aa0Fr5rYBG60OzwHQ= +github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8= +github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod h1:gKOamz3EwoIoJq7mlMIRBpVTAUn8qPCrEclOKKWhD3U= +github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts= +github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4= +github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= +github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= @@ -1052,13 +1077,15 @@ github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/vault/api v1.16.0 h1:nbEYGJiAPGzT9U4oWgaaB0g+Rj8E59QuHKyA5LhwQN4= +github.com/hashicorp/vault/api v1.16.0/go.mod h1:KhuUhzOD8lDSk29AtzNjgAu2kxRA9jL9NAbkFlqvkBA= github.com/hidal-go/hidalgo v0.0.0-20201109092204-05749a6d73df h1:bvz3e467dv98bVHQ9F5QbGKtGvyQO3rPD8lwu6fZ/D4= github.com/hidal-go/hidalgo v0.0.0-20201109092204-05749a6d73df/go.mod h1:bPkrxDlroXxigw8BMWTEPTv4W5/rQwNgg2BECXsgyX0= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= -github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250319152028-b53f202e2b62 h1:fUK1AxK//9bF8si5AYE6kptAErzn+oWbINndOTfTQTM= -github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250319152028-b53f202e2b62/go.mod h1:EdiA1cY2eOOZjqPlutIlFPkueUMMJOxLoiRH5KwOW1c= +github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250314124232-4cd027590cfb h1:tXjdCuJdbLmf+oPb9CluSOuwnYPnQKJn8gwySYBy3to= +github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250314124232-4cd027590cfb/go.mod h1:EdiA1cY2eOOZjqPlutIlFPkueUMMJOxLoiRH5KwOW1c= github.com/hyperledger-labs/orion-sdk-go v0.2.10 h1:lFgWgxyvngIhWnIqymYGBmtmq9D6uC5d0uLG9cbyh5s= github.com/hyperledger-labs/orion-sdk-go v0.2.10/go.mod h1:iN2xZB964AqwVJwL+EnwPOs8z1EkMEbbIg/qYeC7gDY= github.com/hyperledger-labs/orion-server v0.2.10 h1:G4zbQEL5Egk0Oj+TwHCZWdTOLDBHOjaAEvYOT4G7ozw= @@ -1211,6 +1238,10 @@ github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3v github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd h1:br0buuQ854V8u83wA0rVZ8ttrq5CpaPZdvrK0LP2lOk= github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd/go.mod h1:QuCEs1Nt24+FYQEqAAncTDPJIuGs+LxK1MCiFL25pMU= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= @@ -1237,8 +1268,12 @@ github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dz github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8= github.com/miracl/conflate v1.3.4 h1:BI+pOex3Pp7DtSaTDqArYDMKSSDYUvRjb66lgAHhSFw= github.com/miracl/conflate v1.3.4/go.mod h1:7S2L/ymkFyEgv8oM5G6sKxTExeRkLqxPBJgNz7g1ys0= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY= @@ -1412,6 +1447,7 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/polydawn/refmt v0.89.0 h1:ADJTApkvkeBZsN0tBTx8QjpD9JkmxbKp0cxfr9qszm4= github.com/polydawn/refmt v0.89.0/go.mod h1:/zvteZs/GwLtCgZ4BL6CBsk9IKIlexP43ObX9AxTqTw= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -1454,6 +1490,9 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk= +github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk= +github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3N51bwOk= github.com/sagikazarmark/locafero v0.6.0/go.mod h1:77OmuIc6VTraTXKXIs/uvUxKGUXjE1GbemJYHqdNjX0= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= @@ -1881,6 +1920,7 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -2515,4 +2555,4 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU= rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA= sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= -sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= +sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= \ No newline at end of file diff --git a/token/services/ttx/accept.go b/token/services/ttx/accept.go index 082ab34ec..601f04c44 100644 --- a/token/services/ttx/accept.go +++ b/token/services/ttx/accept.go @@ -9,7 +9,6 @@ package ttx import ( "encoding/base64" "fmt" - "time" view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view" "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash" @@ -17,6 +16,7 @@ import ( "github.com/hyperledger-labs/fabric-smart-client/platform/view/view" "github.com/hyperledger-labs/fabric-token-sdk/token" "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokens" + session2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" "github.com/pkg/errors" "go.opentelemetry.io/otel/trace" "go.uber.org/zap/zapcore" @@ -132,16 +132,17 @@ func (s *AcceptView) respondToSignatureRequests(context view.Context) error { if logger.IsEnabledFor(zapcore.DebugLevel) { logger.Debugf("Receiving signature request...") } - - msg, err := ReadMessage(session, time.Minute) + jsonsession := session2.JSON(context) + err := jsonsession.Receive(signatureRequest) + // msg, err := ReadMessage(session, time.Minute) if err != nil { return errors.Wrap(err, "failed reading signature request") } // TODO: check what is signed... - err = Unmarshal(msg, signatureRequest) - if err != nil { - return errors.Wrap(err, "failed unmarshalling signature request") - } + // err = Unmarshal(msg, signatureRequest) + // if err != nil { + // return errors.Wrap(err, "failed unmarshalling signature request") + // } } span.AddEvent("Fetched request from session") tms := token.GetManagementService(context, token.WithTMS(s.tx.Network(), s.tx.Channel(), s.tx.Namespace())) diff --git a/token/services/ttx/auditor.go b/token/services/ttx/auditor.go index 0016d6123..84a3375b6 100644 --- a/token/services/ttx/auditor.go +++ b/token/services/ttx/auditor.go @@ -9,7 +9,6 @@ package ttx import ( "context" "encoding/base64" - "time" view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view" "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash" @@ -20,6 +19,7 @@ import ( "github.com/hyperledger-labs/fabric-token-sdk/token/services/db/driver" "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokens" "github.com/hyperledger-labs/fabric-token-sdk/token/services/ttxdb" + session2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" view3 "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/view" "github.com/pkg/errors" "go.opentelemetry.io/otel/trace" @@ -146,7 +146,10 @@ func (a *AuditingViewInitiator) Call(context view.Context) (interface{}, error) // Receive signature logger.Debugf("Receiving signature for [%s]", a.tx.ID()) span.AddEvent("start_receiving") - signature, err := ReadMessage(session, time.Minute) + + jsonsession := session2.JSON(context) + signature, err := jsonsession.ReceiveRaw() + //signature, err := ReadMessage(session, time.Minute) if err != nil { span.RecordError(err) return nil, errors.WithMessage(err, "failed to read audit event") diff --git a/token/services/ttx/endorse.go b/token/services/ttx/endorse.go index 2313e23bb..407829a8a 100644 --- a/token/services/ttx/endorse.go +++ b/token/services/ttx/endorse.go @@ -11,7 +11,6 @@ import ( errors2 "errors" "fmt" "reflect" - "time" "github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/collections" view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view" @@ -22,6 +21,7 @@ import ( "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/multisig" "github.com/hyperledger-labs/fabric-token-sdk/token/services/network" "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokens" + session2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" "github.com/pkg/errors" "go.opentelemetry.io/otel/trace" "go.uber.org/zap/zapcore" @@ -347,8 +347,9 @@ func (c *CollectEndorsementsView) signRemote(context view.Context, party view.Id if err != nil { return nil, errors.Wrap(err, "failed sending transaction content") } - - sigma, err := ReadMessage(session, time.Minute) + jsonsession := session2.JSON(context) + sigma, err := jsonsession.ReceiveRaw() + //sigma, err := ReadMessage(session, time.Minute) if err != nil { return nil, errors.Wrap(err, "failed reading message") } @@ -553,7 +554,10 @@ func (c *CollectEndorsementsView) distributeEvnToParty(context view.Context, ent } span.AddEvent("Wait for ack") - sigma, err := ReadMessage(session, 1*time.Minute) + //sigma, err := ReadMessage(session, 1*time.Minute) + jsonsession := session2.JSON(context) + sigma, err := jsonsession.ReceiveRaw() + //sigma, err := ReadMessage(session, time.Minute*4) if err != nil { return errors.Wrapf(err, "failed reading message on session [%s]", session.Info().ID) } @@ -736,7 +740,9 @@ func (f *ReceiveTransactionView) Call(context view.Context) (interface{}, error) span.AddEvent("start_receive_transaction_view") defer span.AddEvent("end_receive_transaction_view") - msg, err := ReadMessage(context.Session(), time.Minute*4) + jsonsession := session2.JSON(context) + msg, err := jsonsession.ReceiveRaw() + //msg, err := ReadMessage(context.Session(), time.Minute*4) if err != nil { span.RecordError(err) } @@ -839,20 +845,26 @@ func (s *EndorseView) Call(context view.Context) (interface{}, error) { if err := kvss.(*kvs.KVS).Get(k, &srRaw); err != nil { return nil, errors.Wrap(err, "failed to to store signature request") } + err = Unmarshal(srRaw, signatureRequest) + if err != nil { + return nil, errors.Wrap(err, "failed unmarshalling signature request") + } } else { if logger.IsEnabledFor(zapcore.DebugLevel) { logger.Debugf("Receiving signature request...") } - srRaw, err = ReadMessage(session, time.Minute) + jsonsession := session2.JSON(context) + err := jsonsession.Receive(signatureRequest) + //srRaw, err = ReadMessage(session, time.Minute) if err != nil { return nil, errors.Wrap(err, "failed reading signature request") } } // TODO: check what is signed... - err = Unmarshal(srRaw, signatureRequest) - if err != nil { - return nil, errors.Wrap(err, "failed unmarshalling signature request") - } + // err = Unmarshal(srRaw, signatureRequest) + // if err != nil { + // return nil, errors.Wrap(err, "failed unmarshalling signature request") + // } sigService := s.tx.TokenService().SigService() if !sigService.IsMe(signatureRequest.Signer) { diff --git a/token/services/ttx/multisig/spend.go b/token/services/ttx/multisig/spend.go index 54c887edf..e72d71fcd 100644 --- a/token/services/ttx/multisig/spend.go +++ b/token/services/ttx/multisig/spend.go @@ -28,14 +28,14 @@ type SpendRequest struct { Token *token.UnspentToken } -func NewSpendRequestFromBytes(msg []byte) (*SpendRequest, error) { - request := &SpendRequest{} - err := json.Unmarshal(msg, request) - if err != nil { - return nil, errors.Wrap(err, "failed unmarshalling spendRequest") - } - return request, nil -} +// func NewSpendRequestFromBytes(msg []byte) (*SpendRequest, error) { +// request := &SpendRequest{} +// err := json.Unmarshal(msg, request) +// if err != nil { +// return nil, errors.Wrap(err, "failed unmarshalling spendRequest") +// } +// return request, nil +// } func ReceiveSpendRequest(context view.Context, opts ...ttx.TxOption) (*SpendRequest, error) { logger.Debugf("receive a new spendRequest...") @@ -65,25 +65,33 @@ func (f *ReceiveSpendRequestView) Call(context view.Context) (interface{}, error span := trace.SpanFromContext(context.Context()) span.AddEvent("start_receive_spendRequest_view") defer span.AddEvent("end_receive_spendRequest_view") - - msg, err := ttx.ReadMessage(context.Session(), time.Minute*4) + request := &SpendRequest{} + jsonsession := session.JSON(context) + err := jsonsession.Receive(request) + //msg, err := ttx.ReadMessage(context.Session(), time.Minute*4) if err != nil { span.RecordError(err) } span.AddEvent("receive_tx") + requestBytes, err := json.Marshal(request) + if err != nil { + return nil, errors.Errorf("Failed to marshal request: %v", err) + } + if logger.IsEnabledFor(zapcore.DebugLevel) { - logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(msg), hash.Hashable(msg)) + logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(requestBytes), hash.Hashable(requestBytes)) } - if len(msg) == 0 { + if len(requestBytes) == 0 { info := context.Session().Info() return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) } - tx, err := NewSpendRequestFromBytes(msg) - if err != nil { - return nil, errors.Wrap(err, "failed to receive spendRequest") - } - return tx, nil + // tx, err := NewSpendRequestFromBytes(msg) + // if err != nil { + // return nil, errors.Wrap(err, "failed to receive spendRequest") + // } + //return tx, nil + return request, nil } // SpendResponse is the response to a SpendRequest From 8da68db1cae41f2917dc14aa5c2cd3b971b0dcf3 Mon Sep 17 00:00:00 2001 From: SREENIDHI DR Date: Fri, 21 Mar 2025 14:27:13 +0530 Subject: [PATCH 02/30] issue fix --- token/services/ttx/endorse.go | 10 +++++----- token/services/ttx/multisig/spend.go | 21 +-------------------- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/token/services/ttx/endorse.go b/token/services/ttx/endorse.go index 407829a8a..9b2e020f1 100644 --- a/token/services/ttx/endorse.go +++ b/token/services/ttx/endorse.go @@ -347,9 +347,8 @@ func (c *CollectEndorsementsView) signRemote(context view.Context, party view.Id if err != nil { return nil, errors.Wrap(err, "failed sending transaction content") } - jsonsession := session2.JSON(context) - sigma, err := jsonsession.ReceiveRaw() - //sigma, err := ReadMessage(session, time.Minute) + jsonSession := session2.JSON(context) + sigma, err := jsonSession.ReceiveRaw() if err != nil { return nil, errors.Wrap(err, "failed reading message") } @@ -557,7 +556,10 @@ func (c *CollectEndorsementsView) distributeEvnToParty(context view.Context, ent //sigma, err := ReadMessage(session, 1*time.Minute) jsonsession := session2.JSON(context) sigma, err := jsonsession.ReceiveRaw() +<<<<<<< HEAD //sigma, err := ReadMessage(session, time.Minute*4) +======= +>>>>>>> f9ac4664 (issue fix) if err != nil { return errors.Wrapf(err, "failed reading message on session [%s]", session.Info().ID) } @@ -742,7 +744,6 @@ func (f *ReceiveTransactionView) Call(context view.Context) (interface{}, error) jsonsession := session2.JSON(context) msg, err := jsonsession.ReceiveRaw() - //msg, err := ReadMessage(context.Session(), time.Minute*4) if err != nil { span.RecordError(err) } @@ -855,7 +856,6 @@ func (s *EndorseView) Call(context view.Context) (interface{}, error) { } jsonsession := session2.JSON(context) err := jsonsession.Receive(signatureRequest) - //srRaw, err = ReadMessage(session, time.Minute) if err != nil { return nil, errors.Wrap(err, "failed reading signature request") } diff --git a/token/services/ttx/multisig/spend.go b/token/services/ttx/multisig/spend.go index e72d71fcd..7587632d7 100644 --- a/token/services/ttx/multisig/spend.go +++ b/token/services/ttx/multisig/spend.go @@ -11,7 +11,6 @@ import ( "time" "github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors" - "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash" "github.com/hyperledger-labs/fabric-smart-client/platform/view/view" token2 "github.com/hyperledger-labs/fabric-token-sdk/token" "github.com/hyperledger-labs/fabric-token-sdk/token/core/common/encoding/json" @@ -20,7 +19,6 @@ import ( "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" "github.com/hyperledger-labs/fabric-token-sdk/token/token" "go.opentelemetry.io/otel/trace" - "go.uber.org/zap/zapcore" ) // SpendRequest is the request to spend a token @@ -71,26 +69,9 @@ func (f *ReceiveSpendRequestView) Call(context view.Context) (interface{}, error //msg, err := ttx.ReadMessage(context.Session(), time.Minute*4) if err != nil { span.RecordError(err) + //add err } span.AddEvent("receive_tx") - - requestBytes, err := json.Marshal(request) - if err != nil { - return nil, errors.Errorf("Failed to marshal request: %v", err) - } - - if logger.IsEnabledFor(zapcore.DebugLevel) { - logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(requestBytes), hash.Hashable(requestBytes)) - } - if len(requestBytes) == 0 { - info := context.Session().Info() - return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) - } - // tx, err := NewSpendRequestFromBytes(msg) - // if err != nil { - // return nil, errors.Wrap(err, "failed to receive spendRequest") - // } - //return tx, nil return request, nil } From 82cbfc386b6605b49035a83cec39ed60e2ead028 Mon Sep 17 00:00:00 2001 From: SREENIDHI DR Date: Fri, 21 Mar 2025 14:50:56 +0530 Subject: [PATCH 03/30] issue fix --- token/services/ttx/accept.go | 6 ------ token/services/ttx/auditor.go | 1 - token/services/ttx/multisig/spend.go | 12 +----------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/token/services/ttx/accept.go b/token/services/ttx/accept.go index 601f04c44..732844d07 100644 --- a/token/services/ttx/accept.go +++ b/token/services/ttx/accept.go @@ -134,15 +134,9 @@ func (s *AcceptView) respondToSignatureRequests(context view.Context) error { } jsonsession := session2.JSON(context) err := jsonsession.Receive(signatureRequest) - // msg, err := ReadMessage(session, time.Minute) if err != nil { return errors.Wrap(err, "failed reading signature request") } - // TODO: check what is signed... - // err = Unmarshal(msg, signatureRequest) - // if err != nil { - // return errors.Wrap(err, "failed unmarshalling signature request") - // } } span.AddEvent("Fetched request from session") tms := token.GetManagementService(context, token.WithTMS(s.tx.Network(), s.tx.Channel(), s.tx.Namespace())) diff --git a/token/services/ttx/auditor.go b/token/services/ttx/auditor.go index 84a3375b6..b0c19d64e 100644 --- a/token/services/ttx/auditor.go +++ b/token/services/ttx/auditor.go @@ -149,7 +149,6 @@ func (a *AuditingViewInitiator) Call(context view.Context) (interface{}, error) jsonsession := session2.JSON(context) signature, err := jsonsession.ReceiveRaw() - //signature, err := ReadMessage(session, time.Minute) if err != nil { span.RecordError(err) return nil, errors.WithMessage(err, "failed to read audit event") diff --git a/token/services/ttx/multisig/spend.go b/token/services/ttx/multisig/spend.go index 7587632d7..82bc173b9 100644 --- a/token/services/ttx/multisig/spend.go +++ b/token/services/ttx/multisig/spend.go @@ -26,15 +26,6 @@ type SpendRequest struct { Token *token.UnspentToken } -// func NewSpendRequestFromBytes(msg []byte) (*SpendRequest, error) { -// request := &SpendRequest{} -// err := json.Unmarshal(msg, request) -// if err != nil { -// return nil, errors.Wrap(err, "failed unmarshalling spendRequest") -// } -// return request, nil -// } - func ReceiveSpendRequest(context view.Context, opts ...ttx.TxOption) (*SpendRequest, error) { logger.Debugf("receive a new spendRequest...") requestBoxed, err := context.RunView(NewReceiveSpendRequestView(), view.WithSameContext()) @@ -66,10 +57,9 @@ func (f *ReceiveSpendRequestView) Call(context view.Context) (interface{}, error request := &SpendRequest{} jsonsession := session.JSON(context) err := jsonsession.Receive(request) - //msg, err := ttx.ReadMessage(context.Session(), time.Minute*4) if err != nil { span.RecordError(err) - //add err + return nil, err } span.AddEvent("receive_tx") return request, nil From 2b36c9dd2031134f4bcaffb728e64fe1e3c8615d Mon Sep 17 00:00:00 2001 From: SREENIDHI DR Date: Thu, 27 Mar 2025 12:12:22 +0530 Subject: [PATCH 04/30] err handling Signed-off-by: SREENIDHI DR --- token/services/ttx/endorse.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/token/services/ttx/endorse.go b/token/services/ttx/endorse.go index 9b2e020f1..0aa7f903f 100644 --- a/token/services/ttx/endorse.go +++ b/token/services/ttx/endorse.go @@ -352,7 +352,10 @@ func (c *CollectEndorsementsView) signRemote(context view.Context, party view.Id if err != nil { return nil, errors.Wrap(err, "failed reading message") } - + if len(sigma) == 0 { + info := context.Session().Info() + return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) + } verifier, err := verifierGetter(party) if err != nil { return nil, errors.Wrapf(err, "failed getting verifier for [%s]", party) @@ -563,6 +566,10 @@ func (c *CollectEndorsementsView) distributeEvnToParty(context view.Context, ent if err != nil { return errors.Wrapf(err, "failed reading message on session [%s]", session.Info().ID) } + if len(sigma) == 0 { + info := context.Session().Info() + return errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) + } logger.Debugf("received ack from [%s] [%s], checking signature on [%s]", entry.LongTerm, hash.Hashable(sigma).String(), hash.Hashable(txRaw).String()) @@ -747,6 +754,10 @@ func (f *ReceiveTransactionView) Call(context view.Context) (interface{}, error) if err != nil { span.RecordError(err) } + if len(msg) == 0 { + info := context.Session().Info() + return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) + } span.AddEvent("receive_tx") if logger.IsEnabledFor(zapcore.DebugLevel) { From d39abdab2ef9ca14f5ce72925f892a812e093dd9 Mon Sep 17 00:00:00 2001 From: SREENIDHI DR Date: Thu, 27 Mar 2025 12:18:52 +0530 Subject: [PATCH 05/30] err handling Signed-off-by: SREENIDHI DR --- token/services/ttx/endorse.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/token/services/ttx/endorse.go b/token/services/ttx/endorse.go index 0aa7f903f..4f6522cdd 100644 --- a/token/services/ttx/endorse.go +++ b/token/services/ttx/endorse.go @@ -352,10 +352,6 @@ func (c *CollectEndorsementsView) signRemote(context view.Context, party view.Id if err != nil { return nil, errors.Wrap(err, "failed reading message") } - if len(sigma) == 0 { - info := context.Session().Info() - return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) - } verifier, err := verifierGetter(party) if err != nil { return nil, errors.Wrapf(err, "failed getting verifier for [%s]", party) @@ -566,10 +562,6 @@ func (c *CollectEndorsementsView) distributeEvnToParty(context view.Context, ent if err != nil { return errors.Wrapf(err, "failed reading message on session [%s]", session.Info().ID) } - if len(sigma) == 0 { - info := context.Session().Info() - return errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) - } logger.Debugf("received ack from [%s] [%s], checking signature on [%s]", entry.LongTerm, hash.Hashable(sigma).String(), hash.Hashable(txRaw).String()) @@ -754,10 +746,6 @@ func (f *ReceiveTransactionView) Call(context view.Context) (interface{}, error) if err != nil { span.RecordError(err) } - if len(msg) == 0 { - info := context.Session().Info() - return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) - } span.AddEvent("receive_tx") if logger.IsEnabledFor(zapcore.DebugLevel) { From 3d76a76e7f1c1c330506adc936e79266ad09c510 Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Thu, 27 Mar 2025 18:21:18 +0530 Subject: [PATCH 06/30] rebase Signed-off-by: sreenidhi --- token/services/ttx/endorse.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/token/services/ttx/endorse.go b/token/services/ttx/endorse.go index 4f6522cdd..ac56f8eae 100644 --- a/token/services/ttx/endorse.go +++ b/token/services/ttx/endorse.go @@ -555,10 +555,7 @@ func (c *CollectEndorsementsView) distributeEvnToParty(context view.Context, ent //sigma, err := ReadMessage(session, 1*time.Minute) jsonsession := session2.JSON(context) sigma, err := jsonsession.ReceiveRaw() -<<<<<<< HEAD //sigma, err := ReadMessage(session, time.Minute*4) -======= ->>>>>>> f9ac4664 (issue fix) if err != nil { return errors.Wrapf(err, "failed reading message on session [%s]", session.Info().ID) } From 64ded0ca3be4e2987e00cebe8b53c3ff13c0bd07 Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 01:39:39 +0530 Subject: [PATCH 07/30] testing handling nil Signed-off-by: sreenidhi --- token/services/ttx/accept.go | 4 ++++ token/services/ttx/auditor.go | 5 ++++- token/services/ttx/endorse.go | 17 ++++++++++++++++- token/services/ttx/multisig/spend.go | 4 ++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/token/services/ttx/accept.go b/token/services/ttx/accept.go index 732844d07..e2fd333c4 100644 --- a/token/services/ttx/accept.go +++ b/token/services/ttx/accept.go @@ -132,6 +132,10 @@ func (s *AcceptView) respondToSignatureRequests(context view.Context) error { if logger.IsEnabledFor(zapcore.DebugLevel) { logger.Debugf("Receiving signature request...") } + if context == nil { + return errors.New("Failed to read context. context is empty") + //WithMessage("failed to read audit event") + } jsonsession := session2.JSON(context) err := jsonsession.Receive(signatureRequest) if err != nil { diff --git a/token/services/ttx/auditor.go b/token/services/ttx/auditor.go index b0c19d64e..eb36ef473 100644 --- a/token/services/ttx/auditor.go +++ b/token/services/ttx/auditor.go @@ -146,7 +146,10 @@ func (a *AuditingViewInitiator) Call(context view.Context) (interface{}, error) // Receive signature logger.Debugf("Receiving signature for [%s]", a.tx.ID()) span.AddEvent("start_receiving") - + if context == nil { + return nil, errors.New("Failed to read context. context is empty") + //WithMessage("failed to read audit event") + } jsonsession := session2.JSON(context) signature, err := jsonsession.ReceiveRaw() if err != nil { diff --git a/token/services/ttx/endorse.go b/token/services/ttx/endorse.go index ac56f8eae..99fe93251 100644 --- a/token/services/ttx/endorse.go +++ b/token/services/ttx/endorse.go @@ -347,6 +347,10 @@ func (c *CollectEndorsementsView) signRemote(context view.Context, party view.Id if err != nil { return nil, errors.Wrap(err, "failed sending transaction content") } + if context == nil { + return nil, errors.New("Failed to read context. context is empty") + //WithMessage("failed to read audit event") + } jsonSession := session2.JSON(context) sigma, err := jsonSession.ReceiveRaw() if err != nil { @@ -553,6 +557,10 @@ func (c *CollectEndorsementsView) distributeEvnToParty(context view.Context, ent span.AddEvent("Wait for ack") //sigma, err := ReadMessage(session, 1*time.Minute) + if context == nil { + return errors.New("Failed to read context. context is empty") + //WithMessage("failed to read audit event") + } jsonsession := session2.JSON(context) sigma, err := jsonsession.ReceiveRaw() //sigma, err := ReadMessage(session, time.Minute*4) @@ -737,7 +745,10 @@ func (f *ReceiveTransactionView) Call(context view.Context) (interface{}, error) span := trace.SpanFromContext(context.Context()) span.AddEvent("start_receive_transaction_view") defer span.AddEvent("end_receive_transaction_view") - + if context == nil { + return nil, errors.New("Failed to read context. context is empty") + //WithMessage("failed to read audit event") + } jsonsession := session2.JSON(context) msg, err := jsonsession.ReceiveRaw() if err != nil { @@ -850,6 +861,10 @@ func (s *EndorseView) Call(context view.Context) (interface{}, error) { if logger.IsEnabledFor(zapcore.DebugLevel) { logger.Debugf("Receiving signature request...") } + if context == nil { + return nil, errors.New("Failed to read context. context is empty") + //WithMessage("failed to read audit event") + } jsonsession := session2.JSON(context) err := jsonsession.Receive(signatureRequest) if err != nil { diff --git a/token/services/ttx/multisig/spend.go b/token/services/ttx/multisig/spend.go index 82bc173b9..e3c2b0772 100644 --- a/token/services/ttx/multisig/spend.go +++ b/token/services/ttx/multisig/spend.go @@ -55,6 +55,10 @@ func (f *ReceiveSpendRequestView) Call(context view.Context) (interface{}, error span.AddEvent("start_receive_spendRequest_view") defer span.AddEvent("end_receive_spendRequest_view") request := &SpendRequest{} + if context == nil { + return nil, errors.New("Failed to read context. context is empty") + //WithMessage("failed to read audit event") + } jsonsession := session.JSON(context) err := jsonsession.Receive(request) if err != nil { From bcd65162b31c9014e82c9d3aa9b851ed3a72cf91 Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 14:06:15 +0530 Subject: [PATCH 08/30] changes reverted Signed-off-by: sreenidhi --- token/services/ttx/accept.go | 15 +++++---- token/services/ttx/auditor.go | 9 ++--- token/services/ttx/endorse.go | 49 ++++++++-------------------- token/services/ttx/multisig/spend.go | 37 ++++++++++++++++----- 4 files changed, 53 insertions(+), 57 deletions(-) diff --git a/token/services/ttx/accept.go b/token/services/ttx/accept.go index e2fd333c4..6a79123aa 100644 --- a/token/services/ttx/accept.go +++ b/token/services/ttx/accept.go @@ -9,6 +9,7 @@ package ttx import ( "encoding/base64" "fmt" + "time" view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view" "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash" @@ -132,15 +133,17 @@ func (s *AcceptView) respondToSignatureRequests(context view.Context) error { if logger.IsEnabledFor(zapcore.DebugLevel) { logger.Debugf("Receiving signature request...") } - if context == nil { - return errors.New("Failed to read context. context is empty") - //WithMessage("failed to read audit event") - } - jsonsession := session2.JSON(context) - err := jsonsession.Receive(signatureRequest) + jsonSession := session2.JSON(context) + err := jsonSession.ReceiveWithTimeout(signatureRequest, time.Minute) + //msg, err := ReadMessage(session, time.Minute) if err != nil { return errors.Wrap(err, "failed reading signature request") } + // TODO: check what is signed... + // err = Unmarshal(msg, signatureRequest) + // if err != nil { + // return errors.Wrap(err, "failed unmarshalling signature request") + // } } span.AddEvent("Fetched request from session") tms := token.GetManagementService(context, token.WithTMS(s.tx.Network(), s.tx.Channel(), s.tx.Namespace())) diff --git a/token/services/ttx/auditor.go b/token/services/ttx/auditor.go index eb36ef473..0016d6123 100644 --- a/token/services/ttx/auditor.go +++ b/token/services/ttx/auditor.go @@ -9,6 +9,7 @@ package ttx import ( "context" "encoding/base64" + "time" view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view" "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash" @@ -19,7 +20,6 @@ import ( "github.com/hyperledger-labs/fabric-token-sdk/token/services/db/driver" "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokens" "github.com/hyperledger-labs/fabric-token-sdk/token/services/ttxdb" - session2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" view3 "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/view" "github.com/pkg/errors" "go.opentelemetry.io/otel/trace" @@ -146,12 +146,7 @@ func (a *AuditingViewInitiator) Call(context view.Context) (interface{}, error) // Receive signature logger.Debugf("Receiving signature for [%s]", a.tx.ID()) span.AddEvent("start_receiving") - if context == nil { - return nil, errors.New("Failed to read context. context is empty") - //WithMessage("failed to read audit event") - } - jsonsession := session2.JSON(context) - signature, err := jsonsession.ReceiveRaw() + signature, err := ReadMessage(session, time.Minute) if err != nil { span.RecordError(err) return nil, errors.WithMessage(err, "failed to read audit event") diff --git a/token/services/ttx/endorse.go b/token/services/ttx/endorse.go index 99fe93251..c2b81f7cc 100644 --- a/token/services/ttx/endorse.go +++ b/token/services/ttx/endorse.go @@ -11,6 +11,8 @@ import ( errors2 "errors" "fmt" "reflect" + "runtime/debug" + "time" "github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/collections" view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view" @@ -21,7 +23,6 @@ import ( "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/multisig" "github.com/hyperledger-labs/fabric-token-sdk/token/services/network" "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokens" - session2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" "github.com/pkg/errors" "go.opentelemetry.io/otel/trace" "go.uber.org/zap/zapcore" @@ -347,15 +348,12 @@ func (c *CollectEndorsementsView) signRemote(context view.Context, party view.Id if err != nil { return nil, errors.Wrap(err, "failed sending transaction content") } - if context == nil { - return nil, errors.New("Failed to read context. context is empty") - //WithMessage("failed to read audit event") - } - jsonSession := session2.JSON(context) - sigma, err := jsonSession.ReceiveRaw() + + sigma, err := ReadMessage(session, time.Minute) if err != nil { return nil, errors.Wrap(err, "failed reading message") } + verifier, err := verifierGetter(party) if err != nil { return nil, errors.Wrapf(err, "failed getting verifier for [%s]", party) @@ -556,14 +554,7 @@ func (c *CollectEndorsementsView) distributeEvnToParty(context view.Context, ent } span.AddEvent("Wait for ack") - //sigma, err := ReadMessage(session, 1*time.Minute) - if context == nil { - return errors.New("Failed to read context. context is empty") - //WithMessage("failed to read audit event") - } - jsonsession := session2.JSON(context) - sigma, err := jsonsession.ReceiveRaw() - //sigma, err := ReadMessage(session, time.Minute*4) + sigma, err := ReadMessage(session, 1*time.Minute) if err != nil { return errors.Wrapf(err, "failed reading message on session [%s]", session.Info().ID) } @@ -745,12 +736,8 @@ func (f *ReceiveTransactionView) Call(context view.Context) (interface{}, error) span := trace.SpanFromContext(context.Context()) span.AddEvent("start_receive_transaction_view") defer span.AddEvent("end_receive_transaction_view") - if context == nil { - return nil, errors.New("Failed to read context. context is empty") - //WithMessage("failed to read audit event") - } - jsonsession := session2.JSON(context) - msg, err := jsonsession.ReceiveRaw() + + msg, err := ReadMessage(context.Session(), time.Minute*4) if err != nil { span.RecordError(err) } @@ -761,6 +748,7 @@ func (f *ReceiveTransactionView) Call(context view.Context) (interface{}, error) } if len(msg) == 0 { info := context.Session().Info() + logger.Errorf("received empty message, session closed [%s:%v]: [%s]", info.ID, info.Closed, string(debug.Stack())) return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) } tx, err := NewTransactionFromBytes(context, msg) @@ -853,29 +841,20 @@ func (s *EndorseView) Call(context view.Context) (interface{}, error) { if err := kvss.(*kvs.KVS).Get(k, &srRaw); err != nil { return nil, errors.Wrap(err, "failed to to store signature request") } - err = Unmarshal(srRaw, signatureRequest) - if err != nil { - return nil, errors.Wrap(err, "failed unmarshalling signature request") - } } else { if logger.IsEnabledFor(zapcore.DebugLevel) { logger.Debugf("Receiving signature request...") } - if context == nil { - return nil, errors.New("Failed to read context. context is empty") - //WithMessage("failed to read audit event") - } - jsonsession := session2.JSON(context) - err := jsonsession.Receive(signatureRequest) + srRaw, err = ReadMessage(session, time.Minute) if err != nil { return nil, errors.Wrap(err, "failed reading signature request") } } // TODO: check what is signed... - // err = Unmarshal(srRaw, signatureRequest) - // if err != nil { - // return nil, errors.Wrap(err, "failed unmarshalling signature request") - // } + err = Unmarshal(srRaw, signatureRequest) + if err != nil { + return nil, errors.Wrap(err, "failed unmarshalling signature request") + } sigService := s.tx.TokenService().SigService() if !sigService.IsMe(signatureRequest.Signer) { diff --git a/token/services/ttx/multisig/spend.go b/token/services/ttx/multisig/spend.go index e3c2b0772..b6c76659e 100644 --- a/token/services/ttx/multisig/spend.go +++ b/token/services/ttx/multisig/spend.go @@ -7,10 +7,12 @@ SPDX-License-Identifier: Apache-2.0 package multisig import ( + "runtime/debug" "slices" "time" "github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors" + "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash" "github.com/hyperledger-labs/fabric-smart-client/platform/view/view" token2 "github.com/hyperledger-labs/fabric-token-sdk/token" "github.com/hyperledger-labs/fabric-token-sdk/token/core/common/encoding/json" @@ -19,6 +21,7 @@ import ( "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" "github.com/hyperledger-labs/fabric-token-sdk/token/token" "go.opentelemetry.io/otel/trace" + "go.uber.org/zap/zapcore" ) // SpendRequest is the request to spend a token @@ -26,6 +29,15 @@ type SpendRequest struct { Token *token.UnspentToken } +func NewSpendRequestFromBytes(msg []byte) (*SpendRequest, error) { + request := &SpendRequest{} + err := json.Unmarshal(msg, request) + if err != nil { + return nil, errors.Wrap(err, "failed unmarshalling spendRequest") + } + return request, nil +} + func ReceiveSpendRequest(context view.Context, opts ...ttx.TxOption) (*SpendRequest, error) { logger.Debugf("receive a new spendRequest...") requestBoxed, err := context.RunView(NewReceiveSpendRequestView(), view.WithSameContext()) @@ -54,19 +66,26 @@ func (f *ReceiveSpendRequestView) Call(context view.Context) (interface{}, error span := trace.SpanFromContext(context.Context()) span.AddEvent("start_receive_spendRequest_view") defer span.AddEvent("end_receive_spendRequest_view") - request := &SpendRequest{} - if context == nil { - return nil, errors.New("Failed to read context. context is empty") - //WithMessage("failed to read audit event") - } - jsonsession := session.JSON(context) - err := jsonsession.Receive(request) + + msg, err := ttx.ReadMessage(context.Session(), time.Minute*4) if err != nil { span.RecordError(err) - return nil, err } span.AddEvent("receive_tx") - return request, nil + + if logger.IsEnabledFor(zapcore.DebugLevel) { + logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(msg), hash.Hashable(msg)) + } + if len(msg) == 0 { + info := context.Session().Info() + logger.Errorf("received empty message, session closed [%s:%v], [%s]", info.ID, info.Closed, string(debug.Stack())) + return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) + } + tx, err := NewSpendRequestFromBytes(msg) + if err != nil { + return nil, errors.Wrap(err, "failed to receive spendRequest") + } + return tx, nil } // SpendResponse is the response to a SpendRequest From 03a8ff9b5e08a1f0dc11edfbec15e96dcb5c5e59 Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 14:06:15 +0530 Subject: [PATCH 09/30] changes reverted Signed-off-by: sreenidhi --- token/services/ttx/accept.go | 15 +++++---- token/services/ttx/auditor.go | 10 +++--- token/services/ttx/endorse.go | 49 ++++++++-------------------- token/services/ttx/multisig/spend.go | 37 ++++++++++++++++----- 4 files changed, 55 insertions(+), 56 deletions(-) diff --git a/token/services/ttx/accept.go b/token/services/ttx/accept.go index e2fd333c4..6a79123aa 100644 --- a/token/services/ttx/accept.go +++ b/token/services/ttx/accept.go @@ -9,6 +9,7 @@ package ttx import ( "encoding/base64" "fmt" + "time" view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view" "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash" @@ -132,15 +133,17 @@ func (s *AcceptView) respondToSignatureRequests(context view.Context) error { if logger.IsEnabledFor(zapcore.DebugLevel) { logger.Debugf("Receiving signature request...") } - if context == nil { - return errors.New("Failed to read context. context is empty") - //WithMessage("failed to read audit event") - } - jsonsession := session2.JSON(context) - err := jsonsession.Receive(signatureRequest) + jsonSession := session2.JSON(context) + err := jsonSession.ReceiveWithTimeout(signatureRequest, time.Minute) + //msg, err := ReadMessage(session, time.Minute) if err != nil { return errors.Wrap(err, "failed reading signature request") } + // TODO: check what is signed... + // err = Unmarshal(msg, signatureRequest) + // if err != nil { + // return errors.Wrap(err, "failed unmarshalling signature request") + // } } span.AddEvent("Fetched request from session") tms := token.GetManagementService(context, token.WithTMS(s.tx.Network(), s.tx.Channel(), s.tx.Namespace())) diff --git a/token/services/ttx/auditor.go b/token/services/ttx/auditor.go index eb36ef473..412e429f4 100644 --- a/token/services/ttx/auditor.go +++ b/token/services/ttx/auditor.go @@ -9,6 +9,7 @@ package ttx import ( "context" "encoding/base64" + "time" view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view" "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash" @@ -146,12 +147,9 @@ func (a *AuditingViewInitiator) Call(context view.Context) (interface{}, error) // Receive signature logger.Debugf("Receiving signature for [%s]", a.tx.ID()) span.AddEvent("start_receiving") - if context == nil { - return nil, errors.New("Failed to read context. context is empty") - //WithMessage("failed to read audit event") - } - jsonsession := session2.JSON(context) - signature, err := jsonsession.ReceiveRaw() + //signature, err := ReadMessage(session, time.Minute) + jsonSession := session2.JSON(context) + signature, err := jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { span.RecordError(err) return nil, errors.WithMessage(err, "failed to read audit event") diff --git a/token/services/ttx/endorse.go b/token/services/ttx/endorse.go index 99fe93251..c2b81f7cc 100644 --- a/token/services/ttx/endorse.go +++ b/token/services/ttx/endorse.go @@ -11,6 +11,8 @@ import ( errors2 "errors" "fmt" "reflect" + "runtime/debug" + "time" "github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/collections" view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view" @@ -21,7 +23,6 @@ import ( "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/multisig" "github.com/hyperledger-labs/fabric-token-sdk/token/services/network" "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokens" - session2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" "github.com/pkg/errors" "go.opentelemetry.io/otel/trace" "go.uber.org/zap/zapcore" @@ -347,15 +348,12 @@ func (c *CollectEndorsementsView) signRemote(context view.Context, party view.Id if err != nil { return nil, errors.Wrap(err, "failed sending transaction content") } - if context == nil { - return nil, errors.New("Failed to read context. context is empty") - //WithMessage("failed to read audit event") - } - jsonSession := session2.JSON(context) - sigma, err := jsonSession.ReceiveRaw() + + sigma, err := ReadMessage(session, time.Minute) if err != nil { return nil, errors.Wrap(err, "failed reading message") } + verifier, err := verifierGetter(party) if err != nil { return nil, errors.Wrapf(err, "failed getting verifier for [%s]", party) @@ -556,14 +554,7 @@ func (c *CollectEndorsementsView) distributeEvnToParty(context view.Context, ent } span.AddEvent("Wait for ack") - //sigma, err := ReadMessage(session, 1*time.Minute) - if context == nil { - return errors.New("Failed to read context. context is empty") - //WithMessage("failed to read audit event") - } - jsonsession := session2.JSON(context) - sigma, err := jsonsession.ReceiveRaw() - //sigma, err := ReadMessage(session, time.Minute*4) + sigma, err := ReadMessage(session, 1*time.Minute) if err != nil { return errors.Wrapf(err, "failed reading message on session [%s]", session.Info().ID) } @@ -745,12 +736,8 @@ func (f *ReceiveTransactionView) Call(context view.Context) (interface{}, error) span := trace.SpanFromContext(context.Context()) span.AddEvent("start_receive_transaction_view") defer span.AddEvent("end_receive_transaction_view") - if context == nil { - return nil, errors.New("Failed to read context. context is empty") - //WithMessage("failed to read audit event") - } - jsonsession := session2.JSON(context) - msg, err := jsonsession.ReceiveRaw() + + msg, err := ReadMessage(context.Session(), time.Minute*4) if err != nil { span.RecordError(err) } @@ -761,6 +748,7 @@ func (f *ReceiveTransactionView) Call(context view.Context) (interface{}, error) } if len(msg) == 0 { info := context.Session().Info() + logger.Errorf("received empty message, session closed [%s:%v]: [%s]", info.ID, info.Closed, string(debug.Stack())) return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) } tx, err := NewTransactionFromBytes(context, msg) @@ -853,29 +841,20 @@ func (s *EndorseView) Call(context view.Context) (interface{}, error) { if err := kvss.(*kvs.KVS).Get(k, &srRaw); err != nil { return nil, errors.Wrap(err, "failed to to store signature request") } - err = Unmarshal(srRaw, signatureRequest) - if err != nil { - return nil, errors.Wrap(err, "failed unmarshalling signature request") - } } else { if logger.IsEnabledFor(zapcore.DebugLevel) { logger.Debugf("Receiving signature request...") } - if context == nil { - return nil, errors.New("Failed to read context. context is empty") - //WithMessage("failed to read audit event") - } - jsonsession := session2.JSON(context) - err := jsonsession.Receive(signatureRequest) + srRaw, err = ReadMessage(session, time.Minute) if err != nil { return nil, errors.Wrap(err, "failed reading signature request") } } // TODO: check what is signed... - // err = Unmarshal(srRaw, signatureRequest) - // if err != nil { - // return nil, errors.Wrap(err, "failed unmarshalling signature request") - // } + err = Unmarshal(srRaw, signatureRequest) + if err != nil { + return nil, errors.Wrap(err, "failed unmarshalling signature request") + } sigService := s.tx.TokenService().SigService() if !sigService.IsMe(signatureRequest.Signer) { diff --git a/token/services/ttx/multisig/spend.go b/token/services/ttx/multisig/spend.go index e3c2b0772..b6c76659e 100644 --- a/token/services/ttx/multisig/spend.go +++ b/token/services/ttx/multisig/spend.go @@ -7,10 +7,12 @@ SPDX-License-Identifier: Apache-2.0 package multisig import ( + "runtime/debug" "slices" "time" "github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors" + "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash" "github.com/hyperledger-labs/fabric-smart-client/platform/view/view" token2 "github.com/hyperledger-labs/fabric-token-sdk/token" "github.com/hyperledger-labs/fabric-token-sdk/token/core/common/encoding/json" @@ -19,6 +21,7 @@ import ( "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" "github.com/hyperledger-labs/fabric-token-sdk/token/token" "go.opentelemetry.io/otel/trace" + "go.uber.org/zap/zapcore" ) // SpendRequest is the request to spend a token @@ -26,6 +29,15 @@ type SpendRequest struct { Token *token.UnspentToken } +func NewSpendRequestFromBytes(msg []byte) (*SpendRequest, error) { + request := &SpendRequest{} + err := json.Unmarshal(msg, request) + if err != nil { + return nil, errors.Wrap(err, "failed unmarshalling spendRequest") + } + return request, nil +} + func ReceiveSpendRequest(context view.Context, opts ...ttx.TxOption) (*SpendRequest, error) { logger.Debugf("receive a new spendRequest...") requestBoxed, err := context.RunView(NewReceiveSpendRequestView(), view.WithSameContext()) @@ -54,19 +66,26 @@ func (f *ReceiveSpendRequestView) Call(context view.Context) (interface{}, error span := trace.SpanFromContext(context.Context()) span.AddEvent("start_receive_spendRequest_view") defer span.AddEvent("end_receive_spendRequest_view") - request := &SpendRequest{} - if context == nil { - return nil, errors.New("Failed to read context. context is empty") - //WithMessage("failed to read audit event") - } - jsonsession := session.JSON(context) - err := jsonsession.Receive(request) + + msg, err := ttx.ReadMessage(context.Session(), time.Minute*4) if err != nil { span.RecordError(err) - return nil, err } span.AddEvent("receive_tx") - return request, nil + + if logger.IsEnabledFor(zapcore.DebugLevel) { + logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(msg), hash.Hashable(msg)) + } + if len(msg) == 0 { + info := context.Session().Info() + logger.Errorf("received empty message, session closed [%s:%v], [%s]", info.ID, info.Closed, string(debug.Stack())) + return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) + } + tx, err := NewSpendRequestFromBytes(msg) + if err != nil { + return nil, errors.Wrap(err, "failed to receive spendRequest") + } + return tx, nil } // SpendResponse is the response to a SpendRequest From a6c442b73ad0a5cc7d316a6580ef0f477ead115c Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 17:01:06 +0530 Subject: [PATCH 10/30] changes reverted Signed-off-by: sreenidhi --- integration/ports.go | 4 ++-- token/services/ttx/auditor.go | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/integration/ports.go b/integration/ports.go index 08bfcc198..0aa864534 100755 --- a/integration/ports.go +++ b/integration/ports.go @@ -60,8 +60,8 @@ var ( AllTestTypes = []*InfrastructureType{ WebSocketNoReplication, - LibP2PNoReplication, - WebSocketWithReplication, + //LibP2PNoReplication, + //WebSocketWithReplication, } ) diff --git a/token/services/ttx/auditor.go b/token/services/ttx/auditor.go index 6a4dec9c6..1aaf10f21 100644 --- a/token/services/ttx/auditor.go +++ b/token/services/ttx/auditor.go @@ -148,6 +148,9 @@ func (a *AuditingViewInitiator) Call(context view.Context) (interface{}, error) logger.Debugf("Receiving signature for [%s]", a.tx.ID()) span.AddEvent("start_receiving") //signature, err := ReadMessage(session, time.Minute) + if context.Session() == nil || context.Session().Info().Caller == nil || context.Session().Info().CallerViewID == "" || context.Context() == nil { + return nil, errors.New("Empty context data.") + } jsonSession := session2.JSON(context) signature, err := jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { From 3f1ebbe9432d9c122e99dd25e8284731af737104 Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 17:27:25 +0530 Subject: [PATCH 11/30] changes reverted Signed-off-by: sreenidhi --- token/services/ttx/auditor.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/token/services/ttx/auditor.go b/token/services/ttx/auditor.go index 1aaf10f21..8b6774aa3 100644 --- a/token/services/ttx/auditor.go +++ b/token/services/ttx/auditor.go @@ -148,8 +148,17 @@ func (a *AuditingViewInitiator) Call(context view.Context) (interface{}, error) logger.Debugf("Receiving signature for [%s]", a.tx.ID()) span.AddEvent("start_receiving") //signature, err := ReadMessage(session, time.Minute) - if context.Session() == nil || context.Session().Info().Caller == nil || context.Session().Info().CallerViewID == "" || context.Context() == nil { - return nil, errors.New("Empty context data.") + if context.Session() == nil { + return nil, errors.New("testsree context.Session() is nil") + } + if context.Session().Info().Caller == nil { + return nil, errors.New("testsree context.Session().Info().Caller is nil") + } + if context.Session().Info().CallerViewID == "" { + return nil, errors.New("testsree context.Session().Info().CallerViewID is empty") + } + if context.Context() == nil { + return nil, errors.New("testsree context.Context() is nil") } jsonSession := session2.JSON(context) signature, err := jsonSession.ReceiveRawWithTimeout(time.Minute) From 3f5144966f2dd5cc91243a6272e1d1701745db4b Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 18:33:40 +0530 Subject: [PATCH 12/30] auditor.go fix Signed-off-by: sreenidhi --- token/services/ttx/auditor.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/token/services/ttx/auditor.go b/token/services/ttx/auditor.go index 8b6774aa3..e38664242 100644 --- a/token/services/ttx/auditor.go +++ b/token/services/ttx/auditor.go @@ -147,20 +147,20 @@ func (a *AuditingViewInitiator) Call(context view.Context) (interface{}, error) // Receive signature logger.Debugf("Receiving signature for [%s]", a.tx.ID()) span.AddEvent("start_receiving") + // if context.Session() == nil { + // return nil, errors.New("testsree context.Session() is nil") + // } + // if context.Session().Info().Caller == nil { + // return nil, errors.New("testsree context.Session().Info().Caller is nil") + // } + // if context.Session().Info().CallerViewID == "" { + // return nil, errors.New("testsree context.Session().Info().CallerViewID is empty") + // } + // if context.Context() == nil { + // return nil, errors.New("testsree context.Context() is nil") + // } //signature, err := ReadMessage(session, time.Minute) - if context.Session() == nil { - return nil, errors.New("testsree context.Session() is nil") - } - if context.Session().Info().Caller == nil { - return nil, errors.New("testsree context.Session().Info().Caller is nil") - } - if context.Session().Info().CallerViewID == "" { - return nil, errors.New("testsree context.Session().Info().CallerViewID is empty") - } - if context.Context() == nil { - return nil, errors.New("testsree context.Context() is nil") - } - jsonSession := session2.JSON(context) + jsonSession := session2.NewFromSession(context, session) signature, err := jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { span.RecordError(err) From 9958da61d20bfff0b712fb1de832f1299dba68f8 Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 19:04:51 +0530 Subject: [PATCH 13/30] auditor.go fix Signed-off-by: sreenidhi --- token/services/ttx/auditor.go | 13 ------------- token/services/ttx/endorse.go | 17 +++++++++++++---- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/token/services/ttx/auditor.go b/token/services/ttx/auditor.go index e38664242..95e70b71b 100644 --- a/token/services/ttx/auditor.go +++ b/token/services/ttx/auditor.go @@ -147,19 +147,6 @@ func (a *AuditingViewInitiator) Call(context view.Context) (interface{}, error) // Receive signature logger.Debugf("Receiving signature for [%s]", a.tx.ID()) span.AddEvent("start_receiving") - // if context.Session() == nil { - // return nil, errors.New("testsree context.Session() is nil") - // } - // if context.Session().Info().Caller == nil { - // return nil, errors.New("testsree context.Session().Info().Caller is nil") - // } - // if context.Session().Info().CallerViewID == "" { - // return nil, errors.New("testsree context.Session().Info().CallerViewID is empty") - // } - // if context.Context() == nil { - // return nil, errors.New("testsree context.Context() is nil") - // } - //signature, err := ReadMessage(session, time.Minute) jsonSession := session2.NewFromSession(context, session) signature, err := jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { diff --git a/token/services/ttx/endorse.go b/token/services/ttx/endorse.go index c2b81f7cc..f67ccbcf0 100644 --- a/token/services/ttx/endorse.go +++ b/token/services/ttx/endorse.go @@ -23,6 +23,7 @@ import ( "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/multisig" "github.com/hyperledger-labs/fabric-token-sdk/token/services/network" "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokens" + session2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" "github.com/pkg/errors" "go.opentelemetry.io/otel/trace" "go.uber.org/zap/zapcore" @@ -349,7 +350,9 @@ func (c *CollectEndorsementsView) signRemote(context view.Context, party view.Id return nil, errors.Wrap(err, "failed sending transaction content") } - sigma, err := ReadMessage(session, time.Minute) + //sigma, err := ReadMessage(session, time.Minute) + jsonSession := session2.JSON(context) + sigma, err := jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { return nil, errors.Wrap(err, "failed reading message") } @@ -554,7 +557,9 @@ func (c *CollectEndorsementsView) distributeEvnToParty(context view.Context, ent } span.AddEvent("Wait for ack") - sigma, err := ReadMessage(session, 1*time.Minute) + //sigma, err := ReadMessage(session, 1*time.Minute) + jsonSession := session2.JSON(context) + sigma, err := jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { return errors.Wrapf(err, "failed reading message on session [%s]", session.Info().ID) } @@ -737,7 +742,9 @@ func (f *ReceiveTransactionView) Call(context view.Context) (interface{}, error) span.AddEvent("start_receive_transaction_view") defer span.AddEvent("end_receive_transaction_view") - msg, err := ReadMessage(context.Session(), time.Minute*4) + //msg, err := ReadMessage(context.Session(), time.Minute*4) + jsonSession := session2.JSON(context) + msg, err := jsonSession.ReceiveRawWithTimeout(time.Minute * 4) if err != nil { span.RecordError(err) } @@ -845,7 +852,9 @@ func (s *EndorseView) Call(context view.Context) (interface{}, error) { if logger.IsEnabledFor(zapcore.DebugLevel) { logger.Debugf("Receiving signature request...") } - srRaw, err = ReadMessage(session, time.Minute) + //srRaw, err = ReadMessage(session, time.Minute) + jsonSession := session2.JSON(context) + srRaw, err = jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { return nil, errors.Wrap(err, "failed reading signature request") } From feff38d4200aaa78023aec1cf2554fe526a0a2b2 Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 19:17:51 +0530 Subject: [PATCH 14/30] auditor.go fix Signed-off-by: sreenidhi --- token/services/ttx/endorse.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/token/services/ttx/endorse.go b/token/services/ttx/endorse.go index f67ccbcf0..cea31739a 100644 --- a/token/services/ttx/endorse.go +++ b/token/services/ttx/endorse.go @@ -351,6 +351,9 @@ func (c *CollectEndorsementsView) signRemote(context view.Context, party view.Id } //sigma, err := ReadMessage(session, time.Minute) + if context.Session() == nil { + return nil, errors.New("sreetest 1st read message context nil") + } jsonSession := session2.JSON(context) sigma, err := jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { @@ -558,6 +561,9 @@ func (c *CollectEndorsementsView) distributeEvnToParty(context view.Context, ent span.AddEvent("Wait for ack") //sigma, err := ReadMessage(session, 1*time.Minute) + if context.Session() == nil { + return errors.New("sreetest 2nd read message context nil") + } jsonSession := session2.JSON(context) sigma, err := jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { @@ -743,6 +749,9 @@ func (f *ReceiveTransactionView) Call(context view.Context) (interface{}, error) defer span.AddEvent("end_receive_transaction_view") //msg, err := ReadMessage(context.Session(), time.Minute*4) + if context.Session() == nil { + return nil, errors.New("sreetest 3rd read message context nil") + } jsonSession := session2.JSON(context) msg, err := jsonSession.ReceiveRawWithTimeout(time.Minute * 4) if err != nil { @@ -853,6 +862,9 @@ func (s *EndorseView) Call(context view.Context) (interface{}, error) { logger.Debugf("Receiving signature request...") } //srRaw, err = ReadMessage(session, time.Minute) + if context.Session() == nil { + return nil, errors.New("sreetest 4th read message context nil") + } jsonSession := session2.JSON(context) srRaw, err = jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { From 2e1975b386f4035f0281879393cbceca3770f166 Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 21:25:54 +0530 Subject: [PATCH 15/30] endorse.go fix Signed-off-by: sreenidhi --- token/services/ttx/endorse.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/token/services/ttx/endorse.go b/token/services/ttx/endorse.go index cea31739a..f6f88acfa 100644 --- a/token/services/ttx/endorse.go +++ b/token/services/ttx/endorse.go @@ -564,7 +564,7 @@ func (c *CollectEndorsementsView) distributeEvnToParty(context view.Context, ent if context.Session() == nil { return errors.New("sreetest 2nd read message context nil") } - jsonSession := session2.JSON(context) + jsonSession := session2.NewFromSession(context, session) sigma, err := jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { return errors.Wrapf(err, "failed reading message on session [%s]", session.Info().ID) From c6e054ba41d430ffb9178ef1e458bbc7fd3b168e Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 21:31:36 +0530 Subject: [PATCH 16/30] endorse.go fix Signed-off-by: sreenidhi --- token/services/ttx/endorse.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/token/services/ttx/endorse.go b/token/services/ttx/endorse.go index f6f88acfa..ec5b750e8 100644 --- a/token/services/ttx/endorse.go +++ b/token/services/ttx/endorse.go @@ -561,9 +561,6 @@ func (c *CollectEndorsementsView) distributeEvnToParty(context view.Context, ent span.AddEvent("Wait for ack") //sigma, err := ReadMessage(session, 1*time.Minute) - if context.Session() == nil { - return errors.New("sreetest 2nd read message context nil") - } jsonSession := session2.NewFromSession(context, session) sigma, err := jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { From dd976eb6d1ee8a6407b17fc94827994d55d49dd8 Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 21:33:26 +0530 Subject: [PATCH 17/30] endorse.go fix Signed-off-by: sreenidhi --- token/services/ttx/endorse.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/token/services/ttx/endorse.go b/token/services/ttx/endorse.go index ec5b750e8..5a2555850 100644 --- a/token/services/ttx/endorse.go +++ b/token/services/ttx/endorse.go @@ -351,9 +351,9 @@ func (c *CollectEndorsementsView) signRemote(context view.Context, party view.Id } //sigma, err := ReadMessage(session, time.Minute) - if context.Session() == nil { - return nil, errors.New("sreetest 1st read message context nil") - } + // if context.Session() == nil { + // return nil, errors.New("sreetest 1st read message context nil") + // } jsonSession := session2.JSON(context) sigma, err := jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { @@ -746,9 +746,9 @@ func (f *ReceiveTransactionView) Call(context view.Context) (interface{}, error) defer span.AddEvent("end_receive_transaction_view") //msg, err := ReadMessage(context.Session(), time.Minute*4) - if context.Session() == nil { - return nil, errors.New("sreetest 3rd read message context nil") - } + // if context.Session() == nil { + // return nil, errors.New("sreetest 3rd read message context nil") + // } jsonSession := session2.JSON(context) msg, err := jsonSession.ReceiveRawWithTimeout(time.Minute * 4) if err != nil { @@ -859,9 +859,9 @@ func (s *EndorseView) Call(context view.Context) (interface{}, error) { logger.Debugf("Receiving signature request...") } //srRaw, err = ReadMessage(session, time.Minute) - if context.Session() == nil { - return nil, errors.New("sreetest 4th read message context nil") - } + // if context.Session() == nil { + // return nil, errors.New("sreetest 4th read message context nil") + // } jsonSession := session2.JSON(context) srRaw, err = jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { From ed16387d24574c2e10f0defb6d59242337cf06a4 Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 21:50:40 +0530 Subject: [PATCH 18/30] endorse.go fix Signed-off-by: sreenidhi --- token/services/ttx/endorse.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/token/services/ttx/endorse.go b/token/services/ttx/endorse.go index 5a2555850..ec5b750e8 100644 --- a/token/services/ttx/endorse.go +++ b/token/services/ttx/endorse.go @@ -351,9 +351,9 @@ func (c *CollectEndorsementsView) signRemote(context view.Context, party view.Id } //sigma, err := ReadMessage(session, time.Minute) - // if context.Session() == nil { - // return nil, errors.New("sreetest 1st read message context nil") - // } + if context.Session() == nil { + return nil, errors.New("sreetest 1st read message context nil") + } jsonSession := session2.JSON(context) sigma, err := jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { @@ -746,9 +746,9 @@ func (f *ReceiveTransactionView) Call(context view.Context) (interface{}, error) defer span.AddEvent("end_receive_transaction_view") //msg, err := ReadMessage(context.Session(), time.Minute*4) - // if context.Session() == nil { - // return nil, errors.New("sreetest 3rd read message context nil") - // } + if context.Session() == nil { + return nil, errors.New("sreetest 3rd read message context nil") + } jsonSession := session2.JSON(context) msg, err := jsonSession.ReceiveRawWithTimeout(time.Minute * 4) if err != nil { @@ -859,9 +859,9 @@ func (s *EndorseView) Call(context view.Context) (interface{}, error) { logger.Debugf("Receiving signature request...") } //srRaw, err = ReadMessage(session, time.Minute) - // if context.Session() == nil { - // return nil, errors.New("sreetest 4th read message context nil") - // } + if context.Session() == nil { + return nil, errors.New("sreetest 4th read message context nil") + } jsonSession := session2.JSON(context) srRaw, err = jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { From 0f45eb7e0005b0023a9504e7bbf97e9bfce9603c Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 22:15:58 +0530 Subject: [PATCH 19/30] endorse.go fix Signed-off-by: sreenidhi --- token/services/ttx/endorse.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/token/services/ttx/endorse.go b/token/services/ttx/endorse.go index ec5b750e8..1ff8fbc1c 100644 --- a/token/services/ttx/endorse.go +++ b/token/services/ttx/endorse.go @@ -351,10 +351,10 @@ func (c *CollectEndorsementsView) signRemote(context view.Context, party view.Id } //sigma, err := ReadMessage(session, time.Minute) - if context.Session() == nil { - return nil, errors.New("sreetest 1st read message context nil") - } - jsonSession := session2.JSON(context) + // if context.Session() == nil { + // return nil, errors.New("sreetest 1st read message context nil") + // } + jsonSession := session2.NewFromSession(context, session) sigma, err := jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { return nil, errors.Wrap(err, "failed reading message") From 3829bba90f6f8d3474fd8cb71401ad757d0e8681 Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 22:55:26 +0530 Subject: [PATCH 20/30] endorse.go fix Signed-off-by: sreenidhi --- token/services/ttx/multisig/spend.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/token/services/ttx/multisig/spend.go b/token/services/ttx/multisig/spend.go index b6c76659e..4ddd67038 100644 --- a/token/services/ttx/multisig/spend.go +++ b/token/services/ttx/multisig/spend.go @@ -19,6 +19,7 @@ import ( "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/multisig" "github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx" "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" + session2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" "github.com/hyperledger-labs/fabric-token-sdk/token/token" "go.opentelemetry.io/otel/trace" "go.uber.org/zap/zapcore" @@ -67,7 +68,9 @@ func (f *ReceiveSpendRequestView) Call(context view.Context) (interface{}, error span.AddEvent("start_receive_spendRequest_view") defer span.AddEvent("end_receive_spendRequest_view") - msg, err := ttx.ReadMessage(context.Session(), time.Minute*4) + jsonSession := session2.JSON(context) + msg, err := jsonSession.ReceiveRawWithTimeout(time.Minute * 4) + //msg, err := ttx.ReadMessage(context.Session(), time.Minute*4) if err != nil { span.RecordError(err) } From 4854aca841018ee4b23f0a16336274a34e4972d8 Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 23:06:18 +0530 Subject: [PATCH 21/30] endorse.go fix Signed-off-by: sreenidhi --- token/services/ttx/multisig/spend.go | 47 +++++++++++++--------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/token/services/ttx/multisig/spend.go b/token/services/ttx/multisig/spend.go index 4ddd67038..5716b49d4 100644 --- a/token/services/ttx/multisig/spend.go +++ b/token/services/ttx/multisig/spend.go @@ -7,12 +7,10 @@ SPDX-License-Identifier: Apache-2.0 package multisig import ( - "runtime/debug" "slices" "time" "github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors" - "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash" "github.com/hyperledger-labs/fabric-smart-client/platform/view/view" token2 "github.com/hyperledger-labs/fabric-token-sdk/token" "github.com/hyperledger-labs/fabric-token-sdk/token/core/common/encoding/json" @@ -22,7 +20,6 @@ import ( session2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" "github.com/hyperledger-labs/fabric-token-sdk/token/token" "go.opentelemetry.io/otel/trace" - "go.uber.org/zap/zapcore" ) // SpendRequest is the request to spend a token @@ -30,14 +27,14 @@ type SpendRequest struct { Token *token.UnspentToken } -func NewSpendRequestFromBytes(msg []byte) (*SpendRequest, error) { - request := &SpendRequest{} - err := json.Unmarshal(msg, request) - if err != nil { - return nil, errors.Wrap(err, "failed unmarshalling spendRequest") - } - return request, nil -} +// func NewSpendRequestFromBytes(msg []byte) (*SpendRequest, error) { +// request := &SpendRequest{} +// err := json.Unmarshal(msg, request) +// if err != nil { +// return nil, errors.Wrap(err, "failed unmarshalling spendRequest") +// } +// return request, nil +// } func ReceiveSpendRequest(context view.Context, opts ...ttx.TxOption) (*SpendRequest, error) { logger.Debugf("receive a new spendRequest...") @@ -67,27 +64,27 @@ func (f *ReceiveSpendRequestView) Call(context view.Context) (interface{}, error span := trace.SpanFromContext(context.Context()) span.AddEvent("start_receive_spendRequest_view") defer span.AddEvent("end_receive_spendRequest_view") - + tx := &SpendRequest{} jsonSession := session2.JSON(context) - msg, err := jsonSession.ReceiveRawWithTimeout(time.Minute * 4) + err := jsonSession.ReceiveWithTimeout(tx, time.Minute*4) //msg, err := ttx.ReadMessage(context.Session(), time.Minute*4) if err != nil { span.RecordError(err) } span.AddEvent("receive_tx") - if logger.IsEnabledFor(zapcore.DebugLevel) { - logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(msg), hash.Hashable(msg)) - } - if len(msg) == 0 { - info := context.Session().Info() - logger.Errorf("received empty message, session closed [%s:%v], [%s]", info.ID, info.Closed, string(debug.Stack())) - return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) - } - tx, err := NewSpendRequestFromBytes(msg) - if err != nil { - return nil, errors.Wrap(err, "failed to receive spendRequest") - } + //if logger.IsEnabledFor(zapcore.DebugLevel) { + // logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(msg), hash.Hashable(msg)) + //} + // if len(msg) == 0 { + // info := context.Session().Info() + // logger.Errorf("received empty message, session closed [%s:%v], [%s]", info.ID, info.Closed, string(debug.Stack())) + // return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) + // } + // tx, err := NewSpendRequestFromBytes(msg) + // if err != nil { + // return nil, errors.Wrap(err, "failed to receive spendRequest") + // } return tx, nil } From 731929b45d54bba5c837c2726f09241b0e02adee Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 23:10:44 +0530 Subject: [PATCH 22/30] endorse.go fix Signed-off-by: sreenidhi --- go.mod | 18 ++++++++--- go.sum | 46 ++++++++++++++++++++++++++-- token/services/ttx/accept.go | 15 ++++----- token/services/ttx/auditor.go | 7 +++-- token/services/ttx/endorse.go | 32 +++++++++++++------ token/services/ttx/multisig/spend.go | 42 +++++++++++++++---------- 6 files changed, 117 insertions(+), 43 deletions(-) diff --git a/go.mod b/go.mod index 5bffe2a60..1fcedf504 100644 --- a/go.mod +++ b/go.mod @@ -6,10 +6,13 @@ require ( github.com/IBM/idemix v0.0.2-0.20240816143710-3dce4618d760 github.com/IBM/idemix/bccsp/types v0.0.0-20240816143710-3dce4618d760 github.com/IBM/mathlib v0.0.3-0.20241219051532-81539b287cf5 + github.com/docker/docker v27.2.0+incompatible + github.com/docker/go-connections v0.5.0 github.com/gin-gonic/gin v1.10.0 github.com/gobuffalo/packr/v2 v2.7.1 github.com/hashicorp/go-uuid v1.0.3 - github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250319152028-b53f202e2b62 + github.com/hashicorp/vault/api v1.16.0 + github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250314124232-4cd027590cfb github.com/hyperledger-labs/orion-sdk-go v0.2.10 github.com/hyperledger-labs/orion-server v0.2.10 github.com/hyperledger/fabric v1.4.0-rc1.0.20230405174026-695dd57e01c2 @@ -79,8 +82,6 @@ require ( github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect github.com/distribution/reference v0.6.0 // indirect - github.com/docker/docker v27.2.0+incompatible // indirect - github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/elastic/gosigar v0.14.3 // indirect @@ -93,6 +94,7 @@ require ( github.com/ghodss/yaml v1.0.0 // indirect github.com/gin-contrib/cors v1.7.2 // indirect github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-jose/go-jose/v4 v4.0.1 // indirect github.com/go-kit/kit v0.13.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect @@ -121,7 +123,13 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect github.com/hashicorp/consul/sdk v0.16.1 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hashicorp/go-retryablehttp v0.7.7 // indirect + github.com/hashicorp/go-rootcerts v1.0.2 // indirect + github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect + github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect + github.com/hashicorp/go-sockaddr v1.0.2 // indirect github.com/hashicorp/golang-lru v1.0.2 // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hashicorp/hcl v1.0.0 // indirect @@ -172,6 +180,7 @@ require ( github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect github.com/minio/sha256-simd v1.0.1 // indirect github.com/miracl/conflate v1.3.4 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mmcloughlin/addchain v0.4.0 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/patternmatcher v0.6.0 // indirect @@ -227,6 +236,7 @@ require ( github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 // indirect github.com/raulk/go-watchdog v1.3.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect + github.com/ryanuber/go-glob v1.0.0 // indirect github.com/sagikazarmark/locafero v0.6.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/shirou/gopsutil/v3 v3.23.12 // indirect @@ -288,4 +298,4 @@ require ( modernc.org/strutil v1.2.0 // indirect modernc.org/token v1.1.0 // indirect rsc.io/tmplfunc v0.0.3 // indirect -) +) \ No newline at end of file diff --git a/go.sum b/go.sum index 461d85473..e6c8dba08 100644 --- a/go.sum +++ b/go.sum @@ -665,6 +665,7 @@ github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0I github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4xei5aX110hRiI= github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o= @@ -672,6 +673,7 @@ github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZx github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE= github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= @@ -798,6 +800,9 @@ github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w= github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= @@ -835,6 +840,8 @@ github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmn github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-jose/go-jose/v4 v4.0.1 h1:QVEPDE3OluqXBQZDcnNvQrInro2h0e4eqNbnZSWqS6U= +github.com/go-jose/go-jose/v4 v4.0.1/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY= github.com/go-kit/kit v0.13.0 h1:OoneCcHKHQ03LfBpoQCUfCluwd2Vt3ohz+kvbJneZAU= github.com/go-kit/kit v0.13.0/go.mod h1:phqEHMMUbyrCFCTgH48JueqrM3md2HcAZ8N3XE4FKDg= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= @@ -869,6 +876,8 @@ github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg78 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= +github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw= +github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0= github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= github.com/gobuffalo/envy v1.7.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w= @@ -1040,8 +1049,24 @@ github.com/hashicorp/consul/sdk v0.16.1/go.mod h1:fSXvwxB2hmh1FMZCNl6PwX0Q/1wdWt github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= +github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= +github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= +github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 h1:om4Al8Oy7kCm/B86rLCLah4Dt5Aa0Fr5rYBG60OzwHQ= +github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8= +github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod h1:gKOamz3EwoIoJq7mlMIRBpVTAUn8qPCrEclOKKWhD3U= +github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts= +github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4= +github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= +github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= @@ -1052,13 +1077,15 @@ github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/vault/api v1.16.0 h1:nbEYGJiAPGzT9U4oWgaaB0g+Rj8E59QuHKyA5LhwQN4= +github.com/hashicorp/vault/api v1.16.0/go.mod h1:KhuUhzOD8lDSk29AtzNjgAu2kxRA9jL9NAbkFlqvkBA= github.com/hidal-go/hidalgo v0.0.0-20201109092204-05749a6d73df h1:bvz3e467dv98bVHQ9F5QbGKtGvyQO3rPD8lwu6fZ/D4= github.com/hidal-go/hidalgo v0.0.0-20201109092204-05749a6d73df/go.mod h1:bPkrxDlroXxigw8BMWTEPTv4W5/rQwNgg2BECXsgyX0= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= -github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250319152028-b53f202e2b62 h1:fUK1AxK//9bF8si5AYE6kptAErzn+oWbINndOTfTQTM= -github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250319152028-b53f202e2b62/go.mod h1:EdiA1cY2eOOZjqPlutIlFPkueUMMJOxLoiRH5KwOW1c= +github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250314124232-4cd027590cfb h1:tXjdCuJdbLmf+oPb9CluSOuwnYPnQKJn8gwySYBy3to= +github.com/hyperledger-labs/fabric-smart-client v0.4.1-0.20250314124232-4cd027590cfb/go.mod h1:EdiA1cY2eOOZjqPlutIlFPkueUMMJOxLoiRH5KwOW1c= github.com/hyperledger-labs/orion-sdk-go v0.2.10 h1:lFgWgxyvngIhWnIqymYGBmtmq9D6uC5d0uLG9cbyh5s= github.com/hyperledger-labs/orion-sdk-go v0.2.10/go.mod h1:iN2xZB964AqwVJwL+EnwPOs8z1EkMEbbIg/qYeC7gDY= github.com/hyperledger-labs/orion-server v0.2.10 h1:G4zbQEL5Egk0Oj+TwHCZWdTOLDBHOjaAEvYOT4G7ozw= @@ -1211,6 +1238,10 @@ github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3v github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd h1:br0buuQ854V8u83wA0rVZ8ttrq5CpaPZdvrK0LP2lOk= github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd/go.mod h1:QuCEs1Nt24+FYQEqAAncTDPJIuGs+LxK1MCiFL25pMU= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= @@ -1237,8 +1268,12 @@ github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dz github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8= github.com/miracl/conflate v1.3.4 h1:BI+pOex3Pp7DtSaTDqArYDMKSSDYUvRjb66lgAHhSFw= github.com/miracl/conflate v1.3.4/go.mod h1:7S2L/ymkFyEgv8oM5G6sKxTExeRkLqxPBJgNz7g1ys0= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY= @@ -1412,6 +1447,7 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/polydawn/refmt v0.89.0 h1:ADJTApkvkeBZsN0tBTx8QjpD9JkmxbKp0cxfr9qszm4= github.com/polydawn/refmt v0.89.0/go.mod h1:/zvteZs/GwLtCgZ4BL6CBsk9IKIlexP43ObX9AxTqTw= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -1454,6 +1490,9 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk= +github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk= +github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3N51bwOk= github.com/sagikazarmark/locafero v0.6.0/go.mod h1:77OmuIc6VTraTXKXIs/uvUxKGUXjE1GbemJYHqdNjX0= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= @@ -1881,6 +1920,7 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -2515,4 +2555,4 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU= rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA= sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= -sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= +sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= \ No newline at end of file diff --git a/token/services/ttx/accept.go b/token/services/ttx/accept.go index 082ab34ec..601f04c44 100644 --- a/token/services/ttx/accept.go +++ b/token/services/ttx/accept.go @@ -9,7 +9,6 @@ package ttx import ( "encoding/base64" "fmt" - "time" view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view" "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash" @@ -17,6 +16,7 @@ import ( "github.com/hyperledger-labs/fabric-smart-client/platform/view/view" "github.com/hyperledger-labs/fabric-token-sdk/token" "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokens" + session2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" "github.com/pkg/errors" "go.opentelemetry.io/otel/trace" "go.uber.org/zap/zapcore" @@ -132,16 +132,17 @@ func (s *AcceptView) respondToSignatureRequests(context view.Context) error { if logger.IsEnabledFor(zapcore.DebugLevel) { logger.Debugf("Receiving signature request...") } - - msg, err := ReadMessage(session, time.Minute) + jsonsession := session2.JSON(context) + err := jsonsession.Receive(signatureRequest) + // msg, err := ReadMessage(session, time.Minute) if err != nil { return errors.Wrap(err, "failed reading signature request") } // TODO: check what is signed... - err = Unmarshal(msg, signatureRequest) - if err != nil { - return errors.Wrap(err, "failed unmarshalling signature request") - } + // err = Unmarshal(msg, signatureRequest) + // if err != nil { + // return errors.Wrap(err, "failed unmarshalling signature request") + // } } span.AddEvent("Fetched request from session") tms := token.GetManagementService(context, token.WithTMS(s.tx.Network(), s.tx.Channel(), s.tx.Namespace())) diff --git a/token/services/ttx/auditor.go b/token/services/ttx/auditor.go index 0016d6123..84a3375b6 100644 --- a/token/services/ttx/auditor.go +++ b/token/services/ttx/auditor.go @@ -9,7 +9,6 @@ package ttx import ( "context" "encoding/base64" - "time" view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view" "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash" @@ -20,6 +19,7 @@ import ( "github.com/hyperledger-labs/fabric-token-sdk/token/services/db/driver" "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokens" "github.com/hyperledger-labs/fabric-token-sdk/token/services/ttxdb" + session2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" view3 "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/view" "github.com/pkg/errors" "go.opentelemetry.io/otel/trace" @@ -146,7 +146,10 @@ func (a *AuditingViewInitiator) Call(context view.Context) (interface{}, error) // Receive signature logger.Debugf("Receiving signature for [%s]", a.tx.ID()) span.AddEvent("start_receiving") - signature, err := ReadMessage(session, time.Minute) + + jsonsession := session2.JSON(context) + signature, err := jsonsession.ReceiveRaw() + //signature, err := ReadMessage(session, time.Minute) if err != nil { span.RecordError(err) return nil, errors.WithMessage(err, "failed to read audit event") diff --git a/token/services/ttx/endorse.go b/token/services/ttx/endorse.go index c2b81f7cc..2e7d8261c 100644 --- a/token/services/ttx/endorse.go +++ b/token/services/ttx/endorse.go @@ -12,7 +12,6 @@ import ( "fmt" "reflect" "runtime/debug" - "time" "github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/collections" view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view" @@ -23,6 +22,7 @@ import ( "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/multisig" "github.com/hyperledger-labs/fabric-token-sdk/token/services/network" "github.com/hyperledger-labs/fabric-token-sdk/token/services/tokens" + session2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" "github.com/pkg/errors" "go.opentelemetry.io/otel/trace" "go.uber.org/zap/zapcore" @@ -348,8 +348,9 @@ func (c *CollectEndorsementsView) signRemote(context view.Context, party view.Id if err != nil { return nil, errors.Wrap(err, "failed sending transaction content") } - - sigma, err := ReadMessage(session, time.Minute) + jsonsession := session2.JSON(context) + sigma, err := jsonsession.ReceiveRaw() + //sigma, err := ReadMessage(session, time.Minute) if err != nil { return nil, errors.Wrap(err, "failed reading message") } @@ -554,7 +555,10 @@ func (c *CollectEndorsementsView) distributeEvnToParty(context view.Context, ent } span.AddEvent("Wait for ack") - sigma, err := ReadMessage(session, 1*time.Minute) + //sigma, err := ReadMessage(session, 1*time.Minute) + jsonsession := session2.JSON(context) + sigma, err := jsonsession.ReceiveRaw() + //sigma, err := ReadMessage(session, time.Minute*4) if err != nil { return errors.Wrapf(err, "failed reading message on session [%s]", session.Info().ID) } @@ -737,7 +741,9 @@ func (f *ReceiveTransactionView) Call(context view.Context) (interface{}, error) span.AddEvent("start_receive_transaction_view") defer span.AddEvent("end_receive_transaction_view") - msg, err := ReadMessage(context.Session(), time.Minute*4) + jsonsession := session2.JSON(context) + msg, err := jsonsession.ReceiveRaw() + //msg, err := ReadMessage(context.Session(), time.Minute*4) if err != nil { span.RecordError(err) } @@ -841,20 +847,26 @@ func (s *EndorseView) Call(context view.Context) (interface{}, error) { if err := kvss.(*kvs.KVS).Get(k, &srRaw); err != nil { return nil, errors.Wrap(err, "failed to to store signature request") } + err = Unmarshal(srRaw, signatureRequest) + if err != nil { + return nil, errors.Wrap(err, "failed unmarshalling signature request") + } } else { if logger.IsEnabledFor(zapcore.DebugLevel) { logger.Debugf("Receiving signature request...") } - srRaw, err = ReadMessage(session, time.Minute) + jsonsession := session2.JSON(context) + err := jsonsession.Receive(signatureRequest) + //srRaw, err = ReadMessage(session, time.Minute) if err != nil { return nil, errors.Wrap(err, "failed reading signature request") } } // TODO: check what is signed... - err = Unmarshal(srRaw, signatureRequest) - if err != nil { - return nil, errors.Wrap(err, "failed unmarshalling signature request") - } + // err = Unmarshal(srRaw, signatureRequest) + // if err != nil { + // return nil, errors.Wrap(err, "failed unmarshalling signature request") + // } sigService := s.tx.TokenService().SigService() if !sigService.IsMe(signatureRequest.Signer) { diff --git a/token/services/ttx/multisig/spend.go b/token/services/ttx/multisig/spend.go index b6c76659e..1093c34e1 100644 --- a/token/services/ttx/multisig/spend.go +++ b/token/services/ttx/multisig/spend.go @@ -29,14 +29,14 @@ type SpendRequest struct { Token *token.UnspentToken } -func NewSpendRequestFromBytes(msg []byte) (*SpendRequest, error) { - request := &SpendRequest{} - err := json.Unmarshal(msg, request) - if err != nil { - return nil, errors.Wrap(err, "failed unmarshalling spendRequest") - } - return request, nil -} +// func NewSpendRequestFromBytes(msg []byte) (*SpendRequest, error) { +// request := &SpendRequest{} +// err := json.Unmarshal(msg, request) +// if err != nil { +// return nil, errors.Wrap(err, "failed unmarshalling spendRequest") +// } +// return request, nil +// } func ReceiveSpendRequest(context view.Context, opts ...ttx.TxOption) (*SpendRequest, error) { logger.Debugf("receive a new spendRequest...") @@ -66,26 +66,34 @@ func (f *ReceiveSpendRequestView) Call(context view.Context) (interface{}, error span := trace.SpanFromContext(context.Context()) span.AddEvent("start_receive_spendRequest_view") defer span.AddEvent("end_receive_spendRequest_view") - - msg, err := ttx.ReadMessage(context.Session(), time.Minute*4) + request := &SpendRequest{} + jsonsession := session.JSON(context) + err := jsonsession.Receive(request) + //msg, err := ttx.ReadMessage(context.Session(), time.Minute*4) if err != nil { span.RecordError(err) } span.AddEvent("receive_tx") + requestBytes, err := json.Marshal(request) + if err != nil { + return nil, errors.Errorf("Failed to marshal request: %v", err) + } + if logger.IsEnabledFor(zapcore.DebugLevel) { - logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(msg), hash.Hashable(msg)) + logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(requestBytes), hash.Hashable(requestBytes)) } - if len(msg) == 0 { + if len(requestBytes) == 0 { info := context.Session().Info() logger.Errorf("received empty message, session closed [%s:%v], [%s]", info.ID, info.Closed, string(debug.Stack())) return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) } - tx, err := NewSpendRequestFromBytes(msg) - if err != nil { - return nil, errors.Wrap(err, "failed to receive spendRequest") - } - return tx, nil + // tx, err := NewSpendRequestFromBytes(msg) + // if err != nil { + // return nil, errors.Wrap(err, "failed to receive spendRequest") + // } + //return tx, nil + return request, nil } // SpendResponse is the response to a SpendRequest From 9fec94e0c8cebadbc9f3011fe85b2bfb7daf88b0 Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 23:18:12 +0530 Subject: [PATCH 23/30] endorse.go fix Signed-off-by: sreenidhi --- token/services/ttx/multisig/spend.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/token/services/ttx/multisig/spend.go b/token/services/ttx/multisig/spend.go index 5716b49d4..44c4b34e8 100644 --- a/token/services/ttx/multisig/spend.go +++ b/token/services/ttx/multisig/spend.go @@ -17,7 +17,6 @@ import ( "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/multisig" "github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx" "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" - session2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" "github.com/hyperledger-labs/fabric-token-sdk/token/token" "go.opentelemetry.io/otel/trace" ) @@ -65,7 +64,7 @@ func (f *ReceiveSpendRequestView) Call(context view.Context) (interface{}, error span.AddEvent("start_receive_spendRequest_view") defer span.AddEvent("end_receive_spendRequest_view") tx := &SpendRequest{} - jsonSession := session2.JSON(context) + jsonSession := session.JSON(context) err := jsonSession.ReceiveWithTimeout(tx, time.Minute*4) //msg, err := ttx.ReadMessage(context.Session(), time.Minute*4) if err != nil { From db4c2c783b9adab3bb865b831e0d6a34a02d3d20 Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 23:34:59 +0530 Subject: [PATCH 24/30] endorse.go fix Signed-off-by: sreenidhi --- token/services/ttx/multisig/spend.go | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/token/services/ttx/multisig/spend.go b/token/services/ttx/multisig/spend.go index 44c4b34e8..c72734e06 100644 --- a/token/services/ttx/multisig/spend.go +++ b/token/services/ttx/multisig/spend.go @@ -7,10 +7,12 @@ SPDX-License-Identifier: Apache-2.0 package multisig import ( + "runtime/debug" "slices" "time" "github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors" + "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash" "github.com/hyperledger-labs/fabric-smart-client/platform/view/view" token2 "github.com/hyperledger-labs/fabric-token-sdk/token" "github.com/hyperledger-labs/fabric-token-sdk/token/core/common/encoding/json" @@ -19,6 +21,7 @@ import ( "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" "github.com/hyperledger-labs/fabric-token-sdk/token/token" "go.opentelemetry.io/otel/trace" + "go.uber.org/zap/zapcore" ) // SpendRequest is the request to spend a token @@ -71,7 +74,18 @@ func (f *ReceiveSpendRequestView) Call(context view.Context) (interface{}, error span.RecordError(err) } span.AddEvent("receive_tx") - + txBytes, err := json.Marshal(tx) + if err != nil { + return nil, errors.Wrap(err, "failed to marshal SpendRequest") + } + if logger.IsEnabledFor(zapcore.DebugLevel) { + logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(txBytes), hash.Hashable(txBytes)) + } + if len(txBytes) == 0 { + info := context.Session().Info() + logger.Errorf("received empty message, session closed [%s:%v], [%s]", info.ID, info.Closed, string(debug.Stack())) + return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) + } //if logger.IsEnabledFor(zapcore.DebugLevel) { // logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(msg), hash.Hashable(msg)) //} From eb1e5317ef0a1b33bbd25711e6e32e94301bd43d Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 23:46:02 +0530 Subject: [PATCH 25/30] endorse.go fix Signed-off-by: sreenidhi --- token/services/ttx/multisig/spend.go | 47 ++++++++++------------------ 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/token/services/ttx/multisig/spend.go b/token/services/ttx/multisig/spend.go index c72734e06..b6c76659e 100644 --- a/token/services/ttx/multisig/spend.go +++ b/token/services/ttx/multisig/spend.go @@ -29,14 +29,14 @@ type SpendRequest struct { Token *token.UnspentToken } -// func NewSpendRequestFromBytes(msg []byte) (*SpendRequest, error) { -// request := &SpendRequest{} -// err := json.Unmarshal(msg, request) -// if err != nil { -// return nil, errors.Wrap(err, "failed unmarshalling spendRequest") -// } -// return request, nil -// } +func NewSpendRequestFromBytes(msg []byte) (*SpendRequest, error) { + request := &SpendRequest{} + err := json.Unmarshal(msg, request) + if err != nil { + return nil, errors.Wrap(err, "failed unmarshalling spendRequest") + } + return request, nil +} func ReceiveSpendRequest(context view.Context, opts ...ttx.TxOption) (*SpendRequest, error) { logger.Debugf("receive a new spendRequest...") @@ -66,38 +66,25 @@ func (f *ReceiveSpendRequestView) Call(context view.Context) (interface{}, error span := trace.SpanFromContext(context.Context()) span.AddEvent("start_receive_spendRequest_view") defer span.AddEvent("end_receive_spendRequest_view") - tx := &SpendRequest{} - jsonSession := session.JSON(context) - err := jsonSession.ReceiveWithTimeout(tx, time.Minute*4) - //msg, err := ttx.ReadMessage(context.Session(), time.Minute*4) + + msg, err := ttx.ReadMessage(context.Session(), time.Minute*4) if err != nil { span.RecordError(err) } span.AddEvent("receive_tx") - txBytes, err := json.Marshal(tx) - if err != nil { - return nil, errors.Wrap(err, "failed to marshal SpendRequest") - } + if logger.IsEnabledFor(zapcore.DebugLevel) { - logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(txBytes), hash.Hashable(txBytes)) + logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(msg), hash.Hashable(msg)) } - if len(txBytes) == 0 { + if len(msg) == 0 { info := context.Session().Info() logger.Errorf("received empty message, session closed [%s:%v], [%s]", info.ID, info.Closed, string(debug.Stack())) return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) } - //if logger.IsEnabledFor(zapcore.DebugLevel) { - // logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(msg), hash.Hashable(msg)) - //} - // if len(msg) == 0 { - // info := context.Session().Info() - // logger.Errorf("received empty message, session closed [%s:%v], [%s]", info.ID, info.Closed, string(debug.Stack())) - // return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) - // } - // tx, err := NewSpendRequestFromBytes(msg) - // if err != nil { - // return nil, errors.Wrap(err, "failed to receive spendRequest") - // } + tx, err := NewSpendRequestFromBytes(msg) + if err != nil { + return nil, errors.Wrap(err, "failed to receive spendRequest") + } return tx, nil } From 1edb86b491a09c3cc7ce04a547d37b7777226327 Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Fri, 28 Mar 2025 23:58:51 +0530 Subject: [PATCH 26/30] endorse.go fix Signed-off-by: sreenidhi --- token/services/ttx/endorse.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/token/services/ttx/endorse.go b/token/services/ttx/endorse.go index f37ec9acb..1ff8fbc1c 100644 --- a/token/services/ttx/endorse.go +++ b/token/services/ttx/endorse.go @@ -854,10 +854,6 @@ func (s *EndorseView) Call(context view.Context) (interface{}, error) { if err := kvss.(*kvs.KVS).Get(k, &srRaw); err != nil { return nil, errors.Wrap(err, "failed to to store signature request") } - err = Unmarshal(srRaw, signatureRequest) - if err != nil { - return nil, errors.Wrap(err, "failed unmarshalling signature request") - } } else { if logger.IsEnabledFor(zapcore.DebugLevel) { logger.Debugf("Receiving signature request...") @@ -873,10 +869,10 @@ func (s *EndorseView) Call(context view.Context) (interface{}, error) { } } // TODO: check what is signed... - // err = Unmarshal(srRaw, signatureRequest) - // if err != nil { - // return nil, errors.Wrap(err, "failed unmarshalling signature request") - // } + err = Unmarshal(srRaw, signatureRequest) + if err != nil { + return nil, errors.Wrap(err, "failed unmarshalling signature request") + } sigService := s.tx.TokenService().SigService() if !sigService.IsMe(signatureRequest.Signer) { From c56177028e1c3ade2502bf2b44f4c74d92f27ea9 Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Sat, 29 Mar 2025 00:51:18 +0530 Subject: [PATCH 27/30] endorse.go fix Signed-off-by: sreenidhi --- token/services/ttx/multisig/spend.go | 62 ++++++++++++++++------------ 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/token/services/ttx/multisig/spend.go b/token/services/ttx/multisig/spend.go index b6c76659e..2e3f8e855 100644 --- a/token/services/ttx/multisig/spend.go +++ b/token/services/ttx/multisig/spend.go @@ -7,12 +7,10 @@ SPDX-License-Identifier: Apache-2.0 package multisig import ( - "runtime/debug" "slices" "time" "github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors" - "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash" "github.com/hyperledger-labs/fabric-smart-client/platform/view/view" token2 "github.com/hyperledger-labs/fabric-token-sdk/token" "github.com/hyperledger-labs/fabric-token-sdk/token/core/common/encoding/json" @@ -21,7 +19,6 @@ import ( "github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/json/session" "github.com/hyperledger-labs/fabric-token-sdk/token/token" "go.opentelemetry.io/otel/trace" - "go.uber.org/zap/zapcore" ) // SpendRequest is the request to spend a token @@ -29,14 +26,14 @@ type SpendRequest struct { Token *token.UnspentToken } -func NewSpendRequestFromBytes(msg []byte) (*SpendRequest, error) { - request := &SpendRequest{} - err := json.Unmarshal(msg, request) - if err != nil { - return nil, errors.Wrap(err, "failed unmarshalling spendRequest") - } - return request, nil -} +// func NewSpendRequestFromBytes(msg []byte) (*SpendRequest, error) { +// request := &SpendRequest{} +// err := json.Unmarshal(msg, request) +// if err != nil { +// return nil, errors.Wrap(err, "failed unmarshalling spendRequest") +// } +// return request, nil +// } func ReceiveSpendRequest(context view.Context, opts ...ttx.TxOption) (*SpendRequest, error) { logger.Debugf("receive a new spendRequest...") @@ -66,25 +63,38 @@ func (f *ReceiveSpendRequestView) Call(context view.Context) (interface{}, error span := trace.SpanFromContext(context.Context()) span.AddEvent("start_receive_spendRequest_view") defer span.AddEvent("end_receive_spendRequest_view") - - msg, err := ttx.ReadMessage(context.Session(), time.Minute*4) + tx := &SpendRequest{} + jsonSession := session.JSON(context) + err := jsonSession.ReceiveWithTimeout(tx, time.Minute*4) + //msg, err := ttx.ReadMessage(context.Session(), time.Minute*4) if err != nil { span.RecordError(err) } span.AddEvent("receive_tx") - - if logger.IsEnabledFor(zapcore.DebugLevel) { - logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(msg), hash.Hashable(msg)) - } - if len(msg) == 0 { - info := context.Session().Info() - logger.Errorf("received empty message, session closed [%s:%v], [%s]", info.ID, info.Closed, string(debug.Stack())) - return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) - } - tx, err := NewSpendRequestFromBytes(msg) - if err != nil { - return nil, errors.Wrap(err, "failed to receive spendRequest") - } + // txBytes, err := json.Marshal(tx) + // if err != nil { + // return nil, errors.Wrap(err, "failed to marshal SpendRequest") + // } + // if logger.IsEnabledFor(zapcore.DebugLevel) { + // logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(txBytes), hash.Hashable(txBytes)) + // } + // if len(txBytes) == 0 { + // info := context.Session().Info() + // logger.Errorf("received empty message, session closed [%s:%v], [%s]", info.ID, info.Closed, string(debug.Stack())) + // return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) + // } + //if logger.IsEnabledFor(zapcore.DebugLevel) { + // logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(msg), hash.Hashable(msg)) + //} + // if len(msg) == 0 { + // info := context.Session().Info() + // logger.Errorf("received empty message, session closed [%s:%v], [%s]", info.ID, info.Closed, string(debug.Stack())) + // return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) + // } + // tx, err := NewSpendRequestFromBytes(msg) + // if err != nil { + // return nil, errors.Wrap(err, "failed to receive spendRequest") + // } return tx, nil } From 42ad45a1749b89d9f129bc292b1f4810b0c11da2 Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Sat, 29 Mar 2025 01:51:33 +0530 Subject: [PATCH 28/30] endorse.go fix Signed-off-by: sreenidhi --- integration/ports.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration/ports.go b/integration/ports.go index 0aa864534..08bfcc198 100755 --- a/integration/ports.go +++ b/integration/ports.go @@ -60,8 +60,8 @@ var ( AllTestTypes = []*InfrastructureType{ WebSocketNoReplication, - //LibP2PNoReplication, - //WebSocketWithReplication, + LibP2PNoReplication, + WebSocketWithReplication, } ) From 989adb157e48e9c4ac456db64a365a85215b85d0 Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Mon, 31 Mar 2025 01:23:10 +0530 Subject: [PATCH 29/30] endorse.go fix Signed-off-by: sreenidhi --- token/services/ttx/accept.go | 6 ------ token/services/ttx/endorse.go | 14 -------------- token/services/ttx/multisig/spend.go | 25 ------------------------- 3 files changed, 45 deletions(-) diff --git a/token/services/ttx/accept.go b/token/services/ttx/accept.go index 6a79123aa..3432dacf1 100644 --- a/token/services/ttx/accept.go +++ b/token/services/ttx/accept.go @@ -135,15 +135,9 @@ func (s *AcceptView) respondToSignatureRequests(context view.Context) error { } jsonSession := session2.JSON(context) err := jsonSession.ReceiveWithTimeout(signatureRequest, time.Minute) - //msg, err := ReadMessage(session, time.Minute) if err != nil { return errors.Wrap(err, "failed reading signature request") } - // TODO: check what is signed... - // err = Unmarshal(msg, signatureRequest) - // if err != nil { - // return errors.Wrap(err, "failed unmarshalling signature request") - // } } span.AddEvent("Fetched request from session") tms := token.GetManagementService(context, token.WithTMS(s.tx.Network(), s.tx.Channel(), s.tx.Namespace())) diff --git a/token/services/ttx/endorse.go b/token/services/ttx/endorse.go index 1ff8fbc1c..5f6e386ea 100644 --- a/token/services/ttx/endorse.go +++ b/token/services/ttx/endorse.go @@ -350,10 +350,6 @@ func (c *CollectEndorsementsView) signRemote(context view.Context, party view.Id return nil, errors.Wrap(err, "failed sending transaction content") } - //sigma, err := ReadMessage(session, time.Minute) - // if context.Session() == nil { - // return nil, errors.New("sreetest 1st read message context nil") - // } jsonSession := session2.NewFromSession(context, session) sigma, err := jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { @@ -560,7 +556,6 @@ func (c *CollectEndorsementsView) distributeEvnToParty(context view.Context, ent } span.AddEvent("Wait for ack") - //sigma, err := ReadMessage(session, 1*time.Minute) jsonSession := session2.NewFromSession(context, session) sigma, err := jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { @@ -744,11 +739,6 @@ func (f *ReceiveTransactionView) Call(context view.Context) (interface{}, error) span := trace.SpanFromContext(context.Context()) span.AddEvent("start_receive_transaction_view") defer span.AddEvent("end_receive_transaction_view") - - //msg, err := ReadMessage(context.Session(), time.Minute*4) - if context.Session() == nil { - return nil, errors.New("sreetest 3rd read message context nil") - } jsonSession := session2.JSON(context) msg, err := jsonSession.ReceiveRawWithTimeout(time.Minute * 4) if err != nil { @@ -858,10 +848,6 @@ func (s *EndorseView) Call(context view.Context) (interface{}, error) { if logger.IsEnabledFor(zapcore.DebugLevel) { logger.Debugf("Receiving signature request...") } - //srRaw, err = ReadMessage(session, time.Minute) - if context.Session() == nil { - return nil, errors.New("sreetest 4th read message context nil") - } jsonSession := session2.JSON(context) srRaw, err = jsonSession.ReceiveRawWithTimeout(time.Minute) if err != nil { diff --git a/token/services/ttx/multisig/spend.go b/token/services/ttx/multisig/spend.go index 2e3f8e855..2df67c697 100644 --- a/token/services/ttx/multisig/spend.go +++ b/token/services/ttx/multisig/spend.go @@ -66,35 +66,10 @@ func (f *ReceiveSpendRequestView) Call(context view.Context) (interface{}, error tx := &SpendRequest{} jsonSession := session.JSON(context) err := jsonSession.ReceiveWithTimeout(tx, time.Minute*4) - //msg, err := ttx.ReadMessage(context.Session(), time.Minute*4) if err != nil { span.RecordError(err) } span.AddEvent("receive_tx") - // txBytes, err := json.Marshal(tx) - // if err != nil { - // return nil, errors.Wrap(err, "failed to marshal SpendRequest") - // } - // if logger.IsEnabledFor(zapcore.DebugLevel) { - // logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(txBytes), hash.Hashable(txBytes)) - // } - // if len(txBytes) == 0 { - // info := context.Session().Info() - // logger.Errorf("received empty message, session closed [%s:%v], [%s]", info.ID, info.Closed, string(debug.Stack())) - // return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) - // } - //if logger.IsEnabledFor(zapcore.DebugLevel) { - // logger.Debugf("ReceiveSpendRequestView: received spendRequest, len [%d][%s]", len(msg), hash.Hashable(msg)) - //} - // if len(msg) == 0 { - // info := context.Session().Info() - // logger.Errorf("received empty message, session closed [%s:%v], [%s]", info.ID, info.Closed, string(debug.Stack())) - // return nil, errors.Errorf("received empty message, session closed [%s:%v]", info.ID, info.Closed) - // } - // tx, err := NewSpendRequestFromBytes(msg) - // if err != nil { - // return nil, errors.Wrap(err, "failed to receive spendRequest") - // } return tx, nil } From db747f4443630d9ed0fe6f46052218f0c8fc556d Mon Sep 17 00:00:00 2001 From: sreenidhi Date: Mon, 31 Mar 2025 01:26:05 +0530 Subject: [PATCH 30/30] remove comments Signed-off-by: sreenidhi --- token/services/ttx/multisig/spend.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/token/services/ttx/multisig/spend.go b/token/services/ttx/multisig/spend.go index 2df67c697..2678e914f 100644 --- a/token/services/ttx/multisig/spend.go +++ b/token/services/ttx/multisig/spend.go @@ -26,15 +26,6 @@ type SpendRequest struct { Token *token.UnspentToken } -// func NewSpendRequestFromBytes(msg []byte) (*SpendRequest, error) { -// request := &SpendRequest{} -// err := json.Unmarshal(msg, request) -// if err != nil { -// return nil, errors.Wrap(err, "failed unmarshalling spendRequest") -// } -// return request, nil -// } - func ReceiveSpendRequest(context view.Context, opts ...ttx.TxOption) (*SpendRequest, error) { logger.Debugf("receive a new spendRequest...") requestBoxed, err := context.RunView(NewReceiveSpendRequestView(), view.WithSameContext())