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.

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

Update go.mod module to github.com/Fairblock/fairyring #102

Merged
merged 1 commit into from
Feb 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions app/ante.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package app

import (
"fairyring/blockbuster"
pepante "fairyring/x/pep/ante"
pepkeeper "fairyring/x/pep/keeper"
"github.com/Fairblock/fairyring/blockbuster"
pepante "github.com/Fairblock/fairyring/x/pep/ante"
pepkeeper "github.com/Fairblock/fairyring/x/pep/keeper"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/ante"
Expand Down
24 changes: 12 additions & 12 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,21 +109,21 @@ import (
ibctestingtypes "github.com/cosmos/ibc-go/v7/testing/types"
"github.com/spf13/cast"

"fairyring/blockbuster"
"fairyring/blockbuster/abci"
"fairyring/blockbuster/lanes/base"
"fairyring/blockbuster/lanes/keyshare"
keysharemodule "fairyring/x/keyshare"
keysharemodulekeeper "fairyring/x/keyshare/keeper"
keysharemoduletypes "fairyring/x/keyshare/types"
pepmodule "fairyring/x/pep"
pepmodulekeeper "fairyring/x/pep/keeper"
pepmoduletypes "fairyring/x/pep/types"
"github.com/Fairblock/fairyring/blockbuster"
"github.com/Fairblock/fairyring/blockbuster/abci"
"github.com/Fairblock/fairyring/blockbuster/lanes/base"
"github.com/Fairblock/fairyring/blockbuster/lanes/keyshare"
keysharemodule "github.com/Fairblock/fairyring/x/keyshare"
keysharemodulekeeper "github.com/Fairblock/fairyring/x/keyshare/keeper"
keysharemoduletypes "github.com/Fairblock/fairyring/x/keyshare/types"
pepmodule "github.com/Fairblock/fairyring/x/pep"
pepmodulekeeper "github.com/Fairblock/fairyring/x/pep/keeper"
pepmoduletypes "github.com/Fairblock/fairyring/x/pep/types"

// this line is used by starport scaffolding # stargate/app/moduleImport

appparams "fairyring/app/params"
"fairyring/docs"
appparams "github.com/Fairblock/fairyring/app/params"
"github.com/Fairblock/fairyring/docs"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion app/encoding.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/cosmos/cosmos-sdk/std"
"github.com/cosmos/cosmos-sdk/x/auth/tx"

"fairyring/app/params"
"github.com/Fairblock/fairyring/app/params"
)

// makeEncodingConfig creates an EncodingConfig for an amino based test configuration.
Expand Down
2 changes: 1 addition & 1 deletion app/simulation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
ibctesting "github.com/cosmos/ibc-go/v7/testing"
"github.com/stretchr/testify/require"

"fairyring/app"
"github.com/Fairblock/fairyring/app"
)

