Skip to content

Contracts upgrade gas estimate fix #7548

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

Merged
merged 3 commits into from
Sep 13, 2021
Merged

Contracts upgrade gas estimate fix #7548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bcb963
Update smart-contracts
renovate-bot Sep 9, 2021
ce3d7d3
fix gasEstimate in tests after contract upgrade
clemsos Sep 13, 2021
d15d663
Merge branch 'master' into contracts-upgrade-gas-estimate-fix
clemsos Sep 13, 2021
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
14 changes: 7 additions & 7 deletions smart-contract-extensions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,24 @@
"dependencies": {
"@nomiclabs/hardhat-truffle5": "2.0.0",
"@nomiclabs/hardhat-web3": "2.0.0",
"@openzeppelin/contracts": "3.1.0",
"@openzeppelin/contracts": "3.4.2",
"@openzeppelin/test-helpers": "0.5.13",
"@openzeppelin/upgrades": "2.8.0",
"@typescript-eslint/eslint-plugin": "4.3.0",
"@typescript-eslint/parser": "4.3.0",
"@typescript-eslint/eslint-plugin": "4.31.0",
"@typescript-eslint/parser": "4.31.0",
"@unlock-protocol/eslint-config": "0.0.1",
"@unlock-protocol/unlock-abi-7": "1.0.3",
"babel-eslint": "10.1.0",
"bignumber.js": "9.0.1",
"chai": "4.2.0",
"eslint": "7.8.1",
"chai": "4.3.4",
"eslint": "7.32.0",
"eslint-config-prettier": "8.3.0",
"eslint-plugin-prettier": "3.1.4",
"eslint-plugin-prettier": "3.4.1",
"hardhat": "^2.6.2",
"hardhat-gas-reporter": "^1.0.4",
"hardlydifficult-eth": "1.1.4",
"jest-specific-snapshot": "^5.0.0",
"prettier": "2.1.1",
"prettier": "2.4.0",
"solidity-coverage": "0.7.17",
"solium": "1.2.5",
"truffle-assertions": "0.9.2",
Expand Down
16 changes: 8 additions & 8 deletions smart-contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"@nomiclabs/hardhat-web3": "2.0.0",
"@openzeppelin/contracts-ethereum-package": "2.5.0",
"@openzeppelin/contracts-upgradeable": "4.3.1",
"@openzeppelin/hardhat-upgrades": "1.9.0",
"@openzeppelin/hardhat-upgrades": "1.10.0",
"@openzeppelin/test-helpers": "0.5.13",
"@openzeppelin/upgrades": "2.8.0",
"@openzeppelin/upgrades-core": "1.8.0",
"@openzeppelin/upgrades-core": "1.9.0",
"@unlock-protocol/eslint-config": "0.0.1",
"@unlock-protocol/unlock-abi-0": "1.0.4",
"@unlock-protocol/unlock-abi-1": "1.0.0",
Expand All @@ -32,26 +32,26 @@
"babel-polyfill": "6.26.0",
"babel-register": "6.26.0",
"bignumber.js": "9.0.1",
"eslint": "7.8.1",
"eslint": "7.32.0",
"eslint-plugin-mocha": "9.0.0",
"eth-gas-reporter": "0.2.22",
"eth-sig-util": "2.5.4",
"ethers": "5.3.1",
"ethers": "5.4.6",
"ethlint": "1.2.5",
"fs-extra": "10.0.0",
"hardhat": "2.5.0",
"hardhat": "2.6.4",
"hardhat-erc1820": "0.1.0",
"hardhat-gas-reporter": "1.0.4",
"hardhat-storage-layout": "0.1.6",
"hardhat-tracer": "1.0.0-alpha.6",
"hardlydifficult-eth": "1.1.4",
"hardlydifficult-ethereum-contracts": "0.11.1",
"lint-staged": "11.0.0",
"prettier": "2.1.1",
"lint-staged": "11.1.2",
"prettier": "2.4.0",
"truffle-assertions": "0.9.2"
},
"devDependencies": {
"web3": "1.3.6"
"web3": "1.5.2"
},
"lint-staged": {
"*.{js,ts}": [
Expand Down
5 changes: 4 additions & 1 deletion smart-contracts/test/UnlockDiscountToken/mintingTokens.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let unlock
let udt
let lock

const estimateGas = 252166
const estimateGas = 252166 * 2

contract('UnlockDiscountToken (mainnet) / mintingTokens', (accounts) => {
const [lockOwner, protocolOwner, minter, referrer, keyBuyer] = accounts
Expand Down Expand Up @@ -170,11 +170,14 @@ contract('UnlockDiscountToken (mainnet) / mintingTokens', (accounts) => {
// 1,000,000 UDT minted thus far
// Test goal: 10 UDT minted for the referrer (less than the gas cost equivalent of ~120 UDT)
// keyPrice / GNP / 2 = 10 * 1.25 / 1,000,000 == 40,000 * keyPrice

const initialGdp = new BigNumber(await lock.keyPrice()).times(40000)
await unlock.resetTrackedValue(initialGdp.toFixed(0), 0, {
from: protocolOwner,
})

console.log((await udt.totalSupply()).toString())

await lock.purchase(0, keyBuyer, referrer, [], {
from: keyBuyer,
value: await lock.keyPrice(),
Expand Down
2 changes: 1 addition & 1 deletion smart-contracts/test/UnlockDiscountToken/transferingTokens.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let unlock
let udt
let lock

const estimateGas = 252166
const estimateGas = 252166 * 2

contract('UnlockDiscountToken (l2/sidechain) / granting Tokens', (accounts) => {
const [lockOwner, protocolOwner, minter, referrer, keyBuyer] = accounts
Expand Down
2 changes: 1 addition & 1 deletion smart-contracts/test/UnlockDiscountToken/upgrades.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const { constants, tokens, protocols } = require('hardlydifficult-eth')
const { getProxyAddress } = require('../../helpers/proxy')
const Locks = require('../fixtures/locks')

const estimateGas = 252166
const estimateGas = 252166 * 2

// helper function
const upgradeContract = async (contractAddress) => {
Expand Down
Loading