Skip to content

use ethers utils instead of ethereumjs-abi #129

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

Open
livingrockrises wants to merge 2 commits into
base: master
Choose a base branch
from
+21,449 −35,438
Open

use ethers utils instead of ethereumjs-abi #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5856e8d
use ethers utils instead of ethereumjs-abi
livingrockrises Jun 6, 2022
fc2bb83
remove debugger
livingrockrises Jun 7, 2022
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
4 changes: 1 addition & 3 deletions common-js/Biconomy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ var ethers = require("ethers");

var txDecoder = require("ethereum-tx-decoder");

var abi = require("ethereumjs-abi");

var _require = require("./util"),
toJSONRPCPayload = _require.toJSONRPCPayload;

Expand Down Expand Up @@ -547,7 +545,7 @@ Biconomy.prototype.getForwardRequestAndMessageToSign = function (rawTransaction,
primaryType: "ERC20ForwardRequest",
message: request
};
hashToSign = abi.soliditySHA3(["address", "address", "address", "uint256", "uint256", "uint256", "uint256", "uint256", "bytes32"], [request.from, request.to, request.token, request.txGas, request.tokenGasPrice, request.batchId, request.batchNonce, request.deadline, ethers.utils.keccak256(request.data)]);
hashToSign = ethers.utils.solidityKeccak256(["address", "address", "address", "uint256", "uint256", "uint256", "uint256", "uint256", "bytes32"], [request.from, request.to, request.token, request.txGas, request.tokenGasPrice, request.batchId, request.batchNonce, request.deadline, ethers.utils.keccak256(request.data)]);
dataToSign = {
eip712Format: eip712DataToSign,
personalSignatureFormat: hashToSign,
Expand Down
4 changes: 1 addition & 3 deletions common-js/ERC20ForwarderClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ var _require = require("ethers"),
var _require2 = require("./config"),
config = _require2.config;

var abi = require("ethereumjs-abi");

var _require3 = require("./abis"),
tokenAbi = _require3.tokenAbi,
erc20Eip2612Abi = _require3.erc20Eip2612Abi;
Expand Down Expand Up @@ -1707,7 +1705,7 @@ var ERC20ForwarderClient = /*#__PURE__*/function () {
case 0:
req = _ref9.req, _ref9$signature = _ref9.signature, signature = _ref9$signature === void 0 ? null : _ref9$signature, userAddress = _ref9.userAddress, gasLimit = _ref9.gasLimit;
_context13.prev = 1;
hashToSign = abi.soliditySHA3(["address", "address", "address", "uint256", "uint256", "uint256", "uint256", "uint256", "bytes32"], [req.from, req.to, req.token, req.txGas, req.tokenGasPrice, req.batchId, req.batchNonce, req.deadline, ethers.utils.keccak256(req.data)]);
hashToSign = ethers.utils.solidityKeccak256(["address", "address", "address", "uint256", "uint256", "uint256", "uint256", "uint256", "bytes32"], [req.from, req.to, req.token, req.txGas, req.tokenGasPrice, req.batchId, req.batchNonce, req.deadline, ethers.utils.keccak256(req.data)]);
signer = this.provider.getSigner();

if (!this.isSignerWithAccounts) {
Expand Down
Loading