Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

chore!: ACVM 0.24 #2504

Merged
merged 23 commits into from
Sep 4, 2023
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ edition = "2021"
rust-version = "1.66"

[workspace.dependencies]
acvm = "0.23.0"
acvm = "0.24.0"
arena = { path = "crates/arena" }
fm = { path = "crates/fm" }
iter-extended = { path = "crates/iter-extended" }
Expand Down
2 changes: 1 addition & 1 deletion crates/acvm_backend_barretenberg/src/1_mul.bytecode
Original file line number Diff line number Diff line change
@@ -1 +1 @@
H4sIAAAAAAAA/+2Z326CMBTGP2SIyCTLsmw3u+ARWv5ouZuPMjN8/0fYyFo5MHbFV6KJJyG1jf16/vT8NPoG4B2/Fvw8KzvmYr4azUM7D+0Dsb+zDzuqeabdeeDqKkzYTG3tUftyhszFgx0jsZbY0dWss7WoTSj2HsW+QIyB0DiKPVPvCf7RScSa258JX8DLiVqDfu9UJjTZDl8udVeEHH1TRXYO+GuksW6p9lXVHopWl/pTFc3J1KqqT3ujja5N/VWYsmxNZQ7NqTmoRldlq891U56t8BP8NGXI8bOwfuoHYswRsS7M/PmGcYQhbFh+Y8Jmai8OYwe2WKzdYczRXATGneM5ehjH8Adj10hsGD/jNmC8JsYcE+vCzJ9vGMcYwoblNyZspvbiMN7YUYLvDmOO5iIw7gqYo4dxAn8wdo3EhvELbgPGG2LMCbEuzPz5hnGCYWOz/MaEzdReHMZbO6Zi7Q5jjuYiMO4KmKOHcQp/MHaNxIbxK24DxltizCmxLleev0vMITHmlOjXI7gfZn+aHvxeZPos/d2J1+437NXEnfAATI3ROeM8egWqryLtPOhm4F1+X3Fn/BoN4HTNOZXfdtwfcmP7BvHx78jZGwAA
H4sIAAAAAAAA/+2W3W6CQBCFB7AqVak/VdM0TXmAXuzyo3BXH6Wm+P6P0G5cZCS2N5whkrCJmWUjh505zPKFRPRB5+H8/lwbQ3bt1q49e82HY+OnjbHaJUmxjwod6y8V5ccsVUl63GU602mWfkdZHBdZku3zY75XuU7iQp/SPD6p8xg014qslvbY/v7bs2o29ACnpfh+H9h8YKPL1jwbhwI5Ue059ToGN9agD5cw6UFAd0i4l18q7yHeI8UkRWuqGg6PqkaR2Gt5OErWF6StBbUvz+C1GNk4Zmu+jeUHxowh86b0yry3B3afw6LDNA7snlv/cf7Q8dlaeX9AMr0icEAr0QO4fKmNgSFVBDCmigCkGglNFC8k05QeZp8XWhkBcx4DfZGqH9pnH+hFW+To47SuyPGRzXtybKjp24KidSd03+Ro8p7gPRIlxwlwn9LkaA7psXB9Qdqtk+PUxhlb68kRo9kKORoDQ6rIcUZy5Fg2EpooXkmmKdHkOAXmPAP6IlU/tM8BdY8cA5Ihxyc278mxoWZgC4rWndN9k6PJe473SJQc59QdcjSH9Ey4viDt1slxYeOSrfXkiNFshRyNgSFV5LgkOXIsGwlNFG8k05RoclwAc14CfZGqH9rnFXWPHFckQ47PbN6TY0PNlS0oWndN902OJu813iNRclxTd8jRHNJL4fqCtFsnx42NW7bWkyNGsxVyNAaGVJHjluTIsWwkNFG8k0xToslxA8x5C/RFqn4u2GcPmDOwfoofTi5df4zq4we8wQQCRCoAAA==
2 changes: 1 addition & 1 deletion crates/acvm_backend_barretenberg/src/bb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use const_format::formatcp;

const USERNAME: &str = "AztecProtocol";
const REPO: &str = "barretenberg";
const VERSION: &str = "0.4.6";
const VERSION: &str = "0.5.0";
const TAG: &str = formatcp!("barretenberg-v{}", VERSION);

