Skip to content

Commit 6868325

Browse files
authored
Bump Aptos CLI to 9.1.0 (#420)
Upgrade movefmt to 1.5.1
1 parent b89ce0f commit 6868325

12 files changed

Lines changed: 19 additions & 19 deletions

File tree

.github/workflows/aptos-bindings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- name: Install Aptos CLI
1010
uses: aptos-labs/actions/install-aptos-cli@ce57287eb852b9819c1d74fecc3be187677559fd # v0.1
1111
with:
12-
CLI_VERSION: 8.1.0
12+
CLI_VERSION: 9.1.0
1313
- name: Run make wrappers
1414
run: make wrappers
1515
- name: Check if any files have been changed

.github/workflows/aptos-ccip-integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Install Aptos CLI
3030
uses: aptos-labs/actions/install-aptos-cli@ce57287eb852b9819c1d74fecc3be187677559fd # v0.1
3131
with:
32-
CLI_VERSION: 8.1.0
32+
CLI_VERSION: 9.1.0
3333

3434
- name: Run tests
3535
run: |

.github/workflows/aptos-ccip-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Install Aptos CLI
3838
uses: aptos-labs/actions/install-aptos-cli@ce57287eb852b9819c1d74fecc3be187677559fd # v0.1
3939
with:
40-
CLI_VERSION: 8.1.0
40+
CLI_VERSION: 9.1.0
4141

4242
- name: Checkout chainlink-aptos
4343
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5

.github/workflows/aptos-contracts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Install Aptos CLI
1919
uses: aptos-labs/actions/install-aptos-cli@ce57287eb852b9819c1d74fecc3be187677559fd # v0.1
2020
with:
21-
CLI_VERSION: 8.1.0
21+
CLI_VERSION: 9.1.0
2222

2323
- name: Run tests
2424
run: make move-test

.github/workflows/aptos-movefmt.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
- name: Install Aptos CLI
1010
uses: aptos-labs/actions/install-aptos-cli@ce57287eb852b9819c1d74fecc3be187677559fd # v0.1
1111
with:
12-
CLI_VERSION: 8.1.0
12+
CLI_VERSION: 9.1.0
1313
- name: Update movefmt
14-
run: aptos update movefmt --target-version 1.4.9 # Fix version to prevent accidentally breaking the CI
14+
run: aptos update movefmt --target-version 1.5.1 # Fix version to prevent accidentally breaking the CI
1515
- name: Run movefmt
1616
run: make fmt
1717
- name: Check if any files have been changed

.github/workflows/aptos-relayer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Install Aptos CLI
4646
uses: aptos-labs/actions/install-aptos-cli@ce57287eb852b9819c1d74fecc3be187677559fd # v0.1
4747
with:
48-
CLI_VERSION: 8.1.0
48+
CLI_VERSION: 9.1.0
4949

5050
- name: Wait for PostgreSQL
5151
run: |

.github/workflows/go-all.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Install Aptos CLI
2525
uses: aptos-labs/actions/install-aptos-cli@ce57287eb852b9819c1d74fecc3be187677559fd # v0.1
2626
with:
27-
CLI_VERSION: 8.1.0
27+
CLI_VERSION: 9.1.0
2828
- name: Build and test
2929
uses: smartcontractkit/.github/actions/ci-test-go@ci-test-go/1.0.0
3030
with:

contracts/ccip/ccip/sources/allowlist.move

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ module ccip::allowlist_test {
264264
added_addresses: vector<address>, state: &allowlist::AllowlistState
265265
) {
266266
let expected =
267-
added_addresses.map::<address, AllowlistAdd> (
267+
added_addresses.map::<address, AllowlistAdd>(
268268
|add| allowlist::new_add_event(add)
269269
);
270270
let got =
@@ -286,7 +286,7 @@ module ccip::allowlist_test {
286286
added_addresses: vector<address>, state: &allowlist::AllowlistState
287287
) {
288288
let expected =
289-
added_addresses.map::<address, AllowlistRemove> (
289+
added_addresses.map::<address, AllowlistRemove>(
290290
|add| allowlist::new_remove_event(add)
291291
);
292292
let got =

contracts/ccip/ccip/sources/fee_quoter.move

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ module ccip::fee_quoter {
694694
};
695695
let premium_multiplier =
696696
get_premium_multiplier_wei_per_eth_internal(state, fee_token);
697-
premium_fee_usd_wei *=(premium_multiplier as u256); // Apply premium multiplier in wei/eth units
697+
premium_fee_usd_wei *= (premium_multiplier as u256); // Apply premium multiplier in wei/eth units
698698

699699
let data_availability_cost_usd_36_decimals =
700700
if (dest_chain_config.dest_data_availability_multiplier_bps > 0) {
@@ -852,7 +852,7 @@ module ccip::fee_quoter {
852852
// The messaging accounts needed for CCIP receiver on SVM are:
853853
// message receiver, offramp PDA signer,
854854
// plus remaining accounts specified in SVM extraArgs. Each account is 32 bytes.
855-
svm_expanded_data_length +=((accounts_length
855+
svm_expanded_data_length += ((accounts_length
856856
+ SVM_MESSAGING_ACCOUNTS_OVERHEAD) * SVM_ACCOUNT_BYTE_SIZE);
857857
};
858858

@@ -891,9 +891,9 @@ module ccip::fee_quoter {
891891

892892
// Pools get CCIP_LOCK_OR_BURN_V1_RET_BYTES by default, but if an override is set we use that instead.
893893
if (destBytesOverhead > 0) {
894-
svm_expanded_data_length +=(destBytesOverhead as u64);
894+
svm_expanded_data_length += (destBytesOverhead as u64);
895895
} else {
896-
svm_expanded_data_length +=(CCIP_LOCK_OR_BURN_V1_RET_BYTES as u64);
896+
svm_expanded_data_length += (CCIP_LOCK_OR_BURN_V1_RET_BYTES as u64);
897897
}
898898
};
899899

@@ -1029,7 +1029,7 @@ module ccip::fee_quoter {
10291029
);
10301030

10311031
if (!transfer_fee_config.is_enabled) {
1032-
token_transfer_fee_wei +=(
1032+
token_transfer_fee_wei += (
10331033
(dest_chain_config.default_token_fee_usd_cents as u256)
10341034
* VAL_1E16
10351035
);

contracts/managed_token/sources/allowlist.move

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ module managed_token::allowlist_test {
263263
added_addresses: vector<address>, state: &allowlist::AllowlistState
264264
) {
265265
let expected =
266-
added_addresses.map::<address, AllowlistAdd> (
266+
added_addresses.map::<address, AllowlistAdd>(
267267
|add| allowlist::new_add_event(add)
268268
);
269269
let got =
@@ -285,7 +285,7 @@ module managed_token::allowlist_test {
285285
added_addresses: vector<address>, state: &allowlist::AllowlistState
286286
) {
287287
let expected =
288-
added_addresses.map::<address, AllowlistRemove> (
288+
added_addresses.map::<address, AllowlistRemove>(
289289
|add| allowlist::new_remove_event(add)
290290
);
291291
let got =

0 commit comments

Comments
 (0)