18 Commits

Author SHA1 Message Date
Rod Vagg
58a41f7df1 chore: bump v0.2.0 2023-03-15 15:43:10 +11:00
Rod Vagg
a791fa9589 fix: math/rand -> crypto/rand 2023-03-15 15:43:10 +11:00
web3-bot
c36c36f88b update .github/workflows/release-check.yml 2023-03-15 15:43:10 +11:00
web3-bot
3bbbe822b0 update .github/workflows/go-check.yml 2023-03-15 15:43:10 +11:00
web3-bot
b85d20169d update .github/workflows/go-test.yml 2023-03-15 15:43:10 +11:00
web3-bot
8170d966f8 bump go.mod to Go 1.19 and run go fix 2023-03-15 15:43:10 +11:00
Jorropo
c442d70f87 fuzz: add Decoder fuzzing
This uses the spec tests as seeding value.
2023-01-08 22:58:38 +01:00
web3-bot
7160a7347e sync: update CI config files (#53) 2022-08-23 16:23:09 +00:00
Jorropo
c1bc15b22e chore: release version 0.1.1 2022-06-17 10:57:57 +10:00
Jorropo
801f90a945 fix: add new emoji codepoint for Base256Emoji 🐉
One of the values of base256emoji was not actually an emoji.

Here there be dragons instead !

See df5b7bc6ee (r75683795) for context.
2022-06-17 10:57:57 +10:00
Jorropo
6e0e420356 chore: release v0.1.0 2022-06-09 15:18:49 +10:00
Jorropo
df5b7bc6ee feat: add UTF-8 support and base256emoji
This include fixes for UTF-8 as well as base256emoji encoding (an encoding which actually use UTF-8).
2022-06-09 15:18:49 +10:00
Jorropo
0bd72a8c32 submodule: spec/
The spec submodule was on a 2 year old commit and the tests structure 
changed, this bring it to the latest master at this time.
2022-06-09 15:18:49 +10:00
web3-bot
714f5c0130 sync: update CI config files (#50) 2022-04-04 11:49:11 +00:00
web3-bot
f067816be3 sync: update CI config files (#48) 2021-12-10 14:34:10 +00:00
web3-bot
66b6f5f82a sync: update CI config files (#45) 2021-08-17 13:39:44 +00:00
web3-bot
c1e5d4e95b sync: update CI config files (#43) 2021-06-01 16:57:12 +00:00
Marten Seemann
f68598dd02 Merge pull request #41 from multiformats/fix-staticcheck
fix staticcheck
2021-05-05 20:16:15 +07:00
17 changed files with 390 additions and 60 deletions

11
.github/workflows/automerge.yml vendored Normal file
View File

@@ -0,0 +1,11 @@
# File managed by web3-bot. DO NOT EDIT.
# See https://github.com/protocol/.github/ for details.
name: Automerge
on: [ pull_request ]
jobs:
automerge:
uses: protocol/.github/.github/workflows/automerge.yml@master
with:
job: 'automerge'

67
.github/workflows/go-check.yml vendored Normal file
View File

@@ -0,0 +1,67 @@
# File managed by web3-bot. DO NOT EDIT.
# See https://github.com/protocol/.github/ for details.
on: [push, pull_request]
name: Go Checks
jobs:
unit:
runs-on: ubuntu-latest
name: All
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- id: config
uses: protocol/.github/.github/actions/read-config@master
- uses: actions/setup-go@v3
with:
go-version: 1.20.x
- name: Run repo-specific setup
uses: ./.github/actions/go-check-setup
if: hashFiles('./.github/actions/go-check-setup') != ''
- name: Install staticcheck
run: go install honnef.co/go/tools/cmd/staticcheck@4970552d932f48b71485287748246cf3237cebdf # 2023.1 (v0.4.0)
- name: Check that go.mod is tidy
uses: protocol/multiple-go-modules@v1.2
with:
run: |
go mod tidy
if [[ -n $(git ls-files --other --exclude-standard --directory -- go.sum) ]]; then
echo "go.sum was added by go mod tidy"
exit 1
fi
git diff --exit-code -- go.sum go.mod
- name: gofmt
if: success() || failure() # run this step even if the previous one failed
run: |
out=$(gofmt -s -l .)
if [[ -n "$out" ]]; then
echo $out | awk '{print "::error file=" $0 ",line=0,col=0::File is not gofmt-ed."}'
exit 1
fi
- name: go vet
if: success() || failure() # run this step even if the previous one failed
uses: protocol/multiple-go-modules@v1.2
with:
run: go vet ./...
- name: staticcheck
if: success() || failure() # run this step even if the previous one failed
uses: protocol/multiple-go-modules@v1.2
with:
run: |
set -o pipefail
staticcheck ./... | sed -e 's@\(.*\)\.go@./\1.go@g'
- name: go generate
uses: protocol/multiple-go-modules@v1.2
if: (success() || failure()) && fromJSON(steps.config.outputs.json).gogenerate == true
with:
run: |
git clean -fd # make sure there aren't untracked files / directories
go generate -x ./...
# check if go generate modified or added any files
if ! $(git add . && git diff-index HEAD --exit-code --quiet); then
echo "go generated caused changes to the repository:"
git status --short
exit 1
fi

76
.github/workflows/go-test.yml vendored Normal file
View File

@@ -0,0 +1,76 @@
# File managed by web3-bot. DO NOT EDIT.
# See https://github.com/protocol/.github/ for details.
on: [push, pull_request]
name: Go Test
jobs:
unit:
strategy:
fail-fast: false
matrix:
os: [ "ubuntu", "windows", "macos" ]
go: ["1.19.x","1.20.x"]
env:
COVERAGES: ""
runs-on: ${{ fromJSON(vars[format('UCI_GO_TEST_RUNNER_{0}', matrix.os)] || format('"{0}-latest"', matrix.os)) }}
name: ${{ matrix.os }} (go ${{ matrix.go }})
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- id: config
uses: protocol/.github/.github/actions/read-config@master
- uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go }}
- name: Go information
run: |
go version
go env
- name: Use msys2 on windows
if: matrix.os == 'windows'
shell: bash
# The executable for msys2 is also called bash.cmd
# https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md#shells
# If we prepend its location to the PATH
# subsequent 'shell: bash' steps will use msys2 instead of gitbash
run: echo "C:/msys64/usr/bin" >> $GITHUB_PATH
- name: Run repo-specific setup
uses: ./.github/actions/go-test-setup
if: hashFiles('./.github/actions/go-test-setup') != ''
- name: Run tests
if: contains(fromJSON(steps.config.outputs.json).skipOSes, matrix.os) == false
uses: protocol/multiple-go-modules@v1.2
with:
# Use -coverpkg=./..., so that we include cross-package coverage.
# If package ./A imports ./B, and ./A's tests also cover ./B,
# this means ./B's coverage will be significantly higher than 0%.
run: go test -v -shuffle=on -coverprofile=module-coverage.txt -coverpkg=./... ./...
- name: Run tests (32 bit)
# can't run 32 bit tests on OSX.
if: matrix.os != 'macos' &&
fromJSON(steps.config.outputs.json).skip32bit != true &&
contains(fromJSON(steps.config.outputs.json).skipOSes, matrix.os) == false
uses: protocol/multiple-go-modules@v1.2
env:
GOARCH: 386
with:
run: |
export "PATH=$PATH_386:$PATH"
go test -v -shuffle=on ./...
- name: Run tests with race detector
# speed things up. Windows and OSX VMs are slow
if: matrix.os == 'ubuntu' &&
contains(fromJSON(steps.config.outputs.json).skipOSes, matrix.os) == false
uses: protocol/multiple-go-modules@v1.2
with:
run: go test -v -race ./...
- name: Collect coverage files
shell: bash
run: echo "COVERAGES=$(find . -type f -name 'module-coverage.txt' | tr -s '\n' ',' | sed 's/,$//')" >> $GITHUB_ENV
- name: Upload coverage to Codecov
uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
with:
files: '${{ env.COVERAGES }}'
env_vars: OS=${{ matrix.os }}, GO=${{ matrix.go }}

13
.github/workflows/release-check.yml vendored Normal file
View File

@@ -0,0 +1,13 @@
# File managed by web3-bot. DO NOT EDIT.
# See https://github.com/protocol/.github/ for details.
name: Release Checker
on:
pull_request_target:
paths: [ 'version.json' ]
jobs:
release-check:
uses: protocol/.github/.github/workflows/release-check.yml@master
with:
go-version: 1.20.x

11
.github/workflows/releaser.yml vendored Normal file
View File

@@ -0,0 +1,11 @@
# File managed by web3-bot. DO NOT EDIT.
# See https://github.com/protocol/.github/ for details.
name: Releaser
on:
push:
paths: [ 'version.json' ]
jobs:
releaser:
uses: protocol/.github/.github/workflows/releaser.yml@master

12
.github/workflows/tagpush.yml vendored Normal file
View File

@@ -0,0 +1,12 @@
# File managed by web3-bot. DO NOT EDIT.
# See https://github.com/protocol/.github/ for details.
name: Tag Push Checker
on:
push:
tags:
- v*
jobs:
releaser:
uses: protocol/.github/.github/workflows/tagpush.yml@master

View File

@@ -1,31 +0,0 @@
os:
- linux
language: go
go:
- 1.11.x
- 1.15.x
env:
global:
- GOTFLAGS="-race"
matrix:
- BUILD_DEPTYPE=gomod
# disable travis install
install:
- true
script:
- bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh)
cache:
directories:
- $GOPATH/pkg/mod
- /home/travis/.cache/go-build
notifications:
email: false

95
base256emoji.go Normal file
View File

@@ -0,0 +1,95 @@
package multibase
import (
"strconv"
"strings"
"unicode/utf8"
)
var base256emojiTable = [256]rune{
// Curated list, this is just a list of things that *somwhat* are related to our comunity
'🚀', '🪐', '☄', '🛰', '🌌', // Space
'🌑', '🌒', '🌓', '🌔', '🌕', '🌖', '🌗', '🌘', // Moon
'🌍', '🌏', '🌎', // Our Home, for now (earth)
'🐉', // Dragon!!!
'☀', // Our Garden, for now (sol)
'💻', '🖥', '💾', '💿', // Computer
// The rest is completed from https://home.unicode.org/emoji/emoji-frequency/ at the time of creation (december 2021) (the data is from 2019), most used first until we reach 256.
// We exclude modifier based emojies (such as flags) as they are bigger than one single codepoint.
// Some other emojies were removed adhoc for various reasons.
'😂', '❤', '😍', '🤣', '😊', '🙏', '💕', '😭', '😘', '👍',
'😅', '👏', '😁', '🔥', '🥰', '💔', '💖', '💙', '😢', '🤔',
'😆', '🙄', '💪', '😉', '☺', '👌', '🤗', '💜', '😔', '😎',
'😇', '🌹', '🤦', '🎉', '💞', '✌', '✨', '🤷', '😱', '😌',
'🌸', '🙌', '😋', '💗', '💚', '😏', '💛', '🙂', '💓', '🤩',
'😄', '😀', '🖤', '😃', '💯', '🙈', '👇', '🎶', '😒', '🤭',
'❣', '😜', '💋', '👀', '😪', '😑', '💥', '🙋', '😞', '😩',
'😡', '🤪', '👊', '🥳', '😥', '🤤', '👉', '💃', '😳', '✋',
'😚', '😝', '😴', '🌟', '😬', '🙃', '🍀', '🌷', '😻', '😓',
'⭐', '✅', '🥺', '🌈', '😈', '🤘', '💦', '✔', '😣', '🏃',
'💐', '☹', '🎊', '💘', '😠', '☝', '😕', '🌺', '🎂', '🌻',
'😐', '🖕', '💝', '🙊', '😹', '🗣', '💫', '💀', '👑', '🎵',
'🤞', '😛', '🔴', '😤', '🌼', '😫', '⚽', '🤙', '☕', '🏆',
'🤫', '👈', '😮', '🙆', '🍻', '🍃', '🐶', '💁', '😲', '🌿',
'🧡', '🎁', '⚡', '🌞', '🎈', '❌', '✊', '👋', '😰', '🤨',
'😶', '🤝', '🚶', '💰', '🍓', '💢', '🤟', '🙁', '🚨', '💨',
'🤬', '✈', '🎀', '🍺', '🤓', '😙', '💟', '🌱', '😖', '👶',
'🥴', '▶', '➡', '❓', '💎', '💸', '⬇', '😨', '🌚', '🦋',
'😷', '🕺', '⚠', '🙅', '😟', '😵', '👎', '🤲', '🤠', '🤧',
'📌', '🔵', '💅', '🧐', '🐾', '🍒', '😗', '🤑', '🌊', '🤯',
'🐷', '☎', '💧', '😯', '💆', '👆', '🎤', '🙇', '🍑', '❄',
'🌴', '💣', '🐸', '💌', '📍', '🥀', '🤢', '👅', '💡', '💩',
'👐', '📸', '👻', '🤐', '🤮', '🎼', '🥵', '🚩', '🍎', '🍊',
'👼', '💍', '📣', '🥂',
}
var base256emojiReverseTable map[rune]byte
func init() {
base256emojiReverseTable = make(map[rune]byte, len(base256emojiTable))
for i, v := range base256emojiTable {
base256emojiReverseTable[v] = byte(i)
}
}
func base256emojiEncode(in []byte) string {
var l int
for _, v := range in {
l += utf8.RuneLen(base256emojiTable[v])
}
var out strings.Builder
out.Grow(l)
for _, v := range in {
out.WriteRune(base256emojiTable[v])
}
return out.String()
}
type base256emojiCorruptInputError struct {
index int
char rune
}
func (e base256emojiCorruptInputError) Error() string {
return "illegal base256emoji data at input byte " + strconv.FormatInt(int64(e.index), 10) + ", char: '" + string(e.char) + "'"
}
func (e base256emojiCorruptInputError) String() string {
return e.Error()
}
func base256emojiDecode(in string) ([]byte, error) {
out := make([]byte, utf8.RuneCountInString(in))
var stri int
for i := 0; len(in) > 0; i++ {
r, n := utf8.DecodeRuneInString(in)
in = in[n:]
var ok bool
out[i], ok = base256emojiReverseTable[r]
if !ok {
return nil, base256emojiCorruptInputError{stri, r}
}
stri += n
}
return out, nil
}

26
base256emoji_test.go Normal file
View File

@@ -0,0 +1,26 @@
package multibase
import "testing"
func TestBase256EmojiAlphabet(t *testing.T) {
var c uint
for _, v := range base256emojiTable {
if v != rune(0) {
c++
}
}
if c != 256 {
t.Errorf("Base256Emoji count is wrong, expected 256, got %d.", c)
}
}
func TestBase256EmojiUniq(t *testing.T) {
m := make(map[rune]struct{}, len(base256emojiTable))
for i, v := range base256emojiTable {
_, ok := m[v]
if ok {
t.Errorf("Base256Emoji duplicate %s at index %d.", string(v), i)
}
m[v] = struct{}{}
}
}

View File

@@ -2,6 +2,7 @@ package multibase
import ( import (
"fmt" "fmt"
"unicode/utf8"
) )
// Encoder is a multibase encoding that is verified to be supported and // Encoder is a multibase encoding that is verified to be supported and
@@ -36,8 +37,9 @@ func EncoderByName(str string) (Encoder, error) {
var ok bool var ok bool
if len(str) == 0 { if len(str) == 0 {
return Encoder{-1}, fmt.Errorf("empty multibase encoding") return Encoder{-1}, fmt.Errorf("empty multibase encoding")
} else if len(str) == 1 { } else if utf8.RuneCountInString(str) == 1 {
base = Encoding(str[0]) r, _ := utf8.DecodeRuneInString(str)
base = Encoding(r)
_, ok = EncodingToStr[base] _, ok = EncodingToStr[base]
} else { } else {
base, ok = Encodings[str] base, ok = Encodings[str]

View File

@@ -2,6 +2,7 @@ package multibase
import ( import (
"testing" "testing"
"unicode/utf8"
) )
func TestInvalidCode(t *testing.T) { func TestInvalidCode(t *testing.T) {
@@ -43,9 +44,10 @@ func TestEncoder(t *testing.T) {
} }
// Test that an encoder can be created from the single letter // Test that an encoder can be created from the single letter
// prefix // prefix
_, err = EncoderByName(str[0:1]) r, _ := utf8.DecodeRuneInString(str)
_, err = EncoderByName(string(r))
if err != nil { if err != nil {
t.Fatalf("EncoderByName(%s) failed: %v", str[0:1], err) t.Fatalf("EncoderByName(%s) failed: %v", string(r), err)
} }
} }
} }

2
go.mod
View File

@@ -1,6 +1,6 @@
module github.com/multiformats/go-multibase module github.com/multiformats/go-multibase
go 1.11 go 1.19
require ( require (
github.com/mr-tron/base58 v1.1.0 github.com/mr-tron/base58 v1.1.0

View File

@@ -4,6 +4,7 @@ import (
"encoding/base64" "encoding/base64"
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"unicode/utf8"
b58 "github.com/mr-tron/base58/base58" b58 "github.com/mr-tron/base58/base58"
b32 "github.com/multiformats/go-base32" b32 "github.com/multiformats/go-base32"
@@ -38,31 +39,33 @@ const (
Base64url = 'u' Base64url = 'u'
Base64pad = 'M' Base64pad = 'M'
Base64urlPad = 'U' Base64urlPad = 'U'
Base256Emoji = '🚀'
) )
// EncodingToStr is a map of the supported encoding, unsupported encoding // EncodingToStr is a map of the supported encoding, unsupported encoding
// specified in standard are left out // specified in standard are left out
var EncodingToStr = map[Encoding]string{ var EncodingToStr = map[Encoding]string{
0x00: "identity", 0x00: "identity",
'0': "base2", '0': "base2",
'f': "base16", 'f': "base16",
'F': "base16upper", 'F': "base16upper",
'b': "base32", 'b': "base32",
'B': "base32upper", 'B': "base32upper",
'c': "base32pad", 'c': "base32pad",
'C': "base32padupper", 'C': "base32padupper",
'v': "base32hex", 'v': "base32hex",
'V': "base32hexupper", 'V': "base32hexupper",
't': "base32hexpad", 't': "base32hexpad",
'T': "base32hexpadupper", 'T': "base32hexpadupper",
'k': "base36", 'k': "base36",
'K': "base36upper", 'K': "base36upper",
'z': "base58btc", 'z': "base58btc",
'Z': "base58flickr", 'Z': "base58flickr",
'm': "base64", 'm': "base64",
'u': "base64url", 'u': "base64url",
'M': "base64pad", 'M': "base64pad",
'U': "base64urlpad", 'U': "base64urlpad",
Base256Emoji: "base256emoji",
} }
var Encodings = map[string]Encoding{} var Encodings = map[string]Encoding{}
@@ -123,6 +126,8 @@ func Encode(base Encoding, data []byte) (string, error) {
return string(Base64url) + base64.RawURLEncoding.EncodeToString(data), nil return string(Base64url) + base64.RawURLEncoding.EncodeToString(data), nil
case Base64: case Base64:
return string(Base64) + base64.RawStdEncoding.EncodeToString(data), nil return string(Base64) + base64.RawStdEncoding.EncodeToString(data), nil
case Base256Emoji:
return string(Base256Emoji) + base256emojiEncode(data), nil
default: default:
return "", ErrUnsupportedEncoding return "", ErrUnsupportedEncoding
} }
@@ -135,7 +140,8 @@ func Decode(data string) (Encoding, []byte, error) {
return 0, nil, fmt.Errorf("cannot decode multibase for zero length string") return 0, nil, fmt.Errorf("cannot decode multibase for zero length string")
} }
enc := Encoding(data[0]) r, _ := utf8.DecodeRuneInString(data)
enc := Encoding(r)
switch enc { switch enc {
case Identity: case Identity:
@@ -179,6 +185,9 @@ func Decode(data string) (Encoding, []byte, error) {
case Base64url: case Base64url:
bytes, err := base64.RawURLEncoding.DecodeString(data[1:]) bytes, err := base64.RawURLEncoding.DecodeString(data[1:])
return Base64url, bytes, err return Base64url, bytes, err
case Base256Emoji:
bytes, err := base256emojiDecode(data[4:])
return Base256Emoji, bytes, err
default: default:
return -1, nil, ErrUnsupportedEncoding return -1, nil, ErrUnsupportedEncoding
} }

View File

@@ -2,7 +2,7 @@ package multibase
import ( import (
"bytes" "bytes"
"math/rand" "crypto/rand"
"sort" "sort"
"testing" "testing"
) )
@@ -44,6 +44,7 @@ var encodedSamples = map[Encoding]string{
Base64url: "uRGVjZW50cmFsaXplIGV2ZXJ5dGhpbmchISE", Base64url: "uRGVjZW50cmFsaXplIGV2ZXJ5dGhpbmchISE",
Base64pad: "MRGVjZW50cmFsaXplIGV2ZXJ5dGhpbmchISE=", Base64pad: "MRGVjZW50cmFsaXplIGV2ZXJ5dGhpbmchISE=",
Base64urlPad: "URGVjZW50cmFsaXplIGV2ZXJ5dGhpbmchISE=", Base64urlPad: "URGVjZW50cmFsaXplIGV2ZXJ5dGhpbmchISE=",
Base256Emoji: "🚀💛✋💃✋😻😈🥺🤤🍀🌟💐✋😅✋💦✋🥺🏃😈😴🌟😻😝👏👏👏",
} }
func testEncode(t *testing.T, encoding Encoding, bytes []byte, expected string) { func testEncode(t *testing.T, encoding Encoding, bytes []byte, expected string) {

2
spec

Submodule spec updated: 3806057e6f...4c8344e378

View File

@@ -66,7 +66,7 @@ func TestSpec(t *testing.T) {
} }
} }
func TestSpecVectors(t *testing.T) { func TestSpecVectors(t *testing.T) {
files, err := filepath.Glob("spec/tests/test[0-9]*.csv") files, err := filepath.Glob("spec/tests/*.csv")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -145,3 +145,36 @@ func TestSpecVectors(t *testing.T) {
}) })
} }
} }
func FuzzDecode(f *testing.F) {
files, err := filepath.Glob("spec/tests/*.csv")
if err != nil {
f.Fatal(err)
}
for _, fname := range files {
func() {
file, err := os.Open(fname)
if err != nil {
f.Fatal(err)
}
defer file.Close()
reader := csv.NewReader(file)
reader.LazyQuotes = false
reader.FieldsPerRecord = 2
reader.TrimLeadingSpace = true
values, err := reader.ReadAll()
if err != nil {
f.Fatal(err)
}
for _, tc := range values[1:] {
f.Add(tc[1])
}
}()
}
f.Fuzz(func(_ *testing.T, data string) {
Decode(data)
})
}

3
version.json Normal file
View File

@@ -0,0 +1,3 @@
{
"version": "v0.2.0"
}