Skip to content
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.

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

Update main branch with develop #439

Merged
merged 122 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
e359d7f
Add dependency review
bcodesido Oct 25, 2024
1e637c2
fix: make left bottom info in left side bar fixed and sticky
LordCheta Oct 29, 2024
9edff2d
fix: implement correct render for smaller screens
LordCheta Oct 29, 2024
9996719
Revert "fix: implement correct render for smaller screens"
Freshenext Oct 29, 2024
d4c7ac7
Implemented sidebar from the design
Freshenext Oct 29, 2024
01fdd22
fix: implement correct render of sidebar
LordCheta Oct 29, 2024
8a22312
fix: implement correct render of sidebar, header and main content
LordCheta Oct 29, 2024
03fe66f
chore: lint
LordCheta Oct 29, 2024
e785f6e
Updated padding-top to match design
Freshenext Oct 29, 2024
e6a771d
fix: make sidebar scroll for small screens
LordCheta Oct 30, 2024
a175da6
Fixed chain id in axios instance...
Freshenext Oct 30, 2024
e30a445
Merge pull request #329 from RootstockCollective/DAO-XXX_FIX_CHAIN_ID
jessgusclark Oct 30, 2024
e562af4
feat(cr): builder name in leaderboard (#287)
franciscotobar Oct 31, 2024
c6848bb
fix(CR): fix qa and staging deployment (#331)
antomor Oct 31, 2024
9bc39d1
DAO-XXX Fix pagination after 5 pages. The nextPageParams was not bein…
Freshenext Oct 31, 2024
08c3dfc
Modify the DAO staging environment to use the .env.testnet file and t…
jessgusclark Oct 31, 2024
32877db
Change staging env to mainnet contracts and mainnet .env
jessgusclark Oct 31, 2024
f50884d
Point to mainnet prod
Freshenext Nov 1, 2024
97b9e11
Changed to correct profile
Freshenext Nov 1, 2024
ae5051b
Created a new env because backend has CORS
Freshenext Nov 1, 2024
2387d3c
build: cors localhost (#338)
franciscotobar Nov 5, 2024
c4b899a
docs: environments (#334)
franciscotobar Nov 5, 2024
b35e909
chore: move reward distributed endpoint in a single place (#330)
antomor Nov 5, 2024
896402a
test(cr): remove jest (#332)
franciscotobar Nov 6, 2024
0763388
fix Rouding voting power (#342)
rodrigoncalves Nov 6, 2024
67a2475
Tok 360/prevent dewhitelist nonwhitelisted builder (#336)
DinizSa Nov 6, 2024
1c801a0
Fix conditional hooks (#272)
rodrigoncalves Nov 6, 2024
5cf2502
fix communities banner image (#340)
rodrigoncalves Nov 6, 2024
7eb8741
Revert trigger for staging.
jessgusclark Nov 6, 2024
a9a73ac
Merge pull request #333 from RootstockCollective/DAO-XXX-FIX_PAGINATION
jessgusclark Nov 6, 2024
864e91f
Merge pull request #297 from RootstockCollective/fix/DAO_769
jessgusclark Nov 6, 2024
960f649
add some removed locators (#344)
rodrigoncalves Nov 6, 2024
c320fb1
feat(dao): add feature flags (#295)
jurajpiar Nov 7, 2024
c152c74
build: dockerfile (#335)
franciscotobar Nov 7, 2024
0ee5e6d
feat(cr_v2): claim builder rewards btn (#339)
jurajpiar Nov 7, 2024
a283cc5
TOK-390: clipboard (#346)
franciscotobar Nov 7, 2024
4be6e8b
refactor(cr): create domain-based file-structure (#348)
jurajpiar Nov 8, 2024
641ae6c
fix: make table results render 12 items for uniformity (#347)
LordCheta Nov 8, 2024
f6553c4
fix(dao): makes logo component client only
jurajpiar Nov 8, 2024
be6114a
fix: use v1 contract for growth bucket
jurajpiar Nov 8, 2024
3a19e6e
refactor: renames builder folder to user
jurajpiar Nov 8, 2024
2d6e0c6
feat(cr_rewards): create my rewards layout
jurajpiar Nov 8, 2024
c2207b5
chore: update contract addresses (#354)
antomor Nov 8, 2024
3b5e93b
feat(cr_v2): update abi, qa addresses and naming
jurajpiar Nov 8, 2024
b46acd0
Merge pull request #353 from jurajpiar/update_to_v2_contracts
franciscotobar Nov 8, 2024
a468c1e
Merge pull request #285 from RootstockCollective/dependency-review
jessgusclark Nov 11, 2024
b939dc1
fix: set new projected reward amount (#360)
antomor Nov 11, 2024
f8a0288
fix: change the builder button (#356)
antomor Nov 11, 2024
d89a0e0
feat(rc): last cycle rewards v2 (#341)
franciscotobar Nov 12, 2024
e4162cb
feat(cr): claimable rewards (#349)
franciscotobar Nov 12, 2024
0d4951e
feat(cr_v2): all time rewards
franciscotobar Nov 6, 2024
e1650f8
Merge pull request #357 from RootstockCollective/TOK-409/all-time-rew…
franciscotobar Nov 12, 2024
23d1983
DAO-823: User wants to see which address have delegated stRIF to "Vot…
rodrigoncalves Nov 12, 2024
bf7b947
feat(cr_v2): estimated rewards (#358)
franciscotobar Nov 12, 2024
b2baef3
TOK-457: remove the receiver (#355)
antomor Nov 12, 2024
54e3e7d
DAO-820 Added delegate modal (#362)
Freshenext Nov 12, 2024
50554aa
DAO-679 Fixed proposal confirmation message UI (#361)
Freshenext Nov 12, 2024
055ec14
check for valid delegated address (#366)
rodrigoncalves Nov 12, 2024
82806cf
DAO-819: As a user I need to reclaim the delegation of my stRIF (dele…
rodrigoncalves Nov 13, 2024
10a2a33
feat(cr_v2): all time share (#359)
franciscotobar Nov 13, 2024
1f2d340
fix log injection (#345)
rodrigoncalves Nov 14, 2024
2bbb9d9
TOK-470: backer rewards dashboard (#365)
franciscotobar Nov 15, 2024
8eedabe
TOK-341: reward distribution strategy (#320)
jurajpiar Nov 15, 2024
dae2a53
DAO-824 Added voting power received (#370)
Freshenext Nov 15, 2024
9b6fa44
feat(cr): use v2 contracts
antomor Nov 12, 2024
45266c0
fix: adds suspense
jurajpiar Nov 15, 2024
41f80ba
fix: filter activated builders (#377)
antomor Nov 19, 2024
343f752
TOK-477: page layout and metrics (#368)
antomor Nov 19, 2024
1a78efc
TOK-476: builder allocation component (#373)
antomor Nov 19, 2024
5d26e10
fix: fix opacity to gradually show the component (#379)
antomor Nov 19, 2024
cd3820d
Request to resolve #301 (#310)
tzinadah Nov 19, 2024
cc8d56a
chore: update tooltip explainer for voting power (#378)
LordCheta Nov 19, 2024
f428494
TOK-478: metrics (#371)
franciscotobar Nov 19, 2024
aeb86b6
feat: search field for proposals (#376)
shenshin Nov 19, 2024
9b27722
refactor: forum link to menu (#380)
TravellerOnTheRun Nov 19, 2024
3af4fce
TOK-412: List all activated builders (#369)
DinizSa Nov 20, 2024
db8effc
feat: use getVotes from governor to display user's voting power on pr…
LordCheta Nov 20, 2024
12571a3
DAO-842 Added unstake check when the user cannot withdraw due to coll…
Freshenext Nov 20, 2024
ae4a0bf
chore: implement allow account to create proposal once totalVotingPow…
LordCheta Nov 20, 2024
23289dc
feat(DebounceSearch): show spinner during debounce (#381)
shenshin Nov 20, 2024
280728e
Add stRIF v2 ABI. (#372)
jessgusclark Nov 20, 2024
29651ae
Chore(deps): Bump elliptic in the npm_and_yarn group across 1 directo…
dependabot[bot] Nov 20, 2024
d6980f9
feat(LatestProposalsTable): add message for no proposals found
shenshin Nov 20, 2024
d274c12
patch: addressToDelegate lowered case to match ethereum blockchain re…
Freshenext Nov 20, 2024
57f45d7
Chore(deps): Bump cross-spawn (#385)
dependabot[bot] Nov 20, 2024
c223e71
convert to lowercase to avoid checksum validation (#388)
sleyter93 Nov 20, 2024
98ef1ac
feat(Modal): use createPortal for rendering modal in the DOM
shenshin Nov 20, 2024
71df3c7
Merge pull request #387 from RootstockCollective/update-no-proposal-f…
shenshin Nov 20, 2024
d948a46
Feat/dao 836 (#383)
LordCheta Nov 20, 2024
c6fa62d
update stake and unstake modals (#392)
rodrigoncalves Nov 21, 2024
db737e2
TOK-489: backer rewards table (#391)
franciscotobar Nov 21, 2024
0ef5f7e
TOK-491: review builder context (#393)
antomor Nov 22, 2024
e341a2f
refactor: search context (#397)
franciscotobar Nov 23, 2024
7d69622
fix: rewards ui issues (#398)
franciscotobar Nov 23, 2024
1aa0dd2
fix: add the missing tooltips (#399)
antomor Nov 25, 2024
0809b62
fix: fix builder name and rewards leaderboard name alignment (#400)
antomor Nov 25, 2024
cea8b42
fix: change the destination contract for whitelist builder proposal (…
antomor Nov 25, 2024
4043a97
fix: show tabs only if user is builder or backer (#404)
antomor Nov 25, 2024
594d54b
fix: show community approved builders in actived builders section (#403)
antomor Nov 25, 2024
0cb315a
fix: fix few inconsistencies in the allocations (#402)
antomor Nov 25, 2024
b2478d7
fix: fix few inconsistencies in the allocations (#402) (#409)
jurajpiar Nov 25, 2024
140cfb4
DAO-842 Updated logic to correctly match allocation balance checking …
Freshenext Nov 25, 2024
f638626
fix(allocs): update new amount to alloc (#410)
jurajpiar Nov 25, 2024
6d31841
fix: filter out builders without allocations or rewards (#405)
antomor Nov 25, 2024
cee2b62
fix: show the current pct if remaining time has passed (#413)
antomor Nov 25, 2024
e19598e
Fix: estimated backer rewards (#408)
antomor Nov 25, 2024
762e584
chore: update growth rewards bucket address (#411)
antomor Nov 25, 2024
a3c794a
chore: update the text in my rewards section (#414)
antomor Nov 25, 2024
52edb3a
fix: allocs left too long fractions (#412)
jurajpiar Nov 26, 2024
eded22a
fix: claim rewards button (#415)
franciscotobar Nov 26, 2024
597742d
fix: show the decoded input for dewhitelist proposals (#418)
antomor Nov 26, 2024
a0af10e
Tok 504/fix sort leaderboard per rewards crash (#419)
DinizSa Nov 27, 2024
852fe3b
feat(cr): replace index to address based builders in allocs context (…
jurajpiar Nov 27, 2024
84a85c2
TOK-502: use active backer rewards percentage (#421)
jurajpiar Nov 27, 2024
d9b0cb2
fix: formatOnChain franction
antomor Nov 27, 2024
830ee2d
refactor: saving allocations error handling (#424)
franciscotobar Nov 27, 2024
06e3333
chore: leaderbord align builder icon vertically (#427)
DinizSa Nov 27, 2024
f01b31b
chore(cr): change builder to backer reward percentage (#429)
jurajpiar Nov 27, 2024
750f422
fix: fix bug where 100% btn needs to be clicked twice to stake (#425)
LordCheta Nov 28, 2024
91cf5ea
fix: impl for issue with roudning issue causing 100% staking to fail …
LordCheta Nov 28, 2024
a4be16a
chore: update mainnet configuration (#436)
antomor Nov 29, 2024
e1201f7
Bump version to 1.3.0 (#434)
jessgusclark Nov 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 7 additions & 2 deletions .env.dev
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,14 @@ NEXT_PUBLIC_GENERAL_BUCKET_ADDRESS=0x72Ed7d7b7835Ad62B1f9b6280bAd62618aA71461
NEXT_PUBLIC_CHAIN_ID=31

# CR-related env variables
# TODO: To be removed
NEXT_PUBLIC_SIMPLIFIED_REWARD_DISTRIBUTOR_ADDRESS=0xc469Cc2579De5C16210e9063B4E628bF8C46bA02
NEXT_PUBLIC_EPOCH_DURATION_IN_DAYS=7
NEXT_PUBLIC_FIRST_EPOCH_START_DATE_ISO="1970-01-01T00:00:00Z"

NEXT_PUBLIC_BACKERS_MANAGER_ADDRESS=0x41841e316F85933247fC7b51c79B76F22eB239bc
NEXT_PUBLIC_REWARD_DISTRIBUTOR_ADDRESS=0x83Eac3Abe6AAF4a4AAe8B067888FAD600c4cF6B3

NEXT_PUBLIC_CYCLE_DURATION_IN_DAYS=7
NEXT_PUBLIC_FIRST_CYCLE_START_DATE_ISO="1970-01-01T00:00:00Z"

NEXT_PUBLIC_ENV_DATA_URL="https://raw.githubusercontent.com/RootstockCollective/dao-frontend/develop/data.testnet.json"

Expand Down
30 changes: 30 additions & 0 deletions .env.mainnet
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
NEXT_PUBLIC_ENV=mainnet
NEXT_PUBLIC_RIF_WALLET_SERVICES=https://rws.app.rootstockcollective.xyz
NEXT_PUBLIC_EXPLORER=https://explorer.rootstock.io
NEXT_PUBLIC_BUILD_ID=

NEXT_PUBLIC_RIF_ADDRESS=0x2acc95758f8b5f583470ba265eb685a8f45fc9d5
NEXT_PUBLIC_STRIF_ADDRESS=0x5db91e24bd32059584bbdb831a901f1199f3d459
NEXT_PUBLIC_GOVERNOR_ADDRESS=0x71ac6ff904a17f50f2c07b693376ccc1c92627f0
NEXT_PUBLIC_EA_NFT_ADDRESS=0x339f209b3eb8381c4fbe997232e95a21a731524c
NEXT_PUBLIC_MULTICALL_ADDRESS=0xcA11bde05977b3631167028862bE2a173976CA11
NEXT_PUBLIC_GRANTS_BUCKET_ADDRESS=0x48229e5D82a186Aa89a99212D2D59f5674aa5b6C
NEXT_PUBLIC_GRANTS_ACTIVE_BUCKET_ADDRESS=0xf016fa6b237bb56e3aee7022c6947a6a103e3c47
NEXT_PUBLIC_GROWTH_BUCKET_ADDRESS=0x267a6073637408b6A1d34d685ff5720A0CbCbD9d
NEXT_PUBLIC_GENERAL_BUCKET_ADDRESS=0xfE3d9B7D68aE13455475F28089968336414FD358
NEXT_PUBLIC_CHAIN_ID=30

# CR-related env variables
NEXT_PUBLIC_BACKERS_MANAGER_ADDRESS=0x7995C48D987941291d8008695A4133E557a11530
NEXT_PUBLIC_REWARD_DISTRIBUTOR_ADDRESS=0x5603Ba40257e317e45BA13C3732819Af5E81a9A1

## TODO: to be removed
NEXT_PUBLIC_SIMPLIFIED_REWARD_DISTRIBUTOR_ADDRESS=0x05220a0A76340a4ac474CF6F385718db20C1109f
NEXT_PUBLIC_CYCLE_DURATION_IN_DAYS=14
NEXT_PUBLIC_FIRST_CYCLE_START_DATE_ISO="2024-10-30T00:00:00Z"
NEXT_PUBLIC_ENV_DATA_URL="https://raw.githubusercontent.com/RootstockCollective/dao-frontend/develop/data.mainnet.json"

# OG NFT Contracts
NEXT_PUBLIC_OG_FOUNDERS=0x0025e59f281bc06e7A54afe780673bd6A8D3a7E9
NEXT_PUBLIC_OG_PARTNERS=0x8158aBDAEdD7770F372031aC0AaB8FB4BC9ABe75
NEXT_PUBLIC_OG_CONTRIBUTORS=0x5b20eDd661a2B87A9C9AE55d3e3b09281Dc71C48
1 change: 0 additions & 1 deletion .env.qa
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ NEXT_PUBLIC_CHAIN_ID=31
NEXT_PUBLIC_SIMPLIFIED_REWARD_DISTRIBUTOR_ADDRESS=0xc469Cc2579De5C16210e9063B4E628bF8C46bA02
NEXT_PUBLIC_EPOCH_DURATION_IN_DAYS=7
NEXT_PUBLIC_FIRST_EPOCH_START_DATE_ISO="1970-01-01T00:00:00Z"
NEXT_PUBLIC_WHITELISTED_BUILDERS_URL=https://frontend.qa.bim.dao.rif.technology/bim/whitelisted/

NEXT_PUBLIC_ENV_DATA_URL="https://raw.githubusercontent.com/RootstockCollective/dao-frontend/develop/data.testnet.qa.json"

Expand Down
24 changes: 0 additions & 24 deletions .env.regtest

This file was deleted.

2 changes: 1 addition & 1 deletion .env.prod → .env.staging.mainnet
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
NEXT_PUBLIC_ENV=mainnet
NEXT_PUBLIC_RIF_WALLET_SERVICES=https://rws.app.rootstockcollective.xyz
NEXT_PUBLIC_RIF_WALLET_SERVICES=https://dev.rws.app.rootstockcollective.xyz
NEXT_PUBLIC_EXPLORER=https://explorer.rootstock.io
NEXT_PUBLIC_BUILD_ID=

Expand Down
27 changes: 19 additions & 8 deletions .env.testnet.local
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# This file contains the environment variables for the CR local testnet environment
NEXT_PUBLIC_ENV=testnet
NEXT_PUBLIC_RIF_WALLET_SERVICES=http://localhost:3000/cors_bypass
NEXT_PUBLIC_PROXY_DESTINATION=https://rws.app.rootstockcollective.xyz
NEXT_PUBLIC_PROXY_DESTINATION=https://dev.rws.app.rootstockcollective.xyz
NEXT_PUBLIC_EXPLORER=https://explorer.testnet.rootstock.io
NEXT_PUBLIC_BUILD_ID=

NEXT_PUBLIC_RIF_ADDRESS=0x19f64674d8a5b4e652319f5e239efd3bc969a1fe
NEXT_PUBLIC_STRIF_ADDRESS=0x4861198e9A6814EBfb152552D1b1a37426C54D23
NEXT_PUBLIC_GOVERNOR_ADDRESS=0x2109FF4a9D5548a21F877cA937Ac5847Fde49694
NEXT_PUBLIC_EA_NFT_ADDRESS=0x979deF73ec80B8AE24Ae46765b81D9aF7b1C9327
NEXT_PUBLIC_STRIF_ADDRESS=0xb514d8181e23cf59BE7E4FF237f28dd02BB0772E
NEXT_PUBLIC_GOVERNOR_ADDRESS=0xB1A39B8f57A55d1429324EEb1564122806eb297F
NEXT_PUBLIC_EA_NFT_ADDRESS=0x0Ee4e11f2F2B551cA31Ea7873c7bA675cb51A59d
NEXT_PUBLIC_MULTICALL_ADDRESS=0xcA11bde05977b3631167028862bE2a173976CA11
NEXT_PUBLIC_GRANTS_BUCKET_ADDRESS=0xfaca664c661af7e0e630c8f92b401012cd2a30ef
NEXT_PUBLIC_GRANTS_ACTIVE_BUCKET_ADDRESS=0x2217E4d3Ae0A6E30075D1B5a7b8C1520E8009f49
Expand All @@ -17,8 +17,19 @@ NEXT_PUBLIC_GENERAL_BUCKET_ADDRESS=0x72Ed7d7b7835Ad62B1f9b6280bAd62618aA71461
NEXT_PUBLIC_CHAIN_ID=31

# CR-related env variables
NEXT_PUBLIC_SIMPLIFIED_REWARD_DISTRIBUTOR_ADDRESS=0x4e84FCc953dE129C6C47c5B0AD7E57B226093Ae1
NEXT_PUBLIC_EPOCH_DURATION_IN_DAYS=7
NEXT_PUBLIC_FIRST_EPOCH_START_DATE_ISO="1970-01-01T00:00:00Z"
NEXT_PUBLIC_BACKERS_MANAGER_ADDRESS=0xA3e14a93b1606152A671E3C8f9918882dfAB4B67
NEXT_PUBLIC_REWARD_DISTRIBUTOR_ADDRESS=0xE19d22aB1eDD458dbeAA9F391cAF949E4f110c08
NEXT_PUBLIC_GOVERNANCE_MANAGER_ADDRESS=0xcB392a848dD7539f24c71Ebed0BcA2a855Bcf92D
NEXT_PUBLIC_CYCLE_DURATION_IN_DAYS=7
NEXT_PUBLIC_FIRST_CYCLE_START_DATE_ISO="1970-01-01T00:00:00Z"

NEXT_PUBLIC_ENV_DATA_URL="https://raw.githubusercontent.com/RootstockCollective/dao-frontend/develop/data.testnet.qa.json"

# OG NFT Contracts
NEXT_PUBLIC_OG_FOUNDERS=0x7E6d9969CAC008bAe5f7b144df3c955515404538
NEXT_PUBLIC_OG_PARTNERS=0x285046a90fb322E6BaCa4F38Bb884e3C0904F7EB
NEXT_PUBLIC_OG_CONTRIBUTORS=0xDC03B8fb7E47E4651f5008bD718a804726424A75

NEXT_PUBLIC_ENABLE_CORS_BYPASS=true
NEXT_PUBLIC_ENABLE_FEATURE_V2_REWARDS=true

NEXT_PUBLIC_ENV_DATA_URL="https://raw.githubusercontent.com/RootstockCollective/dao-frontend/develop/data.testnet.local.json"
18 changes: 12 additions & 6 deletions .env.testnet.qa
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# This file contains the environment variables for the CR QA testnet environment
NEXT_PUBLIC_ENV=testnet
NEXT_PUBLIC_RIF_WALLET_SERVICES=https://frontend.qa.bim.dao.rif.technology/cors_bypass
NEXT_PUBLIC_PROXY_DESTINATION=https://rws.app.rootstockcollective.xyz
NEXT_PUBLIC_PROXY_DESTINATION=https://dev.rws.app.rootstockcollective.xyz
NEXT_PUBLIC_EXPLORER=https://explorer.testnet.rootstock.io
NEXT_PUBLIC_BUILD_ID=

NEXT_PUBLIC_RIF_ADDRESS=0x19f64674d8a5b4e652319f5e239efd3bc969a1fe
NEXT_PUBLIC_STRIF_ADDRESS=0xC4b091d97AD25ceA5922f09fe80711B7ACBbb16f
NEXT_PUBLIC_GOVERNOR_ADDRESS=0xB1A39B8f57A55d1429324EEb1564122806eb297F
NEXT_PUBLIC_EA_NFT_ADDRESS=0x979deF73ec80B8AE24Ae46765b81D9aF7b1C9327
NEXT_PUBLIC_EA_NFT_ADDRESS=0x0Ee4e11f2F2B551cA31Ea7873c7bA675cb51A59d
NEXT_PUBLIC_MULTICALL_ADDRESS=0xcA11bde05977b3631167028862bE2a173976CA11
NEXT_PUBLIC_GRANTS_BUCKET_ADDRESS=0xfaca664c661af7e0e630c8f92b401012cd2a30ef
NEXT_PUBLIC_GRANTS_ACTIVE_BUCKET_ADDRESS=0x2217E4d3Ae0A6E30075D1B5a7b8C1520E8009f49
Expand All @@ -17,9 +17,15 @@ NEXT_PUBLIC_GENERAL_BUCKET_ADDRESS=0x72Ed7d7b7835Ad62B1f9b6280bAd62618aA71461
NEXT_PUBLIC_CHAIN_ID=31

# CR-related env variables
NEXT_PUBLIC_SIMPLIFIED_REWARD_DISTRIBUTOR_ADDRESS=0xc469Cc2579De5C16210e9063B4E628bF8C46bA02
NEXT_PUBLIC_EPOCH_DURATION_IN_DAYS=7
NEXT_PUBLIC_FIRST_EPOCH_START_DATE_ISO="1970-01-01T00:00:00Z"
NEXT_PUBLIC_WHITELISTED_BUILDERS_URL=https://frontend.qa.bim.dao.rif.technology/bim/whitelisted/
NEXT_PUBLIC_BACKERS_MANAGER_ADDRESS=0x41841e316F85933247fC7b51c79B76F22eB239bc
NEXT_PUBLIC_REWARD_DISTRIBUTOR_ADDRESS=0x83Eac3Abe6AAF4a4AAe8B067888FAD600c4cF6B3

NEXT_PUBLIC_CYCLE_DURATION_IN_DAYS=7
NEXT_PUBLIC_FIRST_CYCLE_START_DATE_ISO="1970-01-01T00:00:00Z"

NEXT_PUBLIC_ENV_DATA_URL="https://raw.githubusercontent.com/RootstockCollective/dao-frontend/develop/data.testnet.qa.json"

# OG NFT Contracts
NEXT_PUBLIC_OG_FOUNDERS=0x7E6d9969CAC008bAe5f7b144df3c955515404538
NEXT_PUBLIC_OG_PARTNERS=0x285046a90fb322E6BaCa4F38Bb884e3C0904F7EB
NEXT_PUBLIC_OG_CONTRIBUTORS=0xDC03B8fb7E47E4651f5008bD718a804726424A75
14 changes: 10 additions & 4 deletions .env.testnet.staging
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,15 @@ NEXT_PUBLIC_GENERAL_BUCKET_ADDRESS=0x72Ed7d7b7835Ad62B1f9b6280bAd62618aA71461
NEXT_PUBLIC_CHAIN_ID=31

# CR-related env variables
NEXT_PUBLIC_SIMPLIFIED_REWARD_DISTRIBUTOR_ADDRESS=0x4447EC87854651ECdce3E91e581c34641C91eC46
NEXT_PUBLIC_EPOCH_DURATION_IN_DAYS=7
NEXT_PUBLIC_FIRST_EPOCH_START_DATE_ISO="1970-01-01T00:00:00Z"
NEXT_PUBLIC_WHITELISTED_BUILDERS_URL=https://frontend.testnet.bim.dao.rif.technology/bim/whitelisted/
# TODO: To be changed once we deploy the contracts for staging
NEXT_PUBLIC_BACKERS_MANAGER_ADDRESS=0xec0a29Df5180A6B04496dfAf2D827e36F4a0A52F
NEXT_PUBLIC_REWARD_DISTRIBUTOR_ADDRESS=0xD476E4804551595687C1f6F0a9C22dd1Bbfa0319
NEXT_PUBLIC_GOVERNANCE_MANAGER_ADDRESS=0xb7C6918d6aE6df2e147FF464271a94EAfF027E5D
NEXT_PUBLIC_CYCLE_DURATION_IN_DAYS=7
NEXT_PUBLIC_FIRST_CYCLE_START_DATE_ISO="1970-01-01T00:00:00Z"

NEXT_PUBLIC_ENV_DATA_URL="https://raw.githubusercontent.com/RootstockCollective/dao-frontend/develop/data.testnet.staging.json"
# OG NFT Contracts
NEXT_PUBLIC_OG_FOUNDERS=0x7E6d9969CAC008bAe5f7b144df3c955515404538
NEXT_PUBLIC_OG_PARTNERS=0x285046a90fb322E6BaCa4F38Bb884e3C0904F7EB
NEXT_PUBLIC_OG_CONTRIBUTORS=0xDC03B8fb7E47E4651f5008bD718a804726424A75
20 changes: 12 additions & 8 deletions .github/workflows/cr.qa.deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,16 @@ on:

env:
AWS_REGION: us-east-1
ECR_REPOSITORY: bim-dao-frontend-qa
ECS_SERVICE: bim-dao-frontend
ECS_CLUSTER: bim-dao-frontend-qa
ECS_TASK_DEFINITION: bim-dao-frontend-qa
CONTAINER_NAME: bim-dao-frontend
ECR_REPOSITORY: rscoll-dev-bim-qa
ECS_SERVICE: rscoll-dev-bim-qa
ECS_CLUSTER: rscoll-dev
ECS_TASK_DEFINITION: rscoll-dev-bim-qa
CONTAINER_NAME: rscoll-dev-bim-qa

# The .env file that is used to build the docker image
# is retrieved using PROFILE, so be sure there is a `.env.<PROFILE>` file
# that matches with the profile set
# Example: PROFILE=testnet => .env.testnet
PROFILE: testnet.qa

jobs:
Expand All @@ -22,7 +26,7 @@ jobs:
if: |
github.event_name == 'workflow_dispatch' || github.event.label.name == 'deploy to QA'
environment:
name: QA
name: CR-QA
permissions:
id-token: write
contents: read
Expand All @@ -34,7 +38,7 @@ jobs:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.ROLE_ECS_ARN }}
role-to-assume: ${{ secrets.AWS_LOGIN_QA_ROLE_ARN }}
aws-region: ${{ env.AWS_REGION }}

- name: Login to Amazon ECR
Expand All @@ -50,7 +54,7 @@ jobs:
# Build a docker container and
# push it to ECR so that it can
# be deployed to ECS.
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg arg_env="$PROFILE" --build-arg NEXT_PUBLIC_BUILD_ID=${{ github.sha }} --no-cache .
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg PROFILE="$PROFILE" --build-arg NEXT_PUBLIC_BUILD_ID=${{ github.sha }} --no-cache .
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"

Expand Down
20 changes: 12 additions & 8 deletions .github/workflows/cr.staging.deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,24 @@ on:

env:
AWS_REGION: us-east-1
ECR_REPOSITORY: bim-dao-frontend-testnet
ECS_SERVICE: bim-dao-frontend
ECS_CLUSTER: bim-dao-frontend-testnet
ECS_TASK_DEFINITION: bim-dao-frontend-testnet
CONTAINER_NAME: bim-dao-frontend
ECR_REPOSITORY: rscoll-dev-bim-staging
ECS_SERVICE: rscoll-dev-bim-staging
ECS_CLUSTER: rscoll-dev
ECS_TASK_DEFINITION: rscoll-dev-bim-staging
CONTAINER_NAME: rscoll-dev-bim-staging

# The .env file that is used to build the docker image
# is retrieved using PROFILE, so be sure there is a `.env.<PROFILE>` file
# that matches with the profile set
# Example: PROFILE=testnet => .env.testnet
PROFILE: testnet.staging

jobs:
deploy:
name: Deploy
runs-on: ubuntu-latest
environment:
name: TESTNET
name: CR-STAGING
permissions:
id-token: write
contents: read
Expand All @@ -34,7 +38,7 @@ jobs:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.AWS_LOGIN_TESTNET_ROLE_ARN }}
role-to-assume: ${{ secrets.AWS_LOGIN_STAGING_ROLE_ARN }}
aws-region: ${{ env.AWS_REGION }}

- name: Login to Amazon ECR
Expand All @@ -50,7 +54,7 @@ jobs:
# Build a docker container and
# push it to ECR so that it can
# be deployed to ECS.
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg arg_env="$PROFILE" --build-arg NEXT_PUBLIC_BUILD_ID=${{ github.sha }} --no-cache .
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg PROFILE="$PROFILE" --build-arg NEXT_PUBLIC_BUILD_ID=${{ github.sha }} --no-cache .
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"

Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/dependency_review.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: 'Dependency Review'
on: [pull_request]

permissions: read-all

jobs:
dependency-review:
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write
steps:
- name: 'Checkout Repository'
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: 'Dependency Review'
uses: actions/dependency-review-action@a6993e2c61fd5dc440b409aa1d6904921c5e1894 # v4.3.5
with:
fail-on-severity: high
comment-summary-in-pr: true
6 changes: 5 additions & 1 deletion .github/workflows/dev.deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ env:
ECS_TASK_DEFINITION: rscoll-dev-dao-dev
CONTAINER_NAME: rscoll-dev-dao-dev

# The .env file that is used to build the docker image
# is retrieved using PROFILE, so be sure there is a `.env.<PROFILE>` file
# that matches with the profile set
# Example: PROFILE=testnet => .env.testnet
PROFILE: dev

jobs:
Expand Down Expand Up @@ -49,7 +53,7 @@ jobs:
# Build a docker container and
# push it to ECR so that it can
# be deployed to ECS.
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg arg_env="$PROFILE" --build-arg NEXT_PUBLIC_BUILD_ID=${{ github.sha }} --no-cache .
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg PROFILE="$PROFILE" --build-arg NEXT_PUBLIC_BUILD_ID=${{ github.sha }} --no-cache .
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"

Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/mainnet.deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ env:
ECS_TASK_DEFINITION: dao-frontend-mainnet
CONTAINER_NAME: dao-frontend-mainnet

# The .env file that is used to build the docker image
# is retrieved using PROFILE, so be sure there is a `.env.<PROFILE>` file
# that matches with the profile set
# Example: PROFILE=testnet => .env.testnet
PROFILE: mainnet

jobs:
Expand Down Expand Up @@ -49,7 +53,7 @@ jobs:
# Build a docker container and
# push it to ECR so that it can
# be deployed to ECS.
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg arg_env="$PROFILE" --build-arg NEXT_PUBLIC_BUILD_ID=${{ github.sha }} --no-cache .
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg PROFILE="$PROFILE" --build-arg NEXT_PUBLIC_BUILD_ID=${{ github.sha }} --no-cache .
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"

Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/staging.deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ env:
ECS_TASK_DEFINITION: rscoll-dev-dao-staging
CONTAINER_NAME: rscoll-dev-dao-staging

# The .env file that is used to build the docker image
# is retrieved using PROFILE, so be sure there is a `.env.<PROFILE>` file
# that matches with the profile set
# Example: PROFILE=testnet => .env.testnet
PROFILE: qa

jobs:
Expand Down Expand Up @@ -49,7 +53,7 @@ jobs:
# Build a docker container and
# push it to ECR so that it can
# be deployed to ECS.
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg arg_env="$PROFILE" --build-arg NEXT_PUBLIC_BUILD_ID=${{ github.sha }} --no-cache .
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg PROFILE="$PROFILE" --build-arg NEXT_PUBLIC_BUILD_ID=${{ github.sha }} --no-cache .
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"

Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/testnet.deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ env:
ECS_TASK_DEFINITION: dao-frontend-testnet
CONTAINER_NAME: dao-frontend-testnet

# The .env file that is used to build the docker image
# is retrieved using PROFILE, so be sure there is a `.env.<PROFILE>` file
# that matches with the profile set
# Example: PROFILE=testnet => .env.testnet
PROFILE: testnet

jobs:
Expand Down Expand Up @@ -49,7 +53,7 @@ jobs:
# Build a docker container and
# push it to ECR so that it can
# be deployed to ECS.
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg arg_env="$PROFILE" --build-arg NEXT_PUBLIC_BUILD_ID=${{ github.sha }} --no-cache .
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg PROFILE="$PROFILE" --build-arg NEXT_PUBLIC_BUILD_ID=${{ github.sha }} --no-cache .
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- uses: actions/checkout@v2

- name: Install modules
run: yarn
run: npm ci

- name: Run tests
run: yarn test
run: npm run test
Loading
Loading