- Fee {{ fromWei(transaction.fee, 8) }} Eth
+ Fee {{ ethers.utils.formatEther(transaction.fee) }} Eth
@@ -101,7 +101,7 @@
- ![]()
@@ -114,13 +114,13 @@
import Vue from 'vue'
import Component from 'vue-class-component'
import dayjs from 'dayjs'
-import { fromWei } from '../utils/wei'
-import BN from 'bn.js'
+import { ethers } from 'ethers'
import AddressLink from './AddressLink'
import ColorImage from './ColorImage'
import { tryLoadAssetIcon } from '../utils/token'
import InfoText from './InfoText'
import tooltips from '../tooltips'
+import { BigNumber } from "@ethersproject/bignumber";
@Component({
name: 'HistoryCell',
@@ -130,7 +130,7 @@ import tooltips from '../tooltips'
export default class HistoryCell extends Vue {
tooltips = tooltips
dayjs = dayjs
- fromWei = fromWei
+ ethers = ethers
tryLoadAssetIcon = tryLoadAssetIcon
isExpanded = false
@@ -155,8 +155,8 @@ export default class HistoryCell extends Vue {
return +token.address === +tokenAddr
})
const { decimals, symbol } = t
- const tokenAmount = new BN(amount)
- return `${+tokenAmount.toString() / (10 ** +decimals)} ${symbol}`
+ const tokenAmount = BigNumber.from(amount)
+ return `${ethers.utils.formatUnits(tokenAmount, decimals)} ${symbol}`
}
tokenSymbol(tokenAddr) {
diff --git a/src/stores/address-book.js b/src/stores/address-book.js
index 97e223a..e150827 100644
--- a/src/stores/address-book.js
+++ b/src/stores/address-book.js
@@ -5,13 +5,12 @@ export default {
state: {},
actions: {
registerAddress: async ({ state, rootState }) => {
- const { web3 } = rootState.zkopru.client.node.layer1
- const addressBookContract = new web3.eth.Contract(ABI, address)
- const data = await addressBookContract.methods.registerAddress(
+ const addressBookContract = new ethers.Contract(ABI, address, rootState.zkopru.client.node.layer1.provider)
+ const data = await addressBookContract.interface.encodeFunctionData('registerAddress',[
rootState.zkopru.client.node.layer1.address,
rootState.zkopru.wallet.wallet.account.zkAddress.toBuffer(),
false,
- ).encodeABI()
+ ])
await window.ethereum.request({
method: 'eth_sendTransaction',
params: [{
@@ -23,8 +22,7 @@ export default {
})
},
resolveAddress: async ({ state, rootState }, _address) => {
- const { web3 } = rootState.zkopru.client.node.layer1
- const addressBookContract = new web3.eth.Contract(ABI, address)
+ const addressBookContract = new ethers.Contract(ABI, address, rootState.zkopru.client.node.layer1.provider)
const events = await addressBookContract.getPastEvents('L2AddrChanged', {
filter: {
ownerAddr: _address,
@@ -49,10 +47,9 @@ export default {
},
resolveENS: async ({ state, rootState, dispatch }, ensAddress) => {
const hash = namehash.hash(ensAddress)
- const { web3 } = rootState.zkopru.client.node.layer1
- const addressBookContract = new web3.eth.Contract(ABI, address)
+ const addressBookContract = new ethers.Contract(ABI, address, rootState.zkopru.client.node.layer1.provider)
try {
- const resolvedAddr = await addressBookContract.methods.resolveENS(hash).call()
+ const resolvedAddr = await addressBookContract.resolveENS(hash)
if (!resolvedAddr) return
return {
ethAddress: resolvedAddr,
diff --git a/src/stores/eth-account.js b/src/stores/eth-account.js
index 073625b..0d8a59e 100644
--- a/src/stores/eth-account.js
+++ b/src/stores/eth-account.js
@@ -1,4 +1,4 @@
-import { fromWei } from '../utils/wei'
+const ethers = require('ethers');
export default {
state: {
@@ -53,15 +53,15 @@ export default {
method: 'eth_getBalance',
params: [state.accounts[0], 'latest'],
})
- state.balance = fromWei(hexBalance).toString()
+ state.balance = ethers.utils.formatEther(hexBalance)
},
loadTokenBalances: async ({ state, rootState }) => {
for (const { address, symbol } of rootState.zkopru.registeredTokens) {
const tokenContract = await rootState.zkopru.client.getERC20Contract(address)
const myAddress = state.accounts[0]
const [balance, decimals] = await Promise.all([
- tokenContract.methods.balanceOf(myAddress).call(),
- tokenContract.methods.decimals().call(),
+ tokenContract.balanceOf(myAddress),
+ tokenContract.decimals(),
])
const balanceDecimal = +balance.toString() / (10 ** +decimals.toString())
state.tokenBalances = { ...state.tokenBalances, [symbol]: balanceDecimal }
@@ -70,10 +70,10 @@ export default {
loadTokenAllowance: async ({ state, rootState }, address) => {
const tokenContract = await rootState.zkopru.client.getERC20Contract(address)
const myAddress = state.accounts[0]
- const allowance = await tokenContract.methods.allowance(
+ const allowance = await tokenContract.allowance(
myAddress,
rootState.zkopru.client.node.layer1.address
- ).call()
+ )
return allowance
}
}
diff --git a/src/stores/test-token.js b/src/stores/test-token.js
index f23efdc..76eb12f 100644
--- a/src/stores/test-token.js
+++ b/src/stores/test-token.js
@@ -5,10 +5,9 @@ export default {
},
actions: {
mint: async ({ state, rootState }, amount) => {
- const { web3 } = rootState.zkopru.client.node.layer1
- const tokenContract = new web3.eth.Contract(ABI, address)
+ const tokenContract = new ethers.Contract(ABI, address,rootState.zkopru.client.node.layer1.provider)
const decimalAmount = ((+amount)*(10**decimals))
- const data = await tokenContract.methods.mint(`${decimalAmount}`).encodeABI()
+ const data = await tokenContract.interface.encodeFunctionData('mint',[decimalAmount])
await window.ethereum.request({
method: 'eth_sendTransaction',
params: [{
diff --git a/src/stores/zkopru.js b/src/stores/zkopru.js
index 9db636c..022b3c6 100644
--- a/src/stores/zkopru.js
+++ b/src/stores/zkopru.js
@@ -1,6 +1,5 @@
-import { fromWei } from '../utils/wei'
-import dayjs from 'dayjs'
-import BN from 'bn.js'
+const ethers = require('ethers');
+import { BigNumber } from "@ethersproject/bignumber";
const DEFAULT_NETWORKS = {
'5': {
@@ -38,6 +37,22 @@ const DEFAULT_NETWORKS = {
rpcUrls: ['https://kovan.optimism.io'],
blockExplorerUrls: ['https://kovan-optimistic.etherscan.io']
}
+ },
+ '31337': {
+ NAME: 'hardhat testnet',
+ WEBSOCKET: 'ws://localhost:8545',
+ ZKOPRU_ADDRESSES: [
+ '0xDb56f2e9369E0D7bD191099125a3f6C370F8ed15'
+ ],
+ METAMASK_PARAMS: {
+ chainId: '0x7A69',
+ chainName: 'hardhat',
+ nativeCurrency: {
+ name: 'hardhat ETH',
+ symbol: 'ETH',
+ decimals: 18
+ },
+ }
}
}
@@ -240,6 +255,11 @@ export default {
},
primaryType: 'ZkopruKey',
types: {
+ EIP712Domain: [
+ { name: 'name', type: 'string' },
+ { name: 'version', type: 'string' },
+ { name: 'chainId', type: 'uint256' },
+ ],
ZkopruKey: [
{ name: 'info', type: 'string', },
{ name: 'warning', type: 'string', },
@@ -252,16 +272,20 @@ export default {
})
const { sha512_256 } = await import(/* webpackPrefetch: true */ 'js-sha512')
state.walletKey = sha512_256(signedData)
+ console.log('rootState.account.accounts[0]', rootState.account.accounts[0])
return state.walletKey
},
- loadWallet: async ({ state, commit, dispatch }) => {
+ loadWallet: async ({ state, commit, dispatch, rootState }) => {
const key = await dispatch('loadWalletKey')
const { default: Zkopru } = await import(/* webpackPrefetch: true */ '@zkopru/client/browser')
state.wallet = new Zkopru.Wallet(
state.client,
- key
+ key,
+ rootState.account.accounts[0]
)
const { address } = state.wallet.wallet.account.zkAddress
+ console.log('zkAddress', address)
+ console.dir(state.wallet.wallet.account.ethAccount)
commit('setZkAddress', address)
await dispatch('loadL2Balance')
await dispatch('loadHistory')
@@ -293,7 +317,7 @@ export default {
}
}, {})
const { erc20, erc721, eth } = spendable
- state.balance = fromWei(eth.toString())
+ state.balance = ethers.utils.formatEther(eth.toString())
state.tokenBalances = {}
for (const _address of Object.keys(erc20)) {
const token = state.tokensByAddress[_address.toLowerCase()]
@@ -320,7 +344,7 @@ export default {
const key = token ? token.symbol : 'ETH'
const existing = info[key] || {}
const count = existing.count ?? 0;
- const total = existing.total ?? new BN('0');
+ const total = existing.total ?? BigNumber.from('0');
const largestNotes = existing.largestNotes || []
const amount = key === 'ETH' ? asset.eth : asset.erc20Amount.add(asset.nft)
if (largestNotes.length < 4) {
@@ -337,10 +361,10 @@ export default {
}
const maxSpend = largestNotes.reduce((total, current) => {
return total.add(current)
- }, new BN('0'))
+ }, BigNumber.from('0'))
const decimals = token ? token.decimals : 18
const offsetDecimals = Math.min(3, decimals)
- const maxSpendDecimal = +maxSpend.div(new BN(`${10 ** (decimals - offsetDecimals)}`)).toString() / (10 ** offsetDecimals)
+ const maxSpendDecimal = +maxSpend.div(BigNumber.from(10).pow(decimals - offsetDecimals)).toString() / (10 ** offsetDecimals)
info[key] = {
count: count + 1,
total: total.add(amount),
@@ -357,7 +381,7 @@ export default {
}
{
const { erc20, erc721, eth } = locked
- state.lockedBalance = fromWei(eth.toString())
+ state.lockedBalance = ethers.utils.formatEther(eth.toString())
}
state.l2BalanceLoaded = true
},
@@ -365,9 +389,10 @@ export default {
if (!state.wallet) {
await dispatch('loadWallet')
}
- return state.wallet.calculateWeiPerByte()
+ return await state.wallet.calculateWeiPerByte()
},
resetDB: async ({ state, dispatch }) => {
+ console.log('== RESET DB ==')
// take the db and empty it
const { default: Zkopru } = await import(/* webpackPrefetch: true */ '@zkopru/client/browser')
if (!state.client) {
@@ -396,8 +421,6 @@ export default {
})
},
loadHistory: async ({ state, rootState }) => {
- const { layer2, db } = state.client.node
- const { web3 } = state.client.node.layer1
const l2Address = state.wallet.wallet.account.zkAddress.toString()
const l1Address = rootState.account.accounts[0]
const { history, pending } = await state.wallet.transactionsFor(l2Address, l1Address)
diff --git a/src/utils/wei.js b/src/utils/wei.js
deleted file mode 100644
index 7481b66..0000000
--- a/src/utils/wei.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import BN from 'bn.js'
-
-export function fromWei(amount, decimals = 3) {
- let bnAmount
- if (typeof amount === 'string' && amount.indexOf('0x') === 0) {
- bnAmount = new BN(amount.slice(2), 16)
- } else {
- bnAmount = new BN(amount)
- }
- const finney = bnAmount.div(new BN(`${10 ** (18 - decimals)}`)).toString()
- const ether = +finney / (10 ** decimals)
- return ether
-}
-
-export function toWei(amount) {
- const decimalIndex = amount.toString().indexOf('.')
- let decimalCount = 0
- if (decimalIndex !== -1) {
- decimalCount = amount.toString().length - decimalIndex
- }
- const baseAmount = Math.floor(+amount.toString() * (10 ** decimalCount))
- const wei = new BN(baseAmount.toString()).mul(new BN('10').pow(new BN(18 - decimalCount)))
- return wei.toString()
-}
diff --git a/tx-generator.js b/tx-generator.js
index e7b69c5..e376e73 100644
--- a/tx-generator.js
+++ b/tx-generator.js
@@ -1,6 +1,6 @@
const Zkopru = require('@zkopru/client').default
const { sha512_256 } = require('js-sha512')
-const BN = require('bn.js')
+const ethers = require('ethers');
// const URL = 'wss://goerli.infura.io/ws/v3/5b122dbc87ed4260bf9a2031e8a0e2aa'
const URL = 'ws://192.168.1.198:9546'
@@ -15,7 +15,8 @@ const PUBLIC_KEY = '0x3537256fFB47da602871bE7FB26d9fe7e42dD055'
await client.start(':memory:')
const wallet = new Zkopru.Wallet(
client,
- key
+ key,
+ rootState.account.accounts[0]
)
for (;;) {
try {
@@ -28,8 +29,8 @@ const PUBLIC_KEY = '0x3537256fFB47da602871bE7FB26d9fe7e42dD055'
}
console.log(`Current gas price: ${+gasPrice / 10**9} gwei`)
const { to, data, value, onComplete } = wallet.wallet.depositEtherTx(
- toWei('0.0001'),
- toWei('0.0004')
+ ethers.utils.parseEther('0.0001'),
+ ethers.utils.parseEther('0.0004')
)
// sign/send tx
console.log(gasPrice, to, data, value)
@@ -51,25 +52,3 @@ const PUBLIC_KEY = '0x3537256fFB47da602871bE7FB26d9fe7e42dD055'
}
})()
-function fromWei(amount, decimals = 3) {
- let bnAmount
- if (typeof amount === 'string' && amount.indexOf('0x') === 0) {
- bnAmount = new BN(amount.slice(2), 16)
- } else {
- bnAmount = new BN(amount)
- }
- const finney = bnAmount.div(new BN(`${10 ** (18 - decimals)}`)).toString()
- const ether = +finney / (10 ** decimals)
- return ether
-}
-
-function toWei(amount) {
- const decimalIndex = amount.toString().indexOf('.')
- let decimalCount = 0
- if (decimalIndex !== -1) {
- decimalCount = amount.toString().length - decimalIndex
- }
- const baseAmount = +amount.toString() * (10 ** decimalCount)
- const wei = new BN(baseAmount.toString()).mul(new BN('10').pow(new BN(18 - decimalCount)))
- return wei.toString()
-}
{{ fromWei(transaction.eth) }} ETH
+ {{ ethers.utils.formatEther(transaction.eth) }} ETH