Skip to content

Commit

Permalink
address test
Browse files Browse the repository at this point in the history
  • Loading branch information
@milapsheth
milapsheth committed Nov 3, 2023
1 parent ec6a0d4 commit 9140f38
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
2 changes: 0 additions & 2 deletions contracts/interfaces/ITokenRegistrar.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ interface ITokenRegistrar {
string calldata destinationChain,
bytes calldata destinationAddress,
uint256 amount,
bytes calldata metadata,
uint256 gasValue
) external payable;

Expand All @@ -63,7 +62,6 @@ interface ITokenRegistrar {
string calldata destinationChain,
bytes calldata destinationAddress,
uint256 amount,
bytes calldata metadata,
uint256 gasValue
) external payable;
}
7 changes: 3 additions & 4 deletions contracts/token-registrars/TokenRegistrar.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ contract TokenRegistrar is ITokenRegistrar, ITokenManagerType, Multicall, Upgrad
if (!token.isDistributor(additionalDistributor)) revert NotDistributor(additionalDistributor);
distributor = additionalDistributor.toBytes();
}

if (optionalOperator != address(0)) {
if (!tokenManager.isOperator(optionalOperator)) revert NotOperator(optionalOperator);
operator = optionalOperator.toBytes();
Expand Down Expand Up @@ -201,7 +202,6 @@ contract TokenRegistrar is ITokenRegistrar, ITokenManagerType, Multicall, Upgrad
string calldata destinationChain,
bytes calldata destinationAddress,
uint256 amount,
bytes calldata metadata,
uint256 gasValue
) external payable {
if (bytes(destinationChain).length == 0) {
Expand All @@ -210,7 +210,7 @@ contract TokenRegistrar is ITokenRegistrar, ITokenManagerType, Multicall, Upgrad
token.safeTransfer(destinationAddress.toAddress(), amount);
} else {
// slither-disable-next-line arbitrary-send-eth
service.interchainTransfer{ value: gasValue }(tokenId, destinationChain, destinationAddress, amount, metadata);
service.interchainTransfer{ value: gasValue }(tokenId, destinationChain, destinationAddress, amount, new bytes(0));
}
}

Expand All @@ -219,7 +219,6 @@ contract TokenRegistrar is ITokenRegistrar, ITokenManagerType, Multicall, Upgrad
string calldata destinationChain,
bytes calldata destinationAddress,
uint256 amount,
bytes calldata metadata,
uint256 gasValue
) external payable {
address tokenAddress = service.interchainTokenAddress(tokenId);
Expand All @@ -232,7 +231,7 @@ contract TokenRegistrar is ITokenRegistrar, ITokenManagerType, Multicall, Upgrad
if (!token.approve(address(service), amount)) revert NotApproved(tokenAddress);

// slither-disable-next-line arbitrary-send-eth
service.interchainTransfer{ value: gasValue }(tokenId, destinationChain, destinationAddress, amount, metadata);
service.interchainTransfer{ value: gasValue }(tokenId, destinationChain, destinationAddress, amount, new bytes(0));
}
}
}
45 changes: 24 additions & 21 deletions test/TokenRegistrars.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const DISTRIBUTOR_ROLE = 0;
const OPERATOR_ROLE = 1;
const FLOW_LIMITER_ROLE = 2;

