Skip to content

Commit

Permalink
(fix) Remove spurious file
Browse files Browse the repository at this point in the history
(feat) Can now deploy the ZilliqaLockProxyTokenManager
(fix) Approve the right spender so that end-to-end tests work
  • Loading branch information
rrw-zilliqa committed Jul 15, 2024
1 parent 4c57d7a commit cf3d62d
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
Empty file removed smart-contracts/test/zilbridge/#
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ pragma solidity 0.8.20;
import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
import {LockProxyTokenManagerUpgradeableV3} from "contracts/zilbridge/2/LockProxyTokenManagerUpgradeableV3.sol";
import {LockProxyTokenManagerUpgradeable} from "contracts/zilbridge/2/LockProxyTokenManagerUpgradeable.sol";
import { ZilliqaLockProxyTokenManagerUpgradeableV3 } from "contracts/zilbridge/2/ZilliqaLockProxyManagerUpgradeableV3.sol";

abstract contract LockProxyTokenManagerDeployer {

Expand All @@ -28,7 +29,24 @@ abstract contract LockProxyTokenManagerDeployer {
return LockProxyTokenManagerUpgradeableV3(address(proxy));
}

function deployZilliqaLockProxyTokenManagerV3(
address chainGateway,
address lockProxyAddress,
uint fees) public returns (ZilliqaLockProxyTokenManagerUpgradeableV3) {
LockProxyTokenManagerUpgradeable proxy = deployLockProxyTokenManagerUpgradeable(chainGateway, lockProxyAddress);
address newImplementation = address(new ZilliqaLockProxyTokenManagerUpgradeableV3());
bytes memory encodedInitializerCall = abi.encodeCall(
ZilliqaLockProxyTokenManagerUpgradeableV3.reinitialize, fees);
proxy.upgradeToAndCall(newImplementation, encodedInitializerCall);
return ZilliqaLockProxyTokenManagerUpgradeableV3(address(proxy));
}

function deployLatestLockProxyTokenManager(address chainGateway, address lockProxy, uint fees) public returns (LockProxyTokenManagerUpgradeableV3) {
return deployLockProxyTokenManagerV3(chainGateway, lockProxy, fees);
}

function deployLatestZilliqaLockProxyTokenManager(address chainGateway, address lockProxy, uint fees) public returns (ZilliqaLockProxyTokenManagerUpgradeableV3) {
return deployZilliqaLockProxyTokenManagerV3(chainGateway, lockProxy, fees);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,8 @@ contract ZilBridgeTokenBridgeIntegrationTest is ZilBridgeTokenBridgeIntegrationF
function setUp() external {
installContracts();
}

function test_happyPath() external {

function test_happyPath() external {
startHoax(sourceUser);
uint amount = originalTokenSupply;
uint sourceChainId = block.chainid;
Expand Down Expand Up @@ -218,7 +217,7 @@ contract ZilBridgeTokenBridgeIntegrationTest is ZilBridgeTokenBridgeIntegrationF
startHoax(remoteUser);
remoteNativelyOnSource.approve(address(remoteTokenManager), amount);
remoteTokenManager.transfer{value: fees}(
address(nativelyOnSource), sourceChainId, sourceUser, amount);
address(remoteNativelyOnSource), sourceChainId, sourceUser, amount);

vm.startPrank(validator);
data = abi.encodeWithSelector(
Expand Down

0 comments on commit cf3d62d

Please sign in to comment.