Skip to content

Merge dev into pcv/l2-linear-rewards #752

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

Jump to bottom
Merged
merged 95 commits into from
Nov 24, 2022
Merged

Merge dev into pcv/l2-linear-rewards #752

merged 95 commits into from
Nov 24, 2022

Conversation

pcarranzav
Copy link
Member

Fixing some merge conflicts for #700

abarmat and others added 30 commits September 27, 2022 11:48
@abarmat
fix: use path.join to manage path concat
5e36583
@abarmat
feat: add publish and mint to the CLI
0ca43ff
@pcarranzav
chore: add reports for recent audits (#710)
45ce81e
@tmigone
chore: run GitHub actions when it makes sense (#707)
b6219d3 
Signed-off-by: Tomás Migone <[email protected]>
@tmigone
chore: provide sane defaults for graph config (#721)
04cfd3a 
Signed-off-by: Tomás Migone <[email protected]>
@tmigone
chore: remove rinkeby and kovan references (#729)
fdc0bae
@tmigone
feat: add optional expression logging to GRE (#728)
f1c5fe7 
* feat: add optional expression logging to GRE

Closes: #702
Signed-off-by: Tomás Migone <[email protected]>
@pcarranzav
test: fix race condition in BridgeEscrow tests
323bdf8
@tmigone
chore: provide sane defaults for graph config (#727)
08cddfa 
Signed-off-by: Tomás Migone <[email protected]>
@pcarranzav
test: don't use nc to check if evm is running
7b38314
@pcarranzav
test: print gas report, and ensure evm is killed
0b7055a
@pcarranzav
Merge pull request #732 from graphprotocol/pcv/test-gas-cat-report
3f16e5a 
test: print gas report, and ensure evm is killed
@pcarranzav
fix: prevent unpausing gateways if they're not configured (OZ M-01 from
1d5dde2 
#700)
@pcarranzav
fix: use separate task to unpause bridge
ff11ec2
@pcarranzav
fix(e2e): gateways start paused
6d4a0d7
@pcarranzav
fix: validate Arbitrum addresses and callhook senders are contracts (…
16dc44e 
…OZ L-01 from #700)
@pcarranzav
fix: remove unnecessary L2 gas check (OZ N-01 from #700)
2dfacb6
@pcarranzav
fix: add storage gaps to GraphTokenGateway and GraphTokenUpgradeable …
fa52952 
…(C4 M-244)
@pcarranzav
fix: ensure l2Counterpart is nonzero (C4 M-201)
bcb4802
@pcarranzav
fix: ensure contracts are only initialized once (C4 M-149)
85312a0
@tmigone
fix(c4-117-g03): state variables should be cached in stack variables
2c4ac9d 
Signed-off-by: Tomás Migone <[email protected]>
@tmigone
fix(c4-117-g05): require()/revert() strings longer than 32 bytes cost…
76865a4 
… extra gas

Signed-off-by: Tomás Migone <[email protected]>
@tmigone
fix(c4-117-g06): keccak256() should only need to be called on a speci…
18afb3a 
…fic string literal once

Signed-off-by: Tomás Migone <[email protected]>
@tmigone
fix(c4-117-g11): using > 0 costs more gas than != 0 when used on a ui…
ee5d3cb 
…nt in a require()

Signed-off-by: Tomás Migone <[email protected]>
@tmigone
fix(c4-117-g12): splitting require() statements that use && saves gas
71314dd 
Signed-off-by: Tomás Migone <[email protected]>
@tmigone
fix(c4-117-g15): require() or revert() statements that check input ar…
d5aece4 
…guments should be at the

top of the function

Signed-off-by: Tomás Migone <[email protected]>
@tmigone
fix(c4-6-g07): expressions for constant values such as a call to kecc…
2ad9f4e 
…ak256(), should use 

immutable rather than constant

Signed-off-by: Tomás Migone <[email protected]>
@tmigone
fix(c4-6-g08): duplicated require()/revert() checks should be refacto…
e0440a8 
…red to a modifier or

function

Signed-off-by: Tomás Migone <[email protected]>
@tmigone
fix(c4-6-13): use calldata instead of memory for function parameters
3805ca9 
Signed-off-by: Tomás Migone <[email protected]>
@tmigone
fix(c4-86-g07): emitting or returning storage values
54157a7 
Signed-off-by: Tomás Migone <[email protected]>
tmigone and others added 26 commits November 2, 2022 10:43
@tmigone
fix(e2e): use fixed gasLimit for CI send to L2
85c2964 
Signed-off-by: Tomás Migone <[email protected]>
@tmigone
fix(e2e): use fixed gasLimit for redeem in CI
ee8c7f3 
Signed-off-by: Tomás Migone <[email protected]>
@tmigone
e2e: add bridge e2e tests (#720)
967e085 
* feat(e2e): run L1 and L2 together in e2e tests

Signed-off-by: Tomás Migone <[email protected]>
@tmigone
fix: gateways now unpaused on e2e
ae1d70b 
Signed-off-by: Tomás Migone <[email protected]>
@abarmat
Merge branch 'dev' into l2-public-testnet
60afb9e
@tmigone @abarmat
chore: fix automerge wrong import
b1be78b 
Signed-off-by: Tomás Migone <[email protected]>
@abarmat
fix: remove unused task folder
ccaf653
@abarmat
fix: wrong imports and params
dff1845
@tmigone
fix: additional post merge fixes
5f1a3c4 
Signed-off-by: Tomás Migone <[email protected]>
@tmigone
fix: update nitro task for nitro v2.0.8
32fc123 
Signed-off-by: Tomás Migone <[email protected]>
@abarmat
chore: add deployed addresses for L2 public testnet
5daa3c1
@tmigone
fix: minor tweaks to e2e
fb40819 
Signed-off-by: Tomás Migone <[email protected]>
@abarmat
v1.17.0
3605081 
- feat(gre): add hardhat-secure-accounts to GRE (#696)
- feat: add publish and mint to the CLI
- feat: refactor GRE to support L1 and L2 simultaneously
- fix: prevent underflow when subgraphs go under the minimum signal threshold
@tmigone
chore: bump npm package version to v2.0.0-testnet
1dd6f06 
Signed-off-by: Tomás Migone <[email protected]>
@pcarranzav
fix(L1GraphTokenGateway): add a counterpartGateway getter for Router …
d8fed24 
…compatibility
@pcarranzav
Merge branch 'pcv/l2-bridge' into l2-public-testnet
93f6939
@pcarranzav
fix(e2e): no need to explicitly disable secure accounts
dcc2cec
@pcarranzav
Merge remote-tracking branch 'origin/dev' into l2-public-testnet
f45173c
@pcarranzav
chore: bump @arbitrum/sdk to 3.0.0
12e54e5
@pcarranzav
chore: bump package version to 2.0.0
43e719b
@pcarranzav
fix: set flat bonding curve in all L2 configs
4e2872b
@pcarranzav
test(e2e): reenable finalizeInboundTransfer revert check
51c0441
@pcarranzav
fix: use correct governance addresses on Arbitrum One
aa85104
@pcarranzav
Merge pull request #751 from graphprotocol/l2-public-testnet
d35acb6 
L2 public testnet deployment and related fixes
@pcarranzav
Merge pull request #699 from graphprotocol/pcv/l2-bridge
3fe26fa 
feat: add Arbitrum GRT bridge (rebased, bridge only)
@pcarranzav
Merge branch 'dev' into pcv/l2-linear-rewards
f340c3a 
Conflicts fixed for:
- contracts/gateway/L1GraphTokenGateway.sol
- test/gateway/l1GraphTokenGateway.test.ts
- test/rewards/rewards.test.ts
@codecov
Copy link

codecov bot commented Nov 24, 2022

Codecov Report

Base: 91.60% // Head: 91.66% // Increases project coverage by +0.06% 🎉

Coverage data is based on head (f340c3a) compared to base (1845259).
Patch coverage: 98.52% of modified lines in pull request are covered.

Additional details and impacted files 
@@                    Coverage Diff                    @@
##           pcv/l2-linear-rewards     #752      +/-   ##
=========================================================
+ Coverage                  91.60%   91.66%   +0.06%     
=========================================================
  Files                         41       41              
  Lines                       2001     2016      +15     
  Branches                     350      365      +15     
=========================================================
+ Hits                        1833     1848      +15     
  Misses                       168      168
Flag Coverage Δ
unittests 91.66% <98.52%> (+0.06%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
contracts/curation/Curation.sol 100.00% <ø> (ø)
contracts/governance/Pausable.sol 88.88% <ø> (ø)
contracts/upgrades/GraphProxyStorage.sol 90.00% <87.50%> (+0.52%) ⬆️
contracts/governance/Managed.sol 94.54% <90.90%> (ø)
contracts/gateway/BridgeEscrow.sol 100.00% <100.00%> (ø)
contracts/gateway/GraphTokenGateway.sol 100.00% <100.00%> (ø)
contracts/gateway/L1GraphTokenGateway.sol 100.00% <100.00%> (ø)
contracts/governance/Controller.sol 100.00% <100.00%> (ø)
contracts/governance/Governed.sol 100.00% <100.00%> (ø)
contracts/l2/gateway/L2GraphTokenGateway.sol 100.00% <100.00%> (ø)
... and 5 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

abarmat
abarmat approved these changes Nov 24, 2022
View reviewed changes
Copy link
Contributor

@abarmat abarmat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💯

@pcarranzav pcarranzav merged commit f340c3a into pcv/l2-linear-rewards Nov 24, 2022
@pcarranzav pcarranzav deleted the pcv/l2-linear-rewards-merge-dev branch November 24, 2022 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abarmat abarmat abarmat approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pcarranzav @abarmat @tmigone