Skip to content

Commit

Permalink
Merge pull request #407 from SocketDotTech/zkstack
Browse files Browse the repository at this point in the history
Zkstack
  • Loading branch information
arthcp authored Nov 25, 2024
2 parents b84e519 + cd73e09 commit 5339d84
Show file tree
Hide file tree
Showing 38 changed files with 2,877 additions and 335 deletions.
8 changes: 8 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,11 @@ POLTER_TESTNET_RPC=' '
POLYGON_AMOY_RPC=' '
OPBNB_RPC=' '
GEIST_RPC=' '

ZERO_SEPOLIA_RPC=' '

ZERO_RPC=' '

ZKSYNC_RPC=' '

ARENA_Z_RPC=' '
4 changes: 2 additions & 2 deletions .github/workflows/push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
- name: Install forge dependencies
run: forge install

- name: Set Node.js 16.x
- name: Set Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 18.x

- name: Run yarn install
uses: borales/actions-yarn@v4
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,8 @@ switchboards.json
devRpcConfig.ts
devRpcConfig.json
prodRpcConfig.ts
prodRpcConfig.json
prodRpcConfig.json

artifacts-zk/
cache_hardhat-zk/
deployments-zk/
6 changes: 5 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,8 @@ yarn.lock
.github/*
.prettierrc
scratchpad
lcov.info
lcov.info

artifacts-zk/
cache_hardhat-zk/
deployments-zk/
3 changes: 2 additions & 1 deletion contracts/examples/Messenger.sol
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ contract Messenger is IPlug, Ownable(msg.sender) {
}

function removeGas(address payable receiver_) external onlyOwner {
receiver_.transfer(address(this).balance);
// receiver_.transfer(address(this).balance);
payable(receiver_).call{value: address(this).balance}("");
}

function sendLocalMessage(bytes32 message_) external {
Expand Down
3 changes: 2 additions & 1 deletion contracts/socket/SocketBatcher.sol
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,8 @@ contract SocketBatcher is AccessControl {
uint256 totalAmount;
for (uint i; i < addresses.length; i++) {
totalAmount += amounts[i];
addresses[i].transfer(amounts[i]);
// addresses[i].transfer(amounts[i]);
payable(addresses[i]).call{value: amounts[i]}("");
}

require(totalAmount == msg.value, "LOW_MSG_VALUE");
Expand Down
Loading

0 comments on commit 5339d84

Please sign in to comment.