Code

Integrate contracts v2.2.0#1845

Code

Merged

mariacarmina merged 66 commits intomainoceanprotocol/ocean.js:mainfrom integrate-contracts-v2.2.0oceanprotocol/ocean.js:integrate-contracts-v2.2.0Copy head branch name to clipboardOct 1, 2024

+1,362-123

Commits

Commits on Aug 22, 2024

• Created AccessList contract.

  mariacarmina

  committed
  87a7a01

  Copy full SHA for 87a7a01

Commits on Aug 26, 2024

• Created new Datatoken4 template.

  mariacarmina

  committed
  a460ed9

  Copy full SHA for a460ed9

• set file object fc.

  mariacarmina

  committed
  fdcad34

  Copy full SHA for fdcad34

• integrated datatoken 4 contract.

  mariacarmina

  committed
  5b40e64

  Copy full SHA for 5b40e64

Commits on Sep 2, 2024

• install new version of ocean contracts.

  mariacarmina

  committed
  25a42c8

  Copy full SHA for 25a42c8

• added sapphire sdk + remove private functions.

  mariacarmina

  committed
  e59d565

  Copy full SHA for e59d565

Commits on Sep 3, 2024

• tweaks of template4.

  mariacarmina

  committed
  a1e8179

  Copy full SHA for a1e8179

• wrap signer on access list contract.

  mariacarmina

  committed
  243cadb

  Copy full SHA for 243cadb

• Added minimum gas fees for sapphire networks. Send function.

  mariacarmina

  committed
  8cfbeae

  Copy full SHA for 8cfbeae

• Convert to contract functions. Remove abiEnterprise.

  mariacarmina

  committed
  f751cc2

  Copy full SHA for f751cc2

Commits on Sep 4, 2024

• Upgraded contracts v2.2.0.

  mariacarmina

  committed
  47500b0

  Copy full SHA for 47500b0

• Integrated Access List factory. Created tests.

  mariacarmina

  committed
  9695585

  Copy full SHA for 9695585

• Rename file.

  mariacarmina

  committed
  fc985b9

  Copy full SHA for fc985b9

• Add script for testing sapphire functionality.

  mariacarmina

  committed
  ab9898d

  Copy full SHA for ab9898d

• Remove sapphire sdk from accesslist contract.

  mariacarmina

  committed
  8e636e5

  Copy full SHA for 8e636e5

• Added new functions to access list contract.

  mariacarmina

  committed
  0924a71

  Copy full SHA for 0924a71

• Remove script.

  mariacarmina

  committed
  65f5aaa

  Copy full SHA for 65f5aaa

• Remove script.

  mariacarmina

  committed
  7653cc2

  Copy full SHA for 7653cc2

Commits on Sep 5, 2024

• Increase timeout to the tests.

  mariacarmina

  committed
  cec7a26

  Copy full SHA for cec7a26

• Added js script. Modified gitignore.

  mariacarmina

  committed
  f336192

  Copy full SHA for f336192

• Install tsx, added oasis testnet into config helpers.

  mariacarmina

  committed
  59bdf3d

  Copy full SHA for 59bdf3d

• Modified provider signature.

  mariacarmina

  committed
  e8d4749

  Copy full SHA for e8d4749

Commits on Sep 6, 2024

• fix lint.

  mariacarmina

  committed
  e2004b6

  Copy full SHA for e2004b6

• Fix type module.

  mariacarmina

  committed
  2bca54e

  Copy full SHA for 2bca54e

• commented ordering other assets different than URL.

  mariacarmina

  committed
  c2c41e2

  Copy full SHA for c2c41e2

• Added check for file object for template index.

  mariacarmina

  committed
  54b7731

  Copy full SHA for 54b7731

Commits on Sep 9, 2024

• fix deploy erc20 template 4 test.

  mariacarmina

  committed
  4125959

  Copy full SHA for 4125959

Commits on Sep 11, 2024

• Calculate index function. Fix review.

  mariacarmina

  committed
  f97666c

  Copy full SHA for f97666c

• Change to this.signer.

  mariacarmina

  committed
  b287294

  Copy full SHA for b287294

• Uncommented orders.

  mariacarmina

  committed
  fe18feb

  Copy full SHA for fe18feb

• Upgrade Github actions.

  mariacarmina

  committed
  874226c

  Copy full SHA for 874226c

