diff --git a/rolling-shutter/gnosisaccessnode/node.go b/rolling-shutter/gnosisaccessnode/node.go index 0dabcd721..277a3dfb3 100644 --- a/rolling-shutter/gnosisaccessnode/node.go +++ b/rolling-shutter/gnosisaccessnode/node.go @@ -9,8 +9,8 @@ import ( "github.com/shutter-network/shutter/shlib/shcrypto" obskeyperdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync" - syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event" + chainsync "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync" + syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/metricsserver" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service" "github.com/shutter-network/rolling-shutter/rolling-shutter/p2p" diff --git a/rolling-shutter/keyperimpl/gnosis/keyper.go b/rolling-shutter/keyperimpl/gnosis/keyper.go index fa5a9b21f..134bc67eb 100644 --- a/rolling-shutter/keyperimpl/gnosis/keyper.go +++ b/rolling-shutter/keyperimpl/gnosis/keyper.go @@ -20,9 +20,9 @@ import ( "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/database" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/beaconapiclient" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/broker" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync" - syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/db" + chainsync "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync" + syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/slotticker" "github.com/shutter-network/rolling-shutter/rolling-shutter/p2p" diff --git a/rolling-shutter/keyperimpl/gnosis/newblock.go b/rolling-shutter/keyperimpl/gnosis/newblock.go index 8a1af2400..ca122bb6e 100644 --- a/rolling-shutter/keyperimpl/gnosis/newblock.go +++ b/rolling-shutter/keyperimpl/gnosis/newblock.go @@ -4,7 +4,7 @@ import ( "context" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley" - syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event" + syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event" ) func (kpr *Keyper) processNewBlock(ctx context.Context, ev *syncevent.LatestBlock) error { diff --git a/rolling-shutter/keyperimpl/gnosis/newkeyperset.go b/rolling-shutter/keyperimpl/gnosis/newkeyperset.go index 801c379de..afedd4205 100644 --- a/rolling-shutter/keyperimpl/gnosis/newkeyperset.go +++ b/rolling-shutter/keyperimpl/gnosis/newkeyperset.go @@ -9,7 +9,7 @@ import ( obskeyper "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley" - syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event" + syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event" "github.com/shutter-network/rolling-shutter/rolling-shutter/shdb" ) diff --git a/rolling-shutter/keyperimpl/optimism/bootstrap/bootstrap.go b/rolling-shutter/keyperimpl/optimism/bootstrap/bootstrap.go index 439f69cc4..f3ef60c06 100644 --- a/rolling-shutter/keyperimpl/optimism/bootstrap/bootstrap.go +++ b/rolling-shutter/keyperimpl/optimism/bootstrap/bootstrap.go @@ -10,7 +10,7 @@ import ( "github.com/tendermint/tendermint/rpc/client/http" "github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/fx" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event" + "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event" "github.com/shutter-network/rolling-shutter/rolling-shutter/shmsg" ) diff --git a/rolling-shutter/keyperimpl/optimism/bootstrap/keyperset.go b/rolling-shutter/keyperimpl/optimism/bootstrap/keyperset.go index cbf30cee3..ef5aa4dcb 100644 --- a/rolling-shutter/keyperimpl/optimism/bootstrap/keyperset.go +++ b/rolling-shutter/keyperimpl/optimism/bootstrap/keyperset.go @@ -6,9 +6,9 @@ import ( "errors" "os" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number" + chainsync "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync" + "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event" ) func GetKeyperSet(ctx context.Context, config *Config) error { diff --git a/rolling-shutter/keyperimpl/optimism/keyper.go b/rolling-shutter/keyperimpl/optimism/keyper.go index 07ec6191e..f652c73ec 100644 --- a/rolling-shutter/keyperimpl/optimism/keyper.go +++ b/rolling-shutter/keyperimpl/optimism/keyper.go @@ -17,11 +17,11 @@ import ( "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/optimism/database" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/broker" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync" - syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/configuration" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/db" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/identitypreimage" + legacychainsync "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync" + syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service" "github.com/shutter-network/rolling-shutter/rolling-shutter/shdb" ) @@ -30,7 +30,7 @@ var ErrParseKeyperSet = errors.New("can't parse KeyperSet") type Keyper struct { core *keyper.KeyperCore - l2Client *chainsync.Client + l2Client *legacychainsync.Client dbpool *pgxpool.Pool config *config.Config @@ -79,12 +79,12 @@ func (kpr *Keyper) Start(ctx context.Context, runner service.Runner) error { return errors.Wrap(err, "can't instantiate keyper core") } // TODO: wrap the logger and pass in - kpr.l2Client, err = chainsync.NewClient( + kpr.l2Client, err = legacychainsync.NewClient( ctx, - chainsync.WithClientURL(kpr.config.Optimism.JSONRPCURL), - chainsync.WithSyncNewBlock(kpr.newBlock), - chainsync.WithSyncNewKeyperSet(kpr.newKeyperSet), - chainsync.WithPrivateKey(kpr.config.Optimism.PrivateKey.Key), + legacychainsync.WithClientURL(kpr.config.Optimism.JSONRPCURL), + legacychainsync.WithSyncNewBlock(kpr.newBlock), + legacychainsync.WithSyncNewKeyperSet(kpr.newKeyperSet), + legacychainsync.WithPrivateKey(kpr.config.Optimism.PrivateKey.Key), ) if err != nil { return err diff --git a/rolling-shutter/medley/chainsync/client.go b/rolling-shutter/medley/legacychainsync/client.go similarity index 98% rename from rolling-shutter/medley/chainsync/client.go rename to rolling-shutter/medley/legacychainsync/client.go index 7d2bd57de..c254723da 100644 --- a/rolling-shutter/medley/chainsync/client.go +++ b/rolling-shutter/medley/legacychainsync/client.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" "github.com/shutter-network/shop-contracts/bindings" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/syncer" + "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/client" + "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event" + "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/syncer" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/logger" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service" diff --git a/rolling-shutter/medley/chainsync/client/client.go b/rolling-shutter/medley/legacychainsync/client/client.go similarity index 100% rename from rolling-shutter/medley/chainsync/client/client.go rename to rolling-shutter/medley/legacychainsync/client/client.go diff --git a/rolling-shutter/medley/chainsync/event/events.go b/rolling-shutter/medley/legacychainsync/event/events.go similarity index 100% rename from rolling-shutter/medley/chainsync/event/events.go rename to rolling-shutter/medley/legacychainsync/event/events.go diff --git a/rolling-shutter/medley/chainsync/event/handler.go b/rolling-shutter/medley/legacychainsync/event/handler.go similarity index 100% rename from rolling-shutter/medley/chainsync/event/handler.go rename to rolling-shutter/medley/legacychainsync/event/handler.go diff --git a/rolling-shutter/medley/chainsync/options.go b/rolling-shutter/medley/legacychainsync/options.go similarity index 98% rename from rolling-shutter/medley/chainsync/options.go rename to rolling-shutter/medley/legacychainsync/options.go index 580876243..d65094c8a 100644 --- a/rolling-shutter/medley/chainsync/options.go +++ b/rolling-shutter/medley/legacychainsync/options.go @@ -11,10 +11,10 @@ import ( "github.com/shutter-network/shop-contracts/bindings" "github.com/shutter-network/shop-contracts/predeploy" - syncclient "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/syncer" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number" + syncclient "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/client" + "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event" + "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/syncer" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service" ) diff --git a/rolling-shutter/medley/chainsync/syncer/eonpubkey.go b/rolling-shutter/medley/legacychainsync/syncer/eonpubkey.go similarity index 98% rename from rolling-shutter/medley/chainsync/syncer/eonpubkey.go rename to rolling-shutter/medley/legacychainsync/syncer/eonpubkey.go index cfb7f2823..3792e4aa1 100644 --- a/rolling-shutter/medley/chainsync/syncer/eonpubkey.go +++ b/rolling-shutter/medley/legacychainsync/syncer/eonpubkey.go @@ -9,8 +9,8 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/shutter-network/shop-contracts/bindings" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event" + "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/client" + "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service" ) diff --git a/rolling-shutter/medley/chainsync/syncer/keyperset.go b/rolling-shutter/medley/legacychainsync/syncer/keyperset.go similarity index 99% rename from rolling-shutter/medley/chainsync/syncer/keyperset.go rename to rolling-shutter/medley/legacychainsync/syncer/keyperset.go index 7552807b6..07f1b9207 100644 --- a/rolling-shutter/medley/chainsync/syncer/keyperset.go +++ b/rolling-shutter/medley/legacychainsync/syncer/keyperset.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" "github.com/shutter-network/shop-contracts/bindings" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event" + "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/client" + "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service" ) diff --git a/rolling-shutter/medley/chainsync/syncer/shutterstate.go b/rolling-shutter/medley/legacychainsync/syncer/shutterstate.go similarity index 98% rename from rolling-shutter/medley/chainsync/syncer/shutterstate.go rename to rolling-shutter/medley/legacychainsync/syncer/shutterstate.go index decd627db..2602eb925 100644 --- a/rolling-shutter/medley/chainsync/syncer/shutterstate.go +++ b/rolling-shutter/medley/legacychainsync/syncer/shutterstate.go @@ -8,8 +8,8 @@ import ( "github.com/pkg/errors" "github.com/shutter-network/shop-contracts/bindings" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event" + "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/client" + "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service" ) diff --git a/rolling-shutter/medley/chainsync/syncer/unsafehead.go b/rolling-shutter/medley/legacychainsync/syncer/unsafehead.go similarity index 96% rename from rolling-shutter/medley/chainsync/syncer/unsafehead.go rename to rolling-shutter/medley/legacychainsync/syncer/unsafehead.go index 08dd2a309..0f01f9f67 100644 --- a/rolling-shutter/medley/chainsync/syncer/unsafehead.go +++ b/rolling-shutter/medley/legacychainsync/syncer/unsafehead.go @@ -7,8 +7,8 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/log" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event" + "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/client" + "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service" ) diff --git a/rolling-shutter/medley/chainsync/syncer/util.go b/rolling-shutter/medley/legacychainsync/syncer/util.go similarity index 98% rename from rolling-shutter/medley/chainsync/syncer/util.go rename to rolling-shutter/medley/legacychainsync/syncer/util.go index 0c44cf3dc..c40712147 100644 --- a/rolling-shutter/medley/chainsync/syncer/util.go +++ b/rolling-shutter/medley/legacychainsync/syncer/util.go @@ -8,8 +8,8 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/pkg/errors" - "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number" + "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/client" ) var (