From 8c903ec5a53714558096ad8805d7d6b83c02d7f3 Mon Sep 17 00:00:00 2001 From: sanyu1225 Date: Fri, 12 Apr 2024 11:04:14 +0700 Subject: [PATCH 1/3] feat: deprecate goerli testnet --- src/contracts/index.ts | 4 ---- src/services/evm.ts | 50 +---------------------------------------- src/types/ChainTypes.ts | 1 - 3 files changed, 1 insertion(+), 54 deletions(-) diff --git a/src/contracts/index.ts b/src/contracts/index.ts index 829d7d8..c2d4058 100644 --- a/src/contracts/index.ts +++ b/src/contracts/index.ts @@ -13,10 +13,6 @@ export const ContractInfos: ContractInfosType = { abi: valueDappAbi, address: "0x009c403BdFaE357d82AAef2262a163287c30B739", }, - [EvmChainId.EthereumGoerli]: { - abi: valueDappAbi, - address: "0x009c403BdFaE357d82AAef2262a163287c30B739", - }, [EvmChainId.Bsc]: { abi: valueDappAbi, address: "0x009c403BdFaE357d82AAef2262a163287c30B739", diff --git a/src/services/evm.ts b/src/services/evm.ts index 56d64b3..1ab396e 100644 --- a/src/services/evm.ts +++ b/src/services/evm.ts @@ -22,13 +22,6 @@ export const supportedChains = [ ], environment: "mainnet", }, - { - name: "Ethereum Goerli", - chainId: "0x5", - rpcUrls: ["https://rpc.ankr.com/eth_goerli"], - faucet: "https://goerlifaucet.com/", - environment: "testnet", - }, { name: "Ethereum Sepolia", chainId: "0xaa36a7", @@ -42,13 +35,6 @@ export const supportedChains = [ rpcUrls: ["https://arb1.arbitrum.io/rpc"], environment: "mainnet", }, - { - name: "Arbitrum Goerli Testnet", - chainId: "0x66eed", - rpcUrls: ["https://goerli-rollup.arbitrum.io/rpc"], - faucet: "https://faucet.triangleplatform.com/arbitrum/goerli", - environment: "testnet", - }, { name: "Arbitrum Sepolia Testnet", chainId: "0x66eee", @@ -101,13 +87,6 @@ export const supportedChains = [ rpcUrls: ["https://mainnet.optimism.io"], environment: "mainnet", }, - { - name: "Optimism Testnet", - chainId: "0x1a4", - rpcUrls: ["https://goerli.optimism.io"], - faucet: "https://faucet.paradigm.xyz/", - environment: "testnet", - }, { name: "Optimism Sepolia Testnet", chainId: "0xaa37dc", @@ -121,13 +100,6 @@ export const supportedChains = [ rpcUrls: ["https://mainnet.base.org"], environment: "mainnet", }, - { - name: "Base Goerli Testnet", - chainId: "0x14a33", - rpcUrls: ["https://goerli.base.org"], - faucet: "https://faucet.quicknode.com/base/goerli", - environment: "testnet", - }, { name: "Base Sepolia Testnet", chainId: "0x14a34", @@ -141,13 +113,6 @@ export const supportedChains = [ rpcUrls: ["https://rpc.zora.energy"], environment: "mainnet", }, - { - name: "Zora Goerli Testnet", - chainId: "0x3E7", - rpcUrls: ["https://testnet.rpc.zora.energy"], - faucet: "https://testnet.zora.co", - environment: "testnet", - }, { name: "Zora Sepolia Testnet", chainId: "0x3b9ac9ff", @@ -161,12 +126,6 @@ export const supportedChains = [ rpcUrls: ["https://rpc.scroll.io"], environment: "mainnet", }, - { - name: "Scroll Goerli Testnet", - chainId: "0x82751", - rpcUrls: ["https://alpha-rpc.scroll.io/l2"], - environment: "testnet", - }, { name: "Scroll Sepolia Testnet", chainId: "0x8274f", @@ -180,13 +139,6 @@ export const supportedChains = [ rpcUrls: ["https://rpc.linea.build"], environment: "mainnet", }, - { - name: "Linea Goerli Testnet", - chainId: "0xe704", - rpcUrls: ["https://rpc.goerli.linea.build"], - faucet: "https://faucet.goerli.linea.build/", - environment: "testnet", - }, { name: "zKatana Sepolia Testnet", chainId: "0x133e40", @@ -215,7 +167,7 @@ const bloctoSDK = new BloctoSDK({ // (required for Ethereum) JSON RPC endpoint rpc: isMainnet ? `https://mainnet.infura.io/v3/${process.env.REACT_APP_INFURA_KEY}` - : "https://rpc.ankr.com/eth_goerli", + : "https://ethereum-sepolia.blockpi.network/v1/rpc/public", walletServer: process.env.REACT_APP_WALLET_SERVER, }, appId: process.env.REACT_APP_DAPP_ID, diff --git a/src/types/ChainTypes.ts b/src/types/ChainTypes.ts index acb113c..8ab9f7f 100644 --- a/src/types/ChainTypes.ts +++ b/src/types/ChainTypes.ts @@ -15,7 +15,6 @@ export enum EvmChain { export enum EvmChainId { Ethereum = "0x1", - EthereumGoerli = "0x5", Bsc = "0x38", BscTestnet = "0x61", Polygon = "0x89", From 959af857b4b3c207591e73d97855cd94807d50cc Mon Sep 17 00:00:00 2001 From: sanyu1225 Date: Fri, 12 Apr 2024 11:14:11 +0700 Subject: [PATCH 2/3] feat: add swap template --- src/components/EvmEditor.tsx | 1 + src/components/EvmEditors/EvmBatchTxEditor.tsx | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/src/components/EvmEditor.tsx b/src/components/EvmEditor.tsx index bbe9c51..d5b2389 100644 --- a/src/components/EvmEditor.tsx +++ b/src/components/EvmEditor.tsx @@ -272,6 +272,7 @@ const EvmEditor = (): ReactJSXElement => { diff --git a/src/components/EvmEditors/EvmBatchTxEditor.tsx b/src/components/EvmEditors/EvmBatchTxEditor.tsx index 9418c24..a521f11 100644 --- a/src/components/EvmEditors/EvmBatchTxEditor.tsx +++ b/src/components/EvmEditors/EvmBatchTxEditor.tsx @@ -21,6 +21,7 @@ interface EvmBatchTxEditorProps { SetStateAction >; account: string | null; + chainId: string | null; } const RevertOptionMap: Record = { @@ -32,6 +33,7 @@ const RevertOptionMap: Record = { const EvmBatchTxEditor = ({ setRequestObject, account, + chainId, }: EvmBatchTxEditorProps): ReactJSXElement => { const [revert, setRevert] = useState("false"); const [txs, setTxs] = useState(); @@ -75,6 +77,17 @@ const EvmBatchTxEditor = ({ }); }; + const SwapToken = () => { + const obj = { + from: account, + to: "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD", + data: "0x3593564c000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000066053af000000000000000000000000000000000000000000000000000000000000000020b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000038d7ea4c680000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000038d7ea4c680000000000000000000000000000000000000000000000000000000b99e289c676500000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002bfff9976782d46cc05630d1f6ebab18b2324d6b140001f41f9840a85d5af5bf1d1762f925bdaddc4201f984000000000000000000000000000000000000000000", + }; + setTxs((state) => { + return [...(state || []), obj]; + }); + }; + const removeTransfer = (index: number) => { setTxs((state) => { if (Array.isArray(state) && state.length === 1) { @@ -116,6 +129,11 @@ const EvmBatchTxEditor = ({ + {chainId === "0xaa36a7" && ( + + )} {Array.isArray(txs) && From fb546d8e9394e78a0f6f995b9316ff50d9a0c1f7 Mon Sep 17 00:00:00 2001 From: sanyu1225 Date: Fri, 12 Apr 2024 11:15:03 +0700 Subject: [PATCH 3/3] fix: mint nft template only for Scroll --- src/components/EvmEditors/EvmBatchTxEditor.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/EvmEditors/EvmBatchTxEditor.tsx b/src/components/EvmEditors/EvmBatchTxEditor.tsx index a521f11..7c9ad85 100644 --- a/src/components/EvmEditors/EvmBatchTxEditor.tsx +++ b/src/components/EvmEditors/EvmBatchTxEditor.tsx @@ -126,9 +126,11 @@ const EvmBatchTxEditor = ({ - + {chainId === "0x8274f" && ( + + )} {chainId === "0xaa36a7" && (