Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: contract function params, redeployed #69

Merged
merged 1 commit into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contracts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments
### Devnet
#### Arbitrum Sepolia

- [EscrowUniversal](https://sepolia.arbiscan.io/address/0x9B56c711C54F00276787574B6CEE97C33e690BCb)
- [EscrowUniversal](https://sepolia.arbiscan.io/address/0x6e2aC8E5E18191bBa2894F9317d6F2fc50d0830E)

#### Sepolia

Expand Down
108 changes: 42 additions & 66 deletions contracts/deployments/arbitrumSepoliaDevnet/EscrowUniversal.json

Large diffs are not rendered by default.

8 changes: 2 additions & 6 deletions contracts/src/EscrowUniversal.sol
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,7 @@ contract EscrowUniversal is IEscrow, IArbitrableV2 {
function createNativeTransaction(
uint256 _deadline,
string memory _transactionUri,
address payable _seller,
string memory _templateData,
string memory _templateDataMappings
address payable _seller
) external payable override returns (uint256 transactionID) {
Transaction storage transaction = transactions.push();
transaction.buyer = payable(msg.sender);
Expand All @@ -154,9 +152,7 @@ contract EscrowUniversal is IEscrow, IArbitrableV2 {
IERC20 _token,
uint256 _deadline,
string memory _transactionUri,
address payable _seller,
string memory _templateData,
string memory _templateDataMappings
address payable _seller
) external override returns (uint256 transactionID) {
// Transfers token from sender wallet to contract.
if (!_token.safeTransferFrom(msg.sender, address(this), _amount)) revert TokenTransferFailed();
Expand Down
12 changes: 2 additions & 10 deletions contracts/src/interfaces/IEscrow.sol
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,11 @@ interface IEscrow {
/// @param _deadline Time after which a party can automatically execute the arbitrable transaction.
/// @param _transactionUri The IPFS Uri Hash of the transaction.
/// @param _seller The recipient of the transaction.
/// @param _templateData The dispute template data.
/// @param _templateDataMappings The dispute template data mappings.
/// @return transactionID The index of the transaction.
function createNativeTransaction(
uint256 _deadline,
string memory _transactionUri,
address payable _seller,
string memory _templateData,
string memory _templateDataMappings
address payable _seller
) external payable returns (uint256 transactionID);

/// @dev Create a transaction.
Expand All @@ -94,17 +90,13 @@ interface IEscrow {
/// @param _deadline Time after which a party can automatically execute the arbitrable transaction.
/// @param _transactionUri The IPFS Uri Hash of the transaction.
/// @param _seller The recipient of the transaction.
/// @param _templateData The dispute template data.
/// @param _templateDataMappings The dispute template data mappings.
/// @return transactionID The index of the transaction.
function createERC20Transaction(
uint256 _amount,
IERC20 _token,
uint256 _deadline,
string memory _transactionUri,
address payable _seller,
string memory _templateData,
string memory _templateDataMappings
address payable _seller
) external returns (uint256 transactionID);

/// @dev Pay seller. To be called if the good or service is provided.
Expand Down
2 changes: 1 addition & 1 deletion subgraph/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kleros/escrow-v2-subgraph",
"version": "2.0.4",
"version": "2.0.6",
"license": "MIT",
"scripts": {
"update:arbitrum-sepolia-devnet": "./scripts/update.sh arbitrumSepoliaDevnet arbitrum-sepolia",
Expand Down
4 changes: 2 additions & 2 deletions subgraph/subgraph.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ dataSources:
name: EscrowUniversal
network: arbitrum-sepolia
source:
address: '0x9B56c711C54F00276787574B6CEE97C33e690BCb'
address: '0x6e2aC8E5E18191bBa2894F9317d6F2fc50d0830E'
abi: EscrowUniversal
startBlock: 58521526
startBlock: 58544887
mapping:
kind: ethereum/events
apiVersion: 0.0.6
Expand Down
Loading