From b0668aad98f12bc8a6f590a7fb6836a83b179101 Mon Sep 17 00:00:00 2001 From: felipemadero Date: Mon, 1 Jul 2024 20:13:07 -0300 Subject: [PATCH] Bridge backwards compat (#2010) * backward compatible bridge deploy * add missing files --- .../tokentransferrercmd/deploy.go | 2 +- .../tokentransferrercmd/tokentransferrer.go | 2 +- cmd/teleportercmd/bridgecmd/bridge.go | 23 +++++++++++++++++++ cmd/teleportercmd/bridgecmd/deploy.go | 22 ++++++++++++++++++ cmd/teleportercmd/teleporter.go | 3 +++ 5 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 cmd/teleportercmd/bridgecmd/bridge.go create mode 100644 cmd/teleportercmd/bridgecmd/deploy.go diff --git a/cmd/interchaincmd/tokentransferrercmd/deploy.go b/cmd/interchaincmd/tokentransferrercmd/deploy.go index 8d8b88dad..eede624dc 100644 --- a/cmd/interchaincmd/tokentransferrercmd/deploy.go +++ b/cmd/interchaincmd/tokentransferrercmd/deploy.go @@ -44,7 +44,7 @@ var ( ) // avalanche interchain tokenTransferrer deploy -func newDeployCmd() *cobra.Command { +func NewDeployCmd() *cobra.Command { cmd := &cobra.Command{ Use: "deploy", Short: "Deploys a Token Transferrer into a given Network and Subnets", diff --git a/cmd/interchaincmd/tokentransferrercmd/tokentransferrer.go b/cmd/interchaincmd/tokentransferrercmd/tokentransferrer.go index 1b10a69b3..f72a064ff 100644 --- a/cmd/interchaincmd/tokentransferrercmd/tokentransferrer.go +++ b/cmd/interchaincmd/tokentransferrercmd/tokentransferrer.go @@ -20,6 +20,6 @@ func NewCmd(injectedApp *application.Avalanche) *cobra.Command { } app = injectedApp // tokenTransferrer deploy - cmd.AddCommand(newDeployCmd()) + cmd.AddCommand(NewDeployCmd()) return cmd } diff --git a/cmd/teleportercmd/bridgecmd/bridge.go b/cmd/teleportercmd/bridgecmd/bridge.go new file mode 100644 index 000000000..1061c95c6 --- /dev/null +++ b/cmd/teleportercmd/bridgecmd/bridge.go @@ -0,0 +1,23 @@ +// Copyright (C) 2022, Ava Labs, Inc. All rights reserved. +// See the file LICENSE for licensing terms. +package bridgecmd + +import ( + "github.com/ava-labs/avalanche-cli/pkg/cobrautils" + "github.com/spf13/cobra" +) + +// avalanche teleporter bridge +func NewCmd() *cobra.Command { + cmd := &cobra.Command{ + Use: "bridge", + Short: "Manage Teleporter Bridges (deprecation notice: use 'avalanche interchain tokenTransferrer')", + Long: `The bridge command suite provides tools to deploy and manage Teleporter Bridges. + +Deprecation notice: use avalanche interchain tokenTransferrer' instead`, + RunE: cobrautils.CommandSuiteUsage, + } + // contract deploy + cmd.AddCommand(newDeployCmd()) + return cmd +} diff --git a/cmd/teleportercmd/bridgecmd/deploy.go b/cmd/teleportercmd/bridgecmd/deploy.go new file mode 100644 index 000000000..170195689 --- /dev/null +++ b/cmd/teleportercmd/bridgecmd/deploy.go @@ -0,0 +1,22 @@ +// Copyright (C) 2022, Ava Labs, Inc. All rights reserved. +// See the file LICENSE for licensing terms. +package bridgecmd + +import ( + _ "embed" + + "github.com/ava-labs/avalanche-cli/cmd/interchaincmd/tokentransferrercmd" + + "github.com/spf13/cobra" +) + +// avalanche teleporter bridge deploy +func newDeployCmd() *cobra.Command { + cmd := tokentransferrercmd.NewDeployCmd() + cmd.Use = "deploy" + cmd.Short = "Deploys Token Bridge into a given Network and Subnets (deprecation notice: use 'avalanche interchain tokenTransferrer deploy')" + cmd.Long = `Deploys Token Bridge into a given Network and Subnets + +Deprecation notice: use 'avalanche interchain tokenTransferrer deploy` + return cmd +} diff --git a/cmd/teleportercmd/teleporter.go b/cmd/teleportercmd/teleporter.go index 584b22bff..9691d4c56 100644 --- a/cmd/teleportercmd/teleporter.go +++ b/cmd/teleportercmd/teleporter.go @@ -3,6 +3,7 @@ package teleportercmd import ( + "github.com/ava-labs/avalanche-cli/cmd/teleportercmd/bridgecmd" "github.com/ava-labs/avalanche-cli/cmd/teleportercmd/relayercmd" "github.com/ava-labs/avalanche-cli/pkg/application" "github.com/ava-labs/avalanche-cli/pkg/cobrautils" @@ -27,5 +28,7 @@ with Teleporter-Enabled Subnets.`, cmd.AddCommand(newDeployCmd()) // teleporter relayer cmd.AddCommand(relayercmd.NewCmd(app)) + // teleporter bridge + cmd.AddCommand(bridgecmd.NewCmd()) return cmd }