diff --git a/rolling-shutter/eonkeypublisher/eonkeypublisher.go b/rolling-shutter/eonkeypublisher/eonkeypublisher.go index e6b88d4b..0c916724 100644 --- a/rolling-shutter/eonkeypublisher/eonkeypublisher.go +++ b/rolling-shutter/eonkeypublisher/eonkeypublisher.go @@ -13,7 +13,9 @@ import ( "github.com/jackc/pgx/v4/pgxpool" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/shutter-network/shop-contracts/bindings" + "github.com/shutter-network/contracts/v2/bindings/eonkeypublish" + "github.com/shutter-network/contracts/v2/bindings/keyperset" + "github.com/shutter-network/contracts/v2/bindings/keypersetmanager" obskeyperdb "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper" "github.com/shutter-network/rolling-shutter/rolling-shutter/keyper" @@ -32,7 +34,7 @@ const ( type EonKeyPublisher struct { dbpool *pgxpool.Pool client *ethclient.Client - keyperSetManager *bindings.KeyperSetManager + keyperSetManager *keypersetmanager.Keypersetmanager privateKey *ecdsa.PrivateKey keys chan keyper.EonPublicKey @@ -44,7 +46,7 @@ func NewEonKeyPublisher( keyperSetManagerAddress common.Address, privateKey *ecdsa.PrivateKey, ) (*EonKeyPublisher, error) { - keyperSetManager, err := bindings.NewKeyperSetManager(keyperSetManagerAddress, client) + keyperSetManager, err := keypersetmanager.NewKeypersetmanager(keyperSetManagerAddress, client) if err != nil { return nil, errors.Wrapf(err, "failed to instantiate keyper set manager contract at address %s", keyperSetManagerAddress.Hex()) } @@ -221,13 +223,13 @@ func (p *EonKeyPublisher) tryPublish(ctx context.Context, key []byte, keyperSetI return nil } -func (p *EonKeyPublisher) getEonKeyPublisherContract(keyperSetIndex uint64) (*bindings.EonKeyPublish, error) { +func (p *EonKeyPublisher) getEonKeyPublisherContract(keyperSetIndex uint64) (*eonkeypublish.Eonkeypublish, error) { opts := &bind.CallOpts{} keyperSetAddress, err := p.keyperSetManager.GetKeyperSetAddress(opts, keyperSetIndex) if err != nil { return nil, errors.Wrapf(err, "failed to get keyper set address from manager for index %d", keyperSetIndex) } - keyperSet, err := bindings.NewKeyperSet(keyperSetAddress, p.client) + keyperSet, err := keyperset.NewKeyperset(keyperSetAddress, p.client) if err != nil { return nil, errors.Wrapf(err, "failed to instantiate keyper set contract at address %s", keyperSetAddress.Hex()) } @@ -235,7 +237,7 @@ func (p *EonKeyPublisher) getEonKeyPublisherContract(keyperSetIndex uint64) (*bi if err != nil { return nil, errors.Wrapf(err, "failed to get eon key publisher contract from keyper set at address %s", keyperSetAddress.Hex()) } - eonKeyPublisher, err := bindings.NewEonKeyPublish(eonKeyPublisherAddress, p.client) + eonKeyPublisher, err := eonkeypublish.NewEonkeypublish(eonKeyPublisherAddress, p.client) if err != nil { return nil, errors.Wrapf(err, "failed to instantiate eon key publisher contract at address %s", eonKeyPublisherAddress.Hex()) } diff --git a/rolling-shutter/go.mod b/rolling-shutter/go.mod index 69a32076..7c688132 100644 --- a/rolling-shutter/go.mod +++ b/rolling-shutter/go.mod @@ -32,8 +32,8 @@ require ( github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.19.1 github.com/rs/zerolog v1.28.0 - github.com/shutter-network/gnosh-contracts v0.4.0 - github.com/shutter-network/shop-contracts v0.0.0-20240407151512-08ef5d8355b6 + github.com/shutter-network/contracts/v2 v2.0.0-beta.2 + github.com/shutter-network/shop-contracts v0.0.0-20240826093107-e2022678a13f github.com/shutter-network/shutter/shlib v0.1.19 github.com/shutter-network/txtypes v0.1.0 github.com/spf13/afero v1.8.2 diff --git a/rolling-shutter/go.sum b/rolling-shutter/go.sum index 552f432f..f86e074f 100644 --- a/rolling-shutter/go.sum +++ b/rolling-shutter/go.sum @@ -877,10 +877,10 @@ github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go. github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= -github.com/shutter-network/gnosh-contracts v0.4.0 h1:2GJcHK9w4lJZMsccklmxDhNnrkRLJDRwsL1acBnAeak= -github.com/shutter-network/gnosh-contracts v0.4.0/go.mod h1:QB0d64ybbVFKMrLjrc1tldri87KNjTmKQjhk9jaso2E= -github.com/shutter-network/shop-contracts v0.0.0-20240407151512-08ef5d8355b6 h1:m6Ti1/IH+GBTtGqyAX3xbh+ruUKvC+m+/uzYDUa+JDQ= -github.com/shutter-network/shop-contracts v0.0.0-20240407151512-08ef5d8355b6/go.mod h1:LEWXLRruvxq9fe2oKtJI3xfzbauhfWTjOczHN61RU+4= +github.com/shutter-network/contracts/v2 v2.0.0-beta.2 h1:cJJUis+ljdDWKAIOkhj8xQjJs/j0aKwoX71AqM5oXHA= +github.com/shutter-network/contracts/v2 v2.0.0-beta.2/go.mod h1:V8KhVM75wyWVSzZJ6GeC9dWCjRrinIQVb7mYNP+knbg= +github.com/shutter-network/shop-contracts v0.0.0-20240826093107-e2022678a13f h1:tp9nqAaz9t4yvnmw1vUw8vBDryvejVmeQiAzARmnUoU= +github.com/shutter-network/shop-contracts v0.0.0-20240826093107-e2022678a13f/go.mod h1:LEWXLRruvxq9fe2oKtJI3xfzbauhfWTjOczHN61RU+4= github.com/shutter-network/shutter/shlib v0.1.19 h1:Fm/PnxAapl5UK4JuJyF2wBh3dYB5ESztnNFcbmzNNOI= github.com/shutter-network/shutter/shlib v0.1.19/go.mod h1:miY10OJ0FKjLZTwvmG0AJNijsjsNDAk6l1tROTj8uzU= github.com/shutter-network/txtypes v0.1.0 h1:QqdiiiB9AiBCSJ/ke6z1ZoDGfu2+1Lgpz5vHzVN4FKc= diff --git a/rolling-shutter/keyperimpl/gnosis/keyper.go b/rolling-shutter/keyperimpl/gnosis/keyper.go index b228d8e9..90f6c251 100644 --- a/rolling-shutter/keyperimpl/gnosis/keyper.go +++ b/rolling-shutter/keyperimpl/gnosis/keyper.go @@ -9,8 +9,8 @@ import ( "github.com/jackc/pgx/v4/pgxpool" "github.com/pkg/errors" "github.com/rs/zerolog/log" - sequencerBindings "github.com/shutter-network/gnosh-contracts/gnoshcontracts/sequencer" - validatorRegistryBindings "github.com/shutter-network/gnosh-contracts/gnoshcontracts/validatorregistry" + sequencerBindings "github.com/shutter-network/contracts/v2/bindings/sequencer" + validatorRegistryBindings "github.com/shutter-network/contracts/v2/bindings/validatorregistry" "golang.org/x/exp/slog" "github.com/shutter-network/rolling-shutter/rolling-shutter/eonkeypublisher" diff --git a/rolling-shutter/keyperimpl/gnosis/sequencersyncer.go b/rolling-shutter/keyperimpl/gnosis/sequencersyncer.go index c9c3313c..3af1f1ca 100644 --- a/rolling-shutter/keyperimpl/gnosis/sequencersyncer.go +++ b/rolling-shutter/keyperimpl/gnosis/sequencersyncer.go @@ -14,7 +14,7 @@ import ( "github.com/jackc/pgx/v4/pgxpool" "github.com/pkg/errors" "github.com/rs/zerolog/log" - sequencerBindings "github.com/shutter-network/gnosh-contracts/gnoshcontracts/sequencer" + sequencerBindings "github.com/shutter-network/contracts/v2/bindings/sequencer" "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/database" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley" diff --git a/rolling-shutter/keyperimpl/gnosis/validatorsyncer.go b/rolling-shutter/keyperimpl/gnosis/validatorsyncer.go index f69585bd..8b80bfaf 100644 --- a/rolling-shutter/keyperimpl/gnosis/validatorsyncer.go +++ b/rolling-shutter/keyperimpl/gnosis/validatorsyncer.go @@ -14,7 +14,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" "github.com/rs/zerolog/log" - validatorRegistryBindings "github.com/shutter-network/gnosh-contracts/gnoshcontracts/validatorregistry" + validatorRegistryBindings "github.com/shutter-network/contracts/v2/bindings/validatorregistry" blst "github.com/supranational/blst/bindings/go" "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/database" diff --git a/rolling-shutter/medley/chainsync/client.go b/rolling-shutter/medley/chainsync/client.go index 7d2bd57d..d8c7905b 100644 --- a/rolling-shutter/medley/chainsync/client.go +++ b/rolling-shutter/medley/chainsync/client.go @@ -9,7 +9,8 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/log" "github.com/pkg/errors" - "github.com/shutter-network/shop-contracts/bindings" + "github.com/shutter-network/contracts/v2/bindings/keybroadcastcontract" + "github.com/shutter-network/contracts/v2/bindings/keypersetmanager" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event" @@ -31,8 +32,8 @@ type Client struct { chainID *big.Int privKey *ecdsa.PrivateKey - KeyperSetManager *bindings.KeyperSetManager - KeyBroadcast *bindings.KeyBroadcastContract + KeyperSetManager *keypersetmanager.Keypersetmanager + KeyBroadcast *keybroadcastcontract.Keybroadcastcontract sssync *syncer.ShutterStateSyncer kssync *syncer.KeyperSetSyncer diff --git a/rolling-shutter/medley/chainsync/options.go b/rolling-shutter/medley/chainsync/options.go index 58087624..51e16c36 100644 --- a/rolling-shutter/medley/chainsync/options.go +++ b/rolling-shutter/medley/chainsync/options.go @@ -8,7 +8,8 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/log" "github.com/pkg/errors" - "github.com/shutter-network/shop-contracts/bindings" + "github.com/shutter-network/contracts/v2/bindings/keybroadcastcontract" + "github.com/shutter-network/contracts/v2/bindings/keypersetmanager" "github.com/shutter-network/shop-contracts/predeploy" syncclient "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client" @@ -80,7 +81,7 @@ func (o *options) apply(ctx context.Context, c *Client) error { o.syncStart = number.NewBlockNumber(&latestBlock) } - c.KeyperSetManager, err = bindings.NewKeyperSetManager(*o.keyperSetManagerAddress, client) + c.KeyperSetManager, err = keypersetmanager.NewKeypersetmanager(*o.keyperSetManagerAddress, client) if err != nil { return err } @@ -95,7 +96,7 @@ func (o *options) apply(ctx context.Context, c *Client) error { c.services = append(c.services, c.kssync) } - c.KeyBroadcast, err = bindings.NewKeyBroadcastContract(*o.keyBroadcastContractAddress, client) + c.KeyBroadcast, err = keybroadcastcontract.NewKeybroadcastcontract(*o.keyBroadcastContractAddress, client) if err != nil { return err } diff --git a/rolling-shutter/medley/chainsync/syncer/eonpubkey.go b/rolling-shutter/medley/chainsync/syncer/eonpubkey.go index cfb7f282..35fc260c 100644 --- a/rolling-shutter/medley/chainsync/syncer/eonpubkey.go +++ b/rolling-shutter/medley/chainsync/syncer/eonpubkey.go @@ -7,7 +7,8 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/log" - "github.com/shutter-network/shop-contracts/bindings" + "github.com/shutter-network/contracts/v2/bindings/keybroadcastcontract" + "github.com/shutter-network/contracts/v2/bindings/keypersetmanager" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event" @@ -18,12 +19,12 @@ import ( type EonPubKeySyncer struct { Client client.Client Log log.Logger - KeyBroadcast *bindings.KeyBroadcastContract - KeyperSetManager *bindings.KeyperSetManager + KeyBroadcast *keybroadcastcontract.Keybroadcastcontract + KeyperSetManager *keypersetmanager.Keypersetmanager StartBlock *number.BlockNumber Handler event.EonPublicKeyHandler - keyBroadcastCh chan *bindings.KeyBroadcastContractEonKeyBroadcast + keyBroadcastCh chan *keybroadcastcontract.KeybroadcastcontractEonKeyBroadcast } func (s *EonPubKeySyncer) Start(ctx context.Context, runner service.Runner) error { @@ -55,7 +56,7 @@ func (s *EonPubKeySyncer) Start(ctx context.Context, runner service.Runner) erro Start: s.StartBlock.ToUInt64Ptr(), Context: ctx, } - s.keyBroadcastCh = make(chan *bindings.KeyBroadcastContractEonKeyBroadcast, channelSize) + s.keyBroadcastCh = make(chan *keybroadcastcontract.KeybroadcastcontractEonKeyBroadcast, channelSize) subs, err := s.KeyBroadcast.WatchEonKeyBroadcast(watchOpts, s.keyBroadcastCh) // FIXME: what to do on subs.Error() if err != nil { diff --git a/rolling-shutter/medley/chainsync/syncer/keyperset.go b/rolling-shutter/medley/chainsync/syncer/keyperset.go index 7552807b..61e7df93 100644 --- a/rolling-shutter/medley/chainsync/syncer/keyperset.go +++ b/rolling-shutter/medley/chainsync/syncer/keyperset.go @@ -7,7 +7,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" "github.com/pkg/errors" - "github.com/shutter-network/shop-contracts/bindings" + "github.com/shutter-network/contracts/v2/bindings/keyperset" + "github.com/shutter-network/contracts/v2/bindings/keypersetmanager" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event" @@ -23,12 +24,12 @@ const channelSize = 10 type KeyperSetSyncer struct { Client client.Client - Contract *bindings.KeyperSetManager + Contract *keypersetmanager.Keypersetmanager Log log.Logger StartBlock *number.BlockNumber Handler event.KeyperSetHandler - keyperAddedCh chan *bindings.KeyperSetManagerKeyperSetAdded + keyperAddedCh chan *keypersetmanager.KeypersetmanagerKeyperSetAdded } func (s *KeyperSetSyncer) Start(ctx context.Context, runner service.Runner) error { @@ -65,7 +66,7 @@ func (s *KeyperSetSyncer) Start(ctx context.Context, runner service.Runner) erro ) } } - s.keyperAddedCh = make(chan *bindings.KeyperSetManagerKeyperSetAdded, channelSize) + s.keyperAddedCh = make(chan *keypersetmanager.KeypersetmanagerKeyperSetAdded, channelSize) subs, err := s.Contract.WatchKeyperSetAdded(watchOpts, s.keyperAddedCh) // FIXME: what to do on subs.Error() if err != nil { @@ -171,7 +172,7 @@ func (s *KeyperSetSyncer) newEvent( if err := guardCallOpts(opts, false); err != nil { return nil, err } - ks, err := bindings.NewKeyperSet(keyperSetContract, s.Client) + ks, err := keyperset.NewKeyperset(keyperSetContract, s.Client) if err != nil { return nil, errors.Wrap(err, "could not bind to KeyperSet contract") } diff --git a/rolling-shutter/medley/chainsync/syncer/shutterstate.go b/rolling-shutter/medley/chainsync/syncer/shutterstate.go index decd627d..f8dd116e 100644 --- a/rolling-shutter/medley/chainsync/syncer/shutterstate.go +++ b/rolling-shutter/medley/chainsync/syncer/shutterstate.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/log" "github.com/pkg/errors" - "github.com/shutter-network/shop-contracts/bindings" + "github.com/shutter-network/contracts/v2/bindings/keypersetmanager" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client" "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event" @@ -16,13 +16,13 @@ import ( type ShutterStateSyncer struct { Client client.Client - Contract *bindings.KeyperSetManager + Contract *keypersetmanager.Keypersetmanager StartBlock *number.BlockNumber Log log.Logger Handler event.ShutterStateHandler - pausedCh chan *bindings.KeyperSetManagerPaused - unpausedCh chan *bindings.KeyperSetManagerUnpaused + pausedCh chan *keypersetmanager.KeypersetmanagerPaused + unpausedCh chan *keypersetmanager.KeypersetmanagerUnpaused } func (s *ShutterStateSyncer) GetShutterState(ctx context.Context, opts *bind.CallOpts) (*event.ShutterState, error) { @@ -48,7 +48,7 @@ func (s *ShutterStateSyncer) Start(ctx context.Context, runner service.Runner) e Start: s.StartBlock.ToUInt64Ptr(), // nil means latest Context: ctx, } - s.pausedCh = make(chan *bindings.KeyperSetManagerPaused) + s.pausedCh = make(chan *keypersetmanager.KeypersetmanagerPaused) subs, err := s.Contract.WatchPaused(watchOpts, s.pausedCh) // FIXME: what to do on subs.Error() if err != nil { @@ -56,7 +56,7 @@ func (s *ShutterStateSyncer) Start(ctx context.Context, runner service.Runner) e } runner.Defer(subs.Unsubscribe) - s.unpausedCh = make(chan *bindings.KeyperSetManagerUnpaused) + s.unpausedCh = make(chan *keypersetmanager.KeypersetmanagerUnpaused) subs, err = s.Contract.WatchUnpaused(watchOpts, s.unpausedCh) // FIXME: what to do on subs.Error() if err != nil {