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

add missing exports, refactor addresses file #1904

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,12 @@ jobs:
- run: npm run build:metadata
- name: Delete default runner images
run: |
docker image rm node:18
docker image rm node:18-alpine
docker image rm node:20
docker image rm debian:10
docker image rm debian:11
docker image rm moby/buildkit:latest
docker image rm -f node:18
docker image rm -f node:18-alpine
docker image rm -f node:20
docker image rm -f debian:10
docker image rm -f debian:11
docker image rm -f moby/buildkit:latest
- name: Wait for contracts deployment and C2D cluster to be ready
working-directory: ${{ github.workspace }}/barge
run: |
Expand Down
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
Loading