feat: added associated address getter solidity interface

xpladev · Feb 24, 2025 · 2187c34 · 2187c34
1 parent 1ce188a
commit 2187c34
Show file tree

Hide file tree

Showing 7 changed files with 348 additions and 11 deletions.
diff --git a/precompile/wasm/IWasm.abi b/precompile/wasm/IWasm.abi
@@ -1 +1,236 @@
-[{"inputs":[{"internalType":"address","name":"sender","type":"address"},{"internalType":"address","name":"contractAddress","type":"address"},{"internalType":"bytes","name":"msg","type":"bytes"},{"internalType":"string","name":"denom","type":"string"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"executeContract","outputs":[{"internalType":"bytes","name":"data","type":"bytes"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"sender","type":"address"},{"internalType":"address","name":"admin","type":"address"},{"internalType":"uint256","name":"codeId","type":"uint256"},{"internalType":"string","name":"label","type":"string"},{"internalType":"bytes","name":"msg","type":"bytes"},{"internalType":"string","name":"denom","type":"string"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"instantiateContract","outputs":[{"internalType":"address","name":"contractAddress","type":"address"},{"internalType":"bytes","name":"data","type":"bytes"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"sender","type":"address"},{"internalType":"address","name":"admin","type":"address"},{"internalType":"uint256","name":"codeId","type":"uint256"},{"internalType":"string","name":"label","type":"string"},{"internalType":"bytes","name":"msg","type":"bytes"},{"internalType":"string","name":"denom","type":"string"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"bytes","name":"salt","type":"bytes"},{"internalType":"bool","name":"fixMsg","type":"bool"}],"name":"instantiateContract2","outputs":[{"internalType":"address","name":"contractAddress","type":"address"},{"internalType":"bytes","name":"data","type":"bytes"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"sender","type":"address"},{"internalType":"address","name":"contractAddress","type":"address"},{"internalType":"uint256","name":"codeId","type":"uint256"},{"internalType":"bytes","name":"msg","type":"bytes"}],"name":"migrateContract","outputs":[{"internalType":"bytes","name":"data","type":"bytes"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"contractAddress","type":"address"},{"internalType":"bytes","name":"queryData","type":"bytes"}],"name":"smartContractState","outputs":[{"internalType":"bytes","name":"data","type":"bytes"}],"stateMutability":"view","type":"function"}]
+[
+	{
+		"inputs": [
+			{
+				"internalType": "address",
+				"name": "evmAddress",
+				"type": "address"
+			}
+		],
+		"name": "associatedAddress",
+		"outputs": [
+			{
+				"internalType": "bytes",
+				"name": "addr",
+				"type": "bytes"
+			}
+		],
+		"stateMutability": "view",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "address",
+				"name": "sender",
+				"type": "address"
+			},
+			{
+				"internalType": "address",
+				"name": "contractAddress",
+				"type": "address"
+			},
+			{
+				"internalType": "bytes",
+				"name": "message",
+				"type": "bytes"
+			},
+			{
+				"internalType": "string",
+				"name": "denom",
+				"type": "string"
+			},
+			{
+				"internalType": "uint256",
+				"name": "amount",
+				"type": "uint256"
+			}
+		],
+		"name": "executeContract",
+		"outputs": [
+			{
+				"internalType": "bytes",
+				"name": "data",
+				"type": "bytes"
+			}
+		],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "address",
+				"name": "sender",
+				"type": "address"
+			},
+			{
+				"internalType": "address",
+				"name": "admin",
+				"type": "address"
+			},
+			{
+				"internalType": "uint256",
+				"name": "codeId",
+				"type": "uint256"
+			},
+			{
+				"internalType": "string",
+				"name": "label",
+				"type": "string"
+			},
+			{
+				"internalType": "bytes",
+				"name": "message",
+				"type": "bytes"
+			},
+			{
+				"internalType": "string",
+				"name": "denom",
+				"type": "string"
+			},
+			{
+				"internalType": "uint256",
+				"name": "amount",
+				"type": "uint256"
+			}
+		],
+		"name": "instantiateContract",
+		"outputs": [
+			{
+				"internalType": "address",
+				"name": "contractAddress",
+				"type": "address"
+			},
+			{
+				"internalType": "bytes",
+				"name": "data",
+				"type": "bytes"
+			}
+		],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "address",
+				"name": "sender",
+				"type": "address"
+			},
+			{
+				"internalType": "address",
+				"name": "admin",
+				"type": "address"
+			},
+			{
+				"internalType": "uint256",
+				"name": "codeId",
+				"type": "uint256"
+			},
+			{
+				"internalType": "string",
+				"name": "label",
+				"type": "string"
+			},
+			{
+				"internalType": "bytes",
+				"name": "message",
+				"type": "bytes"
+			},
+			{
+				"internalType": "string",
+				"name": "denom",
+				"type": "string"
+			},
+			{
+				"internalType": "uint256",
+				"name": "amount",
+				"type": "uint256"
+			},
+			{
+				"internalType": "bytes",
+				"name": "salt",
+				"type": "bytes"
+			},
+			{
+				"internalType": "bool",
+				"name": "fixMsg",
+				"type": "bool"
+			}
+		],
+		"name": "instantiateContract2",
+		"outputs": [
+			{
+				"internalType": "address",
+				"name": "contractAddress",
+				"type": "address"
+			},
+			{
+				"internalType": "bytes",
+				"name": "data",
+				"type": "bytes"
+			}
+		],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "address",
+				"name": "sender",
+				"type": "address"
+			},
+			{
+				"internalType": "address",
+				"name": "contractAddress",
+				"type": "address"
+			},
+			{
+				"internalType": "uint256",
+				"name": "codeId",
+				"type": "uint256"
+			},
+			{
+				"internalType": "bytes",
+				"name": "message",
+				"type": "bytes"
+			}
+		],
+		"name": "migrateContract",
+		"outputs": [
+			{
+				"internalType": "bytes",
+				"name": "data",
+				"type": "bytes"
+			}
+		],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "address",
+				"name": "contractAddress",
+				"type": "address"
+			},
+			{
+				"internalType": "bytes",
+				"name": "queryData",
+				"type": "bytes"
+			}
+		],
+		"name": "smartContractState",
+		"outputs": [
+			{
+				"internalType": "bytes",
+				"name": "data",
+				"type": "bytes"
+			}
+		],
+		"stateMutability": "view",
+		"type": "function"
+	}
+]
diff --git a/precompile/wasm/IWasm.sol b/precompile/wasm/IWasm.sol
@@ -14,7 +14,7 @@ interface IWasm {
         address admin,
         uint256 codeId,
         string calldata label,
-        bytes calldata msg,
+        bytes calldata message,
         string calldata denom,
         uint256 amount
     ) external returns (address contractAddress, bytes calldata data);
