Skip to content

Improve EVM ABI helpers #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
turbolent wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Improve EVM ABI helpers #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f3e650
use built-in String.encodeHex
turbolent Feb 26, 2026
341f977
remove unused uintArrayToString
turbolent Feb 26, 2026
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
4 changes: 2 additions & 2 deletions cadence/contracts/connectors/evm/UniswapV3SwapConnectors.cdc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ access(all) contract UniswapV3SwapConnectors {
// optional dev guards
let _chkIn = EVMAbiHelpers.abiUInt256(evmAmountIn)
let _chkMin = EVMAbiHelpers.abiUInt256(minOutUint)
//panic("path: \(EVMAbiHelpers.toHex(pathBytes.value)), amountIn: \(evmAmountIn.toString()), amountOutMin: \(minOutUint.toString())")
//panic("path: \(String.encodeHex(pathBytes.value)), amountIn: \(evmAmountIn.toString()), amountOutMin: \(minOutUint.toString())")
assert(_chkIn.length == 32, message: "amountIn not 32 bytes")
assert(_chkMin.length == 32, message: "amountOutMin not 32 bytes")

Expand All @@ -708,7 +708,7 @@ access(all) contract UniswapV3SwapConnectors {
)!
if swapRes.status != EVM.Status.successful {
UniswapV3SwapConnectors._callError(
EVMAbiHelpers.toHex(calldata),
String.encodeHex(calldata),
swapRes, self.routerAddress, idType, id, self.getType()
)
}
Expand Down
25 changes: 0 additions & 25 deletions cadence/contracts/utils/EVMAbiHelpers.cdc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,31 +78,6 @@ access(all) contract EVMAbiHelpers {
return self.abiDynamicBytes(utf8)
}

access(all) fun uintArrayToString(_ arr: [UInt8]): String {
var out = ""
var i = 0
while i < arr.length {
out = out.concat(arr[i].toString())
if i < arr.length - 1 {
out = out.concat(",")
}
i = i + 1
}
return out
}

access(all) fun toHex(_ bytes: [UInt8]): String {
let hex: [String] = ["0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f"]
var out = ""
var i = 0
while i < bytes.length {
let b = bytes[i]
out = out.concat(hex[Int(b / 16)]).concat(hex[Int(b % 16)])
i = i + 1
}
return out
}

// Represents one ABI argument chunk
access(all) struct ABIArg {
access(all) let isDynamic: Bool
Expand Down
Loading