-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into BCI-3862-change-dsl-block-primitive-to-st…
…ring
- Loading branch information
Showing
126 changed files
with
19,650 additions
and
1,527 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "chainlink": minor | ||
| --- | ||
|
|
||
| #added merging core/capabilities/ccip from https://github.com/smartcontractkit/ccip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,12 +27,8 @@ gomod: ## Ensure chainlink's go dependencies are installed. | |
| go mod download | ||
|
|
||
| .PHONY: gomodtidy | ||
| gomodtidy: ## Run go mod tidy on all modules. | ||
| go mod tidy | ||
| cd ./core/scripts && go mod tidy | ||
| cd ./integration-tests && go mod tidy | ||
| cd ./integration-tests/load && go mod tidy | ||
| cd ./dashboard-lib && go mod tidy | ||
| gomodtidy: gomods ## Run go mod tidy on all modules. | ||
| gomods tidy | ||
|
|
||
| .PHONY: docs | ||
| docs: ## Install and run pkgsite to view Go docs | ||
|
|
@@ -89,12 +85,8 @@ abigen: ## Build & install abigen. | |
| ./tools/bin/build_abigen | ||
|
|
||
| .PHONY: generate | ||
| generate: abigen codecgen mockery protoc ## Execute all go:generate commands. | ||
| go generate -x ./... | ||
| cd ./core/scripts && go generate -x ./... | ||
| cd ./integration-tests && go generate -x ./... | ||
| cd ./integration-tests/load && go generate -x ./... | ||
| cd ./dashboard-lib && go generate -x ./... | ||
| generate: abigen codecgen mockery protoc gomods ## Execute all go:generate commands. | ||
| gomods -w go generate -x ./... | ||
| mockery | ||
|
|
||
| .PHONY: rm-mocked | ||
|
|
@@ -136,7 +128,7 @@ presubmit: ## Format go files and imports. | |
|
|
||
| .PHONY: gomods | ||
| gomods: ## Install gomods | ||
| go install github.com/jmank88/[email protected].1 | ||
| go install github.com/jmank88/[email protected].3 | ||
|
|
||
| .PHONY: mockery | ||
| mockery: $(mockery) ## Install mockery. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@chainlink/contracts': patch | ||
| --- | ||
|
|
||
| auto: create a replication from v2_3 to v2_3_zksync |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@chainlink/contracts': patch | ||
| --- | ||
|
|
||
| add OZ v0.5 contracts |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 92 additions & 0 deletions
92
contracts/src/v0.8/automation/ZKSyncAutomationForwarder.sol
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| // SPDX-License-Identifier: BUSL-1.1 | ||
| pragma solidity ^0.8.16; | ||
|
|
||
| import {IAutomationRegistryConsumer} from "./interfaces/IAutomationRegistryConsumer.sol"; | ||
|
|
||
| uint256 constant PERFORM_GAS_CUSHION = 5_000; | ||
|
|
||
| /** | ||
| * @title AutomationForwarder is a relayer that sits between the registry and the customer's target contract | ||
| * @dev The purpose of the forwarder is to give customers a consistent address to authorize against, | ||
| * which stays consistent between migrations. The Forwarder also exposes the registry address, so that users who | ||
| * want to programmatically interact with the registry (ie top up funds) can do so. | ||
| */ | ||
| contract ZKSyncAutomationForwarder { | ||
| /// @notice the user's target contract address | ||
| address private immutable i_target; | ||
|
|
||
| /// @notice the shared logic address | ||
| address private immutable i_logic; | ||
|
|
||
| IAutomationRegistryConsumer private s_registry; | ||
|
|
||
| constructor(address target, address registry, address logic) { | ||
| s_registry = IAutomationRegistryConsumer(registry); | ||
| i_target = target; | ||
| i_logic = logic; | ||
| } | ||
|
|
||
| /** | ||
| * @notice forward is called by the registry and forwards the call to the target | ||
| * @param gasAmount is the amount of gas to use in the call | ||
| * @param data is the 4 bytes function selector + arbitrary function data | ||
| * @return success indicating whether the target call succeeded or failed | ||
| */ | ||
| function forward(uint256 gasAmount, bytes memory data) external returns (bool success, uint256 gasUsed) { | ||
| if (msg.sender != address(s_registry)) revert(); | ||
| address target = i_target; | ||
| gasUsed = gasleft(); | ||
| assembly { | ||
| let g := gas() | ||
| // Compute g -= PERFORM_GAS_CUSHION and check for underflow | ||
| if lt(g, PERFORM_GAS_CUSHION) { | ||
| revert(0, 0) | ||
| } | ||
| g := sub(g, PERFORM_GAS_CUSHION) | ||
| // if g - g//64 <= gasAmount, revert | ||
| // (we subtract g//64 because of EIP-150) | ||
| if iszero(gt(sub(g, div(g, 64)), gasAmount)) { | ||
| revert(0, 0) | ||
| } | ||
| // solidity calls check that a contract actually exists at the destination, so we do the same | ||
| if iszero(extcodesize(target)) { | ||
| revert(0, 0) | ||
| } | ||
| // call with exact gas | ||
| success := call(gasAmount, target, 0, add(data, 0x20), mload(data), 0, 0) | ||
| } | ||
| gasUsed = gasUsed - gasleft(); | ||
| return (success, gasUsed); | ||
| } | ||
|
|
||
| function getTarget() external view returns (address) { | ||
| return i_target; | ||
| } | ||
|
|
||
| fallback() external { | ||
| // copy to memory for assembly access | ||
| address logic = i_logic; | ||
| // copied directly from OZ's Proxy contract | ||
| assembly { | ||
| // Copy msg.data. We take full control of memory in this inline assembly | ||
| // block because it will not return to Solidity code. We overwrite the | ||
| // Solidity scratch pad at memory position 0. | ||
| calldatacopy(0, 0, calldatasize()) | ||
|
|
||
| // out and outsize are 0 because we don't know the size yet. | ||
| let result := delegatecall(gas(), logic, 0, calldatasize(), 0, 0) | ||
|
|
||
| // Copy the returned data. | ||
| returndatacopy(0, 0, returndatasize()) | ||
|
|
||
| switch result | ||
| // delegatecall returns 0 on error. | ||
| case 0 { | ||
| revert(0, returndatasize()) | ||
| } | ||
| default { | ||
| return(0, returndatasize()) | ||
| } | ||
| } | ||
| } | ||
| } |
File renamed without changes.
Oops, something went wrong.