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.

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

feat: Use controller registrar from transactions #2615

Draft
wants to merge 14 commits into
base: master
Choose a base branch
from
Draft

feat: Use controller registrar from transactions #2615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
303f00c
feat: Bump deps
fzavalia Apr 25, 2023
858deca
feat: Remove addresses from configs
fzavalia Apr 25, 2023
fa14795
feat: Remove from contracts
fzavalia Apr 25, 2023
e8f6d00
feat: Add util to get contract address for current app chain id
fzavalia Apr 25, 2023
5d02282
feat: Update ens sagas to use transactions lib
fzavalia Apr 25, 2023
23f1c5c
feat: Update ens utils
fzavalia Apr 25, 2023
7a8a1b7
feat: Update component to show address from transactions lib
fzavalia Apr 25, 2023
6759a50
feat: Remove conracts from this repo
fzavalia Apr 27, 2023
a0177f0
feat: Update dcl transactions
fzavalia Apr 27, 2023
9a912f6
feat: Use factory from transactions
fzavalia Apr 27, 2023
325215a
feat: Fix for names
fzavalia Apr 27, 2023
f9c496b
feat: Update TS version
fzavalia Apr 27, 2023
6a3df9a
chore: Add comment
fzavalia Apr 27, 2023
24da386
Revert "feat: Update TS version"
fzavalia Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
"dcl-scene-writer": "^1.1.2",
"decentraland": "^3.3.0",
"decentraland-builder-scripts": "^0.24.0",
"decentraland-dapps": "^13.48.0",
"decentraland-dapps": "^13.50.0",
"decentraland-ecs": "^6.6.1-20201020183014.commit-bdc29ef-hotfix",
"decentraland-experiments": "^1.0.2",
"decentraland-transactions": "^1.42.0",
"decentraland-transactions": "^1.45.0",
"decentraland-ui": "^3.96.0",
"ethers": "^5.6.8",
"file-saver": "^2.0.1",
Expand Down
5 changes: 3 additions & 2 deletions src/components/ClaimENSPage/ClaimENSPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import { Network } from '@dcl/schemas'
import { T, t } from 'decentraland-dapps/dist/modules/translation/utils'
import { getTokenAmountToApprove } from 'decentraland-dapps/dist/modules/authorization/utils'
import { NetworkButton, NetworkCheck, TransactionLink } from 'decentraland-dapps/dist/containers'
import { ContractName } from 'decentraland-transactions'
import { getContractAddressForAppChainId } from 'modules/contract/utils'
import Back from 'components/Back'
import LoggedInDetailPage from 'components/LoggedInDetailPage'
import { locations } from 'routing/locations'
import { MAX_NAME_SIZE, PRICE, isNameValid, isNameAvailable, hasNameMinLength, isEnoughClaimMana } from 'modules/ens/utils'
import { CONTROLLER_V2_ADDRESS } from 'modules/common/contracts'
import { Props, State } from './ClaimENSPage.types'
import './ClaimENSPage.css'

Expand Down Expand Up @@ -153,7 +154,7 @@ export default class ClaimENSPage extends React.PureComponent<Props, State> {
id="claim_ens_page.need_mana_message"
values={{
contract_link: (
<TransactionLink address={CONTROLLER_V2_ADDRESS} txHash="">
<TransactionLink address={getContractAddressForAppChainId(ContractName.DCLControllerV2)} txHash="">
DCLControllerV2
</TransactionLink>
)
Expand Down
2 changes: 0 additions & 2 deletions src/config/env/dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
"ENS_CONTRACT_ADDRESS": "0x00000000000c2e074ec69a0dfb2997ba6c7d2e1e",
"ENS_GATEWAY": "limo",
"RESOLVER_CONTRACT_ADDRESS": "0x4B1488B7a6B320d2D721406204aBc3eeAa9AD329",
"CONTROLLER_V2_CONTRACT_ADDRESS": "0xe23b047c8ee33d0c423676544bca6d2c9d3faa49",
"REGISTRAR_CONTRACT_ADDRESS": "0x6b8da2752827cf926215b43bb8e46fd7b9ddac35",
"RENTALS_CONTRACT_ADDRESS": "0x92159c78f0f4523b9c60382bb888f30f10a46b3b",
"IPFS_URL": "https://ipfs.infura.io:5001/api/v0/add?pin=false",
"EXPLORER_URL": "https://play.decentraland.zone",
Expand Down
2 changes: 0 additions & 2 deletions src/config/env/prod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
"ENS_CONTRACT_ADDRESS": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
"ENS_GATEWAY": "limo",
"RESOLVER_CONTRACT_ADDRESS": "0x4976fb03c32e5b8cfe2b6ccb31c09ba78ebaba41",
"CONTROLLER_V2_CONTRACT_ADDRESS": "0xbe92b49aee993adea3a002adcda189a2b7dec56c",
"REGISTRAR_CONTRACT_ADDRESS": "0x2a187453064356c898cae034eaed119e1663acb8",
"RENTALS_CONTRACT_ADDRESS": "0x3a1469499d0be105d4f77045ca403a5f6dc2f3f5",
"IPFS_URL": "https://ipfs.infura.io:5001/api/v0/add?pin=false",
"EXPLORER_URL": "https://play.decentraland.org",
Expand Down
2 changes: 0 additions & 2 deletions src/config/env/stg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
"ENS_CONTRACT_ADDRESS": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
"ENS_GATEWAY": "limo",
"RESOLVER_CONTRACT_ADDRESS": "0x4976fb03c32e5b8cfe2b6ccb31c09ba78ebaba41",
"CONTROLLER_V2_CONTRACT_ADDRESS": "0xbe92b49aee993adea3a002adcda189a2b7dec56c",
"REGISTRAR_CONTRACT_ADDRESS": "0x2a187453064356c898cae034eaed119e1663acb8",
"RENTALS_CONTRACT_ADDRESS": "0x3a1469499d0be105d4f77045ca403a5f6dc2f3f5",
"IPFS_URL": "https://ipfs.infura.io:5001/api/v0/add?pin=false",
"EXPLORER_URL": "https://play.decentraland.org",
Expand Down
133 changes: 0 additions & 133 deletions src/contracts/DCLController.json
View file
Open in desktop

This file was deleted.

Loading