fix: encode data

DimensionDev · Dec 20, 2022 · 1c7fe71 · 1c7fe71
1 parent 5540431
commit 1c7fe71
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/mask/src/extension/popups/pages/Wallet/SelectWallet/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/SelectWallet/index.tsx
@@ -143,7 +143,7 @@ const SelectWallet = memo(() => {
             await WalletRPC.resolveMaskAccount([
                 {
                     address: selected,
-                    owner: wallet?.address,
+                    owner: wallet?.owner,
                     identifier: wallet?.identifier,
                 },
             ])

diff --git a/packages/web3-shared/evm/src/libs/UserTransaction.ts b/packages/web3-shared/evm/src/libs/UserTransaction.ts
@@ -275,9 +275,9 @@ export class UserTransaction {
 
         return UserTransaction.fromUserOperation(chainId, entryPoint, {
             ...DEFAULT_USER_OPERATION,
-            sender: from,
+            sender: formatEthereumAddress(from),
             nonce: toNumber(nonce as number),
-            callData: coder.encodeFunctionCall(CALL_WALLET_TYPE, [to, value, data]),
+            callData: coder.encodeFunctionCall(CALL_WALLET_TYPE, [to, value, data.replace(/^0x\w{8}/, '0x')]),
             signature: '0x',
         })
     }