Skip to content

Commit

Permalink
Merge pull request #3 from bgd-labs/feat/use-gov-v3
Browse files Browse the repository at this point in the history
feat: use gov v3 version
  • Loading branch information
sakulstra committed Sep 19, 2023
2 parents 73cdf8c + a5840ee commit 3b32c35
Show file tree
Hide file tree
Showing 26 changed files with 4,019 additions and 66 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ node_modules

# ignore foundry deploy artifacts
broadcast/

/src/etherscan
8 changes: 4 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
[submodule "lib/aave-helpers"]
path = lib/aave-helpers
url = https://github.com/bgd-labs/aave-helpers
[submodule "lib/aave-stk-v1-5"]
path = lib/aave-stk-v1-5
url = https://github.com/bgd-labs/aave-stk-v1-5
branch = feat/abpt-v2-pool
[submodule "lib/solidity-utils"]
path = lib/solidity-utils
url = https://github.com/bgd-labs/solidity-utils
[submodule "lib/stk-no-cooldown"]
path = lib/stk-no-cooldown
url = https://github.com/bgd-labs/aave-stk-v1-5
branch = feat/post-slashing
[submodule "lib/aave-stk-gov-v3"]
path = lib/aave-stk-gov-v3
url = https://github.com/bgd-labs/aave-stk-gov-v3
branch = feat/new-deployment
4 changes: 2 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
out
lib
/lib
cache
node_modules
/node_modules
25 changes: 25 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,33 @@ update:; forge update
build :; forge build --sizes
test :; forge test -vvv

deploy-ledger :; forge script ${contract} --rpc-url ${chain} $(if ${dry},--sender 0x25F2226B597E8F9514B3F68F00f494cF4f286491 -vvvv,--broadcast --ledger --mnemonics foo --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv)

# Utilities
download :; cast etherscan-source --chain ${chain} -d src/etherscan/${chain}_${address} ${address}
git-diff :
@mkdir -p diffs
@printf '%s\n%s\n%s\n' "\`\`\`diff" "$$(git diff --no-index --diff-algorithm=patience --ignore-space-at-eol ${before} ${after})" "\`\`\`" > diffs/${out}.md

deploy-impl-ledger :; make deploy-ledger contract=scripts/01_DeployStkAbptV2ImplTest.sol:DeployImpl chain=sepolia

diff-all :
# StakedTokenV3 - live
make download chain=mainnet address=0x9921c8cea5815364d0f8350e6cbe9042A92448c9
# Demo deployment - next
make download chain=sepolia address=0x70Bf6EC6Fca41a7d08dCBB9909985AC0A4510B5E
# Demo deploynebt - no-cooldown
make download chain=sepolia address=0xd1B3E25fD7C8AE7CADDC6F71b461b79CD4ddcFa3
npm run lint:fix
make git-diff before=src/etherscan/mainnet_0x9921c8cea5815364d0f8350e6cbe9042A92448c9 after=src/etherscan/sepolia_0x70Bf6EC6Fca41a7d08dCBB9909985AC0A4510B5E out=NewVersion_Diff
make git-diff before=src/etherscan/mainnet_0x9921c8cea5815364d0f8350e6cbe9042A92448c9 after=src/etherscan/sepolia_0xd1B3E25fD7C8AE7CADDC6F71b461b79CD4ddcFa3 out=NoCooldown_Diff

diff-snapshot :
forge inspect src/etherscan/mainnet_0x9921c8cea5815364d0f8350e6cbe9042A92448c9/StakedTokenV3/src/contracts/StakedTokenV3.sol:StakedTokenV3 storage-layout --pretty > reports/currentStakedToken.md
npm run clean-storage-report currentStakedToken
forge inspect src/etherscan/sepolia_0x70Bf6EC6Fca41a7d08dCBB9909985AC0A4510B5E/StakedTokenV3/lib/aave-stk-gov-v3/src/contracts/StakedTokenV3.sol:StakedTokenV3 storage-layout --pretty > reports/newStakedToken.md
npm run clean-storage-report newStakedToken
forge inspect src/etherscan/sepolia_0xd1B3E25fD7C8AE7CADDC6F71b461b79CD4ddcFa3/StakedTokenV3/lib/stk-no-cooldown/src/contracts/StakedTokenV3.sol:StakedTokenV3 storage-layout --pretty > reports/noCooldownStakedToken.md
npm run clean-storage-report noCooldownStakedToken
make git-diff before=reports/currentStakedToken.md after=reports/newStakedToken.md out=NewVersion_storageDiff.md
make git-diff before=reports/currentStakedToken.md after=reports/noCooldownStakedToken.md out=NoCooldown_storageDiff.md
5 changes: 0 additions & 5 deletions deploy.sh

This file was deleted.

Loading

0 comments on commit 3b32c35

Please sign in to comment.