From 9dea6fbb2e8fb9f0bbb5e5ac61fbb00373fce173 Mon Sep 17 00:00:00 2001 From: Hitenjain14 Date: Fri, 28 Mar 2025 15:48:52 +0530 Subject: [PATCH 1/2] add check for root --- code/go/0chain.net/blobbercore/handler/handler_common.go | 2 +- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/go/0chain.net/blobbercore/handler/handler_common.go b/code/go/0chain.net/blobbercore/handler/handler_common.go index e37e9d41d..333d6d5c6 100644 --- a/code/go/0chain.net/blobbercore/handler/handler_common.go +++ b/code/go/0chain.net/blobbercore/handler/handler_common.go @@ -192,7 +192,7 @@ func WithStatusConnectionForWM(handler common.StatusCodeResponderF) common.Statu if blobberRes.WriteMarker != nil { writemarker.SaveMarkerData(allocationID, blobberRes.WriteMarker.WM.Timestamp, blobberRes.WriteMarker.WM.ChainLength) trie := blobberRes.Trie - if trie != nil { + if trie != nil && blobberRes.WriteMarker.WM.AllocationRoot != blobberRes.WriteMarker.WM.PreviousAllocationRoot { _ = trie.DeleteNodes() blobberRes.Trie = nil } diff --git a/go.mod b/go.mod index 5da5db8fe..83c15d54c 100644 --- a/go.mod +++ b/go.mod @@ -101,7 +101,7 @@ require ( ) require ( - github.com/0chain/common v1.20.0 + github.com/0chain/common v1.19.1-0.20250328101718-d39d2e0d62fa github.com/Luzifer/go-openssl/v3 v3.1.0 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/btcsuite/btcd v0.23.4 // indirect diff --git a/go.sum b/go.sum index d8e812fa8..020ec3ee2 100644 --- a/go.sum +++ b/go.sum @@ -36,6 +36,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/0chain/common v1.19.1-0.20250328101718-d39d2e0d62fa h1:O7WT6WYcA0N5PpEqUPcIvgsgtF3tpXU7EbOs4/E/GPw= +github.com/0chain/common v1.19.1-0.20250328101718-d39d2e0d62fa/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw= github.com/0chain/common v1.20.0 h1:Ek8YglLoTk8rfxYVB57mP2+w6XzfsztBPN3/vwH470I= github.com/0chain/common v1.20.0/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw= github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= From 267652772492ad2d6b06362c09d748ba04248496 Mon Sep 17 00:00:00 2001 From: Hitenjain14 Date: Sat, 29 Mar 2025 12:50:50 +0530 Subject: [PATCH 2/2] update common --- go.mod | 2 +- go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 83c15d54c..20990aea1 100644 --- a/go.mod +++ b/go.mod @@ -101,7 +101,7 @@ require ( ) require ( - github.com/0chain/common v1.19.1-0.20250328101718-d39d2e0d62fa + github.com/0chain/common v1.20.1 github.com/Luzifer/go-openssl/v3 v3.1.0 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/btcsuite/btcd v0.23.4 // indirect diff --git a/go.sum b/go.sum index 020ec3ee2..be7d83df0 100644 --- a/go.sum +++ b/go.sum @@ -36,10 +36,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/0chain/common v1.19.1-0.20250328101718-d39d2e0d62fa h1:O7WT6WYcA0N5PpEqUPcIvgsgtF3tpXU7EbOs4/E/GPw= -github.com/0chain/common v1.19.1-0.20250328101718-d39d2e0d62fa/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw= -github.com/0chain/common v1.20.0 h1:Ek8YglLoTk8rfxYVB57mP2+w6XzfsztBPN3/vwH470I= -github.com/0chain/common v1.20.0/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw= +github.com/0chain/common v1.20.1 h1:GHLqLF3sxGkZI8E9N9+gUc+j8+suj/V/J9noMNL47ok= +github.com/0chain/common v1.20.1/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw= github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= github.com/0chain/gosdk v1.19.0-RC0 h1:PhHsvfEBJw9ofEFGWKqJ7UID7qMfl1LrWl2GyhIxjqE=