commit a4ae9988a8f9391f2369ac031903ea1a5b4c413d · hailey.at/cocoon

+2 -2

cmd/cocoon/main.go

···

       9
       9
        
       	"os"

     

       10
       10
        
       	"time"

     

       11
       11
        
       

     

       12
       12
       -
       	"github.com/bluesky-social/indigo/atproto/crypto"

     

       12
       12
       +
       	"github.com/bluesky-social/indigo/atproto/atcrypto"

     

       13
       13
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       14
       14
        
       	"github.com/haileyok/cocoon/internal/helpers"

     

       15
       15
        
       	"github.com/haileyok/cocoon/server"

     
···

       217
       217
        
       		},

     

       218
       218
        
       	},

     

       219
       219
        
       	Action: func(cmd *cli.Context) error {

     

       220
       220
       -
       		key, err := crypto.GeneratePrivateKeyK256()

     

       220
       220
       +
       		key, err := atcrypto.GeneratePrivateKeyK256()

     

       221
       221
        
       		if err != nil {

     

       222
       222
        
       			return err

     

       223
       223
        
       		}

+1 -1

go.mod

···

       5
       5
        
       require (

     

       6
       6
        
       	github.com/Azure/go-autorest/autorest/to v0.4.1

     

       7
       7
        
       	github.com/aws/aws-sdk-go v1.55.7

     

       8
       8
       -
       	github.com/bluesky-social/indigo v0.0.0-20250924132341-b4dd6383c76f

     

       8
       8
       +
       	github.com/bluesky-social/indigo v0.0.0-20251009212240-20524de167fe

     

       9
       9
        
       	github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792

     

       10
       10
        
       	github.com/domodwyer/mailyak/v3 v3.6.2

     

       11
       11
        
       	github.com/go-pkgz/expirable-cache/v3 v3.0.0

+2 -2

go.sum

···

       16
       16
        
       github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=

     

       17
       17
        
       github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY=

     

       18
       18
        
       github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k=

     

       19
       19
       -
       github.com/bluesky-social/indigo v0.0.0-20250924132341-b4dd6383c76f h1:DJufFBQBXlekAk1aZF9MgmmBmk1zBQNQOs0AZl2uUos=

     

       20
       20
       -
       github.com/bluesky-social/indigo v0.0.0-20250924132341-b4dd6383c76f/go.mod h1:n6QE1NDPFoi7PRbMUZmc2y7FibCqiVU4ePpsvhHUBR8=

     

       19
       19
       +
       github.com/bluesky-social/indigo v0.0.0-20251009212240-20524de167fe h1:VBhaqE5ewQgXbY5SfSWFZC/AwHFo7cHxZKFYi2ce9Yo=

     

       20
       20
       +
       github.com/bluesky-social/indigo v0.0.0-20251009212240-20524de167fe/go.mod h1:RuQVrCGm42QNsgumKaR6se+XkFKfCPNwdCiTvqKRUck=

     

       21
       21
        
       github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=

     

       22
       22
        
       github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=

     

       23
       23
        
       github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 h1:R8vQdOQdZ9Y3SkEwmHoWBmX1DNXhXZqlTpq6s4tyJGc=

+2 -2

models/models.go

···

       5
       5
        
       	"time"

     

       6
       6
        
       

     

       7
       7
        
       	"github.com/Azure/go-autorest/autorest/to"

     

       8
       8
       -
       	"github.com/bluesky-social/indigo/atproto/crypto"

     

       8
       8
       +
       	"github.com/bluesky-social/indigo/atproto/atcrypto"

     

       9
       9
        
       )

     

       10
       10
        
       

     

       11
       11
        
       type Repo struct {

     
···

       28
       28
        
       }

     

       29
       29
        
       

     

       30
       30
        
       func (r *Repo) SignFor(ctx context.Context, did string, msg []byte) ([]byte, error) {

     

       31
       31
       -
       	k, err := crypto.ParsePrivateBytesK256(r.SigningKey)

     

       31
       31
       +
       	k, err := atcrypto.ParsePrivateBytesK256(r.SigningKey)

     

       32
       32
        
       	if err != nil {

     

       33
       33
        
       		return nil, err

     

       34
       34
        
       	}

+5 -5

plc/client.go

···

       13
       13
        
       	"net/url"

     

       14
       14
        
       	"strings"

     

       15
       15
        
       

     

       16
       16
       -
       	"github.com/bluesky-social/indigo/atproto/crypto"

     

       16
       16
       +
       	"github.com/bluesky-social/indigo/atproto/atcrypto"

     

       17
       17
        
       	"github.com/bluesky-social/indigo/util"

     

       18
       18
        
       	"github.com/haileyok/cocoon/identity"

     

       19
       19
        
       )

     
···

       22
       22
        
       	h           *http.Client

     

       23
       23
        
       	service     string

     

       24
       24
        
       	pdsHostname string

     

       25
       25
       -
       	rotationKey *crypto.PrivateKeyK256

     

       25
       25
       +
       	rotationKey *atcrypto.PrivateKeyK256

     

       26
       26
        
       }

     

       27
       27
        
       

     

       28
       28
        
       type ClientArgs struct {

     
···

       41
       41
        
       		args.H = util.RobustHTTPClient()

     

       42
       42
        
       	}

     

       43
       43
        
       

     

       44
       44
       -
       	rk, err := crypto.ParsePrivateBytesK256([]byte(args.RotationKey))

     

       44
       44
       +
       	rk, err := atcrypto.ParsePrivateBytesK256([]byte(args.RotationKey))

     

       45
       45
        
       	if err != nil {

     

       46
       46
        
       		return nil, err

     

       47
       47
        
       	}

     
