Skip to content

Commit 2117750

Browse files
committed
remove npm contracts dependency in favor of the master submodule
1 parent fa95a69 commit 2117750

File tree

7 files changed

+15
-36
lines changed

7 files changed

+15
-36
lines changed

contracts/crosschain/axelar/AxelarGatewayDestination.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
pragma solidity ^0.8.27;
44

55
import {AxelarExecutable} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/executable/AxelarExecutable.sol";
6-
import {CAIP2} from "@openzeppelin/contracts@master/utils/CAIP2.sol";
7-
import {CAIP10} from "@openzeppelin/contracts@master/utils/CAIP10.sol";
8-
import {Strings} from "@openzeppelin/contracts@master/utils/Strings.sol";
6+
import {CAIP2} from "@openzeppelin/contracts/utils/CAIP2.sol";
7+
import {CAIP10} from "@openzeppelin/contracts/utils/CAIP10.sol";
8+
import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
99
import {IERC7786GatewayDestinationPassive, IERC7786Receiver} from "../interfaces/draft-IERC7786.sol";
1010
import {AxelarGatewayBase} from "./AxelarGatewayBase.sol";
1111

contracts/crosschain/axelar/AxelarGatewaySource.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
pragma solidity ^0.8.27;
44

5-
import {CAIP2} from "@openzeppelin/contracts@master/utils/CAIP2.sol";
6-
import {CAIP10} from "@openzeppelin/contracts@master/utils/CAIP10.sol";
7-
import {Strings} from "@openzeppelin/contracts@master/utils/Strings.sol";
5+
import {CAIP2} from "@openzeppelin/contracts/utils/CAIP2.sol";
6+
import {CAIP10} from "@openzeppelin/contracts/utils/CAIP10.sol";
7+
import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
88
import {AxelarGatewayBase} from "./AxelarGatewayBase.sol";
99
import {IERC7786GatewaySource} from "../interfaces/draft-IERC7786.sol";
1010

contracts/crosschain/axelar/mocks/AxelarGatewayMock.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pragma solidity ^0.8.27;
55
import {IAxelarGateway} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IAxelarGateway.sol";
66
import {IAxelarExecutable} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IAxelarExecutable.sol";
77
import {BitMaps} from "@openzeppelin/contracts/utils/structs/BitMaps.sol";
8-
import {Strings} from "@openzeppelin/contracts@master/utils/Strings.sol";
8+
import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
99

1010
contract AxelarGatewayMock {
1111
using Strings for address;

contracts/crosschain/mocks/ERC7786GatewayMock.sol

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
pragma solidity ^0.8.24;
44

5-
import {BitMaps} from "@openzeppelin/contracts@master/utils/structs/BitMaps.sol";
6-
import {Strings} from "@openzeppelin/contracts@master/utils/Strings.sol";
7-
import {CAIP2} from "@openzeppelin/contracts@master/utils/CAIP2.sol";
8-
import {CAIP10} from "@openzeppelin/contracts@master/utils/CAIP10.sol";
5+
import {BitMaps} from "@openzeppelin/contracts/utils/structs/BitMaps.sol";
6+
import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
7+
import {CAIP2} from "@openzeppelin/contracts/utils/CAIP2.sol";
8+
import {CAIP10} from "@openzeppelin/contracts/utils/CAIP10.sol";
99
import {IERC7786GatewaySource, IERC7786GatewayDestinationPassive, IERC7786Receiver} from "../interfaces/draft-IERC7786.sol";
1010

1111
contract ERC7786GatewayMock is IERC7786GatewaySource, IERC7786GatewayDestinationPassive {

package-lock.json

Lines changed: 1 addition & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@
3434
"zeppelin"
3535
],
3636
"dependencies": {
37-
"@axelar-network/axelar-gmp-sdk-solidity": "^5.10.0",
38-
"@openzeppelin/contracts": "^5.0.2",
39-
"@openzeppelin/contracts-upgradeable": "^5.0.2"
37+
"@axelar-network/axelar-gmp-sdk-solidity": "^5.10.0"
4038
},
4139
"devDependencies": {
4240
"@nomicfoundation/hardhat-chai-matchers": "^2.0.6",

remappings.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
@openzeppelin/contracts@v5/=node_modules/@openzeppelin/contracts/
2-
@openzeppelin/contracts-upgradeable@v5/=node_modules/@openzeppelin/contracts-upgradeable/
3-
4-
@openzeppelin/contracts@master/=lib/@openzeppelin-contracts/contracts/
5-
@openzeppelin/contracts-upgradeable@master/=lib/@openzeppelin-contracts-upgradeable/contracts/
6-
1+
@openzeppelin/contracts/=lib/@openzeppelin-contracts/contracts/
2+
@openzeppelin/contracts-upgradeable/=lib/@openzeppelin-contracts-upgradeable/contracts/
73
@openzeppelin/community-contracts/=contracts/
84

95
@axelar-network/axelar-gmp-sdk-solidity/=node_modules/@axelar-network/axelar-gmp-sdk-solidity/

0 commit comments

Comments
 (0)