diff --git a/globalization/BIP39.en.txt b/globalization/BIP39.en.txt
new file mode 100644
index 00000000..942040ed
--- /dev/null
+++ b/globalization/BIP39.en.txt
@@ -0,0 +1,2048 @@
+abandon
+ability
+able
+about
+above
+absent
+absorb
+abstract
+absurd
+abuse
+access
+accident
+account
+accuse
+achieve
+acid
+acoustic
+acquire
+across
+act
+action
+actor
+actress
+actual
+adapt
+add
+addict
+address
+adjust
+admit
+adult
+advance
+advice
+aerobic
+affair
+afford
+afraid
+again
+age
+agent
+agree
+ahead
+aim
+air
+airport
+aisle
+alarm
+album
+alcohol
+alert
+alien
+all
+alley
+allow
+almost
+alone
+alpha
+already
+also
+alter
+always
+amateur
+amazing
+among
+amount
+amused
+analyst
+anchor
+ancient
+anger
+angle
+angry
+animal
+ankle
+announce
+annual
+another
+answer
+antenna
+antique
+anxiety
+any
+apart
+apology
+appear
+apple
+approve
+april
+arch
+arctic
+area
+arena
+argue
+arm
+armed
+armor
+army
+around
+arrange
+arrest
+arrive
+arrow
+art
+artefact
+artist
+artwork
+ask
+aspect
+assault
+asset
+assist
+assume
+asthma
+athlete
+atom
+attack
+attend
+attitude
+attract
+auction
+audit
+august
+aunt
+author
+auto
+autumn
+average
+avocado
+avoid
+awake
+aware
+away
+awesome
+awful
+awkward
+axis
+baby
+bachelor
+bacon
+badge
+bag
+balance
+balcony
+ball
+bamboo
+banana
+banner
+bar
+barely
+bargain
+barrel
+base
+basic
+basket
+battle
+beach
+bean
+beauty
+because
+become
+beef
+before
+begin
+behave
+behind
+believe
+below
+belt
+bench
+benefit
+best
+betray
+better
+between
+beyond
+bicycle
+bid
+bike
+bind
+biology
+bird
+birth
+bitter
+black
+blade
+blame
+blanket
+blast
+bleak
+bless
+blind
+blood
+blossom
+blouse
+blue
+blur
+blush
+board
+boat
+body
+boil
+bomb
+bone
+bonus
+book
+boost
+border
+boring
+borrow
+boss
+bottom
+bounce
+box
+boy
+bracket
+brain
+brand
+brass
+brave
+bread
+breeze
+brick
+bridge
+brief
+bright
+bring
+brisk
+broccoli
+broken
+bronze
+broom
+brother
+brown
+brush
+bubble
+buddy
+budget
+buffalo
+build
+bulb
+bulk
+bullet
+bundle
+bunker
+burden
+burger
+burst
+bus
+business
+busy
+butter
+buyer
+buzz
+cabbage
+cabin
+cable
+cactus
+cage
+cake
+call
+calm
+camera
+camp
+can
+canal
+cancel
+candy
+cannon
+canoe
+canvas
+canyon
+capable
+capital
+captain
+car
+carbon
+card
+cargo
+carpet
+carry
+cart
+case
+cash
+casino
+castle
+casual
+cat
+catalog
+catch
+category
+cattle
+caught
+cause
+caution
+cave
+ceiling
+celery
+cement
+census
+century
+cereal
+certain
+chair
+chalk
+champion
+change
+chaos
+chapter
+charge
+chase
+chat
+cheap
+check
+cheese
+chef
+cherry
+chest
+chicken
+chief
+child
+chimney
+choice
+choose
+chronic
+chuckle
+chunk
+churn
+cigar
+cinnamon
+circle
+citizen
+city
+civil
+claim
+clap
+clarify
+claw
+clay
+clean
+clerk
+clever
+click
+client
+cliff
+climb
+clinic
+clip
+clock
+clog
+close
+cloth
+cloud
+clown
+club
+clump
+cluster
+clutch
+coach
+coast
+coconut
+code
+coffee
+coil
+coin
+collect
+color
+column
+combine
+come
+comfort
+comic
+common
+company
+concert
+conduct
+confirm
+congress
+connect
+consider
+control
+convince
+cook
+cool
+copper
+copy
+coral
+core
+corn
+correct
+cost
+cotton
+couch
+country
+couple
+course
+cousin
+cover
+coyote
+crack
+cradle
+craft
+cram
+crane
+crash
+crater
+crawl
+crazy
+cream
+credit
+creek
+crew
+cricket
+crime
+crisp
+critic
+crop
+cross
+crouch
+crowd
+crucial
+cruel
+cruise
+crumble
+crunch
+crush
+cry
+crystal
+cube
+culture
+cup
+cupboard
+curious
+current
+curtain
+curve
+cushion
+custom
+cute
+cycle
+dad
+damage
+damp
+dance
+danger
+daring
+dash
+daughter
+dawn
+day
+deal
+debate
+debris
+decade
+december
+decide
+decline
+decorate
+decrease
+deer
+defense
+define
+defy
+degree
+delay
+deliver
+demand
+demise
+denial
+dentist
+deny
+depart
+depend
+deposit
+depth
+deputy
+derive
+describe
+desert
+design
+desk
+despair
+destroy
+detail
+detect
+develop
+device
+devote
+diagram
+dial
+diamond
+diary
+dice
+diesel
+diet
+differ
+digital
+dignity
+dilemma
+dinner
+dinosaur
+direct
+dirt
+disagree
+discover
+disease
+dish
+dismiss
+disorder
+display
+distance
+divert
+divide
+divorce
+dizzy
+doctor
+document
+dog
+doll
+dolphin
+domain
+donate
+donkey
+donor
+door
+dose
+double
+dove
+draft
+dragon
+drama
+drastic
+draw
+dream
+dress
+drift
+drill
+drink
+drip
+drive
+drop
+drum
+dry
+duck
+dumb
+dune
+during
+dust
+dutch
+duty
+dwarf
+dynamic
+eager
+eagle
+early
+earn
+earth
+easily
+east
+easy
+echo
+ecology
+economy
+edge
+edit
+educate
+effort
+egg
+eight
+either
+elbow
+elder
+electric
+elegant
+element
+elephant
+elevator
+elite
+else
+embark
+embody
+embrace
+emerge
+emotion
+employ
+empower
+empty
+enable
+enact
+end
+endless
+endorse
+enemy
+energy
+enforce
+engage
+engine
+enhance
+enjoy
+enlist
+enough
+enrich
+enroll
+ensure
+enter
+entire
+entry
+envelope
+episode
+equal
+equip
+era
+erase
+erode
+erosion
+error
+erupt
+escape
+essay
+essence
+estate
+eternal
+ethics
+evidence
+evil
+evoke
+evolve
+exact
+example
+excess
+exchange
+excite
+exclude
+excuse
+execute
+exercise
+exhaust
+exhibit
+exile
+exist
+exit
+exotic
+expand
+expect
+expire
+explain
+expose
+express
+extend
+extra
+eye
+eyebrow
+fabric
+face
+faculty
+fade
+faint
+faith
+fall
+false
+fame
+family
+famous
+fan
+fancy
+fantasy
+farm
+fashion
+fat
+fatal
+father
+fatigue
+fault
+favorite
+feature
+february
+federal
+fee
+feed
+feel
+female
+fence
+festival
+fetch
+fever
+few
+fiber
+fiction
+field
+figure
+file
+film
+filter
+final
+find
+fine
+finger
+finish
+fire
+firm
+first
+fiscal
+fish
+fit
+fitness
+fix
+flag
+flame
+flash
+flat
+flavor
+flee
+flight
+flip
+float
+flock
+floor
+flower
+fluid
+flush
+fly
+foam
+focus
+fog
+foil
+fold
+follow
+food
+foot
+force
+forest
+forget
+fork
+fortune
+forum
+forward
+fossil
+foster
+found
+fox
+fragile
+frame
+frequent
+fresh
+friend
+fringe
+frog
+front
+frost
+frown
+frozen
+fruit
+fuel
+fun
+funny
+furnace
+fury
+future
+gadget
+gain
+galaxy
+gallery
+game
+gap
+garage
+garbage
+garden
+garlic
+garment
+gas
+gasp
+gate
+gather
+gauge
+gaze
+general
+genius
+genre
+gentle
+genuine
+gesture
+ghost
+giant
+gift
+giggle
+ginger
+giraffe
+girl
+give
+glad
+glance
+glare
+glass
+glide
+glimpse
+globe
+gloom
+glory
+glove
+glow
+glue
+goat
+goddess
+gold
+good
+goose
+gorilla
+gospel
+gossip
+govern
+gown
+grab
+grace
+grain
+grant
+grape
+grass
+gravity
+great
+green
+grid
+grief
+grit
+grocery
+group
+grow
+grunt
+guard
+guess
+guide
+guilt
+guitar
+gun
+gym
+habit
+hair
+half
+hammer
+hamster
+hand
+happy
+harbor
+hard
+harsh
+harvest
+hat
+have
+hawk
+hazard
+head
+health
+heart
+heavy
+hedgehog
+height
+hello
+helmet
+help
+hen
+hero
+hidden
+high
+hill
+hint
+hip
+hire
+history
+hobby
+hockey
+hold
+hole
+holiday
+hollow
+home
+honey
+hood
+hope
+horn
+horror
+horse
+hospital
+host
+hotel
+hour
+hover
+hub
+huge
+human
+humble
+humor
+hundred
+hungry
+hunt
+hurdle
+hurry
+hurt
+husband
+hybrid
+ice
+icon
+idea
+identify
+idle
+ignore
+ill
+illegal
+illness
+image
+imitate
+immense
+immune
+impact
+impose
+improve
+impulse
+inch
+include
+income
+increase
+index
+indicate
+indoor
+industry
+infant
+inflict
+inform
+inhale
+inherit
+initial
+inject
+injury
+inmate
+inner
+innocent
+input
+inquiry
+insane
+insect
+inside
+inspire
+install
+intact
+interest
+into
+invest
+invite
+involve
+iron
+island
+isolate
+issue
+item
+ivory
+jacket
+jaguar
+jar
+jazz
+jealous
+jeans
+jelly
+jewel
+job
+join
+joke
+journey
+joy
+judge
+juice
+jump
+jungle
+junior
+junk
+just
+kangaroo
+keen
+keep
+ketchup
+key
+kick
+kid
+kidney
+kind
+kingdom
+kiss
+kit
+kitchen
+kite
+kitten
+kiwi
+knee
+knife
+knock
+know
+lab
+label
+labor
+ladder
+lady
+lake
+lamp
+language
+laptop
+large
+later
+latin
+laugh
+laundry
+lava
+law
+lawn
+lawsuit
+layer
+lazy
+leader
+leaf
+learn
+leave
+lecture
+left
+leg
+legal
+legend
+leisure
+lemon
+lend
+length
+lens
+leopard
+lesson
+letter
+level
+liar
+liberty
+library
+license
+life
+lift
+light
+like
+limb
+limit
+link
+lion
+liquid
+list
+little
+live
+lizard
+load
+loan
+lobster
+local
+lock
+logic
+lonely
+long
+loop
+lottery
+loud
+lounge
+love
+loyal
+lucky
+luggage
+lumber
+lunar
+lunch
+luxury
+lyrics
+machine
+mad
+magic
+magnet
+maid
+mail
+main
+major
+make
+mammal
+man
+manage
+mandate
+mango
+mansion
+manual
+maple
+marble
+march
+margin
+marine
+market
+marriage
+mask
+mass
+master
+match
+material
+math
+matrix
+matter
+maximum
+maze
+meadow
+mean
+measure
+meat
+mechanic
+medal
+media
+melody
+melt
+member
+memory
+mention
+menu
+mercy
+merge
+merit
+merry
+mesh
+message
+metal
+method
+middle
+midnight
+milk
+million
+mimic
+mind
+minimum
+minor
+minute
+miracle
+mirror
+misery
+miss
+mistake
+mix
+mixed
+mixture
+mobile
+model
+modify
+mom
+moment
+monitor
+monkey
+monster
+month
+moon
+moral
+more
+morning
+mosquito
+mother
+motion
+motor
+mountain
+mouse
+move
+movie
+much
+muffin
+mule
+multiply
+muscle
+museum
+mushroom
+music
+must
+mutual
+myself
+mystery
+myth
+naive
+name
+napkin
+narrow
+nasty
+nation
+nature
+near
+neck
+need
+negative
+neglect
+neither
+nephew
+nerve
+nest
+net
+network
+neutral
+never
+news
+next
+nice
+night
+noble
+noise
+nominee
+noodle
+normal
+north
+nose
+notable
+note
+nothing
+notice
+novel
+now
+nuclear
+number
+nurse
+nut
+oak
+obey
+object
+oblige
+obscure
+observe
+obtain
+obvious
+occur
+ocean
+october
+odor
+off
+offer
+office
+often
+oil
+okay
+old
+olive
+olympic
+omit
+once
+one
+onion
+online
+only
+open
+opera
+opinion
+oppose
+option
+orange
+orbit
+orchard
+order
+ordinary
+organ
+orient
+original
+orphan
+ostrich
+other
+outdoor
+outer
+output
+outside
+oval
+oven
+over
+own
+owner
+oxygen
+oyster
+ozone
+pact
+paddle
+page
+pair
+palace
+palm
+panda
+panel
+panic
+panther
+paper
+parade
+parent
+park
+parrot
+party
+pass
+patch
+path
+patient
+patrol
+pattern
+pause
+pave
+payment
+peace
+peanut
+pear
+peasant
+pelican
+pen
+penalty
+pencil
+people
+pepper
+perfect
+permit
+person
+pet
+phone
+photo
+phrase
+physical
+piano
+picnic
+picture
+piece
+pig
+pigeon
+pill
+pilot
+pink
+pioneer
+pipe
+pistol
+pitch
+pizza
+place
+planet
+plastic
+plate
+play
+please
+pledge
+pluck
+plug
+plunge
+poem
+poet
+point
+polar
+pole
+police
+pond
+pony
+pool
+popular
+portion
+position
+possible
+post
+potato
+pottery
+poverty
+powder
+power
+practice
+praise
+predict
+prefer
+prepare
+present
+pretty
+prevent
+price
+pride
+primary
+print
+priority
+prison
+private
+prize
+problem
+process
+produce
+profit
+program
+project
+promote
+proof
+property
+prosper
+protect
+proud
+provide
+public
+pudding
+pull
+pulp
+pulse
+pumpkin
+punch
+pupil
+puppy
+purchase
+purity
+purpose
+purse
+push
+put
+puzzle
+pyramid
+quality
+quantum
+quarter
+question
+quick
+quit
+quiz
+quote
+rabbit
+raccoon
+race
+rack
+radar
+radio
+rail
+rain
+raise
+rally
+ramp
+ranch
+random
+range
+rapid
+rare
+rate
+rather
+raven
+raw
+razor
+ready
+real
+reason
+rebel
+rebuild
+recall
+receive
+recipe
+record
+recycle
+reduce
+reflect
+reform
+refuse
+region
+regret
+regular
+reject
+relax
+release
+relief
+rely
+remain
+remember
+remind
+remove
+render
+renew
+rent
+reopen
+repair
+repeat
+replace
+report
+require
+rescue
+resemble
+resist
+resource
+response
+result
+retire
+retreat
+return
+reunion
+reveal
+review
+reward
+rhythm
+rib
+ribbon
+rice
+rich
+ride
+ridge
+rifle
+right
+rigid
+ring
+riot
+ripple
+risk
+ritual
+rival
+river
+road
+roast
+robot
+robust
+rocket
+romance
+roof
+rookie
+room
+rose
+rotate
+rough
+round
+route
+royal
+rubber
+rude
+rug
+rule
+run
+runway
+rural
+sad
+saddle
+sadness
+safe
+sail
+salad
+salmon
+salon
+salt
+salute
+same
+sample
+sand
+satisfy
+satoshi
+sauce
+sausage
+save
+say
+scale
+scan
+scare
+scatter
+scene
+scheme
+school
+science
+scissors
+scorpion
+scout
+scrap
+screen
+script
+scrub
+sea
+search
+season
+seat
+second
+secret
+section
+security
+seed
+seek
+segment
+select
+sell
+seminar
+senior
+sense
+sentence
+series
+service
+session
+settle
+setup
+seven
+shadow
+shaft
+shallow
+share
+shed
+shell
+sheriff
+shield
+shift
+shine
+ship
+shiver
+shock
+shoe
+shoot
+shop
+short
+shoulder
+shove
+shrimp
+shrug
+shuffle
+shy
+sibling
+sick
+side
+siege
+sight
+sign
+silent
+silk
+silly
+silver
+similar
+simple
+since
+sing
+siren
+sister
+situate
+six
+size
+skate
+sketch
+ski
+skill
+skin
+skirt
+skull
+slab
+slam
+sleep
+slender
+slice
+slide
+slight
+slim
+slogan
+slot
+slow
+slush
+small
+smart
+smile
+smoke
+smooth
+snack
+snake
+snap
+sniff
+snow
+soap
+soccer
+social
+sock
+soda
+soft
+solar
+soldier
+solid
+solution
+solve
+someone
+song
+soon
+sorry
+sort
+soul
+sound
+soup
+source
+south
+space
+spare
+spatial
+spawn
+speak
+special
+speed
+spell
+spend
+sphere
+spice
+spider
+spike
+spin
+spirit
+split
+spoil
+sponsor
+spoon
+sport
+spot
+spray
+spread
+spring
+spy
+square
+squeeze
+squirrel
+stable
+stadium
+staff
+stage
+stairs
+stamp
+stand
+start
+state
+stay
+steak
+steel
+stem
+step
+stereo
+stick
+still
+sting
+stock
+stomach
+stone
+stool
+story
+stove
+strategy
+street
+strike
+strong
+struggle
+student
+stuff
+stumble
+style
+subject
+submit
+subway
+success
+such
+sudden
+suffer
+sugar
+suggest
+suit
+summer
+sun
+sunny
+sunset
+super
+supply
+supreme
+sure
+surface
+surge
+surprise
+surround
+survey
+suspect
+sustain
+swallow
+swamp
+swap
+swarm
+swear
+sweet
+swift
+swim
+swing
+switch
+sword
+symbol
+symptom
+syrup
+system
+table
+tackle
+tag
+tail
+talent
+talk
+tank
+tape
+target
+task
+taste
+tattoo
+taxi
+teach
+team
+tell
+ten
+tenant
+tennis
+tent
+term
+test
+text
+thank
+that
+theme
+then
+theory
+there
+they
+thing
+this
+thought
+three
+thrive
+throw
+thumb
+thunder
+ticket
+tide
+tiger
+tilt
+timber
+time
+tiny
+tip
+tired
+tissue
+title
+toast
+tobacco
+today
+toddler
+toe
+together
+toilet
+token
+tomato
+tomorrow
+tone
+tongue
+tonight
+tool
+tooth
+top
+topic
+topple
+torch
+tornado
+tortoise
+toss
+total
+tourist
+toward
+tower
+town
+toy
+track
+trade
+traffic
+tragic
+train
+transfer
+trap
+trash
+travel
+tray
+treat
+tree
+trend
+trial
+tribe
+trick
+trigger
+trim
+trip
+trophy
+trouble
+truck
+true
+truly
+trumpet
+trust
+truth
+try
+tube
+tuition
+tumble
+tuna
+tunnel
+turkey
+turn
+turtle
+twelve
+twenty
+twice
+twin
+twist
+two
+type
+typical
+ugly
+umbrella
+unable
+unaware
+uncle
+uncover
+under
+undo
+unfair
+unfold
+unhappy
+uniform
+unique
+unit
+universe
+unknown
+unlock
+until
+unusual
+unveil
+update
+upgrade
+uphold
+upon
+upper
+upset
+urban
+urge
+usage
+use
+used
+useful
+useless
+usual
+utility
+vacant
+vacuum
+vague
+valid
+valley
+valve
+van
+vanish
+vapor
+various
+vast
+vault
+vehicle
+velvet
+vendor
+venture
+venue
+verb
+verify
+version
+very
+vessel
+veteran
+viable
+vibrant
+vicious
+victory
+video
+view
+village
+vintage
+violin
+virtual
+virus
+visa
+visit
+visual
+vital
+vivid
+vocal
+voice
+void
+volcano
+volume
+vote
+voyage
+wage
+wagon
+wait
+walk
+wall
+walnut
+want
+warfare
+warm
+warrior
+wash
+wasp
+waste
+water
+wave
+way
+wealth
+weapon
+wear
+weasel
+weather
+web
+wedding
+weekend
+weird
+welcome
+west
+wet
+whale
+what
+wheat
+wheel
+when
+where
+whip
+whisper
+wide
+width
+wife
+wild
+will
+win
+window
+wine
+wing
+wink
+winner
+winter
+wire
+wisdom
+wise
+wish
+witness
+wolf
+woman
+wonder
+wood
+wool
+word
+work
+world
+worry
+worth
+wrap
+wreck
+wrestle
+wrist
+write
+wrong
+yard
+year
+yellow
+you
+young
+youth
+zebra
+zero
+zone
+zoo
diff --git a/src/api/AssetsResource.java b/src/api/AssetsResource.java
index b5202646..ac83dbdb 100644
--- a/src/api/AssetsResource.java
+++ b/src/api/AssetsResource.java
@@ -225,7 +225,7 @@ public class AssetsResource {
requestBody = @RequestBody(
required = true,
content = @Content(
- mediaType = "application/json",
+ mediaType = MediaType.APPLICATION_JSON,
schema = @Schema(implementation = IssueAssetRequest.class)
)
)
diff --git a/src/api/UtilsResource.java b/src/api/UtilsResource.java
index c935a64c..9016ea92 100644
--- a/src/api/UtilsResource.java
+++ b/src/api/UtilsResource.java
@@ -7,25 +7,29 @@ import io.swagger.v3.oas.annotations.parameters.RequestBody;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
import qora.crypto.Crypto;
+import utils.BIP39;
import utils.Base58;
-import java.math.BigInteger;
import java.security.SecureRandom;
+import java.util.Arrays;
import java.util.Base64;
+import java.util.List;
import java.util.UUID;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import com.google.common.primitives.Bytes;
import com.google.common.primitives.Longs;
+import globalization.BIP39WordList;
+
@Path("/utils")
@Produces({
MediaType.TEXT_PLAIN
@@ -38,47 +42,65 @@ public class UtilsResource {
@Context
HttpServletRequest request;
- @GET
- @Path("/base58from64/{base64}")
+ @POST
+ @Path("/base58from64")
@Operation(
summary = "Convert base64 data to base58",
+ requestBody = @RequestBody(
+ required = true,
+ content = @Content(
+ mediaType = MediaType.TEXT_PLAIN,
+ schema = @Schema(
+ type = "string"
+ )
+ )
+ ),
responses = {
@ApiResponse(
description = "base58 data",
content = @Content(
schema = @Schema(
- implementation = String.class
+ type = "string"
)
)
)
}
)
- public String base58from64(@PathParam("base64") String base64) {
+ public String base58from64(String base64) {
try {
- return Base58.encode(Base64.getDecoder().decode(base64));
+ return Base58.encode(Base64.getDecoder().decode(base64.trim()));
} catch (IllegalArgumentException e) {
throw ApiErrorFactory.getInstance().createError(ApiError.INVALID_DATA);
}
}
- @GET
- @Path("/base64from58/{base58}")
+ @POST
+ @Path("/base64from58")
@Operation(
summary = "Convert base58 data to base64",
+ requestBody = @RequestBody(
+ required = true,
+ content = @Content(
+ mediaType = MediaType.TEXT_PLAIN,
+ schema = @Schema(
+ type = "string"
+ )
+ )
+ ),
responses = {
@ApiResponse(
description = "base64 data",
content = @Content(
schema = @Schema(
- implementation = String.class
+ type = "string"
)
)
)
}
)
- public String base64from58(@PathParam("base58") String base58) {
+ public String base64from58(String base58) {
try {
- return Base64.getEncoder().encodeToString(Base58.decode(base58));
+ return Base64.getEncoder().encodeToString(Base58.decode(base58.trim()));
} catch (NumberFormatException e) {
throw ApiErrorFactory.getInstance().createError(ApiError.INVALID_DATA);
}
@@ -87,7 +109,8 @@ public class UtilsResource {
@GET
@Path("/seed")
@Operation(
- summary = "Generate random 32-byte seed",
+ summary = "Generate random seed",
+ description = "Optionally pass seed length, defaults to 32 bytes.",
responses = {
@ApiResponse(
description = "base58 data",
@@ -100,8 +123,11 @@ public class UtilsResource {
)
}
)
- public String seed() {
- byte[] seed = new byte[32];
+ public String seed(@QueryParam("length") Integer length) {
+ if (length == null)
+ length = 32;
+
+ byte[] seed = new byte[length];
new SecureRandom().nextBytes(seed);
return Base58.encode(seed);
}
@@ -110,6 +136,8 @@ public class UtilsResource {
@Path("/seedPhrase")
@Operation(
summary = "Generate random 12-word BIP39 seed phrase",
+ description = "Optionally pass 16-byte, base58-encoded entropy input or entropy will be internally generated.
"
+ + "Example entropy input: YcVfxkQb6JRzqk5kF2tNLv",
responses = {
@ApiResponse(
description = "seed phrase",
@@ -122,47 +150,52 @@ public class UtilsResource {
)
}
)
- public String seedPhrase() {
+ public String seedPhrase(@QueryParam("entropy") String input) {
/*
* BIP39 word lists have 2048 entries so can be represented by 11 bits.
* UUID (128bits) and another 4 bits gives 132 bits.
* 132 bits, divided by 11, gives 12 words.
*/
- final int WORD_MASK = 2048 - 1;
-
- UUID uuid = UUID.randomUUID();
-
- System.out.println("UUID: " + uuid.toString());
-
- byte[] uuidMSB = Longs.toByteArray(uuid.getMostSignificantBits());
- byte[] uuidLSB = Longs.toByteArray(uuid.getLeastSignificantBits());
- byte[] message = Bytes.concat(uuidMSB, uuidLSB);
+ final int BITS_PER_WORD = 11;
+
+ byte[] message;
+ if (input != null) {
+ // Use caller-supplied entropy input
+ try {
+ message = Base58.decode(input);
+ } catch (NumberFormatException e) {
+ throw ApiErrorFactory.getInstance().createError(ApiError.INVALID_DATA);
+ }
+
+ // Must be 16-bytes
+ if (message.length != 16)
+ throw ApiErrorFactory.getInstance().createError(ApiError.INVALID_DATA);
+ } else {
+ // Generate entropy internally
+ UUID uuid = UUID.randomUUID();
+
+ byte[] uuidMSB = Longs.toByteArray(uuid.getMostSignificantBits());
+ byte[] uuidLSB = Longs.toByteArray(uuid.getLeastSignificantBits());
+ message = Bytes.concat(uuidMSB, uuidLSB);
+ }
// Use SHA256 to generate more bits
byte[] hash = Crypto.digest(message);
- // Append last 4 bits from hash to end. (Actually 8 bits but we only use 4).
+ // Append first 4 bits from hash to end. (Actually 8 bits but we only use 4).
+ byte checksum = (byte) (hash[0] & 0xf0);
message = Bytes.concat(message, new byte[] {
- hash[hash.length - 1]
+ checksum
});
- BigInteger wordBits = new BigInteger(message);
-
- String[] phraseWords = new String[12];
- for (int i = phraseWords.length; i >= 0; --i) {
- int wordListIndex = wordBits.intValue() & WORD_MASK;
- wordBits = wordBits.shiftRight(11);
- // phraseWords[i] = wordList.get(wordListIndex);
- }
-
- return String.join(" ", phraseWords);
+ return BIP39.encode(message, "en");
}
@POST
- @Path("/privateKey")
+ @Path("/seedPhrase")
@Operation(
- summary = "Calculate private key from 12-word BIP39 seed phrase",
- description = "Returns the base58-encoded private key, or \"false\" if phrase is invalid.",
+ summary = "Calculate binary form of 12-word BIP39 seed phrase",
+ description = "Returns the base58-encoded binary form, or \"false\" if phrase is invalid.",
requestBody = @RequestBody(
required = true,
content = @Content(
@@ -184,9 +217,25 @@ public class UtilsResource {
)
}
)
- public String getPublicKey(String seedPhrase) {
- // TODO: convert BIP39 seed phrase to private key
- return seedPhrase;
+ public String getBinarySeed(String seedPhrase) {
+ if (seedPhrase.isEmpty())
+ return "false";
+
+ // Strip leading/trailing whitespace if any
+ seedPhrase = seedPhrase.trim();
+
+ String[] phraseWords = seedPhrase.split(" ");
+ if (phraseWords.length != 12)
+ return "false";
+
+ // Convert BIP39 seed phrase to binary
+ byte[] binary = BIP39.decode(phraseWords, "en");
+ if (binary == null)
+ return "false";
+
+ byte[] message = Arrays.copyOf(binary, 16); // 132 bits is 16.5 bytes, but we're discarding checksum nybble
+
+ return Base58.encode(message);
}
}
diff --git a/src/globalization/BIP39WordList.java b/src/globalization/BIP39WordList.java
new file mode 100644
index 00000000..1779dbd4
--- /dev/null
+++ b/src/globalization/BIP39WordList.java
@@ -0,0 +1,55 @@
+package globalization;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import settings.Settings;
+
+/** Providing multi-language BIP39 word lists, downloaded from https://github.com/bitcoin/bips/tree/master/bip-0039 */
+public class BIP39WordList {
+
+ private static BIP39WordList instance;
+
+ private static Map> wordListsByLang;
+
+ private BIP39WordList() {
+ wordListsByLang = new HashMap<>();
+
+ String path = Settings.getInstance().translationsPath();
+ File dir = new File(path);
+ File[] files = dir.listFiles(new FilenameFilter() {
+ @Override
+ public boolean accept(File dir, String name) {
+ return name.startsWith("BIP39.");
+ }
+ });
+
+ try {
+ for (File file : files) {
+ String lang = file.getName().substring(6, 8);
+ List words = Files.readAllLines(file.toPath());
+ wordListsByLang.put(lang, words);
+ }
+ } catch (IOException e) {
+ throw new RuntimeException("Unable to read BIP39 word list", e);
+ }
+ }
+
+ public static synchronized BIP39WordList getInstance() {
+ if (instance == null)
+ instance = new BIP39WordList();
+
+ return instance;
+ }
+
+ public List getByLang(String lang) {
+ return Collections.unmodifiableList(wordListsByLang.get(lang));
+ }
+
+}
diff --git a/src/utils/BIP39.java b/src/utils/BIP39.java
new file mode 100644
index 00000000..97ea7f17
--- /dev/null
+++ b/src/utils/BIP39.java
@@ -0,0 +1,86 @@
+package utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import globalization.BIP39WordList;
+
+public class BIP39 {
+
+ private static final int BITS_PER_WORD = 11;
+
+ /** Convert BIP39 seed phrase to binary form */
+ public static byte[] decode(String[] phraseWords, String lang) {
+ if (lang == null)
+ lang = "en";
+
+ List wordList = BIP39WordList.getInstance().getByLang(lang);
+ if (wordList == null)
+ throw new IllegalStateException("BIP39 word list for lang '" + lang + "' unavailable");
+
+ byte[] output = new byte[(phraseWords.length * BITS_PER_WORD + 7) / 8];
+ int byteIndex = 0;
+ int bitShift = 3;
+
+ for (int i = 0; i < phraseWords.length; ++i) {
+ int wordListIndex = wordList.indexOf(phraseWords[i]);
+ if (wordListIndex == -1)
+ // Word not found
+ return null;
+
+ output[byteIndex++] |= (byte) (wordListIndex >> bitShift);
+
+ bitShift = 8 - bitShift;
+ if (bitShift >= 0) {
+ // Leftover fits inside one byte
+ output[byteIndex] |= (byte) ((wordListIndex << bitShift));
+ bitShift = BITS_PER_WORD - bitShift;
+ } else {
+ // Leftover spread over next two bytes
+ bitShift = 0 - bitShift;
+ output[byteIndex++] |= (byte) (wordListIndex >> bitShift);
+
+ output[byteIndex] |= (byte) ((wordListIndex << (8 - bitShift)));
+ bitShift = bitShift + BITS_PER_WORD - 8;
+ }
+ }
+
+ return output;
+ }
+
+ /** Convert binary to BIP39 seed phrase */
+ public static String encode(byte[] input, String lang) {
+ if (lang == null)
+ lang = "en";
+
+ List wordList = BIP39WordList.getInstance().getByLang(lang);
+ if (wordList == null)
+ throw new IllegalStateException("BIP39 word list for lang '" + lang + "' unavailable");
+
+ List phraseWords = new ArrayList<>();
+
+ int bitMask = 128; // MSB first
+ int byteIndex = 0;
+ while (true) {
+ int wordListIndex = 0;
+ for (int bitCount = 0; bitCount < BITS_PER_WORD; ++bitCount) {
+ wordListIndex <<= 1;
+
+ if ((input[byteIndex] & bitMask) != 0)
+ ++wordListIndex;
+
+ bitMask >>= 1;
+ if (bitMask == 0) {
+ bitMask = 128;
+ ++byteIndex;
+
+ if (byteIndex >= input.length)
+ return String.join(" ", phraseWords);
+ }
+ }
+
+ phraseWords.add(wordList.get(wordListIndex));
+ }
+ }
+
+}