Merge branch 'refactor/accountId-changes' into fix-SVM-verification-program-id-err

Author: 0xNilesh

api/ue/v1/tx.pulsar.go

@@ -64,8 +64,8 @@ message MsgDeployUEA {
   // signer is the Cosmos address initiating the tx (used for tx signing)
   string signer = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 
-  // universal_account is the identifier of the owner account
-  UniversalAccount universal_account = 2;
+  // universal_account_id is the identifier of the owner account
+  UniversalAccountId universal_account_id = 2;
 
   // tx_hash is the hash of the transaction in which user locked the tokens
   string tx_hash = 3;
@@ -86,8 +86,8 @@ message MsgMintPC {
   // signer is the Cosmos address initiating the tx (used for tx signing)
   string signer = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 
-  // universal_account is the identifier of the owner account
-  UniversalAccount universal_account = 2;
+  // universal_account_id is the identifier of the owner account
+  UniversalAccountId universal_account_id = 2;
 
   // tx_hash is the hash of the transaction in which user locked the tokens
   string tx_hash = 3;
@@ -104,8 +104,8 @@ message MsgExecutePayload {
   // signer is the Cosmos address initiating the tx (used for tx signing)
   string signer = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 
-  // universal_account is the identifier of the owner account
-  UniversalAccount universal_account = 2;
+  // universal_account_id is the identifier of the owner account
+  UniversalAccountId universal_account_id = 2;
 
   // payload is the universal payload to be executed
   UniversalPayload universal_payload = 3;

api/ue/v1/types.pulsar.go

@@ -30,7 +30,7 @@ enum VM_TYPE {
 }
 
 // Signature verification types
-enum SignatureType {
+enum VerificationType {
   signedVerification = 0; // Signed verification using a signature
   universalTxVerification = 1; // Universal transaction verification
 }
@@ -49,17 +49,18 @@ message UniversalPayload {
   string max_priority_fee_per_gas = 6; // uint256 as string
   string nonce = 7;                 // uint256 as string
   string deadline = 8;              // uint256 as string
-  SignatureType sig_type = 9; // Type of signature verification
+  VerificationType v_type = 9; // Type of verification to use before execution
 }
 
-// UniversalAccount is the identifier of a owner account
-message UniversalAccount {
+// UniversalAccountId is the identifier of a owner account
+message UniversalAccountId {
   option (amino.name) = "ue/universal_account";
   option (gogoproto.equal) = true;
   option (gogoproto.goproto_stringer) = false;
 
-  string chain = 1; // chain is the caip2 identifier of the chain where the owner is located - (e.g. "eip155:1" for Ethereum mainnet)
-  string owner = 2; // Owner's public key bytes or address in hex format
+  string chain_namespace = 1; // chain_namespace is the CAIP-2 namespace of the chain where the owner is located (e.g. "eip155" for Ethereum)
+  string chain_id = 2; // chain_id is the chain ID of the chain where the owner is located
+  string owner = 3; // Owner's public key bytes or address in hex format
 }
 
 // MethodConfig defines the configuration for a method that can be used for universal operations

proto/ue/v1/tx.proto

@@ -12,14 +12,14 @@ import (
 func (k Keeper) CallFactoryToComputeUEAAddress(
 	ctx sdk.Context,
 	from, factoryAddr common.Address,
-	universalAccount *types.UniversalAccount,
+	universalAccountId *types.UniversalAccountId,
 ) (*evmtypes.MsgEthereumTxResponse, error) {
 	abi, err := types.ParseFactoryABI()
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to parse factory ABI")
 	}
 
-	abiUniversalAccount, err := types.NewAbiUniversalAccount(universalAccount)
+	abiUniversalAccountId, err := types.NewAbiUniversalAccountId(universalAccountId)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to create universal account")
 	}
@@ -31,7 +31,7 @@ func (k Keeper) CallFactoryToComputeUEAAddress(
 		factoryAddr,
 		false, // commit
 		"computeUEA",
-		abiUniversalAccount,
+		abiUniversalAccountId,
 	)
 }
 
@@ -40,14 +40,14 @@ func (k Keeper) CallFactoryToComputeUEAAddress(
 func (k Keeper) CallFactoryToDeployUEA(
 	ctx sdk.Context,
 	from, factoryAddr common.Address,
-	universalAccount *types.UniversalAccount,
+	universalAccountId *types.UniversalAccountId,
 ) (*evmtypes.MsgEthereumTxResponse, error) {
 	abi, err := types.ParseFactoryABI()
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to parse factory ABI")
 	}
 
-	abiUniversalAccount, err := types.NewAbiUniversalAccount(universalAccount)
+	abiUniversalAccountId, err := types.NewAbiUniversalAccountId(universalAccountId)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to create universal account")
 	}
@@ -59,7 +59,7 @@ func (k Keeper) CallFactoryToDeployUEA(
 		factoryAddr, // destination: FactoryV1 contract
 		true,        // commit = true (real tx, not simulation)
 		"deployUEA",
-		abiUniversalAccount,
+		abiUniversalAccountId,
 	)
 }
 

proto/ue/v1/types.proto

@@ -36,7 +36,7 @@ import (
 	"github.com/rollchains/pchain/app"
 	module "github.com/rollchains/pchain/x/ue"
 	"github.com/rollchains/pchain/x/ue/keeper"
-	"github.com/rollchains/pchain/x/ue/keeper/mocks"
+	"github.com/rollchains/pchain/x/ue/mocks"
 	"github.com/rollchains/pchain/x/ue/types"
 
 	"github.com/ethereum/go-ethereum/accounts/abi"

x/ue/keeper/evm.go

@@ -11,14 +11,14 @@ import (
 )
 
 // updateParams is for updating params collections of the module
-func (k Keeper) DeployUEA(ctx context.Context, evmFrom common.Address, universalAccount *types.UniversalAccount, txHash string) ([]byte, error) {
+func (k Keeper) DeployUEA(ctx context.Context, evmFrom common.Address, universalAccountId *types.UniversalAccountId, txHash string) ([]byte, error) {
 	sdkCtx := sdk.UnwrapSDKContext(ctx)
 
 	// EVM Call arguments
 	factoryAddress := common.HexToAddress(types.FACTORY_PROXY_ADDRESS_HEX)
 
 	// RPC call verification to verify the gateway interaction tx on source chain
-	err := k.utvKeeper.VerifyGatewayInteractionTx(ctx, universalAccount.Owner, txHash, universalAccount.Chain)
+	err := k.utvKeeper.VerifyGatewayInteractionTx(ctx, universalAccountId.Owner, txHash, universalAccountId.GetCAIP2())
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to verify gateway interaction transaction")
 	}
@@ -28,7 +28,7 @@ func (k Keeper) DeployUEA(ctx context.Context, evmFrom common.Address, universal
 		sdkCtx,
 		evmFrom,
 		factoryAddress,
-		universalAccount,
+		universalAccountId,
 	)
 	if err != nil {
 		return nil, err

x/ue/keeper/keeper_test.go

@@ -14,22 +14,25 @@ import (
 )
 
 // updateParams is for updating params collections of the module
-func (k Keeper) ExecutePayload(ctx context.Context, evmFrom common.Address, universalAccount *types.UniversalAccount, universalPayload *types.UniversalPayload, signature string) error {
+func (k Keeper) ExecutePayload(ctx context.Context, evmFrom common.Address, universalAccountId *types.UniversalAccountId, universalPayload *types.UniversalPayload, signature string) error {
 	sdkCtx := sdk.UnwrapSDKContext(ctx)
 
-	chainConfig, err := k.GetChainConfig(sdkCtx, universalAccount.Chain)
+	// Get Caip2Identifier for the universal account
+	caip2Identifier := universalAccountId.GetCAIP2()
+
+	chainConfig, err := k.GetChainConfig(sdkCtx, caip2Identifier)
 	if err != nil {
-		return errors.Wrapf(err, "failed to get chain config for chain %s", universalAccount.Chain)
+		return errors.Wrapf(err, "failed to get chain config for chain %s", caip2Identifier)
 	}
 
 	if !chainConfig.Enabled {
-		return fmt.Errorf("chain %s is not enabled", universalAccount.Chain)
+		return fmt.Errorf("chain %s is not enabled", caip2Identifier)
 	}
 
 	factoryAddress := common.HexToAddress(types.FACTORY_PROXY_ADDRESS_HEX)
 
 	// Step 1: Compute smart account address
-	receipt, err := k.CallFactoryToComputeUEAAddress(sdkCtx, evmFrom, factoryAddress, universalAccount)
+	receipt, err := k.CallFactoryToComputeUEAAddress(sdkCtx, evmFrom, factoryAddress, universalAccountId)
 	if err != nil {
 		return err
 	}

x/ue/keeper/msg_deploy_uea.go

@@ -15,20 +15,20 @@ import (
 )
 
 // updateParams is for updating params collections of the module
-func (k Keeper) MintPC(ctx context.Context, evmFrom common.Address, universalAccount *types.UniversalAccount, txHash string) error {
+func (k Keeper) MintPC(ctx context.Context, evmFrom common.Address, universalAccountId *types.UniversalAccountId, txHash string) error {
 	sdkCtx := sdk.UnwrapSDKContext(ctx)
 
 	factoryAddress := common.HexToAddress(types.FACTORY_PROXY_ADDRESS_HEX)
 
 	// RPC call verification to get amount to be mint
-	amountOfUsdLocked, usdDecimals, err := k.utvKeeper.VerifyAndGetLockedFunds(ctx, universalAccount.Owner, txHash, universalAccount.Chain)
+	amountOfUsdLocked, usdDecimals, err := k.utvKeeper.VerifyAndGetLockedFunds(ctx, universalAccountId.Owner, txHash, universalAccountId.GetCAIP2())
 	if err != nil {
 		return errors.Wrapf(err, "failed to verify gateway interaction transaction")
 	}
 	amountToMint := ConvertUsdToPCTokens(&amountOfUsdLocked, usdDecimals)
 
 	// Calling factory contract to compute the UEA address
-	receipt, err := k.CallFactoryToComputeUEAAddress(sdkCtx, evmFrom, factoryAddress, universalAccount)
+	receipt, err := k.CallFactoryToComputeUEAAddress(sdkCtx, evmFrom, factoryAddress, universalAccountId)
 	if err != nil {
 		return err
 	}

x/ue/keeper/msg_execute_payload.go

@@ -43,7 +43,7 @@ func (ms msgServer) DeployUEA(ctx context.Context, msg *types.MsgDeployUEA) (*ty
 		return nil, errors.Wrapf(err, "failed to parse signer address")
 	}
 
-	sa, err := ms.k.DeployUEA(ctx, evmFromAddress, msg.UniversalAccount, msg.TxHash)
+	sa, err := ms.k.DeployUEA(ctx, evmFromAddress, msg.UniversalAccountId, msg.TxHash)
 	if err != nil {
 		return nil, err
 	}
@@ -60,7 +60,7 @@ func (ms msgServer) MintPC(ctx context.Context, msg *types.MsgMintPC) (*types.Ms
 		return nil, errors.Wrapf(err, "failed to parse signer address")
 	}
 
-	err = ms.k.MintPC(ctx, evmFromAddress, msg.UniversalAccount, msg.TxHash)
+	err = ms.k.MintPC(ctx, evmFromAddress, msg.UniversalAccountId, msg.TxHash)
 	if err != nil {
 		return nil, err
 	}
@@ -75,7 +75,7 @@ func (ms msgServer) ExecutePayload(ctx context.Context, msg *types.MsgExecutePay
 		return nil, errors.Wrapf(err, "failed to parse signer address")
 	}
 
-	err = ms.k.ExecutePayload(ctx, evmFromAddress, msg.UniversalAccount, msg.UniversalPayload, msg.Signature)
+	err = ms.k.ExecutePayload(ctx, evmFromAddress, msg.UniversalAccountId, msg.UniversalPayload, msg.Signature)
 	if err != nil {
 		return nil, err
 	}