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.

Sign up for GitHub

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

PP-885/explore-solution-b2 #260

Merged
merged 14 commits into from
Mar 19, 2024
Merged

PP-885/explore-solution-b2 #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a813688
refactor: first attempt
franciscotobar Jan 25, 2024
bf8e85b
refactor: integration test
franciscotobar Feb 1, 2024
0c8610a
refactor: boltz components
franciscotobar Feb 2, 2024
7e71cbe
chore: apply small changes to the tests
antomor Feb 6, 2024
b62a2af
fix: change the estimation script to include the full boltz template
antomor Feb 7, 2024
2cb5215
fix: cover the minimal boltz template with the gas estimation
antomor Feb 7, 2024
6a5e141
fix: remove hard-coded gas and add some checks on deployment
antomor Feb 8, 2024
865c643
refactor: minimal boltz
franciscotobar Feb 13, 2024
93eb638
refactor: destination contract
franciscotobar Feb 14, 2024
5d9f414
test: fix
franciscotobar Feb 15, 2024
13da238
refactor: pr comments
franciscotobar Feb 16, 2024
02bf404
refactor: pr comments
franciscotobar Feb 21, 2024
109f032
chore: updated dependencies
antomor Feb 28, 2024
5573c73
test: add some tests to show the interaction with the server without …
antomor Mar 19, 2024
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 .husky/pre-push
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npm run test
npm run test -- --network regtest
antomor marked this conversation as resolved.
Show resolved Hide resolved
12 changes: 9 additions & 3 deletions contracts/import.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,19 @@ pragma solidity ^0.6.12;
import '@rsksmart/rif-relay-contracts/contracts/RelayHub.sol';
import '@rsksmart/rif-relay-contracts/contracts/smartwallet/SmartWallet.sol';
import '@rsksmart/rif-relay-contracts/contracts/smartwallet/CustomSmartWallet.sol';
import '@rsksmart/rif-relay-contracts/contracts/factory/SmartWalletFactory.sol';
import '@rsksmart/rif-relay-contracts/contracts/smartwallet/CustomSmartWallet.sol';
import '@rsksmart/rif-relay-contracts/contracts/smartwallet/BoltzSmartWallet.sol';
import '@rsksmart/rif-relay-contracts/contracts/smartwallet/MinimalBoltzSmartWallet.sol';
import '@rsksmart/rif-relay-contracts/contracts/factory/SmartWalletFactory.sol';
import '@rsksmart/rif-relay-contracts/contracts/factory/CustomSmartWalletFactory.sol';
import '@rsksmart/rif-relay-contracts/contracts/verifier/DeployVerifier.sol';
import '@rsksmart/rif-relay-contracts/contracts/factory/BoltzSmartWalletFactory.sol';
import '@rsksmart/rif-relay-contracts/contracts/factory/MinimalBoltzSmartWalletFactory.sol';
import '@rsksmart/rif-relay-contracts/contracts/verifier/CustomSmartWalletDeployVerifier.sol';
import '@rsksmart/rif-relay-contracts/contracts/verifier/DeployVerifier.sol';
import '@rsksmart/rif-relay-contracts/contracts/verifier/RelayVerifier.sol';
import '@rsksmart/rif-relay-contracts/contracts/verifier/BoltzRelayVerifier.sol';
import '@rsksmart/rif-relay-contracts/contracts/verifier/BoltzDeployVerifier.sol';
import '@rsksmart/rif-relay-contracts/contracts/verifier/MinimalBoltzRelayVerifier.sol';
import '@rsksmart/rif-relay-contracts/contracts/verifier/MinimalBoltzDeployVerifier.sol';
import '@rsksmart/rif-relay-contracts/contracts/Penalizer.sol';
import '@rsksmart/rif-relay-contracts/contracts/utils/UtilToken.sol';
import '@rsksmart/rif-relay-contracts/contracts/interfaces/IForwarder.sol';
Expand Down
19 changes: 19 additions & 0 deletions contracts/test/TestSwap.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.6.12;

contract TestSwap {

function claim(
bytes32 preimage,
uint amount,
address refundAddress,
uint timelock
) external {
(bool success, ) = payable(msg.sender).call{value: amount}("");
require(success, "Could not transfer Ether");
}

// solhint-disable-next-line no-empty-blocks
receive() external payable {}

}
4,392 changes: 2,068 additions & 2,324 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
"@metamask/eth-sig-util": "^5.0.2",
"@nomicfoundation/hardhat-toolbox": "^2.0.0",
"@nomiclabs/hardhat-ethers": "^2.2.1",
"@openzeppelin/contracts": "^3.4.0",
antomor marked this conversation as resolved.
Show resolved Hide resolved
"@rsksmart/rif-relay-client": "github:rsksmart/rif-relay-client",
"@rsksmart/rif-relay-contracts": "github:rsksmart/rif-relay-contracts",
"@rsksmart/rif-relay-server": "github:rsksmart/rif-relay-server",
Expand Down Expand Up @@ -115,6 +116,7 @@
"devDependencies": {
"@types/express": "^4.17.17",
"@types/sinon-chai": "^3.2.10",
"axios": "^1.6.7",
"sinon": "^16.0.0",
"sinon-chai": "^3.7.0"
}
Expand Down
Loading
Loading