fix: public inputs sdk integration#945

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.

Sign up for GitHub

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

Merged
NicolasRampoldi merged 1 commit into from
Sep 9, 2024
Merged

fix: public inputs sdk integration #945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions docs/guides/3_validating_public_input.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ This guide assumes you are in the `examples/validating-public-input` directory.

## Generate your ZK Proof

> [!IMPORTANT]
> [!IMPORTANT]
> To generate the proof ensure you have [docker](https://www.docker.com/get-started/) installed and the docker daemon running.
> This is necessary to ensure deterministic builds of the binary we want to generate a proof of. If not used, builds may differ depending on the system you are running on. To know more about this, check [this link](https://dev.risczero.com/terminology#deterministic-builds) from RiscZero docs.

Expand DownExpand Up@@ -42,15 +42,17 @@ pragma solidity ^0.8.12;

contract FibonacciValidator {
address public alignedServiceManager;
address public paymentServiceAddr;
bytes32 public fibonacciProgramId;

bytes32 public fibonacciProgramIdCommitment =
0x069ed9f3972550a2901523723f4beb5e240749dcafa30e1623d0778e17d69d70;

event FibonacciNumbers(uint32 fibN, uint32 fibNPlusOne);

constructor(address _alignedServiceManager) {
constructor(address _alignedServiceManager, address _paymentServiceAddr) {
alignedServiceManager = _alignedServiceManager;
paymentServiceAddr = _paymentServiceAddr;
}

function verifyBatchInclusion(
Expand DownExpand Up@@ -78,14 +80,15 @@ contract FibonacciValidator {
bytes memory proofIsIncluded
) = alignedServiceManager.staticcall(
abi.encodeWithSignature(
"verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
"verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
proofCommitment,
pubInputCommitment,
programIdCommitment,
proofGeneratorAddr,
batchMerkleRoot,
merkleProof,
verificationDataBatchIndex
verificationDataBatchIndex,
paymentServiceAddr
)
);

Expand DownExpand Up@@ -116,6 +119,7 @@ contract FibonacciValidator {
return (first, second);
}
}

```

### Explanation
Expand DownExpand Up@@ -146,14 +150,15 @@ require(
bytes memory proofIsIncluded
) = alignedServiceManager.staticcall(
abi.encodeWithSignature(
"verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
"verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
proofCommitment,
pubInputCommitment,
programIdCommitment,
proofGeneratorAddr,
batchMerkleRoot,
merkleProof,
verificationDataBatchIndex
verificationDataBatchIndex,
paymentServiceAddr
)
);

Expand DownExpand Up@@ -192,6 +197,7 @@ To deploy the contract, first you will need to set up the `.env` file in the con
RPC_URL=<rpc_url> #You can use publicnode RPC: https://ethereum-holesky-rpc.publicnode.com
PRIVATE_KEY=<private_key>
ALIGNED_SERVICE_MANAGER_ADDRESS=<service_manager_address> #0x58F280BeBE9B34c9939C3C39e0890C81f163B623 for Holesky
PAYMENT_SERVICE_ADDRESS=<payment_service_address> #0x815aeCA64a974297942D2Bbf034ABEe22a38A003 for Holesky
```

Then, run `make deploy_fibonacci_validator`.
Expand Down
52 changes: 51 additions & 1 deletion examples/validating-public-input/aligned-integration/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/validating-public-input/aligned-integration/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", tag="v0.4.0" }
aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", rev="6908110aaa04ec3107f15ab8a8bb2603e7bbead9" }
tokio = { version = "1.37.0", features = ["io-std", "time", "macros", "rt", "rt-multi-thread", "sync"] }
ethers = { tag = "v2.0.15-fix-reconnections", features = ["ws", "rustls"], git = "https://github.com/yetanotherco/ethers-rs.git" }
serde = { version = "1.0.201", features = ["derive"] }
Expand Down
33 changes: 20 additions & 13 deletions examples/validating-public-input/aligned-integration/src/main.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
use std::env;
use std::fs::File;
use std::io::Write;
use std::path::PathBuf;
Expand All@@ -6,7 +7,7 @@ use std::str::FromStr;
use aligned_sdk::core::errors::SubmitError;
use aligned_sdk::core::types::Chain::Holesky;
use aligned_sdk::core::types::{AlignedVerificationData, ProvingSystemId, VerificationData};
use aligned_sdk::sdk::{get_next_nonce, submit_and_wait};
use aligned_sdk::sdk::{get_next_nonce, submit_and_wait_verification};
use env_logger::Env;
use ethers::signers::{LocalWallet, Signer};
use ethers::types::Address;
Expand DownExpand Up@@ -49,20 +50,23 @@ async fn main() -> Result<(), SubmitError> {
proof_generator_addr,
};

let wallet = LocalWallet::from_str(WALLET_PRIVATE_KEY).expect("Failed to create wallet");
let wallet = LocalWallet::from_str(WALLET_PRIVATE_KEY)
.expect("Failed to create wallet")
.with_chain_id(17000u64);

let nonce = get_next_nonce(RPC_URL, wallet.address(), BATCHER_PAYMENTS_ADDRESS)
.await
.expect("Failed to get next nonce");

info!("Submitting Fibonacci proof to Aligned and waiting for verification...");
let aligned_verification_data = submit_and_wait(
let aligned_verification_data = submit_and_wait_verification(
BATCHER_URL,
RPC_URL,
Holesky,
&verification_data,
wallet,
nonce,
BATCHER_PAYMENTS_ADDRESS,
)
.await?;

Expand All@@ -72,14 +76,11 @@ async fn main() -> Result<(), SubmitError> {
"Saving verification data to {:?}",
batch_inclusion_data_directory_path
);
if let Some(aligned_verification_data) = aligned_verification_data {
save_response(
batch_inclusion_data_directory_path,
&aligned_verification_data,
)?;
} else {
return Err(SubmitError::EmptyVerificationDataList);
}

save_response(
batch_inclusion_data_directory_path,
&aligned_verification_data,
)?;

Ok(())
}
Expand All@@ -104,13 +105,19 @@ fn save_response(
let batch_inclusion_data_path =
batch_inclusion_data_directory_path.join(batch_inclusion_data_file_name);

let data = serde_json::to_vec(&aligned_verification_data)?;
let data = serde_json::to_vec(&aligned_verification_data).unwrap();

let mut file = File::create(&batch_inclusion_data_path)
.map_err(|e| SubmitError::IoError(batch_inclusion_data_path.clone(), e))?;

file.write_all(data.as_slice())
.map_err(|e| SubmitError::IoError(batch_inclusion_data_path.clone(), e))?;

let current_dir = env::current_dir().expect("Failed to get current directory");

info!(
"Saved batch inclusion data to {:?}",
current_dir.join(batch_inclusion_data_path)
);

Ok(())
}
1 change: 1 addition & 0 deletions examples/validating-public-input/contracts/.env.example
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
RPC_URL=<rpc_url> #You can use publicnode RPC: https://ethereum-holesky-rpc.publicnode.com
PRIVATE_KEY=<private_key>
ALIGNED_SERVICE_MANAGER_ADDRESS=<service_manager_address> #0x58F280BeBE9B34c9939C3C39e0890C81f163B623 for Holesky
PAYMENT_SERVICE_ADDRESS=<payment_service_address> #0x815aeCA64a974297942D2Bbf034ABEe22a38A003 for Holesky
8 changes: 7 additions & 1 deletion examples/validating-public-input/contracts/deploy.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,11 @@ if [ -z "$ALIGNED_SERVICE_MANAGER_ADDRESS" ]; then
exit 1
fi

if [ -z "$PAYMENT_SERVICE_ADDRESS" ]; then
echo "PAYMENT_SERVICE_ADDRESS is not set. Please set it in .env"
exit 1
fi

if [ -z "$RPC_URL" ]; then
echo "RPC_URL is not set. Please set it in .env"
exit 1
Expand All@@ -25,7 +30,8 @@ forge install

forge script script/Deployer.s.sol \
"$ALIGNED_SERVICE_MANAGER_ADDRESS" \
"$PAYMENT_SERVICE_ADDRESS" \
--rpc-url "$RPC_URL" \
--private-key "$PRIVATE_KEY" \
--broadcast \
--sig "run(address _alignedServiceManager)"
--sig "run(address _alignedServiceManager,address _paymentServiceAddr)"
8 changes: 6 additions & 2 deletions examples/validating-public-input/contracts/script/Deployer.s.sol
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,15 @@ import {FibonacciValidator} from "../src/FibonacciValidator.sol";
contract FibonacciDeployer is Script {
function setUp() public {}

function run(address _targetContract) external returns (address) {
function run(
address _alignedServiceManager,
address _paymentServiceAddr
) external returns (address) {
vm.startBroadcast();

FibonacciValidator fibonacciContract = new FibonacciValidator(
_targetContract
_alignedServiceManager,
_paymentServiceAddr
);

vm.stopBroadcast();
Expand Down
9 changes: 6 additions & 3 deletions examples/validating-public-input/contracts/src/FibonacciValidator.sol
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,15 +3,17 @@ pragma solidity ^0.8.12;

contract FibonacciValidator {
address public alignedServiceManager;
address public paymentServiceAddr;
bytes32 public fibonacciProgramId;

bytes32 public fibonacciProgramIdCommitment =
0x069ed9f3972550a2901523723f4beb5e240749dcafa30e1623d0778e17d69d70;

event FibonacciNumbers(uint32 fibN, uint32 fibNPlusOne);

constructor(address _alignedServiceManager) {
constructor(address _alignedServiceManager, address _paymentServiceAddr) {
alignedServiceManager = _alignedServiceManager;
paymentServiceAddr = _paymentServiceAddr;
}

function verifyBatchInclusion(
Expand DownExpand Up@@ -39,14 +41,15 @@ contract FibonacciValidator {
bytes memory proofIsIncluded
) = alignedServiceManager.staticcall(
abi.encodeWithSignature(
"verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
"verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
proofCommitment,
pubInputCommitment,
programIdCommitment,
proofGeneratorAddr,
batchMerkleRoot,
merkleProof,
verificationDataBatchIndex
verificationDataBatchIndex,
paymentServiceAddr
)
);

Expand Down
Binary file modified...les/validating-public-input/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.proof
View file
Open in desktop
Binary file not shown.
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: public inputs sdk integration#945

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.

 Sign up for GitHub

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

 Merged

NicolasRampoldi
merged 1 commit into

from

Sep 9, 2024
 Merged


fix: public inputs sdk integration
#945
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


18 changes: 12 additions & 6 deletions
docs/guides/3_validating_public_input.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ This guide assumes you are in the `examples/validating-public-input` directory.

## Generate your ZK Proof

> [!IMPORTANT]
> [!IMPORTANT]
> To generate the proof ensure you have [docker](https://www.docker.com/get-started/) installed and the docker daemon running.
> This is necessary to ensure deterministic builds of the binary we want to generate a proof of. If not used, builds may differ depending on the system you are running on. To know more about this, check [this link](https://dev.risczero.com/terminology#deterministic-builds) from RiscZero docs.

Expand DownExpand Up@@ -42,15 +42,17 @@ pragma solidity ^0.8.12;

contract FibonacciValidator {
 address public alignedServiceManager;
 address public paymentServiceAddr;
 bytes32 public fibonacciProgramId;

 bytes32 public fibonacciProgramIdCommitment =
 0x069ed9f3972550a2901523723f4beb5e240749dcafa30e1623d0778e17d69d70;

 event FibonacciNumbers(uint32 fibN, uint32 fibNPlusOne);

 constructor(address _alignedServiceManager) {
 constructor(address _alignedServiceManager, address _paymentServiceAddr) {
 alignedServiceManager = _alignedServiceManager;
 paymentServiceAddr = _paymentServiceAddr;
 }

 function verifyBatchInclusion(
Expand DownExpand Up@@ -78,14 +80,15 @@ contract FibonacciValidator {
 bytes memory proofIsIncluded
 ) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
 );

Expand DownExpand Up@@ -116,6 +119,7 @@ contract FibonacciValidator {
 return (first, second);
 }
}

```

### Explanation
Expand DownExpand Up@@ -146,14 +150,15 @@ require(
 bytes memory proofIsIncluded
) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
);

Expand DownExpand Up@@ -192,6 +197,7 @@ To deploy the contract, first you will need to set up the `.env` file in the con
RPC_URL=<rpc_url> #You can use publicnode RPC: https://ethereum-holesky-rpc.publicnode.com
PRIVATE_KEY=<private_key>
ALIGNED_SERVICE_MANAGER_ADDRESS=<service_manager_address> #0x58F280BeBE9B34c9939C3C39e0890C81f163B623 for Holesky
PAYMENT_SERVICE_ADDRESS=<payment_service_address> #0x815aeCA64a974297942D2Bbf034ABEe22a38A003 for Holesky
```

Then, run `make deploy_fibonacci_validator`.
Expand Down

52 changes: 51 additions & 1 deletion
examples/validating-public-input/aligned-integration/Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
examples/validating-public-input/aligned-integration/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", tag="v0.4.0" }
aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", rev="6908110aaa04ec3107f15ab8a8bb2603e7bbead9" }
tokio = { version = "1.37.0", features = ["io-std", "time", "macros", "rt", "rt-multi-thread", "sync"] }
ethers = { tag = "v2.0.15-fix-reconnections", features = ["ws", "rustls"], git = "https://github.com/yetanotherco/ethers-rs.git" }
serde = { version = "1.0.201", features = ["derive"] }
Expand Down

33 changes: 20 additions & 13 deletions
examples/validating-public-input/aligned-integration/src/main.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
use std::env;
use std::fs::File;
use std::io::Write;
use std::path::PathBuf;
Expand All@@ -6,7 +7,7 @@ use std::str::FromStr;
use aligned_sdk::core::errors::SubmitError;
use aligned_sdk::core::types::Chain::Holesky;
use aligned_sdk::core::types::{AlignedVerificationData, ProvingSystemId, VerificationData};
use aligned_sdk::sdk::{get_next_nonce, submit_and_wait};
use aligned_sdk::sdk::{get_next_nonce, submit_and_wait_verification};
use env_logger::Env;
use ethers::signers::{LocalWallet, Signer};
use ethers::types::Address;
Expand DownExpand Up@@ -49,20 +50,23 @@ async fn main() -> Result<(), SubmitError> {
 proof_generator_addr,
 };

 let wallet = LocalWallet::from_str(WALLET_PRIVATE_KEY).expect("Failed to create wallet");
 let wallet = LocalWallet::from_str(WALLET_PRIVATE_KEY)
 .expect("Failed to create wallet")
 .with_chain_id(17000u64);

 let nonce = get_next_nonce(RPC_URL, wallet.address(), BATCHER_PAYMENTS_ADDRESS)
 .await
 .expect("Failed to get next nonce");

 info!("Submitting Fibonacci proof to Aligned and waiting for verification...");
 let aligned_verification_data = submit_and_wait(
 let aligned_verification_data = submit_and_wait_verification(
 BATCHER_URL,
 RPC_URL,
 Holesky,
 &verification_data,
 wallet,
 nonce,
 BATCHER_PAYMENTS_ADDRESS,
 )
 .await?;

Expand All@@ -72,14 +76,11 @@ async fn main() -> Result<(), SubmitError> {
 "Saving verification data to {:?}",
 batch_inclusion_data_directory_path
 );
 if let Some(aligned_verification_data) = aligned_verification_data {
 save_response(
 batch_inclusion_data_directory_path,
 &aligned_verification_data,
 )?;
 } else {
 return Err(SubmitError::EmptyVerificationDataList);
 }

 save_response(
 batch_inclusion_data_directory_path,
 &aligned_verification_data,
 )?;

 Ok(())
}
Expand All@@ -104,13 +105,19 @@ fn save_response(
 let batch_inclusion_data_path =
 batch_inclusion_data_directory_path.join(batch_inclusion_data_file_name);

 let data = serde_json::to_vec(&aligned_verification_data)?;
 let data = serde_json::to_vec(&aligned_verification_data).unwrap();

 let mut file = File::create(&batch_inclusion_data_path)
 .map_err(|e| SubmitError::IoError(batch_inclusion_data_path.clone(), e))?;

 file.write_all(data.as_slice())
 .map_err(|e| SubmitError::IoError(batch_inclusion_data_path.clone(), e))?;

 let current_dir = env::current_dir().expect("Failed to get current directory");

 info!(
 "Saved batch inclusion data to {:?}",
 current_dir.join(batch_inclusion_data_path)
 );

 Ok(())
}

1 change: 1 addition & 0 deletions
examples/validating-public-input/contracts/.env.example

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
RPC_URL=<rpc_url> #You can use publicnode RPC: https://ethereum-holesky-rpc.publicnode.com
PRIVATE_KEY=<private_key>
ALIGNED_SERVICE_MANAGER_ADDRESS=<service_manager_address> #0x58F280BeBE9B34c9939C3C39e0890C81f163B623 for Holesky
PAYMENT_SERVICE_ADDRESS=<payment_service_address> #0x815aeCA64a974297942D2Bbf034ABEe22a38A003 for Holesky

8 changes: 7 additions & 1 deletion
examples/validating-public-input/contracts/deploy.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,11 @@ if [ -z "$ALIGNED_SERVICE_MANAGER_ADDRESS" ]; then
 exit 1
fi

if [ -z "$PAYMENT_SERVICE_ADDRESS" ]; then
 echo "PAYMENT_SERVICE_ADDRESS is not set. Please set it in .env"
 exit 1
fi

if [ -z "$RPC_URL" ]; then
 echo "RPC_URL is not set. Please set it in .env"
 exit 1
Expand All@@ -25,7 +30,8 @@ forge install

forge script script/Deployer.s.sol \
 "$ALIGNED_SERVICE_MANAGER_ADDRESS" \
 "$PAYMENT_SERVICE_ADDRESS" \
 --rpc-url "$RPC_URL" \
 --private-key "$PRIVATE_KEY" \
 --broadcast \
 --sig "run(address _alignedServiceManager)"
 --sig "run(address _alignedServiceManager,address _paymentServiceAddr)"

8 changes: 6 additions & 2 deletions
examples/validating-public-input/contracts/script/Deployer.s.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,15 @@ import {FibonacciValidator} from "../src/FibonacciValidator.sol";
contract FibonacciDeployer is Script {
 function setUp() public {}

 function run(address _targetContract) external returns (address) {
 function run(
 address _alignedServiceManager,
 address _paymentServiceAddr
 ) external returns (address) {
 vm.startBroadcast();

 FibonacciValidator fibonacciContract = new FibonacciValidator(
 _targetContract
 _alignedServiceManager,
 _paymentServiceAddr
 );

 vm.stopBroadcast();
Expand Down

9 changes: 6 additions & 3 deletions
examples/validating-public-input/contracts/src/FibonacciValidator.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,15 +3,17 @@ pragma solidity ^0.8.12;

contract FibonacciValidator {
 address public alignedServiceManager;
 address public paymentServiceAddr;
 bytes32 public fibonacciProgramId;

 bytes32 public fibonacciProgramIdCommitment =
 0x069ed9f3972550a2901523723f4beb5e240749dcafa30e1623d0778e17d69d70;

 event FibonacciNumbers(uint32 fibN, uint32 fibNPlusOne);

 constructor(address _alignedServiceManager) {
 constructor(address _alignedServiceManager, address _paymentServiceAddr) {
 alignedServiceManager = _alignedServiceManager;
 paymentServiceAddr = _paymentServiceAddr;
 }

 function verifyBatchInclusion(
Expand DownExpand Up@@ -39,14 +41,15 @@ contract FibonacciValidator {
 bytes memory proofIsIncluded
 ) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
 );

Expand Down
Binary file modified...les/validating-public-input/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.proof

View file


Open in desktop


Binary file not shown.


, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: public inputs sdk integration#945

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.

 Sign up for GitHub

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

 Merged

NicolasRampoldi
merged 1 commit into

from

Sep 9, 2024
 Merged


fix: public inputs sdk integration
#945
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


18 changes: 12 additions & 6 deletions
docs/guides/3_validating_public_input.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ This guide assumes you are in the `examples/validating-public-input` directory.

## Generate your ZK Proof

> [!IMPORTANT]
> [!IMPORTANT]
> To generate the proof ensure you have [docker](https://www.docker.com/get-started/) installed and the docker daemon running.
> This is necessary to ensure deterministic builds of the binary we want to generate a proof of. If not used, builds may differ depending on the system you are running on. To know more about this, check [this link](https://dev.risczero.com/terminology#deterministic-builds) from RiscZero docs.

Expand DownExpand Up@@ -42,15 +42,17 @@ pragma solidity ^0.8.12;

contract FibonacciValidator {
 address public alignedServiceManager;
 address public paymentServiceAddr;
 bytes32 public fibonacciProgramId;

 bytes32 public fibonacciProgramIdCommitment =
 0x069ed9f3972550a2901523723f4beb5e240749dcafa30e1623d0778e17d69d70;

 event FibonacciNumbers(uint32 fibN, uint32 fibNPlusOne);

 constructor(address _alignedServiceManager) {
 constructor(address _alignedServiceManager, address _paymentServiceAddr) {
 alignedServiceManager = _alignedServiceManager;
 paymentServiceAddr = _paymentServiceAddr;
 }

 function verifyBatchInclusion(
Expand DownExpand Up@@ -78,14 +80,15 @@ contract FibonacciValidator {
 bytes memory proofIsIncluded
 ) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
 );

Expand DownExpand Up@@ -116,6 +119,7 @@ contract FibonacciValidator {
 return (first, second);
 }
}

```

### Explanation
Expand DownExpand Up@@ -146,14 +150,15 @@ require(
 bytes memory proofIsIncluded
) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
);

Expand DownExpand Up@@ -192,6 +197,7 @@ To deploy the contract, first you will need to set up the `.env` file in the con
RPC_URL=<rpc_url> #You can use publicnode RPC: https://ethereum-holesky-rpc.publicnode.com
PRIVATE_KEY=<private_key>
ALIGNED_SERVICE_MANAGER_ADDRESS=<service_manager_address> #0x58F280BeBE9B34c9939C3C39e0890C81f163B623 for Holesky
PAYMENT_SERVICE_ADDRESS=<payment_service_address> #0x815aeCA64a974297942D2Bbf034ABEe22a38A003 for Holesky
```

Then, run `make deploy_fibonacci_validator`.
Expand Down

52 changes: 51 additions & 1 deletion
examples/validating-public-input/aligned-integration/Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
examples/validating-public-input/aligned-integration/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", tag="v0.4.0" }
aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", rev="6908110aaa04ec3107f15ab8a8bb2603e7bbead9" }
tokio = { version = "1.37.0", features = ["io-std", "time", "macros", "rt", "rt-multi-thread", "sync"] }
ethers = { tag = "v2.0.15-fix-reconnections", features = ["ws", "rustls"], git = "https://github.com/yetanotherco/ethers-rs.git" }
serde = { version = "1.0.201", features = ["derive"] }
Expand Down

33 changes: 20 additions & 13 deletions
examples/validating-public-input/aligned-integration/src/main.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
use std::env;
use std::fs::File;
use std::io::Write;
use std::path::PathBuf;
Expand All@@ -6,7 +7,7 @@ use std::str::FromStr;
use aligned_sdk::core::errors::SubmitError;
use aligned_sdk::core::types::Chain::Holesky;
use aligned_sdk::core::types::{AlignedVerificationData, ProvingSystemId, VerificationData};
use aligned_sdk::sdk::{get_next_nonce, submit_and_wait};
use aligned_sdk::sdk::{get_next_nonce, submit_and_wait_verification};
use env_logger::Env;
use ethers::signers::{LocalWallet, Signer};
use ethers::types::Address;
Expand DownExpand Up@@ -49,20 +50,23 @@ async fn main() -> Result<(), SubmitError> {
 proof_generator_addr,
 };

 let wallet = LocalWallet::from_str(WALLET_PRIVATE_KEY).expect("Failed to create wallet");
 let wallet = LocalWallet::from_str(WALLET_PRIVATE_KEY)
 .expect("Failed to create wallet")
 .with_chain_id(17000u64);

 let nonce = get_next_nonce(RPC_URL, wallet.address(), BATCHER_PAYMENTS_ADDRESS)
 .await
 .expect("Failed to get next nonce");

 info!("Submitting Fibonacci proof to Aligned and waiting for verification...");
 let aligned_verification_data = submit_and_wait(
 let aligned_verification_data = submit_and_wait_verification(
 BATCHER_URL,
 RPC_URL,
 Holesky,
 &verification_data,
 wallet,
 nonce,
 BATCHER_PAYMENTS_ADDRESS,
 )
 .await?;

Expand All@@ -72,14 +76,11 @@ async fn main() -> Result<(), SubmitError> {
 "Saving verification data to {:?}",
 batch_inclusion_data_directory_path
 );
 if let Some(aligned_verification_data) = aligned_verification_data {
 save_response(
 batch_inclusion_data_directory_path,
 &aligned_verification_data,
 )?;
 } else {
 return Err(SubmitError::EmptyVerificationDataList);
 }

 save_response(
 batch_inclusion_data_directory_path,
 &aligned_verification_data,
 )?;

 Ok(())
}
Expand All@@ -104,13 +105,19 @@ fn save_response(
 let batch_inclusion_data_path =
 batch_inclusion_data_directory_path.join(batch_inclusion_data_file_name);

 let data = serde_json::to_vec(&aligned_verification_data)?;
 let data = serde_json::to_vec(&aligned_verification_data).unwrap();

 let mut file = File::create(&batch_inclusion_data_path)
 .map_err(|e| SubmitError::IoError(batch_inclusion_data_path.clone(), e))?;

 file.write_all(data.as_slice())
 .map_err(|e| SubmitError::IoError(batch_inclusion_data_path.clone(), e))?;

 let current_dir = env::current_dir().expect("Failed to get current directory");

 info!(
 "Saved batch inclusion data to {:?}",
 current_dir.join(batch_inclusion_data_path)
 );

 Ok(())
}

1 change: 1 addition & 0 deletions
examples/validating-public-input/contracts/.env.example

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
RPC_URL=<rpc_url> #You can use publicnode RPC: https://ethereum-holesky-rpc.publicnode.com
PRIVATE_KEY=<private_key>
ALIGNED_SERVICE_MANAGER_ADDRESS=<service_manager_address> #0x58F280BeBE9B34c9939C3C39e0890C81f163B623 for Holesky
PAYMENT_SERVICE_ADDRESS=<payment_service_address> #0x815aeCA64a974297942D2Bbf034ABEe22a38A003 for Holesky

8 changes: 7 additions & 1 deletion
examples/validating-public-input/contracts/deploy.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,11 @@ if [ -z "$ALIGNED_SERVICE_MANAGER_ADDRESS" ]; then
 exit 1
fi

if [ -z "$PAYMENT_SERVICE_ADDRESS" ]; then
 echo "PAYMENT_SERVICE_ADDRESS is not set. Please set it in .env"
 exit 1
fi

if [ -z "$RPC_URL" ]; then
 echo "RPC_URL is not set. Please set it in .env"
 exit 1
Expand All@@ -25,7 +30,8 @@ forge install

forge script script/Deployer.s.sol \
 "$ALIGNED_SERVICE_MANAGER_ADDRESS" \
 "$PAYMENT_SERVICE_ADDRESS" \
 --rpc-url "$RPC_URL" \
 --private-key "$PRIVATE_KEY" \
 --broadcast \
 --sig "run(address _alignedServiceManager)"
 --sig "run(address _alignedServiceManager,address _paymentServiceAddr)"

8 changes: 6 additions & 2 deletions
examples/validating-public-input/contracts/script/Deployer.s.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,15 @@ import {FibonacciValidator} from "../src/FibonacciValidator.sol";
contract FibonacciDeployer is Script {
 function setUp() public {}

 function run(address _targetContract) external returns (address) {
 function run(
 address _alignedServiceManager,
 address _paymentServiceAddr
 ) external returns (address) {
 vm.startBroadcast();

 FibonacciValidator fibonacciContract = new FibonacciValidator(
 _targetContract
 _alignedServiceManager,
 _paymentServiceAddr
 );

 vm.stopBroadcast();
Expand Down

9 changes: 6 additions & 3 deletions
examples/validating-public-input/contracts/src/FibonacciValidator.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,15 +3,17 @@ pragma solidity ^0.8.12;

contract FibonacciValidator {
 address public alignedServiceManager;
 address public paymentServiceAddr;
 bytes32 public fibonacciProgramId;

 bytes32 public fibonacciProgramIdCommitment =
 0x069ed9f3972550a2901523723f4beb5e240749dcafa30e1623d0778e17d69d70;

 event FibonacciNumbers(uint32 fibN, uint32 fibNPlusOne);

 constructor(address _alignedServiceManager) {
 constructor(address _alignedServiceManager, address _paymentServiceAddr) {
 alignedServiceManager = _alignedServiceManager;
 paymentServiceAddr = _paymentServiceAddr;
 }

 function verifyBatchInclusion(
Expand DownExpand Up@@ -39,14 +41,15 @@ contract FibonacciValidator {
 bytes memory proofIsIncluded
 ) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
 );

Expand Down
Binary file modified...les/validating-public-input/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.proof

View file


Open in desktop


Binary file not shown.


, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: public inputs sdk integration#945

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.

 Sign up for GitHub

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

 Merged

NicolasRampoldi
merged 1 commit into

from

Sep 9, 2024
 Merged


fix: public inputs sdk integration
#945
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


18 changes: 12 additions & 6 deletions
docs/guides/3_validating_public_input.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ This guide assumes you are in the `examples/validating-public-input` directory.

## Generate your ZK Proof

> [!IMPORTANT]
> [!IMPORTANT]
> To generate the proof ensure you have [docker](https://www.docker.com/get-started/) installed and the docker daemon running.
> This is necessary to ensure deterministic builds of the binary we want to generate a proof of. If not used, builds may differ depending on the system you are running on. To know more about this, check [this link](https://dev.risczero.com/terminology#deterministic-builds) from RiscZero docs.

Expand DownExpand Up@@ -42,15 +42,17 @@ pragma solidity ^0.8.12;

contract FibonacciValidator {
 address public alignedServiceManager;
 address public paymentServiceAddr;
 bytes32 public fibonacciProgramId;

 bytes32 public fibonacciProgramIdCommitment =
 0x069ed9f3972550a2901523723f4beb5e240749dcafa30e1623d0778e17d69d70;

 event FibonacciNumbers(uint32 fibN, uint32 fibNPlusOne);

 constructor(address _alignedServiceManager) {
 constructor(address _alignedServiceManager, address _paymentServiceAddr) {
 alignedServiceManager = _alignedServiceManager;
 paymentServiceAddr = _paymentServiceAddr;
 }

 function verifyBatchInclusion(
Expand DownExpand Up@@ -78,14 +80,15 @@ contract FibonacciValidator {
 bytes memory proofIsIncluded
 ) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
 );

Expand DownExpand Up@@ -116,6 +119,7 @@ contract FibonacciValidator {
 return (first, second);
 }
}

```

### Explanation
Expand DownExpand Up@@ -146,14 +150,15 @@ require(
 bytes memory proofIsIncluded
) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
);

Expand DownExpand Up@@ -192,6 +197,7 @@ To deploy the contract, first you will need to set up the `.env` file in the con
RPC_URL=<rpc_url> #You can use publicnode RPC: https://ethereum-holesky-rpc.publicnode.com
PRIVATE_KEY=<private_key>
ALIGNED_SERVICE_MANAGER_ADDRESS=<service_manager_address> #0x58F280BeBE9B34c9939C3C39e0890C81f163B623 for Holesky
PAYMENT_SERVICE_ADDRESS=<payment_service_address> #0x815aeCA64a974297942D2Bbf034ABEe22a38A003 for Holesky
```

Then, run `make deploy_fibonacci_validator`.
Expand Down

52 changes: 51 additions & 1 deletion
examples/validating-public-input/aligned-integration/Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
examples/validating-public-input/aligned-integration/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", tag="v0.4.0" }
aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", rev="6908110aaa04ec3107f15ab8a8bb2603e7bbead9" }
tokio = { version = "1.37.0", features = ["io-std", "time", "macros", "rt", "rt-multi-thread", "sync"] }
ethers = { tag = "v2.0.15-fix-reconnections", features = ["ws", "rustls"], git = "https://github.com/yetanotherco/ethers-rs.git" }
serde = { version = "1.0.201", features = ["derive"] }
Expand Down

33 changes: 20 additions & 13 deletions
examples/validating-public-input/aligned-integration/src/main.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
use std::env;
use std::fs::File;
use std::io::Write;
use std::path::PathBuf;
Expand All@@ -6,7 +7,7 @@ use std::str::FromStr;
use aligned_sdk::core::errors::SubmitError;
use aligned_sdk::core::types::Chain::Holesky;
use aligned_sdk::core::types::{AlignedVerificationData, ProvingSystemId, VerificationData};
use aligned_sdk::sdk::{get_next_nonce, submit_and_wait};
use aligned_sdk::sdk::{get_next_nonce, submit_and_wait_verification};
use env_logger::Env;
use ethers::signers::{LocalWallet, Signer};
use ethers::types::Address;
Expand DownExpand Up@@ -49,20 +50,23 @@ async fn main() -> Result<(), SubmitError> {
 proof_generator_addr,
 };

 let wallet = LocalWallet::from_str(WALLET_PRIVATE_KEY).expect("Failed to create wallet");
 let wallet = LocalWallet::from_str(WALLET_PRIVATE_KEY)
 .expect("Failed to create wallet")
 .with_chain_id(17000u64);

 let nonce = get_next_nonce(RPC_URL, wallet.address(), BATCHER_PAYMENTS_ADDRESS)
 .await
 .expect("Failed to get next nonce");

 info!("Submitting Fibonacci proof to Aligned and waiting for verification...");
 let aligned_verification_data = submit_and_wait(
 let aligned_verification_data = submit_and_wait_verification(
 BATCHER_URL,
 RPC_URL,
 Holesky,
 &verification_data,
 wallet,
 nonce,
 BATCHER_PAYMENTS_ADDRESS,
 )
 .await?;

Expand All@@ -72,14 +76,11 @@ async fn main() -> Result<(), SubmitError> {
 "Saving verification data to {:?}",
 batch_inclusion_data_directory_path
 );
 if let Some(aligned_verification_data) = aligned_verification_data {
 save_response(
 batch_inclusion_data_directory_path,
 &aligned_verification_data,
 )?;
 } else {
 return Err(SubmitError::EmptyVerificationDataList);
 }

 save_response(
 batch_inclusion_data_directory_path,
 &aligned_verification_data,
 )?;

 Ok(())
}
Expand All@@ -104,13 +105,19 @@ fn save_response(
 let batch_inclusion_data_path =
 batch_inclusion_data_directory_path.join(batch_inclusion_data_file_name);

 let data = serde_json::to_vec(&aligned_verification_data)?;
 let data = serde_json::to_vec(&aligned_verification_data).unwrap();

 let mut file = File::create(&batch_inclusion_data_path)
 .map_err(|e| SubmitError::IoError(batch_inclusion_data_path.clone(), e))?;

 file.write_all(data.as_slice())
 .map_err(|e| SubmitError::IoError(batch_inclusion_data_path.clone(), e))?;

 let current_dir = env::current_dir().expect("Failed to get current directory");

 info!(
 "Saved batch inclusion data to {:?}",
 current_dir.join(batch_inclusion_data_path)
 );

 Ok(())
}

1 change: 1 addition & 0 deletions
examples/validating-public-input/contracts/.env.example

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
RPC_URL=<rpc_url> #You can use publicnode RPC: https://ethereum-holesky-rpc.publicnode.com
PRIVATE_KEY=<private_key>
ALIGNED_SERVICE_MANAGER_ADDRESS=<service_manager_address> #0x58F280BeBE9B34c9939C3C39e0890C81f163B623 for Holesky
PAYMENT_SERVICE_ADDRESS=<payment_service_address> #0x815aeCA64a974297942D2Bbf034ABEe22a38A003 for Holesky

8 changes: 7 additions & 1 deletion
examples/validating-public-input/contracts/deploy.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,11 @@ if [ -z "$ALIGNED_SERVICE_MANAGER_ADDRESS" ]; then
 exit 1
fi

if [ -z "$PAYMENT_SERVICE_ADDRESS" ]; then
 echo "PAYMENT_SERVICE_ADDRESS is not set. Please set it in .env"
 exit 1
fi

if [ -z "$RPC_URL" ]; then
 echo "RPC_URL is not set. Please set it in .env"
 exit 1
Expand All@@ -25,7 +30,8 @@ forge install

forge script script/Deployer.s.sol \
 "$ALIGNED_SERVICE_MANAGER_ADDRESS" \
 "$PAYMENT_SERVICE_ADDRESS" \
 --rpc-url "$RPC_URL" \
 --private-key "$PRIVATE_KEY" \
 --broadcast \
 --sig "run(address _alignedServiceManager)"
 --sig "run(address _alignedServiceManager,address _paymentServiceAddr)"

8 changes: 6 additions & 2 deletions
examples/validating-public-input/contracts/script/Deployer.s.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,15 @@ import {FibonacciValidator} from "../src/FibonacciValidator.sol";
contract FibonacciDeployer is Script {
 function setUp() public {}

 function run(address _targetContract) external returns (address) {
 function run(
 address _alignedServiceManager,
 address _paymentServiceAddr
 ) external returns (address) {
 vm.startBroadcast();

 FibonacciValidator fibonacciContract = new FibonacciValidator(
 _targetContract
 _alignedServiceManager,
 _paymentServiceAddr
 );

 vm.stopBroadcast();
Expand Down

9 changes: 6 additions & 3 deletions
examples/validating-public-input/contracts/src/FibonacciValidator.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,15 +3,17 @@ pragma solidity ^0.8.12;

contract FibonacciValidator {
 address public alignedServiceManager;
 address public paymentServiceAddr;
 bytes32 public fibonacciProgramId;

 bytes32 public fibonacciProgramIdCommitment =
 0x069ed9f3972550a2901523723f4beb5e240749dcafa30e1623d0778e17d69d70;

 event FibonacciNumbers(uint32 fibN, uint32 fibNPlusOne);

 constructor(address _alignedServiceManager) {
 constructor(address _alignedServiceManager, address _paymentServiceAddr) {
 alignedServiceManager = _alignedServiceManager;
 paymentServiceAddr = _paymentServiceAddr;
 }

 function verifyBatchInclusion(
Expand DownExpand Up@@ -39,14 +41,15 @@ contract FibonacciValidator {
 bytes memory proofIsIncluded
 ) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
 );

Expand Down
Binary file modified...les/validating-public-input/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.proof

View file


Open in desktop


Binary file not shown.


, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: public inputs sdk integration#945

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.

 Sign up for GitHub

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

 Merged

NicolasRampoldi
merged 1 commit into

from

Sep 9, 2024
 Merged


fix: public inputs sdk integration
#945
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


18 changes: 12 additions & 6 deletions
docs/guides/3_validating_public_input.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ This guide assumes you are in the `examples/validating-public-input` directory.

## Generate your ZK Proof

> [!IMPORTANT]
> [!IMPORTANT]
> To generate the proof ensure you have [docker](https://www.docker.com/get-started/) installed and the docker daemon running.
> This is necessary to ensure deterministic builds of the binary we want to generate a proof of. If not used, builds may differ depending on the system you are running on. To know more about this, check [this link](https://dev.risczero.com/terminology#deterministic-builds) from RiscZero docs.

Expand DownExpand Up@@ -42,15 +42,17 @@ pragma solidity ^0.8.12;

contract FibonacciValidator {
 address public alignedServiceManager;
 address public paymentServiceAddr;
 bytes32 public fibonacciProgramId;

 bytes32 public fibonacciProgramIdCommitment =
 0x069ed9f3972550a2901523723f4beb5e240749dcafa30e1623d0778e17d69d70;

 event FibonacciNumbers(uint32 fibN, uint32 fibNPlusOne);

 constructor(address _alignedServiceManager) {
 constructor(address _alignedServiceManager, address _paymentServiceAddr) {
 alignedServiceManager = _alignedServiceManager;
 paymentServiceAddr = _paymentServiceAddr;
 }

 function verifyBatchInclusion(
Expand DownExpand Up@@ -78,14 +80,15 @@ contract FibonacciValidator {
 bytes memory proofIsIncluded
 ) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
 );

Expand DownExpand Up@@ -116,6 +119,7 @@ contract FibonacciValidator {
 return (first, second);
 }
}

```

### Explanation
Expand DownExpand Up@@ -146,14 +150,15 @@ require(
 bytes memory proofIsIncluded
) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
);

Expand DownExpand Up@@ -192,6 +197,7 @@ To deploy the contract, first you will need to set up the `.env` file in the con
RPC_URL=<rpc_url> #You can use publicnode RPC: https://ethereum-holesky-rpc.publicnode.com
PRIVATE_KEY=<private_key>
ALIGNED_SERVICE_MANAGER_ADDRESS=<service_manager_address> #0x58F280BeBE9B34c9939C3C39e0890C81f163B623 for Holesky
PAYMENT_SERVICE_ADDRESS=<payment_service_address> #0x815aeCA64a974297942D2Bbf034ABEe22a38A003 for Holesky
```

Then, run `make deploy_fibonacci_validator`.
Expand Down

52 changes: 51 additions & 1 deletion
examples/validating-public-input/aligned-integration/Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
examples/validating-public-input/aligned-integration/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", tag="v0.4.0" }
aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", rev="6908110aaa04ec3107f15ab8a8bb2603e7bbead9" }
tokio = { version = "1.37.0", features = ["io-std", "time", "macros", "rt", "rt-multi-thread", "sync"] }
ethers = { tag = "v2.0.15-fix-reconnections", features = ["ws", "rustls"], git = "https://github.com/yetanotherco/ethers-rs.git" }
serde = { version = "1.0.201", features = ["derive"] }
Expand Down

33 changes: 20 additions & 13 deletions
examples/validating-public-input/aligned-integration/src/main.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
use std::env;
use std::fs::File;
use std::io::Write;
use std::path::PathBuf;
Expand All@@ -6,7 +7,7 @@ use std::str::FromStr;
use aligned_sdk::core::errors::SubmitError;
use aligned_sdk::core::types::Chain::Holesky;
use aligned_sdk::core::types::{AlignedVerificationData, ProvingSystemId, VerificationData};
use aligned_sdk::sdk::{get_next_nonce, submit_and_wait};
use aligned_sdk::sdk::{get_next_nonce, submit_and_wait_verification};
use env_logger::Env;
use ethers::signers::{LocalWallet, Signer};
use ethers::types::Address;
Expand DownExpand Up@@ -49,20 +50,23 @@ async fn main() -> Result<(), SubmitError> {
 proof_generator_addr,
 };

 let wallet = LocalWallet::from_str(WALLET_PRIVATE_KEY).expect("Failed to create wallet");
 let wallet = LocalWallet::from_str(WALLET_PRIVATE_KEY)
 .expect("Failed to create wallet")
 .with_chain_id(17000u64);

 let nonce = get_next_nonce(RPC_URL, wallet.address(), BATCHER_PAYMENTS_ADDRESS)
 .await
 .expect("Failed to get next nonce");

 info!("Submitting Fibonacci proof to Aligned and waiting for verification...");
 let aligned_verification_data = submit_and_wait(
 let aligned_verification_data = submit_and_wait_verification(
 BATCHER_URL,
 RPC_URL,
 Holesky,
 &verification_data,
 wallet,
 nonce,
 BATCHER_PAYMENTS_ADDRESS,
 )
 .await?;

Expand All@@ -72,14 +76,11 @@ async fn main() -> Result<(), SubmitError> {
 "Saving verification data to {:?}",
 batch_inclusion_data_directory_path
 );
 if let Some(aligned_verification_data) = aligned_verification_data {
 save_response(
 batch_inclusion_data_directory_path,
 &aligned_verification_data,
 )?;
 } else {
 return Err(SubmitError::EmptyVerificationDataList);
 }

 save_response(
 batch_inclusion_data_directory_path,
 &aligned_verification_data,
 )?;

 Ok(())
}
Expand All@@ -104,13 +105,19 @@ fn save_response(
 let batch_inclusion_data_path =
 batch_inclusion_data_directory_path.join(batch_inclusion_data_file_name);

 let data = serde_json::to_vec(&aligned_verification_data)?;
 let data = serde_json::to_vec(&aligned_verification_data).unwrap();

 let mut file = File::create(&batch_inclusion_data_path)
 .map_err(|e| SubmitError::IoError(batch_inclusion_data_path.clone(), e))?;

 file.write_all(data.as_slice())
 .map_err(|e| SubmitError::IoError(batch_inclusion_data_path.clone(), e))?;

 let current_dir = env::current_dir().expect("Failed to get current directory");

 info!(
 "Saved batch inclusion data to {:?}",
 current_dir.join(batch_inclusion_data_path)
 );

 Ok(())
}

1 change: 1 addition & 0 deletions
examples/validating-public-input/contracts/.env.example

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
RPC_URL=<rpc_url> #You can use publicnode RPC: https://ethereum-holesky-rpc.publicnode.com
PRIVATE_KEY=<private_key>
ALIGNED_SERVICE_MANAGER_ADDRESS=<service_manager_address> #0x58F280BeBE9B34c9939C3C39e0890C81f163B623 for Holesky
PAYMENT_SERVICE_ADDRESS=<payment_service_address> #0x815aeCA64a974297942D2Bbf034ABEe22a38A003 for Holesky

8 changes: 7 additions & 1 deletion
examples/validating-public-input/contracts/deploy.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,11 @@ if [ -z "$ALIGNED_SERVICE_MANAGER_ADDRESS" ]; then
 exit 1
fi

if [ -z "$PAYMENT_SERVICE_ADDRESS" ]; then
 echo "PAYMENT_SERVICE_ADDRESS is not set. Please set it in .env"
 exit 1
fi

if [ -z "$RPC_URL" ]; then
 echo "RPC_URL is not set. Please set it in .env"
 exit 1
Expand All@@ -25,7 +30,8 @@ forge install

forge script script/Deployer.s.sol \
 "$ALIGNED_SERVICE_MANAGER_ADDRESS" \
 "$PAYMENT_SERVICE_ADDRESS" \
 --rpc-url "$RPC_URL" \
 --private-key "$PRIVATE_KEY" \
 --broadcast \
 --sig "run(address _alignedServiceManager)"
 --sig "run(address _alignedServiceManager,address _paymentServiceAddr)"

8 changes: 6 additions & 2 deletions
examples/validating-public-input/contracts/script/Deployer.s.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,15 @@ import {FibonacciValidator} from "../src/FibonacciValidator.sol";
contract FibonacciDeployer is Script {
 function setUp() public {}

 function run(address _targetContract) external returns (address) {
 function run(
 address _alignedServiceManager,
 address _paymentServiceAddr
 ) external returns (address) {
 vm.startBroadcast();

 FibonacciValidator fibonacciContract = new FibonacciValidator(
 _targetContract
 _alignedServiceManager,
 _paymentServiceAddr
 );

 vm.stopBroadcast();
Expand Down

9 changes: 6 additions & 3 deletions
examples/validating-public-input/contracts/src/FibonacciValidator.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,15 +3,17 @@ pragma solidity ^0.8.12;

contract FibonacciValidator {
 address public alignedServiceManager;
 address public paymentServiceAddr;
 bytes32 public fibonacciProgramId;

 bytes32 public fibonacciProgramIdCommitment =
 0x069ed9f3972550a2901523723f4beb5e240749dcafa30e1623d0778e17d69d70;

 event FibonacciNumbers(uint32 fibN, uint32 fibNPlusOne);

 constructor(address _alignedServiceManager) {
 constructor(address _alignedServiceManager, address _paymentServiceAddr) {
 alignedServiceManager = _alignedServiceManager;
 paymentServiceAddr = _paymentServiceAddr;
 }

 function verifyBatchInclusion(
Expand DownExpand Up@@ -39,14 +41,15 @@ contract FibonacciValidator {
 bytes memory proofIsIncluded
 ) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
 );

Expand Down
Binary file modified...les/validating-public-input/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.proof

View file


Open in desktop


Binary file not shown.


, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: public inputs sdk integration#945

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.

 Sign up for GitHub

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

 Merged

NicolasRampoldi
merged 1 commit into

from

Sep 9, 2024
 Merged


fix: public inputs sdk integration
#945
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


18 changes: 12 additions & 6 deletions
docs/guides/3_validating_public_input.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ This guide assumes you are in the `examples/validating-public-input` directory.

## Generate your ZK Proof

> [!IMPORTANT]
> [!IMPORTANT]
> To generate the proof ensure you have [docker](https://www.docker.com/get-started/) installed and the docker daemon running.
> This is necessary to ensure deterministic builds of the binary we want to generate a proof of. If not used, builds may differ depending on the system you are running on. To know more about this, check [this link](https://dev.risczero.com/terminology#deterministic-builds) from RiscZero docs.

Expand DownExpand Up@@ -42,15 +42,17 @@ pragma solidity ^0.8.12;

contract FibonacciValidator {
 address public alignedServiceManager;
 address public paymentServiceAddr;
 bytes32 public fibonacciProgramId;

 bytes32 public fibonacciProgramIdCommitment =
 0x069ed9f3972550a2901523723f4beb5e240749dcafa30e1623d0778e17d69d70;

 event FibonacciNumbers(uint32 fibN, uint32 fibNPlusOne);

 constructor(address _alignedServiceManager) {
 constructor(address _alignedServiceManager, address _paymentServiceAddr) {
 alignedServiceManager = _alignedServiceManager;
 paymentServiceAddr = _paymentServiceAddr;
 }

 function verifyBatchInclusion(
Expand DownExpand Up@@ -78,14 +80,15 @@ contract FibonacciValidator {
 bytes memory proofIsIncluded
 ) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
 );

Expand DownExpand Up@@ -116,6 +119,7 @@ contract FibonacciValidator {
 return (first, second);
 }
}

```

### Explanation
Expand DownExpand Up@@ -146,14 +150,15 @@ require(
 bytes memory proofIsIncluded
) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
);

Expand DownExpand Up@@ -192,6 +197,7 @@ To deploy the contract, first you will need to set up the `.env` file in the con
RPC_URL=<rpc_url> #You can use publicnode RPC: https://ethereum-holesky-rpc.publicnode.com
PRIVATE_KEY=<private_key>
ALIGNED_SERVICE_MANAGER_ADDRESS=<service_manager_address> #0x58F280BeBE9B34c9939C3C39e0890C81f163B623 for Holesky
PAYMENT_SERVICE_ADDRESS=<payment_service_address> #0x815aeCA64a974297942D2Bbf034ABEe22a38A003 for Holesky
```

Then, run `make deploy_fibonacci_validator`.
Expand Down

52 changes: 51 additions & 1 deletion
examples/validating-public-input/aligned-integration/Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
examples/validating-public-input/aligned-integration/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", tag="v0.4.0" }
aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", rev="6908110aaa04ec3107f15ab8a8bb2603e7bbead9" }
tokio = { version = "1.37.0", features = ["io-std", "time", "macros", "rt", "rt-multi-thread", "sync"] }
ethers = { tag = "v2.0.15-fix-reconnections", features = ["ws", "rustls"], git = "https://github.com/yetanotherco/ethers-rs.git" }
serde = { version = "1.0.201", features = ["derive"] }
Expand Down

33 changes: 20 additions & 13 deletions
examples/validating-public-input/aligned-integration/src/main.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
use std::env;
use std::fs::File;
use std::io::Write;
use std::path::PathBuf;
Expand All@@ -6,7 +7,7 @@ use std::str::FromStr;
use aligned_sdk::core::errors::SubmitError;
use aligned_sdk::core::types::Chain::Holesky;
use aligned_sdk::core::types::{AlignedVerificationData, ProvingSystemId, VerificationData};
use aligned_sdk::sdk::{get_next_nonce, submit_and_wait};
use aligned_sdk::sdk::{get_next_nonce, submit_and_wait_verification};
use env_logger::Env;
use ethers::signers::{LocalWallet, Signer};
use ethers::types::Address;
Expand DownExpand Up@@ -49,20 +50,23 @@ async fn main() -> Result<(), SubmitError> {
 proof_generator_addr,
 };

 let wallet = LocalWallet::from_str(WALLET_PRIVATE_KEY).expect("Failed to create wallet");
 let wallet = LocalWallet::from_str(WALLET_PRIVATE_KEY)
 .expect("Failed to create wallet")
 .with_chain_id(17000u64);

 let nonce = get_next_nonce(RPC_URL, wallet.address(), BATCHER_PAYMENTS_ADDRESS)
 .await
 .expect("Failed to get next nonce");

 info!("Submitting Fibonacci proof to Aligned and waiting for verification...");
 let aligned_verification_data = submit_and_wait(
 let aligned_verification_data = submit_and_wait_verification(
 BATCHER_URL,
 RPC_URL,
 Holesky,
 &verification_data,
 wallet,
 nonce,
 BATCHER_PAYMENTS_ADDRESS,
 )
 .await?;

Expand All@@ -72,14 +76,11 @@ async fn main() -> Result<(), SubmitError> {
 "Saving verification data to {:?}",
 batch_inclusion_data_directory_path
 );
 if let Some(aligned_verification_data) = aligned_verification_data {
 save_response(
 batch_inclusion_data_directory_path,
 &aligned_verification_data,
 )?;
 } else {
 return Err(SubmitError::EmptyVerificationDataList);
 }

 save_response(
 batch_inclusion_data_directory_path,
 &aligned_verification_data,
 )?;

 Ok(())
}
Expand All@@ -104,13 +105,19 @@ fn save_response(
 let batch_inclusion_data_path =
 batch_inclusion_data_directory_path.join(batch_inclusion_data_file_name);

 let data = serde_json::to_vec(&aligned_verification_data)?;
 let data = serde_json::to_vec(&aligned_verification_data).unwrap();

 let mut file = File::create(&batch_inclusion_data_path)
 .map_err(|e| SubmitError::IoError(batch_inclusion_data_path.clone(), e))?;

 file.write_all(data.as_slice())
 .map_err(|e| SubmitError::IoError(batch_inclusion_data_path.clone(), e))?;

 let current_dir = env::current_dir().expect("Failed to get current directory");

 info!(
 "Saved batch inclusion data to {:?}",
 current_dir.join(batch_inclusion_data_path)
 );

 Ok(())
}

1 change: 1 addition & 0 deletions
examples/validating-public-input/contracts/.env.example

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
RPC_URL=<rpc_url> #You can use publicnode RPC: https://ethereum-holesky-rpc.publicnode.com
PRIVATE_KEY=<private_key>
ALIGNED_SERVICE_MANAGER_ADDRESS=<service_manager_address> #0x58F280BeBE9B34c9939C3C39e0890C81f163B623 for Holesky
PAYMENT_SERVICE_ADDRESS=<payment_service_address> #0x815aeCA64a974297942D2Bbf034ABEe22a38A003 for Holesky

8 changes: 7 additions & 1 deletion
examples/validating-public-input/contracts/deploy.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,11 @@ if [ -z "$ALIGNED_SERVICE_MANAGER_ADDRESS" ]; then
 exit 1
fi

if [ -z "$PAYMENT_SERVICE_ADDRESS" ]; then
 echo "PAYMENT_SERVICE_ADDRESS is not set. Please set it in .env"
 exit 1
fi

if [ -z "$RPC_URL" ]; then
 echo "RPC_URL is not set. Please set it in .env"
 exit 1
Expand All@@ -25,7 +30,8 @@ forge install

forge script script/Deployer.s.sol \
 "$ALIGNED_SERVICE_MANAGER_ADDRESS" \
 "$PAYMENT_SERVICE_ADDRESS" \
 --rpc-url "$RPC_URL" \
 --private-key "$PRIVATE_KEY" \
 --broadcast \
 --sig "run(address _alignedServiceManager)"
 --sig "run(address _alignedServiceManager,address _paymentServiceAddr)"

8 changes: 6 additions & 2 deletions
examples/validating-public-input/contracts/script/Deployer.s.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,15 @@ import {FibonacciValidator} from "../src/FibonacciValidator.sol";
contract FibonacciDeployer is Script {
 function setUp() public {}

 function run(address _targetContract) external returns (address) {
 function run(
 address _alignedServiceManager,
 address _paymentServiceAddr
 ) external returns (address) {
 vm.startBroadcast();

 FibonacciValidator fibonacciContract = new FibonacciValidator(
 _targetContract
 _alignedServiceManager,
 _paymentServiceAddr
 );

 vm.stopBroadcast();
Expand Down

9 changes: 6 additions & 3 deletions
examples/validating-public-input/contracts/src/FibonacciValidator.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,15 +3,17 @@ pragma solidity ^0.8.12;

contract FibonacciValidator {
 address public alignedServiceManager;
 address public paymentServiceAddr;
 bytes32 public fibonacciProgramId;

 bytes32 public fibonacciProgramIdCommitment =
 0x069ed9f3972550a2901523723f4beb5e240749dcafa30e1623d0778e17d69d70;

 event FibonacciNumbers(uint32 fibN, uint32 fibNPlusOne);

 constructor(address _alignedServiceManager) {
 constructor(address _alignedServiceManager, address _paymentServiceAddr) {
 alignedServiceManager = _alignedServiceManager;
 paymentServiceAddr = _paymentServiceAddr;
 }

 function verifyBatchInclusion(
Expand DownExpand Up@@ -39,14 +41,15 @@ contract FibonacciValidator {
 bytes memory proofIsIncluded
 ) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
 );

Expand Down
Binary file modified...les/validating-public-input/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.proof

View file


Open in desktop


Binary file not shown.


, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: public inputs sdk integration#945

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.

 Sign up for GitHub

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

 Merged

NicolasRampoldi
merged 1 commit into

from

Sep 9, 2024
 Merged


fix: public inputs sdk integration
#945
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


18 changes: 12 additions & 6 deletions
docs/guides/3_validating_public_input.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ This guide assumes you are in the `examples/validating-public-input` directory.

## Generate your ZK Proof

> [!IMPORTANT]
> [!IMPORTANT]
> To generate the proof ensure you have [docker](https://www.docker.com/get-started/) installed and the docker daemon running.
> This is necessary to ensure deterministic builds of the binary we want to generate a proof of. If not used, builds may differ depending on the system you are running on. To know more about this, check [this link](https://dev.risczero.com/terminology#deterministic-builds) from RiscZero docs.

Expand DownExpand Up@@ -42,15 +42,17 @@ pragma solidity ^0.8.12;

contract FibonacciValidator {
 address public alignedServiceManager;
 address public paymentServiceAddr;
 bytes32 public fibonacciProgramId;

 bytes32 public fibonacciProgramIdCommitment =
 0x069ed9f3972550a2901523723f4beb5e240749dcafa30e1623d0778e17d69d70;

 event FibonacciNumbers(uint32 fibN, uint32 fibNPlusOne);

 constructor(address _alignedServiceManager) {
 constructor(address _alignedServiceManager, address _paymentServiceAddr) {
 alignedServiceManager = _alignedServiceManager;
 paymentServiceAddr = _paymentServiceAddr;
 }

 function verifyBatchInclusion(
Expand DownExpand Up@@ -78,14 +80,15 @@ contract FibonacciValidator {
 bytes memory proofIsIncluded
 ) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
 );

Expand DownExpand Up@@ -116,6 +119,7 @@ contract FibonacciValidator {
 return (first, second);
 }
}

```

### Explanation
Expand DownExpand Up@@ -146,14 +150,15 @@ require(
 bytes memory proofIsIncluded
) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
);

Expand DownExpand Up@@ -192,6 +197,7 @@ To deploy the contract, first you will need to set up the `.env` file in the con
RPC_URL=<rpc_url> #You can use publicnode RPC: https://ethereum-holesky-rpc.publicnode.com
PRIVATE_KEY=<private_key>
ALIGNED_SERVICE_MANAGER_ADDRESS=<service_manager_address> #0x58F280BeBE9B34c9939C3C39e0890C81f163B623 for Holesky
PAYMENT_SERVICE_ADDRESS=<payment_service_address> #0x815aeCA64a974297942D2Bbf034ABEe22a38A003 for Holesky
```

Then, run `make deploy_fibonacci_validator`.
Expand Down

52 changes: 51 additions & 1 deletion
examples/validating-public-input/aligned-integration/Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
examples/validating-public-input/aligned-integration/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", tag="v0.4.0" }
aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", rev="6908110aaa04ec3107f15ab8a8bb2603e7bbead9" }
tokio = { version = "1.37.0", features = ["io-std", "time", "macros", "rt", "rt-multi-thread", "sync"] }
ethers = { tag = "v2.0.15-fix-reconnections", features = ["ws", "rustls"], git = "https://github.com/yetanotherco/ethers-rs.git" }
serde = { version = "1.0.201", features = ["derive"] }
Expand Down

33 changes: 20 additions & 13 deletions
examples/validating-public-input/aligned-integration/src/main.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
use std::env;
use std::fs::File;
use std::io::Write;
use std::path::PathBuf;
Expand All@@ -6,7 +7,7 @@ use std::str::FromStr;
use aligned_sdk::core::errors::SubmitError;
use aligned_sdk::core::types::Chain::Holesky;
use aligned_sdk::core::types::{AlignedVerificationData, ProvingSystemId, VerificationData};
use aligned_sdk::sdk::{get_next_nonce, submit_and_wait};
use aligned_sdk::sdk::{get_next_nonce, submit_and_wait_verification};
use env_logger::Env;
use ethers::signers::{LocalWallet, Signer};
use ethers::types::Address;
Expand DownExpand Up@@ -49,20 +50,23 @@ async fn main() -> Result<(), SubmitError> {
 proof_generator_addr,
 };

 let wallet = LocalWallet::from_str(WALLET_PRIVATE_KEY).expect("Failed to create wallet");
 let wallet = LocalWallet::from_str(WALLET_PRIVATE_KEY)
 .expect("Failed to create wallet")
 .with_chain_id(17000u64);

 let nonce = get_next_nonce(RPC_URL, wallet.address(), BATCHER_PAYMENTS_ADDRESS)
 .await
 .expect("Failed to get next nonce");

 info!("Submitting Fibonacci proof to Aligned and waiting for verification...");
 let aligned_verification_data = submit_and_wait(
 let aligned_verification_data = submit_and_wait_verification(
 BATCHER_URL,
 RPC_URL,
 Holesky,
 &verification_data,
 wallet,
 nonce,
 BATCHER_PAYMENTS_ADDRESS,
 )
 .await?;

Expand All@@ -72,14 +76,11 @@ async fn main() -> Result<(), SubmitError> {
 "Saving verification data to {:?}",
 batch_inclusion_data_directory_path
 );
 if let Some(aligned_verification_data) = aligned_verification_data {
 save_response(
 batch_inclusion_data_directory_path,
 &aligned_verification_data,
 )?;
 } else {
 return Err(SubmitError::EmptyVerificationDataList);
 }

 save_response(
 batch_inclusion_data_directory_path,
 &aligned_verification_data,
 )?;

 Ok(())
}
Expand All@@ -104,13 +105,19 @@ fn save_response(
 let batch_inclusion_data_path =
 batch_inclusion_data_directory_path.join(batch_inclusion_data_file_name);

 let data = serde_json::to_vec(&aligned_verification_data)?;
 let data = serde_json::to_vec(&aligned_verification_data).unwrap();

 let mut file = File::create(&batch_inclusion_data_path)
 .map_err(|e| SubmitError::IoError(batch_inclusion_data_path.clone(), e))?;

 file.write_all(data.as_slice())
 .map_err(|e| SubmitError::IoError(batch_inclusion_data_path.clone(), e))?;

 let current_dir = env::current_dir().expect("Failed to get current directory");

 info!(
 "Saved batch inclusion data to {:?}",
 current_dir.join(batch_inclusion_data_path)
 );

 Ok(())
}

1 change: 1 addition & 0 deletions
examples/validating-public-input/contracts/.env.example

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
RPC_URL=<rpc_url> #You can use publicnode RPC: https://ethereum-holesky-rpc.publicnode.com
PRIVATE_KEY=<private_key>
ALIGNED_SERVICE_MANAGER_ADDRESS=<service_manager_address> #0x58F280BeBE9B34c9939C3C39e0890C81f163B623 for Holesky
PAYMENT_SERVICE_ADDRESS=<payment_service_address> #0x815aeCA64a974297942D2Bbf034ABEe22a38A003 for Holesky

8 changes: 7 additions & 1 deletion
examples/validating-public-input/contracts/deploy.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,11 @@ if [ -z "$ALIGNED_SERVICE_MANAGER_ADDRESS" ]; then
 exit 1
fi

if [ -z "$PAYMENT_SERVICE_ADDRESS" ]; then
 echo "PAYMENT_SERVICE_ADDRESS is not set. Please set it in .env"
 exit 1
fi

if [ -z "$RPC_URL" ]; then
 echo "RPC_URL is not set. Please set it in .env"
 exit 1
Expand All@@ -25,7 +30,8 @@ forge install

forge script script/Deployer.s.sol \
 "$ALIGNED_SERVICE_MANAGER_ADDRESS" \
 "$PAYMENT_SERVICE_ADDRESS" \
 --rpc-url "$RPC_URL" \
 --private-key "$PRIVATE_KEY" \
 --broadcast \
 --sig "run(address _alignedServiceManager)"
 --sig "run(address _alignedServiceManager,address _paymentServiceAddr)"

8 changes: 6 additions & 2 deletions
examples/validating-public-input/contracts/script/Deployer.s.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,15 @@ import {FibonacciValidator} from "../src/FibonacciValidator.sol";
contract FibonacciDeployer is Script {
 function setUp() public {}

 function run(address _targetContract) external returns (address) {
 function run(
 address _alignedServiceManager,
 address _paymentServiceAddr
 ) external returns (address) {
 vm.startBroadcast();

 FibonacciValidator fibonacciContract = new FibonacciValidator(
 _targetContract
 _alignedServiceManager,
 _paymentServiceAddr
 );

 vm.stopBroadcast();
Expand Down

9 changes: 6 additions & 3 deletions
examples/validating-public-input/contracts/src/FibonacciValidator.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,15 +3,17 @@ pragma solidity ^0.8.12;

contract FibonacciValidator {
 address public alignedServiceManager;
 address public paymentServiceAddr;
 bytes32 public fibonacciProgramId;

 bytes32 public fibonacciProgramIdCommitment =
 0x069ed9f3972550a2901523723f4beb5e240749dcafa30e1623d0778e17d69d70;

 event FibonacciNumbers(uint32 fibN, uint32 fibNPlusOne);

 constructor(address _alignedServiceManager) {
 constructor(address _alignedServiceManager, address _paymentServiceAddr) {
 alignedServiceManager = _alignedServiceManager;
 paymentServiceAddr = _paymentServiceAddr;
 }

 function verifyBatchInclusion(
Expand DownExpand Up@@ -39,14 +41,15 @@ contract FibonacciValidator {
 bytes memory proofIsIncluded
 ) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
 );

Expand Down
Binary file modified...les/validating-public-input/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.proof

View file


Open in desktop


Binary file not shown.


, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: public inputs sdk integration#945

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.

 Sign up for GitHub

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

 Merged

NicolasRampoldi
merged 1 commit into

from

Sep 9, 2024
 Merged


fix: public inputs sdk integration
#945
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


18 changes: 12 additions & 6 deletions
docs/guides/3_validating_public_input.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ This guide assumes you are in the `examples/validating-public-input` directory.

## Generate your ZK Proof

> [!IMPORTANT]
> [!IMPORTANT]
> To generate the proof ensure you have [docker](https://www.docker.com/get-started/) installed and the docker daemon running.
> This is necessary to ensure deterministic builds of the binary we want to generate a proof of. If not used, builds may differ depending on the system you are running on. To know more about this, check [this link](https://dev.risczero.com/terminology#deterministic-builds) from RiscZero docs.

Expand DownExpand Up@@ -42,15 +42,17 @@ pragma solidity ^0.8.12;

contract FibonacciValidator {
 address public alignedServiceManager;
 address public paymentServiceAddr;
 bytes32 public fibonacciProgramId;

 bytes32 public fibonacciProgramIdCommitment =
 0x069ed9f3972550a2901523723f4beb5e240749dcafa30e1623d0778e17d69d70;

 event FibonacciNumbers(uint32 fibN, uint32 fibNPlusOne);

 constructor(address _alignedServiceManager) {
 constructor(address _alignedServiceManager, address _paymentServiceAddr) {
 alignedServiceManager = _alignedServiceManager;
 paymentServiceAddr = _paymentServiceAddr;
 }

 function verifyBatchInclusion(
Expand DownExpand Up@@ -78,14 +80,15 @@ contract FibonacciValidator {
 bytes memory proofIsIncluded
 ) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
 );

Expand DownExpand Up@@ -116,6 +119,7 @@ contract FibonacciValidator {
 return (first, second);
 }
}

```

### Explanation
Expand DownExpand Up@@ -146,14 +150,15 @@ require(
 bytes memory proofIsIncluded
) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
);

Expand DownExpand Up@@ -192,6 +197,7 @@ To deploy the contract, first you will need to set up the `.env` file in the con
RPC_URL=<rpc_url> #You can use publicnode RPC: https://ethereum-holesky-rpc.publicnode.com
PRIVATE_KEY=<private_key>
ALIGNED_SERVICE_MANAGER_ADDRESS=<service_manager_address> #0x58F280BeBE9B34c9939C3C39e0890C81f163B623 for Holesky
PAYMENT_SERVICE_ADDRESS=<payment_service_address> #0x815aeCA64a974297942D2Bbf034ABEe22a38A003 for Holesky
```

Then, run `make deploy_fibonacci_validator`.
Expand Down

52 changes: 51 additions & 1 deletion
examples/validating-public-input/aligned-integration/Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
examples/validating-public-input/aligned-integration/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", tag="v0.4.0" }
aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", rev="6908110aaa04ec3107f15ab8a8bb2603e7bbead9" }
tokio = { version = "1.37.0", features = ["io-std", "time", "macros", "rt", "rt-multi-thread", "sync"] }
ethers = { tag = "v2.0.15-fix-reconnections", features = ["ws", "rustls"], git = "https://github.com/yetanotherco/ethers-rs.git" }
serde = { version = "1.0.201", features = ["derive"] }
Expand Down

33 changes: 20 additions & 13 deletions
examples/validating-public-input/aligned-integration/src/main.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
use std::env;
use std::fs::File;
use std::io::Write;
use std::path::PathBuf;
Expand All@@ -6,7 +7,7 @@ use std::str::FromStr;
use aligned_sdk::core::errors::SubmitError;
use aligned_sdk::core::types::Chain::Holesky;
use aligned_sdk::core::types::{AlignedVerificationData, ProvingSystemId, VerificationData};
use aligned_sdk::sdk::{get_next_nonce, submit_and_wait};
use aligned_sdk::sdk::{get_next_nonce, submit_and_wait_verification};
use env_logger::Env;
use ethers::signers::{LocalWallet, Signer};
use ethers::types::Address;
Expand DownExpand Up@@ -49,20 +50,23 @@ async fn main() -> Result<(), SubmitError> {
 proof_generator_addr,
 };

 let wallet = LocalWallet::from_str(WALLET_PRIVATE_KEY).expect("Failed to create wallet");
 let wallet = LocalWallet::from_str(WALLET_PRIVATE_KEY)
 .expect("Failed to create wallet")
 .with_chain_id(17000u64);

 let nonce = get_next_nonce(RPC_URL, wallet.address(), BATCHER_PAYMENTS_ADDRESS)
 .await
 .expect("Failed to get next nonce");

 info!("Submitting Fibonacci proof to Aligned and waiting for verification...");
 let aligned_verification_data = submit_and_wait(
 let aligned_verification_data = submit_and_wait_verification(
 BATCHER_URL,
 RPC_URL,
 Holesky,
 &verification_data,
 wallet,
 nonce,
 BATCHER_PAYMENTS_ADDRESS,
 )
 .await?;

Expand All@@ -72,14 +76,11 @@ async fn main() -> Result<(), SubmitError> {
 "Saving verification data to {:?}",
 batch_inclusion_data_directory_path
 );
 if let Some(aligned_verification_data) = aligned_verification_data {
 save_response(
 batch_inclusion_data_directory_path,
 &aligned_verification_data,
 )?;
 } else {
 return Err(SubmitError::EmptyVerificationDataList);
 }

 save_response(
 batch_inclusion_data_directory_path,
 &aligned_verification_data,
 )?;

 Ok(())
}
Expand All@@ -104,13 +105,19 @@ fn save_response(
 let batch_inclusion_data_path =
 batch_inclusion_data_directory_path.join(batch_inclusion_data_file_name);

 let data = serde_json::to_vec(&aligned_verification_data)?;
 let data = serde_json::to_vec(&aligned_verification_data).unwrap();

 let mut file = File::create(&batch_inclusion_data_path)
 .map_err(|e| SubmitError::IoError(batch_inclusion_data_path.clone(), e))?;

 file.write_all(data.as_slice())
 .map_err(|e| SubmitError::IoError(batch_inclusion_data_path.clone(), e))?;

 let current_dir = env::current_dir().expect("Failed to get current directory");

 info!(
 "Saved batch inclusion data to {:?}",
 current_dir.join(batch_inclusion_data_path)
 );

 Ok(())
}

1 change: 1 addition & 0 deletions
examples/validating-public-input/contracts/.env.example

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
RPC_URL=<rpc_url> #You can use publicnode RPC: https://ethereum-holesky-rpc.publicnode.com
PRIVATE_KEY=<private_key>
ALIGNED_SERVICE_MANAGER_ADDRESS=<service_manager_address> #0x58F280BeBE9B34c9939C3C39e0890C81f163B623 for Holesky
PAYMENT_SERVICE_ADDRESS=<payment_service_address> #0x815aeCA64a974297942D2Bbf034ABEe22a38A003 for Holesky

8 changes: 7 additions & 1 deletion
examples/validating-public-input/contracts/deploy.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,11 @@ if [ -z "$ALIGNED_SERVICE_MANAGER_ADDRESS" ]; then
 exit 1
fi

if [ -z "$PAYMENT_SERVICE_ADDRESS" ]; then
 echo "PAYMENT_SERVICE_ADDRESS is not set. Please set it in .env"
 exit 1
fi

if [ -z "$RPC_URL" ]; then
 echo "RPC_URL is not set. Please set it in .env"
 exit 1
Expand All@@ -25,7 +30,8 @@ forge install

forge script script/Deployer.s.sol \
 "$ALIGNED_SERVICE_MANAGER_ADDRESS" \
 "$PAYMENT_SERVICE_ADDRESS" \
 --rpc-url "$RPC_URL" \
 --private-key "$PRIVATE_KEY" \
 --broadcast \
 --sig "run(address _alignedServiceManager)"
 --sig "run(address _alignedServiceManager,address _paymentServiceAddr)"

8 changes: 6 additions & 2 deletions
examples/validating-public-input/contracts/script/Deployer.s.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,15 @@ import {FibonacciValidator} from "../src/FibonacciValidator.sol";
contract FibonacciDeployer is Script {
 function setUp() public {}

 function run(address _targetContract) external returns (address) {
 function run(
 address _alignedServiceManager,
 address _paymentServiceAddr
 ) external returns (address) {
 vm.startBroadcast();

 FibonacciValidator fibonacciContract = new FibonacciValidator(
 _targetContract
 _alignedServiceManager,
 _paymentServiceAddr
 );

 vm.stopBroadcast();
Expand Down

9 changes: 6 additions & 3 deletions
examples/validating-public-input/contracts/src/FibonacciValidator.sol

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,15 +3,17 @@ pragma solidity ^0.8.12;

contract FibonacciValidator {
 address public alignedServiceManager;
 address public paymentServiceAddr;
 bytes32 public fibonacciProgramId;

 bytes32 public fibonacciProgramIdCommitment =
 0x069ed9f3972550a2901523723f4beb5e240749dcafa30e1623d0778e17d69d70;

 event FibonacciNumbers(uint32 fibN, uint32 fibNPlusOne);

 constructor(address _alignedServiceManager) {
 constructor(address _alignedServiceManager, address _paymentServiceAddr) {
 alignedServiceManager = _alignedServiceManager;
 paymentServiceAddr = _paymentServiceAddr;
 }

 function verifyBatchInclusion(
Expand DownExpand Up@@ -39,14 +41,15 @@ contract FibonacciValidator {
 bytes memory proofIsIncluded
 ) = alignedServiceManager.staticcall(
 abi.encodeWithSignature(
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
 "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
 proofCommitment,
 pubInputCommitment,
 programIdCommitment,
 proofGeneratorAddr,
 batchMerkleRoot,
 merkleProof,
 verificationDataBatchIndex
 verificationDataBatchIndex,
 paymentServiceAddr
 )
 );

Expand Down
Binary file modified...les/validating-public-input/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.proof

View file


Open in desktop


Binary file not shown.