1
0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00

Merge branch 'main' into issue-1841-pub-flow

This commit is contained in:
paulo-ocean 2024-09-24 09:41:13 +01:00
commit 7da351bd3e
3 changed files with 22 additions and 18 deletions

View File

@ -186,7 +186,6 @@ jobs:
- uses: actions/download-artifact@v4 - uses: actions/download-artifact@v4
with: with:
name: coverage-integration name: coverage-integration
- uses: paambaati/codeclimate-action@v2.7.5 - uses: paambaati/codeclimate-action@v2.7.5
env: env:
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }} CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}

1
package-lock.json generated
View File

@ -7954,6 +7954,7 @@
"url": "https://www.buymeacoffee.com/ricmoo" "url": "https://www.buymeacoffee.com/ricmoo"
} }
], ],
"license": "MIT",
"dependencies": { "dependencies": {
"@ethersproject/abi": "5.7.0", "@ethersproject/abi": "5.7.0",
"@ethersproject/abstract-provider": "5.7.0", "@ethersproject/abstract-provider": "5.7.0",

View File

@ -67,23 +67,27 @@ export class NftFactory extends SmartContractWithAddress {
) )
if (estimateGas) return <G extends false ? string : BigNumber>estGas if (estimateGas) return <G extends false ? string : BigNumber>estGas
// Invoke createToken function of the contract // Invoke createToken function of the contract
const tx = await sendTx( try {
estGas, const tx = await sendTx(
this.signer, estGas,
this.config?.gasFeeMultiplier, this.signer,
this.contract.deployERC721Contract, this.config?.gasFeeMultiplier,
nftData.name, this.contract.deployERC721Contract,
nftData.symbol, nftData.name,
nftData.templateIndex, nftData.symbol,
ZERO_ADDRESS, nftData.templateIndex,
ZERO_ADDRESS, ZERO_ADDRESS,
nftData.tokenURI, ZERO_ADDRESS,
nftData.transferable, nftData.tokenURI,
nftData.owner nftData.transferable,
) nftData.owner
const trxReceipt = await tx.wait() )
const events = getEventFromTx(trxReceipt, 'NFTCreated') const trxReceipt = await tx.wait()
return events.args[0] const events = getEventFromTx(trxReceipt, 'NFTCreated')
return events.args[0]
} catch (e) {
console.error(`Creation of AccessList failed: ${e}`)
}
} }
/** /**