Fix inheritance linearisability test (#6492)

Co-authored-by: John Kane <john@kanej.me>

Author: Amxx

contracts/token/ERC1155/extensions/ERC1155Crosschain.sol

@@ -13,7 +13,7 @@ import {BridgeMultiToken} from "../../../crosschain/bridges/abstract/BridgeMulti
  * * {ERC1155} instances on other chains that are bridged using {BridgeERC1155},
  */
 // slither-disable-next-line locked-ether
-abstract contract ERC1155Crosschain is ERC1155, BridgeMultiToken {
+abstract contract ERC1155Crosschain is BridgeMultiToken, ERC1155 {
     /// @dev TransferFrom variant of {crosschainTransferFrom}, using ERC1155 allowance from the sender to the caller.
     function crosschainTransferFrom(
         address from,

contracts/token/ERC721/extensions/ERC721Crosschain.sol

@@ -13,7 +13,7 @@ import {BridgeNonFungible} from "../../../crosschain/bridges/abstract/BridgeNonF
  * * {ERC721} instances on other chains that are bridged using {BridgeERC721},
  */
 // slither-disable-next-line locked-ether
-abstract contract ERC721Crosschain is ERC721, BridgeNonFungible {
+abstract contract ERC721Crosschain is BridgeNonFungible, ERC721 {
     /// @dev Crosschain variant of {transferFrom}, using the allowance system from the underlying ERC-721 token.
     function crosschainTransferFrom(address from, bytes memory to, uint256 tokenId) public virtual returns (bytes32) {
         // operator (_msgSender) permission over `from` is checked in `_onSend`

scripts/checks/inheritance-ordering.js

@@ -4,7 +4,8 @@ const path = require('path');
 const graphlib = require('graphlib');
 const match = require('micromatch');
 const { findAll } = require('solidity-ast/utils');
-const { _: artifacts } = require('yargs/yargs')().argv;
+const { hideBin } = require('yargs/helpers');
+const { _: artifacts } = require('yargs/yargs')(hideBin(process.argv)).argv;
 
 // files to skip
 const skipPatterns = ['contracts-exposed/**', 'contracts/mocks/**'];

test/crosschain/BridgeERC1155.test.js

@@ -21,8 +21,8 @@ async function fixture() {
 
   // Chain B: ERC1155 with native bridge integration
   const tokenB = await ethers.deployContract('$ERC1155Crosschain', [
-    'https://token-cdn-domain/{id}.json',
     [[gateway, chain.toErc7930(bridgeA)]],
+    'https://token-cdn-domain/{id}.json',
   ]);
   const bridgeB = tokenB; // self bridge
 

test/crosschain/BridgeERC721.test.js

@@ -21,9 +21,9 @@ async function fixture() {
 
   // Chain B: ERC721 with native bridge integration
   const tokenB = await ethers.deployContract('$ERC721Crosschain', [
+    [[gateway, chain.toErc7930(bridgeA)]],
     'Token2',
     'T2',
-    [[gateway, chain.toErc7930(bridgeA)]],
   ]);
   const bridgeB = tokenB; // self bridge
 

test/token/ERC1155/extensions/ERC1155Crosschain.test.js

@@ -16,13 +16,13 @@ async function fixture() {
   const gatewayAsEOA = await impersonate(gateway);
 
   // Chain A: ERC1155 with native bridge integration
-  const tokenA = await ethers.deployContract('$ERC1155Crosschain', ['https://token-cdn-domain/{id}.json', []]);
+  const tokenA = await ethers.deployContract('$ERC1155Crosschain', [[], 'https://token-cdn-domain/{id}.json']);
   const bridgeA = tokenA; // self bridge
 
   // Chain B: ERC1155 with native bridge integration
   const tokenB = await ethers.deployContract('$ERC1155Crosschain', [
-    'https://token-cdn-domain/{id}.json',
     [[gateway, chain.toErc7930(bridgeA)]],
+    'https://token-cdn-domain/{id}.json',
   ]);
   const bridgeB = tokenB; // self bridge
 

test/token/ERC721/extensions/ERC721Crosschain.test.js

@@ -16,14 +16,14 @@ async function fixture() {
   const gatewayAsEOA = await impersonate(gateway);
 
   // Chain A: ERC721 with native bridge integration
-  const tokenA = await ethers.deployContract('$ERC721Crosschain', ['Token1', 'T1', []]);
+  const tokenA = await ethers.deployContract('$ERC721Crosschain', [[], 'Token1', 'T1']);
   const bridgeA = tokenA; // self bridge
 
   // Chain B: ERC721 with native bridge integration
   const tokenB = await ethers.deployContract('$ERC721Crosschain', [
+    [[gateway, chain.toErc7930(bridgeA)]],
     'Token2',
     'T2',
-    [[gateway, chain.toErc7930(bridgeA)]],
   ]);
   const bridgeB = tokenB; // self bridge