Skip to content

Commit 8bf1797

Browse files
h5lawh5law
authored
[Dependencies] Update deps (#673)
## Description This PR updates the dependencies to use `pocket-network/smt` (our fork) instead of `celestiaorg/smt` for the SMT. It is recommended to run the following: ```sh rm -vfrd vendor/ go clean -modcache make develop_start ``` ## Issue Fixes N/A ## Type of change Please mark the relevant option(s): - [ ] New feature, functionality or library - [ ] Bug fix - [x] Code health or cleanup - [ ] Major breaking change - [ ] Documentation - [ ] Other <!-- add details here if it a different type of change --> ## List of changes - Update `go.mod` and the codebase to use the `pocket-network/smt` fork of celestia's SMT now it is archived ## Testing - [x] `make develop_test`; if any code changes were made - [x] [Docker Compose LocalNet](https://github.com/pokt-network/pocket/blob/main/docs/development/README.md); if any major functionality was changed or introduced - [ ] [k8s LocalNet](https://github.com/pokt-network/pocket/blob/main/build/localnet/README.md); if any infrastructure or configuration changes were made ## Required Checklist - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added, or updated, [`godoc` format comments](https://go.dev/blog/godoc) on touched members (see: [tip.golang.org/doc/comment](https://tip.golang.org/doc/comment)) - [ ] I have tested my changes using the available tooling - [ ] I have updated the corresponding CHANGELOG ### If Applicable Checklist - [ ] I have updated the corresponding README(s); local and/or global - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] I have added, or updated, [mermaid.js](https://mermaid-js.github.io) diagrams in the corresponding README(s) - [ ] I have added, or updated, documentation and [mermaid.js](https://mermaid-js.github.io) diagrams in `shared/docs/*` if I updated `shared/*`README(s)
1 parent 5c9fa16 commit 8bf1797

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

‎go.mod

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ module github.com/pokt-network/pocket
22

33
go 1.18
44

5-
// See the following link for reasoning on why we need the replacement:
6-
// https://discuss.dgraph.io/t/error-mremap-size-mismatch-on-arm64/15333/8
7-
replace github.com/dgraph-io/ristretto v0.1.0 => github.com/46bit/ristretto v0.1.0-with-arm-fix
8-
95
require (
106
github.com/ProtonMail/go-ecvrf v0.0.1
117
github.com/golang/mock v1.6.0
@@ -19,7 +15,6 @@ require (
1915

2016
require (
2117
github.com/benbjohnson/clock v1.3.0
22-
github.com/celestiaorg/smt v0.2.1-0.20220414134126-dba215ccb884
2318
github.com/cucumber/godog v0.12.6
2419
github.com/deepmap/oapi-codegen v1.12.4
2520
github.com/dgraph-io/badger/v3 v3.2103.2
@@ -36,6 +31,7 @@ require (
3631
github.com/manifoldco/promptui v0.9.0
3732
github.com/mitchellh/mapstructure v1.5.0
3833
github.com/multiformats/go-multiaddr v0.8.0
34+
github.com/pokt-network/smt v0.4.0
3935
github.com/quasilyte/go-ruleguard/dsl v0.3.21
4036
github.com/rs/zerolog v1.27.0
4137
github.com/spf13/cobra v1.6.0

‎go.sum

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D
4545
filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
4646
filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
4747
git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
48-
github.com/46bit/ristretto v0.1.0-with-arm-fix/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug=
4948
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
5049
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
5150
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -80,8 +79,6 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
8079
github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
8180
github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
8281
github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
83-
github.com/celestiaorg/smt v0.2.1-0.20220414134126-dba215ccb884 h1:iRNKw2WmAbVgGMNYzDH5Y2yY3+jyxwEK9Hc5pwIjZAE=
84-
github.com/celestiaorg/smt v0.2.1-0.20220414134126-dba215ccb884/go.mod h1:/sdYDakowo/XaxS2Fl7CBqtuf/O2uTqF2zmAUFAtAiw=
8582
github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
8683
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
8784
github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c=
@@ -155,6 +152,7 @@ github.com/deepmap/oapi-codegen v1.12.4 h1:pPmn6qI9MuOtCz82WY2Xaw46EQjgvxednXXrP
155152
github.com/deepmap/oapi-codegen v1.12.4/go.mod h1:3lgHGMu6myQ2vqbbTXH2H1o4eXFTGnFiDaOaKKl5yas=
156153
github.com/dgraph-io/badger/v3 v3.2103.2 h1:dpyM5eCJAtQCBcMCZcT4UBZchuTJgCywerHHgmxfxM8=
157154
github.com/dgraph-io/badger/v3 v3.2103.2/go.mod h1:RHo4/GmYcKKh5Lxu63wLEMHJ70Pac2JqZRYGhlyAo2M=
155+
github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug=
158156
github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8=
159157
github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA=
160158
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA=
@@ -677,6 +675,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
677675
github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
678676
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
679677
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
678+
github.com/pokt-network/smt v0.4.0 h1:fodLphes/EtQw+nr6Zc5giSJdnjIkM2BY6cGTOfTaqo=
679+
github.com/pokt-network/smt v0.4.0/go.mod h1:rUeZeXkK4ifRpLhZghwa1epw855ZpzbD/2sv7q/K+q8=
680680
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
681681
github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
682682
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=

‎persistence/debug.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import (
44
"crypto/sha256"
55
"runtime/debug"
66

7-
"github.com/celestiaorg/smt"
87
"github.com/pokt-network/pocket/persistence/types"
98
"github.com/pokt-network/pocket/shared/codec"
109
coreTypes "github.com/pokt-network/pocket/shared/core/types"
1110
"github.com/pokt-network/pocket/shared/messaging"
1211
"github.com/pokt-network/pocket/shared/utils"
12+
"github.com/pokt-network/smt"
1313
)
1414

1515
// A list of functions to clear data from the DB not associated with protocol actors

‎persistence/docs/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [0.0.0.47] - 2023-04-13
11+
12+
- Update imports to use `pokt-network/smt` instead of the archived `celestiaorg/smt`
13+
1014
## [0.0.0.46] - 2023-04-12
1115

1216
- Update `prepareBlock()` function to add processed transactions to the persisted block

‎persistence/kvstore/kvstore.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"errors"
77
"log"
88

9-
"github.com/celestiaorg/smt"
109
badger "github.com/dgraph-io/badger/v3"
10+
"github.com/pokt-network/smt"
1111
)
1212

1313
type KVStore interface {

‎persistence/state.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import (
66
"encoding/hex"
77
"fmt"
88

9-
"github.com/celestiaorg/smt"
109
"github.com/pokt-network/pocket/persistence/kvstore"
1110
"github.com/pokt-network/pocket/persistence/types"
1211
"github.com/pokt-network/pocket/shared/codec"
1312
coreTypes "github.com/pokt-network/pocket/shared/core/types"
1413
"github.com/pokt-network/pocket/shared/crypto"
14+
"github.com/pokt-network/smt"
1515
)
1616

1717
type merkleTree float64

0 commit comments

Comments
 (0)