From f0a90c06ee2ef579053016cd9e54222a3c7a3428 Mon Sep 17 00:00:00 2001 From: Marco Argentieri <3596602+tiero@users.noreply.github.com> Date: Tue, 13 Aug 2024 00:54:06 +0200 Subject: [PATCH] Move `api-spec` to root folder (#242) * api-spec: move the api-spec to root and init go.mod * go mod tidy * move buf files in the root as well * gh action for api-spec changes only * gh action for api-spec on push and pr --- .github/workflows/ark.proto.yaml | 27 +++++++++++++++++++ .github/workflows/ark.unit.yaml | 3 --- api-spec/go.mod | 17 ++++++++++++ api-spec/go.sum | 18 +++++++++++++ .../openapi/swagger/ark/v1/admin.swagger.json | 0 .../swagger/ark/v1/service.swagger.json | 0 .../swagger/ark/v1/wallet.swagger.json | 0 .../swagger/clark/v1/service.swagger.json | 0 .../swagger/ocean/v1/account.swagger.json | 0 .../ocean/v1/notification.swagger.json | 0 .../swagger/ocean/v1/transaction.swagger.json | 0 .../swagger/ocean/v1/types.swagger.json | 0 .../swagger/ocean/v1/wallet.swagger.json | 0 .../protobuf/ark/v1/admin.proto | 0 .../protobuf/ark/v1/service.proto | 0 .../protobuf/ark/v1/wallet.proto | 0 .../api-spec => api-spec}/protobuf/buf.lock | 0 .../api-spec => api-spec}/protobuf/buf.yaml | 0 .../protobuf/gen/ark/v1/admin.pb.go | 0 .../protobuf/gen/ark/v1/admin.pb.gw.go | 0 .../protobuf/gen/ark/v1/admin_grpc.pb.go | 0 .../protobuf/gen/ark/v1/service.pb.go | 0 .../protobuf/gen/ark/v1/service.pb.gw.go | 0 .../protobuf/gen/ark/v1/service_grpc.pb.go | 0 .../protobuf/gen/ark/v1/wallet.pb.go | 0 .../protobuf/gen/ark/v1/wallet.pb.gw.go | 0 .../protobuf/gen/ark/v1/wallet_grpc.pb.go | 0 .../protobuf/gen/ocean/v1/account.pb.go | 0 .../protobuf/gen/ocean/v1/account_grpc.pb.go | 0 .../protobuf/gen/ocean/v1/notification.pb.go | 0 .../gen/ocean/v1/notification_grpc.pb.go | 0 .../protobuf/gen/ocean/v1/transaction.pb.go | 0 .../gen/ocean/v1/transaction_grpc.pb.go | 0 .../protobuf/gen/ocean/v1/types.pb.go | 0 .../protobuf/gen/ocean/v1/wallet.pb.go | 0 .../protobuf/gen/ocean/v1/wallet_grpc.pb.go | 0 server/buf.gen.yaml => buf.gen.yaml | 0 server/buf.work.yaml => buf.work.yaml | 0 client/go.mod | 10 ++++--- client/go.sum | 10 ++++--- pkg/client-sdk/go.mod | 8 +++--- pkg/client-sdk/go.sum | 10 ++++--- server/go.mod | 7 ++--- server/go.sum | 10 ++++--- 44 files changed, 94 insertions(+), 26 deletions(-) create mode 100644 .github/workflows/ark.proto.yaml create mode 100644 api-spec/go.mod create mode 100644 api-spec/go.sum rename {server/api-spec => api-spec}/openapi/swagger/ark/v1/admin.swagger.json (100%) rename {server/api-spec => api-spec}/openapi/swagger/ark/v1/service.swagger.json (100%) rename {server/api-spec => api-spec}/openapi/swagger/ark/v1/wallet.swagger.json (100%) rename {server/api-spec => api-spec}/openapi/swagger/clark/v1/service.swagger.json (100%) rename {server/api-spec => api-spec}/openapi/swagger/ocean/v1/account.swagger.json (100%) rename {server/api-spec => api-spec}/openapi/swagger/ocean/v1/notification.swagger.json (100%) rename {server/api-spec => api-spec}/openapi/swagger/ocean/v1/transaction.swagger.json (100%) rename {server/api-spec => api-spec}/openapi/swagger/ocean/v1/types.swagger.json (100%) rename {server/api-spec => api-spec}/openapi/swagger/ocean/v1/wallet.swagger.json (100%) rename {server/api-spec => api-spec}/protobuf/ark/v1/admin.proto (100%) rename {server/api-spec => api-spec}/protobuf/ark/v1/service.proto (100%) rename {server/api-spec => api-spec}/protobuf/ark/v1/wallet.proto (100%) rename {server/api-spec => api-spec}/protobuf/buf.lock (100%) rename {server/api-spec => api-spec}/protobuf/buf.yaml (100%) rename {server/api-spec => api-spec}/protobuf/gen/ark/v1/admin.pb.go (100%) rename {server/api-spec => api-spec}/protobuf/gen/ark/v1/admin.pb.gw.go (100%) rename {server/api-spec => api-spec}/protobuf/gen/ark/v1/admin_grpc.pb.go (100%) rename {server/api-spec => api-spec}/protobuf/gen/ark/v1/service.pb.go (100%) rename {server/api-spec => api-spec}/protobuf/gen/ark/v1/service.pb.gw.go (100%) rename {server/api-spec => api-spec}/protobuf/gen/ark/v1/service_grpc.pb.go (100%) rename {server/api-spec => api-spec}/protobuf/gen/ark/v1/wallet.pb.go (100%) rename {server/api-spec => api-spec}/protobuf/gen/ark/v1/wallet.pb.gw.go (100%) rename {server/api-spec => api-spec}/protobuf/gen/ark/v1/wallet_grpc.pb.go (100%) rename {server/api-spec => api-spec}/protobuf/gen/ocean/v1/account.pb.go (100%) rename {server/api-spec => api-spec}/protobuf/gen/ocean/v1/account_grpc.pb.go (100%) rename {server/api-spec => api-spec}/protobuf/gen/ocean/v1/notification.pb.go (100%) rename {server/api-spec => api-spec}/protobuf/gen/ocean/v1/notification_grpc.pb.go (100%) rename {server/api-spec => api-spec}/protobuf/gen/ocean/v1/transaction.pb.go (100%) rename {server/api-spec => api-spec}/protobuf/gen/ocean/v1/transaction_grpc.pb.go (100%) rename {server/api-spec => api-spec}/protobuf/gen/ocean/v1/types.pb.go (100%) rename {server/api-spec => api-spec}/protobuf/gen/ocean/v1/wallet.pb.go (100%) rename {server/api-spec => api-spec}/protobuf/gen/ocean/v1/wallet_grpc.pb.go (100%) rename server/buf.gen.yaml => buf.gen.yaml (100%) rename server/buf.work.yaml => buf.work.yaml (100%) diff --git a/.github/workflows/ark.proto.yaml b/.github/workflows/ark.proto.yaml new file mode 100644 index 000000000..4f9333f40 --- /dev/null +++ b/.github/workflows/ark.proto.yaml @@ -0,0 +1,27 @@ +name: API Spec Changes + +on: + push: + branches: + - master + paths: + - "api-spec/**" + pull_request: + branches: + - master + paths: + - "api-spec/**" + + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - uses: bufbuild/buf-setup-action@v1.3.1 + + - name: check proto linting + run: buf lint \ No newline at end of file diff --git a/.github/workflows/ark.unit.yaml b/.github/workflows/ark.unit.yaml index ca0c9a01f..7803fb12d 100755 --- a/.github/workflows/ark.unit.yaml +++ b/.github/workflows/ark.unit.yaml @@ -34,9 +34,6 @@ jobs: uses: securego/gosec@master with: args: '-severity high -quiet ./...' - - uses: bufbuild/buf-setup-action@v1.3.1 - - name: check proto linting - run: buf lint - run: go get -v -t -d ./... - name: unit testing run: make test diff --git a/api-spec/go.mod b/api-spec/go.mod new file mode 100644 index 000000000..ade355835 --- /dev/null +++ b/api-spec/go.mod @@ -0,0 +1,17 @@ +module github.com/ark-network/ark/api-spec + +go 1.22.6 + +require ( + github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 + google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 + google.golang.org/grpc v1.65.0 + google.golang.org/protobuf v1.34.2 +) + +require ( + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect +) diff --git a/api-spec/go.sum b/api-spec/go.sum new file mode 100644 index 000000000..f019c804a --- /dev/null +++ b/api-spec/go.sum @@ -0,0 +1,18 @@ +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 h1:CWyXh/jylQWp2dtiV33mY4iSSp6yf4lmn+c7/tN+ObI= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0/go.mod h1:nCLIt0w3Ept2NwF8ThLmrppXsfT07oC8k0XNDxd8sVU= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 h1:+/tmTy5zAieooKIXfzDm9KiA3Bv6JBwriRN9LY+yayk= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988/go.mod h1:4+X6GvPs+25wZKbQq9qyAXrwIRExv7w0Ea6MgZLZiDM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf h1:liao9UHurZLtiEwBgT9LMOnKYsHze6eA6w1KQCMVN2Q= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= diff --git a/server/api-spec/openapi/swagger/ark/v1/admin.swagger.json b/api-spec/openapi/swagger/ark/v1/admin.swagger.json similarity index 100% rename from server/api-spec/openapi/swagger/ark/v1/admin.swagger.json rename to api-spec/openapi/swagger/ark/v1/admin.swagger.json diff --git a/server/api-spec/openapi/swagger/ark/v1/service.swagger.json b/api-spec/openapi/swagger/ark/v1/service.swagger.json similarity index 100% rename from server/api-spec/openapi/swagger/ark/v1/service.swagger.json rename to api-spec/openapi/swagger/ark/v1/service.swagger.json diff --git a/server/api-spec/openapi/swagger/ark/v1/wallet.swagger.json b/api-spec/openapi/swagger/ark/v1/wallet.swagger.json similarity index 100% rename from server/api-spec/openapi/swagger/ark/v1/wallet.swagger.json rename to api-spec/openapi/swagger/ark/v1/wallet.swagger.json diff --git a/server/api-spec/openapi/swagger/clark/v1/service.swagger.json b/api-spec/openapi/swagger/clark/v1/service.swagger.json similarity index 100% rename from server/api-spec/openapi/swagger/clark/v1/service.swagger.json rename to api-spec/openapi/swagger/clark/v1/service.swagger.json diff --git a/server/api-spec/openapi/swagger/ocean/v1/account.swagger.json b/api-spec/openapi/swagger/ocean/v1/account.swagger.json similarity index 100% rename from server/api-spec/openapi/swagger/ocean/v1/account.swagger.json rename to api-spec/openapi/swagger/ocean/v1/account.swagger.json diff --git a/server/api-spec/openapi/swagger/ocean/v1/notification.swagger.json b/api-spec/openapi/swagger/ocean/v1/notification.swagger.json similarity index 100% rename from server/api-spec/openapi/swagger/ocean/v1/notification.swagger.json rename to api-spec/openapi/swagger/ocean/v1/notification.swagger.json diff --git a/server/api-spec/openapi/swagger/ocean/v1/transaction.swagger.json b/api-spec/openapi/swagger/ocean/v1/transaction.swagger.json similarity index 100% rename from server/api-spec/openapi/swagger/ocean/v1/transaction.swagger.json rename to api-spec/openapi/swagger/ocean/v1/transaction.swagger.json diff --git a/server/api-spec/openapi/swagger/ocean/v1/types.swagger.json b/api-spec/openapi/swagger/ocean/v1/types.swagger.json similarity index 100% rename from server/api-spec/openapi/swagger/ocean/v1/types.swagger.json rename to api-spec/openapi/swagger/ocean/v1/types.swagger.json diff --git a/server/api-spec/openapi/swagger/ocean/v1/wallet.swagger.json b/api-spec/openapi/swagger/ocean/v1/wallet.swagger.json similarity index 100% rename from server/api-spec/openapi/swagger/ocean/v1/wallet.swagger.json rename to api-spec/openapi/swagger/ocean/v1/wallet.swagger.json diff --git a/server/api-spec/protobuf/ark/v1/admin.proto b/api-spec/protobuf/ark/v1/admin.proto similarity index 100% rename from server/api-spec/protobuf/ark/v1/admin.proto rename to api-spec/protobuf/ark/v1/admin.proto diff --git a/server/api-spec/protobuf/ark/v1/service.proto b/api-spec/protobuf/ark/v1/service.proto similarity index 100% rename from server/api-spec/protobuf/ark/v1/service.proto rename to api-spec/protobuf/ark/v1/service.proto diff --git a/server/api-spec/protobuf/ark/v1/wallet.proto b/api-spec/protobuf/ark/v1/wallet.proto similarity index 100% rename from server/api-spec/protobuf/ark/v1/wallet.proto rename to api-spec/protobuf/ark/v1/wallet.proto diff --git a/server/api-spec/protobuf/buf.lock b/api-spec/protobuf/buf.lock similarity index 100% rename from server/api-spec/protobuf/buf.lock rename to api-spec/protobuf/buf.lock diff --git a/server/api-spec/protobuf/buf.yaml b/api-spec/protobuf/buf.yaml similarity index 100% rename from server/api-spec/protobuf/buf.yaml rename to api-spec/protobuf/buf.yaml diff --git a/server/api-spec/protobuf/gen/ark/v1/admin.pb.go b/api-spec/protobuf/gen/ark/v1/admin.pb.go similarity index 100% rename from server/api-spec/protobuf/gen/ark/v1/admin.pb.go rename to api-spec/protobuf/gen/ark/v1/admin.pb.go diff --git a/server/api-spec/protobuf/gen/ark/v1/admin.pb.gw.go b/api-spec/protobuf/gen/ark/v1/admin.pb.gw.go similarity index 100% rename from server/api-spec/protobuf/gen/ark/v1/admin.pb.gw.go rename to api-spec/protobuf/gen/ark/v1/admin.pb.gw.go diff --git a/server/api-spec/protobuf/gen/ark/v1/admin_grpc.pb.go b/api-spec/protobuf/gen/ark/v1/admin_grpc.pb.go similarity index 100% rename from server/api-spec/protobuf/gen/ark/v1/admin_grpc.pb.go rename to api-spec/protobuf/gen/ark/v1/admin_grpc.pb.go diff --git a/server/api-spec/protobuf/gen/ark/v1/service.pb.go b/api-spec/protobuf/gen/ark/v1/service.pb.go similarity index 100% rename from server/api-spec/protobuf/gen/ark/v1/service.pb.go rename to api-spec/protobuf/gen/ark/v1/service.pb.go diff --git a/server/api-spec/protobuf/gen/ark/v1/service.pb.gw.go b/api-spec/protobuf/gen/ark/v1/service.pb.gw.go similarity index 100% rename from server/api-spec/protobuf/gen/ark/v1/service.pb.gw.go rename to api-spec/protobuf/gen/ark/v1/service.pb.gw.go diff --git a/server/api-spec/protobuf/gen/ark/v1/service_grpc.pb.go b/api-spec/protobuf/gen/ark/v1/service_grpc.pb.go similarity index 100% rename from server/api-spec/protobuf/gen/ark/v1/service_grpc.pb.go rename to api-spec/protobuf/gen/ark/v1/service_grpc.pb.go diff --git a/server/api-spec/protobuf/gen/ark/v1/wallet.pb.go b/api-spec/protobuf/gen/ark/v1/wallet.pb.go similarity index 100% rename from server/api-spec/protobuf/gen/ark/v1/wallet.pb.go rename to api-spec/protobuf/gen/ark/v1/wallet.pb.go diff --git a/server/api-spec/protobuf/gen/ark/v1/wallet.pb.gw.go b/api-spec/protobuf/gen/ark/v1/wallet.pb.gw.go similarity index 100% rename from server/api-spec/protobuf/gen/ark/v1/wallet.pb.gw.go rename to api-spec/protobuf/gen/ark/v1/wallet.pb.gw.go diff --git a/server/api-spec/protobuf/gen/ark/v1/wallet_grpc.pb.go b/api-spec/protobuf/gen/ark/v1/wallet_grpc.pb.go similarity index 100% rename from server/api-spec/protobuf/gen/ark/v1/wallet_grpc.pb.go rename to api-spec/protobuf/gen/ark/v1/wallet_grpc.pb.go diff --git a/server/api-spec/protobuf/gen/ocean/v1/account.pb.go b/api-spec/protobuf/gen/ocean/v1/account.pb.go similarity index 100% rename from server/api-spec/protobuf/gen/ocean/v1/account.pb.go rename to api-spec/protobuf/gen/ocean/v1/account.pb.go diff --git a/server/api-spec/protobuf/gen/ocean/v1/account_grpc.pb.go b/api-spec/protobuf/gen/ocean/v1/account_grpc.pb.go similarity index 100% rename from server/api-spec/protobuf/gen/ocean/v1/account_grpc.pb.go rename to api-spec/protobuf/gen/ocean/v1/account_grpc.pb.go diff --git a/server/api-spec/protobuf/gen/ocean/v1/notification.pb.go b/api-spec/protobuf/gen/ocean/v1/notification.pb.go similarity index 100% rename from server/api-spec/protobuf/gen/ocean/v1/notification.pb.go rename to api-spec/protobuf/gen/ocean/v1/notification.pb.go diff --git a/server/api-spec/protobuf/gen/ocean/v1/notification_grpc.pb.go b/api-spec/protobuf/gen/ocean/v1/notification_grpc.pb.go similarity index 100% rename from server/api-spec/protobuf/gen/ocean/v1/notification_grpc.pb.go rename to api-spec/protobuf/gen/ocean/v1/notification_grpc.pb.go diff --git a/server/api-spec/protobuf/gen/ocean/v1/transaction.pb.go b/api-spec/protobuf/gen/ocean/v1/transaction.pb.go similarity index 100% rename from server/api-spec/protobuf/gen/ocean/v1/transaction.pb.go rename to api-spec/protobuf/gen/ocean/v1/transaction.pb.go diff --git a/server/api-spec/protobuf/gen/ocean/v1/transaction_grpc.pb.go b/api-spec/protobuf/gen/ocean/v1/transaction_grpc.pb.go similarity index 100% rename from server/api-spec/protobuf/gen/ocean/v1/transaction_grpc.pb.go rename to api-spec/protobuf/gen/ocean/v1/transaction_grpc.pb.go diff --git a/server/api-spec/protobuf/gen/ocean/v1/types.pb.go b/api-spec/protobuf/gen/ocean/v1/types.pb.go similarity index 100% rename from server/api-spec/protobuf/gen/ocean/v1/types.pb.go rename to api-spec/protobuf/gen/ocean/v1/types.pb.go diff --git a/server/api-spec/protobuf/gen/ocean/v1/wallet.pb.go b/api-spec/protobuf/gen/ocean/v1/wallet.pb.go similarity index 100% rename from server/api-spec/protobuf/gen/ocean/v1/wallet.pb.go rename to api-spec/protobuf/gen/ocean/v1/wallet.pb.go diff --git a/server/api-spec/protobuf/gen/ocean/v1/wallet_grpc.pb.go b/api-spec/protobuf/gen/ocean/v1/wallet_grpc.pb.go similarity index 100% rename from server/api-spec/protobuf/gen/ocean/v1/wallet_grpc.pb.go rename to api-spec/protobuf/gen/ocean/v1/wallet_grpc.pb.go diff --git a/server/buf.gen.yaml b/buf.gen.yaml similarity index 100% rename from server/buf.gen.yaml rename to buf.gen.yaml diff --git a/server/buf.work.yaml b/buf.work.yaml similarity index 100% rename from server/buf.work.yaml rename to buf.work.yaml diff --git a/client/go.mod b/client/go.mod index 526fe9a41..c79619eb5 100644 --- a/client/go.mod +++ b/client/go.mod @@ -1,13 +1,13 @@ module github.com/ark-network/ark-cli -go 1.22.4 +go 1.22.6 replace github.com/ark-network/ark/common => ../common replace github.com/ark-network/ark => ../server require ( - github.com/ark-network/ark v0.0.0-00010101000000-000000000000 + github.com/ark-network/ark/api-spec v0.0.0-20240812222508-b097e943fb45 github.com/ark-network/ark/common v0.0.0 github.com/btcsuite/btcd v0.24.2 github.com/btcsuite/btcd/btcec/v2 v2.3.4 @@ -21,21 +21,23 @@ require ( require ( github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/vulpemventures/fastsha256 v0.0.0-20160815193821-637e65642941 // indirect ) require ( github.com/btcsuite/btcd/btcutil v1.1.5 github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/vulpemventures/go-elements v0.5.4 github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect golang.org/x/net v0.27.0 // indirect golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect google.golang.org/grpc v1.65.0 google.golang.org/protobuf v1.34.2 // indirect diff --git a/client/go.sum b/client/go.sum index 459c5de82..667648781 100644 --- a/client/go.sum +++ b/client/go.sum @@ -1,4 +1,6 @@ github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= +github.com/ark-network/ark/api-spec v0.0.0-20240812222508-b097e943fb45 h1:T+oj3fvBRMO7mpA0QeNThQeOumvXLaMSqvhwuLULMZ0= +github.com/ark-network/ark/api-spec v0.0.0-20240812222508-b097e943fb45/go.mod h1:0B5seq/gzuGL8OZGUaO12yj73ZJKAde8L+nmLQAZ7IA= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M= github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A= @@ -58,8 +60,8 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 h1:CWyXh/jylQWp2dtiV33mY4iSSp6yf4lmn+c7/tN+ObI= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0/go.mod h1:nCLIt0w3Ept2NwF8ThLmrppXsfT07oC8k0XNDxd8sVU= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= @@ -128,8 +130,8 @@ golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d h1:Aqf0fiIdUQEj0Gn9mKFFXoQfTTEaNopWpfVyYADxiSg= -google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d/go.mod h1:Od4k8V1LQSizPRUK4OzZ7TBE/20k+jPczUDAEyvn69Y= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 h1:+/tmTy5zAieooKIXfzDm9KiA3Bv6JBwriRN9LY+yayk= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988/go.mod h1:4+X6GvPs+25wZKbQq9qyAXrwIRExv7w0Ea6MgZLZiDM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf h1:liao9UHurZLtiEwBgT9LMOnKYsHze6eA6w1KQCMVN2Q= google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= diff --git a/pkg/client-sdk/go.mod b/pkg/client-sdk/go.mod index 00291d4d6..8f99cb7a8 100644 --- a/pkg/client-sdk/go.mod +++ b/pkg/client-sdk/go.mod @@ -1,13 +1,13 @@ module github.com/ark-network/ark/pkg/client-sdk -go 1.22.4 +go 1.22.6 replace github.com/ark-network/ark/common => ./../../common replace github.com/ark-network/ark => ./../../server require ( - github.com/ark-network/ark v0.0.0-00010101000000-000000000000 + github.com/ark-network/ark/api-spec v0.0.0-20240812222508-b097e943fb45 github.com/ark-network/ark/common v0.0.0 github.com/btcsuite/btcd v0.24.2 github.com/btcsuite/btcd/btcec/v2 v2.3.4 @@ -40,7 +40,7 @@ require ( github.com/go-openapi/loads v0.22.0 // indirect github.com/go-openapi/spec v0.21.0 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect @@ -56,7 +56,7 @@ require ( golang.org/x/sync v0.7.0 // indirect golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/pkg/client-sdk/go.sum b/pkg/client-sdk/go.sum index 5df775e02..eaeae7cb2 100644 --- a/pkg/client-sdk/go.sum +++ b/pkg/client-sdk/go.sum @@ -1,4 +1,6 @@ github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= +github.com/ark-network/ark/api-spec v0.0.0-20240812222508-b097e943fb45 h1:T+oj3fvBRMO7mpA0QeNThQeOumvXLaMSqvhwuLULMZ0= +github.com/ark-network/ark/api-spec v0.0.0-20240812222508-b097e943fb45/go.mod h1:0B5seq/gzuGL8OZGUaO12yj73ZJKAde8L+nmLQAZ7IA= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= @@ -85,8 +87,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 h1:CWyXh/jylQWp2dtiV33mY4iSSp6yf4lmn+c7/tN+ObI= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0/go.mod h1:nCLIt0w3Ept2NwF8ThLmrppXsfT07oC8k0XNDxd8sVU= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= @@ -179,8 +181,8 @@ golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d h1:Aqf0fiIdUQEj0Gn9mKFFXoQfTTEaNopWpfVyYADxiSg= -google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d/go.mod h1:Od4k8V1LQSizPRUK4OzZ7TBE/20k+jPczUDAEyvn69Y= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 h1:+/tmTy5zAieooKIXfzDm9KiA3Bv6JBwriRN9LY+yayk= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988/go.mod h1:4+X6GvPs+25wZKbQq9qyAXrwIRExv7w0Ea6MgZLZiDM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf h1:liao9UHurZLtiEwBgT9LMOnKYsHze6eA6w1KQCMVN2Q= google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= diff --git a/server/go.mod b/server/go.mod index f5ae0c58a..98585de25 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,6 +1,6 @@ module github.com/ark-network/ark -go 1.22.4 +go 1.22.6 replace github.com/ark-network/ark/common => ../common @@ -9,6 +9,7 @@ replace github.com/ark-network/tools/macaroons => ./pkg/macaroons replace github.com/ark-network/tools/kvdb => ./pkg/kvdb require ( + github.com/ark-network/ark/api-spec v0.0.0-20240812222508-b097e943fb45 github.com/ark-network/ark/common v0.0.0 github.com/ark-network/tools/kvdb v0.0.0-00010101000000-000000000000 github.com/ark-network/tools/macaroons v0.0.0-00010101000000-000000000000 @@ -20,7 +21,7 @@ require ( github.com/golang-migrate/migrate/v4 v4.17.1 github.com/google/uuid v1.6.0 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd github.com/lightningnetwork/lnd v0.18.2-beta github.com/sirupsen/logrus v1.9.3 @@ -30,7 +31,6 @@ require ( github.com/urfave/cli/v2 v2.27.3 github.com/vulpemventures/go-bip39 v1.0.2 github.com/vulpemventures/go-elements v0.5.4 - google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d google.golang.org/grpc v1.65.0 google.golang.org/protobuf v1.34.2 gopkg.in/macaroon-bakery.v2 v2.3.0 @@ -164,6 +164,7 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.22.0 // indirect google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 // indirect gopkg.in/errgo.v1 v1.0.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/server/go.sum b/server/go.sum index 81dc63f0a..caf7eac99 100644 --- a/server/go.sum +++ b/server/go.sum @@ -27,6 +27,8 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/ark-network/ark/api-spec v0.0.0-20240812222508-b097e943fb45 h1:T+oj3fvBRMO7mpA0QeNThQeOumvXLaMSqvhwuLULMZ0= +github.com/ark-network/ark/api-spec v0.0.0-20240812222508-b097e943fb45/go.mod h1:0B5seq/gzuGL8OZGUaO12yj73ZJKAde8L+nmLQAZ7IA= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -264,8 +266,8 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92Bcuy github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 h1:CWyXh/jylQWp2dtiV33mY4iSSp6yf4lmn+c7/tN+ObI= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0/go.mod h1:nCLIt0w3Ept2NwF8ThLmrppXsfT07oC8k0XNDxd8sVU= 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= @@ -847,8 +849,8 @@ google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= -google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d h1:Aqf0fiIdUQEj0Gn9mKFFXoQfTTEaNopWpfVyYADxiSg= -google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d/go.mod h1:Od4k8V1LQSizPRUK4OzZ7TBE/20k+jPczUDAEyvn69Y= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 h1:+/tmTy5zAieooKIXfzDm9KiA3Bv6JBwriRN9LY+yayk= +google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988/go.mod h1:4+X6GvPs+25wZKbQq9qyAXrwIRExv7w0Ea6MgZLZiDM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf h1:liao9UHurZLtiEwBgT9LMOnKYsHze6eA6w1KQCMVN2Q= google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=