Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[0.9->main] merge in 0.9-rc2 changes #57

Merged
merged 14 commits into from
Sep 28, 2023
Merged

[0.9->main] merge in 0.9-rc2 changes #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
35d2e23
Revert the doubling of gas limit.
yarkinwho Sep 20, 2023
a6e5fd6
Update i18n.js for USDT and JUNGLE support
stephenpdeos Sep 20, 2023
69f944f
Merge pull request #48 from eosnetworkfoundation/yarkin/revert_double…
yarkinwho Sep 26, 2023
27d9331
Yarn somehow changed the lock file.
yarkinwho Sep 26, 2023
d8c2b89
Change jungle icon file.
yarkinwho Sep 26, 2023
3ea608c
Change title
yarkinwho Sep 26, 2023
6976f33
Merge remote-tracking branch 'origin/stephenpdeos-patch-2' into relea…
yarkinwho Sep 26, 2023
d1e0fdf
Code to properly display newly merged texts.
yarkinwho Sep 26, 2023
167f320
Display network on the Switch network button
yarkinwho Sep 26, 2023
9eb6f2c
Statically display gas fee and bridge fee.
yarkinwho Sep 26, 2023
8254a97
Minor fix to localization.
yarkinwho Sep 26, 2023
2ae91a4
Merge pull request #54 from eosnetworkfoundation/yarkin/0.9rc2_changes
yarkinwho Sep 27, 2023
f12974d
fix gas price
yarkinwho Sep 27, 2023
450fe9b
Merge pull request #56 from eosnetworkfoundation/quickfix
yarkinwho Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8">
<link rel="icon" href="/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Evm Bridge</title>
<title>EOS EVM Bridge</title>
</head>
<body>
<div id="app"></div>
Expand Down
Binary file added public/images/jungle.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
112 changes: 0 additions & 112 deletions public/images/jungle.svg
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const selectLang = (val) => {
<img v-else src="./assets/eos_evm_logo.svg" alt="" style="filter:invert(1); height: 45px;">
</a>
<b-navbar-nav class="ml-auto">
<b-nav-item-dropdown class="me-3" no-caret strategy="fixed" :text="$t('home.switchNetwork')" toggle-class="text-decoration-none" >
<b-nav-item-dropdown class="me-3" no-caret strategy="fixed" :text="env === 'TESTNET'?'Testnet':'Mainnet'" toggle-class="text-decoration-none" >
<b-dropdown-item :href="v" v-for="(v, k) in networks" :key="k">{{ k }}</b-dropdown-item>
</b-nav-item-dropdown>
<b-nav-item-dropdown class="me-3" no-caret strategy="fixed" toggle-class="locale">
Expand Down
21 changes: 13 additions & 8 deletions src/i18n.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ const messages = {
'home.netWarning.testnet': 'Warning! This is the TESTNET.',
'home.netWarning.mainnet': 'Warning! This is the MAINNET.',
'home.netWarning.desc': 'Please confirm that your wallet is connected to the correct network before making a transfer. Using the wrong network may result in loss of tokens.',
'home.eos2evmDesc.p1': 'Please use a wallet that supports the EOS Network, such as Anchor, Wombat, TokenPocket or a centralized exchange such as Binance, Coinbase, etc.',
'home.eos2evmDesc.p1': 'Please use a wallet that supports the EOS Network, such as Anchor, Wombat, TokenPocket or a centralized exchange such as OKX, Coinbase, etc.',
'home.eos2evmDesc.p2': 'To transfer funds to the following EOS Contract Address, please fill in the Destination EOS EVM Address in the memo to complete the deposit to EOS EVM.',
'home.eos2evmDesc.p3': 'Officially supported tokens include EOS and USDT (EOS) at this time.',
'home.eos2evmDesc.p3.testnet': 'Officially supported tokens include EOS and JUNGLE at this time.',
'home.eos2evmDesc.p3.mainnet': 'Officially supported tokens include EOS and USDT (EOS) at this time.',

'home.addressCheck.invalidAddress': 'Address includes an illegal character',
'home.addressCheck.invalid13Char': 'Invalid 13th character',
Expand Down Expand Up @@ -107,8 +108,10 @@ const messages = {
'home.netWarning.testnet': '경고! 테스트넷입니다.',
'home.netWarning.mainnet': '경고! 메인넷입니다.',
'home.netWarning.desc': '전송하기 전에 지갑이 올바른 네트워크에 연결되어 있는지 확인하시기 바랍니다. 잘못된 네트워크를 사용하면 토큰이 손실될 수 있습니다.',
'home.eos2evmDesc.p1': 'Anchor, Wombat, TokenPocket과 같은 EOS 네트워크를 지원하는 지갑 또는 바이낸스, 코인베이스 등과 같은 중앙화된 거래소를 사용하시기 바랍니다.',
'home.eos2evmDesc.p2': '다음 EOS 컨트랙트 주소로 자금을 전송하려면, 메모에 목적지 EOS EVM 주소를 입력하여 EOS EVM으로 입금을 완료하세요',
'home.eos2evmDesc.p1': 'Anchor, Wombat, TokenPocket 등 EOS 네트워크를 지원하는 지갑 또는 OKX, Coinbase 등과 같은 중앙화 거래소를 사용해 주세요.',
'home.eos2evmDesc.p2': '다음 EOS 컨트랙트 주소로 자금을 이체하려면 메모에 목적지 EOS EVM 주소를 입력하여 EOS EVM에 입금을 완료하세요.',
'home.eos2evmDesc.p3.testnet': '현재 공식적으로 지원되는 토큰은 EOS와 JUNGLE 입니다.',
'home.eos2evmDesc.p3.mainnet': '현재 공식적으로 지원되는 토큰은 EOS와 USDT(EOS)입니다.',

'home.addressCheck.invalidAddress': '주소에 잘못된 문자가 포함되어 있습니다.',
'home.addressCheck.invalid13Char': '최대 문자 초과, 13개 이상을 넘을 수 없습니다.',
Expand All @@ -134,7 +137,7 @@ const messages = {
'home.address': '地址',
'home.connecting': '正在连接中',
'home.connected': '已连接',
'home.connectWallet': '连接EVM钱包',
'home.connectWallet': '连接 EVM 钱包',
'home.amount': '数额',
'home.myBalance': '余额：',
'home.insufficient': '您的余额不足',
Expand All @@ -159,7 +162,7 @@ const messages = {
'home.viewEvmTx':'在 EOS EVM 区块浏览器上查看',
'home.copy': '复制',
'home.addrCopied' : '地址已复制',
'home.bridgeFee': 'Bridge Fee:',
'home.bridgeFee': 'Bridge Fee：',
'home.depositDesc': '向 EOS EVM 地址的转账交易即刻完成',
'home.depositMemoLabel': 'Memo / 目标地址 Tag',
'home.addressTitle': '请使用目标 EOS EVM 地址：',
Expand All @@ -169,8 +172,10 @@ const messages = {
'home.netWarning.testnet': '警告！ 请注意这是测试网。',
'home.netWarning.mainnet': '警告！ 请注意这是主网。',
'home.netWarning.desc':'在进行交易之前，请确认您的钱包已连接到正确的网络。使用错误的网络可能会导致代币丢失。',
'home.eos2evmDesc.p1':'请使用支持 EOS 网络的钱包或中心化交易所，钱包例如 Anchor、Wombat、TokenPocket等，中心化交易所例如 Binance、Coinbase 等。',
'home.eos2evmDesc.p2': '如需转账至下方 EOS 合约地址，请在 Memo 中填写目标 EOS EVM 地址以完成 EOS EVM 充值。',
'home.eos2evmDesc.p1':'请使用支持 EOS 网络的钱包，如 Anchor、Wombat、TokenPocket 或中心化交易所如 OKX、Coinbase 等。',
'home.eos2evmDesc.p2': '如需转账至以下 EOS 合约地址，请在 memo 中填写目标 EOS EVM 地址，以完成向 EOS EVM 的充值。',
'home.eos2evmDesc.p3.testnet': '目前官方支持的代币包括 EOS 和 JUNGLE。',
'home.eos2evmDesc.p3.mainnet': '目前官方支持的代币包括 EOS和 USDT(EOS)。',

'home.addressCheck.invalidAddress': '地址包含违规字符',
'home.addressCheck.invalid13Char': '第 13 个字符无效',
Expand Down
21 changes: 11 additions & 10 deletions src/views/Home.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<div class="mb-3">
<label for="address">{{ $t('home.destinationAccount') }}</label>
<div class="form-text mb-2">{{ $t('home.destinationAccountDesc') }}</div>
<input type="text" id="address" class="form-control select" @change="calcFee" v-model="targetAddress"
<input type="text" id="address" class="form-control select" v-model="targetAddress"
maxlength="13" list="addresses">
<div class="form-text font-monospace" v-if='extraWarning !== ""'>
<span style="color: red">{{ extraWarning }}</span>
Expand Down Expand Up @@ -109,7 +109,12 @@

<div class="mt-2 text-center small text-white">
{{ $t('home.gasFee') }}
<span v-if="transferFee">~{{ transferFee }}EOS</span>
<span v-if="tokenName() === 'EOS'">~0.0032 EOS</span>
<span v-else>~0.016 EOS</span>
<span v-if="tokenName() != 'EOS'">
<br>
{{ $t('home.bridgeFee') }} 0.01 EOS
</span>
<br>
{{ $t('home.transferTime', ['~5 s']) }}
<br>
Expand Down Expand Up @@ -154,7 +159,8 @@
</span>
<p>{{ $t('home.eos2evmDesc.p1') }}</p>
<p>{{ $t('home.eos2evmDesc.p2') }}</p>
<p>{{ $t('home.eos2evmDesc.p3') }}</p>
<p v-if="env === 'TESTNET'">{{ $t('home.eos2evmDesc.p3.testnet') }}</p>
<p v-else>{{ $t('home.eos2evmDesc.p3.mainnet') }}</p>
</div>
</b-row>
</b-card>
Expand Down Expand Up @@ -255,7 +261,7 @@ export default {
selectedToken: 0,
tokenListTestnet: [
{ name: 'EOS', addr: '', logo: 'images/eos.png' },
{ name: 'JUNGLE', addr: '0x4ea3b729669bF6C34F7B80E5D6c17DB71F89F21F', logo: 'images/jungle.svg', erc20_contract: null },
{ name: 'JUNGLE', addr: '0x4ea3b729669bF6C34F7B80E5D6c17DB71F89F21F', logo: 'images/jungle.png', erc20_contract: null },
],
tokenListMainnet: [
{ name: 'EOS', addr: '', logo: 'images/eos.png' },
Expand Down Expand Up @@ -362,9 +368,6 @@ export default {
}
this.gasPrice = await this.web3.eth.getGasPrice()
this.gas = await this.web3.eth.estimateGas(await this.prepareTx(null));
if (this.tokenName() != "EOS") {
this.gas = new BN(this.gas).mul(new BN(2)).toString()
}
},

async checkChainID() {
Expand Down Expand Up @@ -531,10 +534,8 @@ export default {
if (!window.confirm(this.$t('home.transferConfirm', [this.amount, this.tokenName(), this.targetAddress]))) {
return
}
this.gasPrice = await this.web3.eth.getGasPrice();
this.gas = await this.web3.eth.estimateGas(await this.prepareTx(null));
if (this.tokenName() != "EOS") {
this.gas = new BN(this.gas).mul(new BN(2)).toString()
}

var vm = this

Expand Down
Loading