Merge pull request #223 from hermeznetwork/develop

Develop

src/tokens.js

@@ -104,13 +104,14 @@ async function createPermitSignature (
  * Generates a permit data string to be passed to a smart contract function call
  * @param {ethers.Contract} fromTokenContract - A Contract instance of an ERC 20 token
  * @param {String} accountAddress - The Ethereum address of the transaction sender
+ * @param {String} contractAddress - The contract we are authorizing to handle our tokens
+ * @param {ethers.BigNumber} amount - The amount we want to authorize
  * @param {Object} signerData - Signer data used to build a Signer to send the transaction
  * @param {String} providerUrl - Network url (i.e, http://localhost:8545). Optional
  * @returns {String} A hex string with the permit data
  */
-async function permit (fromTokenContract, accountAddress, contractAddress, signerData, providerUrl) {
+async function permit (fromTokenContract, accountAddress, contractAddress, amount, signerData, providerUrl) {
   const nonce = await fromTokenContract.nonces(accountAddress)
-  const amount = ethersConstants.MaxUint256
   const deadline = ethersConstants.MaxUint256
   const { v, r, s } = await createPermitSignature(
     fromTokenContract,

src/tx.js

@@ -59,7 +59,6 @@ async function getGasPrice (providerUrl) {
  * @param {Object} signerData - Signer data used to build a Signer to send the transaction
  * @param {String} providerUrl - Network url (i.e, http://localhost:8545). Optional
  * @param {Number} gasLimit - Optional gas limit
- * @param {Number} gasMultiplier - Optional gas multiplier
  * @returns {Promise} transaction parameters
  */
 const deposit = async (
@@ -69,8 +68,7 @@ const deposit = async (
   babyJubJub,
   signerData,
   providerUrl,
-  gasLimit,
-  gasMultiplier
+  gasLimit
 ) => {
   if (!HermezCompressedAmount.isHermezCompressedAmount(amount)) {
     throw new Error('The parameter needs to be an instance of HermezCompressedAmount created with HermezCompressedAmount.compressAmount')
@@ -85,11 +83,12 @@ const deposit = async (
     .catch(() => undefined)
   const account = typeof accounts !== 'undefined' ? accounts.accounts[0] : null
   const overrides = await getGasPrice(providerUrl)
+  const decompressedAmount = HermezCompressedAmount.decompressAmount(amount)
 
   const usePermit = await isPermitSupported(fromTokenContract)
   const permitSignature =
     usePermit
-      ? await permit(fromTokenContract, ethereumAddress, CONTRACT_ADDRESSES[ContractNames.Hermez], signerData, providerUrl)
+      ? await permit(fromTokenContract, ethereumAddress, CONTRACT_ADDRESSES[ContractNames.Hermez], decompressedAmount, signerData, providerUrl)
       : '0x'
 
   const transactionParameters = [
@@ -102,8 +101,6 @@ const deposit = async (
     permitSignature
   ]
 
-  const decompressedAmount = HermezCompressedAmount.decompressAmount(amount)
-
   // Deposits need a gas limit to not have to wait for the approve to occur
   // before calculating it automatically, which would slow down the process
   overrides.gasLimit = typeof gasLimit === 'undefined'
@@ -131,7 +128,6 @@ const deposit = async (
  * @param {Object} signerData - Signer data used to build a Signer to send the transaction
  * @param {String} providerUrl - Network url (i.e, http://localhost:8545). Optional
  * @param {Number} gasLimit - Optional gas limit
- * @param {Number} gasMultiplier - Optional gas multiplier
  * @returns {Promise} transaction parameters
  * @throws {Error} Throws an error if account index isn't valid
  */
@@ -141,8 +137,7 @@ const forceExit = async (
   token,
   signerData,
   providerUrl,
-  gasLimit,
-  gasMultiplier
+  gasLimit
 ) => {
   if (!HermezCompressedAmount.isHermezCompressedAmount(amount)) {
     throw new Error('The parameter needs to be an instance of HermezCompressedAmount created with HermezCompressedAmount.compressAmount')
@@ -187,7 +182,6 @@ const forceExit = async (
  * @param {String} providerUrl - Network url (i.e, http://localhost:8545). Optional
  * @param {Boolean} filterSiblings - Whether siblings should be filtered
  * @param {Number} gasLimit - Optional gas limit
- * @param {Number} gasMultiplier - Optional gas multiplier
  * @returns {Promise} transaction parameters
  * @throws {Error} Throws an error if account index isn't valid
  */
@@ -201,8 +195,7 @@ const withdraw = async (
   isInstant = true,
   signerData,
   providerUrl,
-  gasLimit,
-  gasMultiplier
+  gasLimit
 ) => {
   const account = await getAccount(accountIndex)
     .catch(() => {
@@ -250,7 +243,6 @@ const withdraw = async (
  * @param {Object} signerData - Signer data used to build a Signer to send the transaction
  * @param {String} providerUrl - Network url (i.e, http://localhost:8545). Optional
  * @param {Number} gasLimit - Optional gas limit
- * @param {Number} gasMultiplier - Optional gas multiplier
  * @returns {Promise} transaction parameters
  */
 const withdrawCircuit = async (
@@ -260,8 +252,7 @@ const withdrawCircuit = async (
   zkeyFilePath,
   signerData,
   providerUrl,
-  gasLimit,
-  gasMultiplier
+  gasLimit
 ) => {
   const hermezContract = getContract(CONTRACT_ADDRESSES[ContractNames.Hermez], HermezABI, signerData, providerUrl)
   const wasmFileInput = typeof window === 'undefined' ? wasmFilePath : wasmFilePath || WITHDRAWAL_WASM_URL
@@ -298,16 +289,14 @@ const withdrawCircuit = async (
  * @param {Object} signerData - Signer data used to build a Signer to send the transaction
  * @param {String} providerUrl - Network url (i.e, http://localhost:8545). Optional
  * @param {Number} gasLimit - Optional gas limit
- * @param {Number} gasMultiplier - Optional gas multiplier
  * @returns {Promise} transaction parameters
  */
 const delayedWithdraw = async (
   hezEthereumAddress,
   token,
   signerData,
   providerUrl,
-  gasLimit,
-  gasMultiplier
+  gasLimit
 ) => {
   const ethereumAddress = getEthereumAddress(hezEthereumAddress)
   const txSignerData = signerData || { type: SignerType.JSON_RPC, addressOrIndex: ethereumAddress }