type storeKeysPrefixes struct {
Expand Down
6 changes: 3 additions & 3 deletions blockbuster/abci/abci.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package abci

import (
"fairyring/blockbuster"
"fairyring/blockbuster/lanes/terminator"
"fairyring/blockbuster/utils"
"github.com/Fairblock/fairyring/blockbuster"
"github.com/Fairblock/fairyring/blockbuster/lanes/terminator"
"github.com/Fairblock/fairyring/blockbuster/utils"

abci "github.com/cometbft/cometbft/abci/types"
"github.com/cometbft/cometbft/libs/log"
Expand Down
2 changes: 1 addition & 1 deletion blockbuster/abci/check_tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"fairyring/x/pep/types"
"github.com/Fairblock/fairyring/x/pep/types"

cometabci "github.com/cometbft/cometbft/abci/types"
log "github.com/cometbft/cometbft/libs/log"
Expand Down
4 changes: 2 additions & 2 deletions blockbuster/lanes/base/abci.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package base
import (
"fmt"

"fairyring/blockbuster"
"fairyring/blockbuster/utils"
"github.com/Fairblock/fairyring/blockbuster"
"github.com/Fairblock/fairyring/blockbuster/utils"

sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down
2 changes: 1 addition & 1 deletion blockbuster/lanes/base/lane.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package base

import (
"fairyring/blockbuster"
"github.com/Fairblock/fairyring/blockbuster"

"github.com/cometbft/cometbft/libs/log"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down
4 changes: 2 additions & 2 deletions blockbuster/lanes/base/mempool.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"errors"
"fmt"

"fairyring/blockbuster"
"fairyring/blockbuster/utils"
"github.com/Fairblock/fairyring/blockbuster"
"github.com/Fairblock/fairyring/blockbuster/utils"

sdk "github.com/cosmos/cosmos-sdk/types"
sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
Expand Down
4 changes: 2 additions & 2 deletions blockbuster/lanes/keyshare/abci.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package keyshare
import (
"fmt"

"fairyring/blockbuster"
"fairyring/blockbuster/utils"
"github.com/Fairblock/fairyring/blockbuster"
"github.com/Fairblock/fairyring/blockbuster/utils"

sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down
2 changes: 1 addition & 1 deletion blockbuster/lanes/keyshare/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package keyshare

import (
"errors"
"fairyring/x/pep/types"
"github.com/Fairblock/fairyring/x/pep/types"

sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down
4 changes: 2 additions & 2 deletions blockbuster/lanes/keyshare/lane.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package keyshare

import (
"fairyring/blockbuster"
"fairyring/blockbuster/lanes/base"
"github.com/Fairblock/fairyring/blockbuster"
"github.com/Fairblock/fairyring/blockbuster/lanes/base"

sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down
4 changes: 2 additions & 2 deletions blockbuster/lanes/keyshare/mempool.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"strconv"

"fairyring/blockbuster"
"fairyring/blockbuster/utils"
"github.com/Fairblock/fairyring/blockbuster"
"github.com/Fairblock/fairyring/blockbuster/utils"

sdk "github.com/cosmos/cosmos-sdk/types"
sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
Expand Down
2 changes: 1 addition & 1 deletion blockbuster/lanes/terminator/lane.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"fairyring/blockbuster"
"github.com/Fairblock/fairyring/blockbuster"

"github.com/cometbft/cometbft/libs/log"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down
2 changes: 1 addition & 1 deletion blockbuster/proposals.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/hex"
"fmt"

"fairyring/blockbuster/utils"
"github.com/Fairblock/fairyring/blockbuster/utils"
"github.com/cometbft/cometbft/libs/log"
sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down
2 changes: 1 addition & 1 deletion blockbuster/utils/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package utils_test
import (
"testing"

"fairyring/blockbuster/utils"
"github.com/Fairblock/fairyring/blockbuster/utils"
sdk "github.com/cosmos/cosmos-sdk/types"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/fairyringd/cmd/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
sdk "github.com/cosmos/cosmos-sdk/types"

"fairyring/app"
"github.com/Fairblock/fairyring/app"
)

func initSDKConfig() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/fairyringd/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ import (

// this line is used by starport scaffolding # root/moduleImport

"fairyring/app"
appparams "fairyring/app/params"
"github.com/Fairblock/fairyring/app"
appparams "github.com/Fairblock/fairyring/app/params"
)

// NewRootCmd creates a new root command for a Cosmos SDK application
Expand Down
4 changes: 2 additions & 2 deletions cmd/fairyringd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/cosmos/cosmos-sdk/server"
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

"fairyring/app"
"fairyring/cmd/fairyringd/cmd"
"github.com/Fairblock/fairyring/app"
"github.com/Fairblock/fairyring/cmd/fairyringd/cmd"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions docs/fairy_core/integration/04_pep_module.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ To integrate the PEP module to any destination chain, the following steps are ne

```go
import (
pepmodule "fairyring/x/pep"
pepmodulekeeper "fairyring/x/pep/keeper"
pepmoduletypes "fairyring/x/pep/types"
pepmodule "github.com/Fairblock/fairyring/x/pep"
pepmodulekeeper "github.com/Fairblock/fairyring/x/pep/keeper"
pepmoduletypes "github.com/Fairblock/fairyring/x/pep/types"
)
```

Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module fairyring
module github.com/Fairblock/fairyring

go 1.21

Expand All @@ -7,6 +7,7 @@ require (
cosmossdk.io/errors v1.0.0-beta.7
cosmossdk.io/math v1.0.1
github.com/FairBlock/DistributedIBE v0.0.0-20230528025616-f58fb2b93eaf
github.com/armon/go-metrics v0.4.1
github.com/cometbft/cometbft v0.37.2
github.com/cometbft/cometbft-db v0.8.0
github.com/cosmos/cosmos-sdk v0.47.3
Expand Down Expand Up @@ -47,7 +48,6 @@ require (
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/OneOfOne/xxhash v1.2.8 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/aws/aws-sdk-go v1.44.203 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
Expand Down
2 changes: 1 addition & 1 deletion proto/fairyring/keyshare/aggregated_key_share.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package fairyring.keyshare;

option go_package = "fairyring/x/keyshare/types";
option go_package = "github.com/Fairblock/fairyring/x/keyshare/types";

message AggregatedKeyShare {
uint64 height = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/fairyring/keyshare/authorized_address.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package fairyring.keyshare;

option go_package = "fairyring/x/keyshare/types";
option go_package = "github.com/Fairblock/fairyring/x/keyshare/types";

message AuthorizedAddress {
string target = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/fairyring/keyshare/commitments.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package fairyring.keyshare;

option go_package = "fairyring/x/keyshare/types";
option go_package = "github.com/Fairblock/fairyring/x/keyshare/types";

message Commitments {
repeated string commitments = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/fairyring/keyshare/general_key_share.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package fairyring.keyshare;

option go_package = "fairyring/x/keyshare/types";
option go_package = "github.com/Fairblock/fairyring/x/keyshare/types";

message GeneralKeyShare {
string validator = 1;
Expand Down
16 changes: 8 additions & 8 deletions proto/fairyring/keyshare/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ syntax = "proto3";
package fairyring.keyshare;

import "gogoproto/gogo.proto";
import "fairyring/keyshare/params.proto";
import "fairyring/keyshare/validator_set.proto";
import "fairyring/keyshare/key_share.proto";
import "fairyring/keyshare/aggregated_key_share.proto";
import "fairyring/keyshare/pub_key.proto";
import "fairyring/keyshare/authorized_address.proto";
import "fairyring/keyshare/general_key_share.proto";
import "github.com/Fairblock/fairyring/keyshare/params.proto";
import "github.com/Fairblock/fairyring/keyshare/validator_set.proto";
import "github.com/Fairblock/fairyring/keyshare/key_share.proto";
import "github.com/Fairblock/fairyring/keyshare/aggregated_key_share.proto";
import "github.com/Fairblock/fairyring/keyshare/pub_key.proto";
import "github.com/Fairblock/fairyring/keyshare/authorized_address.proto";
import "github.com/Fairblock/fairyring/keyshare/general_key_share.proto";

// this line is used by starport scaffolding # genesis/proto/import

option go_package = "fairyring/x/keyshare/types";
option go_package = "github.com/Fairblock/fairyring/x/keyshare/types";

// GenesisState defines the keyshare module's genesis state.
message GenesisState {
Expand Down
2 changes: 1 addition & 1 deletion proto/fairyring/keyshare/key_share.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package fairyring.keyshare;

option go_package = "fairyring/x/keyshare/types";
option go_package = "github.com/Fairblock/fairyring/x/keyshare/types";

message KeyShare {
string validator = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/fairyring/keyshare/packet.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package fairyring.keyshare;

option go_package = "fairyring/x/keyshare/types";
option go_package = "github.com/Fairblock/fairyring/x/keyshare/types";

message KeysharePacketData {
oneof packet {
Expand Down
2 changes: 1 addition & 1 deletion proto/fairyring/keyshare/params.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package fairyring.keyshare;

import "gogoproto/gogo.proto";

option go_package = "fairyring/x/keyshare/types";
option go_package = "github.com/Fairblock/fairyring/x/keyshare/types";

// Params defines the parameters for the module.
message Params {
Expand Down
2 changes: 1 addition & 1 deletion proto/fairyring/keyshare/pub_key.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package fairyring.keyshare;

option go_package = "fairyring/x/keyshare/types";
option go_package = "github.com/Fairblock/fairyring/x/keyshare/types";

message ActivePubKey {
string publicKey = 1;
Expand Down
18 changes: 9 additions & 9 deletions proto/fairyring/keyshare/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ package fairyring.keyshare;
import "gogoproto/gogo.proto";
import "google/api/annotations.proto";
import "cosmos/base/query/v1beta1/pagination.proto";
import "fairyring/keyshare/params.proto";
import "fairyring/keyshare/validator_set.proto";
import "fairyring/keyshare/key_share.proto";
import "fairyring/keyshare/aggregated_key_share.proto";
import "fairyring/keyshare/pub_key.proto";
import "fairyring/keyshare/authorized_address.proto";
import "fairyring/keyshare/general_key_share.proto";
import "fairyring/keyshare/commitments.proto";
import "github.com/Fairblock/fairyring/keyshare/params.proto";
import "github.com/Fairblock/fairyring/keyshare/validator_set.proto";
import "github.com/Fairblock/fairyring/keyshare/key_share.proto";
import "github.com/Fairblock/fairyring/keyshare/aggregated_key_share.proto";
import "github.com/Fairblock/fairyring/keyshare/pub_key.proto";
import "github.com/Fairblock/fairyring/keyshare/authorized_address.proto";
import "github.com/Fairblock/fairyring/keyshare/general_key_share.proto";
import "github.com/Fairblock/fairyring/keyshare/commitments.proto";

// this line is used by starport scaffolding # 1

option go_package = "fairyring/x/keyshare/types";
option go_package = "github.com/Fairblock/fairyring/x/keyshare/types";

// Query defines the gRPC querier service.
service Query {
Expand Down
2 changes: 1 addition & 1 deletion proto/fairyring/keyshare/requested_keyshare.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package fairyring.keyshare;

option go_package = "fairyring/x/keyshare/types";
option go_package = "github.com/Fairblock/fairyring/x/keyshare/types";

message KeyShareRequest {
string identity = 1;
Expand Down
Loading
Loading