Ubuntu systemctl support & Fix relayer l2 flow

cosmosutils/binary.go

@@ -237,6 +237,15 @@ func getBinaryURL(version string) string {
 }
 
 func GetInitiaBinaryPath(version string) string {
+	if strings.Contains(version, "@") {
+		parts := strings.Split(version, "@")
+		if len(parts) == 2 {
+			version = parts[1]
+		} else {
+			panic(fmt.Sprintf("invalid version format: %s", version))
+		}
+	}
+
 	userHome, err := os.UserHomeDir()
 	if err != nil {
 		panic(fmt.Sprintf("failed to get user home directory: %v", err))

cosmosutils/cli_query.go

@@ -0,0 +1,45 @@
+package cosmosutils
+
+import (
+	"encoding/json"
+	"fmt"
+	"os/exec"
+
+	"github.com/initia-labs/weave/client"
+)
+
+type InitiadBankBalancesQueryResponse struct {
+	Balances Coins `json:"balances"`
+}
+
+type InitiadQuerier struct {
+	binaryPath string
+}
+
+func NewInitiadQuerier(rest string) *InitiadQuerier {
+	httpClient := client.NewHTTPClient()
+	nodeVersion, url := MustGetInitiaBinaryUrlFromLcd(httpClient, rest)
+	binaryPath := GetInitiaBinaryPath(nodeVersion)
+	MustInstallInitiaBinary(nodeVersion, url, binaryPath)
+
+	return &InitiadQuerier{
+		binaryPath: binaryPath,
+	}
+}
+
+func (iq *InitiadQuerier) QueryBankBalances(address, rpc string) (*Coins, error) {
+	cmd := exec.Command(iq.binaryPath, "query", "bank", "balances", address, "--node", rpc, "--output", "json")
+
+	outputBytes, err := cmd.Output()
+	if err != nil {
+		return nil, fmt.Errorf("failed to query bank balances for %s: %v, output: %s", address, err, string(outputBytes))
+	}
+
+	var queryResponse InitiadBankBalancesQueryResponse
+	err = json.Unmarshal(outputBytes, &queryResponse)
+	if err != nil {
+		panic(fmt.Sprintf("failed to unmarshal JSON: %v", err))
+	}
+
+	return &queryResponse.Balances, nil
+}

models/relayer/init.go

@@ -695,20 +695,14 @@ func waitFetchingBalancesLoading(ctx context.Context) tea.Cmd {
 		if err != nil {
 			panic(fmt.Errorf("cannot fetch balance for l1: %v", err))
 		}
-		if l1Balances.IsZero() {
-			state.l1NeedsFunding = true
-		}
+		state.l1NeedsFunding = l1Balances.IsZero()
 
-		l2ChainId := MustGetL2ChainId(ctx)
-		l2Registry := registry.MustGetL2Registry(registry.InitiaL1Testnet, l2ChainId)
-		l2Rest := l2Registry.MustGetActiveLcd()
-		l2Balances, err := cosmosutils.QueryBankBalances(l2Rest, state.l2RelayerAddress)
+		querier := cosmosutils.NewInitiadQuerier(l1Rest)
+		l2Balances, err := querier.QueryBankBalances(state.l2RelayerAddress, MustGetL2ActiveRpc(ctx))
 		if err != nil {
 			panic(fmt.Errorf("cannot fetch balance for l2: %v", err))
 		}
-		if l2Balances.IsZero() {
-			state.l2NeedsFunding = true
-		}
+		state.l2NeedsFunding = l2Balances.IsZero()
 
 		return ui.EndLoading{
 			Ctx: weavecontext.SetCurrentState(ctx, state),
@@ -971,7 +965,7 @@ func broadcastDefaultPresetFromGasStation(ctx context.Context) tea.Cmd {
 		res, err = cliTx.BroadcastMsgSend(
 			gasStationMnemonic,
 			state.l2RelayerAddress,
-			fmt.Sprintf("%s%s", state.l2FundingAmount, "l2/4b66eb60bf9f503ea97fe4dc96d5c604c1dca14ee988e21510ac4b087bf72671"),
+			fmt.Sprintf("%s%s", state.l2FundingAmount, MustGetL2GasDenom(ctx)),
 			MustGetL2GasPrices(ctx),
 			MustGetL2ActiveRpc(ctx),
 			MustGetL2ChainId(ctx),

service/systemd.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 
 	"github.com/initia-labs/weave/common"
+	"github.com/initia-labs/weave/cosmosutils"
 )
 
 type Systemd struct {
@@ -39,13 +40,20 @@ func (j *Systemd) Create(binaryVersion, appHome string) error {
 		return fmt.Errorf("failed to get user home directory: %v", err)
 	}
 
-	weaveDataPath := filepath.Join(userHome, common.WeaveDataDirectory)
 	binaryName := j.commandName.MustGetBinaryName()
-	binaryPath := filepath.Join(weaveDataPath, binaryVersion, strings.ReplaceAll(binaryVersion, "@", "_"))
+	var binaryPath string
+	switch j.commandName {
+	case Initia:
+		binaryPath = filepath.Dir(cosmosutils.GetInitiaBinaryPath(binaryVersion))
+	case Minitia:
+		binaryPath = filepath.Join(userHome, common.WeaveDataDirectory, binaryVersion, strings.ReplaceAll(binaryVersion, "@", "_"))
+	default:
+		binaryPath = filepath.Join(userHome, common.WeaveDataDirectory)
+	}
 
 	cmd := exec.Command("sudo", "tee", fmt.Sprintf("/etc/systemd/system/%s", j.GetServiceName()))
 	template := LinuxTemplateMap[j.commandName]
-	cmd.Stdin = strings.NewReader(fmt.Sprintf(string(template), binaryName, currentUser.Username, binaryPath, j.GetServiceName(), appHome))
+	cmd.Stdin = strings.NewReader(fmt.Sprintf(string(template), binaryName, currentUser.Username, binaryPath, string(j.commandName), appHome))
 	if err = cmd.Run(); err != nil {
 		return fmt.Errorf("failed to create service: %v", err)
 	}