fix: use gas station on polygon networks

integration/nevermined/ClaimPaymentAbortedAgreement.test.ts

@@ -1,10 +1,15 @@
 import { assert } from 'chai'
 import { decodeJwt, JWTPayload } from 'jose'
 import { Account, DDO, Nevermined, NFTAttributes, AssetPrice } from '../../src'
-import { TransferNFT721Condition, Token, Nft721Contract, ConditionState } from '../../src/keeper'
+import {
+  TransferNFT721Condition,
+  Token,
+  Nft721Contract,
+  ConditionState,
+  ContractHandler,
+} from '../../src/keeper'
 import { config } from '../config'
 import { getMetadata } from '../utils'
-import TestContractHandler from '../../test/keeper/TestContractHandler'
 import { ethers } from 'ethers'
 import { BigNumber, generateId } from '../../src/utils'
 import '../globals'
@@ -45,22 +50,20 @@ describe('Claim aborted agreements End-to-End', () => {
     nevermined = await Nevermined.getInstance(config)
     ;[, publisher, collector1, , other] = await nevermined.accounts.list()
 
-    TestContractHandler.setConfig(config)
-
     const networkName = (await nevermined.keeper.getNetworkName()).toLowerCase()
-    const erc721ABI = await TestContractHandler.getABI(
+    const erc721ABI = await ContractHandler.getABI(
       'NFT721Upgradeable',
       config.artifactsFolder,
       networkName,
     )
 
-    nft = await TestContractHandler.deployArtifact(erc721ABI, publisher.getId(), [
+    nft = await nevermined.utils.contractHandler.deployAbi(erc721ABI, publisher, [
       publisher.getId(),
       nevermined.keeper.didRegistry.address,
       'NFT721',
       'NVM',
       '',
-      0,
+      '0',
     ])
 
     nftContract = await Nft721Contract.getInstance(

integration/nevermined/NFT1155.test.ts

@@ -1,14 +1,21 @@
 import chai, { assert } from 'chai'
 import { decodeJwt, JWTPayload } from 'jose'
 import chaiAsPromised from 'chai-as-promised'
-import { Account, DDO, Nevermined, AssetPrice, AssetAttributes, NFTAttributes } from '../../src'
+import {
+  Account,
+  DDO,
+  Nevermined,
+  AssetPrice,
+  AssetAttributes,
+  NFTAttributes,
+  ContractHandler,
+} from '../../src'
 import { config } from '../config'
 import { getMetadata } from '../utils'
 import { getRoyaltyAttributes, RoyaltyKind } from '../../src/nevermined'
 import { ethers } from 'ethers'
 import { BigNumber } from '../../src/utils'
 import '../globals'
-import TestContractHandler from '../../test/keeper/TestContractHandler'
 
 chai.use(chaiAsPromised)
 
@@ -62,15 +69,14 @@ describe('NFT1155 End-to-End', () => {
 
   describe('As user I can deploy Nevermined ERC-1155 NFT contract instances', () => {
     it('Using the ABI', async () => {
-      TestContractHandler.setConfig(config)
       const networkName = (await nevermined.keeper.getNetworkName()).toLowerCase()
-      const erc1155ABI = await TestContractHandler.getABI(
+      const erc1155ABI = await ContractHandler.getABI(
         'NFT1155Upgradeable',
         config.artifactsFolder,
         networkName,
       )
 
-      nftContract = await TestContractHandler.deployArtifact(erc1155ABI, deployer.getId(), [
+      nftContract = await nevermined.utils.contractHandler.deployAbi(erc1155ABI, deployer, [
         deployer.getId(),
         nevermined.keeper.didRegistry.getAddress(),
         'NFT1155',

integration/nevermined/NFT1155Api.e2e.test.ts

@@ -7,6 +7,7 @@ import {
   TransferNFTCondition,
   Token,
   Nft1155Contract,
+  ContractHandler,
 } from '../../src/keeper'
 import { config } from '../config'
 import { getMetadata } from '../utils'
@@ -21,7 +22,6 @@ import { AssetAttributes } from '../../src/models/AssetAttributes'
 import { NFTAttributes } from '../../src/models/NFTAttributes'
 import { DIDResolvePolicy } from '../../src/nevermined/api/RegistryBaseApi'
 import { BigNumber } from '../../src/utils'
-import TestContractHandler from '../../test/keeper/TestContractHandler'
 import { sleep } from '../utils/utils'
 
 chai.use(chaiAsPromised)
@@ -85,16 +85,14 @@ function makeTest(isCustom) {
       )
 
       if (isCustom) {
-        TestContractHandler.setConfig(config)
-
         const networkName = (await nevermined.keeper.getNetworkName()).toLowerCase()
-        const erc1155ABI = await TestContractHandler.getABI(
+        const erc1155ABI = await ContractHandler.getABI(
           'NFT1155Upgradeable',
           config.artifactsFolder,
           networkName,
         )
 
-        const nft = await TestContractHandler.deployArtifact(erc1155ABI, artist.getId(), [
+        const nft = await nevermined.utils.contractHandler.deployAbi(erc1155ABI, artist, [
           artist.getId(),
           nevermined.keeper.didRegistry.address,
           'NFT1155',
@@ -455,16 +453,14 @@ function makeTest(isCustom) {
 
     describe('Node should not be able to transfer the nft without the operator role', () => {
       it('should create the subscription NFT without granting Nevermined the operator role', async () => {
-        TestContractHandler.setConfig(config)
-
         const networkName = (await nevermined.keeper.getNetworkName()).toLowerCase()
-        const erc1155ABI = await TestContractHandler.getABI(
+        const erc1155ABI = await ContractHandler.getABI(
           'NFT1155Upgradeable',
           config.artifactsFolder,
           networkName,
         )
 
-        const nft = await TestContractHandler.deployArtifact(erc1155ABI, artist.getId(), [
+        const nft = await nevermined.utils.contractHandler.deployAbi(erc1155ABI, artist, [
           artist.getId(),
           nevermined.keeper.didRegistry.address,
           'NFT1155',

integration/nevermined/NFT721.test.ts

@@ -3,11 +3,10 @@ import { decodeJwt, JWTPayload } from 'jose'
 import { config } from '../config'
 import { getMetadata } from '../utils'
 import { Nevermined, Account, DDO, NFTAttributes, AssetPrice } from '../../src'
-import TestContractHandler from '../../test/keeper/TestContractHandler'
 import { generateId, ZeroAddress, zeroX } from '../../src/utils'
 import { TokenUtils } from '../../src/nevermined'
 import { ethers } from 'ethers'
-import { Nft721Contract, TransferNFT721Condition } from '../../src/keeper'
+import { ContractHandler, Nft721Contract, TransferNFT721Condition } from '../../src/keeper'
 import { BigNumber } from '../../src/utils'
 
 describe('Nfts721 operations', async () => {
@@ -31,23 +30,21 @@ describe('Nfts721 operations', async () => {
     // Accounts
     ;[deployer, artist, collector] = await nevermined.accounts.list()
 
-    TestContractHandler.setConfig(config)
-
     const networkName = (await nevermined.keeper.getNetworkName()).toLowerCase()
-    const erc721ABI = await TestContractHandler.getABI(
+    const erc721ABI = await ContractHandler.getABI(
       'NFT721Upgradeable',
       config.artifactsFolder,
       networkName,
     )
 
     // deploy a nft contract we can use
-    nft = await TestContractHandler.deployArtifact(erc721ABI, deployer.getId(), [
+    nft = await nevermined.utils.contractHandler.deployAbi(erc721ABI, deployer, [
       artist.getId(),
       nevermined.keeper.didRegistry.address,
       'NFT721',
       'NVM',
       '',
-      0,
+      '0',
     ])
     nftContract = await Nft721Contract.getInstance(
       (nevermined.keeper as any).instanceConfig,

integration/nevermined/NFT721Api.e2e.test.ts

@@ -6,10 +6,10 @@ import {
   TransferNFT721Condition,
   Token,
   Nft721Contract,
+  ContractHandler,
 } from '../../src/keeper'
 import { config } from '../config'
 import { getMetadata } from '../utils'
-import TestContractHandler from '../../test/keeper/TestContractHandler'
 import { ethers } from 'ethers'
 import { BigNumber } from '../../src/utils'
 import '../globals'
@@ -48,22 +48,20 @@ describe('NFTs721 Api End-to-End', () => {
     nevermined = await Nevermined.getInstance(config)
     ;[, artist, collector1, , gallery] = await nevermined.accounts.list()
 
-    TestContractHandler.setConfig(config)
-
     const networkName = (await nevermined.keeper.getNetworkName()).toLowerCase()
-    const erc721ABI = await TestContractHandler.getABI(
+    const erc721ABI = await ContractHandler.getABI(
       'NFT721Upgradeable',
       config.artifactsFolder,
       networkName,
     )
 
-    nft = await TestContractHandler.deployArtifact(erc721ABI, artist.getId(), [
+    nft = await nevermined.utils.contractHandler.deployAbi(erc721ABI, artist, [
       artist.getId(),
       nevermined.keeper.didRegistry.address,
       'NFT721',
       'NVM',
       '',
-      0,
+      '0',
     ])
 
     nftContract = await Nft721Contract.getInstance(

integration/nevermined/NFT721Templates.test.ts

@@ -20,9 +20,9 @@ import {
   Token,
   NFT721AccessTemplate,
   NFT721SalesTemplate,
+  ContractHandler,
 } from '../../src/keeper'
 import { config } from '../config'
-import TestContractHandler from '../../test/keeper/TestContractHandler'
 import { NFT721Api } from '../../src'
 import { getMetadata } from '../utils'
 import { setNFTRewardsFromDDOByService } from '../../src/utils'
@@ -88,25 +88,23 @@ describe('NFT721Templates E2E', () => {
 
   before(async () => {
     nevermined = await Nevermined.getInstance(config)
-
-    TestContractHandler.setConfig(config)
     ;[owner, artist, collector1, collector2, gallery] = await nevermined.accounts.list()
 
     const networkName = (await nevermined.keeper.getNetworkName()).toLowerCase()
-    const erc721ABI = await TestContractHandler.getABI(
+    const erc721ABI = await ContractHandler.getABI(
       'NFT721Upgradeable',
       config.artifactsFolder,
       networkName,
     )
 
     // deploy a nft contract we can use
-    const nftContract = await TestContractHandler.deployArtifact(erc721ABI, artist.getId(), [
+    const nftContract = await nevermined.utils.contractHandler.deployAbi(erc721ABI, artist, [
       artist.getId(),
       nevermined.keeper.didRegistry.address,
       'NFT721',
       'NVM',
       '',
-      0,
+      '0',
     ])
 
     const clientAssertion = await nevermined.utils.jwt.generateClientAssertion(artist)
@@ -612,19 +610,19 @@ describe('NFT721Templates E2E', () => {
       )
 
       const networkName = (await nevermined.keeper.getNetworkName()).toLowerCase()
-      const erc721ABI = await TestContractHandler.getABI(
+      const erc721ABI = await ContractHandler.getABI(
         'NFT721Upgradeable',
         config.artifactsFolder,
         networkName,
       )
 
-      const nftContract = await TestContractHandler.deployArtifact(erc721ABI, artist.getId(), [
+      const nftContract = await nevermined.utils.contractHandler.deployAbi(erc721ABI, artist, [
         artist.getId(),
         nevermined.keeper.didRegistry.address,
         'NFT721',
         'NVM',
         '',
-        0,
+        '0',
       ])
       nft = await nevermined.contracts.loadNft721(nftContract.address)
 

integration/nevermined/Poap.test.ts

@@ -34,13 +34,13 @@ describe('POAPs with Assets', () => {
 
   it('should deploy the contract', async () => {
     TestContractHandler.setConfig(config)
-    poapContract = await TestContractHandler.deployArtifact(POAPUpgradeable, editor.getId(), [
+    poapContract = await nevermined.utils.contractHandler.deployAbi(POAPUpgradeable, editor, [
       editor.getId(),
       nevermined.keeper.didRegistry.address,
       'NFT721',
       'NVM',
       '',
-      0,
+      '0',
     ])
     assert.isDefined(poapContract)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nevermined-io/sdk",
-  "version": "1.3.16",
+  "version": "1.4.0",
   "description": "Javascript SDK for connecting with Nevermined Data Platform ",
   "main": "./dist/node/sdk.js",
   "typings": "./dist/node/sdk.d.ts",