Skip to content

Arbitrum proposals#719

Merged
scott-silver merged 17 commits intosilver/arbitrumfrom
silver/arbitrum-proposal-v2
May 10, 2023
Merged

Arbitrum proposals#719
scott-silver merged 17 commits intosilver/arbitrumfrom
silver/arbitrum-proposal-v2

Conversation

@scott-silver
Copy link
Copy Markdown
Contributor

@scott-silver scott-silver commented Mar 17, 2023

  • add ARBISCAN_KEY to Github secrets
  • update configuration.json with actual supply caps
  • add proposal description
  • determine correct L2 refund address
  • uncomment the diffState test (once contracts are deployed)`
  • add GMX
  • decide on baseMinForRewards set to 10K
  • add setRewardConfig
  • set supply caps
  • update references to l1GatewayRouter to arbitrumL1GatewayRouter
  • updates references to inbox to arbitrumInbox
  • move COMP distribution from v2 USDT borrow to Arbitrum supply side
  • finalize the amount of USDC and COMP to bridge

Copy link
Copy Markdown
Contributor

@jflatow jflatow left a comment

Choose a reason for hiding this comment

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

Looking great 💪

@scott-silver scott-silver changed the base branch from silver/arbitrum-mainnet to silver/arbitrum March 17, 2023 21:07
@scott-silver scott-silver force-pushed the silver/arbitrum-proposal-v2 branch 3 times, most recently from 981fe07 to 63d1b47 Compare March 17, 2023 21:48
@jflatow jflatow force-pushed the silver/arbitrum-proposal-v2 branch from 63d1b47 to 1c1e047 Compare March 20, 2023 18:27
@scott-silver scott-silver force-pushed the silver/arbitrum-proposal-v2 branch from 1c1e047 to 43d1561 Compare March 21, 2023 03:51
@scott-silver scott-silver mentioned this pull request Mar 21, 2023
21 tasks
@scott-silver scott-silver force-pushed the silver/arbitrum branch 2 times, most recently from a86ac83 to 3b36dec Compare March 21, 2023 21:13
@scott-silver scott-silver force-pushed the silver/arbitrum-proposal-v2 branch 3 times, most recently from 7a27e54 to 45a1763 Compare March 22, 2023 16:33
@jflatow jflatow added the proposal This PR contains a governance proposal label Apr 11, 2023
@scott-silver scott-silver force-pushed the silver/arbitrum-proposal-v2 branch from 45a1763 to 791d1ff Compare April 12, 2023 18:29
Copy link
Copy Markdown
Contributor

@kevincheng96 kevincheng96 left a comment

Choose a reason for hiding this comment

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

Nice, looking good 👍

@scott-silver scott-silver mentioned this pull request Apr 21, 2023
6 tasks
@scott-silver scott-silver changed the title Arbitrum proposal Arbitrum proposals Apr 21, 2023
scott-silver added a commit that referenced this pull request Apr 21, 2023
@scott-silver scott-silver force-pushed the silver/arbitrum-proposal-v2 branch from ba87990 to 5b99679 Compare April 21, 2023 17:53
scott-silver added a commit that referenced this pull request Apr 21, 2023
@scott-silver scott-silver force-pushed the silver/arbitrum-proposal-v2 branch from 5b99679 to fee8df4 Compare April 21, 2023 22:39
@scott-silver scott-silver force-pushed the silver/arbitrum-proposal-v2 branch from fee8df4 to 8149ed4 Compare April 24, 2023 20:30
@kevincheng96
Copy link
Copy Markdown
Contributor

scott-silver added a commit that referenced this pull request May 4, 2023
@scott-silver scott-silver force-pushed the silver/arbitrum-proposal-v2 branch from d455805 to dff473a Compare May 4, 2023 23:24
@scott-silver scott-silver force-pushed the silver/arbitrum-proposal-v2 branch from dff473a to 503381f Compare May 5, 2023 00:25
@kevincheng96
Copy link
Copy Markdown
Contributor

Proposal 160 has been created on mainnet: https://github.com/compound-finance/comet/actions/runs/4911368836/jobs/8769343015

Copy link
Copy Markdown
Contributor

@kevincheng96 kevincheng96 left a comment

Choose a reason for hiding this comment

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

Should be ready to merge now that the proposal has been created on both testnet and mainnet.

@scott-silver scott-silver merged commit 9c3d22d into silver/arbitrum May 10, 2023
kevincheng96 added a commit that referenced this pull request May 15, 2023
* Arbitrum deployment

* Arbitrum mainnet (#717)

* update github actions

* add configuration file

* deploy script

* add inbox to roots

* update hardhat config

* update etherscan.ts

* template string in Spider trace fn

* Arbitrum whale

* MAINNET_TIMELOCK instead of mainnetTimelock.address

* add inbox to mainnet/usdc relations

* missing whale error

* add LINK, LINK whale

add Arbitrum SDK; bump hardhat-etherscan version; ARBISCAN_KEY; add l1GatewayRouter to roots; update getCompWhales

* CometRewards with multiplier (#702)

* Initial implementation of CometRewards with multiplier

* Simply implementation a bit

* Refactor slightly for more readability

* Update unit tests

* Implement setRewardsClaimed (#703)

This PR introduces a `setRewardsClaimed` function that gives the admin the ability to set rewards claimed for any user. This gives us the ability to initialize a new reward distribution that doesn't necessarily have to retroactively reward all past usage of Comet. 

We would have to compute off-chain the amount that each user would be able to claim at a specific block number `x` and write it on-chain via the `setRewardsClaimed` function. This allows us to essentially set the start time of the rewards accrual to be after that specific block number `x`.

* Add scenarios for testing reward multipliers

* Re-implement multiplier logic by storing multiplier in RewardConfig

* Add a unit test to sanity check zeroing out retroactive rewards for users

* restore hardhat-etherscan version; createCrossChainProposal; Goerli l1GatewayRouter

* update ArbitrumBridgeScenario

* refactor, rename in relayArbitrumMessage

* Pin Solidity version (#731)

* replace LINK with ARB

* pull in ARB in deploy.ts

* replace nock with undici in VerifyTest

* specify shanghai hardfork

* Emit event when setting rewards claimed (#736)

* Update aliases to include arbitrum prefix

* updates from #719 to enable proposals

* Fix spidering when using explicit address in relations config; use addresses to indicate ERC20 proxies in relations

* Adjust timelock delay on testnet

* Move arbitrum cross-chain scenario into cross-chain governance scenarios file

* Add pauseGuardian for arbitrum goerli

* Add custom chain for arbitrum goerli to verify on etherscan

* Add api key for arbitrum goerli

* Modified deployment roots from GitHub Actions

* add Arbitrum pauseGuardian address to config

* SweepableBridgeReceiver, tests (#733)

* Add custom chain in hardhat etherscan config for arbitrum

* Modified deployment roots from GitHub Actions

* Arbitrum proposals (#719)

* Arbitrum proposals

* update Arbitrum aliases in proposals

* update asset supply caps

* spider in verify()

* add prices to BulkerScenario

* restore original asset variables; update supply cap expectations; enable diffState test for Arbitrum-Goerli

* Add arb to enact-migration.yaml

* Modified migration from GitHub Actions

* Finalize arb gas estimation

* update proposal description

* update diffState test

* add action to set v2 COMP speeds for USDT to 0; update Arbitrum baseSupplySpeed

* Skip calling verify on migrations that are already enacted

* Update COMP amount to bridge and hardcoded gas price; modify proposal text to be more specific about shifting COMP distributions from USDT v2 to Arbitrum

* Change skip to skipVerify

* Add COMP whale for arbitrum-goerli

* Modified migration from GitHub Actions

---------

Co-authored-by: kevincheng96 <kevincheng96@hotmail.com>
Co-authored-by: GitHub Actions Bot <>

* Small fixes for Arbitrum scenarios

---------

Co-authored-by: Kevin Cheng <kevincheng96@hotmail.com>
Co-authored-by: GitHub Actions Bot <>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

proposal This PR contains a governance proposal

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants