Skip to content

Commit 61f94e6

Browse files
committed
fix all
1 parent 0beb6fc commit 61f94e6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+282
-282
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use dep::ethereum::log::{get_log, LogWithinBlock};
22

3-
global MAX_LOG_DATA_LEN = 32;
3+
global MAX_LOG_DATA_LEN: u32 = 32;
44
global MAX_LOGS_COUNT = 1;
55

66
fn main(
77
chain_id: pub Field,
88
block_number: pub u64,
99
tx_idx: pub Field,
10-
log_idx: pub u64
10+
log_idx: pub u32
1111
) -> pub LogWithinBlock<MAX_LOG_DATA_LEN> {
1212
get_log::<MAX_LOG_DATA_LEN, MAX_LOGS_COUNT>(chain_id, block_number, tx_idx, log_idx)
1313
}

ethereum/circuits/lib/README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,25 @@ If you decide to use our Oracles - you don't need to provide all the data by han
2424
Here is a list of public functions that you should use if you decide to go the **oracles route**:
2525

2626
```rust
27-
pub fn get_header(chain_id: Field, block_number: u64) -> BlockHeaderPartial;
27+
pub fn get_header(chain_id: Field, block_number: u32) -> BlockHeaderPartial;
2828
```
2929

3030
```rust
31-
pub fn get_account(chain_id: Field, block_no: u64, address: Address) -> AccountWithinBlock;
31+
pub fn get_account(chain_id: Field, block_no: u32, address: Address) -> AccountWithinBlock;
3232
```
3333

3434
```rust
35-
pub fn get_account_with_storage(chain_id: Field, block_number: u64, address: Address, storage_key: Bytes32) -> StorageWithinBlock<1>;
35+
pub fn get_account_with_storage(chain_id: Field, block_number: u32, address: Address, storage_key: Bytes32) -> StorageWithinBlock<1>;
3636
```
3737

3838
```rust
39-
pub fn get_receipt<...>(chain_id: Field, block_number: u64, tx_idx: Field, ...) -> TxReceiptWithinBlock;
39+
pub fn get_receipt<...>(chain_id: Field, block_number: u32, tx_idx: Field, ...) -> TxReceiptWithinBlock;
4040
```
4141

