Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/kotlin-sample-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:

jobs:
build:
runs-on: macos-latest-xlarge
runs-on: macos-14-xlarge
if: github.event.pull_request.draft == false
steps:
- uses: actions/checkout@v3
Expand Down
16 changes: 0 additions & 16 deletions rust/chains/tw_aptos/src/aptos_move_packages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -192,22 +192,6 @@ pub fn token_transfers_claim_script(
)))
}

pub fn managed_coin_register(coin_type: TypeTag) -> TransactionPayload {
TransactionPayload::EntryFunction(EntryFunction::new(
ModuleId::new(
AccountAddress::new([
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 1,
]),
ident_str!("managed_coin").to_owned(),
),
ident_str!("register").to_owned(),
vec![coin_type],
vec![],
json!([]),
))
}

pub fn fungible_asset_transfer(
metadata_address: AccountAddress,
to: AccountAddress,
Expand Down
16 changes: 2 additions & 14 deletions rust/chains/tw_aptos/src/transaction_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
use crate::address::from_account_error;
use crate::aptos_move_packages::{
aptos_account_create_account, aptos_account_transfer, aptos_account_transfer_coins,
coin_transfer, fungible_asset_transfer, managed_coin_register,
token_transfers_cancel_offer_script, token_transfers_claim_script,
token_transfers_offer_script,
coin_transfer, fungible_asset_transfer, token_transfers_cancel_offer_script,
token_transfers_claim_script, token_transfers_offer_script,
};
use crate::constants::{GAS_UNIT_PRICE, MAX_GAS_AMOUNT};
use crate::liquid_staking::{
Expand Down Expand Up @@ -124,13 +123,6 @@ impl TransactionFactory {
OneOftransaction_payload::nft_message(nft_message) => {
factory.nft_ops(NftOperation::try_from(nft_message)?)
},
OneOftransaction_payload::register_token(register_token) => {
let function = register_token
.function
.or_tw_err(SigningErrorType::Error_invalid_params)
.context("'ManagedTokensRegisterMessage::function' is not set")?;
Ok(factory.register_token(convert_proto_struct_tag_to_type_tag(function)?))
},
OneOftransaction_payload::liquid_staking_message(msg) => {
factory.liquid_staking_ops(LiquidStakingOperation::try_from(msg)?)
},
Expand Down Expand Up @@ -200,10 +192,6 @@ impl TransactionFactory {
Ok(self.payload(aptos_account_create_account(to)?))
}

pub fn register_token(&self, coin_type: TypeTag) -> TransactionBuilder {
self.payload(managed_coin_register(coin_type))
}

pub fn nft_ops(&self, operation: NftOperation) -> SigningResult<TransactionBuilder> {
match operation {
NftOperation::Claim(claim) => Ok(self.payload(token_transfers_claim_script(
Expand Down
51 changes: 0 additions & 51 deletions rust/chains/tw_aptos/tests/signer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,17 +122,6 @@ fn setup_proto_transaction<'a>(
panic!("Unsupported arguments")
}
},
"register_token" => {
if let OpsDetails::RegisterToken(register_token) = ops_details.unwrap() {
Proto::mod_SigningInput::OneOftransaction_payload::register_token(
Proto::ManagedTokensRegisterMessage {
function: Some(convert_type_tag_to_struct_tag(register_token.coin_type)),
},
)
} else {
panic!("Unsupported arguments")
}
},
"liquid_staking_ops" => {
if let OpsDetails::LiquidStakingOps(liquid_staking_ops) = ops_details.unwrap() {
Proto::mod_SigningInput::OneOftransaction_payload::liquid_staking_message(
Expand Down Expand Up @@ -598,46 +587,6 @@ fn test_aptos_nft_claim() {
}"#);
}

// Successfully broadcasted https://explorer.aptoslabs.com/txn/0xe591252daed785641bfbbcf72a5d17864568cf32e04c0cc9129f3a13834d0e8e?network=testnet
#[test]
fn test_aptos_register_token() {
let input = setup_proto_transaction("0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30", // Sender's address
"5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec", // Keypair
"register_token",
23, // Sequence number
2,
2000000,
3664390082,
100,
"",
"",
Some(OpsDetails::RegisterToken(RegisterToken { coin_type: TypeTag::from_str("0xe4497a32bf4a9fd5601b27661aa0b933a923191bf403bd08669ab2468d43b379::move_coin::MoveCoin").unwrap() })),
);
let output = Signer::sign_proto(input);
test_tx_result(output,
"07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3017000000000000000200000000000000000000000000000000000000000000000000000000000000010c6d616e616765645f636f696e0872656769737465720107e4497a32bf4a9fd5601b27661aa0b933a923191bf403bd08669ab2468d43b379096d6f76655f636f696e084d6f7665436f696e000080841e00000000006400000000000000c2276ada0000000002", // Expected raw transaction bytes
"e230b49f552fb85356dbec9df13f0dc56228eb7a9c29a8af3a99f4ae95b86c72bdcaa4ff1e9beb0bd81c298b967b9d97449856ec8bc672a08e2efef345c37100", // Expected signature
"07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3017000000000000000200000000000000000000000000000000000000000000000000000000000000010c6d616e616765645f636f696e0872656769737465720107e4497a32bf4a9fd5601b27661aa0b933a923191bf403bd08669ab2468d43b379096d6f76655f636f696e084d6f7665436f696e000080841e00000000006400000000000000c2276ada00000000020020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c40e230b49f552fb85356dbec9df13f0dc56228eb7a9c29a8af3a99f4ae95b86c72bdcaa4ff1e9beb0bd81c298b967b9d97449856ec8bc672a08e2efef345c37100", // Expected encoded transaction
r#"{
"expiration_timestamp_secs": "3664390082",
"gas_unit_price": "100",
"max_gas_amount": "2000000",
"payload": {
"arguments": [],
"function": "0x1::managed_coin::register",
"type": "entry_function_payload",
"type_arguments": ["0xe4497a32bf4a9fd5601b27661aa0b933a923191bf403bd08669ab2468d43b379::move_coin::MoveCoin"]
},
"sender": "0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30",
"sequence_number": "23",
"signature": {
"public_key": "0xea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c",
"signature": "0xe230b49f552fb85356dbec9df13f0dc56228eb7a9c29a8af3a99f4ae95b86c72bdcaa4ff1e9beb0bd81c298b967b9d97449856ec8bc672a08e2efef345c37100",
"type": "ed25519_signature"
}
}"#);
}

// Successfully broadcasted: https://explorer.aptoslabs.com/txn/0x25dca849cb4ebacbff223139f7ad5d24c37c225d9506b8b12a925de70429e685/userTxnOverview?network=mainnet
#[test]
fn test_aptos_tortuga_stake() {
Expand Down
7 changes: 0 additions & 7 deletions src/proto/Aptos.proto
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,6 @@ message FungibleAssetTransferMessage {
uint64 amount = 3;
}

// Necessary fields to process a ManagedTokensRegisterMessage
message ManagedTokensRegisterMessage {
// token function to register, e.g BTC: 0x43417434fd869edee76cca2a4d2301e528a1551b1d719b75c350c3c97d15b8b9::coins::BTC
StructTag function = 1;
}

// Necessary fields to process a CreateAccountMessage
message CreateAccountMessage {
// auth account address to create
Expand Down Expand Up @@ -171,7 +165,6 @@ message SigningInput {
TokenTransferMessage token_transfer = 10;
CreateAccountMessage create_account = 11;
NftMessage nft_message = 12;
ManagedTokensRegisterMessage register_token = 13;
LiquidStaking liquid_staking_message = 14;
TokenTransferCoinsMessage token_transfer_coins = 15;
FungibleAssetTransferMessage fungible_asset_transfer = 16;
Expand Down
9 changes: 8 additions & 1 deletion tools/install-sys-dependencies-mac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@

set -e

brew install cmake boost ninja xcodegen xcbeautify
brew install boost ninja xcodegen xcbeautify

if command -v cmake &> /dev/null
then
echo "Skip installing CMake."
else
brew install cmake
fi

if [[ "$BOOST_ROOT" == "" ]]; then
echo "export BOOST_ROOT=$(brew --prefix boost)" >> ~/.zprofile
Expand Down
Loading