Skip to content

Commit e1c4fba

Browse files
PepePepe
Pepe
authored and
Pepe
committed
naming change for local and remote tokens
1 parent 30296d9 commit e1c4fba

9 files changed

Lines changed: 59 additions & 32 deletions

File tree

‎src/protocol/ERC1155Bridge.sol‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,9 @@ contract ERC1155Bridge is IERC1155Bridge, ReentrancyGuardTransient, IERC1155Rece
9494
address remoteToken = localToRemoteToken[localToken];
9595
require(remoteToken != address(0), "Unsupported token");
9696

97-
ERC1155Deposit memory erc1155Deposit =
98-
ERC1155Deposit(_globalDepositNonce, msg.sender, to, remoteToken, tokenId, amount, data, context, canceler);
97+
ERC1155Deposit memory erc1155Deposit = ERC1155Deposit(
98+
_globalDepositNonce, msg.sender, to, localToken, remoteToken, tokenId, amount, data, context, canceler
99+
);
99100
id = _generateId(erc1155Deposit);
100101
unchecked {
101102
++_globalDepositNonce;
@@ -144,7 +145,7 @@ contract ERC1155Bridge is IERC1155Bridge, ReentrancyGuardTransient, IERC1155Rece
144145
signalService.verifySignal(height, trustedCommitmentPublisher, counterpart, id, proof);
145146

146147
_processed[id] = true;
147-
_sendERC1155(erc1155Deposit.token, to, erc1155Deposit.tokenId, erc1155Deposit.amount, data);
148+
_sendERC1155(erc1155Deposit.remoteToken, to, erc1155Deposit.tokenId, erc1155Deposit.amount, data);
148149
}
149150

150151
/// @dev Function to safe transfer ERC1155 to the receiver with data.

