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

Jump to bottom

feat: support erc1155. Impl Batcher for supporting erc721/erc1155 in batch #16

Merged
merged 33 commits into from
Apr 11, 2024
Merged

feat: support erc1155. Impl Batcher for supporting erc721/erc1155 in batch #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
5078d3e
fix(Token): nit prettier Token lib
nxqbao Mar 13, 2024
cb1706f
fix(Token): rename `_` for internal lib
nxqbao Mar 13, 2024
079fa61
fix(Owner): move TokenOwner to a separate lib
nxqbao Mar 13, 2024
c7751f5
fix(Info): move to LibTokenInfo
nxqbao Mar 13, 2024
d4c7a9b
fix(Info): add two array fields for info
nxqbao Mar 13, 2024
77396ac
fix(Info): validate erc1155 and erc721 batch
nxqbao Mar 13, 2024
8d0becb
fix(Info): add router
nxqbao Mar 13, 2024
68b9c86
fix(Info): restrict scope of tryTransfer to private
nxqbao Mar 13, 2024
6efc05a
feat(Info): support hash batch
nxqbao Mar 13, 2024
66b166a
fix(Info): move helpers to EoF
nxqbao Mar 13, 2024
eb9a888
fix(Info): refactor `handleAssetTransfer`
nxqbao Mar 13, 2024
fe51f39
feat(Info): rename `transferFrom` to `handleTransferFrom`
nxqbao Mar 13, 2024
f65c25d
fix(Info): rename to ERC1155Batch
nxqbao Mar 13, 2024
5090262
fix(Info): return instead of nested if-else
nxqbao Mar 13, 2024
ec8adac
feat(Info): impl transfer1155
nxqbao Mar 13, 2024
87c1c15
feat(Info): mint and transfer 1155 in batch
nxqbao Mar 13, 2024
a9649a5
fix(Gateway): rename tranferFrom to `handleAssetIn`
nxqbao Mar 13, 2024
f722a9c
fix((Info): rework the `transfer` methods
nxqbao Mar 13, 2024
bb4d8b9
fix(Info): transfer in ERC721 by private method
nxqbao Mar 13, 2024
69df309
fix(Info): support ERC721Batch
nxqbao Mar 13, 2024
3d39232
fix(Info): chore: update docs
nxqbao Mar 13, 2024
e9d6435
fix(Info): fix validation
nxqbao Mar 14, 2024
2ca888e
test: add test for ERC721 Batch
nxqbao Mar 15, 2024
4e04462
fea(GatewayBatcher): init commit
nxqbao Mar 18, 2024
7d7c5d5
feat(GatewayBatcher): separate to two `-Batch` lib
nxqbao Mar 18, 2024
65bbf4c
feat(GatewayBatcher): refactor by dispatcher
nxqbao Mar 18, 2024
a0e0e36
feat(TokenInfo): remove batch action in legacy TokenInfo
nxqbao Mar 18, 2024
7a8e1ef
feat(GatewayBatcher): fix validation erc1155
nxqbao Mar 18, 2024
d5aca70
test(GatewayBatcher): init first 1155 batch test
nxqbao Mar 18, 2024
a8ca9ee
feat(*Gateway): inherit ERC1155Holder
nxqbao Mar 18, 2024
9b8fc4a
test(ERC1155): fix the first test
nxqbao Mar 18, 2024
150705a
Apply suggestions from code review
nxqbao Apr 1, 2024
fa39256
Update src/libraries/LibTokenInfoBatch.sol
nxqbao Apr 1, 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 lib/foundry-deployment-kit
Open in desktop
Submodule foundry-deployment-kit updated 4 files
+0 −5 script/ArtifactFactory.sol
+5 −30 script/BaseMigration.s.sol
+1 −5 script/configs/MigrationConfig.sol
+0 −2 script/interfaces/configs/IMigrationConfig.sol
8 changes: 4 additions & 4 deletions script/20231218-maptoken/20231218-maptoken-mainchain.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { BaseMigration } from "foundry-deployment-kit/BaseMigration.s.sol";
import { RoninBridgeManager } from "@ronin/contracts/ronin/gateway/RoninBridgeManager.sol";
import { IMainchainGatewayV3 } from "@ronin/contracts/interfaces/IMainchainGatewayV3.sol";
import { GlobalProposal } from "@ronin/contracts/libraries/GlobalProposal.sol";
import { Token } from "@ronin/contracts/libraries/Token.sol";
import { LibTokenInfo, TokenInfo, TokenStandard } from "@ronin/contracts/libraries/LibTokenInfo.sol";
import { Contract } from "../utils/Contract.sol";
import { BridgeMigration } from "../BridgeMigration.sol";
import { Network } from "../utils/Network.sol";
Expand Down Expand Up @@ -41,8 +41,8 @@ contract Migration__20231215_MapTokenMainchain is BridgeMigration {
mainchainTokens[0] = _aggMainchainToken;
address[] memory roninTokens = new address[](1);
roninTokens[0] = _aggRoninToken;
Token.Standard[] memory standards = new Token.Standard[](1);
standards[0] = Token.Standard.ERC20;
TokenStandard[] memory standards = new TokenStandard[](1);
standards[0] = TokenStandard.ERC20;
uint256[][4] memory thresholds;
// highTierThreshold
thresholds[0] = new uint256[](1);
Expand All @@ -60,7 +60,7 @@ contract Migration__20231215_MapTokenMainchain is BridgeMigration {
// function mapTokensAndThresholds(
// address[] calldata _mainchainTokens,
// address[] calldata _roninTokens,
// Token.Standard[] calldata _standards,
// TokenStandard[] calldata _standards,
// uint256[][4] calldata _thresholds
// )

Expand Down
8 changes: 4 additions & 4 deletions script/20231218-maptoken/20231218-maptoken-roninchain.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { StdStyle } from "forge-std/StdStyle.sol";
import { BaseMigration } from "foundry-deployment-kit/BaseMigration.s.sol";
import { RoninBridgeManager } from "@ronin/contracts/ronin/gateway/RoninBridgeManager.sol";
import { IRoninGatewayV3 } from "@ronin/contracts/interfaces/IRoninGatewayV3.sol";
import { Token } from "@ronin/contracts/libraries/Token.sol";
import { LibTokenInfo, TokenInfo, TokenStandard } from "@ronin/contracts/libraries/LibTokenInfo.sol";
import { Contract } from "../utils/Contract.sol";
import { BridgeMigration } from "../BridgeMigration.sol";
import { Network } from "../utils/Network.sol";
Expand All @@ -32,14 +32,14 @@ contract Migration__20231215_MapTokenRoninchain is BridgeMigration {
mainchainTokens[0] = _aggMainchainToken;
uint256[] memory chainIds = new uint256[](1);
chainIds[0] = _config.getCompanionNetwork(_config.getNetworkByChainId(block.chainid)).chainId();
Token.Standard[] memory standards = new Token.Standard[](1);
standards[0] = Token.Standard.ERC20;
TokenStandard[] memory standards = new TokenStandard[](1);
standards[0] = TokenStandard.ERC20;

// function mapTokens(
// address[] calldata _roninTokens,
// address[] calldata _mainchainTokens,
// uint256[] calldata chainIds,
// Token.Standard[] calldata _standards
// TokenStandard[] calldata _standards
// )
bytes memory innerData =
abi.encodeCall(IRoninGatewayV3.mapTokens, (roninTokens, mainchainTokens, chainIds, standards));
Expand Down
14 changes: 7 additions & 7 deletions script/20240115-mappixeltoken/20240115-maptoken-mainchain.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { RoninBridgeManager } from "@ronin/contracts/ronin/gateway/RoninBridgeMa
import { IMainchainGatewayV3 } from "@ronin/contracts/interfaces/IMainchainGatewayV3.sol";
import { IBridgeManager } from "@ronin/contracts/interfaces/bridge/IBridgeManager.sol";
import { GlobalProposal } from "@ronin/contracts/libraries/GlobalProposal.sol";
import { Token } from "@ronin/contracts/libraries/Token.sol";
import { LibTokenInfo, TokenInfo, TokenStandard } from "@ronin/contracts/libraries/LibTokenInfo.sol";
import { Contract } from "../utils/Contract.sol";
import { BridgeMigration } from "../BridgeMigration.sol";
import { Network } from "../utils/Network.sol";
Expand Down Expand Up @@ -56,16 +56,16 @@ contract Migration__MapTokenMainchain is BridgeMigration {
function _mapFarmlandToken() internal pure returns (bytes memory) {
address[] memory mainchainTokens = new address[](1);
address[] memory roninTokens = new address[](1);
Token.Standard[] memory standards = new Token.Standard[](1);
TokenStandard[] memory standards = new TokenStandard[](1);

mainchainTokens[0] = _farmlandMainchainToken;
roninTokens[0] = _farmlandRoninToken;
standards[0] = Token.Standard.ERC721;
standards[0] = TokenStandard.ERC721;

// function mapTokens(
// address[] calldata _mainchainTokens,
// address[] calldata _roninTokens,
// Token.Standard[] calldata _standards
// TokenStandard[] calldata _standards
// )

bytes memory innerData = abi.encodeCall(IMainchainGatewayV3.mapTokens, (
Expand All @@ -79,7 +79,7 @@ contract Migration__MapTokenMainchain is BridgeMigration {
function _mapPixelToken() internal pure returns (bytes memory) {
address[] memory mainchainTokens = new address[](1);
address[] memory roninTokens = new address[](1);
Token.Standard[] memory standards = new Token.Standard[](1);
TokenStandard[] memory standards = new TokenStandard[](1);
uint256[][4] memory thresholds;

// highTierThreshold
Expand All @@ -97,12 +97,12 @@ contract Migration__MapTokenMainchain is BridgeMigration {

mainchainTokens[0] = _farmlandMainchainToken;
roninTokens[0] = _farmlandRoninToken;
standards[0] = Token.Standard.ERC20;
standards[0] = TokenStandard.ERC20;

// function mapTokensAndThresholds(
// address[] calldata _mainchainTokens,
// address[] calldata _roninTokens,
// Token.Standard[] calldata _standards,
// TokenStandard[] calldata _standards,
// uint256[][4] calldata _thresholds
// )

Expand Down
10 changes: 5 additions & 5 deletions script/20240115-mappixeltoken/20240115-maptoken-roninchain.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { BaseMigration } from "foundry-deployment-kit/BaseMigration.s.sol";
import { RoninBridgeManager } from "@ronin/contracts/ronin/gateway/RoninBridgeManager.sol";
import { IRoninGatewayV3 } from "@ronin/contracts/interfaces/IRoninGatewayV3.sol";
import { IBridgeManager } from "@ronin/contracts/interfaces/bridge/IBridgeManager.sol";
import { Token } from "@ronin/contracts/libraries/Token.sol";
import { LibTokenInfo, TokenInfo, TokenStandard } from "@ronin/contracts/libraries/LibTokenInfo.sol";
import { Contract } from "../utils/Contract.sol";
import { BridgeMigration } from "../BridgeMigration.sol";
import { Network } from "../utils/Network.sol";
Expand Down Expand Up @@ -40,23 +40,23 @@ contract Migration__MapTokenRoninchain is BridgeMigration {
address[] memory mainchainTokens = new address[](2);
address[] memory roninTokens = new address[](2);
uint256[] memory chainIds = new uint256[](2);
Token.Standard[] memory standards = new Token.Standard[](2);
TokenStandard[] memory standards = new TokenStandard[](2);

mainchainTokens[0] = _farmlandMainchainToken;
roninTokens[0] = _farmlandRoninToken;
chainIds[0] = _config.getCompanionNetwork(_config.getNetworkByChainId(block.chainid)).chainId();
standards[0] = Token.Standard.ERC721;
standards[0] = TokenStandard.ERC721;

mainchainTokens[1] = _pixelMainchainToken;
roninTokens[1] = _pixelRoninToken;
chainIds[1] = _config.getCompanionNetwork(_config.getNetworkByChainId(block.chainid)).chainId();
standards[1] = Token.Standard.ERC20;
standards[1] = TokenStandard.ERC20;

// function mapTokens(
// address[] calldata _roninTokens,
// address[] calldata _mainchainTokens,
// uint256[] calldata chainIds,
// Token.Standard[] calldata _standards
// TokenStandard[] calldata _standards
// )

bytes memory innerData = abi.encodeCall(IRoninGatewayV3.mapTokens, (
Expand Down
12 changes: 6 additions & 6 deletions script/20240131-maptoken-pixel/20240131-maptoken-pixel-mainchain.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { BaseMigration } from "foundry-deployment-kit/BaseMigration.s.sol";
import { RoninBridgeManager } from "@ronin/contracts/ronin/gateway/RoninBridgeManager.sol";
import { IMainchainGatewayV3 } from "@ronin/contracts/interfaces/IMainchainGatewayV3.sol";
import { GlobalProposal } from "@ronin/contracts/libraries/GlobalProposal.sol";
import { Token } from "@ronin/contracts/libraries/Token.sol";
import { LibTokenInfo, TokenInfo, TokenStandard } from "@ronin/contracts/libraries/LibTokenInfo.sol";
import { Contract } from "../utils/Contract.sol";
import { BridgeMigration } from "../BridgeMigration.sol";
import { Network } from "../utils/Network.sol";
Expand Down Expand Up @@ -39,7 +39,7 @@ contract Migration__20240131_MapTokenPixelMainchain is BridgeMigration, Migratio
function run() public {
address[] memory mainchainTokens = new address[](1);
address[] memory roninTokens = new address[](1);
Token.Standard[] memory standards = new Token.Standard[](1);
TokenStandard[] memory standards = new TokenStandard[](1);
uint256[][4] memory thresholds;

uint256 expiredTime = block.timestamp + 10 days;
Expand All @@ -52,7 +52,7 @@ contract Migration__20240131_MapTokenPixelMainchain is BridgeMigration, Migratio

mainchainTokens[0] = _pixelMainchainToken;
roninTokens[0] = _pixelRoninToken;
standards[0] = Token.Standard.ERC20;
standards[0] = TokenStandard.ERC20;
// highTierThreshold
thresholds[0] = new uint256[](1);
thresholds[0][0] = _highTierThreshold;
Expand All @@ -69,7 +69,7 @@ contract Migration__20240131_MapTokenPixelMainchain is BridgeMigration, Migratio
// function mapTokensAndThresholds(
// address[] calldata _mainchainTokens,
// address[] calldata _roninTokens,
// Token.Standard[] calldata _standards,
// TokenStandard[] calldata _standards,
// uint256[][4] calldata _thresholds
// )

Expand All @@ -91,12 +91,12 @@ contract Migration__20240131_MapTokenPixelMainchain is BridgeMigration, Migratio

mainchainTokens[0] = _farmlandMainchainToken;
roninTokens[0] = _farmlandRoninToken;
standards[0] = Token.Standard.ERC721;
standards[0] = TokenStandard.ERC721;

// function mapTokens(
// address[] calldata _mainchainTokens,
// address[] calldata _roninTokens,
// Token.Standard[] calldata _standards
// TokenStandard[] calldata _standards
// ) external;

innerData = abi.encodeCall(IMainchainGatewayV3.mapTokens, (
Expand Down
10 changes: 5 additions & 5 deletions script/20240131-maptoken-pixel/20240131-maptoken-pixel-roninchain.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { BaseMigration } from "foundry-deployment-kit/BaseMigration.s.sol";
import { RoninBridgeManager } from "@ronin/contracts/ronin/gateway/RoninBridgeManager.sol";
import { IRoninGatewayV3 } from "@ronin/contracts/interfaces/IRoninGatewayV3.sol";
import { MinimumWithdrawal } from "@ronin/contracts/extensions/MinimumWithdrawal.sol";
import { Token } from "@ronin/contracts/libraries/Token.sol";
import { LibTokenInfo, TokenInfo, TokenStandard } from "@ronin/contracts/libraries/LibTokenInfo.sol";
import { Ballot } from "@ronin/contracts/libraries/Ballot.sol";
import { GlobalProposal } from "@ronin/contracts/libraries/GlobalProposal.sol";

Expand Down Expand Up @@ -48,7 +48,7 @@ contract Migration__20240131_MapTokenPixelRoninchain is BridgeMigration, Migrati
address[] memory roninTokens = new address[](2);
address[] memory mainchainTokens = new address[](2);
uint256[] memory chainIds = new uint256[](2);
Token.Standard[] memory standards = new Token.Standard[](2);
TokenStandard[] memory standards = new TokenStandard[](2);

uint256 expiredTime = block.timestamp + 10 days;
address[] memory targets = new address[](4);
Expand All @@ -61,18 +61,18 @@ contract Migration__20240131_MapTokenPixelRoninchain is BridgeMigration, Migrati
roninTokens[0] = _pixelRoninToken;
mainchainTokens[0] = _pixelMainchainToken;
chainIds[0] = _config.getCompanionNetwork(_config.getNetworkByChainId(block.chainid)).chainId();
standards[0] = Token.Standard.ERC20;
standards[0] = TokenStandard.ERC20;

roninTokens[1] = _farmlandRoninToken;
mainchainTokens[1] = _farmlandMainchainToken;
chainIds[1] = _config.getCompanionNetwork(_config.getNetworkByChainId(block.chainid)).chainId();
standards[1] = Token.Standard.ERC721;
standards[1] = TokenStandard.ERC721;

// function mapTokens(
// address[] calldata _roninTokens,
// address[] calldata _mainchainTokens,
// uint256[] calldata chainIds,
// Token.Standard[] calldata _standards
// TokenStandard[] calldata _standards
// )
bytes memory innerData = abi.encodeCall(IRoninGatewayV3.mapTokens, (
roninTokens,
Expand Down
16 changes: 8 additions & 8 deletions script/20240206-maptoken-banana/20240206-maptoken-banana-mainchain.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {BaseMigration} from "foundry-deployment-kit/BaseMigration.s.sol";
import {RoninBridgeManager} from "@ronin/contracts/ronin/gateway/RoninBridgeManager.sol";
import {IMainchainGatewayV3} from "@ronin/contracts/interfaces/IMainchainGatewayV3.sol";
import {GlobalProposal} from "@ronin/contracts/libraries/GlobalProposal.sol";
import {Token} from "@ronin/contracts/libraries/Token.sol";
import {LibTokenInfo, TokenStandard} from "@ronin/contracts/libraries/LibTokenInfo.sol";
import {Contract} from "../utils/Contract.sol";
import {BridgeMigration} from "../BridgeMigration.sol";
import {Network} from "../utils/Network.sol";
Expand Down Expand Up @@ -43,7 +43,7 @@ contract Migration__20240206_MapTokenBananaMainchain is
function run() public onlyOn(DefaultNetwork.RoninMainnet.key()) {
address[] memory mainchainTokens = new address[](1);
address[] memory roninTokens = new address[](1);
Token.Standard[] memory standards = new Token.Standard[](1);
TokenStandard[] memory standards = new TokenStandard[](1);
uint256[][4] memory thresholds;

uint256 expiredTime = block.timestamp + 10 days;
Expand All @@ -56,7 +56,7 @@ contract Migration__20240206_MapTokenBananaMainchain is

mainchainTokens[0] = _bananaMainchainToken;
roninTokens[0] = _bananaRoninToken;
standards[0] = Token.Standard.ERC20;
standards[0] = TokenStandard.ERC20;
// highTierThreshold
thresholds[0] = new uint256[](1);
thresholds[0][0] = _highTierThreshold;
Expand All @@ -73,7 +73,7 @@ contract Migration__20240206_MapTokenBananaMainchain is
// function mapTokens(
// address[] calldata _mainchainTokens,
// address[] calldata _roninTokens,
// Token.Standard[] calldata _standards
// TokenStandard[] calldata _standards
// )

bytes memory innerData = abi.encodeCall(IMainchainGatewayV3.mapTokensAndThresholds, (mainchainTokens, roninTokens, standards, thresholds));
Expand All @@ -89,12 +89,12 @@ contract Migration__20240206_MapTokenBananaMainchain is

mainchainTokens[0] = _genkaiMainchainToken;
roninTokens[0] = _genkaiRoninToken;
standards[0] = Token.Standard.ERC721;
standards[0] = TokenStandard.ERC721;

// function mapTokens(
// address[] calldata _mainchainTokens,
// address[] calldata _roninTokens,
// Token.Standard[] calldata _standards
// TokenStandard[] calldata _standards
// ) external;

innerData = abi.encodeCall(IMainchainGatewayV3.mapTokens, (mainchainTokens, roninTokens, standards));
Expand All @@ -110,12 +110,12 @@ contract Migration__20240206_MapTokenBananaMainchain is

mainchainTokens[0] = _VxMainchainToken;
roninTokens[0] = _VxRoninToken;
standards[0] = Token.Standard.ERC721;
standards[0] = TokenStandard.ERC721;

// function mapTokens(
// address[] calldata _mainchainTokens,
// address[] calldata _roninTokens,
// Token.Standard[] calldata _standards
// TokenStandard[] calldata _standards
// ) external;

innerData = abi.encodeCall(IMainchainGatewayV3.mapTokens, (mainchainTokens, roninTokens, standards));
Expand Down
14 changes: 7 additions & 7 deletions script/20240206-maptoken-banana/20240206-maptoken-banana-roninchain.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {DefaultNetwork} from "foundry-deployment-kit/utils/DefaultNetwork.sol";
import {RoninBridgeManager} from "@ronin/contracts/ronin/gateway/RoninBridgeManager.sol";
import {IRoninGatewayV3} from "@ronin/contracts/interfaces/IRoninGatewayV3.sol";
import {MinimumWithdrawal} from "@ronin/contracts/extensions/MinimumWithdrawal.sol";
import {Token} from "@ronin/contracts/libraries/Token.sol";
import {LibTokenInfo, TokenStandard} from "@ronin/contracts/libraries/LibTokenInfo.sol";
import {Ballot} from "@ronin/contracts/libraries/Ballot.sol";
import {GlobalProposal} from "@ronin/contracts/libraries/GlobalProposal.sol";
import {Proposal} from "@ronin/contracts/libraries/Proposal.sol";
Expand Down Expand Up @@ -64,7 +64,7 @@ contract Migration__20240206_MapTokenBananaRoninChain is
address[] memory roninTokens = new address[](3);
address[] memory mainchainTokens = new address[](3);
uint256[] memory chainIds = new uint256[](3);
Token.Standard[] memory standards = new Token.Standard[](3);
TokenStandard[] memory standards = new TokenStandard[](3);

uint256 expiredTime = block.timestamp + 10 days;
address[] memory targets = new address[](4);
Expand All @@ -77,23 +77,23 @@ contract Migration__20240206_MapTokenBananaRoninChain is
roninTokens[0] = _bananaRoninToken;
mainchainTokens[0] = _bananaMainchainToken;
chainIds[0] = _config.getCompanionNetwork(_config.getNetworkByChainId(block.chainid)).chainId();
standards[0] = Token.Standard.ERC20;
standards[0] = TokenStandard.ERC20;

roninTokens[1] = _VxRoninToken;
mainchainTokens[1] = _VxMainchainToken;
chainIds[1] = _config.getCompanionNetwork(_config.getNetworkByChainId(block.chainid)).chainId();
standards[1] = Token.Standard.ERC721;
standards[1] = TokenStandard.ERC721;

roninTokens[2] = _genkaiRoninToken;
mainchainTokens[2] = _genkaiMainchainToken;
chainIds[2] = _config.getCompanionNetwork(_config.getNetworkByChainId(block.chainid)).chainId();
standards[2] = Token.Standard.ERC721;
standards[2] = TokenStandard.ERC721;

// function mapTokens(
// address[] calldata _roninTokens,
// address[] calldata _mainchainTokens,
// uint256[] calldata chainIds,
// Token.Standard[] calldata _standards
// TokenStandard[] calldata _standards
// )
bytes memory innerData =
abi.encodeCall(IRoninGatewayV3.mapTokens, (roninTokens, mainchainTokens, chainIds, standards));
Expand All @@ -117,7 +117,7 @@ contract Migration__20240206_MapTokenBananaRoninChain is

roninTokensToSetMinThreshold[1] = pixelRoninToken;
minThresholds[1] = pixelMinThreshold;

roninTokensToSetMinThreshold[2] = pixelMainchainToken;
minThresholds[2] = 0;

Expand Down
2 changes: 2 additions & 0 deletions script/GeneralConfig.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ contract GeneralConfig is BaseGeneralConfig, Utils {
_mapContractName(Contract.RoninGatewayV3);
_mapContractName(Contract.RoninBridgeManager);
_mapContractName(Contract.MainchainGatewayV3);
_mapContractName(Contract.MainchainGatewayBatcher);
_mapContractName(Contract.MainchainBridgeManager);
_mapContractName(Contract.MockERC721);
_mapContractName(Contract.MockERC1155);

_contractNameMap[Contract.WETH.key()] = "MockWrappedToken";
_contractNameMap[Contract.WRON.key()] = "MockWrappedToken";
Expand Down
4 changes: 3 additions & 1 deletion script/Migration.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { Network } from "./utils/Network.sol";
import { Utils } from "./utils/Utils.sol";
import { Contract } from "./utils/Contract.sol";
import { GlobalProposal } from "@ronin/contracts/libraries/GlobalProposal.sol";
import { Token } from "@ronin/contracts/libraries/Token.sol";
import { LibTokenInfo, TokenInfo, TokenStandard } from "@ronin/contracts/libraries/LibTokenInfo.sol";
import { LibArray } from "./libraries/LibArray.sol";

contract Migration is BaseMigrationV2, Utils {
Expand Down Expand Up @@ -46,6 +46,8 @@ contract Migration is BaseMigrationV2, Utils {
param.mockErc721.name = "Mock ERC721";
param.mockErc721.symbol = "M_ERC721";

param.mockErc1155.uri = "mock://erc1155/";

uint256 num = 6;
address[] memory operatorAddrs = new address[](num);
address[] memory governorAddrs = new address[](num);
Expand Down
Loading