Skip to content

Commit

Permalink
Merge pull request #706 from nevermined-io/fix/contract-defaults-per-env
Browse files Browse the repository at this point in the history
fix: move to the environments the contract addresses
  • Loading branch information
eruizgar91 authored Aug 26, 2024
2 parents 7c681a9 + 751a570 commit 0c9a5a0
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 23 deletions.
8 changes: 4 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2214,7 +2214,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

> 2 May 2022
- add aave service agreement to ddo when creating nft721 asset [`#248`](https://github.com/nevermined-io/sdk-js/pull/248)
- add aave service agreement to ddo when creating nft721 asset [`#248`](https://github.com/nevermined-io/sdk-js/pull/248)
- Adding v0.19.21 Changelog updates [`c93cdc5`](https://github.com/nevermined-io/sdk-js/commit/c93cdc55f139a43db4130ccb0f80924d2645a931)

#### [v0.19.21](https://github.com/nevermined-io/sdk-js/compare/v0.19.20...v0.19.21)
Expand Down Expand Up @@ -2477,7 +2477,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

> 18 January 2022
- Removing not used parameter [`#186`](https://github.com/nevermined-io/sdk-js/pull/186)
- Removing not used parameter [`#186`](https://github.com/nevermined-io/sdk-js/pull/186)
- [wip] Create agreement+pay in one transaction [`#183`](https://github.com/nevermined-io/sdk-js/pull/183)
- Adapting to contracts `v1.3.3` [`#177`](https://github.com/nevermined-io/sdk-js/pull/177)
- Adding v0.17.2 Changelog updates [`5eddda4`](https://github.com/nevermined-io/sdk-js/commit/5eddda43954e013e6e6f7344c9a877d801aacb5c)
Expand Down Expand Up @@ -2983,7 +2983,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Feature/sync develop [`#268`](https://github.com/nevermined-io/sdk-js/pull/268)
- Quick fix for non-eip1559 networks [`#266`](https://github.com/nevermined-io/sdk-js/pull/266)
- integrate Permissions and refactor search query [`#264`](https://github.com/nevermined-io/sdk-js/pull/264)
- add aave service agreement to ddo when creating nft721 asset [`#248`](https://github.com/nevermined-io/sdk-js/pull/248)
- add aave service agreement to ddo when creating nft721 asset [`#248`](https://github.com/nevermined-io/sdk-js/pull/248)
- Get the keeper version from the artifacts instead of package version [`#244`](https://github.com/nevermined-io/sdk-js/pull/244)
- replace `metadata-api` url by `marketplace-api` and sort type [`#243`](https://github.com/nevermined-io/sdk-js/pull/243)
- fixing issues with BigNumbers [`#246`](https://github.com/nevermined-io/sdk-js/pull/246)
Expand Down Expand Up @@ -3022,7 +3022,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Feature/190 add did to sec markets [`#191`](https://github.com/nevermined-io/sdk-js/pull/191)
- Adding utility methods for getting nft token uri [`#189`](https://github.com/nevermined-io/sdk-js/pull/189)
- Lint ... [`#187`](https://github.com/nevermined-io/sdk-js/pull/187)
- Removing not used parameter [`#186`](https://github.com/nevermined-io/sdk-js/pull/186)
- Removing not used parameter [`#186`](https://github.com/nevermined-io/sdk-js/pull/186)
- [wip] Create agreement+pay in one transaction [`#183`](https://github.com/nevermined-io/sdk-js/pull/183)
- Adapting to contracts `v1.3.3` [`#177`](https://github.com/nevermined-io/sdk-js/pull/177)
- Correct typo in route [`#184`](https://github.com/nevermined-io/sdk-js/pull/184)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nevermined-io/sdk",
"version": "3.0.25",
"version": "3.0.26",
"description": "Javascript SDK for connecting with Nevermined Data Platform ",
"main": "./dist/node/sdk.js",
"typings": "./dist/node/sdk.d.ts",
Expand Down
2 changes: 0 additions & 2 deletions src/nevermined/NvmApp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,6 @@ export class NvmApp {
if (!isValidAddress(this.subscriptionNFTContractCreditsAddress as string)) {
throw new Web3Error('Invalid Subscription NFT contract credits address')
}
this.sdk.contracts.loadNft1155(this.subscriptionNFTContractTimeAddress as string)
this.sdk.contracts.loadNft1155(this.subscriptionNFTContractCreditsAddress as string)
this.networkFeeReceiver = await this.fullSDK.keeper.nvmConfig.getFeeReceiver()
this.networkFee = await this.fullSDK.keeper.nvmConfig.getNetworkFee()
return {
Expand Down
32 changes: 16 additions & 16 deletions src/nevermined/resources/AppNetworks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ export class AppDeploymentStaging extends NeverminedAppOptions {
verbose = true
gasMultiplier = 0
gasPriceMultiplier = 0
nftContractTimeAddress = undefined
nftContractCreditsAddress = undefined
nftContractTimeAddress = '0x1bcA156f746C6Eb8b18d61654293e2Fc5b653fF5'
nftContractCreditsAddress = '0xb1c2237d0a2b32da39b9a1cdff4a1e6429c0fe52'
tokenAddress = '0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d'
}

Expand All @@ -52,8 +52,8 @@ export class AppDeploymentTesting extends NeverminedAppOptions {
verbose = true
gasMultiplier = 0
gasPriceMultiplier = 0
nftContractTimeAddress = undefined
nftContractCreditsAddress = undefined
nftContractTimeAddress = '0x1bcA156f746C6Eb8b18d61654293e2Fc5b653fF5'
nftContractCreditsAddress = '0xb1c2237d0a2b32da39b9a1cdff4a1e6429c0fe52'
tokenAddress = '0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d'
}

Expand All @@ -69,8 +69,8 @@ export class AppDeploymentArbitrum extends NeverminedAppOptions {
verbose = true
gasMultiplier = 0
gasPriceMultiplier = 0
nftContractTimeAddress = undefined
nftContractCreditsAddress = undefined
nftContractTimeAddress = '0x19D7551f112457deb78DadeFfd87D95a0810EDfF'
nftContractCreditsAddress = '0xda658962eb23e6343dacc222bac0401a8c8f2879'
tokenAddress = '0xaf88d065e77c8cC2239327C5EDb3A432268e5831'
}

Expand All @@ -86,8 +86,8 @@ export class AppDeploymentGnosis extends NeverminedAppOptions {
verbose = true
gasMultiplier = 0
gasPriceMultiplier = 0
nftContractTimeAddress = undefined
nftContractCreditsAddress = undefined
nftContractTimeAddress = '0x80A9b55F8604acC26dF2Ac6e07F9dC5B0eAa05Ce'
nftContractCreditsAddress = '0x80A9b55F8604acC26dF2Ac6e07F9dC5B0eAa05Ce'
tokenAddress = '0xDDAfbb505ad214D7b80b1f830fcCc89B60fb7A83'
}

Expand All @@ -103,8 +103,8 @@ export class AppDeploymentMatic extends NeverminedAppOptions {
verbose = true
gasMultiplier = 1.2
gasPriceMultiplier = 1.2
nftContractTimeAddress = undefined
nftContractCreditsAddress = undefined
nftContractTimeAddress = '0xaB53c5EBd2C42D063EA548b8e46F3E1b8F343391'
nftContractCreditsAddress = '0xaB53c5EBd2C42D063EA548b8e46F3E1b8F343391'
tokenAddress = '0x2791bca1f2de4661ed88a30c99a7a9449aa84174'
}

Expand All @@ -120,8 +120,8 @@ export class AppDeploymentBase extends NeverminedAppOptions {
verbose = true
gasMultiplier = 0
gasPriceMultiplier = 0
nftContractTimeAddress = undefined
nftContractCreditsAddress = undefined
nftContractTimeAddress = '0xE24f60aE42F7Cc3B3357480C94165afD86B66583'
nftContractCreditsAddress = '0xE24f60aE42F7Cc3B3357480C94165afD86B66583'
tokenAddress = '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913'
}

Expand All @@ -137,8 +137,8 @@ export class AppDeploymentCelo extends NeverminedAppOptions {
verbose = true
gasMultiplier = 0
gasPriceMultiplier = 0
nftContractTimeAddress = undefined
nftContractCreditsAddress = undefined
nftContractTimeAddress = '0x4daA62Fe74bFE5558D97F5B9fC45b999c6508A8e'
nftContractCreditsAddress = '0x4daA62Fe74bFE5558D97F5B9fC45b999c6508A8e'
tokenAddress = '0xef4229c8c3250C675F21BCefa42f58EfbfF6002a'
}

Expand All @@ -154,7 +154,7 @@ export class AppDeploymentOptimism extends NeverminedAppOptions {
verbose = true
gasMultiplier = 0
gasPriceMultiplier = 0
nftContractTimeAddress = undefined
nftContractCreditsAddress = undefined
nftContractTimeAddress = '0xE24f60aE42F7Cc3B3357480C94165afD86B66583'
nftContractCreditsAddress = '0xE24f60aE42F7Cc3B3357480C94165afD86B66583'
tokenAddress = '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85'
}

0 comments on commit 0c9a5a0

Please sign in to comment.