diff --git a/cmd/fix_block_timestamps/main.go b/cmd/fix_block_timestamps/main.go index 2cab4e6..2957005 100644 --- a/cmd/fix_block_timestamps/main.go +++ b/cmd/fix_block_timestamps/main.go @@ -4,14 +4,15 @@ import ( "context" "fmt" "time" - "tokenbridge-monitor/config" - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" - "tokenbridge-monitor/ethclient" - "tokenbridge-monitor/logging" - "tokenbridge-monitor/repository" "github.com/sirupsen/logrus" + + "github.com/poanetwork/tokenbridge-monitor/config" + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" + "github.com/poanetwork/tokenbridge-monitor/ethclient" + "github.com/poanetwork/tokenbridge-monitor/logging" + "github.com/poanetwork/tokenbridge-monitor/repository" ) func main() { diff --git a/cmd/monitor/main.go b/cmd/monitor/main.go index 4a8e76e..57dfaca 100644 --- a/cmd/monitor/main.go +++ b/cmd/monitor/main.go @@ -5,15 +5,16 @@ import ( "net/http" "os" "os/signal" - "tokenbridge-monitor/config" - "tokenbridge-monitor/db" - "tokenbridge-monitor/ethclient" - "tokenbridge-monitor/logging" - "tokenbridge-monitor/monitor" - "tokenbridge-monitor/presenter" - "tokenbridge-monitor/repository" "github.com/prometheus/client_golang/prometheus/promhttp" + + "github.com/poanetwork/tokenbridge-monitor/config" + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/ethclient" + "github.com/poanetwork/tokenbridge-monitor/logging" + "github.com/poanetwork/tokenbridge-monitor/monitor" + "github.com/poanetwork/tokenbridge-monitor/presenter" + "github.com/poanetwork/tokenbridge-monitor/repository" ) func main() { diff --git a/contract/bridge_contract.go b/contract/bridge_contract.go index fe18396..e601c71 100644 --- a/contract/bridge_contract.go +++ b/contract/bridge_contract.go @@ -3,11 +3,12 @@ package contract import ( "context" "fmt" - "tokenbridge-monitor/config" - "tokenbridge-monitor/contract/abi" - "tokenbridge-monitor/ethclient" "github.com/ethereum/go-ethereum/common" + + "github.com/poanetwork/tokenbridge-monitor/config" + "github.com/poanetwork/tokenbridge-monitor/contract/abi" + "github.com/poanetwork/tokenbridge-monitor/ethclient" ) type BridgeContract struct { diff --git a/contract/contract.go b/contract/contract.go index bd0b538..d4a38f3 100644 --- a/contract/contract.go +++ b/contract/contract.go @@ -3,12 +3,13 @@ package contract import ( "context" "fmt" - "tokenbridge-monitor/entity" - "tokenbridge-monitor/ethclient" "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" + + "github.com/poanetwork/tokenbridge-monitor/entity" + "github.com/poanetwork/tokenbridge-monitor/ethclient" ) type Contract struct { diff --git a/contract/utils.go b/contract/utils.go index 455bf2c..baa8c24 100644 --- a/contract/utils.go +++ b/contract/utils.go @@ -2,10 +2,11 @@ package contract import ( "fmt" - "tokenbridge-monitor/entity" "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" + + "github.com/poanetwork/tokenbridge-monitor/entity" ) func Indexed(args abi.Arguments) abi.Arguments { diff --git a/db/db.go b/db/db.go index 68c399c..82e9bea 100644 --- a/db/db.go +++ b/db/db.go @@ -6,7 +6,6 @@ import ( "fmt" "runtime" "strings" - "tokenbridge-monitor/config" "github.com/golang-migrate/migrate/v4" _ "github.com/golang-migrate/migrate/v4/database/pgx" @@ -14,6 +13,8 @@ import ( _ "github.com/jackc/pgx/v4/stdlib" "github.com/jmoiron/sqlx" _ "github.com/lib/pq" + + "github.com/poanetwork/tokenbridge-monitor/config" ) type DB struct { diff --git a/go.mod b/go.mod index 41a9543..57c64f9 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module tokenbridge-monitor +module github.com/poanetwork/tokenbridge-monitor go 1.17 diff --git a/monitor/alerts/alert_manager.go b/monitor/alerts/alert_manager.go index 9659066..1981adf 100644 --- a/monitor/alerts/alert_manager.go +++ b/monitor/alerts/alert_manager.go @@ -4,9 +4,10 @@ import ( "context" "fmt" "time" - "tokenbridge-monitor/config" - "tokenbridge-monitor/db" - "tokenbridge-monitor/logging" + + "github.com/poanetwork/tokenbridge-monitor/config" + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/logging" ) type AlertManager struct { diff --git a/monitor/alerts/db_alerts_provider.go b/monitor/alerts/db_alerts_provider.go index 19ee0aa..799f867 100644 --- a/monitor/alerts/db_alerts_provider.go +++ b/monitor/alerts/db_alerts_provider.go @@ -4,11 +4,12 @@ import ( "context" "fmt" "time" - "tokenbridge-monitor/db" sq "github.com/Masterminds/squirrel" "github.com/ethereum/go-ethereum/common" "github.com/lib/pq" + + "github.com/poanetwork/tokenbridge-monitor/db" ) type DBAlertsProvider struct { diff --git a/monitor/alerts/job.go b/monitor/alerts/job.go index 4f4ee94..39a3b40 100644 --- a/monitor/alerts/job.go +++ b/monitor/alerts/job.go @@ -6,11 +6,12 @@ import ( "fmt" "strconv" "time" - "tokenbridge-monitor/logging" "github.com/ethereum/go-ethereum/common" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" + + "github.com/poanetwork/tokenbridge-monitor/logging" ) type AlertJobParams struct { diff --git a/monitor/contract_monitor.go b/monitor/contract_monitor.go index 1dc03b2..d90aaa3 100644 --- a/monitor/contract_monitor.go +++ b/monitor/contract_monitor.go @@ -8,14 +8,6 @@ import ( "sort" "sync" "time" - "tokenbridge-monitor/config" - "tokenbridge-monitor/contract" - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" - "tokenbridge-monitor/ethclient" - "tokenbridge-monitor/logging" - "tokenbridge-monitor/repository" - "tokenbridge-monitor/utils" "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" @@ -23,6 +15,15 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" + + "github.com/poanetwork/tokenbridge-monitor/config" + "github.com/poanetwork/tokenbridge-monitor/contract" + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" + "github.com/poanetwork/tokenbridge-monitor/ethclient" + "github.com/poanetwork/tokenbridge-monitor/logging" + "github.com/poanetwork/tokenbridge-monitor/repository" + "github.com/poanetwork/tokenbridge-monitor/utils" ) const defaultSyncedThreshold = 10 diff --git a/monitor/decoders.go b/monitor/decoders.go index aefed55..92273f0 100644 --- a/monitor/decoders.go +++ b/monitor/decoders.go @@ -3,10 +3,11 @@ package monitor import ( "bytes" "encoding/binary" - "tokenbridge-monitor/entity" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" + + "github.com/poanetwork/tokenbridge-monitor/entity" ) func unmarshalMessage(bridgeID string, direction entity.Direction, encodedData []byte) *entity.Message { diff --git a/monitor/handlers.go b/monitor/handlers.go index 84f2c63..ed3bddf 100644 --- a/monitor/handlers.go +++ b/monitor/handlers.go @@ -5,15 +5,16 @@ import ( "errors" "fmt" "math/big" - "tokenbridge-monitor/config" - "tokenbridge-monitor/contract/abi" - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" - "tokenbridge-monitor/ethclient" - "tokenbridge-monitor/repository" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" + + "github.com/poanetwork/tokenbridge-monitor/config" + "github.com/poanetwork/tokenbridge-monitor/contract/abi" + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" + "github.com/poanetwork/tokenbridge-monitor/ethclient" + "github.com/poanetwork/tokenbridge-monitor/repository" ) type EventHandler func(ctx context.Context, log *entity.Log, data map[string]interface{}) error diff --git a/monitor/monitor.go b/monitor/monitor.go index 71de6ab..a665509 100644 --- a/monitor/monitor.go +++ b/monitor/monitor.go @@ -3,13 +3,14 @@ package monitor import ( "context" "fmt" - "tokenbridge-monitor/config" - "tokenbridge-monitor/contract/abi" - "tokenbridge-monitor/db" - "tokenbridge-monitor/ethclient" - "tokenbridge-monitor/logging" - "tokenbridge-monitor/monitor/alerts" - "tokenbridge-monitor/repository" + + "github.com/poanetwork/tokenbridge-monitor/config" + "github.com/poanetwork/tokenbridge-monitor/contract/abi" + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/ethclient" + "github.com/poanetwork/tokenbridge-monitor/logging" + "github.com/poanetwork/tokenbridge-monitor/monitor/alerts" + "github.com/poanetwork/tokenbridge-monitor/repository" ) type Monitor struct { diff --git a/monitor/types.go b/monitor/types.go index 9fb9b3b..a6a8144 100644 --- a/monitor/types.go +++ b/monitor/types.go @@ -2,9 +2,10 @@ package monitor import ( "math" - "tokenbridge-monitor/entity" "github.com/ethereum/go-ethereum/common" + + "github.com/poanetwork/tokenbridge-monitor/entity" ) type BlocksRange struct { diff --git a/monitor/types_test.go b/monitor/types_test.go index c5f04ac..2601cf8 100644 --- a/monitor/types_test.go +++ b/monitor/types_test.go @@ -2,10 +2,11 @@ package monitor_test import ( "testing" - "tokenbridge-monitor/entity" - "tokenbridge-monitor/monitor" "github.com/stretchr/testify/require" + + "github.com/poanetwork/tokenbridge-monitor/entity" + "github.com/poanetwork/tokenbridge-monitor/monitor" ) func TestSplitBlockRange(t *testing.T) { diff --git a/presenter/middleware.go b/presenter/middleware.go index e2ba4fa..c398296 100644 --- a/presenter/middleware.go +++ b/presenter/middleware.go @@ -4,10 +4,11 @@ import ( "fmt" "net/http" "time" - "tokenbridge-monitor/logging" "github.com/go-chi/chi/v5/middleware" "github.com/sirupsen/logrus" + + "github.com/poanetwork/tokenbridge-monitor/logging" ) func NewRequestLogger(logger logging.Logger) func(next http.Handler) http.Handler { diff --git a/presenter/presenter.go b/presenter/presenter.go index 801d22b..3f01fe3 100644 --- a/presenter/presenter.go +++ b/presenter/presenter.go @@ -8,15 +8,16 @@ import ( "net/http" "regexp" "strconv" - "tokenbridge-monitor/config" - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" - "tokenbridge-monitor/logging" - "tokenbridge-monitor/repository" "github.com/ethereum/go-ethereum/common" "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" + + "github.com/poanetwork/tokenbridge-monitor/config" + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" + "github.com/poanetwork/tokenbridge-monitor/logging" + "github.com/poanetwork/tokenbridge-monitor/repository" ) type Presenter struct { diff --git a/presenter/types.go b/presenter/types.go index 9fff39e..ebaf349 100644 --- a/presenter/types.go +++ b/presenter/types.go @@ -2,10 +2,11 @@ package presenter import ( "time" - "tokenbridge-monitor/entity" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" + + "github.com/poanetwork/tokenbridge-monitor/entity" ) type MessageInfo struct { diff --git a/presenter/utils.go b/presenter/utils.go index abf067d..36cf41e 100644 --- a/presenter/utils.go +++ b/presenter/utils.go @@ -2,7 +2,8 @@ package presenter import ( "fmt" - "tokenbridge-monitor/entity" + + "github.com/poanetwork/tokenbridge-monitor/entity" ) var formats = map[string]string{ diff --git a/repository/postgres/base.go b/repository/postgres/base.go index e38d39e..0af53c1 100644 --- a/repository/postgres/base.go +++ b/repository/postgres/base.go @@ -1,7 +1,7 @@ package postgres import ( - "tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/db" ) type basePostgresRepo struct { diff --git a/repository/postgres/block_timestamps.go b/repository/postgres/block_timestamps.go index 123b79f..480d097 100644 --- a/repository/postgres/block_timestamps.go +++ b/repository/postgres/block_timestamps.go @@ -5,10 +5,11 @@ import ( "database/sql" "errors" "fmt" - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" sq "github.com/Masterminds/squirrel" + + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" ) type blockTimestampsRepo basePostgresRepo diff --git a/repository/postgres/bridge_validators.go b/repository/postgres/bridge_validators.go index 4d78e70..5f85c7c 100644 --- a/repository/postgres/bridge_validators.go +++ b/repository/postgres/bridge_validators.go @@ -5,11 +5,12 @@ import ( "database/sql" "errors" "fmt" - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" sq "github.com/Masterminds/squirrel" "github.com/ethereum/go-ethereum/common" + + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" ) type bridgeValidatorsRepo basePostgresRepo diff --git a/repository/postgres/collected_messages.go b/repository/postgres/collected_messages.go index da231e5..3daf152 100644 --- a/repository/postgres/collected_messages.go +++ b/repository/postgres/collected_messages.go @@ -5,11 +5,12 @@ import ( "database/sql" "errors" "fmt" - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" sq "github.com/Masterminds/squirrel" "github.com/ethereum/go-ethereum/common" + + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" ) type collectedMessagesRepo basePostgresRepo diff --git a/repository/postgres/erc_to_native_messages.go b/repository/postgres/erc_to_native_messages.go index 7ead178..2efa1d3 100644 --- a/repository/postgres/erc_to_native_messages.go +++ b/repository/postgres/erc_to_native_messages.go @@ -5,11 +5,12 @@ import ( "database/sql" "errors" "fmt" - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" sq "github.com/Masterminds/squirrel" "github.com/ethereum/go-ethereum/common" + + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" ) type ercToNativeMessagesRepo basePostgresRepo diff --git a/repository/postgres/executed_information_requests.go b/repository/postgres/executed_information_requests.go index c700de9..6126f5f 100644 --- a/repository/postgres/executed_information_requests.go +++ b/repository/postgres/executed_information_requests.go @@ -5,11 +5,12 @@ import ( "database/sql" "errors" "fmt" - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" sq "github.com/Masterminds/squirrel" "github.com/ethereum/go-ethereum/common" + + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" ) type executedInformationRequestsRepo basePostgresRepo diff --git a/repository/postgres/executed_messages.go b/repository/postgres/executed_messages.go index 19e91a4..42bb543 100644 --- a/repository/postgres/executed_messages.go +++ b/repository/postgres/executed_messages.go @@ -5,11 +5,12 @@ import ( "database/sql" "errors" "fmt" - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" sq "github.com/Masterminds/squirrel" "github.com/ethereum/go-ethereum/common" + + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" ) type executedMessagesRepo basePostgresRepo diff --git a/repository/postgres/information_requests.go b/repository/postgres/information_requests.go index 277d417..339e35f 100644 --- a/repository/postgres/information_requests.go +++ b/repository/postgres/information_requests.go @@ -5,11 +5,12 @@ import ( "database/sql" "errors" "fmt" - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" sq "github.com/Masterminds/squirrel" "github.com/ethereum/go-ethereum/common" + + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" ) type informationRequestsRepo basePostgresRepo diff --git a/repository/postgres/logs.go b/repository/postgres/logs.go index 927b637..000a562 100644 --- a/repository/postgres/logs.go +++ b/repository/postgres/logs.go @@ -3,11 +3,12 @@ package postgres import ( "context" "fmt" - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" sq "github.com/Masterminds/squirrel" "github.com/ethereum/go-ethereum/common" + + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" ) type logsRepo basePostgresRepo diff --git a/repository/postgres/logs_cursors.go b/repository/postgres/logs_cursors.go index 67bdb3b..91821d9 100644 --- a/repository/postgres/logs_cursors.go +++ b/repository/postgres/logs_cursors.go @@ -5,11 +5,12 @@ import ( "database/sql" "errors" "fmt" - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" sq "github.com/Masterminds/squirrel" "github.com/ethereum/go-ethereum/common" + + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" ) type logsCursorsRepo basePostgresRepo diff --git a/repository/postgres/messages.go b/repository/postgres/messages.go index fb582a2..ccf08ae 100644 --- a/repository/postgres/messages.go +++ b/repository/postgres/messages.go @@ -5,11 +5,12 @@ import ( "database/sql" "errors" "fmt" - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" sq "github.com/Masterminds/squirrel" "github.com/ethereum/go-ethereum/common" + + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" ) type messagesRepo basePostgresRepo diff --git a/repository/postgres/sent_information_requests.go b/repository/postgres/sent_information_requests.go index e49372f..ec53f98 100644 --- a/repository/postgres/sent_information_requests.go +++ b/repository/postgres/sent_information_requests.go @@ -5,11 +5,12 @@ import ( "database/sql" "errors" "fmt" - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" sq "github.com/Masterminds/squirrel" "github.com/ethereum/go-ethereum/common" + + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" ) type sentInformationRequestsRepo basePostgresRepo diff --git a/repository/postgres/sent_messages.go b/repository/postgres/sent_messages.go index 9254520..54a614c 100644 --- a/repository/postgres/sent_messages.go +++ b/repository/postgres/sent_messages.go @@ -5,11 +5,12 @@ import ( "database/sql" "errors" "fmt" - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" sq "github.com/Masterminds/squirrel" "github.com/ethereum/go-ethereum/common" + + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" ) type sentMessagesRepo basePostgresRepo diff --git a/repository/postgres/signed_information_requests.go b/repository/postgres/signed_information_requests.go index 7e05cec..253036c 100644 --- a/repository/postgres/signed_information_requests.go +++ b/repository/postgres/signed_information_requests.go @@ -5,11 +5,12 @@ import ( "database/sql" "errors" "fmt" - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" sq "github.com/Masterminds/squirrel" "github.com/ethereum/go-ethereum/common" + + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" ) type signedInformationRequestsRepo basePostgresRepo diff --git a/repository/postgres/signed_messages.go b/repository/postgres/signed_messages.go index 373740c..8ecd5e3 100644 --- a/repository/postgres/signed_messages.go +++ b/repository/postgres/signed_messages.go @@ -5,11 +5,12 @@ import ( "database/sql" "errors" "fmt" - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" sq "github.com/Masterminds/squirrel" "github.com/ethereum/go-ethereum/common" + + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" ) type signedMessagesRepo basePostgresRepo diff --git a/repository/repos.go b/repository/repos.go index c3367fb..dbdf28d 100644 --- a/repository/repos.go +++ b/repository/repos.go @@ -1,9 +1,9 @@ package repository import ( - "tokenbridge-monitor/db" - "tokenbridge-monitor/entity" - "tokenbridge-monitor/repository/postgres" + "github.com/poanetwork/tokenbridge-monitor/db" + "github.com/poanetwork/tokenbridge-monitor/entity" + "github.com/poanetwork/tokenbridge-monitor/repository/postgres" ) type Repo struct {