Skip to content

Commit 9c995df

Browse files
natanasownatanasow
authored
chore: change visibility (#139)
Signed-off-by: nikolay <n.atanasow94@gmail.com>
1 parent 44e20e3 commit 9c995df

7 files changed

Lines changed: 31 additions & 27 deletions

File tree

‎contracts/extensions/token-create/TokenCreateContract.sol‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,4 +376,8 @@ contract TokenCreateContract is HederaTokenService, KeyHelper {
376376
revert ();
377377
}
378378
}
379+
380+
function redirectForTokenPublic(address token, bytes memory encodedFunctionSelector) external returns (int responseCode, bytes memory response) {
381+
(responseCode, response) = HederaTokenService.redirectForToken(token, encodedFunctionSelector);
382+
}
379383
}

‎contracts/extensions/token-transfer/TokenTransferContract.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ contract TokenTransferContract is HederaTokenService {
5454
}
5555

5656
function transferFromPublic(address token, address from, address to, uint256 amount) public returns (int64 responseCode) {
57-
responseCode = this.transferFrom(token, from, to, amount);
57+
responseCode = HederaTokenService.transferFrom(token, from, to, amount);
5858
emit ResponseCode(responseCode);
5959

6060
if (responseCode != HederaResponseCodes.SUCCESS) {
@@ -63,7 +63,7 @@ contract TokenTransferContract is HederaTokenService {
6363
}
6464

6565
function transferFromNFTPublic(address token, address from, address to, uint256 serialNumber) public returns (int64 responseCode) {
66-
responseCode = this.transferFromNFT(token, from, to, serialNumber);
66+
responseCode = HederaTokenService.transferFromNFT(token, from, to, serialNumber);
6767
emit ResponseCode(responseCode);
6868

6969
if (responseCode != HederaResponseCodes.SUCCESS) {

‎contracts/token-service-v2/HederaTokenService.sol‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ abstract contract HederaTokenService {
473473
address from,
474474
address to,
475475
uint256 amount
476-
) external returns (int64 responseCode) {
476+
) internal returns (int64 responseCode) {
477477
(bool success, bytes memory result) = precompileAddress.call(
478478
abi.encodeWithSelector(
479479
IHederaTokenService.transferFrom.selector,
@@ -500,7 +500,7 @@ abstract contract HederaTokenService {
500500
address from,
501501
address to,
502502
uint256 serialNumber
503-
) external returns (int64 responseCode) {
503+
) internal returns (int64 responseCode) {
504504
(bool success, bytes memory result) = precompileAddress.call(
505505
abi.encodeWithSelector(
506506
IHederaTokenService.transferFromNFT.selector,
@@ -1119,7 +1119,7 @@ abstract contract HederaTokenService {
11191119
function redirectForToken(
11201120
address token,
11211121
bytes memory encodedFunctionSelector
1122-
) external returns (int64 responseCode, bytes memory response) {
1122+
) internal returns (int64 responseCode, bytes memory response) {
11231123
(bool success, bytes memory result) = precompileAddress.call(
11241124
abi.encodeWithSelector(
11251125
IHederaTokenService.redirectForToken.selector,
@@ -1259,7 +1259,7 @@ abstract contract HederaTokenService {
12591259
address nftToken,
12601260
int64[] memory serialNumbers,
12611261
bytes memory metadata
1262-
) external returns (int64 responseCode) {
1262+
) internal returns (int64 responseCode) {
12631263
(bool success, bytes memory result) = precompileAddress.call(
12641264
abi.encodeWithSelector(
12651265
IHederaTokenService.updateNFTsMetadata.selector,

‎contracts/token-service/AtomicHTS.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ contract AtomicHTS is HederaTokenService {
8484
"Failed to associate token."
8585
);
8686

87-
(int grantKYCResponseCode) = HederaTokenService.grantTokenKyc(token, recipient);
87+
(int grantKYCResponseCode) = HederaTokenService.grantTokenKyc(token, recipient);
8888
require(grantKYCResponseCode == HederaResponseCodes.SUCCESS, "Failed to grant token KYC.");
8989

90-
(int transferFromResponseCode) = this.transferFrom(token, spender, recipient, allowance);
90+
(int transferFromResponseCode) = HederaTokenService.transferFrom(token, spender, recipient, allowance);
9191
require(transferFromResponseCode == HederaResponseCodes.SUCCESS, "Failed to transfer token.");
9292

9393
emit BatchApproveAssociateGrantKYCTransferFrom(transferTokenResponseCode, approveResponseCode, associateResponseCode, grantKYCResponseCode, transferFromResponseCode);

‎contracts/token-service/HederaTokenService.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ abstract contract HederaTokenService {
473473
address from,
474474
address to,
475475
uint256 amount
476-
) external returns (int64 responseCode) {
476+
) internal returns (int64 responseCode) {
477477
(bool success, bytes memory result) = precompileAddress.call(
478478
abi.encodeWithSelector(
479479
IHederaTokenService.transferFrom.selector,
@@ -500,7 +500,7 @@ abstract contract HederaTokenService {
500500
address from,
501501
address to,
502502
uint256 serialNumber
503-
) external returns (int64 responseCode) {
503+
) internal returns (int64 responseCode) {
504504
(bool success, bytes memory result) = precompileAddress.call(
505505
abi.encodeWithSelector(
506506
IHederaTokenService.transferFromNFT.selector,
@@ -1119,7 +1119,7 @@ abstract contract HederaTokenService {
11191119
function redirectForToken(
11201120
address token,
11211121
bytes memory encodedFunctionSelector
1122-
) external returns (int64 responseCode, bytes memory response) {
1122+
) internal returns (int64 responseCode, bytes memory response) {
11231123
(bool success, bytes memory result) = precompileAddress.call(
11241124
abi.encodeWithSelector(
11251125
IHederaTokenService.redirectForToken.selector,

‎test/token-service/hrc-719/HRC719Contract.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ describe('@HRC-719 Test Suite', function () {
185185
describe('redirectoForToken', () => {
186186
it('should be able to execute associate() via redirectForToken', async function () {
187187
const encodedFunc = IHRC719.encodeFunctionData('associate()');
188-
const tx = await tokenCreateContract.redirectForToken(
188+
const tx = await tokenCreateContract.redirectForTokenPublic(
189189
tokenAddress,
190190
encodedFunc,
191191
Constants.GAS_LIMIT_1_000_000,
@@ -198,15 +198,15 @@ describe('@HRC-719 Test Suite', function () {
198198
it('should be able to execute dissociate() via redirectForToken', async function () {
199199
// first associate the token before dissociate other wise get response_code = 184 instead of 22 (success)
200200
const encodedFuncAssociate = IHRC719.encodeFunctionData('associate()');
201-
const associateTx = await tokenCreateContract.redirectForToken(
201+
const associateTx = await tokenCreateContract.redirectForTokenPublic(
202202
tokenAddress,
203203
encodedFuncAssociate,
204204
Constants.GAS_LIMIT_1_000_000,
205205
);
206206
await associateTx.wait();
207207

208208
const enCodedFuncDissociate = IHRC719.encodeFunctionData('dissociate()');
209-
const dissociateTx = await tokenCreateContract.redirectForToken(
209+
const dissociateTx = await tokenCreateContract.redirectForTokenPublic(
210210
tokenAddress,
211211
enCodedFuncDissociate,
212212
Constants.GAS_LIMIT_1_000_000,
@@ -219,7 +219,7 @@ describe('@HRC-719 Test Suite', function () {
219219

220220
it('should be able to execute isAssociated() via redirectForToken', async function () {
221221
const encodedFunc = IHRC719.encodeFunctionData('isAssociated()');
222-
const tx = await tokenCreateContract.redirectForToken(
222+
const tx = await tokenCreateContract.redirectForTokenPublic(
223223
tokenAddress,
224224
encodedFunc,
225225
Constants.GAS_LIMIT_1_000_000,
@@ -231,15 +231,15 @@ describe('@HRC-719 Test Suite', function () {
231231

232232
it('should be able to execute isAssociated() after association via redirectForToken', async function () {
233233
await (
234-
await tokenCreateContract.redirectForToken(
234+
await tokenCreateContract.redirectForTokenPublic(
235235
tokenAddress,
236236
IHRC719.encodeFunctionData('associate()'),
237237
Constants.GAS_LIMIT_1_000_000,
238238
)
239239
).wait();
240240

241241
const encodedFunc = IHRC719.encodeFunctionData('isAssociated()');
242-
const tx = await tokenCreateContract.redirectForToken(
242+
const tx = await tokenCreateContract.redirectForTokenPublic(
243243
tokenAddress,
244244
encodedFunc,
245245
Constants.GAS_LIMIT_1_000_000,

‎test/token-service/redirect-for-token.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ describe('RedirectForToken Test Suite', function () {
8888

8989
it('should be able to execute name()', async function () {
9090
const encodedFunc = IERC20.encodeFunctionData('name()');
91-
const tx = await tokenCreateContract.redirectForToken(
91+
const tx = await tokenCreateContract.redirectForTokenPublic(
9292
tokenAddress,
9393
encodedFunc,
9494
);
@@ -99,7 +99,7 @@ describe('RedirectForToken Test Suite', function () {
9999

100100
it('should be able to execute symbol()', async function () {
101101
const encodedFunc = IERC20.encodeFunctionData('symbol()');
102-
const tx = await tokenCreateContract.redirectForToken(
102+
const tx = await tokenCreateContract.redirectForTokenPublic(
103103
tokenAddress,
104104
encodedFunc,
105105
);
@@ -110,7 +110,7 @@ describe('RedirectForToken Test Suite', function () {
110110

111111
it('should be able to execute decimals()', async function () {
112112
const encodedFunc = IERC20.encodeFunctionData('decimals()');
113-
const tx = await tokenCreateContract.redirectForToken(
113+
const tx = await tokenCreateContract.redirectForTokenPublic(
114114
tokenAddress,
115115
encodedFunc,
116116
);
@@ -121,7 +121,7 @@ describe('RedirectForToken Test Suite', function () {
121121

122122
it('should be able to execute totalSupply()', async function () {
123123
const encodedFunc = IERC20.encodeFunctionData('totalSupply()');
124-
const tx = await tokenCreateContract.redirectForToken(
124+
const tx = await tokenCreateContract.redirectForTokenPublic(
125125
tokenAddress,
126126
encodedFunc,
127127
);
@@ -134,7 +134,7 @@ describe('RedirectForToken Test Suite', function () {
134134
const encodedFuncSigner0 = IERC20.encodeFunctionData('balanceOf(address)', [
135135
signers[0].address,
136136
]);
137-
const tx0 = await tokenCreateContract.redirectForToken(
137+
const tx0 = await tokenCreateContract.redirectForTokenPublic(
138138
tokenAddress,
139139
encodedFuncSigner0,
140140
);
@@ -145,7 +145,7 @@ describe('RedirectForToken Test Suite', function () {
145145
const encodedFuncSigner1 = IERC20.encodeFunctionData('balanceOf(address)', [
146146
signers[1].address,
147147
]);
148-
const tx1 = await tokenCreateContract.redirectForToken(
148+
const tx1 = await tokenCreateContract.redirectForTokenPublic(
149149
tokenAddress,
150150
encodedFuncSigner1,
151151
);
@@ -159,7 +159,7 @@ describe('RedirectForToken Test Suite', function () {
159159
signers[1].address,
160160
amount,
161161
]);
162-
const tx = await tokenCreateContract.redirectForToken(
162+
const tx = await tokenCreateContract.redirectForTokenPublic(
163163
tokenAddress,
164164
encodedFunc,
165165
Constants.GAS_LIMIT_10_000_000,
@@ -173,7 +173,7 @@ describe('RedirectForToken Test Suite', function () {
173173
'allowance(address,address)',
174174
[await tokenCreateContract.getAddress(), signers[1].address],
175175
);
176-
const tx = await tokenCreateContract.redirectForToken(
176+
const tx = await tokenCreateContract.redirectForTokenPublic(
177177
tokenAddress,
178178
encodedFunc,
179179
Constants.GAS_LIMIT_10_000_000,
@@ -198,7 +198,7 @@ describe('RedirectForToken Test Suite', function () {
198198
signers[1].address,
199199
amount,
200200
]);
201-
const tx = await tokenCreateContract.redirectForToken(
201+
const tx = await tokenCreateContract.redirectForTokenPublic(
202202
tokenAddress,
203203
encodedFunc,
204204
);
@@ -237,7 +237,7 @@ describe('RedirectForToken Test Suite', function () {
237237
'transferFrom(address,address,uint256)',
238238
[await tokenCreateContract.getAddress(), signers[1].address, amount],
239239
);
240-
const tx = await tokenCreateContract.redirectForToken(
240+
const tx = await tokenCreateContract.redirectForTokenPublic(
241241
tokenAddress,
242242
encodedFunc,
243243
Constants.GAS_LIMIT_1_000_000,

0 commit comments

Comments
 (0)