evil: #1273

anoma · Apr 3, 2023 · affe967 · affe967
1 parent 8a6c297
commit affe967
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 42 deletions.
diff --git a/apps/src/lib/node/ledger/shell/mod.rs b/apps/src/lib/node/ledger/shell/mod.rs
@@ -1182,7 +1182,7 @@ mod test_mempool_validate {
 
         let unsigned_wrapper = if let Some(Ok(SignedTxData {
             data: Some(data),
-            sig: _,
+            sigs: _,
         })) = wrapper
             .data
             .take()
@@ -1235,7 +1235,7 @@ mod test_mempool_validate {
 
         let invalid_wrapper = if let Some(Ok(SignedTxData {
             data: Some(data),
-            sig,
+            sigs,
         })) = wrapper
             .data
             .take()
@@ -1259,7 +1259,7 @@ mod test_mempool_validate {
                 vec![],
                 Some(
                     SignedTxData {
-                        sig,
+                        sigs,
                         data: Some(new_data),
                     }
                     .try_to_vec()

diff --git a/wasm/checksums.json b/wasm/checksums.json
@@ -1,41 +1,20 @@
 {
-<<<<<<< HEAD
-    "tx_bond.wasm": "tx_bond.8915d1bc2e50a39113eda4b84dbafcef55634bda3c7c517687112952353bdc40.wasm",
-    "tx_change_validator_commission.wasm": "tx_change_validator_commission.8da9bfc181836d1715e3e35f99bf3577c157f619ceb573b2911e9ebd2b497a9b.wasm",
-    "tx_ibc.wasm": "tx_ibc.d8d856437804b82374051fb15c441c9b50715e51aca06b4f7d1ffe67fd75dd13.wasm",
-    "tx_init_account.wasm": "tx_init_account.9cc792ba8535b0e29643184afbd51c6b5e7153a4276a7acc23079ed9e802fb2b.wasm",
-    "tx_init_proposal.wasm": "tx_init_proposal.84fa938093c4a5bd9d0113ac2684fa38ccd99cd56e8291da74026a9b85d278a4.wasm",
-    "tx_init_validator.wasm": "tx_init_validator.3f04b3bbeb17b493858ba96dc309021468b166ab01d594773cbf9744d1a8076b.wasm",
-    "tx_reveal_pk.wasm": "tx_reveal_pk.7a645d6afbf8844e1aea83905eed26f9e7d550db456bdde169a4786c902b917f.wasm",
-    "tx_transfer.wasm": "tx_transfer.64d73335d0db816c56d21e5ef2af11f594337370d36ba28a8e1b329e1216692f.wasm",
-    "tx_unbond.wasm": "tx_unbond.c3391611d4a1f5818876a799efa87fee793eedcba193c636e294bf1dd4c6f340.wasm",
-    "tx_update_vp.wasm": "tx_update_vp.dbaf4fdacb12fba9fe1231afd0371a302a8242cbbf74565d8605a646fe5a00ab.wasm",
-    "tx_vote_proposal.wasm": "tx_vote_proposal.704d0c40268c997ab185d9e5a9f02decf40f4c51c9684a25ef6a9be2768b180d.wasm",
-    "tx_withdraw.wasm": "tx_withdraw.70bea521c96d4a5e970a741c7b5af03c6407c4b7f9c27b3f8b9a4baa530f6c43.wasm",
-    "vp_implicit.wasm": "vp_implicit.e5aff165c7b3c43f0d6d0bc2848f2d171ce5599f01fa33d0572bea584a83903c.wasm",
-    "vp_masp.wasm": "vp_masp.813d4ec58e55255f0fe3e3d40ea723fca34dcea69de57f26e89c7737c56254db.wasm",
-    "vp_testnet_faucet.wasm": "vp_testnet_faucet.25bcab2206bba4cf89dbf33cf133fd034878566d7e375856bbf53e4547db441f.wasm",
-    "vp_token.wasm": "vp_token.0450ebd338297015cade8d10cdac49d08332729aceb0879b502c803221495eb8.wasm",
-    "vp_user.wasm": "vp_user.9bba925de6e5b32b194b922fc10938c54480cbfc3f5e9ca3df8666daebb78bef.wasm",
-    "vp_validator.wasm": "vp_validator.5866ec82d9a63974c4d685d4b6d4fa3a1cecc247021a56e4136f54aade9be6d4.wasm"
-=======
-    "tx_bond.wasm": "tx_bond.e7ce9a96968175c9834f946abd58619b03d50466ccb01c6777144479f314a359.wasm",
-    "tx_change_validator_commission.wasm": "tx_change_validator_commission.627360703b218fe83912d9e4f32b294df09e47e89d04a341ef5a40787ab84195.wasm",
-    "tx_ibc.wasm": "tx_ibc.81665084a4d1f3f6d0d0bf996e0f5eee88b513da445e606d281b68b35ab88cdd.wasm",
-    "tx_init_account.wasm": "tx_init_account.69eac03e2aab6bc263c0b9cee71fc40fd17e708cb9211bd32b66f463ae97532a.wasm",
-    "tx_init_proposal.wasm": "tx_init_proposal.69c91a7edcece48053a345f0ded721dc48857a91d9bfa32c8ba5498a2bcf3f49.wasm",
-    "tx_init_validator.wasm": "tx_init_validator.422ab5d40d1a268f28d879f8300cd7d3f92bed5da198c3db5bd2449902fdaf78.wasm",
-    "tx_reveal_pk.wasm": "tx_reveal_pk.98e7e0084363c1aca40d2a2f2b87f66bd36145b64f249508c64292cadf75ff63.wasm",
-    "tx_transfer.wasm": "tx_transfer.4f656bc6f4459d065e0dd4ce9ae4aa5278f53cd29adf69d6a2060180e432e164.wasm",
-    "tx_unbond.wasm": "tx_unbond.c065510900650e995d850c2887a230134d0547494ea4670afcb87c8e701688b5.wasm",
-    "tx_update_vp.wasm": "tx_update_vp.67ba11b57e8c144886b4355a4d62910b3ec848358637723e9072e47223929c65.wasm",
-    "tx_vote_proposal.wasm": "tx_vote_proposal.c5258a6047bc599f78b95a9a4e0147f7ec07b1efdeb403d4b814afa16953013a.wasm",
-    "tx_withdraw.wasm": "tx_withdraw.ca7549691c43f2ea68b7ad1c4fe208e37995860457a604fbd20f1579d8b54eae.wasm",
-    "vp_implicit.wasm": "vp_implicit.7c5a53331188da2ff33e1fb5809148115d381ea81c28aaaaf3f5405c530ae099.wasm",
-    "vp_masp.wasm": "vp_masp.74de81daf2d1ebd219e2969b58ae52d6233794194d7da3d8d07c506dd1fa5767.wasm",
-    "vp_testnet_faucet.wasm": "vp_testnet_faucet.6e2cfc3281956cd39100cdd353b77afd517c61ffc6fe64efa91bdcc13df6a65d.wasm",
-    "vp_token.wasm": "vp_token.74c4efcc7e9a9258965cc50e4e42ec9c9920ea58ff3fa358573051144b2de6f1.wasm",
-    "vp_user.wasm": "vp_user.c2a7e556b61c46f5fd6763d970088469d9bf60eff11cadabb57f40911c05aac8.wasm",
-    "vp_validator.wasm": "vp_validator.5251edeb5e18d2da681eca0caf3766312f6239c238b1da055bb9a3baec51552a.wasm"
->>>>>>> fraccaman+grarco/multisignature+rebase
+    "tx_bond.wasm": "tx_bond.683273b32636632306fa323b2b3ce7010472f7188ad4f1f56a61ca25a2c0be08.wasm",
+    "tx_change_validator_commission.wasm": "tx_change_validator_commission.ecd7c931196479c06fbe162a5f25990ba8c6407a986e542454682fdb06d73223.wasm",
+    "tx_ibc.wasm": "tx_ibc.87642dfe730859dda5d2c47e87071f8edbe9ca0e00b844fb8b2d62d308410998.wasm",
+    "tx_init_account.wasm": "tx_init_account.dd01e3860b014f159bd26eb259d358c7c22583e53e447c0be1ffa0198fd82a47.wasm",
+    "tx_init_proposal.wasm": "tx_init_proposal.8e6301e385a2eb06b086837c08e80ec5cecd4394215faad2ab06bba4b802c413.wasm",
+    "tx_init_validator.wasm": "tx_init_validator.0de465a2d9ad845ec0175382049f7fa5774bdb77bc70d4293e81c86951cf0a14.wasm",
+    "tx_reveal_pk.wasm": "tx_reveal_pk.5903898283b75f3d00cee935386b5b5c9b1b36795e23996be181be53cf1840c7.wasm",
+    "tx_transfer.wasm": "tx_transfer.68755e2fdbc96a02ac1ec201948a6ff75ca9b8971236c57d418544a669e711cb.wasm",
+    "tx_unbond.wasm": "tx_unbond.8285bfe79f427346f57d2577dfec823a3c8d6bbbcdc116717f5ce1da16de2c0d.wasm",
+    "tx_update_vp.wasm": "tx_update_vp.d0648aa623e368401ccb86e0346faecc1559ceebe49793fe8f705fe033d14afb.wasm",
+    "tx_vote_proposal.wasm": "tx_vote_proposal.cded93d42425ecdfc832c8a9a9f5a95470b255eace3bab1631d1325cc192847f.wasm",
+    "tx_withdraw.wasm": "tx_withdraw.a866b694e5503ccb5fec773b43e1d485863faa3f60b3ef7b421bdb10f98da21a.wasm",
+    "vp_implicit.wasm": "vp_implicit.9a6cb2e5f505f0f2d15da12a150d0f50efdfa7136c044cfa3cb9c75fddc0305e.wasm",
+    "vp_masp.wasm": "vp_masp.811e84a73e693331c7719cbceb974522c5c4ef663c73032220b0318ede48f48b.wasm",
+    "vp_testnet_faucet.wasm": "vp_testnet_faucet.69e50b81a32a91016065c44680b6c9a05d92d7696f0dbcda6baf639d21375470.wasm",
+    "vp_token.wasm": "vp_token.f34765984c09fcd5a72c004b641f2dea3a42e947bff0ded7bd413baafd69f42b.wasm",
+    "vp_user.wasm": "vp_user.b9d82bdb80fc56de2b21e77f2c8461836b640d2b212b5c6db4edab07c523bc08.wasm",
+    "vp_validator.wasm": "vp_validator.184de5a1ec188ac582047f7a9f6b8881e1c201d39b22a6c31f94b628f2d6e71b.wasm"
 }
diff --git a/wasm_for_tests/tx_memory_limit.wasm b/wasm_for_tests/tx_memory_limit.wasm
diff --git a/wasm_for_tests/tx_mint_tokens.wasm b/wasm_for_tests/tx_mint_tokens.wasm
diff --git a/wasm_for_tests/tx_proposal_code.wasm b/wasm_for_tests/tx_proposal_code.wasm
diff --git a/wasm_for_tests/tx_read_storage_key.wasm b/wasm_for_tests/tx_read_storage_key.wasm
diff --git a/wasm_for_tests/tx_write.wasm b/wasm_for_tests/tx_write.wasm
diff --git a/wasm_for_tests/vp_always_false.wasm b/wasm_for_tests/vp_always_false.wasm
diff --git a/wasm_for_tests/vp_always_true.wasm b/wasm_for_tests/vp_always_true.wasm
diff --git a/wasm_for_tests/vp_eval.wasm b/wasm_for_tests/vp_eval.wasm
diff --git a/wasm_for_tests/vp_memory_limit.wasm b/wasm_for_tests/vp_memory_limit.wasm
diff --git a/wasm_for_tests/vp_read_storage_key.wasm b/wasm_for_tests/vp_read_storage_key.wasm