Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Up github.com/iden3/go-circuits/v2 dependency #48

Merged
merged 1 commit into from
Jan 16, 2024
Merged

Up github.com/iden3/go-circuits/v2 dependency #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ go 1.21

require (
github.com/dgraph-io/badger/v4 v4.2.0
github.com/ethereum/go-ethereum v1.13.2
github.com/ethereum/go-ethereum v1.13.8
github.com/iden3/contracts-abi/onchain-credential-status-resolver/go/abi v0.0.0-20230911113809-c58b7e7a69b0
github.com/iden3/contracts-abi/state/go/abi v0.0.0-20230405152923-4a25f6f1f0f4
github.com/iden3/go-circuits/v2 v2.0.1-0.20231206170636-08f762edb388
github.com/iden3/go-iden3-core/v2 v2.0.0
github.com/iden3/go-circuits/v2 v2.0.1
github.com/iden3/go-iden3-core/v2 v2.0.3
github.com/iden3/go-iden3-crypto v0.0.15
github.com/iden3/go-merkletree-sql/v2 v2.0.6
github.com/iden3/go-schema-processor/v2 v2.1.1-0.20231213064039-68c1fb2962ff
github.com/iden3/merkletree-proof v0.0.3
github.com/iden3/merkletree-proof v0.0.4
github.com/ipfs/go-ipfs-api v0.7.0
github.com/piprate/json-gold v0.5.1-0.20230111113000-6ddbe6e6f19f
github.com/stretchr/testify v1.8.4
Expand All @@ -21,25 +21,24 @@ require (
require (
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/benbjohnson/clock v1.3.5 // indirect
github.com/bits-and-blooms/bitset v1.5.0 // indirect
github.com/bits-and-blooms/bitset v1.10.0 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/btcsuite/btcd v0.22.0-beta // indirect
github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/consensys/bavard v0.1.13 // indirect
github.com/consensys/gnark-crypto v0.10.0 // indirect
github.com/consensys/gnark-crypto v0.12.1 // indirect
github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3 // indirect
github.com/crate-crypto/go-kzg-4844 v0.3.0 // indirect
github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dchest/blake512 v1.0.0 // indirect
github.com/deckarep/golang-set/v2 v2.1.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/ethereum/c-kzg-4844 v0.3.1 // indirect
github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.0.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
Expand All @@ -48,7 +47,7 @@ require (
github.com/google/flatbuffers v1.12.1 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/holiman/uint256 v1.2.3 // indirect
github.com/holiman/uint256 v1.2.4 // indirect
github.com/ipfs/boxo v0.12.0 // indirect
github.com/ipfs/go-cid v0.4.1 // indirect
github.com/klauspost/compress v1.16.5 // indirect
Expand Down Expand Up @@ -79,13 +78,13 @@ require (
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.12.0 // indirect
golang.org/x/exp v0.0.0-20230810033253-352e893a4cad // indirect
golang.org/x/mod v0.11.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/tools v0.9.1 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/tools v0.15.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/blake3 v1.2.1 // indirect
Expand Down
107 changes: 58 additions & 49 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions inputs_sig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import (
"github.com/iden3/go-schema-processor/v2/processor"
"github.com/iden3/go-schema-processor/v2/verifiable"
mp "github.com/iden3/merkletree-proof"
mpHttp "github.com/iden3/merkletree-proof/http"
shell "github.com/ipfs/go-ipfs-api"
"github.com/piprate/json-gold/ld"
)
Expand Down Expand Up @@ -2175,18 +2176,18 @@ func isErrInvalidRootsLength(err error) bool {
rpcErr.Error() == "execution reverted: Invalid roots length"
}

func newRhsCli(rhsURL string) (*mp.HTTPReverseHashCli, error) {
func newRhsCli(rhsURL string) (mp.ReverseHashCli, error) {
if rhsURL == "" {
return nil, errors.New("reverse hash service url is empty")
}

return &mp.HTTPReverseHashCli{
return &mpHttp.ReverseHashCli{
URL: rhsURL,
HTTPTimeout: 10 * time.Second,
}, nil
}

func treeStateFromRHS(ctx context.Context, rhsCli *mp.HTTPReverseHashCli,
func treeStateFromRHS(ctx context.Context, rhsCli mp.ReverseHashCli,
state *merkletree.Hash) (circuits.TreeState, error) {

var treeState circuits.TreeState
Expand Down
2 changes: 1 addition & 1 deletion testdata/atomic_query_v3_mtp_inputs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
},
"request": {
"id": 84239,
"circuitId": "credentialAtomicQueryV3",
"circuitId": "credentialAtomicQueryV3-beta.0",
"query": {
"allowedIssuers": "unused",
"context": "https://raw.githubusercontent.com/iden3/claim-schema-vocab/main/schemas/json-ld/kyc-v3.json-ld",
Expand Down
2 changes: 1 addition & 1 deletion testdata/atomic_query_v3_no_proof_type_both_have_inputs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
},
"request": {
"id": 84239,
"circuitId": "credentialAtomicQueryV3",
"circuitId": "credentialAtomicQueryV3-beta.0",
"query": {
"allowedIssuers": "unused",
"context": "https://raw.githubusercontent.com/iden3/claim-schema-vocab/main/schemas/json-ld/kyc-v3.json-ld",
Expand Down
2 changes: 1 addition & 1 deletion testdata/atomic_query_v3_no_proof_type_sig_only_inputs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
},
"request": {
"id": 84239,
"circuitId": "credentialAtomicQueryV3",
"circuitId": "credentialAtomicQueryV3-beta.0",
"query": {
"allowedIssuers": "unused",
"context": "https://raw.githubusercontent.com/iden3/claim-schema-vocab/main/schemas/json-ld/kyc-v3.json-ld",
Expand Down
2 changes: 1 addition & 1 deletion testdata/atomic_query_v3_on_chain_mtp_inputs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
},
"request": {
"id": 84239,
"circuitId": "credentialAtomicQueryV3OnChain",
"circuitId": "credentialAtomicQueryV3OnChain-beta.0",
"query": {
"allowedIssuers": "unused",
"context": "https://raw.githubusercontent.com/iden3/claim-schema-vocab/main/schemas/json-ld/kyc-v3.json-ld",
Expand Down
2 changes: 1 addition & 1 deletion testdata/atomic_query_v3_on_chain_sig_inputs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
},
"request": {
"id": 84239,
"circuitId": "credentialAtomicQueryV3OnChain",
"circuitId": "credentialAtomicQueryV3OnChain-beta.0",
"query": {
"allowedIssuers": "unused",
"context": "https://raw.githubusercontent.com/iden3/claim-schema-vocab/main/schemas/json-ld/kyc-v3.json-ld",
Expand Down
2 changes: 1 addition & 1 deletion testdata/atomic_query_v3_on_chain_tx_data_inputs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
},
"request": {
"id": 84239,
"circuitId": "credentialAtomicQueryV3OnChain",
"circuitId": "credentialAtomicQueryV3OnChain-beta.0",
"query": {
"allowedIssuers": "unused",
"context": "https://raw.githubusercontent.com/iden3/claim-schema-vocab/main/schemas/json-ld/kyc-v3.json-ld",
Expand Down
2 changes: 1 addition & 1 deletion testdata/atomic_query_v3_sig_inputs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
},
"request": {
"id": 84239,
"circuitId": "credentialAtomicQueryV3",
"circuitId": "credentialAtomicQueryV3-beta.0",
"query": {
"allowedIssuers": "unused",
"context": "https://raw.githubusercontent.com/iden3/claim-schema-vocab/main/schemas/json-ld/kyc-v3.json-ld",
Expand Down
2 changes: 1 addition & 1 deletion testdata/atomic_query_v3_sig_selective_disclosure_inputs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
},
"request": {
"id": 84239,
"circuitId": "credentialAtomicQueryV3",
"circuitId": "credentialAtomicQueryV3-beta.0",
"query": {
"allowedIssuers": "unused",
"context": "https://raw.githubusercontent.com/iden3/claim-schema-vocab/main/schemas/json-ld/kyc-v3.json-ld",
Expand Down