Aptos accumulators (#904)

* Pin dependency versions

* Implement accumulator support on aptos

* Fix formatting on error.move in aptos

* Add CI workflow for aptos

* Upgrade to aptos cli 1.0.4

Author: m30m

.github/workflows/aptos-contract.yml

@@ -0,0 +1,30 @@
+on:
+  pull_request:
+    paths:
+      - target_chains/aptos/contracts/**
+  push:
+    branches:
+      - main
+    paths:
+      - target_chains/aptos/contracts/**
+
+name: Aptos Contract
+
+jobs:
+  aptos-tests:
+    name: Aptos tests
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: target_chains/aptos/contracts/
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Download CLI
+        run: wget https://github.com/aptos-labs/aptos-core/releases/download/aptos-cli-v1.0.4/aptos-cli-1.0.4-Ubuntu-22.04-x86_64.zip
+
+      - name: Unzip CLI
+        run: unzip aptos-cli-1.0.4-Ubuntu-22.04-x86_64.zip
+
+      - name: Run tests
+        run: ./aptos move test

target_chains/aptos/contracts/Move.toml

@@ -4,11 +4,10 @@ version = "0.0.1"
 upgrade_policy = "compatible"
 
 [dependencies]
-# TODO: pin versions before mainnet release
-AptosFramework = { git = "https://github.com/aptos-labs/aptos-core.git", subdir = "aptos-move/framework/aptos-framework/", rev = "main" }
-MoveStdlib = { git = "https://github.com/aptos-labs/aptos-core.git", subdir = "aptos-move/framework/move-stdlib/", rev = "main" }
-AptosStdlib = { git = "https://github.com/aptos-labs/aptos-core.git", subdir = "aptos-move/framework/aptos-stdlib/", rev = "main" }
-AptosToken = { git = "https://github.com/aptos-labs/aptos-core.git", subdir = "aptos-move/framework/aptos-token/", rev = "main" }
+AptosFramework = { git = "https://github.com/aptos-labs/aptos-core.git", subdir = "aptos-move/framework/aptos-framework/", rev = "2c74a456298fcd520241a562119b6fe30abdaae2" }
+MoveStdlib = { git = "https://github.com/aptos-labs/aptos-core.git", subdir = "aptos-move/framework/move-stdlib/", rev = "2c74a456298fcd520241a562119b6fe30abdaae2" }
+AptosStdlib = { git = "https://github.com/aptos-labs/aptos-core.git", subdir = "aptos-move/framework/aptos-stdlib/", rev = "2c74a456298fcd520241a562119b6fe30abdaae2" }
+AptosToken = { git = "https://github.com/aptos-labs/aptos-core.git", subdir = "aptos-move/framework/aptos-token/", rev = "2c74a456298fcd520241a562119b6fe30abdaae2" }
 Wormhole = { git = "https://github.com/wormhole-foundation/wormhole.git", subdir = "aptos/wormhole", rev = "aptos/integration" }
 Deployer = { git = "https://github.com/wormhole-foundation/wormhole.git", subdir = "aptos/deployer", rev = "aptos/integration" }
 

target_chains/aptos/contracts/sources/batch_price_attestation.move

@@ -159,7 +159,7 @@ module pyth::batch_price_attestation {
     }
 
     #[test]
-    #[expected_failure(abort_code = 65560)]
+    #[expected_failure(abort_code = 65560, location = pyth::batch_price_attestation)]
     fun test_deserialize_batch_price_attestation_invalid_magic() {
         // A batch price attestation with a magic number of 0x50325749
         let bytes = x"5032574900030000000102000400951436e0be37536be96f0896366089506a59763d036728332d3e3038047851aea7c6c75c89f14810ec1c54c03ab8f1864a4c4032791f05747f560faec380a695d1000000000000049a0000000000000008fffffffb00000000000005dc0000000000000003000000000100000001000000006329c0eb000000006329c0e9000000006329c0e400000000000006150000000000000007215258d81468614f6b7e194c5d145609394f67b041e93e6695dcc616faadd0603b9551a68d01d954d6387aff4df1529027ffb2fee413082e509feb29cc4904fe000000000000041a0000000000000003fffffffb00000000000005cb0000000000000003010000000100000001000000006329c0eb000000006329c0e9000000006329c0e4000000000000048600000000000000078ac9cf3ab299af710d735163726fdae0db8465280502eb9f801f74b3c1bd190333832fad6e36eb05a8972fe5f219b27b5b2bb2230a79ce79beb4c5c5e7ecc76d00000000000003f20000000000000002fffffffb00000000000005e70000000000000003010000000100000001000000006329c0eb000000006329c0e9000000006329c0e40000000000000685000000000000000861db714e9ff987b6fedf00d01f9fea6db7c30632d6fc83b7bc9459d7192bc44a21a28b4c6619968bd8c20e95b0aaed7df2187fd310275347e0376a2cd7427db800000000000006cb0000000000000001fffffffb00000000000005e40000000000000003010000000100000001000000006329c0eb000000006329c0e9000000006329c0e400000000000007970000000000000001";

target_chains/aptos/contracts/sources/error.move

@@ -79,27 +79,47 @@ module pyth::error {
         error::invalid_state(19)
     }
 
-   public fun invalid_governance_magic_value(): u64 {
+    public fun invalid_governance_magic_value(): u64 {
         error::invalid_argument(20)
-   }
+    }
 
-   public fun magnitude_too_large(): u64 {
+    public fun magnitude_too_large(): u64 {
         error::invalid_argument(21)
-   }
+    }
 
-   public fun governance_contract_upgrade_chain_id_zero(): u64 {
+    public fun governance_contract_upgrade_chain_id_zero(): u64 {
         error::invalid_argument(22)
-   }
+    }
 
-   public fun invalid_price_status(): u64 {
+    public fun invalid_price_status(): u64 {
         error::invalid_argument(23)
-   }
+    }
 
-   public fun invalid_attestation_magic_value(): u64 {
+    public fun invalid_attestation_magic_value(): u64 {
         error::invalid_argument(24)
-   }
+    }
 
-   public fun data_source_emitter_address_and_chain_ids_different_lengths(): u64 {
+    public fun data_source_emitter_address_and_chain_ids_different_lengths(): u64 {
         error::invalid_argument(25)
-   }
+    }
+
+    public fun invalid_accumulator_payload(): u64 {
+        error::invalid_argument(26)
+    }
+
+    public fun invalid_accumulator_message(): u64 {
+        error::invalid_argument(27)
+    }
+
+    public fun invalid_wormhole_message(): u64 {
+        error::invalid_argument(28)
+    }
+
+    public fun invalid_proof(): u64 {
+        error::invalid_argument(29)
+    }
+
+    public fun invalid_keccak160_length(): u64 {
+        error::invalid_argument(30)
+    }
 }

target_chains/aptos/contracts/sources/governance/governance.move

@@ -85,15 +85,15 @@ module pyth::governance_test {
     }
 
     #[test]
-    #[expected_failure(abort_code = 6)]
+    #[expected_failure(abort_code = 6, location = wormhole::vaa)]
     fun test_execute_governance_instruction_invalid_vaa() {
         setup_test(50, 24, x"f06413c0148c78916554f134dcd17a7c8029a3a2bda475a4a1182305c53078bf", 100);
         let vaa_bytes = x"6c436741b108";
         governance::execute_governance_instruction(vaa_bytes);
     }
 
     #[test]
-    #[expected_failure(abort_code = 65550)]
+    #[expected_failure(abort_code = 65550, location = pyth::governance)]
     fun test_execute_governance_instruction_invalid_data_source() {
         setup_test(100, 50, x"f06413c0148c78916554f134dcd17a7c8029a3a2bda475a4a1182305c53078bf", 100);
 
@@ -105,7 +105,7 @@ module pyth::governance_test {
     }
 
     #[test]
-    #[expected_failure(abort_code = 65551)]
+    #[expected_failure(abort_code = 65551, location = pyth::governance)]
     fun test_execute_governance_instruction_invalid_sequence_number_0() {
         setup_test(100, 50, x"f06413c0148c78916554f134dcd17a7c8029a3a2bda475a4a1182305c53078bf", 100);
         assert!(state::get_last_executed_governance_sequence() == 0, 1);
@@ -119,7 +119,7 @@ module pyth::governance_test {
     }
 
     #[test]
-    #[expected_failure(abort_code = 65556)]
+    #[expected_failure(abort_code = 65556, location = pyth::governance_instruction)]
     fun test_execute_governance_instruction_invalid_instruction_magic() {
         setup_test(100, 50, x"f06413c0148c78916554f134dcd17a7c8029a3a2bda475a4a1182305c53078bf", 100);
 
@@ -133,7 +133,7 @@ module pyth::governance_test {
     }
 
     #[test]
-    #[expected_failure(abort_code = 65548)]
+    #[expected_failure(abort_code = 65548, location = pyth::governance_instruction)]
     fun test_execute_governance_instruction_invalid_module() {
         setup_test(100, 50, x"f06413c0148c78916554f134dcd17a7c8029a3a2bda475a4a1182305c53078bf", 100);
 
@@ -148,7 +148,7 @@ module pyth::governance_test {
     }
 
     #[test]
-    #[expected_failure(abort_code = 65549)]
+    #[expected_failure(abort_code = 65549, location = pyth::governance_instruction)]
     fun test_execute_governance_instruction_invalid_target_chain() {
         setup_test(100, 50, x"f06413c0148c78916554f134dcd17a7c8029a3a2bda475a4a1182305c53078bf", 100);
 
@@ -164,7 +164,7 @@ module pyth::governance_test {
     }
 
     #[test]
-    #[expected_failure(abort_code = 65552)]
+    #[expected_failure(abort_code = 65552, location = pyth::governance_action)]
     fun test_execute_governance_instruction_invalid_action() {
         setup_test(100, 50, x"f06413c0148c78916554f134dcd17a7c8029a3a2bda475a4a1182305c53078bf", 100);
 
@@ -204,7 +204,7 @@ module pyth::governance_test {
     }
 
     #[test]
-    #[expected_failure(abort_code = 65558)]
+    #[expected_failure(abort_code = 65558, location = pyth::governance)]
     fun test_execute_governance_instruction_upgrade_contract_chain_id_zero() {
         setup_test(100, 50, x"f06413c0148c78916554f134dcd17a7c8029a3a2bda475a4a1182305c53078bf", 100);
 
@@ -280,7 +280,7 @@ module pyth::governance_test {
     }
 
     #[test]
-    #[expected_failure(abort_code = 65550)]
+    #[expected_failure(abort_code = 65550, location = pyth::governance)]
     fun test_execute_governance_instruction_set_governance_data_source_old_source_invalid() {
         let initial_governance_emitter_chain_id = 50;
         let initial_governance_emitter_address = x"f06413c0148c78916554f134dcd17a7c8029a3a2bda475a4a1182305c53078bf";

target_chains/aptos/contracts/sources/governance/governance_instruction.move

@@ -64,21 +64,21 @@ module pyth::governance_instruction {
     }
 
     #[test]
-    #[expected_failure(abort_code = 65556)]
+    #[expected_failure(abort_code = 65556, location = pyth::governance_instruction)]
     fun test_from_byte_vec_invalid_magic() {
         let bytes = x"5054474eb01087a85361f738f19454e66664d3c9";
         destroy(from_byte_vec(bytes));
     }
 
     #[test]
-    #[expected_failure(abort_code = 65548)]
+    #[expected_failure(abort_code = 65548, location = pyth::governance_instruction)]
     fun test_from_byte_vec_invalid_module() {
         let bytes = x"5054474db00187a85361f738f19454e66664d3c9";
         destroy(from_byte_vec(bytes));
     }
 
     #[test]
-    #[expected_failure(abort_code = 65548)]
+    #[expected_failure(abort_code = 65548, location = pyth::governance_instruction)]
     fun test_from_byte_vec_invalid_target_chain_id() {
         let bytes = x"5054474db00187a85361f738f19454e66664d3c9";
         destroy(from_byte_vec(bytes));

target_chains/aptos/contracts/sources/i64.move

@@ -76,7 +76,7 @@ module pyth::i64 {
     }
 
     #[test]
-    #[expected_failure(abort_code = 65557)]
+    #[expected_failure(abort_code = 65557, location = pyth::i64)]
     fun test_magnitude_too_large_positive() {
         new(0x8000000000000000, false);
     }
@@ -88,7 +88,7 @@ module pyth::i64 {
     }
 
     #[test]
-    #[expected_failure(abort_code = 65557)]
+    #[expected_failure(abort_code = 65557, location = pyth::i64)]
     fun test_magnitude_too_large_negative() {
         new(0x8000000000000001, true);
     }
@@ -115,7 +115,7 @@ module pyth::i64 {
     }
 
     #[test]
-    #[expected_failure(abort_code = 196609)]
+    #[expected_failure(abort_code = 196609, location = pyth::i64)]
     fun test_get_magnitude_if_positive_negative() {
         assert!(get_magnitude_if_positive(&new(7686, true)) == 7686, 1);
     }
@@ -126,7 +126,7 @@ module pyth::i64 {
     }
 
     #[test]
-    #[expected_failure(abort_code = 196627)]
+    #[expected_failure(abort_code = 196627, location = pyth::i64)]
     fun test_get_magnitude_if_negative_positive() {
         assert!(get_magnitude_if_negative(&new(7686, false)) == 7686, 1);
     }

target_chains/aptos/contracts/sources/keccak160.move

@@ -0,0 +1,83 @@
+module pyth::keccak160 {
+    use std::vector;
+    use pyth::error;
+    use std::aptos_hash;
+
+    struct Hash has drop {
+        data: vector<u8>,
+    }
+
+    const HASH_LENGTH: u64 = 20;
+
+    public fun get_data(hash: &Hash): vector<u8> {
+        hash.data
+    }
+
+    public fun get_hash_length(): u64 {
+        HASH_LENGTH
+    }
+
+    public fun new(data: vector<u8>): Hash {
+        assert!(vector::length(&data) == HASH_LENGTH, error::invalid_keccak160_length());
+        Hash { data }
+    }
+
+    public fun from_data(data: vector<u8>): Hash {
+        let hash = aptos_hash::keccak256(data);
+        while (vector::length(&hash) > HASH_LENGTH) {
+            vector::pop_back(&mut hash);
+        };
+        new(hash)
+    }
+
+    public fun is_smaller(lhs: &Hash, rhs: &Hash): bool {
+        let i = 0;
+        while (i < vector::length(&get_data(lhs))) {
+            let lhs_val: u8 = *vector::borrow(&get_data(lhs), i);
+            let rhs_val: u8 = *vector::borrow(&get_data(rhs), i);
+            if (lhs_val != rhs_val) {
+                return lhs_val < rhs_val
+            };
+            i = i + 1;
+        };
+        false
+    }
+
+
+    #[test]
+    fun test_from_data() {
+        let hash = from_data(vector[0]);
+        let expected = new(x"bc36789e7a1e281436464229828f817d6612f7b4");
+        assert!(&hash == &expected, 1);
+    }
+
+    #[test]
+    fun test_is_smaller() {
+        let h1 = new(x"0000000000000000010000000000000000000000");
+        let h2 = new(x"0000000000000000000300000000000000000000");
+        let h3 = new(x"0000000000000000000200000000000000000000");
+        assert!(is_smaller(&h3, &h2), 1);
+        assert!(!is_smaller(&h2, &h3), 1);
+
+        assert!(is_smaller(&h2, &h1), 1);
+        assert!(!is_smaller(&h1, &h2), 1);
+
+        assert!(is_smaller(&h3, &h1), 1);
+        assert!(!is_smaller(&h1, &h3), 1);
+
+        assert!(!is_smaller(&h1, &h1), 1);
+        assert!(!is_smaller(&h2, &h2), 1);
+        assert!(!is_smaller(&h3, &h3), 1);
+    }
+
+    #[test]
+    fun test_new_success() {
+        new(x"05c51b04b820c0f704e3fdd2e4fc1e70aff26dff");
+    }
+
+    #[test]
+    #[expected_failure(abort_code = 65566, location = pyth::keccak160)]
+    fun test_new_wrong_size() {
+        new(vector[1, 2, 3]);
+    }
+}