4242
```rust
4343
pub fn get_transaction<MAX_DATA_LEN, ...>(
4444
chain_id: Field,
45-
block_number: u64,
45+
block_number: u32,
4646
tx_idx: Field,
4747
...
4848
) -> TransactionWithinBlock<MAX_DATA_LEN>;
@@ -51,9 +51,9 @@ pub fn get_transaction<MAX_DATA_LEN, ...>(
5151
```rust
5252
pub fn get_log<MAX_LOG_DATA_LEN, MAX_LOGS_COUNT>(
5353
chain_id: Field,
54-
block_number: u64,
54+
block_number: u32,
5555
tx_idx: Field,
56-
log_idx: u64
56+
log_idx: u32
5757
) -> LogWithinBlock<MAX_LOG_DATA_LEN>;
5858
```
5959

@@ -153,7 +153,7 @@ type Bytes32 = [u8; 32];
153153

154154
```rust
155155
struct BlockHeaderPartial {
156-
number: u64,
156+
number: u32,
157157
hash: Bytes32,
158158
state_root: Bytes32,
159159
transactions_root: Bytes32,
@@ -163,7 +163,7 @@ struct BlockHeaderPartial {
163163

164164
```rust
165165
struct Account {
166-
nonce: u64,
166+
nonce: u32,
167167
balance: Field,
168168
storage_root: Bytes32,
169169
code_hash: Bytes32,
@@ -194,8 +194,8 @@ struct TxReceiptWithinBlock {
194194

195195
```rust
196196
struct TxPartial<MAX_DATA_LEN> {
197-
nonce: u64,
198-
gas_limit: u64,
197+
nonce: u32,
198+
gas_limit: u32,
199199
to: Option<Address>,
200200
value: U128,
201201
data: BoundedVec<u8, MAX_DATA_LEN>,
@@ -233,8 +233,8 @@ struct LogWithinBlock<MAX_LOG_DATA_LEN> {
233233

234234
## U256
235235

236-
U256 is a structure to use as a type for big numbers.
237-
It is used when dealing with numbers up to 2<sup>256</sup>. They can exceed Field maximum value.
236+
U256 is a structure to use as a type for big numbers.
237+
It is used when dealing with numbers up to 2<sup>256</sup>. They can exceed Field maximum value.
238238
In particular it is a word size in ETH and therefore it is a basic type used in both storage and slot values calculations.
239239

240240
[There](.src/uint256.nr) is an unoptimized implementation of this type using two U128 structures. Optimized version will appear in Noir.

ethereum/circuits/lib/src/account.nr

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ use crate::verifiers::account::verify_account;
55
use crate::serde::Serde;
66
use crate::merkle_patricia_proofs::proof::ProofInput;
77

8-
global MAX_KEY_LEN = 32;
9-
global MAX_PREFIXED_KEY_NIBBLE_LEN = 66; // (MAX_KEY_LEN + 1) * 2
10-
global MAX_ACCOUNT_DEPTH_NO_LEAF_M = 10; // Emperically correct values to be determined after we scan ethereum state trie.
8+
global MAX_KEY_LEN: u32 = 32;
9+
global MAX_PREFIXED_KEY_NIBBLE_LEN: u32 = 66; // (MAX_KEY_LEN + 1) * 2
10+
global MAX_ACCOUNT_DEPTH_NO_LEAF_M: u32 = 10; // Emperically correct values to be determined after we scan ethereum state trie.
1111

12-
global MAX_ACCOUNT_STATE_LEN = 110; // Values taken from accountProofConfig in account.ts.
13-
global MAX_ACCOUNT_LEAF_LEN = 148;
12+
global MAX_ACCOUNT_STATE_LEN: u32 = 110; // Values taken from accountProofConfig in account.ts.
13+
global MAX_ACCOUNT_LEAF_LEN: u32 = 148;
1414

1515
struct AccountWithinBlock {
1616
account: Account,
@@ -25,23 +25,23 @@ impl Eq for AccountWithinBlock {
2525

2626
type AccountWithStateProofM = (Account, ProofInput<MAX_PREFIXED_KEY_NIBBLE_LEN, MAX_ACCOUNT_STATE_LEN, MAX_ACCOUNT_DEPTH_NO_LEAF_M, MAX_ACCOUNT_LEAF_LEN>);
2727

28-
type ProofInputSerialized<LEN> = [Field; LEN];
28+
type ProofInputSerialized<let LEN: u32> = [Field; LEN];
2929

30-
pub fn get_account(chain_id: Field, block_no: u64, address: Address) -> AccountWithinBlock {
30+
pub fn get_account(chain_id: Field, block_no: u32, address: Address) -> AccountWithinBlock {
3131
let (account, state_proof) = get_account_unconstrained_M(chain_id, block_no, address);
3232
let header = get_header(chain_id, block_no);
3333
verify_account(address, account, state_proof, header.state_root);
3434
AccountWithinBlock { account, block_hash: header.hash }
3535
}
3636

3737
#[oracle(get_account)]
38-
unconstrained fn get_account_oracle<PROOF_INPUT_LEN>(
38+
unconstrained fn get_account_oracle<let PROOF_INPUT_LEN: u32>(
3939
_chain_id: Field,
40-
_block_no: u64,
40+
_block_no: u32,
4141
_address: [u8; 20]
4242
) -> (Account, ProofInputSerialized<PROOF_INPUT_LEN>) {}
4343

44-
unconstrained fn get_account_unconstrained_M(chain_id: Field, block_no: u64, address: Address) -> AccountWithStateProofM {
44+
unconstrained fn get_account_unconstrained_M(chain_id: Field, block_no: u32, address: Address) -> AccountWithStateProofM {
4545
let (account, proof_input) = get_account_oracle(chain_id, block_no, address);
4646
let proof_input = Serde::deserialize(proof_input);
4747

ethereum/circuits/lib/src/account_with_storage.nr

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ use crate::rlp::decode::decode_string;
99

1010
use dep::std::hash::keccak256;
1111

12-
global MAX_KEY_LEN = 32;
13-
global MAX_PREFIXED_KEY_NIBBLE_LEN = 66; // (MAX_KEY_LEN + 1) * 2
12+
global MAX_KEY_LEN: u32 = 32;
13+
global MAX_PREFIXED_KEY_NIBBLE_LEN: u32 = 66; // (MAX_KEY_LEN + 1) * 2
1414
global MAX_STORAGE_DEPTH_NO_LEAF_M = 6; // Emperically correct values to be determined after we scan ethereum state trie.
1515

16-
global MAX_STORAGE_VALUE_LEN = 32; // Values taken from storageProofConfig in storage.ts.
17-
global MAX_STORAGE_LEAF_LEN = 69;
16+
global MAX_STORAGE_VALUE_LEN: u32 = 32; // Values taken from storageProofConfig in storage.ts.
17+
global MAX_STORAGE_LEAF_LEN: u32 = 69;
1818

1919
struct Account {
20-
nonce: u64,
20+
nonce: u32,
2121
balance: Field,
2222
storage_root: Bytes32,
2323
code_hash: Bytes32,
@@ -37,13 +37,13 @@ struct StateAndStorageProofInput {
3737
storage_proof_input: ProofInput<MAX_PREFIXED_KEY_NIBBLE_LEN, MAX_STORAGE_VALUE_LEN, MAX_STORAGE_DEPTH_NO_LEAF_M, MAX_STORAGE_LEAF_LEN>
3838
}
3939

40-
struct StorageWithinBlock<N> {
40+
struct StorageWithinBlock<let N: u32> {
4141
block_hash: Bytes32,
4242
account: Account,
4343
values: [Bytes32; N],
4444
}
4545

46-
type ProofInputSerialized<LEN> = [Field; LEN];
46+
type ProofInputSerialized<let LEN: u32> = [Field; LEN];
4747

4848
impl Eq for StorageWithinBlock<1> {
4949
fn eq(self, other: Self) -> bool {
@@ -89,7 +89,7 @@ fn get_storage_value(rlp_encoded_value: [u8; MAX_STORAGE_VALUE_LEN]) -> [u8; MAX
8989

9090
pub fn get_account_with_storage(
9191
chain_id: Field,
92-
block_number: u64,
92+
block_number: u32,
9393
address: Address,
9494
storage_key: Bytes32
9595
) -> StorageWithinBlock<1> {
@@ -105,16 +105,16 @@ pub fn get_account_with_storage(
105105
}
106106

107107
#[oracle(get_proof)]
108-
unconstrained fn get_proof_oracle<STATE_PROOF_INPUT_LEN, STORAGE_PROOF_INPUT>(
108+
unconstrained fn get_proof_oracle<let STATE_PROOF_INPUT_LEN: u32, let STORAGE_PROOF_INPUT: u32>(
109109
_chain_id: Field,
110-
_block_no: u64,
110+
_block_no: u32,
111111
_address: Address,
112112
_storage_key: Bytes32
113113
) -> (Account, ProofInputSerialized<STATE_PROOF_INPUT_LEN>, ProofInputSerialized<STORAGE_PROOF_INPUT>) {}
114114

115115
unconstrained fn get_proof_unconstrained(
116116
chain_id: Field,
117-
block_no: u64,
117+
block_no: u32,
118118
address: Address,
119119
storage_key: Bytes32
120120
) -> StateAndStorageProofInput {

ethereum/circuits/lib/src/account_with_storage_recursive.nr

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
use crate::account_with_storage::StorageWithinBlock;
22
use crate::misc::{fragment::Fragment, types::{Address, Bytes32, ADDRESS_LENGTH, BYTES32_LENGTH}};
33
use crate::serde::STORAGE_BLOCK_LEN;
4-
use dep::std::{verify_proof, unsafe::zeroed};
4+
use dep::std::{verify_proof, mem::zeroed};
55

66
struct RecursiveProof {
77
key_hash: Field,
88
verification_key: [Field; 114],
99
proof: [Field; 93],
1010
}
1111

12-
global NUM_PUBLIC_INPUTS = 1 + 1 + ADDRESS_LENGTH + BYTES32_LENGTH + STORAGE_BLOCK_LEN; // chain_id + block_number + address + storage_key + public_return_inputs
12+
global NUM_PUBLIC_INPUTS: u32 = 1 + 1 + ADDRESS_LENGTH + BYTES32_LENGTH + STORAGE_BLOCK_LEN; // chain_id + block_number + address + storage_key + public_return_inputs
1313

1414
pub fn get_account_with_storage_recursive(
1515
chain_id: Field,
16-
block_number: u64,
16+
block_number: u32,
1717
address: Address,
1818
storage_key: Bytes32
1919
) -> StorageWithinBlock<1> {
@@ -27,9 +27,9 @@ pub fn get_account_with_storage_recursive(
2727
public_inputs.extend_back(storage_within_block.serialize());
2828

2929
verify_proof(
30-
verification_key.as_slice(),
31-
proof.as_slice(),
32-
public_inputs.to_array::<NUM_PUBLIC_INPUTS>().as_slice(),
30+
verification_key,
31+
proof,
32+
public_inputs.to_array::<NUM_PUBLIC_INPUTS>(),
3333
key_hash
3434
);
3535

@@ -39,14 +39,14 @@ pub fn get_account_with_storage_recursive(
3939
#[oracle(get_storage_recursive)]
4040
unconstrained fn get_account_with_storage_recursive_oracle(
4141
chain_id: Field,
42-
block_number: u64,
42+
block_number: u32,
4343
address: Address,
4444
storage_key: Bytes32
4545
) -> ([Field; STORAGE_BLOCK_LEN], RecursiveProof) {}
4646

4747
unconstrained fn get_account_with_storage_recursive_unconstrained(
4848
chain_id: Field,
49-
block_number: u64,
49+
block_number: u32,
5050
address: Address,
5151
storage_key: Bytes32
5252
) -> (StorageWithinBlock<1>, RecursiveProof) {

ethereum/circuits/lib/src/account_with_storage_recursive_int_test.nr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ use crate::fixtures::mainnet::paris::usdc_circle::{header::{number, hash}, accou
44
use crate::chain::ETHEREUM_MAINNET_ID;
55
use crate::misc::types::{Bytes32, Address};
66
use dep::std::test::OracleMock;
7-
use dep::std::unsafe::zeroed;
7+
use dep::std::mem::zeroed;
88

99
#[test]
1010
fn success() {
1111
let result = StorageWithinBlock { block_hash: hash, account, values };
1212
// This is not a correct proof but it passes because nargo does not verify it. Nargo thinks that it's bb's job, but doesn't call bb.
13-
let recursive_proof: RecursiveProof = zeroed();
13+
let recursive_proof: RecursiveProof = std::mem::zeroed();
1414

1515
let _ = OracleMock::mock("get_storage_recursive").returns((result.serialize(), recursive_proof));
1616

ethereum/circuits/lib/src/fixtures/mainnet/cancun/access_list/header.nr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ global receipts_root = [
1414
0x1d, 0x5d, 0x85, 0x65, 0xc9, 0x60, 0x65, 0x2c, 0xa7, 0x2f, 0x0d, 0xdc, 0x3e, 0xe8, 0xad, 0xe0, 0xe7, 0x29, 0x93, 0x3f, 0xe9, 0x25, 0xef, 0x1e, 0x1a, 0x35, 0xe2, 0x2a, 0x96, 0xaf, 0x06, 0xf4
1515
];
1616

17-
global encoded_length: u64 = 610;
17+
global encoded_length: u32 = 610;
1818
global encoded_data: [u8; 708] = [
1919
0xf9, 0x02, 0x5f, 0xa0, 0x7d, 0x47, 0xfc, 0x4b, 0x87, 0xa1, 0xb5, 0x2e, 0x5c, 0x1b, 0xfb, 0x76, 0xfd, 0x50, 0x61, 0x8e, 0x8d, 0x34, 0xef, 0x50, 0x1f, 0xd1, 0x1b, 0x8c, 0x3c, 0xb7, 0x4e, 0x77, 0x20, 0xa2, 0xc7, 0x17, 0xa0, 0x1d, 0xcc, 0x4d, 0xe8, 0xde, 0xc7, 0x5d, 0x7a, 0xab, 0x85, 0xb5, 0x67, 0xb6, 0xcc, 0xd4, 0x1a, 0xd3, 0x12, 0x45, 0x1b, 0x94, 0x8a, 0x74, 0x13, 0xf0, 0xa1, 0x42, 0xfd, 0x40, 0xd4, 0x93, 0x47, 0x94, 0x48, 0x38, 0xb1, 0x06, 0xfc, 0xe9, 0x64, 0x7b, 0xdf, 0x1e, 0x78, 0x77, 0xbf, 0x73, 0xce, 0x8b, 0x0b, 0xad, 0x5f, 0x97, 0xa0, 0x77, 0x41, 0xce, 0xeb, 0x95, 0x47, 0x3f, 0xde, 0x38, 0x29, 0xd3, 0xbf, 0xb9, 0x29, 0xb0, 0xf3, 0xc4, 0xbd, 0x8d, 0xe0, 0xb2, 0xab, 0x8b, 0x64, 0xec, 0x9a, 0xf0, 0xd8, 0xba, 0xc6, 0x34, 0xf5, 0xa0, 0xa2, 0xd9, 0xe7, 0x60, 0x9f, 0x2c, 0x79, 0xfe, 0x83, 0x5f, 0xdc, 0x8b, 0x1b, 0x43, 0x5a, 0xaf, 0x26, 0x59, 0xcd, 0x4e, 0x23, 0x76, 0xff, 0x09, 0x4e, 0x26, 0xab, 0x8c, 0xc1, 0x03, 0x41, 0xc9, 0xa0, 0x1d, 0x5d, 0x85, 0x65, 0xc9, 0x60, 0x65, 0x2c, 0xa7, 0x2f, 0x0d, 0xdc, 0x3e, 0xe8, 0xad, 0xe0, 0xe7, 0x29, 0x93, 0x3f, 0xe9, 0x25, 0xef, 0x1e, 0x1a, 0x35, 0xe2, 0x2a, 0x96, 0xaf, 0x06, 0xf4, 0xb9, 0x01, 0x00, 0xbc, 0x63, 0xd7, 0x4f, 0xc5, 0x5b, 0xe1, 0xb9, 0xb0, 0x29, 0x66, 0xb7, 0xe5, 0x19, 0x79, 0x25, 0xf2, 0x89, 0x1b, 0xc1, 0x9a, 0x2d, 0x70, 0x7b, 0xf6, 0xcd, 0xff, 0x6b, 0xf4, 0xbb, 0x1f, 0x33, 0x54, 0x26, 0xbf, 0xdb, 0x96, 0xbb, 0x33, 0x29, 0xe8, 0xbc, 0xdf, 0x3b, 0x74, 0x5f, 0xf9, 0x70, 0x36, 0x61, 0xbf, 0xda, 0x9f, 0xe7, 0xba, 0xb5, 0x3d, 0x7f, 0xbe, 0x78, 0x81, 0xb8, 0x2d, 0x47, 0x6d, 0x16, 0xd9, 0x69, 0xd4, 0x72, 0xeb, 0xff, 0xcd, 0x3e, 0xe6, 0x0b, 0x1c, 0xee, 0x97, 0xfd, 0xf0, 0xa2, 0x2c, 0xaf, 0x0f, 0x4f, 0x38, 0x57, 0xf6, 0x32, 0xbd, 0xd9, 0xd7, 0xf7, 0x9d, 0x94, 0x1c, 0xe8, 0x8e, 0x90, 0x1e, 0xe2, 0x23, 0x8e, 0xdb, 0x5c, 0xdd, 0xe4, 0x23, 0x4a, 0xbd, 0xb5, 0x26, 0x18, 0x94, 0x07, 0xc1, 0x9e, 0xa7, 0xbf, 0xae, 0x34, 0x35, 0xdf, 0x23, 0x6f, 0x59, 0x17, 0x3a, 0xa4, 0xd6, 0xde, 0xb5, 0xeb, 0xeb, 0xe5, 0xa3, 0x57, 0xf6, 0x59, 0x89, 0x3a, 0x37, 0x3e, 0x14, 0x79, 0x8e, 0xe7, 0xaf, 0x04, 0x42, 0x5a, 0x7d, 0xe1, 0x34, 0xd7, 0x79, 0x11, 0x39, 0xab, 0xbb, 0xcf, 0xf4, 0x32, 0xb0, 0xeb, 0x6e, 0xd6, 0x74, 0x07, 0x50, 0xcf, 0xd8, 0x79, 0x1c, 0x9e, 0x74, 0xba, 0xaf, 0x67, 0x3e, 0x83, 0x89, 0x33, 0x6c, 0xb3, 0x85, 0x47, 0x6f, 0x7c, 0x3f, 0x76, 0xb7, 0x18, 0x3e, 0x7e, 0x2c, 0x4e, 0x48, 0x72, 0xcf, 0x6d, 0x47, 0xb6, 0x43, 0x5f, 0x55, 0xaf, 0xa5, 0xeb, 0xe3, 0x8e, 0xc0, 0x6b, 0xbb, 0x95, 0x32, 0x1f, 0x6c, 0x4f, 0xc9, 0x54, 0xee, 0x2f, 0xfe, 0x7b, 0xfe, 0x16, 0x43, 0xc0, 0x88, 0xe6, 0x45, 0x8f, 0x17, 0x9e, 0x93, 0xe4, 0x82, 0xda, 0xf6, 0xad, 0x37, 0xf8, 0x8f, 0x3b, 0xfb, 0xf3, 0x86, 0x7b, 0xc5, 0xb1, 0xe1, 0x74, 0xf7, 0xd5, 0x80, 0x84, 0x01, 0x28, 0x9f, 0x06, 0x84, 0x01, 0xc9, 0xc3, 0x80, 0x84, 0x01, 0xc9, 0x91, 0x02, 0x84, 0x65, 0xf4, 0x10, 0xaf, 0x98, 0x54, 0x69, 0x74, 0x61, 0x6e, 0x20, 0x28, 0x74, 0x69, 0x74, 0x61, 0x6e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x2e, 0x78, 0x79, 0x7a, 0x29, 0xa0, 0xdb, 0xd3, 0x13, 0xbe, 0xd2, 0x1f, 0x64, 0x13, 0x26, 0x90, 0x4c, 0x41, 0xeb, 0xdd, 0x24, 0x05, 0x15, 0x07, 0x5c, 0xa1, 0xd3, 0xf9, 0x7a, 0xac, 0x96, 0x5f, 0x08, 0x7a, 0x15, 0x3a, 0x7b, 0x06, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x0f, 0xe0, 0x99, 0x72, 0x68, 0xa0, 0xdd, 0x07, 0x4c, 0xce, 0x1a, 0x2b, 0xaf, 0xda, 0x2f, 0x35, 0xe6, 0x4d, 0xb1, 0xce, 0x06, 0x69, 0x6d, 0x3c, 0x82, 0x2a, 0x6a, 0xdd, 0x90, 0x6a, 0x32, 0x90, 0x6d, 0xa2, 0xaf, 0x19, 0xef, 0xb5, 0x80, 0x80, 0xa0, 0x91, 0x30, 0xc7, 0xf2, 0xbf, 0xc1, 0x53, 0x62, 0x5e, 0x7a, 0x18, 0xe4, 0x81, 0x29, 0x6a, 0x75, 0xbc, 0x38, 0x94, 0x8c, 0xa9, 0xe7, 0x2d, 0x46, 0x5f, 0xa4, 0xa3, 0x44, 0x60, 0x50, 0x8a, 0xd5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
2020
];

ethereum/circuits/lib/src/fixtures/mainnet/cancun/approve/header.nr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ global receipts_root = [
1414
0x73, 0x15, 0x40, 0xc5, 0xb0, 0xaf, 0xee, 0xf5, 0x02, 0x7d, 0x5a, 0xd8, 0xe1, 0x78, 0x5d, 0x39, 0xa8, 0x10, 0xc8, 0xc2, 0x95, 0xdf, 0xc5, 0xcf, 0x94, 0x73, 0xfa, 0x93, 0x29, 0xd8, 0x38, 0x77
1515
];
1616

17-
global encoded_length: u64 = 588;
17+
global encoded_length: u32 = 588;
1818
global encoded_data: [u8; 708] = [
1919
0xf9, 0x02, 0x49, 0xa0, 0xa2, 0x13, 0x5c, 0xe7, 0x4d, 0x35, 0x98, 0x2a, 0x86, 0x8e, 0xe2, 0x73, 0x09, 0xb0, 0x92, 0x9f, 0xc0, 0x3a, 0xd1, 0xe6, 0x98, 0xc2, 0x17, 0x9e, 0xe3, 0x0f, 0x46, 0x79, 0x6d, 0x83, 0x50, 0x0e, 0xa0, 0x1d, 0xcc, 0x4d, 0xe8, 0xde, 0xc7, 0x5d, 0x7a, 0xab, 0x85, 0xb5, 0x67, 0xb6, 0xcc, 0xd4, 0x1a, 0xd3, 0x12, 0x45, 0x1b, 0x94, 0x8a, 0x74, 0x13, 0xf0, 0xa1, 0x42, 0xfd, 0x40, 0xd4, 0x93, 0x47, 0x94, 0x35, 0x8b, 0x97, 0x63, 0xe4, 0x0f, 0x0e, 0x69, 0x8d, 0xc9, 0x90, 0x13, 0x07, 0x98, 0x08, 0x93, 0x0f, 0x57, 0xcd, 0xe9, 0xa0, 0xc3, 0xb5, 0x5f, 0x59, 0x59, 0x0e, 0x4c, 0x8b, 0xd6, 0xac, 0x32, 0x58, 0xb5, 0xbb, 0x4a, 0x5c, 0x38, 0x56, 0x4f, 0xf4, 0xe0, 0xa9, 0x05, 0xf0, 0xb0, 0xbe, 0xf4, 0x1f, 0xca, 0xb4, 0x7d, 0x03, 0xa0, 0xcc, 0x20, 0x55, 0x86, 0x3d, 0x77, 0x5e, 0xa5, 0xa4, 0x6f, 0x2d, 0x24, 0xed, 0x2e, 0x46, 0x44, 0xb8, 0x66, 0x2e, 0xfc, 0xd0, 0xf7, 0x91, 0x9d, 0xdb, 0xd6, 0x8f, 0x8a, 0x0d, 0xa8, 0x8d, 0x21, 0xa0, 0x73, 0x15, 0x40, 0xc5, 0xb0, 0xaf, 0xee, 0xf5, 0x02, 0x7d, 0x5a, 0xd8, 0xe1, 0x78, 0x5d, 0x39, 0xa8, 0x10, 0xc8, 0xc2, 0x95, 0xdf, 0xc5, 0xcf, 0x94, 0x73, 0xfa, 0x93, 0x29, 0xd8, 0x38, 0x77, 0xb9, 0x01, 0x00, 0x20, 0x72, 0x2c, 0x00, 0x80, 0x8a, 0x81, 0xc8, 0x98, 0x06, 0x20, 0x87, 0x8d, 0x24, 0x90, 0x15, 0x04, 0x01, 0xc8, 0x11, 0x0e, 0x88, 0x90, 0xb1, 0x10, 0x88, 0x94, 0x33, 0x29, 0x1b, 0x24, 0xd2, 0x92, 0x14, 0x31, 0x06, 0x02, 0x28, 0x43, 0x28, 0x62, 0xb5, 0x93, 0x80, 0xda, 0x10, 0xa1, 0x03, 0x02, 0x08, 0xc0, 0x01, 0xa9, 0x0a, 0x28, 0x15, 0x94, 0x40, 0x41, 0xa8, 0x80, 0x33, 0x26, 0x20, 0x94, 0x00, 0x5c, 0x4c, 0x3c, 0x20, 0x0b, 0x4a, 0x4a, 0x43, 0x44, 0x5d, 0x8c, 0xa0, 0x18, 0xa4, 0x41, 0x8b, 0x61, 0x11, 0x63, 0x58, 0xcc, 0x4c, 0xa0, 0x0d, 0x05, 0x21, 0x82, 0x32, 0x50, 0x0b, 0xf6, 0x06, 0xd1, 0x00, 0x62, 0xd3, 0x42, 0xb1, 0x80, 0x42, 0x48, 0xa5, 0x26, 0x00, 0xed, 0xa1, 0x42, 0x10, 0x08, 0x75, 0x20, 0x34, 0x4e, 0x00, 0x02, 0x02, 0x07, 0x94, 0x94, 0x3a, 0x10, 0x40, 0x6b, 0x16, 0x09, 0x80, 0x08, 0x42, 0x13, 0x00, 0xb2, 0x08, 0x29, 0x22, 0x2e, 0x12, 0x0a, 0x11, 0xd4, 0x41, 0x1c, 0x87, 0x87, 0xd0, 0x04, 0x6c, 0x84, 0x2a, 0x21, 0x68, 0xca, 0x32, 0x08, 0xe2, 0x42, 0x29, 0x12, 0x00, 0x38, 0x91, 0x2e, 0x4e, 0xa1, 0xa4, 0x82, 0xd4, 0x30, 0x02, 0x44, 0x20, 0x02, 0x88, 0x86, 0x2a, 0x82, 0x01, 0xc0, 0x42, 0xcc, 0x8d, 0x10, 0x46, 0x10, 0x60, 0x21, 0x80, 0xc4, 0x10, 0x00, 0xa3, 0x54, 0xb0, 0x88, 0x89, 0xcb, 0xc0, 0x16, 0xf2, 0x61, 0x01, 0x44, 0x0c, 0x00, 0xe0, 0xc0, 0x38, 0x86, 0xa9, 0x8d, 0x91, 0x20, 0x20, 0xd2, 0x02, 0x05, 0x18, 0x26, 0x0a, 0x4a, 0x30, 0xa0, 0x39, 0x8b, 0x45, 0x04, 0x54, 0x40, 0x04, 0x21, 0x81, 0x00, 0x52, 0x30, 0x12, 0x0c, 0x70, 0x30, 0x80, 0xda, 0x70, 0x3e, 0x52, 0x60, 0x19, 0xe9, 0x44, 0x00, 0x96, 0x50, 0x13, 0x80, 0x84, 0x01, 0x2c, 0x19, 0xb1, 0x84, 0x01, 0xc9, 0xc3, 0x80, 0x83, 0x93, 0xa3, 0x00, 0x84, 0x66, 0x1e, 0x4f, 0x4f, 0x80, 0xa0, 0xa4, 0x20, 0xac, 0x6b, 0xac, 0x73, 0xaf, 0x0a, 0x64, 0xc5, 0xff, 0x53, 0x7e, 0x5d, 0x52, 0xd7, 0x06, 0xba, 0xce, 0xbd, 0xbd, 0x81, 0xc5, 0xd8, 0x5e, 0x23, 0x39, 0x76, 0xdc, 0x4b, 0xf1, 0x65, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x02, 0xfb, 0xcc, 0x98, 0xfb, 0xa0, 0x1c, 0x57, 0x13, 0x47, 0x78, 0xe2, 0xcb, 0xc1, 0xf0, 0x84, 0x97, 0x9f, 0xf9, 0xbe, 0x1d, 0xec, 0x42, 0x0b, 0x13, 0xa5, 0x23, 0x4f, 0xd2, 0x76, 0x3f, 0x67, 0xf6, 0x7e, 0xa4, 0xc0, 0xb1, 0xf5, 0x83, 0x02, 0x00, 0x00, 0x80, 0xa0, 0x52, 0x77, 0x1e, 0xc8, 0x02, 0x8c, 0x90, 0xf1, 0xef, 0x11, 0x20, 0xf8, 0x10, 0xdb, 0xd8, 0x41, 0xe6, 0xee, 0x4d, 0x80, 0xdf, 0xfc, 0xd6, 0xdc, 0xfc, 0x90, 0x27, 0xfa, 0xd3, 0xa1, 0x8a, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
2020
];

ethereum/circuits/lib/src/fixtures/mainnet/cancun/approve/transaction.nr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ global transaction = TxPartial {
3232
]
3333
};
3434

35-
global foreign_call_transaction = ForeignCallTransaction::<1000>::from(transaction);
35+
global foreign_call_transaction: ForeignCallTransaction<1000> = ForeignCallTransaction::from(transaction);

0 commit comments

Comments
 (0)