Skip to content
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

Updates to host calls v0.6.0 #254

Merged
merged 1 commit into from
Feb 7, 2025
Merged

Updates to host calls v0.6.0 #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 deletions internal/polkavm/host_call/accumulate_functions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ func Bless(gas Gas, regs Registers, mem Memory, ctxPair AccumulateContextPair) (
for i := range uint32(servicesNr) {
serviceId, err := readNumber[block.ServiceId](mem, uint32(addr)+(12*i), 4)
if err != nil {
return gas, withCode(regs, OOB), mem, ctxPair, err
return gas, regs, mem, ctxPair, ErrPanicf(err.Error())
}
serviceGas, err := readNumber[uint64](mem, uint32(addr)+(12*i)+4, 8)
if err != nil {
return gas, withCode(regs, OOB), mem, ctxPair, err
return gas, regs, mem, ctxPair, ErrPanicf(err.Error())
}

if ctxPair.RegularCtx.AccumulationState.PrivilegedServices.AmountOfGasPerServiceId == nil {
Expand Down Expand Up @@ -60,7 +60,7 @@ func Assign(gas Gas, regs Registers, mem Memory, ctxPair AccumulateContextPair)
for i := 0; i < state.PendingAuthorizersQueueSize; i++ {
bytes := make([]byte, 32)
if err := mem.Read(uint32(addr)+uint32(32*i), bytes); err != nil {
return gas, withCode(regs, OOB), mem, ctxPair, nil
return gas, regs, mem, ctxPair, ErrPanicf(err.Error())
}
ctxPair.RegularCtx.AccumulationState.PendingAuthorizersQueues[core][i] = crypto.Hash(bytes)
}
Expand All @@ -85,7 +85,7 @@ func Designate(gas Gas, regs Registers, mem Memory, ctxPair AccumulateContextPai
for i := 0; i < common.NumberOfValidators; i++ {
bytes := make([]byte, 336)
if err := mem.Read(uint32(addr)+uint32(336*i), bytes); err != nil {
return gas, withCode(regs, OOB), mem, ctxPair, nil
return gas, regs, mem, ctxPair, ErrPanicf(err.Error())
}

ctxPair.RegularCtx.AccumulationState.ValidatorKeys[i] = &crypto.ValidatorKey{
Expand Down Expand Up @@ -127,7 +127,7 @@ func New(gas Gas, regs Registers, mem Memory, ctxPair AccumulateContextPair) (Ga
// c = μo⋅⋅⋅+32 if No⋅⋅⋅+32 ⊂ Vμ otherwise ∇
codeHashBytes := make([]byte, 32)
if err := mem.Read(uint32(addr), codeHashBytes); err != nil {
return gas, withCode(regs, OOB), mem, ctxPair, nil
return gas, regs, mem, ctxPair, ErrPanicf(err.Error())
}

codeHash := crypto.Hash(codeHashBytes)
Expand Down Expand Up @@ -186,7 +186,7 @@ func Upgrade(gas Gas, regs Registers, mem Memory, ctxPair AccumulateContextPair)
// c = μo⋅⋅⋅+32 if No⋅⋅⋅+32 ⊂ Vμ otherwise ∇
codeHash := make([]byte, 32)
if err := mem.Read(uint32(addr), codeHash); err != nil {
return gas, withCode(regs, OOB), mem, ctxPair, nil
return gas, regs, mem, ctxPair, ErrPanicf(err.Error())
}

// (ω′7, (X′s)c, (X′s)g , (X′s)m) = (OK, c, g, m) if c ≠ ∇
Expand All @@ -213,7 +213,7 @@ func Transfer(gas Gas, regs Registers, mem Memory, ctxPair AccumulateContextPair
// m = μo⋅⋅⋅+M if No⋅⋅⋅+WT ⊂ Vμ otherwise ∇
m := make([]byte, service.TransferMemoSizeBytes)
if err := mem.Read(uint32(o), m); err != nil {
return gas, withCode(regs, OK), mem, ctxPair, nil
return gas, regs, mem, ctxPair, ErrPanicf(err.Error())
}

// let t ∈ T = (s, d, a, m, g)
Expand Down Expand Up @@ -262,7 +262,7 @@ func Eject(gas Gas, regs Registers, mem Memory, ctxPair AccumulateContextPair, t
h := make([]byte, 32)
if err := mem.Read(uint32(o), h); err != nil {
// otherwise ∇
return gas, withCode(regs, OOB), mem, ctxPair, nil
return gas, regs, mem, ctxPair, ErrPanicf(err.Error())
}

if block.ServiceId(d) == ctxPair.RegularCtx.ServiceId {
Expand Down Expand Up @@ -327,8 +327,8 @@ func Query(gas Gas, regs Registers, mem Memory, ctxPair AccumulateContextPair) (
// let h = μo..o+32 if Zo..o+32 ⊂ Vμ
h := make([]byte, 32)
if err := mem.Read(uint32(addr), h); err != nil {
// otherwise ∇ => OOB
return gas, withCode(regs, OOB), mem, ctxPair, nil
// otherwise ∇ => panic
return gas, regs, mem, ctxPair, ErrPanicf(err.Error())
}

// let a = (xs)l[h, z] if (h, z) ∈ K((xs)l)
Expand Down Expand Up @@ -374,7 +374,7 @@ func Solicit(gas Gas, regs Registers, mem Memory, ctxPair AccumulateContextPair,
// let h = μo⋅⋅⋅+32 if Zo⋅⋅⋅+32 ⊂ Vμ otherwise ∇
preimageHashBytes := make([]byte, 32)
if err := mem.Read(uint32(addr), preimageHashBytes); err != nil {
return gas, withCode(regs, OOB), mem, ctxPair, nil
return gas, regs, mem, ctxPair, ErrPanicf(err.Error())
}

// let a = xs
Expand Down Expand Up @@ -415,7 +415,7 @@ func Forget(gas Gas, regs Registers, mem Memory, ctxPair AccumulateContextPair,
// let h = μo⋅⋅⋅+32 if Zo⋅⋅⋅+32 ⊂ Vμ otherwise ∇
preimageHashBytes := make([]byte, 32)
if err := mem.Read(uint32(addr), preimageHashBytes); err != nil {
return gas, withCode(regs, OOB), mem, ctxPair, nil
return gas, regs, mem, ctxPair, ErrPanicf(err.Error())
}

// let a = xs
Expand Down Expand Up @@ -480,8 +480,8 @@ func Yield(gas Gas, regs Registers, mem Memory, ctxPair AccumulateContextPair) (
// let h = μo..o+32 if Zo..o+32 ⊂ Vμ otherwise ∇
hBytes := make([]byte, 32)
if err := mem.Read(uint32(addr), hBytes); err != nil {
// (ω′7, x′_y) = (OOB, x_y) if h = ∇
return gas, withCode(regs, OOB), mem, ctxPair, nil
// (ε', ω′7, x′_y) = (panic, ω7, x_y) if h = ∇
return gas, regs, mem, ctxPair, ErrPanicf(err.Error())
}

// (ω′7, x′_y) = (OK, h) otherwise
Expand Down
21 changes: 21 additions & 0 deletions internal/polkavm/host_call/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,24 @@ func withCode(regs Registers, s Code) Registers {
regs[A0] = uint64(s)
return regs
}

func writeFromOffset(
mem Memory,
addressToWrite uint64,
data []byte,
offset uint64,
length uint64,
) error {
vLen := uint64(len(data))

f := min(offset, vLen)
l := min(length, vLen-f)

if l > 0 {
sliceToWrite := data[f : f+l]
if err := mem.Write(uint32(addressToWrite), sliceToWrite); err != nil {
return ErrPanicf("out-of-bounds write at address %d", addressToWrite)
}
}
return nil
}
82 changes: 35 additions & 47 deletions internal/polkavm/host_call/general_functions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,38 +54,27 @@ func Lookup(gas polkavm.Gas, regs polkavm.Registers, mem polkavm.Memory, s servi
}
}

ho := regs[polkavm.A1]
// let [h, o] = ω8..+2
h, o := regs[polkavm.A1], regs[polkavm.A2]

// Ensure the memory range is valid for hashing (µho..ho+32)
memorySlice := make([]byte, 32)
err := mem.Read(uint32(ho), memorySlice)
if err != nil {
return gas, withCode(regs, OOB), mem, err
key := make([]byte, 32)
if err := mem.Read(uint32(h), key); err != nil {
return gas, regs, mem, polkavm.ErrPanicf(err.Error())
}

// Compute the hash H(µho..ho+32)
hash := crypto.HashData(memorySlice)

// lookup value in storage (v) using the hash
v, exists := a.Storage[hash]
v, exists := a.PreimageLookup[crypto.Hash(key)]
if !exists {
// v=∅ => (▸, NONE, μ)
return gas, withCode(regs, NONE), mem, nil
}

bo := regs[polkavm.A2]
bz := regs[polkavm.A3]

// Write value to memory if within bounds
if len(v) > 0 && len(v) <= int(bz) {
if err = mem.Write(uint32(bo), v); err != nil {
return gas, withCode(regs, OOB), mem, err
}
} else {
return gas, withCode(regs, OOB), mem, err
if err := writeFromOffset(mem, o, v, regs[polkavm.A3], regs[polkavm.A4]); err != nil {
return gas, regs, mem, err
}

regs[polkavm.A0] = uint64(len(v))
return gas, regs, mem, err
return gas, regs, mem, nil
}

// Read ΩR(ϱ, ω, μ, s, s, d)
Expand All @@ -96,28 +85,33 @@ func Read(gas polkavm.Gas, regs polkavm.Registers, mem polkavm.Memory, s service
gas -= ReadCost

omega7 := regs[polkavm.A0]
ko := regs[polkavm.A1]
kz := regs[polkavm.A2]
bo := regs[polkavm.A3]
bz := regs[polkavm.A4]
// s* = ω7
ss := block.ServiceId(omega7)
if uint64(omega7) == math.MaxUint64 {
ss = serviceId // s* = s
}

a := s
if uint64(omega7) != math.MaxUint64 && omega7 != uint64(serviceId) {
if ss != serviceId {
var exists bool
a, exists = serviceState[block.ServiceId(omega7)]
a, exists = serviceState[ss]
if !exists {
return gas, regs, mem, polkavm.ErrAccountNotFound
}
}

// let [ko, kz, o] = ω8..+3
ko, kz, o := regs[polkavm.A1], regs[polkavm.A2], regs[polkavm.A3]

// read key data from memory at ko..ko+kz
keyData := make([]byte, kz)
err := mem.Read(uint32(ko), keyData)
if err != nil {
return gas, withCode(regs, OOB), mem, nil
return gas, regs, mem, polkavm.ErrPanicf(err.Error())
}

serviceIdBytes, err := jam.Marshal(omega7)
// k = H(E4(s*) ⌢ µko..ko+kz)
serviceIdBytes, err := jam.Marshal(ss)
if err != nil {
return gas, regs, mem, polkavm.ErrPanicf(err.Error())
}
Expand All @@ -135,18 +129,12 @@ func Read(gas polkavm.Gas, regs polkavm.Registers, mem polkavm.Memory, s service
return gas, withCode(regs, NONE), mem, nil
}

writeLen := int(math.Min(float64(bz), float64(len(v))))

if writeLen > 0 {
if err = mem.Write(uint32(bo), v[:writeLen]); err != nil {
return gas, withCode(regs, OOB), mem, nil
}

regs[polkavm.A0] = uint64(len(v))
return gas, regs, mem, nil
if err = writeFromOffset(mem, o, v, regs[polkavm.A4], regs[polkavm.A5]); err != nil {
return gas, regs, mem, err
}

return gas, withCode(regs, NONE), mem, nil
regs[polkavm.A0] = uint64(len(v))
return gas, regs, mem, nil
}

// Write ΩW(ϱ, ω, μ, s, s)
Expand All @@ -164,12 +152,12 @@ func Write(gas polkavm.Gas, regs polkavm.Registers, mem polkavm.Memory, s servic
keyData := make([]byte, kz)
err := mem.Read(uint32(ko), keyData)
if err != nil {
return gas, regs, mem, s, err
return gas, regs, mem, s, polkavm.ErrPanicf(err.Error())
}

serviceIdBytes, err := jam.Marshal(serviceId)
if err != nil {
return gas, regs, mem, s, err
return gas, regs, mem, s, polkavm.ErrPanicf(err.Error())
}
hashInput := append(serviceIdBytes, keyData...)
k := crypto.HashData(hashInput)
Expand All @@ -179,9 +167,9 @@ func Write(gas polkavm.Gas, regs polkavm.Registers, mem polkavm.Memory, s servic
delete(a.Storage, k)
} else {
valueData := make([]byte, vz)
err := mem.Read(uint32(vo), valueData)
err = mem.Read(uint32(vo), valueData)
if err != nil {
return gas, withCode(regs, OOB), mem, s, err
return gas, regs, mem, s, polkavm.ErrPanicf(err.Error())
}

a.Storage[k] = valueData
Expand All @@ -193,7 +181,7 @@ func Write(gas polkavm.Gas, regs polkavm.Registers, mem polkavm.Memory, s servic
}

if a.ThresholdBalance() > a.Balance {
return gas, withCode(regs, FULL), mem, s, err
return gas, withCode(regs, FULL), mem, s, nil
}

// otherwise a.ThresholdBalance() <= a.Balance
Expand Down Expand Up @@ -232,11 +220,11 @@ func Info(gas polkavm.Gas, regs polkavm.Registers, mem polkavm.Memory, serviceId
// E(tc, tb, tt, tg , tm, tl, ti)
m, err := jam.Marshal(accountInfo)
if err != nil {
return gas, regs, mem, polkavm.ErrPanicf(err.Error())
return gas, regs, mem, err
}

if err := mem.Write(uint32(omega8), m); err != nil {
return gas, withCode(regs, OOB), mem, nil
if err = mem.Write(uint32(omega8), m); err != nil {
return gas, regs, mem, polkavm.ErrPanicf(err.Error())
}

return gas, withCode(regs, OK), mem, nil
Expand Down
24 changes: 13 additions & 11 deletions internal/polkavm/host_call/general_functions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,18 @@ func TestLookup(t *testing.T) {
bo := polkavm.RWAddressBase + 100
dataToHash := make([]byte, 32)
copy(dataToHash, "hash")
hash := crypto.HashData(dataToHash)

err = mem.Write(ho, dataToHash)
require.NoError(t, err)

initialRegs[polkavm.A0] = uint64(serviceId)
initialRegs[polkavm.A1] = uint64(ho)
initialRegs[polkavm.A2] = uint64(bo)
initialRegs[polkavm.A3] = 32
initialRegs[polkavm.A1] = uint64(ho) // h
initialRegs[polkavm.A2] = uint64(bo) // o
initialRegs[polkavm.A3] = 0 // f
initialRegs[polkavm.A4] = uint64(len(val)) // l
sa := service.ServiceAccount{
Storage: map[crypto.Hash][]byte{
hash: val,
PreimageLookup: map[crypto.Hash][]byte{
crypto.Hash(dataToHash): val,
},
}
serviceState := service.ServiceState{
Expand Down Expand Up @@ -147,7 +148,7 @@ func TestRead(t *testing.T) {
value := []byte("value_to_read")

// Compute the hash H(E4(s) || keyData)
serviceIdBytes, err := jam.Marshal(uint64(serviceId))
serviceIdBytes, err := jam.Marshal(serviceId)
require.NoError(t, err)

hashInput := make([]byte, 0, len(serviceIdBytes)+len(keyData))
Expand All @@ -164,17 +165,18 @@ func TestRead(t *testing.T) {
serviceId: sa,
}

initialGas := uint64(100)

ko := polkavm.RWAddressBase
bo := polkavm.RWAddressBase + 100
kz := uint32(len(keyData))
bz := uint32(32)
vLen := uint64(len(value))

initialRegs[polkavm.A0] = uint64(serviceId)
initialRegs[polkavm.A1] = uint64(ko)
initialRegs[polkavm.A2] = uint64(kz)
initialRegs[polkavm.A3] = uint64(bo)
initialRegs[polkavm.A4] = uint64(bz)
initialRegs[polkavm.A4] = 0 // f = offset (starting at 0)
initialRegs[polkavm.A5] = vLen // l = length (32 bytes)

err = mem.Write(ko, keyData)
require.NoError(t, err)

Expand Down
Loading
Loading