Skip to content
Merged
Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
5a400eb
Add Bytes.splice, an inplace variant of Buffer.slice
Amxx Jun 10, 2025
65292d5
Add Base58 library
Amxx Jun 20, 2025
99a1835
docs
Amxx Jun 20, 2025
bddf4f6
Merge branch 'feature/Bytes-splice' into feature/base58
Amxx Jun 21, 2025
88c03e7
Add Bytes.countConsecutive and Bytes.countLeading
Amxx Jun 21, 2025
a3c4667
fix
Amxx Jun 21, 2025
41b586b
efficient decoding
Amxx Jun 21, 2025
c6d6bdd
coverage
Amxx Jun 21, 2025
48bf13b
Update thirty-pugs-pick.md
Amxx Jun 21, 2025
eebd51e
docs
Amxx Jun 21, 2025
296a87e
pragma
Amxx Jun 21, 2025
8c94acc
pragma
Amxx Jun 21, 2025
d09ebfa
coverage
Amxx Jun 21, 2025
a25bd11
rewrite _encode in assembly
Amxx Jun 22, 2025
a4ce8c8
more inline documentation
Amxx Jun 22, 2025
7474f2a
test vectors
Amxx Jun 22, 2025
bef2e4f
document
Amxx Jun 22, 2025
ce1c5ad
remove auxiliary utils
Amxx Jun 22, 2025
c33e933
mload is actually cheaper than jump
Amxx Jun 23, 2025
855a1c6
up
Amxx Jun 23, 2025
ec641c7
Update contracts/utils/Base58.sol
Amxx Jun 25, 2025
7429bcc
up
Amxx Jun 26, 2025
45edb76
do base58 arithmetics in chunks of 248 bits
Amxx Jun 26, 2025
20f3611
update
Amxx Jun 26, 2025
8e60a99
codespell
Amxx Jun 26, 2025
dd8e895
decode assembly
Amxx Jun 26, 2025
45f04b4
char valdity filter
Amxx Jun 26, 2025
da84743
slither
Amxx Jun 26, 2025
c80f693
slither
Amxx Jun 27, 2025
f7ac27d
fix custom error name + testing
Amxx Aug 22, 2025
2696cd8
Apply suggestions from code review
Amxx Aug 27, 2025
1736f38
optimize zero limbs accounting
Amxx Aug 27, 2025
8652d20
Update contracts/utils/Base58.sol
Amxx Aug 27, 2025
8098fb2
Update test/utils/Base58.t.sol
Amxx Aug 27, 2025
d0ece81
Apply suggestions from code review
Amxx Sep 4, 2025
3974f6d
Merge branch 'master' into feature/base58
Amxx Sep 4, 2025
59b2866
fix compilation and update custom error name
Amxx Sep 4, 2025
66ef584
minify change by removing unecessary feature in Bytes.sol
Amxx Sep 4, 2025
8b1ae97
Apply suggestions from code review
Amxx Sep 12, 2025
bb3aaf3
Update contracts/utils/Base58.sol
Amxx Sep 12, 2025
ac75789
clarify
Amxx Sep 15, 2025
930a03f
update estimation to always overestimate
Amxx Sep 15, 2025
c3a4e76
closer approximation
Amxx Sep 15, 2025
f372c20
Update Base58.sol
Amxx Sep 16, 2025
377ec53
Enhance comments
ernestognw Sep 25, 2025
aeaa73c
fraction values
Amxx Sep 25, 2025
107328f
Update contracts/utils/Base58.sol
ernestognw Sep 25, 2025
e3268cf
Update contracts/utils/Base58.sol
ernestognw Sep 25, 2025
fe288ea
Enhance _decode comments
ernestognw Sep 25, 2025
8e32c79
Add custom error changes section in changelog
ernestognw Sep 25, 2025
0c488da
Apply suggestions from code review
Amxx Sep 26, 2025
23221e1
Update CHANGELOG.md
ernestognw Sep 26, 2025
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
5 changes: 5 additions & 0 deletions .changeset/loose-lamps-bake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'openzeppelin-solidity': minor
---