‎src/protocol/ERC20Bridge.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ contract ERC20Bridge is IERC20Bridge, ReentrancyGuardTransient, AccessControl {
8080
require(remoteToken != address(0), "Unsupported token");
8181

8282
ERC20Deposit memory erc20Deposit =
83-
ERC20Deposit(_globalDepositNonce, msg.sender, to, remoteToken, amount, data, context, canceler);
83+
ERC20Deposit(_globalDepositNonce, msg.sender, to, localToken, remoteToken, amount, data, context, canceler);
8484
id = _generateId(erc20Deposit);
8585
unchecked {
8686
++_globalDepositNonce;
@@ -126,7 +126,7 @@ contract ERC20Bridge is IERC20Bridge, ReentrancyGuardTransient, AccessControl {
126126
signalService.verifySignal(height, trustedCommitmentPublisher, counterpart, id, proof);
127127

128128
_processed[id] = true;
129-
_sendERC20(erc20Deposit.token, to, erc20Deposit.amount, data);
129+
_sendERC20(erc20Deposit.remoteToken, to, erc20Deposit.amount, data);
130130
}
131131

132132
/// @dev Function to transfer ERC20 to the receiver and optionally call with data.

‎src/protocol/ERC721Bridge.sol‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,9 @@ contract ERC721Bridge is IERC721Bridge, ReentrancyGuardTransient, IERC721Receive
8888
address remoteToken = localToRemoteToken[localToken];
8989
require(remoteToken != address(0), "Unsupported token");
9090

91-
ERC721Deposit memory erc721Deposit =
92-
ERC721Deposit(_globalDepositNonce, msg.sender, to, remoteToken, tokenId, data, context, canceler);
91+
ERC721Deposit memory erc721Deposit = ERC721Deposit(
92+
_globalDepositNonce, msg.sender, to, localToken, remoteToken, tokenId, data, context, canceler
93+
);
9394
id = _generateId(erc721Deposit);
9495
unchecked {
9596
++_globalDepositNonce;
@@ -138,7 +139,7 @@ contract ERC721Bridge is IERC721Bridge, ReentrancyGuardTransient, IERC721Receive
138139
signalService.verifySignal(height, trustedCommitmentPublisher, counterpart, id, proof);
139140

140141
_processed[id] = true;
141-
_sendERC721(erc721Deposit.token, to, erc721Deposit.tokenId, data);
142+
_sendERC721(erc721Deposit.remoteToken, to, erc721Deposit.tokenId, data);
142143
}
143144

144145
/// @dev Function to safe transfer ERC721 to the receiver with data.

‎src/protocol/IERC1155Bridge.sol‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ interface IERC1155Bridge {
1414
// The receiver of the deposit
1515
address to;
1616
// The ERC1155 token address
17-
address token; // destination token
17+
address localToken;
18+
// The ERC1155 token address in the destination network
19+
address remoteToken;
1820
// The token ID
1921
uint256 tokenId;
2022
// The amount of the deposit

‎src/protocol/IERC20Bridge.sol‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ interface IERC20Bridge {
1313
address from;
1414
// The receiver of the deposit
1515
address to;
16-
// The ERC20 token address
17-
address token; // destination token
16+
// The ERC20 token address in this network
17+
address localToken;
18+
// The ERC20 token address in the destination network
19+
address remoteToken;
1820
// The amount of the deposit
1921
uint256 amount;
2022
// Any calldata to be sent to the receiver in case of a contract
@@ -56,7 +58,7 @@ interface IERC20Bridge {
5658

5759
/// @dev ERC20 Deposit identifier.
5860
/// @param erc20Deposit The ERC20 deposit struct
59-
function getDepositId(ERC20Deposit memory erc20Deposit) external view returns (bytes32 id);
61+
function getDepositId(ERC20Deposit memory erc20Deposit) external pure returns (bytes32 id);
6062

6163
/// @dev Creates an ERC20 deposit
6264
/// @param to The receiver of the deposit

‎src/protocol/IERC721Bridge.sol‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ interface IERC721Bridge {
1414
// The receiver of the deposit
1515
address to;
1616
// The ERC721 token address
17-
address token; // destination token
17+
address localToken;
18+
// The ERC721 token address in the destination network
19+
address remoteToken;
1820
// The token ID
1921
uint256 tokenId;
2022
// Any calldata to be sent to the receiver in case of a contract

‎test/ERC1155Bridge/Basic.t.sol‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ contract ERC1155BridgeTest is Test {
4545
nonce: 0,
4646
from: alice,
4747
to: bob,
48-
token: address(token),
48+
localToken: address(token),
49+
remoteToken: address(token),
4950
tokenId: tokenId,
5051
amount: 50,
5152
data: "",
@@ -73,7 +74,8 @@ contract ERC1155BridgeTest is Test {
7374
nonce: 0,
7475
from: alice,
7576
to: bob,
76-
token: address(token),
77+
localToken: address(token),
78+
remoteToken: address(token),
7779
tokenId: tokenId,
7880
amount: 50,
7981
data: "",
@@ -102,7 +104,8 @@ contract ERC1155BridgeTest is Test {
102104
nonce: 0,
103105
from: alice,
104106
to: bob,
105-
token: address(token),
107+
localToken: address(token),
108+
remoteToken: address(token),
106109
tokenId: tokenId,
107110
amount: 50,
108111
data: "",
@@ -127,7 +130,8 @@ contract ERC1155BridgeTest is Test {
127130
nonce: 0,
128131
from: alice,
129132
to: bob,
130-
token: address(token),
133+
localToken: address(token),
134+
remoteToken: address(token),
131135
tokenId: tokenId,
132136
amount: 50,
133137
data: "",
@@ -154,7 +158,8 @@ contract ERC1155BridgeTest is Test {
154158
nonce: 0,
155159
from: alice,
156160
to: bob,
157-
token: address(token),
161+
localToken: address(token),
162+
remoteToken: address(token),
158163
tokenId: tokenId,
159164
amount: 50,
160165
data: "",
@@ -181,7 +186,8 @@ contract ERC1155BridgeTest is Test {
181186
nonce: 0,
182187
from: alice,
183188
to: bob,
184-
token: address(token),
189+
localToken: address(token),
190+
remoteToken: address(token),
185191
tokenId: tokenId,
186192
amount: 50,
187193
data: "",

‎test/ERC20Bridge/Basic.t.sol‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ contract ERC20BridgeTest is Test {
5252
nonce: 0,
5353
from: alice,
5454
to: bob,
55-
token: address(token),
55+
localToken: address(token),
56+
remoteToken: address(token),
5657
amount: 100,
5758
data: "",
5859
context: "",
@@ -79,7 +80,8 @@ contract ERC20BridgeTest is Test {
7980
nonce: 0,
8081
from: alice,
8182
to: bob,
82-
token: address(token),
83+
localToken: address(token),
84+
remoteToken: address(token),
8385
amount: 100,
8486
data: "",
8587
context: "",
@@ -106,7 +108,8 @@ contract ERC20BridgeTest is Test {
106108
nonce: 0,
107109
from: alice,
108110
to: bob,
109-
token: address(token),
111+
localToken: address(token),
112+
remoteToken: address(token),
110113
amount: 100,
111114
data: "",
112115
context: "",
@@ -134,7 +137,8 @@ contract ERC20BridgeTest is Test {
134137
nonce: 0,
135138
from: alice,
136139
to: bob,
137-
token: address(token),
140+
localToken: address(token),
141+
remoteToken: address(token),
138142
amount: 100,
139143
data: "",
140144
context: "",
@@ -158,7 +162,8 @@ contract ERC20BridgeTest is Test {
158162
nonce: 0,
159163
from: alice,
160164
to: bob,
161-
token: address(token),
165+
localToken: address(token),
166+
remoteToken: address(token),
162167
amount: 100,
163168
data: "",
164169
context: "",
@@ -184,7 +189,8 @@ contract ERC20BridgeTest is Test {
184189
nonce: 0,
185190
from: alice,
186191
to: bob,
187-
token: address(token),
192+
localToken: address(token),
193+
remoteToken: address(token),
188194
amount: 100,
189195
data: "",
190196
context: "",
@@ -210,7 +216,8 @@ contract ERC20BridgeTest is Test {
210216
nonce: 0,
211217
from: alice,
212218
to: bob,
213-
token: address(token),
219+
localToken: address(token),
220+
remoteToken: address(token),
214221
amount: 100,
215222
data: "",
216223
context: "",

‎test/ERC721Bridge/Basic.t.sol‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ contract ERC721BridgeTest is Test {
4343
nonce: 0,
4444
from: alice,
4545
to: bob,
46-
token: address(token),
46+
localToken: address(token),
47+
remoteToken: address(token),
4748
tokenId: tokenId,
4849
data: "",
4950
context: "",
@@ -69,7 +70,8 @@ contract ERC721BridgeTest is Test {
6970
nonce: 0,
7071
from: alice,
7172
to: bob,
72-
token: address(token),
73+
localToken: address(token),
74+
remoteToken: address(token),
7375
tokenId: tokenId,
7476
data: "",
7577
context: "",
@@ -96,7 +98,8 @@ contract ERC721BridgeTest is Test {
9698
nonce: 0,
9799
from: alice,
98100
to: bob,
99-
token: address(token),
101+
localToken: address(token),
102+
remoteToken: address(token),
100103
tokenId: tokenId,
101104
data: "",
102105
context: "",
@@ -120,7 +123,8 @@ contract ERC721BridgeTest is Test {
120123
nonce: 0,
121124
from: alice,
122125
to: bob,
123-
token: address(token),
126+
localToken: address(token),
127+
remoteToken: address(token),
124128
tokenId: tokenId,
125129
data: "",
126130
context: "",
@@ -146,7 +150,8 @@ contract ERC721BridgeTest is Test {
146150
nonce: 0,
147151
from: alice,
148152
to: bob,
149-
token: address(token),
153+
localToken: address(token),
154+
remoteToken: address(token),
150155
tokenId: tokenId,
151156
data: "",
152157
context: "",
@@ -172,7 +177,8 @@ contract ERC721BridgeTest is Test {
172177
nonce: 0,
173178
from: alice,
174179
to: bob,
175-
token: address(token),
180+
localToken: address(token),
181+
remoteToken: address(token),
176182
tokenId: tokenId,
177183
data: "",
178184
context: "",

0 commit comments

Comments
 (0)