chore: send one msg per tx if batch of msgs fails

.github/workflows/ci.yml

@@ -12,7 +12,7 @@
       go-version: '1.23'
       go-lint-version: 'v1.60.2'
       run-unit-tests: true
-      run-integration-tests: true
+      run-integration-tests: false
       run-lint: true
       run-build: true
       run-gosec: true
@@ -55,3 +55,61 @@
       dockerContext: ./
       repoName: covenant-signer
       docker_scan: true
+
+###############################################################################
+###                                   E2E                                   ###
+###############################################################################
+
+  e2e-cov-signer:
+      runs-on: ubuntu-22.04
+      steps:
+        - name: Checkout repository
+          uses: actions/checkout@v4
+        - name: Login to Docker Hub
+          uses: docker/login-action@v3
+          with:
+            username: ${{ secrets.DOCKERHUB_USERNAME }}
+            password: ${{ secrets.DOCKERHUB_TOKEN }}
+        - name: Cache Go
+          uses: actions/setup-go@v5
+          with:
+            go-version: 1.23.1
+        - name: Run e2e covenant signer
+          run: |
+            cd covenant-signer; make test-e2e
+
+  e2e-cov-emulator-life:
+      runs-on: ubuntu-22.04
+      steps:
+        - name: Checkout repository
+          uses: actions/checkout@v4
+        - name: Login to Docker Hub
+          uses: docker/login-action@v3
+          with:
+            username: ${{ secrets.DOCKERHUB_USERNAME }}
+            password: ${{ secrets.DOCKERHUB_TOKEN }}
+        - name: Cache Go
+          uses: actions/setup-go@v5
+          with:
+            go-version: 1.23.1
+        - name: Run e2e covenant emulator life cycle
+          run: |
+            make test-e2e-cov-emu-life
+
+  e2e-cov-pending-dels:
+      runs-on: ubuntu-22.04
+      steps:
+        - name: Checkout repository
+          uses: actions/checkout@v4
+        - name: Login to Docker Hub
+          uses: docker/login-action@v3
+          with:
+            username: ${{ secrets.DOCKERHUB_USERNAME }}
+            password: ${{ secrets.DOCKERHUB_TOKEN }}
+        - name: Cache Go
+          uses: actions/setup-go@v5
+          with:
+            go-version: 1.23.1
+        - name: Run e2e covenant emulator pending dels
+          run: |
+            make test-e2e-cov-pending-del

CHANGELOG.md

