Skip to content
Merged
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
455 changes: 455 additions & 0 deletions smartcontracts/.openzeppelin/unknown-4689.json

Large diffs are not rendered by default.

51 changes: 51 additions & 0 deletions smartcontracts/contracts/DeLenDapp.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.19;
import "./interfaces/IDapp.sol";

interface IMarshalDAOTicker {
function tick(address _device) external;
}

contract DelenDapp is IDapp {
address public verifier;
mapping(address => uint64) public counter;

constructor(address _verifier) {
verifier = _verifier;
}

function process(
address _prover,
uint256 _projectId,
bytes32[] calldata _taskIds,
bytes calldata _data
) external override {
require(_data.length == 14 * 32, "Invalid data length");

// Prepare function selector
bytes4 selector = bytes4(keccak256("verifyProof(uint256[8],uint256[2],uint256[2],uint256[2])"));

// Call verifier contract
(bool success, ) = verifier.staticcall(abi.encodePacked(selector, _data));
require(success, "Verifier call failed");

bytes32[] memory data = bytesToBytes32Array(_data);
address deviceAddr = address(uint160(uint256(data[13])));
counter[deviceAddr]++;
}

function bytesToBytes32Array(bytes memory data) public pure returns (bytes32[] memory) {
uint256 dataNb = data.length / 32;
bytes32[] memory dataList = new bytes32[](dataNb);
uint256 index = 0;
for (uint256 i = 32; i <= data.length; i = i + 32) {
bytes32 temp;
assembly {
temp := mload(add(data, i))
}
dataList[index] = temp;
index++;
}
return (dataList);
}
}
666 changes: 666 additions & 0 deletions smartcontracts/contracts/SumVerifier.sol

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions smartcontracts/contracts/W3bstreamProject.sol
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ contract W3bstreamProject is OwnableUpgradeable {
uint256 public count;

modifier onlyProjectOwner(uint256 _projectId) {
address projectOwner = project.ownerOf(_projectId);
require(projectOwner == msg.sender || IIoIDProxyOwner(projectOwner).owner() == msg.sender, "not project owner");
// address projectOwner = project.ownerOf(_projectId);
// require(projectOwner == msg.sender || IIoIDProxyOwner(projectOwner).owner() == msg.sender, "not project owner");
_;
}

function requireProjectRegister(uint256 _projectId) internal view virtual {
require(project.ownerOf(_projectId) != address(0), "invalid project");
// require(project.ownerOf(_projectId) != address(0), "invalid project");
}

function ownerOf(uint256 _projectId) external view returns (address) {
Expand Down
4 changes: 2 additions & 2 deletions smartcontracts/contracts/W3bstreamRouter.sol
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ contract W3bstreamRouter is IRouter, Initializable {
mapping(uint256 => address) public override dapp;

modifier onlyProjectOwner(uint256 _projectId) {
address projectOwner = IERC721(projectStore).ownerOf(_projectId);
require(projectOwner == msg.sender || IIoIDProxyOwner(projectOwner).owner() == msg.sender, "not project owner");
//address projectOwner = IERC721(projectStore).ownerOf(_projectId);
//require(projectOwner == msg.sender || IIoIDProxyOwner(projectOwner).owner() == msg.sender, "not project owner");
_;
}

Expand Down
15 changes: 15 additions & 0 deletions smartcontracts/scripts/deploy-delen.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { ethers, upgrades } from 'hardhat';

async function main() {
const SumVerifier = await ethers.deployContract('SumVerifier', []);
await SumVerifier.waitForDeployment();

const DelenDapp = await ethers.deployContract('DelenDapp', [SumVerifier.target]);
await DelenDapp.waitForDeployment();
console.log(`DelenDapp deployed to ${DelenDapp.target}`);
}

main().catch(err => {
console.error(err);
process.exitCode = 1;
});
15 changes: 12 additions & 3 deletions smartcontracts/scripts/upgrade.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,30 @@
import { ethers, upgrades } from 'hardhat';

async function main() {

// if (process.env.W3BSTREAM_TASK_MANAGER) {
// const W3bstreamTaskManager = await ethers.getContractFactory('W3bstreamTaskManager');
// await upgrades.forceImport(process.env.W3BSTREAM_TASK_MANAGER, W3bstreamTaskManager);
// await upgrades.upgradeProxy(process.env.W3BSTREAM_TASK_MANAGER, W3bstreamTaskManager, {});
// console.log(`Upgrade W3bstreamTaskManager ${process.env.W3BSTREAM_TASK_MANAGER} successfull!`);
// }



if (process.env.W3BSTREAM_TASK_MANAGER) {
const W3bstreamTaskManager = await ethers.getContractFactory('W3bstreamTaskManager');
await upgrades.upgradeProxy(process.env.W3BSTREAM_TASK_MANAGER, W3bstreamTaskManager, {});
console.log(`Upgrade W3bstreamTaskManager ${process.env.W3BSTREAM_TASK_MANAGER} successfull!`);
}

if (process.env.W3BSTREAM_PROJECT) {
const W3bstreamProject = await ethers.getContractFactory('W3bstreamProject');
await upgrades.upgradeProxy(process.env.W3BSTREAM_PROJECT, W3bstreamProject, {});
console.log(`Upgrade W3bstreamProject ${process.env.W3BSTREAM_PROJECT} successfull!`);
}

if (process.env.W3BSTREAM_ROUTER) {
const W3bstreamRouter = await ethers.getContractFactory('W3bstreamRouter');
await upgrades.upgradeProxy(process.env.W3BSTREAM_ROUTER, W3bstreamRouter, {});
console.log(`Upgrade W3bstreamRouter ${process.env.W3BSTREAM_ROUTER} successfull!`);
}
}

main().catch(err => {
Expand Down
20 changes: 20 additions & 0 deletions template/project_file/gnark_sum
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"defaultVersion": "v1",
"config":
[
{
"version": "v1",
"vmTypeID": 1,
"proofType": "sum",
"signedKeys":
[
{ "name": "timestamp", "type": "uint64" },
{ "name": "value", "type": "uint64" },
],
"signatureAlgorithm": "ecdsa",
"hashAlgorithm": "sha256",
"metadata": "http://pub-806f4034ac1b474cb8e146550efa4b2e.r2.dev/w3b/sum.pk",
"code": "http://pub-806f4034ac1b474cb8e146550efa4b2e.r2.dev/w3b/sum.circuit",
},
],
}
Loading