Skip to content

Commit 1b16743

Browse files
authored
Merge branch 'main' into feat/sql-squirrel-migration
2 parents 2e12868 + b15f26f commit 1b16743

34 files changed

Lines changed: 388 additions & 229 deletions

File tree

cmd/tokengen/main_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ func TestGenFullSuccess(t *testing.T) {
4242
gt.Expect(err).NotTo(HaveOccurred())
4343
defer gexec.CleanupBuildArtifacts()
4444

45-
// tempOutput := t.TempDir()
46-
// defer utils.IgnoreErrorWithOneArg(os.RemoveAll, tempOutput)
47-
tempOutput := "./testdata"
45+
tempOutput := t.TempDir()
46+
defer utils.IgnoreErrorWithOneArg(os.RemoveAll, tempOutput)
47+
// tempOutput := "./testdata"
4848
testGenRun(
4949
gt,
5050
tokengen,

go.mod

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ require (
1111
github.com/consensys/gnark-crypto v0.20.1
1212
github.com/dgraph-io/ristretto/v2 v2.4.0
1313
github.com/gin-gonic/gin v1.12.0
14-
github.com/go-co-op/gocron/v2 v2.21.1
14+
github.com/go-co-op/gocron/v2 v2.19.1
1515
github.com/google/pprof v0.0.0-20260402051712-545e8a4df936
1616
github.com/hashicorp/go-uuid v1.0.3
17-
github.com/hyperledger-labs/fabric-smart-client v0.10.2-0.20260428094934-a70a13e26c74
17+
github.com/hyperledger-labs/fabric-smart-client v0.10.2-0.20260506093942-1274969d717d
1818
github.com/hyperledger/fabric-chaincode-go/v2 v2.3.0
1919
github.com/hyperledger/fabric-lib-go v1.1.3-0.20240523144151-25edd1eaf5f5
2020
github.com/hyperledger/fabric-protos-go-apiv2 v0.3.7
@@ -36,11 +36,11 @@ require (
3636
go.uber.org/dig v1.19.0
3737
go.uber.org/zap v1.27.1
3838
golang.org/x/crypto v0.50.0
39-
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f
39+
golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90
4040
golang.org/x/sync v0.20.0
4141
google.golang.org/protobuf v1.36.11
4242
gopkg.in/yaml.v2 v2.4.0
43-
modernc.org/sqlite v1.49.1
43+
modernc.org/sqlite v1.48.0
4444
)
4545

4646
require (
@@ -54,7 +54,6 @@ require (
5454
cloud.google.com/go/storage v1.49.0 // indirect
5555
filippo.io/bigmod v0.1.1-0.20260103110540-f8a47775ebe5 // indirect
5656
filippo.io/keygen v0.0.0-20260114151900-8e2790ea4c5b // indirect
57-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
5857
github.com/BurntSushi/toml v1.6.0 // indirect
5958
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
6059
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
@@ -81,12 +80,10 @@ require (
8180
github.com/cockroachdb/redact v1.1.5 // indirect
8281
github.com/containerd/errdefs v1.0.0 // indirect
8382
github.com/containerd/errdefs/pkg v0.3.0 // indirect
84-
github.com/containerd/log v0.1.0 // indirect
8583
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8684
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
8785
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1 // indirect
8886
github.com/distribution/reference v0.6.0 // indirect
89-
github.com/docker/docker v28.5.2+incompatible // indirect
9087
github.com/docker/go-connections v0.6.0 // indirect
9188
github.com/docker/go-units v0.5.0 // indirect
9289
github.com/dunglas/httpsfv v1.1.0 // indirect
@@ -97,7 +94,6 @@ require (
9794
github.com/filecoin-project/go-clock v0.1.0 // indirect
9895
github.com/flynn/noise v1.1.0 // indirect
9996
github.com/fsnotify/fsnotify v1.9.0 // indirect
100-
github.com/fsouza/go-dockerclient v1.12.3 // indirect
10197
github.com/gabriel-vasile/mimetype v1.4.13 // indirect
10298
github.com/getsentry/sentry-go v0.27.0 // indirect
10399
github.com/ghodss/yaml v1.0.0 // indirect
@@ -136,10 +132,10 @@ require (
136132
github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect
137133
github.com/inconshreveable/mousetrap v1.1.0 // indirect
138134
github.com/ipfs/boxo v0.37.0 // indirect
139-
github.com/ipfs/go-cid v0.6.0 // indirect
135+
github.com/ipfs/go-cid v0.6.1 // indirect
140136
github.com/ipfs/go-datastore v0.9.1 // indirect
141137
github.com/ipfs/go-log/v2 v2.9.1 // indirect
142-
github.com/ipld/go-ipld-prime v0.22.0 // indirect
138+
github.com/ipld/go-ipld-prime v0.23.0 // indirect
143139
github.com/jackc/pgpassfile v1.0.0 // indirect
144140
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
145141
github.com/jackc/puddle/v2 v2.2.2 // indirect
@@ -149,7 +145,6 @@ require (
149145
github.com/jonboulle/clockwork v0.5.0 // indirect
150146
github.com/json-iterator/go v1.1.12 // indirect
151147
github.com/kilic/bls12-381 v0.1.0 // indirect
152-
github.com/klauspost/compress v1.18.0 // indirect
153148
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
154149
github.com/knadh/koanf/maps v0.1.2 // indirect
155150
github.com/knadh/koanf/parsers/yaml v1.1.0 // indirect
@@ -186,22 +181,17 @@ require (
186181
github.com/mitchellh/copystructure v1.2.0 // indirect
187182
github.com/mitchellh/reflectwalk v1.0.2 // indirect
188183
github.com/moby/docker-image-spec v1.3.1 // indirect
189-
github.com/moby/go-archive v0.1.0 // indirect
190-
github.com/moby/patternmatcher v0.6.0 // indirect
191-
github.com/moby/sys/sequential v0.6.0 // indirect
192-
github.com/moby/sys/user v0.4.0 // indirect
193-
github.com/moby/sys/userns v0.1.0 // indirect
194-
github.com/moby/term v0.5.0 // indirect
184+
github.com/moby/moby/api v1.54.2 // indirect
185+
github.com/moby/moby/client v0.4.0 // indirect
195186
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
196187
github.com/modern-go/reflect2 v1.0.2 // indirect
197-
github.com/morikuni/aec v1.0.0 // indirect
198-
github.com/mr-tron/base58 v1.2.0 // indirect
188+
github.com/mr-tron/base58 v1.3.0 // indirect
199189
github.com/multiformats/go-base32 v0.1.0 // indirect
200190
github.com/multiformats/go-base36 v0.2.0 // indirect
201191
github.com/multiformats/go-multiaddr v0.16.1 // indirect
202192
github.com/multiformats/go-multiaddr-dns v0.5.0 // indirect
203193
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
204-
github.com/multiformats/go-multibase v0.2.0 // indirect
194+
github.com/multiformats/go-multibase v0.3.0 // indirect
205195
github.com/multiformats/go-multicodec v0.10.0 // indirect
206196
github.com/multiformats/go-multihash v0.2.3 // indirect
207197
github.com/multiformats/go-multistream v0.6.1 // indirect
@@ -242,7 +232,6 @@ require (
242232
github.com/robfig/cron/v3 v3.0.1 // indirect
243233
github.com/rogpeppe/go-internal v1.14.1 // indirect
244234
github.com/sagikazarmark/locafero v0.11.0 // indirect
245-
github.com/sirupsen/logrus v1.9.3 // indirect
246235
github.com/spaolacci/murmur3 v1.1.0 // indirect
247236
github.com/spf13/afero v1.15.0 // indirect
248237
github.com/spf13/cast v1.10.0 // indirect
@@ -283,14 +272,14 @@ require (
283272
go.yaml.in/yaml/v2 v2.4.4 // indirect
284273
go.yaml.in/yaml/v3 v3.0.4 // indirect
285274
golang.org/x/arch v0.22.0 // indirect
286-
golang.org/x/mod v0.35.0 // indirect
287-
golang.org/x/net v0.53.0 // indirect
275+
golang.org/x/mod v0.34.0 // indirect
276+
golang.org/x/net v0.52.0 // indirect
288277
golang.org/x/oauth2 v0.35.0 // indirect
289278
golang.org/x/sys v0.43.0 // indirect
290-
golang.org/x/telemetry v0.0.0-20260409153401-be6f6cb8b1fa // indirect
279+
golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c // indirect
291280
golang.org/x/text v0.36.0 // indirect
292281
golang.org/x/time v0.14.0 // indirect
293-
golang.org/x/tools v0.44.0 // indirect
282+
golang.org/x/tools v0.43.0 // indirect
294283
gonum.org/v1/gonum v0.17.0 // indirect
295284
google.golang.org/api v0.215.0 // indirect
296285
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
@@ -299,7 +288,7 @@ require (
299288
google.golang.org/grpc v1.79.3 // indirect
300289
gopkg.in/yaml.v3 v3.0.1 // indirect
301290
lukechampine.com/blake3 v1.4.1 // indirect
302-
modernc.org/libc v1.72.0 // indirect
291+
modernc.org/libc v1.70.0 // indirect
303292
modernc.org/mathutil v1.7.1 // indirect
304293
modernc.org/memory v1.11.0 // indirect
305294
)

0 commit comments

Comments
 (0)