Contract Event Emission (#283)

Signed-off-by: TwiceBurnt <169301814+2xburnt@users.noreply.github.com>
Co-authored-by: TwiceBurnt <169301814+2xburnt@users.noreply.github.com>
Co-authored-by: peartes <kenny.fale.kf@gmail.com>
Co-authored-by: Eduardo Diaz <eduardo.j.diaz.rodriguez@gmail.com>

Author: 4 people

Makefile

@@ -237,6 +237,12 @@ test-integration-xion-send-platform-fee: compile-integration-tests
 test-integration-xion-abstract-account: compile-integration-tests
 	$(MAKE) run-integration-test TEST_NAME=XionAbstractAccount
 
+test-integration-xion-abstract-account-event: compile_integration_tests
+	$(MAKE) run-integration-test TEST_NAME=XionClientEvent
+
+test-integration-xion-min-default: compile_integration_tests
+	$(MAKE) run-integration-test TEST_NAME=TestXionMinimumFeeDefault
+
 test-integration-xion-min-default: compile-integration-tests
 	$(MAKE) run-integration-test TEST_NAME=TestXionMinimumFeeDefault
 

app/app.go

@@ -563,7 +563,8 @@ func NewWasmApp(
 	// See: https://docs.cosmos.network/main/modules/gov#proposal-messages
 	govRouter := govv1beta1.NewRouter()
 	govRouter.AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler).
-		AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper))
+		AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)).
+		AddRoute(feeabstypes.ModuleName, feeabs.NewHostZoneProposal(app.FeeAbsKeeper))
 	govConfig := govtypes.DefaultConfig()
 	/*
 		Example of setting gov params:

go.mod

@@ -59,7 +59,7 @@ require (
 	github.com/hashicorp/go-metrics v0.5.3
 	github.com/larry0x/abstract-account v0.0.0-20240202022305-255071ed91ee
 	github.com/lestrrat-go/jwx/v2 v2.0.21
-	github.com/osmosis-labs/fee-abstraction/v8 v8.0.1
+	github.com/osmosis-labs/fee-abstraction/v8 v8.0.2
 	github.com/prometheus/client_golang v1.20.5
 	github.com/spf13/cast v1.7.1
 	github.com/spf13/cobra v1.8.1

go.sum

@@ -913,8 +913,8 @@ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
 github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA=
 github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs=
-github.com/osmosis-labs/fee-abstraction/v8 v8.0.1 h1:WTmn5ddKtWZc4Ppz5XRdIUhlI0bQJsN0Yd8ybYpCUiU=
-github.com/osmosis-labs/fee-abstraction/v8 v8.0.1/go.mod h1:oixKpyWv08ZeFgZthXSNjiGz1wOhhJDUlSBXR3zQn+k=
+github.com/osmosis-labs/fee-abstraction/v8 v8.0.2 h1:z8GfKxGqkEB66rO2iDNJ6/IA62ZZlyitOeOvzE11LiY=
+github.com/osmosis-labs/fee-abstraction/v8 v8.0.2/go.mod h1:nNhh1fdDIXVK7xY/ji4qRNCkPEzgPrlJ1FD/ox3U+Oo=
 github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=

integration_tests/abstract_account_test.go

@@ -1,6 +1,7 @@
 package integration_tests
 
 import (
+	"context"
 	"crypto/sha256"
 	"encoding/base64"
 	"encoding/hex"
@@ -29,6 +30,9 @@ import (
 	"github.com/stretchr/testify/require"
 
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
+	cometClient "github.com/cometbft/cometbft/rpc/client"
+	rpchttp "github.com/cometbft/cometbft/rpc/client/http"
+	cometRpcCoreTypes "github.com/cometbft/cometbft/rpc/core/types"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
 	aatypes "github.com/larry0x/abstract-account/x/abstractaccount/types"
@@ -580,7 +584,7 @@ func TestXionAbstractAccount(t *testing.T) {
 		aaContractAddr,
 		path.Join(xion.GetNode().HomeDir(), removeFilePath[len(removeFilePath)-1]),
 		"--chain-id", xion.Config().ChainID,
-		"--authenticator-id", "1",
+		"--nuthenticator-id", "1",
 	)
 	require.NoError(t, err)
 
@@ -617,3 +621,287 @@ func GetAAContractAddress(t *testing.T, txDetails map[string]interface{}) string
 
 	return addr
 }
+
+func TestXionClientEvent(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping in short mode")
+	}
+
+	t.Parallel()
+	td := BuildXionChain(t, "0.0uxion", ModifyInterChainGenesis(ModifyInterChainGenesisFn{ModifyGenesisShortProposals}, [][]string{{votingPeriod, maxDepositPeriod}}))
+	xion, ctx := td.xionChain, td.ctx
+
+	config := types.GetConfig()
+	config.SetBech32PrefixForAccount("xion", "xionpub")
+
+	// Create and Fund User Wallets
+	t.Log("creating and funding user accounts")
+	fundAmount := math.NewInt(10_000_000)
+	xionUser, err := ibctest.GetAndFundTestUserWithMnemonic(ctx, "default", deployerMnemonic, fundAmount, xion)
+	require.NoError(t, err)
+	currentHeight, _ := xion.Height(ctx)
+	err = testutil.WaitForBlocks(ctx, int(currentHeight)+8, xion)
+	require.NoError(t, err)
+	t.Logf("created xion user %s", xionUser.FormattedAddress())
+
+	xionUserBalInitial, err := xion.GetBalance(ctx, xionUser.FormattedAddress(), xion.Config().Denom)
+	require.NoError(t, err)
+	require.Equal(t, fundAmount, xionUserBalInitial)
+
+	// Create a Secondary Key For Rotation
+	recipientKeyName := "recipient-key"
+	err = xion.CreateKey(ctx, recipientKeyName)
+	require.NoError(t, err)
+	receipientKeyAddressBytes, err := xion.GetAddress(ctx, recipientKeyName)
+	require.NoError(t, err)
+	recipientKeyAddress, err := types.Bech32ifyAddressBytes(xion.Config().Bech32Prefix, receipientKeyAddressBytes)
+	require.NoError(t, err)
+
+	// Get Public Key For Funded Account
+	account, err := ExecBin(t, ctx, xion.GetNode(),
+		"keys", "show",
+		xionUser.KeyName(),
+		"--keyring-backend", keyring.BackendTest,
+		"-p",
+	)
+	require.NoError(t, err)
+	t.Log("Funded Account:")
+	for k, v := range account {
+		t.Logf("[%s]: %v", k, v)
+	}
+
+	fp, err := os.Getwd()
+	require.NoError(t, err)
+
+	// Store Wasm Contract
+	codeID, err := xion.StoreContract(ctx, xionUser.FormattedAddress(), path.Join(fp,
+		"integration_tests", "testdata", "contracts", "account-wasm-updatable-event-aarch64.wasm"))
+	require.NoError(t, err)
+
+	// retrieve the hash
+	codeResp, err := ExecQuery(t, ctx, xion.GetNode(),
+		"wasm", "code-info", codeID)
+	require.NoError(t, err)
+	t.Logf("code response: %s", codeResp)
+
+	depositedFunds := fmt.Sprintf("%d%s", 100000, xion.Config().Denom)
+
+	registeredTxHash, err := ExecTx(t, ctx, xion.GetNode(),
+		xionUser.KeyName(),
+		"xion", "register",
+		codeID,
+		xionUser.KeyName(),
+		"--funds", depositedFunds,
+		"--salt", "0",
+		"--authenticator", "Secp256K1",
+		"--chain-id", xion.Config().ChainID,
+	)
+	require.NoError(t, err)
+	t.Logf("tx hash: %s", registeredTxHash)
+
+	txDetails, err := ExecQuery(t, ctx, xion.GetNode(), "tx", registeredTxHash)
+	require.NoError(t, err)
+	t.Logf("TxDetails: %s", txDetails)
+	aaContractAddr := GetAAContractAddress(t, txDetails)
+
+	contractBalance, err := xion.GetBalance(ctx, aaContractAddr, xion.Config().Denom)
+	require.NoError(t, err)
+	require.Equal(t, math.NewInt(100000), contractBalance)
+
+	contractState, err := ExecQuery(t, ctx, xion.GetNode(), "wasm", "contract-state", "smart", aaContractAddr, `{"authenticator_by_i_d":{ "id": 0 }}`)
+	require.NoError(t, err)
+
+	pubkey64, ok := contractState["data"].(string)
+	require.True(t, ok)
+	pubkeyRawJSON, err := base64.StdEncoding.DecodeString(pubkey64)
+	require.NoError(t, err)
+	var pubKeyMap jsonAuthenticator
+	json.Unmarshal(pubkeyRawJSON, &pubKeyMap)
+	require.Equal(t, account["key"], pubKeyMap["Secp256K1"]["pubkey"])
+
+	// Generate Msg Send without signatures
+	jsonMsg := RawJSONMsgSend(t, aaContractAddr, recipientKeyAddress, xion.Config().Denom)
+	require.NoError(t, err)
+	require.True(t, json.Valid(jsonMsg))
+
+	sendFile, err := os.CreateTemp("", "*-msg-bank-send.json")
+	require.NoError(t, err)
+	defer os.Remove(sendFile.Name())
+
+	_, err = sendFile.Write(jsonMsg)
+	require.NoError(t, err)
+
+	err = UploadFileToContainer(t, ctx, xion.GetNode(), sendFile)
+	require.NoError(t, err)
+
+	// Sign and broadcast a transaction
+	sendFilePath := strings.Split(sendFile.Name(), "/")
+	_, err = ExecTx(t, ctx, xion.GetNode(),
+		xionUser.KeyName(),
+		"xion", "sign",
+		xionUser.KeyName(),
+		aaContractAddr,
+		path.Join(xion.GetNode().HomeDir(), sendFilePath[len(sendFilePath)-1]),
+		"--chain-id", xion.Config().ChainID,
+	)
+	require.NoError(t, err)
+
+	err = testutil.WaitForBlocks(ctx, 1, xion)
+	require.NoError(t, err)
+
+	// Confirm the updated balance
+	balance, err := xion.GetBalance(ctx, recipientKeyAddress, xion.Config().Denom)
+	require.NoError(t, err)
+	require.Equal(t, math.NewInt(100000).Uint64(), balance.Uint64())
+
+	// Generate Key Rotation Msg
+	account, err = ExecBin(t, ctx, xion.GetNode(),
+		"keys", "show",
+		xionUser.KeyName(),
+		"--keyring-backend", keyring.BackendTest,
+		"-p",
+	)
+
+	// add secondary authenticator to account. in this case, the same key but in a different position
+	jsonExecMsgStr, err := GenerateTx(t, ctx, xion.GetNode(),
+		xionUser.KeyName(),
+		"xion", "add-authenticator", aaContractAddr,
+		"--authenticator-id", "1",
+		"--chain-id", xion.Config().ChainID,
+	)
+	require.NoError(t, err)
+	jsonExecMsg := []byte(jsonExecMsgStr)
+	require.True(t, json.Valid(jsonExecMsg))
+
+	rotateFile, err := os.CreateTemp("", "*-msg-exec-rotate-key.json")
+	require.NoError(t, err)
+	defer os.Remove(rotateFile.Name())
+
+	_, err = rotateFile.Write(jsonExecMsg)
+	require.NoError(t, err)
+
+	err = UploadFileToContainer(t, ctx, xion.GetNode(), rotateFile)
+	require.NoError(t, err)
+
+	rotateFilePath := strings.Split(rotateFile.Name(), "/")
+
+	_, err = ExecTx(t, ctx, xion.GetNode(),
+		xionUser.KeyName(),
+		"xion", "sign",
+		xionUser.KeyName(),
+		aaContractAddr,
+		path.Join(xion.GetNode().HomeDir(), rotateFilePath[len(rotateFilePath)-1]),
+		"--chain-id", xion.Config().ChainID,
+	)
+	require.NoError(t, err)
+	updatedContractState, err := ExecQuery(t, ctx, xion.GetNode(), "wasm", "contract-state", "smart", aaContractAddr, `{"authenticator_by_i_d":{ "id": 1 }}`)
+	require.NoError(t, err)
+
+	updatedPubKey, ok := updatedContractState["data"].(string)
+	require.True(t, ok)
+
+	updatedPubKeyRawJSON, err := base64.StdEncoding.DecodeString(updatedPubKey)
+	require.NoError(t, err)
+	var updatedPubKeyMap jsonAuthenticator
+
+	err = json.Unmarshal(updatedPubKeyRawJSON, &updatedPubKeyMap)
+	require.NoError(t, err)
+	require.Equal(t, account["key"], updatedPubKeyMap["Secp256K1"]["pubkey"])
+
+	cometWsClient, err := getCometClient(xion.GetHostRPCAddress()) // Note: add a close function
+	require.NoError(t, err)
+	fmt.Printf("%+v\n", xion.GetNode())
+
+	err = cometWsClient.Start()
+	require.NoError(t, err)
+
+	//eventStream, err := subscribeToEvent(t, ctx, cometTypes.EventTx, cometWsClient)
+	eventStream, err := subscribeToEvent(t, ctx, cometWsClient)
+
+	require.NoError(t, err)
+
+	doneChan := make(chan struct{})
+	go receiveEvents(t, doneChan, eventStream)
+
+	jsonExecMsgStr, err = GenerateTx(t, ctx, xion.GetNode(),
+		xionUser.KeyName(),
+		"xion", "emit", "arbitrary_data", aaContractAddr,
+		"--authenticator-id", "0",
+		"--chain-id", xion.Config().ChainID,
+	)
+
+	require.NoError(t, err)
+	jsonExecMsg = []byte(jsonExecMsgStr)
+	require.True(t, json.Valid(jsonExecMsg))
+
+	rotateFile, err = os.CreateTemp("", "*-msg-exec-emit.json")
+	require.NoError(t, err)
+	defer os.Remove(rotateFile.Name())
+
+	_, err = rotateFile.Write(jsonExecMsg)
+	require.NoError(t, err)
+
+	err = UploadFileToContainer(t, ctx, xion.GetNode(), rotateFile)
+	require.NoError(t, err)
+
+	rotateFilePath = strings.Split(rotateFile.Name(), "/")
+
+	_, err = ExecTx(t, ctx, xion.GetNode(),
+		xionUser.KeyName(),
+		"xion", "sign",
+		xionUser.KeyName(),
+		aaContractAddr,
+		path.Join(xion.GetNode().HomeDir(), rotateFilePath[len(rotateFilePath)-1]),
+		"--chain-id", xion.Config().ChainID,
+	)
+	require.NoError(t, err) // it's returning an error and it's not throwing
+	fmt.Println("we have thrown a transaction")
+
+	//wg.Wait()
+	<-doneChan
+	stopClient(ctx, cometWsClient)
+}
+
+func getCometClient(hostAddr string) (cometClient.Client, error) {
+	return rpchttp.New(hostAddr, "/websocket")
+}
+
+func subscribeToEvent(t *testing.T, ctx context.Context, cli cometClient.Client) (<-chan cometRpcCoreTypes.ResultEvent, error) {
+	return cli.Subscribe(ctx, "helpers", "message.module='wasm' AND message.action='/cosmwasm.wasm.v1.MsgExecuteContract'")
+}
+
+func receiveEvents(t *testing.T, done chan<- struct{}, eventStream <-chan cometRpcCoreTypes.ResultEvent) {
+	for {
+		select {
+		case event := <-eventStream:
+			fmt.Println("event intercepted")
+			contractAddress, ok := event.Events["wasm-account_emit._contract_address"]
+			if !ok {
+				fmt.Println("not desired event")
+				continue
+			}
+			arbData, ok := event.Events["wasm-account_emit.data"]
+			if !ok {
+				fmt.Println("not desired event")
+				continue
+			}
+			fmt.Println(contractAddress)
+			fmt.Println(arbData)
+			done <- struct{}{}
+			return
+		default:
+			continue
+		}
+	}
+}
+
+func stopClient(ctx context.Context, cli cometClient.Client) error {
+	if err := cli.UnsubscribeAll(ctx, "helpers"); err != nil {
+		return err
+	}
+
+	if err := cli.Stop(); err != nil {
+		return err
+	}
+	return nil
+}

integration_tests/go.sum

@@ -1036,8 +1036,8 @@ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
 github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA=
 github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs=
-github.com/osmosis-labs/fee-abstraction/v8 v8.0.1 h1:WTmn5ddKtWZc4Ppz5XRdIUhlI0bQJsN0Yd8ybYpCUiU=
-github.com/osmosis-labs/fee-abstraction/v8 v8.0.1/go.mod h1:oixKpyWv08ZeFgZthXSNjiGz1wOhhJDUlSBXR3zQn+k=
+github.com/osmosis-labs/fee-abstraction/v8 v8.0.2 h1:z8GfKxGqkEB66rO2iDNJ6/IA62ZZlyitOeOvzE11LiY=
+github.com/osmosis-labs/fee-abstraction/v8 v8.0.2/go.mod h1:nNhh1fdDIXVK7xY/ji4qRNCkPEzgPrlJ1FD/ox3U+Oo=
 github.com/oxyno-zeta/gomock-extra-matcher v1.2.0 h1:WPEclU0y0PMwUzdDcaKZvld4aXpa3fkzjiUMQdcBEHg=
 github.com/oxyno-zeta/gomock-extra-matcher v1.2.0/go.mod h1:S0r7HmKeCGsHmvIVFMjKWwswb4+30nCNWbXRMBVPkaU=
 github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=