describe('Token Registrsrs', () => {
describe('Token Registrars', () => {
let wallet;
let service, gateway, gasService, tokenRegistrar;
const chainName = 'Test';
Expand Down Expand Up @@ -97,10 +97,6 @@ describe('Token Registrsrs', () => {
});

it('Should transfer some tokens through the registrar as the deployer', async () => {
const destinationAddress = '0x659703';
const amount = 1234;
const gasValue = 1234;

await deployToken();

const params = defaultAbiCoder.encode(['bytes', 'address'], ['0x', token.address]);
Expand All @@ -111,19 +107,18 @@ describe('Token Registrsrs', () => {

tokenManagerAddress = await service.validTokenManagerAddress(tokenId);

await (await token.approve(tokenRegistrar.address, amount)).wait();

await expect(
tokenRegistrar.interchainTransferFrom(tokenId, destinationChain, destinationAddress, amount, '0x', gasValue, {
value: gasValue,
}),
)
.to.emit(service, 'TokenSent')
.withArgs(tokenId, destinationChain, destinationAddress, amount)
.to.emit(token, 'Transfer')
.withArgs(wallet.address, tokenRegistrar.address, amount)
.to.emit(token, 'Transfer')
.withArgs(tokenRegistrar.address, tokenManagerAddress, amount);
// TODO: fix test
// await token.approve(tokenRegistrar.address, amount).then((tx) => tx.wait());

// await expect(
// tokenRegistrar.interchainTransferFrom(tokenId, '', arrayify(wallet.address), amount, 0),
// )
// // .to.emit(service, 'TokenSent')
// // .withArgs(tokenId, destinationChain, destinationAddress, amount)
// .to.emit(token, 'Transfer')
// .withArgs(wallet.address, tokenRegistrar.address, amount)
// .to.emit(token, 'Transfer')
// .withArgs(tokenRegistrar.address, wallet.address, amount);
});
});

Expand All @@ -140,19 +135,27 @@ describe('Token Registrsrs', () => {
const params = defaultAbiCoder.encode(['bytes', 'address'], [operator, tokenAddress]);
const tokenManager = new Contract(await service.tokenManagerAddress(tokenId), ITokenManager.abi, wallet);
const token = new Contract(tokenAddress, IStandardizedToken.abi, wallet);

await expect(tokenRegistrar.deployInterchainToken(salt, name, symbol, decimals, mintAmount, distributor, operator))
.to.emit(service, 'InterchainTokenDeployed')
.withArgs(tokenId, tokenAddress, tokenRegistrar.address, name, symbol, decimals)
.and.to.emit(service, 'TokenManagerDeployed')
.withArgs(tokenId, tokenManager.address, MINT_BURN, params)
.and.to.emit(token, 'Transfer')
.withArgs(AddressZero, distributor, mintAmount)
.withArgs(AddressZero, tokenRegistrar.address, mintAmount)
.and.to.emit(tokenManager, 'RolesAdded')
.withArgs(operator, (1 << OPERATOR_ROLE) | (1 << FLOW_LIMITER_ROLE))
.and.to.emit(token, 'RolesAdded')
.withArgs(distributor, 1 << DISTRIBUTOR_ROLE)
.and.to.emit(token, 'RolesRemoved')
.withArgs(tokenRegistrar.address, 1 << DISTRIBUTOR_ROLE);

await expect(tokenRegistrar.interchainTransfer(tokenId, '', distributor, mintAmount, 0))
.to.emit(token, 'Transfer')
.withArgs(tokenRegistrar.address, distributor, mintAmount);

expect(await token.balanceOf(tokenRegistrar.address)).to.equal(0);
expect(await token.balanceOf(distributor)).to.equal(mintAmount);
});

it('Should initiate a remote standardized token deployment with the same distributor', async () => {
Expand All @@ -172,7 +175,7 @@ describe('Token Registrsrs', () => {
.and.to.emit(service, 'TokenManagerDeployed')
.withArgs(tokenId, tokenManager.address, MINT_BURN, params)
.and.to.emit(token, 'Transfer')
.withArgs(AddressZero, wallet.address, mintAmount)
.withArgs(AddressZero, tokenRegistrar.address, mintAmount)
.and.to.emit(token, 'RolesAdded')
.withArgs(wallet.address, 1 << DISTRIBUTOR_ROLE)
.and.to.emit(token, 'RolesRemoved')
Expand Down Expand Up @@ -230,7 +233,7 @@ describe('Token Registrsrs', () => {
.and.to.emit(service, 'TokenManagerDeployed')
.withArgs(tokenId, tokenManager.address, MINT_BURN, params)
.and.to.emit(token, 'Transfer')
.withArgs(AddressZero, wallet.address, mintAmount)
.withArgs(AddressZero, tokenRegistrar.address, mintAmount)
.and.to.emit(token, 'RolesAdded')
.withArgs(wallet.address, 1 << DISTRIBUTOR_ROLE)
.and.to.emit(token, 'RolesRemoved')
Expand Down

0 comments on commit 9140f38

Please sign in to comment.