From d846a5717abe7d9c1905eb77904c5d57b5f82b16 Mon Sep 17 00:00:00 2001 From: Sairam kola Date: Fri, 3 May 2024 17:35:40 +0530 Subject: [PATCH 1/3] update gravity bridge rpc --- .../components/gravityConfirmationModal.tsx | 22 ++++++++++++++----- config/networks/evm/gravityEVM.ts | 2 +- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/bridge/components/gravityConfirmationModal.tsx b/app/bridge/components/gravityConfirmationModal.tsx index 3b59f379..7d4560c3 100644 --- a/app/bridge/components/gravityConfirmationModal.tsx +++ b/app/bridge/components/gravityConfirmationModal.tsx @@ -27,12 +27,24 @@ const GravityConfirmationModal = ({ async function handleConfirm() { try { - await switchNetwork({ chainId: GRAVITY_BRIGDE_EVM.chainId }); - const network = getNetwork(); - if (!network.chain || network.chain.id !== GRAVITY_BRIGDE_EVM.chainId) { - throw new Error(TX_SIGN_ERRORS.SWITCH_CHAIN_ERROR()); - } + if (!window.ethereum) throw new Error("No ethereum provider found"); + await window.ethereum.request({ + method: "wallet_addEthereumChain", + params: [ + { + chainId: `0x${GRAVITY_BRIGDE_EVM.chainId.toString(16)}`, + chainName: GRAVITY_BRIGDE_EVM.name, + rpcUrls: [GRAVITY_BRIGDE_EVM.rpcUrl], + iconUrls: [GRAVITY_BRIGDE_EVM.icon], + nativeCurrency: { + name: GRAVITY_BRIGDE_EVM.nativeCurrency.name, + symbol: GRAVITY_BRIGDE_EVM.nativeCurrency.symbol, + decimals: GRAVITY_BRIGDE_EVM.nativeCurrency.decimals, + }, + }, + ], + }); setAddChainError(null); onConfirm(); } catch (err) { diff --git a/config/networks/evm/gravityEVM.ts b/config/networks/evm/gravityEVM.ts index 2606a0f0..4b9642b7 100644 --- a/config/networks/evm/gravityEVM.ts +++ b/config/networks/evm/gravityEVM.ts @@ -9,7 +9,7 @@ export const GRAVITY_BRIGDE_EVM: EVMNetwork = { icon: "/icons/grav.svg", name: "Gravity Bridge", isTestChain: false, - rpcUrl: "https://info.gravitychain.io:8545", + rpcUrl: "http://159.223.192.164:8545", nativeCurrency: { name: "Graviton", baseName: "ugraviton", From a10207a95bc42c11298a071b476dcc892196d780 Mon Sep 17 00:00:00 2001 From: Sairam kola Date: Fri, 3 May 2024 21:38:23 +0530 Subject: [PATCH 2/3] update endpoint --- config/networks/evm/gravityEVM.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/networks/evm/gravityEVM.ts b/config/networks/evm/gravityEVM.ts index 4b9642b7..95c7a27e 100644 --- a/config/networks/evm/gravityEVM.ts +++ b/config/networks/evm/gravityEVM.ts @@ -9,7 +9,7 @@ export const GRAVITY_BRIGDE_EVM: EVMNetwork = { icon: "/icons/grav.svg", name: "Gravity Bridge", isTestChain: false, - rpcUrl: "http://159.223.192.164:8545", + rpcUrl: "https://gravity.plexnode.wtf", nativeCurrency: { name: "Graviton", baseName: "ugraviton", From 53505b3630b612c3ba9c3ee07472ca6161cf3b6a Mon Sep 17 00:00:00 2001 From: Sairam kola Date: Tue, 7 May 2024 09:31:13 +0530 Subject: [PATCH 3/3] update sign message --- transactions/signTx/cosmosEIP/signCosmosEIP.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/transactions/signTx/cosmosEIP/signCosmosEIP.ts b/transactions/signTx/cosmosEIP/signCosmosEIP.ts index 4b6b017e..7cf309ba 100644 --- a/transactions/signTx/cosmosEIP/signCosmosEIP.ts +++ b/transactions/signTx/cosmosEIP/signCosmosEIP.ts @@ -119,8 +119,9 @@ async function signAndBroadcastCosmosTransaction( if (!context.sender.pubkey) { // create a public key for the user IFF EIP712 Canto is used (since through metamask) try { - const signature = await signMessage({ - message:"Welcome to Canto! \n\nPlease sign this message to generate your Canto account.", + const signature = await window.ethereum.request({ + method: "personal_sign", + params: [context.ethAddress, "generate_pubkey"], }); context.sender.pubkey = signatureToPubkey( signature, @@ -152,7 +153,12 @@ async function signAndBroadcastCosmosTransaction( ); // get signature from metamask - const signature = await signTypedData(eipToSign as SignTypedDataArgs); + + const signature = await window.ethereum.request({ + method: "eth_signTypedData_v4", + params: [context.ethAddress, JSON.stringify(eipToSign)], + }); + const signedTx = createTxRawEIP712( cosmosPayload.legacyAmino.body, cosmosPayload.legacyAmino.authInfo,