From 6511578d7df0c9b9decbd2e6f5cc01d8a4770b22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonat=C3=A3=20Oliveira?= Date: Wed, 7 Feb 2024 12:20:54 -0300 Subject: [PATCH 1/3] change transferFrom to transfer on send ETH --- packages/kos-sdk/src/chains/ethereum/erc20.rs | 8 ++------ packages/kos-sdk/src/chains/ethereum/mod.rs | 5 ++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/kos-sdk/src/chains/ethereum/erc20.rs b/packages/kos-sdk/src/chains/ethereum/erc20.rs index 8aa1e1a..4dc0c07 100644 --- a/packages/kos-sdk/src/chains/ethereum/erc20.rs +++ b/packages/kos-sdk/src/chains/ethereum/erc20.rs @@ -25,10 +25,6 @@ const ERC20_CONTRACT_ABI: &str = r#" { "constant": false, "inputs": [ - { - "name": "_from", - "type": "address" - }, { "name": "_to", "type": "address" @@ -39,7 +35,7 @@ const ERC20_CONTRACT_ABI: &str = r#" } ], - "name": "transferFrom", + "name": "transfer", "outputs": [ { "name": "", @@ -47,7 +43,7 @@ const ERC20_CONTRACT_ABI: &str = r#" } ], "payable": false, - "stateMutability": "nonpayable", + "stateMutability": "nonpayable", "type": "function" } ] diff --git a/packages/kos-sdk/src/chains/ethereum/mod.rs b/packages/kos-sdk/src/chains/ethereum/mod.rs index b8e5717..ba0876f 100644 --- a/packages/kos-sdk/src/chains/ethereum/mod.rs +++ b/packages/kos-sdk/src/chains/ethereum/mod.rs @@ -253,13 +253,12 @@ impl ETH { if !is_eth_token { // update contract data for token transfer let contract = erc20::get_contract_erc20(); - let func = contract.function("transferFrom").map_err(|e| { - Error::InvalidMessage(format!("failed to get transferFrom function: {}", e)) + let func = contract.function("transfer").map_err(|e| { + Error::InvalidMessage(format!("failed to get transfer function: {}", e)) })?; let encoded = func .encode_input(&[ - ethabi::Token::Address(addr_sender.into()), ethabi::Token::Address(addr_receiver.into()), ethabi::Token::Uint( U256::from_dec_str(&amount.to_string()) From 627942009ee64706f2cef1f739270561cd5ce7a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonat=C3=A3=20Oliveira?= Date: Wed, 7 Feb 2024 12:52:51 -0300 Subject: [PATCH 2/3] fix evm20 abi --- packages/kos-sdk/src/chains/evm20.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/kos-sdk/src/chains/evm20.rs b/packages/kos-sdk/src/chains/evm20.rs index 6a98766..8563387 100644 --- a/packages/kos-sdk/src/chains/evm20.rs +++ b/packages/kos-sdk/src/chains/evm20.rs @@ -25,6 +25,10 @@ const EVM20_CONTRACT_ABI: &str = r#" { "constant": false, "inputs": [ + { + "name": "_from", + "type": "address" + }, { "name": "_to", "type": "address" @@ -35,7 +39,7 @@ const EVM20_CONTRACT_ABI: &str = r#" } ], - "name": "transfer", + "name": "transferFrom", "outputs": [ { "name": "", From 93afd7425610af58364a532c55fc72a4bed8daa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonat=C3=A3=20Oliveira?= Date: Wed, 7 Feb 2024 12:53:47 -0300 Subject: [PATCH 3/3] fix transferFrom abi --- packages/kos-sdk/src/chains/evm20.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/kos-sdk/src/chains/evm20.rs b/packages/kos-sdk/src/chains/evm20.rs index 8563387..d3a10b0 100644 --- a/packages/kos-sdk/src/chains/evm20.rs +++ b/packages/kos-sdk/src/chains/evm20.rs @@ -25,9 +25,9 @@ const EVM20_CONTRACT_ABI: &str = r#" { "constant": false, "inputs": [ - { - "name": "_from", - "type": "address" + { + "name": "_from", + "type": "address" }, { "name": "_to",