···

       54
       54
        
       	}, nil

     

       55
       55
        
       }

     

       56
       56
        
       

     

       57
       57
       -
       func (c *Client) CreateDID(sigkey *crypto.PrivateKeyK256, recovery string, handle string) (string, *Operation, error) {

     

       57
       57
       +
       func (c *Client) CreateDID(sigkey *atcrypto.PrivateKeyK256, recovery string, handle string) (string, *Operation, error) {

     

       58
       58
        
       	pubsigkey, err := sigkey.PublicKey()

     

       59
       59
        
       	if err != nil {

     

       60
       60
        
       		return "", nil, err

     
···

       107
       107
        
       	return did, &op, nil

     

       108
       108
        
       }

     

       109
       109
        
       

     

       110
       110
       -
       func (c *Client) SignOp(sigkey *crypto.PrivateKeyK256, op *Operation) error {

     

       110
       110
       +
       func (c *Client) SignOp(sigkey *atcrypto.PrivateKeyK256, op *Operation) error {

     

       111
       111
        
       	b, err := op.MarshalCBOR()

     

       112
       112
        
       	if err != nil {

     

       113
       113
        
       		return err

+2 -2

plc/types.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"encoding/json"

     

       5
       5
        
       

     

       6
       6
       -
       	"github.com/bluesky-social/indigo/atproto/data"

     

       6
       6
       +
       	"github.com/bluesky-social/indigo/atproto/atdata"

     

       7
       7
        
       	"github.com/haileyok/cocoon/identity"

     

       8
       8
        
       	cbg "github.com/whyrusleeping/cbor-gen"

     

       9
       9
        
       )

     
···

       38
       38
        
       		return nil, err

     

       39
       39
        
       	}

     

       40
       40
        
       

     

       41
       41
       -
       	b, err = data.MarshalCBOR(m)

     

       41
       41
       +
       	b, err = atdata.MarshalCBOR(m)

     

       42
       42
        
       	if err != nil {

     

       43
       43
        
       		return nil, err

     

       44
       44
        
       	}

+2 -2

server/handle_identity_update_handle.go

···

       7
       7
        
       

     

       8
       8
        
       	"github.com/Azure/go-autorest/autorest/to"

     

       9
       9
        
       	"github.com/bluesky-social/indigo/api/atproto"

     

       10
       10
       -
       	"github.com/bluesky-social/indigo/atproto/crypto"

     

       10
       10
       +
       	"github.com/bluesky-social/indigo/atproto/atcrypto"

     

       11
       11
        
       	"github.com/bluesky-social/indigo/events"

     

       12
       12
        
       	"github.com/bluesky-social/indigo/util"

     

       13
       13
        
       	"github.com/haileyok/cocoon/identity"

     
···

       66
       66
        
       			Prev:                &latest.Cid,

     

       67
       67
        
       		}

     

       68
       68
        
       

     

       69
       69
       -
       		k, err := crypto.ParsePrivateBytesK256(repo.SigningKey)

     

       69
       69
       +
       		k, err := atcrypto.ParsePrivateBytesK256(repo.SigningKey)

     

       70
       70
        
       		if err != nil {

     

       71
       71
        
       			s.logger.Error("error parsing signing key", "error", err)

     

       72
       72
        
       			return helpers.ServerError(e, nil)

+2 -2

server/handle_repo_get_record.go

···

       1
       1
        
       package server

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"github.com/bluesky-social/indigo/atproto/data"

     

       4
       4
       +
       	"github.com/bluesky-social/indigo/atproto/atdata"

     

       5
       5
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       6
       6
        
       	"github.com/haileyok/cocoon/models"

     

       7
       7
        
       	"github.com/labstack/echo/v4"

     
···

       37
       37
        
       		return err

     

       38
       38
        
       	}

     

       39
       39
        
       

     

       40
       40
       -
       	val, err := data.UnmarshalCBOR(record.Value)

     

       40
       40
       +
       	val, err := atdata.UnmarshalCBOR(record.Value)

     

       41
       41
        
       	if err != nil {

     

       42
       42
        
       		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?

     

       43
       43
        
       	}

+2 -2

server/handle_repo_list_records.go

···

       4
       4
        
       	"strconv"

     

       5
       5
        
       

     

       6
       6
        
       	"github.com/Azure/go-autorest/autorest/to"

     

       7
       7
       -
       	"github.com/bluesky-social/indigo/atproto/data"

     

       7
       7
       +
       	"github.com/bluesky-social/indigo/atproto/atdata"

     

       8
       8
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       9
       9
        
       	"github.com/haileyok/cocoon/internal/helpers"

     

       10
       10
        
       	"github.com/haileyok/cocoon/models"

     
···

       100
       100
        
       

     

       101
       101
        
       	items := []ComAtprotoRepoListRecordsRecordItem{}

     

       102
       102
        
       	for _, r := range records {

     

       103
       103
       -
       		val, err := data.UnmarshalCBOR(r.Value)

     

       103
       103
       +
       		val, err := atdata.UnmarshalCBOR(r.Value)

     

       104
       104
        
       		if err != nil {

     

       105
       105
        
       			return err

     

       106
       106
        
       		}

+2 -2

server/handle_server_create_account.go

···

       9
       9
        
       

     

       10
       10
        
       	"github.com/Azure/go-autorest/autorest/to"

     

       11
       11
        
       	"github.com/bluesky-social/indigo/api/atproto"

     

       12
       12
       -
       	"github.com/bluesky-social/indigo/atproto/crypto"

     

       12
       12
       +
       	"github.com/bluesky-social/indigo/atproto/atcrypto"

     

       13
       13
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       14
       14
        
       	"github.com/bluesky-social/indigo/events"

     

       15
       15
        
       	"github.com/bluesky-social/indigo/repo"

     
···

       125
       125
        
       

     

       126
       126
        
       	// TODO: unsupported domains

     

       127
       127
        
       

     

       128
       128
       -
       	k, err := crypto.GeneratePrivateKeyK256()

     

       128
       128
       +
       	k, err := atcrypto.GeneratePrivateKeyK256()

     

       129
       129
        
       	if err != nil {

     

       130
       130
        
       		s.logger.Error("error creating signing key", "endpoint", "com.atproto.server.createAccount", "error", err)

     

       131
       131
        
       		return helpers.ServerError(e, nil)

+7 -7

server/repo.go

···

       10
       10
        
       

     

       11
       11
        
       	"github.com/Azure/go-autorest/autorest/to"

     

       12
       12
        
       	"github.com/bluesky-social/indigo/api/atproto"

     

       13
       13
       -
       	"github.com/bluesky-social/indigo/atproto/data"

     

       13
       13
       +
       	"github.com/bluesky-social/indigo/atproto/atdata"

     

       14
       14
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       15
       15
        
       	"github.com/bluesky-social/indigo/carstore"

     

       16
       16
        
       	"github.com/bluesky-social/indigo/events"

     
···

       72
       72
        
       }

     

       73
       73
        
       

     

       74
       74
        
       func (mm *MarshalableMap) MarshalCBOR(w io.Writer) error {

     

       75
       75
       -
       	data, err := data.MarshalCBOR(*mm)

     

       75
       75
       +
       	data, err := atdata.MarshalCBOR(*mm)

     

       76
       76
        
       	if err != nil {

     

       77
       77
        
       		return err

     

       78
       78
        
       	}

     
···

       133
       133
        
       			if err != nil {

     

       134
       134
        
       				return nil, err

     

       135
       135
        
       			}

     

       136
       136
       -
       			out, err := data.UnmarshalJSON(j)

     

       136
       136
       +
       			out, err := atdata.UnmarshalJSON(j)

     

       137
       137
        
       			if err != nil {

     

       138
       138
        
       				return nil, err

     

       139
       139
        
       			}

     
···

       148
       148
        
       			if err != nil {

     

       149
       149
        
       				return nil, err

     

       150
       150
        
       			}

     

       151
       151
       -
       			d, err := data.MarshalCBOR(mm)

     

       151
       151
       +
       			d, err := atdata.MarshalCBOR(mm)

     

       152
       152
        
       			if err != nil {

     

       153
       153
        
       				return nil, err

     

       154
       154
        
       			}

     
···

       189
       189
        
       			if err != nil {

     

       190
       190
        
       				return nil, err

     

       191
       191
        
       			}

     

       192
       192
       -
       			out, err := data.UnmarshalJSON(j)

     

       192
       192
       +
       			out, err := atdata.UnmarshalJSON(j)

     

       193
       193
        
       			if err != nil {

     

       194
       194
        
       				return nil, err

     

       195
       195
        
       			}

     
···

       198
       198
        
       			if err != nil {

     

       199
       199
        
       				return nil, err

     

       200
       200
        
       			}

     

       201
       201
       -
       			d, err := data.MarshalCBOR(mm)

     

       201
       201
       +
       			d, err := atdata.MarshalCBOR(mm)

     

       202
       202
        
       			if err != nil {

     

       203
       203
        
       				return nil, err

     

       204
       204
        
       			}

     
···

       415
       415
        
       func getBlobCidsFromCbor(cbor []byte) ([]cid.Cid, error) {

     

       416
       416
        
       	var cids []cid.Cid

     

       417
       417
        
       

     

       418
       418
       -
       	decoded, err := data.UnmarshalCBOR(cbor)

     

       418
       418
       +
       	decoded, err := atdata.UnmarshalCBOR(cbor)

     

       419
       419
        
       	if err != nil {

     

       420
       420
        
       		return nil, fmt.Errorf("error unmarshaling cbor: %w", err)

     

       421
       421
        
       	}