Skip to content

Commit

Permalink
parameterize address in metdata view
Browse files Browse the repository at this point in the history
  • Loading branch information
loic1 committed Feb 19, 2025
1 parent db51016 commit bea276f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
3 changes: 1 addition & 2 deletions contracts/TopShot.cdc
Original file line number Diff line number Diff line change
Expand Up @@ -1743,8 +1743,7 @@ access(all) contract TopShot: NonFungibleToken {
return CrossVMMetadataViews.EVMPointer(
cadenceType: Type<@TopShot.NFT>(),
cadenceContractAddress: self.account.address,
// TODO: Replace with actual EVM contract address
evmContractAddress: EVM.addressFromString("0x1234565789012345657890123456578901234565"),
evmContractAddress: EVM.addressFromString(${EVMCONTRACTADDRESS}),
nativeVM: CrossVMMetadataViews.VM.Cadence
)
}
Expand Down
5 changes: 4 additions & 1 deletion lib/go/contracts/contracts.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const (
defaultEVMAddress = "EVMADDRESS"
defaultCrossVMMetadataViewsAddress = "CROSSVMMETADATAVIEWSADDRESS"
defaultNetwork = "${NETWORK}"
defaultEVMContractAddress = "${EVMCONTRACTADDRESS}"
fastBreakFile = "FastBreakV1.cdc"
crossVMMetadataViewsFile = "imports/CrossVMMetadataViews.cdc"
)
Expand Down Expand Up @@ -59,7 +60,9 @@ func GenerateTopShotContract(ftAddr, nftAddr, metadataViewsAddr, viewResolverAdd

codeWithNetwork := strings.ReplaceAll(codeWithTopShotRoyaltyAddr, defaultNetwork, network)

return []byte(codeWithNetwork)
codeWithEVMContractAddress := strings.ReplaceAll(codeWithNetwork, defaultEVMContractAddress, evmAddr)

return []byte(codeWithEVMContractAddress)
}

// GenerateTopShotShardedCollectionContract returns a copy
Expand Down
6 changes: 3 additions & 3 deletions lib/go/contracts/internal/assets/assets.go

Large diffs are not rendered by default.

0 comments on commit bea276f

Please sign in to comment.