Skip to content

Commit

Permalink
Merge branch 'feat/v0.2.0' into docs/README
Browse files Browse the repository at this point in the history
  • Loading branch information
allemanfredi committed Sep 27, 2024
2 parents 001f5cd + 94810c9 commit 6669748
Show file tree
Hide file tree
Showing 4 changed files with 122 additions and 953 deletions.
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@
"url": "https://github.com/gnosis"
},
"scripts": {
"prepare": "husky install",
"postinstall": "patch-package"
"prepare": "husky install"
},
"devDependencies": {
"@commitlint/cli": "^17.5.1",
"@commitlint/config-conventional": "^17.4.4",
"husky": "^8.0.3",
"patch-package": "8.0.0",
"prettier": "^2.8.7",
"prettier-plugin-solidity": "^1.0.0"
},
Expand Down
10 changes: 5 additions & 5 deletions packages/evm/contracts/adapters/LayerZero/LayerZeroAdapter.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
pragma solidity ^0.8.20;

import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
import { ILayerZeroReceiver } from "./interfaces/ILayerZeroReceiver.sol";
import { Origin } from "./interfaces/ILayerZeroEndpointV2.sol";
import { OAppCore } from "@layerzerolabs/lz-evm-oapp-v2/contracts/oapp/OAppCore.sol";
import { BlockHashAdapter } from "../BlockHashAdapter.sol";
import { ILayerZeroReceiver } from "./interfaces/ILayerZeroReceiver.sol";
import { Origin } from "./interfaces/ILayerZeroEndpointV2.sol";

contract LayerZeroAdapter is BlockHashAdapter, Ownable, ILayerZeroReceiver, OAppCore {
string public constant PROVIDER = "layer-zero";
Expand All @@ -24,10 +24,10 @@ contract LayerZeroAdapter is BlockHashAdapter, Ownable, ILayerZeroReceiver, OApp

function lzReceive(
Origin calldata _origin,
bytes32 _guid,
bytes32 /* _guid*/,
bytes calldata _message,
address _executor,
bytes calldata _extraData
address /* _executor*/,
bytes calldata /* _extraData*/
) external payable {
if (
msg.sender != LAYER_ZERO_ENDPOINT ||
Expand Down
19 changes: 4 additions & 15 deletions packages/evm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@
"name": "@gnosis/hashi-evm",
"private": true,
"description": "",
"version": "0.1.1",
"version": "0.2.0",
"author": {
"name": "gnosis",
"url": "https://github.com/gnosis"
},
"devDependencies": {
"@commitlint/cli": "^17.3.0",
"@commitlint/config-conventional": "^17.3.0",
"@ethersproject/abi": "^5.7.0",
"@ethersproject/abstract-signer": "^5.7.0",
"@ethersproject/bignumber": "^5.7.0",
Expand All @@ -21,35 +19,25 @@
"@nomicfoundation/hardhat-verify": "^2.0.8",
"@nomiclabs/hardhat-ethers": "^2.2.1",
"@nomiclabs/hardhat-etherscan": "^3.1.2",
"@trivago/prettier-plugin-sort-imports": "^4.0.0",
"@typechain/ethers-v5": "^10.1.1",
"@typechain/hardhat": "^6.1.4",
"@types/chai": "^4.3.4",
"@types/fs-extra": "^9.0.13",
"@types/mocha": "^10.0.0",
"@types/node": "^18.11.9",
"@types/sinon-chai": "3.2.12",
"@typescript-eslint/eslint-plugin": "^5.44.0",
"@typescript-eslint/parser": "^5.44.0",
"chai": "^4.3.7",
"commitizen": "^4.2.5",
"cross-env": "^7.0.3",
"cz-conventional-changelog": "^3.3.0",
"dotenv": "^16.0.3",
"eslint": "^8.28.0",
"eslint-config-prettier": "^8.5.0",
"ethers": "^5.7.2",
"fs-extra": "^10.1.0",
"hardhat": "2.19.4",
"hardhat-change-network": "^0.0.7",
"hardhat-deploy": "^0.11.31",
"hardhat-gas-reporter": "^1.0.9",
"lint-staged": "^13.0.4",
"lodash": "^4.17.21",
"mocha": "^10.1.0",
"pinst": "^3.0.0",
"prettier": "^2.8.7",
"prettier-plugin-solidity": "^1.0.0",
"shx": "^0.3.4",
"solhint": "^3.3.7",
"solhint-plugin-prettier": "^0.0.5",
"solidity-coverage": "^0.8.2",
Expand Down Expand Up @@ -90,9 +78,10 @@
"typechain": "cross-env TS_NODE_TRANSPILE_ONLY=true hardhat typechain"
},
"dependencies": {
"@axelar-network/axelar-gmp-sdk-solidity": "5.6.2",
"@axelar-network/axelar-gmp-sdk-solidity": "5.6.4",
"@chainlink/contracts-ccip": "0.7.6",
"@connext/interfaces": "2.0.0",
"@eth-optimism/contracts": "0.6.0",
"@hyperlane-xyz/core": "3.1.10",
"@layerzerolabs/lz-evm-messagelib-v2": "^2.3.29",
"@layerzerolabs/lz-evm-oapp-v2": "^2.3.29",
Expand Down
Loading

0 comments on commit 6669748

Please sign in to comment.