@@ -23,7 +23,7 @@ interface IWasm {
         address admin,
         uint256 codeId,
         string calldata label,
-        bytes calldata msg,
+        bytes calldata message,
         string calldata denom,
         uint256 amount,
         bytes calldata salt,
@@ -32,20 +32,21 @@ interface IWasm {
     function executeContract(
         address sender,
         address contractAddress,
-        bytes calldata msg,
+        bytes calldata message,
         string calldata denom,
         uint256 amount
     ) external returns (bytes calldata data);
     function migrateContract(
         address sender,
         address contractAddress,
         uint256 codeId,
-        bytes calldata msg
+        bytes calldata message
     ) external returns (bytes calldata data);
 
     // Queries
     function smartContractState(
         address contractAddress,
         bytes calldata queryData
     ) external view returns (bytes calldata data);
+    function associatedAddress(address evmAddress) external view returns (bytes calldata addr);
 }
diff --git a/precompile/wasm/const.go b/precompile/wasm/const.go
@@ -14,4 +14,5 @@ const (
 	MigrateContract      MethodWasm = "migrateContract"
 
 	SmartContractState MethodWasm = "smartContractState"
+	AssociatedAddress  MethodWasm = "associatedAddress"
 )
diff --git a/precompile/wasm/expected_keepers.go b/precompile/wasm/expected_keepers.go
@@ -9,6 +9,7 @@ import (
 
 type AccountKeeper interface {
 	GetAccount(ctx context.Context, addr sdk.AccAddress) (acc sdk.AccountI)
+	HasAccount(ctx context.Context, addr sdk.AccAddress) bool
 }
 
 type WasmMsgServer interface {

diff --git a/precompile/wasm/wasm.go b/precompile/wasm/wasm.go
@@ -80,6 +80,8 @@ func (p PrecompiledWasm) Run(evm *vm.EVM, input []byte) ([]byte, error) {
 		return p.migrateContract(ctx, evm.Origin, abiMethod, args)
 	case SmartContractState:
 		return p.smartContractState(ctx, abiMethod, args)
+	case AssociatedAddress:
+		return p.associatedAddress(ctx, abiMethod, args)
 	default:
 		return nil, errors.New("method not found")
 	}
@@ -337,3 +339,22 @@ func (p PrecompiledWasm) smartContractState(ctx sdk.Context, method *abi.Method,
 
 	return method.Outputs.Pack(res)
 }
+
+func (p PrecompiledWasm) associatedAddress(ctx sdk.Context, method *abi.Method, args []interface{}) ([]byte, error) {
+	address, err := util.GetAccAddress(args[0])
+	if err != nil {
+		return nil, err
+	}
+
+	var strAddress string
+	if p.ak.HasAccount(ctx, address) {
+		// address: contract or address
+		account := p.ak.GetAccount(ctx, address)
+		strAddress = account.GetAddress().String()
+	} else {
+		// should be address type
+		strAddress = address.String()
+	}
+
+	return method.Outputs.Pack([]byte(strAddress))
+}