{
//1 for ethereum mainnet, 15 for gravity bridge testnet
- activateBrowserWallet();
networkSwitch == 1 ? addEthMainToWallet() : addNetwork();
}
}
@@ -35,6 +31,8 @@ interface IWallet {
gap: "1rem",
width: "20rem",
cursor: "pointer",
+ // border: Number(networkInfo.chainId) == networkSwitch ? "" : "1px solid yellow",
+ // boxShadow:" 0 1px 0 #000000, 0 5px 0 #000000, 0 6px 6px #ff0000"
}}
>
{image ? 
: null}
@@ -44,13 +42,13 @@ interface IWallet {
textAlign: "center",
}}
>
- {networkInfo.account
- ? Number(networkInfo.chainId) != networkSwitch ? networkSwitch == 1
- ? "switch to ethereum network" : "switch to canto network"
+ {Number(networkInfo.chainId) != networkSwitch ? networkSwitch == 1
+ ? "switch to ethereum network" : "switch to canto network" :
+ !networkInfo.account ? ""
: networkInfo.account.substring(0, 10) +
"..." +
networkInfo.account.substring(networkInfo.account.length - 10, networkInfo.account.length)
- : "connect"}
+ }
);
diff --git a/src/pages/ReactiveButton.tsx b/src/pages/ReactiveButton.tsx
index 7a621e4..ccbccce 100644
--- a/src/pages/ReactiveButton.tsx
+++ b/src/pages/ReactiveButton.tsx
@@ -74,8 +74,7 @@ export const ReactiveButton = ({
//? refactor this into a single component
//if the account doesn't have a public key
if (!hasPubKey) {
- return
- // return
-
- 
- 
+
-
{bridgeOut ? "to:" : "from:"}
+{"to:"}
{bridgeOut ? "gravity bridge" : "ethereum"}
+{"cosmos hub"}
copyAddress(networkInfo.account)}> - {bridgeOut - ? "" - : networkInfo.account?.slice(0, 6) + - "..." + - networkInfo.account?.slice(-6, -1)} -
+copyAddress(networkInfo.account)} + >
-
- copyAddress(networkInfo.cantoAddress)}>
+
{bridgeOut ? "from:" : "to:"}
+from:
canto
copyAddress(networkInfo.cantoAddress)}>
+ copyAddress(networkInfo.cantoAddress)}
+ >
{networkInfo.cantoAddress
? networkInfo.cantoAddress.slice(0, 10) +
"..." +
networkInfo.cantoAddress.slice(-5)
: "retrieving wallet"}
- {/* 
copyAddress(networkInfo.cantoAddress)}/> */}
{tempPubKeyMsg}
}
-
-
- {
- tokenStore.setSelectedToken(value);
- resetCosmos();
- resetApprove();
- }}
- />
-
- {
- const response = await txIBCTransfer(
- gravReceiver,
- "channel-0",
- ethers.utils
- .parseUnits(amount, tokenStore.selectedToken.data.decimals)
- .toString(),
- tokenStore.selectedToken.data.nativeName,
- CantoMainnet.cosmosAPIEndpoint,
- "https://gravitychain.io:1317",
- fee,
- chain,
- memo
- );
- if (response.tx_response?.txhash) {
- toast("bridge out successful", {
- position: "top-right",
- autoClose: 5000,
- hideProgressBar: false,
- closeOnClick: true,
- pauseOnHover: true,
- draggable: true,
- progressStyle: {
- color: "var(--primary-color)",
- },
- style: {
- border: "1px solid var(--primary-color)",
- borderRadius: "0px",
- paddingBottom: "3px",
- background: "black",
- color: "var(--primary-color)",
- height: "100px",
- fontSize: "20px",
- },
- });
- } else {
- //TODO: Show an error
- }
- }
- : send
- }
- />
-
-}
-
- {
- if (
- !(
- stateApprove.status == "PendingSignature" ||
- stateCosmos.status == "PendingSignature" ||
- stateApprove.status == "Mining" ||
- stateCosmos.status == "Mining"
- )
- ) {
- const val = Number(e.target.value);
- if (!isNaN(val)) {
- setAmount(e.target.value);
- }
- resetCosmos();
- resetApprove();
- }
- }}
- />
-
- {setAmount((tokenStore.selectedToken.balanceOf))}}>
- {Number(tokenStore.selectedToken.balanceOf) < 0 ? "" : "max " + tokenStore.selectedToken.balanceOf}
-
-
-
-
- {
- setGravReceiver(e.target.value);
- }}
- style={{ width: "120%" }}
- />
-
-
-
- - {bridgeOut ? ( -
- in order to bridge out of canto, you must convert all of your ERC20
- assets
- {" (Metamask)"} to native canto tokens{" "}
-
- here.
- {" "}
- the balances in your Metamask will not reflect your bridgeable assets
-
+
- it takes several minutes for your bridged assets to arrive on the
- canto network. go to the{" "}
-
- convert coin
- {" "}
- page to view your bridged assets and convert them into canto ERC20
- tokens to view your assets in Metamask. for more details, please read{" "}
-
- here
-
- .
+
-
- -
+
+ {
+ tokenStore.setSelectedToken(value);
+ }}
+ />
+
+ {
+ const response = await txIBCTransfer(
+ gravReceiver,
+ "channel-2",
+ ethers.utils
+ .parseUnits(amount, tokenStore.selectedToken.data.decimals)
+ .toString(),
+ tokenStore.selectedToken.data.nativeName,
+ CantoMainnet.cosmosAPIEndpoint,
+ "https://api-cosmoshub-ia.cosmosia.notional.ventures/",
+ fee,
+ chain,
+ memo
+ );
+ if (response.tx_response?.txhash) {
+ toast("bridge out successful", {
+ position: "top-right",
+ autoClose: 5000,
+ hideProgressBar: false,
+ closeOnClick: true,
+ pauseOnHover: true,
+ draggable: true,
+ progressStyle: {
+ color: "var(--primary-color)",
+ },
+ style: {
+ border: "1px solid var(--primary-color)",
+ borderRadius: "0px",
+ paddingBottom: "3px",
+ background: "black",
+ color: "var(--primary-color)",
+ height: "100px",
+ fontSize: "20px",
+ },
+ });
+ } else {
+ //TODO: Show an error
+ }
+ }}
+ />
)}
-
+ {
+ const val = Number(e.target.value);
+ if (!isNaN(val)) {
+ setAmount(e.target.value);
+ }
+ }}
+ />
+
+ {
+ setAmount(tokenStore.selectedToken.balanceOf);
+ }}
+ >
+ {Number(tokenStore.selectedToken.balanceOf) < 0
+ ? ""
+ : "max " + tokenStore.selectedToken.balanceOf}
+
+
+
+
+ {
+ setGravReceiver(e.target.value);
+ }}
+ style={{ width: "120%" }}
+ />
+
+
+ -
to learn how to bridge ATOM into canto, please read - here
-- -
- powered by Gravity Bridge
+
+
+
); }; diff --git a/src/pages/genPubKey.tsx b/src/pages/genPubKey.tsx index ad6263c..9705277 100644 --- a/src/pages/genPubKey.tsx +++ b/src/pages/genPubKey.tsx @@ -1,40 +1,59 @@ +import { useEthers } from "@usedapp/core"; import { CantoMainnet } from "cantoui"; -import { useState } from "react" +import { useEffect, useState } from "react"; import { useNetworkInfo } from "stores/networkInfo"; import { addNetwork } from "utils/addCantoToWallet"; import { generatePubKey } from "utils/nodeTransactions"; export const GenPubKey = () => { - - const [pubKeySuccess, setPubKeySuccess] = useState(""); - const networkInfo = useNetworkInfo(); - - return ( -()(
}
},
account: undefined,
- cantoAddress : "",
+ cantoAddress: "",
hasPubKey: true,
setAccount: async (account) => {
- set({ account: account });
- let cantoAddress = await getCantoAddressFromMetaMask(account);
- let hasPubKey = await checkPubKey(cantoAddress);
- set({cantoAddress : cantoAddress});
- set({hasPubKey : hasPubKey});
+ if (account) {
+ set({ account: account });
+ let cantoAddress = await getCantoAddressFromMetaMask(account);
+ let hasPubKey = await checkPubKey(cantoAddress);
+ set({ cantoAddress: cantoAddress });
+ set({ hasPubKey: hasPubKey });
+ }
},
balance: "0",
setBalance: (balance) => set({ balance: balance }),
diff --git a/src/utils/IBC/signAndBroadcast.ts b/src/utils/IBC/signAndBroadcast.ts
index b44e125..a2805a8 100644
--- a/src/utils/IBC/signAndBroadcast.ts
+++ b/src/utils/IBC/signAndBroadcast.ts
@@ -26,8 +26,6 @@ import {Buffer} from 'buffer'
headers: { 'Content-Type': 'application/json' },
body: generatePostBodyBroadcast(raw),
};
- console.log( nodeAddress + generateEndpointBroadcast(),
- postOptions)
const broadcastPost = await fetch(
nodeAddress + generateEndpointBroadcast(),
postOptions
diff --git a/src/utils/IBC/signTransaction.js b/src/utils/IBC/signTransaction.js
index b443a5c..63ecabf 100644
--- a/src/utils/IBC/signTransaction.js
+++ b/src/utils/IBC/signTransaction.js
@@ -15,14 +15,11 @@ export async function signAndBroadcastTxMsg(msg, senderObj, chain, nodeAddress,
body: generatePostBodyBroadcast(raw),
};
- console.log("POST OPTIONS: ", postOptions);
-
const broadcastPost = await fetch(
nodeAddress + generateEndpointBroadcast(),
postOptions
);
const response = await broadcastPost.json();
- console.log("🚀 ~ file: signTransaction.js ~ line 25 ~ signAndBroadcastTxMsg ~ response", response)
}
function generateRawTx(chain, senderObj, signature, msg) {
@@ -68,7 +65,6 @@ async function ethToCanto(address, nodeAddress) {
}
function reformatSender(addressData) {
- console.log(addressData);
return {
accountNumber : addressData['account_number'],
pubkey : addressData['pub_key']['key'],
+
+ this page is only for bridging ATOM from canto to the cosmos hub
+ +
+ to learn how to bridge ATOM into canto, please read{" "} + + here + {" "} +
+); }; diff --git a/src/pages/genPubKey.tsx b/src/pages/genPubKey.tsx index ad6263c..9705277 100644 --- a/src/pages/genPubKey.tsx +++ b/src/pages/genPubKey.tsx @@ -1,40 +1,59 @@ +import { useEthers } from "@usedapp/core"; import { CantoMainnet } from "cantoui"; -import { useState } from "react" +import { useEffect, useState } from "react"; import { useNetworkInfo } from "stores/networkInfo"; import { addNetwork } from "utils/addCantoToWallet"; import { generatePubKey } from "utils/nodeTransactions"; export const GenPubKey = () => { - - const [pubKeySuccess, setPubKeySuccess] = useState(""); - const networkInfo = useNetworkInfo(); - - return ( -
+ const [pubKeySuccess, setPubKeySuccess] = useState(""); + const [wasNotConnected, setWasNotConnected] = useState(false); + const networkInfo = useNetworkInfo(); + const {activateBrowserWallet} = useEthers(); + useEffect(() => { + if ( + Number(networkInfo.chainId) == CantoMainnet.chainId && + wasNotConnected == true + ) { + setPubKeySuccess( + "connected to canto network! click above to generate a public key" + ); + } + }, [networkInfo.chainId]); + return ( +
+
+ );
+};
diff --git a/src/providers/index.tsx b/src/providers/index.tsx
index b2f6633..626ed39 100644
--- a/src/providers/index.tsx
+++ b/src/providers/index.tsx
@@ -15,18 +15,18 @@ export const getAddressLink = (explorerUrl: string) => (address: string) => `${e
export const getTransactionLink = (explorerUrl: string) => (txnId: string) => `${explorerUrl}/tx/${txnId}`
-export const Gravity: Chain = {
- chainId: GravityTestnet.chainId,
- chainName: GravityTestnet.name,
- isTestChain: GravityTestnet.isTestChain,
- isLocalChain: false,
- multicallAddress: '0x86C885e7D824F0278323f7CF4529d330BEA6f87C',
- multicall2Address: '0xaC14870809392C5181c9869046619b2A86386C80',
- blockExplorerUrl: GravityTestnet.blockExplorerUrl,
- getExplorerAddressLink: getAddressLink("kovanEtherscanUrl"),
- getExplorerTransactionLink: getTransactionLink("kovanEtherscanUrl"),
- rpcUrl: GravityTestnet.rpcUrl
-}
+// export const Gravity: Chain = {
+// chainId: GravityTestnet.chainId,
+// chainName: GravityTestnet.name,
+// isTestChain: GravityTestnet.isTestChain,
+// isLocalChain: false,
+// multicallAddress: '0x86C885e7D824F0278323f7CF4529d330BEA6f87C',
+// multicall2Address: '0xaC14870809392C5181c9869046619b2A86386C80',
+// blockExplorerUrl: GravityTestnet.blockExplorerUrl,
+// getExplorerAddressLink: getAddressLink("kovanEtherscanUrl"),
+// getExplorerTransactionLink: getTransactionLink("kovanEtherscanUrl"),
+// rpcUrl: GravityTestnet.rpcUrl
+// }
export const CantoMainnet: Chain = {
chainId: CantoMain.chainId,
chainName: CantoMain.name,
@@ -44,9 +44,8 @@ export const CantoMainnet: Chain = {
const config: Config = {
- networks: [Gravity, ETHMain, CantoMainnet],
+ networks: [ETHMain, CantoMainnet],
readOnlyUrls: {
- [Gravity.chainId]: GravityTestnet.rpcUrl,
[ETHMain.chainId]: ETHMainnet.rpcUrl,
[CantoMainnet.chainId]: CantoMain.rpcUrl
},
diff --git a/src/stores/networkInfo.tsx b/src/stores/networkInfo.tsx
index c99ec90..a652770 100644
--- a/src/stores/networkInfo.tsx
+++ b/src/stores/networkInfo.tsx
@@ -1,6 +1,9 @@
import { CantoMainnet } from "cantoui";
import { GravityTestnet, ETHMainnet } from "config/networks";
-import { checkPubKey, getCantoAddressFromMetaMask } from "utils/nodeTransactions";
+import {
+ checkPubKey,
+ getCantoAddressFromMetaMask,
+} from "utils/nodeTransactions";
import create from "zustand";
import { devtools } from "zustand/middleware";
@@ -35,14 +38,16 @@ export const useNetworkInfo = create{pubKeySuccess}
- )
-}
\ No newline at end of file
+ {pubKeySuccess}
+