const API_URL: &str =
Expand Down
2 changes: 1 addition & 1 deletion crates/acvm_backend_barretenberg/src/cli/gates.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,5 @@ fn gate_command() {
let gate_command = GatesCommand { crs_path, bytecode_path };

let output = gate_command.run(&backend.binary_path()).unwrap();
assert_eq!(output, 2775);
assert_eq!(output, 2788);
}
1 change: 1 addition & 0 deletions crates/acvm_backend_barretenberg/src/smart_contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ mod tests {
private_parameters: BTreeSet::from([Witness(1), Witness(2)]),
public_parameters: PublicInputs::default(),
return_values: PublicInputs::default(),
assert_messages: Default::default(),
};

let contract = get_bb().eth_contract(&circuit).unwrap();
Expand Down
Binary file modified crates/acvm_backend_barretenberg/src/witness.tr
Binary file not shown.
4 changes: 4 additions & 0 deletions crates/nargo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ edition.workspace = true
rustc_version = "0.4.0"

[dependencies]

# Backends
acvm-backend-barretenberg = { path = "../acvm_backend_barretenberg" }
TomAFrench marked this conversation as resolved.
Show resolved Hide resolved

acvm.workspace = true
fm.workspace = true
noirc_abi.workspace = true
Expand Down
13 changes: 4 additions & 9 deletions crates/nargo/src/ops/codegen_verifier.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
use acvm::{acir::circuit::Circuit, SmartContract};
use acvm::acir::circuit::Circuit;
use acvm_backend_barretenberg::{Backend, BackendError};

