From a4ae9988a8f9391f2369ac031903ea1a5b4c413d Mon Sep 17 00:00:00 2001 From: bnewbold Date: Thu, 9 Oct 2025 15:39:16 -0700 Subject: [PATCH] indigo pkg rename (#30) * bump indigo dep for pkg renames * update atcrypto and atdata pkg names --- cmd/cocoon/main.go | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- models/models.go | 4 ++-- plc/client.go | 10 +++++----- plc/types.go | 4 ++-- server/handle_identity_update_handle.go | 4 ++-- server/handle_repo_get_record.go | 4 ++-- server/handle_repo_list_records.go | 4 ++-- server/handle_server_create_account.go | 4 ++-- server/repo.go | 14 +++++++------- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/cmd/cocoon/main.go b/cmd/cocoon/main.go index ebc8dd4..eeba378 100644 --- a/cmd/cocoon/main.go +++ b/cmd/cocoon/main.go @@ -9,7 +9,7 @@ import ( "os" "time" - "github.com/bluesky-social/indigo/atproto/crypto" + "github.com/bluesky-social/indigo/atproto/atcrypto" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/haileyok/cocoon/internal/helpers" "github.com/haileyok/cocoon/server" @@ -217,7 +217,7 @@ var runCreateRotationKey = &cli.Command{ }, }, Action: func(cmd *cli.Context) error { - key, err := crypto.GeneratePrivateKeyK256() + key, err := atcrypto.GeneratePrivateKeyK256() if err != nil { return err } diff --git a/go.mod b/go.mod index af8b412..72ab840 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.24.1 require ( github.com/Azure/go-autorest/autorest/to v0.4.1 github.com/aws/aws-sdk-go v1.55.7 - github.com/bluesky-social/indigo v0.0.0-20250924132341-b4dd6383c76f + github.com/bluesky-social/indigo v0.0.0-20251009212240-20524de167fe github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 github.com/domodwyer/mailyak/v3 v3.6.2 github.com/go-pkgz/expirable-cache/v3 v3.0.0 diff --git a/go.sum b/go.sum index a226ae3..8de66a6 100644 --- a/go.sum +++ b/go.sum @@ -16,8 +16,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY= github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= -github.com/bluesky-social/indigo v0.0.0-20250924132341-b4dd6383c76f h1:DJufFBQBXlekAk1aZF9MgmmBmk1zBQNQOs0AZl2uUos= -github.com/bluesky-social/indigo v0.0.0-20250924132341-b4dd6383c76f/go.mod h1:n6QE1NDPFoi7PRbMUZmc2y7FibCqiVU4ePpsvhHUBR8= +github.com/bluesky-social/indigo v0.0.0-20251009212240-20524de167fe h1:VBhaqE5ewQgXbY5SfSWFZC/AwHFo7cHxZKFYi2ce9Yo= +github.com/bluesky-social/indigo v0.0.0-20251009212240-20524de167fe/go.mod h1:RuQVrCGm42QNsgumKaR6se+XkFKfCPNwdCiTvqKRUck= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 h1:R8vQdOQdZ9Y3SkEwmHoWBmX1DNXhXZqlTpq6s4tyJGc= diff --git a/models/models.go b/models/models.go index 93239c5..c9dd9a7 100644 --- a/models/models.go +++ b/models/models.go @@ -5,7 +5,7 @@ import ( "time" "github.com/Azure/go-autorest/autorest/to" - "github.com/bluesky-social/indigo/atproto/crypto" + "github.com/bluesky-social/indigo/atproto/atcrypto" ) type Repo struct { @@ -28,7 +28,7 @@ type Repo struct { } func (r *Repo) SignFor(ctx context.Context, did string, msg []byte) ([]byte, error) { - k, err := crypto.ParsePrivateBytesK256(r.SigningKey) + k, err := atcrypto.ParsePrivateBytesK256(r.SigningKey) if err != nil { return nil, err } diff --git a/plc/client.go b/plc/client.go index 6f834b7..07677c1 100644 --- a/plc/client.go +++ b/plc/client.go @@ -13,7 +13,7 @@ import ( "net/url" "strings" - "github.com/bluesky-social/indigo/atproto/crypto" + "github.com/bluesky-social/indigo/atproto/atcrypto" "github.com/bluesky-social/indigo/util" "github.com/haileyok/cocoon/identity" ) @@ -22,7 +22,7 @@ type Client struct { h *http.Client service string pdsHostname string - rotationKey *crypto.PrivateKeyK256 + rotationKey *atcrypto.PrivateKeyK256 } type ClientArgs struct { @@ -41,7 +41,7 @@ func NewClient(args *ClientArgs) (*Client, error) { args.H = util.RobustHTTPClient() } - rk, err := crypto.ParsePrivateBytesK256([]byte(args.RotationKey)) + rk, err := atcrypto.ParsePrivateBytesK256([]byte(args.RotationKey)) if err != nil { return nil, err } @@ -54,7 +54,7 @@ func NewClient(args *ClientArgs) (*Client, error) { }, nil } -func (c *Client) CreateDID(sigkey *crypto.PrivateKeyK256, recovery string, handle string) (string, *Operation, error) { +func (c *Client) CreateDID(sigkey *atcrypto.PrivateKeyK256, recovery string, handle string) (string, *Operation, error) { pubsigkey, err := sigkey.PublicKey() if err != nil { return "", nil, err @@ -107,7 +107,7 @@ func (c *Client) CreateDID(sigkey *crypto.PrivateKeyK256, recovery string, handl return did, &op, nil } -func (c *Client) SignOp(sigkey *crypto.PrivateKeyK256, op *Operation) error { +func (c *Client) SignOp(sigkey *atcrypto.PrivateKeyK256, op *Operation) error { b, err := op.MarshalCBOR() if err != nil { return err diff --git a/plc/types.go b/plc/types.go index 32ba88e..0137e03 100644 --- a/plc/types.go +++ b/plc/types.go @@ -3,7 +3,7 @@ package plc import ( "encoding/json" - "github.com/bluesky-social/indigo/atproto/data" + "github.com/bluesky-social/indigo/atproto/atdata" "github.com/haileyok/cocoon/identity" cbg "github.com/whyrusleeping/cbor-gen" ) @@ -38,7 +38,7 @@ func (po *Operation) MarshalCBOR() ([]byte, error) { return nil, err } - b, err = data.MarshalCBOR(m) + b, err = atdata.MarshalCBOR(m) if err != nil { return nil, err } diff --git a/server/handle_identity_update_handle.go b/server/handle_identity_update_handle.go index 8df7f22..fa87be6 100644 --- a/server/handle_identity_update_handle.go +++ b/server/handle_identity_update_handle.go @@ -7,7 +7,7 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/bluesky-social/indigo/api/atproto" - "github.com/bluesky-social/indigo/atproto/crypto" + "github.com/bluesky-social/indigo/atproto/atcrypto" "github.com/bluesky-social/indigo/events" "github.com/bluesky-social/indigo/util" "github.com/haileyok/cocoon/identity" @@ -66,7 +66,7 @@ func (s *Server) handleIdentityUpdateHandle(e echo.Context) error { Prev: &latest.Cid, } - k, err := crypto.ParsePrivateBytesK256(repo.SigningKey) + k, err := atcrypto.ParsePrivateBytesK256(repo.SigningKey) if err != nil { s.logger.Error("error parsing signing key", "error", err) return helpers.ServerError(e, nil) diff --git a/server/handle_repo_get_record.go b/server/handle_repo_get_record.go index a99c912..6b75857 100644 --- a/server/handle_repo_get_record.go +++ b/server/handle_repo_get_record.go @@ -1,7 +1,7 @@ package server import ( - "github.com/bluesky-social/indigo/atproto/data" + "github.com/bluesky-social/indigo/atproto/atdata" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/haileyok/cocoon/models" "github.com/labstack/echo/v4" @@ -37,7 +37,7 @@ func (s *Server) handleRepoGetRecord(e echo.Context) error { return err } - val, err := data.UnmarshalCBOR(record.Value) + val, err := atdata.UnmarshalCBOR(record.Value) if err != nil { return s.handleProxy(e) // TODO: this should be getting handled like...if we don't find it in the db. why doesn't it throw error up there? } diff --git a/server/handle_repo_list_records.go b/server/handle_repo_list_records.go index 4358ec7..aa1063c 100644 --- a/server/handle_repo_list_records.go +++ b/server/handle_repo_list_records.go @@ -4,7 +4,7 @@ import ( "strconv" "github.com/Azure/go-autorest/autorest/to" - "github.com/bluesky-social/indigo/atproto/data" + "github.com/bluesky-social/indigo/atproto/atdata" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/haileyok/cocoon/internal/helpers" "github.com/haileyok/cocoon/models" @@ -100,7 +100,7 @@ func (s *Server) handleListRecords(e echo.Context) error { items := []ComAtprotoRepoListRecordsRecordItem{} for _, r := range records { - val, err := data.UnmarshalCBOR(r.Value) + val, err := atdata.UnmarshalCBOR(r.Value) if err != nil { return err } diff --git a/server/handle_server_create_account.go b/server/handle_server_create_account.go index eadffbb..6bb0f15 100644 --- a/server/handle_server_create_account.go +++ b/server/handle_server_create_account.go @@ -9,7 +9,7 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/bluesky-social/indigo/api/atproto" - "github.com/bluesky-social/indigo/atproto/crypto" + "github.com/bluesky-social/indigo/atproto/atcrypto" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/bluesky-social/indigo/events" "github.com/bluesky-social/indigo/repo" @@ -125,7 +125,7 @@ func (s *Server) handleCreateAccount(e echo.Context) error { // TODO: unsupported domains - k, err := crypto.GeneratePrivateKeyK256() + k, err := atcrypto.GeneratePrivateKeyK256() if err != nil { s.logger.Error("error creating signing key", "endpoint", "com.atproto.server.createAccount", "error", err) return helpers.ServerError(e, nil) diff --git a/server/repo.go b/server/repo.go index 8a53f7a..2fb8578 100644 --- a/server/repo.go +++ b/server/repo.go @@ -10,7 +10,7 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/bluesky-social/indigo/api/atproto" - "github.com/bluesky-social/indigo/atproto/data" + "github.com/bluesky-social/indigo/atproto/atdata" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/bluesky-social/indigo/carstore" "github.com/bluesky-social/indigo/events" @@ -72,7 +72,7 @@ type FirehoseOp struct { } func (mm *MarshalableMap) MarshalCBOR(w io.Writer) error { - data, err := data.MarshalCBOR(*mm) + data, err := atdata.MarshalCBOR(*mm) if err != nil { return err } @@ -133,7 +133,7 @@ func (rm *RepoMan) applyWrites(urepo models.Repo, writes []Op, swapCommit *strin if err != nil { return nil, err } - out, err := data.UnmarshalJSON(j) + out, err := atdata.UnmarshalJSON(j) if err != nil { return nil, err } @@ -148,7 +148,7 @@ func (rm *RepoMan) applyWrites(urepo models.Repo, writes []Op, swapCommit *strin if err != nil { return nil, err } - d, err := data.MarshalCBOR(mm) + d, err := atdata.MarshalCBOR(mm) if err != nil { return nil, err } @@ -189,7 +189,7 @@ func (rm *RepoMan) applyWrites(urepo models.Repo, writes []Op, swapCommit *strin if err != nil { return nil, err } - out, err := data.UnmarshalJSON(j) + out, err := atdata.UnmarshalJSON(j) if err != nil { return nil, err } @@ -198,7 +198,7 @@ func (rm *RepoMan) applyWrites(urepo models.Repo, writes []Op, swapCommit *strin if err != nil { return nil, err } - d, err := data.MarshalCBOR(mm) + d, err := atdata.MarshalCBOR(mm) if err != nil { return nil, err } @@ -415,7 +415,7 @@ func (rm *RepoMan) decrementBlobRefs(urepo models.Repo, cbor []byte) ([]cid.Cid, func getBlobCidsFromCbor(cbor []byte) ([]cid.Cid, error) { var cids []cid.Cid - decoded, err := data.UnmarshalCBOR(cbor) + decoded, err := atdata.UnmarshalCBOR(cbor) if err != nil { return nil, fmt.Errorf("error unmarshaling cbor: %w", err) } -- 2.51.2