From 56b7d92689f7341c55a5d0ece91c7b53c33a6fb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 10:13:57 +0000 Subject: [PATCH 01/15] Bump serde from 1.0.201 to 1.0.202 Bumps [serde](https://github.com/serde-rs/serde) from 1.0.201 to 1.0.202. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.201...v1.0.202) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- compiler/compiler/Cargo.toml | 2 +- compiler/span/Cargo.toml | 2 +- errors/Cargo.toml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 37f56b8b9f..cd3d77669d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3318,18 +3318,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.201" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.201" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote 1.0.36", diff --git a/compiler/compiler/Cargo.toml b/compiler/compiler/Cargo.toml index 8d6d9df266..654770fbbc 100644 --- a/compiler/compiler/Cargo.toml +++ b/compiler/compiler/Cargo.toml @@ -75,7 +75,7 @@ workspace = true version = "1.10.4" [dev-dependencies.serde] -version = "1.0.201" +version = "1.0.202" features = [ "derive" ] [dev-dependencies.serde_yaml] diff --git a/compiler/span/Cargo.toml b/compiler/span/Cargo.toml index 68db7f7573..f4d6768403 100644 --- a/compiler/span/Cargo.toml +++ b/compiler/span/Cargo.toml @@ -29,5 +29,5 @@ version = "0.2.1" version = "1.0.1" [dependencies.serde] -version = "1.0.201" +version = "1.0.202" features = [ "derive", "rc" ] diff --git a/errors/Cargo.toml b/errors/Cargo.toml index e5b0e77906..9242093e45 100644 --- a/errors/Cargo.toml +++ b/errors/Cargo.toml @@ -41,7 +41,7 @@ version = "2.2.0" version = "0.12.4" [dependencies.serde] -version = "1.0.201" +version = "1.0.202" features = [ "derive", "rc" ] [dependencies.thiserror] From ee4bc2f8563cacadc99549cfbb48ac2bdeb650e3 Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu <23022326+d0cd@users.noreply.github.com> Date: Wed, 15 May 2024 08:22:10 -0700 Subject: [PATCH 02/15] Update default PK in examples .env --- examples/auction/.env | 3 +-- examples/basic_bank/.env | 3 +-- examples/battleship/.env | 5 ++--- examples/bubblesort/.env | 2 +- examples/core/.env | 2 +- examples/fibonacci/.env | 2 +- examples/groups/.env | 2 +- examples/hackers-delight/ntzdebruijn/.env | 2 +- examples/hackers-delight/ntzgaudet/.env | 2 +- examples/hackers-delight/ntzloops/.env | 2 +- examples/hackers-delight/ntzmasks/.env | 2 +- examples/hackers-delight/ntzreisers/.env | 2 +- examples/hackers-delight/ntzseals/.env | 2 +- examples/hackers-delight/ntzsearchtree/.env | 2 +- examples/hackers-delight/ntzsmallvals/.env | 3 +-- examples/helloworld/.env | 2 +- examples/interest/.env | 2 +- examples/lottery/.env | 2 +- examples/message/.env | 2 +- examples/simple_token/.env | 2 +- examples/tictactoe/.env | 2 +- examples/token/.env | 3 +-- examples/twoadicity/.env | 2 +- examples/vote/.env | 2 +- 24 files changed, 25 insertions(+), 30 deletions(-) diff --git a/examples/auction/.env b/examples/auction/.env index 8cee101fe7..53bdb2227c 100644 --- a/examples/auction/.env +++ b/examples/auction/.env @@ -1,4 +1,3 @@ - NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkp5wvamYgK3WCAdpBQxZqQX8XnuN2u11Y6QprZTriVwZVc +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/basic_bank/.env b/examples/basic_bank/.env index 1f6131a28f..53bdb2227c 100644 --- a/examples/basic_bank/.env +++ b/examples/basic_bank/.env @@ -1,4 +1,3 @@ - NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpHtqVWT6fSHgUMNxsuVf7eaR6id2cj7TieKY1Z8CP5rCD +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/battleship/.env b/examples/battleship/.env index 25045f5992..b9fc9bf48e 100644 --- a/examples/battleship/.env +++ b/examples/battleship/.env @@ -1,4 +1,3 @@ - - NETWORK=mainnet - PRIVATE_KEY=APrivateKey1zkp86FNGdKxjgAdgQZ967bqBanjuHkAaoRe19RK24ZCGsHH +NETWORK=mainnet +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/bubblesort/.env b/examples/bubblesort/.env index 71372dab5b..c7836c7232 100644 --- a/examples/bubblesort/.env +++ b/examples/bubblesort/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/core/.env b/examples/core/.env index 71372dab5b..c7836c7232 100644 --- a/examples/core/.env +++ b/examples/core/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/fibonacci/.env b/examples/fibonacci/.env index 71372dab5b..c7836c7232 100644 --- a/examples/fibonacci/.env +++ b/examples/fibonacci/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/groups/.env b/examples/groups/.env index 71372dab5b..c7836c7232 100644 --- a/examples/groups/.env +++ b/examples/groups/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/hackers-delight/ntzdebruijn/.env b/examples/hackers-delight/ntzdebruijn/.env index 71372dab5b..c7836c7232 100644 --- a/examples/hackers-delight/ntzdebruijn/.env +++ b/examples/hackers-delight/ntzdebruijn/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/hackers-delight/ntzgaudet/.env b/examples/hackers-delight/ntzgaudet/.env index 71372dab5b..c7836c7232 100644 --- a/examples/hackers-delight/ntzgaudet/.env +++ b/examples/hackers-delight/ntzgaudet/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/hackers-delight/ntzloops/.env b/examples/hackers-delight/ntzloops/.env index 71372dab5b..c7836c7232 100644 --- a/examples/hackers-delight/ntzloops/.env +++ b/examples/hackers-delight/ntzloops/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/hackers-delight/ntzmasks/.env b/examples/hackers-delight/ntzmasks/.env index 71372dab5b..c7836c7232 100644 --- a/examples/hackers-delight/ntzmasks/.env +++ b/examples/hackers-delight/ntzmasks/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/hackers-delight/ntzreisers/.env b/examples/hackers-delight/ntzreisers/.env index 71372dab5b..c7836c7232 100644 --- a/examples/hackers-delight/ntzreisers/.env +++ b/examples/hackers-delight/ntzreisers/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/hackers-delight/ntzseals/.env b/examples/hackers-delight/ntzseals/.env index 71372dab5b..c7836c7232 100644 --- a/examples/hackers-delight/ntzseals/.env +++ b/examples/hackers-delight/ntzseals/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/hackers-delight/ntzsearchtree/.env b/examples/hackers-delight/ntzsearchtree/.env index 71372dab5b..c7836c7232 100644 --- a/examples/hackers-delight/ntzsearchtree/.env +++ b/examples/hackers-delight/ntzsearchtree/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/hackers-delight/ntzsmallvals/.env b/examples/hackers-delight/ntzsmallvals/.env index e01e56c78a..c7836c7232 100644 --- a/examples/hackers-delight/ntzsmallvals/.env +++ b/examples/hackers-delight/ntzsmallvals/.env @@ -1,3 +1,2 @@ - NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/helloworld/.env b/examples/helloworld/.env index 71372dab5b..c7836c7232 100644 --- a/examples/helloworld/.env +++ b/examples/helloworld/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/interest/.env b/examples/interest/.env index 71372dab5b..c7836c7232 100644 --- a/examples/interest/.env +++ b/examples/interest/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/lottery/.env b/examples/lottery/.env index 71372dab5b..c7836c7232 100644 --- a/examples/lottery/.env +++ b/examples/lottery/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/message/.env b/examples/message/.env index 71372dab5b..c7836c7232 100644 --- a/examples/message/.env +++ b/examples/message/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/simple_token/.env b/examples/simple_token/.env index 71372dab5b..c7836c7232 100644 --- a/examples/simple_token/.env +++ b/examples/simple_token/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/tictactoe/.env b/examples/tictactoe/.env index 71372dab5b..c7836c7232 100644 --- a/examples/tictactoe/.env +++ b/examples/tictactoe/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/token/.env b/examples/token/.env index 5c2ddd82b1..53bdb2227c 100644 --- a/examples/token/.env +++ b/examples/token/.env @@ -1,4 +1,3 @@ - NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkp1w8PTxrRgGfAtfKUSq43iQyVbdQHfhGbiNPEg2LVSEXR +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/twoadicity/.env b/examples/twoadicity/.env index 71372dab5b..c7836c7232 100644 --- a/examples/twoadicity/.env +++ b/examples/twoadicity/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/vote/.env b/examples/vote/.env index 71372dab5b..c7836c7232 100644 --- a/examples/vote/.env +++ b/examples/vote/.env @@ -1,2 +1,2 @@ NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpBvXdKZKaXXcLUnwAVFCQNp41jrX6JqTuJo1JShfPoRfx +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH From 61a98cb8f8678323c5b8c0f3ba5a30b53287adb0 Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu <23022326+d0cd@users.noreply.github.com> Date: Wed, 15 May 2024 20:52:30 -0700 Subject: [PATCH 03/15] WIP update examples --- .circleci/lottery/build/main.aleo | 2 ++ .circleci/lottery/run.sh | 0 .circleci/token/run.sh | 25 +++++++++++++------------ 3 files changed, 15 insertions(+), 12 deletions(-) mode change 100644 => 100755 .circleci/lottery/run.sh diff --git a/.circleci/lottery/build/main.aleo b/.circleci/lottery/build/main.aleo index dc0ee909fd..859e6208e0 100644 --- a/.circleci/lottery/build/main.aleo +++ b/.circleci/lottery/build/main.aleo @@ -8,6 +8,7 @@ mapping num_winners: key as u8.public; value as u8.public; + function play: cast self.caller into r0 as Ticket.record; async play into r1; @@ -24,3 +25,4 @@ finalize play: assert.eq r3 true; add r2 1u8 into r4; set r4 into num_winners[0u8]; + diff --git a/.circleci/lottery/run.sh b/.circleci/lottery/run.sh old mode 100644 new mode 100755 diff --git a/.circleci/token/run.sh b/.circleci/token/run.sh index 9d244bb68a..e52735ed54 100644 --- a/.circleci/token/run.sh +++ b/.circleci/token/run.sh @@ -7,19 +7,20 @@ then fi # The private key and address of Alice. -# Swap these into program.json, when running transactions as the first bidder. -# "private_key": "APrivateKey1zkp1w8PTxrRgGfAtfKUSq43iQyVbdQHfhGbiNPEg2LVSEXR", -# "address": "aleo13ssze66adjjkt795z9u5wpq8h6kn0y2657726h4h3e3wfnez4vqsm3008q" +# Swap these into .env, when running transactions as the first bidder. +# NETWORK=mainnet +# PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH # The private key and address of Bob. # Swap these into program.json, when running transactions as the second bidder. -# "private_key": "APrivateKey1zkpFo72g7N9iFt3JzzeG8CqsS5doAiXyFvNCgk2oHvjRCzF" -# "address": "aleo17vy26rpdhqx4598y5gp7nvaa9rk7tnvl6ufhvvf4calsrrqdaqyshdsf5z" +# NETWORK=mainnet +# PRIVATE_KEY=APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh + # Swap in the private key of Alice. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkp1w8PTxrRgGfAtfKUSq43iQyVbdQHfhGbiNPEg2LVSEXR +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH " > .env # Publicly mint 100 tokens for Alice. @@ -53,7 +54,7 @@ leo run mint_public aleo13ssze66adjjkt795z9u5wpq8h6kn0y2657726h4h3e3wfnez4vqsm30 # Swap in the private key of Bob. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpFo72g7N9iFt3JzzeG8CqsS5doAiXyFvNCgk2oHvjRCzF +PRIVATE_KEY=APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh " > .env # Privately mint 100 tokens for Bob. @@ -87,7 +88,7 @@ leo run mint_private aleo17vy26rpdhqx4598y5gp7nvaa9rk7tnvl6ufhvvf4calsrrqdaqyshd # Swap in the private key of Alice. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkp1w8PTxrRgGfAtfKUSq43iQyVbdQHfhGbiNPEg2LVSEXR +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH " > .env # Publicly transfer 10 tokens from Alice to Bob. @@ -121,7 +122,7 @@ leo run transfer_public aleo17vy26rpdhqx4598y5gp7nvaa9rk7tnvl6ufhvvf4calsrrqdaqy # Swap in the private key of Bob. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpFo72g7N9iFt3JzzeG8CqsS5doAiXyFvNCgk2oHvjRCzF +PRIVATE_KEY=APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh " > .env # Privately transfer 20 tokens from Bob to Alice. @@ -159,7 +160,7 @@ leo run transfer_private "{ # Swap in the private key of Alice. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkp1w8PTxrRgGfAtfKUSq43iQyVbdQHfhGbiNPEg2LVSEXR +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH " > .env # Convert 30 public tokens from Alice into 30 private tokens for Bob. @@ -194,7 +195,7 @@ leo run transfer_public_to_private aleo17vy26rpdhqx4598y5gp7nvaa9rk7tnvl6ufhvvf4 # Swap in the private key of Bob. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpFo72g7N9iFt3JzzeG8CqsS5doAiXyFvNCgk2oHvjRCzF +PRIVATE_KEY=APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh " > .env # Convert 40 private tokens from Bob into 40 public tokens for Alice. @@ -235,5 +236,5 @@ leo run transfer_private_to_public "{ # This is done to ensure that program.json is the same after every execution of ./run.sh. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkp1w8PTxrRgGfAtfKUSq43iQyVbdQHfhGbiNPEg2LVSEXR +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH " > .env From 6f39bc9ad8aa61d127c526e3e9669957d84d64f8 Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu <23022326+d0cd@users.noreply.github.com> Date: Wed, 15 May 2024 20:59:10 -0700 Subject: [PATCH 04/15] WIP --- examples/auction/run.sh | 37 +++--- examples/basic_bank/run.sh | 45 +++---- examples/battleship/README.md | 90 ++++++------- examples/battleship/run.sh | 230 +++++++++++++++++----------------- examples/token/run.sh | 38 +++--- examples/vote/run.sh | 6 +- 6 files changed, 223 insertions(+), 223 deletions(-) diff --git a/examples/auction/run.sh b/examples/auction/run.sh index 864d0d6e06..60128c4ebb 100755 --- a/examples/auction/run.sh +++ b/examples/auction/run.sh @@ -8,18 +8,19 @@ fi # The private key and address of the first bidder. # Swap these into program.json, when running transactions as the first bidder. -# "private_key": "APrivateKey1zkpG9Af9z5Ha4ejVyMCqVFXRKknSm8L1ELEwcc4htk9YhVK" -# "address": aleo1yzlta2q5h8t0fqe0v6dyh9mtv4aggd53fgzr068jvplqhvqsnvzq7pj2ke +# NETWORK=mainnet +# PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH # The private key and address of the second bidder. # Swap these into program.json, when running transactions as the second bidder. -# "private_key": "APrivateKey1zkpAFshdsj2EqQzXh5zHceDapFWVCwR6wMCJFfkLYRKupug" -# "address": aleo1esqchvevwn7n5p84e735w4dtwt2hdtu4dpguwgwy94tsxm2p7qpqmlrta4 +# NETWORK=mainnet +# PRIVATE_KEY=APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh + # The private key and address of the auctioneer. # Swap these into program.json, when running transactions as the auctioneer. -# "private_key": "APrivateKey1zkp5wvamYgK3WCAdpBQxZqQX8XnuN2u11Y6QprZTriVwZVc", -# "address": "aleo1fxs9s0w97lmkwlcmgn0z3nuxufdee5yck9wqrs0umevp7qs0sg9q5xxxzh" +# NETWORK=mainnet +# PRIVATE_KEY=APrivateKey1zkp2GUmKbVsuc1NSj28pa1WTQuZaK5f1DQJAT6vPcHyWokG echo " @@ -38,7 +39,7 @@ echo " # Swap in the private key and address of the first bidder to .env. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpG9Af9z5Ha4ejVyMCqVFXRKknSm8L1ELEwcc4htk9YhVK +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH " > .env # Have the first bidder place a bid of 10. @@ -55,12 +56,12 @@ echo " ######## ######## ############################################################################### " -leo run place_bid aleo1yzlta2q5h8t0fqe0v6dyh9mtv4aggd53fgzr068jvplqhvqsnvzq7pj2ke 10u64 || exit +leo run place_bid aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px 10u64 || exit # Swap in the private key and address of the second bidder to .env. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpAFshdsj2EqQzXh5zHceDapFWVCwR6wMCJFfkLYRKupug +PRIVATE_KEY=APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh " > .env # Have the second bidder place a bid of 90. @@ -77,12 +78,12 @@ echo " ######## ######## ############################################################################### " -leo run place_bid aleo1esqchvevwn7n5p84e735w4dtwt2hdtu4dpguwgwy94tsxm2p7qpqmlrta4 90u64 || exit +leo run place_bid aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t 90u64 || exit # Swap in the private key and address of the auctioneer to .env. echo " -NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkp5wvamYgK3WCAdpBQxZqQX8XnuN2u11Y6QprZTriVwZVc +# NETWORK=mainnet +# PRIVATE_KEY=APrivateKey1zkp2GUmKbVsuc1NSj28pa1WTQuZaK5f1DQJAT6vPcHyWokG " > .env # Have the auctioneer select the winning bid. @@ -100,14 +101,14 @@ echo " ############################################################################### " leo run resolve "{ - owner: aleo1fxs9s0w97lmkwlcmgn0z3nuxufdee5yck9wqrs0umevp7qs0sg9q5xxxzh.private, - bidder: aleo1yzlta2q5h8t0fqe0v6dyh9mtv4aggd53fgzr068jvplqhvqsnvzq7pj2ke.private, + owner: aleo1ashyu96tjwe63u0gtnnv8z5lhapdu4l5pjsl2kha7fv7hvz2eqxs5dz0rg.private, + bidder: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, amount: 10u64.private, is_winner: false.private, _nonce: 4668394794828730542675887906815309351994017139223602571716627453741502624516group.public }" "{ - owner: aleo1fxs9s0w97lmkwlcmgn0z3nuxufdee5yck9wqrs0umevp7qs0sg9q5xxxzh.private, - bidder: aleo1esqchvevwn7n5p84e735w4dtwt2hdtu4dpguwgwy94tsxm2p7qpqmlrta4.private, + owner: aleo1ashyu96tjwe63u0gtnnv8z5lhapdu4l5pjsl2kha7fv7hvz2eqxs5dz0rg.private, + bidder: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, amount: 90u64.private, is_winner: false.private, _nonce: 5952811863753971450641238938606857357746712138665944763541786901326522216736group.public @@ -128,8 +129,8 @@ echo " ############################################################################### " leo run finish "{ - owner: aleo1fxs9s0w97lmkwlcmgn0z3nuxufdee5yck9wqrs0umevp7qs0sg9q5xxxzh.private, - bidder: aleo1esqchvevwn7n5p84e735w4dtwt2hdtu4dpguwgwy94tsxm2p7qpqmlrta4.private, + owner: aleo1ashyu96tjwe63u0gtnnv8z5lhapdu4l5pjsl2kha7fv7hvz2eqxs5dz0rg.private, + bidder: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, amount: 90u64.private, is_winner: false.private, _nonce: 5952811863753971450641238938606857357746712138665944763541786901326522216736group.public diff --git a/examples/basic_bank/run.sh b/examples/basic_bank/run.sh index 96ebf861a6..9ac451db87 100755 --- a/examples/basic_bank/run.sh +++ b/examples/basic_bank/run.sh @@ -7,26 +7,26 @@ then fi # The private key and address of the bank. -# Swap these into program.json, when running transactions as the first bidder. -# "private_key": "APrivateKey1zkpHtqVWT6fSHgUMNxsuVf7eaR6id2cj7TieKY1Z8CP5rCD", -# "address": "aleo1t0uer3jgtsgmx5tq6x6f9ecu8tr57rzzfnc2dgmcqldceal0ls9qf6st7a" +# Swap these into program.json, when running transactions as the bank. +# NETWORK=mainnet +# PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH # The private key and address of the user. -# Swap these into program.json, when running transactions as the second bidder. -# "private_key": "APrivateKey1zkp75cpr5NNQpVWc5mfsD9Uf2wg6XvHknf82iwB636q3rtc" -# "address": "aleo1zeklp6dd8e764spe74xez6f8w27dlua3w7hl4z2uln03re52egpsv46ngg" +# Swap these into program.json, when running transactions as the user. +# NETWORK=mainnet +# PRIVATE_KEY=APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh # Swap in the private key and address of the bank to .env. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpHtqVWT6fSHgUMNxsuVf7eaR6id2cj7TieKY1Z8CP5rCD +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH " > .env # Have the bank issue 100 tokens to the user. echo " ############################################################################### ######## ######## -######## STEP 1: Initialize 100 tokens for aleo1zeklp...v46ngg ######## +######## STEP 1: Initialize 100 tokens for aleo1s3ws5...em2u4t ######## ######## ######## ######## ----------------------------------------- ######## ######## | ACTION | AMOUNT | ######## @@ -40,14 +40,14 @@ echo " ######## ----------------------------------------- ######## ######## ######## ######## ----------------------------------------- ######## -######## | WALLET | aleo1zeklp...v46ngg | ######## +######## | WALLET | aleo1s3ws5...em2u4t | ######## ######## ----------------------------------------- ######## ######## ----------------------------------------- ######## ######## | Balance | 100 | ######## ######## ----------------------------------------- ######## ######## ######## ######## ----------------------------------------- ######## -######## | BANK | aleo1zeklp...v46ngg | ######## +######## | BANK | aleo1rhgdu...vzp9px | ######## ######## ----------------------------------------- ######## ######## ----------------------------------------- ######## ######## | Balance | 0 | ######## @@ -63,19 +63,20 @@ echo " ######## ######## ############################################################################### " -leo run issue aleo1zeklp6dd8e764spe74xez6f8w27dlua3w7hl4z2uln03re52egpsv46ngg 100u64 || exit +leo run issue aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t 100u64 || exit + # Swap in the private key and address of the user to .env. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkp75cpr5NNQpVWc5mfsD9Uf2wg6XvHknf82iwB636q3rtc +PRIVATE_KEY=APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh " > .env # Have the user deposit 50 tokens into the bank. echo " ############################################################################### ######## ######## -######## STEP 2: aleo1zeklp...v46ngg deposits 50 tokens ######## +######## STEP 2: aleo1s3ws5...em2u4t deposits 50 tokens ######## ######## ######## ######## ----------------------------------------- ######## ######## | ACTION | AMOUNT | ######## @@ -89,14 +90,14 @@ echo " ######## ----------------------------------------- ######## ######## ######## ######## ----------------------------------------- ######## -######## | WALLET | aleo1zeklp...v46ngg | ######## +######## | WALLET | aleo1s3ws5...em2u4t | ######## ######## ----------------------------------------- ######## ######## ----------------------------------------- ######## ######## | Balance | 50 | ######## ######## ----------------------------------------- ######## ######## ######## ######## ----------------------------------------- ######## -######## | BANK | aleo1zeklp...v46ngg | ######## +######## | BANK | aleo1rhgdu...vzp9px | ######## ######## ----------------------------------------- ######## ######## ----------------------------------------- ######## ######## | Balance | 50 | ######## @@ -113,7 +114,7 @@ echo " ############################################################################### " leo run deposit "{ - owner: aleo1zeklp6dd8e764spe74xez6f8w27dlua3w7hl4z2uln03re52egpsv46ngg.private, + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, amount: 100u64.private, _nonce: 4668394794828730542675887906815309351994017139223602571716627453741502624516group.public }" 50u64 || exit @@ -135,14 +136,14 @@ echo " ######## ----------------------------------------- ######## ######## ######## ######## ----------------------------------------- ######## -######## | WALLET | aleo1zeklp...v46ngg | ######## +######## | WALLET | aleo1s3ws5...em2u4t | ######## ######## ----------------------------------------- ######## ######## ----------------------------------------- ######## ######## | Balance | 50 | ######## ######## ----------------------------------------- ######## ######## ######## ######## ----------------------------------------- ######## -######## | BANK | aleo1zeklp...v46ngg | ######## +######## | BANK | aleo1rhgdu...vzp9px | ######## ######## ----------------------------------------- ######## ######## ----------------------------------------- ######## ######## | Balance | 266 | ######## @@ -162,14 +163,14 @@ echo " # Swap in the private key and address of the bank to .env. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpHtqVWT6fSHgUMNxsuVf7eaR6id2cj7TieKY1Z8CP5rCD +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH " > .env # Have the bank withdraw all of the user's tokens with compound interest over 15 periods at 12.34%. echo " ############################################################################### ######## ######## -######## STEP 4: Withdraw tokens of aleo1zeklp...v46ngg w/ interest ######## +######## STEP 4: Withdraw tokens of aleo1s3ws5...em2u4t w/ interest ######## ######## ######## ######## ----------------------------------------- ######## ######## | ACTION | AMOUNT | ######## @@ -183,14 +184,14 @@ echo " ######## ----------------------------------------- ######## ######## ######## ######## ----------------------------------------- ######## -######## | WALLET | aleo1zeklp...v46ngg | ######## +######## | WALLET | aleo1s3ws5...em2u4t | ######## ######## ----------------------------------------- ######## ######## ----------------------------------------- ######## ######## | Balance | 316 | ######## ######## ----------------------------------------- ######## ######## ######## ######## ----------------------------------------- ######## -######## | BANK | aleo1zeklp...v46ngg | ######## +######## | BANK | aleo1rhgdu...vzp9px | ######## ######## ----------------------------------------- ######## ######## ----------------------------------------- ######## ######## | Balance | 0 | ######## diff --git a/examples/battleship/README.md b/examples/battleship/README.md index e93fd9918e..ea62700de5 100644 --- a/examples/battleship/README.md +++ b/examples/battleship/README.md @@ -48,14 +48,14 @@ Players will be represented by their Aleo address. You can use the provided player accounts or [generate your own](https://aleohq.github.io/aleo/). ```markdown Player 1: - Private Key APrivateKey1zkpGKaJY47BXb6knSqmT3JZnBUEGBDFAWz2nMVSsjwYpJmm + Private Key APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH View Key AViewKey1fSyEPXxfPFVgjL6qcM9izWRGrhSHKXyN3c64BNsAjnA6 Address aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy Player 2: - Private Key APrivateKey1zkp86FNGdKxjgAdgQZ967bqBanjuHkAaoRe19RK24ZCGsHH + Private Key APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh View Key AViewKey1hh6dvSEgeMdfseP4hfdbNYjX4grETwCuTbKnCftkpMwE - Address aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry + Address aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px ``` Save the keys and addresses. Set the `program.json` private key and address to one of the newly created aleo accounts. We'll refer to this address as Player 1, and the other address as Player 2. @@ -66,7 +66,7 @@ Save the keys and addresses. Set the `program.json` private key and address to o "version": "0.0.0", "description": "Play ZK Battleship", "development": { - "private_key": "APrivateKey1zkpGKaJY47BXb6knSqmT3JZnBUEGBDFAWz2nMVSsjwYpJmm", + "private_key": "APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH", "view_key": "AViewKey1fSyEPXxfPFVgjL6qcM9izWRGrhSHKXyN3c64BNsAjnA6", "address": "aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy" }, @@ -82,7 +82,7 @@ Initialize a new board as Player 1 with valid ship inputs and Player 2's address **Run** ``` -leo run initialize_board 34084860461056u64 551911718912u64 7u64 1157425104234217472u64 aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry +leo run initialize_board 34084860461056u64 551911718912u64 7u64 1157425104234217472u64 aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px ``` **Output** ```bash @@ -94,7 +94,7 @@ leo run initialize_board 34084860461056u64 551911718912u64 7u64 1157425104234217 played_tiles: 0u64.private, ships: 1157459741006397447u64.private, player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, game_started: false.private, _nonce: 3887646704618532506963887075433683846689834495661101507703164090915348189037group.public } @@ -127,7 +127,7 @@ leo run offer_battleship '{ played_tiles: 0u64.private, ships: 1157459741006397447u64.private, player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, game_started: false.private, _nonce: 3887646704618532506963887075433683846689834495661101507703164090915348189037group.public }' @@ -143,15 +143,15 @@ leo run offer_battleship '{ played_tiles: 0u64.private, ships: 1157459741006397447u64.private, player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, game_started: true.private, _nonce: 6563064852163330630334088854834332804417910882908622526775624018226782316843group.public } • { - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, incoming_fire_coordinate: 0u64.private, player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, prev_hit_or_miss: 0u64.private, _nonce: 4374626042494973146987320062571809401151262172766172816829659487584978644457group.public } @@ -176,9 +176,9 @@ We must run the program as Player 2 now, so switch the `program.json` file to us "version": "0.0.0", "description": "Play ZK Battleship", "development": { - "private_key": "APrivateKey1zkp86FNGdKxjgAdgQZ967bqBanjuHkAaoRe19RK24ZCGsHH", + "private_key": "APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh", "view_key": "AViewKey1hh6dvSEgeMdfseP4hfdbNYjX4grETwCuTbKnCftkpMwE", - "address": "aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry" + "address": "aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px" }, "license": "MIT" } @@ -195,11 +195,11 @@ leo run initialize_board 31u64 2207646875648u64 224u64 9042383626829824u64 aleo1 ➡️ Output • { - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, hits_and_misses: 0u64.private, played_tiles: 0u64.private, ships: 9044591273705727u64.private, - player_1: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, game_started: false.private, _nonce: 1549419609469324182591325047490602235361156298832591378925133482196483208807group.public @@ -224,19 +224,19 @@ Now, we can accept Player 1's offer. Run `leo run start_battleship 'board_state. **Run** ```bash leo run start_battleship '{ - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, hits_and_misses: 0u64.private, played_tiles: 0u64.private, ships: 9044591273705727u64.private, - player_1: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, game_started: false.private, _nonce: 1549419609469324182591325047490602235361156298832591378925133482196483208807group.public }' '{ - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, incoming_fire_coordinate: 0u64.private, player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, prev_hit_or_miss: 0u64.private, _nonce: 4374626042494973146987320062571809401151262172766172816829659487584978644457group.public }' @@ -247,11 +247,11 @@ leo run start_battleship '{ ➡️ Outputs • { - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, hits_and_misses: 0u64.private, played_tiles: 0u64.private, ships: 9044591273705727u64.private, - player_1: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, game_started: true.private, _nonce: 6222383571142756260765569201308836492199048237638652378826141459336360362251group.public @@ -259,7 +259,7 @@ leo run start_battleship '{ • { owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, incoming_fire_coordinate: 0u64.private, - player_1: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, prev_hit_or_miss: 0u64.private, _nonce: 3742551407126138397717446975757978589064777004441277005584760115236217735495group.public @@ -284,13 +284,13 @@ leo run play '{ played_tiles: 0u64.private, ships: 1157459741006397447u64.private, player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, game_started: true.private, _nonce: 6563064852163330630334088854834332804417910882908622526775624018226782316843group.public }' '{ owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, incoming_fire_coordinate: 0u64.private, - player_1: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, prev_hit_or_miss: 0u64.private, _nonce: 3742551407126138397717446975757978589064777004441277005584760115236217735495group.public @@ -306,15 +306,15 @@ leo run play '{ played_tiles: 1u64.private, ships: 1157459741006397447u64.private, player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, game_started: true.private, _nonce: 1474170213684980843727833284550698461565286563122422722760769547002894080093group.public } • { - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, incoming_fire_coordinate: 1u64.private, player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, prev_hit_or_miss: 0u64.private, _nonce: 5481529266389297320813092061136936339861329677911328036818179854958874588416group.public } @@ -334,19 +334,19 @@ and they will also let Player 1 know whether their fire coordinate hit or miss P **Run** ```bash leo run play '{ - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, hits_and_misses: 0u64.private, played_tiles: 0u64.private, ships: 9044591273705727u64.private, - player_1: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, game_started: true.private, _nonce: 6222383571142756260765569201308836492199048237638652378826141459336360362251group.public }' '{ - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, incoming_fire_coordinate: 1u64.private, player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, prev_hit_or_miss: 0u64.private, _nonce: 5481529266389297320813092061136936339861329677911328036818179854958874588416group.public }' 2048u64 @@ -358,11 +358,11 @@ leo run play '{ ➡️ Outputs • { - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, hits_and_misses: 0u64.private, played_tiles: 2048u64.private, ships: 9044591273705727u64.private, - player_1: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, game_started: true.private, _nonce: 5254963165391133332409074172682159033621708071536429341861038147524454777097group.public @@ -370,7 +370,7 @@ leo run play '{ • { owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, incoming_fire_coordinate: 2048u64.private, - player_1: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, prev_hit_or_miss: 1u64.private, _nonce: 5851606198769770675504009323414373017067582072428989801313256693053765675198group.public @@ -405,13 +405,13 @@ leo run play '{ played_tiles: 1u64.private, ships: 1157459741006397447u64.private, player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, game_started: true.private, _nonce: 1474170213684980843727833284550698461565286563122422722760769547002894080093group.public }' '{ owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, incoming_fire_coordinate: 2048u64.private, - player_1: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, prev_hit_or_miss: 1u64.private, _nonce: 5851606198769770675504009323414373017067582072428989801313256693053765675198group.public @@ -428,15 +428,15 @@ leo run play '{ played_tiles: 3u64.private, ships: 1157459741006397447u64.private, player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, game_started: true.private, _nonce: 853278652528988609827041334083853520436225751739504321439524466875699631772group.public } • { - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, incoming_fire_coordinate: 2u64.private, player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, prev_hit_or_miss: 0u64.private, _nonce: 710336412388939616658264778971886770861024495941253598683184288448156545822group.public } @@ -465,19 +465,19 @@ The `board_state` record `hits_and_misses` component has also been updated with **Run** ```bash leo run play '{ - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, hits_and_misses: 0u64.private, played_tiles: 2048u64.private, ships: 9044591273705727u64.private, - player_1: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, game_started: true.private, _nonce: 5254963165391133332409074172682159033621708071536429341861038147524454777097group.public }' '{ - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, incoming_fire_coordinate: 2u64.private, player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, prev_hit_or_miss: 0u64.private, _nonce: 710336412388939616658264778971886770861024495941253598683184288448156545822group.public }' 4u64 @@ -488,11 +488,11 @@ leo run play '{ ➡️ Outputs • { - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, hits_and_misses: 0u64.private, played_tiles: 2052u64.private, ships: 9044591273705727u64.private, - player_1: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, game_started: true.private, _nonce: 1145182747531998766752104305052328886102707397061849372000385383229513301534group.public @@ -500,7 +500,7 @@ leo run play '{ • { owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, incoming_fire_coordinate: 4u64.private, - player_1: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, prev_hit_or_miss: 2u64.private, _nonce: 5958326936461495382488152485080596366937963499216527548334225566230682598418group.public diff --git a/examples/battleship/run.sh b/examples/battleship/run.sh index 43d903a5f9..ad896e819d 100755 --- a/examples/battleship/run.sh +++ b/examples/battleship/run.sh @@ -18,7 +18,7 @@ echo " echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpGKaJY47BXb6knSqmT3JZnBUEGBDFAWz2nMVSsjwYpJmm +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH " > .env echo "✅ Successfully initialized Player 1." @@ -31,7 +31,7 @@ echo " ######## ######## ############################################################################### " -leo run initialize_board 34084860461056u64 551911718912u64 7u64 1157425104234217472u64 aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry || exit +leo run initialize_board 34084860461056u64 551911718912u64 7u64 1157425104234217472u64 aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px || exit echo " ✅ Successfully initialized Player 1's board." @@ -45,12 +45,12 @@ echo " ############################################################################### " leo run offer_battleship '{ - owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, hits_and_misses: 0u64.private, played_tiles: 0u64.private, ships: 1157459741006397447u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, game_started: false.private, _nonce: 3887646704618532506963887075433683846689834495661101507703164090915348189037group.public }' || exit @@ -65,14 +65,14 @@ echo " ######## ######## ############################################################################### " -( - echo " - NETWORK=mainnet - PRIVATE_KEY=APrivateKey1zkp86FNGdKxjgAdgQZ967bqBanjuHkAaoRe19RK24ZCGsHH - " > .env - leo run initialize_board 31u64 2207646875648u64 224u64 9042383626829824u64 aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy || exit -) +echo " +NETWORK=mainnet +PRIVATE_KEY=APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh +" > .env + +leo run initialize_board 31u64 2207646875648u64 224u64 9042383626829824u64 aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t || exit + echo " ✅ Successfully initialized Player 2's board." @@ -86,19 +86,19 @@ echo " " leo run start_battleship '{ - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, hits_and_misses: 0u64.private, played_tiles: 0u64.private, ships: 9044591273705727u64.private, - player_1: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, - player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, game_started: false.private, _nonce: 1549419609469324182591325047490602235361156298832591378925133482196483208807group.public }' '{ - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, incoming_fire_coordinate: 0u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, prev_hit_or_miss: 0u64.private, _nonce: 4374626042494973146987320062571809401151262172766172816829659487584978644457group.public }' || exit @@ -113,30 +113,30 @@ echo " ######## ######## ############################################################################### " -( - echo " - NETWORK=mainnet - PRIVATE_KEY=APrivateKey1zkpGKaJY47BXb6knSqmT3JZnBUEGBDFAWz2nMVSsjwYpJmm - " > .env - - leo run play '{ - owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - hits_and_misses: 0u64.private, - played_tiles: 0u64.private, - ships: 1157459741006397447u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, - game_started: true.private, - _nonce: 6563064852163330630334088854834332804417910882908622526775624018226782316843group.public - }' '{ - owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - incoming_fire_coordinate: 0u64.private, - player_1: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, - player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - prev_hit_or_miss: 0u64.private, - _nonce: 3742551407126138397717446975757978589064777004441277005584760115236217735495group.public - }' 1u64 || exit -) + +echo " +NETWORK=mainnet +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH +" > .env + +leo run play '{ + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + hits_and_misses: 0u64.private, + played_tiles: 0u64.private, + ships: 1157459741006397447u64.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + game_started: true.private, + _nonce: 6563064852163330630334088854834332804417910882908622526775624018226782316843group.public +}' '{ + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + incoming_fire_coordinate: 0u64.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + prev_hit_or_miss: 0u64.private, + _nonce: 3742551407126138397717446975757978589064777004441277005584760115236217735495group.public +}' 1u64 || exit + echo " ✅ Successfully executed Player 1's turn." @@ -148,31 +148,30 @@ echo " ######## ######## ############################################################################### " -( - - echo " - NETWORK=mainnet - PRIVATE_KEY=APrivateKey1zkp86FNGdKxjgAdgQZ967bqBanjuHkAaoRe19RK24ZCGsHH - " > .env - - leo run play '{ - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, - hits_and_misses: 0u64.private, - played_tiles: 0u64.private, - ships: 9044591273705727u64.private, - player_1: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, - player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - game_started: true.private, - _nonce: 6222383571142756260765569201308836492199048237638652378826141459336360362251group.public - }' '{ - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, - incoming_fire_coordinate: 1u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, - prev_hit_or_miss: 0u64.private, - _nonce: 5481529266389297320813092061136936339861329677911328036818179854958874588416group.public - }' 2048u64 || exit -) + +echo " +NETWORK=mainnet +PRIVATE_KEY=APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh +" > .env + +leo run play '{ + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + hits_and_misses: 0u64.private, + played_tiles: 0u64.private, + ships: 9044591273705727u64.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + game_started: true.private, + _nonce: 6222383571142756260765569201308836492199048237638652378826141459336360362251group.public +}' '{ + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + incoming_fire_coordinate: 1u64.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + prev_hit_or_miss: 0u64.private, + _nonce: 5481529266389297320813092061136936339861329677911328036818179854958874588416group.public +}' 2048u64 || exit + echo " ✅ Successfully executed Player 2's turn." @@ -184,30 +183,30 @@ echo " ######## ######## ############################################################################### " -( - echo " - NETWORK=mainnet - PRIVATE_KEY=APrivateKey1zkpGKaJY47BXb6knSqmT3JZnBUEGBDFAWz2nMVSsjwYpJmm - " > .env - - leo run play '{ - owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - hits_and_misses: 0u64.private, - played_tiles: 1u64.private, - ships: 1157459741006397447u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, - game_started: true.private, - _nonce: 1474170213684980843727833284550698461565286563122422722760769547002894080093group.public - }' '{ - owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - incoming_fire_coordinate: 2048u64.private, - player_1: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, - player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - prev_hit_or_miss: 1u64.private, - _nonce: 5851606198769770675504009323414373017067582072428989801313256693053765675198group.public - }' 2u64 || exit -) + +echo " +NETWORK=mainnet +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH +" > .env + +leo run play '{ + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + hits_and_misses: 0u64.private, + played_tiles: 1u64.private, + ships: 1157459741006397447u64.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + game_started: true.private, + _nonce: 1474170213684980843727833284550698461565286563122422722760769547002894080093group.public +}' '{ + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + incoming_fire_coordinate: 2048u64.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + prev_hit_or_miss: 1u64.private, + _nonce: 5851606198769770675504009323414373017067582072428989801313256693053765675198group.public +}' 2u64 || exit + echo " ✅ Successfully executed Player 1's turn." @@ -219,30 +218,29 @@ echo " ######## ######## ############################################################################### " -( - - echo " - NETWORK=mainnet - PRIVATE_KEY=APrivateKey1zkp86FNGdKxjgAdgQZ967bqBanjuHkAaoRe19RK24ZCGsHH - " > .env - - leo run play '{ - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, - hits_and_misses: 0u64.private, - played_tiles: 2048u64.private, - ships: 9044591273705727u64.private, - player_1: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, - player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - game_started: true.private, - _nonce: 5254963165391133332409074172682159033621708071536429341861038147524454777097group.public - }' '{ - owner: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, - incoming_fire_coordinate: 2u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1wyvu96dvv0auq9e4qme54kjuhzglyfcf576h0g3nrrmrmr0505pqd6wnry.private, - prev_hit_or_miss: 0u64.private, - _nonce: 710336412388939616658264778971886770861024495941253598683184288448156545822group.public - }' 4u64 || exit -) + +echo " +NETWORK=mainnet +PRIVATE_KEY=APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh +" > .env + +leo run play '{ + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + hits_and_misses: 0u64.private, + played_tiles: 2048u64.private, + ships: 9044591273705727u64.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + game_started: true.private, + _nonce: 5254963165391133332409074172682159033621708071536429341861038147524454777097group.public +}' '{ + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + incoming_fire_coordinate: 2u64.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + prev_hit_or_miss: 0u64.private, + _nonce: 710336412388939616658264778971886770861024495941253598683184288448156545822group.public +}' 4u64 || exit + echo " ✅ Successfully executed Player 2's turn." diff --git a/examples/token/run.sh b/examples/token/run.sh index 9d244bb68a..1b212bf0fa 100755 --- a/examples/token/run.sh +++ b/examples/token/run.sh @@ -8,18 +8,18 @@ fi # The private key and address of Alice. # Swap these into program.json, when running transactions as the first bidder. -# "private_key": "APrivateKey1zkp1w8PTxrRgGfAtfKUSq43iQyVbdQHfhGbiNPEg2LVSEXR", -# "address": "aleo13ssze66adjjkt795z9u5wpq8h6kn0y2657726h4h3e3wfnez4vqsm3008q" +# NETWORK=mainnet +# PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH # The private key and address of Bob. # Swap these into program.json, when running transactions as the second bidder. -# "private_key": "APrivateKey1zkpFo72g7N9iFt3JzzeG8CqsS5doAiXyFvNCgk2oHvjRCzF" -# "address": "aleo17vy26rpdhqx4598y5gp7nvaa9rk7tnvl6ufhvvf4calsrrqdaqyshdsf5z" +# NETWORK=mainnet +# PRIVATE_KEY=APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh # Swap in the private key of Alice. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkp1w8PTxrRgGfAtfKUSq43iQyVbdQHfhGbiNPEg2LVSEXR +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH " > .env # Publicly mint 100 tokens for Alice. @@ -48,12 +48,12 @@ echo " ######## ######## ############################################################################### " -leo run mint_public aleo13ssze66adjjkt795z9u5wpq8h6kn0y2657726h4h3e3wfnez4vqsm3008q 100u64 +leo run mint_public aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px 100u64 # Swap in the private key of Bob. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpFo72g7N9iFt3JzzeG8CqsS5doAiXyFvNCgk2oHvjRCzF +PRIVATE_KEY=APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh " > .env # Privately mint 100 tokens for Bob. @@ -82,12 +82,12 @@ echo " ######## ######## ############################################################################### " -leo run mint_private aleo17vy26rpdhqx4598y5gp7nvaa9rk7tnvl6ufhvvf4calsrrqdaqyshdsf5z 100u64 +leo run mint_private aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t 100u64 # Swap in the private key of Alice. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkp1w8PTxrRgGfAtfKUSq43iQyVbdQHfhGbiNPEg2LVSEXR +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH " > .env # Publicly transfer 10 tokens from Alice to Bob. @@ -116,12 +116,12 @@ echo " ######## ######## ############################################################################### " -leo run transfer_public aleo17vy26rpdhqx4598y5gp7nvaa9rk7tnvl6ufhvvf4calsrrqdaqyshdsf5z 10u64 +leo run transfer_public aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t 10u64 # Swap in the private key of Bob. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpFo72g7N9iFt3JzzeG8CqsS5doAiXyFvNCgk2oHvjRCzF +PRIVATE_KEY=APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh " > .env # Privately transfer 20 tokens from Bob to Alice. @@ -151,15 +151,15 @@ echo " ############################################################################### " leo run transfer_private "{ - owner: aleo17vy26rpdhqx4598y5gp7nvaa9rk7tnvl6ufhvvf4calsrrqdaqyshdsf5z.private, + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, amount: 100u64.private, _nonce: 6586771265379155927089644749305420610382723873232320906747954786091923851913group.public - }" aleo13ssze66adjjkt795z9u5wpq8h6kn0y2657726h4h3e3wfnez4vqsm3008q 20u64 + }" aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px 20u64 # Swap in the private key of Alice. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkp1w8PTxrRgGfAtfKUSq43iQyVbdQHfhGbiNPEg2LVSEXR +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH " > .env # Convert 30 public tokens from Alice into 30 private tokens for Bob. @@ -189,12 +189,12 @@ echo " ######## ######## ############################################################################### " -leo run transfer_public_to_private aleo17vy26rpdhqx4598y5gp7nvaa9rk7tnvl6ufhvvf4calsrrqdaqyshdsf5z 30u64 +leo run transfer_public_to_private aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t 30u64 # Swap in the private key of Bob. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkpFo72g7N9iFt3JzzeG8CqsS5doAiXyFvNCgk2oHvjRCzF +PRIVATE_KEY=APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh " > .env # Convert 40 private tokens from Bob into 40 public tokens for Alice. @@ -225,15 +225,15 @@ echo " ############################################################################### " leo run transfer_private_to_public "{ - owner: aleo17vy26rpdhqx4598y5gp7nvaa9rk7tnvl6ufhvvf4calsrrqdaqyshdsf5z.private, + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, amount: 80u64.private, _nonce: 1852830456042139988098466781381363679605019151318121788109768539956661608520group.public - }" aleo13ssze66adjjkt795z9u5wpq8h6kn0y2657726h4h3e3wfnez4vqsm3008q 40u64 + }" aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px 40u64 # Swap in the private key of Alice. # This is done to ensure that program.json is the same after every execution of ./run.sh. echo " NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkp1w8PTxrRgGfAtfKUSq43iQyVbdQHfhGbiNPEg2LVSEXR +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH " > .env diff --git a/examples/vote/run.sh b/examples/vote/run.sh index 40cf48cfe0..59d236dd29 100755 --- a/examples/vote/run.sh +++ b/examples/vote/run.sh @@ -23,7 +23,7 @@ echo " leo run propose "{ title: 2077160157502449938194577302446444field, content: 1452374294790018907888397545906607852827800436field, - proposer: aleo1mgfq6g40l6zkhsm063n3uhr43qk5e0zsua5aszeq5080dsvlcvxsn0rrau + proposer: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px }" || exit echo " @@ -40,7 +40,7 @@ echo " ############################################################################### " # Run the `new_ticket` program function -leo run new_ticket 2264670486490520844857553240576860973319410481267184439818180411609250173817field aleo1mgfq6g40l6zkhsm063n3uhr43qk5e0zsua5aszeq5080dsvlcvxsn0rrau || exit +leo run new_ticket 2264670486490520844857553240576860973319410481267184439818180411609250173817field aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px || exit echo " ############################################################################### @@ -57,7 +57,7 @@ echo " " # Run the `agree` or `disagree` program function leo run agree "{ - owner: aleo1mgfq6g40l6zkhsm063n3uhr43qk5e0zsua5aszeq5080dsvlcvxsn0rrau.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, pid: 2264670486490520844857553240576860973319410481267184439818180411609250173817field.private, _nonce: 1637267040221574073903539416642641433705357302885235345311606754421919550724group.public }" || exit From 5aad616542be75d1750a9b57bce595a41fef0040 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 10:25:54 +0000 Subject: [PATCH 05/15] Bump toml from 0.8.12 to 0.8.13 Bumps [toml](https://github.com/toml-rs/toml) from 0.8.12 to 0.8.13. - [Commits](https://github.com/toml-rs/toml/compare/toml-v0.8.12...toml-v0.8.13) --- updated-dependencies: - dependency-name: toml dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 22 +++++++++++----------- utils/retriever/Cargo.toml | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 37f56b8b9f..125288c175 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1963,7 +1963,7 @@ dependencies = [ "snarkvm", "sys-info", "test_dir", - "toml 0.8.12", + "toml 0.8.13", "tracing", "tracing-subscriber", "ureq", @@ -1985,7 +1985,7 @@ dependencies = [ "serial_test", "snarkos-cli", "snarkvm", - "toml 0.8.12", + "toml 0.8.13", "tracing", ] @@ -2041,7 +2041,7 @@ dependencies = [ "sha2", "snarkvm", "tempfile", - "toml 0.8.12", + "toml 0.8.13", "ureq", ] @@ -3360,9 +3360,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -5126,9 +5126,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" dependencies = [ "serde", "serde_spanned", @@ -5138,18 +5138,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.12" +version = "0.22.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" dependencies = [ "indexmap 2.2.6", "serde", diff --git a/utils/retriever/Cargo.toml b/utils/retriever/Cargo.toml index 2549609d25..5af5d8f7ef 100644 --- a/utils/retriever/Cargo.toml +++ b/utils/retriever/Cargo.toml @@ -66,7 +66,7 @@ version = "0.10.8" version = "3.10.1" [dependencies.toml] -version = "0.8.12" +version = "0.8.13" [dependencies.ureq] version = "2.9" From 96dd83b586c0a2ba653a93f653e830607b03ae68 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 10:21:43 +0000 Subject: [PATCH 06/15] Bump itertools from 0.12.1 to 0.13.0 Bumps [itertools](https://github.com/rust-itertools/itertools) from 0.12.1 to 0.13.0. - [Changelog](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-itertools/itertools/compare/v0.12.1...v0.13.0) --- updated-dependencies: - dependency-name: itertools dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 13 +++++++++++-- compiler/ast/Cargo.toml | 2 +- compiler/passes/Cargo.toml | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2fb8c19d15..b023c018f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1802,6 +1802,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -1867,7 +1876,7 @@ version = "1.12.0" dependencies = [ "criterion", "indexmap 1.9.3", - "itertools 0.12.1", + "itertools 0.13.0", "leo-errors", "leo-span", "serde", @@ -2013,7 +2022,7 @@ name = "leo-passes" version = "1.12.0" dependencies = [ "indexmap 1.9.3", - "itertools 0.12.1", + "itertools 0.13.0", "leo-ast", "leo-errors", "leo-parser", diff --git a/compiler/ast/Cargo.toml b/compiler/ast/Cargo.toml index 2e5bc77881..12ed5b126e 100644 --- a/compiler/ast/Cargo.toml +++ b/compiler/ast/Cargo.toml @@ -34,7 +34,7 @@ version = "1.9" features = [ "serde-1" ] [dependencies.itertools] -version = "0.12.1" +version = "0.13.0" [dependencies.serde] version = "1.0" diff --git a/compiler/passes/Cargo.toml b/compiler/passes/Cargo.toml index 75777c7778..84b972f621 100644 --- a/compiler/passes/Cargo.toml +++ b/compiler/passes/Cargo.toml @@ -44,7 +44,7 @@ version = "=1.12.0" version = "1.9" [dependencies.itertools] -version = "0.12.1" +version = "0.13.0" [dependencies.num-traits] version = "0.2.19" From dbfb9eb13a93e5d4446d4b7ba22df3ff1a868119 Mon Sep 17 00:00:00 2001 From: evan-schott <53463459+evan-schott@users.noreply.github.com> Date: Sat, 18 May 2024 11:37:58 -0700 Subject: [PATCH 07/15] fix --- Cargo.lock | 152 ++++++++++++++++++------------------- Cargo.toml | 8 +- leo/cli/commands/deploy.rs | 11 +-- 3 files changed, 86 insertions(+), 85 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2fb8c19d15..641c0309ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3547,7 +3547,7 @@ dependencies = [ [[package]] name = "snarkos-account" version = "2.2.7" -source = "git+https://github.com/AleoHQ/snarkos?rev=6ac2fe5#6ac2fe5fc2b85960c2fec11a9caba3819ef59b21" +source = "git+https://github.com/AleoNet/snarkOS.git?rev=01ea476#01ea4768ed62d3f1933745568f023fadcf15cdf1" dependencies = [ "anyhow", "colored", @@ -3558,7 +3558,7 @@ dependencies = [ [[package]] name = "snarkos-cli" version = "2.2.7" -source = "git+https://github.com/AleoHQ/snarkos?rev=6ac2fe5#6ac2fe5fc2b85960c2fec11a9caba3819ef59b21" +source = "git+https://github.com/AleoNet/snarkOS.git?rev=01ea476#01ea4768ed62d3f1933745568f023fadcf15cdf1" dependencies = [ "aleo-std", "anstyle", @@ -3597,7 +3597,7 @@ dependencies = [ [[package]] name = "snarkos-display" version = "2.2.7" -source = "git+https://github.com/AleoHQ/snarkos?rev=6ac2fe5#6ac2fe5fc2b85960c2fec11a9caba3819ef59b21" +source = "git+https://github.com/AleoNet/snarkOS.git?rev=01ea476#01ea4768ed62d3f1933745568f023fadcf15cdf1" dependencies = [ "anyhow", "crossterm", @@ -3610,7 +3610,7 @@ dependencies = [ [[package]] name = "snarkos-node" version = "2.2.7" -source = "git+https://github.com/AleoHQ/snarkos?rev=6ac2fe5#6ac2fe5fc2b85960c2fec11a9caba3819ef59b21" +source = "git+https://github.com/AleoNet/snarkOS.git?rev=01ea476#01ea4768ed62d3f1933745568f023fadcf15cdf1" dependencies = [ "aleo-std", "anyhow", @@ -3643,7 +3643,7 @@ dependencies = [ [[package]] name = "snarkos-node-bft" version = "2.2.7" -source = "git+https://github.com/AleoHQ/snarkos?rev=6ac2fe5#6ac2fe5fc2b85960c2fec11a9caba3819ef59b21" +source = "git+https://github.com/AleoNet/snarkOS.git?rev=01ea476#01ea4768ed62d3f1933745568f023fadcf15cdf1" dependencies = [ "aleo-std", "anyhow", @@ -3676,7 +3676,7 @@ dependencies = [ [[package]] name = "snarkos-node-bft-events" version = "2.2.7" -source = "git+https://github.com/AleoHQ/snarkos?rev=6ac2fe5#6ac2fe5fc2b85960c2fec11a9caba3819ef59b21" +source = "git+https://github.com/AleoNet/snarkOS.git?rev=01ea476#01ea4768ed62d3f1933745568f023fadcf15cdf1" dependencies = [ "anyhow", "bytes", @@ -3693,7 +3693,7 @@ dependencies = [ [[package]] name = "snarkos-node-bft-ledger-service" version = "2.2.7" -source = "git+https://github.com/AleoHQ/snarkos?rev=6ac2fe5#6ac2fe5fc2b85960c2fec11a9caba3819ef59b21" +source = "git+https://github.com/AleoNet/snarkOS.git?rev=01ea476#01ea4768ed62d3f1933745568f023fadcf15cdf1" dependencies = [ "async-trait", "indexmap 2.2.6", @@ -3709,7 +3709,7 @@ dependencies = [ [[package]] name = "snarkos-node-bft-storage-service" version = "2.2.7" -source = "git+https://github.com/AleoHQ/snarkos?rev=6ac2fe5#6ac2fe5fc2b85960c2fec11a9caba3819ef59b21" +source = "git+https://github.com/AleoNet/snarkOS.git?rev=01ea476#01ea4768ed62d3f1933745568f023fadcf15cdf1" dependencies = [ "aleo-std", "indexmap 2.2.6", @@ -3721,7 +3721,7 @@ dependencies = [ [[package]] name = "snarkos-node-cdn" version = "2.2.7" -source = "git+https://github.com/AleoHQ/snarkos?rev=6ac2fe5#6ac2fe5fc2b85960c2fec11a9caba3819ef59b21" +source = "git+https://github.com/AleoNet/snarkOS.git?rev=01ea476#01ea4768ed62d3f1933745568f023fadcf15cdf1" dependencies = [ "anyhow", "bincode", @@ -3740,7 +3740,7 @@ dependencies = [ [[package]] name = "snarkos-node-consensus" version = "2.2.7" -source = "git+https://github.com/AleoHQ/snarkos?rev=6ac2fe5#6ac2fe5fc2b85960c2fec11a9caba3819ef59b21" +source = "git+https://github.com/AleoNet/snarkOS.git?rev=01ea476#01ea4768ed62d3f1933745568f023fadcf15cdf1" dependencies = [ "aleo-std", "anyhow", @@ -3762,7 +3762,7 @@ dependencies = [ [[package]] name = "snarkos-node-metrics" version = "2.2.7" -source = "git+https://github.com/AleoHQ/snarkos?rev=6ac2fe5#6ac2fe5fc2b85960c2fec11a9caba3819ef59b21" +source = "git+https://github.com/AleoNet/snarkOS.git?rev=01ea476#01ea4768ed62d3f1933745568f023fadcf15cdf1" dependencies = [ "metrics-exporter-prometheus", "parking_lot", @@ -3775,7 +3775,7 @@ dependencies = [ [[package]] name = "snarkos-node-rest" version = "2.2.7" -source = "git+https://github.com/AleoHQ/snarkos?rev=6ac2fe5#6ac2fe5fc2b85960c2fec11a9caba3819ef59b21" +source = "git+https://github.com/AleoNet/snarkOS.git?rev=01ea476#01ea4768ed62d3f1933745568f023fadcf15cdf1" dependencies = [ "anyhow", "axum", @@ -3803,7 +3803,7 @@ dependencies = [ [[package]] name = "snarkos-node-router" version = "2.2.7" -source = "git+https://github.com/AleoHQ/snarkos?rev=6ac2fe5#6ac2fe5fc2b85960c2fec11a9caba3819ef59b21" +source = "git+https://github.com/AleoNet/snarkOS.git?rev=01ea476#01ea4768ed62d3f1933745568f023fadcf15cdf1" dependencies = [ "anyhow", "async-trait", @@ -3833,7 +3833,7 @@ dependencies = [ [[package]] name = "snarkos-node-router-messages" version = "2.2.7" -source = "git+https://github.com/AleoHQ/snarkos?rev=6ac2fe5#6ac2fe5fc2b85960c2fec11a9caba3819ef59b21" +source = "git+https://github.com/AleoNet/snarkOS.git?rev=01ea476#01ea4768ed62d3f1933745568f023fadcf15cdf1" dependencies = [ "anyhow", "bytes", @@ -3851,7 +3851,7 @@ dependencies = [ [[package]] name = "snarkos-node-sync" version = "2.2.7" -source = "git+https://github.com/AleoHQ/snarkos?rev=6ac2fe5#6ac2fe5fc2b85960c2fec11a9caba3819ef59b21" +source = "git+https://github.com/AleoNet/snarkOS.git?rev=01ea476#01ea4768ed62d3f1933745568f023fadcf15cdf1" dependencies = [ "anyhow", "indexmap 2.2.6", @@ -3872,7 +3872,7 @@ dependencies = [ [[package]] name = "snarkos-node-sync-communication-service" version = "2.2.7" -source = "git+https://github.com/AleoHQ/snarkos?rev=6ac2fe5#6ac2fe5fc2b85960c2fec11a9caba3819ef59b21" +source = "git+https://github.com/AleoNet/snarkOS.git?rev=01ea476#01ea4768ed62d3f1933745568f023fadcf15cdf1" dependencies = [ "async-trait", "tokio", @@ -3881,7 +3881,7 @@ dependencies = [ [[package]] name = "snarkos-node-sync-locators" version = "2.2.7" -source = "git+https://github.com/AleoHQ/snarkos?rev=6ac2fe5#6ac2fe5fc2b85960c2fec11a9caba3819ef59b21" +source = "git+https://github.com/AleoNet/snarkOS.git?rev=01ea476#01ea4768ed62d3f1933745568f023fadcf15cdf1" dependencies = [ "anyhow", "indexmap 2.2.6", @@ -3893,7 +3893,7 @@ dependencies = [ [[package]] name = "snarkos-node-tcp" version = "2.2.7" -source = "git+https://github.com/AleoHQ/snarkos?rev=6ac2fe5#6ac2fe5fc2b85960c2fec11a9caba3819ef59b21" +source = "git+https://github.com/AleoNet/snarkOS.git?rev=01ea476#01ea4768ed62d3f1933745568f023fadcf15cdf1" dependencies = [ "async-trait", "bytes", @@ -3909,7 +3909,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "anstyle", "anyhow", @@ -3939,7 +3939,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "aleo-std", "anyhow", @@ -3969,7 +3969,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3983,7 +3983,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -3994,7 +3994,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -4004,7 +4004,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -4014,7 +4014,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "indexmap 2.2.6", "itertools 0.11.0", @@ -4032,12 +4032,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" [[package]] name = "snarkvm-circuit-network" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -4048,7 +4048,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "paste", "snarkvm-circuit-account", @@ -4063,7 +4063,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -4078,7 +4078,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4091,7 +4091,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -4100,7 +4100,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4110,7 +4110,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4122,7 +4122,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4134,7 +4134,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4145,7 +4145,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4157,7 +4157,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4170,7 +4170,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "bs58", "snarkvm-console-network", @@ -4181,7 +4181,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "blake2s_simd", "smallvec", @@ -4194,7 +4194,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "aleo-std", "rayon", @@ -4205,7 +4205,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "anyhow", "indexmap 2.2.6", @@ -4228,7 +4228,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "anyhow", "bech32", @@ -4246,7 +4246,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "enum_index", "enum_index_derive", @@ -4267,7 +4267,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -4282,7 +4282,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4293,7 +4293,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-console-network-environment", ] @@ -4301,7 +4301,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4311,7 +4311,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4322,7 +4322,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4333,7 +4333,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4344,7 +4344,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4355,7 +4355,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "rand", "rayon", @@ -4369,7 +4369,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "aleo-std", "anyhow", @@ -4386,7 +4386,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "aleo-std", "anyhow", @@ -4410,7 +4410,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "anyhow", "rand", @@ -4422,7 +4422,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "indexmap 2.2.6", "rayon", @@ -4441,7 +4441,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "indexmap 2.2.6", "rayon", @@ -4454,7 +4454,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4467,7 +4467,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "indexmap 2.2.6", "rayon", @@ -4480,7 +4480,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "indexmap 2.2.6", "rayon", @@ -4492,7 +4492,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "bytes", "serde_json", @@ -4503,7 +4503,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "indexmap 2.2.6", "rayon", @@ -4518,7 +4518,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "bytes", "serde_json", @@ -4531,7 +4531,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -4540,7 +4540,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "aleo-std", "anyhow", @@ -4560,7 +4560,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "anyhow", "colored", @@ -4575,7 +4575,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "async-trait", "reqwest 0.11.27", @@ -4588,7 +4588,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "aleo-std-storage", "anyhow", @@ -4615,7 +4615,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4624,7 +4624,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "aleo-std", "anyhow", @@ -4649,7 +4649,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "aleo-std", "anyhow", @@ -4678,7 +4678,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "aleo-std", "colored", @@ -4701,7 +4701,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "indexmap 2.2.6", "paste", @@ -4715,7 +4715,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "bincode", "once_cell", @@ -4728,7 +4728,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "aleo-std", "anyhow", @@ -4749,7 +4749,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM?rev=3ebe60c#3ebe60c499285a140ec2171fe8dd06662c325531" +source = "git+https://github.com/AleoNet/snarkVM.git?rev=140ff26#140ff26f87697c2e9d18212cce2cc831fc4b146a" dependencies = [ "proc-macro2", "quote 1.0.36", diff --git a/Cargo.toml b/Cargo.toml index 72b9ed5aaf..2d31c8bbba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,13 +44,13 @@ members = [ ] [workspace.dependencies.snarkos-cli] -git = "https://github.com/AleoHQ/snarkos" -rev = "6ac2fe5" +git = "https://github.com/AleoNet/snarkOS.git" +rev = "01ea476" [workspace.dependencies.snarkvm] #version = "0.16.19" -git = "https://github.com/AleoHQ/snarkVM" -rev = "3ebe60c" +git = "https://github.com/AleoNet/snarkVM.git" +rev = "140ff26" [lib] path = "leo/lib.rs" diff --git a/leo/cli/commands/deploy.rs b/leo/cli/commands/deploy.rs index 7329637a38..1a444d0782 100644 --- a/leo/cli/commands/deploy.rs +++ b/leo/cli/commands/deploy.rs @@ -22,8 +22,6 @@ use std::path::PathBuf; /// Deploys an Aleo program. #[derive(Parser, Debug)] pub struct Deploy { - #[clap(long, help = "Endpoint to retrieve network state from.", default_value = "http://api.explorer.aleo.org/v1")] - pub endpoint: String, #[clap(flatten)] pub(crate) fee_options: FeeOptions, #[clap(long, help = "Disables building of the project before deployment.", default_value = "false")] @@ -36,6 +34,8 @@ pub struct Deploy { default_value = "12" )] pub(crate) wait: u64, + #[clap(flatten)] + pub(crate) compiler_options: BuildOptions, } impl Command for Deploy { @@ -48,7 +48,7 @@ impl Command for Deploy { fn prelude(&self, context: Context) -> Result { if !self.no_build { - (Build { options: BuildOptions::default() }).execute(context)?; + (Build { options: self.compiler_options.clone() }).execute(context)?; } Ok(()) } @@ -85,13 +85,14 @@ impl Command for Deploy { "--private-key".to_string(), private_key.as_ref().unwrap().clone(), "--query".to_string(), - self.endpoint.clone(), + self.compiler_options.endpoint.clone(), "--priority-fee".to_string(), self.fee_options.priority_fee.to_string(), "--path".to_string(), path.to_str().unwrap().parse().unwrap(), "--broadcast".to_string(), - format!("{}/{}/transaction/broadcast", self.endpoint, self.fee_options.network).to_string(), + format!("{}/{}/transaction/broadcast", self.compiler_options.endpoint, self.fee_options.network) + .to_string(), name.clone(), ]; From f7e03525006591d6b36e7b91139e0870851e098f Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu <23022326+d0cd@users.noreply.github.com> Date: Sat, 18 May 2024 16:43:53 -0700 Subject: [PATCH 08/15] WIP --- examples/auction/.env | 1 + examples/auction/build/main.aleo | 6 +- examples/auction/run.sh | 13 +- examples/auction/src/main.leo | 8 +- examples/basic_bank/.env | 1 + examples/basic_bank/build/main.aleo | 8 +- examples/basic_bank/src/main.leo | 6 +- examples/battleship/.env | 5 +- examples/battleship/README.md | 162 +- examples/battleship/leo.lock | 12 +- examples/battleship/run.sh | 27 +- .../hackers-delight/ntzseals/build/main.aleo | 4824 ++++------------- examples/lottery/build/main.aleo | 2 + examples/simple_token/inputs/mint.in | 2 +- examples/simple_token/inputs/transfer.in | 4 +- examples/tictactoe/build/main.aleo | 4 +- examples/token/.env | 1 + examples/token/build/main.aleo | 8 + examples/vote/build/main.aleo | 20 +- 19 files changed, 1319 insertions(+), 3795 deletions(-) diff --git a/examples/auction/.env b/examples/auction/.env index 53bdb2227c..391701926c 100644 --- a/examples/auction/.env +++ b/examples/auction/.env @@ -1,3 +1,4 @@ + NETWORK=mainnet PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/auction/build/main.aleo b/examples/auction/build/main.aleo index 480fe0cda5..23f114074b 100644 --- a/examples/auction/build/main.aleo +++ b/examples/auction/build/main.aleo @@ -11,14 +11,14 @@ function place_bid: input r0 as address.private; input r1 as u64.private; assert.eq self.caller r0; - cast aleo1fxs9s0w97lmkwlcmgn0z3nuxufdee5yck9wqrs0umevp7qs0sg9q5xxxzh r0 r1 false into r2 as Bid.record; + cast aleo1ashyu96tjwe63u0gtnnv8z5lhapdu4l5pjsl2kha7fv7hvz2eqxs5dz0rg r0 r1 false into r2 as Bid.record; output r2 as Bid.record; function resolve: input r0 as Bid.record; input r1 as Bid.record; - assert.eq self.caller aleo1fxs9s0w97lmkwlcmgn0z3nuxufdee5yck9wqrs0umevp7qs0sg9q5xxxzh; + assert.eq self.caller aleo1ashyu96tjwe63u0gtnnv8z5lhapdu4l5pjsl2kha7fv7hvz2eqxs5dz0rg; gte r0.amount r1.amount into r2; ternary r2 r0.owner r1.owner into r3; ternary r2 r0.bidder r1.bidder into r4; @@ -30,6 +30,6 @@ function resolve: function finish: input r0 as Bid.record; - assert.eq self.caller aleo1fxs9s0w97lmkwlcmgn0z3nuxufdee5yck9wqrs0umevp7qs0sg9q5xxxzh; + assert.eq self.caller aleo1ashyu96tjwe63u0gtnnv8z5lhapdu4l5pjsl2kha7fv7hvz2eqxs5dz0rg; cast r0.bidder r0.bidder r0.amount true into r1 as Bid.record; output r1 as Bid.record; diff --git a/examples/auction/run.sh b/examples/auction/run.sh index 60128c4ebb..d13f3de839 100755 --- a/examples/auction/run.sh +++ b/examples/auction/run.sh @@ -82,8 +82,8 @@ leo run place_bid aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4 # Swap in the private key and address of the auctioneer to .env. echo " -# NETWORK=mainnet -# PRIVATE_KEY=APrivateKey1zkp2GUmKbVsuc1NSj28pa1WTQuZaK5f1DQJAT6vPcHyWokG +NETWORK=mainnet +PRIVATE_KEY=APrivateKey1zkp2GUmKbVsuc1NSj28pa1WTQuZaK5f1DQJAT6vPcHyWokG " > .env # Have the auctioneer select the winning bid. @@ -118,7 +118,7 @@ leo run resolve "{ echo " ############################################################################### ######## ######## -######## STEP 3: The auctioneer completes the auction. ######## +######## STEP 4: The auctioneer completes the auction. ######## ######## ######## ######## ------------------------------- ######## ######## | CLOSE | A | → B ← | ######## @@ -137,6 +137,13 @@ leo run finish "{ }" || exit +# Restore the .env file to its original state. +echo " +NETWORK=mainnet +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH +" > .env + + diff --git a/examples/auction/src/main.leo b/examples/auction/src/main.leo index 873d361f0d..09389b2fae 100644 --- a/examples/auction/src/main.leo +++ b/examples/auction/src/main.leo @@ -17,13 +17,13 @@ program auction.aleo { // - `amount` : The amount of the bid. // Requires that `bidder` matches the function caller. // The owner of the record is set to the entity responsible for running the auction (auction runner). - // The address of the auction runner is aleo1fxs9s0w97lmkwlcmgn0z3nuxufdee5yck9wqrs0umevp7qs0sg9q5xxxzh. + // The address of the auction runner is aleo1ashyu96tjwe63u0gtnnv8z5lhapdu4l5pjsl2kha7fv7hvz2eqxs5dz0rg. transition place_bid(bidder: address, amount: u64) -> Bid { // Ensure the caller is the auction bidder. assert_eq(self.caller, bidder); // Return a new 'Bid' record for the auction bidder. return Bid { - owner: aleo1fxs9s0w97lmkwlcmgn0z3nuxufdee5yck9wqrs0umevp7qs0sg9q5xxxzh, + owner: aleo1ashyu96tjwe63u0gtnnv8z5lhapdu4l5pjsl2kha7fv7hvz2eqxs5dz0rg, bidder: bidder, amount: amount, is_winner: false, @@ -38,7 +38,7 @@ program auction.aleo { // In the event of a tie, the first bid is selected. transition resolve(first: Bid, second: Bid) -> Bid { // Ensure the caller is the auctioneer. - assert_eq(self.caller, aleo1fxs9s0w97lmkwlcmgn0z3nuxufdee5yck9wqrs0umevp7qs0sg9q5xxxzh); + assert_eq(self.caller, aleo1ashyu96tjwe63u0gtnnv8z5lhapdu4l5pjsl2kha7fv7hvz2eqxs5dz0rg); // Resolve the winner of the auction. if (first.amount >= second.amount) { return first; @@ -53,7 +53,7 @@ program auction.aleo { // Assumes that the function is invoked only after all bids have been resolved. transition finish(bid: Bid) -> Bid { // Ensure the caller is the auctioneer. - assert_eq(self.caller, aleo1fxs9s0w97lmkwlcmgn0z3nuxufdee5yck9wqrs0umevp7qs0sg9q5xxxzh); + assert_eq(self.caller, aleo1ashyu96tjwe63u0gtnnv8z5lhapdu4l5pjsl2kha7fv7hvz2eqxs5dz0rg); // Return 'is_winner' as 'true' in the winning 'Bid'. return Bid { owner: bid.bidder, diff --git a/examples/basic_bank/.env b/examples/basic_bank/.env index 53bdb2227c..391701926c 100644 --- a/examples/basic_bank/.env +++ b/examples/basic_bank/.env @@ -1,3 +1,4 @@ + NETWORK=mainnet PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/basic_bank/build/main.aleo b/examples/basic_bank/build/main.aleo index 963c29ed1a..73965d8697 100644 --- a/examples/basic_bank/build/main.aleo +++ b/examples/basic_bank/build/main.aleo @@ -12,11 +12,12 @@ mapping balances: function issue: input r0 as address.private; input r1 as u64.private; - assert.eq self.caller aleo1t0uer3jgtsgmx5tq6x6f9ecu8tr57rzzfnc2dgmcqldceal0ls9qf6st7a; + assert.eq self.caller aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px; cast r0 r1 into r2 as Token.record; output r2 as Token.record; + function deposit: input r0 as Token.record; input r1 as u64.private; @@ -35,6 +36,7 @@ finalize deposit: set r3 into balances[r0]; + closure calculate_interest: input r0 as u64; input r1 as u64; @@ -542,12 +544,13 @@ closure calculate_interest: output r502 as u64; + function withdraw: input r0 as address.private; input r1 as u64.private; input r2 as u64.private; input r3 as u64.private; - assert.eq self.caller aleo1t0uer3jgtsgmx5tq6x6f9ecu8tr57rzzfnc2dgmcqldceal0ls9qf6st7a; + assert.eq self.caller aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px; hash.bhp256 r0 into r4 as field; call calculate_interest r1 r2 r3 into r5; cast r0 r5 into r6 as Token.record; @@ -561,3 +564,4 @@ finalize withdraw: get.or_use balances[r0] 0u64 into r2; sub r2 r1 into r3; set r3 into balances[r0]; + diff --git a/examples/basic_bank/src/main.leo b/examples/basic_bank/src/main.leo index df7719ed86..18b1120531 100644 --- a/examples/basic_bank/src/main.leo +++ b/examples/basic_bank/src/main.leo @@ -15,9 +15,9 @@ program basic_bank.aleo { // - `owner` : The address of the account to issue the token to. // - `amount`: The amount of tokens to issue. // Requires that the function caller is the bank. - // The bank's address is aleo1t0uer3jgtsgmx5tq6x6f9ecu8tr57rzzfnc2dgmcqldceal0ls9qf6st7a. + // The bank's address is aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px. transition issue(owner: address, amount: u64) -> Token { - assert_eq(self.caller, aleo1t0uer3jgtsgmx5tq6x6f9ecu8tr57rzzfnc2dgmcqldceal0ls9qf6st7a); + assert_eq(self.caller, aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px); return Token { owner: owner, amount: amount, @@ -57,7 +57,7 @@ program basic_bank.aleo { // - `periods` : The number of periods to compound the interest over. // Requires that the function caller is the bank. async transition withdraw(recipient: address, amount: u64, rate: u64, periods: u64) -> (Token, Future) { - assert_eq(self.caller, aleo1t0uer3jgtsgmx5tq6x6f9ecu8tr57rzzfnc2dgmcqldceal0ls9qf6st7a); + assert_eq(self.caller, aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px); let hash: field = BHP256::hash_to_field(recipient); let total: u64 = calculate_interest(amount, rate, periods); diff --git a/examples/battleship/.env b/examples/battleship/.env index b9fc9bf48e..59936403c4 100644 --- a/examples/battleship/.env +++ b/examples/battleship/.env @@ -1,3 +1,4 @@ + NETWORK=mainnet -PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH - +PRIVATE_KEY=APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh + diff --git a/examples/battleship/README.md b/examples/battleship/README.md index ea62700de5..a81086d943 100644 --- a/examples/battleship/README.md +++ b/examples/battleship/README.md @@ -50,12 +50,12 @@ You can use the provided player accounts or [generate your own](https://aleohq.g Player 1: Private Key APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH View Key AViewKey1fSyEPXxfPFVgjL6qcM9izWRGrhSHKXyN3c64BNsAjnA6 - Address aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy + Address aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px Player 2: Private Key APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh View Key AViewKey1hh6dvSEgeMdfseP4hfdbNYjX4grETwCuTbKnCftkpMwE - Address aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px + Address aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t ``` Save the keys and addresses. Set the `program.json` private key and address to one of the newly created aleo accounts. We'll refer to this address as Player 1, and the other address as Player 2. @@ -68,7 +68,7 @@ Save the keys and addresses. Set the `program.json` private key and address to o "development": { "private_key": "APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH", "view_key": "AViewKey1fSyEPXxfPFVgjL6qcM9izWRGrhSHKXyN3c64BNsAjnA6", - "address": "aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy" + "address": "aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px" }, "license": "MIT" } @@ -82,19 +82,19 @@ Initialize a new board as Player 1 with valid ship inputs and Player 2's address **Run** ``` -leo run initialize_board 34084860461056u64 551911718912u64 7u64 1157425104234217472u64 aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px +leo run initialize_board 34084860461056u64 551911718912u64 7u64 1157425104234217472u64 aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t ``` **Output** ```bash ➡️ Output • { - owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, hits_and_misses: 0u64.private, played_tiles: 0u64.private, ships: 1157459741006397447u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, game_started: false.private, _nonce: 3887646704618532506963887075433683846689834495661101507703164090915348189037group.public } @@ -122,12 +122,12 @@ Now, we can offer a battleship game to player 2. Run `leo run offer_battleship ' **Run** ``` leo run offer_battleship '{ - owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, hits_and_misses: 0u64.private, played_tiles: 0u64.private, ships: 1157459741006397447u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, game_started: false.private, _nonce: 3887646704618532506963887075433683846689834495661101507703164090915348189037group.public }' @@ -138,20 +138,20 @@ leo run offer_battleship '{ ➡️ Outputs • { - owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, hits_and_misses: 0u64.private, played_tiles: 0u64.private, ships: 1157459741006397447u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, game_started: true.private, _nonce: 6563064852163330630334088854834332804417910882908622526775624018226782316843group.public } • { - owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, incoming_fire_coordinate: 0u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, prev_hit_or_miss: 0u64.private, _nonce: 4374626042494973146987320062571809401151262172766172816829659487584978644457group.public } @@ -178,7 +178,7 @@ We must run the program as Player 2 now, so switch the `program.json` file to us "development": { "private_key": "APrivateKey1zkp2RWGDcde3efb89rjhME1VYA8QMxcxep5DShNBR6n8Yjh", "view_key": "AViewKey1hh6dvSEgeMdfseP4hfdbNYjX4grETwCuTbKnCftkpMwE", - "address": "aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px" + "address": "aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t" }, "license": "MIT" } @@ -187,7 +187,7 @@ We must run the program as Player 2 now, so switch the `program.json` file to us We'll create a new and different board for Player 2, and make sure to include Player 1's address as the opponent: **Run** ```bash -leo run initialize_board 31u64 2207646875648u64 224u64 9042383626829824u64 aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy +leo run initialize_board 31u64 2207646875648u64 224u64 9042383626829824u64 aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px ``` **Output** @@ -195,12 +195,12 @@ leo run initialize_board 31u64 2207646875648u64 224u64 9042383626829824u64 aleo1 ➡️ Output • { - owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, hits_and_misses: 0u64.private, played_tiles: 0u64.private, ships: 9044591273705727u64.private, - player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, - player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + player_1: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, game_started: false.private, _nonce: 1549419609469324182591325047490602235361156298832591378925133482196483208807group.public } @@ -224,19 +224,19 @@ Now, we can accept Player 1's offer. Run `leo run start_battleship 'board_state. **Run** ```bash leo run start_battleship '{ - owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, hits_and_misses: 0u64.private, played_tiles: 0u64.private, ships: 9044591273705727u64.private, - player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, - player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + player_1: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, game_started: false.private, _nonce: 1549419609469324182591325047490602235361156298832591378925133482196483208807group.public }' '{ - owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, incoming_fire_coordinate: 0u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, prev_hit_or_miss: 0u64.private, _nonce: 4374626042494973146987320062571809401151262172766172816829659487584978644457group.public }' @@ -247,20 +247,20 @@ leo run start_battleship '{ ➡️ Outputs • { - owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, hits_and_misses: 0u64.private, played_tiles: 0u64.private, ships: 9044591273705727u64.private, - player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, - player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + player_1: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, game_started: true.private, _nonce: 6222383571142756260765569201308836492199048237638652378826141459336360362251group.public } • { - owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, incoming_fire_coordinate: 0u64.private, - player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, - player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + player_1: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, prev_hit_or_miss: 0u64.private, _nonce: 3742551407126138397717446975757978589064777004441277005584760115236217735495group.public } @@ -279,19 +279,19 @@ Player 1 now makes the first real move: `leo run play 'board_state.record' 'move **Run** ```bash leo run play '{ - owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, hits_and_misses: 0u64.private, played_tiles: 0u64.private, ships: 1157459741006397447u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, game_started: true.private, _nonce: 6563064852163330630334088854834332804417910882908622526775624018226782316843group.public }' '{ - owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, incoming_fire_coordinate: 0u64.private, - player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, - player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + player_1: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, prev_hit_or_miss: 0u64.private, _nonce: 3742551407126138397717446975757978589064777004441277005584760115236217735495group.public }' 1u64 @@ -301,20 +301,20 @@ leo run play '{ ➡️ Outputs • { - owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, hits_and_misses: 0u64.private, played_tiles: 1u64.private, ships: 1157459741006397447u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, game_started: true.private, _nonce: 1474170213684980843727833284550698461565286563122422722760769547002894080093group.public } • { - owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, incoming_fire_coordinate: 1u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, prev_hit_or_miss: 0u64.private, _nonce: 5481529266389297320813092061136936339861329677911328036818179854958874588416group.public } @@ -334,19 +334,19 @@ and they will also let Player 1 know whether their fire coordinate hit or miss P **Run** ```bash leo run play '{ - owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, hits_and_misses: 0u64.private, played_tiles: 0u64.private, ships: 9044591273705727u64.private, - player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, - player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + player_1: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, game_started: true.private, _nonce: 6222383571142756260765569201308836492199048237638652378826141459336360362251group.public }' '{ - owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, incoming_fire_coordinate: 1u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, prev_hit_or_miss: 0u64.private, _nonce: 5481529266389297320813092061136936339861329677911328036818179854958874588416group.public }' 2048u64 @@ -358,20 +358,20 @@ leo run play '{ ➡️ Outputs • { - owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, hits_and_misses: 0u64.private, played_tiles: 2048u64.private, ships: 9044591273705727u64.private, - player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, - player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + player_1: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, game_started: true.private, _nonce: 5254963165391133332409074172682159033621708071536429341861038147524454777097group.public } • { - owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, incoming_fire_coordinate: 2048u64.private, - player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, - player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + player_1: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, prev_hit_or_miss: 1u64.private, _nonce: 5851606198769770675504009323414373017067582072428989801313256693053765675198group.public } @@ -400,19 +400,19 @@ For example, running `aleo run play 'board_state.record' 'move.record' 1u64` wil **Run** ```bash leo run play '{ - owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, hits_and_misses: 0u64.private, played_tiles: 1u64.private, ships: 1157459741006397447u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, game_started: true.private, _nonce: 1474170213684980843727833284550698461565286563122422722760769547002894080093group.public }' '{ - owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, incoming_fire_coordinate: 2048u64.private, - player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, - player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + player_1: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, prev_hit_or_miss: 1u64.private, _nonce: 5851606198769770675504009323414373017067582072428989801313256693053765675198group.public }' 2u64 @@ -423,20 +423,20 @@ leo run play '{ ➡️ Outputs • { - owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, hits_and_misses: 1u64.private, played_tiles: 3u64.private, ships: 1157459741006397447u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, game_started: true.private, _nonce: 853278652528988609827041334083853520436225751739504321439524466875699631772group.public } • { - owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, incoming_fire_coordinate: 2u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, prev_hit_or_miss: 0u64.private, _nonce: 710336412388939616658264778971886770861024495941253598683184288448156545822group.public } @@ -465,19 +465,19 @@ The `board_state` record `hits_and_misses` component has also been updated with **Run** ```bash leo run play '{ - owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, hits_and_misses: 0u64.private, played_tiles: 2048u64.private, ships: 9044591273705727u64.private, - player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, - player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + player_1: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, game_started: true.private, _nonce: 5254963165391133332409074172682159033621708071536429341861038147524454777097group.public }' '{ - owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, incoming_fire_coordinate: 2u64.private, - player_1: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, - player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, prev_hit_or_miss: 0u64.private, _nonce: 710336412388939616658264778971886770861024495941253598683184288448156545822group.public }' 4u64 @@ -488,20 +488,20 @@ leo run play '{ ➡️ Outputs • { - owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, + owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, hits_and_misses: 0u64.private, played_tiles: 2052u64.private, ships: 9044591273705727u64.private, - player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, - player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + player_1: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, game_started: true.private, _nonce: 1145182747531998766752104305052328886102707397061849372000385383229513301534group.public } • { - owner: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, incoming_fire_coordinate: 4u64.private, - player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, - player_2: aleo15g9c69urtdhvfml0vjl8px07txmxsy454urhgzk57szmcuttpqgq5cvcdy.private, + player_1: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, prev_hit_or_miss: 2u64.private, _nonce: 5958326936461495382488152485080596366937963499216527548334225566230682598418group.public } diff --git a/examples/battleship/leo.lock b/examples/battleship/leo.lock index dcb0468d95..e8600075bc 100644 --- a/examples/battleship/leo.lock +++ b/examples/battleship/leo.lock @@ -1,20 +1,20 @@ [[package]] -name = "board" +name = "board.aleo" location = "local" -path = "board" +path = "/Users/pranav/work/Aleo/leo/examples/battleship/board" checksum = "da94274230d0c0c3deb96d80e07ad9db8bbf53264286c14cc3231b7a8b7ef380" dependencies = [] [[package]] -name = "move" +name = "move.aleo" location = "local" -path = "move" +path = "/Users/pranav/work/Aleo/leo/examples/battleship/move" checksum = "7d9fef5fe083eb24376e63935855e4ec709c17fb5ee46a0bb4594b0f9ef8eb08" dependencies = [] [[package]] -name = "verify" +name = "verify.aleo" location = "local" -path = "verify" +path = "/Users/pranav/work/Aleo/leo/examples/battleship/verify" checksum = "2c2035ebd70500b7e5a9a6198bed1a1163cd1ddfd09128db8f4c16cf23ad2c62" dependencies = [] diff --git a/examples/battleship/run.sh b/examples/battleship/run.sh index ad896e819d..e6e86718aa 100755 --- a/examples/battleship/run.sh +++ b/examples/battleship/run.sh @@ -97,8 +97,8 @@ leo run start_battleship '{ }' '{ owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, incoming_fire_coordinate: 0u64.private, - player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, - player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_1: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, prev_hit_or_miss: 0u64.private, _nonce: 4374626042494973146987320062571809401151262172766172816829659487584978644457group.public }' || exit @@ -131,8 +131,8 @@ leo run play '{ }' '{ owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, incoming_fire_coordinate: 0u64.private, - player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, - player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_1: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, prev_hit_or_miss: 0u64.private, _nonce: 3742551407126138397717446975757978589064777004441277005584760115236217735495group.public }' 1u64 || exit @@ -166,8 +166,8 @@ leo run play '{ }' '{ owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, incoming_fire_coordinate: 1u64.private, - player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, - player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_1: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, prev_hit_or_miss: 0u64.private, _nonce: 5481529266389297320813092061136936339861329677911328036818179854958874588416group.public }' 2048u64 || exit @@ -201,8 +201,8 @@ leo run play '{ }' '{ owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, incoming_fire_coordinate: 2048u64.private, - player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, - player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_1: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, prev_hit_or_miss: 1u64.private, _nonce: 5851606198769770675504009323414373017067582072428989801313256693053765675198group.public }' 2u64 || exit @@ -236,11 +236,18 @@ leo run play '{ }' '{ owner: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, incoming_fire_coordinate: 2u64.private, - player_1: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, - player_2: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_1: aleo1s3ws5tra87fjycnjrwsjcrnw2qxr8jfqqdugnf0xzqqw29q9m5pqem2u4t.private, + player_2: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, prev_hit_or_miss: 0u64.private, _nonce: 710336412388939616658264778971886770861024495941253598683184288448156545822group.public }' 4u64 || exit echo " ✅ Successfully executed Player 2's turn." + + +# Restore the .env file to its original state +echo " +NETWORK=mainnet +PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH +" > .env diff --git a/examples/hackers-delight/ntzseals/build/main.aleo b/examples/hackers-delight/ntzseals/build/main.aleo index 6d2c99f90f..bcc1636815 100644 --- a/examples/hackers-delight/ntzseals/build/main.aleo +++ b/examples/hackers-delight/ntzseals/build/main.aleo @@ -44,645 +44,645 @@ closure sealsTableLookup: is.eq r0 37u32 into r38; is.eq r0 38u32 into r39; is.eq r0 39u32 into r40; - is.eq r0 40u32 into r41; - is.eq r0 41u32 into r42; - is.eq r0 42u32 into r43; - is.eq r0 43u32 into r44; - is.eq r0 44u32 into r45; - is.eq r0 45u32 into r46; - is.eq r0 46u32 into r47; - is.eq r0 47u32 into r48; - is.eq r0 48u32 into r49; - is.eq r0 49u32 into r50; - is.eq r0 50u32 into r51; - is.eq r0 51u32 into r52; - is.eq r0 52u32 into r53; - is.eq r0 53u32 into r54; - is.eq r0 54u32 into r55; - is.eq r0 55u32 into r56; - is.eq r0 56u32 into r57; - is.eq r0 57u32 into r58; - is.eq r0 58u32 into r59; - is.eq r0 59u32 into r60; - is.eq r0 60u32 into r61; - is.eq r0 61u32 into r62; - is.eq r0 62u32 into r63; - is.eq r0 63u32 into r64; - not r1 into r65; - not r2 into r66; + not r1 into r41; + not r2 into r42; + and r41 r42 into r43; + not r3 into r44; + and r43 r44 into r45; + not r4 into r46; + and r45 r46 into r47; + not r5 into r48; + and r47 r48 into r49; + not r6 into r50; + and r49 r50 into r51; + not r7 into r52; + and r51 r52 into r53; + not r8 into r54; + and r53 r54 into r55; + not r9 into r56; + and r55 r56 into r57; + not r10 into r58; + and r57 r58 into r59; + not r11 into r60; + and r59 r60 into r61; + not r12 into r62; + and r61 r62 into r63; + not r13 into r64; + and r63 r64 into r65; + not r14 into r66; and r65 r66 into r67; - not r3 into r68; + not r15 into r68; and r67 r68 into r69; - not r4 into r70; + not r16 into r70; and r69 r70 into r71; - not r5 into r72; + not r17 into r72; and r71 r72 into r73; - not r6 into r74; + not r18 into r74; and r73 r74 into r75; - not r7 into r76; + not r19 into r76; and r75 r76 into r77; - not r8 into r78; + not r20 into r78; and r77 r78 into r79; - not r9 into r80; + not r21 into r80; and r79 r80 into r81; - not r10 into r82; + not r22 into r82; and r81 r82 into r83; - not r11 into r84; + not r23 into r84; and r83 r84 into r85; - not r12 into r86; + not r24 into r86; and r85 r86 into r87; - not r13 into r88; + not r25 into r88; and r87 r88 into r89; - not r14 into r90; + not r26 into r90; and r89 r90 into r91; - not r15 into r92; + not r27 into r92; and r91 r92 into r93; - not r16 into r94; + not r28 into r94; and r93 r94 into r95; - not r17 into r96; + not r29 into r96; and r95 r96 into r97; - not r18 into r98; + not r30 into r98; and r97 r98 into r99; - not r19 into r100; + not r31 into r100; and r99 r100 into r101; - not r20 into r102; + not r32 into r102; and r101 r102 into r103; - not r21 into r104; + not r33 into r104; and r103 r104 into r105; - not r22 into r106; + not r34 into r106; and r105 r106 into r107; - not r23 into r108; + not r35 into r108; and r107 r108 into r109; - not r24 into r110; + not r36 into r110; and r109 r110 into r111; - not r25 into r112; + not r37 into r112; and r111 r112 into r113; - not r26 into r114; + not r38 into r114; and r113 r114 into r115; - not r27 into r116; + not r39 into r116; and r115 r116 into r117; - not r28 into r118; - and r117 r118 into r119; - not r29 into r120; - and r119 r120 into r121; - not r30 into r122; - and r121 r122 into r123; - not r31 into r124; - and r123 r124 into r125; - not r32 into r126; - and r125 r126 into r127; - not r33 into r128; - and r127 r128 into r129; - not r34 into r130; - and r129 r130 into r131; - not r35 into r132; - and r131 r132 into r133; - not r36 into r134; - and r133 r134 into r135; - not r37 into r136; - and r135 r136 into r137; - not r38 into r138; - and r137 r138 into r139; - not r39 into r140; - and r139 r140 into r141; - not r40 into r142; - and r141 r142 into r143; - not r41 into r144; - and r143 r144 into r145; - not r42 into r146; - and r145 r146 into r147; - not r43 into r148; - and r147 r148 into r149; - not r44 into r150; - and r149 r150 into r151; - not r45 into r152; - and r151 r152 into r153; - not r46 into r154; - and r153 r154 into r155; - not r47 into r156; - and r155 r156 into r157; - not r48 into r158; - and r157 r158 into r159; - not r49 into r160; - and r159 r160 into r161; - not r50 into r162; - and r161 r162 into r163; - not r51 into r164; - and r163 r164 into r165; - not r52 into r166; - and r165 r166 into r167; - not r53 into r168; - and r167 r168 into r169; - not r54 into r170; - and r169 r170 into r171; - not r55 into r172; - and r171 r172 into r173; - not r56 into r174; - and r173 r174 into r175; - not r57 into r176; - and r175 r176 into r177; - not r58 into r178; - and r177 r178 into r179; - not r59 into r180; - and r179 r180 into r181; - not r60 into r182; - and r181 r182 into r183; - not r61 into r184; - and r183 r184 into r185; - not r62 into r186; - and r185 r186 into r187; - not r63 into r188; - and r187 r188 into r189; - and r189 r64 into r190; - ternary r190 0u8 0u8 into r191; - not r1 into r192; - not r2 into r193; + and r117 r40 into r118; + ternary r118 0u8 0u8 into r119; + not r1 into r120; + not r2 into r121; + and r120 r121 into r122; + not r3 into r123; + and r122 r123 into r124; + not r4 into r125; + and r124 r125 into r126; + not r5 into r127; + and r126 r127 into r128; + not r6 into r129; + and r128 r129 into r130; + not r7 into r131; + and r130 r131 into r132; + not r8 into r133; + and r132 r133 into r134; + not r9 into r135; + and r134 r135 into r136; + not r10 into r137; + and r136 r137 into r138; + not r11 into r139; + and r138 r139 into r140; + not r12 into r141; + and r140 r141 into r142; + not r13 into r143; + and r142 r143 into r144; + not r14 into r145; + and r144 r145 into r146; + not r15 into r147; + and r146 r147 into r148; + not r16 into r149; + and r148 r149 into r150; + not r17 into r151; + and r150 r151 into r152; + not r18 into r153; + and r152 r153 into r154; + not r19 into r155; + and r154 r155 into r156; + not r20 into r157; + and r156 r157 into r158; + not r21 into r159; + and r158 r159 into r160; + not r22 into r161; + and r160 r161 into r162; + not r23 into r163; + and r162 r163 into r164; + not r24 into r165; + and r164 r165 into r166; + not r25 into r167; + and r166 r167 into r168; + not r26 into r169; + and r168 r169 into r170; + not r27 into r171; + and r170 r171 into r172; + not r28 into r173; + and r172 r173 into r174; + not r29 into r175; + and r174 r175 into r176; + not r30 into r177; + and r176 r177 into r178; + not r31 into r179; + and r178 r179 into r180; + not r32 into r181; + and r180 r181 into r182; + not r33 into r183; + and r182 r183 into r184; + not r34 into r185; + and r184 r185 into r186; + not r35 into r187; + and r186 r187 into r188; + not r36 into r189; + and r188 r189 into r190; + not r37 into r191; + and r190 r191 into r192; + not r38 into r193; and r192 r193 into r194; - not r3 into r195; - and r194 r195 into r196; - not r4 into r197; - and r196 r197 into r198; - not r5 into r199; - and r198 r199 into r200; - not r6 into r201; - and r200 r201 into r202; - not r7 into r203; - and r202 r203 into r204; - not r8 into r205; - and r204 r205 into r206; - not r9 into r207; - and r206 r207 into r208; - not r10 into r209; - and r208 r209 into r210; - not r11 into r211; - and r210 r211 into r212; - not r12 into r213; - and r212 r213 into r214; - not r13 into r215; - and r214 r215 into r216; - not r14 into r217; - and r216 r217 into r218; - not r15 into r219; - and r218 r219 into r220; - not r16 into r221; - and r220 r221 into r222; - not r17 into r223; - and r222 r223 into r224; - not r18 into r225; - and r224 r225 into r226; - not r19 into r227; - and r226 r227 into r228; - not r20 into r229; - and r228 r229 into r230; - not r21 into r231; - and r230 r231 into r232; - not r22 into r233; - and r232 r233 into r234; - not r23 into r235; - and r234 r235 into r236; - not r24 into r237; - and r236 r237 into r238; - not r25 into r239; - and r238 r239 into r240; - not r26 into r241; - and r240 r241 into r242; - not r27 into r243; - and r242 r243 into r244; - not r28 into r245; - and r244 r245 into r246; - not r29 into r247; - and r246 r247 into r248; - not r30 into r249; - and r248 r249 into r250; - not r31 into r251; - and r250 r251 into r252; - not r32 into r253; - and r252 r253 into r254; - not r33 into r255; - and r254 r255 into r256; - not r34 into r257; - and r256 r257 into r258; - not r35 into r259; - and r258 r259 into r260; - not r36 into r261; - and r260 r261 into r262; - not r37 into r263; - and r262 r263 into r264; - not r38 into r265; - and r264 r265 into r266; - not r39 into r267; - and r266 r267 into r268; - not r40 into r269; - and r268 r269 into r270; - not r41 into r271; - and r270 r271 into r272; - not r42 into r273; + and r194 r39 into r195; + ternary r195 0u8 r119 into r196; + not r1 into r197; + not r2 into r198; + and r197 r198 into r199; + not r3 into r200; + and r199 r200 into r201; + not r4 into r202; + and r201 r202 into r203; + not r5 into r204; + and r203 r204 into r205; + not r6 into r206; + and r205 r206 into r207; + not r7 into r208; + and r207 r208 into r209; + not r8 into r210; + and r209 r210 into r211; + not r9 into r212; + and r211 r212 into r213; + not r10 into r214; + and r213 r214 into r215; + not r11 into r216; + and r215 r216 into r217; + not r12 into r218; + and r217 r218 into r219; + not r13 into r220; + and r219 r220 into r221; + not r14 into r222; + and r221 r222 into r223; + not r15 into r224; + and r223 r224 into r225; + not r16 into r226; + and r225 r226 into r227; + not r17 into r228; + and r227 r228 into r229; + not r18 into r230; + and r229 r230 into r231; + not r19 into r232; + and r231 r232 into r233; + not r20 into r234; + and r233 r234 into r235; + not r21 into r236; + and r235 r236 into r237; + not r22 into r238; + and r237 r238 into r239; + not r23 into r240; + and r239 r240 into r241; + not r24 into r242; + and r241 r242 into r243; + not r25 into r244; + and r243 r244 into r245; + not r26 into r246; + and r245 r246 into r247; + not r27 into r248; + and r247 r248 into r249; + not r28 into r250; + and r249 r250 into r251; + not r29 into r252; + and r251 r252 into r253; + not r30 into r254; + and r253 r254 into r255; + not r31 into r256; + and r255 r256 into r257; + not r32 into r258; + and r257 r258 into r259; + not r33 into r260; + and r259 r260 into r261; + not r34 into r262; + and r261 r262 into r263; + not r35 into r264; + and r263 r264 into r265; + not r36 into r266; + and r265 r266 into r267; + not r37 into r268; + and r267 r268 into r269; + and r269 r38 into r270; + ternary r270 0u8 r196 into r271; + not r1 into r272; + not r2 into r273; and r272 r273 into r274; - not r43 into r275; + not r3 into r275; and r274 r275 into r276; - not r44 into r277; + not r4 into r277; and r276 r277 into r278; - not r45 into r279; + not r5 into r279; and r278 r279 into r280; - not r46 into r281; + not r6 into r281; and r280 r281 into r282; - not r47 into r283; + not r7 into r283; and r282 r283 into r284; - not r48 into r285; + not r8 into r285; and r284 r285 into r286; - not r49 into r287; + not r9 into r287; and r286 r287 into r288; - not r50 into r289; + not r10 into r289; and r288 r289 into r290; - not r51 into r291; + not r11 into r291; and r290 r291 into r292; - not r52 into r293; + not r12 into r293; and r292 r293 into r294; - not r53 into r295; + not r13 into r295; and r294 r295 into r296; - not r54 into r297; + not r14 into r297; and r296 r297 into r298; - not r55 into r299; + not r15 into r299; and r298 r299 into r300; - not r56 into r301; + not r16 into r301; and r300 r301 into r302; - not r57 into r303; + not r17 into r303; and r302 r303 into r304; - not r58 into r305; + not r18 into r305; and r304 r305 into r306; - not r59 into r307; + not r19 into r307; and r306 r307 into r308; - not r60 into r309; + not r20 into r309; and r308 r309 into r310; - not r61 into r311; + not r21 into r311; and r310 r311 into r312; - not r62 into r313; + not r22 into r313; and r312 r313 into r314; - and r314 r63 into r315; - ternary r315 16u8 r191 into r316; - not r1 into r317; - not r2 into r318; - and r317 r318 into r319; - not r3 into r320; - and r319 r320 into r321; - not r4 into r322; - and r321 r322 into r323; - not r5 into r324; - and r323 r324 into r325; - not r6 into r326; - and r325 r326 into r327; - not r7 into r328; - and r327 r328 into r329; - not r8 into r330; - and r329 r330 into r331; - not r9 into r332; - and r331 r332 into r333; - not r10 into r334; - and r333 r334 into r335; - not r11 into r336; - and r335 r336 into r337; - not r12 into r338; - and r337 r338 into r339; - not r13 into r340; - and r339 r340 into r341; - not r14 into r342; - and r341 r342 into r343; - not r15 into r344; - and r343 r344 into r345; - not r16 into r346; + not r23 into r315; + and r314 r315 into r316; + not r24 into r317; + and r316 r317 into r318; + not r25 into r319; + and r318 r319 into r320; + not r26 into r321; + and r320 r321 into r322; + not r27 into r323; + and r322 r323 into r324; + not r28 into r325; + and r324 r325 into r326; + not r29 into r327; + and r326 r327 into r328; + not r30 into r329; + and r328 r329 into r330; + not r31 into r331; + and r330 r331 into r332; + not r32 into r333; + and r332 r333 into r334; + not r33 into r335; + and r334 r335 into r336; + not r34 into r337; + and r336 r337 into r338; + not r35 into r339; + and r338 r339 into r340; + not r36 into r341; + and r340 r341 into r342; + and r342 r37 into r343; + ternary r343 0u8 r271 into r344; + not r1 into r345; + not r2 into r346; and r345 r346 into r347; - not r17 into r348; + not r3 into r348; and r347 r348 into r349; - not r18 into r350; + not r4 into r350; and r349 r350 into r351; - not r19 into r352; + not r5 into r352; and r351 r352 into r353; - not r20 into r354; + not r6 into r354; and r353 r354 into r355; - not r21 into r356; + not r7 into r356; and r355 r356 into r357; - not r22 into r358; + not r8 into r358; and r357 r358 into r359; - not r23 into r360; + not r9 into r360; and r359 r360 into r361; - not r24 into r362; + not r10 into r362; and r361 r362 into r363; - not r25 into r364; + not r11 into r364; and r363 r364 into r365; - not r26 into r366; + not r12 into r366; and r365 r366 into r367; - not r27 into r368; + not r13 into r368; and r367 r368 into r369; - not r28 into r370; + not r14 into r370; and r369 r370 into r371; - not r29 into r372; + not r15 into r372; and r371 r372 into r373; - not r30 into r374; + not r16 into r374; and r373 r374 into r375; - not r31 into r376; + not r17 into r376; and r375 r376 into r377; - not r32 into r378; + not r18 into r378; and r377 r378 into r379; - not r33 into r380; + not r19 into r380; and r379 r380 into r381; - not r34 into r382; + not r20 into r382; and r381 r382 into r383; - not r35 into r384; + not r21 into r384; and r383 r384 into r385; - not r36 into r386; + not r22 into r386; and r385 r386 into r387; - not r37 into r388; + not r23 into r388; and r387 r388 into r389; - not r38 into r390; + not r24 into r390; and r389 r390 into r391; - not r39 into r392; + not r25 into r392; and r391 r392 into r393; - not r40 into r394; + not r26 into r394; and r393 r394 into r395; - not r41 into r396; + not r27 into r396; and r395 r396 into r397; - not r42 into r398; + not r28 into r398; and r397 r398 into r399; - not r43 into r400; + not r29 into r400; and r399 r400 into r401; - not r44 into r402; + not r30 into r402; and r401 r402 into r403; - not r45 into r404; + not r31 into r404; and r403 r404 into r405; - not r46 into r406; + not r32 into r406; and r405 r406 into r407; - not r47 into r408; + not r33 into r408; and r407 r408 into r409; - not r48 into r410; + not r34 into r410; and r409 r410 into r411; - not r49 into r412; + not r35 into r412; and r411 r412 into r413; - not r50 into r414; - and r413 r414 into r415; - not r51 into r416; - and r415 r416 into r417; - not r52 into r418; - and r417 r418 into r419; - not r53 into r420; - and r419 r420 into r421; - not r54 into r422; - and r421 r422 into r423; - not r55 into r424; - and r423 r424 into r425; - not r56 into r426; - and r425 r426 into r427; - not r57 into r428; - and r427 r428 into r429; - not r58 into r430; - and r429 r430 into r431; - not r59 into r432; - and r431 r432 into r433; - not r60 into r434; - and r433 r434 into r435; - not r61 into r436; - and r435 r436 into r437; - and r437 r62 into r438; - ternary r438 17u8 r316 into r439; - not r1 into r440; - not r2 into r441; + and r413 r36 into r414; + ternary r414 0u8 r344 into r415; + not r1 into r416; + not r2 into r417; + and r416 r417 into r418; + not r3 into r419; + and r418 r419 into r420; + not r4 into r421; + and r420 r421 into r422; + not r5 into r423; + and r422 r423 into r424; + not r6 into r425; + and r424 r425 into r426; + not r7 into r427; + and r426 r427 into r428; + not r8 into r429; + and r428 r429 into r430; + not r9 into r431; + and r430 r431 into r432; + not r10 into r433; + and r432 r433 into r434; + not r11 into r435; + and r434 r435 into r436; + not r12 into r437; + and r436 r437 into r438; + not r13 into r439; + and r438 r439 into r440; + not r14 into r441; and r440 r441 into r442; - not r3 into r443; + not r15 into r443; and r442 r443 into r444; - not r4 into r445; + not r16 into r445; and r444 r445 into r446; - not r5 into r447; + not r17 into r447; and r446 r447 into r448; - not r6 into r449; + not r18 into r449; and r448 r449 into r450; - not r7 into r451; + not r19 into r451; and r450 r451 into r452; - not r8 into r453; + not r20 into r453; and r452 r453 into r454; - not r9 into r455; + not r21 into r455; and r454 r455 into r456; - not r10 into r457; + not r22 into r457; and r456 r457 into r458; - not r11 into r459; + not r23 into r459; and r458 r459 into r460; - not r12 into r461; + not r24 into r461; and r460 r461 into r462; - not r13 into r463; + not r25 into r463; and r462 r463 into r464; - not r14 into r465; + not r26 into r465; and r464 r465 into r466; - not r15 into r467; + not r27 into r467; and r466 r467 into r468; - not r16 into r469; + not r28 into r469; and r468 r469 into r470; - not r17 into r471; + not r29 into r471; and r470 r471 into r472; - not r18 into r473; + not r30 into r473; and r472 r473 into r474; - not r19 into r475; + not r31 into r475; and r474 r475 into r476; - not r20 into r477; + not r32 into r477; and r476 r477 into r478; - not r21 into r479; + not r33 into r479; and r478 r479 into r480; - not r22 into r481; + not r34 into r481; and r480 r481 into r482; - not r23 into r483; - and r482 r483 into r484; - not r24 into r485; - and r484 r485 into r486; - not r25 into r487; - and r486 r487 into r488; - not r26 into r489; - and r488 r489 into r490; - not r27 into r491; - and r490 r491 into r492; - not r28 into r493; - and r492 r493 into r494; - not r29 into r495; - and r494 r495 into r496; - not r30 into r497; - and r496 r497 into r498; - not r31 into r499; - and r498 r499 into r500; - not r32 into r501; - and r500 r501 into r502; - not r33 into r503; - and r502 r503 into r504; - not r34 into r505; - and r504 r505 into r506; - not r35 into r507; - and r506 r507 into r508; - not r36 into r509; - and r508 r509 into r510; - not r37 into r511; - and r510 r511 into r512; - not r38 into r513; - and r512 r513 into r514; - not r39 into r515; - and r514 r515 into r516; - not r40 into r517; - and r516 r517 into r518; - not r41 into r519; - and r518 r519 into r520; - not r42 into r521; - and r520 r521 into r522; - not r43 into r523; - and r522 r523 into r524; - not r44 into r525; - and r524 r525 into r526; - not r45 into r527; - and r526 r527 into r528; - not r46 into r529; - and r528 r529 into r530; - not r47 into r531; - and r530 r531 into r532; - not r48 into r533; - and r532 r533 into r534; - not r49 into r535; - and r534 r535 into r536; - not r50 into r537; - and r536 r537 into r538; - not r51 into r539; - and r538 r539 into r540; - not r52 into r541; - and r540 r541 into r542; - not r53 into r543; - and r542 r543 into r544; - not r54 into r545; - and r544 r545 into r546; - not r55 into r547; - and r546 r547 into r548; - not r56 into r549; - and r548 r549 into r550; - not r57 into r551; - and r550 r551 into r552; - not r58 into r553; + and r482 r35 into r483; + ternary r483 5u8 r415 into r484; + not r1 into r485; + not r2 into r486; + and r485 r486 into r487; + not r3 into r488; + and r487 r488 into r489; + not r4 into r490; + and r489 r490 into r491; + not r5 into r492; + and r491 r492 into r493; + not r6 into r494; + and r493 r494 into r495; + not r7 into r496; + and r495 r496 into r497; + not r8 into r498; + and r497 r498 into r499; + not r9 into r500; + and r499 r500 into r501; + not r10 into r502; + and r501 r502 into r503; + not r11 into r504; + and r503 r504 into r505; + not r12 into r506; + and r505 r506 into r507; + not r13 into r508; + and r507 r508 into r509; + not r14 into r510; + and r509 r510 into r511; + not r15 into r512; + and r511 r512 into r513; + not r16 into r514; + and r513 r514 into r515; + not r17 into r516; + and r515 r516 into r517; + not r18 into r518; + and r517 r518 into r519; + not r19 into r520; + and r519 r520 into r521; + not r20 into r522; + and r521 r522 into r523; + not r21 into r524; + and r523 r524 into r525; + not r22 into r526; + and r525 r526 into r527; + not r23 into r528; + and r527 r528 into r529; + not r24 into r530; + and r529 r530 into r531; + not r25 into r532; + and r531 r532 into r533; + not r26 into r534; + and r533 r534 into r535; + not r27 into r536; + and r535 r536 into r537; + not r28 into r538; + and r537 r538 into r539; + not r29 into r540; + and r539 r540 into r541; + not r30 into r542; + and r541 r542 into r543; + not r31 into r544; + and r543 r544 into r545; + not r32 into r546; + and r545 r546 into r547; + not r33 into r548; + and r547 r548 into r549; + and r549 r34 into r550; + ternary r550 11u8 r484 into r551; + not r1 into r552; + not r2 into r553; and r552 r553 into r554; - not r59 into r555; + not r3 into r555; and r554 r555 into r556; - not r60 into r557; + not r4 into r557; and r556 r557 into r558; - and r558 r61 into r559; - ternary r559 28u8 r439 into r560; - not r1 into r561; - not r2 into r562; - and r561 r562 into r563; - not r3 into r564; - and r563 r564 into r565; - not r4 into r566; - and r565 r566 into r567; - not r5 into r568; - and r567 r568 into r569; - not r6 into r570; - and r569 r570 into r571; - not r7 into r572; - and r571 r572 into r573; - not r8 into r574; - and r573 r574 into r575; - not r9 into r576; - and r575 r576 into r577; - not r10 into r578; - and r577 r578 into r579; - not r11 into r580; - and r579 r580 into r581; - not r12 into r582; - and r581 r582 into r583; - not r13 into r584; - and r583 r584 into r585; - not r14 into r586; - and r585 r586 into r587; - not r15 into r588; - and r587 r588 into r589; - not r16 into r590; - and r589 r590 into r591; - not r17 into r592; - and r591 r592 into r593; - not r18 into r594; - and r593 r594 into r595; - not r19 into r596; - and r595 r596 into r597; - not r20 into r598; - and r597 r598 into r599; - not r21 into r600; - and r599 r600 into r601; - not r22 into r602; - and r601 r602 into r603; - not r23 into r604; - and r603 r604 into r605; - not r24 into r606; - and r605 r606 into r607; - not r25 into r608; - and r607 r608 into r609; - not r26 into r610; - and r609 r610 into r611; - not r27 into r612; - and r611 r612 into r613; - not r28 into r614; - and r613 r614 into r615; - not r29 into r616; - and r615 r616 into r617; - not r30 into r618; + not r5 into r559; + and r558 r559 into r560; + not r6 into r561; + and r560 r561 into r562; + not r7 into r563; + and r562 r563 into r564; + not r8 into r565; + and r564 r565 into r566; + not r9 into r567; + and r566 r567 into r568; + not r10 into r569; + and r568 r569 into r570; + not r11 into r571; + and r570 r571 into r572; + not r12 into r573; + and r572 r573 into r574; + not r13 into r575; + and r574 r575 into r576; + not r14 into r577; + and r576 r577 into r578; + not r15 into r579; + and r578 r579 into r580; + not r16 into r581; + and r580 r581 into r582; + not r17 into r583; + and r582 r583 into r584; + not r18 into r585; + and r584 r585 into r586; + not r19 into r587; + and r586 r587 into r588; + not r20 into r589; + and r588 r589 into r590; + not r21 into r591; + and r590 r591 into r592; + not r22 into r593; + and r592 r593 into r594; + not r23 into r595; + and r594 r595 into r596; + not r24 into r597; + and r596 r597 into r598; + not r25 into r599; + and r598 r599 into r600; + not r26 into r601; + and r600 r601 into r602; + not r27 into r603; + and r602 r603 into r604; + not r28 into r605; + and r604 r605 into r606; + not r29 into r607; + and r606 r607 into r608; + not r30 into r609; + and r608 r609 into r610; + not r31 into r611; + and r610 r611 into r612; + not r32 into r613; + and r612 r613 into r614; + and r614 r33 into r615; + ternary r615 31u8 r551 into r616; + not r1 into r617; + not r2 into r618; and r617 r618 into r619; - not r31 into r620; + not r3 into r620; and r619 r620 into r621; - not r32 into r622; + not r4 into r622; and r621 r622 into r623; - not r33 into r624; + not r5 into r624; and r623 r624 into r625; - not r34 into r626; + not r6 into r626; and r625 r626 into r627; - not r35 into r628; + not r7 into r628; and r627 r628 into r629; - not r36 into r630; + not r8 into r630; and r629 r630 into r631; - not r37 into r632; + not r9 into r632; and r631 r632 into r633; - not r38 into r634; + not r10 into r634; and r633 r634 into r635; - not r39 into r636; + not r11 into r636; and r635 r636 into r637; - not r40 into r638; + not r12 into r638; and r637 r638 into r639; - not r41 into r640; + not r13 into r640; and r639 r640 into r641; - not r42 into r642; + not r14 into r642; and r641 r642 into r643; - not r43 into r644; + not r15 into r644; and r643 r644 into r645; - not r44 into r646; + not r16 into r646; and r645 r646 into r647; - not r45 into r648; + not r17 into r648; and r647 r648 into r649; - not r46 into r650; + not r18 into r650; and r649 r650 into r651; - not r47 into r652; + not r19 into r652; and r651 r652 into r653; - not r48 into r654; + not r20 into r654; and r653 r654 into r655; - not r49 into r656; + not r21 into r656; and r655 r656 into r657; - not r50 into r658; + not r22 into r658; and r657 r658 into r659; - not r51 into r660; + not r23 into r660; and r659 r660 into r661; - not r52 into r662; + not r24 into r662; and r661 r662 into r663; - not r53 into r664; + not r25 into r664; and r663 r664 into r665; - not r54 into r666; + not r26 into r666; and r665 r666 into r667; - not r55 into r668; + not r27 into r668; and r667 r668 into r669; - not r56 into r670; + not r28 into r670; and r669 r670 into r671; - not r57 into r672; + not r29 into r672; and r671 r672 into r673; - not r58 into r674; + not r30 into r674; and r673 r674 into r675; - not r59 into r676; + not r31 into r676; and r675 r676 into r677; - and r677 r60 into r678; - ternary r678 18u8 r560 into r679; + and r677 r32 into r678; + ternary r678 15u8 r616 into r679; not r1 into r680; not r2 into r681; and r680 r681 into r682; @@ -742,179 +742,179 @@ closure sealsTableLookup: and r734 r735 into r736; not r30 into r737; and r736 r737 into r738; - not r31 into r739; - and r738 r739 into r740; - not r32 into r741; - and r740 r741 into r742; - not r33 into r743; - and r742 r743 into r744; - not r34 into r745; - and r744 r745 into r746; - not r35 into r747; - and r746 r747 into r748; - not r36 into r749; - and r748 r749 into r750; - not r37 into r751; - and r750 r751 into r752; - not r38 into r753; - and r752 r753 into r754; - not r39 into r755; - and r754 r755 into r756; - not r40 into r757; - and r756 r757 into r758; - not r41 into r759; - and r758 r759 into r760; - not r42 into r761; - and r760 r761 into r762; - not r43 into r763; - and r762 r763 into r764; - not r44 into r765; - and r764 r765 into r766; - not r45 into r767; - and r766 r767 into r768; - not r46 into r769; - and r768 r769 into r770; - not r47 into r771; - and r770 r771 into r772; - not r48 into r773; - and r772 r773 into r774; - not r49 into r775; - and r774 r775 into r776; - not r50 into r777; - and r776 r777 into r778; - not r51 into r779; - and r778 r779 into r780; - not r52 into r781; - and r780 r781 into r782; - not r53 into r783; - and r782 r783 into r784; - not r54 into r785; - and r784 r785 into r786; - not r55 into r787; - and r786 r787 into r788; - not r56 into r789; - and r788 r789 into r790; - not r57 into r791; - and r790 r791 into r792; - not r58 into r793; - and r792 r793 into r794; - and r794 r59 into r795; - ternary r795 22u8 r679 into r796; - not r1 into r797; - not r2 into r798; - and r797 r798 into r799; - not r3 into r800; - and r799 r800 into r801; - not r4 into r802; - and r801 r802 into r803; - not r5 into r804; - and r803 r804 into r805; - not r6 into r806; - and r805 r806 into r807; - not r7 into r808; - and r807 r808 into r809; - not r8 into r810; - and r809 r810 into r811; - not r9 into r812; - and r811 r812 into r813; - not r10 into r814; - and r813 r814 into r815; - not r11 into r816; - and r815 r816 into r817; - not r12 into r818; - and r817 r818 into r819; - not r13 into r820; - and r819 r820 into r821; - not r14 into r822; - and r821 r822 into r823; - not r15 into r824; - and r823 r824 into r825; - not r16 into r826; - and r825 r826 into r827; - not r17 into r828; - and r827 r828 into r829; - not r18 into r830; - and r829 r830 into r831; - not r19 into r832; - and r831 r832 into r833; - not r20 into r834; - and r833 r834 into r835; - not r21 into r836; - and r835 r836 into r837; - not r22 into r838; - and r837 r838 into r839; - not r23 into r840; - and r839 r840 into r841; - not r24 into r842; - and r841 r842 into r843; - not r25 into r844; - and r843 r844 into r845; - not r26 into r846; - and r845 r846 into r847; - not r27 into r848; - and r847 r848 into r849; - not r28 into r850; - and r849 r850 into r851; - not r29 into r852; - and r851 r852 into r853; - not r30 into r854; - and r853 r854 into r855; - not r31 into r856; - and r855 r856 into r857; - not r32 into r858; + and r738 r31 into r739; + ternary r739 27u8 r679 into r740; + not r1 into r741; + not r2 into r742; + and r741 r742 into r743; + not r3 into r744; + and r743 r744 into r745; + not r4 into r746; + and r745 r746 into r747; + not r5 into r748; + and r747 r748 into r749; + not r6 into r750; + and r749 r750 into r751; + not r7 into r752; + and r751 r752 into r753; + not r8 into r754; + and r753 r754 into r755; + not r9 into r756; + and r755 r756 into r757; + not r10 into r758; + and r757 r758 into r759; + not r11 into r760; + and r759 r760 into r761; + not r12 into r762; + and r761 r762 into r763; + not r13 into r764; + and r763 r764 into r765; + not r14 into r766; + and r765 r766 into r767; + not r15 into r768; + and r767 r768 into r769; + not r16 into r770; + and r769 r770 into r771; + not r17 into r772; + and r771 r772 into r773; + not r18 into r774; + and r773 r774 into r775; + not r19 into r776; + and r775 r776 into r777; + not r20 into r778; + and r777 r778 into r779; + not r21 into r780; + and r779 r780 into r781; + not r22 into r782; + and r781 r782 into r783; + not r23 into r784; + and r783 r784 into r785; + not r24 into r786; + and r785 r786 into r787; + not r25 into r788; + and r787 r788 into r789; + not r26 into r790; + and r789 r790 into r791; + not r27 into r792; + and r791 r792 into r793; + not r28 into r794; + and r793 r794 into r795; + not r29 into r796; + and r795 r796 into r797; + and r797 r30 into r798; + ternary r798 21u8 r740 into r799; + not r1 into r800; + not r2 into r801; + and r800 r801 into r802; + not r3 into r803; + and r802 r803 into r804; + not r4 into r805; + and r804 r805 into r806; + not r5 into r807; + and r806 r807 into r808; + not r6 into r809; + and r808 r809 into r810; + not r7 into r811; + and r810 r811 into r812; + not r8 into r813; + and r812 r813 into r814; + not r9 into r815; + and r814 r815 into r816; + not r10 into r817; + and r816 r817 into r818; + not r11 into r819; + and r818 r819 into r820; + not r12 into r821; + and r820 r821 into r822; + not r13 into r823; + and r822 r823 into r824; + not r14 into r825; + and r824 r825 into r826; + not r15 into r827; + and r826 r827 into r828; + not r16 into r829; + and r828 r829 into r830; + not r17 into r831; + and r830 r831 into r832; + not r18 into r833; + and r832 r833 into r834; + not r19 into r835; + and r834 r835 into r836; + not r20 into r837; + and r836 r837 into r838; + not r21 into r839; + and r838 r839 into r840; + not r22 into r841; + and r840 r841 into r842; + not r23 into r843; + and r842 r843 into r844; + not r24 into r845; + and r844 r845 into r846; + not r25 into r847; + and r846 r847 into r848; + not r26 into r849; + and r848 r849 into r850; + not r27 into r851; + and r850 r851 into r852; + not r28 into r853; + and r852 r853 into r854; + and r854 r29 into r855; + ternary r855 0u8 r799 into r856; + not r1 into r857; + not r2 into r858; and r857 r858 into r859; - not r33 into r860; + not r3 into r860; and r859 r860 into r861; - not r34 into r862; + not r4 into r862; and r861 r862 into r863; - not r35 into r864; + not r5 into r864; and r863 r864 into r865; - not r36 into r866; + not r6 into r866; and r865 r866 into r867; - not r37 into r868; + not r7 into r868; and r867 r868 into r869; - not r38 into r870; + not r8 into r870; and r869 r870 into r871; - not r39 into r872; + not r9 into r872; and r871 r872 into r873; - not r40 into r874; + not r10 into r874; and r873 r874 into r875; - not r41 into r876; + not r11 into r876; and r875 r876 into r877; - not r42 into r878; + not r12 into r878; and r877 r878 into r879; - not r43 into r880; + not r13 into r880; and r879 r880 into r881; - not r44 into r882; + not r14 into r882; and r881 r882 into r883; - not r45 into r884; + not r15 into r884; and r883 r884 into r885; - not r46 into r886; + not r16 into r886; and r885 r886 into r887; - not r47 into r888; + not r17 into r888; and r887 r888 into r889; - not r48 into r890; + not r18 into r890; and r889 r890 into r891; - not r49 into r892; + not r19 into r892; and r891 r892 into r893; - not r50 into r894; + not r20 into r894; and r893 r894 into r895; - not r51 into r896; + not r21 into r896; and r895 r896 into r897; - not r52 into r898; + not r22 into r898; and r897 r898 into r899; - not r53 into r900; + not r23 into r900; and r899 r900 into r901; - not r54 into r902; + not r24 into r902; and r901 r902 into r903; - not r55 into r904; + not r25 into r904; and r903 r904 into r905; - not r56 into r906; + not r26 into r906; and r905 r906 into r907; - not r57 into r908; + not r27 into r908; and r907 r908 into r909; - and r909 r58 into r910; - ternary r910 0u8 r796 into r911; + and r909 r28 into r910; + ternary r910 0u8 r856 into r911; not r1 into r912; not r2 into r913; and r912 r913 into r914; @@ -966,395 +966,395 @@ closure sealsTableLookup: and r958 r959 into r960; not r26 into r961; and r960 r961 into r962; - not r27 into r963; - and r962 r963 into r964; - not r28 into r965; - and r964 r965 into r966; - not r29 into r967; - and r966 r967 into r968; - not r30 into r969; - and r968 r969 into r970; - not r31 into r971; - and r970 r971 into r972; - not r32 into r973; - and r972 r973 into r974; - not r33 into r975; - and r974 r975 into r976; - not r34 into r977; - and r976 r977 into r978; - not r35 into r979; - and r978 r979 into r980; - not r36 into r981; - and r980 r981 into r982; - not r37 into r983; - and r982 r983 into r984; - not r38 into r985; - and r984 r985 into r986; - not r39 into r987; - and r986 r987 into r988; - not r40 into r989; - and r988 r989 into r990; - not r41 into r991; - and r990 r991 into r992; - not r42 into r993; - and r992 r993 into r994; - not r43 into r995; - and r994 r995 into r996; - not r44 into r997; - and r996 r997 into r998; - not r45 into r999; - and r998 r999 into r1000; - not r46 into r1001; - and r1000 r1001 into r1002; - not r47 into r1003; - and r1002 r1003 into r1004; - not r48 into r1005; - and r1004 r1005 into r1006; - not r49 into r1007; - and r1006 r1007 into r1008; - not r50 into r1009; - and r1008 r1009 into r1010; - not r51 into r1011; - and r1010 r1011 into r1012; - not r52 into r1013; - and r1012 r1013 into r1014; - not r53 into r1015; - and r1014 r1015 into r1016; - not r54 into r1017; + and r962 r27 into r963; + ternary r963 0u8 r911 into r964; + not r1 into r965; + not r2 into r966; + and r965 r966 into r967; + not r3 into r968; + and r967 r968 into r969; + not r4 into r970; + and r969 r970 into r971; + not r5 into r972; + and r971 r972 into r973; + not r6 into r974; + and r973 r974 into r975; + not r7 into r976; + and r975 r976 into r977; + not r8 into r978; + and r977 r978 into r979; + not r9 into r980; + and r979 r980 into r981; + not r10 into r982; + and r981 r982 into r983; + not r11 into r984; + and r983 r984 into r985; + not r12 into r986; + and r985 r986 into r987; + not r13 into r988; + and r987 r988 into r989; + not r14 into r990; + and r989 r990 into r991; + not r15 into r992; + and r991 r992 into r993; + not r16 into r994; + and r993 r994 into r995; + not r17 into r996; + and r995 r996 into r997; + not r18 into r998; + and r997 r998 into r999; + not r19 into r1000; + and r999 r1000 into r1001; + not r20 into r1002; + and r1001 r1002 into r1003; + not r21 into r1004; + and r1003 r1004 into r1005; + not r22 into r1006; + and r1005 r1006 into r1007; + not r23 into r1008; + and r1007 r1008 into r1009; + not r24 into r1010; + and r1009 r1010 into r1011; + not r25 into r1012; + and r1011 r1012 into r1013; + and r1013 r26 into r1014; + ternary r1014 0u8 r964 into r1015; + not r1 into r1016; + not r2 into r1017; and r1016 r1017 into r1018; - not r55 into r1019; + not r3 into r1019; and r1018 r1019 into r1020; - not r56 into r1021; + not r4 into r1021; and r1020 r1021 into r1022; - and r1022 r57 into r1023; - ternary r1023 29u8 r911 into r1024; - not r1 into r1025; - not r2 into r1026; - and r1025 r1026 into r1027; - not r3 into r1028; - and r1027 r1028 into r1029; - not r4 into r1030; - and r1029 r1030 into r1031; - not r5 into r1032; - and r1031 r1032 into r1033; - not r6 into r1034; - and r1033 r1034 into r1035; - not r7 into r1036; - and r1035 r1036 into r1037; - not r8 into r1038; - and r1037 r1038 into r1039; - not r9 into r1040; - and r1039 r1040 into r1041; - not r10 into r1042; - and r1041 r1042 into r1043; - not r11 into r1044; - and r1043 r1044 into r1045; - not r12 into r1046; - and r1045 r1046 into r1047; - not r13 into r1048; - and r1047 r1048 into r1049; - not r14 into r1050; - and r1049 r1050 into r1051; - not r15 into r1052; - and r1051 r1052 into r1053; - not r16 into r1054; - and r1053 r1054 into r1055; - not r17 into r1056; - and r1055 r1056 into r1057; - not r18 into r1058; - and r1057 r1058 into r1059; - not r19 into r1060; - and r1059 r1060 into r1061; - not r20 into r1062; - and r1061 r1062 into r1063; - not r21 into r1064; - and r1063 r1064 into r1065; - not r22 into r1066; + not r5 into r1023; + and r1022 r1023 into r1024; + not r6 into r1025; + and r1024 r1025 into r1026; + not r7 into r1027; + and r1026 r1027 into r1028; + not r8 into r1029; + and r1028 r1029 into r1030; + not r9 into r1031; + and r1030 r1031 into r1032; + not r10 into r1033; + and r1032 r1033 into r1034; + not r11 into r1035; + and r1034 r1035 into r1036; + not r12 into r1037; + and r1036 r1037 into r1038; + not r13 into r1039; + and r1038 r1039 into r1040; + not r14 into r1041; + and r1040 r1041 into r1042; + not r15 into r1043; + and r1042 r1043 into r1044; + not r16 into r1045; + and r1044 r1045 into r1046; + not r17 into r1047; + and r1046 r1047 into r1048; + not r18 into r1049; + and r1048 r1049 into r1050; + not r19 into r1051; + and r1050 r1051 into r1052; + not r20 into r1053; + and r1052 r1053 into r1054; + not r21 into r1055; + and r1054 r1055 into r1056; + not r22 into r1057; + and r1056 r1057 into r1058; + not r23 into r1059; + and r1058 r1059 into r1060; + not r24 into r1061; + and r1060 r1061 into r1062; + and r1062 r25 into r1063; + ternary r1063 0u8 r1015 into r1064; + not r1 into r1065; + not r2 into r1066; and r1065 r1066 into r1067; - not r23 into r1068; + not r3 into r1068; and r1067 r1068 into r1069; - not r24 into r1070; + not r4 into r1070; and r1069 r1070 into r1071; - not r25 into r1072; + not r5 into r1072; and r1071 r1072 into r1073; - not r26 into r1074; + not r6 into r1074; and r1073 r1074 into r1075; - not r27 into r1076; + not r7 into r1076; and r1075 r1076 into r1077; - not r28 into r1078; + not r8 into r1078; and r1077 r1078 into r1079; - not r29 into r1080; + not r9 into r1080; and r1079 r1080 into r1081; - not r30 into r1082; + not r10 into r1082; and r1081 r1082 into r1083; - not r31 into r1084; + not r11 into r1084; and r1083 r1084 into r1085; - not r32 into r1086; + not r12 into r1086; and r1085 r1086 into r1087; - not r33 into r1088; + not r13 into r1088; and r1087 r1088 into r1089; - not r34 into r1090; + not r14 into r1090; and r1089 r1090 into r1091; - not r35 into r1092; + not r15 into r1092; and r1091 r1092 into r1093; - not r36 into r1094; + not r16 into r1094; and r1093 r1094 into r1095; - not r37 into r1096; + not r17 into r1096; and r1095 r1096 into r1097; - not r38 into r1098; + not r18 into r1098; and r1097 r1098 into r1099; - not r39 into r1100; + not r19 into r1100; and r1099 r1100 into r1101; - not r40 into r1102; + not r20 into r1102; and r1101 r1102 into r1103; - not r41 into r1104; + not r21 into r1104; and r1103 r1104 into r1105; - not r42 into r1106; + not r22 into r1106; and r1105 r1106 into r1107; - not r43 into r1108; + not r23 into r1108; and r1107 r1108 into r1109; - not r44 into r1110; - and r1109 r1110 into r1111; - not r45 into r1112; - and r1111 r1112 into r1113; - not r46 into r1114; - and r1113 r1114 into r1115; - not r47 into r1116; - and r1115 r1116 into r1117; - not r48 into r1118; - and r1117 r1118 into r1119; - not r49 into r1120; - and r1119 r1120 into r1121; - not r50 into r1122; - and r1121 r1122 into r1123; - not r51 into r1124; - and r1123 r1124 into r1125; - not r52 into r1126; - and r1125 r1126 into r1127; - not r53 into r1128; - and r1127 r1128 into r1129; - not r54 into r1130; - and r1129 r1130 into r1131; - not r55 into r1132; - and r1131 r1132 into r1133; - and r1133 r56 into r1134; - ternary r1134 19u8 r1024 into r1135; - not r1 into r1136; - not r2 into r1137; + and r1109 r24 into r1110; + ternary r1110 25u8 r1064 into r1111; + not r1 into r1112; + not r2 into r1113; + and r1112 r1113 into r1114; + not r3 into r1115; + and r1114 r1115 into r1116; + not r4 into r1117; + and r1116 r1117 into r1118; + not r5 into r1119; + and r1118 r1119 into r1120; + not r6 into r1121; + and r1120 r1121 into r1122; + not r7 into r1123; + and r1122 r1123 into r1124; + not r8 into r1125; + and r1124 r1125 into r1126; + not r9 into r1127; + and r1126 r1127 into r1128; + not r10 into r1129; + and r1128 r1129 into r1130; + not r11 into r1131; + and r1130 r1131 into r1132; + not r12 into r1133; + and r1132 r1133 into r1134; + not r13 into r1135; + and r1134 r1135 into r1136; + not r14 into r1137; and r1136 r1137 into r1138; - not r3 into r1139; + not r15 into r1139; and r1138 r1139 into r1140; - not r4 into r1141; + not r16 into r1141; and r1140 r1141 into r1142; - not r5 into r1143; + not r17 into r1143; and r1142 r1143 into r1144; - not r6 into r1145; + not r18 into r1145; and r1144 r1145 into r1146; - not r7 into r1147; + not r19 into r1147; and r1146 r1147 into r1148; - not r8 into r1149; + not r20 into r1149; and r1148 r1149 into r1150; - not r9 into r1151; + not r21 into r1151; and r1150 r1151 into r1152; - not r10 into r1153; + not r22 into r1153; and r1152 r1153 into r1154; - not r11 into r1155; - and r1154 r1155 into r1156; - not r12 into r1157; - and r1156 r1157 into r1158; - not r13 into r1159; - and r1158 r1159 into r1160; - not r14 into r1161; - and r1160 r1161 into r1162; - not r15 into r1163; - and r1162 r1163 into r1164; - not r16 into r1165; - and r1164 r1165 into r1166; - not r17 into r1167; - and r1166 r1167 into r1168; - not r18 into r1169; - and r1168 r1169 into r1170; - not r19 into r1171; - and r1170 r1171 into r1172; - not r20 into r1173; - and r1172 r1173 into r1174; - not r21 into r1175; - and r1174 r1175 into r1176; - not r22 into r1177; - and r1176 r1177 into r1178; - not r23 into r1179; - and r1178 r1179 into r1180; - not r24 into r1181; - and r1180 r1181 into r1182; - not r25 into r1183; - and r1182 r1183 into r1184; - not r26 into r1185; - and r1184 r1185 into r1186; - not r27 into r1187; - and r1186 r1187 into r1188; - not r28 into r1189; - and r1188 r1189 into r1190; - not r29 into r1191; - and r1190 r1191 into r1192; - not r30 into r1193; - and r1192 r1193 into r1194; - not r31 into r1195; - and r1194 r1195 into r1196; - not r32 into r1197; - and r1196 r1197 into r1198; - not r33 into r1199; - and r1198 r1199 into r1200; - not r34 into r1201; + and r1154 r23 into r1155; + ternary r1155 0u8 r1111 into r1156; + not r1 into r1157; + not r2 into r1158; + and r1157 r1158 into r1159; + not r3 into r1160; + and r1159 r1160 into r1161; + not r4 into r1162; + and r1161 r1162 into r1163; + not r5 into r1164; + and r1163 r1164 into r1165; + not r6 into r1166; + and r1165 r1166 into r1167; + not r7 into r1168; + and r1167 r1168 into r1169; + not r8 into r1170; + and r1169 r1170 into r1171; + not r9 into r1172; + and r1171 r1172 into r1173; + not r10 into r1174; + and r1173 r1174 into r1175; + not r11 into r1176; + and r1175 r1176 into r1177; + not r12 into r1178; + and r1177 r1178 into r1179; + not r13 into r1180; + and r1179 r1180 into r1181; + not r14 into r1182; + and r1181 r1182 into r1183; + not r15 into r1184; + and r1183 r1184 into r1185; + not r16 into r1186; + and r1185 r1186 into r1187; + not r17 into r1188; + and r1187 r1188 into r1189; + not r18 into r1190; + and r1189 r1190 into r1191; + not r19 into r1192; + and r1191 r1192 into r1193; + not r20 into r1194; + and r1193 r1194 into r1195; + not r21 into r1196; + and r1195 r1196 into r1197; + and r1197 r22 into r1198; + ternary r1198 0u8 r1156 into r1199; + not r1 into r1200; + not r2 into r1201; and r1200 r1201 into r1202; - not r35 into r1203; + not r3 into r1203; and r1202 r1203 into r1204; - not r36 into r1205; + not r4 into r1205; and r1204 r1205 into r1206; - not r37 into r1207; + not r5 into r1207; and r1206 r1207 into r1208; - not r38 into r1209; + not r6 into r1209; and r1208 r1209 into r1210; - not r39 into r1211; + not r7 into r1211; and r1210 r1211 into r1212; - not r40 into r1213; + not r8 into r1213; and r1212 r1213 into r1214; - not r41 into r1215; + not r9 into r1215; and r1214 r1215 into r1216; - not r42 into r1217; + not r10 into r1217; and r1216 r1217 into r1218; - not r43 into r1219; + not r11 into r1219; and r1218 r1219 into r1220; - not r44 into r1221; + not r12 into r1221; and r1220 r1221 into r1222; - not r45 into r1223; + not r13 into r1223; and r1222 r1223 into r1224; - not r46 into r1225; + not r14 into r1225; and r1224 r1225 into r1226; - not r47 into r1227; + not r15 into r1227; and r1226 r1227 into r1228; - not r48 into r1229; + not r16 into r1229; and r1228 r1229 into r1230; - not r49 into r1231; + not r17 into r1231; and r1230 r1231 into r1232; - not r50 into r1233; + not r18 into r1233; and r1232 r1233 into r1234; - not r51 into r1235; + not r19 into r1235; and r1234 r1235 into r1236; - not r52 into r1237; + not r20 into r1237; and r1236 r1237 into r1238; - not r53 into r1239; - and r1238 r1239 into r1240; - not r54 into r1241; - and r1240 r1241 into r1242; - and r1242 r55 into r1243; - ternary r1243 0u8 r1135 into r1244; - not r1 into r1245; - not r2 into r1246; + and r1238 r21 into r1239; + ternary r1239 8u8 r1199 into r1240; + not r1 into r1241; + not r2 into r1242; + and r1241 r1242 into r1243; + not r3 into r1244; + and r1243 r1244 into r1245; + not r4 into r1246; and r1245 r1246 into r1247; - not r3 into r1248; + not r5 into r1248; and r1247 r1248 into r1249; - not r4 into r1250; + not r6 into r1250; and r1249 r1250 into r1251; - not r5 into r1252; + not r7 into r1252; and r1251 r1252 into r1253; - not r6 into r1254; + not r8 into r1254; and r1253 r1254 into r1255; - not r7 into r1256; + not r9 into r1256; and r1255 r1256 into r1257; - not r8 into r1258; + not r10 into r1258; and r1257 r1258 into r1259; - not r9 into r1260; + not r11 into r1260; and r1259 r1260 into r1261; - not r10 into r1262; + not r12 into r1262; and r1261 r1262 into r1263; - not r11 into r1264; + not r13 into r1264; and r1263 r1264 into r1265; - not r12 into r1266; + not r14 into r1266; and r1265 r1266 into r1267; - not r13 into r1268; + not r15 into r1268; and r1267 r1268 into r1269; - not r14 into r1270; + not r16 into r1270; and r1269 r1270 into r1271; - not r15 into r1272; + not r17 into r1272; and r1271 r1272 into r1273; - not r16 into r1274; + not r18 into r1274; and r1273 r1274 into r1275; - not r17 into r1276; + not r19 into r1276; and r1275 r1276 into r1277; - not r18 into r1278; - and r1277 r1278 into r1279; - not r19 into r1280; - and r1279 r1280 into r1281; - not r20 into r1282; - and r1281 r1282 into r1283; - not r21 into r1284; - and r1283 r1284 into r1285; - not r22 into r1286; - and r1285 r1286 into r1287; - not r23 into r1288; - and r1287 r1288 into r1289; - not r24 into r1290; - and r1289 r1290 into r1291; - not r25 into r1292; - and r1291 r1292 into r1293; - not r26 into r1294; - and r1293 r1294 into r1295; - not r27 into r1296; - and r1295 r1296 into r1297; - not r28 into r1298; - and r1297 r1298 into r1299; - not r29 into r1300; - and r1299 r1300 into r1301; - not r30 into r1302; - and r1301 r1302 into r1303; - not r31 into r1304; - and r1303 r1304 into r1305; - not r32 into r1306; - and r1305 r1306 into r1307; - not r33 into r1308; - and r1307 r1308 into r1309; - not r34 into r1310; - and r1309 r1310 into r1311; - not r35 into r1312; - and r1311 r1312 into r1313; - not r36 into r1314; - and r1313 r1314 into r1315; - not r37 into r1316; - and r1315 r1316 into r1317; - not r38 into r1318; + and r1277 r20 into r1278; + ternary r1278 0u8 r1240 into r1279; + not r1 into r1280; + not r2 into r1281; + and r1280 r1281 into r1282; + not r3 into r1283; + and r1282 r1283 into r1284; + not r4 into r1285; + and r1284 r1285 into r1286; + not r5 into r1287; + and r1286 r1287 into r1288; + not r6 into r1289; + and r1288 r1289 into r1290; + not r7 into r1291; + and r1290 r1291 into r1292; + not r8 into r1293; + and r1292 r1293 into r1294; + not r9 into r1295; + and r1294 r1295 into r1296; + not r10 into r1297; + and r1296 r1297 into r1298; + not r11 into r1299; + and r1298 r1299 into r1300; + not r12 into r1301; + and r1300 r1301 into r1302; + not r13 into r1303; + and r1302 r1303 into r1304; + not r14 into r1305; + and r1304 r1305 into r1306; + not r15 into r1307; + and r1306 r1307 into r1308; + not r16 into r1309; + and r1308 r1309 into r1310; + not r17 into r1311; + and r1310 r1311 into r1312; + not r18 into r1313; + and r1312 r1313 into r1314; + and r1314 r19 into r1315; + ternary r1315 0u8 r1279 into r1316; + not r1 into r1317; + not r2 into r1318; and r1317 r1318 into r1319; - not r39 into r1320; + not r3 into r1320; and r1319 r1320 into r1321; - not r40 into r1322; + not r4 into r1322; and r1321 r1322 into r1323; - not r41 into r1324; + not r5 into r1324; and r1323 r1324 into r1325; - not r42 into r1326; + not r6 into r1326; and r1325 r1326 into r1327; - not r43 into r1328; + not r7 into r1328; and r1327 r1328 into r1329; - not r44 into r1330; + not r8 into r1330; and r1329 r1330 into r1331; - not r45 into r1332; + not r9 into r1332; and r1331 r1332 into r1333; - not r46 into r1334; + not r10 into r1334; and r1333 r1334 into r1335; - not r47 into r1336; + not r11 into r1336; and r1335 r1336 into r1337; - not r48 into r1338; + not r12 into r1338; and r1337 r1338 into r1339; - not r49 into r1340; + not r13 into r1340; and r1339 r1340 into r1341; - not r50 into r1342; + not r14 into r1342; and r1341 r1342 into r1343; - not r51 into r1344; + not r15 into r1344; and r1343 r1344 into r1345; - not r52 into r1346; + not r16 into r1346; and r1345 r1346 into r1347; - not r53 into r1348; + not r17 into r1348; and r1347 r1348 into r1349; - and r1349 r54 into r1350; - ternary r1350 23u8 r1244 into r1351; + and r1349 r18 into r1350; + ternary r1350 4u8 r1316 into r1351; not r1 into r1352; not r2 into r1353; and r1352 r1353 into r1354; @@ -1386,183 +1386,183 @@ closure sealsTableLookup: and r1378 r1379 into r1380; not r16 into r1381; and r1380 r1381 into r1382; - not r17 into r1383; - and r1382 r1383 into r1384; - not r18 into r1385; - and r1384 r1385 into r1386; - not r19 into r1387; - and r1386 r1387 into r1388; - not r20 into r1389; - and r1388 r1389 into r1390; - not r21 into r1391; - and r1390 r1391 into r1392; - not r22 into r1393; - and r1392 r1393 into r1394; - not r23 into r1395; - and r1394 r1395 into r1396; - not r24 into r1397; - and r1396 r1397 into r1398; - not r25 into r1399; - and r1398 r1399 into r1400; - not r26 into r1401; - and r1400 r1401 into r1402; - not r27 into r1403; - and r1402 r1403 into r1404; - not r28 into r1405; - and r1404 r1405 into r1406; - not r29 into r1407; - and r1406 r1407 into r1408; - not r30 into r1409; - and r1408 r1409 into r1410; - not r31 into r1411; - and r1410 r1411 into r1412; - not r32 into r1413; - and r1412 r1413 into r1414; - not r33 into r1415; - and r1414 r1415 into r1416; - not r34 into r1417; + and r1382 r17 into r1383; + ternary r1383 10u8 r1351 into r1384; + not r1 into r1385; + not r2 into r1386; + and r1385 r1386 into r1387; + not r3 into r1388; + and r1387 r1388 into r1389; + not r4 into r1390; + and r1389 r1390 into r1391; + not r5 into r1392; + and r1391 r1392 into r1393; + not r6 into r1394; + and r1393 r1394 into r1395; + not r7 into r1396; + and r1395 r1396 into r1397; + not r8 into r1398; + and r1397 r1398 into r1399; + not r9 into r1400; + and r1399 r1400 into r1401; + not r10 into r1402; + and r1401 r1402 into r1403; + not r11 into r1404; + and r1403 r1404 into r1405; + not r12 into r1406; + and r1405 r1406 into r1407; + not r13 into r1408; + and r1407 r1408 into r1409; + not r14 into r1410; + and r1409 r1410 into r1411; + not r15 into r1412; + and r1411 r1412 into r1413; + and r1413 r16 into r1414; + ternary r1414 14u8 r1384 into r1415; + not r1 into r1416; + not r2 into r1417; and r1416 r1417 into r1418; - not r35 into r1419; + not r3 into r1419; and r1418 r1419 into r1420; - not r36 into r1421; + not r4 into r1421; and r1420 r1421 into r1422; - not r37 into r1423; + not r5 into r1423; and r1422 r1423 into r1424; - not r38 into r1425; + not r6 into r1425; and r1424 r1425 into r1426; - not r39 into r1427; + not r7 into r1427; and r1426 r1427 into r1428; - not r40 into r1429; + not r8 into r1429; and r1428 r1429 into r1430; - not r41 into r1431; + not r9 into r1431; and r1430 r1431 into r1432; - not r42 into r1433; + not r10 into r1433; and r1432 r1433 into r1434; - not r43 into r1435; + not r11 into r1435; and r1434 r1435 into r1436; - not r44 into r1437; + not r12 into r1437; and r1436 r1437 into r1438; - not r45 into r1439; + not r13 into r1439; and r1438 r1439 into r1440; - not r46 into r1441; + not r14 into r1441; and r1440 r1441 into r1442; - not r47 into r1443; - and r1442 r1443 into r1444; - not r48 into r1445; - and r1444 r1445 into r1446; - not r49 into r1447; - and r1446 r1447 into r1448; - not r50 into r1449; - and r1448 r1449 into r1450; - not r51 into r1451; - and r1450 r1451 into r1452; - not r52 into r1453; - and r1452 r1453 into r1454; - and r1454 r53 into r1455; - ternary r1455 0u8 r1351 into r1456; - not r1 into r1457; - not r2 into r1458; + and r1442 r15 into r1443; + ternary r1443 0u8 r1415 into r1444; + not r1 into r1445; + not r2 into r1446; + and r1445 r1446 into r1447; + not r3 into r1448; + and r1447 r1448 into r1449; + not r4 into r1450; + and r1449 r1450 into r1451; + not r5 into r1452; + and r1451 r1452 into r1453; + not r6 into r1454; + and r1453 r1454 into r1455; + not r7 into r1456; + and r1455 r1456 into r1457; + not r8 into r1458; and r1457 r1458 into r1459; - not r3 into r1460; + not r9 into r1460; and r1459 r1460 into r1461; - not r4 into r1462; + not r10 into r1462; and r1461 r1462 into r1463; - not r5 into r1464; + not r11 into r1464; and r1463 r1464 into r1465; - not r6 into r1466; + not r12 into r1466; and r1465 r1466 into r1467; - not r7 into r1468; + not r13 into r1468; and r1467 r1468 into r1469; - not r8 into r1470; - and r1469 r1470 into r1471; - not r9 into r1472; - and r1471 r1472 into r1473; - not r10 into r1474; - and r1473 r1474 into r1475; - not r11 into r1476; - and r1475 r1476 into r1477; - not r12 into r1478; - and r1477 r1478 into r1479; - not r13 into r1480; - and r1479 r1480 into r1481; - not r14 into r1482; - and r1481 r1482 into r1483; - not r15 into r1484; - and r1483 r1484 into r1485; - not r16 into r1486; - and r1485 r1486 into r1487; - not r17 into r1488; - and r1487 r1488 into r1489; - not r18 into r1490; - and r1489 r1490 into r1491; - not r19 into r1492; - and r1491 r1492 into r1493; - not r20 into r1494; - and r1493 r1494 into r1495; - not r21 into r1496; - and r1495 r1496 into r1497; - not r22 into r1498; + and r1469 r14 into r1470; + ternary r1470 0u8 r1444 into r1471; + not r1 into r1472; + not r2 into r1473; + and r1472 r1473 into r1474; + not r3 into r1475; + and r1474 r1475 into r1476; + not r4 into r1477; + and r1476 r1477 into r1478; + not r5 into r1479; + and r1478 r1479 into r1480; + not r6 into r1481; + and r1480 r1481 into r1482; + not r7 into r1483; + and r1482 r1483 into r1484; + not r8 into r1485; + and r1484 r1485 into r1486; + not r9 into r1487; + and r1486 r1487 into r1488; + not r10 into r1489; + and r1488 r1489 into r1490; + not r11 into r1491; + and r1490 r1491 into r1492; + not r12 into r1493; + and r1492 r1493 into r1494; + and r1494 r13 into r1495; + ternary r1495 0u8 r1471 into r1496; + not r1 into r1497; + not r2 into r1498; and r1497 r1498 into r1499; - not r23 into r1500; + not r3 into r1500; and r1499 r1500 into r1501; - not r24 into r1502; + not r4 into r1502; and r1501 r1502 into r1503; - not r25 into r1504; + not r5 into r1504; and r1503 r1504 into r1505; - not r26 into r1506; + not r6 into r1506; and r1505 r1506 into r1507; - not r27 into r1508; + not r7 into r1508; and r1507 r1508 into r1509; - not r28 into r1510; + not r8 into r1510; and r1509 r1510 into r1511; - not r29 into r1512; + not r9 into r1512; and r1511 r1512 into r1513; - not r30 into r1514; + not r10 into r1514; and r1513 r1514 into r1515; - not r31 into r1516; + not r11 into r1516; and r1515 r1516 into r1517; - not r32 into r1518; - and r1517 r1518 into r1519; - not r33 into r1520; - and r1519 r1520 into r1521; - not r34 into r1522; - and r1521 r1522 into r1523; - not r35 into r1524; - and r1523 r1524 into r1525; - not r36 into r1526; - and r1525 r1526 into r1527; - not r37 into r1528; - and r1527 r1528 into r1529; - not r38 into r1530; - and r1529 r1530 into r1531; - not r39 into r1532; - and r1531 r1532 into r1533; - not r40 into r1534; - and r1533 r1534 into r1535; - not r41 into r1536; - and r1535 r1536 into r1537; - not r42 into r1538; - and r1537 r1538 into r1539; - not r43 into r1540; - and r1539 r1540 into r1541; - not r44 into r1542; + and r1517 r12 into r1518; + ternary r1518 0u8 r1496 into r1519; + not r1 into r1520; + not r2 into r1521; + and r1520 r1521 into r1522; + not r3 into r1523; + and r1522 r1523 into r1524; + not r4 into r1525; + and r1524 r1525 into r1526; + not r5 into r1527; + and r1526 r1527 into r1528; + not r6 into r1529; + and r1528 r1529 into r1530; + not r7 into r1531; + and r1530 r1531 into r1532; + not r8 into r1533; + and r1532 r1533 into r1534; + not r9 into r1535; + and r1534 r1535 into r1536; + not r10 into r1537; + and r1536 r1537 into r1538; + and r1538 r11 into r1539; + ternary r1539 7u8 r1519 into r1540; + not r1 into r1541; + not r2 into r1542; and r1541 r1542 into r1543; - not r45 into r1544; + not r3 into r1544; and r1543 r1544 into r1545; - not r46 into r1546; + not r4 into r1546; and r1545 r1546 into r1547; - not r47 into r1548; + not r5 into r1548; and r1547 r1548 into r1549; - not r48 into r1550; + not r6 into r1550; and r1549 r1550 into r1551; - not r49 into r1552; + not r7 into r1552; and r1551 r1552 into r1553; - not r50 into r1554; + not r8 into r1554; and r1553 r1554 into r1555; - not r51 into r1556; + not r9 into r1556; and r1555 r1556 into r1557; - and r1557 r52 into r1558; - ternary r1558 0u8 r1456 into r1559; + and r1557 r10 into r1558; + ternary r1558 0u8 r1540 into r1559; not r1 into r1560; not r2 into r1561; and r1560 r1561 into r1562; @@ -1578,2593 +1578,73 @@ closure sealsTableLookup: and r1570 r1571 into r1572; not r8 into r1573; and r1572 r1573 into r1574; - not r9 into r1575; - and r1574 r1575 into r1576; - not r10 into r1577; - and r1576 r1577 into r1578; - not r11 into r1579; - and r1578 r1579 into r1580; - not r12 into r1581; - and r1580 r1581 into r1582; - not r13 into r1583; - and r1582 r1583 into r1584; - not r14 into r1585; - and r1584 r1585 into r1586; - not r15 into r1587; - and r1586 r1587 into r1588; - not r16 into r1589; - and r1588 r1589 into r1590; - not r17 into r1591; - and r1590 r1591 into r1592; - not r18 into r1593; + and r1574 r9 into r1575; + ternary r1575 3u8 r1559 into r1576; + not r1 into r1577; + not r2 into r1578; + and r1577 r1578 into r1579; + not r3 into r1580; + and r1579 r1580 into r1581; + not r4 into r1582; + and r1581 r1582 into r1583; + not r5 into r1584; + and r1583 r1584 into r1585; + not r6 into r1586; + and r1585 r1586 into r1587; + not r7 into r1588; + and r1587 r1588 into r1589; + and r1589 r8 into r1590; + ternary r1590 13u8 r1576 into r1591; + not r1 into r1592; + not r2 into r1593; and r1592 r1593 into r1594; - not r19 into r1595; + not r3 into r1595; and r1594 r1595 into r1596; - not r20 into r1597; + not r4 into r1597; and r1596 r1597 into r1598; - not r21 into r1599; + not r5 into r1599; and r1598 r1599 into r1600; - not r22 into r1601; + not r6 into r1601; and r1600 r1601 into r1602; - not r23 into r1603; - and r1602 r1603 into r1604; - not r24 into r1605; - and r1604 r1605 into r1606; - not r25 into r1607; - and r1606 r1607 into r1608; - not r26 into r1609; - and r1608 r1609 into r1610; - not r27 into r1611; - and r1610 r1611 into r1612; - not r28 into r1613; - and r1612 r1613 into r1614; - not r29 into r1615; - and r1614 r1615 into r1616; - not r30 into r1617; + and r1602 r7 into r1603; + ternary r1603 0u8 r1591 into r1604; + not r1 into r1605; + not r2 into r1606; + and r1605 r1606 into r1607; + not r3 into r1608; + and r1607 r1608 into r1609; + not r4 into r1610; + and r1609 r1610 into r1611; + not r5 into r1612; + and r1611 r1612 into r1613; + and r1613 r6 into r1614; + ternary r1614 6u8 r1604 into r1615; + not r1 into r1616; + not r2 into r1617; and r1616 r1617 into r1618; - not r31 into r1619; + not r3 into r1619; and r1618 r1619 into r1620; - not r32 into r1621; + not r4 into r1621; and r1620 r1621 into r1622; - not r33 into r1623; - and r1622 r1623 into r1624; - not r34 into r1625; - and r1624 r1625 into r1626; - not r35 into r1627; - and r1626 r1627 into r1628; - not r36 into r1629; - and r1628 r1629 into r1630; - not r37 into r1631; - and r1630 r1631 into r1632; - not r38 into r1633; + and r1622 r5 into r1623; + ternary r1623 2u8 r1615 into r1624; + not r1 into r1625; + not r2 into r1626; + and r1625 r1626 into r1627; + not r3 into r1628; + and r1627 r1628 into r1629; + and r1629 r4 into r1630; + ternary r1630 12u8 r1624 into r1631; + not r1 into r1632; + not r2 into r1633; and r1632 r1633 into r1634; - not r39 into r1635; - and r1634 r1635 into r1636; - not r40 into r1637; - and r1636 r1637 into r1638; - not r41 into r1639; - and r1638 r1639 into r1640; - not r42 into r1641; - and r1640 r1641 into r1642; - not r43 into r1643; - and r1642 r1643 into r1644; - not r44 into r1645; - and r1644 r1645 into r1646; - not r45 into r1647; - and r1646 r1647 into r1648; - not r46 into r1649; - and r1648 r1649 into r1650; - not r47 into r1651; - and r1650 r1651 into r1652; - not r48 into r1653; - and r1652 r1653 into r1654; - not r49 into r1655; - and r1654 r1655 into r1656; - not r50 into r1657; - and r1656 r1657 into r1658; - and r1658 r51 into r1659; - ternary r1659 0u8 r1559 into r1660; - not r1 into r1661; - not r2 into r1662; - and r1661 r1662 into r1663; - not r3 into r1664; - and r1663 r1664 into r1665; - not r4 into r1666; - and r1665 r1666 into r1667; - not r5 into r1668; - and r1667 r1668 into r1669; - not r6 into r1670; - and r1669 r1670 into r1671; - not r7 into r1672; - and r1671 r1672 into r1673; - not r8 into r1674; - and r1673 r1674 into r1675; - not r9 into r1676; - and r1675 r1676 into r1677; - not r10 into r1678; - and r1677 r1678 into r1679; - not r11 into r1680; - and r1679 r1680 into r1681; - not r12 into r1682; - and r1681 r1682 into r1683; - not r13 into r1684; - and r1683 r1684 into r1685; - not r14 into r1686; - and r1685 r1686 into r1687; - not r15 into r1688; - and r1687 r1688 into r1689; - not r16 into r1690; - and r1689 r1690 into r1691; - not r17 into r1692; - and r1691 r1692 into r1693; - not r18 into r1694; - and r1693 r1694 into r1695; - not r19 into r1696; - and r1695 r1696 into r1697; - not r20 into r1698; - and r1697 r1698 into r1699; - not r21 into r1700; - and r1699 r1700 into r1701; - not r22 into r1702; - and r1701 r1702 into r1703; - not r23 into r1704; - and r1703 r1704 into r1705; - not r24 into r1706; - and r1705 r1706 into r1707; - not r25 into r1708; - and r1707 r1708 into r1709; - not r26 into r1710; - and r1709 r1710 into r1711; - not r27 into r1712; - and r1711 r1712 into r1713; - not r28 into r1714; - and r1713 r1714 into r1715; - not r29 into r1716; - and r1715 r1716 into r1717; - not r30 into r1718; - and r1717 r1718 into r1719; - not r31 into r1720; - and r1719 r1720 into r1721; - not r32 into r1722; - and r1721 r1722 into r1723; - not r33 into r1724; - and r1723 r1724 into r1725; - not r34 into r1726; - and r1725 r1726 into r1727; - not r35 into r1728; - and r1727 r1728 into r1729; - not r36 into r1730; - and r1729 r1730 into r1731; - not r37 into r1732; - and r1731 r1732 into r1733; - not r38 into r1734; - and r1733 r1734 into r1735; - not r39 into r1736; - and r1735 r1736 into r1737; - not r40 into r1738; - and r1737 r1738 into r1739; - not r41 into r1740; - and r1739 r1740 into r1741; - not r42 into r1742; - and r1741 r1742 into r1743; - not r43 into r1744; - and r1743 r1744 into r1745; - not r44 into r1746; - and r1745 r1746 into r1747; - not r45 into r1748; - and r1747 r1748 into r1749; - not r46 into r1750; - and r1749 r1750 into r1751; - not r47 into r1752; - and r1751 r1752 into r1753; - not r48 into r1754; - and r1753 r1754 into r1755; - not r49 into r1756; - and r1755 r1756 into r1757; - and r1757 r50 into r1758; - ternary r1758 0u8 r1660 into r1759; - not r1 into r1760; - not r2 into r1761; - and r1760 r1761 into r1762; - not r3 into r1763; - and r1762 r1763 into r1764; - not r4 into r1765; - and r1764 r1765 into r1766; - not r5 into r1767; - and r1766 r1767 into r1768; - not r6 into r1769; - and r1768 r1769 into r1770; - not r7 into r1771; - and r1770 r1771 into r1772; - not r8 into r1773; - and r1772 r1773 into r1774; - not r9 into r1775; - and r1774 r1775 into r1776; - not r10 into r1777; - and r1776 r1777 into r1778; - not r11 into r1779; - and r1778 r1779 into r1780; - not r12 into r1781; - and r1780 r1781 into r1782; - not r13 into r1783; - and r1782 r1783 into r1784; - not r14 into r1785; - and r1784 r1785 into r1786; - not r15 into r1787; - and r1786 r1787 into r1788; - not r16 into r1789; - and r1788 r1789 into r1790; - not r17 into r1791; - and r1790 r1791 into r1792; - not r18 into r1793; - and r1792 r1793 into r1794; - not r19 into r1795; - and r1794 r1795 into r1796; - not r20 into r1797; - and r1796 r1797 into r1798; - not r21 into r1799; - and r1798 r1799 into r1800; - not r22 into r1801; - and r1800 r1801 into r1802; - not r23 into r1803; - and r1802 r1803 into r1804; - not r24 into r1805; - and r1804 r1805 into r1806; - not r25 into r1807; - and r1806 r1807 into r1808; - not r26 into r1809; - and r1808 r1809 into r1810; - not r27 into r1811; - and r1810 r1811 into r1812; - not r28 into r1813; - and r1812 r1813 into r1814; - not r29 into r1815; - and r1814 r1815 into r1816; - not r30 into r1817; - and r1816 r1817 into r1818; - not r31 into r1819; - and r1818 r1819 into r1820; - not r32 into r1821; - and r1820 r1821 into r1822; - not r33 into r1823; - and r1822 r1823 into r1824; - not r34 into r1825; - and r1824 r1825 into r1826; - not r35 into r1827; - and r1826 r1827 into r1828; - not r36 into r1829; - and r1828 r1829 into r1830; - not r37 into r1831; - and r1830 r1831 into r1832; - not r38 into r1833; - and r1832 r1833 into r1834; - not r39 into r1835; - and r1834 r1835 into r1836; - not r40 into r1837; - and r1836 r1837 into r1838; - not r41 into r1839; - and r1838 r1839 into r1840; - not r42 into r1841; - and r1840 r1841 into r1842; - not r43 into r1843; - and r1842 r1843 into r1844; - not r44 into r1845; - and r1844 r1845 into r1846; - not r45 into r1847; - and r1846 r1847 into r1848; - not r46 into r1849; - and r1848 r1849 into r1850; - not r47 into r1851; - and r1850 r1851 into r1852; - not r48 into r1853; - and r1852 r1853 into r1854; - and r1854 r49 into r1855; - ternary r1855 30u8 r1759 into r1856; - not r1 into r1857; - not r2 into r1858; - and r1857 r1858 into r1859; - not r3 into r1860; - and r1859 r1860 into r1861; - not r4 into r1862; - and r1861 r1862 into r1863; - not r5 into r1864; - and r1863 r1864 into r1865; - not r6 into r1866; - and r1865 r1866 into r1867; - not r7 into r1868; - and r1867 r1868 into r1869; - not r8 into r1870; - and r1869 r1870 into r1871; - not r9 into r1872; - and r1871 r1872 into r1873; - not r10 into r1874; - and r1873 r1874 into r1875; - not r11 into r1876; - and r1875 r1876 into r1877; - not r12 into r1878; - and r1877 r1878 into r1879; - not r13 into r1880; - and r1879 r1880 into r1881; - not r14 into r1882; - and r1881 r1882 into r1883; - not r15 into r1884; - and r1883 r1884 into r1885; - not r16 into r1886; - and r1885 r1886 into r1887; - not r17 into r1888; - and r1887 r1888 into r1889; - not r18 into r1890; - and r1889 r1890 into r1891; - not r19 into r1892; - and r1891 r1892 into r1893; - not r20 into r1894; - and r1893 r1894 into r1895; - not r21 into r1896; - and r1895 r1896 into r1897; - not r22 into r1898; - and r1897 r1898 into r1899; - not r23 into r1900; - and r1899 r1900 into r1901; - not r24 into r1902; - and r1901 r1902 into r1903; - not r25 into r1904; - and r1903 r1904 into r1905; - not r26 into r1906; - and r1905 r1906 into r1907; - not r27 into r1908; - and r1907 r1908 into r1909; - not r28 into r1910; - and r1909 r1910 into r1911; - not r29 into r1912; - and r1911 r1912 into r1913; - not r30 into r1914; - and r1913 r1914 into r1915; - not r31 into r1916; - and r1915 r1916 into r1917; - not r32 into r1918; - and r1917 r1918 into r1919; - not r33 into r1920; - and r1919 r1920 into r1921; - not r34 into r1922; - and r1921 r1922 into r1923; - not r35 into r1924; - and r1923 r1924 into r1925; - not r36 into r1926; - and r1925 r1926 into r1927; - not r37 into r1928; - and r1927 r1928 into r1929; - not r38 into r1930; - and r1929 r1930 into r1931; - not r39 into r1932; - and r1931 r1932 into r1933; - not r40 into r1934; - and r1933 r1934 into r1935; - not r41 into r1936; - and r1935 r1936 into r1937; - not r42 into r1938; - and r1937 r1938 into r1939; - not r43 into r1940; - and r1939 r1940 into r1941; - not r44 into r1942; - and r1941 r1942 into r1943; - not r45 into r1944; - and r1943 r1944 into r1945; - not r46 into r1946; - and r1945 r1946 into r1947; - not r47 into r1948; - and r1947 r1948 into r1949; - and r1949 r48 into r1950; - ternary r1950 26u8 r1856 into r1951; - not r1 into r1952; - not r2 into r1953; - and r1952 r1953 into r1954; - not r3 into r1955; - and r1954 r1955 into r1956; - not r4 into r1957; - and r1956 r1957 into r1958; - not r5 into r1959; - and r1958 r1959 into r1960; - not r6 into r1961; - and r1960 r1961 into r1962; - not r7 into r1963; - and r1962 r1963 into r1964; - not r8 into r1965; - and r1964 r1965 into r1966; - not r9 into r1967; - and r1966 r1967 into r1968; - not r10 into r1969; - and r1968 r1969 into r1970; - not r11 into r1971; - and r1970 r1971 into r1972; - not r12 into r1973; - and r1972 r1973 into r1974; - not r13 into r1975; - and r1974 r1975 into r1976; - not r14 into r1977; - and r1976 r1977 into r1978; - not r15 into r1979; - and r1978 r1979 into r1980; - not r16 into r1981; - and r1980 r1981 into r1982; - not r17 into r1983; - and r1982 r1983 into r1984; - not r18 into r1985; - and r1984 r1985 into r1986; - not r19 into r1987; - and r1986 r1987 into r1988; - not r20 into r1989; - and r1988 r1989 into r1990; - not r21 into r1991; - and r1990 r1991 into r1992; - not r22 into r1993; - and r1992 r1993 into r1994; - not r23 into r1995; - and r1994 r1995 into r1996; - not r24 into r1997; - and r1996 r1997 into r1998; - not r25 into r1999; - and r1998 r1999 into r2000; - not r26 into r2001; - and r2000 r2001 into r2002; - not r27 into r2003; - and r2002 r2003 into r2004; - not r28 into r2005; - and r2004 r2005 into r2006; - not r29 into r2007; - and r2006 r2007 into r2008; - not r30 into r2009; - and r2008 r2009 into r2010; - not r31 into r2011; - and r2010 r2011 into r2012; - not r32 into r2013; - and r2012 r2013 into r2014; - not r33 into r2015; - and r2014 r2015 into r2016; - not r34 into r2017; - and r2016 r2017 into r2018; - not r35 into r2019; - and r2018 r2019 into r2020; - not r36 into r2021; - and r2020 r2021 into r2022; - not r37 into r2023; - and r2022 r2023 into r2024; - not r38 into r2025; - and r2024 r2025 into r2026; - not r39 into r2027; - and r2026 r2027 into r2028; - not r40 into r2029; - and r2028 r2029 into r2030; - not r41 into r2031; - and r2030 r2031 into r2032; - not r42 into r2033; - and r2032 r2033 into r2034; - not r43 into r2035; - and r2034 r2035 into r2036; - not r44 into r2037; - and r2036 r2037 into r2038; - not r45 into r2039; - and r2038 r2039 into r2040; - not r46 into r2041; - and r2040 r2041 into r2042; - and r2042 r47 into r2043; - ternary r2043 20u8 r1951 into r2044; - not r1 into r2045; - not r2 into r2046; - and r2045 r2046 into r2047; - not r3 into r2048; - and r2047 r2048 into r2049; - not r4 into r2050; - and r2049 r2050 into r2051; - not r5 into r2052; - and r2051 r2052 into r2053; - not r6 into r2054; - and r2053 r2054 into r2055; - not r7 into r2056; - and r2055 r2056 into r2057; - not r8 into r2058; - and r2057 r2058 into r2059; - not r9 into r2060; - and r2059 r2060 into r2061; - not r10 into r2062; - and r2061 r2062 into r2063; - not r11 into r2064; - and r2063 r2064 into r2065; - not r12 into r2066; - and r2065 r2066 into r2067; - not r13 into r2068; - and r2067 r2068 into r2069; - not r14 into r2070; - and r2069 r2070 into r2071; - not r15 into r2072; - and r2071 r2072 into r2073; - not r16 into r2074; - and r2073 r2074 into r2075; - not r17 into r2076; - and r2075 r2076 into r2077; - not r18 into r2078; - and r2077 r2078 into r2079; - not r19 into r2080; - and r2079 r2080 into r2081; - not r20 into r2082; - and r2081 r2082 into r2083; - not r21 into r2084; - and r2083 r2084 into r2085; - not r22 into r2086; - and r2085 r2086 into r2087; - not r23 into r2088; - and r2087 r2088 into r2089; - not r24 into r2090; - and r2089 r2090 into r2091; - not r25 into r2092; - and r2091 r2092 into r2093; - not r26 into r2094; - and r2093 r2094 into r2095; - not r27 into r2096; - and r2095 r2096 into r2097; - not r28 into r2098; - and r2097 r2098 into r2099; - not r29 into r2100; - and r2099 r2100 into r2101; - not r30 into r2102; - and r2101 r2102 into r2103; - not r31 into r2104; - and r2103 r2104 into r2105; - not r32 into r2106; - and r2105 r2106 into r2107; - not r33 into r2108; - and r2107 r2108 into r2109; - not r34 into r2110; - and r2109 r2110 into r2111; - not r35 into r2112; - and r2111 r2112 into r2113; - not r36 into r2114; - and r2113 r2114 into r2115; - not r37 into r2116; - and r2115 r2116 into r2117; - not r38 into r2118; - and r2117 r2118 into r2119; - not r39 into r2120; - and r2119 r2120 into r2121; - not r40 into r2122; - and r2121 r2122 into r2123; - not r41 into r2124; - and r2123 r2124 into r2125; - not r42 into r2126; - and r2125 r2126 into r2127; - not r43 into r2128; - and r2127 r2128 into r2129; - not r44 into r2130; - and r2129 r2130 into r2131; - not r45 into r2132; - and r2131 r2132 into r2133; - and r2133 r46 into r2134; - ternary r2134 0u8 r2044 into r2135; - not r1 into r2136; - not r2 into r2137; - and r2136 r2137 into r2138; - not r3 into r2139; - and r2138 r2139 into r2140; - not r4 into r2141; - and r2140 r2141 into r2142; - not r5 into r2143; - and r2142 r2143 into r2144; - not r6 into r2145; - and r2144 r2145 into r2146; - not r7 into r2147; - and r2146 r2147 into r2148; - not r8 into r2149; - and r2148 r2149 into r2150; - not r9 into r2151; - and r2150 r2151 into r2152; - not r10 into r2153; - and r2152 r2153 into r2154; - not r11 into r2155; - and r2154 r2155 into r2156; - not r12 into r2157; - and r2156 r2157 into r2158; - not r13 into r2159; - and r2158 r2159 into r2160; - not r14 into r2161; - and r2160 r2161 into r2162; - not r15 into r2163; - and r2162 r2163 into r2164; - not r16 into r2165; - and r2164 r2165 into r2166; - not r17 into r2167; - and r2166 r2167 into r2168; - not r18 into r2169; - and r2168 r2169 into r2170; - not r19 into r2171; - and r2170 r2171 into r2172; - not r20 into r2173; - and r2172 r2173 into r2174; - not r21 into r2175; - and r2174 r2175 into r2176; - not r22 into r2177; - and r2176 r2177 into r2178; - not r23 into r2179; - and r2178 r2179 into r2180; - not r24 into r2181; - and r2180 r2181 into r2182; - not r25 into r2183; - and r2182 r2183 into r2184; - not r26 into r2185; - and r2184 r2185 into r2186; - not r27 into r2187; - and r2186 r2187 into r2188; - not r28 into r2189; - and r2188 r2189 into r2190; - not r29 into r2191; - and r2190 r2191 into r2192; - not r30 into r2193; - and r2192 r2193 into r2194; - not r31 into r2195; - and r2194 r2195 into r2196; - not r32 into r2197; - and r2196 r2197 into r2198; - not r33 into r2199; - and r2198 r2199 into r2200; - not r34 into r2201; - and r2200 r2201 into r2202; - not r35 into r2203; - and r2202 r2203 into r2204; - not r36 into r2205; - and r2204 r2205 into r2206; - not r37 into r2207; - and r2206 r2207 into r2208; - not r38 into r2209; - and r2208 r2209 into r2210; - not r39 into r2211; - and r2210 r2211 into r2212; - not r40 into r2213; - and r2212 r2213 into r2214; - not r41 into r2215; - and r2214 r2215 into r2216; - not r42 into r2217; - and r2216 r2217 into r2218; - not r43 into r2219; - and r2218 r2219 into r2220; - not r44 into r2221; - and r2220 r2221 into r2222; - and r2222 r45 into r2223; - ternary r2223 0u8 r2135 into r2224; - not r1 into r2225; - not r2 into r2226; - and r2225 r2226 into r2227; - not r3 into r2228; - and r2227 r2228 into r2229; - not r4 into r2230; - and r2229 r2230 into r2231; - not r5 into r2232; - and r2231 r2232 into r2233; - not r6 into r2234; - and r2233 r2234 into r2235; - not r7 into r2236; - and r2235 r2236 into r2237; - not r8 into r2238; - and r2237 r2238 into r2239; - not r9 into r2240; - and r2239 r2240 into r2241; - not r10 into r2242; - and r2241 r2242 into r2243; - not r11 into r2244; - and r2243 r2244 into r2245; - not r12 into r2246; - and r2245 r2246 into r2247; - not r13 into r2248; - and r2247 r2248 into r2249; - not r14 into r2250; - and r2249 r2250 into r2251; - not r15 into r2252; - and r2251 r2252 into r2253; - not r16 into r2254; - and r2253 r2254 into r2255; - not r17 into r2256; - and r2255 r2256 into r2257; - not r18 into r2258; - and r2257 r2258 into r2259; - not r19 into r2260; - and r2259 r2260 into r2261; - not r20 into r2262; - and r2261 r2262 into r2263; - not r21 into r2264; - and r2263 r2264 into r2265; - not r22 into r2266; - and r2265 r2266 into r2267; - not r23 into r2268; - and r2267 r2268 into r2269; - not r24 into r2270; - and r2269 r2270 into r2271; - not r25 into r2272; - and r2271 r2272 into r2273; - not r26 into r2274; - and r2273 r2274 into r2275; - not r27 into r2276; - and r2275 r2276 into r2277; - not r28 into r2278; - and r2277 r2278 into r2279; - not r29 into r2280; - and r2279 r2280 into r2281; - not r30 into r2282; - and r2281 r2282 into r2283; - not r31 into r2284; - and r2283 r2284 into r2285; - not r32 into r2286; - and r2285 r2286 into r2287; - not r33 into r2288; - and r2287 r2288 into r2289; - not r34 into r2290; - and r2289 r2290 into r2291; - not r35 into r2292; - and r2291 r2292 into r2293; - not r36 into r2294; - and r2293 r2294 into r2295; - not r37 into r2296; - and r2295 r2296 into r2297; - not r38 into r2298; - and r2297 r2298 into r2299; - not r39 into r2300; - and r2299 r2300 into r2301; - not r40 into r2302; - and r2301 r2302 into r2303; - not r41 into r2304; - and r2303 r2304 into r2305; - not r42 into r2306; - and r2305 r2306 into r2307; - not r43 into r2308; - and r2307 r2308 into r2309; - and r2309 r44 into r2310; - ternary r2310 24u8 r2224 into r2311; - not r1 into r2312; - not r2 into r2313; - and r2312 r2313 into r2314; - not r3 into r2315; - and r2314 r2315 into r2316; - not r4 into r2317; - and r2316 r2317 into r2318; - not r5 into r2319; - and r2318 r2319 into r2320; - not r6 into r2321; - and r2320 r2321 into r2322; - not r7 into r2323; - and r2322 r2323 into r2324; - not r8 into r2325; - and r2324 r2325 into r2326; - not r9 into r2327; - and r2326 r2327 into r2328; - not r10 into r2329; - and r2328 r2329 into r2330; - not r11 into r2331; - and r2330 r2331 into r2332; - not r12 into r2333; - and r2332 r2333 into r2334; - not r13 into r2335; - and r2334 r2335 into r2336; - not r14 into r2337; - and r2336 r2337 into r2338; - not r15 into r2339; - and r2338 r2339 into r2340; - not r16 into r2341; - and r2340 r2341 into r2342; - not r17 into r2343; - and r2342 r2343 into r2344; - not r18 into r2345; - and r2344 r2345 into r2346; - not r19 into r2347; - and r2346 r2347 into r2348; - not r20 into r2349; - and r2348 r2349 into r2350; - not r21 into r2351; - and r2350 r2351 into r2352; - not r22 into r2353; - and r2352 r2353 into r2354; - not r23 into r2355; - and r2354 r2355 into r2356; - not r24 into r2357; - and r2356 r2357 into r2358; - not r25 into r2359; - and r2358 r2359 into r2360; - not r26 into r2361; - and r2360 r2361 into r2362; - not r27 into r2363; - and r2362 r2363 into r2364; - not r28 into r2365; - and r2364 r2365 into r2366; - not r29 into r2367; - and r2366 r2367 into r2368; - not r30 into r2369; - and r2368 r2369 into r2370; - not r31 into r2371; - and r2370 r2371 into r2372; - not r32 into r2373; - and r2372 r2373 into r2374; - not r33 into r2375; - and r2374 r2375 into r2376; - not r34 into r2377; - and r2376 r2377 into r2378; - not r35 into r2379; - and r2378 r2379 into r2380; - not r36 into r2381; - and r2380 r2381 into r2382; - not r37 into r2383; - and r2382 r2383 into r2384; - not r38 into r2385; - and r2384 r2385 into r2386; - not r39 into r2387; - and r2386 r2387 into r2388; - not r40 into r2389; - and r2388 r2389 into r2390; - not r41 into r2391; - and r2390 r2391 into r2392; - not r42 into r2393; - and r2392 r2393 into r2394; - and r2394 r43 into r2395; - ternary r2395 0u8 r2311 into r2396; - not r1 into r2397; - not r2 into r2398; - and r2397 r2398 into r2399; - not r3 into r2400; - and r2399 r2400 into r2401; - not r4 into r2402; - and r2401 r2402 into r2403; - not r5 into r2404; - and r2403 r2404 into r2405; - not r6 into r2406; - and r2405 r2406 into r2407; - not r7 into r2408; - and r2407 r2408 into r2409; - not r8 into r2410; - and r2409 r2410 into r2411; - not r9 into r2412; - and r2411 r2412 into r2413; - not r10 into r2414; - and r2413 r2414 into r2415; - not r11 into r2416; - and r2415 r2416 into r2417; - not r12 into r2418; - and r2417 r2418 into r2419; - not r13 into r2420; - and r2419 r2420 into r2421; - not r14 into r2422; - and r2421 r2422 into r2423; - not r15 into r2424; - and r2423 r2424 into r2425; - not r16 into r2426; - and r2425 r2426 into r2427; - not r17 into r2428; - and r2427 r2428 into r2429; - not r18 into r2430; - and r2429 r2430 into r2431; - not r19 into r2432; - and r2431 r2432 into r2433; - not r20 into r2434; - and r2433 r2434 into r2435; - not r21 into r2436; - and r2435 r2436 into r2437; - not r22 into r2438; - and r2437 r2438 into r2439; - not r23 into r2440; - and r2439 r2440 into r2441; - not r24 into r2442; - and r2441 r2442 into r2443; - not r25 into r2444; - and r2443 r2444 into r2445; - not r26 into r2446; - and r2445 r2446 into r2447; - not r27 into r2448; - and r2447 r2448 into r2449; - not r28 into r2450; - and r2449 r2450 into r2451; - not r29 into r2452; - and r2451 r2452 into r2453; - not r30 into r2454; - and r2453 r2454 into r2455; - not r31 into r2456; - and r2455 r2456 into r2457; - not r32 into r2458; - and r2457 r2458 into r2459; - not r33 into r2460; - and r2459 r2460 into r2461; - not r34 into r2462; - and r2461 r2462 into r2463; - not r35 into r2464; - and r2463 r2464 into r2465; - not r36 into r2466; - and r2465 r2466 into r2467; - not r37 into r2468; - and r2467 r2468 into r2469; - not r38 into r2470; - and r2469 r2470 into r2471; - not r39 into r2472; - and r2471 r2472 into r2473; - not r40 into r2474; - and r2473 r2474 into r2475; - not r41 into r2476; - and r2475 r2476 into r2477; - and r2477 r42 into r2478; - ternary r2478 0u8 r2396 into r2479; - not r1 into r2480; - not r2 into r2481; - and r2480 r2481 into r2482; - not r3 into r2483; - and r2482 r2483 into r2484; - not r4 into r2485; - and r2484 r2485 into r2486; - not r5 into r2487; - and r2486 r2487 into r2488; - not r6 into r2489; - and r2488 r2489 into r2490; - not r7 into r2491; - and r2490 r2491 into r2492; - not r8 into r2493; - and r2492 r2493 into r2494; - not r9 into r2495; - and r2494 r2495 into r2496; - not r10 into r2497; - and r2496 r2497 into r2498; - not r11 into r2499; - and r2498 r2499 into r2500; - not r12 into r2501; - and r2500 r2501 into r2502; - not r13 into r2503; - and r2502 r2503 into r2504; - not r14 into r2505; - and r2504 r2505 into r2506; - not r15 into r2507; - and r2506 r2507 into r2508; - not r16 into r2509; - and r2508 r2509 into r2510; - not r17 into r2511; - and r2510 r2511 into r2512; - not r18 into r2513; - and r2512 r2513 into r2514; - not r19 into r2515; - and r2514 r2515 into r2516; - not r20 into r2517; - and r2516 r2517 into r2518; - not r21 into r2519; - and r2518 r2519 into r2520; - not r22 into r2521; - and r2520 r2521 into r2522; - not r23 into r2523; - and r2522 r2523 into r2524; - not r24 into r2525; - and r2524 r2525 into r2526; - not r25 into r2527; - and r2526 r2527 into r2528; - not r26 into r2529; - and r2528 r2529 into r2530; - not r27 into r2531; - and r2530 r2531 into r2532; - not r28 into r2533; - and r2532 r2533 into r2534; - not r29 into r2535; - and r2534 r2535 into r2536; - not r30 into r2537; - and r2536 r2537 into r2538; - not r31 into r2539; - and r2538 r2539 into r2540; - not r32 into r2541; - and r2540 r2541 into r2542; - not r33 into r2543; - and r2542 r2543 into r2544; - not r34 into r2545; - and r2544 r2545 into r2546; - not r35 into r2547; - and r2546 r2547 into r2548; - not r36 into r2549; - and r2548 r2549 into r2550; - not r37 into r2551; - and r2550 r2551 into r2552; - not r38 into r2553; - and r2552 r2553 into r2554; - not r39 into r2555; - and r2554 r2555 into r2556; - not r40 into r2557; - and r2556 r2557 into r2558; - and r2558 r41 into r2559; - ternary r2559 9u8 r2479 into r2560; - not r1 into r2561; - not r2 into r2562; - and r2561 r2562 into r2563; - not r3 into r2564; - and r2563 r2564 into r2565; - not r4 into r2566; - and r2565 r2566 into r2567; - not r5 into r2568; - and r2567 r2568 into r2569; - not r6 into r2570; - and r2569 r2570 into r2571; - not r7 into r2572; - and r2571 r2572 into r2573; - not r8 into r2574; - and r2573 r2574 into r2575; - not r9 into r2576; - and r2575 r2576 into r2577; - not r10 into r2578; - and r2577 r2578 into r2579; - not r11 into r2580; - and r2579 r2580 into r2581; - not r12 into r2582; - and r2581 r2582 into r2583; - not r13 into r2584; - and r2583 r2584 into r2585; - not r14 into r2586; - and r2585 r2586 into r2587; - not r15 into r2588; - and r2587 r2588 into r2589; - not r16 into r2590; - and r2589 r2590 into r2591; - not r17 into r2592; - and r2591 r2592 into r2593; - not r18 into r2594; - and r2593 r2594 into r2595; - not r19 into r2596; - and r2595 r2596 into r2597; - not r20 into r2598; - and r2597 r2598 into r2599; - not r21 into r2600; - and r2599 r2600 into r2601; - not r22 into r2602; - and r2601 r2602 into r2603; - not r23 into r2604; - and r2603 r2604 into r2605; - not r24 into r2606; - and r2605 r2606 into r2607; - not r25 into r2608; - and r2607 r2608 into r2609; - not r26 into r2610; - and r2609 r2610 into r2611; - not r27 into r2612; - and r2611 r2612 into r2613; - not r28 into r2614; - and r2613 r2614 into r2615; - not r29 into r2616; - and r2615 r2616 into r2617; - not r30 into r2618; - and r2617 r2618 into r2619; - not r31 into r2620; - and r2619 r2620 into r2621; - not r32 into r2622; - and r2621 r2622 into r2623; - not r33 into r2624; - and r2623 r2624 into r2625; - not r34 into r2626; - and r2625 r2626 into r2627; - not r35 into r2628; - and r2627 r2628 into r2629; - not r36 into r2630; - and r2629 r2630 into r2631; - not r37 into r2632; - and r2631 r2632 into r2633; - not r38 into r2634; - and r2633 r2634 into r2635; - not r39 into r2636; - and r2635 r2636 into r2637; - and r2637 r40 into r2638; - ternary r2638 0u8 r2560 into r2639; - not r1 into r2640; - not r2 into r2641; - and r2640 r2641 into r2642; - not r3 into r2643; - and r2642 r2643 into r2644; - not r4 into r2645; - and r2644 r2645 into r2646; - not r5 into r2647; - and r2646 r2647 into r2648; - not r6 into r2649; - and r2648 r2649 into r2650; - not r7 into r2651; - and r2650 r2651 into r2652; - not r8 into r2653; - and r2652 r2653 into r2654; - not r9 into r2655; - and r2654 r2655 into r2656; - not r10 into r2657; - and r2656 r2657 into r2658; - not r11 into r2659; - and r2658 r2659 into r2660; - not r12 into r2661; - and r2660 r2661 into r2662; - not r13 into r2663; - and r2662 r2663 into r2664; - not r14 into r2665; - and r2664 r2665 into r2666; - not r15 into r2667; - and r2666 r2667 into r2668; - not r16 into r2669; - and r2668 r2669 into r2670; - not r17 into r2671; - and r2670 r2671 into r2672; - not r18 into r2673; - and r2672 r2673 into r2674; - not r19 into r2675; - and r2674 r2675 into r2676; - not r20 into r2677; - and r2676 r2677 into r2678; - not r21 into r2679; - and r2678 r2679 into r2680; - not r22 into r2681; - and r2680 r2681 into r2682; - not r23 into r2683; - and r2682 r2683 into r2684; - not r24 into r2685; - and r2684 r2685 into r2686; - not r25 into r2687; - and r2686 r2687 into r2688; - not r26 into r2689; - and r2688 r2689 into r2690; - not r27 into r2691; - and r2690 r2691 into r2692; - not r28 into r2693; - and r2692 r2693 into r2694; - not r29 into r2695; - and r2694 r2695 into r2696; - not r30 into r2697; - and r2696 r2697 into r2698; - not r31 into r2699; - and r2698 r2699 into r2700; - not r32 into r2701; - and r2700 r2701 into r2702; - not r33 into r2703; - and r2702 r2703 into r2704; - not r34 into r2705; - and r2704 r2705 into r2706; - not r35 into r2707; - and r2706 r2707 into r2708; - not r36 into r2709; - and r2708 r2709 into r2710; - not r37 into r2711; - and r2710 r2711 into r2712; - not r38 into r2713; - and r2712 r2713 into r2714; - and r2714 r39 into r2715; - ternary r2715 0u8 r2639 into r2716; - not r1 into r2717; - not r2 into r2718; - and r2717 r2718 into r2719; - not r3 into r2720; - and r2719 r2720 into r2721; - not r4 into r2722; - and r2721 r2722 into r2723; - not r5 into r2724; - and r2723 r2724 into r2725; - not r6 into r2726; - and r2725 r2726 into r2727; - not r7 into r2728; - and r2727 r2728 into r2729; - not r8 into r2730; - and r2729 r2730 into r2731; - not r9 into r2732; - and r2731 r2732 into r2733; - not r10 into r2734; - and r2733 r2734 into r2735; - not r11 into r2736; - and r2735 r2736 into r2737; - not r12 into r2738; - and r2737 r2738 into r2739; - not r13 into r2740; - and r2739 r2740 into r2741; - not r14 into r2742; - and r2741 r2742 into r2743; - not r15 into r2744; - and r2743 r2744 into r2745; - not r16 into r2746; - and r2745 r2746 into r2747; - not r17 into r2748; - and r2747 r2748 into r2749; - not r18 into r2750; - and r2749 r2750 into r2751; - not r19 into r2752; - and r2751 r2752 into r2753; - not r20 into r2754; - and r2753 r2754 into r2755; - not r21 into r2756; - and r2755 r2756 into r2757; - not r22 into r2758; - and r2757 r2758 into r2759; - not r23 into r2760; - and r2759 r2760 into r2761; - not r24 into r2762; - and r2761 r2762 into r2763; - not r25 into r2764; - and r2763 r2764 into r2765; - not r26 into r2766; - and r2765 r2766 into r2767; - not r27 into r2768; - and r2767 r2768 into r2769; - not r28 into r2770; - and r2769 r2770 into r2771; - not r29 into r2772; - and r2771 r2772 into r2773; - not r30 into r2774; - and r2773 r2774 into r2775; - not r31 into r2776; - and r2775 r2776 into r2777; - not r32 into r2778; - and r2777 r2778 into r2779; - not r33 into r2780; - and r2779 r2780 into r2781; - not r34 into r2782; - and r2781 r2782 into r2783; - not r35 into r2784; - and r2783 r2784 into r2785; - not r36 into r2786; - and r2785 r2786 into r2787; - not r37 into r2788; - and r2787 r2788 into r2789; - and r2789 r38 into r2790; - ternary r2790 0u8 r2716 into r2791; - not r1 into r2792; - not r2 into r2793; - and r2792 r2793 into r2794; - not r3 into r2795; - and r2794 r2795 into r2796; - not r4 into r2797; - and r2796 r2797 into r2798; - not r5 into r2799; - and r2798 r2799 into r2800; - not r6 into r2801; - and r2800 r2801 into r2802; - not r7 into r2803; - and r2802 r2803 into r2804; - not r8 into r2805; - and r2804 r2805 into r2806; - not r9 into r2807; - and r2806 r2807 into r2808; - not r10 into r2809; - and r2808 r2809 into r2810; - not r11 into r2811; - and r2810 r2811 into r2812; - not r12 into r2813; - and r2812 r2813 into r2814; - not r13 into r2815; - and r2814 r2815 into r2816; - not r14 into r2817; - and r2816 r2817 into r2818; - not r15 into r2819; - and r2818 r2819 into r2820; - not r16 into r2821; - and r2820 r2821 into r2822; - not r17 into r2823; - and r2822 r2823 into r2824; - not r18 into r2825; - and r2824 r2825 into r2826; - not r19 into r2827; - and r2826 r2827 into r2828; - not r20 into r2829; - and r2828 r2829 into r2830; - not r21 into r2831; - and r2830 r2831 into r2832; - not r22 into r2833; - and r2832 r2833 into r2834; - not r23 into r2835; - and r2834 r2835 into r2836; - not r24 into r2837; - and r2836 r2837 into r2838; - not r25 into r2839; - and r2838 r2839 into r2840; - not r26 into r2841; - and r2840 r2841 into r2842; - not r27 into r2843; - and r2842 r2843 into r2844; - not r28 into r2845; - and r2844 r2845 into r2846; - not r29 into r2847; - and r2846 r2847 into r2848; - not r30 into r2849; - and r2848 r2849 into r2850; - not r31 into r2851; - and r2850 r2851 into r2852; - not r32 into r2853; - and r2852 r2853 into r2854; - not r33 into r2855; - and r2854 r2855 into r2856; - not r34 into r2857; - and r2856 r2857 into r2858; - not r35 into r2859; - and r2858 r2859 into r2860; - not r36 into r2861; - and r2860 r2861 into r2862; - and r2862 r37 into r2863; - ternary r2863 0u8 r2791 into r2864; - not r1 into r2865; - not r2 into r2866; - and r2865 r2866 into r2867; - not r3 into r2868; - and r2867 r2868 into r2869; - not r4 into r2870; - and r2869 r2870 into r2871; - not r5 into r2872; - and r2871 r2872 into r2873; - not r6 into r2874; - and r2873 r2874 into r2875; - not r7 into r2876; - and r2875 r2876 into r2877; - not r8 into r2878; - and r2877 r2878 into r2879; - not r9 into r2880; - and r2879 r2880 into r2881; - not r10 into r2882; - and r2881 r2882 into r2883; - not r11 into r2884; - and r2883 r2884 into r2885; - not r12 into r2886; - and r2885 r2886 into r2887; - not r13 into r2888; - and r2887 r2888 into r2889; - not r14 into r2890; - and r2889 r2890 into r2891; - not r15 into r2892; - and r2891 r2892 into r2893; - not r16 into r2894; - and r2893 r2894 into r2895; - not r17 into r2896; - and r2895 r2896 into r2897; - not r18 into r2898; - and r2897 r2898 into r2899; - not r19 into r2900; - and r2899 r2900 into r2901; - not r20 into r2902; - and r2901 r2902 into r2903; - not r21 into r2904; - and r2903 r2904 into r2905; - not r22 into r2906; - and r2905 r2906 into r2907; - not r23 into r2908; - and r2907 r2908 into r2909; - not r24 into r2910; - and r2909 r2910 into r2911; - not r25 into r2912; - and r2911 r2912 into r2913; - not r26 into r2914; - and r2913 r2914 into r2915; - not r27 into r2916; - and r2915 r2916 into r2917; - not r28 into r2918; - and r2917 r2918 into r2919; - not r29 into r2920; - and r2919 r2920 into r2921; - not r30 into r2922; - and r2921 r2922 into r2923; - not r31 into r2924; - and r2923 r2924 into r2925; - not r32 into r2926; - and r2925 r2926 into r2927; - not r33 into r2928; - and r2927 r2928 into r2929; - not r34 into r2930; - and r2929 r2930 into r2931; - not r35 into r2932; - and r2931 r2932 into r2933; - and r2933 r36 into r2934; - ternary r2934 0u8 r2864 into r2935; - not r1 into r2936; - not r2 into r2937; - and r2936 r2937 into r2938; - not r3 into r2939; - and r2938 r2939 into r2940; - not r4 into r2941; - and r2940 r2941 into r2942; - not r5 into r2943; - and r2942 r2943 into r2944; - not r6 into r2945; - and r2944 r2945 into r2946; - not r7 into r2947; - and r2946 r2947 into r2948; - not r8 into r2949; - and r2948 r2949 into r2950; - not r9 into r2951; - and r2950 r2951 into r2952; - not r10 into r2953; - and r2952 r2953 into r2954; - not r11 into r2955; - and r2954 r2955 into r2956; - not r12 into r2957; - and r2956 r2957 into r2958; - not r13 into r2959; - and r2958 r2959 into r2960; - not r14 into r2961; - and r2960 r2961 into r2962; - not r15 into r2963; - and r2962 r2963 into r2964; - not r16 into r2965; - and r2964 r2965 into r2966; - not r17 into r2967; - and r2966 r2967 into r2968; - not r18 into r2969; - and r2968 r2969 into r2970; - not r19 into r2971; - and r2970 r2971 into r2972; - not r20 into r2973; - and r2972 r2973 into r2974; - not r21 into r2975; - and r2974 r2975 into r2976; - not r22 into r2977; - and r2976 r2977 into r2978; - not r23 into r2979; - and r2978 r2979 into r2980; - not r24 into r2981; - and r2980 r2981 into r2982; - not r25 into r2983; - and r2982 r2983 into r2984; - not r26 into r2985; - and r2984 r2985 into r2986; - not r27 into r2987; - and r2986 r2987 into r2988; - not r28 into r2989; - and r2988 r2989 into r2990; - not r29 into r2991; - and r2990 r2991 into r2992; - not r30 into r2993; - and r2992 r2993 into r2994; - not r31 into r2995; - and r2994 r2995 into r2996; - not r32 into r2997; - and r2996 r2997 into r2998; - not r33 into r2999; - and r2998 r2999 into r3000; - not r34 into r3001; - and r3000 r3001 into r3002; - and r3002 r35 into r3003; - ternary r3003 5u8 r2935 into r3004; - not r1 into r3005; - not r2 into r3006; - and r3005 r3006 into r3007; - not r3 into r3008; - and r3007 r3008 into r3009; - not r4 into r3010; - and r3009 r3010 into r3011; - not r5 into r3012; - and r3011 r3012 into r3013; - not r6 into r3014; - and r3013 r3014 into r3015; - not r7 into r3016; - and r3015 r3016 into r3017; - not r8 into r3018; - and r3017 r3018 into r3019; - not r9 into r3020; - and r3019 r3020 into r3021; - not r10 into r3022; - and r3021 r3022 into r3023; - not r11 into r3024; - and r3023 r3024 into r3025; - not r12 into r3026; - and r3025 r3026 into r3027; - not r13 into r3028; - and r3027 r3028 into r3029; - not r14 into r3030; - and r3029 r3030 into r3031; - not r15 into r3032; - and r3031 r3032 into r3033; - not r16 into r3034; - and r3033 r3034 into r3035; - not r17 into r3036; - and r3035 r3036 into r3037; - not r18 into r3038; - and r3037 r3038 into r3039; - not r19 into r3040; - and r3039 r3040 into r3041; - not r20 into r3042; - and r3041 r3042 into r3043; - not r21 into r3044; - and r3043 r3044 into r3045; - not r22 into r3046; - and r3045 r3046 into r3047; - not r23 into r3048; - and r3047 r3048 into r3049; - not r24 into r3050; - and r3049 r3050 into r3051; - not r25 into r3052; - and r3051 r3052 into r3053; - not r26 into r3054; - and r3053 r3054 into r3055; - not r27 into r3056; - and r3055 r3056 into r3057; - not r28 into r3058; - and r3057 r3058 into r3059; - not r29 into r3060; - and r3059 r3060 into r3061; - not r30 into r3062; - and r3061 r3062 into r3063; - not r31 into r3064; - and r3063 r3064 into r3065; - not r32 into r3066; - and r3065 r3066 into r3067; - not r33 into r3068; - and r3067 r3068 into r3069; - and r3069 r34 into r3070; - ternary r3070 11u8 r3004 into r3071; - not r1 into r3072; - not r2 into r3073; - and r3072 r3073 into r3074; - not r3 into r3075; - and r3074 r3075 into r3076; - not r4 into r3077; - and r3076 r3077 into r3078; - not r5 into r3079; - and r3078 r3079 into r3080; - not r6 into r3081; - and r3080 r3081 into r3082; - not r7 into r3083; - and r3082 r3083 into r3084; - not r8 into r3085; - and r3084 r3085 into r3086; - not r9 into r3087; - and r3086 r3087 into r3088; - not r10 into r3089; - and r3088 r3089 into r3090; - not r11 into r3091; - and r3090 r3091 into r3092; - not r12 into r3093; - and r3092 r3093 into r3094; - not r13 into r3095; - and r3094 r3095 into r3096; - not r14 into r3097; - and r3096 r3097 into r3098; - not r15 into r3099; - and r3098 r3099 into r3100; - not r16 into r3101; - and r3100 r3101 into r3102; - not r17 into r3103; - and r3102 r3103 into r3104; - not r18 into r3105; - and r3104 r3105 into r3106; - not r19 into r3107; - and r3106 r3107 into r3108; - not r20 into r3109; - and r3108 r3109 into r3110; - not r21 into r3111; - and r3110 r3111 into r3112; - not r22 into r3113; - and r3112 r3113 into r3114; - not r23 into r3115; - and r3114 r3115 into r3116; - not r24 into r3117; - and r3116 r3117 into r3118; - not r25 into r3119; - and r3118 r3119 into r3120; - not r26 into r3121; - and r3120 r3121 into r3122; - not r27 into r3123; - and r3122 r3123 into r3124; - not r28 into r3125; - and r3124 r3125 into r3126; - not r29 into r3127; - and r3126 r3127 into r3128; - not r30 into r3129; - and r3128 r3129 into r3130; - not r31 into r3131; - and r3130 r3131 into r3132; - not r32 into r3133; - and r3132 r3133 into r3134; - and r3134 r33 into r3135; - ternary r3135 31u8 r3071 into r3136; - not r1 into r3137; - not r2 into r3138; - and r3137 r3138 into r3139; - not r3 into r3140; - and r3139 r3140 into r3141; - not r4 into r3142; - and r3141 r3142 into r3143; - not r5 into r3144; - and r3143 r3144 into r3145; - not r6 into r3146; - and r3145 r3146 into r3147; - not r7 into r3148; - and r3147 r3148 into r3149; - not r8 into r3150; - and r3149 r3150 into r3151; - not r9 into r3152; - and r3151 r3152 into r3153; - not r10 into r3154; - and r3153 r3154 into r3155; - not r11 into r3156; - and r3155 r3156 into r3157; - not r12 into r3158; - and r3157 r3158 into r3159; - not r13 into r3160; - and r3159 r3160 into r3161; - not r14 into r3162; - and r3161 r3162 into r3163; - not r15 into r3164; - and r3163 r3164 into r3165; - not r16 into r3166; - and r3165 r3166 into r3167; - not r17 into r3168; - and r3167 r3168 into r3169; - not r18 into r3170; - and r3169 r3170 into r3171; - not r19 into r3172; - and r3171 r3172 into r3173; - not r20 into r3174; - and r3173 r3174 into r3175; - not r21 into r3176; - and r3175 r3176 into r3177; - not r22 into r3178; - and r3177 r3178 into r3179; - not r23 into r3180; - and r3179 r3180 into r3181; - not r24 into r3182; - and r3181 r3182 into r3183; - not r25 into r3184; - and r3183 r3184 into r3185; - not r26 into r3186; - and r3185 r3186 into r3187; - not r27 into r3188; - and r3187 r3188 into r3189; - not r28 into r3190; - and r3189 r3190 into r3191; - not r29 into r3192; - and r3191 r3192 into r3193; - not r30 into r3194; - and r3193 r3194 into r3195; - not r31 into r3196; - and r3195 r3196 into r3197; - and r3197 r32 into r3198; - ternary r3198 15u8 r3136 into r3199; - not r1 into r3200; - not r2 into r3201; - and r3200 r3201 into r3202; - not r3 into r3203; - and r3202 r3203 into r3204; - not r4 into r3205; - and r3204 r3205 into r3206; - not r5 into r3207; - and r3206 r3207 into r3208; - not r6 into r3209; - and r3208 r3209 into r3210; - not r7 into r3211; - and r3210 r3211 into r3212; - not r8 into r3213; - and r3212 r3213 into r3214; - not r9 into r3215; - and r3214 r3215 into r3216; - not r10 into r3217; - and r3216 r3217 into r3218; - not r11 into r3219; - and r3218 r3219 into r3220; - not r12 into r3221; - and r3220 r3221 into r3222; - not r13 into r3223; - and r3222 r3223 into r3224; - not r14 into r3225; - and r3224 r3225 into r3226; - not r15 into r3227; - and r3226 r3227 into r3228; - not r16 into r3229; - and r3228 r3229 into r3230; - not r17 into r3231; - and r3230 r3231 into r3232; - not r18 into r3233; - and r3232 r3233 into r3234; - not r19 into r3235; - and r3234 r3235 into r3236; - not r20 into r3237; - and r3236 r3237 into r3238; - not r21 into r3239; - and r3238 r3239 into r3240; - not r22 into r3241; - and r3240 r3241 into r3242; - not r23 into r3243; - and r3242 r3243 into r3244; - not r24 into r3245; - and r3244 r3245 into r3246; - not r25 into r3247; - and r3246 r3247 into r3248; - not r26 into r3249; - and r3248 r3249 into r3250; - not r27 into r3251; - and r3250 r3251 into r3252; - not r28 into r3253; - and r3252 r3253 into r3254; - not r29 into r3255; - and r3254 r3255 into r3256; - not r30 into r3257; - and r3256 r3257 into r3258; - and r3258 r31 into r3259; - ternary r3259 27u8 r3199 into r3260; - not r1 into r3261; - not r2 into r3262; - and r3261 r3262 into r3263; - not r3 into r3264; - and r3263 r3264 into r3265; - not r4 into r3266; - and r3265 r3266 into r3267; - not r5 into r3268; - and r3267 r3268 into r3269; - not r6 into r3270; - and r3269 r3270 into r3271; - not r7 into r3272; - and r3271 r3272 into r3273; - not r8 into r3274; - and r3273 r3274 into r3275; - not r9 into r3276; - and r3275 r3276 into r3277; - not r10 into r3278; - and r3277 r3278 into r3279; - not r11 into r3280; - and r3279 r3280 into r3281; - not r12 into r3282; - and r3281 r3282 into r3283; - not r13 into r3284; - and r3283 r3284 into r3285; - not r14 into r3286; - and r3285 r3286 into r3287; - not r15 into r3288; - and r3287 r3288 into r3289; - not r16 into r3290; - and r3289 r3290 into r3291; - not r17 into r3292; - and r3291 r3292 into r3293; - not r18 into r3294; - and r3293 r3294 into r3295; - not r19 into r3296; - and r3295 r3296 into r3297; - not r20 into r3298; - and r3297 r3298 into r3299; - not r21 into r3300; - and r3299 r3300 into r3301; - not r22 into r3302; - and r3301 r3302 into r3303; - not r23 into r3304; - and r3303 r3304 into r3305; - not r24 into r3306; - and r3305 r3306 into r3307; - not r25 into r3308; - and r3307 r3308 into r3309; - not r26 into r3310; - and r3309 r3310 into r3311; - not r27 into r3312; - and r3311 r3312 into r3313; - not r28 into r3314; - and r3313 r3314 into r3315; - not r29 into r3316; - and r3315 r3316 into r3317; - and r3317 r30 into r3318; - ternary r3318 21u8 r3260 into r3319; - not r1 into r3320; - not r2 into r3321; - and r3320 r3321 into r3322; - not r3 into r3323; - and r3322 r3323 into r3324; - not r4 into r3325; - and r3324 r3325 into r3326; - not r5 into r3327; - and r3326 r3327 into r3328; - not r6 into r3329; - and r3328 r3329 into r3330; - not r7 into r3331; - and r3330 r3331 into r3332; - not r8 into r3333; - and r3332 r3333 into r3334; - not r9 into r3335; - and r3334 r3335 into r3336; - not r10 into r3337; - and r3336 r3337 into r3338; - not r11 into r3339; - and r3338 r3339 into r3340; - not r12 into r3341; - and r3340 r3341 into r3342; - not r13 into r3343; - and r3342 r3343 into r3344; - not r14 into r3345; - and r3344 r3345 into r3346; - not r15 into r3347; - and r3346 r3347 into r3348; - not r16 into r3349; - and r3348 r3349 into r3350; - not r17 into r3351; - and r3350 r3351 into r3352; - not r18 into r3353; - and r3352 r3353 into r3354; - not r19 into r3355; - and r3354 r3355 into r3356; - not r20 into r3357; - and r3356 r3357 into r3358; - not r21 into r3359; - and r3358 r3359 into r3360; - not r22 into r3361; - and r3360 r3361 into r3362; - not r23 into r3363; - and r3362 r3363 into r3364; - not r24 into r3365; - and r3364 r3365 into r3366; - not r25 into r3367; - and r3366 r3367 into r3368; - not r26 into r3369; - and r3368 r3369 into r3370; - not r27 into r3371; - and r3370 r3371 into r3372; - not r28 into r3373; - and r3372 r3373 into r3374; - and r3374 r29 into r3375; - ternary r3375 0u8 r3319 into r3376; - not r1 into r3377; - not r2 into r3378; - and r3377 r3378 into r3379; - not r3 into r3380; - and r3379 r3380 into r3381; - not r4 into r3382; - and r3381 r3382 into r3383; - not r5 into r3384; - and r3383 r3384 into r3385; - not r6 into r3386; - and r3385 r3386 into r3387; - not r7 into r3388; - and r3387 r3388 into r3389; - not r8 into r3390; - and r3389 r3390 into r3391; - not r9 into r3392; - and r3391 r3392 into r3393; - not r10 into r3394; - and r3393 r3394 into r3395; - not r11 into r3396; - and r3395 r3396 into r3397; - not r12 into r3398; - and r3397 r3398 into r3399; - not r13 into r3400; - and r3399 r3400 into r3401; - not r14 into r3402; - and r3401 r3402 into r3403; - not r15 into r3404; - and r3403 r3404 into r3405; - not r16 into r3406; - and r3405 r3406 into r3407; - not r17 into r3408; - and r3407 r3408 into r3409; - not r18 into r3410; - and r3409 r3410 into r3411; - not r19 into r3412; - and r3411 r3412 into r3413; - not r20 into r3414; - and r3413 r3414 into r3415; - not r21 into r3416; - and r3415 r3416 into r3417; - not r22 into r3418; - and r3417 r3418 into r3419; - not r23 into r3420; - and r3419 r3420 into r3421; - not r24 into r3422; - and r3421 r3422 into r3423; - not r25 into r3424; - and r3423 r3424 into r3425; - not r26 into r3426; - and r3425 r3426 into r3427; - not r27 into r3428; - and r3427 r3428 into r3429; - and r3429 r28 into r3430; - ternary r3430 0u8 r3376 into r3431; - not r1 into r3432; - not r2 into r3433; - and r3432 r3433 into r3434; - not r3 into r3435; - and r3434 r3435 into r3436; - not r4 into r3437; - and r3436 r3437 into r3438; - not r5 into r3439; - and r3438 r3439 into r3440; - not r6 into r3441; - and r3440 r3441 into r3442; - not r7 into r3443; - and r3442 r3443 into r3444; - not r8 into r3445; - and r3444 r3445 into r3446; - not r9 into r3447; - and r3446 r3447 into r3448; - not r10 into r3449; - and r3448 r3449 into r3450; - not r11 into r3451; - and r3450 r3451 into r3452; - not r12 into r3453; - and r3452 r3453 into r3454; - not r13 into r3455; - and r3454 r3455 into r3456; - not r14 into r3457; - and r3456 r3457 into r3458; - not r15 into r3459; - and r3458 r3459 into r3460; - not r16 into r3461; - and r3460 r3461 into r3462; - not r17 into r3463; - and r3462 r3463 into r3464; - not r18 into r3465; - and r3464 r3465 into r3466; - not r19 into r3467; - and r3466 r3467 into r3468; - not r20 into r3469; - and r3468 r3469 into r3470; - not r21 into r3471; - and r3470 r3471 into r3472; - not r22 into r3473; - and r3472 r3473 into r3474; - not r23 into r3475; - and r3474 r3475 into r3476; - not r24 into r3477; - and r3476 r3477 into r3478; - not r25 into r3479; - and r3478 r3479 into r3480; - not r26 into r3481; - and r3480 r3481 into r3482; - and r3482 r27 into r3483; - ternary r3483 0u8 r3431 into r3484; - not r1 into r3485; - not r2 into r3486; - and r3485 r3486 into r3487; - not r3 into r3488; - and r3487 r3488 into r3489; - not r4 into r3490; - and r3489 r3490 into r3491; - not r5 into r3492; - and r3491 r3492 into r3493; - not r6 into r3494; - and r3493 r3494 into r3495; - not r7 into r3496; - and r3495 r3496 into r3497; - not r8 into r3498; - and r3497 r3498 into r3499; - not r9 into r3500; - and r3499 r3500 into r3501; - not r10 into r3502; - and r3501 r3502 into r3503; - not r11 into r3504; - and r3503 r3504 into r3505; - not r12 into r3506; - and r3505 r3506 into r3507; - not r13 into r3508; - and r3507 r3508 into r3509; - not r14 into r3510; - and r3509 r3510 into r3511; - not r15 into r3512; - and r3511 r3512 into r3513; - not r16 into r3514; - and r3513 r3514 into r3515; - not r17 into r3516; - and r3515 r3516 into r3517; - not r18 into r3518; - and r3517 r3518 into r3519; - not r19 into r3520; - and r3519 r3520 into r3521; - not r20 into r3522; - and r3521 r3522 into r3523; - not r21 into r3524; - and r3523 r3524 into r3525; - not r22 into r3526; - and r3525 r3526 into r3527; - not r23 into r3528; - and r3527 r3528 into r3529; - not r24 into r3530; - and r3529 r3530 into r3531; - not r25 into r3532; - and r3531 r3532 into r3533; - and r3533 r26 into r3534; - ternary r3534 0u8 r3484 into r3535; - not r1 into r3536; - not r2 into r3537; - and r3536 r3537 into r3538; - not r3 into r3539; - and r3538 r3539 into r3540; - not r4 into r3541; - and r3540 r3541 into r3542; - not r5 into r3543; - and r3542 r3543 into r3544; - not r6 into r3545; - and r3544 r3545 into r3546; - not r7 into r3547; - and r3546 r3547 into r3548; - not r8 into r3549; - and r3548 r3549 into r3550; - not r9 into r3551; - and r3550 r3551 into r3552; - not r10 into r3553; - and r3552 r3553 into r3554; - not r11 into r3555; - and r3554 r3555 into r3556; - not r12 into r3557; - and r3556 r3557 into r3558; - not r13 into r3559; - and r3558 r3559 into r3560; - not r14 into r3561; - and r3560 r3561 into r3562; - not r15 into r3563; - and r3562 r3563 into r3564; - not r16 into r3565; - and r3564 r3565 into r3566; - not r17 into r3567; - and r3566 r3567 into r3568; - not r18 into r3569; - and r3568 r3569 into r3570; - not r19 into r3571; - and r3570 r3571 into r3572; - not r20 into r3573; - and r3572 r3573 into r3574; - not r21 into r3575; - and r3574 r3575 into r3576; - not r22 into r3577; - and r3576 r3577 into r3578; - not r23 into r3579; - and r3578 r3579 into r3580; - not r24 into r3581; - and r3580 r3581 into r3582; - and r3582 r25 into r3583; - ternary r3583 0u8 r3535 into r3584; - not r1 into r3585; - not r2 into r3586; - and r3585 r3586 into r3587; - not r3 into r3588; - and r3587 r3588 into r3589; - not r4 into r3590; - and r3589 r3590 into r3591; - not r5 into r3592; - and r3591 r3592 into r3593; - not r6 into r3594; - and r3593 r3594 into r3595; - not r7 into r3596; - and r3595 r3596 into r3597; - not r8 into r3598; - and r3597 r3598 into r3599; - not r9 into r3600; - and r3599 r3600 into r3601; - not r10 into r3602; - and r3601 r3602 into r3603; - not r11 into r3604; - and r3603 r3604 into r3605; - not r12 into r3606; - and r3605 r3606 into r3607; - not r13 into r3608; - and r3607 r3608 into r3609; - not r14 into r3610; - and r3609 r3610 into r3611; - not r15 into r3612; - and r3611 r3612 into r3613; - not r16 into r3614; - and r3613 r3614 into r3615; - not r17 into r3616; - and r3615 r3616 into r3617; - not r18 into r3618; - and r3617 r3618 into r3619; - not r19 into r3620; - and r3619 r3620 into r3621; - not r20 into r3622; - and r3621 r3622 into r3623; - not r21 into r3624; - and r3623 r3624 into r3625; - not r22 into r3626; - and r3625 r3626 into r3627; - not r23 into r3628; - and r3627 r3628 into r3629; - and r3629 r24 into r3630; - ternary r3630 25u8 r3584 into r3631; - not r1 into r3632; - not r2 into r3633; - and r3632 r3633 into r3634; - not r3 into r3635; - and r3634 r3635 into r3636; - not r4 into r3637; - and r3636 r3637 into r3638; - not r5 into r3639; - and r3638 r3639 into r3640; - not r6 into r3641; - and r3640 r3641 into r3642; - not r7 into r3643; - and r3642 r3643 into r3644; - not r8 into r3645; - and r3644 r3645 into r3646; - not r9 into r3647; - and r3646 r3647 into r3648; - not r10 into r3649; - and r3648 r3649 into r3650; - not r11 into r3651; - and r3650 r3651 into r3652; - not r12 into r3653; - and r3652 r3653 into r3654; - not r13 into r3655; - and r3654 r3655 into r3656; - not r14 into r3657; - and r3656 r3657 into r3658; - not r15 into r3659; - and r3658 r3659 into r3660; - not r16 into r3661; - and r3660 r3661 into r3662; - not r17 into r3663; - and r3662 r3663 into r3664; - not r18 into r3665; - and r3664 r3665 into r3666; - not r19 into r3667; - and r3666 r3667 into r3668; - not r20 into r3669; - and r3668 r3669 into r3670; - not r21 into r3671; - and r3670 r3671 into r3672; - not r22 into r3673; - and r3672 r3673 into r3674; - and r3674 r23 into r3675; - ternary r3675 0u8 r3631 into r3676; - not r1 into r3677; - not r2 into r3678; - and r3677 r3678 into r3679; - not r3 into r3680; - and r3679 r3680 into r3681; - not r4 into r3682; - and r3681 r3682 into r3683; - not r5 into r3684; - and r3683 r3684 into r3685; - not r6 into r3686; - and r3685 r3686 into r3687; - not r7 into r3688; - and r3687 r3688 into r3689; - not r8 into r3690; - and r3689 r3690 into r3691; - not r9 into r3692; - and r3691 r3692 into r3693; - not r10 into r3694; - and r3693 r3694 into r3695; - not r11 into r3696; - and r3695 r3696 into r3697; - not r12 into r3698; - and r3697 r3698 into r3699; - not r13 into r3700; - and r3699 r3700 into r3701; - not r14 into r3702; - and r3701 r3702 into r3703; - not r15 into r3704; - and r3703 r3704 into r3705; - not r16 into r3706; - and r3705 r3706 into r3707; - not r17 into r3708; - and r3707 r3708 into r3709; - not r18 into r3710; - and r3709 r3710 into r3711; - not r19 into r3712; - and r3711 r3712 into r3713; - not r20 into r3714; - and r3713 r3714 into r3715; - not r21 into r3716; - and r3715 r3716 into r3717; - and r3717 r22 into r3718; - ternary r3718 0u8 r3676 into r3719; - not r1 into r3720; - not r2 into r3721; - and r3720 r3721 into r3722; - not r3 into r3723; - and r3722 r3723 into r3724; - not r4 into r3725; - and r3724 r3725 into r3726; - not r5 into r3727; - and r3726 r3727 into r3728; - not r6 into r3729; - and r3728 r3729 into r3730; - not r7 into r3731; - and r3730 r3731 into r3732; - not r8 into r3733; - and r3732 r3733 into r3734; - not r9 into r3735; - and r3734 r3735 into r3736; - not r10 into r3737; - and r3736 r3737 into r3738; - not r11 into r3739; - and r3738 r3739 into r3740; - not r12 into r3741; - and r3740 r3741 into r3742; - not r13 into r3743; - and r3742 r3743 into r3744; - not r14 into r3745; - and r3744 r3745 into r3746; - not r15 into r3747; - and r3746 r3747 into r3748; - not r16 into r3749; - and r3748 r3749 into r3750; - not r17 into r3751; - and r3750 r3751 into r3752; - not r18 into r3753; - and r3752 r3753 into r3754; - not r19 into r3755; - and r3754 r3755 into r3756; - not r20 into r3757; - and r3756 r3757 into r3758; - and r3758 r21 into r3759; - ternary r3759 8u8 r3719 into r3760; - not r1 into r3761; - not r2 into r3762; - and r3761 r3762 into r3763; - not r3 into r3764; - and r3763 r3764 into r3765; - not r4 into r3766; - and r3765 r3766 into r3767; - not r5 into r3768; - and r3767 r3768 into r3769; - not r6 into r3770; - and r3769 r3770 into r3771; - not r7 into r3772; - and r3771 r3772 into r3773; - not r8 into r3774; - and r3773 r3774 into r3775; - not r9 into r3776; - and r3775 r3776 into r3777; - not r10 into r3778; - and r3777 r3778 into r3779; - not r11 into r3780; - and r3779 r3780 into r3781; - not r12 into r3782; - and r3781 r3782 into r3783; - not r13 into r3784; - and r3783 r3784 into r3785; - not r14 into r3786; - and r3785 r3786 into r3787; - not r15 into r3788; - and r3787 r3788 into r3789; - not r16 into r3790; - and r3789 r3790 into r3791; - not r17 into r3792; - and r3791 r3792 into r3793; - not r18 into r3794; - and r3793 r3794 into r3795; - not r19 into r3796; - and r3795 r3796 into r3797; - and r3797 r20 into r3798; - ternary r3798 0u8 r3760 into r3799; - not r1 into r3800; - not r2 into r3801; - and r3800 r3801 into r3802; - not r3 into r3803; - and r3802 r3803 into r3804; - not r4 into r3805; - and r3804 r3805 into r3806; - not r5 into r3807; - and r3806 r3807 into r3808; - not r6 into r3809; - and r3808 r3809 into r3810; - not r7 into r3811; - and r3810 r3811 into r3812; - not r8 into r3813; - and r3812 r3813 into r3814; - not r9 into r3815; - and r3814 r3815 into r3816; - not r10 into r3817; - and r3816 r3817 into r3818; - not r11 into r3819; - and r3818 r3819 into r3820; - not r12 into r3821; - and r3820 r3821 into r3822; - not r13 into r3823; - and r3822 r3823 into r3824; - not r14 into r3825; - and r3824 r3825 into r3826; - not r15 into r3827; - and r3826 r3827 into r3828; - not r16 into r3829; - and r3828 r3829 into r3830; - not r17 into r3831; - and r3830 r3831 into r3832; - not r18 into r3833; - and r3832 r3833 into r3834; - and r3834 r19 into r3835; - ternary r3835 0u8 r3799 into r3836; - not r1 into r3837; - not r2 into r3838; - and r3837 r3838 into r3839; - not r3 into r3840; - and r3839 r3840 into r3841; - not r4 into r3842; - and r3841 r3842 into r3843; - not r5 into r3844; - and r3843 r3844 into r3845; - not r6 into r3846; - and r3845 r3846 into r3847; - not r7 into r3848; - and r3847 r3848 into r3849; - not r8 into r3850; - and r3849 r3850 into r3851; - not r9 into r3852; - and r3851 r3852 into r3853; - not r10 into r3854; - and r3853 r3854 into r3855; - not r11 into r3856; - and r3855 r3856 into r3857; - not r12 into r3858; - and r3857 r3858 into r3859; - not r13 into r3860; - and r3859 r3860 into r3861; - not r14 into r3862; - and r3861 r3862 into r3863; - not r15 into r3864; - and r3863 r3864 into r3865; - not r16 into r3866; - and r3865 r3866 into r3867; - not r17 into r3868; - and r3867 r3868 into r3869; - and r3869 r18 into r3870; - ternary r3870 4u8 r3836 into r3871; - not r1 into r3872; - not r2 into r3873; - and r3872 r3873 into r3874; - not r3 into r3875; - and r3874 r3875 into r3876; - not r4 into r3877; - and r3876 r3877 into r3878; - not r5 into r3879; - and r3878 r3879 into r3880; - not r6 into r3881; - and r3880 r3881 into r3882; - not r7 into r3883; - and r3882 r3883 into r3884; - not r8 into r3885; - and r3884 r3885 into r3886; - not r9 into r3887; - and r3886 r3887 into r3888; - not r10 into r3889; - and r3888 r3889 into r3890; - not r11 into r3891; - and r3890 r3891 into r3892; - not r12 into r3893; - and r3892 r3893 into r3894; - not r13 into r3895; - and r3894 r3895 into r3896; - not r14 into r3897; - and r3896 r3897 into r3898; - not r15 into r3899; - and r3898 r3899 into r3900; - not r16 into r3901; - and r3900 r3901 into r3902; - and r3902 r17 into r3903; - ternary r3903 10u8 r3871 into r3904; - not r1 into r3905; - not r2 into r3906; - and r3905 r3906 into r3907; - not r3 into r3908; - and r3907 r3908 into r3909; - not r4 into r3910; - and r3909 r3910 into r3911; - not r5 into r3912; - and r3911 r3912 into r3913; - not r6 into r3914; - and r3913 r3914 into r3915; - not r7 into r3916; - and r3915 r3916 into r3917; - not r8 into r3918; - and r3917 r3918 into r3919; - not r9 into r3920; - and r3919 r3920 into r3921; - not r10 into r3922; - and r3921 r3922 into r3923; - not r11 into r3924; - and r3923 r3924 into r3925; - not r12 into r3926; - and r3925 r3926 into r3927; - not r13 into r3928; - and r3927 r3928 into r3929; - not r14 into r3930; - and r3929 r3930 into r3931; - not r15 into r3932; - and r3931 r3932 into r3933; - and r3933 r16 into r3934; - ternary r3934 14u8 r3904 into r3935; - not r1 into r3936; - not r2 into r3937; - and r3936 r3937 into r3938; - not r3 into r3939; - and r3938 r3939 into r3940; - not r4 into r3941; - and r3940 r3941 into r3942; - not r5 into r3943; - and r3942 r3943 into r3944; - not r6 into r3945; - and r3944 r3945 into r3946; - not r7 into r3947; - and r3946 r3947 into r3948; - not r8 into r3949; - and r3948 r3949 into r3950; - not r9 into r3951; - and r3950 r3951 into r3952; - not r10 into r3953; - and r3952 r3953 into r3954; - not r11 into r3955; - and r3954 r3955 into r3956; - not r12 into r3957; - and r3956 r3957 into r3958; - not r13 into r3959; - and r3958 r3959 into r3960; - not r14 into r3961; - and r3960 r3961 into r3962; - and r3962 r15 into r3963; - ternary r3963 0u8 r3935 into r3964; - not r1 into r3965; - not r2 into r3966; - and r3965 r3966 into r3967; - not r3 into r3968; - and r3967 r3968 into r3969; - not r4 into r3970; - and r3969 r3970 into r3971; - not r5 into r3972; - and r3971 r3972 into r3973; - not r6 into r3974; - and r3973 r3974 into r3975; - not r7 into r3976; - and r3975 r3976 into r3977; - not r8 into r3978; - and r3977 r3978 into r3979; - not r9 into r3980; - and r3979 r3980 into r3981; - not r10 into r3982; - and r3981 r3982 into r3983; - not r11 into r3984; - and r3983 r3984 into r3985; - not r12 into r3986; - and r3985 r3986 into r3987; - not r13 into r3988; - and r3987 r3988 into r3989; - and r3989 r14 into r3990; - ternary r3990 0u8 r3964 into r3991; - not r1 into r3992; - not r2 into r3993; - and r3992 r3993 into r3994; - not r3 into r3995; - and r3994 r3995 into r3996; - not r4 into r3997; - and r3996 r3997 into r3998; - not r5 into r3999; - and r3998 r3999 into r4000; - not r6 into r4001; - and r4000 r4001 into r4002; - not r7 into r4003; - and r4002 r4003 into r4004; - not r8 into r4005; - and r4004 r4005 into r4006; - not r9 into r4007; - and r4006 r4007 into r4008; - not r10 into r4009; - and r4008 r4009 into r4010; - not r11 into r4011; - and r4010 r4011 into r4012; - not r12 into r4013; - and r4012 r4013 into r4014; - and r4014 r13 into r4015; - ternary r4015 0u8 r3991 into r4016; - not r1 into r4017; - not r2 into r4018; - and r4017 r4018 into r4019; - not r3 into r4020; - and r4019 r4020 into r4021; - not r4 into r4022; - and r4021 r4022 into r4023; - not r5 into r4024; - and r4023 r4024 into r4025; - not r6 into r4026; - and r4025 r4026 into r4027; - not r7 into r4028; - and r4027 r4028 into r4029; - not r8 into r4030; - and r4029 r4030 into r4031; - not r9 into r4032; - and r4031 r4032 into r4033; - not r10 into r4034; - and r4033 r4034 into r4035; - not r11 into r4036; - and r4035 r4036 into r4037; - and r4037 r12 into r4038; - ternary r4038 0u8 r4016 into r4039; - not r1 into r4040; - not r2 into r4041; - and r4040 r4041 into r4042; - not r3 into r4043; - and r4042 r4043 into r4044; - not r4 into r4045; - and r4044 r4045 into r4046; - not r5 into r4047; - and r4046 r4047 into r4048; - not r6 into r4049; - and r4048 r4049 into r4050; - not r7 into r4051; - and r4050 r4051 into r4052; - not r8 into r4053; - and r4052 r4053 into r4054; - not r9 into r4055; - and r4054 r4055 into r4056; - not r10 into r4057; - and r4056 r4057 into r4058; - and r4058 r11 into r4059; - ternary r4059 7u8 r4039 into r4060; - not r1 into r4061; - not r2 into r4062; - and r4061 r4062 into r4063; - not r3 into r4064; - and r4063 r4064 into r4065; - not r4 into r4066; - and r4065 r4066 into r4067; - not r5 into r4068; - and r4067 r4068 into r4069; - not r6 into r4070; - and r4069 r4070 into r4071; - not r7 into r4072; - and r4071 r4072 into r4073; - not r8 into r4074; - and r4073 r4074 into r4075; - not r9 into r4076; - and r4075 r4076 into r4077; - and r4077 r10 into r4078; - ternary r4078 0u8 r4060 into r4079; - not r1 into r4080; - not r2 into r4081; - and r4080 r4081 into r4082; - not r3 into r4083; - and r4082 r4083 into r4084; - not r4 into r4085; - and r4084 r4085 into r4086; - not r5 into r4087; - and r4086 r4087 into r4088; - not r6 into r4089; - and r4088 r4089 into r4090; - not r7 into r4091; - and r4090 r4091 into r4092; - not r8 into r4093; - and r4092 r4093 into r4094; - and r4094 r9 into r4095; - ternary r4095 3u8 r4079 into r4096; - not r1 into r4097; - not r2 into r4098; - and r4097 r4098 into r4099; - not r3 into r4100; - and r4099 r4100 into r4101; - not r4 into r4102; - and r4101 r4102 into r4103; - not r5 into r4104; - and r4103 r4104 into r4105; - not r6 into r4106; - and r4105 r4106 into r4107; - not r7 into r4108; - and r4107 r4108 into r4109; - and r4109 r8 into r4110; - ternary r4110 13u8 r4096 into r4111; - not r1 into r4112; - not r2 into r4113; - and r4112 r4113 into r4114; - not r3 into r4115; - and r4114 r4115 into r4116; - not r4 into r4117; - and r4116 r4117 into r4118; - not r5 into r4119; - and r4118 r4119 into r4120; - not r6 into r4121; - and r4120 r4121 into r4122; - and r4122 r7 into r4123; - ternary r4123 0u8 r4111 into r4124; - not r1 into r4125; - not r2 into r4126; - and r4125 r4126 into r4127; - not r3 into r4128; - and r4127 r4128 into r4129; - not r4 into r4130; - and r4129 r4130 into r4131; - not r5 into r4132; - and r4131 r4132 into r4133; - and r4133 r6 into r4134; - ternary r4134 6u8 r4124 into r4135; - not r1 into r4136; - not r2 into r4137; - and r4136 r4137 into r4138; - not r3 into r4139; - and r4138 r4139 into r4140; - not r4 into r4141; - and r4140 r4141 into r4142; - and r4142 r5 into r4143; - ternary r4143 2u8 r4135 into r4144; - not r1 into r4145; - not r2 into r4146; - and r4145 r4146 into r4147; - not r3 into r4148; - and r4147 r4148 into r4149; - and r4149 r4 into r4150; - ternary r4150 12u8 r4144 into r4151; - not r1 into r4152; - not r2 into r4153; - and r4152 r4153 into r4154; - and r4154 r3 into r4155; - ternary r4155 1u8 r4151 into r4156; - not r1 into r4157; - and r4157 r2 into r4158; - ternary r4158 0u8 r4156 into r4159; - ternary r1 32u8 r4159 into r4160; - output r4160 as u8; + and r1634 r3 into r1635; + ternary r1635 1u8 r1631 into r1636; + not r1 into r1637; + and r1637 r2 into r1638; + ternary r1638 0u8 r1636 into r1639; + ternary r1 32u8 r1639 into r1640; + output r1640 as u8; function main: diff --git a/examples/lottery/build/main.aleo b/examples/lottery/build/main.aleo index dc0ee909fd..859e6208e0 100644 --- a/examples/lottery/build/main.aleo +++ b/examples/lottery/build/main.aleo @@ -8,6 +8,7 @@ mapping num_winners: key as u8.public; value as u8.public; + function play: cast self.caller into r0 as Ticket.record; async play into r1; @@ -24,3 +25,4 @@ finalize play: assert.eq r3 true; add r2 1u8 into r4; set r4 into num_winners[0u8]; + diff --git a/examples/simple_token/inputs/mint.in b/examples/simple_token/inputs/mint.in index e157dbe766..f949c17fa5 100644 --- a/examples/simple_token/inputs/mint.in +++ b/examples/simple_token/inputs/mint.in @@ -1 +1 @@ -aleo1mgfq6g40l6zkhsm063n3uhr43qk5e0zsua5aszeq5080dsvlcvxsn0rrau 100u64 +aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px 100u64 diff --git a/examples/simple_token/inputs/transfer.in b/examples/simple_token/inputs/transfer.in index d62ac71bac..a013141903 100644 --- a/examples/simple_token/inputs/transfer.in +++ b/examples/simple_token/inputs/transfer.in @@ -1,7 +1,7 @@ { - owner: aleo1mgfq6g40l6zkhsm063n3uhr43qk5e0zsua5aszeq5080dsvlcvxsn0rrau.private, + owner: aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px.private, amount: 100u64.private, _nonce: 0group.public } -aleo1mgfq6g40l6zkhsm063n3uhr43qk5e0zsua5aszeq5080dsvlcvxsn0rrau +aleo1rhgdu77hgyqd3xjj8ucu3jj9r2krwz6mnzyd80gncr5fxcwlh5rsvzp9px 50u64 diff --git a/examples/tictactoe/build/main.aleo b/examples/tictactoe/build/main.aleo index 2431ce3837..f557eeff0f 100644 --- a/examples/tictactoe/build/main.aleo +++ b/examples/tictactoe/build/main.aleo @@ -34,7 +34,7 @@ closure check_for_win: and r9 r10 into r11; or r6 r11 into r12; is.eq r0.r3.c1 r1 into r13; - is.eq r0.r3.c3 r1 into r14; + is.eq r0.r3.c2 r1 into r14; and r13 r14 into r15; is.eq r0.r3.c3 r1 into r16; and r15 r16 into r17; @@ -46,7 +46,7 @@ closure check_for_win: and r21 r22 into r23; or r18 r23 into r24; is.eq r0.r1.c2 r1 into r25; - is.eq r0.r2.c3 r1 into r26; + is.eq r0.r2.c2 r1 into r26; and r25 r26 into r27; is.eq r0.r3.c2 r1 into r28; and r27 r28 into r29; diff --git a/examples/token/.env b/examples/token/.env index 53bdb2227c..391701926c 100644 --- a/examples/token/.env +++ b/examples/token/.env @@ -1,3 +1,4 @@ + NETWORK=mainnet PRIVATE_KEY=APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH diff --git a/examples/token/build/main.aleo b/examples/token/build/main.aleo index 2f80ca2797..f7711f83c4 100644 --- a/examples/token/build/main.aleo +++ b/examples/token/build/main.aleo @@ -9,6 +9,7 @@ mapping account: key as address.public; value as u64.public; + function mint_public: input r0 as address.public; input r1 as u64.public; @@ -23,6 +24,7 @@ finalize mint_public: set r3 into account[r0]; + function mint_private: input r0 as address.private; input r1 as u64.private; @@ -30,6 +32,7 @@ function mint_private: output r2 as token.record; + function transfer_public: input r0 as address.public; input r1 as u64.public; @@ -48,6 +51,7 @@ finalize transfer_public: set r6 into account[r1]; + function transfer_private: input r0 as token.record; input r1 as address.private; @@ -59,6 +63,7 @@ function transfer_private: output r5 as token.record; + function transfer_private_to_public: input r0 as token.record; input r1 as address.public; @@ -77,6 +82,8 @@ finalize transfer_private_to_public: set r3 into account[r0]; + + function transfer_public_to_private: input r0 as address.public; input r1 as u64.public; @@ -91,3 +98,4 @@ finalize transfer_public_to_private: get.or_use account[r0] 0u64 into r2; sub r2 r1 into r3; set r3 into account[r0]; + diff --git a/examples/vote/build/main.aleo b/examples/vote/build/main.aleo index 82cfdf4cf0..4da3939022 100644 --- a/examples/vote/build/main.aleo +++ b/examples/vote/build/main.aleo @@ -34,12 +34,14 @@ mapping disagree_votes: key as field.public; value as u64.public; + function propose: input r0 as ProposalInfo.public; assert.eq self.caller r0.proposer; hash.bhp256 r0.title into r1 as field; cast self.caller r1 r0 into r2 as Proposal.record; - async propose r1 into r3; output r2 as Proposal.record; + async propose r1 into r3; + output r2 as Proposal.record; output r3 as vote.aleo/propose.future; finalize propose: @@ -47,11 +49,14 @@ finalize propose: set 0u64 into tickets[r0]; + + function new_ticket: input r0 as field.public; input r1 as address.public; cast r1 r0 into r2 as Ticket.record; - async new_ticket r0 into r3; output r2 as Ticket.record; + async new_ticket r0 into r3; + output r2 as Ticket.record; output r3 as vote.aleo/new_ticket.future; finalize new_ticket: @@ -61,9 +66,12 @@ finalize new_ticket: set r2 into tickets[r0]; + + function agree: input r0 as Ticket.record; - async agree r0.pid into r1; output r1 as vote.aleo/agree.future; + async agree r0.pid into r1; + output r1 as vote.aleo/agree.future; finalize agree: input r0 as field.public; @@ -72,12 +80,16 @@ finalize agree: set r2 into agree_votes[r0]; + + function disagree: input r0 as Ticket.record; - async disagree r0.pid into r1; output r1 as vote.aleo/disagree.future; + async disagree r0.pid into r1; + output r1 as vote.aleo/disagree.future; finalize disagree: input r0 as field.public; get.or_use disagree_votes[r0] 0u64 into r1; add r1 1u64 into r2; set r2 into disagree_votes[r0]; + From 10057b628a92463cb80bafc3d1814ef864cf5041 Mon Sep 17 00:00:00 2001 From: Pranav Gaddamadugu <23022326+d0cd@users.noreply.github.com> Date: Sat, 18 May 2024 16:45:40 -0700 Subject: [PATCH 09/15] More cleanup --- examples/battleship/leo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/battleship/leo.lock b/examples/battleship/leo.lock index e8600075bc..1d3aa3990c 100644 --- a/examples/battleship/leo.lock +++ b/examples/battleship/leo.lock @@ -1,20 +1,20 @@ [[package]] name = "board.aleo" location = "local" -path = "/Users/pranav/work/Aleo/leo/examples/battleship/board" +path = "board" checksum = "da94274230d0c0c3deb96d80e07ad9db8bbf53264286c14cc3231b7a8b7ef380" dependencies = [] [[package]] name = "move.aleo" location = "local" -path = "/Users/pranav/work/Aleo/leo/examples/battleship/move" +path = "move" checksum = "7d9fef5fe083eb24376e63935855e4ec709c17fb5ee46a0bb4594b0f9ef8eb08" dependencies = [] [[package]] name = "verify.aleo" location = "local" -path = "/Users/pranav/work/Aleo/leo/examples/battleship/verify" +path = "verify" checksum = "2c2035ebd70500b7e5a9a6198bed1a1163cd1ddfd09128db8f4c16cf23ad2c62" dependencies = [] From 79f9594cbabbe8c962c3e002f3fd27840c8f5417 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 11:01:30 +0000 Subject: [PATCH 10/15] Bump zip from 1.2.3 to 1.3.0 Bumps [zip](https://github.com/zip-rs/zip2) from 1.2.3 to 1.3.0. - [Release notes](https://github.com/zip-rs/zip2/releases) - [Changelog](https://github.com/zip-rs/zip2/blob/master/CHANGELOG.md) - [Commits](https://github.com/zip-rs/zip2/compare/v1.2.3...v1.3.0) --- updated-dependencies: - dependency-name: zip dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 116dfec26e..aedcb585c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1977,7 +1977,7 @@ dependencies = [ "tracing-subscriber", "ureq", "walkdir", - "zip 1.2.3", + "zip 1.3.0", ] [[package]] @@ -5803,9 +5803,9 @@ dependencies = [ [[package]] name = "zip" -version = "1.2.3" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c700ea425e148de30c29c580c1f9508b93ca57ad31c9f4e96b83c194c37a7a8f" +checksum = "f1f4a27345eb6f7aa7bd015ba7eb4175fa4e1b462a29874b779e0bbcf96c6ac7" dependencies = [ "aes", "arbitrary", diff --git a/Cargo.toml b/Cargo.toml index 2d31c8bbba..94d12a59a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -177,7 +177,7 @@ version = "0.3.18" features = [ "fmt" ] [dependencies.zip] -version = "^1.2" +version = "^1.3" [dependencies.crossterm] version = "0.27.0" From b5bf28ca6e3385fa4c65c7b0f1938d78fa1cdd11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 11:01:46 +0000 Subject: [PATCH 11/15] Bump anyhow from 1.0.83 to 1.0.86 Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.83 to 1.0.86. - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.83...1.0.86) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 116dfec26e..daa2485e33 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -203,9 +203,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arbitrary" From 9fc82d6381f7dd4d44ff4363fd40fde38941a6d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 11:02:07 +0000 Subject: [PATCH 12/15] Bump thiserror from 1.0.60 to 1.0.61 Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.60 to 1.0.61. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.60...1.0.61) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- errors/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 116dfec26e..52291e986c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4967,18 +4967,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote 1.0.36", diff --git a/errors/Cargo.toml b/errors/Cargo.toml index 9242093e45..ef6d70f1b4 100644 --- a/errors/Cargo.toml +++ b/errors/Cargo.toml @@ -45,4 +45,4 @@ version = "1.0.202" features = [ "derive", "rc" ] [dependencies.thiserror] -version = "1.0.60" +version = "1.0.61" From 06e47983f80065a85b27a8ec0a801399533d93fd Mon Sep 17 00:00:00 2001 From: evan-schott <53463459+evan-schott@users.noreply.github.com> Date: Mon, 20 May 2024 13:42:00 -0700 Subject: [PATCH 13/15] fix --- compiler/ast/src/stub/function_stub.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/ast/src/stub/function_stub.rs b/compiler/ast/src/stub/function_stub.rs index 55b0533529..fb67d4cfac 100644 --- a/compiler/ast/src/stub/function_stub.rs +++ b/compiler/ast/src/stub/function_stub.rs @@ -258,7 +258,7 @@ impl FunctionStub { pub fn from_finalize, Command: CommandTrait>( function: &FunctionCore, key_name: Symbol, - _program: Symbol, + program: Symbol, ) -> Self { Self { annotations: Vec::new(), @@ -274,7 +274,7 @@ impl FunctionStub { identifier: Identifier::new(Symbol::intern(&format!("arg{}", index + 1)), Default::default()), mode: Mode::None, type_: match input.finalize_type() { - PlaintextFinalizeType(val) => Type::from_snarkvm(val, Some(key_name)), + PlaintextFinalizeType(val) => Type::from_snarkvm(val, Some(program)), FutureFinalizeType(val) => Type::Future(FutureType::new( Vec::new(), Some(Location::new( From 1934a23eb2e49691520d7cf716f894fe47c9a167 Mon Sep 17 00:00:00 2001 From: evan-schott <53463459+evan-schott@users.noreply.github.com> Date: Mon, 20 May 2024 13:49:33 -0700 Subject: [PATCH 14/15] add test --- .../external_struct_in_async_function.out | 31 ++++++++++++++++++ .../external_struct_in_async_function.leo | 32 +++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 tests/expectations/compiler/structs/external_struct_in_async_function.out create mode 100644 tests/tests/compiler/structs/external_struct_in_async_function.leo diff --git a/tests/expectations/compiler/structs/external_struct_in_async_function.out b/tests/expectations/compiler/structs/external_struct_in_async_function.out new file mode 100644 index 0000000000..e9808d48e7 --- /dev/null +++ b/tests/expectations/compiler/structs/external_struct_in_async_function.out @@ -0,0 +1,31 @@ +--- +namespace: Compile +expectation: Pass +outputs: + - - compile: + - initial_symbol_table: 52de8e39e7909bf371547bcd54ab3e76fd09cbd6544a5772d042c4d25c996e2c + type_checked_symbol_table: b15217927f45cc35af145e9c260af0d8ac353f397a29ca444ff4a95258610db8 + unrolled_symbol_table: b15217927f45cc35af145e9c260af0d8ac353f397a29ca444ff4a95258610db8 + initial_ast: b4c949f6c13875d2cfdc35c1cfeeb6eee60eaa02b40736f21f7299643f554bf6 + unrolled_ast: b4c949f6c13875d2cfdc35c1cfeeb6eee60eaa02b40736f21f7299643f554bf6 + ssa_ast: ba1b08fbe9a242a88e6c13d8be7691a1fb2e9bf45abd6c089ea0f4659ec38866 + flattened_ast: e8a54be927eb0d70f57e05142476382f2c3ef64b9d0a52a3e95b2bad0ba46764 + destructured_ast: 073fe0dab04571576a62611e9781356da18c58cbf08d910ab61d2179f249bc5d + inlined_ast: 7d4857f2b1507ba362be0e6a1aa273a2c849cb6080fbfb4a9759232ba7701d0a + dce_ast: 7d4857f2b1507ba362be0e6a1aa273a2c849cb6080fbfb4a9759232ba7701d0a + bytecode: 688608475dba90bb7f4b89d00988f9f4944d15a84f89f6b1b78e4c1ec1b342ca + errors: "" + warnings: "" + - initial_symbol_table: c9f26fb8c18222d0819c01087efc4aae88ea8944dec03710d94c38c24e0d077a + type_checked_symbol_table: ed3db1e139955da3a7df17d8abdf36ddcabf05e2cb0cc6af012cce4a4fc67fae + unrolled_symbol_table: ed3db1e139955da3a7df17d8abdf36ddcabf05e2cb0cc6af012cce4a4fc67fae + initial_ast: b1348090a951e00cbf76c62d734fa808bfceea5b4169aa6da15a08ff185cbc50 + unrolled_ast: f1c461c8b0f677d0954ff6d29ab29abb648b57c7c141ddaf116a28d837e2b546 + ssa_ast: 39e50a1b965cf6d4c19750d75edd4b1a8f8c02c04bbcb361f4fa70cebdc39574 + flattened_ast: a5a1c8def04670f3c5177946811bd27dcae5b045fce181e5e3307d9964686341 + destructured_ast: 97153aa38aad12f2695c1e457270bd678add4d96f01f78660a9be0ab8cd409bf + inlined_ast: 97153aa38aad12f2695c1e457270bd678add4d96f01f78660a9be0ab8cd409bf + dce_ast: 97153aa38aad12f2695c1e457270bd678add4d96f01f78660a9be0ab8cd409bf + bytecode: 7881a6c09234d93975545436c75faf7d6a17d6d1c5723d8b29b214ca130eed23 + errors: "" + warnings: "" diff --git a/tests/tests/compiler/structs/external_struct_in_async_function.leo b/tests/tests/compiler/structs/external_struct_in_async_function.leo new file mode 100644 index 0000000000..9ba026cebd --- /dev/null +++ b/tests/tests/compiler/structs/external_struct_in_async_function.leo @@ -0,0 +1,32 @@ +/* +namespace: Compile +expectation: Pass +*/ + +program parent.aleo { + struct TestStruct { + data0: u128, + data1: u128 + } + + async transition init() -> Future { + let test_struct: TestStruct = TestStruct { + data0: 0u128, + data1: 1u128 + }; + return finalize_init(test_struct); + } + + async function finalize_init(public test_struct: TestStruct) { + assert_eq(0u32, 0u32); + } +} + +// --- Next Program --- // + +import parent.aleo; +program child.aleo { + transition main() -> u32 { + return 1u32; + } +} \ No newline at end of file From 6c4c02a8a512061e92349416ac20441cde38d79e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 10:57:49 +0000 Subject: [PATCH 15/15] --- updated-dependencies: - dependency-name: zip dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 46 ++++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1baa59c27c..f462aeb2e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -654,15 +654,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - [[package]] name = "color-backtrace" version = "0.6.1" @@ -1180,7 +1171,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", - "libz-ng-sys", "miniz_oxide", ] @@ -1977,7 +1967,7 @@ dependencies = [ "tracing-subscriber", "ureq", "walkdir", - "zip 1.3.0", + "zip 1.3.1", ] [[package]] @@ -2124,16 +2114,6 @@ dependencies = [ "lz4-sys", ] -[[package]] -name = "libz-ng-sys" -version = "1.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6409efc61b12687963e602df8ecf70e8ddacf95bc6576bcf16e3ac6328083c5" -dependencies = [ - "cmake", - "libc", -] - [[package]] name = "libz-sys" version = "1.1.16" @@ -2168,6 +2148,12 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + [[package]] name = "log" version = "0.4.21" @@ -5296,12 +5282,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - [[package]] name = "typenum" version = "1.17.0" @@ -5803,9 +5783,9 @@ dependencies = [ [[package]] name = "zip" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f4a27345eb6f7aa7bd015ba7eb4175fa4e1b462a29874b779e0bbcf96c6ac7" +checksum = "1b7a5a9285bd4ee13bdeb3f8a4917eb46557e53f270c783849db8bef37b0ad00" dependencies = [ "aes", "arbitrary", @@ -5841,14 +5821,16 @@ dependencies = [ [[package]] name = "zopfli" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c1f48f3508a3a3f2faee01629564400bc12260f6214a056d06a3aaaa6ef0736" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" dependencies = [ + "bumpalo", "crc32fast", + "lockfree-object-pool", "log", + "once_cell", "simd-adler32", - "typed-arena", ] [[package]]