Skip to content

feat: specs update #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions script/Deploy.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ contract Deploy is BaseScript {

IRiscZeroVerifier trustedSepoliaVerifier = IRiscZeroVerifier(vm.parseAddress(vm.readLine(path)));

bytes32 logicCircuitID = vm.parseBytes32(vm.readLine(path));

bytes32 complianceCircuitID = vm.parseBytes32(vm.readLine(path));

uint8 treeDepth = uint8(vm.parseUint(vm.readLine(path)));
uint8 commitmentTreeDepth = uint8(vm.parseUint(vm.readLine(path)));

uint8 actionTreeDepth = uint8(vm.parseUint(vm.readLine(path)));

protocolAdapter = address(
new ProtocolAdapter{salt: sha256("ProtocolAdapter")}({
riscZeroVerifier: trustedSepoliaVerifier,
logicCircuitID: logicCircuitID,
complianceCircuitID: complianceCircuitID,
treeDepth: treeDepth
commitmentTreeDepth: commitmentTreeDepth,
actionTreeDepth: actionTreeDepth
})
);
}
Expand Down
4 changes: 2 additions & 2 deletions script/constructor-args.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0x925d8331ddc0a1F0d96E68CF073DFE1d92b69187
0x0000000000000000000000000000000000000000000000000000000000000000
0x0000000000000000000000000000000000000000000000000000000000000000
32
32
4
7 changes: 0 additions & 7 deletions src/ERC20Forwarder.sol
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,7 @@ contract ERC20Forwarder is ForwarderBase {
_ERC20_CONTRACT = erc20;
}

// TODO make generic proxy, allow native ETH transfers
function _forwardCall(bytes calldata input) internal override returns (bytes memory output) {
output = _ERC20_CONTRACT.functionCall(input);
}

// Native ETH transfer
// TODO! The msg.sender must call directly, but the protocol adapter is the caller. This won't work.
//receive() external payable {
// emit NativeTokenDeposited(msg.sender, msg.value);
//}
}
Loading
Loading