Skip to content
This repository has been archived by the owner on Nov 20, 2024. It is now read-only.

Commit

Permalink
Merge pull request #189 from hermeznetwork/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
AlbertoElias authored Jun 25, 2021
2 parents dcd5338 + c6945bf commit d66ab5b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion src/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ const WITHDRAWAL_WASM_URL = 'https://github.com/hermeznetwork/hermezjs/blob/main

const WITHDRAWAL_ZKEY_URL = 'https://github.com/hermeznetwork/hermezjs/blob/main/withdraw-circuit-files/withdraw_hez4_final.zkey'

const ETHER_ADDRESS = '0x0000000000000000000000000000000000000000'

export {
TRANSACTION_POOL_KEY,
METAMASK_MESSAGE,
Expand Down Expand Up @@ -90,5 +92,6 @@ export {
MAX_NLEVELS,
WITHDRAWAL_CIRCUIT_NLEVELS,
WITHDRAWAL_WASM_URL,
WITHDRAWAL_ZKEY_URL
WITHDRAWAL_ZKEY_URL,
ETHER_ADDRESS
}
4 changes: 2 additions & 2 deletions src/tx.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from './api.js'
import { HermezCompressedAmount } from './hermez-compressed-amount.js'
import { addPoolTransaction } from './tx-pool.js'
import { ContractNames, CONTRACT_ADDRESSES, GAS_LIMIT_LOW, GAS_MULTIPLIER, WITHDRAWAL_WASM_URL, WITHDRAWAL_ZKEY_URL } from './constants.js'
import { ContractNames, CONTRACT_ADDRESSES, GAS_LIMIT_LOW, GAS_MULTIPLIER, WITHDRAWAL_WASM_URL, WITHDRAWAL_ZKEY_URL, ETHER_ADDRESS } from './constants.js'
import { approve } from './tokens.js'
import { getEthereumAddress, getAccountIndex } from './addresses.js'
import { getContract } from './contracts.js'
Expand Down Expand Up @@ -297,7 +297,7 @@ const delayedWithdraw = async (

const transactionParameters = [
ethereumAddress,
token.id === 0 ? 0x0 : token.ethereumAddress
token.id === 0 ? ETHER_ADDRESS : token.ethereumAddress
]

return delayedWithdrawalContract.withdrawal(...transactionParameters, overrides)
Expand Down

0 comments on commit d66ab5b

Please sign in to comment.