`Base58`: Add a library for encoding and decoding bytes buffers into base58 strings.
1 change: 1 addition & 0 deletions contracts/mocks/Stateless.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ pragma solidity ^0.8.26;
import {Address} from "../utils/Address.sol";
import {Arrays} from "../utils/Arrays.sol";
import {AuthorityUtils} from "../access/manager/AuthorityUtils.sol";
import {Base58} from "../utils/Base58.sol";
import {Base64} from "../utils/Base64.sol";
import {BitMaps} from "../utils/structs/BitMaps.sol";
import {Blockhash} from "../utils/Blockhash.sol";
Expand Down
214 changes: 214 additions & 0 deletions contracts/utils/Base58.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,214 @@
// SPDX-License-Identifier: MIT

pragma solidity ^0.8.20;

/**
* @dev Provides a set of functions to operate with Base58 strings.
*
* Initially based on https://github.com/storyicon/base58-solidity/commit/807428e5174e61867e4c606bdb26cba58a8c5cb1[storyicon's implementation] (MIT).
* Based on the updated and improved https://github.com/Vectorized/solady/blob/main/src/utils/Base58.sol[Vectorized version] (MIT).
*/
library Base58 {
error InvalidBase58Char(bytes1);

/**
* @dev Encode a `bytes` buffer as a Base58 `string`.
*/
function encode(bytes memory input) internal pure returns (string memory) {
return string(_encode(input));
}

/**
* @dev Decode a Base58 `string` into a `bytes` buffer.
*/
function decode(string memory input) internal pure returns (bytes memory) {
return _decode(bytes(input));
}

function _encode(bytes memory input) private pure returns (bytes memory output) {
uint256 inputLength = input.length;
if (inputLength == 0) return "";

assembly ("memory-safe") {
// Count number of zero bytes at the beginning of `input`. These are encoded using the same number of '1's
// at the beginning of the encoded string.
let inputLeadingZeros := 0
for {} lt(byte(0, mload(add(add(input, 0x20), inputLeadingZeros))), lt(inputLeadingZeros, inputLength)) {} {
inputLeadingZeros := add(inputLeadingZeros, 1)
}

// Start the output offset by an over-estimate of the length.
// This is an estimation of the length ratio between bytes (base 256) and base58
// 9886 / 7239 = 1.36565824008841 > 1.365658237309761 = Math.log(256) / Math.log(58)
let outputLengthEstim := add(inputLeadingZeros, div(mul(sub(inputLength, inputLeadingZeros), 9886), 7239))

// This is going to be our "scratch" workspace. We leave enough room after FMP to later store length + encoded output.
let scratch := add(mload(0x40), add(outputLengthEstim, 0x21))

// Cut the input buffer in section (limbs) of 31 bytes (248 bits). Store in scratch.
let ptr := scratch
for {
// first section is possibly smaller than 31 bytes
let i := mod(inputLength, 31)
// unfold first loop, with a different shift.
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// unfold first loop, with a different shift.
// If inputLength is not a multiple of 31, unfold the first loop:
// Load the first i bytes from the input, right align them, and store them in scratch (at ptr) in a dedicated 32 bytes space.

if i {
mstore(ptr, shr(mul(sub(32, i), 8), mload(add(input, 0x20))))
ptr := add(ptr, 0x20)
}
} lt(i, inputLength) {
ptr := add(ptr, 0x20) // next limb
i := add(i, 31) // move in buffer
} {
// Load 31 bytes from the input buffer and store then in scratch (at ptr) in a dedicated 32 bytes space.
mstore(ptr, shr(8, mload(add(add(input, 0x20), i))))
}

// Store the encoding table. This overlaps with the FMP that we are going to reset later anyway.
// See sections 2 of https://inputtracker.ietf.org/doc/html/draft-msporny-base58-03
mstore(0x1f, "123456789ABCDEFGHJKLMNPQRSTUVWXY")
mstore(0x3f, "Zabcdefghijkmnopqrstuvwxyz")

// Encoding the "input" part of the result.
// - `data` points to the first (highest) non-empty limb. As limb get nullified by the successive
// divisions by 58, we don't need to reprocess the highest ones. Algorithm ends when all limbs are zeroed
// i.e. when the `data` pointer reaches the `ptr` pointer that correspond to the last limb.
// - `output` point the the left part of the encoded string. We start from scratch, which means we have
// outputLengthEstim bytes to work with before hitting the FMP
for {
let data := scratch
output := scratch
} 1 {} {
// move past the first (highest) zero limbs.
for {} and(iszero(mload(data)), lt(data, ptr)) {
data := add(data, 0x20)
} {}
// if all limbs are zeroed, we are done with this part of encoding
if eq(data, ptr) {
break
}

// base 58 arithmetic on the 248bits limbs
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// base 58 arithmetic on the 248bits limbs
// base 58 arithmetic on the 248bits limbs:
// we compute the remainder modulo 58 of the value encoded in the limbs,
// all while dividing the value encoded in the limbs by 58

let carry := 0
for {
let i := data
} lt(i, ptr) {
i := add(i, 0x20)
} {
let acc := add(shl(248, carry), mload(i))
Copy link
Collaborator Author

@Amxx Amxx Aug 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let acc := add(shl(248, carry), mload(i))
// Load the next limb and add the carry (limbs are 248bits objects)
let acc := add(shl(248, carry), mload(i))

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let acc := add(shl(248, carry), mload(i))
let numerator := add(shl(248, carry), mload(i))

mstore(i, div(acc, 58))
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
mstore(i, div(acc, 58))
// store the updated limb (divided by 58)
mstore(i, div(acc, 58))

carry := mod(acc, 58)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
carry := mod(acc, 58)
// carry the remainder (modulo 58)
carry := mod(acc, 58)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
carry := mod(acc, 58)
remainder := mod(acc, 58)

I would call it remainder here

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what you mean by numerator / denominator. To me these for fractions, but there is no fraction here, is thee ?

carry really feels like the right word to me. Its what remains of the operation and gets carried to the next step, like in fulladders or other similar operations.

acc is for accululator. We might find a better name, but I'm really nkot convinced by numerator

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In elementary arithmetic, a carry is a digit that is transferred from one column of digits to another column of more significant digits.

From wikipedia. I was confused by the word carry since I expected it to be going to somewhere more significant (not less).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the inverse of add and mul.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I see what you mean. We are doing a division, so you think or "partial" remainder at each step. That makes sens.

}

// encode carry using base58 table, and add it to the output
output := sub(output, 1)
mstore8(output, mload(carry))
}

// Write the input leading zeros at the left of the encoded.
// This may spill to the left into the "length" of the buffer.
for {
let i := 0
} lt(i, inputLeadingZeros) {} {
i := add(i, 0x20)
mstore(sub(output, i), "11111111111111111111111111111111")
}

// Move output pointer to account for inputLeadingZeros
output := sub(output, add(inputLeadingZeros, 0x20))

// Store length and allocate (reserve) memory up to scratch.
mstore(output, sub(scratch, add(output, 0x20)))
mstore(0x40, scratch)
}
}

function _decode(bytes memory input) private pure returns (bytes memory output) {
bytes4 errorSelector = InvalidBase58Char.selector;

uint256 inputLength = input.length;
if (inputLength == 0) return "";

assembly ("memory-safe") {
let inputLeadingZeros := 0 // Number of leading '1' in `input`.
// Count leading zeros. In base58, zeros are represented using '1' (chr(49)).
for {} and(
eq(byte(0, mload(add(add(input, 0x20), inputLeadingZeros))), 49),
lt(inputLeadingZeros, inputLength)
) {} {
inputLeadingZeros := add(inputLeadingZeros, 1)
}

// Start the output offset by an over-estimate of the length.
// This is an estimation of the length ratio between base58 and bytes (base 256)
// 6115 / 8351 = 0.7322476350137708 > 0.7322476243909465 = Math.log(58) / Math.log(256)
let outputLengthEstim := add(inputLeadingZeros, div(mul(sub(inputLength, inputLeadingZeros), 6115), 8351))

// This is going to be our "scratch" workspace. Be leave enough room on the left to store length + encoded input.
let scratch := add(mload(0x40), add(outputLengthEstim, 0x21))

// Store the decoding table. This overlaps with the FMP that we are going to reset later anyway.
mstore(0x2a, 0x30313233343536373839)
mstore(0x20, 0x1718191a1b1c1d1e1f20ffffffffffff2122232425262728292a2bff2c2d2e2f)
mstore(0x00, 0x000102030405060708ffffffffffffff090a0b0c0d0e0f10ff1112131415ff16)

// Decode each char of the input string, and store it in sections (limbs) of 31 bytes. Store in scratch.
let ptr := scratch
let mask := shr(8, not(0))
for {
let j := 0
} lt(j, inputLength) {
j := add(j, 1)
} {
// for each char, decode it ...
let c := sub(byte(0, mload(add(add(input, 0x20), j))), 49)
// slither-disable-next-line incorrect-shift
if iszero(and(shl(c, 1), 0x3fff7ff03ffbeff01ff)) {
mstore(0, errorSelector)
mstore(4, shl(248, add(c, 49)))
revert(0, 0x24)
}
let carry := byte(0, mload(c))

// ... and add it to the limbs starting a `scratch`
for {
let i := scratch
} lt(i, ptr) {
i := add(i, 0x20)
} {
let acc := add(carry, mul(58, mload(i)))
mstore(i, and(mask, acc))
carry := shr(248, acc)
}
// If the char just read result in a leftover carry, extend the limbs with the new value
if carry {
mstore(ptr, carry)
ptr := add(ptr, 0x20)
}
}

// Copy and compact the uint248 limbs + remove any zeros at the beginning.
output := scratch
for {
let i := scratch
} lt(i, ptr) {
i := add(i, 0x20)
} {
output := sub(output, 31)
mstore(sub(output, 1), mload(i))
}
for {} lt(byte(0, mload(output)), lt(output, scratch)) {} {
output := add(output, 1)
}

// Add the zeros that were encoded in the input (prefix '1's)
calldatacopy(sub(output, inputLeadingZeros), calldatasize(), inputLeadingZeros)

// Move output pointer to account for inputLeadingZeros
output := sub(output, add(inputLeadingZeros, 0x20))

// Store length and allocate (reserve) memory up to scratch.
mstore(output, sub(scratch, add(output, 0x20)))
mstore(0x40, scratch)
}
}
}
8 changes: 4 additions & 4 deletions contracts/utils/Base64.sol
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ import {SafeCast} from "./math/SafeCast.sol";
library Base64 {
using SafeCast for bool;

error InvalidBase64Digit(bytes1);
error InvalidBase64Char(bytes1);

/**
* @dev Converts a `bytes` to its Bytes64 `string` representation.
* @dev Converts a `bytes` to its Base64 `string` representation.
*/
function encode(bytes memory data) internal pure returns (string memory) {
return string(_encode(data, false));
}

/**
* @dev Converts a `bytes` to its Bytes64Url `string` representation.
* @dev Converts a `bytes` to its Base64Url `string` representation.
* Output is not padded with `=` as specified in https://www.rfc-editor.org/rfc/rfc4648[rfc4648].
*/
function encodeURL(bytes memory data) internal pure returns (string memory) {
Expand Down Expand Up @@ -142,7 +142,7 @@ library Base64 {
* @dev Internal decoding
*/
function _decode(bytes memory data) private pure returns (bytes memory result) {
bytes4 errorSelector = InvalidBase64Digit.selector;
bytes4 errorSelector = InvalidBase64Char.selector;

uint256 dataLength = data.length;
if (dataLength == 0) return "";
Expand Down
3 changes: 3 additions & 0 deletions contracts/utils/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Miscellaneous contracts and libraries containing utility functions you can use t
* {Create2}: Wrapper around the https://blog.openzeppelin.com/getting-the-most-out-of-create2/[`CREATE2` EVM opcode] for safe use without having to deal with low-level assembly.
* {Address}: Collection of functions for overloading Solidity's https://docs.soliditylang.org/en/latest/types.html#address[`address`] type.
* {Arrays}: Collection of functions that operate on https://docs.soliditylang.org/en/latest/types.html#arrays[`arrays`].
* {Base58}: On-chain base58 encoding and decoding.
* {Base64}: On-chain base64 and base64URL encoding according to https://datatracker.ietf.org/doc/html/rfc4648[RFC-4648].
* {Bytes}: Common operations on bytes objects.
* {Calldata}: Helpers for manipulating calldata.
Expand Down Expand Up @@ -106,6 +107,8 @@ Ethereum contracts have no native concept of an interface, so applications must

{{Arrays}}

{{Base58}}

{{Base64}}

{{Bytes}}
Expand Down
24 changes: 24 additions & 0 deletions test/utils/Base58.t.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// SPDX-License-Identifier: MIT

pragma solidity ^0.8.26;

import {Test} from "forge-std/Test.sol";
import {Base58} from "@openzeppelin/contracts/utils/Base58.sol";

contract Base58Test is Test {
function testEncodeDecodeEmpty() external pure {
assertEq(Base58.decode(Base58.encode(hex"")), hex"");
}

function testEncodeDecodeZeros() external pure {
bytes memory zeros = hex"0000000000000000";
assertEq(Base58.decode(Base58.encode(zeros)), zeros);

bytes memory almostZeros = hex"00000000a400000000";
assertEq(Base58.decode(Base58.encode(almostZeros)), almostZeros);
}

function testEncodeDecode(bytes memory input) external pure {
assertEq(Base58.decode(Base58.encode(input)), input);
}
}
65 changes: 65 additions & 0 deletions test/utils/Base58.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
const { ethers } = require('hardhat');
const { expect } = require('chai');
const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');

async function fixture() {
const mock = await ethers.deployContract('$Base58');
return { mock };
}

describe('Base58', function () {
beforeEach(async function () {
Object.assign(this, await loadFixture(fixture));
});

describe('base58', function () {
describe('encode/decode random buffers', function () {
// length 512 runs out of gas.
// this checks are very slow when running coverage, causing CI to timeout.
for (const length of [0, 1, 2, 3, 4, 32, 42, 128, 384])
it(
[length > 32 && '[skip-on-coverage]', `buffer of length ${length}`].filter(Boolean).join(' '),
async function () {
const buffer = ethers.randomBytes(length);
const hex = ethers.hexlify(buffer);
const b58 = ethers.encodeBase58(buffer);

await expect(this.mock.$encode(hex)).to.eventually.equal(b58);
await expect(this.mock.$decode(b58)).to.eventually.equal(hex);
},
);
});

// Tests case from section 5 of the (no longer active) Base58 Encoding Scheme RFC
// https://datatracker.ietf.org/doc/html/draft-msporny-base58-03
describe('test vectors', function () {
for (const { raw, b58 } of [
{ raw: 'Hello World!', b58: '2NEpo7TZRRrLZSi2U' },
{
raw: 'The quick brown fox jumps over the lazy dog.',
b58: 'USm3fpXnKG5EUBx2ndxBDMPVciP5hGey2Jh4NDv6gmeo1LkMeiKrLJUUBk6Z',
},
{ raw: '0x0000287fb4cd', b58: '11233QC4' },
])
it(raw, async function () {
const buffer = (ethers.isHexString(raw) ? ethers.getBytes : ethers.toUtf8Bytes)(raw);
const hex = ethers.hexlify(buffer);

await expect(this.mock.$encode(hex)).to.eventually.equal(b58);
await expect(this.mock.$decode(b58)).to.eventually.equal(hex);
});
});

describe('decode invalid format', function () {
for (const chr of ['I', '-', '~'])
it(`Invalid base58 char ${chr}`, async function () {
const getHexCode = str => ethers.hexlify(ethers.toUtf8Bytes(str));
const helper = { interface: ethers.Interface.from(['error InvalidBase58Char(bytes1)']) };

await expect(this.mock.$decode(`VYRWKp${chr}pnN7`))
.to.be.revertedWithCustomError(helper, 'InvalidBase58Char')
.withArgs(getHexCode(chr));
});
});
});
});
Loading