Arbitrum bridge + rewards distribution #552

pcarranzav · 2022-03-24T13:42:02Z

Motivation

Based on discussions that have been going on in the past few months (see this Forum discussion), it seems that there is interest in the community for scaling through a Layer 2 network. Conversations between core dev teams point towards an Arbitrum Graph devnet as the most viable first step in this direction.

This devnet would require, among other things, a way to bridge GRT from L1 into L2 and back. This bridge should be the canonical way to send GRT into Arbitrum, but it should be extensible to support any protocol-specific behavior that may be necessary, both for the initial devnet deployment and the eventual "mainnet” release. This GIP covers the specification of such bridge.

GIPs for discussions in the forum:

Changes

We add the following contracts L1GraphTokenGateway, BridgeEscrow, L2GraphTokenGateway and L2GraphToken
Deployment commands in the CLI are updated to include an L2 deployment
Configuration and address book entries for Arbitrum are added as well.
L1Reservoir and L2Reservoir are introduced, changing the RewardsManager to pull. rewards from them instead of minting.

(Edited to add the changes from #556 and #571 as these were merged on top of this PR)

codecov · 2022-03-24T13:54:07Z

Codecov Report

Merging #552 (df5599f) into dev (7c6e27d) will increase coverage by 1.61%.
The diff coverage is 99.72%.

❗ Current head df5599f differs from pull request most recent head b99d31f. Consider uploading reports for the commit b99d31f to get more accurate results

@@            Coverage Diff             @@
##              dev     #552      +/-   ##
==========================================
+ Coverage   90.35%   91.96%   +1.61%     
==========================================
  Files          35       44       +9     
  Lines        1762     2092     +330     
  Branches      296      361      +65     
==========================================
+ Hits         1592     1924     +332     
+ Misses        170      168       -2

Flag	Coverage Δ
unittests	`91.96% <99.72%> (+1.61%)`	⬆️

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

Impacted Files	Coverage Δ
contracts/tests/ReservoirMock.sol	`66.66% <66.66%> (ø)`
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/Managed.sol	`100.00% <100.00%> (+1.92%)`	⬆️
contracts/l2/gateway/L2GraphTokenGateway.sol	`100.00% <100.00%> (ø)`
contracts/l2/reservoir/L2Reservoir.sol	`100.00% <100.00%> (ø)`
contracts/l2/token/GraphTokenUpgradeable.sol	`100.00% <100.00%> (ø)`
contracts/l2/token/L2GraphToken.sol	`100.00% <100.00%> (ø)`
contracts/reservoir/L1Reservoir.sol	`100.00% <100.00%> (ø)`
... and 4 more

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

pcarranzav

Some notes and open questions.

arbitrum-graph.config.yml

contracts/gateway/GraphTokenGateway.sol

contracts/gateway/L1GraphTokenGateway.sol

.solcover.js

contracts/l2/token/L2GraphToken.sol

pcarranzav · 2022-04-04T17:41:26Z

test/l2/l2GraphTokenGateway.test.ts

+      // For some reason the call count doesn't work properly,
+      // and each function call is counted 12 times.
+      // Possibly related to https://github.com/defi-wonderland/smock/issues/85 ?
+      //expect(arbSysMock.sendTxToL1).to.have.been.calledOnce


I was trying to investigate why this doesn't work, as it would be nice to explicitly check we only call this once...

The error looks very similar to what they reported, and the number being 12 looks really fixed. I haven't used that feature from waffle yet.

pcarranzav · 2022-04-05T15:45:40Z

I've deployed this to a new deployment on Rinkeby and I'm working on some CLI commands to configure the new contracts and interact with them, but doing this in a separate PR, see #556

Deployment commands in the CLI are also updated to include an L2 deployment. Configuration and address book entries for Arbitrum are added as well.

…bridge

We also add Goerli and Arbitrum Nitro Devnet configurations (though the CLI commands don't support Nitro yet).

…ations

…the middle

socket-security · 2022-07-27T22:48:28Z

Socket Security Report

👍 No new dependency issues detected in pull request

Socket.dev scan summary

Issue	Status
Did you mean?	✅ no new possible package typos
Install scripts	✅ no new install scripts
Telemetry	✅ no new telemetry
Troll package	✅ no new troll packages
Malware	✅ no new malware
Native code	✅ no new native modules

Powered by socket.dev

…o call drip (needs tests)

…L-01]

…emer [H-01]

… L2 [H-03] [L-03]

pcarranzav · 2022-12-21T14:52:37Z

Superseded by #699 so closing

pcarranzav added the in progress label Mar 24, 2022

pcarranzav force-pushed the pcv/arb-bridge branch from 69626a9 to 6ef918b Compare March 28, 2022 13:39

pcarranzav mentioned this pull request Mar 29, 2022

Make block/epoch alignment in tests more predictable #555

Merged

pcarranzav force-pushed the pcv/arb-bridge branch from e68ebf9 to f91c67d Compare April 1, 2022 15:29

pcarranzav commented Apr 4, 2022

View reviewed changes

pcarranzav force-pushed the pcv/arb-bridge branch from e66acaf to 0287949 Compare April 5, 2022 15:38

pcarranzav mentioned this pull request Apr 5, 2022

CLI support for Arbitrum bridge + L2 rewards distribution #556

Merged

pcarranzav force-pushed the pcv/arb-bridge branch from 95ba090 to 37cc956 Compare April 12, 2022 15:01

pcarranzav changed the title ~~WIP: Arbitrum bridge implementation~~ Arbitrum bridge implementation Apr 28, 2022

pcarranzav marked this pull request as ready for review April 28, 2022 21:32

pcarranzav added GIP and removed in progress labels Apr 28, 2022

pcarranzav force-pushed the pcv/arb-bridge branch 2 times, most recently from 822e1da to bcee887 Compare May 17, 2022 18:43

abarmat added the protocol change label May 25, 2022

pcarranzav force-pushed the pcv/arb-bridge branch 3 times, most recently from e60da74 to f80cad3 Compare May 31, 2022 14:54

pcarranzav mentioned this pull request May 31, 2022

Arbitrum devnet with rewards distribution #571

Merged

pcarranzav added 2 commits June 1, 2022 07:58

feat: add Arbitrum GRT bridge

f5e17bc

Deployment commands in the CLI are also updated to include an L2 deployment. Configuration and address book entries for Arbitrum are added as well.

feat: allow callhooks from whitelisted addresses in the Arbitrum GRT …

0495b9c

…bridge

pcarranzav force-pushed the pcv/arb-bridge branch from f80cad3 to 0495b9c Compare June 1, 2022 12:58

pcarranzav and others added 6 commits June 6, 2022 13:54

fix: call bridge callhooks after minting tokens

359d254

feat: add commands to configure and use the Arbitrum bridge on the CLI

00e7d3a

We also add Goerli and Arbitrum Nitro Devnet configurations (though the CLI commands don't support Nitro yet).

fix: Take a snapshot of GRT supply when signal is updated

497a7d8

test: add a test for rewards distribution accrual with multiple alloc…

1bf6515

…ations

test: Add a test for two simultaneous allocations with a GRT burn in …

ebf51fe

…the middle

fix: Typo fix in tests

dbeaa7c

pcarranzav and others added 12 commits July 28, 2022 14:11

fix: change to the new Goerli Arb testnet

500e86b

feat: keeper reward for reservoir drip through token issuance

4b9491f

fix: don't use tx.origin as it will not work

56de47a

fix: only allow indexers, their operators, or whitelisted addresses t…

a33bd30

…o call drip (needs tests)

test: fix rewards and reservoir tests after restricting drip callers

435abc2

test: add a test for the keeper reward delivery in L2

c4af2f6

fix: provide part of the keeper reward to L2 redeemer

873b600

fix: clean up comments about redeemer

634477a

fix: more documentation details

b542943

fix: use safe math for minDripInterval

6ef2faa

fix: validate input when granting/revoking drip permission

1a6df5d

fix: docs and inheritance for IArbTxWithRedeemer

120753f

tmigone added the audited label Jul 28, 2022

pcarranzav mentioned this pull request Jul 28, 2022

L2 testnet branch #659

Closed

pcarranzav added 10 commits August 22, 2022 14:09

fix: remove minDripInterval from the drip keeper reward calculation […

00d4547

…L-01]

fix: use L2 alias of l1ReservoirAddress when comparing getCurrentRede…

d36aab9

…emer [H-01]

fix: don't include keeper reward twice when computing what to send to…

2eea58c

… L2 [H-03] [L-03]

test: add test to ensure no DoS if l2RewardsFraction is zeroed [H-04]

448f506

test: optimize functions to advance blocks and fix some race conditions

cc51cb7

fix: add some missing validation on reservoirs [M-01]

0f8fb06

fix: add some missing docstrings [L-04]

365e307

fix: use a single-condition requires for the drip auth check [L-05]

91a0219

fix: add indexed params to dripper change events [N-01]

80cc2f2

fix: use explicit imports in relevant reservoir contracts [N-02]

b99d31f

pcarranzav mentioned this pull request Sep 1, 2022

feat: add Arbitrum GRT bridge (rebased, bridge only) #699

Merged

tmigone mentioned this pull request Sep 2, 2022

Sync: l2-testnet / scenario1 > dev #703

Merged

pcarranzav mentioned this pull request Sep 7, 2022

chore: add reports for recent audits #710

Merged

pcarranzav closed this Dec 21, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Arbitrum bridge + rewards distribution #552

Arbitrum bridge + rewards distribution #552

pcarranzav commented Mar 24, 2022 •

edited

Loading

codecov bot commented Mar 24, 2022 •

edited

Loading

pcarranzav left a comment

pcarranzav Apr 4, 2022

abarmat Apr 28, 2022

pcarranzav commented Apr 5, 2022 •

edited

Loading

socket-security bot commented Jul 27, 2022 •

edited

Loading

pcarranzav commented Dec 21, 2022

Arbitrum bridge + rewards distribution #552

Arbitrum bridge + rewards distribution #552

Conversation

pcarranzav commented Mar 24, 2022 • edited Loading

Motivation

Changes

codecov bot commented Mar 24, 2022 • edited Loading

Codecov Report

pcarranzav left a comment

Choose a reason for hiding this comment

pcarranzav Apr 4, 2022

Choose a reason for hiding this comment

abarmat Apr 28, 2022

Choose a reason for hiding this comment

pcarranzav commented Apr 5, 2022 • edited Loading

socket-security bot commented Jul 27, 2022 • edited Loading

Socket Security Report

pcarranzav commented Dec 21, 2022

pcarranzav commented Mar 24, 2022 •

edited

Loading

codecov bot commented Mar 24, 2022 •

edited

Loading

pcarranzav commented Apr 5, 2022 •

edited

Loading

socket-security bot commented Jul 27, 2022 •

edited

Loading