@@ -43,6 +43,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 * [#95](https://github.com/babylonlabs-io/covenant-emulator/pull/95) removed local signer option
 as the covenant emulator should only connect to a remote signer
 * [#96](https://github.com/babylonlabs-io/covenant-emulator/pull/96) add pagination to `queryDelegationsWithStatus`
+* [#98](https://github.com/babylonlabs-io/covenant-emulator/pull/98) add submission of covenant
+signatures as one msg per transaction if batch of transactions fails
 
 ## v0.11.3
 

Makefile

@@ -59,9 +59,17 @@ test:
 
 test-e2e:
 	cd $(TOOLS_DIR); go install -trimpath $(BABYLON_PKG)
-	go test -mod=readonly -timeout=25m -v $(PACKAGES_E2E) -count=1 --tags=e2e
+	go test -mod=readonly -timeout=5m -v $(PACKAGES_E2E) --tags=e2e
 	cd covenant-signer; make test-e2e
 
+test-e2e-cov-emu-life:
+	cd $(TOOLS_DIR); go install -trimpath $(BABYLON_PKG)
+	go test -run TestCovenantEmulatorLifeCycle -mod=readonly -timeout=5m -v $(PACKAGES_E2E) --tags=e2e
+
+test-e2e-cov-pending-del:
+	cd $(TOOLS_DIR); go install -trimpath $(BABYLON_PKG)
+	go test -run TestQueryPendingDelegations -mod=readonly -timeout=5m -v $(PACKAGES_E2E) --tags=e2e
+
 mock-gen:
 	mkdir -p $(MOCKS_DIR)
 	$(MOCKGEN_CMD) -source=clientcontroller/interface.go -package mocks -destination $(MOCKS_DIR)/babylon.go

clientcontroller/babylon.go

@@ -8,8 +8,11 @@ import (
 
 	sdkmath "cosmossdk.io/math"
 	"github.com/btcsuite/btcd/btcec/v2"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
+	bbn "github.com/babylonlabs-io/babylon/app"
+	appparams "github.com/babylonlabs-io/babylon/app/params"
 	bbnclient "github.com/babylonlabs-io/babylon/client/client"
 	bbntypes "github.com/babylonlabs-io/babylon/types"
 	btcctypes "github.com/babylonlabs-io/babylon/x/btccheckpoint/types"
@@ -36,6 +39,7 @@ type BabylonController struct {
 	bbnClient *bbnclient.Client
 	cfg       *config.BBNConfig
 	btcParams *chaincfg.Params
+	encCfg    *appparams.EncodingConfig
 	logger    *zap.Logger
 }
 
@@ -63,6 +67,7 @@ func NewBabylonController(
 		bc,
 		cfg,
 		btcParams,
+		bbn.GetEncodingConfig(),
 		logger,
 	}, nil
 }
@@ -159,6 +164,37 @@ func (bc *BabylonController) reliablySendMsgs(msgs []sdk.Msg) (*provider.Relayer
 	)
 }
 
+func (bc *BabylonController) reliablySendMsgsAsMultipleTxs(msgs []sdk.Msg) (*provider.RelayerTxResponse, error) {
+	// ctx := context.Background()
+	cfg := bc.bbnClient.GetConfig()
+	encCfg := bc.encCfg
+	// c := bc.bbnClient.GetConfig()
+	// c.acc
+	keybase, err := KeybaseFromCfg(cfg, encCfg.Codec)
+	if err != nil {
+		return nil, err
+	}
+
+	covAddr, err := GetKeyAddressForKey(keybase, cfg.Key)
+	if err != nil {
+		return nil, err
+	}
+
+	covAddrStr := covAddr.String()
+	bc.logger.Debug(
+		"covenant_signing",
+		zap.String("address", covAddrStr),
+	)
+
+	covAcc, err := bc.QueryAccount(covAddrStr)
+	if err != nil {
+		return nil, err
+	}
+
+	_, _, err = reliablySendEachMsgAsTx(cfg, msgs, bc.logger, bc.bbnClient.RPCClient, encCfg, covAcc, expectedErrors, unrecoverableErrors)
+	return nil, err
+}
+
 // SubmitCovenantSigs submits the Covenant signature via a MsgAddCovenantSig to Babylon if the daemon runs in Covenant mode
 // it returns tx hash and error
 func (bc *BabylonController) SubmitCovenantSigs(covSigs []*types.CovenantSigs) (*types.TxResponse, error) {
@@ -174,7 +210,11 @@ func (bc *BabylonController) SubmitCovenantSigs(covSigs []*types.CovenantSigs) (
 			SlashingUnbondingTxSigs: covSig.SlashingUnbondingSigs,
 		})
 	}
-	res, err := bc.reliablySendMsgs(msgs)
+	// res, err := bc.reliablySendMsgs(msgs)
+	// if err != nil {
+	// 	return nil, err
+	// }
+	res, err := bc.reliablySendMsgsAsMultipleTxs(msgs)
 	if err != nil {
 		return nil, err
 	}
@@ -509,3 +549,28 @@ func (bc *BabylonController) QueryBtcLightClientTip() (*btclctypes.BTCHeaderInfo
 
 	return res.Header, nil
 }
+
+// QueryAccount returns the account interface based on the address
+func (bc *BabylonController) QueryAccount(addr string) (sdk.AccountI, error) {
+	ctx, cancel := getContextWithCancel(bc.cfg.Timeout)
+	defer cancel()
+
+	clientCtx := sdkclient.Context{Client: bc.bbnClient.RPCClient}.WithCodec(bc.encCfg.Codec)
+
+	queryClient := authtypes.NewQueryClient(clientCtx)
+
+	req := &authtypes.QueryAccountRequest{
+		Address: addr,
+	}
+	resp, err := queryClient.Account(ctx, req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to query account: %v", err)
+	}
+
+	var account sdk.AccountI
+	if err := bc.encCfg.InterfaceRegistry.UnpackAny(resp.Account, &account); err != nil {
+		return nil, err
+	}
+
+	return account, nil
+}