• Condition for calculation of template index.

  mariacarmina

  committed
  7b84b3c

  Copy full SHA for 7b84b3c

• Specify ABI in the tests.

  mariacarmina

  committed
  da25e32

  Copy full SHA for da25e32

• Test w soulbound contracts.

  mariacarmina

  committed
  73988cd

  Copy full SHA for 73988cd

• Fixed wallet address for test.

  mariacarmina

  committed
  5e96dda

  Copy full SHA for 5e96dda

• Add deny list check.

  mariacarmina

  committed
  2670863

  Copy full SHA for 2670863

• Store access list address within the constructor. Added tests.

  mariacarmina

  committed
  f88cdb0

  Copy full SHA for f88cdb0

Commits on Sep 12, 2024

• add debug log.

  mariacarmina

  committed
  6fe2e0b

  Copy full SHA for 6fe2e0b

• Create new datatoken for consumer.

  mariacarmina

  committed
  2fdaed9

  Copy full SHA for 2fdaed9

• distinguish coverage reports.

  mariacarmina

  committed
  74ddb70

  Copy full SHA for 74ddb70

• Fix coverage download report.

  mariacarmina

  committed
  42bbd15

  Copy full SHA for 42bbd15

Commits on Sep 13, 2024

• cleanup. added tests.

  mariacarmina

  committed
  76c2539

  Copy full SHA for 76c2539

Commits on Sep 15, 2024

• fix tests.

  mariacarmina

  committed
  c3f50bc

  Copy full SHA for c3f50bc

Commits on Sep 16, 2024

• Remove unused imports.

  mariacarmina

  committed
  4b1f4c4

  Copy full SHA for 4b1f4c4

• Increase timeout.

  mariacarmina

  committed
  c6f5657

  Copy full SHA for c6f5657

• Added test with encrypted tx.

  mariacarmina

  committed
  a3d8346

  Copy full SHA for a3d8346

Commits on Sep 17, 2024

• comment the test file.

  mariacarmina

  committed
  1e7c377

  Copy full SHA for 1e7c377

• Add test back + add ABI.

  mariacarmina

  committed
  f871aff

  Copy full SHA for f871aff

• added debug log.

  mariacarmina

  committed
  81ec8c4

  Copy full SHA for 81ec8c4

• increase timeout.

  mariacarmina

  committed
  b3694a2

  Copy full SHA for b3694a2

• Comment tests with external services.

  mariacarmina

  committed
  badeacb

  Copy full SHA for badeacb

• fix graphql URL.

  mariacarmina

  committed
  c1b5a48

  Copy full SHA for c1b5a48

• Insert arweave.

  mariacarmina

  committed
  b612061

  Copy full SHA for b612061

• Insert ipfs.

  mariacarmina

  committed
  62c3d56

  Copy full SHA for 62c3d56

• cleanup. mention ipfs issue.

  mariacarmina

  committed
  fb1f02d

  Copy full SHA for fb1f02d

• Fixes. Added getFilesObject back.

  mariacarmina

  committed
  58298e4

  Copy full SHA for 58298e4

Commits on Sep 19, 2024

• fix review.

  mariacarmina

  committed
  ae1e79f

  Copy full SHA for ae1e79f

• replace srv id w srv index.

  mariacarmina

  committed
  f595def

  Copy full SHA for f595def

• Fix doc.

  mariacarmina

  committed
  2da79fa

  Copy full SHA for 2da79fa

• Remove wrap call from constructor.

  mariacarmina

  committed
  15aaddb

  Copy full SHA for 15aaddb

• Modify README.

  mariacarmina

  committed
  9584d32

  Copy full SHA for 9584d32

Commits on Sep 24, 2024

• Added check for tx.

  mariacarmina

  committed
  c88123a

  Copy full SHA for c88123a

• fix check.

  mariacarmina

  committed
  54e15f8

  Copy full SHA for 54e15f8

• Fix conflicts.

  mariacarmina

  committed
  a6620c9

  Copy full SHA for a6620c9

• remove duplicate test.

  mariacarmina

  committed
  27aa6bb

  Copy full SHA for 27aa6bb

Commits on Sep 26, 2024

• Merge branch 'main' into integrate-contracts-v2.2.0

  mariacarmina

  committed
  2e02dfc

  Copy full SHA for 2e02dfc