Skip to content

Commit

Permalink
Merge pull request #1904 from oceanprotocol/issue-1903-exports
Browse files Browse the repository at this point in the history
add missing exports, refactor addresses file
  • Loading branch information
paulo-ocean authored Feb 17, 2025
2 parents 1c5bb82 + f5eb8b5 commit c831480
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
6 changes: 3 additions & 3 deletions src/contracts/NFT.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import { ZERO_ADDRESS } from '../utils/Constants'
import { getEventFromTx, sendTx } from '../utils/ContractUtils'
import {
calculateActiveTemplateIndex,
getOceanArtifactsAdressesByChainId
} from '../utils/Adresses'
getOceanArtifactsAddressesByChainId
} from '../utils/Addresses'

export class Nft extends SmartContract {
getDefaultAbi() {
Expand Down Expand Up @@ -70,7 +70,7 @@ export class Nft extends SmartContract {
const nftContract = this.getContract(nftAddress)

const { chainId } = await nftContract.provider.getNetwork()
const artifacts = getOceanArtifactsAdressesByChainId(chainId)
const artifacts = getOceanArtifactsAddressesByChainId(chainId)
if (filesObject) {
templateIndex = await calculateActiveTemplateIndex(
this.signer,
Expand Down
6 changes: 3 additions & 3 deletions src/utils/Adresses.ts → src/utils/Addresses.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { default as Addresses } from '@oceanprotocol/contracts/addresses/address
* either from the env or from the ocean-contracts dir
* @returns data or null
*/
export function getOceanArtifactsAdresses(): any {
export function getOceanArtifactsAddresses(): any {
try {
if (process.env.ADDRESS_FILE) {
// eslint-disable-next-line security/detect-non-literal-fs-filename
Expand All @@ -29,10 +29,10 @@ export function getOceanArtifactsAdresses(): any {
* is mispeled, best example "optimism_sepolia" vs "optimism-sepolia"
* @returns data or null
*/
export function getOceanArtifactsAdressesByChainId(chain: number): any {
export function getOceanArtifactsAddressesByChainId(chain: number): any {
try {
// eslint-disable-next-line security/detect-non-literal-fs-filename
const data = getOceanArtifactsAdresses()
const data = getOceanArtifactsAddresses()
if (data) {
const networks = Object.keys(data)
for (const network of networks) {
Expand Down
2 changes: 1 addition & 1 deletion src/utils/Assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { ProviderInstance } from '../services/Provider'

import AccessListFactory from '@oceanprotocol/contracts/artifacts/contracts/accesslists/AccessListFactory.sol/AccessListFactory.json'
import ERC20Template4 from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template4.sol/ERC20Template4.json'
import { calculateActiveTemplateIndex } from './Adresses'
import { calculateActiveTemplateIndex } from './Addresses'

// import * as hre from 'hardhat'

Expand Down
1 change: 1 addition & 0 deletions src/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ export * from './TokenUtils'
export * from './ProviderErrors'
export * from './OrderUtils'
export * from './Assets'
export * from './Addresses'
2 changes: 1 addition & 1 deletion test/unit/AssetUtils.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { assert } from 'chai'
import { KNOWN_CONFIDENTIAL_EVMS } from '../../src/config'
import { provider, getAddresses } from '../config'
import { calculateActiveTemplateIndex } from '../../src/utils/Adresses'
import { calculateActiveTemplateIndex } from '../../src/utils/Addresses'
import { useOasisSDK } from '../../src/utils/Assets'
import { Signer } from 'ethers/lib/ethers'

Expand Down

0 comments on commit c831480

Please sign in to comment.