Skip to content
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
3 changes: 2 additions & 1 deletion manager/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ WORKDIR /src

COPY ./ /src/

RUN go build -o sai-interx-manager -buildvcs=false
ENV GOPRIVATE=github.com/KiraCore/*
RUN go mod tidy && go build -o sai-interx-manager -buildvcs=false

FROM ubuntu

Expand Down
6 changes: 3 additions & 3 deletions manager/gateway/bitcoin.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package gateway

import (
"encoding/json"
"github.com/saiset-co/sai-interx-manager/logger"
"github.com/saiset-co/sai-service/service"
"github.com/KiraCore/sai-interx-manager/logger"
"github.com/KiraCore/sai-service/service"
"go.uber.org/zap"
"time"

"github.com/saiset-co/sai-interx-manager/types"
"github.com/KiraCore/sai-interx-manager/types"
)

type BitcoinGateway struct {
Expand Down
28 changes: 14 additions & 14 deletions manager/gateway/cosmos.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ import (
"strings"
"time"

cosmosAuth "github.com/saiset-co/sai-interx-manager/proto-gen/cosmos/auth/v1beta1"
cosmosBank "github.com/saiset-co/sai-interx-manager/proto-gen/cosmos/bank/v1beta1"
cosmosTx "github.com/saiset-co/sai-interx-manager/proto-gen/cosmos/tx/v1beta1"
kiraGov "github.com/saiset-co/sai-interx-manager/proto-gen/kira/gov"
kiraMultiStaking "github.com/saiset-co/sai-interx-manager/proto-gen/kira/multistaking"
kiraSlashing "github.com/saiset-co/sai-interx-manager/proto-gen/kira/slashing/v1beta1"
kiraSpending "github.com/saiset-co/sai-interx-manager/proto-gen/kira/spending"
kiraStaking "github.com/saiset-co/sai-interx-manager/proto-gen/kira/staking"
kiraTokens "github.com/saiset-co/sai-interx-manager/proto-gen/kira/tokens"
kiraUbi "github.com/saiset-co/sai-interx-manager/proto-gen/kira/ubi"
kiraUpgrades "github.com/saiset-co/sai-interx-manager/proto-gen/kira/upgrade"
cosmosAuth "github.com/KiraCore/sai-interx-manager/proto-gen/cosmos/auth/v1beta1"
cosmosBank "github.com/KiraCore/sai-interx-manager/proto-gen/cosmos/bank/v1beta1"
cosmosTx "github.com/KiraCore/sai-interx-manager/proto-gen/cosmos/tx/v1beta1"
kiraGov "github.com/KiraCore/sai-interx-manager/proto-gen/kira/gov"
kiraMultiStaking "github.com/KiraCore/sai-interx-manager/proto-gen/kira/multistaking"
kiraSlashing "github.com/KiraCore/sai-interx-manager/proto-gen/kira/slashing/v1beta1"
kiraSpending "github.com/KiraCore/sai-interx-manager/proto-gen/kira/spending"
kiraStaking "github.com/KiraCore/sai-interx-manager/proto-gen/kira/staking"
kiraTokens "github.com/KiraCore/sai-interx-manager/proto-gen/kira/tokens"
kiraUbi "github.com/KiraCore/sai-interx-manager/proto-gen/kira/ubi"
kiraUpgrades "github.com/KiraCore/sai-interx-manager/proto-gen/kira/upgrade"

sekaitypes "github.com/KiraCore/sekai/types"
"github.com/cosmos/cosmos-sdk/client"
Expand All @@ -41,9 +41,9 @@ import (
"github.com/cosmos/go-bip39"
"github.com/google/uuid"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/saiset-co/sai-interx-manager/logger"
"github.com/saiset-co/sai-interx-manager/types"
"github.com/saiset-co/sai-service/service"
"github.com/KiraCore/sai-interx-manager/logger"
"github.com/KiraCore/sai-interx-manager/types"
"github.com/KiraCore/sai-service/service"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
Expand Down
4 changes: 2 additions & 2 deletions manager/gateway/cosmos_agregated.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"go.uber.org/zap"

"github.com/saiset-co/sai-interx-manager/logger"
"github.com/saiset-co/sai-interx-manager/types"
"github.com/KiraCore/sai-interx-manager/logger"
"github.com/KiraCore/sai-interx-manager/types"
)

func (g *CosmosGateway) allValidators() (*types.ValidatorsResponse, error) {
Expand Down
8 changes: 4 additions & 4 deletions manager/gateway/cosmos_agregated2.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strconv"
"strings"

"github.com/saiset-co/sai-storage-mongo/external/adapter"
"github.com/KiraCore/sai-storage-mongo/external/adapter"

sekaitypes "github.com/KiraCore/sekai/types"
tmjson "github.com/cometbft/cometbft/libs/json"
Expand All @@ -19,9 +19,9 @@ import (
"github.com/spf13/cast"
"go.uber.org/zap"

"github.com/saiset-co/sai-interx-manager/logger"
"github.com/saiset-co/sai-interx-manager/types"
"github.com/saiset-co/sai-interx-manager/utils"
"github.com/KiraCore/sai-interx-manager/logger"
"github.com/KiraCore/sai-interx-manager/types"
"github.com/KiraCore/sai-interx-manager/utils"
)

func (g *CosmosGateway) statusAPI() (interface{}, error) {
Expand Down
8 changes: 4 additions & 4 deletions manager/gateway/cosmos_agregated3.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ import (
"fmt"
sekaitypes "github.com/KiraCore/sekai/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/saiset-co/sai-storage-mongo/external/adapter"
"github.com/KiraCore/sai-storage-mongo/external/adapter"
"go.uber.org/zap"
"math"
"net/http"
"regexp"
"strconv"
"strings"

"github.com/saiset-co/sai-interx-manager/logger"
"github.com/saiset-co/sai-interx-manager/types"
"github.com/saiset-co/sai-interx-manager/utils"
"github.com/KiraCore/sai-interx-manager/logger"
"github.com/KiraCore/sai-interx-manager/types"
"github.com/KiraCore/sai-interx-manager/utils"
)

func (g *CosmosGateway) txByHash(hash string) (interface{}, error) {
Expand Down
8 changes: 4 additions & 4 deletions manager/gateway/cosmos_agregated4.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (
bank "github.com/cosmos/cosmos-sdk/x/bank/types"
"go.uber.org/zap"

"github.com/saiset-co/sai-interx-manager/logger"
"github.com/saiset-co/sai-interx-manager/types"
"github.com/saiset-co/sai-interx-manager/utils"
"github.com/saiset-co/sai-storage-mongo/external/adapter"
"github.com/KiraCore/sai-interx-manager/logger"
"github.com/KiraCore/sai-interx-manager/types"
"github.com/KiraCore/sai-interx-manager/utils"
"github.com/KiraCore/sai-storage-mongo/external/adapter"
)

func (g *CosmosGateway) tokenRates() (interface{}, error) {
Expand Down
6 changes: 3 additions & 3 deletions manager/gateway/ethereum.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package gateway
import (
"encoding/json"
"errors"
"github.com/saiset-co/sai-service/service"
"github.com/KiraCore/sai-service/service"
"github.com/spf13/cast"
"math/big"
"strconv"
Expand All @@ -13,8 +13,8 @@ import (
jsonrpc2 "github.com/KeisukeYamashita/go-jsonrpc"
"go.uber.org/zap"

"github.com/saiset-co/sai-interx-manager/logger"
"github.com/saiset-co/sai-interx-manager/types"
"github.com/KiraCore/sai-interx-manager/logger"
"github.com/KiraCore/sai-interx-manager/types"
)

type EthereumGateway struct {
Expand Down
6 changes: 3 additions & 3 deletions manager/gateway/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ package gateway
import (
"encoding/json"
"fmt"
"github.com/saiset-co/sai-interx-manager/logger"
"github.com/KiraCore/sai-interx-manager/logger"
"go.uber.org/zap"
"time"

saiService "github.com/saiset-co/sai-service/service"
saiService "github.com/KiraCore/sai-service/service"
"github.com/spf13/cast"

"github.com/saiset-co/sai-interx-manager/types"
"github.com/KiraCore/sai-interx-manager/types"
)

type GatewayFactory struct {
Expand Down
4 changes: 2 additions & 2 deletions manager/gateway/gateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"context"
"encoding/json"
"errors"
"github.com/saiset-co/sai-interx-manager/logger"
"github.com/saiset-co/sai-service/service"
"github.com/KiraCore/sai-interx-manager/logger"
"github.com/KiraCore/sai-service/service"
"go.uber.org/zap"
"io"
"net/http"
Expand Down
2 changes: 1 addition & 1 deletion manager/gateway/retrier.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gateway

import (
"github.com/saiset-co/sai-interx-manager/logger"
"github.com/KiraCore/sai-interx-manager/logger"
"go.uber.org/zap"
"time"
)
Expand Down
6 changes: 3 additions & 3 deletions manager/gateway/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package gateway
import (
"encoding/json"
"errors"
"github.com/saiset-co/sai-interx-manager/logger"
"github.com/saiset-co/sai-service/service"
"github.com/KiraCore/sai-interx-manager/logger"
"github.com/KiraCore/sai-service/service"
"github.com/spf13/cast"
"go.uber.org/zap"
"time"

"github.com/saiset-co/sai-interx-manager/types"
"github.com/KiraCore/sai-interx-manager/types"
)

type StorageGateway struct {
Expand Down
6 changes: 3 additions & 3 deletions manager/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/saiset-co/sai-interx-manager
module github.com/KiraCore/sai-interx-manager

go 1.23.0

Expand All @@ -14,8 +14,8 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/google/uuid v1.6.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2
github.com/saiset-co/sai-service v1.0.5
github.com/saiset-co/sai-storage-mongo v1.1.4
github.com/KiraCore/sai-service v1.0.5
github.com/KiraCore/sai-storage-mongo v1.1.4
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible
github.com/spf13/cast v1.5.0
go.mongodb.org/mongo-driver v1.17.3
Expand Down
6 changes: 3 additions & 3 deletions manager/internal/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (

"go.uber.org/zap"

"github.com/saiset-co/sai-interx-manager/logger"
"github.com/saiset-co/sai-interx-manager/p2p"
"github.com/saiset-co/sai-service/service"
"github.com/KiraCore/sai-interx-manager/logger"
"github.com/KiraCore/sai-interx-manager/p2p"
"github.com/KiraCore/sai-service/service"
)

func (is *InternalService) NewHandler() service.Handler {
Expand Down
12 changes: 6 additions & 6 deletions manager/internal/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import (

"github.com/spf13/cast"

"github.com/saiset-co/sai-interx-manager/gateway"
"github.com/saiset-co/sai-interx-manager/p2p"
"github.com/saiset-co/sai-interx-manager/p2p/config"
"github.com/saiset-co/sai-interx-manager/p2p/net"
"github.com/saiset-co/sai-interx-manager/types"
"github.com/saiset-co/sai-service/service"
"github.com/KiraCore/sai-interx-manager/gateway"
"github.com/KiraCore/sai-interx-manager/p2p"
"github.com/KiraCore/sai-interx-manager/p2p/config"
"github.com/KiraCore/sai-interx-manager/p2p/net"
"github.com/KiraCore/sai-interx-manager/types"
"github.com/KiraCore/sai-service/service"
)

type InternalService struct {
Expand Down
6 changes: 3 additions & 3 deletions manager/main.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package main

import (
"github.com/saiset-co/sai-interx-manager/internal"
"github.com/saiset-co/sai-interx-manager/logger"
"github.com/KiraCore/sai-interx-manager/internal"
"github.com/KiraCore/sai-interx-manager/logger"

"github.com/saiset-co/sai-service/service"
"github.com/KiraCore/sai-service/service"
)

func main() {
Expand Down
12 changes: 6 additions & 6 deletions manager/p2p/balancer/balancer.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import (
"net"
"net/http"

saiService "github.com/saiset-co/sai-service/service"
saiService "github.com/KiraCore/sai-service/service"
"go.uber.org/zap"

"github.com/saiset-co/sai-interx-manager/logger"
"github.com/saiset-co/sai-interx-manager/p2p"
"github.com/saiset-co/sai-interx-manager/p2p/metrics"
"github.com/saiset-co/sai-interx-manager/p2p/utils"
"github.com/saiset-co/sai-interx-manager/types"
"github.com/KiraCore/sai-interx-manager/logger"
"github.com/KiraCore/sai-interx-manager/p2p"
"github.com/KiraCore/sai-interx-manager/p2p/metrics"
"github.com/KiraCore/sai-interx-manager/p2p/utils"
"github.com/KiraCore/sai-interx-manager/types"
)

type LoadBalancer struct {
Expand Down
2 changes: 1 addition & 1 deletion manager/p2p/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package config
import (
"time"

"github.com/saiset-co/sai-interx-manager/p2p"
"github.com/KiraCore/sai-interx-manager/p2p"
)

type NetworkConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion manager/p2p/config/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package config
import (
"time"

"github.com/saiset-co/sai-interx-manager/p2p"
"github.com/KiraCore/sai-interx-manager/p2p"
)

type Option func(*NetworkConfig)
Expand Down
8 changes: 4 additions & 4 deletions manager/p2p/metrics/collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"sync"
"time"

saiService "github.com/saiset-co/sai-service/service"
saiService "github.com/KiraCore/sai-service/service"

"github.com/saiset-co/sai-interx-manager/p2p"
"github.com/saiset-co/sai-interx-manager/p2p/types"
"github.com/saiset-co/sai-interx-manager/p2p/utils"
"github.com/KiraCore/sai-interx-manager/p2p"
"github.com/KiraCore/sai-interx-manager/p2p/types"
"github.com/KiraCore/sai-interx-manager/p2p/utils"
)

type CollectorImpl struct {
Expand Down
6 changes: 3 additions & 3 deletions manager/p2p/metrics/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package metrics
import (
"time"

saiService "github.com/saiset-co/sai-service/service"
saiService "github.com/KiraCore/sai-service/service"

"github.com/saiset-co/sai-interx-manager/p2p"
"github.com/saiset-co/sai-interx-manager/p2p/types"
"github.com/KiraCore/sai-interx-manager/p2p"
"github.com/KiraCore/sai-interx-manager/p2p/types"
)

type RequestStat struct {
Expand Down
6 changes: 3 additions & 3 deletions manager/p2p/net/join.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package net
import (
"fmt"

"github.com/saiset-co/sai-interx-manager/p2p"
"github.com/saiset-co/sai-interx-manager/p2p/proto"
"github.com/saiset-co/sai-interx-manager/p2p/types"
"github.com/KiraCore/sai-interx-manager/p2p"
"github.com/KiraCore/sai-interx-manager/p2p/proto"
"github.com/KiraCore/sai-interx-manager/p2p/types"
)

type joinResponseHandler struct {
Expand Down
10 changes: 5 additions & 5 deletions manager/p2p/net/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (

"go.uber.org/zap"

"github.com/saiset-co/sai-interx-manager/logger"
"github.com/saiset-co/sai-interx-manager/p2p"
"github.com/saiset-co/sai-interx-manager/p2p/balancer"
"github.com/saiset-co/sai-interx-manager/p2p/config"
"github.com/saiset-co/sai-interx-manager/p2p/metrics"
"github.com/KiraCore/sai-interx-manager/logger"
"github.com/KiraCore/sai-interx-manager/p2p"
"github.com/KiraCore/sai-interx-manager/p2p/balancer"
"github.com/KiraCore/sai-interx-manager/p2p/config"
"github.com/KiraCore/sai-interx-manager/p2p/metrics"
)

type Network struct {
Expand Down
2 changes: 1 addition & 1 deletion manager/p2p/net/peer.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net"
"sync"

"github.com/saiset-co/sai-interx-manager/p2p"
"github.com/KiraCore/sai-interx-manager/p2p"
)

type PeerStatus struct {
Expand Down
Loading
Loading