pub fn codegen_verifier<B: SmartContract>(
backend: &B,
circuit: &Circuit,
) -> Result<String, B::Error> {
// Nargo no longer handles logic related to proving/verifying with keys or the CRS.
let common_reference_string = Vec::new();
let verification_key = Vec::new();
backend.eth_contract_from_vk(&common_reference_string, circuit, &verification_key)
pub fn codegen_verifier(backend: &Backend, circuit: &Circuit) -> Result<String, BackendError> {
backend.eth_contract(circuit)
}
13 changes: 5 additions & 8 deletions crates/nargo/src/ops/prove.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
use acvm::acir::{circuit::Circuit, native_types::WitnessMap};
use acvm::ProofSystemCompiler;
use acvm_backend_barretenberg::{Backend, BackendError};

pub fn prove_execution<B: ProofSystemCompiler>(
backend: &B,
pub fn prove_execution(
backend: &Backend,
circuit: &Circuit,
solved_witness: WitnessMap,
) -> Result<Vec<u8>, B::Error> {
) -> Result<Vec<u8>, BackendError> {
// TODO(#1569): update from not just accepting `false` once we get nargo to interop with dynamic backend
// Nargo no longer handles logic related to proving/verifying with keys or the CRS.
let common_reference_string = Vec::new();
let proving_key = Vec::new();
backend.prove_with_pk(&common_reference_string, circuit, solved_witness, &proving_key, false)
backend.prove(circuit, solved_witness, false)
}
20 changes: 5 additions & 15 deletions crates/nargo/src/ops/verify.rs
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
use acvm::acir::{circuit::Circuit, native_types::WitnessMap};
use acvm::ProofSystemCompiler;
use acvm_backend_barretenberg::{Backend, BackendError};

pub fn verify_proof<B: ProofSystemCompiler>(
backend: &B,
pub fn verify_proof(
backend: &Backend,
circuit: &Circuit,
proof: &[u8],
public_inputs: WitnessMap,
) -> Result<bool, B::Error> {
) -> Result<bool, BackendError> {
// TODO(#1569): update from not just accepting `false` once we get nargo to interop with dynamic backend
// Nargo no longer handles logic related to proving/verifying with keys or the CRS.
let common_reference_string = Vec::new();
let verification_key = Vec::new();
backend.verify_with_vk(
&common_reference_string,
proof,
public_inputs,
circuit,
&verification_key,
false,
)
backend.verify(proof, public_inputs, circuit, false)
}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
H4sIAAAAAAAA/62PwQ2AMAwDU1goaZI2+bEKFen+IyCkIlC/4I/9OtsrACR4dOdtOH4TpcGcuYxFJGoOYtoxezNF0VaMjNT0yMYcJla9eUUn4aCuzn2Al/82Ypq+v/PVcwJ2MvbyJAEAAA==
H4sIAAAAAAAA/62PMQ6AMAwDU/hQ0iRtsvEVKtL/P4GliKoreLHl4WTvAJDg1ZOP4fhNlAZz5TIWkag5iOnE7M0URVsxMlLTKxtzmFj15hWdhIO6OvcB3v7biGn5Pudt6m48Ct7BLAEAAA==
Original file line number Diff line number Diff line change
@@ -1 +1 @@
H4sIAAAAAAAA/+2W3W6CQBCFB7AqVak/VdM0TXmAXuwKKNzVR6kpvv8jtBt3ZTS2N5whkrCJmWUjh505zPLFRPRBp+H9/nwbY3btX10H9poPz8ZPGxO1TdNytyl1or/UpjjkmUqzwzbXuc7y7HuTJ0mZp/muOBQ7Veg0KfUxK5KjOo1efa2N1dIB299/e1b1hu7htBTf7wOb92z02VpgY18gJ7p6znUdoxtr0IdLmPQgoNsn3MsvlXcf75FikqI1VTVHQFWjSOzVHY6S9QVpa0Ht8zN4LQY2DtlaaKP7wJjRZ944r8x7u2f3eSx6TGPP7rn1H+8PnZCtufsjkukVgQNaiR7A7qU2BsZUEcCQKgKQaiQ0UbyQTFMGmH2eaWUAzHkI9EWqfmifQ6AXTZFjiNO6IMdHNu/IsaZmaAuK1h3RfZOjyXuE90iUHEfAfUqTozmkh8L1BWk3To5jGydsrSNHjGYj5GgMjKkixwnJkaNrJDRRvJJMU6LJcQzMeQL0Rap+aJ8jah85RiRDjk9s3pFjTc3IFhStO6X7JkeT9xTvkSg5Tqk95GgO6YlwfUHajZPjzMY5W+vIEaPZCDkaA2OqyHFOcuToGglNFG8k05RocpwBc54DfZGqH9rnBbWPHBckQ47PbN6RY03NhS0oWndJ902OJu8l3iNRclxSe8jRHNJz4fqCtBsnx5WNa7bWkSNGsxFyNAbGVJHjmuTI0TUSmijeSaYp0eS4Aua8BvoiVT8f7HMAzBlYP8UPJ58uP0Zu/AARy5GuPCoAAA==
H4sIAAAAAAAA/+2W3W6CQBCFB7AqVak/VdM0TXmAXuzyo3BXH6Wm+P6P0G5cZCS2N5whkrCJmWUjh505zPKFRPRB5+H8/lwbQ3bt1q49e82HY+OnjbHaJUmxjwod6y8V5ccsVUl63GU602mWfkdZHBdZku3zY75XuU7iQp/SPD6p8xg014qslvbY/v7bs2o29ACnpfh+H9h8YKPL1jwbhwI5Ue059ToGN9agD5cw6UFAd0i4l18q7yHeI8UkRWuqGg6PqkaR2Gt5OErWF6StBbUvz+C1GNk4Zmu+jeUHxowh86b0yry3B3afw6LDNA7snlv/cf7Q8dlaeX9AMr0icEAr0QO4fKmNgSFVBDCmigCkGglNFC8k05QeZp8XWhkBcx4DfZGqH9pnH+hFW+To47SuyPGRzXtybKjp24KidSd03+Ro8p7gPRIlxwlwn9LkaA7psXB9Qdqtk+PUxhlb68kRo9kKORoDQ6rIcUZy5Fg2EpooXkmmKdHkOAXmPAP6IlU/tM8BdY8cA5Ihxyc278mxoWZgC4rWndN9k6PJe473SJQc59QdcjSH9Ey4viDt1slxYeOSrfXkiNFshRyNgSFV5LgkOXIsGwlNFG8k05RoclwAc14CfZGqH9rnFXWPHFckQ47PbN6TY0PNlS0oWndN902OJu813iNRclxTd8jRHNJL4fqCtFsnx42NW7bWkyNGsxVyNAaGVJHjluTIsWwkNFG8k0xToslxA8x5C/RFqn4u2GcPmDOwfoofTi5df4zq4we8wQQCRCoAAA==
Original file line number Diff line number Diff line change
@@ -1 +1 @@
H4sIAAAAAAAA/+1a0W6jMBBcoE2TXkJzaXJJdTodzRfYARp4u37KRU3//xNaqyZsXWhVeRYRiZUigxXG61ljZhBbItL0FsHrL7Rtws5D5zyy5zxC2/6zbaoesuy43x11qv+rXXkocpXlh4dCFzov8qddkabHIiv25aHcq1Jn6VE/52X6rN4iBGJdMCzlGZHlwY3Amb/yC43Mmed7yY4vnNqRra2JkcCcyBnH5TFu6IMOLlGkSwHcEeEWv9S8R/gaKQYpyqnyjIjqG0Uy5+BMuA2F8iSBPKu4su2Y9U1sWz30TIwYZ1XNzfq/b+AzYMeh/U/0yX+CFpwJ66uuj0nmnhPY6JXoRl6pEFPAhGpVMqaPqiQCj41UJWMg1gSIVfE5YXy6CwSh7q4EcH+TzEaEXkeB0DpSfqGl+OuzO7gmrDDowh0gc+b5/mDHgzvwxLy2hKJxp9Rvd2DmPcXXSFTBTgm7CQzuoM7zHN3BzLYx6xvcAQazE3dgCphQ7Q5iOi93EAOxboBYFZ83JOsOZgK4f0hmI+qzO4iBeUnxh3YHEXDOM+rmIes757k/1s5i6a5czByH9c7F/GTHg4vxxJxbQtG4C+q3izHzXuBrJKq0F8A8XReDztVgh8L8grC1IPZpDM7FrW2XrO877uORXdfmPh7pa/fRhDO4j/Y4uQ9TwIRq97GkdrWs/EJXX2SgFcVfkrkpI0yeJ7VyC5zzElgXKf7QdV4Ba9GVclzhsN4px1/seFCOnpgrSygad039Vo5m3mt8jUSV4xqYZ9v77xCcM/I1CWDjl1SJnSvQjW3vWN93FOiWXdemQLf0tQJtwhkUaHucFOiGkWnOTSETZ8w+v7dcArHuSWYTRivZDXDOd8C6Avhr3MDQDwTkF1VA/hTf5EJqfji+AJMcTW+ILwAA
H4sIAAAAAAAA/+1a0W6jMBBcoE2TXkJzaXJJdTodzRfYARp4u37KRU3//xNaqyZsXWhVeRYRiZUigxXG61ljZhBbItL0FsHrL7Rtws5D5zyy5zxC2/6zbaoesuy43x11qv+rXXkocpXlh4dCFzov8qddkabHIiv25aHcq1Jn6VE/52X6rN4iBGJdMCzlGZHlwY3Amb/yC43Mmed7yY4vnNqRra2JkcCcyBnH5TFu6IMOLlGkSwHcEeEWv9S8R/gaKQYpyqnyjIjqG0Uy5+BMuA2F8iSBPKu4su2Y9U1sWz30TIwYZ1XNzfq/b+AzYMeh/U/0yX+CFpwJ66uuj0nmnhPY6JXoRl6pEFPAhGpVMqaPqiQCj41UJWMg1gSIVfE5YXy6CwSh7q4EcH+TzEaEXkeB0DpSfqGl+OuzO7gmrDDowh0gc+b5/mDHgzvwxLy2hKJxp9Rvd2DmPcXXSFTBTgm7CQzuoM7zHN3BzLYx6xvcAQazE3dgCphQ7Q5iOi93EAOxboBYFZ83JOsOZgK4f0hmI+qzO4iBeUnxh3YHEXDOM+rmIes757k/1s5i6a5czByH9c7F/GTHg4vxxJxbQtG4C+q3izHzXuBrJKq0F8A8XReDztVgh8L8grC1IPZpDM7FrW2XrO877uORXdfmPh7pa/fRhDO4j/Y4uQ9TwIRq97GkdrWs/EJXX2SgFcVfkrkpI0yeJ7VyC5zzElgXKf7QdV4Ba9GVclzhsN4px1/seFCOnpgrSygad039Vo5m3mt8jUSV4xqYZ9v77xCcM/I1CWDjl1SJnSvQjW3vWN93FOiWXdemQLf0tQJtwhkUaHucFOiGkWnOTSETZ8w+v7dcArHuSWYTRivZDXDOd8C6Avhr3MDQDwTkF1VA/hTf5EJqfjhW8QLvY/fMkC8AAA==
Original file line number Diff line number Diff line change
@@ -1 +1 @@
H4sIAAAAAAAA/+1Z226DMAw10Btry0q1vbN+QcKlDW/rp6wa/f9P2KKG1mS00xQbwYSlyiSCE19i5yh9BYA3uIj3/fONTtDYt8aBGWPxjH43OhP7PK8OaSUz+SHS8qQKkRenvZJKFqr4TFWWVSpXh/JUHkQp86yS56LMzuIiE3es1GDJANn3yGbhJnJChyWwvVP0PDHaR3OB0TMGn8Bax45j1DJHujhHkqYMuDOg2/xcfs/ocyQQJGtMhaMEcCsULD6xzR4hls+UJ6I9IBmxr2vgRjc3eoHmQpTH+t16n+tc1DnX+3+HvvOQ9hDGDn3T9o53BydEc/X3EfDUHEOjF6yNvGYOcxRMPdaJTKw1A4a1qbBwQbo2+RfgKW47fq7saU7o84IwF1zx82nid/U5IPSZMH4PD25Xn0PC/dcVew/psBrs/Qk9j+zdETM0AaXGXUK/2bv2e0mfI1b2viS08x57J7ZZETbrf8G4V0av0dxfGPcRfubKZtxH+J1xt+GMjPu+XBm3TmACN8a9BnbG3Sgi19N/BXSNeQ0wCPYUwfDYUwQ87OkZPY/syREzMgGlxt1Av9mT9ntDnyNW9rSB7tlTDxpszXDKFnMHx55io7dobryvpMHshD3F0Lyv1IlMrDWJ7ttai8j19I8J7doCT3FTN6EYaBsnQPOfb1u+ACHKv69CHwAA
H4sIAAAAAAAA/+1Z226DMAw10Btry0q1vbN+QcKlDW/rp6wa/f9P2KKG1mTQaYpdwYSlyiSCE19i5yh9BYA3uIj3/fONTtDYt8aBGWPxjH43OhP7PK8OaSUz+SHS8qQKkRenvZJKFqr4TFWWVSpXh/JUHkQp86yS56LMzuIiE3es1GDJANl3z2bhJnJChyWwvVP0PDHaR3OB0TMGn8Bax45j1DJHujhHkqYMuDOg2/xcfs/ocyQQJGtMhaMEcCsULD6xzR4hls+UJ6I9IBmxr2vgRjc3eoHmQpTH+t16n+tc1DnX+3+HvvOQ9hDGDn3T9o7XgROiufr7CHhqjqHRC9ZGXjOHOQqmHutEJtaaAcPaVFi4IF2b/AvwFLcdP1f2NCf0eUGYC674+TTxu/ocEPpMGL+7B7erzyHh/nsUew/psBrs/Qk9j+zdETM0AaXGXUK/2bv2e0mfI1b2viS0s4u9E9usCJv1v2DcK6PXaO4vjPsIP3NlM+4j/M6423BGxt0tV8atE5jAjXGvgZ1xN4rI9fRfAV1jXgMMgj1FMDz2FAEPe3pGzyN7csSMTECpcTfQb/ak/d7Q54iVPW3g8eypBw22Zjhli7mDY0+x0Vs0N95X0mA+hD3F0Lyv1IlMrDWJ7ttai8j19I8J7doCT3FTN6EYaBsnQPOf7y75AoPUeCFKHwAA
Original file line number Diff line number Diff line change
@@ -1 +1 @@
H4sIAAAAAAAA/81WXW7DIAw2kCbtJuUMVU9gQmjgbVdZtPT+R9iiQmch2hdsqZYiYws+/+LwCQAj3En9fTrxM5F1IZskU1KJfyXu8DrP2zJt1tlvnOIaPM5+vQYbrA/+ZwrObWEOS1zjgtHObrM3H90N79S1Y00Jyxri3yufsY1sx4eF1N8DWXeJa6IzifcCMUFhp8zjWNGxGpco0kEAtwe+5peKu+evERJI0ZxiIxn4vyiUNLPPirEPdLtfNi8qob8z9sMGHXRD4keiO5E65r25z/da5Jrv/X8h5xThimBcyJnaHvUE50R0+fwIMndOYNCj6CDPL4eBJHOX90KeC5tGwHbG4ryQrVgfIDOEy/y1vp4GxpiPjHVlyF91gGme/D1iNowxM+YP6ZDTUP85/gKjbA3kHgwAAA==
H4sIAAAAAAAA/81WXW7DIAw2kCbtJuUMVU9gQmjgbVdZtPT+R9iiQmch2hdsqZYiYws+/+LwCQAj3En9fTrxM5F1IZskU1KJfyXu8DrP2zJt1tlvnOIaPM5+vQYbrA/+ZwrObWEOS1zjgtHObrM3H90N79S1Y00Jyxri3yufsY1sx4eF1N8DWXeJa6IzifcCMUFhp8zjWNGxGpco0kEAtwe+5peKu+evERJI0ZxiIxn4vyiUNLPPirEPdLtfNi8qob8z9sMGHXRD4keiO5E65r25z/da5Jrv/X8h5xThimBcyJnaHvUE50R0+fwIMndOYNCj6CDPL4eBJHOX90KeC5tGwHbG4ryQrVgfIDOEy/y1vp4GxpiPjHVlyF91gGme/D1iNowxM+YP6ZDTUP85ZvoFVms8bCYMAAA=
Original file line number Diff line number Diff line change
@@ -1 +1 @@
H4sIAAAAAAAA/+2W226CQBCGf0A8HzDtbRN9g10OutzVR6kpvv8jtNQFB0SNYaaRhEnMyGb5d3aGnf3eAWxwNuf351q/Ic8umQMyN7dP6yO1i+NsH2Y60l8qTI8mUXFy3BltdGKS79BEUWZis0+P6V6lOo4yfUrS6KTO5rXXCq2W9kh892JW7Ux7fFqKxjto+O+SMc/6ocCeUFunnsdlwxjr4hJFGgjo+uD7+KX27fPXSBFJ0ZyqlubhclAkYnVQPQgS+WXS1oLa5Rq0QQ2tH5GxifXFhULnOaRW+Vk9kPcc4h2icSDvNM1xbuhMyFjx/pLEAr6cKIEGrUQbcHHj54FvcCGAEaqUwL2mA36ieIPMofR44ixpZci45xFjXaTy5zJ/P+5r5u/uRdk2zjGDVnb6s/S/aHnMp1WhZdrQe1puqTm2CeXWneK1aTnf95S/RqK0PGWMs07LUjG7QrllrpsR1K6Q8sz6ORl7hpS3uK5VnZS3eEzKTTo9Kd+2kpTzAn7gQspzXB8kj3ltDuIpbv8Z+BrzHN2gpwW6R08LyNDTkvzv6aml5qIWNJfuCq9NT/m+V/w1EqWnFbpHT4wNdtcQbufoKbB+TcaeoSe/oVZ1evLxmJ6adHp6um0lPQUkmfnzGvL0RA9R29s/AF9jXkPmcHPTU8AXp3JJjC6u7QfU8OpDnh4AAA==
H4sIAAAAAAAA/+2W226DMAyGf6DnI9V2O6l9g4RDG+7WR1k1+v6PsLEGaii0qrCnImGpconCH8cmzvcOYIuLOb8/1/oteXbJHJC5mX1aH6p9FKWHINWh/lJBcjKxiuLT3mijYxN/ByYMUxOZQ3JKDirRUZjqc5yEZ3Uxr71WYLW0R+K7F7NqZ9rj01I03kHNf5eMedaPBPaEyjrVPK5qxlgXlyjSQEB3CL6PX2rfQ/4aKSIpmlPV0jxcD4pErA7KB0Eiv0zaWlC7WIM2qJH1YzI2tT6/UOg8h9QqO6tH8p5DvEM0juSdujlOg86UjOXvr0gs4MuJEmjQSrQB5zd+FvgWVwIYo0wJ3Gs64CeKN8gcSo8nzoJWRox7HjPWRSp/LvP3475m/u5elG3jnDBopec/S/6Llid8WiVapg29p+WWmhObUG7dGV6blrN9z/hrJErLM8Y4q7QsFbMrlFvmuhlB7RIpz61fkLFnSHmH21pVSXmHx6Rcp9OTcrMVpJwV8ANXUl7g9iB5zGtzEE9++8/B15gX6AY9LdE9elpChp5W5H9PTy01l5WguXTXeG16yva95q+RKD2t0T16Ymyw+5pwO0dPvvUbMvYMPQ1ralWlpyEe01OdTk9PzVbQk0+SmT1vIE9P9BC1vf198DXmDWQONzc9+XxxKpfE6KLZfgArh4crph4AAA==
Original file line number Diff line number Diff line change
@@ -1 +1 @@
H4sIAAAAAAAA/9Wa2U4CMRSGRxAdREREREQERNyXdham44prfA2J+P6P4DEe4vhfeOMx5jT5MvkglH5t7+DJ87xn73PMEDl++hnPgefBZ8EL7AWetwDz5/kzhcxrczDHPLgPXgRfAC+BL4KXwZfAK+DL4FXwFfAa+Cp4HXwNvAG+Dt4E3wBvgW+Ct8G3wDvgXfAe+DZ4H3wHfOB93ZEZnv9jfNyD6dkX+VxLfH5lPqcKn0eV973G+1vnfWzwfjV5X1rc3+bODn9fj9fd5/UNeC157/ud9b2vOzi9+7OZ9fuZ9e8Se8Q+cUAcEkfEMXFCnBJnhCEsERAhERExMSQSwhEpcU5cEJfEFXFN3BAj4pa4I+6JB+LR+z5y/BzxMzTDKJokwcSG9sUE6djFJorHQ2edjV38GrgwnLjIJek4TUxqo3Bi3+I0fDOfYy4zl/ndsLtyc5m/bJ4XbN5T0uwLNu8raS4KNh8oaV4QbD5U0lwSbD5S0rwo2HyspLks2HyipHlJsPlUSXNFsPlMSfOyYLNR0lwVbLZKmlcEmwMlzTXB5lBJ86pgc6SkuS7YHCtpXhNsHippbgg2J0qa1wWbnZLmpmBzqqR5Q7D5XElzS7D5QknzpmDzpZLmtmDzlZLmLcHmayXNHcHmGyXNXcHmkZLmnmDzrZLmbcHmOyXNfcHmeyXNO4LND0qaB4LNj4LNP/3Xo8vv/fdv/NPxDmmBfEL8IgAA
H4sIAAAAAAAA/9Wa2U4CMRSGRxAdREREREQERNyXdham44prfA2J+P6P4DEe4/BfeOMx5jT5MvkglH5t7+DJ87xn73PMEDl++hnPgefBZ8EL7AWetwDz5/kzhcxrczDHPLgPXgRfAC+BL4KXwZfAK+DL4FXwFfAa+Cp4HXwNvAG+Dt4E3wBvgW+Ct8G3wDvgXfAe+DZ4H3wHfOB935EZnv9jfNyDr7Mv8rmW+PzKfE4VPo8q73uN97fO+9jg/WryvrS4v82dHf6+Hq+7z+sb8Fry3vSd9b3vO/h192cz6/cz698l9oh94oA4JI6IY+KEOCXOCENYIiBCIiJiYkgkhCNS4py4IC6JK+KauCFGxC1xR9wTD8SjNz1y/BzxMzTDKJokwcSG9sUE6djFJorHQ2edjV38GrgwnLjIJek4TUxqo3Bi3+I0fDOfYy4zl/ndsLtyc5m/bJ4XbN5T0uwLNu8raS4KNh8oaV4QbD5U0lwSbD5S0rwo2HyspLks2HyipHlJsPlUSXNFsPlMSfOyYLNR0lwVbLZKmlcEmwMlzTXB5lBJ86pgc6SkuS7YHCtpXhNsHippbgg2J0qa1wWbnZLmpmBzqqR5Q7D5XElzS7D5QknzpmDzpZLmtmDzlZLmLcHmayXNHcHmGyXNXcHmkZLmnmDzrZLmbcHmOyXNfcHmeyXNO4LND0qaB4LNj4LNP/3Xo8vv/fdv/DjeASxDNNoEIwAA
Loading