Skip to content

Escrow contract integration#1910

Merged
mariacarmina merged 34 commits intomainfrom
escrow-contract-integration
Apr 28, 2025
Merged

Escrow contract integration#1910
mariacarmina merged 34 commits intomainfrom
escrow-contract-integration

Conversation

@mariacarmina
Copy link
Copy Markdown
Contributor

@mariacarmina mariacarmina commented Feb 3, 2025

Fixes #1900 .

Changes proposed in this PR:

  • Created Escrow contract class
  • tests

@mariacarmina mariacarmina self-assigned this Feb 3, 2025
@mariacarmina mariacarmina changed the title Created Escrow contract class. Escrow contract integration Feb 3, 2025
@mariacarmina mariacarmina marked this pull request as ready for review February 21, 2025 21:19
@alexcos20 alexcos20 changed the base branch from main to release_4.0 March 4, 2025 09:29
Copy link
Copy Markdown
Member

@bogdanfazakas bogdanfazakas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good but we need the things mentioned here this yml change and the conflicts issue

Base automatically changed from release_4.0 to main March 18, 2025 07:27
@giurgiur99 giurgiur99 self-requested a review March 26, 2025 08:07
@jamiehewitt15
Copy link
Copy Markdown
Contributor

Have you looked into the failing tests?

@giurgiur99
Copy link
Copy Markdown
Contributor

Have you looked into the failing tests?

I am looking over them now

Copy link
Copy Markdown
Contributor Author

@mariacarmina mariacarmina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @giurgiur99 for fixing this PR! The escrow version container for the contracts got updated with latest modifications from 2.3.0-next.3 and implicit the functions definitions changed. I suggest to not merge this yet because we have the contract version set to escrow and maybe we do not need to merge now escrow payments into ocean.js.

@mariacarmina mariacarmina force-pushed the escrow-contract-integration branch from 11dd61b to dda89da Compare April 11, 2025 10:11
@mariacarmina mariacarmina merged commit 261c665 into main Apr 28, 2025
11 checks passed
@mariacarmina mariacarmina deleted the escrow-contract-integration branch April 28, 2025 11:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Escrow integration

6 participants