From 8b174091db1c79ef2e3838b36fabc3a0f47a3987 Mon Sep 17 00:00:00 2001 From: Monir Hadji Date: Tue, 27 Jun 2023 14:10:19 -0400 Subject: [PATCH 1/2] chore: rename topos-network to topos-protocol --- .github/CODEOWNERS | 6 +++--- .github/workflows/release.yml | 2 +- .goreleaser.yml | 8 ++++---- consensus/ibft/frost/frost_backend.go | 4 ++-- consensus/ibft/transport.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 661a4ad0a4..a998138ddf 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,9 +1,9 @@ -* @topos-network/protocol +* @topos-protocol/protocol # Github Actions -/.github/workflows/ @topos-network/protocol @topos-network/tools +/.github/workflows/ @topos-protocol/protocol @topos-protocol/tools # Docker -/docker @topos-network/protocol @topos-network/tools +/docker @topos-protocol/protocol @topos-protocol/tools diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 21ca049c34..c73ef1f03f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,7 +45,7 @@ jobs: ghcr.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \ --rm-dist --skip-validate env: - PACKAGE_NAME: github.com/topos-network/polygon-edge + PACKAGE_NAME: github.com/topos-protocol/polygon-edge GOLANG_CROSS_VERSION: v1.18.3 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VERSION: ${{ steps.prepare.outputs.tag_name }} diff --git a/.goreleaser.yml b/.goreleaser.yml index d8938840aa..446170d70b 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -16,7 +16,7 @@ builds: env: - CC=o64-clang - CXX=o64-clang++ - ldflags: -s -w -X 'github.com/topos-network/polygon-edge/versioning.Version=v{{ .Version }}' + ldflags: -s -w -X 'github.com/topos-protocol/polygon-edge/versioning.Version=v{{ .Version }}' - id: darwin-arm64 main: ./main.go @@ -28,7 +28,7 @@ builds: env: - CC=oa64-clang - CXX=oa64-clang++ - ldflags: -s -w -X 'github.com/topos-network/polygon-edge/versioning.Version=v{{ .Version }}' + ldflags: -s -w -X 'github.com/topos-protocol/polygon-edge/versioning.Version=v{{ .Version }}' - id: linux-amd64 main: ./main.go @@ -42,7 +42,7 @@ builds: - CXX=g++ ldflags: # We need to build a static binary because we are building in a glibc based system and running in a musl container - -s -w -linkmode external -extldflags "-static" -X 'github.com/topos-network/polygon-edge/versioning.Version=v{{ .Version }}' + -s -w -linkmode external -extldflags "-static" -X 'github.com/topos-protocol/polygon-edge/versioning.Version=v{{ .Version }}' tags: - netgo - osusergo @@ -59,7 +59,7 @@ builds: - CXX=aarch64-linux-gnu-g++ ldflags: # We need to build a static binary because we are building in a glibc based system and running in a musl container - -s -w -linkmode external -extldflags "-static" -X 'github.com/topos-network/polygon-edge/versioning.Version=v{{ .Version }}' + -s -w -linkmode external -extldflags "-static" -X 'github.com/topos-protocol/polygon-edge/versioning.Version=v{{ .Version }}' tags: - netgo - osusergo diff --git a/consensus/ibft/frost/frost_backend.go b/consensus/ibft/frost/frost_backend.go index 0d350c50d2..664820b2c2 100644 --- a/consensus/ibft/frost/frost_backend.go +++ b/consensus/ibft/frost/frost_backend.go @@ -2,8 +2,8 @@ package frost import ( "github.com/0xPolygon/go-ibft/core" - "github.com/topos-network/go-topos-sequencer-client/frostclient" - protofrost "github.com/topos-network/go-topos-sequencer-client/frostclient/proto" + "github.com/topos-protocol/go-topos-sequencer-client/frostclient" + protofrost "github.com/topos-protocol/go-topos-sequencer-client/frostclient/proto" ) type FrostTransport interface { diff --git a/consensus/ibft/transport.go b/consensus/ibft/transport.go index 3c559e1f90..14481d2cf6 100644 --- a/consensus/ibft/transport.go +++ b/consensus/ibft/transport.go @@ -5,7 +5,7 @@ import ( "github.com/0xPolygon/polygon-edge/network" "github.com/0xPolygon/polygon-edge/types" "github.com/libp2p/go-libp2p/core/peer" - protofrost "github.com/topos-network/go-topos-sequencer-client/frostclient/proto" + protofrost "github.com/topos-protocol/go-topos-sequencer-client/frostclient/proto" ) type transport interface { diff --git a/go.mod b/go.mod index 6a3d40311e..9662f0d1b7 100644 --- a/go.mod +++ b/go.mod @@ -210,7 +210,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.5.0 // indirect github.com/tinylib/msgp v1.1.2 // indirect - github.com/topos-network/go-topos-sequencer-client v0.0.0-20230322084800-1e8efcf8a2b6 // indirect + github.com/topos-protocol/go-topos-sequencer-client v0.0.0-20230322084800-1e8efcf8a2b6 // indirect github.com/tyler-smith/go-bip39 v1.1.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.37.0 // indirect diff --git a/go.sum b/go.sum index a811a76025..b45f4d4b6d 100644 --- a/go.sum +++ b/go.sum @@ -737,8 +737,8 @@ github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= github.com/tinylib/msgp v1.1.2 h1:gWmO7n0Ys2RBEb7GPYB9Ujq8Mk5p2U08lRnmMcGy6BQ= github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/topos-network/go-topos-sequencer-client v0.0.0-20230322084800-1e8efcf8a2b6 h1:5X7SeZwCTJYnmeIod+WakLgRPSb+2gV7EQbbEzTu4f0= -github.com/topos-network/go-topos-sequencer-client v0.0.0-20230322084800-1e8efcf8a2b6/go.mod h1:ScY+JV9rsoGqA3a3dTERdnWHgMUlcxKtAI37X/7rB+M= +github.com/topos-protocol/go-topos-sequencer-client v0.0.0-20230322084800-1e8efcf8a2b6 h1:5X7SeZwCTJYnmeIod+WakLgRPSb+2gV7EQbbEzTu4f0= +github.com/topos-protocol/go-topos-sequencer-client v0.0.0-20230322084800-1e8efcf8a2b6/go.mod h1:ScY+JV9rsoGqA3a3dTERdnWHgMUlcxKtAI37X/7rB+M= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8= github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U= From 95fb9dd7d3b135a29b3cc1da02a38ffae7b2510a Mon Sep 17 00:00:00 2001 From: Marko Atanasievski Date: Wed, 19 Jul 2023 13:36:43 +0200 Subject: [PATCH 2/2] fix: dependencies --- go.mod | 10 ++++++---- go.sum | 10 ++++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 9662f0d1b7..82b75f60d0 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,7 @@ require ( github.com/umbracle/ethgo v0.1.4-0.20230126112511-6a4d02533af6 github.com/valyala/fastjson v1.6.3 // indirect go.uber.org/zap v1.22.0 // indirect - golang.org/x/sys v0.4.0 // indirect + golang.org/x/sys v0.5.0 // indirect golang.org/x/tools v0.3.0 google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e gopkg.in/yaml.v3 v3.0.1 @@ -210,7 +210,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.5.0 // indirect github.com/tinylib/msgp v1.1.2 // indirect - github.com/topos-protocol/go-topos-sequencer-client v0.0.0-20230322084800-1e8efcf8a2b6 // indirect + github.com/topos-protocol/go-topos-sequencer-client v0.0.0-20230719150134-37636f549da4 // indirect github.com/tyler-smith/go-bip39 v1.1.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.37.0 // indirect @@ -222,9 +222,9 @@ require ( go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect golang.org/x/exp/typeparams v0.0.0-20221002003631-540bb7301a08 // indirect golang.org/x/mod v0.7.0 // indirect - golang.org/x/net v0.2.0 // indirect + golang.org/x/net v0.7.0 // indirect golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect - golang.org/x/text v0.4.0 // indirect + golang.org/x/text v0.7.0 // indirect golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.99.0 // indirect @@ -234,3 +234,5 @@ require ( gotest.tools/v3 v3.0.2 // indirect inet.af/netaddr v0.0.0-20220617031823-097006376321 // indirect ) + +replace github.com/topos-network/go-topos-sequencer-client => github.com/topos-protocol/go-topos-sequencer-client v0.0.0-20230322084800-1e8efcf8a2b6 diff --git a/go.sum b/go.sum index b45f4d4b6d..ad4712d29b 100644 --- a/go.sum +++ b/go.sum @@ -737,8 +737,8 @@ github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= github.com/tinylib/msgp v1.1.2 h1:gWmO7n0Ys2RBEb7GPYB9Ujq8Mk5p2U08lRnmMcGy6BQ= github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/topos-protocol/go-topos-sequencer-client v0.0.0-20230322084800-1e8efcf8a2b6 h1:5X7SeZwCTJYnmeIod+WakLgRPSb+2gV7EQbbEzTu4f0= -github.com/topos-protocol/go-topos-sequencer-client v0.0.0-20230322084800-1e8efcf8a2b6/go.mod h1:ScY+JV9rsoGqA3a3dTERdnWHgMUlcxKtAI37X/7rB+M= +github.com/topos-protocol/go-topos-sequencer-client v0.0.0-20230719150134-37636f549da4 h1:Nj+BFLcjdabxDNG94kRdDes97TVZ3NnmSoxBTY2eN3w= +github.com/topos-protocol/go-topos-sequencer-client v0.0.0-20230719150134-37636f549da4/go.mod h1:Dt4YfK6HlJg3sdqRpvzk/zab7V+CDS/cQaZLYjmkcfE= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8= github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U= @@ -903,6 +903,8 @@ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1002,6 +1004,8 @@ golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -1014,6 +1018,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=